aboutsummaryrefslogtreecommitdiffstats
path: root/data/maps/objects/CeladonHotel.asm
diff options
context:
space:
mode:
authorvulcandth <vulcandth@gmail.com>2023-07-13 20:27:56 -0500
committerGitHub <noreply@github.com>2023-07-13 21:27:56 -0400
commitd001ced41b53271373753de835a9c3b3413dc318 (patch)
treeff2db7f403bddfcdeb12e50def8411cafedcdd5e /data/maps/objects/CeladonHotel.asm
parentMake wCurrentBoxNum a byte instead of word (#414) (diff)
downloadpokeyellow-d001ced41b53271373753de835a9c3b3413dc318.tar.gz
pokeyellow-d001ced41b53271373753de835a9c3b3413dc318.tar.xz
pokeyellow-d001ced41b53271373753de835a9c3b3413dc318.zip
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.
Diffstat (limited to 'data/maps/objects/CeladonHotel.asm')
-rw-r--r--data/maps/objects/CeladonHotel.asm11
1 files changed, 8 insertions, 3 deletions
diff --git a/data/maps/objects/CeladonHotel.asm b/data/maps/objects/CeladonHotel.asm
index 13aaff64..700361ce 100644
--- a/data/maps/objects/CeladonHotel.asm
+++ b/data/maps/objects/CeladonHotel.asm
@@ -1,3 +1,8 @@
+ object_const_def
+ const CELADONHOTEL_GRANNY
+ const CELADONHOTEL_BEAUTY
+ const CELADONHOTEL_SUPER_NERD
+
CeladonHotel_Object:
db $0 ; border block
@@ -8,8 +13,8 @@ CeladonHotel_Object:
def_bg_events
def_object_events
- object_event 3, 1, SPRITE_GRANNY, STAY, DOWN, 1 ; person
- object_event 2, 4, SPRITE_BEAUTY, STAY, NONE, 2 ; person
- object_event 8, 4, SPRITE_SUPER_NERD, WALK, LEFT_RIGHT, 3 ; person
+ object_event 3, 1, SPRITE_GRANNY, STAY, DOWN, TEXT_CELADONHOTEL_GRANNY
+ object_event 2, 4, SPRITE_BEAUTY, STAY, NONE, TEXT_CELADONHOTEL_BEAUTY
+ object_event 8, 4, SPRITE_SUPER_NERD, WALK, LEFT_RIGHT, TEXT_CELADONHOTEL_SUPER_NERD
def_warps_to CELADON_HOTEL