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 /engine/titlescreen2.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 'engine/titlescreen2.asm')
| -rwxr-xr-x | engine/titlescreen2.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/titlescreen2.asm b/engine/titlescreen2.asm index f81d8bb8..dc1c633a 100755 --- a/engine/titlescreen2.asm +++ b/engine/titlescreen2.asm @@ -89,7 +89,7 @@ TitleBallYTable: ; 372a0 (d:72a0) Func_372ac: ; 372ac (d:72ac) ; Animate the TitleBall if a starter just got scrolled out. - ld a, [wWhichTrade] ; $cd3d + ld a, [wWhichTrade] ; wWhichTrade cp STARTER1 jr z, .ok cp STARTER2 @@ -115,6 +115,6 @@ GetTitleBallY: ; 372c4 (d:72c4) pop de and a ret z - ld [$c328], a + ld [wOAMBuffer + $28], a inc e ret |