From ac56eec979af7de6310d7c585b632879cf0db030 Mon Sep 17 00:00:00 2001 From: TheXaman Date: Sat, 12 Jun 2021 23:00:58 +0200 Subject: [PATCH] shortened evo methodes, fixed typos --- src/strings.c | 76 +++++++++++++++++++++++++-------------------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/src/strings.c b/src/strings.c index 9476cbc7e7..420894fe89 100644 --- a/src/strings.c +++ b/src/strings.c @@ -1840,7 +1840,7 @@ 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_ExpYield[] = _("EXP YIELD: "); -const u8 gText_Stats_EggCycles[] = _("EGG CYCLES: "); +const u8 gText_Stats_EggCycles[] = _("HATCH SPEED:"); 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}"); @@ -1862,17 +1862,17 @@ const u8 gText_Stats_Minus[] = _("-"); const u8 gText_Stats_eggGroup_g1[] = _("EGG G1:"); const u8 gText_Stats_eggGroup_g2[] = _("EGG G2:"); const u8 gText_Stats_eggGroup_MONSTER[] = _("MONSTER"); -const u8 gText_Stats_eggGroup_WATER_1[] = _("WATER 1"); +const u8 gText_Stats_eggGroup_WATER_1[] = _("WATER{CIRCLE_1}"); const u8 gText_Stats_eggGroup_BUG[] = _("BUG"); const u8 gText_Stats_eggGroup_FLYING[] = _("FLYING"); const u8 gText_Stats_eggGroup_FIELD[] = _("FIELD"); -const u8 gText_Stats_eggGroup_FAIRY[] = _("FAIR"); +const u8 gText_Stats_eggGroup_FAIRY[] = _("FAIRY"); const u8 gText_Stats_eggGroup_GRASS[] = _("GRASS"); -const u8 gText_Stats_eggGroup_HUMAN_LIKE[] = _("HUMAN LIKE"); -const u8 gText_Stats_eggGroup_WATER_3[] = _("WATER 3"); +const u8 gText_Stats_eggGroup_HUMAN_LIKE[] = _("HUMAN"); +const u8 gText_Stats_eggGroup_WATER_3[] = _("WATER{CIRCLE_3}"); const u8 gText_Stats_eggGroup_MINERAL[] = _("MINERAL"); const u8 gText_Stats_eggGroup_AMORPHOUS[] = _("AMORPHOUS"); -const u8 gText_Stats_eggGroup_WATER_2[] = _("WATER 2"); +const u8 gText_Stats_eggGroup_WATER_2[] = _("WATER{CIRCLE_2}"); const u8 gText_Stats_eggGroup_DITTO[] = _("DITTO"); const u8 gText_Stats_eggGroup_DRAGON[] = _("DRAGON"); const u8 gText_Stats_eggGroup_UNDISCOVERED[]= _("---"); @@ -1880,37 +1880,37 @@ const u8 gText_Dex_SEEN[] = _("SEEN"); const u8 gText_Dex_OWN[] = _("OWN"); const u8 gText_EVO_Name[] = _("{STR_VAR_3}:"); -const u8 gText_EVO_FRIENDSHIP[] = _("Lvl up with friendship >= 220"); -const u8 gText_EVO_FRIENDSHIP_DAY[] = _("Lvl up at day with friendship >= 220"); -const u8 gText_EVO_FRIENDSHIP_NIGHT[] = _("Lvl up at night with friendship >= 220"); -const u8 gText_EVO_LEVEL[] = _("Lvl up to {STR_VAR_2}"); -const u8 gText_EVO_TRADE[] = _("via trading"); -const u8 gText_EVO_TRADE_ITEM[] = _("via trading while holding {STR_VAR_2}"); -const u8 gText_EVO_ITEM[] = _("{STR_VAR_2} is used on Pokémon"); -const u8 gText_EVO_LEVEL_ATK_GT_DEF[] = _("Lvl up to {STR_VAR_2} with attack > defense"); -const u8 gText_EVO_LEVEL_ATK_EQ_DEF[] = _("Lvl up to {STR_VAR_2} with attack = defense"); -const u8 gText_EVO_LEVEL_ATK_LT_DEF[] = _("Lvl up to {STR_VAR_2} with attack < defense"); -const u8 gText_EVO_LEVEL_SILCOON[] = _("Lvl up to {STR_VAR_2} with Silcoon persona"); -const u8 gText_EVO_LEVEL_CASCOON[] = _("Lvl up to {STR_VAR_2} with Cascoon persona"); -const u8 gText_EVO_LEVEL_NINJASK[] = _("Lvl up to {STR_VAR_2}"); -const u8 gText_EVO_LEVEL_SHEDINJA[] = _("Lvl up to {STR_VAR_2}, party<6, 1x POKéBALL"); -const u8 gText_EVO_BEAUTY[] = _("Lvl up with beauty >= {STR_VAR_2}"); -const u8 gText_EVO_LEVEL_FEMALE[] = _("Lvl up to {STR_VAR_2}, is female"); -const u8 gText_EVO_LEVEL_MALE[] = _("Lvl up to {STR_VAR_2}, is male"); -const u8 gText_EVO_LEVEL_NIGHT[] = _("Lvl up to {STR_VAR_2} at night"); -const u8 gText_EVO_LEVEL_DAY[] = _("Lvl up to {STR_VAR_2} at day"); -const u8 gText_EVO_LEVEL_DUSK[] = _("Lvl up to {STR_VAR_2} at dusk (5-6 P.M)"); -const u8 gText_EVO_ITEM_HOLD_DAY[] = _("Lvl up, holds {STR_VAR_2} at day"); -const u8 gText_EVO_ITEM_HOLD_NIGHT[] = _("Lvl up, holds{STR_VAR_2} at night"); -const u8 gText_EVO_MOVE[] = _("Lvl up, knows {STR_VAR_2}"); -const u8 gText_EVO_MOVE_TYPE[] = _("Lvl up, knows {STR_VAR_2} type move"); -const u8 gText_EVO_MAPSEC[] = _("Lvl up on {STR_VAR_2}"); +const u8 gText_EVO_FRIENDSHIP[] = _("LvlUp, high friendship"); +const u8 gText_EVO_FRIENDSHIP_DAY[] = _("LvlUp, high friendship, day"); +const u8 gText_EVO_FRIENDSHIP_NIGHT[] = _("Lvlup, high friendship, night"); +const u8 gText_EVO_LEVEL[] = _("LvlUp to {STR_VAR_2}"); +const u8 gText_EVO_TRADE[] = _("Trading"); +const u8 gText_EVO_TRADE_ITEM[] = _("Trading, holding {STR_VAR_2}"); +const u8 gText_EVO_ITEM[] = _("{STR_VAR_2} is used"); +const u8 gText_EVO_LEVEL_ATK_GT_DEF[] = _("LvlUp to {STR_VAR_2}, Atk > Def"); +const u8 gText_EVO_LEVEL_ATK_EQ_DEF[] = _("LvlUp to {STR_VAR_2}, Atk = Def"); +const u8 gText_EVO_LEVEL_ATK_LT_DEF[] = _("LvlUp to {STR_VAR_2}, Atk < Def"); +const u8 gText_EVO_LEVEL_SILCOON[] = _("LvlUp to {STR_VAR_2}, Silcoon persona"); +const u8 gText_EVO_LEVEL_CASCOON[] = _("LvlUp to {STR_VAR_2}, Cascoon persona"); +const u8 gText_EVO_LEVEL_NINJASK[] = _("LvlUp to {STR_VAR_2}"); +const u8 gText_EVO_LEVEL_SHEDINJA[] = _("LvlUp to {STR_VAR_2}, party<6, 1x POKéBALL"); +const u8 gText_EVO_BEAUTY[] = _("LvlUp, high beauty"); +const u8 gText_EVO_LEVEL_FEMALE[] = _("LvlUp to {STR_VAR_2}, is female"); +const u8 gText_EVO_LEVEL_MALE[] = _("LvlUp to {STR_VAR_2}, is male"); +const u8 gText_EVO_LEVEL_NIGHT[] = _("LvlUp to {STR_VAR_2}, night"); +const u8 gText_EVO_LEVEL_DAY[] = _("LvlUp to {STR_VAR_2}, day"); +const u8 gText_EVO_LEVEL_DUSK[] = _("LvlUp to {STR_VAR_2}, dusk (5-6PM)"); +const u8 gText_EVO_ITEM_HOLD_DAY[] = _("LvlUp, holds {STR_VAR_2}, day"); +const u8 gText_EVO_ITEM_HOLD_NIGHT[] = _("LvlUp, holds {STR_VAR_2}, night"); +const u8 gText_EVO_MOVE[] = _("LvlUp, knows {STR_VAR_2}"); +const u8 gText_EVO_MOVE_TYPE[] = _("LvlUp, knows {STR_VAR_2} move"); +const u8 gText_EVO_MAPSEC[] = _("LvlUp on {STR_VAR_2}"); const u8 gText_EVO_ITEM_MALE[] = _("{STR_VAR_2} used on male"); const u8 gText_EVO_ITEM_FEMALE[] = _("{STR_VAR_2} used on female"); -const u8 gText_EVO_LEVEL_RAIN[] = _("Lvl up to {STR_VAR_2} while raining"); -const u8 gText_EVO_SPECIFIC_MON_IN_PARTY[] = _("Lvl up with a {STR_VAR_2} in party"); -const u8 gText_EVO_LEVEL_DARK_TYPE_MON_IN_PARTY[] = _("Lvl up with with dark type in party"); -const u8 gText_EVO_TRADE_SPECIFIC_MON[] = _("is traded for a {STR_VAR_2}"); -const u8 gText_EVO_SPECIFIC_MAP[] = _("Lvl up on {STR_VAR_2}"); -const u8 gText_EVO_NONE[] = _("There is no evolution for {STR_VAR_1}."); -const u8 gText_FORMS_NONE[] = _("No alternate forms for {STR_VAR_1}."); +const u8 gText_EVO_LEVEL_RAIN[] = _("LvlUp to {STR_VAR_2} while raining"); +const u8 gText_EVO_SPECIFIC_MON_IN_PARTY[] = _("LvlUp with {STR_VAR_2} in party"); +const u8 gText_EVO_LEVEL_DARK_TYPE_MON_IN_PARTY[] = _("LvlUp with dark type in party"); +const u8 gText_EVO_TRADE_SPECIFIC_MON[] = _("Traded for {STR_VAR_2}"); +const u8 gText_EVO_SPECIFIC_MAP[] = _("LvlUp on {STR_VAR_2}"); +const u8 gText_EVO_NONE[] = _("{STR_VAR_1} has no evolution."); +const u8 gText_FORMS_NONE[] = _("{STR_VAR_1} has no alternate forms.");