summaryrefslogtreecommitdiff
path: root/scripts/fuchsiahouse3.asm
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2014-07-12 09:02:49 -0400
committeryenatch <yenatch@gmail.com>2014-07-12 09:02:49 -0400
commitfb11ff7e55be56cef9234c8443614f04f2157a1e (patch)
treea6aa8d0745bd07d0b80090491b5e4b6652de4420 /scripts/fuchsiahouse3.asm
parent15427f532085846ab6b51719be687951a094cb6c (diff)
parent9f29f21d9d43baa7124991dcf3b093fc6c615706 (diff)
Merge pull request #48 from yenatch/master
Clean up post-split main.asm. Get rid of static wram addresses. Lay out a foundation for Yellow.
Diffstat (limited to 'scripts/fuchsiahouse3.asm')
-rwxr-xr-xscripts/fuchsiahouse3.asm6
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/fuchsiahouse3.asm b/scripts/fuchsiahouse3.asm
index ec5654ba..372df6a6 100755
--- a/scripts/fuchsiahouse3.asm
+++ b/scripts/fuchsiahouse3.asm
@@ -6,7 +6,7 @@ FuchsiaHouse3TextPointers: ; 5617f (15:617f)
FuchsiaHouse3Text1: ; 56181 (15:6181)
db $08 ; asm
- ld a, [$d728]
+ ld a, [wd728]
bit 4, a
jr nz, .after
@@ -14,7 +14,7 @@ FuchsiaHouse3Text1: ; 56181 (15:6181)
call PrintText
call YesNoChoice
- ld a, [$cc26]
+ ld a, [wCurrentMenuItem]
and a
jr nz, .refused
@@ -22,7 +22,7 @@ FuchsiaHouse3Text1: ; 56181 (15:6181)
call GiveItem
jr nc, .full
- ld hl, $d728
+ ld hl, wd728
set 4, [hl]
ld hl, FuchsiaHouse3Text_561c2