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/SafariZoneEast.asm | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) (limited to 'scripts/SafariZoneEast.asm') diff --git a/scripts/SafariZoneEast.asm b/scripts/SafariZoneEast.asm index 062eeab1..6cb045d3 100644 --- a/scripts/SafariZoneEast.asm +++ b/scripts/SafariZoneEast.asm @@ -2,22 +2,23 @@ SafariZoneEast_Script: jp EnableAutoTextBoxDrawing SafariZoneEast_TextPointers: - dw PickUpItemText - dw PickUpItemText - dw PickUpItemText - dw PickUpItemText - dw SafariZoneEastText5 - dw SafariZoneEastText6 - dw SafariZoneEastText7 + def_text_pointers + dw_const PickUpItemText, TEXT_SAFARIZONEEAST_FULL_RESTORE + dw_const PickUpItemText, TEXT_SAFARIZONEEAST_MAX_RESTORE + dw_const PickUpItemText, TEXT_SAFARIZONEEAST_CARBOS + dw_const PickUpItemText, TEXT_SAFARIZONEEAST_TM_EGG_BOMB + dw_const SafariZoneEastRestHouseSignText, TEXT_SAFARIZONEEAST_REST_HOUSE_SIGN + dw_const SafariZoneEastTrainerTipsText, TEXT_SAFARIZONEEAST_TRAINER_TIPS + dw_const SafariZoneEastSignText, TEXT_SAFARIZONEEAST_SIGN -SafariZoneEastText5: - text_far _SafariZoneEastText5 +SafariZoneEastRestHouseSignText: + text_far _SafariZoneEastRestHouseSignText text_end -SafariZoneEastText6: - text_far _SafariZoneEastText6 +SafariZoneEastTrainerTipsText: + text_far _SafariZoneEastTrainerTipsText text_end -SafariZoneEastText7: - text_far _SafariZoneEastText7 +SafariZoneEastSignText: + text_far _SafariZoneEastSignText text_end -- cgit v1.3.1-sl0p