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/SSAnneKitchen.asm | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) (limited to 'data/maps/objects/SSAnneKitchen.asm') diff --git a/data/maps/objects/SSAnneKitchen.asm b/data/maps/objects/SSAnneKitchen.asm index c651679e..d44e9547 100644 --- a/data/maps/objects/SSAnneKitchen.asm +++ b/data/maps/objects/SSAnneKitchen.asm @@ -1,3 +1,12 @@ + object_const_def + const SSANNEKITCHEN_COOK1 + const SSANNEKITCHEN_COOK2 + const SSANNEKITCHEN_COOK3 + const SSANNEKITCHEN_COOK4 + const SSANNEKITCHEN_COOK5 + const SSANNEKITCHEN_COOK6 + const SSANNEKITCHEN_COOK7 + SSAnneKitchen_Object: db $c ; border block @@ -7,12 +16,12 @@ SSAnneKitchen_Object: def_bg_events def_object_events - object_event 1, 8, SPRITE_COOK, WALK, UP_DOWN, 1 ; person - object_event 5, 8, SPRITE_COOK, WALK, UP_DOWN, 2 ; person - object_event 9, 7, SPRITE_COOK, WALK, UP_DOWN, 3 ; person - object_event 13, 6, SPRITE_COOK, STAY, NONE, 4 ; person - object_event 13, 8, SPRITE_COOK, STAY, NONE, 5 ; person - object_event 13, 10, SPRITE_COOK, STAY, NONE, 6 ; person - object_event 11, 13, SPRITE_COOK, STAY, UP, 7 ; person + object_event 1, 8, SPRITE_COOK, WALK, UP_DOWN, TEXT_SSANNEKITCHEN_COOK1 + object_event 5, 8, SPRITE_COOK, WALK, UP_DOWN, TEXT_SSANNEKITCHEN_COOK2 + object_event 9, 7, SPRITE_COOK, WALK, UP_DOWN, TEXT_SSANNEKITCHEN_COOK3 + object_event 13, 6, SPRITE_COOK, STAY, NONE, TEXT_SSANNEKITCHEN_COOK4 + object_event 13, 8, SPRITE_COOK, STAY, NONE, TEXT_SSANNEKITCHEN_COOK5 + object_event 13, 10, SPRITE_COOK, STAY, NONE, TEXT_SSANNEKITCHEN_COOK6 + object_event 11, 13, SPRITE_COOK, STAY, UP, TEXT_SSANNEKITCHEN_COOK7 def_warps_to SS_ANNE_KITCHEN -- cgit v1.3.1-sl0p