diff --git a/include/strings.h b/include/strings.h index 3e7ab51fb4..9a76c1afc4 100644 --- a/include/strings.h +++ b/include/strings.h @@ -542,6 +542,7 @@ extern const u8 gText_Stats_SpDefense[]; extern const u8 gText_Stats_EV_Plus1[]; extern const u8 gText_Stats_EV_Plus2[]; extern const u8 gText_Stats_EV_Plus3[]; +extern const u8 gText_Stats_EvStr1Str2[]; extern const u8 gText_Stats_MoveSelectedMax[]; extern const u8 gText_Stats_MoveLevel[]; extern const u8 gText_Stats_Gender_0[]; diff --git a/src/pokedex.c b/src/pokedex.c index d12f53fda8..4454969a1c 100644 --- a/src/pokedex.c +++ b/src/pokedex.c @@ -6852,9 +6852,10 @@ static void PrintMonStatsToggle(u8 taskId) differentEVs++; column = PrintMonStatsToggle_DifferentEVsColumn(differentEVs); base_i = PrintMonStatsToggle_DifferentEVsRow(differentEVs); - PrintInfoScreenTextSmall(gText_Stats_HP, base_x + x_offset_column*column, base_y + base_y_offset*base_i); - PrintMonStatsToggle_EV_Arrows(strBase, EVs, 0); - PrintInfoScreenTextSmall(strBase, base_x + x_offset_column*column + x_offset_value, base_y + base_y_offset*base_i); + StringCopy(gStringVar1, gText_Stats_HP); + PrintMonStatsToggle_EV_Arrows(gStringVar2, EVs, 0); + StringExpandPlaceholders(gStringVar3, gText_Stats_EvStr1Str2); + PrintInfoScreenTextSmall(gStringVar3, base_x + x_offset_column*column, base_y + base_y_offset*base_i); } if (gBaseStats[species].evYield_Speed > 0) //Speed @@ -6862,9 +6863,10 @@ static void PrintMonStatsToggle(u8 taskId) differentEVs++; column = PrintMonStatsToggle_DifferentEVsColumn(differentEVs); base_i = PrintMonStatsToggle_DifferentEVsRow(differentEVs); - PrintInfoScreenTextSmall(gText_Stats_Speed, base_x + x_offset_column*column, base_y + base_y_offset*base_i); - PrintMonStatsToggle_EV_Arrows(strBase, EVs, 1); - PrintInfoScreenTextSmall(strBase, base_x + x_offset_column*column + x_offset_value, base_y + base_y_offset*base_i); + StringCopy(gStringVar1, gText_Stats_Speed); + PrintMonStatsToggle_EV_Arrows(gStringVar2, EVs, 1); + StringExpandPlaceholders(gStringVar3, gText_Stats_EvStr1Str2); + PrintInfoScreenTextSmall(gStringVar3, base_x + x_offset_column*column, base_y + base_y_offset*base_i); } if (gBaseStats[species].evYield_Attack > 0) //Attack @@ -6872,9 +6874,10 @@ static void PrintMonStatsToggle(u8 taskId) differentEVs++; column = PrintMonStatsToggle_DifferentEVsColumn(differentEVs); base_i = PrintMonStatsToggle_DifferentEVsRow(differentEVs); - PrintInfoScreenTextSmall(gText_Stats_Attack, base_x + x_offset_column*column, base_y + base_y_offset*base_i); - PrintMonStatsToggle_EV_Arrows(strBase, EVs, 2); - PrintInfoScreenTextSmall(strBase, base_x + x_offset_column*column + x_offset_value, base_y + base_y_offset*base_i); + StringCopy(gStringVar1, gText_Stats_Attack); + PrintMonStatsToggle_EV_Arrows(gStringVar2, EVs, 2); + StringExpandPlaceholders(gStringVar3, gText_Stats_EvStr1Str2); + PrintInfoScreenTextSmall(gStringVar3, base_x + x_offset_column*column, base_y + base_y_offset*base_i); } if (gBaseStats[species].evYield_SpAttack > 0) //Special Attack @@ -6882,9 +6885,10 @@ static void PrintMonStatsToggle(u8 taskId) differentEVs++; column = PrintMonStatsToggle_DifferentEVsColumn(differentEVs); base_i = PrintMonStatsToggle_DifferentEVsRow(differentEVs); - PrintInfoScreenTextSmall(gText_Stats_SpAttack, base_x + x_offset_column*column, base_y + base_y_offset*base_i); - PrintMonStatsToggle_EV_Arrows(strBase, EVs, 3); - PrintInfoScreenTextSmall(strBase, base_x + x_offset_column*column + x_offset_value, base_y + base_y_offset*base_i); + StringCopy(gStringVar1, gText_Stats_SpAttack); + PrintMonStatsToggle_EV_Arrows(gStringVar2, EVs, 3); + StringExpandPlaceholders(gStringVar3, gText_Stats_EvStr1Str2); + PrintInfoScreenTextSmall(gStringVar3, base_x + x_offset_column*column, base_y + base_y_offset*base_i); } if (gBaseStats[species].evYield_Defense > 0) //Defense @@ -6892,9 +6896,10 @@ static void PrintMonStatsToggle(u8 taskId) differentEVs++; column = PrintMonStatsToggle_DifferentEVsColumn(differentEVs); base_i = PrintMonStatsToggle_DifferentEVsRow(differentEVs); - PrintInfoScreenTextSmall(gText_Stats_Defense, base_x + x_offset_column*column, base_y + base_y_offset*base_i); - PrintMonStatsToggle_EV_Arrows(strBase, EVs, 4); - PrintInfoScreenTextSmall(strBase, base_x + x_offset_column*column + x_offset_value, base_y + base_y_offset*base_i); + StringCopy(gStringVar1, gText_Stats_Defense); + PrintMonStatsToggle_EV_Arrows(gStringVar2, EVs, 4); + StringExpandPlaceholders(gStringVar3, gText_Stats_EvStr1Str2); + PrintInfoScreenTextSmall(gStringVar3, base_x + x_offset_column*column, base_y + base_y_offset*base_i); } if (gBaseStats[species].evYield_SpDefense > 0) //Special Defense @@ -6902,9 +6907,10 @@ static void PrintMonStatsToggle(u8 taskId) differentEVs++; column = PrintMonStatsToggle_DifferentEVsColumn(differentEVs); base_i = PrintMonStatsToggle_DifferentEVsRow(differentEVs); - PrintInfoScreenTextSmall(gText_Stats_SpDefense, base_x + x_offset_column*column, base_y + base_y_offset*base_i); - PrintMonStatsToggle_EV_Arrows(strBase, EVs, 5); - PrintInfoScreenTextSmall(strBase, base_x + x_offset_column*column + x_offset_value, base_y + base_y_offset*base_i); + StringCopy(gStringVar1, gText_Stats_SpDefense); + PrintMonStatsToggle_EV_Arrows(gStringVar2, EVs, 5); + StringExpandPlaceholders(gStringVar3, gText_Stats_EvStr1Str2); + PrintInfoScreenTextSmall(gStringVar3, base_x + x_offset_column*column, base_y + base_y_offset*base_i); } } else //3 different EVs in 1 row @@ -6912,49 +6918,55 @@ static void PrintMonStatsToggle(u8 taskId) column = 0; if (gBaseStats[species].evYield_HP > 0) //HP { - PrintInfoScreenTextSmall(gText_Stats_HP, base_x + 29*column, base_y); - PrintMonStatsToggle_EV_Arrows(strBase, EVs, 0); - PrintInfoScreenTextSmall(strBase, base_x + 29*column + 21, base_y); + StringCopy(gStringVar1, gText_Stats_HP); + PrintMonStatsToggle_EV_Arrows(gStringVar2, EVs, 0); + StringExpandPlaceholders(gStringVar3, gText_Stats_EvStr1Str2); + PrintInfoScreenTextSmall(gStringVar3, base_x + 29*column, base_y + base_y_offset*base_i); column++; } if (gBaseStats[species].evYield_Speed > 0) //Speed { - PrintInfoScreenTextSmall(gText_Stats_Speed, base_x + 29*column, base_y); - PrintMonStatsToggle_EV_Arrows(strBase, EVs, 1); - PrintInfoScreenTextSmall(strBase, base_x + 29*column + 21, base_y); + StringCopy(gStringVar1, gText_Stats_Speed); + PrintMonStatsToggle_EV_Arrows(gStringVar2, EVs, 1); + StringExpandPlaceholders(gStringVar3, gText_Stats_EvStr1Str2); + PrintInfoScreenTextSmall(gStringVar3, base_x + 29*column, base_y + base_y_offset*base_i); column++; } if (gBaseStats[species].evYield_Attack > 0) //Attack { - PrintInfoScreenTextSmall(gText_Stats_Attack, base_x + 29*column, base_y); - PrintMonStatsToggle_EV_Arrows(strBase, EVs, 2); - PrintInfoScreenTextSmall(strBase, base_x + 29*column + 21, base_y); + StringCopy(gStringVar1, gText_Stats_Attack); + PrintMonStatsToggle_EV_Arrows(gStringVar2, EVs, 2); + StringExpandPlaceholders(gStringVar3, gText_Stats_EvStr1Str2); + PrintInfoScreenTextSmall(gStringVar3, base_x + 29*column, base_y + base_y_offset*base_i); column++; } if (gBaseStats[species].evYield_SpAttack > 0) //Special Attack { - PrintInfoScreenTextSmall(gText_Stats_SpAttack, base_x + 29*column, base_y); - PrintMonStatsToggle_EV_Arrows(strBase, EVs, 3); - PrintInfoScreenTextSmall(strBase, base_x + 29*column + 21, base_y); + StringCopy(gStringVar1, gText_Stats_SpAttack); + PrintMonStatsToggle_EV_Arrows(gStringVar2, EVs, 3); + StringExpandPlaceholders(gStringVar3, gText_Stats_EvStr1Str2); + PrintInfoScreenTextSmall(gStringVar3, base_x + 29*column, base_y + base_y_offset*base_i); column++; } if (gBaseStats[species].evYield_Defense > 0) //Defense { - PrintInfoScreenTextSmall(gText_Stats_Defense, base_x + 29*column, base_y); - PrintMonStatsToggle_EV_Arrows(strBase, EVs, 4); - PrintInfoScreenTextSmall(strBase, base_x + 29*column + 21, base_y); + StringCopy(gStringVar1, gText_Stats_Defense); + PrintMonStatsToggle_EV_Arrows(gStringVar2, EVs, 4); + StringExpandPlaceholders(gStringVar3, gText_Stats_EvStr1Str2); + PrintInfoScreenTextSmall(gStringVar3, base_x + 29*column, base_y + base_y_offset*base_i); column++; } if (gBaseStats[species].evYield_SpDefense > 0) //Special Defense { - PrintInfoScreenTextSmall(gText_Stats_SpDefense, base_x + 29*column, base_y); - PrintMonStatsToggle_EV_Arrows(strBase, EVs, 5); - PrintInfoScreenTextSmall(strBase, base_x + 29*column + 21, base_y); + StringCopy(gStringVar1, gText_Stats_SpDefense); + PrintMonStatsToggle_EV_Arrows(gStringVar2, EVs, 5); + StringExpandPlaceholders(gStringVar3, gText_Stats_EvStr1Str2); + PrintInfoScreenTextSmall(gStringVar3, base_x + 29*column, base_y + base_y_offset*base_i); column++; } } diff --git a/src/strings.c b/src/strings.c index 848db7e13c..2cf7311371 100644 --- a/src/strings.c +++ b/src/strings.c @@ -1820,15 +1820,16 @@ const u8 gText_Berries[] = _("BERRIES"); //HGSS_Ui PokedexPlus -const u8 gText_Stats_HP[] = _("HP "); -const u8 gText_Stats_Attack[] = _("ATK "); -const u8 gText_Stats_Defense[] = _("DEF "); -const u8 gText_Stats_Speed[] = _("SPE "); -const u8 gText_Stats_SpAttack[] = _("SP.A "); -const u8 gText_Stats_SpDefense[] = _("SP.D "); +const u8 gText_Stats_HP[] = _("HP"); +const u8 gText_Stats_Attack[] = _("ATK"); +const u8 gText_Stats_Defense[] = _("DEF"); +const u8 gText_Stats_Speed[] = _("SPE"); +const u8 gText_Stats_SpAttack[] = _("SP.A"); +const u8 gText_Stats_SpDefense[] = _("SP.D"); const u8 gText_Stats_EV_Plus1[] = _("{UP_ARROW_2}"); const u8 gText_Stats_EV_Plus2[] = _("{UP_ARROW_2}{UP_ARROW_2}"); const u8 gText_Stats_EV_Plus3[] = _("{UP_ARROW_2}{UP_ARROW_2}{UP_ARROW_2}"); +const u8 gText_Stats_EvStr1Str2[] = _("{STR_VAR_1}{STR_VAR_2}"); const u8 gText_Stats_MoveSelectedMax[] = _("{STR_VAR_1} / {STR_VAR_2}"); const u8 gText_Stats_MoveLevel[] = _("LVL"); const u8 gText_Stats_Gender_0[] = _("♂");