From e799ba8765e88d02a0c3d3de50a49d7b64ace771 Mon Sep 17 00:00:00 2001
From: Martha Schilling <harleyrayquaza@gmail.com>
Date: Wed, 28 Aug 2024 15:03:56 +0100
Subject: [PATCH] Title/Intro screen edits

NOTE: THIS IS STILL A WIP

- Adds 'EXPANSION PAK' text to the title screen.

- Makes the Ditto on the Game Freak presents screen shiny. This'll act as a neat way for people to tell they've correctly patched the ROM.
---
 engine/movie/splash.asm   |   6 +++---
 engine/movie/title.asm    |  24 +++++++++++++++---------
 gfx/splash/ditto.pal      |   2 +-
 gfx/splash/ditto_fade.pal |  28 ++++++++++++++--------------
 gfx/title/logo.png        | Bin 1044 -> 1140 bytes
 5 files changed, 33 insertions(+), 27 deletions(-)

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 2bfff59c9d8d4a188e2df4c35c5bc066954e6237..6918da10c3b820d6c3ae136a5101d648c0a8e787 100644
GIT binary patch
delta 1132
zcmV-y1e5!e2=oY$7k@|s000009s{|*000C#Nkl<Zc-p1bJ#X7a7zgl&VhI#<QFjP;
zqZ7d;U!VYK1liBPojnw)zd<_*K_)ZmroD3y>>`{8O<gO_UOE{Xf}&ZxXwqWDP$gae
z&+#l%5`+?{U<(rY<MVbWN@P1e=>Ne#yTY&|Tv123_$KcLYkzs#4F)Rg1Xq!I(+MsT
z@t+Z&!g^|JMX$MaI)pgr%73B|rYz#g5lG~YZV2$i)@1C$AKHaAA4SLoCG<tlej=Iz
zCIUyoHe6Al6xY9q6zCtg>ZDd85mOG_f;A~T@aj_nSe)U%S2E091zWhHgkh0e4X6Y~
zxT;i=p-u$VxqpX?fSnSjRtG9jlH(Wj3{_E6?qTGhbnslk7Ky+GO6GPPF(jYb!_b;Q
zy;YJsDm*li5`pmWiBlI5HiG%UB}7P04!&LxLsc};ILJF@$&mBP9v_n@#IV^SfOD>1
zkO~((PvpH&qJhNCiO6j_hNXwZP%<p2feD&>fy**+2Y+!AvBeo672Kc<gc97`sfXI-
zMov7b0;7X)Fgj<LNDnufmqzgQ5=+BAk(^p20kao4W_ZEZ14?pZ^-0t#hJIzN!Ti;Q
zNU$oAn<$qj9VCWg2fh^vsU%|4OkJVlf+Sb<4Cl?rxjc^M-XPEmv^$V^%S7Ba7YcZR
znj`s2xqlUOaLEuE9dv6}00!shT!U=Ee|T+pV?}`2h}hL<fWb3-v;A-}B;F9{kT_nf
z6D)LrBj>0k+`=VqWDj|nVxt3DVgb<EA#__K5e6XviF6>)6?b>Kg&W@Sy4i~`DxNU>
zAl-*T$z3QA75hRMggn6-kSQ@(+J(HyMH=z=0Dm=Z8pce}VL=$KlKC#oaPZ4SED_Sf
zKx7(Fv>>h)SxGd0MKBt<Hj@qBXF556G9DBD2<tR)MQsd2Bp0pQ-W&stjX?{zF`9{O
zprL%sRkk1oDZe)6cFt(Ig|}SC9>gbTZl(^}2BL;Th(QW2Y(8n<WS6&i(m}Wb{Z0Jv
zp?|3jt>HTsJwNglKf4=tZpuBF*;N+nYFLf4IA2wxY8;Q^;V?I5+J^JkOmQ}?Mx?6|
z!`>*3)2hlhdk`0{bev{!xrG^^;Z?csueWg7KppqAHlxs|_Hex(wBW>Y>XbAhhA6kk
z$r0SazqW9Lk>PBb#teVM%W9OlW*mG;y?=TBqH{9|Ta(&@{;M<el0_YQclb5DGH2h8
zk**owozCL;2-GQ$vT6o+$8V0oc*rAZ2FP%HEOk5_XO(FNc!z;%do*>KR(^nYbUZbh
z`8lnIXo8#hsu~?@2ID#14zT`icRUY2b^KZQ_s7eJA209i{rm54KCAVW`u&H?*=6<Y
z5Wau+IO`7{?e!y0U$1ZagY{r`Z7&~g_TanEzc|<*TwPwdh<$ZGo%Lsj5wAVO$!$cu
ye%yn<epIOO(cbfE#jx+-!(b0~?z-!*=6?Zih8xk?2Ab0V0000<MNUMnLSTXrEfh@v

delta 1036
zcmV+n1oQj!2$Tqr7k@wk00000@=!a{000BqNkl<Zc-p1bJ&)o>7zgmjIF=%>lufbI
zZ;9O8N3hZ9`dMj)Eh3I@kW}b&)%v!iPn{8I&}>1KHt-EnA&OI!Yqp`HLAN5{$^RJ}
zuK`7|6m*B!@z2lO4BjQz@<sm-{?QhOE#aP8!p-+-JGfBS?SEjP!&Yz~>9?)mM#%q+
z_!2JWZlUQ7w@#N3i@y993Ssgrp8X3X@~Z^_UbzKXx2cv+;euBYazlc?>9{XMb3h@n
z5;ozU0<F3JO{778$6Z$oErpzO;09cf#tWam2*B(X|2sLu)K^f$Jqd<c>I|Tk6ydI1
zD~3i$TBH@+1b^(bymltgfmR$pqa)PWg3<~`9x4xe8a5LWH)xf*X~dAK)D;Y!4fH#$
zxTCCsHqtVX6@1~;S%iaNKXC~Wl9PvTHpEb8CA1#$iP<saysE=%>WUbaM+9)q)l1Uh
zhUbaAcUqQ^xH%d5L&q?$ATd-7Gb*7#bFXlh3%`hqh<`0_0V(4KRUozG=B_Jfd~W2#
zo6ayg2oIwkL!l~I7~UGm_bY4-d!abB6alkWIAwUp_X8^OW37_t8-~@+IE(q~J1MX$
zk)J4+r#vKv@&vw<g0zU(lvCH}I3vYX9pSnhIhV)L{0|893f&1LJ~9#a&4mKqq2@^4
zXupFV?td5}qlbRaGQgnM;~G>0{>^*C2P*=^LBy%P1q_bxZT;n9NPHmBA#uFe2yAqQ
zl^$vdYq;ZsTtVKZ*qT7)*Z_2P3H{L!(jp`vkqIQa;_j|%Sn!EA<ynN$@r>ao<-ZhK
zokEGII2Y0)<Q4XSY>vUwDda;gyAh8M(BPqA?SBj%W`yBtm7c-`i{A>lL&ypSGBJR%
z0dcoXa-!)C!5HK!W(9sujJSX*o)Z2M_G#veDl9`JmyO5X8Uv24MGJT^+L<e%rF6<w
zHXsJ6zO(je&1hG{C$8fR;v2NKa}Qk!QNty~ASD;Jo;4q`yC=MvAUuK9L;Uh(s0p3r
zCw~?lU+JFT{R2C-`58>yK8elbaWYNfbUztSrtvs_d`zvKH{m+Ab6o9C#$+aAhMjRY
z?oK9YaRzbY-o)J`&TE(eTHclA;84R|2~FHF#*V`(bp;QHQ3K8#r|yzL#1Q3nI5~oQ
z_-73Zj0{)1-I(F8_&6CSz8Mc+Qy0fybbo#(VPjG?eEzBBpEG}b?mz$7U%KVTA0EEy
z!@d6PeSbAvUBZtawyVKt>xNrg9v&VBqr+%5bp7XtGx*`_&mIm&_x*bxaiEv;)nIiQ
zaaciItRv#{_6+{=S)<0STk>ViaNyzd=nS^*y6s<k{{VG|LYFoZE^7b)002ovP6b4+
GLSTZ2J@xAV