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/Museum1F.asm | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'data/maps/objects/Museum1F.asm') diff --git a/data/maps/objects/Museum1F.asm b/data/maps/objects/Museum1F.asm index edbe63c9..d33151a6 100644 --- a/data/maps/objects/Museum1F.asm +++ b/data/maps/objects/Museum1F.asm @@ -1,3 +1,10 @@ + object_const_def + const MUSEUM1F_SCIENTIST1 + const MUSEUM1F_GAMBLER + const MUSEUM1F_SCIENTIST2 + const MUSEUM1F_SCIENTIST3 + const MUSEUM1F_OLD_AMBER + Museum1F_Object: db $a ; border block @@ -11,10 +18,10 @@ Museum1F_Object: def_bg_events def_object_events - object_event 12, 4, SPRITE_SCIENTIST, STAY, LEFT, 1 ; person - object_event 1, 4, SPRITE_GAMBLER, STAY, NONE, 2 ; person - object_event 15, 2, SPRITE_SCIENTIST, STAY, DOWN, 3 ; person - object_event 17, 4, SPRITE_SCIENTIST, STAY, NONE, 4 ; person - object_event 16, 2, SPRITE_OLD_AMBER, STAY, NONE, 5 ; person + object_event 12, 4, SPRITE_SCIENTIST, STAY, LEFT, TEXT_MUSEUM1F_SCIENTIST1 + object_event 1, 4, SPRITE_GAMBLER, STAY, NONE, TEXT_MUSEUM1F_GAMBLER + object_event 15, 2, SPRITE_SCIENTIST, STAY, DOWN, TEXT_MUSEUM1F_SCIENTIST2 + object_event 17, 4, SPRITE_SCIENTIST, STAY, NONE, TEXT_MUSEUM1F_SCIENTIST3 + object_event 16, 2, SPRITE_OLD_AMBER, STAY, NONE, TEXT_MUSEUM1F_OLD_AMBER def_warps_to MUSEUM_1F -- cgit v1.3.1-sl0p