From d271d6917549074e721f3e5064b77e1ad1dbe44a Mon Sep 17 00:00:00 2001
From: Remy Oukaour <remy.oukaour@gmail.com>
Date: Mon, 29 Jan 2018 02:31:32 -0500
Subject: Add warp, sign, and warp_to macros for data/mapObjects definitions

---
 data/mapObjects/route7.asm | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

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

diff --git a/data/mapObjects/route7.asm b/data/mapObjects/route7.asm
index d039cb3c..44982068 100755
--- a/data/mapObjects/route7.asm
+++ b/data/mapObjects/route7.asm
@@ -2,20 +2,20 @@ Route7Object:
 	db $f ; border block
 
 	db $5 ; warps
-	db $9, $12, $2, ROUTE_7_GATE
-	db $a, $12, $3, ROUTE_7_GATE
-	db $9, $b, $0, ROUTE_7_GATE
-	db $a, $b, $1, ROUTE_7_GATE
-	db $d, $5, $0, PATH_ENTRANCE_ROUTE_7
+	warp $12, $9, $2, ROUTE_7_GATE
+	warp $12, $a, $3, ROUTE_7_GATE
+	warp $b, $9, $0, ROUTE_7_GATE
+	warp $b, $a, $1, ROUTE_7_GATE
+	warp $5, $d, $0, PATH_ENTRANCE_ROUTE_7
 
 	db $1 ; signs
-	db $d, $3, $1 ; Route7Text1
+	sign $3, $d, $1 ; Route7Text1
 
 	db $0 ; objects
 
 	; warp-to
-	EVENT_DISP ROUTE_7_WIDTH, $9, $12 ; ROUTE_7_GATE
-	EVENT_DISP ROUTE_7_WIDTH, $a, $12 ; ROUTE_7_GATE
-	EVENT_DISP ROUTE_7_WIDTH, $9, $b ; ROUTE_7_GATE
-	EVENT_DISP ROUTE_7_WIDTH, $a, $b ; ROUTE_7_GATE
-	EVENT_DISP ROUTE_7_WIDTH, $d, $5 ; PATH_ENTRANCE_ROUTE_7
+	warp_to $12, $9, ROUTE_7_WIDTH ; ROUTE_7_GATE
+	warp_to $12, $a, ROUTE_7_WIDTH ; ROUTE_7_GATE
+	warp_to $b, $9, ROUTE_7_WIDTH ; ROUTE_7_GATE
+	warp_to $b, $a, ROUTE_7_WIDTH ; ROUTE_7_GATE
+	warp_to $5, $d, ROUTE_7_WIDTH ; PATH_ENTRANCE_ROUTE_7
-- 
cgit v1.3.1-sl0p