mirror of
https://github.com/pret/pokeemerald.git
synced 2026-08-14 05:15:09 -05:00
# Conflicts: # data/battle_scripts_2.s # include/constants/battle_string_ids.h # include/constants/songs.h # src/battle_message.c # src/data/pokemon/species_info.h