diff --git a/PKHeX.Core/Editing/BattleTemplate/Showdown/ShowdownParsing.cs b/PKHeX.Core/Editing/BattleTemplate/Showdown/ShowdownParsing.cs index 8aa9e9afa..87f0199db 100644 --- a/PKHeX.Core/Editing/BattleTemplate/Showdown/ShowdownParsing.cs +++ b/PKHeX.Core/Editing/BattleTemplate/Showdown/ShowdownParsing.cs @@ -78,6 +78,8 @@ public static string GetStringFromForm(byte form, GameStrings strings, ushort sp var result = form >= forms.Length ? string.Empty : forms[form]; // Showdown uses a non-standard representation for some forms, and uses interstitial dashes instead of spaces. + if (strings.Language != LanguageID.English) + return result; return GetShowdownFormName(species, result); } @@ -316,7 +318,7 @@ public static string GetShowdownText(PKM pk, in BattleTemplateExportSettings set { if (pk.Species == 0) return string.Empty; - var set = new ShowdownSet(pk); + var set = new ShowdownSet(pk, settings.Localization); set.InterpretAsPreview(pk); return set.GetText(settings); } @@ -371,7 +373,7 @@ public static IEnumerable GetShowdownSets(IEnumerable data) /// Multi-line string public static string GetLocalizedPreviewText(PKM pk, in BattleTemplateExportSettings settings) { - var set = new ShowdownSet(pk); + var set = new ShowdownSet(pk, settings.Localization); set.InterpretAsPreview(pk); return set.GetText(settings); } diff --git a/PKHeX.Core/Editing/BattleTemplate/Showdown/ShowdownSet.cs b/PKHeX.Core/Editing/BattleTemplate/Showdown/ShowdownSet.cs index 51c78dd66..db721a33e 100644 --- a/PKHeX.Core/Editing/BattleTemplate/Showdown/ShowdownSet.cs +++ b/PKHeX.Core/Editing/BattleTemplate/Showdown/ShowdownSet.cs @@ -82,7 +82,8 @@ private void LoadLines(IEnumerable lines, BattleTemplateLocalization loc private void SanitizeResult(BattleTemplateLocalization localization) { ReviseContextIfPastGenForm(localization.Strings); - FormName = ShowdownParsing.GetFormNameFromShowdownFormName(Species, FormName, Ability); + if (localization.Strings.Language == LanguageID.English) + FormName = ShowdownParsing.GetFormNameFromShowdownFormName(Species, FormName, Ability); Form = ShowdownParsing.GetFormFromString(FormName, localization.Strings, Species, Context); // Handle edge case with fixed-gender forms.