From 76b882d9523915ca8ced96e8c5e889ca2728241e Mon Sep 17 00:00:00 2001
From: Rangi <remy.oukaour+rangi42@gmail.com>
Date: Thu, 16 Jul 2020 12:32:19 -0400
Subject: Reformat map scripts' coordinate and movement data

'dbmapcoord' has X, Y order like other coordinate-related data macros
---
 scripts/SilphCo7F.asm | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'scripts/SilphCo7F.asm')

diff --git a/scripts/SilphCo7F.asm b/scripts/SilphCo7F.asm
index 3627bc7f..32a95fb5 100755
--- a/scripts/SilphCo7F.asm
+++ b/scripts/SilphCo7F.asm
@@ -42,10 +42,10 @@ SilphCo7Script_51b77:
 	predef_jump ReplaceTileBlock
 
 SilphCo7GateCoords:
-	db $03,$05
-	db $02,$0A
-	db $06,$0A
-	db $FF
+	dbmapcoord  5,  3
+	dbmapcoord 10,  2
+	dbmapcoord 10,  6
+	db -1 ; end
 
 SilphCo7Text_51bc8:
 	push hl
@@ -156,16 +156,16 @@ SilphCo7Script0:
 	jp SilphCo7Text_51c10
 
 CoordsData_51c78:
-	db $02,$03
-	db $03,$03
-	db $FF
+	dbmapcoord  3,  2
+	dbmapcoord  3,  3
+	db -1 ; end
 
 MovementData_51c7d:
 	db NPC_MOVEMENT_UP
 	db NPC_MOVEMENT_UP
 	db NPC_MOVEMENT_UP
 	db NPC_MOVEMENT_UP
-	db $FF
+	db -1 ; end
 
 SilphCo7Script3:
 	ld a, [wd730]
@@ -238,7 +238,7 @@ SilphCo7Script4:
 MovementData_51d1a:
 	db NPC_MOVEMENT_RIGHT
 	db NPC_MOVEMENT_RIGHT
-	db $FF
+	db -1 ; end
 
 MovementData_51d1d:
 	db NPC_MOVEMENT_LEFT
@@ -248,7 +248,7 @@ MovementData_51d1d:
 	db NPC_MOVEMENT_RIGHT
 	db NPC_MOVEMENT_RIGHT
 	db NPC_MOVEMENT_DOWN
-	db $FF
+	db -1 ; end
 
 SilphCo7Script5:
 	ld a, [wd730]
-- 
cgit v1.2.3