mirror of
https://github.com/pret/pokeemerald.git
synced 2026-09-15 14:38:36 -05:00
# Conflicts: # include/event_object_movement.h # src/data.c # src/data/graphics/pokemon.h # src/data/pokemon/species_info/gen_4_families.h
# Conflicts: # include/event_object_movement.h # src/data.c # src/data/graphics/pokemon.h # src/data/pokemon/species_info/gen_4_families.h