From 61cbf04c2e491ae2c817bb23730b50d818fd1713 Mon Sep 17 00:00:00 2001
From: Kurt <kaphotics@gmail.com>
Date: Thu, 19 Mar 2020 21:04:17 -0700
Subject: [PATCH] Fix comparison to watchtower, not wild area

unshuffle the IVs for comparison, oops
---
 PKHeX.Core/Legality/Encounters/Data/Encounters8Nest.cs        | 1 +
 PKHeX.Core/Legality/Encounters/Data/Encounters8NestCrystal.cs | 2 +-
 PKHeX.Core/Legality/Encounters/EncounterStatic8NC.cs          | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/PKHeX.Core/Legality/Encounters/Data/Encounters8Nest.cs b/PKHeX.Core/Legality/Encounters/Data/Encounters8Nest.cs
index 94b6b605b..cbb872822 100644
--- a/PKHeX.Core/Legality/Encounters/Data/Encounters8Nest.cs
+++ b/PKHeX.Core/Legality/Encounters/Data/Encounters8Nest.cs
@@ -203,6 +203,7 @@ internal static partial class Encounters8Nest
         internal const int A4 = -1; // 1/2/H
 
         internal const int SharedNest = 162;
+        internal const int Watchtower = 126;
 
         internal static readonly EncounterStatic8N[] Nest_Common =
         {
diff --git a/PKHeX.Core/Legality/Encounters/Data/Encounters8NestCrystal.cs b/PKHeX.Core/Legality/Encounters/Data/Encounters8NestCrystal.cs
index c849bb632..f394bfe01 100644
--- a/PKHeX.Core/Legality/Encounters/Data/Encounters8NestCrystal.cs
+++ b/PKHeX.Core/Legality/Encounters/Data/Encounters8NestCrystal.cs
@@ -8,7 +8,7 @@ internal static partial class Encounters8Nest
         {
             new EncounterStatic8NC { Species = 782, Level = 16, Ability = A4, Location = 126, IVs = new []{31,31,31,-1,-1,-1}, DynamaxLevel = 2, Moves = new[] {033,029,525,043}, }, // ★And458 Jangmo-o
             new EncounterStatic8NC { Species = 246, Level = 16, Ability = A4, Location = 126, IVs = new []{31,31,31,-1,-1,-1}, DynamaxLevel = 2, Moves = new[] {033,157,371,044}, }, // ★And15 Larvitar
-            new EncounterStatic8NC { Species = 823, Level = 50, Ability = A4, Location = 126, IVs = new []{31,31,31,-1,31,-1}, DynamaxLevel = 5, Moves = new[] {065,442,034,796}, CanGigantamax = true }, // ★And337 4-Star Gigantamax Corviknight
+            new EncounterStatic8NC { Species = 823, Level = 50, Ability = A4, Location = 126, IVs = new []{31,31,31,-1,-1,31}, DynamaxLevel = 5, Moves = new[] {065,442,034,796}, CanGigantamax = true }, // ★And337 4-Star Gigantamax Corviknight
         };
         #endregion
     }
diff --git a/PKHeX.Core/Legality/Encounters/EncounterStatic8NC.cs b/PKHeX.Core/Legality/Encounters/EncounterStatic8NC.cs
index 3e9a9209a..e6e155fea 100644
--- a/PKHeX.Core/Legality/Encounters/EncounterStatic8NC.cs
+++ b/PKHeX.Core/Legality/Encounters/EncounterStatic8NC.cs
@@ -12,7 +12,7 @@ public sealed class EncounterStatic8NC : EncounterStatic8Nest<EncounterStatic8NC
         protected override bool IsMatchLocation(PKM pkm)
         {
             var loc = pkm.Met_Location;
-            return loc == SharedNest || EncounterArea8.IsWildArea8(loc);
+            return loc == SharedNest || loc == Watchtower;
         }
     }
 }
\ No newline at end of file