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/Route6SaffronGate.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/Route6SaffronGate.asm')
| -rw-r--r-- | maps/Route6SaffronGate.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/maps/Route6SaffronGate.asm b/maps/Route6SaffronGate.asm index 25f234e82..713e1476e 100644 --- a/maps/Route6SaffronGate.asm +++ b/maps/Route6SaffronGate.asm @@ -63,10 +63,10 @@ Route6SaffronGate_MapEventHeader: .Warps: db 4 - warp_def $0, $4, 12, SAFFRON_CITY - warp_def $0, $5, 13, SAFFRON_CITY - warp_def $7, $4, 2, ROUTE_6 - warp_def $7, $5, 2, ROUTE_6 + warp_def 4, 0, 12, SAFFRON_CITY + warp_def 5, 0, 13, SAFFRON_CITY + warp_def 4, 7, 2, ROUTE_6 + warp_def 5, 7, 2, ROUTE_6 .CoordEvents: db 0 @@ -76,4 +76,4 @@ Route6SaffronGate_MapEventHeader: .ObjectEvents: db 1 - object_event SPRITE_OFFICER, 4, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x1926ea, -1 + object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x1926ea, -1 |