diff options
| author | dannye <33dannye@gmail.com> | 2023-11-20 00:33:27 -0600 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2023-11-20 20:23:27 -0600 |
| commit | 298e99d3776580585c3f434e5d93137ae431bdd3 (patch) | |
| tree | a808c4ffd0fd0f9bd28972bae5236e0d3345c8e5 /data/maps/objects/ViridianForest.asm | |
| parent | Add sound bits documentation for wOptions (#110) (diff) | |
| parent | Name 2 unnamed labels I missed in SeafoamIslandsB4F and PokemonMansion3F (#437) (diff) | |
| download | pokeyellow-298e99d3776580585c3f434e5d93137ae431bdd3.tar.gz pokeyellow-298e99d3776580585c3f434e5d93137ae431bdd3.tar.xz pokeyellow-298e99d3776580585c3f434e5d93137ae431bdd3.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 | 44 |
1 files changed, 28 insertions, 16 deletions
diff --git a/data/maps/objects/ViridianForest.asm b/data/maps/objects/ViridianForest.asm index 037c4f7e..4fb016e1 100644 --- a/data/maps/objects/ViridianForest.asm +++ b/data/maps/objects/ViridianForest.asm @@ -1,3 +1,15 @@ + object_const_def + const_export VIRIDIANFOREST_YOUNGSTER1 + const_export VIRIDIANFOREST_YOUNGSTER2 + const_export VIRIDIANFOREST_YOUNGSTER3 + const_export VIRIDIANFOREST_YOUNGSTER4 + const_export VIRIDIANFOREST_COOLTRAINER_F + const_export VIRIDIANFOREST_YOUNGSTER5 + const_export VIRIDIANFOREST_POTION1 + const_export VIRIDIANFOREST_POTION2 + const_export VIRIDIANFOREST_POKE_BALL + const_export VIRIDIANFOREST_YOUNGSTER6 + ViridianForest_Object: db $3 ; border block @@ -10,23 +22,23 @@ ViridianForest_Object: warp_event 18, 47, VIRIDIAN_FOREST_SOUTH_GATE, 2 def_bg_events - 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 + bg_event 24, 40, TEXT_VIRIDIANFOREST_TRAINER_TIPS1 + bg_event 16, 32, TEXT_VIRIDIANFOREST_USE_ANTIDOTE_SIGN + bg_event 26, 17, TEXT_VIRIDIANFOREST_TRAINER_TIPS2 + bg_event 4, 24, TEXT_VIRIDIANFOREST_TRAINER_TIPS3 + bg_event 18, 45, TEXT_VIRIDIANFOREST_TRAINER_TIPS4 + bg_event 2, 1, TEXT_VIRIDIANFOREST_LEAVING_SIGN 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 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 + object_event 16, 43, SPRITE_YOUNGSTER, STAY, NONE, TEXT_VIRIDIANFOREST_YOUNGSTER1 + object_event 30, 33, SPRITE_YOUNGSTER, STAY, LEFT, TEXT_VIRIDIANFOREST_YOUNGSTER2, OPP_BUG_CATCHER, 1 + object_event 30, 19, SPRITE_YOUNGSTER, STAY, LEFT, TEXT_VIRIDIANFOREST_YOUNGSTER3, OPP_BUG_CATCHER, 2 + object_event 2, 18, SPRITE_YOUNGSTER, STAY, LEFT, TEXT_VIRIDIANFOREST_YOUNGSTER4, OPP_BUG_CATCHER, 3 + object_event 2, 41, SPRITE_COOLTRAINER_F, STAY, NONE, TEXT_VIRIDIANFOREST_COOLTRAINER_F, OPP_LASS, 19 + object_event 13, 17, SPRITE_YOUNGSTER, STAY, RIGHT, TEXT_VIRIDIANFOREST_YOUNGSTER5, OPP_BUG_CATCHER, 15 + object_event 25, 11, SPRITE_POKE_BALL, STAY, NONE, TEXT_VIRIDIANFOREST_POTION1, POTION + object_event 12, 29, SPRITE_POKE_BALL, STAY, NONE, TEXT_VIRIDIANFOREST_POTION2, POTION + object_event 1, 31, SPRITE_POKE_BALL, STAY, NONE, TEXT_VIRIDIANFOREST_POKE_BALL, POKE_BALL + object_event 27, 40, SPRITE_YOUNGSTER, STAY, NONE, TEXT_VIRIDIANFOREST_YOUNGSTER6 def_warps_to VIRIDIAN_FOREST |