aboutsummaryrefslogtreecommitdiffstats
path: root/data/maps/objects/CopycatsHouse1F.asm
diff options
context:
space:
mode:
authordannye <33dannye@gmail.com>2023-11-20 00:33:27 -0600
committerdannye <33dannye@gmail.com>2023-11-20 20:23:27 -0600
commit298e99d3776580585c3f434e5d93137ae431bdd3 (patch)
treea808c4ffd0fd0f9bd28972bae5236e0d3345c8e5 /data/maps/objects/CopycatsHouse1F.asm
parentAdd sound bits documentation for wOptions (#110) (diff)
parentName 2 unnamed labels I missed in SeafoamIslandsB4F and PokemonMansion3F (#437) (diff)
downloadpokeyellow-298e99d3776580585c3f434e5d93137ae431bdd3.tar.gz
pokeyellow-298e99d3776580585c3f434e5d93137ae431bdd3.tar.xz
pokeyellow-298e99d3776580585c3f434e5d93137ae431bdd3.zip
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'data/maps/objects/CopycatsHouse1F.asm')
-rw-r--r--data/maps/objects/CopycatsHouse1F.asm11
1 files changed, 8 insertions, 3 deletions
diff --git a/data/maps/objects/CopycatsHouse1F.asm b/data/maps/objects/CopycatsHouse1F.asm
index 3d6c3af1..05c3f5d1 100644
--- a/data/maps/objects/CopycatsHouse1F.asm
+++ b/data/maps/objects/CopycatsHouse1F.asm
@@ -1,3 +1,8 @@
+ object_const_def
+ const_export COPYCATSHOUSE1F_MIDDLE_AGED_WOMAN
+ const_export COPYCATSHOUSE1F_MIDDLE_AGED_MAN
+ const_export COPYCATSHOUSE1F_CHANSEY
+
CopycatsHouse1F_Object:
db $a ; border block
@@ -9,8 +14,8 @@ CopycatsHouse1F_Object:
def_bg_events
def_object_events
- object_event 2, 2, SPRITE_MIDDLE_AGED_WOMAN, STAY, DOWN, 1 ; person
- object_event 5, 4, SPRITE_MIDDLE_AGED_MAN, STAY, LEFT, 2 ; person
- object_event 1, 4, SPRITE_CHANSEY, STAY, NONE, 3 ; person
+ object_event 2, 2, SPRITE_MIDDLE_AGED_WOMAN, STAY, DOWN, TEXT_COPYCATSHOUSE1F_MIDDLE_AGED_WOMAN
+ object_event 5, 4, SPRITE_MIDDLE_AGED_MAN, STAY, LEFT, TEXT_COPYCATSHOUSE1F_MIDDLE_AGED_MAN
+ object_event 1, 4, SPRITE_CHANSEY, STAY, NONE, TEXT_COPYCATSHOUSE1F_CHANSEY
def_warps_to COPYCATS_HOUSE_1F