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/MtMoonB2F.asm | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) (limited to 'data/maps/objects/MtMoonB2F.asm') diff --git a/data/maps/objects/MtMoonB2F.asm b/data/maps/objects/MtMoonB2F.asm index 43c7db88..5f3bbf76 100644 --- a/data/maps/objects/MtMoonB2F.asm +++ b/data/maps/objects/MtMoonB2F.asm @@ -1,3 +1,14 @@ + object_const_def + const MTMOONB2F_SUPER_NERD + const MTMOONB2F_ROCKET1 + const MTMOONB2F_ROCKET2 + const MTMOONB2F_ROCKET3 + const MTMOONB2F_ROCKET4 + const MTMOONB2F_DOME_FOSSIL + const MTMOONB2F_HELIX_FOSSIL + const MTMOONB2F_HP_UP + const MTMOONB2F_TM_MEGA_PUNCH + MtMoonB2F_Object: db $3 ; border block @@ -10,14 +21,14 @@ MtMoonB2F_Object: def_bg_events def_object_events - object_event 12, 8, SPRITE_SUPER_NERD, STAY, RIGHT, 1, OPP_SUPER_NERD, 2 - object_event 11, 16, SPRITE_ROCKET, STAY, DOWN, 2, OPP_ROCKET, 1 - object_event 15, 22, SPRITE_ROCKET, STAY, DOWN, 3, OPP_ROCKET, 2 - object_event 29, 11, SPRITE_ROCKET, STAY, UP, 4, OPP_ROCKET, 3 - object_event 29, 17, SPRITE_ROCKET, STAY, LEFT, 5, OPP_ROCKET, 4 - object_event 12, 6, SPRITE_FOSSIL, STAY, NONE, 6 ; person - object_event 13, 6, SPRITE_FOSSIL, STAY, NONE, 7 ; person - object_event 25, 21, SPRITE_POKE_BALL, STAY, NONE, 8, HP_UP - object_event 29, 5, SPRITE_POKE_BALL, STAY, NONE, 9, TM_MEGA_PUNCH + object_event 12, 8, SPRITE_SUPER_NERD, STAY, RIGHT, TEXT_MTMOONB2F_SUPER_NERD, OPP_SUPER_NERD, 2 + object_event 11, 16, SPRITE_ROCKET, STAY, DOWN, TEXT_MTMOONB2F_ROCKET1, OPP_ROCKET, 1 + object_event 15, 22, SPRITE_ROCKET, STAY, DOWN, TEXT_MTMOONB2F_ROCKET2, OPP_ROCKET, 2 + object_event 29, 11, SPRITE_ROCKET, STAY, UP, TEXT_MTMOONB2F_ROCKET3, OPP_ROCKET, 3 + object_event 29, 17, SPRITE_ROCKET, STAY, LEFT, TEXT_MTMOONB2F_ROCKET4, OPP_ROCKET, 4 + object_event 12, 6, SPRITE_FOSSIL, STAY, NONE, TEXT_MTMOONB2F_DOME_FOSSIL + object_event 13, 6, SPRITE_FOSSIL, STAY, NONE, TEXT_MTMOONB2F_HELIX_FOSSIL + object_event 25, 21, SPRITE_POKE_BALL, STAY, NONE, TEXT_MTMOONB2F_HP_UP, HP_UP + object_event 29, 5, SPRITE_POKE_BALL, STAY, NONE, TEXT_MTMOONB2F_TM_MEGA_PUNCH, TM_MEGA_PUNCH def_warps_to MT_MOON_B2F -- cgit v1.3.1-sl0p