atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Adjust evo strings for HGSS dex (#3375)

Browse source
This commit is contained in:
Pawkkie 2023-10-05 07:58:28 -04:00 committed by GitHub
parent be5683e899
commit 7ebaddc290
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 32 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/strings.h
View file

@ -619,6 +619,7 @@ extern const u8 gText_EVO_PreEvo_PE_Mega[];
extern const u8 gText_EVO_FRIENDSHIP[];
extern const u8 gText_EVO_FRIENDSHIP_DAY[];
extern const u8 gText_EVO_FRIENDSHIP_NIGHT[];
extern const u8 gText_EVO_FRIENDSHIP_MOVE_TYPE[];
extern const u8 gText_EVO_LEVEL[];
extern const u8 gText_EVO_TRADE[];
extern const u8 gText_EVO_TRADE_ITEM[];
@ -639,7 +640,6 @@ extern const u8 gText_EVO_LEVEL_DUSK[];
extern const u8 gText_EVO_ITEM_HOLD_DAY[];
extern const u8 gText_EVO_ITEM_HOLD_NIGHT[];
extern const u8 gText_EVO_MOVE[];
extern const u8 gText_EVO_MOVE_TYPE[];
extern const u8 gText_EVO_MAPSEC[];
extern const u8 gText_EVO_ITEM_MALE[];
extern const u8 gText_EVO_ITEM_FEMALE[];

2
src/pokedex_plus_hgss.c
View file

@ -6505,7 +6505,7 @@ static u8 PrintEvolutionTargetSpeciesAndMethod(u8 taskId, u16 species, u8 depth,
break;
case EVO_FRIENDSHIP_MOVE_TYPE:
StringCopy(gStringVar2, gTypeNames[gEvolutionTable[species][i].param]);
StringExpandPlaceholders(gStringVar4, gText_EVO_MOVE_TYPE );
StringExpandPlaceholders(gStringVar4, gText_EVO_FRIENDSHIP_MOVE_TYPE );
break;
case EVO_MAPSEC:
StringCopy(gStringVar2, gRegionMapEntries[gEvolutionTable[species][i].param].name);

60
src/strings.c
View file

@ -1910,48 +1910,48 @@ const u8 gText_EVO_Buttons_PE[] = _("{DPAD_UPDOWN}EVOs {A_BUTTON}CHECK {START_
const u8 gText_EVO_Buttons_Decapped_PE[] = _("{DPAD_UPDOWN}Evos {A_BUTTON}Check {START_BUTTON}Froms");
const u8 gText_EVO_Name[] = _("{STR_VAR_3}:");
const u8 gText_EVO_PreEvo[] = _("{STR_VAR_1} evolves from {STR_VAR_2}");
const u8 gText_EVO_PreEvo_PE_Mega[] = _("{STR_VAR_1} mega evolves with {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_PreEvo_PE_Mega[] = _("{STR_VAR_1} Mega Evolves with {STR_VAR_2}");
const u8 gText_EVO_FRIENDSHIP[] = _("{LV}{UP_ARROW}, high friendship");
const u8 gText_EVO_FRIENDSHIP_DAY[] = _("{LV}{UP_ARROW}, high friendship, day");
const u8 gText_EVO_FRIENDSHIP_NIGHT[] = _("{LV}{UP_ARROW}, high friendship, night");
const u8 gText_EVO_FRIENDSHIP_MOVE_TYPE[] = _("{LV}{UP_ARROW}, high friendship, {STR_VAR_2} move");
const u8 gText_EVO_LEVEL[] = _("{LV}{UP_ARROW} 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_LEVEL_ATK_GT_DEF[] = _("{LV}{UP_ARROW} to {STR_VAR_2}, Atk > Def");
const u8 gText_EVO_LEVEL_ATK_EQ_DEF[] = _("{LV}{UP_ARROW} to {STR_VAR_2}, Atk = Def");
const u8 gText_EVO_LEVEL_ATK_LT_DEF[] = _("{LV}{UP_ARROW} to {STR_VAR_2}, Atk < Def");
const u8 gText_EVO_LEVEL_SILCOON[] = _("{LV}{UP_ARROW} to {STR_VAR_2}, Silcoon persona");
const u8 gText_EVO_LEVEL_CASCOON[] = _("{LV}{UP_ARROW} to {STR_VAR_2}, Cascoon persona");
const u8 gText_EVO_LEVEL_NINJASK[] = _("{LV}{UP_ARROW} to {STR_VAR_2}");
const u8 gText_EVO_LEVEL_SHEDINJA[] = _("{LV}{UP_ARROW} to {STR_VAR_2}, party<6, 1x POKéBALL");
const u8 gText_EVO_BEAUTY[] = _("{LV}{UP_ARROW}, high beauty");
const u8 gText_EVO_LEVEL_FEMALE[] = _("{LV}{UP_ARROW} to {STR_VAR_2}, is female");
const u8 gText_EVO_LEVEL_MALE[] = _("{LV}{UP_ARROW} to {STR_VAR_2}, is male");
const u8 gText_EVO_LEVEL_NIGHT[] = _("{LV}{UP_ARROW} to {STR_VAR_2}, night");
const u8 gText_EVO_LEVEL_DAY[] = _("{LV}{UP_ARROW} to {STR_VAR_2}, day");
const u8 gText_EVO_LEVEL_DUSK[] = _("{LV}{UP_ARROW} to {STR_VAR_2}, dusk (5-6PM)");
const u8 gText_EVO_ITEM_HOLD_DAY[] = _("{LV}{UP_ARROW}, holds {STR_VAR_2}, day");
const u8 gText_EVO_ITEM_HOLD_NIGHT[] = _("{LV}{UP_ARROW}, holds {STR_VAR_2}, night");
const u8 gText_EVO_MOVE[] = _("{LV}{UP_ARROW}, knows {STR_VAR_2}");
const u8 gText_EVO_MAPSEC[] = _("{LV}{UP_ARROW} 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[] = _("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_LEVEL_RAIN[] = _("{LV}{UP_ARROW} to {STR_VAR_2} while raining");
const u8 gText_EVO_SPECIFIC_MON_IN_PARTY[] = _("{LV}{UP_ARROW} with {STR_VAR_2} in party");
const u8 gText_EVO_LEVEL_DARK_TYPE_MON_IN_PARTY[] = _("{LV}{UP_ARROW} 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_LEVEL_NATURE_AMPED[] = _("LvlUp to {STR_VAR_2}, Amped natures");
const u8 gText_EVO_LEVEL_NATURE_LOW_KEY[] = _("LvlUp to {STR_VAR_2}, Low Key natures");
const u8 gText_EVO_SPECIFIC_MAP[] = _("{LV}{UP_ARROW} on {STR_VAR_2}");
const u8 gText_EVO_LEVEL_NATURE_AMPED[] = _("{LV}{UP_ARROW} to {STR_VAR_2}, Amped natures");
const u8 gText_EVO_LEVEL_NATURE_LOW_KEY[] = _("{LV}{UP_ARROW} to {STR_VAR_2}, Low Key natures");
const u8 gText_EVO_CRITICAL_HITS[] = _("Land {STR_VAR_2} critical hits in\nsingle battle");
const u8 gText_EVO_SCRIPT_TRIGGER_DMG[] = _("Takes at least {STR_VAR_2} HP in damage");
const u8 gText_EVO_DARK_SCROLL[] = _("ScrllOfDrknss is used");
const u8 gText_EVO_WATER_SCROLL[] = _("ScrollOfWatrs is used");
const u8 gText_EVO_ITEM_NIGHT[] = _("{STR_VAR_2} is used, night");
const u8 gText_EVO_ITEM_DAY[] = _("{STR_VAR_2} is used, day");
const u8 gText_EVO_ITEM_HOLD[] = _("LvlUp, holds {STR_VAR_2}");
const u8 gText_EVO_ITEM_HOLD[] = _("{LV}{UP_ARROW}, holds {STR_VAR_2}");
const u8 gText_EVO_UNKNOWN[] = _("Method unknown");
const u8 gText_EVO_NONE[] = _("{STR_VAR_1} has no evolution.");