From 6b1fff05bddc8b50efbbc0507808ba8562608a7a Mon Sep 17 00:00:00 2001
From: Kurt <kaphotics@gmail.com>
Date: Fri, 9 Oct 2020 20:04:09 -0700
Subject: [PATCH] Revise gen6/7 HA banlist to account for altforms

---
 PKHeX.Core/Legality/Tables/Tables6.cs | 35 ++++++++++++++++++---------
 PKHeX.Core/Legality/Tables/Tables7.cs | 18 +++++++++-----
 2 files changed, 35 insertions(+), 18 deletions(-)

diff --git a/PKHeX.Core/Legality/Tables/Tables6.cs b/PKHeX.Core/Legality/Tables/Tables6.cs
index bb5792247..3bb434594 100644
--- a/PKHeX.Core/Legality/Tables/Tables6.cs
+++ b/PKHeX.Core/Legality/Tables/Tables6.cs
@@ -279,19 +279,19 @@ public static partial class Legal
 
         internal static readonly HashSet<int> Ban_NoHidden6 = new HashSet<int>
         {
-            //Not avaliable at Friend Safari or Horde Encounter
-            669 + (2 << 11), //Flabébé-Orange
-            670 + (2 << 11), //Floette-Orange
-            671 + (2 << 11), //Florges-Orange
-            669 + (4 << 11), //Flabébé-White
-            670 + (4 << 11), //Floette-White
-            671 + (4 << 11), //Florges-White
+            // Not available at Friend Safari or Horde Encounter
+            (int)Species.Flabébé + (2 << 11), // Orange
+            (int)Species.Floette + (2 << 11), // Orange
+            (int)Species.Florges + (2 << 11), // Orange
+            (int)Species.Flabébé + (4 << 11), // White
+            (int)Species.Floette + (4 << 11), // White
+            (int)Species.Florges + (4 << 11), // White
 
-            710 + (1 << 11), //Pumpkaboo-Small
-            711 + (1 << 11), //Gourgeist-Small
-            710 + (2 << 11), //Pumpkaboo-Large
-            711 + (2 << 11), //Gourgeist-Large
-            //Super Size can be obtained as a Pumpkaboo from event distributions
+            // Super Size can be obtained as a Pumpkaboo from event distributions
+            (int)Species.Pumpkaboo + (1 << 11), // Small
+            (int)Species.Gourgeist + (1 << 11), // Small
+            (int)Species.Pumpkaboo + (2 << 11), // Large
+            (int)Species.Gourgeist + (2 << 11), // Large
 
             // Same abilities (1/2/H), not available as H
             (int)Species.Honedge,
@@ -310,7 +310,18 @@ public static partial class Legal
 
             (int)Species.Castform,
             (int)Species.Furfrou,
+            (int)Species.Furfrou,
+            (int)Species.Furfrou + (1 << 11),
+            (int)Species.Furfrou + (2 << 11),
+            (int)Species.Furfrou + (3 << 11),
+            (int)Species.Furfrou + (4 << 11),
+            (int)Species.Furfrou + (5 << 11),
+            (int)Species.Furfrou + (6 << 11),
+            (int)Species.Furfrou + (7 << 11),
+            (int)Species.Furfrou + (8 << 11),
+            (int)Species.Furfrou + (9 << 11),
         };
+
         #region Ball Table
         internal static readonly HashSet<int> Inherit_Sport = new HashSet<int>
         {
diff --git a/PKHeX.Core/Legality/Tables/Tables7.cs b/PKHeX.Core/Legality/Tables/Tables7.cs
index dccb471c9..3b0429a54 100644
--- a/PKHeX.Core/Legality/Tables/Tables7.cs
+++ b/PKHeX.Core/Legality/Tables/Tables7.cs
@@ -557,13 +557,19 @@ public static partial class Legal
             (int)Species.Komala,
 
             // No Encounter
-            774, // Minior
+            (int)Species.Minior + (07 << 11),
+            (int)Species.Minior + (08 << 11),
+            (int)Species.Minior + (09 << 11),
+            (int)Species.Minior + (10 << 11),
+            (int)Species.Minior + (11 << 11),
+            (int)Species.Minior + (12 << 11),
+            (int)Species.Minior + (13 << 11),
 
-            // Pre-Gen
-            710 + (1 << 11), //Pumpkaboo-Small
-            711 + (1 << 11), //Gourgeist-Small
-            710 + (2 << 11), //Pumpkaboo-Large
-            711 + (2 << 11), //Gourgeist-Large
+            // Previous-Gen
+            (int)Species.Pumpkaboo + (1 << 11), // Small
+            (int)Species.Gourgeist + (1 << 11), // Small
+            (int)Species.Pumpkaboo + (2 << 11), // Large
+            (int)Species.Gourgeist + (2 << 11), // Large
 
             // Same abilities (1/2/H), not available as H
             (int)Species.Honedge,