summaryrefslogtreecommitdiff
path: root/scripts/blueshouse.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/blueshouse.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/blueshouse.asm')
-rwxr-xr-xscripts/blueshouse.asm10
1 files changed, 5 insertions, 5 deletions
diff --git a/scripts/blueshouse.asm b/scripts/blueshouse.asm
index 1699160f..1055f47a 100755
--- a/scripts/blueshouse.asm
+++ b/scripts/blueshouse.asm
@@ -9,7 +9,7 @@ BluesHouseScriptPointers: ; 19b47 (6:5b47)
dw BluesHouseScript1
BluesHouseScript0: ; 19b4b (6:5b4b)
- ld hl,$D74A
+ ld hl,wd74a
set 1,[hl]
; trigger the next script
@@ -27,10 +27,10 @@ BluesHouseTextPointers: ; 19b57 (6:5b57)
BluesHouseText1: ; 19b5d (6:5b5d)
db 8
- ld a,[$D74A]
+ ld a,[wd74a]
bit 0,a
jr nz,.GotMap
- ld a,[$D74B]
+ ld a,[wd74b]
bit 5,a
jr nz,.GiveMap
ld hl,DaisyInitialText
@@ -43,12 +43,12 @@ BluesHouseText1: ; 19b5d (6:5b5d)
call GiveItem
jr nc, .BagFull
ld a,$29
- ld [$CC4D],a
+ ld [wcc4d],a
ld a,$11
call Predef ; hide table map object
ld hl,GotMapText
call PrintText
- ld hl,$D74A
+ ld hl,wd74a
set 0,[hl]
jr .done
.GotMap