diff options
| author | dannye <33dannye@gmail.com> | 2021-09-26 22:56:02 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2021-09-26 22:56:02 -0500 |
| commit | 94ed208164c3f6484a26923c5bc7664b9a3c4002 (patch) | |
| tree | e6141c9f312ae0edf4b4741a729b03fea1ddebf5 /data/maps/objects/Route24.asm | |
| parent | Merge branch 'master' of https://github.com/pret/pokered (diff) | |
| parent | Align `object_event` coordinates (diff) | |
| download | pokeyellow-94ed208164c3f6484a26923c5bc7664b9a3c4002.tar.gz pokeyellow-94ed208164c3f6484a26923c5bc7664b9a3c4002.tar.xz pokeyellow-94ed208164c3f6484a26923c5bc7664b9a3c4002.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'data/maps/objects/Route24.asm')
| -rw-r--r-- | data/maps/objects/Route24.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/data/maps/objects/Route24.asm b/data/maps/objects/Route24.asm index 237c499e..050b7060 100644 --- a/data/maps/objects/Route24.asm +++ b/data/maps/objects/Route24.asm @@ -7,13 +7,13 @@ Route24_Object: def_object_events object_event 11, 15, SPRITE_COOLTRAINER_M, STAY, LEFT, 1, OPP_ROCKET, 6 - object_event 5, 20, SPRITE_COOLTRAINER_M, STAY, UP, 2, OPP_JR_TRAINER_M, 2 + object_event 5, 20, SPRITE_COOLTRAINER_M, STAY, UP, 2, OPP_JR_TRAINER_M, 2 object_event 11, 19, SPRITE_COOLTRAINER_M, STAY, LEFT, 3, OPP_JR_TRAINER_M, 3 object_event 10, 22, SPRITE_COOLTRAINER_F, STAY, RIGHT, 4, OPP_LASS, 7 object_event 11, 25, SPRITE_YOUNGSTER, STAY, LEFT, 5, OPP_YOUNGSTER, 4 object_event 10, 28, SPRITE_COOLTRAINER_F, STAY, RIGHT, 6, OPP_LASS, 8 object_event 11, 31, SPRITE_YOUNGSTER, STAY, LEFT, 7, OPP_BUG_CATCHER, 9 - object_event 10, 5, SPRITE_POKE_BALL, STAY, NONE, 8, TM_THUNDER_WAVE - object_event 6, 5, SPRITE_COOLTRAINER_M, STAY, DOWN, 9 + object_event 10, 5, SPRITE_POKE_BALL, STAY, NONE, 8, TM_THUNDER_WAVE + object_event 6, 5, SPRITE_COOLTRAINER_M, STAY, DOWN, 9 def_warps_to ROUTE_24 |