From 0edbef8ba4bb82a80b31d25aa10cebbcac515870 Mon Sep 17 00:00:00 2001 From: Kurt Date: Fri, 24 Apr 2020 08:24:12 -0700 Subject: [PATCH] Add more HA banlist definitely more --- PKHeX.Core/Legality/Core.cs | 2 ++ PKHeX.Core/Legality/Tables/Tables6.cs | 5 +++++ PKHeX.Core/Legality/Tables/Tables7.cs | 5 +++++ 3 files changed, 12 insertions(+) diff --git a/PKHeX.Core/Legality/Core.cs b/PKHeX.Core/Legality/Core.cs index 53f25874e..76470dba0 100644 --- a/PKHeX.Core/Legality/Core.cs +++ b/PKHeX.Core/Legality/Core.cs @@ -463,6 +463,8 @@ private static bool IsEvolvedFormChange(PKM pkm, int expected) return pkm.AltForm != orig; // bad compare? if ((int) Species.Darmanitan == pkm.Species) return pkm.AltForm == (expected == 1 ? 2 : 0); + if ((int)Species.MrMime == pkm.Species) + return pkm.AltForm == (expected == 0 ? 1 : 0); if ((int) Species.Toxtricity == pkm.Species) return pkm.AltForm == EvolutionMethod.GetAmpLowKeyResult(pkm.Nature); if ((int) Species.Alcremie == pkm.Species) diff --git a/PKHeX.Core/Legality/Tables/Tables6.cs b/PKHeX.Core/Legality/Tables/Tables6.cs index 137c4a470..ac0bc5a88 100644 --- a/PKHeX.Core/Legality/Tables/Tables6.cs +++ b/PKHeX.Core/Legality/Tables/Tables6.cs @@ -292,6 +292,11 @@ public static partial class Legal 710 + (2 << 11), //Pumpkaboo-Large 711 + (2 << 11), //Gourgeist-Large //Super Size can be obtained as a Pumpkaboo from event distributions + + // Same abilities (1/2/H), not available as H + (int)Species.Honedge, + (int)Species.Doublade, + (int)Species.Aegislash, }; #region Ball Table internal static readonly HashSet Inherit_Sport = new HashSet diff --git a/PKHeX.Core/Legality/Tables/Tables7.cs b/PKHeX.Core/Legality/Tables/Tables7.cs index a597ee813..c61665db4 100644 --- a/PKHeX.Core/Legality/Tables/Tables7.cs +++ b/PKHeX.Core/Legality/Tables/Tables7.cs @@ -562,6 +562,11 @@ public static partial class Legal 711 + (1 << 11), //Gourgeist-Small 710 + (2 << 11), //Pumpkaboo-Large 711 + (2 << 11), //Gourgeist-Large + + // Same abilities (1/2/H), not available as H + (int)Species.Honedge, + (int)Species.Doublade, + (int)Species.Aegislash, }; internal static readonly HashSet Ban_NoHidden7Apricorn = new HashSet