aboutsummaryrefslogtreecommitdiffstats
path: root/data/maps/objects/BluesHouse.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/BluesHouse.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/BluesHouse.asm')
-rw-r--r--data/maps/objects/BluesHouse.asm11
1 files changed, 8 insertions, 3 deletions
diff --git a/data/maps/objects/BluesHouse.asm b/data/maps/objects/BluesHouse.asm
index ac200b28..9633c1d0 100644
--- a/data/maps/objects/BluesHouse.asm
+++ b/data/maps/objects/BluesHouse.asm
@@ -1,3 +1,8 @@
+ object_const_def
+ const BLUESHOUSE_DAISY1
+ const BLUESHOUSE_DAISY2
+ const BLUESHOUSE_TOWN_MAP
+
BluesHouse_Object:
db $a ; border block
@@ -8,8 +13,8 @@ BluesHouse_Object:
def_bg_events
def_object_events
- object_event 2, 3, SPRITE_DAISY, STAY, RIGHT, 1
- object_event 6, 4, SPRITE_DAISY, WALK, UP_DOWN, 2, 0
- object_event 3, 3, SPRITE_POKEDEX, STAY, NONE, 3, 0
+ object_event 2, 3, SPRITE_DAISY, STAY, RIGHT, TEXT_BLUESHOUSE_DAISY_SITTING
+ object_event 6, 4, SPRITE_DAISY, WALK, UP_DOWN, TEXT_BLUESHOUSE_DAISY_WALKING, 0
+ object_event 3, 3, SPRITE_POKEDEX, STAY, NONE, TEXT_BLUESHOUSE_TOWN_MAP, 0
def_warps_to BLUES_HOUSE