diff --git a/PKHeX.Core/Legality/Encounters/Data/Encounters8b.cs b/PKHeX.Core/Legality/Encounters/Data/Encounters8b.cs
index 21824e1f4..327f1cd91 100644
--- a/PKHeX.Core/Legality/Encounters/Data/Encounters8b.cs
+++ b/PKHeX.Core/Legality/Encounters/Data/Encounters8b.cs
@@ -61,7 +61,8 @@ internal static class Encounters8b
             // Mythical
           //new (BDSP) { Species = 491, Level = 50, Location = 333, FlawlessIVCount = 3, Fateful = true }, // Darkrai
             new (BDSP) { Species = 492, Level = 30, Location = 285, FlawlessIVCount = 3, Fateful = true }, // Shaymin
-          //new (BDSP) { Species = 493, Level = 80, Location = 218, FlawlessIVCount = 3, Fateful = true }, // Arceus
+            new (BD  ) { Species = 493, Level = 80, Location = 218, FlawlessIVCount = 3, Fateful = true }, // Arceus
+            new (  SP) { Species = 493, Level = 80, Location = 618, FlawlessIVCount = 3, Fateful = true }, // Arceus
 
             // Ramanas Park (Pure Space)
             new (  SP) { Species = 144, Level = 70, Location = 506, FlawlessIVCount = 3, Ability = OnlyHidden }, // Articuno
diff --git a/PKHeX.Core/Legality/Tables/Tables8bs.cs b/PKHeX.Core/Legality/Tables/Tables8bs.cs
index 215805f30..921be8909 100644
--- a/PKHeX.Core/Legality/Tables/Tables8bs.cs
+++ b/PKHeX.Core/Legality/Tables/Tables8bs.cs
@@ -224,7 +224,6 @@ public static partial class Legal
         {
             (int)Move.PsychoBoost, // Deoxys
             (int)Move.DarkVoid, // Darkrai
-            (int)Move.Judgment, // Arceus
         };
 
         /// <summary>
@@ -322,6 +321,7 @@ public static bool IsValidEggHatchLocation8b(int location, GameVersion version)
         private static readonly HashSet<int> LocationsExclusiveBD = new()
         {
             216, // Spear Pillar
+            218, // Hall of Origin
             498, // Ramanas Park (Johto Room)
             503, // Ramanas Park (Rainbow Room)
             650, // Ramanas Park (Johto Room)
@@ -333,18 +333,17 @@ public static bool IsValidEggHatchLocation8b(int location, GameVersion version)
             217, // Spear Pillar
             497, // Ramanas Park (Kanto Room)
             504, // Ramanas Park (Squall Room)
+            618, // Hall of Origin
             649, // Ramanas Park (Kanto Room)
             656, // Ramanas Park (Squall Room)
         };
 
         private static readonly HashSet<int> LocationsNoHatchBDSP = new()
         {
-            020, 022, 023,                // Jubilife City
             035,                          // Canalave City
             094, 103, 107,                // Hearthome City
             154, 155, 158,                // Sunyshore City
             181, 182, 183,                // Pokémon League
-            218,                          // Hall of Origin (Diamond)
             329,                          // Lake Acuity
             332, 333,                     // Newmoon Island
             337, 338,                     // Battle Park
@@ -354,7 +353,6 @@ public static bool IsValidEggHatchLocation8b(int location, GameVersion version)
             483, 484,                     // Mystery Zone
             491, 492, 493,                // Mystery Zone
             495,                          // Ramanas Park
-            618,                          // Hall of Origin (Pearl)
             620, 621, 622, 623,           // Grand Underground (Secret Base)
             625,                          // Sea (sailing animation)
             627, 628, 629, 630, 631, 632, // Grand Underground (Secret Base)