summaryrefslogtreecommitdiff
path: root/scripts/route6gate.asm
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/route6gate.asm')
-rwxr-xr-xscripts/route6gate.asm22
1 files changed, 11 insertions, 11 deletions
diff --git a/scripts/route6gate.asm b/scripts/route6gate.asm
index 22fe5ede..9945f80f 100755
--- a/scripts/route6gate.asm
+++ b/scripts/route6gate.asm
@@ -10,16 +10,16 @@ Route6GateScriptPointers: ; 1e04a (7:604a)
dw Route6GateScript1
Route6GateScript0: ; 1e04e (7:604e)
- ld a, [$d728]
+ ld a, [wd728]
bit 6, a
ret nz
ld hl, CoordsData_1e08c
call ArePlayerCoordsInArray
ret nc
ld a, $1
- ld [$d528], a
+ ld [wd528], a
xor a
- ld [H_CURRENTPRESSEDBUTTONS], a
+ ld [hJoyHeld], a
callba RemoveGuardDrink
ld a, [$ffdb]
and a
@@ -32,7 +32,7 @@ Route6GateScript0: ; 1e04e (7:604e)
ld [W_ROUTE6GATECURSCRIPT], a
ret
.asm_1e080
- ld hl, $d728
+ ld hl, wd728
set 6, [hl]
ld a, $3
ld [$ff8c], a
@@ -43,25 +43,25 @@ CoordsData_1e08c: ; 1e08c (7:608c)
db $02,$04,$FF
Route6GateScript1: ; 1e091 (7:6091)
- ld a, [$cd38]
+ ld a, [wcd38]
and a
ret nz
call Delay3
xor a
- ld [wJoypadForbiddenButtonsMask], a
+ ld [wJoyIgnore], a
ld [W_ROUTE6GATECURSCRIPT], a
ret
Route6GateScript_1e0a1: ; 1e0a1 (7:60a1)
- ld hl, $d730
+ ld hl, wd730
set 7, [hl]
ld a, $80
- ld [$ccd3], a
+ ld [wccd3], a
ld a, $1
- ld [$cd38], a
+ ld [wcd38], a
xor a
- ld [$c206], a
- ld [$cd3b], a
+ ld [wSpriteStateData2 + $06], a
+ ld [wcd3b], a
ret
Route6GateTextPointers: ; 1e0b8 (7:60b8)