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/FuchsiaGoodRodHouse.asm | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) (limited to 'scripts/FuchsiaGoodRodHouse.asm') diff --git a/scripts/FuchsiaGoodRodHouse.asm b/scripts/FuchsiaGoodRodHouse.asm index 28f6d056..4bfd49ae 100644 --- a/scripts/FuchsiaGoodRodHouse.asm +++ b/scripts/FuchsiaGoodRodHouse.asm @@ -2,14 +2,15 @@ FuchsiaGoodRodHouse_Script: jp EnableAutoTextBoxDrawing FuchsiaGoodRodHouse_TextPointers: - dw FuchsiaHouse3Text1 + def_text_pointers + dw_const FuchsiaGoodRodHouseFishingGuruText, TEXT_FUCHSIAGOODRODHOUSE_FISHING_GURU -FuchsiaHouse3Text1: +FuchsiaGoodRodHouseFishingGuruText: text_asm ld a, [wd728] bit 4, a ; got good rod? jr nz, .got_item - ld hl, FuchsiaHouse3Text_561bd + ld hl, .Text call PrintText call YesNoChoice ld a, [wCurrentMenuItem] @@ -20,30 +21,30 @@ FuchsiaHouse3Text1: jr nc, .bag_full ld hl, wd728 set 4, [hl] ; got good rod - ld hl, FuchsiaHouse3Text_561c2 + ld hl, .ReceivedGoodRodText jr .done .bag_full - ld hl, FuchsiaHouse3Text_5621c + ld hl, .NoRoomText jr .done .refused - ld hl, FuchsiaHouse3Text_56212 + ld hl, .ThatsSoDisappointingText jr .done .got_item - ld hl, FuchsiaHouse3Text_56217 + ld hl, .HowAreTheFishText .done call PrintText jp TextScriptEnd -FuchsiaHouse3Text_561bd: - text_far _FuchsiaHouse3Text_561bd +.Text: + text_far _FuchsiaGoodRodHouseFishingGuruText text_end -FuchsiaHouse3Text_561c2: - text_far _FuchsiaHouse3Text_561c2 +.ReceivedGoodRodText: + text_far _FuchsiaGoodRodHouseFishingGuruReceivedGoodRodText sound_get_item_1 text_end -UnusedText_561c8: +.UnusedText: para "つり こそ" line "おとこの ロマン だ!" @@ -53,14 +54,14 @@ UnusedText_561c8: line "もっと いいもんが つれるんじゃ!" done -FuchsiaHouse3Text_56212: - text_far _FuchsiaHouse3Text_56212 +.ThatsSoDisappointingText: + text_far _FuchsiaGoodRodHouseFishingGuruThatsSoDisappointingText text_end -FuchsiaHouse3Text_56217: - text_far _FuchsiaHouse3Text_56217 +.HowAreTheFishText: + text_far _FuchsiaGoodRodHouseFishingGuruHowAreTheFishText text_end -FuchsiaHouse3Text_5621c: - text_far _FuchsiaHouse3Text_5621c +.NoRoomText: + text_far _FuchsiaGoodRodHouseFishingGuruNoRoomText text_end -- cgit v1.3.1-sl0p