From 4346faffcce1a635b77becd1ea51a8da6194c7cb Mon Sep 17 00:00:00 2001
From: Alaxandir <jalex01x@gmail.com>
Date: Sat, 10 Sep 2022 19:22:11 -0500
Subject: [PATCH] customized title screen

---
 graphics/title_screen/emerald_version.png | Bin 1138 -> 764 bytes
 graphics/title_screen/trees.png           | Bin 0 -> 1023 bytes
 graphics/title_screen/trees_map.bin       | Bin 0 -> 4096 bytes
 include/constants/map_groups.h            |   2 +
 src/intro.c                               |   2 +-
 src/title_screen.c                        |  78 +++++++++++++++++++---
 6 files changed, 71 insertions(+), 11 deletions(-)
 create mode 100644 graphics/title_screen/trees.png
 create mode 100644 graphics/title_screen/trees_map.bin

diff --git a/graphics/title_screen/emerald_version.png b/graphics/title_screen/emerald_version.png
index 2e8b32da988fe9471126f94bd0fed4bf8a0dedc0..7ef7c907968f26f2bcd539526759303d3f2221dc 100644
GIT binary patch
delta 682
zcmV;b0#*I;2>b<*Bnkm@Qb$4nuFf3kks&^R0(wbAK~z|U?Urk^;~)rzqd|?={QrNu
zylAfVq@L}U&g?Rs6azjIG=XXQFNaW*iz2r>rs*(#7oex?q>JeQp8%P93NEiEQRy_?
z?g;m!?0}mI_gT*KCki5TRsgu(X-adaO9WwC=A^)nI;Q4+A<#-4MFy{?W;~7MPFv=G
ztgH=iGfg*g1&Gj1p{}V5=pCf`jAIAs%Y=qyaK0l~iZR+a8RcbJvU4$K^Jczt+Gn*S
zMXGLq^+ei=staG@PxG--4s$Bic@_Y4Tim>^DKCKx4|5lgL$aEP9T!}z%AO+T`fcIl
z`C$O?T>$(7IbJYRLfAP{M!X2aAOeJcVtxi-xz#&((^9>iuQ`~t<PeOY5zh}fNN~kG
zSvjdp@W$gXAZCZu1pfelLqZDVaiY#%GB(R2)V!`4rtUUk7iz?jBvS|ismmD5Iav9l
zM?igcju#W{oK(T7A!AIzp)v(q&1cK?0QDenxHF#yr!nPkj&k9xewz6R`1oai`sZXz
z#-5f_en#^2I`04sW%>aywpVm~;LpArV0sVOinx^Q&6ke8;MxUr0YrB|)dm5Vn%_#<
zHa@OT07P&G>~((-aFkiv3omV^dlT>kAn67!4T5OvyIt4;uU!C;@8-X4C%^xd|M)`%
zclY|?{SCk;E)+I!4Ip!n#sP7EZ4#xRb1iUQGiMZlqG{D)rRqt^lVaqD0aEf?4K=kH
zk(xIQ2$;fo1R&SmhyUz&5)eUj(gJzDgn148m&O4_8W1Vig*yV}rI%9U0Mc`7UZit~
zG}lay1Gs>zB`9CJE-gI`(mD><g`3J)q%pAN7YFH(B0oOZdi)f8{xba)0W{DsfIKc?
QI{*Lx07*qoM6N<$g78{Ar~m)}

delta 1061
zcmV+=1ls%j1@Z`xB#|*Ye*^tVL_t(oh2>Y-7TYKcHHaOA|Nn1Cn@Q3J*VDeWoSfK>
z(bbBsavcB43a|BkKOf0uzWR#TT`4Vx2>=7eXfEy$mYhe|1}m-SwPuLx{&Zgv$g=1W
zNo>llN_T$A#CHIG_oHIEV4_!PhS_CPSpcK8Vite{zO)4}S=e`Ee}H1<*-fH1Dx{H%
ziaPZtm1c1)N%kDUsay_l*=c4ENRaiuWt3lnX)mx`JhCc2F{jgfuxKdkdkoM3@Os@S
zGok4N@Xnz^7Z!)+70^*bFb~x0NIMN+kOWzhs`{V+-TN5c0GuS7R#a~>cIXrh*6P#@
zm`Qw408jb#7R06=e^?MLZW0v(P(4k|dBu}Ac(qm>iUyEZrIC-axd_bJH9S?H-T;c`
z80J+47Q;?HW)RhaX$H3sfCMSI5EC!B08C%-P6N`^lSy!C6b!Xvr4Y`UDbT!vT;{Ss
zsuo(}z$A@@Ps7o^nZw<(O3q>BrkT!=-y})xoH2S%G<~p?e}Xx8#CRQrSEaZtI#oJn
zY6PwfcjYNnHtp1;ve)Y@H49?CRMP2aFs5z>0nk&*K^|C|#1|I;LigE3v5n*<orS-W
z!^%NQvtEivje02RI?g6M8LUbgvP5*S*{Jo<*^HRAs8aj{;I+)*oYc&_ubyy~8jxia
zL&-E(l>gQef2Y&{c&TC5JRC~>u{#9NF>`2I-2o5+Zy3@EcvtsWC1M~hSi+EB#jgMs
z1}RNzAA>`O`~b-1Mwf5{a9BU|+KUnlH@Rv;jB#>NMQ(yzTX_R;$dLlBcpq<zc?UqG
zK&f7mGyjsszIbtm|M#sw^_SS+$1T}E(Qjv-5$40$f8ztd$WWxHb0la!DDnfSc^P2y
zhW2L}9767O3UlA8KNc-PprfH2B#gtSC4sB=5JufDso2cYKW0#GtWo>Bn%8zYK~C>+
z%_8hfUUbBbVGAIASGj8hYXnV0kj@7P%1K?#C2zZilivu70;(N;mkw1!G$~!m8i~wW
zO3cN6e=0kGe!eZERPIEyt{FnYGIjuxH2}3BWi<$jLu0#WY1#rvgJhys)p=QiBF96b
zQ{y%O)EKK+jAVvQF0!KJgJ?|)z26SjMyT9od!ccXC9ZK%mzLHJAb&Pq>e{utw=z0q
zTHOLvo(U6`EAj0+QjWENvHMLehn2@Jgic(Lf2&_O)Ax?d`#br=OQedNrL2jc=k-V6
z#S2^c!)dOCL+v05=RIzbP5%e5@~$(tM^68i^uAfpvlL6EuLfsxTz5O#{b^~vNj-8g
zx+=4jd*0-Ow>cVQa_Ba={|^8na95hEI(2zH#Lr{+QOdsdDTBejaBmm&BN;rRufNYy
f8;5bz<K6!OnW9$?uAyU|00000NkvXXu0mjf&0hG}

diff --git a/graphics/title_screen/trees.png b/graphics/title_screen/trees.png
new file mode 100644
index 0000000000000000000000000000000000000000..e6d16357932798893c8a2b2923f9bb1e9a6e9226
GIT binary patch
literal 1023
zcmV<b0|5MqP)<h;3K|Lk000e1NJLTq004jh004jl0{{R3F%W$C0000mP)t-s0001-
zz4oll_QmG^)%O4H|Noq{ti{Egti7aSi(+D&IeVmooYhhQ0000000000MRejJ000Au
zNkl<ZXo2mRO;Y195QV*k(rtzt40D4?<pkqU<#jM8V7A#R-mo3RBCAvxWx<xX4>c{x
zl3ITucBYDA%FT+V_36DQDFqY-sc%>}_;ri*1HTqnMW#5G!19_B@EuD6eqv1m++ZmM
zShIqO3U0N4+l3bJF<?PzS(od@$fAH{U6-Q?6j0X>Wx1LTSSr9+2@Zhk>-%yv!2xOm
z7)P)GDWHB-06&K1{Yjt&$n_6p8A<r)WD2|goe|&>w5{aQ2Q^lh^^fImBfy!EzU246
z66+;-Z2-eu84z47u?hW?wFcBgy>qe5#j?Oy%}>_F%HE)`R@io2ax|#jZCR9e@$Si5
zsZ7>tJrc~K;;hAkjoMu{TVntyHukCjxetxAY6ko_09lo}7?T0}&jtwb$$(0T{Zv4u
z1q>1<0xAjEPXx$?LKq1X0hd^))XED0%KQZxsHGQWAT3lHu>YDFXut&-sJ$=AK+u|Q
z;Y(knibU`^A^yYa&+Hv@fcG<dSwI)JSfZB&ux=Cgc%pZF$^a6>{TM*cc{KYT_X;?+
zX#t60)+Kt-W&k)G>ID(^B;Y9p03Hpq{yhQB09Y^omJK&c^^R@QgN%ST{&t|Ceoq4u
z5<mjF&YzV%?%ySlfY;YpfZDC`Bmn%0dJGOI;Q2X{00-rlN?<Uwx*c_e8KQzP1=ef1
zUSij((=?4IKt_<tfa~c*Z|h4{fW$Fq0eqL}d2?->2B<qD|Eb~iG=S>8e$fgd55tl1
zW=DHGlE4NFkpzHF1H_K>hF}Dp8$1LOm>DJ>NKcSnn@j<qkL0?Z^99C1upW<hNZj3g
zdo{=lVGiJ106Xj?;N8@*kn0J~fhU21FvC^?dxL{<U?iY`LlQtvtRX3w9`9`L`j`P&
z1N6)}DFbLT0J|Ce_#o>|_vM&#05O1BS?)PO<{}XQKLx<!PG2N<XK04@VC-|k<4$`3
zcMYru=0q6@49F=^4-Cj|MgkGVw`Q8TQ=k%nL|`OPQJkCo$T1QLj7Bg3m=D+v<1PXU
zpfACAa4*3R0TLeM*?54BdWzJQIR~H$tOR)TGE@?f=>xWd019w12E%-VPtl8oUr7lJ
zJO?C&t6+Zxjbb@b%->)2c%qlBC`0}G%Gm%GWk_Gr86FtK!!QQm2d?!7qE32X;clB)
t)JZ^ijnqX7M16RWbImo^TyxE(>n}%8`gP_!mKOj3002ovPDHLkV1i7F!~p;R

literal 0
HcmV?d00001

diff --git a/graphics/title_screen/trees_map.bin b/graphics/title_screen/trees_map.bin
new file mode 100644
index 0000000000000000000000000000000000000000..97c13a0aaeacdb53cd27febeea641e6f099282a6
GIT binary patch
literal 4096
zcmeIv+ft5U7>Ds@3VWy!p(2ZfI0SM6(g~DKAR<W_D$8OlS|E&;5;YPjEk>3(i{GL2
zZrXchzIW@JdFI-<H?H~bTz9VAROCs=2I<%+9h;<Mt9%6tZL{4DMRwYy*lv65RiaeL
zm)U2(at9oA$YB+ZsC3jZ$5lBY<WI_OPC2dG8JXU*YMfIm(_5$Bc?~kXTSQ`kSRfY2
z&H_0i*<7H}1s65Bl>G6sW>>Vh`rl7O{)U@6bm~erx7>EeUH7!QrcJx+LjIA*o_MM^
z+4t!;;F;&{>(=9eheH01A;U(DCi^kt-kR{v3xi&I<+YIiXvQbAJ}3Jx=6p48!KC*-
om@+NozgzXgPrs7=Z-4x?=AUmCEm^iA<Ts1N0<l0WkevnA0S=ewt^fc4

literal 0
HcmV?d00001

diff --git a/include/constants/map_groups.h b/include/constants/map_groups.h
index 51c633e052bc..9edeec9a8d1e 100755
--- a/include/constants/map_groups.h
+++ b/include/constants/map_groups.h
@@ -616,4 +616,6 @@
 
 #define MAP_GROUPS_COUNT 37
 
+// static const u8 MAP_GROUP_COUNT[] = {57, 4, 6, 6, 6, 5, 6, 7, 8, 9, 7, 7, 14, 8, 17, 10, 23, 13, 15, 15, 2, 2, 2, 3, 1, 1, 1, 108, 61, 89, 2, 1, 13, 1, 1, 3, 1, 0};
+
 #endif // GUARD_CONSTANTS_MAP_GROUPS_H
diff --git a/src/intro.c b/src/intro.c
index b067891429fb..6a5bdb9b6327 100644
--- a/src/intro.c
+++ b/src/intro.c
@@ -1113,7 +1113,7 @@ static u8 SetUpCopyrightScreen(void)
         if (UpdatePaletteFade())
             break;
         CreateTask(Task_Scene1_Load, 0);
-        SetMainCallback2(MainCB2_Intro);
+        SetMainCallback2(CB2_InitTitleScreen);
         if (gMultibootProgramStruct.gcmb_field_2 != 0)
         {
             if (gMultibootProgramStruct.gcmb_field_2 == 2)
diff --git a/src/title_screen.c b/src/title_screen.c
index 25a1d60d055a..2a7e2a30e8fb 100644
--- a/src/title_screen.c
+++ b/src/title_screen.c
@@ -22,6 +22,7 @@
 #include "graphics.h"
 #include "constants/rgb.h"
 #include "constants/songs.h"
+#include "constants/species.h"
 
 #define VERSION_BANNER_RIGHT_TILEOFFSET 64
 #define VERSION_BANNER_LEFT_X 98
@@ -54,12 +55,65 @@ static void SpriteCB_PokemonLogoShine(struct Sprite *sprite);
 // const rom data
 static const u16 sUnusedUnknownPal[] = INCBIN_U16("graphics/title_screen/unused.gbapal");
 
-static const u32 sTitleScreenRayquazaGfx[] = INCBIN_U32("graphics/title_screen/rayquaza.4bpp.lz");
-static const u32 sTitleScreenRayquazaTilemap[] = INCBIN_U32("graphics/title_screen/rayquaza.bin.lz");
+static const u32 sTitleScreenRayquazaGfx[] = INCBIN_U32("graphics/title_screen/trees.4bpp.lz");
+static const u32 sTitleScreenRayquazaTilemap[] = INCBIN_U32("graphics/title_screen/trees_map.bin.lz");
 static const u32 sTitleScreenLogoShineGfx[] = INCBIN_U32("graphics/title_screen/logo_shine.4bpp.lz");
 static const u32 sTitleScreenCloudsGfx[] = INCBIN_U32("graphics/title_screen/clouds.4bpp.lz");
+const u32 gTest_Mon[] = INCBIN_U32("graphics/pokemon/eevee/anim_front.4bpp.lz");
+const u32 gTestPal_Mon[] = INCBIN_U32("graphics/pokemon/eevee/normal.gbapal.lz");
 
+static const struct CompressedSpriteSheet sSpriteSheet_Mon[] =
+{
+    {gTest_Mon, 4096, 777},
+    {NULL},
+};
+
+static const struct CompressedSpritePalette sSpritePal_Mon[] =
+{
+    {gTestPal_Mon, 777},
+    {NULL},
+};
+
+static const union AnimCmd smon_Anim1[] =
+{
+    ANIMCMD_FRAME(0, 30),
+    ANIMCMD_FRAME(64, 30),
+    ANIMCMD_JUMP(0),
+};
 
+static const union AnimCmd *const smon_AnimTable[] =
+{
+        smon_Anim1,
+};
+
+static const struct OamData sMonOamData =
+{
+    .y = 0,
+    .affineMode = 0,
+    .objMode = 0,
+    .mosaic = 0,
+    .bpp = 0,
+    .shape = 0,
+    .x = 0,
+    .matrixNum = 0,
+    .size = 3,
+    .tileNum = 0,
+    .priority = 0,
+    .paletteNum = 0,
+    .affineParam = 0,
+};
+
+static const struct SpriteTemplate sMonSpriteTemplate =
+
+{
+    .tileTag = 777,
+    .paletteTag = 777,
+    .oam = &sMonOamData,
+    .anims = smon_AnimTable,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = SpriteCallbackDummy,
+};
 
 // Used to blend "Emerald Version" as it passes over over the Pokémon banner.
 // Also used by the intro to blend the Game Freak name/logo in and out as they appear and disappear
@@ -507,7 +561,7 @@ static void StartPokemonLogoShine(u8 flashBg)
 
 static void VBlankCB(void)
 {
-    ScanlineEffect_InitHBlankDmaTransfer();
+    //ScanlineEffect_InitHBlankDmaTransfer();
     LoadOam();
     ProcessSpriteCopyRequests();
     TransferPlttBuffer();
@@ -534,7 +588,7 @@ void CB2_InitTitleScreen(void)
         SetGpuReg(REG_OFFSET_BG0CNT, 0);
         SetGpuReg(REG_OFFSET_BG2HOFS, 0);
         SetGpuReg(REG_OFFSET_BG2VOFS, 0);
-        SetGpuReg(REG_OFFSET_BG1HOFS, 0);
+        //SetGpuReg(REG_OFFSET_BG1HOFS, 0);
         SetGpuReg(REG_OFFSET_BG1VOFS, 0);
         SetGpuReg(REG_OFFSET_BG0HOFS, 0);
         SetGpuReg(REG_OFFSET_BG0VOFS, 0);
@@ -555,7 +609,7 @@ void CB2_InitTitleScreen(void)
         // bg1
         LZ77UnCompVram(sTitleScreenCloudsGfx, (void *)(BG_CHAR_ADDR(3)));
         LZ77UnCompVram(gTitleScreenCloudsTilemap, (void *)(BG_SCREEN_ADDR(27)));
-        ScanlineEffect_Stop();
+        //ScanlineEffect_Stop();
         ResetTasks();
         ResetSpriteData();
         FreeAllSpritePalettes();
@@ -565,6 +619,8 @@ void CB2_InitTitleScreen(void)
         LoadCompressedSpriteSheet(&sPokemonLogoShineSpriteSheet[0]);
         LoadPalette(gTitleScreenEmeraldVersionPal, 0x100, 0x20);
         LoadSpritePalette(&sSpritePalette_PressStart[0]);
+        LoadCompressedSpriteSheet(sSpriteSheet_Mon);
+        LoadCompressedSpritePalette(sSpritePal_Mon);
         gMain.state = 2;
         break;
     case 2:
@@ -608,14 +664,14 @@ void CB2_InitTitleScreen(void)
                                     | DISPCNT_OBJ_ON
                                     | DISPCNT_WIN0_ON
                                     | DISPCNT_OBJWIN_ON);
-        m4aSongNumStart(MUS_TITLE);
+        m4aSongNumStart(MUS_EVER_GRANDE);
         gMain.state = 5;
         break;
     case 5:
         if (!UpdatePaletteFade())
         {
             StartPokemonLogoShine(0);
-            ScanlineEffect_InitWave(0, DISPLAY_HEIGHT, 4, 4, 0, SCANLINE_EFFECT_REG_BG1HOFS, TRUE);
+            //ScanlineEffect_InitWave(0, DISPLAY_HEIGHT, 4, 4, 0, SCANLINE_EFFECT_REG_BG1HOFS, TRUE);
             SetMainCallback2(MainCB2);
         }
         break;
@@ -705,6 +761,7 @@ static void Task_TitleScreenPhase2(u8 taskId)
                                     | DISPCNT_OBJ_ON);
         CreatePressStartBanner(START_BANNER_X, 108);
         CreateCopyrightBanner(START_BANNER_X, 148);
+        CreateSprite(&sMonSpriteTemplate, 190, 110, 0);
         gTasks[taskId].data[4] = 0;
         gTasks[taskId].func = Task_TitleScreenPhase3;
     }
@@ -728,6 +785,7 @@ static void Task_TitleScreenPhase3(u8 taskId)
 {
     if ((JOY_NEW(A_BUTTON)) || (JOY_NEW(START_BUTTON)))
     {
+        PlayCryInternal(SPECIES_EEVEE, 0, 120, 10, 0);
         FadeOutBGM(4);
         BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 0x10, RGB_WHITEALPHA);
         SetMainCallback2(CB2_GoToMainMenu);
@@ -754,13 +812,13 @@ static void Task_TitleScreenPhase3(u8 taskId)
         SetGpuReg(REG_OFFSET_BG2Y_L, 0);
         SetGpuReg(REG_OFFSET_BG2Y_H, 0);
         gTasks[taskId].tCounter++;
-        if (gTasks[taskId].tCounter & 1)
+/*         if (gTasks[taskId].tCounter & 1)
         {
             gTasks[taskId].data[4]++;
             gBattle_BG1_Y = gTasks[taskId].data[4] / 2;
             gBattle_BG1_X = 0;
-        }
-        UpdateLegendaryMarkingColor(gTasks[taskId].tCounter);
+        } */
+        //UpdateLegendaryMarkingColor(gTasks[taskId].tCounter);
         if ((gMPlayInfo_BGM.status & 0xFFFF) == 0)
         {
             BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 0x10, RGB_WHITEALPHA);