aboutsummaryrefslogtreecommitdiffstats
path: root/data/maps/objects/CinnabarLabMetronomeRoom.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/objects/CinnabarLabMetronomeRoom.asm')
-rwxr-xr-xdata/maps/objects/CinnabarLabMetronomeRoom.asm10
1 files changed, 4 insertions, 6 deletions
diff --git a/data/maps/objects/CinnabarLabMetronomeRoom.asm b/data/maps/objects/CinnabarLabMetronomeRoom.asm
index d3250af3..3b787be6 100755
--- a/data/maps/objects/CinnabarLabMetronomeRoom.asm
+++ b/data/maps/objects/CinnabarLabMetronomeRoom.asm
@@ -1,19 +1,17 @@
CinnabarLabMetronomeRoom_Object:
db $17 ; border block
- db 2 ; warps
+ def_warps
warp 2, 7, 3, CINNABAR_LAB
warp 3, 7, 3, CINNABAR_LAB
- db 3 ; signs
+ def_signs
sign 0, 4, 3 ; Lab3Text3
sign 1, 4, 4 ; Lab3Text4
sign 2, 1, 5 ; Lab3Text5
- db 2 ; objects
+ def_objects
object SPRITE_SCIENTIST, 7, 2, STAY, DOWN, 1 ; person
object SPRITE_SCIENTIST, 2, 3, WALK, LEFT_RIGHT, 2 ; person
- ; warp-to
- warp_to 2, 7, CINNABAR_LAB_METRONOME_ROOM_WIDTH ; CINNABAR_LAB
- warp_to 3, 7, CINNABAR_LAB_METRONOME_ROOM_WIDTH ; CINNABAR_LAB
+ def_warps_to CINNABAR_LAB_METRONOME_ROOM