From bc1538efa572d4792775f9106fbb57af99abc845 Mon Sep 17 00:00:00 2001
From: Lusamine <30205550+Lusamine@users.noreply.github.com>
Date: Wed, 24 Jun 2020 07:34:26 -0500
Subject: [PATCH 1/2] Add some IoA cross-boundary encounters (#2902)

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

diff --git a/PKHeX.Core/Legality/Areas/EncounterArea8.cs b/PKHeX.Core/Legality/Areas/EncounterArea8.cs
index b5d974a25..92f6c2c8c 100644
--- a/PKHeX.Core/Legality/Areas/EncounterArea8.cs
+++ b/PKHeX.Core/Legality/Areas/EncounterArea8.cs
@@ -61,7 +61,7 @@ private static bool IsMatch(DexLevel evo, EncounterSlot slot)
         public static bool IsWildArea8(int loc) => 122 <= loc && loc <= 154; // Rolling Fields -> Lake of Outrage
         public static bool IsWildArea8Armor(int loc) => 164 <= loc && loc <= 194; // Fields of Honor -> Honeycalm Island
 
-        // Location, and areas that can feed encounters into it.
+        // Location, and areas that it can feed encounters to.
         public static readonly IReadOnlyDictionary<int, IReadOnlyList<byte>> ConnectingArea8 = new Dictionary<int, IReadOnlyList<byte>>
         {
             // Rolling Fields
@@ -132,6 +132,30 @@ private static bool IsMatch(DexLevel evo, EncounterSlot slot)
             {152, new byte[] {144, 150}},
 
             // Lake of Outrage is just itself.
+
+            // Challenge Beach
+            // Soothing Wetlands, Courageous Cavern
+            {170, new byte[] {166, 176}},
+
+            // Challenge Road
+            // Brawler's Cave
+            {174, new byte[] {172}},
+
+            // Warm-Up Tunnel
+            // Training Lowlands, Potbottom Desert
+            {182, new byte[] {180, 184}},
+
+            // Workout Sea
+            // Fields of Honor
+            {186, new byte[] {164}},
+
+            // Stepping-Stone Sea
+            // Fields of Honor
+            {188, new byte[] {170}},
+
+            // 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 a3e510788..bf3b3ef88 100644
--- a/PKHeX.Core/Legality/Encounters/Data/Encounters8.cs
+++ b/PKHeX.Core/Legality/Encounters/Data/Encounters8.cs
@@ -551,8 +551,8 @@ private static void CopyBerryTreeFromBridgeFieldToStony(IReadOnlyList<EncounterA
             new EncounterStatic8 { Species = 549, Level = 45, Location = 194 }, // Lilligant on Honeycalm Island (on the Isle of Armor)
             new EncounterStatic8 { Species = 415, Level = 40, Location = 194 }, // Combee on Honeycalm Island (on the Isle of Armor)
             new EncounterStatic8 { Species = 028, Level = 42, Location = 184 }, // Sandslash in the Potbottom Desert (on the Isle of Armor)
-            new EncounterStatic8 { Species = 587, Level = 20, Location = 168 }, // Emolga in the Forest of Focus (on the Isle of Armor)
-            new EncounterStatic8S{ Species = 847, Level = 42, Locations = new[] {170, 180} }, // Barraskewda on Challenge Beach (on the Isle of Armor) and Training Lowlands
+            new EncounterStatic8S{ Species = 587, Level = 20, Locations = new[] {166, 168} }, // Emolga in the Soothing Wetlands and in the Forest of Focus (on the Isle of Armor)
+            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)

From a5b72bd1ce2923ba38c07253b0a49b06488626bd Mon Sep 17 00:00:00 2001
From: Matt <sorafanatic10@gmail.com>
Date: Wed, 24 Jun 2020 08:34:55 -0400
Subject: [PATCH 2/2] Update VerifyVersionEvolution for Gen 8 Lycanroc (#2903)

SWSH changed Rockruff->Lycanroc to only depend on time of day, not Version as well. Cosmoem still needs both, though.
---
 PKHeX.Core/Legality/Verifiers/MiscVerifier.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/PKHeX.Core/Legality/Verifiers/MiscVerifier.cs b/PKHeX.Core/Legality/Verifiers/MiscVerifier.cs
index ff1ad1140..f4e66f061 100644
--- a/PKHeX.Core/Legality/Verifiers/MiscVerifier.cs
+++ b/PKHeX.Core/Legality/Verifiers/MiscVerifier.cs
@@ -298,7 +298,7 @@ public void VerifyVersionEvolution(LegalityAnalysis data)
             // No point using the evolution tree. Just handle certain species.
             switch (pkm.Species)
             {
-                case (int)Species.Lycanroc when (pkm.AltForm == 0 && Moon()) || (pkm.AltForm == 1 && Sun()):
+                case (int)Species.Lycanroc when pkm.Format == 7 && ((pkm.AltForm == 0 && Moon()) || (pkm.AltForm == 1 && Sun())):
                 case (int)Species.Solgaleo when Moon():
                 case (int)Species.Lunala when Sun():
                     bool Sun() => (pkm.Version & 1) == 0;