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/ViridianForest.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/ViridianForest.asm')
| -rw-r--r-- | data/maps/objects/ViridianForest.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/data/maps/objects/ViridianForest.asm b/data/maps/objects/ViridianForest.asm index 55e7ee5a..09392f17 100644 --- a/data/maps/objects/ViridianForest.asm +++ b/data/maps/objects/ViridianForest.asm @@ -21,12 +21,12 @@ ViridianForest_Object: object_event 16, 43, SPRITE_YOUNGSTER, STAY, NONE, 1 ; person object_event 30, 33, SPRITE_YOUNGSTER, STAY, LEFT, 2, OPP_BUG_CATCHER, 1 object_event 30, 19, SPRITE_YOUNGSTER, STAY, LEFT, 3, OPP_BUG_CATCHER, 2 - object_event 2, 18, SPRITE_YOUNGSTER, STAY, LEFT, 4, OPP_BUG_CATCHER, 3 - object_event 2, 41, SPRITE_COOLTRAINER_F, STAY, NONE, 5, OPP_LASS, 19 + object_event 2, 18, SPRITE_YOUNGSTER, STAY, LEFT, 4, OPP_BUG_CATCHER, 3 + object_event 2, 41, SPRITE_COOLTRAINER_F, STAY, NONE, 5, OPP_LASS, 19 object_event 13, 17, SPRITE_YOUNGSTER, STAY, RIGHT, 6, OPP_BUG_CATCHER, 15 object_event 25, 11, SPRITE_POKE_BALL, STAY, NONE, 7, POTION object_event 12, 29, SPRITE_POKE_BALL, STAY, NONE, 8, POTION - object_event 1, 31, SPRITE_POKE_BALL, STAY, NONE, 9, POKE_BALL + object_event 1, 31, SPRITE_POKE_BALL, STAY, NONE, 9, POKE_BALL object_event 27, 40, SPRITE_YOUNGSTER, STAY, NONE, 10 ; person def_warps_to VIRIDIAN_FOREST |