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/CeladonMart2F.asm | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'data/maps/objects/CeladonMart2F.asm') diff --git a/data/maps/objects/CeladonMart2F.asm b/data/maps/objects/CeladonMart2F.asm index 9eaa1605..52052383 100644 --- a/data/maps/objects/CeladonMart2F.asm +++ b/data/maps/objects/CeladonMart2F.asm @@ -1,3 +1,9 @@ + object_const_def + const CELADONMART2F_CLERK1 + const CELADONMART2F_CLERK2 + const CELADONMART2F_MIDDLE_AGED_MAN + const CELADONMART2F_GIRL + CeladonMart2F_Object: db $f ; border block @@ -7,12 +13,12 @@ CeladonMart2F_Object: warp_event 1, 1, CELADON_MART_ELEVATOR, 1 def_bg_events - bg_event 14, 1, 5 ; CeladonMart2Text5 + bg_event 14, 1, TEXT_CELADONMART2F_CURRENT_FLOOR_SIGN def_object_events - object_event 5, 3, SPRITE_CLERK, STAY, DOWN, 1 ; person - object_event 6, 3, SPRITE_CLERK, STAY, DOWN, 2 ; person - object_event 19, 5, SPRITE_MIDDLE_AGED_MAN, STAY, NONE, 3 ; person - object_event 14, 4, SPRITE_GIRL, WALK, UP_DOWN, 4 ; person + object_event 5, 3, SPRITE_CLERK, STAY, DOWN, TEXT_CELADONMART2F_CLERK1 + object_event 6, 3, SPRITE_CLERK, STAY, DOWN, TEXT_CELADONMART2F_CLERK2 + object_event 19, 5, SPRITE_MIDDLE_AGED_MAN, STAY, NONE, TEXT_CELADONMART2F_MIDDLE_AGED_MAN + object_event 14, 4, SPRITE_GIRL, WALK, UP_DOWN, TEXT_CELADONMART2F_GIRL def_warps_to CELADON_MART_2F -- cgit v1.3.1-sl0p