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/PewterNidoranHouse.asm | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'scripts/PewterNidoranHouse.asm') diff --git a/scripts/PewterNidoranHouse.asm b/scripts/PewterNidoranHouse.asm index 93d430c0..bd2de197 100644 --- a/scripts/PewterNidoranHouse.asm +++ b/scripts/PewterNidoranHouse.asm @@ -2,22 +2,23 @@ PewterNidoranHouse_Script: jp EnableAutoTextBoxDrawing PewterNidoranHouse_TextPointers: - dw PewterHouse1Text1 - dw PewterHouse1Text2 - dw PewterHouse1Text3 + def_text_pointers + dw_const PewterNidoranHouseNidoranText, TEXT_PEWTERNIDORANHOUSE_NIDORAN + dw_const PewterNidoranHouseLittleBoyText, TEXT_PEWTERNIDORANHOUSE_LITTLE_BOY + dw_const PewterNidoranHouseMiddleAgedManText, TEXT_PEWTERNIDORANHOUSE_MIDDLE_AGED_MAN -PewterHouse1Text1: - text_far _PewterHouse1Text1 +PewterNidoranHouseNidoranText: + text_far _PewterNidoranHouseNidoranText text_asm ld a, NIDORAN_M call PlayCry call WaitForSoundToFinish jp TextScriptEnd -PewterHouse1Text2: - text_far _PewterHouse1Text2 +PewterNidoranHouseLittleBoyText: + text_far _PewterNidoranHouseLittleBoyText text_end -PewterHouse1Text3: - text_far _PewterHouse1Text3 +PewterNidoranHouseMiddleAgedManText: + text_far _PewterNidoranHouseMiddleAgedManText text_end -- cgit v1.3.1-sl0p