From 3d8e949d373a828fee370b08d005f131abb67333 Mon Sep 17 00:00:00 2001
From: Shakib2001 <shakibafzali@gmail.com>
Date: Fri, 27 Mar 2020 14:31:38 -0400
Subject: Added warp, warp_to and sign compatibility

---
 data/mapObjects/bruno.asm | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'data/mapObjects/bruno.asm')

diff --git a/data/mapObjects/bruno.asm b/data/mapObjects/bruno.asm
index a734b07b..45d21186 100755
--- a/data/mapObjects/bruno.asm
+++ b/data/mapObjects/bruno.asm
@@ -1,19 +1,19 @@
 BrunoObject:
 	db $3 ; border block
 
-	db $4 ; warps
-	db $b, $4, $2, LORELEIS_ROOM
-	db $b, $5, $3, LORELEIS_ROOM
-	db $0, $4, $0, AGATHAS_ROOM
-	db $0, $5, $1, AGATHAS_ROOM
+	db 4 ; warps
+	warp 4, 11, 2, LORELEIS_ROOM
+	warp 5, 11, 3, LORELEIS_ROOM
+	warp 4, 0, 0, AGATHAS_ROOM
+	warp 5, 0, 1, AGATHAS_ROOM
 
-	db $0 ; signs
+	db 0 ; signs
 
-	db $1 ; objects
-	object SPRITE_BRUNO, $5, $2, STAY, DOWN, $1, OPP_BRUNO, $1
+	db 1 ; objects
+	object SPRITE_BRUNO, 5, 2, STAY, DOWN, 1, OPP_BRUNO, 1
 
 	; warp-to
-	EVENT_DISP BRUNOS_ROOM_WIDTH, $b, $4 ; LORELEIS_ROOM
-	EVENT_DISP BRUNOS_ROOM_WIDTH, $b, $5 ; LORELEIS_ROOM
-	EVENT_DISP BRUNOS_ROOM_WIDTH, $0, $4 ; AGATHAS_ROOM
-	EVENT_DISP BRUNOS_ROOM_WIDTH, $0, $5 ; AGATHAS_ROOM
+	warp_to 4, 11, BRUNOS_ROOM_WIDTH ; LORELEIS_ROOM
+	warp_to 5, 11, BRUNOS_ROOM_WIDTH ; LORELEIS_ROOM
+	warp_to 4, 0, BRUNOS_ROOM_WIDTH ; AGATHAS_ROOM
+	warp_to 5, 0, BRUNOS_ROOM_WIDTH ; AGATHAS_ROOM
-- 
cgit v1.3.1-sl0p