diff --git a/PKHeX/Legality/Core.cs b/PKHeX/Legality/Core.cs
index b376dcc8a..e6d989a18 100644
--- a/PKHeX/Legality/Core.cs
+++ b/PKHeX/Legality/Core.cs
@@ -159,8 +159,8 @@ private static void MarkG7SMSlots(ref EncounterArea[] Areas)
                 var SOS_MN = getEncounterTables(Properties.Resources.encounter_mn_sos, "sm");
                 MarkG7SMSlots(ref SOS_SN);
                 MarkG7SMSlots(ref SOS_MN);
-                SlotsSN = addExtraTableSlots(REG_SN, SOS_SN).Concat(Encounter_SM_Pelago).ToArray();
-                SlotsMN = addExtraTableSlots(REG_MN, SOS_MN).Concat(Encounter_SM_Pelago).ToArray();
+                SlotsSN = addExtraTableSlots(REG_SN, SOS_SN).Concat(Encounter_Pelago_SM).Concat(Encounter_Pelago_SN).ToArray();
+                SlotsMN = addExtraTableSlots(REG_MN, SOS_MN).Concat(Encounter_Pelago_SM).Concat(Encounter_Pelago_MN).ToArray();
 
                 Evolves7 = new EvolutionTree(Data.unpackMini(Properties.Resources.evos_sm, "sm"), GameVersion.SM, PersonalTable.SM, 802);
             }
diff --git a/PKHeX/Legality/Tables7.cs b/PKHeX/Legality/Tables7.cs
index da478a2cd..5ac1c896a 100644
--- a/PKHeX/Legality/Tables7.cs
+++ b/PKHeX/Legality/Tables7.cs
@@ -127,6 +127,16 @@ public static partial class Legal
             new EncounterStatic { Gift = true, Species = 789, Level = 5,  Location = 142, Shiny = false, IV3 = true, Version = GameVersion.SN}, // Cosmog                00 FF
             new EncounterStatic { Gift = true, Species = 789, Level = 5,  Location = 144, Shiny = false, IV3 = true, Version = GameVersion.MN}, // Cosmog                00 FF
             new EncounterStatic { Gift = true, Species = 142, Level = 40, Location = 172, }, // Aerodactyl @ Seafolk Village
