summaryrefslogtreecommitdiff
path: root/scripts/silphco1.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/silphco1.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/silphco1.asm')
-rwxr-xr-xscripts/silphco1.asm9
1 files changed, 4 insertions, 5 deletions
diff --git a/scripts/silphco1.asm b/scripts/silphco1.asm
index 64f93cdc..990e5c2a 100755
--- a/scripts/silphco1.asm
+++ b/scripts/silphco1.asm
@@ -1,16 +1,15 @@
SilphCo1Script: ; 5d44e (17:544e)
call EnableAutoTextBoxDrawing
- ld a, [$d838]
+ ld a, [wd838]
bit 7, a
ret z
- ld hl, $d7b9
+ ld hl, wd7b9
bit 7, [hl]
set 7, [hl]
ret nz
ld a, $4c
- ld [$cc4d], a
- ld a, $15
- jp Predef
+ ld [wcc4d], a
+ predef_jump ShowObject
SilphCo1TextPointers: ; 5d469 (17:5469)
dw SilphCo1Text1