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/PokemonMansion2F.asm | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'data/maps/objects/PokemonMansion2F.asm') diff --git a/data/maps/objects/PokemonMansion2F.asm b/data/maps/objects/PokemonMansion2F.asm index 52b65885..a4b71d2c 100644 --- a/data/maps/objects/PokemonMansion2F.asm +++ b/data/maps/objects/PokemonMansion2F.asm @@ -1,3 +1,9 @@ + object_const_def + const POKEMONMANSION2F_SUPER_NERD + const POKEMONMANSION2F_CALCIUM + const POKEMONMANSION2F_DIARY1 + const POKEMONMANSION2F_DIARY2 + PokemonMansion2F_Object: db $1 ; border block @@ -10,9 +16,9 @@ PokemonMansion2F_Object: def_bg_events def_object_events - object_event 3, 17, SPRITE_SUPER_NERD, WALK, LEFT_RIGHT, 1, OPP_BURGLAR, 7 - object_event 28, 7, SPRITE_POKE_BALL, STAY, NONE, 2, CALCIUM - object_event 18, 2, SPRITE_POKEDEX, STAY, NONE, 3 ; person - object_event 3, 22, SPRITE_POKEDEX, STAY, NONE, 4 ; person + object_event 3, 17, SPRITE_SUPER_NERD, WALK, LEFT_RIGHT, TEXT_POKEMONMANSION2F_SUPER_NERD, OPP_BURGLAR, 7 + object_event 28, 7, SPRITE_POKE_BALL, STAY, NONE, TEXT_POKEMONMANSION2F_CALCIUM, CALCIUM + object_event 18, 2, SPRITE_POKEDEX, STAY, NONE, TEXT_POKEMONMANSION2F_DIARY1 + object_event 3, 22, SPRITE_POKEDEX, STAY, NONE, TEXT_POKEMONMANSION2F_DIARY2 def_warps_to POKEMON_MANSION_2F -- cgit v1.3.1-sl0p