diff --git a/engine/movie/splash.asm b/engine/movie/splash.asm index e209935..b6dce88 100644 --- a/engine/movie/splash.asm +++ b/engine/movie/splash.asm @@ -35,6 +35,8 @@ SplashScreen: ; Play GameFreak logo animation call GameFreakPresentsInit + ld de, SFX_GAME_FREAK_LOGO_GS + call PlaySFX .joy_loop call JoyTextDelay ldh a, [hJoyLast] @@ -267,8 +269,6 @@ GameFreakLogo_Bounce: ld a, [hl] sub 48 ld [hl], a - ld de, SFX_DITTO_BOUNCE - call PlaySFX ret .done @@ -287,7 +287,7 @@ GameFreakLogo_Ditto: ld hl, SPRITEANIMSTRUCT_VAR2 ; frame count add hl, bc ld a, [hl] - cp 32 + cp 40 jr nc, .start_transform inc [hl] ret diff --git a/engine/movie/title.asm b/engine/movie/title.asm index 16d56ab..07abbb5 100644 --- a/engine/movie/title.asm +++ b/engine/movie/title.asm @@ -47,31 +47,37 @@ _TitleScreen: ; Apply logo gradient: ; lines 3-4 - hlbgcoord 0, 3 + hlbgcoord 0, 2 ld bc, 2 * BG_MAP_WIDTH ld a, 2 call ByteFill ; line 5 - hlbgcoord 0, 5 + hlbgcoord 0, 4 ld bc, BG_MAP_WIDTH ld a, 3 call ByteFill ; line 6 - hlbgcoord 0, 6 + hlbgcoord 0, 5 ld bc, BG_MAP_WIDTH ld a, 4 call ByteFill ; line 7 - hlbgcoord 0, 7 + hlbgcoord 0, 6 ld bc, BG_MAP_WIDTH ld a, 5 call ByteFill ; lines 8-9 - hlbgcoord 0, 8 + hlbgcoord 0, 7 ld bc, 2 * BG_MAP_WIDTH ld a, 6 call ByteFill +; 'CRYSTAL VERSION' + hlbgcoord 5, 8 + ld bc, 11 ; length of version text + ld a, 1 + call ByteFill + ; 'CRYSTAL VERSION' hlbgcoord 5, 9 ld bc, 11 ; length of version text @@ -105,16 +111,16 @@ _TitleScreen: call ByteFill ; Draw Pokemon logo - hlcoord 0, 3 - lb bc, 7, 20 + hlcoord 0, 2 + lb bc, 8, 20 ld d, $80 ld e, 20 call DrawTitleGraphic ; Draw copyright text hlbgcoord 3, 0, vBGMap1 - lb bc, 1, 13 - ld d, $c + lb bc, 2, 13 + ld d, $20 ld e, 16 call DrawTitleGraphic diff --git a/gfx/splash/ditto.pal b/gfx/splash/ditto.pal index b1712ef..e30cd2b 100644 --- a/gfx/splash/ditto.pal +++ b/gfx/splash/ditto.pal @@ -1,4 +1,4 @@ RGB 31, 31, 31 RGB 13, 11, 00 - RGB 23, 12, 28 + RGB 17, 22, 28 RGB 00, 00, 00 diff --git a/gfx/splash/ditto_fade.pal b/gfx/splash/ditto_fade.pal index 91e2641..0db8965 100644 --- a/gfx/splash/ditto_fade.pal +++ b/gfx/splash/ditto_fade.pal @@ -2,19 +2,19 @@ ; Fade from pink to orange. ; One color per step. - RGB 23, 12, 28 - RGB 23, 12, 27 - RGB 23, 13, 26 - RGB 23, 13, 24 - RGB 24, 14, 22 - RGB 24, 14, 20 - RGB 24, 15, 18 - RGB 24, 15, 16 - RGB 25, 16, 14 - RGB 25, 16, 12 - RGB 25, 17, 10 - RGB 25, 17, 08 - RGB 26, 18, 06 - RGB 26, 18, 04 + RGB 17, 22, 28 + RGB 17, 22, 27 + RGB 18, 22, 26 + RGB 19, 22, 24 + RGB 19, 21, 22 + RGB 20, 21, 20 + RGB 21, 21, 18 + RGB 21, 21, 16 + RGB 22, 20, 14 + RGB 23, 20, 12 + RGB 23, 20, 10 + RGB 24, 20, 08 + RGB 25, 19, 06 + RGB 25, 19, 04 RGB 26, 19, 02 RGB 26, 19, 00 diff --git a/gfx/title/logo.png b/gfx/title/logo.png index 2bfff59..6918da1 100644 Binary files a/gfx/title/logo.png and b/gfx/title/logo.png differ