aboutsummaryrefslogtreecommitdiffstats
path: root/data/maps/objects/CeruleanTrashedHouse.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/CeruleanTrashedHouse.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/CeruleanTrashedHouse.asm')
-rw-r--r--data/maps/objects/CeruleanTrashedHouse.asm10
1 files changed, 7 insertions, 3 deletions
diff --git a/data/maps/objects/CeruleanTrashedHouse.asm b/data/maps/objects/CeruleanTrashedHouse.asm
index 9dc28f08..993e66c2 100644
--- a/data/maps/objects/CeruleanTrashedHouse.asm
+++ b/data/maps/objects/CeruleanTrashedHouse.asm
@@ -1,3 +1,7 @@
+ object_const_def
+ const CERULEANTRASHEDHOUSE_FISHING_GURU
+ const CERULEANTRASHEDHOUSE_GIRL
+
CeruleanTrashedHouse_Object:
db $a ; border block
@@ -7,10 +11,10 @@ CeruleanTrashedHouse_Object:
warp_event 3, 0, LAST_MAP, 8
def_bg_events
- bg_event 3, 0, 3 ; CeruleanHouseTrashedText3
+ bg_event 3, 0, TEXT_CERULEANTRASHEDHOUSE_WALL_HOLE
def_object_events
- object_event 2, 1, SPRITE_FISHING_GURU, STAY, DOWN, 1 ; person
- object_event 5, 6, SPRITE_GIRL, WALK, LEFT_RIGHT, 2 ; person
+ object_event 2, 1, SPRITE_FISHING_GURU, STAY, DOWN, TEXT_CERULEANTRASHEDHOUSE_FISHING_GURU
+ object_event 5, 6, SPRITE_GIRL, WALK, LEFT_RIGHT, TEXT_CERULEANTRASHEDHOUSE_GIRL
def_warps_to CERULEAN_TRASHED_HOUSE