+
+            new EncounterStatic { Gift = true, Species = 718, Form = 0, Level = 30, Shiny = false, Ability = 1, Location = 118, IV3 = true, }, // Zygarde
+            new EncounterStatic { Gift = true, Species = 718, Form = 1, Level = 30, Shiny = false, Ability = 1, Location = 118, IV3 = true, }, // Zygarde
+            new EncounterStatic { Gift = true, Species = 718, Form = 2, Level = 30, Shiny = false, Ability = 1, Location = 118, IV3 = true, }, // Zygarde
+            new EncounterStatic { Gift = true, Species = 718, Form = 3, Level = 30, Shiny = false, Ability = 1, Location = 118, IV3 = true, }, // Zygarde
+
+            new EncounterStatic { Gift = true, Species = 718, Form = 0, Level = 50, Shiny = false, Ability = 1, Location = 118, IV3 = true, }, // Zygarde
+            new EncounterStatic { Gift = true, Species = 718, Form = 1, Level = 50, Shiny = false, Ability = 1, Location = 118, IV3 = true, }, // Zygarde
+            new EncounterStatic { Gift = true, Species = 718, Form = 2, Level = 50, Shiny = false, Ability = 1, Location = 118, IV3 = true, }, // Zygarde
+            new EncounterStatic { Gift = true, Species = 718, Form = 3, Level = 50, Shiny = false, Ability = 1, Location = 118, IV3 = true, }, // Zygarde
             
             new EncounterStatic // Magearna (Bottle Cap) 00 FF
             {
@@ -243,19 +253,9 @@ public static partial class Legal
             new EncounterStatic { Species = 103, Form = 1, Level = 40, Relearn = new[]{000, 000, 000, 000}, Ability = 1, Location = 184, }, // Exeggutor-1 @ Exeggutor Island
             new EncounterStatic { Species = 785, Form = 0, Level = 60, Relearn = new[]{000, 000, 000, 000}, Shiny = false, Ability = 1, Location = 030, }, // Tapu Koko
             new EncounterStatic { Species = 542, Form = 0, Level = 57, Relearn = new[]{382, 437, 014, 494}, Location = -1, }, // Leavanny
-            
-            new EncounterStatic { Species = 718, Form = 0, Level = 30, Relearn = new[]{000, 000, 000, 000}, Shiny = false, Ability = 1, Location = 118, IV3 = true, }, // Zygarde
-            new EncounterStatic { Species = 718, Form = 1, Level = 30, Relearn = new[]{000, 000, 000, 000}, Shiny = false, Ability = 1, Location = 118, IV3 = true, }, // Zygarde
-            new EncounterStatic { Species = 718, Form = 2, Level = 30, Relearn = new[]{000, 000, 000, 000}, Shiny = false, Ability = 1, Location = 118, IV3 = true, }, // Zygarde
-            new EncounterStatic { Species = 718, Form = 3, Level = 30, Relearn = new[]{000, 000, 000, 000}, Shiny = false, Ability = 1, Location = 118, IV3 = true, }, // Zygarde
-            
-            new EncounterStatic { Species = 718, Form = 0, Level = 50, Relearn = new[]{000, 000, 000, 000}, Shiny = false, Ability = 1, Location = 118, IV3 = true, }, // Zygarde
-            new EncounterStatic { Species = 718, Form = 1, Level = 50, Relearn = new[]{000, 000, 000, 000}, Shiny = false, Ability = 1, Location = 118, IV3 = true, }, // Zygarde
-            new EncounterStatic { Species = 718, Form = 2, Level = 50, Relearn = new[]{000, 000, 000, 000}, Shiny = false, Ability = 1, Location = 118, IV3 = true, }, // Zygarde
-            new EncounterStatic { Species = 718, Form = 3, Level = 50, Relearn = new[]{000, 000, 000, 000}, Shiny = false, Ability = 1, Location = 118, IV3 = true, }, // Zygarde
         };
-
-        private static readonly EncounterArea[] Encounter_SM_Pelago =
+        
+        private static readonly EncounterArea[] Encounter_Pelago_SM =
         {
             new EncounterArea
             {
@@ -281,8 +281,6 @@ public static partial class Legal
                     new EncounterSlot {Species = 426, LevelMin = 10, LevelMax = 55}, // Drifblim
                     new EncounterSlot {Species = 429, LevelMin = 10, LevelMax = 55}, // Mismagius
                     new EncounterSlot {Species = 587, LevelMin = 10, LevelMax = 55}, // Emolga
-                    new EncounterSlot {Species = 627, LevelMin = 10, LevelMax = 55}, // Rufflet
-                    new EncounterSlot {Species = 629, LevelMin = 10, LevelMax = 55}, // Vullaby
                     new EncounterSlot {Species = 661, LevelMin = 10, LevelMax = 55}, // Fletchling
                     new EncounterSlot {Species = 703, LevelMin = 10, LevelMax = 55}, // Carbink
                     new EncounterSlot {Species = 707, LevelMin = 10, LevelMax = 55}, // Klefki
@@ -292,6 +290,8 @@ public static partial class Legal
                 },
             }
         };
+        private static readonly EncounterArea[] Encounter_Pelago_SN = { new EncounterArea { Location = 30016, Slots = new[] { new EncounterSlot {Species = 627, LevelMin = 10, LevelMax = 55}, /* Rufflet SUN  */ } } };
+        private static readonly EncounterArea[] Encounter_Pelago_MN = { new EncounterArea { Location = 30016, Slots = new[] { new EncounterSlot {Species = 629, LevelMin = 10, LevelMax = 55}, /* Vullaby MOON */ } } };
         private static readonly EncounterTrade[] TradeGift_SM = // @ a\1\5\5
         {
             // Trades - 4.bin