From 3c22d5513045b50e54fe8aadbdd3b6608bafad36 Mon Sep 17 00:00:00 2001
From: TheXaman <maxvdl@web.de>
Date: Mon, 14 Jun 2021 19:18:06 +0200
Subject: [PATCH] form screen new navigation buttons and special case for Unown

---
 .../pokedex/HGSS_tilemap_evo_screen_PE.bin    | Bin 1344 -> 1344 bytes
 .../pokedex/HGSS_tilemap_forms_screen.bin     | Bin 1344 -> 1344 bytes
 graphics/pokedex/HGSS_tileset_menu2.png       | Bin 855 -> 847 bytes
 src/pokedex.c                                 |  14 +++++++++-----
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/graphics/pokedex/HGSS_tilemap_evo_screen_PE.bin b/graphics/pokedex/HGSS_tilemap_evo_screen_PE.bin
index 77ac6ad54f3e98fecd0ecc4f6f28cb3c1ffaa64c..5cabb2e65b814c1f6157fea2adae0e6f45cef910 100644
GIT binary patch
delta 63
zcmX@Wb%1L_1B-A7LnsOiV+fx-pGA7|Iu;?}NQNkeXdr}<F$}Sj@3Y8G{=gCd0Pv6x
A;Q#;t

delta 63
zcmX@Wb%1L_1B-AtLj($pWQdwPpGA7|Iu;?}XoeVuSRjOvaSZX3@3Y8G{=gCd0QX!F
A6951J

diff --git a/graphics/pokedex/HGSS_tilemap_forms_screen.bin b/graphics/pokedex/HGSS_tilemap_forms_screen.bin
index c72154071ceaf220d9f609ace0e6acdf035272df..0e50577f6866b80993bc2643f94c67205bbc105c 100644
GIT binary patch
delta 146
zcmX@Wb%1L_6-#|E0|<mLgrdMOhH!=m25%t5Px>(Ug7rr-L@`7IA&iV+h-L6+@B=~u
QBol+*WJXr|$pWlw0AcVLNdN!<

delta 79
qcmX@Wb%1L_70YBRCO7L~h7g8OAVelXd_pjUA#5@utNmmFRyF{!ybp>1

diff --git a/graphics/pokedex/HGSS_tileset_menu2.png b/graphics/pokedex/HGSS_tileset_menu2.png
index 65018e3a0e6bb2d9de0e21fc11f2f0e64ec66f32..7c271984cbc2a7dba805a4509f726ded6387e6bb 100644
GIT binary patch
delta 671
zcmV;Q0$}~u2G0hNEe8<`CduD7bCEQYe{)GhK~#90wUkY6<1h?`bp>HEYo8(T%nfpZ
zqR6^C0X~7@m6wwf*u!Ib5oGBhDN+_?JIxP<ZK{e=K8t)$b`AsJ@1OR?a0_6b-vjhh
z)wUgEG13N;fpum9%$@)t49(Dl5CDH^JMh2Fz@KJJnIJ;~^pgSt1LzwBpi!nce~hb4
z0?eKP_<RBY&_NhL2Lj9i;4n%C|Cb>FCI-+dlbaGi2UY+;7e-pZp*X<?K&G)`?EwKW
zOMs_!yHM{_&xV%)s+uFc=M*<q&N!j8h618*5P%g?1O1FYp3K+{QZl5Ha~T!D&h5a_
ziU352PDO@H_6<M`N8O&PnVvsYe^UfN5b;!Yb^*B~0WKPj*6`65z%CKz(gyqttY&QD
zoQ3wF1Vrn%(gX5b1KR*PtFf;72$FGtEhomI8I_DS;0L<EfU!-NCs{Xd!eU+S8Frfh
z)N~j7HMV+vHvsX`3J}$>W|rNlK{|PXn70L}5jq%YN(0WQ_I|$gWV{Egf2`=O8T#Pz
zX1Mvycpo6v#nynlMa70R7wh^M2QyA_;^gu~jgpS`^7x<Sb3Y7Vh%Yb&tZ$$H@=H|o
z=b8gl`c8~M)z}w^Ze9S@F$dg}eGgD4!1qdj19(KL{|nH>i4)cN-sWtfK1n#c3CFc$
zHs>W5<FE#-O!K*&+XZ-Ee`EZvWAGSL^)H*-2mB}i$CxsJ;}a!(XyJ!q+ySf`_9S2`
z0aZHgHbB3ytGV~5o4GCh8THq-1#sOf0iyua*^=|7S6fX)E8hi}Bhv}e#;eFyKL@yF
z8x`<n0M~nfvjH4Ac__;IeEbAn0M_31D}dbI$;TA`0JdQk253q84XywH002ovPDHLk
FV1k5QH9i0U

delta 679
zcmV;Y0$Bae2G<6VEe8)907s}UrI9p~e|t$pK~#90wUj|_<1h?Gbp>J4wa*ZEdV^e`
zD7x-WfKOm}<>llA_VAcq1X+4Wij+lJX_^MZHep1`Pa^qc=g<KD{^@^cZUe0AbAWMa
z`hI}SW?En(u#aqj)e|6ushheG0^mO_2maYj{ORTt3E~o9Toe!(Ku-{WybRIJf4fKm
zteye5KLG&fAPk@b0mcB(%@V=i;u2tC0L?PFD*<$11po|TrU`V#2`T^?#*DQF1i&Z(
z9`4(jYM*L0{TQHKbJXuO*_AtIlu$}T0Z}&yz>KJXe#JjeVjLz(8B)r58x_FH9l+6y
z0HhIvHW{+ER{+r*ReNbx+J9-5e+Yme&C|BC3P>FZa8`3Phg(|!t3;Gb3-B{>H)9dk
z%(Mn2AWFZN8j$8Xr~~M%M!KpaNWuY@oCt?TlrqYIH*|pkbDu6xl5SpvO}bn&tTq9t
z=q}c4?)Cas0C8&tNY^lDZo5-~4DtdoZwpW%3^3D>9F8dWalMWtyl+TZf6=uO>frpO
zx%EkV9w5@i(tx~0MTRsM>H25~<Ci#aa(QBpQXlQ*@h|1RZw4^M7nlO}x6gn2%^Lc;
z<N$5`AVQ#Q><dH}Z-C~Q1HNkeEkK(9_d9(D@SRruUw{Tq9B4kiTAWR^CoyLiq2IU6
z#=OL$9rl2oXx{6wn*i@yf3(*&8v7V(f7{q?z^?*uj3EO!K9ItjCVnXV4Zyx&4+54F
z(4^zm0r~)fPUhi46KJQaxi#Yl>p&OLNiATXP642bJD=C81QZ3W1M-J<CrFDg-21x#
zbL30@z{r441Gww~=E(0Ba4hGeo?TJtT*ekqnXdtI86PWve4Y>W6%WYNBw`c7ll=ey
N002ovPDHLkV1i=kG7ta&

diff --git a/src/pokedex.c b/src/pokedex.c
index 4479cb7cdf..8447a7c85c 100644
--- a/src/pokedex.c
+++ b/src/pokedex.c
@@ -7329,9 +7329,9 @@ static void EvoFormsPage_PrintAToggleUpdownEvos(void)
         if (sPokedexView->selectedScreen == EVO_SCREEN)
         {
             if (!HGSS_DECAPPED)
-                AddTextPrinterParameterized3(WIN_NAVIGATION_BUTTONS, 0, x, y, sStatsPageNavigationTextColor, 0, gText_EVO_Buttons_PE);
+                AddTextPrinterParameterized3(WIN_NAVIGATION_BUTTONS, 0, x+9, y, sStatsPageNavigationTextColor, 0, gText_EVO_Buttons_PE);
             else
-                AddTextPrinterParameterized3(WIN_NAVIGATION_BUTTONS, 0, x, y, sStatsPageNavigationTextColor, 0, gText_EVO_Buttons_Decapped_PE);
+                AddTextPrinterParameterized3(WIN_NAVIGATION_BUTTONS, 0, x+9, y, sStatsPageNavigationTextColor, 0, gText_EVO_Buttons_Decapped_PE);
         }
         else if (sPokedexView->selectedScreen == FORMS_SCREEN)
         {
@@ -8231,6 +8231,10 @@ static void PrintForms(u8 taskId, u16 species)
     u8 base_y_offset = 9;
     u8 base_i = 0;
     u8 times = 0;
+    u8 y_offset_icons = 0; //For unown only
+
+    if (species == SPECIES_UNOWN)
+        y_offset_icons = 8;
 
     StringCopy(gStringVar1, gSpeciesNames[species]);
 
@@ -8248,11 +8252,11 @@ static void PrintForms(u8 taskId, u16 species)
             if (times < 7)
                 gTasks[taskId].data[4+times] = CreateMonIcon(speciesForm, SpriteCB_MonIcon, 52 + 34*(times-1), 31, 4, 0); //Create pokemon sprite
             else if (times < 14)
-                gTasks[taskId].data[4+times] = CreateMonIcon(speciesForm, SpriteCB_MonIcon, 18 + 34*(times-7), 70, 4, 0); //Create pokemon sprite
+                gTasks[taskId].data[4+times] = CreateMonIcon(speciesForm, SpriteCB_MonIcon, 18 + 34*(times-7), 70 - y_offset_icons, 4, 0); //Create pokemon sprite
             else if (times < 21)
-                gTasks[taskId].data[4+times] = CreateMonIcon(speciesForm, SpriteCB_MonIcon, 18 + 34*(times-14), 104, 4, 0); //Create pokemon sprite
+                gTasks[taskId].data[4+times] = CreateMonIcon(speciesForm, SpriteCB_MonIcon, 18 + 34*(times-14), 104 - y_offset_icons, 4, 0); //Create pokemon sprite
             else
-                gTasks[taskId].data[4+times] = CreateMonIcon(speciesForm, SpriteCB_MonIcon, 18 + 34*(times-21), 138, 4, 0); //Create pokemon sprite
+                gTasks[taskId].data[4+times] = CreateMonIcon(speciesForm, SpriteCB_MonIcon, 18 + 34*(times-21), 138 - y_offset_icons, 4, 0); //Create pokemon sprite
             gSprites[gTasks[taskId].data[4+times]].oam.priority = 0;
         }
     }