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/SafariZoneNorth.asm | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) (limited to 'scripts/SafariZoneNorth.asm') diff --git a/scripts/SafariZoneNorth.asm b/scripts/SafariZoneNorth.asm index aaf39ea2..7cdec6cb 100644 --- a/scripts/SafariZoneNorth.asm +++ b/scripts/SafariZoneNorth.asm @@ -2,30 +2,31 @@ SafariZoneNorth_Script: jp EnableAutoTextBoxDrawing SafariZoneNorth_TextPointers: - dw PickUpItemText - dw PickUpItemText - dw SafariZoneNorthText3 - dw SafariZoneNorthText4 - dw SafariZoneNorthText5 - dw SafariZoneNorthText6 - dw SafariZoneNorthText7 + def_text_pointers + dw_const PickUpItemText, TEXT_SAFARIZONENORTH_PROTEIN + dw_const PickUpItemText, TEXT_SAFARIZONENORTH_TM_SKULL_BASH + dw_const SafariZoneNorthRestHouseSignText, TEXT_SAFARIZONENORTH_REST_HOUSE_SIGN + dw_const SafariZoneNorthTrainerTips1Text, TEXT_SAFARIZONENORTH_TRAINER_TIPS_1 + dw_const SafariZoneNorthSignText, TEXT_SAFARIZONENORTH_SIGN + dw_const SafariZoneNorthTrainerTips2Text, TEXT_SAFARIZONENORTH_TRAINER_TIPS_2 + dw_const SafariZoneNorthTrainerTips3Text, TEXT_SAFARIZONENORTH_TRAINER_TIPS_3 -SafariZoneNorthText3: - text_far _SafariZoneNorthText3 +SafariZoneNorthRestHouseSignText: + text_far _SafariZoneNorthRestHouseSignText text_end -SafariZoneNorthText4: - text_far _SafariZoneNorthText4 +SafariZoneNorthTrainerTips1Text: + text_far _SafariZoneNorthTrainerTips1Text text_end -SafariZoneNorthText5: - text_far _SafariZoneNorthText5 +SafariZoneNorthSignText: + text_far _SafariZoneNorthSignText text_end -SafariZoneNorthText6: - text_far _SafariZoneNorthText6 +SafariZoneNorthTrainerTips2Text: + text_far _SafariZoneNorthTrainerTips2Text text_end -SafariZoneNorthText7: - text_far _SafariZoneNorthText7 +SafariZoneNorthTrainerTips3Text: + text_far _SafariZoneNorthTrainerTips3Text text_end -- cgit v1.3.1-sl0p