summaryrefslogtreecommitdiff
path: root/data/maps/objects/CinnabarLab.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/objects/CinnabarLab.asm')
-rw-r--r--data/maps/objects/CinnabarLab.asm26
1 files changed, 13 insertions, 13 deletions
diff --git a/data/maps/objects/CinnabarLab.asm b/data/maps/objects/CinnabarLab.asm
index 0e007e3a..aa1aa1c7 100644
--- a/data/maps/objects/CinnabarLab.asm
+++ b/data/maps/objects/CinnabarLab.asm
@@ -1,20 +1,20 @@
CinnabarLab_Object:
db $17 ; border block
- def_warps
- warp 2, 7, 2, LAST_MAP
- warp 3, 7, 2, LAST_MAP
- warp 8, 4, 0, CINNABAR_LAB_TRADE_ROOM
- warp 12, 4, 0, CINNABAR_LAB_METRONOME_ROOM
- warp 16, 4, 0, CINNABAR_LAB_FOSSIL_ROOM
+ def_warp_events
+ warp_event 2, 7, LAST_MAP, 2
+ warp_event 3, 7, LAST_MAP, 2
+ warp_event 8, 4, CINNABAR_LAB_TRADE_ROOM, 0
+ warp_event 12, 4, CINNABAR_LAB_METRONOME_ROOM, 0
+ warp_event 16, 4, CINNABAR_LAB_FOSSIL_ROOM, 0
- def_signs
- sign 3, 2, 2 ; Lab1Text2
- sign 9, 4, 3 ; Lab1Text3
- sign 13, 4, 4 ; Lab1Text4
- sign 17, 4, 5 ; Lab1Text5
+ def_bg_events
+ bg_event 3, 2, 2 ; Lab1Text2
+ bg_event 9, 4, 3 ; Lab1Text3
+ bg_event 13, 4, 4 ; Lab1Text4
+ bg_event 17, 4, 5 ; Lab1Text5
- def_objects
- object SPRITE_FISHING_GURU, 1, 3, STAY, NONE, 1 ; person
+ def_object_events
+ object_event 1, 3, SPRITE_FISHING_GURU, STAY, NONE, 1 ; person
def_warps_to CINNABAR_LAB