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/safarizonecenter.asm | 40 ++++++++++++++++++------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

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

diff --git a/data/mapObjects/safarizonecenter.asm b/data/mapObjects/safarizonecenter.asm
index b5fa0107..681e81e1 100755
--- a/data/mapObjects/safarizonecenter.asm
+++ b/data/mapObjects/safarizonecenter.asm
@@ -2,30 +2,30 @@ SafariZoneCenterObject:
 	db $0 ; border block
 
 	db $9 ; warps
-	db $19, $e, $2, SAFARI_ZONE_ENTRANCE
-	db $19, $f, $3, SAFARI_ZONE_ENTRANCE
-	db $a, $0, $4, SAFARI_ZONE_WEST
-	db $b, $0, $5, SAFARI_ZONE_WEST
-	db $0, $e, $4, SAFARI_ZONE_NORTH
-	db $0, $f, $5, SAFARI_ZONE_NORTH
-	db $a, $1d, $2, SAFARI_ZONE_EAST
-	db $b, $1d, $3, SAFARI_ZONE_EAST
-	db $13, $11, $0, SAFARI_ZONE_REST_HOUSE_1
+	warp $e, $19, $2, SAFARI_ZONE_ENTRANCE
+	warp $f, $19, $3, SAFARI_ZONE_ENTRANCE
+	warp $0, $a, $4, SAFARI_ZONE_WEST
+	warp $0, $b, $5, SAFARI_ZONE_WEST
+	warp $e, $0, $4, SAFARI_ZONE_NORTH
+	warp $f, $0, $5, SAFARI_ZONE_NORTH
+	warp $1d, $a, $2, SAFARI_ZONE_EAST
+	warp $1d, $b, $3, SAFARI_ZONE_EAST
+	warp $11, $13, $0, SAFARI_ZONE_REST_HOUSE_1
 
 	db $2 ; signs
-	db $14, $12, $2 ; SafariZoneCenterText2
-	db $16, $e, $3 ; SafariZoneCenterText3
+	sign $12, $14, $2 ; SafariZoneCenterText2
+	sign $e, $16, $3 ; SafariZoneCenterText3
 
 	db $1 ; objects
 	object SPRITE_BALL, $e, $a, STAY, NONE, $1, NUGGET
 
 	; warp-to
-	EVENT_DISP SAFARI_ZONE_CENTER_WIDTH, $19, $e ; SAFARI_ZONE_ENTRANCE
-	EVENT_DISP SAFARI_ZONE_CENTER_WIDTH, $19, $f ; SAFARI_ZONE_ENTRANCE
-	EVENT_DISP SAFARI_ZONE_CENTER_WIDTH, $a, $0 ; SAFARI_ZONE_WEST
-	EVENT_DISP SAFARI_ZONE_CENTER_WIDTH, $b, $0 ; SAFARI_ZONE_WEST
-	EVENT_DISP SAFARI_ZONE_CENTER_WIDTH, $0, $e ; SAFARI_ZONE_NORTH
-	EVENT_DISP SAFARI_ZONE_CENTER_WIDTH, $0, $f ; SAFARI_ZONE_NORTH
-	EVENT_DISP SAFARI_ZONE_CENTER_WIDTH, $a, $1d ; SAFARI_ZONE_EAST
-	EVENT_DISP SAFARI_ZONE_CENTER_WIDTH, $b, $1d ; SAFARI_ZONE_EAST
-	EVENT_DISP SAFARI_ZONE_CENTER_WIDTH, $13, $11 ; SAFARI_ZONE_REST_HOUSE_1
+	warp_to $e, $19, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_ENTRANCE
+	warp_to $f, $19, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_ENTRANCE
+	warp_to $0, $a, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_WEST
+	warp_to $0, $b, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_WEST
+	warp_to $e, $0, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_NORTH
+	warp_to $f, $0, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_NORTH
+	warp_to $1d, $a, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_EAST
+	warp_to $1d, $b, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_EAST
+	warp_to $11, $13, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_REST_HOUSE_1
-- 
cgit v1.3.1-sl0p