aboutsummaryrefslogtreecommitdiffstats
path: root/data/maps/objects/CeladonHotel.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/objects/CeladonHotel.asm')
-rw-r--r--data/maps/objects/CeladonHotel.asm16
1 files changed, 8 insertions, 8 deletions
diff --git a/data/maps/objects/CeladonHotel.asm b/data/maps/objects/CeladonHotel.asm
index a516f141..951b6c75 100644
--- a/data/maps/objects/CeladonHotel.asm
+++ b/data/maps/objects/CeladonHotel.asm
@@ -1,15 +1,15 @@
CeladonHotel_Object:
db $0 ; border block
- def_warps
- warp 3, 7, 12, LAST_MAP
- warp 4, 7, 12, LAST_MAP
+ def_warp_events
+ warp_event 3, 7, LAST_MAP, 12
+ warp_event 4, 7, LAST_MAP, 12
- def_signs
+ def_bg_events
- def_objects
- object SPRITE_GRANNY, 3, 1, STAY, DOWN, 1 ; person
- object SPRITE_BEAUTY, 2, 4, STAY, NONE, 2 ; person
- object SPRITE_SUPER_NERD, 8, 4, WALK, LEFT_RIGHT, 3 ; person
+ def_object_events
+ object_event 3, 1, SPRITE_GRANNY, STAY, DOWN, 1 ; person
+ object_event 2, 4, SPRITE_BEAUTY, STAY, NONE, 2 ; person
+ object_event 8, 4, SPRITE_SUPER_NERD, WALK, LEFT_RIGHT, 3 ; person
def_warps_to CELADON_HOTEL