From 181e75818c4f8bda3da1711e015cd2c005283dbf Mon Sep 17 00:00:00 2001 From: Kurt Date: Tue, 13 Nov 2018 19:20:21 -0800 Subject: [PATCH] Use agreed upon lgpe starter forme name Thanks @Marty-D ! --- PKHeX.Core/PKM/Util/FormConverter.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/PKHeX.Core/PKM/Util/FormConverter.cs b/PKHeX.Core/PKM/Util/FormConverter.cs index c57c4024a..338701133 100644 --- a/PKHeX.Core/PKM/Util/FormConverter.cs +++ b/PKHeX.Core/PKM/Util/FormConverter.cs @@ -44,7 +44,7 @@ internal static string[] GetFormList(int species, IReadOnlyList types, I return GetFormsGen7(species, types, forms); } - private static bool IsGG() => false; + private static bool IsGG() => GameVersion.GG.Contains(PKMConverter.Trainer.Game); public static bool IsTotemForm(int species, int form, int generation = 7) { @@ -85,7 +85,7 @@ public static bool IsValidOutOfBoundsForme(int species, int form, int generation } private static readonly string[] EMPTY = {""}; - private const string Partner = "Starter"; + private const string Starter = nameof(Starter); private static string[] GetFormsGen1(int species, IReadOnlyList types, IReadOnlyList forms, int generation) { @@ -104,7 +104,7 @@ private static string[] GetFormsGen1(int species, IReadOnlyList types, I return new[] { types[000], // Normal - Partner, + Starter, }; case 025: @@ -572,7 +572,7 @@ private static string[] GetFormsPikachu(int generation, IReadOnlyList ty if (!IsGG()) return arr; System.Array.Resize(ref arr, arr.Length + 1); - arr[arr.Length - 1] = Partner; + arr[arr.Length - 1] = Starter; return arr; } }