From 565c9a590ee78c6cdfd5f1130f02df51cab8a6d6 Mon Sep 17 00:00:00 2001
From: Lusamine <30205550+Lusamine@users.noreply.github.com>
Date: Fri, 26 Jun 2020 23:31:23 -0500
Subject: [PATCH] Add some cross boundary encounters (#2910)

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

diff --git a/PKHeX.Core/Legality/Areas/EncounterArea8.cs b/PKHeX.Core/Legality/Areas/EncounterArea8.cs
index 92f6c2c8c..d0f0f6360 100644
--- a/PKHeX.Core/Legality/Areas/EncounterArea8.cs
+++ b/PKHeX.Core/Legality/Areas/EncounterArea8.cs
@@ -141,6 +141,10 @@ private static bool IsMatch(DexLevel evo, EncounterSlot slot)
             // Brawler's Cave
             {174, new byte[] {172}},
 
+            // Courageous Cavern
+            // Loop Lagoon
+            {176, new byte[] {178}},
+
             // Warm-Up Tunnel
             // Training Lowlands, Potbottom Desert
             {182, new byte[] {180, 184}},
diff --git a/PKHeX.Core/Legality/Encounters/Data/Encounters8.cs b/PKHeX.Core/Legality/Encounters/Data/Encounters8.cs
index f9c62cb21..b13d8c9f5 100644
--- a/PKHeX.Core/Legality/Encounters/Data/Encounters8.cs
+++ b/PKHeX.Core/Legality/Encounters/Data/Encounters8.cs
@@ -520,7 +520,7 @@ private static void CopyBerryTreeFromBridgeFieldToStony(IReadOnlyList<EncounterA
             new EncounterStatic8 { Species = 128, Level = 28, Location = 180 }, // Tauros in the Training Lowlands (on the Isle of Armor)
             new EncounterStatic8 { Species = 687, Level = 28, Location = 180 }, // Malamar in the Training Lowlands (on the Isle of Armor)
             new EncounterStatic8 { Species = 214, Level = 28, Location = 180 }, // Heracross in the Training Lowlands (on the Isle of Armor)
-            new EncounterStatic8 { Species = 507, Level = 28, Location = 180 }, // Herdier in the Training Lowlands (on the Isle of Armor)
+            new EncounterStatic8S{ Species = 507, Level = 28, Locations = new[] {174, 180} }, // Herdier on Challenge Road and in the Training Lowlands (on the Isle of Armor)
             new EncounterStatic8 { Species = 549, Level = 28, Location = 180 }, // Lilligant in the Training Lowlands (on the Isle of Armor)
             new EncounterStatic8 { Species = 426, Level = 28, Location = 180 }, // Drifblim in the Training Lowlands (on the Isle of Armor
             new EncounterStatic8 { Species = 055, Level = 26, Location = 180 }, // Golduck in the Training Lowlands (on the Isle of Armor)