summaryrefslogtreecommitdiff
path: root/scripts/fuchsiahouse2.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/fuchsiahouse2.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/fuchsiahouse2.asm')
-rwxr-xr-xscripts/fuchsiahouse2.asm10
1 files changed, 5 insertions, 5 deletions
diff --git a/scripts/fuchsiahouse2.asm b/scripts/fuchsiahouse2.asm
index 82957d2d..33bae7e4 100755
--- a/scripts/fuchsiahouse2.asm
+++ b/scripts/fuchsiahouse2.asm
@@ -10,19 +10,19 @@ FuchsiaHouse2TextPointers: ; 750b8 (1d:50b8)
FuchsiaHouse2Text1: ; 750c2 (1d:50c2)
db $08 ; asm
- ld a, [$d78e]
+ ld a, [wd78e]
bit 0, a
jr nz, .subtract ; 0x750c8
ld b,GOLD_TEETH
call IsItemInBag
jr nz, .asm_3f30f ; 0x750cf
- ld a, [$d78e]
+ ld a, [wd78e]
bit 1, a
jr nz, .asm_60cba ; 0x750d6
ld hl, WardenGibberishText1
call PrintText
call YesNoChoice
- ld a, [$cc26]
+ ld a, [wCurrentMenuItem]
and a
ld hl, WardenGibberishText3
jr nz, .asm_61238 ; 0x750e8
@@ -36,7 +36,7 @@ FuchsiaHouse2Text1: ; 750c2 (1d:50c2)
ld a, GOLD_TEETH
ldh [$db], a
callba RemoveItemByID
- ld hl, $d78e
+ ld hl, wd78e
set 1, [hl]
.asm_60cba ; 0x75109
ld hl, WardenThankYouText
@@ -46,7 +46,7 @@ FuchsiaHouse2Text1: ; 750c2 (1d:50c2)
jr nc, .BagFull
ld hl, ReceivedHM04Text
call PrintText
- ld hl, $d78e
+ ld hl, wd78e
set 0, [hl]
jr .asm_52039 ; 0x75122
.subtract ; 0x75124