summaryrefslogtreecommitdiff
path: root/scripts/route7gate.asm
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2014-05-26 14:04:56 -0700
committeryenatch <yenatch@gmail.com>2014-05-26 22:04:39 -0700
commit40c17c906b2b3f65b3b04b1933b90238a7ac5566 (patch)
tree6de26c959808d5a792b692f2300c33557c1dbfab /scripts/route7gate.asm
parent52ba96f5f4ec53450a0ff6257ea1040d09b7e537 (diff)
Remove most static wram addresses. Use labels instead.
For unknown addresses, use "w<address>". Label overleads are still an issue.
Diffstat (limited to 'scripts/route7gate.asm')
-rwxr-xr-xscripts/route7gate.asm18
1 files changed, 9 insertions, 9 deletions
diff --git a/scripts/route7gate.asm b/scripts/route7gate.asm
index 08e7bc4c..c9599706 100755
--- a/scripts/route7gate.asm
+++ b/scripts/route7gate.asm
@@ -10,26 +10,26 @@ Route7GateScriptPointers: ; 1e10d (7:610d)
dw Route7GateScript1
Route7GateScript_1e111: ; 1e111 (7:6111)
- ld hl, $d730
+ ld hl, wd730
set 7, [hl]
ld a, $20
- 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
Route7GateScript0: ; 1e128 (7:6128)
- ld a, [$d728]
+ ld a, [wd728]
bit 6, a
ret nz
ld hl, CoordsData_1e167
call ArePlayerCoordsInArray
ret nc
ld a, $8
- ld [$d528], a
+ ld [wd528], a
xor a
ld [hJoyHeld], a
callba RemoveGuardDrink
@@ -47,7 +47,7 @@ Route7GateScript0: ; 1e128 (7:6128)
ld a, $3
ld [$ff8c], a
call DisplayTextID
- ld hl, $d728
+ ld hl, wd728
set 6, [hl]
ret
@@ -57,7 +57,7 @@ CoordsData_1e167: ; 1e167 (7:6167)
db $ff
Route7GateScript1: ; 1e16c (7:616c)
- ld a, [$cd38]
+ ld a, [wcd38]
and a
ret nz
call Delay3