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/ViridianNicknameHouse.asm | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) (limited to 'scripts/ViridianNicknameHouse.asm') diff --git a/scripts/ViridianNicknameHouse.asm b/scripts/ViridianNicknameHouse.asm index df7482c2..7aba0b4a 100644 --- a/scripts/ViridianNicknameHouse.asm +++ b/scripts/ViridianNicknameHouse.asm @@ -2,32 +2,33 @@ ViridianNicknameHouse_Script: jp EnableAutoTextBoxDrawing ViridianNicknameHouse_TextPointers: - dw ViridianHouseText1 - dw ViridianHouseText2 - dw ViridianHouseText3 - dw ViridianHouseText4 + def_text_pointers + dw_const ViridianNicknameHouseBaldingGuyText, TEXT_VIRIDIANNICKNAMEHOUSE_BALDING_GUY + dw_const ViridianNicknameHouseLittleGirlText, TEXT_VIRIDIANNICKNAMEHOUSE_LITTLE_GIRL + dw_const ViridianNicknameHouseSpearowText, TEXT_VIRIDIANNICKNAMEHOUSE_SPEAROW + dw_const ViridianNicknameHouseSpearySignText, TEXT_VIRIDIANNICKNAMEHOUSE_SPEARY_SIGN -ViridianHouseText1: - text_far _ViridianHouseText1 +ViridianNicknameHouseBaldingGuyText: + text_far _ViridianNicknameHouseBaldingGuyText text_end -ViridianHouseText2: - text_far _ViridianHouseText2 +ViridianNicknameHouseLittleGirlText: + text_far _ViridianNicknameHouseLittleGirlText text_end -ViridianHouseText3: +ViridianNicknameHouseSpearowText: text_asm - ld hl, ViridianHouseText_1d5b1 + ld hl, .Text call PrintText ld a, SPEAROW call PlayCry call WaitForSoundToFinish jp TextScriptEnd -ViridianHouseText_1d5b1: - text_far _ViridianHouseText_1d5b1 +.Text: + text_far _ViridianNicknameHouseSpearowText text_end -ViridianHouseText4: - text_far _ViridianHouseText4 +ViridianNicknameHouseSpearySignText: + text_far _ViridianNicknameHouseSpearySignText text_end -- cgit v1.3.1-sl0p