summaryrefslogtreecommitdiff
path: root/scripts/copycatshouse2f.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/copycatshouse2f.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/copycatshouse2f.asm')
-rwxr-xr-xscripts/copycatshouse2f.asm8
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/copycatshouse2f.asm b/scripts/copycatshouse2f.asm
index afe589da..ea1e91b3 100755
--- a/scripts/copycatshouse2f.asm
+++ b/scripts/copycatshouse2f.asm
@@ -12,11 +12,11 @@ CopycatsHouse2FTextPointers: ; 5cc74 (17:4c74)
CopycatsHouse2FText1: ; 5cc82 (17:4c82)
db $08 ; asm
- ld a, [$d7af]
+ ld a, [wd7af]
bit 0, a
jr nz, .asm_7ccf3 ; 0x5cc88
ld a, $1
- ld [$cc3c], a
+ ld [wcc3c], a
ld hl, CopycatsHouse2FText_5ccd4
call PrintText
ld b, POKE_DOLL
@@ -32,7 +32,7 @@ CopycatsHouse2FText1: ; 5cc82 (17:4c82)
ld a, POKE_DOLL
ldh [$db], a
callba RemoveItemByID
- ld hl, $d7af
+ ld hl, wd7af
set 0, [hl]
jr .asm_62ecd ; 0x5ccc1
.BagFull
@@ -84,7 +84,7 @@ CopycatsHouse2FText6: ; 5ccfe (17:4cfe)
CopycatsHouse2FText7: ; 5cd03 (17:4d03)
db $08 ; asm
- ld a, [$c109]
+ ld a, [wSpriteStateData1 + 9]
cp $4
ld hl, CopycatsHouse2FText_5cd1c
jr nz, .asm_399a4 ; 0x5cd0c