diff --git a/PKHeX.Core/Game/Enums/GCVersion.cs b/PKHeX.Core/Game/Enums/GCVersion.cs index 92f387375..fe619e909 100644 --- a/PKHeX.Core/Game/Enums/GCVersion.cs +++ b/PKHeX.Core/Game/Enums/GCVersion.cs @@ -6,8 +6,13 @@ namespace PKHeX.Core; public enum GCVersion : byte { None = 0, - FR = 1, - LG = 2, + FR = 1, // RD + LG = 2, // GN + // BU = 3, + // YW = 4, + // GD = 5, + // SV = 6, + // C = 7, S = 8, R = 9, E = 10, diff --git a/PKHeX.Core/Game/Locations/Locations.cs b/PKHeX.Core/Game/Locations/Locations.cs index fc4fdfa45..be821cdb8 100644 --- a/PKHeX.Core/Game/Locations/Locations.cs +++ b/PKHeX.Core/Game/Locations/Locations.cs @@ -28,40 +28,40 @@ public static class Locations public const ushort Ranger4 = 3001; public const ushort Faraway4 = 3002; - /// Goldenrod City in + /// Goldenrod City in Crystal public const byte HatchLocationC = 16; - /// Route 117 in + /// Route 117 in R/S/E public const byte HatchLocationRSE = 32; - /// Four Island in + /// Four Island in FR/LG public const byte HatchLocationFRLG = 146; - /// Solaceon Town in + /// Solaceon Town in D/P/Pt public const ushort HatchLocationDPPt = 4; - /// Route 34 in + /// Route 34 in HG/SS public const ushort HatchLocationHGSS = 182; - /// Skyarrow Bridge in + /// Skyarrow Bridge in Gen5 public const ushort HatchLocation5 = 64; - /// Route 7 in + /// Route 7 in X/Y public const ushort HatchLocation6XY = 38; - /// Battle Resort in + /// Battle Resort in OR/AS public const ushort HatchLocation6AO = 318; - /// Paniola Ranch in + /// Paniola Ranch in Gen7 public const ushort HatchLocation7 = 78; - /// Route 5 in + /// Route 5 in SW/SH public const ushort HatchLocation8 = 40; - /// Solaceon Town in + /// Solaceon Town in BD/SP public const ushort HatchLocation8b = 446; - /// South Province (Area One) in + /// South Province (Area One) in S/V public const ushort HatchLocation9 = 6; /// Generation 1 -> Generation 7 Transfer Location (Kanto) @@ -117,7 +117,7 @@ public static class Locations { 4 => LinkTrade4, 5 => LinkTrade5, - 8 when GameVersion.BDSP.Contains(version) => LinkTrade6NPC, + 8 when version is GameVersion.BD or GameVersion.SP => LinkTrade6NPC, _ => LinkTrade6, }; diff --git a/PKHeX.Core/Game/Locations/Locations4.cs b/PKHeX.Core/Game/Locations/Locations4.cs index 94b716281..3ea540d74 100644 --- a/PKHeX.Core/Game/Locations/Locations4.cs +++ b/PKHeX.Core/Game/Locations/Locations4.cs @@ -3,7 +3,7 @@ namespace PKHeX.Core; /// -/// Locations for . +/// Locations for . /// public static class Locations4 { diff --git a/PKHeX.Core/Game/Locations/Locations5.cs b/PKHeX.Core/Game/Locations/Locations5.cs index 25ad7e8f3..5c8088b86 100644 --- a/PKHeX.Core/Game/Locations/Locations5.cs +++ b/PKHeX.Core/Game/Locations/Locations5.cs @@ -3,7 +3,7 @@ namespace PKHeX.Core; /// -/// Locations for . +/// Locations for . /// public static class Locations5 { diff --git a/PKHeX.Core/Game/Locations/Locations6.cs b/PKHeX.Core/Game/Locations/Locations6.cs index d4e9e1932..4577034c8 100644 --- a/PKHeX.Core/Game/Locations/Locations6.cs +++ b/PKHeX.Core/Game/Locations/Locations6.cs @@ -3,7 +3,7 @@ namespace PKHeX.Core; /// -/// Locations for . +/// Locations for . /// public static class Locations6 { diff --git a/PKHeX.Core/Game/Locations/Locations7.cs b/PKHeX.Core/Game/Locations/Locations7.cs index c9a04478e..5ab7d3607 100644 --- a/PKHeX.Core/Game/Locations/Locations7.cs +++ b/PKHeX.Core/Game/Locations/Locations7.cs @@ -3,7 +3,7 @@ namespace PKHeX.Core; /// -/// Locations for . +/// Locations for . /// public static class Locations7 { diff --git a/PKHeX.Core/Game/Locations/Locations7b.cs b/PKHeX.Core/Game/Locations/Locations7b.cs index 802d60348..91d391a36 100644 --- a/PKHeX.Core/Game/Locations/Locations7b.cs +++ b/PKHeX.Core/Game/Locations/Locations7b.cs @@ -3,7 +3,7 @@ namespace PKHeX.Core; /// -/// Locations for . +/// Locations for . /// public static class Locations7b { diff --git a/PKHeX.Core/Game/Locations/Locations8.cs b/PKHeX.Core/Game/Locations/Locations8.cs index eb02c288d..915bd23e4 100644 --- a/PKHeX.Core/Game/Locations/Locations8.cs +++ b/PKHeX.Core/Game/Locations/Locations8.cs @@ -3,7 +3,7 @@ namespace PKHeX.Core; /// -/// Locations for . +/// Locations for . /// public static class Locations8 { diff --git a/PKHeX.Core/Game/Locations/Locations8a.cs b/PKHeX.Core/Game/Locations/Locations8a.cs index 77d75b85c..a8b2a7b0f 100644 --- a/PKHeX.Core/Game/Locations/Locations8a.cs +++ b/PKHeX.Core/Game/Locations/Locations8a.cs @@ -3,7 +3,7 @@ namespace PKHeX.Core; /// -/// Locations for . +/// Locations for . /// public static class Locations8a { diff --git a/PKHeX.Core/Game/Locations/Locations8b.cs b/PKHeX.Core/Game/Locations/Locations8b.cs index b31e7be23..23234394e 100644 --- a/PKHeX.Core/Game/Locations/Locations8b.cs +++ b/PKHeX.Core/Game/Locations/Locations8b.cs @@ -3,7 +3,7 @@ namespace PKHeX.Core; /// -/// Locations for . +/// Locations for . /// public static class Locations8b { diff --git a/PKHeX.Core/Game/Locations/Locations9.cs b/PKHeX.Core/Game/Locations/Locations9.cs index 86bad6e50..8e871e334 100644 --- a/PKHeX.Core/Game/Locations/Locations9.cs +++ b/PKHeX.Core/Game/Locations/Locations9.cs @@ -3,9 +3,9 @@ namespace PKHeX.Core; /// -/// Locations for . +/// Locations for . /// -internal static class Locations9 +public static class Locations9 { /// /// Checks if the location is accessible in Paldea (without DLC). diff --git a/PKHeX.Core/Items/ItemStorage1.cs b/PKHeX.Core/Items/ItemStorage1.cs index 806d043b7..66492eb4a 100644 --- a/PKHeX.Core/Items/ItemStorage1.cs +++ b/PKHeX.Core/Items/ItemStorage1.cs @@ -2,6 +2,9 @@ namespace PKHeX.Core; +/// +/// Item storage for +/// public sealed class ItemStorage1 : IItemStorage { public static readonly ItemStorage1 Instance = new(); diff --git a/PKHeX.Core/Items/ItemStorage2.cs b/PKHeX.Core/Items/ItemStorage2.cs index bc0861cb1..6bd2c3cab 100644 --- a/PKHeX.Core/Items/ItemStorage2.cs +++ b/PKHeX.Core/Items/ItemStorage2.cs @@ -2,6 +2,9 @@ namespace PKHeX.Core; +/// +/// Item storage for +/// public sealed class ItemStorage2 : IItemStorage { public static readonly ItemStorage2 InstanceGS = new(false); diff --git a/PKHeX.Core/Items/ItemStorage3Colo.cs b/PKHeX.Core/Items/ItemStorage3Colo.cs index a2d527e13..62552911e 100644 --- a/PKHeX.Core/Items/ItemStorage3Colo.cs +++ b/PKHeX.Core/Items/ItemStorage3Colo.cs @@ -2,6 +2,9 @@ namespace PKHeX.Core; +/// +/// Item storage for Colosseum. +/// public sealed class ItemStorage3Colo : IItemStorage { public static readonly ItemStorage3Colo Instance = new(); diff --git a/PKHeX.Core/Items/ItemStorage3E.cs b/PKHeX.Core/Items/ItemStorage3E.cs index eff87c479..d1f71c365 100644 --- a/PKHeX.Core/Items/ItemStorage3E.cs +++ b/PKHeX.Core/Items/ItemStorage3E.cs @@ -3,6 +3,9 @@ namespace PKHeX.Core; +/// +/// Item storage for +/// public sealed class ItemStorage3E : IItemStorage { public static readonly ItemStorage3E Instance = new(); diff --git a/PKHeX.Core/Items/ItemStorage3FRLG.cs b/PKHeX.Core/Items/ItemStorage3FRLG.cs index e037f9867..2d704cb72 100644 --- a/PKHeX.Core/Items/ItemStorage3FRLG.cs +++ b/PKHeX.Core/Items/ItemStorage3FRLG.cs @@ -3,6 +3,9 @@ namespace PKHeX.Core; +/// +/// Item storage for and +/// public sealed class ItemStorage3FRLG : IItemStorage { public static readonly ItemStorage3FRLG Instance = new(); diff --git a/PKHeX.Core/Items/ItemStorage3RS.cs b/PKHeX.Core/Items/ItemStorage3RS.cs index 09f8ef165..9464f30ca 100644 --- a/PKHeX.Core/Items/ItemStorage3RS.cs +++ b/PKHeX.Core/Items/ItemStorage3RS.cs @@ -2,6 +2,9 @@ namespace PKHeX.Core; +/// +/// Item storage for and +/// public sealed class ItemStorage3RS : IItemStorage { public static readonly ItemStorage3RS Instance = new(); diff --git a/PKHeX.Core/Items/ItemStorage3XD.cs b/PKHeX.Core/Items/ItemStorage3XD.cs index 6a419e6fb..957560896 100644 --- a/PKHeX.Core/Items/ItemStorage3XD.cs +++ b/PKHeX.Core/Items/ItemStorage3XD.cs @@ -2,6 +2,9 @@ namespace PKHeX.Core; +/// +/// Item storage for XD +/// public sealed class ItemStorage3XD : IItemStorage { public static readonly ItemStorage3XD Instance = new(); diff --git a/PKHeX.Core/Items/ItemStorage4.cs b/PKHeX.Core/Items/ItemStorage4.cs index f7b4a132b..540e06fc0 100644 --- a/PKHeX.Core/Items/ItemStorage4.cs +++ b/PKHeX.Core/Items/ItemStorage4.cs @@ -2,6 +2,9 @@ namespace PKHeX.Core; +/// +/// Item storage for +/// public abstract class ItemStorage4 { private protected static ReadOnlySpan Pouch_Items_DP => diff --git a/PKHeX.Core/Items/ItemStorage4DP.cs b/PKHeX.Core/Items/ItemStorage4DP.cs index 4ccd88c49..0bb62a83e 100644 --- a/PKHeX.Core/Items/ItemStorage4DP.cs +++ b/PKHeX.Core/Items/ItemStorage4DP.cs @@ -2,6 +2,9 @@ namespace PKHeX.Core; +/// +/// Item storage for and +/// public sealed class ItemStorage4DP : ItemStorage4, IItemStorage { public static readonly ItemStorage4DP Instance = new(); diff --git a/PKHeX.Core/Items/ItemStorage4HGSS.cs b/PKHeX.Core/Items/ItemStorage4HGSS.cs index 391069ba6..5a6a74c09 100644 --- a/PKHeX.Core/Items/ItemStorage4HGSS.cs +++ b/PKHeX.Core/Items/ItemStorage4HGSS.cs @@ -2,6 +2,9 @@ namespace PKHeX.Core; +/// +/// Item storage for and +/// public sealed class ItemStorage4HGSS : ItemStorage4, IItemStorage { public static readonly ItemStorage4HGSS Instance = new(); diff --git a/PKHeX.Core/Items/ItemStorage4Pt.cs b/PKHeX.Core/Items/ItemStorage4Pt.cs index 657ceaf15..ff1db9bb1 100644 --- a/PKHeX.Core/Items/ItemStorage4Pt.cs +++ b/PKHeX.Core/Items/ItemStorage4Pt.cs @@ -2,6 +2,9 @@ namespace PKHeX.Core; +/// +/// Item storage for +/// public sealed class ItemStorage4Pt : ItemStorage4, IItemStorage { public static readonly ItemStorage4Pt Instance = new(); diff --git a/PKHeX.Core/Items/ItemStorage5.cs b/PKHeX.Core/Items/ItemStorage5.cs index 50fac7635..9890112bd 100644 --- a/PKHeX.Core/Items/ItemStorage5.cs +++ b/PKHeX.Core/Items/ItemStorage5.cs @@ -2,6 +2,9 @@ namespace PKHeX.Core; +/// +/// Item storage for +/// public abstract class ItemStorage5 { private protected static ReadOnlySpan Pouch_Items_BW => diff --git a/PKHeX.Core/Items/ItemStorage5B2W2.cs b/PKHeX.Core/Items/ItemStorage5B2W2.cs index af04744b0..48ad8746a 100644 --- a/PKHeX.Core/Items/ItemStorage5B2W2.cs +++ b/PKHeX.Core/Items/ItemStorage5B2W2.cs @@ -2,6 +2,9 @@ namespace PKHeX.Core; +/// +/// Item storage for and +/// public sealed class ItemStorage5B2W2 : ItemStorage5, IItemStorage { public static readonly ItemStorage5B2W2 Instance = new(); diff --git a/PKHeX.Core/Items/ItemStorage5BW.cs b/PKHeX.Core/Items/ItemStorage5BW.cs index 9e7817f64..26d8f1f89 100644 --- a/PKHeX.Core/Items/ItemStorage5BW.cs +++ b/PKHeX.Core/Items/ItemStorage5BW.cs @@ -2,6 +2,9 @@ namespace PKHeX.Core; +/// +/// Item storage for and +/// public sealed class ItemStorage5BW : ItemStorage5, IItemStorage { public static readonly ItemStorage5BW Instance = new(); diff --git a/PKHeX.Core/Items/ItemStorage6AO.cs b/PKHeX.Core/Items/ItemStorage6AO.cs index f37890170..4a6bfa371 100644 --- a/PKHeX.Core/Items/ItemStorage6AO.cs +++ b/PKHeX.Core/Items/ItemStorage6AO.cs @@ -3,6 +3,9 @@ namespace PKHeX.Core; +/// +/// Item storage for and +/// public sealed class ItemStorage6AO : IItemStorage { public static readonly ItemStorage6AO Instance = new(); diff --git a/PKHeX.Core/Items/ItemStorage6XY.cs b/PKHeX.Core/Items/ItemStorage6XY.cs index bbbd8a886..a254c0851 100644 --- a/PKHeX.Core/Items/ItemStorage6XY.cs +++ b/PKHeX.Core/Items/ItemStorage6XY.cs @@ -2,6 +2,9 @@ namespace PKHeX.Core; +/// +/// Item storage for and +/// public sealed class ItemStorage6XY : IItemStorage { public static readonly ItemStorage6XY Instance = new(); diff --git a/PKHeX.Core/Items/ItemStorage7GG.cs b/PKHeX.Core/Items/ItemStorage7GG.cs index 8f4a1a17e..9dae4fca6 100644 --- a/PKHeX.Core/Items/ItemStorage7GG.cs +++ b/PKHeX.Core/Items/ItemStorage7GG.cs @@ -2,6 +2,9 @@ namespace PKHeX.Core; +/// +/// Item storage for +/// public sealed class ItemStorage7GG : IItemStorage { public static readonly ItemStorage7GG Instance = new(); diff --git a/PKHeX.Core/Items/ItemStorage7SM.cs b/PKHeX.Core/Items/ItemStorage7SM.cs index 6930a0a62..1f80a77f5 100644 --- a/PKHeX.Core/Items/ItemStorage7SM.cs +++ b/PKHeX.Core/Items/ItemStorage7SM.cs @@ -2,6 +2,9 @@ namespace PKHeX.Core; +/// +/// Item storage for and +/// public sealed class ItemStorage7SM : IItemStorage { public static readonly ItemStorage7SM Instance = new(); diff --git a/PKHeX.Core/Items/ItemStorage7USUM.cs b/PKHeX.Core/Items/ItemStorage7USUM.cs index b71ffe393..e3731310f 100644 --- a/PKHeX.Core/Items/ItemStorage7USUM.cs +++ b/PKHeX.Core/Items/ItemStorage7USUM.cs @@ -3,6 +3,9 @@ namespace PKHeX.Core; +/// +/// Item storage for and +/// public sealed class ItemStorage7USUM : IItemStorage { public static readonly ItemStorage7USUM Instance = new(); diff --git a/PKHeX.Core/Items/ItemStorage8BDSP.cs b/PKHeX.Core/Items/ItemStorage8BDSP.cs index af81a9d80..0a69bc378 100644 --- a/PKHeX.Core/Items/ItemStorage8BDSP.cs +++ b/PKHeX.Core/Items/ItemStorage8BDSP.cs @@ -2,6 +2,9 @@ namespace PKHeX.Core; +/// +/// Item storage for +/// public sealed class ItemStorage8BDSP : IItemStorage { public static readonly ItemStorage8BDSP Instance = new(); diff --git a/PKHeX.Core/Items/ItemStorage8LA.cs b/PKHeX.Core/Items/ItemStorage8LA.cs index bd00eb134..7ac872b63 100644 --- a/PKHeX.Core/Items/ItemStorage8LA.cs +++ b/PKHeX.Core/Items/ItemStorage8LA.cs @@ -2,6 +2,9 @@ namespace PKHeX.Core; +/// +/// Item storage for +/// public sealed class ItemStorage8LA : IItemStorage { public static readonly ItemStorage8LA Instance = new(); diff --git a/PKHeX.Core/Items/ItemStorage8SWSH.cs b/PKHeX.Core/Items/ItemStorage8SWSH.cs index d6a42551d..e4619b30a 100644 --- a/PKHeX.Core/Items/ItemStorage8SWSH.cs +++ b/PKHeX.Core/Items/ItemStorage8SWSH.cs @@ -2,6 +2,9 @@ namespace PKHeX.Core; +/// +/// Item storage for +/// public sealed class ItemStorage8SWSH : IItemStorage { public static readonly ItemStorage8SWSH Instance = new(); diff --git a/PKHeX.Core/Items/ItemStorage9SV.cs b/PKHeX.Core/Items/ItemStorage9SV.cs index 4c7623bfa..3872b6cd5 100644 --- a/PKHeX.Core/Items/ItemStorage9SV.cs +++ b/PKHeX.Core/Items/ItemStorage9SV.cs @@ -2,6 +2,9 @@ namespace PKHeX.Core; +/// +/// Item storage for +/// public sealed class ItemStorage9SV : IItemStorage { public static readonly ItemStorage9SV Instance = new(); diff --git a/PKHeX.Core/Legality/Encounters/Generator/Possible/EncounterPossible1.cs b/PKHeX.Core/Legality/Encounters/Generator/Possible/EncounterPossible1.cs index f70ecc31f..b27fc80ed 100644 --- a/PKHeX.Core/Legality/Encounters/Generator/Possible/EncounterPossible1.cs +++ b/PKHeX.Core/Legality/Encounters/Generator/Possible/EncounterPossible1.cs @@ -5,7 +5,7 @@ namespace PKHeX.Core; /// -/// Iterates to find possible encounters for encounters. +/// Iterates to find possible encounters for encounters. /// public record struct EncounterPossible1(EvoCriteria[] Chain, EncounterTypeGroup Flags, GameVersion Version) : IEnumerator { diff --git a/PKHeX.Core/Legality/Encounters/Generator/Possible/EncounterPossible2.cs b/PKHeX.Core/Legality/Encounters/Generator/Possible/EncounterPossible2.cs index 2764d91cf..17159b8b4 100644 --- a/PKHeX.Core/Legality/Encounters/Generator/Possible/EncounterPossible2.cs +++ b/PKHeX.Core/Legality/Encounters/Generator/Possible/EncounterPossible2.cs @@ -5,7 +5,7 @@ namespace PKHeX.Core; /// -/// Iterates to find possible encounters for encounters. +/// Iterates to find possible encounters for encounters. /// public record struct EncounterPossible2(EvoCriteria[] Chain, EncounterTypeGroup Flags, GameVersion Version, PKM Entity) : IEnumerator { diff --git a/PKHeX.Core/Legality/Encounters/Generator/Possible/EncounterPossible3.cs b/PKHeX.Core/Legality/Encounters/Generator/Possible/EncounterPossible3.cs index 7cde709b2..854464c76 100644 --- a/PKHeX.Core/Legality/Encounters/Generator/Possible/EncounterPossible3.cs +++ b/PKHeX.Core/Legality/Encounters/Generator/Possible/EncounterPossible3.cs @@ -5,7 +5,7 @@ namespace PKHeX.Core; /// -/// Iterates to find possible encounters for encounters. +/// Iterates to find possible encounters for encounters. /// public record struct EncounterPossible3(EvoCriteria[] Chain, EncounterTypeGroup Flags, GameVersion Version) : IEnumerator { diff --git a/PKHeX.Core/Legality/Encounters/Generator/Possible/EncounterPossible4.cs b/PKHeX.Core/Legality/Encounters/Generator/Possible/EncounterPossible4.cs index 6607efc53..b0bb1cae2 100644 --- a/PKHeX.Core/Legality/Encounters/Generator/Possible/EncounterPossible4.cs +++ b/PKHeX.Core/Legality/Encounters/Generator/Possible/EncounterPossible4.cs @@ -5,7 +5,7 @@ namespace PKHeX.Core; /// -/// Iterates to find possible encounters for encounters. +/// Iterates to find possible encounters for encounters. /// public record struct EncounterPossible4(EvoCriteria[] Chain, EncounterTypeGroup Flags, GameVersion Version, PKM Entity) : IEnumerator { diff --git a/PKHeX.Core/Legality/Encounters/Generator/Possible/EncounterPossible5.cs b/PKHeX.Core/Legality/Encounters/Generator/Possible/EncounterPossible5.cs index f69102dda..5fac21831 100644 --- a/PKHeX.Core/Legality/Encounters/Generator/Possible/EncounterPossible5.cs +++ b/PKHeX.Core/Legality/Encounters/Generator/Possible/EncounterPossible5.cs @@ -5,7 +5,7 @@ namespace PKHeX.Core; /// -/// Iterates to find possible encounters for encounters. +/// Iterates to find possible encounters for encounters. /// public record struct EncounterPossible5(EvoCriteria[] Chain, EncounterTypeGroup Flags, GameVersion Version) : IEnumerator { diff --git a/PKHeX.Core/Legality/Encounters/Generator/Possible/EncounterPossible6.cs b/PKHeX.Core/Legality/Encounters/Generator/Possible/EncounterPossible6.cs index 9d03c0d71..510764a73 100644 --- a/PKHeX.Core/Legality/Encounters/Generator/Possible/EncounterPossible6.cs +++ b/PKHeX.Core/Legality/Encounters/Generator/Possible/EncounterPossible6.cs @@ -5,7 +5,7 @@ namespace PKHeX.Core; /// -/// Iterates to find possible encounters for encounters. +/// Iterates to find possible encounters for encounters. /// public record struct EncounterPossible6(EvoCriteria[] Chain, EncounterTypeGroup Flags, GameVersion Version) : IEnumerator { diff --git a/PKHeX.Core/Legality/Encounters/Generator/Possible/EncounterPossible7.cs b/PKHeX.Core/Legality/Encounters/Generator/Possible/EncounterPossible7.cs index 62320a41b..7b98e8ed4 100644 --- a/PKHeX.Core/Legality/Encounters/Generator/Possible/EncounterPossible7.cs +++ b/PKHeX.Core/Legality/Encounters/Generator/Possible/EncounterPossible7.cs @@ -5,7 +5,7 @@ namespace PKHeX.Core; /// -/// Iterates to find possible encounters for encounters. +/// Iterates to find possible encounters for encounters. /// public record struct EncounterPossible7(EvoCriteria[] Chain, EncounterTypeGroup Flags, GameVersion Version) : IEnumerator { diff --git a/PKHeX.Core/Legality/Encounters/Generator/Possible/EncounterPossible7GG.cs b/PKHeX.Core/Legality/Encounters/Generator/Possible/EncounterPossible7GG.cs index ad4f4a05b..0798b4bc7 100644 --- a/PKHeX.Core/Legality/Encounters/Generator/Possible/EncounterPossible7GG.cs +++ b/PKHeX.Core/Legality/Encounters/Generator/Possible/EncounterPossible7GG.cs @@ -5,7 +5,7 @@ namespace PKHeX.Core; /// -/// Iterates to find possible encounters for encounters. +/// Iterates to find possible encounters for encounters. /// public record struct EncounterPossible7GG(EvoCriteria[] Chain, EncounterTypeGroup Flags, GameVersion Version) : IEnumerator { diff --git a/PKHeX.Core/Legality/Encounters/Generator/Possible/EncounterPossible8.cs b/PKHeX.Core/Legality/Encounters/Generator/Possible/EncounterPossible8.cs index 1a05247de..02e8925bc 100644 --- a/PKHeX.Core/Legality/Encounters/Generator/Possible/EncounterPossible8.cs +++ b/PKHeX.Core/Legality/Encounters/Generator/Possible/EncounterPossible8.cs @@ -5,7 +5,7 @@ namespace PKHeX.Core; /// -/// Iterates to find possible encounters for encounters. +/// Iterates to find possible encounters for encounters. /// public record struct EncounterPossible8(EvoCriteria[] Chain, EncounterTypeGroup Flags, GameVersion Version) : IEnumerator { diff --git a/PKHeX.Core/Legality/Encounters/Generator/Possible/EncounterPossible8a.cs b/PKHeX.Core/Legality/Encounters/Generator/Possible/EncounterPossible8a.cs index c628e13ac..157378775 100644 --- a/PKHeX.Core/Legality/Encounters/Generator/Possible/EncounterPossible8a.cs +++ b/PKHeX.Core/Legality/Encounters/Generator/Possible/EncounterPossible8a.cs @@ -5,7 +5,7 @@ namespace PKHeX.Core; /// -/// Iterates to find possible encounters for encounters. +/// Iterates to find possible encounters for encounters. /// public record struct EncounterPossible8a(EvoCriteria[] Chain, EncounterTypeGroup Flags) : IEnumerator { diff --git a/PKHeX.Core/Legality/Encounters/Generator/Possible/EncounterPossible8b.cs b/PKHeX.Core/Legality/Encounters/Generator/Possible/EncounterPossible8b.cs index ba2437ba5..d0090c5ce 100644 --- a/PKHeX.Core/Legality/Encounters/Generator/Possible/EncounterPossible8b.cs +++ b/PKHeX.Core/Legality/Encounters/Generator/Possible/EncounterPossible8b.cs @@ -5,7 +5,7 @@ namespace PKHeX.Core; /// -/// Iterates to find possible encounters for encounters. +/// Iterates to find possible encounters for encounters. /// public record struct EncounterPossible8b(EvoCriteria[] Chain, EncounterTypeGroup Flags, GameVersion Version, PKM Entity) : IEnumerator { diff --git a/PKHeX.Core/Legality/Encounters/Generator/Possible/EncounterPossible9.cs b/PKHeX.Core/Legality/Encounters/Generator/Possible/EncounterPossible9.cs index 2714d2261..6d90e4d59 100644 --- a/PKHeX.Core/Legality/Encounters/Generator/Possible/EncounterPossible9.cs +++ b/PKHeX.Core/Legality/Encounters/Generator/Possible/EncounterPossible9.cs @@ -5,7 +5,7 @@ namespace PKHeX.Core; /// -/// Iterates to find possible encounters for encounters. +/// Iterates to find possible encounters for encounters. /// public record struct EncounterPossible9(EvoCriteria[] Chain, EncounterTypeGroup Flags, GameVersion Version) : IEnumerator { diff --git a/PKHeX.Core/Legality/Encounters/Generator/Search/Dirtied/EncounterEnumerator8bSWSH.cs b/PKHeX.Core/Legality/Encounters/Generator/Search/Dirtied/EncounterEnumerator8bSWSH.cs index 7830e4399..f4e060560 100644 --- a/PKHeX.Core/Legality/Encounters/Generator/Search/Dirtied/EncounterEnumerator8bSWSH.cs +++ b/PKHeX.Core/Legality/Encounters/Generator/Search/Dirtied/EncounterEnumerator8bSWSH.cs @@ -6,7 +6,7 @@ namespace PKHeX.Core; /// -/// Iterates to find potentially matched encounters for encounters while in the format. +/// Iterates to find potentially matched encounters for encounters while in the format. /// public record struct EncounterEnumerator8bSWSH(PKM Entity, EvoCriteria[] Chain, GameVersion Version) : IEnumerator> { diff --git a/PKHeX.Core/Legality/Encounters/Generator/Search/Dirtied/EncounterEnumerator9SWSH.cs b/PKHeX.Core/Legality/Encounters/Generator/Search/Dirtied/EncounterEnumerator9SWSH.cs index a320858ce..e20f7022e 100644 --- a/PKHeX.Core/Legality/Encounters/Generator/Search/Dirtied/EncounterEnumerator9SWSH.cs +++ b/PKHeX.Core/Legality/Encounters/Generator/Search/Dirtied/EncounterEnumerator9SWSH.cs @@ -5,7 +5,7 @@ namespace PKHeX.Core; /// -/// Iterates to find potentially matched encounters for encounters while in the format. +/// Iterates to find potentially matched encounters for encounters while in the format. /// public record struct EncounterEnumerator9SWSH(PKM Entity, EvoCriteria[] Chain, GameVersion Version) : IEnumerator> { diff --git a/PKHeX.Core/Legality/Encounters/Generator/Search/EncounterEnumerator1.cs b/PKHeX.Core/Legality/Encounters/Generator/Search/EncounterEnumerator1.cs index 7a32e9a22..f34936ce6 100644 --- a/PKHeX.Core/Legality/Encounters/Generator/Search/EncounterEnumerator1.cs +++ b/PKHeX.Core/Legality/Encounters/Generator/Search/EncounterEnumerator1.cs @@ -5,7 +5,7 @@ namespace PKHeX.Core; /// -/// Iterates to find potentially matched encounters for . +/// Iterates to find potentially matched encounters for . /// public record struct EncounterEnumerator1(PKM Entity, EvoCriteria[] Chain) : IEnumerator> { diff --git a/PKHeX.Core/Legality/Encounters/Generator/Search/EncounterEnumerator2.cs b/PKHeX.Core/Legality/Encounters/Generator/Search/EncounterEnumerator2.cs index 89777c1e1..f05dc980c 100644 --- a/PKHeX.Core/Legality/Encounters/Generator/Search/EncounterEnumerator2.cs +++ b/PKHeX.Core/Legality/Encounters/Generator/Search/EncounterEnumerator2.cs @@ -5,7 +5,7 @@ namespace PKHeX.Core; /// -/// Iterates to find potentially matched encounters for . +/// Iterates to find potentially matched encounters for . /// public record struct EncounterEnumerator2 : IEnumerator> { diff --git a/PKHeX.Core/Legality/Encounters/Generator/Search/EncounterEnumerator3.cs b/PKHeX.Core/Legality/Encounters/Generator/Search/EncounterEnumerator3.cs index 329075737..e4e1763c8 100644 --- a/PKHeX.Core/Legality/Encounters/Generator/Search/EncounterEnumerator3.cs +++ b/PKHeX.Core/Legality/Encounters/Generator/Search/EncounterEnumerator3.cs @@ -5,7 +5,7 @@ namespace PKHeX.Core; /// -/// Iterates to find potentially matched encounters for . +/// Iterates to find potentially matched encounters for . /// public record struct EncounterEnumerator3(PKM Entity, EvoCriteria[] Chain, GameVersion Version) : IEnumerator> { diff --git a/PKHeX.Core/Legality/Encounters/Generator/Search/EncounterEnumerator4.cs b/PKHeX.Core/Legality/Encounters/Generator/Search/EncounterEnumerator4.cs index 240b84ad2..84a4e43aa 100644 --- a/PKHeX.Core/Legality/Encounters/Generator/Search/EncounterEnumerator4.cs +++ b/PKHeX.Core/Legality/Encounters/Generator/Search/EncounterEnumerator4.cs @@ -5,7 +5,7 @@ namespace PKHeX.Core; /// -/// Iterates to find potentially matched encounters for . +/// Iterates to find potentially matched encounters for . /// public record struct EncounterEnumerator4(PKM Entity, EvoCriteria[] Chain, GameVersion Version) : IEnumerator> { diff --git a/PKHeX.Core/Legality/Encounters/Generator/Search/EncounterEnumerator5.cs b/PKHeX.Core/Legality/Encounters/Generator/Search/EncounterEnumerator5.cs index f009d1068..00513a4d7 100644 --- a/PKHeX.Core/Legality/Encounters/Generator/Search/EncounterEnumerator5.cs +++ b/PKHeX.Core/Legality/Encounters/Generator/Search/EncounterEnumerator5.cs @@ -5,7 +5,7 @@ namespace PKHeX.Core; /// -/// Iterates to find potentially matched encounters for . +/// Iterates to find potentially matched encounters for . /// public record struct EncounterEnumerator5(PKM Entity, EvoCriteria[] Chain, GameVersion Version) : IEnumerator> { diff --git a/PKHeX.Core/Legality/Encounters/Generator/Search/EncounterEnumerator6.cs b/PKHeX.Core/Legality/Encounters/Generator/Search/EncounterEnumerator6.cs index 7bb6a9295..a0f2c6efc 100644 --- a/PKHeX.Core/Legality/Encounters/Generator/Search/EncounterEnumerator6.cs +++ b/PKHeX.Core/Legality/Encounters/Generator/Search/EncounterEnumerator6.cs @@ -5,7 +5,7 @@ namespace PKHeX.Core; /// -/// Iterates to find potentially matched encounters for . +/// Iterates to find potentially matched encounters for . /// public record struct EncounterEnumerator6(PKM Entity, EvoCriteria[] Chain, GameVersion Version) : IEnumerator> { diff --git a/PKHeX.Core/Legality/Encounters/Generator/Search/EncounterEnumerator7.cs b/PKHeX.Core/Legality/Encounters/Generator/Search/EncounterEnumerator7.cs index 220588ab2..cc3228646 100644 --- a/PKHeX.Core/Legality/Encounters/Generator/Search/EncounterEnumerator7.cs +++ b/PKHeX.Core/Legality/Encounters/Generator/Search/EncounterEnumerator7.cs @@ -5,7 +5,7 @@ namespace PKHeX.Core; /// -/// Iterates to find potentially matched encounters for . +/// Iterates to find potentially matched encounters for . /// public record struct EncounterEnumerator7(PKM Entity, EvoCriteria[] Chain, GameVersion Version) : IEnumerator> { diff --git a/PKHeX.Core/Legality/Encounters/Generator/Search/EncounterEnumerator7GG.cs b/PKHeX.Core/Legality/Encounters/Generator/Search/EncounterEnumerator7GG.cs index 58d457cb0..cfcf219e8 100644 --- a/PKHeX.Core/Legality/Encounters/Generator/Search/EncounterEnumerator7GG.cs +++ b/PKHeX.Core/Legality/Encounters/Generator/Search/EncounterEnumerator7GG.cs @@ -5,7 +5,7 @@ namespace PKHeX.Core; /// -/// Iterates to find potentially matched encounters for . +/// Iterates to find potentially matched encounters for . /// public record struct EncounterEnumerator7GG(PKM Entity, EvoCriteria[] Chain, GameVersion Version) : IEnumerator> { diff --git a/PKHeX.Core/Legality/Encounters/Generator/Search/EncounterEnumerator7GO.cs b/PKHeX.Core/Legality/Encounters/Generator/Search/EncounterEnumerator7GO.cs index f27fde8c4..ad83820e7 100644 --- a/PKHeX.Core/Legality/Encounters/Generator/Search/EncounterEnumerator7GO.cs +++ b/PKHeX.Core/Legality/Encounters/Generator/Search/EncounterEnumerator7GO.cs @@ -5,7 +5,7 @@ namespace PKHeX.Core; /// -/// Iterates to find potentially matched encounters for encounters from GO Park. +/// Iterates to find potentially matched encounters for encounters from GO Park. /// public record struct EncounterEnumerator7GO(PKM Entity, EvoCriteria[] Chain) : IEnumerator> { diff --git a/PKHeX.Core/Legality/Encounters/Generator/Search/EncounterEnumerator8.cs b/PKHeX.Core/Legality/Encounters/Generator/Search/EncounterEnumerator8.cs index a92674fb5..f06b046bb 100644 --- a/PKHeX.Core/Legality/Encounters/Generator/Search/EncounterEnumerator8.cs +++ b/PKHeX.Core/Legality/Encounters/Generator/Search/EncounterEnumerator8.cs @@ -5,7 +5,7 @@ namespace PKHeX.Core; /// -/// Iterates to find potentially matched encounters for . +/// Iterates to find potentially matched encounters for . /// public record struct EncounterEnumerator8(PKM Entity, EvoCriteria[] Chain, GameVersion Version) : IEnumerator> { diff --git a/PKHeX.Core/Legality/Encounters/Generator/Search/EncounterEnumerator8a.cs b/PKHeX.Core/Legality/Encounters/Generator/Search/EncounterEnumerator8a.cs index 7a802232a..b3bb230e5 100644 --- a/PKHeX.Core/Legality/Encounters/Generator/Search/EncounterEnumerator8a.cs +++ b/PKHeX.Core/Legality/Encounters/Generator/Search/EncounterEnumerator8a.cs @@ -5,7 +5,7 @@ namespace PKHeX.Core; /// -/// Iterates to find potentially matched encounters for . +/// Iterates to find potentially matched encounters for . /// public record struct EncounterEnumerator8a(PKM Entity, EvoCriteria[] Chain) : IEnumerator> { diff --git a/PKHeX.Core/Legality/Encounters/Generator/Search/EncounterEnumerator8b.cs b/PKHeX.Core/Legality/Encounters/Generator/Search/EncounterEnumerator8b.cs index 30e3fdb1a..4bb63ee77 100644 --- a/PKHeX.Core/Legality/Encounters/Generator/Search/EncounterEnumerator8b.cs +++ b/PKHeX.Core/Legality/Encounters/Generator/Search/EncounterEnumerator8b.cs @@ -5,7 +5,7 @@ namespace PKHeX.Core; /// -/// Iterates to find potentially matched encounters for . +/// Iterates to find potentially matched encounters for . /// public record struct EncounterEnumerator8b(PKM Entity, EvoCriteria[] Chain, GameVersion Version) : IEnumerator> { diff --git a/PKHeX.Core/Legality/Encounters/Generator/Search/EncounterEnumerator9.cs b/PKHeX.Core/Legality/Encounters/Generator/Search/EncounterEnumerator9.cs index e838d51c5..d259379d2 100644 --- a/PKHeX.Core/Legality/Encounters/Generator/Search/EncounterEnumerator9.cs +++ b/PKHeX.Core/Legality/Encounters/Generator/Search/EncounterEnumerator9.cs @@ -5,7 +5,7 @@ namespace PKHeX.Core; /// -/// Iterates to find potentially matched encounters for . +/// Iterates to find potentially matched encounters for . /// public record struct EncounterEnumerator9(PKM Entity, EvoCriteria[] Chain, GameVersion Version) : IEnumerator> { diff --git a/PKHeX.Core/Legality/Encounters/Templates/GO/EncounterSlot7GO.cs b/PKHeX.Core/Legality/Encounters/Templates/GO/EncounterSlot7GO.cs index 58dca9d2a..ace34af9d 100644 --- a/PKHeX.Core/Legality/Encounters/Templates/GO/EncounterSlot7GO.cs +++ b/PKHeX.Core/Legality/Encounters/Templates/GO/EncounterSlot7GO.cs @@ -3,7 +3,7 @@ namespace PKHeX.Core; /// -/// Encounter Slot found in (GO Park, ). +/// Encounter Slot found in (GO Park). /// /// public sealed record EncounterSlot7GO(int StartDate, int EndDate, ushort Species, byte Form, byte LevelMin, byte LevelMax, Shiny Shiny, Gender Gender, PogoType Type) diff --git a/PKHeX.Core/Legality/Encounters/Templates/Gen1/EncounterSlot1.cs b/PKHeX.Core/Legality/Encounters/Templates/Gen1/EncounterSlot1.cs index 92664d760..37489ad00 100644 --- a/PKHeX.Core/Legality/Encounters/Templates/Gen1/EncounterSlot1.cs +++ b/PKHeX.Core/Legality/Encounters/Templates/Gen1/EncounterSlot1.cs @@ -1,7 +1,7 @@ namespace PKHeX.Core; /// -/// Encounter Slot found in . +/// Encounter Slot found in . /// public sealed record EncounterSlot1(EncounterArea1 Parent, ushort Species, byte LevelMin, byte LevelMax, byte SlotNumber) : IEncounterable, IEncounterMatch, IEncounterConvertible, INumberedSlot diff --git a/PKHeX.Core/Legality/Encounters/Templates/Gen2/EncounterSlot2.cs b/PKHeX.Core/Legality/Encounters/Templates/Gen2/EncounterSlot2.cs index 66c04ab2c..5ede285d6 100644 --- a/PKHeX.Core/Legality/Encounters/Templates/Gen2/EncounterSlot2.cs +++ b/PKHeX.Core/Legality/Encounters/Templates/Gen2/EncounterSlot2.cs @@ -4,7 +4,7 @@ namespace PKHeX.Core; /// -/// Encounter Slot found in . +/// Encounter Slot found in . /// /// /// Referenced Area object contains Time data which is used for origin data. diff --git a/PKHeX.Core/Legality/Encounters/Templates/Gen3/EncounterArea3.cs b/PKHeX.Core/Legality/Encounters/Templates/Gen3/EncounterArea3.cs index 70d3a56f6..449d63d34 100644 --- a/PKHeX.Core/Legality/Encounters/Templates/Gen3/EncounterArea3.cs +++ b/PKHeX.Core/Legality/Encounters/Templates/Gen3/EncounterArea3.cs @@ -6,7 +6,7 @@ namespace PKHeX.Core; /// -/// encounter area +/// encounter area /// public sealed record EncounterArea3 : IEncounterArea, IAreaLocation { diff --git a/PKHeX.Core/Legality/Encounters/Templates/Gen3/EncounterSlot3.cs b/PKHeX.Core/Legality/Encounters/Templates/Gen3/EncounterSlot3.cs index 415da4636..b3edbcded 100644 --- a/PKHeX.Core/Legality/Encounters/Templates/Gen3/EncounterSlot3.cs +++ b/PKHeX.Core/Legality/Encounters/Templates/Gen3/EncounterSlot3.cs @@ -4,7 +4,7 @@ namespace PKHeX.Core; /// -/// Encounter Slot found in . +/// Encounter Slot found in . /// public record EncounterSlot3(EncounterArea3 Parent, ushort Species, byte Form, byte LevelMin, byte LevelMax, byte SlotNumber, byte MagnetPullIndex, byte MagnetPullCount, byte StaticIndex, byte StaticCount) : IEncounterable, IEncounterMatch, IEncounterConvertible, IEncounterSlot3, IRandomCorrelation diff --git a/PKHeX.Core/Legality/Encounters/Templates/Gen4/EncounterArea4.cs b/PKHeX.Core/Legality/Encounters/Templates/Gen4/EncounterArea4.cs index 255432ab6..3fe1ee095 100644 --- a/PKHeX.Core/Legality/Encounters/Templates/Gen4/EncounterArea4.cs +++ b/PKHeX.Core/Legality/Encounters/Templates/Gen4/EncounterArea4.cs @@ -5,7 +5,7 @@ namespace PKHeX.Core; /// -/// encounter area +/// encounter area /// public sealed record EncounterArea4 : IEncounterArea, IGroundTypeTile, IAreaLocation { diff --git a/PKHeX.Core/Legality/Encounters/Templates/Gen4/EncounterSlot4.cs b/PKHeX.Core/Legality/Encounters/Templates/Gen4/EncounterSlot4.cs index 9086a6ed2..c770bc29c 100644 --- a/PKHeX.Core/Legality/Encounters/Templates/Gen4/EncounterSlot4.cs +++ b/PKHeX.Core/Legality/Encounters/Templates/Gen4/EncounterSlot4.cs @@ -3,7 +3,7 @@ namespace PKHeX.Core; /// -/// Encounter Slot found in . +/// Encounter Slot found in . /// public sealed record EncounterSlot4(EncounterArea4 Parent, ushort Species, byte Form, byte LevelMin, byte LevelMax, byte SlotNumber, byte MagnetPullIndex, byte MagnetPullCount, byte StaticIndex, byte StaticCount) : IEncounterable, IEncounterMatch, IEncounterConvertible, IEncounterSlot4, IGroundTypeTile, IEncounterFormRandom, IRandomCorrelation diff --git a/PKHeX.Core/Legality/Encounters/Templates/Gen4/IGroundTypeTile.cs b/PKHeX.Core/Legality/Encounters/Templates/Gen4/IGroundTypeTile.cs index 60f6ac3ab..78124b8eb 100644 --- a/PKHeX.Core/Legality/Encounters/Templates/Gen4/IGroundTypeTile.cs +++ b/PKHeX.Core/Legality/Encounters/Templates/Gen4/IGroundTypeTile.cs @@ -1,7 +1,7 @@ namespace PKHeX.Core; /// -/// Contains information pertaining the floor tile the was obtained on in . +/// Contains information pertaining the floor tile the was obtained on in . /// /// /// diff --git a/PKHeX.Core/Legality/Encounters/Templates/Gen5/EncounterArea5.cs b/PKHeX.Core/Legality/Encounters/Templates/Gen5/EncounterArea5.cs index 0ea70654a..ea0f35ce1 100644 --- a/PKHeX.Core/Legality/Encounters/Templates/Gen5/EncounterArea5.cs +++ b/PKHeX.Core/Legality/Encounters/Templates/Gen5/EncounterArea5.cs @@ -5,7 +5,7 @@ namespace PKHeX.Core; /// -/// encounter area +/// encounter area /// public sealed record EncounterArea5 : IEncounterArea, IAreaLocation { diff --git a/PKHeX.Core/Legality/Encounters/Templates/Gen5/EncounterSlot5.cs b/PKHeX.Core/Legality/Encounters/Templates/Gen5/EncounterSlot5.cs index 7f03c6e92..863d86d11 100644 --- a/PKHeX.Core/Legality/Encounters/Templates/Gen5/EncounterSlot5.cs +++ b/PKHeX.Core/Legality/Encounters/Templates/Gen5/EncounterSlot5.cs @@ -1,7 +1,7 @@ namespace PKHeX.Core; /// -/// Encounter Slot found in . +/// Encounter Slot found in . /// public sealed record EncounterSlot5(EncounterArea5 Parent, ushort Species, byte Form, byte LevelMin, byte LevelMax) : IEncounterable, IEncounterMatch, IEncounterConvertible diff --git a/PKHeX.Core/Legality/Encounters/Templates/Gen7/EncounterArea7.cs b/PKHeX.Core/Legality/Encounters/Templates/Gen7/EncounterArea7.cs index a3a8874b5..64b6e8cfe 100644 --- a/PKHeX.Core/Legality/Encounters/Templates/Gen7/EncounterArea7.cs +++ b/PKHeX.Core/Legality/Encounters/Templates/Gen7/EncounterArea7.cs @@ -11,7 +11,7 @@ public enum SlotType7 : byte } /// -/// encounter area +/// encounter area /// public sealed record EncounterArea7 : IEncounterArea, IAreaLocation { diff --git a/PKHeX.Core/Legality/Encounters/Templates/Gen7/EncounterSlot7.cs b/PKHeX.Core/Legality/Encounters/Templates/Gen7/EncounterSlot7.cs index 730291456..f31d7b680 100644 --- a/PKHeX.Core/Legality/Encounters/Templates/Gen7/EncounterSlot7.cs +++ b/PKHeX.Core/Legality/Encounters/Templates/Gen7/EncounterSlot7.cs @@ -1,7 +1,7 @@ namespace PKHeX.Core; /// -/// Encounter Slot found in . +/// Encounter Slot found in . /// public sealed record EncounterSlot7(EncounterArea7 Parent, ushort Species, byte Form, byte LevelMin, byte LevelMax) : IEncounterable, IEncounterMatch, IEncounterConvertible, IEncounterFormRandom, IFlawlessIVCountConditional diff --git a/PKHeX.Core/Legality/Encounters/Verifiers/EggHatchLocation3.cs b/PKHeX.Core/Legality/Encounters/Verifiers/EggHatchLocation3.cs index 369be3a0e..83e632857 100644 --- a/PKHeX.Core/Legality/Encounters/Verifiers/EggHatchLocation3.cs +++ b/PKHeX.Core/Legality/Encounters/Verifiers/EggHatchLocation3.cs @@ -4,7 +4,7 @@ namespace PKHeX.Core; /// -/// Hatch Location validity for . +/// Hatch Location validity for . /// public static class EggHatchLocation3 { diff --git a/PKHeX.Core/Legality/Encounters/Verifiers/EggHatchLocation4.cs b/PKHeX.Core/Legality/Encounters/Verifiers/EggHatchLocation4.cs index a4d3a8c4d..817ac8b37 100644 --- a/PKHeX.Core/Legality/Encounters/Verifiers/EggHatchLocation4.cs +++ b/PKHeX.Core/Legality/Encounters/Verifiers/EggHatchLocation4.cs @@ -4,7 +4,7 @@ namespace PKHeX.Core; /// -/// Hatch Location validity for . +/// Hatch Location validity for . /// public static class EggHatchLocation4 { diff --git a/PKHeX.Core/Legality/Encounters/Verifiers/EggHatchLocation5.cs b/PKHeX.Core/Legality/Encounters/Verifiers/EggHatchLocation5.cs index 900de2339..3bbfe4c0f 100644 --- a/PKHeX.Core/Legality/Encounters/Verifiers/EggHatchLocation5.cs +++ b/PKHeX.Core/Legality/Encounters/Verifiers/EggHatchLocation5.cs @@ -4,7 +4,7 @@ namespace PKHeX.Core; /// -/// Hatch Location validity for . +/// Hatch Location validity for . /// public static class EggHatchLocation5 { diff --git a/PKHeX.Core/Legality/Encounters/Verifiers/EggHatchLocation6.cs b/PKHeX.Core/Legality/Encounters/Verifiers/EggHatchLocation6.cs index e40386c2a..245a6515f 100644 --- a/PKHeX.Core/Legality/Encounters/Verifiers/EggHatchLocation6.cs +++ b/PKHeX.Core/Legality/Encounters/Verifiers/EggHatchLocation6.cs @@ -1,7 +1,7 @@ namespace PKHeX.Core; /// -/// Hatch Location validity for . +/// Hatch Location validity for . /// public static class EggHatchLocation6 { diff --git a/PKHeX.Core/Legality/Encounters/Verifiers/EggHatchLocation7.cs b/PKHeX.Core/Legality/Encounters/Verifiers/EggHatchLocation7.cs index bfb01ec18..5264b4289 100644 --- a/PKHeX.Core/Legality/Encounters/Verifiers/EggHatchLocation7.cs +++ b/PKHeX.Core/Legality/Encounters/Verifiers/EggHatchLocation7.cs @@ -3,7 +3,7 @@ namespace PKHeX.Core; /// -/// Hatch Location validity for . +/// Hatch Location validity for . /// public static class EggHatchLocation7 { diff --git a/PKHeX.Core/Legality/Encounters/Verifiers/EggHatchLocation8.cs b/PKHeX.Core/Legality/Encounters/Verifiers/EggHatchLocation8.cs index d16444847..4cc18e9cb 100644 --- a/PKHeX.Core/Legality/Encounters/Verifiers/EggHatchLocation8.cs +++ b/PKHeX.Core/Legality/Encounters/Verifiers/EggHatchLocation8.cs @@ -3,7 +3,7 @@ namespace PKHeX.Core; /// -/// Hatch Location validity for . +/// Hatch Location validity for . /// public static class EggHatchLocation8 { diff --git a/PKHeX.Core/Legality/Encounters/Verifiers/EggHatchLocation8b.cs b/PKHeX.Core/Legality/Encounters/Verifiers/EggHatchLocation8b.cs index 6b5bb916a..cbe73974d 100644 --- a/PKHeX.Core/Legality/Encounters/Verifiers/EggHatchLocation8b.cs +++ b/PKHeX.Core/Legality/Encounters/Verifiers/EggHatchLocation8b.cs @@ -3,7 +3,7 @@ namespace PKHeX.Core; /// -/// Hatch Location validity for . +/// Hatch Location validity for . /// public static class EggHatchLocation8b { diff --git a/PKHeX.Core/Legality/Encounters/Verifiers/EggHatchLocation9.cs b/PKHeX.Core/Legality/Encounters/Verifiers/EggHatchLocation9.cs index 1da699936..7b6f2e9c1 100644 --- a/PKHeX.Core/Legality/Encounters/Verifiers/EggHatchLocation9.cs +++ b/PKHeX.Core/Legality/Encounters/Verifiers/EggHatchLocation9.cs @@ -3,7 +3,7 @@ namespace PKHeX.Core; /// -/// Hatch Location validity for . +/// Hatch Location validity for . /// public static class EggHatchLocation9 { diff --git a/PKHeX.Core/Legality/LearnSource/Group/LearnGroup1.cs b/PKHeX.Core/Legality/LearnSource/Group/LearnGroup1.cs index a53a8b3c0..a368c0801 100644 --- a/PKHeX.Core/Legality/LearnSource/Group/LearnGroup1.cs +++ b/PKHeX.Core/Legality/LearnSource/Group/LearnGroup1.cs @@ -3,7 +3,7 @@ namespace PKHeX.Core; /// -/// Group that checks the source of a move in . +/// Group that checks the source of a move in . /// public sealed class LearnGroup1 : ILearnGroup { diff --git a/PKHeX.Core/Legality/LearnSource/Group/LearnGroup2.cs b/PKHeX.Core/Legality/LearnSource/Group/LearnGroup2.cs index 4a5f720a9..17577f08d 100644 --- a/PKHeX.Core/Legality/LearnSource/Group/LearnGroup2.cs +++ b/PKHeX.Core/Legality/LearnSource/Group/LearnGroup2.cs @@ -3,7 +3,7 @@ namespace PKHeX.Core; /// -/// Group that checks the source of a move in . +/// Group that checks the source of a move in . /// public sealed class LearnGroup2 : ILearnGroup { diff --git a/PKHeX.Core/Legality/LearnSource/Group/LearnGroup3.cs b/PKHeX.Core/Legality/LearnSource/Group/LearnGroup3.cs index 55c542db6..663bc9577 100644 --- a/PKHeX.Core/Legality/LearnSource/Group/LearnGroup3.cs +++ b/PKHeX.Core/Legality/LearnSource/Group/LearnGroup3.cs @@ -3,7 +3,7 @@ namespace PKHeX.Core; /// -/// Group that checks the source of a move in . +/// Group that checks the source of a move in . /// public sealed class LearnGroup3 : ILearnGroup { diff --git a/PKHeX.Core/Legality/LearnSource/Group/LearnGroup4.cs b/PKHeX.Core/Legality/LearnSource/Group/LearnGroup4.cs index ac52ea8ff..1ee2b89f8 100644 --- a/PKHeX.Core/Legality/LearnSource/Group/LearnGroup4.cs +++ b/PKHeX.Core/Legality/LearnSource/Group/LearnGroup4.cs @@ -3,7 +3,7 @@ namespace PKHeX.Core; /// -/// Group that checks the source of a move in . +/// Group that checks the source of a move in . /// public sealed class LearnGroup4 : ILearnGroup { diff --git a/PKHeX.Core/Legality/LearnSource/Group/LearnGroup5.cs b/PKHeX.Core/Legality/LearnSource/Group/LearnGroup5.cs index c56731d9e..2b6b73f1a 100644 --- a/PKHeX.Core/Legality/LearnSource/Group/LearnGroup5.cs +++ b/PKHeX.Core/Legality/LearnSource/Group/LearnGroup5.cs @@ -3,7 +3,7 @@ namespace PKHeX.Core; /// -/// Group that checks the source of a move in . +/// Group that checks the source of a move in . /// public sealed class LearnGroup5 : ILearnGroup { diff --git a/PKHeX.Core/Legality/LearnSource/Group/LearnGroup6.cs b/PKHeX.Core/Legality/LearnSource/Group/LearnGroup6.cs index f33c84440..e9f15009e 100644 --- a/PKHeX.Core/Legality/LearnSource/Group/LearnGroup6.cs +++ b/PKHeX.Core/Legality/LearnSource/Group/LearnGroup6.cs @@ -3,7 +3,7 @@ namespace PKHeX.Core; /// -/// Group that checks the source of a move in . +/// Group that checks the source of a move in . /// public sealed class LearnGroup6 : ILearnGroup { diff --git a/PKHeX.Core/Legality/LearnSource/Group/LearnGroup7.cs b/PKHeX.Core/Legality/LearnSource/Group/LearnGroup7.cs index 700599d43..6167b0705 100644 --- a/PKHeX.Core/Legality/LearnSource/Group/LearnGroup7.cs +++ b/PKHeX.Core/Legality/LearnSource/Group/LearnGroup7.cs @@ -3,7 +3,7 @@ namespace PKHeX.Core; /// -/// Group that checks the source of a move in . +/// Group that checks the source of a move in . /// public sealed class LearnGroup7 : ILearnGroup { diff --git a/PKHeX.Core/Legality/LearnSource/Group/LearnGroup7b.cs b/PKHeX.Core/Legality/LearnSource/Group/LearnGroup7b.cs index b6d2a0972..711e03997 100644 --- a/PKHeX.Core/Legality/LearnSource/Group/LearnGroup7b.cs +++ b/PKHeX.Core/Legality/LearnSource/Group/LearnGroup7b.cs @@ -3,7 +3,7 @@ namespace PKHeX.Core; /// -/// Group that checks the source of a move in . +/// Group that checks the source of a move in . /// public sealed class LearnGroup7b : ILearnGroup { diff --git a/PKHeX.Core/Legality/LearnSource/Group/LearnGroup8.cs b/PKHeX.Core/Legality/LearnSource/Group/LearnGroup8.cs index a8e03820f..8983300ec 100644 --- a/PKHeX.Core/Legality/LearnSource/Group/LearnGroup8.cs +++ b/PKHeX.Core/Legality/LearnSource/Group/LearnGroup8.cs @@ -3,7 +3,7 @@ namespace PKHeX.Core; /// -/// Group that checks the source of a move in . +/// Group that checks the source of a move in . /// public sealed class LearnGroup8 : ILearnGroup { diff --git a/PKHeX.Core/Legality/LearnSource/Group/LearnGroup8a.cs b/PKHeX.Core/Legality/LearnSource/Group/LearnGroup8a.cs index 49f12d1d5..80aa699d3 100644 --- a/PKHeX.Core/Legality/LearnSource/Group/LearnGroup8a.cs +++ b/PKHeX.Core/Legality/LearnSource/Group/LearnGroup8a.cs @@ -3,7 +3,7 @@ namespace PKHeX.Core; /// -/// Group that checks the source of a move in . +/// Group that checks the source of a move in . /// public sealed class LearnGroup8a : ILearnGroup { diff --git a/PKHeX.Core/Legality/LearnSource/Group/LearnGroup8b.cs b/PKHeX.Core/Legality/LearnSource/Group/LearnGroup8b.cs index 9043e8100..d71f7dc44 100644 --- a/PKHeX.Core/Legality/LearnSource/Group/LearnGroup8b.cs +++ b/PKHeX.Core/Legality/LearnSource/Group/LearnGroup8b.cs @@ -3,7 +3,7 @@ namespace PKHeX.Core; /// -/// Group that checks the source of a move in . +/// Group that checks the source of a move in . /// public sealed class LearnGroup8b : ILearnGroup { diff --git a/PKHeX.Core/Legality/LearnSource/Group/LearnGroup9.cs b/PKHeX.Core/Legality/LearnSource/Group/LearnGroup9.cs index 0457aada7..67d9c468d 100644 --- a/PKHeX.Core/Legality/LearnSource/Group/LearnGroup9.cs +++ b/PKHeX.Core/Legality/LearnSource/Group/LearnGroup9.cs @@ -3,7 +3,7 @@ namespace PKHeX.Core; /// -/// Group that checks the source of a move in . +/// Group that checks the source of a move in . /// public sealed class LearnGroup9 : ILearnGroup { diff --git a/PKHeX.Core/Legality/Verifiers/FormVerifier.cs b/PKHeX.Core/Legality/Verifiers/FormVerifier.cs index 2adc1ac3d..5f75a932a 100644 --- a/PKHeX.Core/Legality/Verifiers/FormVerifier.cs +++ b/PKHeX.Core/Legality/Verifiers/FormVerifier.cs @@ -105,7 +105,7 @@ private CheckResult VerifyForm(LegalityAnalysis data) return GetInvalid(string.Format(LFormInvalidRange, 0, form)); break; - case Scatterbug or Spewpa or Vivillon when GameVersion.SV.Contains(enc.Version): + case Scatterbug or Spewpa or Vivillon when enc.Context is EntityContext.Gen9: if (form > 18 && enc.Form != form) // Pokéball return GetInvalid(LFormVivillonEventPre); if (form != 18 && enc is EncounterEgg) // Fancy diff --git a/PKHeX.Core/Legality/Verifiers/LanguageVerifier.cs b/PKHeX.Core/Legality/Verifiers/LanguageVerifier.cs index c499d5a21..c55f23811 100644 --- a/PKHeX.Core/Legality/Verifiers/LanguageVerifier.cs +++ b/PKHeX.Core/Legality/Verifiers/LanguageVerifier.cs @@ -37,11 +37,11 @@ public override void Verify(LegalityAnalysis data) if (originalGeneration <= 2) { // Korean Crystal does not exist, neither do Korean VC1 - if (pk.Korean && !GameVersion.GS.Contains(pk.Version)) + if (pk is { Korean: true, Version: not (GameVersion.GD or GameVersion.SI) }) data.AddLine(GetInvalid(string.Format(LOTLanguage, $"!={(LanguageID)currentLanguage}", (LanguageID)currentLanguage))); // Japanese VC is language locked; cannot obtain Japanese-Blue version as other languages. - if (pk is { Version: GameVersion.BU, Japanese: false }) + if (pk is { Japanese: false, Version: GameVersion.BU }) data.AddLine(GetInvalid(string.Format(LOTLanguage, nameof(LanguageID.Japanese), (LanguageID)currentLanguage))); } } diff --git a/PKHeX.WinForms/Subforms/Save Editors/Gen7/SAV_Trainer7GG.cs b/PKHeX.WinForms/Subforms/Save Editors/Gen7/SAV_Trainer7GG.cs index 53f030fef..6c4612e1c 100644 --- a/PKHeX.WinForms/Subforms/Save Editors/Gen7/SAV_Trainer7GG.cs +++ b/PKHeX.WinForms/Subforms/Save Editors/Gen7/SAV_Trainer7GG.cs @@ -60,7 +60,7 @@ private void GetComboBoxes() CB_Language.InitializeBinding(); CB_Language.DataSource = GameInfo.LanguageDataSource(SAV.Generation); CB_Game.InitializeBinding(); - CB_Game.DataSource = new BindingSource(GameInfo.VersionDataSource.Where(z => GameVersion.Gen7b.Contains(z.Value)).ToList(), string.Empty); + CB_Game.DataSource = new BindingSource(GameInfo.VersionDataSource.Where(z => (GameVersion)z.Value is GameVersion.GP or GameVersion.GE).ToList(), string.Empty); } private void LoadTrainerInfo()