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/ceruleancity2.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/ceruleancity2.asm')
| -rwxr-xr-x | scripts/ceruleancity2.asm | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/scripts/ceruleancity2.asm b/scripts/ceruleancity2.asm index db2d12a1..57c9ea4a 100755 --- a/scripts/ceruleancity2.asm +++ b/scripts/ceruleancity2.asm @@ -4,16 +4,13 @@ Func_74872: ; 74872 (1d:4872) ; the screen then fades out, he disappears, and fades back in call GBFadeIn1 ld a, $07 - ld [$CC4D], a - ld a, $15 - call Predef + ld [wcc4d], a + predef ShowObject ld a, $09 - ld [$CC4D], a - ld a, $11 - call Predef + ld [wcc4d], a + predef HideObject ld a, $06 - ld [$CC4D], a - ld a, $11 - call Predef + ld [wcc4d], a + predef HideObject call GBFadeOut1 ret |