mirror of
https://github.com/pret/pokeemerald.git
synced 2026-04-20 06:07:26 -05:00
Conflicts: asm/macros/event.inc data/maps/BattleFrontier_BattlePyramidFloor/scripts.inc data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc data/scripts/trainer_hill.inc include/graphics.h |
||
|---|---|---|
| .. | ||
| map.json | ||
| scripts.inc | ||