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/RocketHideoutB2F.asm | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'data/maps/objects/RocketHideoutB2F.asm') diff --git a/data/maps/objects/RocketHideoutB2F.asm b/data/maps/objects/RocketHideoutB2F.asm index e118fb58..9808f58b 100644 --- a/data/maps/objects/RocketHideoutB2F.asm +++ b/data/maps/objects/RocketHideoutB2F.asm @@ -1,3 +1,10 @@ + object_const_def + const ROCKETHIDEOUTB2F_ROCKET + const ROCKETHIDEOUTB2F_MOON_STONE + const ROCKETHIDEOUTB2F_NUGGET + const ROCKETHIDEOUTB2F_TM_HORN_DRILL + const ROCKETHIDEOUTB2F_SUPER_POTION + RocketHideoutB2F_Object: db $2e ; border block @@ -11,10 +18,10 @@ RocketHideoutB2F_Object: def_bg_events def_object_events - object_event 20, 12, SPRITE_ROCKET, STAY, DOWN, 1, OPP_ROCKET, 13 - object_event 1, 11, SPRITE_POKE_BALL, STAY, NONE, 2, MOON_STONE - object_event 16, 8, SPRITE_POKE_BALL, STAY, NONE, 3, NUGGET - object_event 6, 12, SPRITE_POKE_BALL, STAY, NONE, 4, TM_HORN_DRILL - object_event 3, 21, SPRITE_POKE_BALL, STAY, NONE, 5, SUPER_POTION + object_event 20, 12, SPRITE_ROCKET, STAY, DOWN, TEXT_ROCKETHIDEOUTB2F_ROCKET, OPP_ROCKET, 13 + object_event 1, 11, SPRITE_POKE_BALL, STAY, NONE, TEXT_ROCKETHIDEOUTB2F_MOON_STONE, MOON_STONE + object_event 16, 8, SPRITE_POKE_BALL, STAY, NONE, TEXT_ROCKETHIDEOUTB2F_NUGGET, NUGGET + object_event 6, 12, SPRITE_POKE_BALL, STAY, NONE, TEXT_ROCKETHIDEOUTB2F_TM_HORN_DRILL, TM_HORN_DRILL + object_event 3, 21, SPRITE_POKE_BALL, STAY, NONE, TEXT_ROCKETHIDEOUTB2F_SUPER_POTION, SUPER_POTION def_warps_to ROCKET_HIDEOUT_B2F -- cgit v1.3.1-sl0p