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/CinnabarLabTradeRoom.asm | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'scripts/CinnabarLabTradeRoom.asm') diff --git a/scripts/CinnabarLabTradeRoom.asm b/scripts/CinnabarLabTradeRoom.asm index 1f8710be..ad40f2fe 100644 --- a/scripts/CinnabarLabTradeRoom.asm +++ b/scripts/CinnabarLabTradeRoom.asm @@ -2,24 +2,25 @@ CinnabarLabTradeRoom_Script: jp EnableAutoTextBoxDrawing CinnabarLabTradeRoom_TextPointers: - dw Lab2Text1 - dw Lab2Text2 - dw Lab2Text3 + def_text_pointers + dw_const CinnabarLabTradeRoomSuperNerdText, TEXT_CINNABARLABTRADEROOM_SUPER_NERD + dw_const CinnabarLabTradeRoomGrampsText, TEXT_CINNABARLABTRADEROOM_GRAMPS + dw_const CinnabarLabTradeRoomBeautyText, TEXT_CINNABARLABTRADEROOM_BEAUTY -Lab2Text1: - text_far _Lab2Text1 +CinnabarLabTradeRoomSuperNerdText: + text_far _CinnabarLabTradeRoomSuperNerdText text_end -Lab2Text2: +CinnabarLabTradeRoomGrampsText: text_asm ld a, TRADE_FOR_DORIS ld [wWhichTrade], a - jr Lab2DoTrade + jr CinnabarLabTradeRoomDoTrade -Lab2Text3: +CinnabarLabTradeRoomBeautyText: text_asm ld a, TRADE_FOR_CRINKLES ld [wWhichTrade], a -Lab2DoTrade: +CinnabarLabTradeRoomDoTrade: predef DoInGameTradeDialogue jp TextScriptEnd -- cgit v1.3.1-sl0p