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/Route31VioletGate.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/Route31VioletGate.asm')
| -rw-r--r-- | maps/Route31VioletGate.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/maps/Route31VioletGate.asm b/maps/Route31VioletGate.asm index 404a216e2..4195528ff 100644 --- a/maps/Route31VioletGate.asm +++ b/maps/Route31VioletGate.asm @@ -33,10 +33,10 @@ Route31VioletGate_MapEventHeader: .Warps: db 4 - warp_def $4, $0, 8, VIOLET_CITY - warp_def $5, $0, 9, VIOLET_CITY - warp_def $4, $9, 1, ROUTE_31 - warp_def $5, $9, 2, ROUTE_31 + warp_def 0, 4, 8, VIOLET_CITY + warp_def 0, 5, 9, VIOLET_CITY + warp_def 9, 4, 1, ROUTE_31 + warp_def 9, 5, 2, ROUTE_31 .CoordEvents: db 0 @@ -46,5 +46,5 @@ Route31VioletGate_MapEventHeader: .ObjectEvents: db 2 - object_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route31VioletGateOfficerScript, -1 - object_event SPRITE_COOLTRAINER_F, 2, 1, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route31VioletGateCooltrainerFScript, -1 + object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route31VioletGateOfficerScript, -1 + object_event 1, 2, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route31VioletGateCooltrainerFScript, -1 |