diff options
author | yenatch <yenatch@gmail.com> | 2017-12-28 22:17:13 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-12-28 22:17:13 -0500 |
commit | b97a1acf3d676ca1c776e37ff4cfa48164ffc92b (patch) | |
tree | 59b5db70690a9f9041e4964adae1722b4d178a1b /maps/Route5SaffronCityGate.asm | |
parent | 82a05a1752b476caab8951fe03f539dcc1a63669 (diff) | |
parent | b9a68fec2589eb6969be63e6ed1eb3fca312c307 (diff) |
Merge pull request #445 from roukaour/master
Rename Pokémon animation files; consistent (x, y) coords; document design flaws
Diffstat (limited to 'maps/Route5SaffronCityGate.asm')
-rw-r--r-- | maps/Route5SaffronCityGate.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/maps/Route5SaffronCityGate.asm b/maps/Route5SaffronCityGate.asm index ebd84823e..e47ce7628 100644 --- a/maps/Route5SaffronCityGate.asm +++ b/maps/Route5SaffronCityGate.asm @@ -26,10 +26,10 @@ Route5SaffronCityGate_MapEventHeader: .Warps: db 4 - warp_def $0, $4, 2, ROUTE_5 - warp_def $0, $5, 3, ROUTE_5 - warp_def $7, $4, 9, SAFFRON_CITY - warp_def $7, $5, 9, SAFFRON_CITY + warp_def 4, 0, 2, ROUTE_5 + warp_def 5, 0, 3, ROUTE_5 + warp_def 4, 7, 9, SAFFRON_CITY + warp_def 5, 7, 9, SAFFRON_CITY .CoordEvents: db 0 @@ -39,4 +39,4 @@ Route5SaffronCityGate_MapEventHeader: .ObjectEvents: db 1 - object_event SPRITE_OFFICER, 4, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route5SaffronCityGateOfficerScript, -1 + object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route5SaffronCityGateOfficerScript, -1 |