From fdfa10e8818f93f6d0e690fd7efaab2cf6f58792 Mon Sep 17 00:00:00 2001
From: Lusamine <30205550+Lusamine@users.noreply.github.com>
Date: Wed, 8 Jul 2020 22:59:08 -0500
Subject: [PATCH] Add a few static/crossover encounters (#2932)

---
 PKHeX.Core/Legality/Areas/EncounterArea8.cs        | 4 ++++
 PKHeX.Core/Legality/Encounters/Data/Encounters8.cs | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/PKHeX.Core/Legality/Areas/EncounterArea8.cs b/PKHeX.Core/Legality/Areas/EncounterArea8.cs
index a00382447..7206c4533 100644
--- a/PKHeX.Core/Legality/Areas/EncounterArea8.cs
+++ b/PKHeX.Core/Legality/Areas/EncounterArea8.cs
@@ -157,6 +157,10 @@ private static bool IsMatch(DexLevel evo, EncounterSlot slot)
             // Fields of Honor
             {188, new byte[] {170}},
 
+            // Insular Sea
+            // Honeycalm Sea
+            {190, new byte[] {192}},
+
             // Honeycalm Sea
             // Honeycalm Island
             {192, new byte[] {194}},
diff --git a/PKHeX.Core/Legality/Encounters/Data/Encounters8.cs b/PKHeX.Core/Legality/Encounters/Data/Encounters8.cs
index f5f61cc70..096991c13 100644
--- a/PKHeX.Core/Legality/Encounters/Data/Encounters8.cs
+++ b/PKHeX.Core/Legality/Encounters/Data/Encounters8.cs
@@ -204,7 +204,7 @@ private static void CopyBerryTreeFromBridgeFieldToStony(IReadOnlyList<EncounterA
             new EncounterStatic8 { Species = 569, Level = 40, Location = 142, }, // Garbodor in Bridge Field (in a Wild Area)
             new EncounterStatic8 { Species = 743, Level = 40, Location = 142, }, // Ribombee in Bridge Field (in a Wild Area)
             new EncounterStatic8 { Species = 475, Level = 60, Location = 142, }, // Gallade in Bridge Field (in a Wild Area)
-            new EncounterStatic8 { Species = 264, Level = 40, Location = 142, Form = 01, }, // Linoone in Bridge Field (in a Wild Area)
+            new EncounterStatic8S{ Species = 264, Level = 40, Locations = new[] {140, 142}, Form = 01, }, // Linoone at the Motostoke Riverbank & in Bridge Field (in a Wild Area)
             new EncounterStatic8 { Species = 606, Level = 42, Location = 142, }, // Beheeyem in Bridge Field (in a Wild Area)
             new EncounterStatic8 { Species = 715, Level = 50, Location = 142, }, // Noivern in Bridge Field (in a Wild Area)
             new EncounterStatic8 { Species = 537, Level = 46, Location = 142, }, // Seismitoad in Bridge Field (in a Wild Area)
@@ -554,7 +554,7 @@ private static void CopyBerryTreeFromBridgeFieldToStony(IReadOnlyList<EncounterA
             new EncounterStatic8S{ Species = 847, Level = 42, Locations = new[] {166, 170, 176, 180} }, // Barraskewda in the Soothing Wetlands, on Challenge Beach, in Courageous Cavern, and Training Lowlands (on the Isle of Armor)
             new EncounterStatic8 { Species = 224, Level = 45, Location = 170 }, // Octillery on Challenge Beach (on the Isle of Armor)
             new EncounterStatic8 { Species = 171, Level = 42, Location = 170 }, // Lanturn on Challenge Beach (on the Isle of Armor)
-            new EncounterStatic8 { Species = 593, Level = 42, Location = 170 }, // Jellicent on Challenge Beach (on the Isle of Armor)
+            new EncounterStatic8S{ Species = 593, Level = 42, Locations = new[] {170, 178} }, // Jellicent on Challenge Beach and in Loop Lagoon (on the Isle of Armor)
             new EncounterStatic8 { Species = 091, Level = 42, Location = 170 }, // Cloyster on Challenge Beach (on the Isle of Armor)
             new EncounterStatic8 { Species = 130, Level = 50, Location = 170 }, // Gyarados on Challenge Beach (on the Isle of Armor)
             new EncounterStatic8 { Species = 073, Level = 42, Location = 176 }, // Tentacruel in Courageous Cavern (on the Isle of Armor)