aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/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 /scripts/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 'scripts/Route15Gate2F.asm')
-rw-r--r--scripts/Route15Gate2F.asm21
1 files changed, 11 insertions, 10 deletions
diff --git a/scripts/Route15Gate2F.asm b/scripts/Route15Gate2F.asm
index 1b85e34e..0e04367b 100644
--- a/scripts/Route15Gate2F.asm
+++ b/scripts/Route15Gate2F.asm
@@ -2,10 +2,11 @@ Route15Gate2F_Script:
jp DisableAutoTextBoxDrawing
Route15Gate2F_TextPointers:
- dw Route15GateUpstairsText1
- dw Route15GateUpstairsText2
+ def_text_pointers
+ dw_const Route15Gate2FOaksAideText, TEXT_ROUTE15GATE2F_OAKS_AIDE
+ dw_const Route15Gate2FBinocularsText, TEXT_ROUTE15GATE2F_BINOCULARS
-Route15GateUpstairsText1:
+Route15Gate2FOaksAideText:
text_asm
CheckEvent EVENT_GOT_EXP_ALL
jr nz, .got_item
@@ -25,20 +26,20 @@ Route15GateUpstairsText1:
jr nz, .no_item
SetEvent EVENT_GOT_EXP_ALL
.got_item
- ld hl, Route15GateUpstairsText_4968c
+ ld hl, .ExpAllText
call PrintText
.no_item
jp TextScriptEnd
-Route15GateUpstairsText_4968c:
- text_far _Route15GateUpstairsText_4968c
+.ExpAllText:
+ text_far _Route15Gate2FOaksAideExpAllText
text_end
-Route15GateUpstairsText2:
+Route15Gate2FBinocularsText:
text_asm
- ld hl, Route15GateUpstairsText_49698
+ ld hl, .Text
jp GateUpstairsScript_PrintIfFacingUp
-Route15GateUpstairsText_49698:
- text_far _Route15GateUpstairsText_49698
+.Text:
+ text_far _Route15Gate2FBinocularsText
text_end