From d001ced41b53271373753de835a9c3b3413dc318 Mon Sep 17 00:00:00 2001 From: vulcandth Date: Thu, 13 Jul 2023 20:27:56 -0500 Subject: 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. --- scripts/Route18Gate2F.asm | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) (limited to 'scripts/Route18Gate2F.asm') diff --git a/scripts/Route18Gate2F.asm b/scripts/Route18Gate2F.asm index efb6d70a..0300966e 100644 --- a/scripts/Route18Gate2F.asm +++ b/scripts/Route18Gate2F.asm @@ -2,31 +2,32 @@ Route18Gate2F_Script: jp DisableAutoTextBoxDrawing Route18Gate2F_TextPointers: - dw Route18GateUpstairsText1 - dw Route18GateUpstairsText2 - dw Route18GateUpstairsText3 + def_text_pointers + dw_const Route18Gate2FYoungsterText, TEXT_ROUTE18GATE2F_YOUNGSTER + dw_const Route18Gate2FLeftBinocularsText, TEXT_ROUTE18GATE2F_LEFT_BINOCULARS + dw_const Route18Gate2FRightBinocularsText, TEXT_ROUTE18GATE2F_RIGHT_BINOCULARS -Route18GateUpstairsText1: +Route18Gate2FYoungsterText: text_asm ld a, TRADE_FOR_MARC ld [wWhichTrade], a predef DoInGameTradeDialogue jp TextScriptEnd -Route18GateUpstairsText2: +Route18Gate2FLeftBinocularsText: text_asm - ld hl, Route18GateUpstairsText_49993 + ld hl, .Text jp GateUpstairsScript_PrintIfFacingUp -Route18GateUpstairsText_49993: - text_far _Route18GateUpstairsText_49993 +.Text: + text_far _Route18Gate2FLeftBinocularsText text_end -Route18GateUpstairsText3: +Route18Gate2FRightBinocularsText: text_asm - ld hl, Route18GateUpstairsText_4999f + ld hl, .Text jp GateUpstairsScript_PrintIfFacingUp -Route18GateUpstairsText_4999f: - text_far _Route18GateUpstairsText_4999f +.Text: + text_far _Route18Gate2FRightBinocularsText text_end -- cgit v1.3.1-sl0p