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/Route15.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/Route15.asm')
| -rw-r--r-- | data/maps/objects/Route15.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/data/maps/objects/Route15.asm b/data/maps/objects/Route15.asm index 915db18e..bd8422b7 100644 --- a/data/maps/objects/Route15.asm +++ b/data/maps/objects/Route15.asm @@ -19,8 +19,8 @@ Route15_Object: object_event 41, 10, SPRITE_BEAUTY, STAY, RIGHT, 6, OPP_BEAUTY, 10 object_event 48, 10, SPRITE_BIKER, STAY, DOWN, 7, OPP_BIKER, 3 object_event 46, 10, SPRITE_BIKER, STAY, DOWN, 8, OPP_BIKER, 4 - object_event 37, 5, SPRITE_COOLTRAINER_F, STAY, RIGHT, 9, OPP_JR_TRAINER_F, 22 + object_event 37, 5, SPRITE_COOLTRAINER_F, STAY, RIGHT, 9, OPP_JR_TRAINER_F, 22 object_event 18, 13, SPRITE_COOLTRAINER_F, STAY, UP, 10, OPP_JR_TRAINER_F, 23 - object_event 18, 5, SPRITE_POKE_BALL, STAY, NONE, 11, TM_RAGE + object_event 18, 5, SPRITE_POKE_BALL, STAY, NONE, 11, TM_RAGE def_warps_to ROUTE_15 |