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/LavenderMart.asm | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'scripts/LavenderMart.asm') diff --git a/scripts/LavenderMart.asm b/scripts/LavenderMart.asm index 2b67aaa6..15da1bfc 100644 --- a/scripts/LavenderMart.asm +++ b/scripts/LavenderMart.asm @@ -2,15 +2,16 @@ LavenderMart_Script: jp EnableAutoTextBoxDrawing LavenderMart_TextPointers: - dw LavenderCashierText - dw LavenderMartText2 - dw LavenderMartText3 + def_text_pointers + dw_const LavenderMartClerkText, TEXT_LAVENDERMART_CLERK + dw_const LavenderMartBaldingGuyText, TEXT_LAVENDERMART_BALDING_GUY + dw_const LavenderMartCooltrainerMText, TEXT_LAVENDERMART_COOLTRAINER_M -LavenderMartText2: - text_far _LavenderMartText2 +LavenderMartBaldingGuyText: + text_far _LavenderMartBaldingGuyText text_end -LavenderMartText3: +LavenderMartCooltrainerMText: text_asm CheckEvent EVENT_RESCUED_MR_FUJI jr nz, .Nugget @@ -24,9 +25,9 @@ LavenderMartText3: jp TextScriptEnd .ReviveText - text_far _LavenderMartReviveText + text_far _LavenderMartCooltrainerMReviveText text_end .NuggetText - text_far _LavenderMartNuggetText + text_far _LavenderMartCooltrainerMNuggetText text_end -- cgit v1.3.1-sl0p