From 3896ce3abefa2e68366a36083be9e83ada606a4a Mon Sep 17 00:00:00 2001
From: TheXaman <maxvdl@web.de>
Date: Sun, 13 Jun 2021 00:09:27 +0200
Subject: [PATCH] changed info per stats toggle page to an equal 5

---
 .../pokedex/HGSS_tilemap_stats_screen.bin     | Bin 1344 -> 1344 bytes
 graphics/pokedex/HGSS_tileset_menu1.png       | Bin 1741 -> 1725 bytes
 src/pokedex.c                                 | 142 +++++++++---------
 src/strings.c                                 |   2 +-
 4 files changed, 69 insertions(+), 75 deletions(-)

diff --git a/graphics/pokedex/HGSS_tilemap_stats_screen.bin b/graphics/pokedex/HGSS_tilemap_stats_screen.bin
index a6eb2fd1626def8f8c422588414b94b5bc0a9b57..d6d4fb9463d01eeee51cffb058fc58664a53de79 100644
GIT binary patch
delta 326
zcmaitO-{m46ot?0yCJn>h*qMNI3O;BvIU2-1I9W*w{TX#4jS+$0fb^yPy_)L6hY$#
z2xCV+J8!sO@(s>8$qk**2}%}2wRKR%IW7$GzQq4k*jAhBia*NbO4+Pgdzl*QhDNNf
zSywx%$%1xS)HaXx?tTm58d^Nj9?z^KSK8S)v~QyS0o&Tm-r~*>@B3)m;i;99E^@*n
z*=A7^UM?yg@Q5Cs(8mDJ7-EF6NnY^EvbYSy_THkMk31%r;vFBD;S+N#Oyc8<-;(B1
I68sha4<0*h(EtDd

delta 332
zcmaivO-=$)5QOXTIyjj%Mv)*ftT=`w3|DZ8H(<?*JJboh0g)dQ5SSq<3it<tq9Vit
z7`CwT&A6V}Us8+ePFJ^UyLP1<QB@wxZn}m#8n`foDmRfMeye@1m9^7^U+47HUb=-#
zv<;n5?Xsnk%H^q!v#2eW^kK$B?;kw*%TN+$R$^RhTc220{;te5ZqPS`>uqr1o&TK-
zkP{Z<fJKR>azSH=5$^GTM?B#fV@&X3oGE5JGjSEMQm?_BgFN0a$2&goi3Pr}G>(H6
Mmy+O*M7b5`7lEd4k^lez

diff --git a/graphics/pokedex/HGSS_tileset_menu1.png b/graphics/pokedex/HGSS_tileset_menu1.png
index e9bcae9a1f039f7675ec6c5be87c6aabdb28d2db..5e305a01716e893b2f90d4973c05abd18a7dbc55 100644
GIT binary patch
delta 1578
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

delta 1594
zcmV-A2F3Zk4b2UZ7ae#60{{R3$kFGF00007bV*G`2ju}A6dyChSA`;xG?RbvNkl<Z
zc%0Rky>8<;5P<axMB<vyAaJ)nEa21!!|U3(Mu4hdi(A>1%A`vtpB__4v~tIr;S9;4
zEX9A@>>v&$ivBo%q=wEikhcBrrMgkF2x!~;0Q;t_s@e(}aKOHma@rFCZGix#I^Aid
zl!ZSW-WCP?m5uw9htN}S699kv#sicCbV_Li;5T6$H;0p+0KjPg0P`cjT2#aV%BF;=
znzC)7IdBhLa}xlK15^l5pn)C(P+<>f+kJ7s2hfZ(m;g9U%Z4oWK0pBUBH*UrzoP%i
zZ&w4XjR1@ssNWu9R1Yq4$!!w$1K2o30OU@F7CAdx7g_v9!zQ=EWD$SH4%5Q}V6Lp;
zEFn*$ANM}Utq8jSfC>Qssf^L!AmfDt(4`2w8vq?>0%j-yUQsf9#tKJ(%M#99H=u+u
zrBl#lC;<F|@je&>DD^A$0p?uUdVoy;l)hRe>C4H3igWU`F6}sZNJE^aY%*Sf02r#U
zfI|98N5u3c1D%cm&>?@oFX0IQP3-|3Ik3CU;wCcS)sSYA&nB1ulyTU=9bfJ*OyxZ%
z>FHhedZ%RePPrc-(idIhmQ&?Z5%1fW|4WjmWt68(EFg+eh~w!BoB@O-EC8bw$a{bQ
zJOvZdO=Qn^9B9r1zY7V#HiYqlu#*75kbHs9a6=x<0Ims{B6)v=&u;{vS56<)Muh5D
z;pBNkuS_r6;Qv{G=<CE6P65__zYkDV{k?$t8o)LJdc0p;3s}UMtQ{~L4L%1@oJ?Qw
zAC4abe8?^V<TySP0~JKH(;FAoj)rep-IbE+JLPrt(>YNB;upDH3_sanIGcJ1vtJ6}
zL0*030r{-}Io5vzthDkLfL~Sp4S>gQkKY2Iz7<fgJm(2u+h1w|K3x8dH+nNQAOLJt
z6qPmb+2FN*;s7*Qn*<PY0Hv1za~U9HA?M!pfQPVXK>oT6AQo#XE0qEU@B1PJZ07)d
z3J~K`fFLJQ+Z3>v1w`AVc)J5Y_$R}-PQD-0m!*5*mt23tcK%EP?-~S{3jkO?0N~)>
z{H`jr?p)>p>7k%b92fu%0`Sd01>ga69JKD(=uS_rx``7U+?!wGGw?72ipC!Y$wtM^
z@TqaIq4b8FgaCFDtB6jr060@8uF;89Jr`6dMH>k)mtM{UjO7V{!{l6X4lr*co*!y8
zAPpM4OBa6|wV9m-pdko|&BS6`F`ynl80d5)0BDwYH!ISo&*+FikyoOjzS<6m!$y%?
zM*z*cavJ&09erv(evshZBmiSc_Cm-+GZphm0A)MojC9y^$UXr$dt=Dp?qa}HY(v|{
zfrk81=LG4N&~BjbYJefYJ3ceN1(4qZfQl+JX?lNtza9|I9!~zf3ILzXq-&{;3#Pvj
z5EhJHT?7bUgiiS|hzE4sCO+%UG+<)cnk~1!TJ&$GNx<pGvF4dKCRDpr?)n<(IRVh1
zuW}~i`=V~NrOf~y#(<pr@-aYI`k4u<>EdHG1K3vos8ssIv7$Q#xIuai`|KE?c^Qwp
z;n;uY2J0{QCAx-!@ky$=1_uKFJy%egBpAKUK?4F9*D}DQQ4oN%it5cgKt>@K0DK^#
zGY<$eVHGa{DgmfDK(rN>R0N!aay19g(NmoOq<cq&r;PJ}cL5m2fI3eBtXK-jKLeNy
z_jdn)GEtjx7`<j{9A3C~JCfn^ssJQm6o7w+%K(ei(*l6<80}M!1mK_rK;rHG20-Gh
zdJ>@VHyMpp+Ic`e1sJd@(JxgBaLc(L0}SsEy#VMRO4X-;1ux$*fSkG(fa8zq#|{dS
zDw82GQhw175zFP$4gP?`<;Sre-d?Od*4Dm!ERR+7v780u><>4aQadoX>KtI$9qWJU
z?WI#kbc5g0#^K=~J{W-N27uiOMXm)@Fm<&P4gG%5!AH9bx17cR4S*U;#}3Oe{QVl5
z0NBY+XV=>pKrx4`!SXLmMgjn-)(k+CR!Iu`i_A*L0H8iKVai7lu<X=bk|o8&9}1X!
s>s|v`gkNiK1Sn<BjyeN)xCih*kZ%%Kcgm6UnE(I)07*qoM6N<$f@ZDLzW@LL

diff --git a/src/pokedex.c b/src/pokedex.c
index 4a88db6767..d12f53fda8 100644
--- a/src/pokedex.c
+++ b/src/pokedex.c
@@ -6958,50 +6958,12 @@ static void PrintMonStatsToggle(u8 taskId)
                 column++;
             }
         }
-
+        base_i++;
     }
 
-
-    base_y = 86;
-    base_i = 0;
-
+    //TOGGLE--------------------------------------
     if (gTasks[taskId].data[5] == 0)
     {
-        //Exp Yield
-        PrintInfoScreenTextSmall(gText_Stats_ExpYield, base_x, base_y + base_y_offset*base_i);
-        ConvertIntToDecimalStringN(gStringVar1, gBaseStats[species].expYield, STR_CONV_MODE_RIGHT_ALIGN, 3);
-        PrintInfoScreenTextSmall(gStringVar1, base_x + base_x_offset, base_y + base_y_offset*base_i);
-        base_i++;
-
-        //friendship
-        PrintInfoScreenTextSmall(gText_Stats_Friendship, base_x, base_y + base_y_offset*base_i);
-        switch (gBaseStats[species].friendship)
-        {
-        case 35:
-            StringCopy(strEV, gText_Stats_Friendship_BigAnger);
-            break;
-        case 70:
-            StringCopy(strEV, gText_Stats_Friendship_Neutral);
-            break;
-        case 90:
-            StringCopy(strEV, gText_Stats_Friendship_Happy);
-            break;
-        case 100:
-            StringCopy(strEV, gText_Stats_Friendship_Happy);
-            break;
-        case 140:
-            StringCopy(strEV, gText_Stats_Friendship_BigSmile);
-            break;
-        default:
-            ConvertIntToDecimalStringN(strEV, gBaseStats[species].friendship, STR_CONV_MODE_RIGHT_ALIGN, 3);
-            break;
-        }
-        // ConvertIntToDecimalStringN(strEV, gBaseStats[species].friendship, STR_CONV_MODE_RIGHT_ALIGN, 3);
-        align_x = GetStringRightAlignXOffset(0, strEV, total_x);
-        PrintInfoScreenTextSmall(strEV, align_x, base_y + base_y_offset*base_i);
-        base_i++;
-
-
         //Catch rate
         PrintInfoScreenTextSmall(gText_Stats_Catch, base_x, base_y + base_y_offset*base_i);
         ConvertIntToDecimalStringN(gStringVar1, gBaseStats[species].catchRate, STR_CONV_MODE_RIGHT_ALIGN, 3);
@@ -7038,7 +7000,72 @@ static void PrintMonStatsToggle(u8 taskId)
     }
     else
     {
-        base_i = 0;
+        //Exp Yield
+        PrintInfoScreenTextSmall(gText_Stats_ExpYield, base_x, base_y + base_y_offset*base_i);
+        ConvertIntToDecimalStringN(gStringVar1, gBaseStats[species].expYield, STR_CONV_MODE_RIGHT_ALIGN, 3);
+        PrintInfoScreenTextSmall(gStringVar1, base_x + base_x_offset, base_y + base_y_offset*base_i);
+        base_i++;
+
+        //Friendship
+        PrintInfoScreenTextSmall(gText_Stats_Friendship, base_x, base_y + base_y_offset*base_i);
+        switch (gBaseStats[species].friendship)
+        {
+        case 35:
+            StringCopy(strEV, gText_Stats_Friendship_BigAnger);
+            break;
+        case 70:
+            StringCopy(strEV, gText_Stats_Friendship_Neutral);
+            break;
+        case 90:
+            StringCopy(strEV, gText_Stats_Friendship_Happy);
+            break;
+        case 100:
+            StringCopy(strEV, gText_Stats_Friendship_Happy);
+            break;
+        case 140:
+            StringCopy(strEV, gText_Stats_Friendship_BigSmile);
+            break;
+        default:
+            ConvertIntToDecimalStringN(strEV, gBaseStats[species].friendship, STR_CONV_MODE_RIGHT_ALIGN, 3);
+            break;
+        }
+        align_x = GetStringRightAlignXOffset(0, strEV, total_x);
+        PrintInfoScreenTextSmall(strEV, align_x, base_y + base_y_offset*base_i);
+        base_i++;
+
+        //Egg cycles
+        if (gBaseStats[species].eggGroup1 == EGG_GROUP_UNDISCOVERED || gBaseStats[species].eggGroup2 == EGG_GROUP_UNDISCOVERED) //Species without eggs (legendaries etc)
+        {
+            PrintInfoScreenTextSmall(gText_Stats_EggCycles, base_x, base_y + base_y_offset*base_i);
+            PrintInfoScreenTextSmall(gText_ThreeDashes, 78, base_y + base_y_offset*base_i);
+        }
+        else
+        {
+            PrintInfoScreenTextSmall(gText_Stats_EggCycles, base_x, base_y + base_y_offset*base_i);
+            if (gBaseStats[species].eggCycles <= 10)
+            {
+                StringCopy(strEV, gText_Stats_EggCycles_VeryFast);
+                align_x = 76;
+            }
+            else if (gBaseStats[species].eggCycles <= 20)
+            {
+                StringCopy(strEV, gText_Stats_EggCycles_Fast);
+                align_x = 85;
+            }
+            else if (gBaseStats[species].eggCycles <= 30)
+            {
+                StringCopy(strEV, gText_Stats_EggCycles_Normal);
+                align_x = 76;
+            }
+            else
+            {
+                StringCopy(strEV, gText_Stats_EggCycles_Slow);
+                align_x = 67;
+            }
+            PrintInfoScreenTextSmall(strEV, align_x, base_y + base_y_offset*base_i);
+        }
+        base_i++;
+
         //Egg group 1
         switch (gBaseStats[species].eggGroup1)
         {
@@ -7088,7 +7115,6 @@ static void PrintMonStatsToggle(u8 taskId)
             StringCopy(gStringVar1, gText_Stats_eggGroup_UNDISCOVERED);
             break;
         }
-
         //Egg group 2
         if (gBaseStats[species].eggGroup1 != gBaseStats[species].eggGroup2)
         {
@@ -7150,38 +7176,6 @@ static void PrintMonStatsToggle(u8 taskId)
             PrintInfoScreenTextSmall(gStringVar1, base_x, base_y + base_y_offset*base_i);
         }
         base_i++;
-
-        //Egg cycles
-        if (gBaseStats[species].eggGroup1 == EGG_GROUP_UNDISCOVERED || gBaseStats[species].eggGroup2 == EGG_GROUP_UNDISCOVERED) //Species without eggs (legendaries etc)
-        {
-            PrintInfoScreenTextSmall(gText_Stats_EggCycles, base_x, base_y + base_y_offset*base_i);
-            PrintInfoScreenTextSmall(gText_ThreeDashes, 78, base_y + base_y_offset*base_i);
-        }
-        else
-        {
-            PrintInfoScreenTextSmall(gText_Stats_EggCycles, base_x, base_y + base_y_offset*base_i);
-            if (gBaseStats[species].eggCycles <= 10)
-            {
-                StringCopy(strEV, gText_Stats_EggCycles_VeryFast);
-                align_x = 76;
-            }
-            else if (gBaseStats[species].eggCycles <= 20)
-            {
-                StringCopy(strEV, gText_Stats_EggCycles_Fast);
-                align_x = 85;
-            }
-            else if (gBaseStats[species].eggCycles <= 30)
-            {
-                StringCopy(strEV, gText_Stats_EggCycles_Normal);
-                align_x = 76;
-            }
-            else
-            {
-                StringCopy(strEV, gText_Stats_EggCycles_Slow);
-                align_x = 67;
-            }
-            PrintInfoScreenTextSmall(strEV, align_x, base_y + base_y_offset*base_i);
-        }
     }
 
 
diff --git a/src/strings.c b/src/strings.c
index a65bae0b2a..848db7e13c 100644
--- a/src/strings.c
+++ b/src/strings.c
@@ -1846,7 +1846,7 @@ const u8 gText_Stats_EggCycles_Fast[]       = _("{EMOJI_DIZZYEGG}");
 const u8 gText_Stats_EggCycles_Normal[]     = _("{EMOJI_DIZZYEGG}{EMOJI_DIZZYEGG}");
 const u8 gText_Stats_EggCycles_Slow[]       = _("{EMOJI_DIZZYEGG}{EMOJI_DIZZYEGG}{EMOJI_DIZZYEGG}");
 const u8 gText_Stats_Growthrate[]    = _("GROW: ");
-const u8 gText_Stats_Friendship[]    = _("FRIENDSHIP:" );
+const u8 gText_Stats_Friendship[]    = _("FRIENDSHIP:");
 const u8 gText_Stats_Friendship_BigAnger[]      = _("{EMOJI_BIGANGER}");
 const u8 gText_Stats_Friendship_Neutral[]       = _("{EMOJI_NEUTRAL}");
 const u8 gText_Stats_Friendship_Happy[]         = _("{EMOJI_HAPPY}");