From 857124acf0e5c98458b3604cd14bcd650b795f33 Mon Sep 17 00:00:00 2001 From: Kurt Date: Thu, 16 Jan 2020 18:54:09 -0800 Subject: [PATCH] Swap zen galar -> galar zen ty showdown for changing your convention over a month ago https://github.com/smogon/pokemon-showdown/commit/a01e2a26bc8042c77e786beb84dd9de9f886f285#diff-58e367765263b7e21df251b3e7619b70L9307 --- PKHeX.Core/Editing/ShowdownSet.cs | 4 ++-- PKHeX.Core/PKM/Util/FormConverter.cs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/PKHeX.Core/Editing/ShowdownSet.cs b/PKHeX.Core/Editing/ShowdownSet.cs index d7fcb4e89..00a0a7ab9 100644 --- a/PKHeX.Core/Editing/ShowdownSet.cs +++ b/PKHeX.Core/Editing/ShowdownSet.cs @@ -703,8 +703,8 @@ private static string ConvertFormFromShowdown(string form, int spec, int ability // Darmanitan case (int)Core.Species.Darmanitan: - if (form == "Zen-Galar") - return "Zen Galar"; + if (form == "Galar-Zen") + return "Galar Zen"; return form; default: diff --git a/PKHeX.Core/PKM/Util/FormConverter.cs b/PKHeX.Core/PKM/Util/FormConverter.cs index 81f4acd30..eeca310ad 100644 --- a/PKHeX.Core/PKM/Util/FormConverter.cs +++ b/PKHeX.Core/PKM/Util/FormConverter.cs @@ -262,7 +262,7 @@ private static string[] GetFormsGen5(int species, IReadOnlyList types, I forms[555], // Standard forms[943], // Zen forms[Galarian], // Standard - forms[943] + " " + forms[Galarian], // Zen + forms[Galarian] + " " + forms[943], // Zen }; }