summaryrefslogtreecommitdiff
path: root/data/maps/objects/CeladonDiner.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/objects/CeladonDiner.asm')
-rw-r--r--data/maps/objects/CeladonDiner.asm20
1 files changed, 10 insertions, 10 deletions
diff --git a/data/maps/objects/CeladonDiner.asm b/data/maps/objects/CeladonDiner.asm
index 37c8c876..d2815299 100644
--- a/data/maps/objects/CeladonDiner.asm
+++ b/data/maps/objects/CeladonDiner.asm
@@ -1,17 +1,17 @@
CeladonDiner_Object:
db $f ; border block
- def_warps
- warp 3, 7, 10, LAST_MAP
- warp 4, 7, 10, LAST_MAP
+ def_warp_events
+ warp_event 3, 7, LAST_MAP, 10
+ warp_event 4, 7, LAST_MAP, 10
- def_signs
+ def_bg_events
- def_objects
- object SPRITE_COOK, 8, 5, WALK, LEFT_RIGHT, 1 ; person
- object SPRITE_MIDDLE_AGED_WOMAN, 7, 2, STAY, NONE, 2 ; person
- object SPRITE_MIDDLE_AGED_MAN, 1, 4, STAY, DOWN, 3 ; person
- object SPRITE_FISHER, 5, 3, STAY, RIGHT, 4 ; person
- object SPRITE_GYM_GUIDE, 0, 1, STAY, DOWN, 5 ; person
+ def_object_events
+ object_event 8, 5, SPRITE_COOK, WALK, LEFT_RIGHT, 1 ; person
+ object_event 7, 2, SPRITE_MIDDLE_AGED_WOMAN, STAY, NONE, 2 ; person
+ object_event 1, 4, SPRITE_MIDDLE_AGED_MAN, STAY, DOWN, 3 ; person
+ object_event 5, 3, SPRITE_FISHER, STAY, RIGHT, 4 ; person
+ object_event 0, 1, SPRITE_GYM_GUIDE, STAY, DOWN, 5 ; person
def_warps_to CELADON_DINER