aboutsummaryrefslogtreecommitdiffstats
path: root/data/maps/objects/LavenderTown.asm
diff options
context:
space:
mode:
authorvulcandth <vulcandth@gmail.com>2023-07-13 20:27:56 -0500
committerGitHub <noreply@github.com>2023-07-13 21:27:56 -0400
commitd001ced41b53271373753de835a9c3b3413dc318 (patch)
treeff2db7f403bddfcdeb12e50def8411cafedcdd5e /data/maps/objects/LavenderTown.asm
parentMake wCurrentBoxNum a byte instead of word (#414) (diff)
downloadpokeyellow-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/LavenderTown.asm')
-rw-r--r--data/maps/objects/LavenderTown.asm23
1 files changed, 14 insertions, 9 deletions
diff --git a/data/maps/objects/LavenderTown.asm b/data/maps/objects/LavenderTown.asm
index e2601721..76df4c60 100644
--- a/data/maps/objects/LavenderTown.asm
+++ b/data/maps/objects/LavenderTown.asm
@@ -1,3 +1,8 @@
+ object_const_def
+ const LAVENDERTOWN_LITTLE_GIRL
+ const LAVENDERTOWN_COOLTRAINER_M
+ const LAVENDERTOWN_SUPER_NERD
+
LavenderTown_Object:
db $2c ; border block
@@ -10,16 +15,16 @@ LavenderTown_Object:
warp_event 7, 13, NAME_RATERS_HOUSE, 1
def_bg_events
- bg_event 11, 9, 4 ; LavenderTownText4
- bg_event 9, 3, 5 ; LavenderTownText5
- bg_event 16, 13, 6 ; MartSignText
- bg_event 4, 5, 7 ; PokeCenterSignText
- bg_event 5, 9, 8 ; LavenderTownText8
- bg_event 17, 7, 9 ; LavenderTownText9
+ bg_event 11, 9, TEXT_LAVENDERTOWN_SIGN
+ bg_event 9, 3, TEXT_LAVENDERTOWN_SILPH_SCOPE_SIGN
+ bg_event 16, 13, TEXT_LAVENDERTOWN_MART_SIGN
+ bg_event 4, 5, TEXT_LAVENDERTOWN_POKECENTER_SIGN
+ bg_event 5, 9, TEXT_LAVENDERTOWN_POKEMON_HOUSE_SIGN
+ bg_event 17, 7, TEXT_LAVENDERTOWN_POKEMON_TOWER_SIGN
def_object_events
- object_event 15, 9, SPRITE_LITTLE_GIRL, WALK, ANY_DIR, 1 ; person
- object_event 9, 10, SPRITE_COOLTRAINER_M, STAY, NONE, 2 ; person
- object_event 8, 7, SPRITE_SUPER_NERD, WALK, LEFT_RIGHT, 3 ; person
+ object_event 15, 9, SPRITE_LITTLE_GIRL, WALK, ANY_DIR, TEXT_LAVENDERTOWN_LITTLE_GIRL
+ object_event 9, 10, SPRITE_COOLTRAINER_M, STAY, NONE, TEXT_LAVENDERTOWN_COOLTRAINER_M
+ object_event 8, 7, SPRITE_SUPER_NERD, WALK, LEFT_RIGHT, TEXT_LAVENDERTOWN_SUPER_NERD
def_warps_to LAVENDER_TOWN