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/Route12.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/Route12.asm')
| -rw-r--r-- | data/maps/objects/Route12.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/data/maps/objects/Route12.asm b/data/maps/objects/Route12.asm index c9bb87bb..d18dc671 100644 --- a/data/maps/objects/Route12.asm +++ b/data/maps/objects/Route12.asm @@ -14,13 +14,13 @@ Route12_Object: def_object_events object_event 10, 62, SPRITE_SNORLAX, STAY, DOWN, 1 ; person object_event 14, 31, SPRITE_FISHER, STAY, LEFT, 2, OPP_FISHER, 3 - object_event 5, 39, SPRITE_FISHER, STAY, UP, 3, OPP_FISHER, 4 + object_event 5, 39, SPRITE_FISHER, STAY, UP, 3, OPP_FISHER, 4 object_event 11, 92, SPRITE_COOLTRAINER_M, STAY, LEFT, 4, OPP_JR_TRAINER_M, 9 object_event 14, 76, SPRITE_SUPER_NERD, STAY, UP, 5, OPP_ROCKER, 2 object_event 12, 40, SPRITE_FISHER, STAY, LEFT, 6, OPP_FISHER, 5 - object_event 9, 52, SPRITE_FISHER, STAY, RIGHT, 7, OPP_FISHER, 6 - object_event 6, 87, SPRITE_FISHER, STAY, DOWN, 8, OPP_FISHER, 11 + object_event 9, 52, SPRITE_FISHER, STAY, RIGHT, 7, OPP_FISHER, 6 + object_event 6, 87, SPRITE_FISHER, STAY, DOWN, 8, OPP_FISHER, 11 object_event 14, 35, SPRITE_POKE_BALL, STAY, NONE, 9, TM_PAY_DAY - object_event 5, 89, SPRITE_POKE_BALL, STAY, NONE, 10, IRON + object_event 5, 89, SPRITE_POKE_BALL, STAY, NONE, 10, IRON def_warps_to ROUTE_12 |