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. --- data/maps/objects/SaffronMart.asm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'data/maps/objects/SaffronMart.asm') diff --git a/data/maps/objects/SaffronMart.asm b/data/maps/objects/SaffronMart.asm index d9dd6881..7a2d9eb1 100644 --- a/data/maps/objects/SaffronMart.asm +++ b/data/maps/objects/SaffronMart.asm @@ -1,3 +1,8 @@ + object_const_def + const SAFFRONMART_CLERK + const SAFFRONMART_SUPER_NERD + const SAFFRONMART_COOLTRAINER_F + SaffronMart_Object: db $0 ; border block @@ -8,8 +13,8 @@ SaffronMart_Object: def_bg_events def_object_events - object_event 0, 5, SPRITE_CLERK, STAY, RIGHT, 1 ; person - object_event 4, 2, SPRITE_SUPER_NERD, STAY, NONE, 2 ; person - object_event 6, 5, SPRITE_COOLTRAINER_F, WALK, ANY_DIR, 3 ; person + object_event 0, 5, SPRITE_CLERK, STAY, RIGHT, TEXT_SAFFRONMART_CLERK + object_event 4, 2, SPRITE_SUPER_NERD, STAY, NONE, TEXT_SAFFRONMART_SUPER_NERD + object_event 6, 5, SPRITE_COOLTRAINER_F, WALK, ANY_DIR, TEXT_SAFFRONMART_COOLTRAINER_F def_warps_to SAFFRON_MART -- cgit v1.3.1-sl0p