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/Route18.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/Route18.asm')
| -rw-r--r-- | maps/Route18.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/maps/Route18.asm b/maps/Route18.asm index 75ce7ca65..04a0cc843 100644 --- a/maps/Route18.asm +++ b/maps/Route18.asm @@ -83,17 +83,17 @@ Route18_MapEventHeader: .Warps: db 2 - warp_def $6, $2, 3, ROUTE_17_18_GATE - warp_def $7, $2, 4, ROUTE_17_18_GATE + warp_def 2, 6, 3, ROUTE_17_18_GATE + warp_def 2, 7, 4, ROUTE_17_18_GATE .CoordEvents: db 0 .BGEvents: db 1 - bg_event 5, 9, BGEVENT_READ, Route18Sign + bg_event 9, 5, BGEVENT_READ, Route18Sign .ObjectEvents: db 2 - object_event SPRITE_YOUNGSTER, 12, 9, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperBoris, -1 - object_event SPRITE_YOUNGSTER, 6, 13, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperBob, -1 + object_event 9, 12, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperBoris, -1 + object_event 13, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperBob, -1 |