mirror of
https://github.com/Ninjdai1/pokeemerald.git
synced 2025-02-09 23:03:01 +01:00
# Conflicts: # src/data/pokemon/form_change_table_pointers.h # src/data/pokemon/form_change_tables.h # src/data/pokemon/form_species_table_pointers.h # src/data/pokemon_graphics/back_pic_coordinates.h # src/data/pokemon_graphics/front_pic_coordinates.h