diff options
| author | vulcandth <vulcandth@gmail.com> | 2023-07-13 20:27:56 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-13 21:27:56 -0400 |
| commit | d001ced41b53271373753de835a9c3b3413dc318 (patch) | |
| tree | ff2db7f403bddfcdeb12e50def8411cafedcdd5e /data/maps/objects/ViridianForest.asm | |
| parent | Make wCurrentBoxNum a byte instead of word (#414) (diff) | |
| download | pokeyellow-d001ced41b53271373753de835a9c3b3413dc318.tar.gz pokeyellow-d001ced41b53271373753de835a9c3b3413dc318.tar.xz pokeyellow-d001ced41b53271373753de835a9c3b3413dc318.zip | |
Add macros, constants, and labels for map scripts and text (#367)
This introduces `def_script_pointers`, `def_text_pointers`, and `object_const_def` macros, and applies them to all maps. Most other map labels have also been identified.
Diffstat (limited to 'data/maps/objects/ViridianForest.asm')
| -rw-r--r-- | data/maps/objects/ViridianForest.asm | 38 |
1 files changed, 24 insertions, 14 deletions
diff --git a/data/maps/objects/ViridianForest.asm b/data/maps/objects/ViridianForest.asm index 7a0a644c..ca3fc30b 100644 --- a/data/maps/objects/ViridianForest.asm +++ b/data/maps/objects/ViridianForest.asm @@ -1,3 +1,13 @@ + object_const_def + const VIRIDIANFOREST_YOUNGSTER1 + const VIRIDIANFOREST_YOUNGSTER2 + const VIRIDIANFOREST_YOUNGSTER3 + const VIRIDIANFOREST_YOUNGSTER4 + const VIRIDIANFOREST_ANTIDOTE + const VIRIDIANFOREST_POTION + const VIRIDIANFOREST_POKE_BALL + const VIRIDIANFOREST_YOUNGSTER5 + ViridianForest_Object: db $3 ; border block @@ -10,21 +20,21 @@ ViridianForest_Object: warp_event 18, 47, VIRIDIAN_FOREST_SOUTH_GATE, 2 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, 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 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 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 25, 11, SPRITE_POKE_BALL, STAY, NONE, TEXT_VIRIDIANFOREST_ANTIDOTE, ANTIDOTE + object_event 12, 29, SPRITE_POKE_BALL, STAY, NONE, TEXT_VIRIDIANFOREST_POTION, 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_YOUNGSTER5 def_warps_to VIRIDIAN_FOREST |