From 7b2e3c59bf567e4a68e1a404d230b0c52335a42e Mon Sep 17 00:00:00 2001
From: Kurt <kaphotics@gmail.com>
Date: Sat, 17 Jun 2017 22:44:05 -0700
Subject: [PATCH] Add gsc goldenrod / fix mania shuckie

---
 .../Legality/Encounters/EncounterGenerator.cs    |  4 ++--
 PKHeX.Core/Legality/Tables2.cs                   | 16 ++++++++++++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/PKHeX.Core/Legality/Encounters/EncounterGenerator.cs b/PKHeX.Core/Legality/Encounters/EncounterGenerator.cs
index 224906e81..407733ee3 100644
--- a/PKHeX.Core/Legality/Encounters/EncounterGenerator.cs
+++ b/PKHeX.Core/Legality/Encounters/EncounterGenerator.cs
@@ -713,9 +713,9 @@ private static IEnumerable<EncounterTrade> GetValidEncounterTradesVC2(PKM pkm, D
                 // Filter Criteria
                 if (z.TID != pkm.TID)
                     continue;
-                if (z.Gender != pkm.Gender && pkm.Format <= 2)
+                if (z.Gender >= 0 && z.Gender != pkm.Gender && pkm.Format <= 2)
                     continue;
-                if (!z.IVs.SequenceEqual(pkm.IVs) && pkm.Format <= 2)
+                if (z.IVs[0] >= 0 && !z.IVs.SequenceEqual(pkm.IVs) && pkm.Format <= 2)
                     continue;
                 if (pkm.Met_Location != 0 && pkm.Format == 2 && pkm.Met_Location != 126)
                     continue;
diff --git a/PKHeX.Core/Legality/Tables2.cs b/PKHeX.Core/Legality/Tables2.cs
index c8d60ac88..8e32a7d48 100644
--- a/PKHeX.Core/Legality/Tables2.cs
+++ b/PKHeX.Core/Legality/Tables2.cs
@@ -79,8 +79,7 @@ public static partial class Legal
             new EncounterStatic { Species = 131, Level = 20, Location = 010, Version = GameVersion.GSC }, // Lapras @ Union Cave
             new EncounterStatic { Species = 133, Level = 20, Location = 016, Version = GameVersion.GSC }, // Eevee @ Goldenrod City
             
-            new EncounterStatic { Species = 185, Level = 20, Location = 020,  Version = GameVersion.GSC }, // Sudowoodo @ Route 36
-            new EncounterStatic { Species = 213, Level = 15, Location = 033, Version = GameVersion.GSC }, // Shuckle @ Cianwood City
+            new EncounterStatic { Species = 185, Level = 20, Location = 020, Version = GameVersion.GSC }, // Sudowoodo @ Route 36
             new EncounterStatic { Species = 236, Level = 10, Location = 035, Version = GameVersion.GSC }, // Tyrogue @ Mt. Mortar
             
             new EncounterStatic { Species = 130, Level = 30, Location = 038, Version = GameVersion.GSC, Shiny = true, }, // Gyarados @ Lake of Rage
@@ -107,6 +106,11 @@ public static partial class Legal
             new EncounterStatic { Species = 137, Level = 15, Version = GameVersion.GS }, // Porygon @ Celadon Game Corner
             new EncounterStatic { Species = 133, Level = 15, Version = GameVersion.GS }, // Eevee @ Celadon Game Corner
             new EncounterStatic { Species = 122, Level = 15, Version = GameVersion.GS }, // Mr. Mime @ Celadon Game Corner
+            
+            new EncounterStatic { Species = 063, Level = 10, Version = GameVersion.GS }, // Abra @ Goldenrod City (Game Corner)
+            new EncounterStatic { Species = 147, Level = 10, Version = GameVersion.GS }, // Dratini @ Goldenrod City (Game Corner)
+            new EncounterStatic { Species = 023, Level = 10, Version = GameVersion.GS }, // Ekans @ Goldenrod City (Game Corner) (Gold)
+            new EncounterStatic { Species = 027, Level = 10, Version = GameVersion.GS }, // Sandshrew @ Goldenrod City (Game Corner) (Silver)
         };
 
         internal static readonly EncounterStatic[] Encounter_C_Exclusive = 
@@ -130,6 +134,10 @@ public static partial class Legal
             new EncounterStatic { Species = 137, Level = 15, Location = 071, Version = GameVersion.C }, // Porygon @ Celadon Game Corner
             new EncounterStatic { Species = 025, Level = 25, Location = 071, Version = GameVersion.C }, // Pikachu @ Celadon Game Corner
             new EncounterStatic { Species = 246, Level = 40, Location = 071, Version = GameVersion.C }, // Larvitar @ Celadon Game Corner
+
+            new EncounterStatic { Species = 063, Level = 05, Location = 016, Version = GameVersion.C }, // Abra @ Goldenrod City (Game Corner)
+            new EncounterStatic { Species = 104, Level = 15, Location = 016, Version = GameVersion.C }, // Cubone @ Goldenrod City (Game Corner)
+            new EncounterStatic { Species = 202, Level = 15, Location = 016, Version = GameVersion.C }, // Wobbuffet @ Goldenrod City (Game Corner)
         };
 
         internal static readonly EncounterStatic[] Encounter_GS = Encounter_GSC_Common.Concat(Encounter_GS_Exclusive).ToArray();
@@ -148,6 +156,8 @@ public static partial class Legal
             new EncounterTrade { Species = 085, Generation = 2, Level = 30, Gender = 0, TID = 00283, IVs = new[] {12, 07, 07, 06, 06, 06} }, // Dodrio @ Blackthorn City for Dragonair [blue jp game corner]
             new EncounterTrade { Species = 178, Generation = 2, Level = 15, Gender = 0, TID = 15616, IVs = new[] {08, 09, 06, 08, 06, 06} }, // Xatu @ Pewter City for Haunter [wild]
             new EncounterTrade { Species = 082, Generation = 2, Level = 16, Gender = 2, TID = 50082, IVs = new[] {08, 09, 06, 06, 06, 06} }, // Magneton @ Power Plant for Dugtrio [wild]
+            
+            new EncounterTrade { Species = 213, Generation = 2, Level = 15, TID = 00518 } // Shuckle @ Cianwood City for free
         };
         internal static readonly string[][] TradeGift_GSC_OTs =
         {
@@ -161,6 +171,8 @@ public static partial class Legal
             new[] { "ミサコ", "EMY" },
             new[] { "デンジ", "CHRIS" },
             new[] { "モリオ", "FOREST" },
+
+            new[] { "セイジ", "MANIA" },
         };
         internal static readonly int[] UnreleasedItems_2 =
         {