diff options
| author | yenatch <yenatch@gmail.com> | 2014-07-12 09:02:49 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2014-07-12 09:02:49 -0400 |
| commit | fb11ff7e55be56cef9234c8443614f04f2157a1e (patch) | |
| tree | a6aa8d0745bd07d0b80090491b5e4b6652de4420 /scripts/silphco1.asm | |
| parent | Pull a lot of engine out of main.asm (diff) | |
| parent | Update INSTALL.md (diff) | |
| download | pokeyellow-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/silphco1.asm')
| -rwxr-xr-x | scripts/silphco1.asm | 9 |
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 |