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/CinnabarLabTradeRoom.asm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'data/maps/objects/CinnabarLabTradeRoom.asm') diff --git a/data/maps/objects/CinnabarLabTradeRoom.asm b/data/maps/objects/CinnabarLabTradeRoom.asm index 11702821..69a94483 100644 --- a/data/maps/objects/CinnabarLabTradeRoom.asm +++ b/data/maps/objects/CinnabarLabTradeRoom.asm @@ -1,3 +1,8 @@ + object_const_def + const CINNABARLABTRADEROOM_SUPER_NERD + const CINNABARLABTRADEROOM_GRAMPS + const CINNABARLABTRADEROOM_BEAUTY + CinnabarLabTradeRoom_Object: db $17 ; border block @@ -8,8 +13,8 @@ CinnabarLabTradeRoom_Object: def_bg_events def_object_events - object_event 3, 2, SPRITE_SUPER_NERD, STAY, DOWN, 1 ; person - object_event 1, 4, SPRITE_GRAMPS, STAY, NONE, 2 ; person - object_event 5, 5, SPRITE_BEAUTY, STAY, UP, 3 ; person + object_event 3, 2, SPRITE_SUPER_NERD, STAY, DOWN, TEXT_CINNABARLABTRADEROOM_SUPER_NERD + object_event 1, 4, SPRITE_GRAMPS, STAY, NONE, TEXT_CINNABARLABTRADEROOM_GRAMPS + object_event 5, 5, SPRITE_BEAUTY, STAY, UP, TEXT_CINNABARLABTRADEROOM_BEAUTY def_warps_to CINNABAR_LAB_TRADE_ROOM -- cgit v1.3.1-sl0p