From fea54c9277808c8de4c4a21078598dc9926d5d31 Mon Sep 17 00:00:00 2001
From: sbird <sbird@no.tld>
Date: Wed, 15 Feb 2023 01:06:24 +0100
Subject: [PATCH] [intro] add fading, refactor abort, align intro gfx

---
 graphics/expansion_intro/rhh_credits.bin | Bin 2048 -> 2048 bytes
 graphics/expansion_intro/rhh_credits.png | Bin 1703 -> 1708 bytes
 src/expansion_intro.c                    |  31 ++++++++++++++++++-----
 3 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/graphics/expansion_intro/rhh_credits.bin b/graphics/expansion_intro/rhh_credits.bin
index 629a2e9544af1ebc9589eb6c6fbe444fb87cad6e..44ec5e7e42e213a791b665e36f5402f490cf21cf 100644
GIT binary patch
literal 2048
zcmeH@S5pE(5QIN;%>ff86fj`M958?ZOsAX?6v3SJ|Gzu8cvQ(B;KALg?WyhQuAOQy
z=RYUl!9xX=D5|KYhFa>Vr-4S{3)Mt3URr3CcN^`39r*Oj$<5Jp(nU8t^x~(FegXtF
zA7ViFL53J6%m|~5363+NdDkCQlS~m|ni*!9WB%8_z@pYIvCIllR#{_RaHGT@Bd&Fu
zY_To1Lrl5b7kYvuyQ0}+U+{oKt#|*ousD)yag3!>*x2esD;)PJXPnE-=7LMoWVqt`
vk3Y)|Ir37s+;PtXk31Fq&%E$TR@gV*`QVc;zKecm2XjmUCIOQ`ITH8*HG>;N

literal 2048
zcmeIuS5I6)3_#&;Vd=g177{}5z1Jj!un;;V^xpsf8&@kpyT5=3t}RQ}%p6;D2;(yw
zh)9ttDowf!nX+Wdkt_0^dGZw~RHRsm(%`%-L0Ck&3YDr<t5K^?y@pq|QB%D8qS;s9
zwD_)7oAxBWL#Hm?di3hkZ{VFDG!*BDjTkj%Jm4oxno8oQ&BR~Lnlo>~qNUgUZ-4mV
zr(c%+w&G84x0=Mq#H<Asvo03>Yr{r#GhxD(Z98`D*>_+qy6;~S|KFh_$3dPrb>`fK
e%LM+)wHvqY+<Wlo$#Vi9wxNO0Kxp8j47>oZ*&9^=

diff --git a/graphics/expansion_intro/rhh_credits.png b/graphics/expansion_intro/rhh_credits.png
index 177022a9d607fee02efd627816b253b4fa37481a..02e1dd3b6e871eec5fa91898acff1c787af20a39 100644
GIT binary patch
delta 890
zcmV-=1BLvj4Xh2YKm&hQNkl<ZScUDFjgq4v41jA3FQ79{)%yGX4|x(uNFdmD*S+1l
z+3dE`0LfQKg7tC<V!uf)KN4UvT<*h?>iTgDL+>V$C07|Te6N_8$5sNcT_t5VYa5}d
z2S0MDlc962s>tpt_4T8;1t~#2*(p)oH<e&kprYMA>FJ6wkP&|@)?|}4f?0uzX1A1W
zC<b9qJLpF?b|FpJjWG};F#sx<lEuK@GoS>!FJ!?saCabc>zT>|-|nE_v4D|N(r<*A
z;F=AL@2hcNo&cVc|IS@4G*j?kYMnp>Sl~Ojtuco>MFtsa%!8?P0tH~HP3BC~y$hfd
z<N$l>WX?35Doua31rQdG^3)8#rEcm>)2Z^vgRlufm=+JH69QoM3i836X*xyLK1<UH
z{I~WMfbIhTLuxg6bJ9p(&jAirc6D{LAs87<64du`(8MoIjz>xlQx59@tSvf8f>{8B
zzA^xtjBDbT{ult3I@nH=i34C?5un@R#050XWM2jF&8&Z<GH28$0O-^i##PLOgBFJY
z0G5!Xl!Sm{>@$;A2Ii9LGGiqENERzl=~DnTruUddzES#~1Neo-;J(mkHe+>PXEHo(
zH2)D`%ykC<eq{#^U~l_hlqK4u1yKBxvr*9<0nCsXn+HgZ&T_sifOMnQVpwZj2qF5M
zB0ID8Mc#h_%)n(80CHvMmX7>G;CF@Kq`tNUuzCP(m110q8F1{lQ;q|OTd$;)57<xv
z_EL8UpkxP&pECfq`UpU)4?cckWqAugljAK=1d_A+Mu3&)%1Ho^auz5u@N7Q?pu;h;
z4)~PA`y63Rb8vXicp$D2Eh>PoBhB^~0E`X*KR17HeZLgI9gVF5FvH^szXYxc+u?q+
z_O_^dAK-)YPLp4N(*f}Gh0KR*1xg!FWgArR@ic(wFkbP+z$&JIx6=TwSO0c%HxT>V
z)d@6jsKS4*2op{Nz{f%GL?~SG<@;^ypr$!*3!>c=gndpG`}P0Jf`1i&?wv7<g3_|2
zrA~6xv!R~@sJJa@HrkJ6#6}uXSQspuczGs}q4ctp$6hdLeUp^oAG>LGXoTJu0Zf)C
zF{fg~;zM6bZye6^-6Xv)0t8Qp!5=Tv)8=TO+J>l55#iqf_+t45`0)UL0GaWSgubl8
QhX4Qo07*qoM6N<$f?7ME7XSbN

delta 885
zcmV-*1B(2t4W|vTKm&hLNkl<ZScUDFi;}7^42G$;F90)+T!g~=KjfiFFG+8(tFAk9
zHoGb&q4_NNOSNgNsSjE6O95s{?LO+*H#|0*dY6&u)Fm-f5R=nZ15mx-whya1=4nUF
z)NPcyq%HxOEBCci4Im+CXEjHz`<5kGGEg|?5PAC=KuVyM%nW~!5-b@gOx$9wvD$=#
zzk-<EDeXP>YCJ4K)C1sxQ&<n|-qD#Ib3LbmZKUPEmK!pa&3?j?=^M`Bi{$r!o}iu$
z3hc9S*Hyq*>ED!VnP;{YWSb|50W{+`mq;oe<G#qo&}vZyDe?pnfNt5?teA~`8z4`>
z0e0CG0bHyK&?SGD0NP?IpT+=;Y)b$>Rs)#QChTkz#)}866EQ$CHgWjFGQc_{GM%CR
zO}z_Xj7PQAjCH)$DS+(9GV5mNA$TKkz+x;1>XY%-QdtLv(AbHT7(h9e0U*ip002(L
z^kgxi0F_t@&~G78p8>$bWH}{8YB3zc-+{)*$})Qk;1++7Xd&qW0PrrvZoF%YvCR5J
z%-o)vP&rD3{XmfRBe|OLM63>A!i}%(^H%dQW=SQJs}TSyu>*j8mTeDQ_djPkjN>OD
zQ^Oaj#f|_L(U^?E9G4ahG`dXr&DzbibcP|zl>svVxV75><VcNnES(|0we$4>zUPgY
z^W_1$*$;nGyw|ZFv9}&Ek@*qP_DhPKFApF?yabS_1Qbd}e+obx&Oo|OEav<+T%#`o
z1Z(IGr+5hxgO2TA1Ypy?1h8_QJPFWl4qz&&AhD5(>L~yc#W_9LKv+X5KFHanVm?*}
zz&X{Y0dSq^wwD3m_CuZrfUhFX@d^N()7cJu0$_iEpDu6;%pu*9!WY{?@fh*t06t}Z
z06z|38%x2hV1If$fGb2_-NV@10WKGOx|$8e{&X=0hgWdD9l-ra1ius6SNBjq15g6N
z_y3;?ejk89O$aMca9US*Ymc3jf=78h2_94;gbo47%AiOUCBmT8O~w^8#RcgrQGD_V
z@ThIs#pwP~m`=E$T=!63$0|q|4;4KpoZ!cG=`=#34a&sn!yQVm8y9f$Q9)TYM+J?A
zlazaB(}?(almdi$tgdtWADvkdwyF?92j(dQsiM)(tKbjd(*XYfni7_^82nq%00000
LNkvXXu0mjfJt3GW

diff --git a/src/expansion_intro.c b/src/expansion_intro.c
index fa4d44601..8fdb7c1cb 100644
--- a/src/expansion_intro.c
+++ b/src/expansion_intro.c
@@ -1,6 +1,5 @@
 #include "global.h"
 #include "bg.h"
-#include "clear_save_data_menu.h"
 #include "decompress.h"
 #include "palette.h"
 #include "sound.h"
@@ -10,6 +9,7 @@
 #include "trig.h"
 #include "main.h"
 #include "intro.h"
+#include "m4a.h"
 #include "expansion_intro.h"
 #include "constants/rgb.h"
 #include "constants/songs.h"
@@ -253,17 +253,34 @@ void Task_HandleExpansionIntro(u8 taskId)
             tState++;
         break;
     case 2:
-        if (tFrameCounter == 208 || gMain.newKeys != 0)
+        if (tFrameCounter == 208)
+        {
             tState++;
+            BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK);
+        }
+        else if (gMain.newKeys != 0)
+        {
+            CpuFill16(0, gPlttBufferFaded, sizeof(gPlttBufferFaded));
+            if (IsCryPlaying())
+                StopCry();
+            m4aSongNumStop(SE_BIKE_HOP);
+            m4aSongNumStop(SE_M_DOUBLE_SLAP);
+            tState++;
+        }
         else
+        {
             tFrameCounter++;
+        }
         break;
     case 3:
-        ResetSpriteData();
-        FreeAllSpritePalettes();
-        DestroyTask(taskId);
-        CreateTask(Task_Scene1_Load, 0);
-        SetMainCallback2(MainCB2_Intro);
+        if (!gPaletteFade.active)
+        {
+            ResetSpriteData();
+            FreeAllSpritePalettes();
+            DestroyTask(taskId);
+            CreateTask(Task_Scene1_Load, 0);
+            SetMainCallback2(MainCB2_Intro);
+        }
         break;
     }
 }