mirror of
https://github.com/pret/pokeemerald.git
synced 2026-11-16 10:27:21 -06:00
# Conflicts: # include/battle_anim.h # include/global.h # include/pokemon.h # src/battle_message.c # src/battle_script_commands.c # src/data/pokemon/base_stats.h