diff --git a/PKHeX/Legality/Core.cs b/PKHeX/Legality/Core.cs
index 6414ee5ea..4ac624c1e 100644
--- a/PKHeX/Legality/Core.cs
+++ b/PKHeX/Legality/Core.cs
@@ -232,22 +232,16 @@ private static void MarkG4Slots(ref EncounterArea[] Areas)
         }
         private static void MarkBWSwarmSlots(ref EncounterArea[] Areas)
         {
-            foreach (var area in Areas)
+            foreach (EncounterSlot s in Areas.SelectMany(area => area.Slots))
             {
-                foreach (var Slot in area.Slots)
-                {
-                    Slot.LevelMin = 15; Slot.LevelMax = 55; Slot.Type = SlotType.Swarm;
-                }
+                s.LevelMin = 15; s.LevelMax = 55; s.Type = SlotType.Swarm;
             }
         }
         private static void MarkB2W2SwarmSlots(ref EncounterArea[] Areas)
         {
-            foreach (var area in Areas)
+            foreach (EncounterSlot s in Areas.SelectMany(area => area.Slots))
             {
-                foreach (var Slot in area.Slots)
-                {
-                    Slot.LevelMin = 40; Slot.LevelMax = 55; Slot.Type = SlotType.Swarm;
-                }
+                s.LevelMin = 40; s.LevelMax = 55; s.Type = SlotType.Swarm;
             }
         }
         private static void MarkG5Slots(ref EncounterArea[] Areas)
diff --git a/PKHeX/Legality/Tables5.cs b/PKHeX/Legality/Tables5.cs
index 6c7d577dc..8fc5d58b8 100644
--- a/PKHeX/Legality/Tables5.cs
+++ b/PKHeX/Legality/Tables5.cs
@@ -322,14 +322,14 @@ public static partial class Legal
         };
         private static readonly EncounterArea[] SlotsB_Swarm = SlotsBW_Swarm.Concat(
             new EncounterArea[] {
-                new EncounterArea {Location = 14, Slots = new[]{new EncounterSlot {Species = 313},},},// Volbeat @ Route 3
+                new EncounterArea {Location = 16, Slots = new[]{new EncounterSlot {Species = 313},},},// Volbeat @ Route 3
                 new EncounterArea {Location = 19, Slots = new[]{new EncounterSlot {Species = 311},},},// Plusle @ Route 6
                 new EncounterArea {Location = 22, Slots = new[]{new EncounterSlot {Species = 228},},},// Houndour @ Route 9
                 new EncounterArea {Location = 24, Slots = new[]{new EncounterSlot {Species = 285},},},// Shroomish @ Route 11
             }).ToArray();
         private static readonly EncounterArea[] SlotsW_Swarm = SlotsBW_Swarm.Concat(
             new EncounterArea[] {
-                new EncounterArea {Location = 14, Slots = new[]{new EncounterSlot {Species = 314},},},// Illumise @ Route 3
+                new EncounterArea {Location = 16, Slots = new[]{new EncounterSlot {Species = 314},},},// Illumise @ Route 3
                 new EncounterArea {Location = 19, Slots = new[]{new EncounterSlot {Species = 312},},},// Minun @ Route 6
                 new EncounterArea {Location = 22, Slots = new[]{new EncounterSlot {Species = 261},},},// Poochyena @ Route 9
                 new EncounterArea {Location = 24, Slots = new[]{new EncounterSlot {Species = 048},},},// Paras @ Route 11
@@ -357,14 +357,14 @@ public static partial class Legal
         };
         private static readonly EncounterArea[] SlotsB2_Swarm = SlotsB2W2_Swarm.Concat(
             new EncounterArea[] {
-                new EncounterArea {Location = 014, Slots = new[]{new EncounterSlot {Species = 313},},},// Volbeat @ Route 3
+                new EncounterArea {Location = 016, Slots = new[]{new EncounterSlot {Species = 313},},},// Volbeat @ Route 3
                 new EncounterArea {Location = 019, Slots = new[]{new EncounterSlot {Species = 311},},},// Plusle @ Route 6
                 new EncounterArea {Location = 125, Slots = new[]{new EncounterSlot {Species = 184},},},// Sudowoodo @ Route 20
                 new EncounterArea {Location = 127, Slots = new[]{new EncounterSlot {Species = 168},},},// Ariados @ Route 22
             }).ToArray();
         private static readonly EncounterArea[] SlotsW2_Swarm = SlotsB2W2_Swarm.Concat(
             new EncounterArea[] {
-                new EncounterArea {Location = 014, Slots = new[]{new EncounterSlot {Species = 314},},},// Illumise @ Route 3
+                new EncounterArea {Location = 016, Slots = new[]{new EncounterSlot {Species = 314},},},// Illumise @ Route 3
                 new EncounterArea {Location = 019, Slots = new[]{new EncounterSlot {Species = 312},},},// Minun @ Route 6
                 new EncounterArea {Location = 125, Slots = new[]{new EncounterSlot {Species = 122},},},// Mr.Mime @ Route 20
                 new EncounterArea {Location = 127, Slots = new[]{new EncounterSlot {Species = 166},},},// Ledian @ Route 22