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/ssanne9.asm | 48 ++++++++++++++++++++++-----------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

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

diff --git a/data/mapObjects/ssanne9.asm b/data/mapObjects/ssanne9.asm
index 6b5e4b7d..c3cc9e6a 100755
--- a/data/mapObjects/ssanne9.asm
+++ b/data/mapObjects/ssanne9.asm
@@ -2,18 +2,18 @@ SSAnne9Object:
 	db $c ; border block
 
 	db $c ; warps
-	db $5, $2, $0, SS_ANNE_2
-	db $5, $3, $0, SS_ANNE_2
-	db $5, $c, $1, SS_ANNE_2
-	db $5, $d, $1, SS_ANNE_2
-	db $5, $16, $2, SS_ANNE_2
-	db $5, $17, $2, SS_ANNE_2
-	db $f, $2, $3, SS_ANNE_2
-	db $f, $3, $3, SS_ANNE_2
-	db $f, $c, $4, SS_ANNE_2
-	db $f, $d, $4, SS_ANNE_2
-	db $f, $16, $5, SS_ANNE_2
-	db $f, $17, $5, SS_ANNE_2
+	warp $2, $5, $0, SS_ANNE_2
+	warp $3, $5, $0, SS_ANNE_2
+	warp $c, $5, $1, SS_ANNE_2
+	warp $d, $5, $1, SS_ANNE_2
+	warp $16, $5, $2, SS_ANNE_2
+	warp $17, $5, $2, SS_ANNE_2
+	warp $2, $f, $3, SS_ANNE_2
+	warp $3, $f, $3, SS_ANNE_2
+	warp $c, $f, $4, SS_ANNE_2
+	warp $d, $f, $4, SS_ANNE_2
+	warp $16, $f, $5, SS_ANNE_2
+	warp $17, $f, $5, SS_ANNE_2
 
 	db $0 ; signs
 
@@ -33,15 +33,15 @@ SSAnne9Object:
 	object SPRITE_FOULARD_WOMAN, $14, $c, STAY, RIGHT, $d ; person
 
 	; warp-to
-	EVENT_DISP SS_ANNE_9_WIDTH, $5, $2 ; SS_ANNE_2
-	EVENT_DISP SS_ANNE_9_WIDTH, $5, $3 ; SS_ANNE_2
-	EVENT_DISP SS_ANNE_9_WIDTH, $5, $c ; SS_ANNE_2
-	EVENT_DISP SS_ANNE_9_WIDTH, $5, $d ; SS_ANNE_2
-	EVENT_DISP SS_ANNE_9_WIDTH, $5, $16 ; SS_ANNE_2
-	EVENT_DISP SS_ANNE_9_WIDTH, $5, $17 ; SS_ANNE_2
-	EVENT_DISP SS_ANNE_9_WIDTH, $f, $2 ; SS_ANNE_2
-	EVENT_DISP SS_ANNE_9_WIDTH, $f, $3 ; SS_ANNE_2
-	EVENT_DISP SS_ANNE_9_WIDTH, $f, $c ; SS_ANNE_2
-	EVENT_DISP SS_ANNE_9_WIDTH, $f, $d ; SS_ANNE_2
-	EVENT_DISP SS_ANNE_9_WIDTH, $f, $16 ; SS_ANNE_2
-	EVENT_DISP SS_ANNE_9_WIDTH, $f, $17 ; SS_ANNE_2
+	warp_to $2, $5, SS_ANNE_9_WIDTH ; SS_ANNE_2
+	warp_to $3, $5, SS_ANNE_9_WIDTH ; SS_ANNE_2
+	warp_to $c, $5, SS_ANNE_9_WIDTH ; SS_ANNE_2
+	warp_to $d, $5, SS_ANNE_9_WIDTH ; SS_ANNE_2
+	warp_to $16, $5, SS_ANNE_9_WIDTH ; SS_ANNE_2
+	warp_to $17, $5, SS_ANNE_9_WIDTH ; SS_ANNE_2
+	warp_to $2, $f, SS_ANNE_9_WIDTH ; SS_ANNE_2
+	warp_to $3, $f, SS_ANNE_9_WIDTH ; SS_ANNE_2
+	warp_to $c, $f, SS_ANNE_9_WIDTH ; SS_ANNE_2
+	warp_to $d, $f, SS_ANNE_9_WIDTH ; SS_ANNE_2
+	warp_to $16, $f, SS_ANNE_9_WIDTH ; SS_ANNE_2
+	warp_to $17, $f, SS_ANNE_9_WIDTH ; SS_ANNE_2
-- 
cgit v1.3.1-sl0p