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/LavenderCuboneHouse.asm | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) (limited to 'scripts/LavenderCuboneHouse.asm') diff --git a/scripts/LavenderCuboneHouse.asm b/scripts/LavenderCuboneHouse.asm index 69d74ede..03062007 100644 --- a/scripts/LavenderCuboneHouse.asm +++ b/scripts/LavenderCuboneHouse.asm @@ -3,33 +3,34 @@ LavenderCuboneHouse_Script: ret LavenderCuboneHouse_TextPointers: - dw LavenderHouse2Text1 - dw LavenderHouse2Text2 + def_text_pointers + dw_const LavenderCuboneHouseCuboneText, TEXT_LAVENDERCUBONEHOUSE_CUBONE + dw_const LavenderCuboneHouseBrunetteGirlText, TEXT_LAVENDERCUBONEHOUSE_BRUNETTE_GIRL -LavenderHouse2Text1: - text_far _LavenderHouse2Text1 +LavenderCuboneHouseCuboneText: + text_far _LavenderCuboneHouseCuboneText text_asm ld a, CUBONE call PlayCry jp TextScriptEnd -LavenderHouse2Text2: +LavenderCuboneHouseBrunetteGirlText: text_asm CheckEvent EVENT_RESCUED_MR_FUJI jr nz, .rescued_mr_fuji - ld hl, LavenderHouse2Text_1d9dc + ld hl, .PoorCubonesMotherText call PrintText jr .done .rescued_mr_fuji - ld hl, LavenderHouse2Text_1d9e1 + ld hl, .TheGhostIsGoneText call PrintText .done jp TextScriptEnd -LavenderHouse2Text_1d9dc: - text_far _LavenderHouse2Text_1d9dc +.PoorCubonesMotherText: + text_far _LavenderCuboneHouseBrunetteGirlPoorCubonesMotherText text_end -LavenderHouse2Text_1d9e1: - text_far _LavenderHouse2Text_1d9e1 +.TheGhostIsGoneText: + text_far _LavenderCuboneHouseBrunetteGirlGhostIsGoneText text_end -- cgit v1.3.1-sl0p