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/PokemonTower7F.asm | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'data/maps/objects/PokemonTower7F.asm') diff --git a/data/maps/objects/PokemonTower7F.asm b/data/maps/objects/PokemonTower7F.asm index 328588ed..9f72f3ed 100644 --- a/data/maps/objects/PokemonTower7F.asm +++ b/data/maps/objects/PokemonTower7F.asm @@ -1,3 +1,9 @@ + object_const_def + const POKEMONTOWER7F_ROCKET1 + const POKEMONTOWER7F_ROCKET2 + const POKEMONTOWER7F_ROCKET3 + const POKEMONTOWER7F_MR_FUJI + PokemonTower7F_Object: db $1 ; border block @@ -7,9 +13,9 @@ PokemonTower7F_Object: def_bg_events def_object_events - object_event 9, 11, SPRITE_ROCKET, STAY, RIGHT, 1, OPP_ROCKET, 19 - object_event 12, 9, SPRITE_ROCKET, STAY, LEFT, 2, OPP_ROCKET, 20 - object_event 9, 7, SPRITE_ROCKET, STAY, RIGHT, 3, OPP_ROCKET, 21 - object_event 10, 3, SPRITE_MR_FUJI, STAY, DOWN, 4 ; person + object_event 9, 11, SPRITE_ROCKET, STAY, RIGHT, TEXT_POKEMONTOWER7F_ROCKET1, OPP_ROCKET, 19 + object_event 12, 9, SPRITE_ROCKET, STAY, LEFT, TEXT_POKEMONTOWER7F_ROCKET2, OPP_ROCKET, 20 + object_event 9, 7, SPRITE_ROCKET, STAY, RIGHT, TEXT_POKEMONTOWER7F_ROCKET3, OPP_ROCKET, 21 + object_event 10, 3, SPRITE_MR_FUJI, STAY, DOWN, TEXT_POKEMONTOWER7F_MR_FUJI def_warps_to POKEMON_TOWER_7F -- cgit v1.3.1-sl0p