Eduardo Quezada 4625a46748 Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange ... # Conflicts: # src/battle_interface.c # src/battle_main.c # src/battle_script_commands.c # src/battle_util.c		2023-03-07 11:26:33 -03:00
..
abilities.h
apprentice.h
battle_ai.h
battle_anim.h
battle_arena.h
battle_dome.h
battle_factory.h
battle_frontier_mons.h
battle_frontier_trainers.h
battle_frontier.h
battle_move_effects.h	Add MOVE_SHELL_TRAP Effect (#2716)	2023-02-22 13:55:34 +00:00
battle_palace.h
battle_pike.h
battle_pyramid.h
battle_script_commands.h	Add MOVE_SHELL_TRAP Effect (#2716)	2023-02-22 13:55:34 +00:00
battle_setup.h
battle_string_ids.h	Add tests for Defog and fix Defog battle strings (#2737)	2023-03-06 20:35:08 +01:00
battle_tent_mons.h
battle_tent_trainers.h
battle_tent.h
battle_tower.h
battle.h	add messages for stockpile effects wear off	2023-02-27 12:31:29 +01:00
berry.h
cable_club.h
coins.h
contest.h
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	Fix wrong route in item flag name	2023-02-25 13:48:39 -08:00
form_change_types.h
frontier_util.h
game_stat.h
global.h
heal_locations.h
hold_effects.h
item_effects.h
item.h
items.h
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
pokedex.h
pokemon_debug.h
pokemon.h	Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange	2023-03-07 11:26:33 -03:00
region_map_sections.h
rgb.h
roulette.h
script_menu.h
secret_bases.h
slot_machine.h
songs.h
sound.h
species.h
trade.h
trainer_hill.h
trainer_types.h
trainers.h
tv.h
union_room.h
vars.h
weather.h
wild_encounter.h
z_move_effects.h