mirror of
https://github.com/rh-hideout/pokeemerald-expansion.git
synced 2026-03-21 18:04:50 -05:00
Conflicts: data/maps/BirthIsland_Exterior/scripts.inc data/maps/DesertUnderpass/scripts.inc data/maps/Route117/scripts.inc data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc data/maps/SootopolisCity/scripts.inc include/constants/event_objects.h src/battle_setup.c src/event_object_movement.c src/field_control_avatar.c src/item_use.c src/scrcmd.c tools/mapjson/mapjson.cpp |
||
|---|---|---|
| .. | ||
| map.json | ||
| scripts.inc | ||