summaryrefslogtreecommitdiff
path: root/data/maps/objects/CinnabarLabTradeRoom.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/objects/CinnabarLabTradeRoom.asm')
-rw-r--r--data/maps/objects/CinnabarLabTradeRoom.asm16
1 files changed, 8 insertions, 8 deletions
diff --git a/data/maps/objects/CinnabarLabTradeRoom.asm b/data/maps/objects/CinnabarLabTradeRoom.asm
index e23a19cf..d117af51 100644
--- a/data/maps/objects/CinnabarLabTradeRoom.asm
+++ b/data/maps/objects/CinnabarLabTradeRoom.asm
@@ -1,15 +1,15 @@
CinnabarLabTradeRoom_Object:
db $17 ; border block
- def_warps
- warp 2, 7, 2, CINNABAR_LAB
- warp 3, 7, 2, CINNABAR_LAB
+ def_warp_events
+ warp_event 2, 7, CINNABAR_LAB, 2
+ warp_event 3, 7, CINNABAR_LAB, 2
- def_signs
+ def_bg_events
- def_objects
- object SPRITE_SUPER_NERD, 3, 2, STAY, DOWN, 1 ; person
- object SPRITE_GRAMPS, 1, 4, STAY, NONE, 2 ; person
- object SPRITE_BEAUTY, 5, 5, STAY, UP, 3 ; person
+ def_object_events
+ object_event 3, 2, SPRITE_SUPER_NERD, STAY, DOWN, 1 ; person
+ object_event 1, 4, SPRITE_GRAMPS, STAY, NONE, 2 ; person
+ object_event 5, 5, SPRITE_BEAUTY, STAY, UP, 3 ; person
def_warps_to CINNABAR_LAB_TRADE_ROOM