Eduardo Quezada 820113d883 Merge branch 'RHH/master' into RHH/upcoming ... # Conflicts: # data/battle_anim_scripts.s # data/battle_scripts_1.s # include/battle_scripts.h # include/battle_util.h # src/battle_script_commands.c # src/battle_util.c		2023-09-07 15:13:06 -03:00
..
abilities.h
apprentice.h
battle_ai.h	Ported TheXaman's latest changes to the Debug Menu (#2815)	2023-07-18 09:17:03 +02:00
battle_anim_scripts.h	Add many gen 8 move animations (#2861)	2023-06-21 13:19:54 -04:00
battle_anim.h	Ultra burst trigger	2023-08-09 22:12:26 -05:00
battle_arena.h
battle_dome.h
battle_factory.h
battle_frontier_mons.h
battle_frontier_trainers.h
battle_frontier.h
battle_move_effects.h	solve conflics	2023-08-07 14:25:30 +02:00
battle_palace.h
battle_pike.h
battle_pyramid.h
battle_script_commands.h	Merge branch 'RHH/master' into RHH/upcoming	2023-09-07 15:13:06 -03:00
battle_setup.h
battle_string_ids.h	Ultra burst trigger	2023-08-09 22:12:26 -05:00
battle_tent_mons.h
battle_tent_trainers.h
battle_tent.h
battle_tower.h
battle.h	Constants	2023-08-12 12:30:36 -05:00
berry.h
cable_club.h
coins.h
contest.h	Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829	2023-08-31 14:28:01 -04:00
daycare.h
decorations.h
easy_chat.h
event_bg.h
event_object_movement.h
event_objects.h
field_effects.h
field_poison.h
field_specials.h
field_tasks.h
field_weather.h
flags.h	Merge pull request #1904 from GriffinRichards/temp-alias	2023-08-11 15:45:00 -04:00
form_change_types.h	Ultra burst trigger	2023-08-09 22:12:26 -05:00
frontier_util.h
game_stat.h	Rename GAME_STAT_FISHING_CAPTURES to GAME_STAT_FISHING_ENCOUNTERS	2023-06-05 14:15:07 +02:00
global.h	Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829	2023-08-31 14:28:01 -04:00
heal_locations.h
hold_effects.h	Add Berserk Gene Item (#2893)	2023-04-25 15:03:57 -04:00
item_effects.h	Fix Ice Heal message	2023-04-25 19:38:47 +02:00
item.h
items.h	Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829	2023-08-31 14:28:01 -04:00
layouts.h
lilycove_lady.h
map_groups.h
map_scripts.h
map_types.h
maps.h
mauville_old_man.h
metatile_behaviors.h
metatile_labels.h
moves.h
mystery_gift.h
opponents.h
party_menu.h	Add Frostbite status	2023-04-22 18:23:08 +02:00
pokedex.h
pokemon_debug.h
pokemon.h	merge with upcoming	2023-08-30 13:23:55 +02:00
region_map_sections.h
rgb.h
roulette.h
script_menu.h
secret_bases.h
slot_machine.h
songs.h
sound.h
species.h
tms_hms.h	Reference TMs and HMs by move instead of number (#1732)	2023-08-09 10:51:01 -04:00
trade.h
trainer_hill.h	Fix some frontier gfx, adjacent cleanup	2023-08-03 11:15:15 -04:00
trainer_types.h
trainers.h	Removed uses of F_TRAINER_PARTY_EVERYTHING_CUSTOMIZED	2023-07-05 18:22:48 -04:00
tv.h	Redefine TV_SHOWS_COUNT	2023-04-27 13:59:09 -04:00
union_room.h
vars.h	Add temp var aliases	2023-08-04 14:17:28 -04:00
weather.h
wild_encounter.h
z_move_effects.h