Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

changed info per stats toggle page to an equal 5

Browse Source
This commit is contained in:
TheXaman 2021-06-13 00:09:27 +02:00
parent 13256b856e
commit 3896ce3abe
4 changed files with 69 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
graphics/pokedex/HGSS_tilemap_stats_screen.bin
View File

Binary file not shown.

BIN
graphics/pokedex/HGSS_tileset_menu1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

142
src/pokedex.c
View File

@ -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);
}
}

2
src/strings.c
View File

@ -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}");