Leahnaya/pokeemerald
1
0
Fork 0
mirror of https://github.com/pret/pokeemerald.git synced 2026-06-02 22:05:46 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

changed catch rate to words

Browse Source
This commit is contained in:
TheXaman 2021-06-13 01:17:47 +02:00
parent 537a17714c
commit 1530da10a0
3 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/strings.h
View File

@ -552,7 +552,13 @@ extern const u8 gText_Stats_Gender_50[];
extern const u8 gText_Stats_Gender_75[];
extern const u8 gText_Stats_Gender_87_5[];
extern const u8 gText_Stats_Gender_100[];
extern const u8 gText_Stats_Catch[];
extern const u8 gText_Stats_CatchRate[];
extern const u8 gText_Stats_CatchRate_Legend[];
extern const u8 gText_Stats_CatchRate_VeryHard[];
extern const u8 gText_Stats_CatchRate_Difficult[];
extern const u8 gText_Stats_CatchRate_Medium[];
extern const u8 gText_Stats_CatchRate_Relaxed[];
extern const u8 gText_Stats_CatchRate_Easy[];
extern const u8 gText_Stats_ExpYield[];
extern const u8 gText_Stats_EggCycles[];
extern const u8 gText_Stats_EggCycles_VeryFast[];

16
src/pokedex.c
View File

@ -6977,9 +6977,19 @@ static void PrintMonStatsToggle(u8 taskId)
if (gTasks[taskId].data[5] == 0)
{
//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);
PrintInfoScreenTextSmall(gStringVar1, base_x + base_x_offset, base_y + base_y_offset*base_i);
PrintInfoScreenTextSmall(gText_Stats_CatchRate, base_x, base_y + base_y_offset*base_i);
if (gBaseStats[species].catchRate <= 10)
PrintInfoScreenTextSmall(gText_Stats_CatchRate_Legend, base_x + x_offset_column, base_y + base_y_offset*base_i);
else if (gBaseStats[species].catchRate <= 70)
PrintInfoScreenTextSmall(gText_Stats_CatchRate_VeryHard, base_x + x_offset_column, base_y + base_y_offset*base_i);
else if (gBaseStats[species].catchRate <= 100)
PrintInfoScreenTextSmall(gText_Stats_CatchRate_Difficult, base_x + x_offset_column, base_y + base_y_offset*base_i);
else if (gBaseStats[species].catchRate <= 150)
PrintInfoScreenTextSmall(gText_Stats_CatchRate_Medium, base_x + x_offset_column, base_y + base_y_offset*base_i);
else if (gBaseStats[species].catchRate <= 200)
PrintInfoScreenTextSmall(gText_Stats_CatchRate_Relaxed, base_x + x_offset_column, base_y + base_y_offset*base_i);
else
PrintInfoScreenTextSmall(gText_Stats_CatchRate_Easy, base_x + x_offset_column, base_y + base_y_offset*base_i);
base_i++;
//Growth rate

10
src/strings.c
View File

@ -1839,9 +1839,15 @@ const u8 gText_Stats_Gender_50[] = _("♀ 1/1 ♂"); //_("♀ 50 / 50
const u8 gText_Stats_Gender_75[] = _("♀ 3/1 ♂"); //_("♀ 75 / 25 ♂");
const u8 gText_Stats_Gender_87_5[] = _("♀ 7/1 ♂");
const u8 gText_Stats_Gender_100[] = _("♀");
const u8 gText_Stats_Catch[] = _("CATCH RATE: ");
const u8 gText_Stats_CatchRate[] = _("CATCH{0x5B}: ");
const u8 gText_Stats_CatchRate_Legend[] = _("LEGENDARY");
const u8 gText_Stats_CatchRate_VeryHard[] = _("VERY HARD");
const u8 gText_Stats_CatchRate_Difficult[] = _("DIFFICULT");
const u8 gText_Stats_CatchRate_Medium[] = _("MEDIUM");
const u8 gText_Stats_CatchRate_Relaxed[] = _("RELAXED");
const u8 gText_Stats_CatchRate_Easy[] = _("EASY");
const u8 gText_Stats_ExpYield[] = _("EXP YIELD: ");
const u8 gText_Stats_EggCycles[] = _("HATCH SPEED:");
const u8 gText_Stats_EggCycles[] = _("HATCH STEPS:");
const u8 gText_Stats_EggCycles_VeryFast[] = _("{EMOJI_BOLT}{EMOJI_DIZZYEGG}");
const u8 gText_Stats_EggCycles_Fast[] = _("{EMOJI_DIZZYEGG}");
const u8 gText_Stats_EggCycles_Normal[] = _("{EMOJI_DIZZYEGG}{EMOJI_DIZZYEGG}");