mirror of
https://github.com/Ninjdai1/pokeemerald.git
synced 2025-01-13 07:03:40 +01:00
566ec93492
# Conflicts: # asm/macros/battle_script.inc # data/battle_scripts_1.s # include/constants/battle_move_effects.h # include/constants/battle_script_commands.h # include/constants/battle_string_ids.h # src/battle_script_commands.c # src/data/battle_moves.h