diff --git a/PKHeX.Core/PKM/PK3.cs b/PKHeX.Core/PKM/PK3.cs index 4c8b63158..71aba8e18 100644 --- a/PKHeX.Core/PKM/PK3.cs +++ b/PKHeX.Core/PKM/PK3.cs @@ -305,7 +305,7 @@ namespace PKHeX.Core if (HeldItem > 0) { ushort item = ItemConverter.GetG4Item((ushort)HeldItem); - if (ItemConverter.IsItemTransferrable34(item)) + if (ItemConverter.IsItemTransferable34(item)) pk4.HeldItem = item; } diff --git a/PKHeX.Core/PKM/Util/ItemConverter.cs b/PKHeX.Core/PKM/Util/ItemConverter.cs index 2c3bcc78a..9fabdb770 100644 --- a/PKHeX.Core/PKM/Util/ItemConverter.cs +++ b/PKHeX.Core/PKM/Util/ItemConverter.cs @@ -15,8 +15,8 @@ namespace PKHeX.Core /// Checks if the item can be kept during 3->4 conversion. /// /// Generation 3 Item ID. - /// True if transferrable, False if not transferrable. - internal static bool IsItemTransferrable34(ushort item) => item != NaN && item > 0; + /// True if transferable, False if not transferable. + internal static bool IsItemTransferable34(ushort item) => item != NaN && item > 0; /// /// Converts a Generation 3 Item ID to Generation 4+ Item ID. @@ -162,12 +162,12 @@ namespace PKHeX.Core internal static int GetG2ItemTransfer(int g1val) { - if (!IsItemTransferrable12((ushort) g1val)) + if (!IsItemTransferable12((ushort) g1val)) return GetTeruSamaItem(g1val); return g1val; } - private static bool IsItemTransferrable12(ushort item) => ((IList) Legal.HeldItems_GSC).Contains(item); + private static bool IsItemTransferable12(ushort item) => ((IList) Legal.HeldItems_GSC).Contains(item); /// /// Gets a format specific value depending on the desired format and the provided item index & origin format. diff --git a/PKHeX.Core/PKM/Util/PKMConverter.cs b/PKHeX.Core/PKM/Util/PKMConverter.cs index 3e27e1cec..3eccc15e9 100644 --- a/PKHeX.Core/PKM/Util/PKMConverter.cs +++ b/PKHeX.Core/PKM/Util/PKMConverter.cs @@ -77,7 +77,6 @@ namespace PKHeX.Core /// Creates an instance of from the given data. /// /// Raw data of the Pokemon file. - /// Optional identifier for the Pokemon. Usually the full path of the source file. /// Optional identifier for the preferred generation. Usually the generation of the destination save file. /// An instance of created from the given , or null if is invalid. public static PKM GetPKMfromBytes(byte[] data, int prefer = 7) @@ -160,7 +159,7 @@ namespace PKHeX.Core if (!pk.Gen4) // can't have encounter type return true; - if (et > 24) // invalid encountertype + if (et > 24) // invalid gen4 EncounterType return true; } @@ -231,7 +230,7 @@ namespace PKHeX.Core private static PKM ConvertPKM(PKM pk, Type PKMType, Type fromType, out string comment) { - if (IsNotTransferrable(pk, out comment)) + if (IsNotTransferable(pk, out comment)) return null; Debug.WriteLine($"Trying to convert {fromType.Name} to {PKMType.Name}."); @@ -304,12 +303,12 @@ namespace PKHeX.Core } /// - /// Checks to see if a PKM is transferrable relative to in-game restrictions and . + /// Checks to see if a PKM is transferable relative to in-game restrictions and . /// /// PKM to convert - /// Comment indicating why the is not transferrable. - /// Indication if Not Transferrable - private static bool IsNotTransferrable(PKM pk, out string comment) + /// Comment indicating why the is not transferable. + /// Indication if Not Transferable + private static bool IsNotTransferable(PKM pk, out string comment) { switch (pk.Species) {