diff options
| author | IIMarckus <iimarckus@gmail.com> | 2020-02-09 02:20:05 -0700 |
|---|---|---|
| committer | IIMarckus <iimarckus@gmail.com> | 2020-02-09 02:20:05 -0700 |
| commit | a7e3a999ff21ecac0bfbe7f091f9ff901075a323 (patch) | |
| tree | 8032e91c6a426b355b6d1d3505bbc1fdc9c40fa6 /engine/title.asm | |
| parent | d561a6d2db176240549fa605dc3e7e1f59e86607 (diff) | |
| parent | 0543e933915a65127a8b803789d049478c7889d5 (diff) | |
Merge https://github.com/libjet/pokegold
Diffstat (limited to 'engine/title.asm')
| -rwxr-xr-x | engine/title.asm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/engine/title.asm b/engine/title.asm index 4e9a2d3a..8427dfc9 100755 --- a/engine/title.asm +++ b/engine/title.asm @@ -1,7 +1,7 @@ IntroSequence: ; 6241 (1:6241) - callab Copyright_GFPresents + callfar Copyright_GFPresents jr c, StartTitleScreen - callab GoldSilverIntro + callfar GoldSilverIntro StartTitleScreen: call InitTitleScreen call DelayFrame @@ -58,7 +58,7 @@ InitTitleScreen: ; 6291 (1:6291) ld bc, $2000 xor a call ByteFill - callba ClearAnimatedObjectBuffer + farcall ClearAnimatedObjectBuffer ld hl, TitleScreenGFX1 ld de, $9000 @@ -237,7 +237,7 @@ TitleScreenFrame: ; 63da (1:63da) call Function640f ld a, $1 ld [hOAMUpdate], a - callba AnimatedObjects_PlayFrame + farcall AnimatedObjects_PlayFrame xor a ld [hOAMUpdate], a call Function64b1 @@ -341,8 +341,8 @@ Function6434: ld hl, wce63 inc [hl] xor a - ld [wMusicFadeIDLo], a - ld [wMusicFadeIDHi], a + ld [wMusicFadeID], a + ld [wMusicFadeID + 1], a ld hl, wMusicFade ld [hl], $8 ld hl, wce65 @@ -369,11 +369,11 @@ Function648b: ret DeleteSaveData: - callba DeleteSaveData_ + farcall DeleteSaveData_ jp Init ResetClock: - callba ResetClock_ + farcall ResetClock_ jp Init Function64b1: ; 64b1 (1:64b1) |