diff --git a/PKHeX.Core/PKM/Util/Conversion/FormConverter.cs b/PKHeX.Core/PKM/Util/Conversion/FormConverter.cs index 3bb5021d1..e83daac16 100644 --- a/PKHeX.Core/PKM/Util/Conversion/FormConverter.cs +++ b/PKHeX.Core/PKM/Util/Conversion/FormConverter.cs @@ -38,7 +38,7 @@ public static string[] GetFormList(ushort species, IReadOnlyList types, <= Legal.MaxSpeciesID_3 => GetFormsGen3(species, types, forms, generation), <= Legal.MaxSpeciesID_4 => GetFormsGen4(species, types, forms, generation), <= Legal.MaxSpeciesID_5 => GetFormsGen5(species, types, forms, generation), - <= Legal.MaxSpeciesID_6 => GetFormsGen6(species, types, forms, genders, generation, context), + <= Legal.MaxSpeciesID_6 => GetFormsGen6(species, types, forms, genders, context), <= Legal.MaxSpeciesID_7_USUM => GetFormsGen7(species, types, forms, generation), <= Legal.MaxSpeciesID_8a => GetFormsGen8(species, generation, types, forms, genders), _ => GetFormsGen9(species, generation, types, forms, genders), @@ -220,11 +220,12 @@ private static string[] GetFormsGen5(ushort species, IReadOnlyList types }; } - private static string[] GetFormsGen6(ushort species, IReadOnlyList types, IReadOnlyList forms, IReadOnlyList genders, byte generation, EntityContext context) + private static string[] GetFormsGen6(ushort species, IReadOnlyList types, IReadOnlyList forms, IReadOnlyList genders, EntityContext context) { + var generation = context.Generation(); return (Species)species switch { - Greninja => GetFormsGreninja(types, forms, new string[!context.IsMegaContext() ? 2 : context.Generation() >= 9 ? 4 : 3]), + Greninja => GetFormsGreninja(types, forms, new string[!context.IsMegaContext() ? 2 : generation >= 9 ? 4 : 3]), Scatterbug or Spewpa or Vivillon => [ forms[(int)Vivillon], // Icy Snow forms[963], // Polar @@ -254,7 +255,7 @@ private static string[] GetFormsGen6(ushort species, IReadOnlyList types forms[988], // Blue forms[989], // White ], - Floette => GetFormsFloette(forms, new string[!context.IsMegaContext() ? 5 : context.Generation() >= 9 ? 7 : 6]), + Floette => GetFormsFloette(forms, new string[!context.IsMegaContext() ? 5 : generation >= 9 ? 7 : 6]), Furfrou => [ forms[(int)Furfrou], // Natural forms[995], // Heart @@ -275,11 +276,11 @@ private static string[] GetFormsGen6(ushort species, IReadOnlyList types forms[(int)Aegislash], // Shield forms[1005], // Blade ], - Sliggoo or Goodra or Avalugg when context.Generation() >= 8 => GetFormsHisui(species, context.Generation(), types, forms), + Sliggoo or Goodra or Avalugg when generation >= 8 => GetFormsHisui(species, generation, types, forms), Pumpkaboo or Gourgeist when generation >= 9 => [ forms[MediumVariety], - forms[1006], // Small - forms[1007], // Large + forms[SmallVariety], + forms[LargeVariety], forms[JumboVariety], ], Pumpkaboo or Gourgeist => [ @@ -288,11 +289,11 @@ private static string[] GetFormsGen6(ushort species, IReadOnlyList types forms[1007], // Large forms[1008], // Super ], - Xerneas => [ + Xerneas when generation < 9 => [ forms[(int)Xerneas], // Neutral forms[1012], // Active ], - Zygarde => GetFormsZygarde(forms, new string[context.IsMegaContext() && context.Generation() >= 9 ? 6 : 5]), + Zygarde => GetFormsZygarde(forms, new string[context.IsMegaContext() && generation >= 9 ? 6 : 5]), Hoopa => [ forms[(int)Hoopa], // Confined forms[1018], // Unbound @@ -976,7 +977,9 @@ private static string[] GetFormsZygarde(IReadOnlyList forms, string[] re private const int Terastal = 1135; private const int Stellar = 1136; private const int MediumVariety = 1137; - private const int JumboVariety = 1138; + private const int SmallVariety = 1138; + private const int LargeVariety = 1139; + private const int JumboVariety = 1140; public static string GetGigantamaxName(IReadOnlyList forms) => forms[Gigantamax]; diff --git a/PKHeX.Core/Resources/text/other/de/text_Forms_de.txt b/PKHeX.Core/Resources/text/other/de/text_Forms_de.txt index 5210035eb..d6f0f15df 100644 --- a/PKHeX.Core/Resources/text/other/de/text_Forms_de.txt +++ b/PKHeX.Core/Resources/text/other/de/text_Forms_de.txt @@ -1136,4 +1136,6 @@ Edle Terastal Stellar Mittelgroße +Kleine +Große Extragroße \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/other/en/text_Forms_en.txt b/PKHeX.Core/Resources/text/other/en/text_Forms_en.txt index ba685244e..5a0f701f2 100644 --- a/PKHeX.Core/Resources/text/other/en/text_Forms_en.txt +++ b/PKHeX.Core/Resources/text/other/en/text_Forms_en.txt @@ -1136,4 +1136,6 @@ Masterpiece Terastal Stellar Medium +Small +Large Jumbo \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/other/es-419/text_Forms_es-419.txt b/PKHeX.Core/Resources/text/other/es-419/text_Forms_es-419.txt index 0e8c659a1..5f9127e3b 100644 --- a/PKHeX.Core/Resources/text/other/es-419/text_Forms_es-419.txt +++ b/PKHeX.Core/Resources/text/other/es-419/text_Forms_es-419.txt @@ -1136,4 +1136,6 @@ Exquisita Teracristal Astral Mediana +Pequeña +Grande Enorme \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/other/es/text_Forms_es.txt b/PKHeX.Core/Resources/text/other/es/text_Forms_es.txt index a2c707d91..3e0832de8 100644 --- a/PKHeX.Core/Resources/text/other/es/text_Forms_es.txt +++ b/PKHeX.Core/Resources/text/other/es/text_Forms_es.txt @@ -1136,4 +1136,6 @@ Exquisita Teracristal Astral Mediana +Pequeña +Grande Enorme \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/other/fr/text_Forms_fr.txt b/PKHeX.Core/Resources/text/other/fr/text_Forms_fr.txt index d7e237673..deaa7af5a 100644 --- a/PKHeX.Core/Resources/text/other/fr/text_Forms_fr.txt +++ b/PKHeX.Core/Resources/text/other/fr/text_Forms_fr.txt @@ -1136,4 +1136,6 @@ Exceptionnelle Téracristal Stellaire Moyenne +Petite +Grande Giga \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/other/it/text_Forms_it.txt b/PKHeX.Core/Resources/text/other/it/text_Forms_it.txt index e4047a92b..53b949344 100644 --- a/PKHeX.Core/Resources/text/other/it/text_Forms_it.txt +++ b/PKHeX.Core/Resources/text/other/it/text_Forms_it.txt @@ -1136,4 +1136,6 @@ Eccezionale Teracristal Astrale Media +Piccola +Grande Gigante \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/other/ja/text_Forms_ja.txt b/PKHeX.Core/Resources/text/other/ja/text_Forms_ja.txt index bfdff3ffe..ba246b302 100644 --- a/PKHeX.Core/Resources/text/other/ja/text_Forms_ja.txt +++ b/PKHeX.Core/Resources/text/other/ja/text_Forms_ja.txt @@ -1136,4 +1136,6 @@ テラスタル ステラ ちゅうだましゅ +こだましゅ +おおだましゅ ギガだましゅ \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/other/ko/text_Forms_ko.txt b/PKHeX.Core/Resources/text/other/ko/text_Forms_ko.txt index 92f7d6184..18f6c3a0e 100644 --- a/PKHeX.Core/Resources/text/other/ko/text_Forms_ko.txt +++ b/PKHeX.Core/Resources/text/other/ko/text_Forms_ko.txt @@ -1136,4 +1136,6 @@ 테라스탈폼 스텔라폼 중과종 +소과종 +대과종 특대과종 \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/other/zh-Hans/text_Forms_zh-Hans.txt b/PKHeX.Core/Resources/text/other/zh-Hans/text_Forms_zh-Hans.txt index 637fab24a..a1aa36d5d 100644 --- a/PKHeX.Core/Resources/text/other/zh-Hans/text_Forms_zh-Hans.txt +++ b/PKHeX.Core/Resources/text/other/zh-Hans/text_Forms_zh-Hans.txt @@ -1136,4 +1136,6 @@ 太晶形态 星晶形态 中颗种 +小颗种 +大颗种 巨颗种 \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/other/zh-Hant/text_Forms_zh-Hant.txt b/PKHeX.Core/Resources/text/other/zh-Hant/text_Forms_zh-Hant.txt index b7db7132c..2164ca21a 100644 --- a/PKHeX.Core/Resources/text/other/zh-Hant/text_Forms_zh-Hant.txt +++ b/PKHeX.Core/Resources/text/other/zh-Hant/text_Forms_zh-Hant.txt @@ -1136,4 +1136,6 @@ Mega蒂安希 太晶形態 星晶形態 中顆種 +小顆種 +大顆種 巨顆種 \ No newline at end of file