diff options
Diffstat (limited to 'data/maps/objects/ViridianForest.asm')
| -rw-r--r-- | data/maps/objects/ViridianForest.asm | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/data/maps/objects/ViridianForest.asm b/data/maps/objects/ViridianForest.asm index 87a93800..55e7ee5a 100644 --- a/data/maps/objects/ViridianForest.asm +++ b/data/maps/objects/ViridianForest.asm @@ -3,28 +3,30 @@ ViridianForest_Object: def_warp_events warp_event 1, 0, VIRIDIAN_FOREST_NORTH_GATE, 2 - warp_event 2, 0, VIRIDIAN_FOREST_NORTH_GATE, 3 + warp_event 2, 0, VIRIDIAN_FOREST_NORTH_GATE, 2 warp_event 15, 47, VIRIDIAN_FOREST_SOUTH_GATE, 1 warp_event 16, 47, VIRIDIAN_FOREST_SOUTH_GATE, 1 warp_event 17, 47, VIRIDIAN_FOREST_SOUTH_GATE, 1 warp_event 18, 47, VIRIDIAN_FOREST_SOUTH_GATE, 1 def_bg_events - bg_event 24, 40, 9 ; ViridianForestText9 - bg_event 16, 32, 10 ; ViridianForestText10 - bg_event 26, 17, 11 ; ViridianForestText11 - bg_event 4, 24, 12 ; ViridianForestText12 - bg_event 18, 45, 13 ; ViridianForestText13 - bg_event 2, 1, 14 ; ViridianForestText14 + bg_event 24, 40, 11 ; ViridianForestText9 + bg_event 16, 32, 12 ; ViridianForestText10 + bg_event 26, 17, 13 ; ViridianForestText11 + bg_event 4, 24, 14 ; ViridianForestText12 + bg_event 18, 45, 15 ; ViridianForestText13 + bg_event 2, 1, 16 ; ViridianForestText14 def_object_events 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 25, 11, SPRITE_POKE_BALL, STAY, NONE, 5, ANTIDOTE - object_event 12, 29, SPRITE_POKE_BALL, STAY, NONE, 6, POTION - object_event 1, 31, SPRITE_POKE_BALL, STAY, NONE, 7, POKE_BALL - object_event 27, 40, SPRITE_YOUNGSTER, STAY, NONE, 8 ; person + 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 27, 40, SPRITE_YOUNGSTER, STAY, NONE, 10 ; person def_warps_to VIRIDIAN_FOREST |