summaryrefslogtreecommitdiff
path: root/data/maps/objects/LancesRoom.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/objects/LancesRoom.asm')
-rwxr-xr-xdata/maps/objects/LancesRoom.asm11
1 files changed, 4 insertions, 7 deletions
diff --git a/data/maps/objects/LancesRoom.asm b/data/maps/objects/LancesRoom.asm
index 6f22631a..01cde61e 100755
--- a/data/maps/objects/LancesRoom.asm
+++ b/data/maps/objects/LancesRoom.asm
@@ -1,17 +1,14 @@
LancesRoom_Object:
db $3 ; border block
- db 3 ; warps
+ def_warps
warp 24, 16, 2, AGATHAS_ROOM
warp 5, 0, 0, CHAMPIONS_ROOM
warp 6, 0, 0, CHAMPIONS_ROOM
- db 0 ; signs
+ def_signs
- db 1 ; objects
+ def_objects
object SPRITE_LANCE, 6, 1, STAY, DOWN, 1, OPP_LANCE, 1
- ; warp-to
- warp_to 24, 16, LANCES_ROOM_WIDTH ; AGATHAS_ROOM
- warp_to 5, 0, LANCES_ROOM_WIDTH ; CHAMPIONS_ROOM
- warp_to 6, 0, LANCES_ROOM_WIDTH ; CHAMPIONS_ROOM
+ def_warps_to LANCES_ROOM