aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/redshouse2f.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/redshouse2f.asm
parentPull a lot of engine out of main.asm (diff)
parentUpdate INSTALL.md (diff)
downloadpokeyellow-fb11ff7e55be56cef9234c8443614f04f2157a1e.tar.gz
pokeyellow-fb11ff7e55be56cef9234c8443614f04f2157a1e.tar.xz
pokeyellow-fb11ff7e55be56cef9234c8443614f04f2157a1e.zip
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/redshouse2f.asm')
-rwxr-xr-xscripts/redshouse2f.asm4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/redshouse2f.asm b/scripts/redshouse2f.asm
index 1004860c..8fcdc66e 100755
--- a/scripts/redshouse2f.asm
+++ b/scripts/redshouse2f.asm
@@ -10,9 +10,9 @@ RedsHouse2FScriptPointers: ; 5c0bc (17:40bc)
RedsHouse2FScript0: ; 5c0c0 (17:40c0)
xor a
- ld [H_CURRENTPRESSEDBUTTONS],a
+ ld [hJoyHeld],a
ld a,8
- ld [$D528],a
+ ld [wd528],a
ld a,1
ld [W_REDSHOUSE2CURSCRIPT],a
ret