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/SilphCo2F.asm | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'data/maps/objects/SilphCo2F.asm') diff --git a/data/maps/objects/SilphCo2F.asm b/data/maps/objects/SilphCo2F.asm index 3ee8de9c..b618708a 100644 --- a/data/maps/objects/SilphCo2F.asm +++ b/data/maps/objects/SilphCo2F.asm @@ -1,3 +1,10 @@ + object_const_def + const SILPHCO2F_SILPH_WORKER_F + const SILPHCO2F_SCIENTIST1 + const SILPHCO2F_SCIENTIST2 + const SILPHCO2F_ROCKET1 + const SILPHCO2F_ROCKET2 + SilphCo2F_Object: db $2e ; border block @@ -13,10 +20,10 @@ SilphCo2F_Object: def_bg_events def_object_events - object_event 10, 1, SPRITE_ERIKA, STAY, UP, 1 ; person - object_event 5, 12, SPRITE_SCIENTIST, STAY, DOWN, 2, OPP_SCIENTIST, 2 - object_event 24, 13, SPRITE_SCIENTIST, STAY, LEFT, 3, OPP_SCIENTIST, 3 - object_event 16, 11, SPRITE_ROCKET, STAY, UP, 4, OPP_ROCKET, 23 - object_event 24, 7, SPRITE_ROCKET, STAY, UP, 5, OPP_ROCKET, 24 + object_event 10, 1, SPRITE_SILPH_WORKER_F, STAY, UP, TEXT_SILPHCO2F_SILPH_WORKER_F + object_event 5, 12, SPRITE_SCIENTIST, STAY, DOWN, TEXT_SILPHCO2F_SCIENTIST1, OPP_SCIENTIST, 2 + object_event 24, 13, SPRITE_SCIENTIST, STAY, LEFT, TEXT_SILPHCO2F_SCIENTIST2, OPP_SCIENTIST, 3 + object_event 16, 11, SPRITE_ROCKET, STAY, UP, TEXT_SILPHCO2F_ROCKET1, OPP_ROCKET, 23 + object_event 24, 7, SPRITE_ROCKET, STAY, UP, TEXT_SILPHCO2F_ROCKET2, OPP_ROCKET, 24 def_warps_to SILPH_CO_2F -- cgit v1.3.1-sl0p