From 15c08ad8a3d520001850cd323dac7c29643f24bc Mon Sep 17 00:00:00 2001 From: mid-kid Date: Thu, 27 Aug 2020 14:52:27 +0200 Subject: [PATCH] Small changes to better match pokegold --- engine/gfx/sprite_anims.asm | 2 +- engine/movie/splash.asm | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/engine/gfx/sprite_anims.asm b/engine/gfx/sprite_anims.asm index 47dd91c96..1bda709e0 100644 --- a/engine/gfx/sprite_anims.asm +++ b/engine/gfx/sprite_anims.asm @@ -220,7 +220,7 @@ DoAnimFrame: callfar ComposeMail_AnimateCursor ret -.GameFreakLogo: +.GameFreakLogo callfar GameFreakLogoSpriteAnim ret diff --git a/engine/movie/splash.asm b/engine/movie/splash.asm index e72568c1d..e395b463c 100644 --- a/engine/movie/splash.asm +++ b/engine/movie/splash.asm @@ -129,7 +129,7 @@ GameFreakPresentsScene: dw GameFreakPresents_WaitSpriteAnim dw GameFreakPresents_PlaceGameFreak dw GameFreakPresents_PlacePresents - dw GameFreakPresents_DelayEnd + dw GameFreakPresents_WaitForTimer GameFreakPresents_NextScene: ld hl, wJumptableIndex @@ -149,17 +149,16 @@ GameFreakPresents_PlaceGameFreak: .PlaceGameFreak: ld [hl], 0 - ld hl, .GAME_FREAK + ld hl, .game_freak decoord 5, 10 - ld bc, .end - .GAME_FREAK + ld bc, .end - .game_freak call CopyBytes call GameFreakPresents_NextScene ld de, SFX_GAME_FREAK_PRESENTS call PlaySFX ret -.GAME_FREAK: - ; G A M E _ F R E A K +.game_freak db 0, 1, 2, 3, 13, 4, 5, 3, 1, 6 .end db "@" @@ -186,7 +185,7 @@ GameFreakPresents_PlacePresents: .end db "@" -GameFreakPresents_DelayEnd: +GameFreakPresents_WaitForTimer: ld hl, wIntroSceneTimer ld a, [hl] cp 128