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/VermilionCity.asm | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-) (limited to 'data/maps/objects/VermilionCity.asm') diff --git a/data/maps/objects/VermilionCity.asm b/data/maps/objects/VermilionCity.asm index ca652afc..1146d2b8 100644 --- a/data/maps/objects/VermilionCity.asm +++ b/data/maps/objects/VermilionCity.asm @@ -1,3 +1,11 @@ + object_const_def + const VERMILIONCITY_BEAUTY + const VERMILIONCITY_GAMBLER1 + const VERMILIONCITY_SAILOR1 + const VERMILIONCITY_GAMBLER2 + const VERMILIONCITY_MACHOP + const VERMILIONCITY_SAILOR2 + VermilionCity_Object: db $43 ; border block @@ -13,20 +21,20 @@ VermilionCity_Object: warp_event 7, 3, VERMILION_OLD_ROD_HOUSE, 1 def_bg_events - bg_event 27, 3, 7 ; VermilionCityText7 - bg_event 37, 13, 8 ; VermilionCityText8 - bg_event 24, 13, 9 ; MartSignText - bg_event 12, 3, 10 ; PokeCenterSignText - bg_event 7, 13, 11 ; VermilionCityText11 - bg_event 7, 19, 12 ; VermilionCityText12 - bg_event 29, 15, 13 ; VermilionCityText13 + bg_event 27, 3, TEXT_VERMILIONCITY_SIGN + bg_event 37, 13, TEXT_VERMILIONCITY_NOTICE_SIGN + bg_event 24, 13, TEXT_VERMILIONCITY_MART_SIGN + bg_event 12, 3, TEXT_VERMILIONCITY_POKECENTER_SIGN + bg_event 7, 13, TEXT_VERMILIONCITY_POKEMON_FAN_CLUB_SIGN + bg_event 7, 19, TEXT_VERMILIONCITY_GYM_SIGN + bg_event 29, 15, TEXT_VERMILIONCITY_HARBOR_SIGN def_object_events - object_event 19, 7, SPRITE_BEAUTY, WALK, LEFT_RIGHT, 1 ; person - object_event 14, 6, SPRITE_GAMBLER, STAY, NONE, 2 ; person - object_event 19, 30, SPRITE_SAILOR, STAY, UP, 3 ; person - object_event 30, 7, SPRITE_GAMBLER, STAY, NONE, 4 ; person - object_event 29, 9, SPRITE_MONSTER, WALK, UP_DOWN, 5 ; person - object_event 25, 27, SPRITE_SAILOR, WALK, LEFT_RIGHT, 6 ; person + object_event 19, 7, SPRITE_BEAUTY, WALK, LEFT_RIGHT, TEXT_VERMILIONCITY_BEAUTY + object_event 14, 6, SPRITE_GAMBLER, STAY, NONE, TEXT_VERMILIONCITY_GAMBLER1 + object_event 19, 30, SPRITE_SAILOR, STAY, UP, TEXT_VERMILIONCITY_SAILOR1 + object_event 30, 7, SPRITE_GAMBLER, STAY, NONE, TEXT_VERMILIONCITY_GAMBLER2 + object_event 29, 9, SPRITE_MONSTER, WALK, UP_DOWN, TEXT_VERMILIONCITY_MACHOP + object_event 25, 27, SPRITE_SAILOR, WALK, LEFT_RIGHT, TEXT_VERMILIONCITY_SAILOR2 def_warps_to VERMILION_CITY -- cgit v1.3.1-sl0p