aboutsummaryrefslogtreecommitdiffstats
path: root/data/maps/objects/CinnabarLabTradeRoom.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/objects/CinnabarLabTradeRoom.asm')
-rwxr-xr-xdata/maps/objects/CinnabarLabTradeRoom.asm10
1 files changed, 4 insertions, 6 deletions
diff --git a/data/maps/objects/CinnabarLabTradeRoom.asm b/data/maps/objects/CinnabarLabTradeRoom.asm
index de9a7d96..af6a8149 100755
--- a/data/maps/objects/CinnabarLabTradeRoom.asm
+++ b/data/maps/objects/CinnabarLabTradeRoom.asm
@@ -1,17 +1,15 @@
CinnabarLabTradeRoom_Object:
db $17 ; border block
- db 2 ; warps
+ def_warps
warp 2, 7, 2, CINNABAR_LAB
warp 3, 7, 2, CINNABAR_LAB
- db 0 ; signs
+ def_signs
- db 3 ; objects
+ 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
- ; warp-to
- warp_to 2, 7, CINNABAR_LAB_TRADE_ROOM_WIDTH ; CINNABAR_LAB
- warp_to 3, 7, CINNABAR_LAB_TRADE_ROOM_WIDTH ; CINNABAR_LAB
+ def_warps_to CINNABAR_LAB_TRADE_ROOM