aboutsummaryrefslogtreecommitdiffstats
path: root/data/maps/objects/Route16Gate2F.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/Route16Gate2F.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/Route16Gate2F.asm')
-rw-r--r--data/maps/objects/Route16Gate2F.asm12
1 files changed, 8 insertions, 4 deletions
diff --git a/data/maps/objects/Route16Gate2F.asm b/data/maps/objects/Route16Gate2F.asm
index f687fab0..421b5caa 100644
--- a/data/maps/objects/Route16Gate2F.asm
+++ b/data/maps/objects/Route16Gate2F.asm
@@ -1,3 +1,7 @@
+ object_const_def
+ const ROUTE16GATE2F_LITTLE_BOY
+ const ROUTE16GATE2F_LITTLE_GIRL
+
Route16Gate2F_Object:
db $a ; border block
@@ -5,11 +9,11 @@ Route16Gate2F_Object:
warp_event 7, 7, ROUTE_16_GATE_1F, 9
def_bg_events
- bg_event 1, 2, 3 ; Route16GateUpstairsText3
- bg_event 6, 2, 4 ; Route16GateUpstairsText4
+ bg_event 1, 2, TEXT_ROUTE16GATE2F_LEFT_BINOCULARS
+ bg_event 6, 2, TEXT_ROUTE16GATE2F_RIGHT_BINOCULARS
def_object_events
- object_event 4, 2, SPRITE_LITTLE_BOY, STAY, NONE, 1 ; person
- object_event 2, 5, SPRITE_LITTLE_GIRL, WALK, LEFT_RIGHT, 2 ; person
+ object_event 4, 2, SPRITE_LITTLE_BOY, STAY, NONE, TEXT_ROUTE16GATE2F_LITTLE_BOY
+ object_event 2, 5, SPRITE_LITTLE_GIRL, WALK, LEFT_RIGHT, TEXT_ROUTE16GATE2F_LITTLE_GIRL
def_warps_to ROUTE_16_GATE_2F