summaryrefslogtreecommitdiff
path: root/data/maps/objects/CeladonChiefHouse.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/objects/CeladonChiefHouse.asm')
-rw-r--r--data/maps/objects/CeladonChiefHouse.asm16
1 files changed, 8 insertions, 8 deletions
diff --git a/data/maps/objects/CeladonChiefHouse.asm b/data/maps/objects/CeladonChiefHouse.asm
index 97b9e4c9..f8f28da8 100644
--- a/data/maps/objects/CeladonChiefHouse.asm
+++ b/data/maps/objects/CeladonChiefHouse.asm
@@ -1,15 +1,15 @@
CeladonChiefHouse_Object:
db $f ; border block
- def_warps
- warp 2, 7, 11, LAST_MAP
- warp 3, 7, 11, LAST_MAP
+ def_warp_events
+ warp_event 2, 7, LAST_MAP, 11
+ warp_event 3, 7, LAST_MAP, 11
- def_signs
+ def_bg_events
- def_objects
- object SPRITE_GRAMPS, 4, 2, STAY, DOWN, 1 ; person
- object SPRITE_ROCKET, 1, 4, WALK, ANY_DIR, 2 ; person
- object SPRITE_SAILOR, 5, 6, STAY, LEFT, 3 ; person
+ def_object_events
+ object_event 4, 2, SPRITE_GRAMPS, STAY, DOWN, 1 ; person
+ object_event 1, 4, SPRITE_ROCKET, WALK, ANY_DIR, 2 ; person
+ object_event 5, 6, SPRITE_SAILOR, STAY, LEFT, 3 ; person
def_warps_to CELADON_CHIEF_HOUSE