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/CinnabarLabFossilRoom.asm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'data/maps/objects/CinnabarLabFossilRoom.asm') diff --git a/data/maps/objects/CinnabarLabFossilRoom.asm b/data/maps/objects/CinnabarLabFossilRoom.asm index 29a805f7..6ffe4912 100644 --- a/data/maps/objects/CinnabarLabFossilRoom.asm +++ b/data/maps/objects/CinnabarLabFossilRoom.asm @@ -1,3 +1,7 @@ + object_const_def + const CINNABARLABFOSSILROOM_SCIENTIST1 + const CINNABARLABFOSSILROOM_SCIENTIST2 + CinnabarLabFossilRoom_Object: db $17 ; border block @@ -8,7 +12,7 @@ CinnabarLabFossilRoom_Object: def_bg_events def_object_events - object_event 5, 2, SPRITE_SCIENTIST, WALK, LEFT_RIGHT, 1 ; person - object_event 7, 6, SPRITE_SCIENTIST, STAY, UP, 2 ; person + object_event 5, 2, SPRITE_SCIENTIST, WALK, LEFT_RIGHT, TEXT_CINNABARLABFOSSILROOM_SCIENTIST1 + object_event 7, 6, SPRITE_SCIENTIST, STAY, UP, TEXT_CINNABARLABFOSSILROOM_SCIENTIST2 def_warps_to CINNABAR_LAB_FOSSIL_ROOM -- cgit v1.3.1-sl0p