aboutsummaryrefslogtreecommitdiffstats
path: root/data/maps/objects/Route15Gate2F.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/Route15Gate2F.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/Route15Gate2F.asm')
-rw-r--r--data/maps/objects/Route15Gate2F.asm7
1 files changed, 5 insertions, 2 deletions
diff --git a/data/maps/objects/Route15Gate2F.asm b/data/maps/objects/Route15Gate2F.asm
index 39b5c64a..b2b17285 100644
--- a/data/maps/objects/Route15Gate2F.asm
+++ b/data/maps/objects/Route15Gate2F.asm
@@ -1,3 +1,6 @@
+ object_const_def
+ const ROUTE15GATE2F_OAKS_AIDE
+
Route15Gate2F_Object:
db $a ; border block
@@ -5,9 +8,9 @@ Route15Gate2F_Object:
warp_event 7, 7, ROUTE_15_GATE_1F, 5
def_bg_events
- bg_event 6, 2, 2 ; Route15GateUpstairsText2
+ bg_event 6, 2, TEXT_ROUTE15GATE2F_BINOCULARS
def_object_events
- object_event 4, 2, SPRITE_SCIENTIST, STAY, DOWN, 1
+ object_event 4, 2, SPRITE_SCIENTIST, STAY, DOWN, TEXT_ROUTE15GATE2F_OAKS_AIDE
def_warps_to ROUTE_15_GATE_2F