From 6e8c3883e430b567f7aa8f9230e366e03610bd5a Mon Sep 17 00:00:00 2001 From: IIMarckus Date: Wed, 8 Jun 2016 05:44:58 -0600 Subject: Part 1 of syncing with pokered. --- scripts/route5gate.asm | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) (limited to 'scripts/route5gate.asm') diff --git a/scripts/route5gate.asm b/scripts/route5gate.asm index 6442fd83..63072d55 100755 --- a/scripts/route5gate.asm +++ b/scripts/route5gate.asm @@ -1,21 +1,21 @@ -Route5GateScript: ; 1df33 (7:5f33) +Route5GateScript: call EnableAutoTextBoxDrawing ld a, [W_ROUTE5GATECURSCRIPT] ld hl, Route5GateScriptPointers jp JumpTable -Route5GateScriptPointers: ; 1df3f (7:5f3f) +Route5GateScriptPointers: dw Route5GateScript0 dw Route5GateScript1 -Route5GateScript_1df43: ; 1df43 (7:5f43) +Route5GateScript_1df43: ld a, D_UP ld [wSimulatedJoypadStatesEnd], a ld a, $1 ld [wSimulatedJoypadStatesIndex], a jp StartSimulatingJoypadStates -Route5GateScript0: ; 1df50 (7:5f50) +Route5GateScript0: ld a, [wd728] bit 6, a ret nz @@ -45,12 +45,12 @@ Route5GateScript0: ; 1df50 (7:5f50) set 6, [hl] ret -CoordsData_1df8f: ; 1df8f (7:5f8f) +CoordsData_1df8f: db 3,3 db 3,4 db $ff -Route5GateScript1: ; 1df94 (7:5f94) +Route5GateScript1: ld a, [wSimulatedJoypadStatesIndex] and a ret nz @@ -60,15 +60,15 @@ Route5GateScript1: ; 1df94 (7:5f94) ld [W_ROUTE5GATECURSCRIPT], a ret -Route5GateTextPointers: ; 1dfa4 (7:5fa4) +Route5GateTextPointers: dw Route5GateText1 dw Route5GateText2 dw Route5GateText3 -Route8GateText1: ; 1dfaa (7:5faa) -Route7GateText1: ; 1dfaa (7:5faa) -Route6GateText1: ; 1dfaa (7:5faa) -Route5GateText1: ; 1dfaa (7:5faa) +Route8GateText1: +Route7GateText1: +Route6GateText1: +Route5GateText1: TX_ASM ld a, [wd728] bit 6, a @@ -94,23 +94,23 @@ Route5GateText1: ; 1dfaa (7:5faa) call PrintText jp TextScriptEnd -Route8GateText2: ; 1dfe7 (7:5fe7) -Route7GateText2: ; 1dfe7 (7:5fe7) -Route6GateText2: ; 1dfe7 (7:5fe7) -Route5GateText2: ; 1dfe7 (7:5fe7) +Route8GateText2: +Route7GateText2: +Route6GateText2: +Route5GateText2: TX_FAR _SaffronGateText_1dfe7 db "@" -Route8GateText3: ; 1dfec (7:5fec) -Route7GateText3: ; 1dfec (7:5fec) -Route6GateText3: ; 1dfec (7:5fec) -Route5GateText3: ; 1dfec (7:5fec) +Route8GateText3: +Route7GateText3: +Route6GateText3: +Route5GateText3: TX_FAR _SaffronGateText_8aaa9 db $11 TX_FAR _SaffronGateText_1dff1 db "@" -SaffronGateText_1dff6: ; 1dff6 (7:5ff6) +SaffronGateText_1dff6: TX_FAR _SaffronGateText_1dff6 db "@" -- cgit v1.2.3 From 269f2c3ba72776e975f5b00d9a1361cadbda42a7 Mon Sep 17 00:00:00 2001 From: dannye Date: Sat, 11 Jun 2016 15:45:24 -0500 Subject: Sync with pokered from August 29, 2015 to April 6, 2016 --- scripts/route5gate.asm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'scripts/route5gate.asm') diff --git a/scripts/route5gate.asm b/scripts/route5gate.asm index 6442fd83..f35e5dea 100755 --- a/scripts/route5gate.asm +++ b/scripts/route5gate.asm @@ -1,6 +1,6 @@ Route5GateScript: ; 1df33 (7:5f33) call EnableAutoTextBoxDrawing - ld a, [W_ROUTE5GATECURSCRIPT] + ld a, [wRoute5GateCurScript] ld hl, Route5GateScriptPointers jp JumpTable @@ -35,7 +35,7 @@ Route5GateScript0: ; 1df50 (7:5f50) call DisplayTextID call Route5GateScript_1df43 ld a, $1 - ld [W_ROUTE5GATECURSCRIPT], a + ld [wRoute5GateCurScript], a ret .asm_1df82 ld a, $3 @@ -57,7 +57,7 @@ Route5GateScript1: ; 1df94 (7:5f94) call Delay3 xor a ld [wJoyIgnore], a - ld [W_ROUTE5GATECURSCRIPT], a + ld [wRoute5GateCurScript], a ret Route5GateTextPointers: ; 1dfa4 (7:5fa4) @@ -81,7 +81,7 @@ Route5GateText1: ; 1dfaa (7:5faa) call PrintText call Route5GateScript_1df43 ld a, $1 - ld [W_ROUTE5GATECURSCRIPT], a + ld [wRoute5GateCurScript], a jp TextScriptEnd .asm_768a2 ld hl, Route5GateText3 -- cgit v1.2.3