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/PokemonFanClub.asm | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) (limited to 'data/maps/objects/PokemonFanClub.asm') diff --git a/data/maps/objects/PokemonFanClub.asm b/data/maps/objects/PokemonFanClub.asm index c7d815f2..5ee899d3 100644 --- a/data/maps/objects/PokemonFanClub.asm +++ b/data/maps/objects/PokemonFanClub.asm @@ -1,3 +1,13 @@ + object_const_def + const POKEMONFANCLUB_PIKACHU_FAN + const POKEMONFANCLUB_SEEL_FAN + const POKEMONFANCLUB_PIKACHU + const POKEMONFANCLUB_SEEL + const POKEMONFANCLUB_CHAIRMAN + const POKEMONFANCLUB_RECEPTIONIST + const POKEMONFANCLUB_SIGN_1 + const POKEMONFANCLUB_SIGN_2 + PokemonFanClub_Object: db $d ; border block @@ -6,15 +16,15 @@ PokemonFanClub_Object: warp_event 3, 7, LAST_MAP, 2 def_bg_events - bg_event 1, 0, 7 ; FanClubText7 - bg_event 6, 0, 8 ; FanClubText8 + bg_event 1, 0, TEXT_POKEMONFANCLUB_SIGN_1 + bg_event 6, 0, TEXT_POKEMONFANCLUB_SIGN_2 def_object_events - object_event 6, 3, SPRITE_FISHER, STAY, LEFT, 1 ; person - object_event 1, 3, SPRITE_GIRL, STAY, RIGHT, 2 ; person - object_event 6, 4, SPRITE_FAIRY, STAY, LEFT, 3 ; person - object_event 1, 4, SPRITE_SEEL, STAY, RIGHT, 4 ; person - object_event 3, 1, SPRITE_GENTLEMAN, STAY, DOWN, 5 ; person - object_event 5, 1, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 6 ; person + object_event 6, 3, SPRITE_FISHER, STAY, LEFT, TEXT_POKEMONFANCLUB_PIKACHU_FAN + object_event 1, 3, SPRITE_GIRL, STAY, RIGHT, TEXT_POKEMONFANCLUB_SEEL_FAN + object_event 6, 4, SPRITE_FAIRY, STAY, LEFT, TEXT_POKEMONFANCLUB_PIKACHU + object_event 1, 4, SPRITE_SEEL, STAY, RIGHT, TEXT_POKEMONFANCLUB_SEEL + object_event 3, 1, SPRITE_GENTLEMAN, STAY, DOWN, TEXT_POKEMONFANCLUB_CHAIRMAN + object_event 5, 1, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, TEXT_POKEMONFANCLUB_RECEPTIONIST def_warps_to POKEMON_FAN_CLUB -- cgit v1.3.1-sl0p