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/MtMoonPokecenter.asm | 51 ++++++++++++++++++++++---------------------- 1 file changed, 26 insertions(+), 25 deletions(-) (limited to 'scripts/MtMoonPokecenter.asm') diff --git a/scripts/MtMoonPokecenter.asm b/scripts/MtMoonPokecenter.asm index e4b881d1..da3d3bc5 100644 --- a/scripts/MtMoonPokecenter.asm +++ b/scripts/MtMoonPokecenter.asm @@ -3,29 +3,30 @@ MtMoonPokecenter_Script: jp EnableAutoTextBoxDrawing MtMoonPokecenter_TextPointers: - dw MtMoonHealNurseText - dw MtMoonPokecenterText2 - dw MtMoonPokecenterText3 - dw MagikarpSalesmanText - dw MtMoonPokecenterText5 - dw MtMoonTradeNurseText + def_text_pointers + dw_const MtMoonPokecenterNurseText, TEXT_MTMOONPOKECENTER_NURSE + dw_const MtMoonPokecenterYoungsterText, TEXT_MTMOONPOKECENTER_YOUNGSTER + dw_const MtMoonPokecenterGentlemanText, TEXT_MTMOONPOKECENTER_GENTLEMAN + dw_const MtMoonPokecenterMagikarpSalesmanText, TEXT_MTMOONPOKECENTER_MAGIKARP_SALESMAN + dw_const MtMoonPokecenterClipboardText, TEXT_MTMOONPOKECENTER_CLIPBOARD + dw_const MtMoonPokecenterLinkReceptionistText, TEXT_MTMOONPOKECENTER_LINK_RECEPTIONIST -MtMoonHealNurseText: +MtMoonPokecenterNurseText: script_pokecenter_nurse -MtMoonPokecenterText2: - text_far _MtMoonPokecenterText1 +MtMoonPokecenterYoungsterText: + text_far _MtMoonPokecenterYoungsterText text_end -MtMoonPokecenterText3: - text_far _MtMoonPokecenterText3 +MtMoonPokecenterGentlemanText: + text_far _MtMoonPokecenterGentlemanText text_end -MagikarpSalesmanText: +MtMoonPokecenterMagikarpSalesmanText: text_asm CheckEvent EVENT_BOUGHT_MAGIKARP, 1 jp c, .alreadyBoughtMagikarp - ld hl, .Text1 + ld hl, .IGotADealText call PrintText ld a, MONEY_BOX ld [wTextBoxID], a @@ -61,34 +62,34 @@ MagikarpSalesmanText: SetEvent EVENT_BOUGHT_MAGIKARP jr .done .choseNo - ld hl, .RefuseText + ld hl, .NoText jr .printText .alreadyBoughtMagikarp - ld hl, .Text2 + ld hl, .NoRefundsText .printText call PrintText .done jp TextScriptEnd -.Text1 - text_far _MagikarpSalesmanText1 +.IGotADealText + text_far _MtMoonPokecenterMagikarpSalesmanIGotADealText text_end -.RefuseText - text_far _MagikarpSalesmanNoText +.NoText + text_far _MtMoonPokecenterMagikarpSalesmanNoText text_end .NoMoneyText - text_far _MagikarpSalesmanNoMoneyText + text_far _MtMoonPokecenterMagikarpSalesmanNoMoneyText text_end -.Text2 - text_far _MagikarpSalesmanText2 +.NoRefundsText + text_far _MtMoonPokecenterMagikarpSalesmanNoRefundsText text_end -MtMoonPokecenterText5: - text_far _MtMoonPokecenterText5 +MtMoonPokecenterClipboardText: + text_far _MtMoonPokecenterClipboardText text_end -MtMoonTradeNurseText: +MtMoonPokecenterLinkReceptionistText: script_cable_club_receptionist -- cgit v1.3.1-sl0p