From 6e8c3883e430b567f7aa8f9230e366e03610bd5a Mon Sep 17 00:00:00 2001
From: IIMarckus <iimarckus@gmail.com>
Date: Wed, 8 Jun 2016 05:44:58 -0600
Subject: Part 1 of syncing with pokered.

---
 scripts/route6gate.asm | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'scripts/route6gate.asm')

diff --git a/scripts/route6gate.asm b/scripts/route6gate.asm
index dd179e28..b8876185 100755
--- a/scripts/route6gate.asm
+++ b/scripts/route6gate.asm
@@ -1,15 +1,15 @@
-Route6GateScript: ; 1e03d (7:603d)
+Route6GateScript:
 	call EnableAutoTextBoxDrawing
 	ld hl, Route6GateScriptPointers
 	ld a, [W_ROUTE6GATECURSCRIPT]
 	call JumpTable
 	ret
 
-Route6GateScriptPointers: ; 1e04a (7:604a)
+Route6GateScriptPointers:
 	dw Route6GateScript0
 	dw Route6GateScript1
 
-Route6GateScript0: ; 1e04e (7:604e)
+Route6GateScript0:
 	ld a, [wd728]
 	bit 6, a
 	ret nz
@@ -38,11 +38,11 @@ Route6GateScript0: ; 1e04e (7:604e)
 	ld [hSpriteIndexOrTextID], a
 	jp DisplayTextID
 
-CoordsData_1e08c: ; 1e08c (7:608c)
+CoordsData_1e08c:
 	db $02,$03
 	db $02,$04,$FF
 
-Route6GateScript1: ; 1e091 (7:6091)
+Route6GateScript1:
 	ld a, [wSimulatedJoypadStatesIndex]
 	and a
 	ret nz
@@ -52,7 +52,7 @@ Route6GateScript1: ; 1e091 (7:6091)
 	ld [W_ROUTE6GATECURSCRIPT], a
 	ret
 
-Route6GateScript_1e0a1: ; 1e0a1 (7:60a1)
+Route6GateScript_1e0a1:
 	ld hl, wd730
 	set 7, [hl]
 	ld a, $80
@@ -64,7 +64,7 @@ Route6GateScript_1e0a1: ; 1e0a1 (7:60a1)
 	ld [wOverrideSimulatedJoypadStatesMask], a
 	ret
 
-Route6GateTextPointers: ; 1e0b8 (7:60b8)
+Route6GateTextPointers:
 	dw Route6GateText1
 	dw Route6GateText2
 	dw Route6GateText3
-- 
cgit v1.2.3


From 269f2c3ba72776e975f5b00d9a1361cadbda42a7 Mon Sep 17 00:00:00 2001
From: dannye <corrnondacqb@yahoo.com>
Date: Sat, 11 Jun 2016 15:45:24 -0500
Subject: Sync with pokered from August 29, 2015 to April 6, 2016

---
 scripts/route6gate.asm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'scripts/route6gate.asm')

diff --git a/scripts/route6gate.asm b/scripts/route6gate.asm
index dd179e28..c0c19021 100755
--- a/scripts/route6gate.asm
+++ b/scripts/route6gate.asm
@@ -1,7 +1,7 @@
 Route6GateScript: ; 1e03d (7:603d)
 	call EnableAutoTextBoxDrawing
 	ld hl, Route6GateScriptPointers
-	ld a, [W_ROUTE6GATECURSCRIPT]
+	ld a, [wRoute6GateCurScript]
 	call JumpTable
 	ret
 
@@ -29,7 +29,7 @@ Route6GateScript0: ; 1e04e (7:604e)
 	call DisplayTextID
 	call Route6GateScript_1e0a1
 	ld a, $1
-	ld [W_ROUTE6GATECURSCRIPT], a
+	ld [wRoute6GateCurScript], a
 	ret
 .asm_1e080
 	ld hl, wd728
@@ -49,7 +49,7 @@ Route6GateScript1: ; 1e091 (7:6091)
 	call Delay3
 	xor a
 	ld [wJoyIgnore], a
-	ld [W_ROUTE6GATECURSCRIPT], a
+	ld [wRoute6GateCurScript], a
 	ret
 
 Route6GateScript_1e0a1: ; 1e0a1 (7:60a1)
-- 
cgit v1.2.3