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/SSAnneKitchen.asm | 65 ++++++++++++++++++++++++----------------------- 1 file changed, 33 insertions(+), 32 deletions(-) (limited to 'scripts/SSAnneKitchen.asm') diff --git a/scripts/SSAnneKitchen.asm b/scripts/SSAnneKitchen.asm index 30a9830f..4062199c 100644 --- a/scripts/SSAnneKitchen.asm +++ b/scripts/SSAnneKitchen.asm @@ -3,70 +3,71 @@ SSAnneKitchen_Script: ret SSAnneKitchen_TextPointers: - dw SSAnne6Text1 - dw SSAnne6Text2 - dw SSAnne6Text3 - dw SSAnne6Text4 - dw SSAnne6Text5 - dw SSAnne6Text6 - dw SSAnne6Text7 + def_text_pointers + dw_const SSAnneKitchenCook1Text, TEXT_SSANNEKITCHEN_COOK1 + dw_const SSAnneKitchenCook2Text, TEXT_SSANNEKITCHEN_COOK2 + dw_const SSAnneKitchenCook3Text, TEXT_SSANNEKITCHEN_COOK3 + dw_const SSAnneKitchenCook4Text, TEXT_SSANNEKITCHEN_COOK4 + dw_const SSAnneKitchenCook5Text, TEXT_SSANNEKITCHEN_COOK5 + dw_const SSAnneKitchenCook6Text, TEXT_SSANNEKITCHEN_COOK6 + dw_const SSAnneKitchenCook7Text, TEXT_SSANNEKITCHEN_COOK7 -SSAnne6Text1: - text_far _SSAnne6Text1 +SSAnneKitchenCook1Text: + text_far _SSAnneKitchenCook1Text text_end -SSAnne6Text2: - text_far _SSAnne6Text2 +SSAnneKitchenCook2Text: + text_far _SSAnneKitchenCook2Text text_end -SSAnne6Text3: - text_far _SSAnne6Text3 +SSAnneKitchenCook3Text: + text_far _SSAnneKitchenCook3Text text_end -SSAnne6Text4: - text_far _SSAnne6Text4 +SSAnneKitchenCook4Text: + text_far _SSAnneKitchenCook4Text text_end -SSAnne6Text5: - text_far _SSAnne6Text5 +SSAnneKitchenCook5Text: + text_far _SSAnneKitchenCook5Text text_end -SSAnne6Text6: - text_far _SSAnne6Text6 +SSAnneKitchenCook6Text: + text_far _SSAnneKitchenCook6Text text_end -SSAnne6Text7: +SSAnneKitchenCook7Text: text_asm - ld hl, SSAnne6Text_61807 + ld hl, .MainCourseIsText call PrintText ldh a, [hRandomAdd] bit 7, a jr z, .not_dialog_1 - ld hl, SSAnne6Text_6180c + ld hl, .SalmonDuSaladText jr .done .not_dialog_1 bit 4, a jr z, .not_dialog_2 - ld hl, SSAnne6Text_61811 + ld hl, .EelsAuBarbecueText jr .done .not_dialog_2 - ld hl, SSAnne6Text_61816 + ld hl, .PrimeBeefSteakText .done call PrintText jp TextScriptEnd -SSAnne6Text_61807: - text_far _SSAnne6Text_61807 +.MainCourseIsText: + text_far _SSAnneKitchenCook7MainCourseIsText text_end -SSAnne6Text_6180c: - text_far _SSAnne6Text_6180c +.SalmonDuSaladText: + text_far SSAnneKitchenCook7SalmonDuSaladText text_end -SSAnne6Text_61811: - text_far _SSAnne6Text_61811 +.EelsAuBarbecueText: + text_far SSAnneKitchenCook7EelsAuBarbecueText text_end -SSAnne6Text_61816: - text_far _SSAnne6Text_61816 +.PrimeBeefSteakText: + text_far SSAnneKitchenCook7PrimeBeefSteakText text_end -- cgit v1.3.1-sl0p