From 0caa0dec727dc9788ba271b8d3c910ae75e0f075 Mon Sep 17 00:00:00 2001
From: Kurt <kaphotics@gmail.com>
Date: Wed, 8 Nov 2017 16:27:35 -0800
Subject: [PATCH 1/7] Group forms with special battle formes check

---
 PKHeX.Core/Legality/Checks.cs | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/PKHeX.Core/Legality/Checks.cs b/PKHeX.Core/Legality/Checks.cs
index 2c8f111cd..81271aa82 100644
--- a/PKHeX.Core/Legality/Checks.cs
+++ b/PKHeX.Core/Legality/Checks.cs
@@ -1977,13 +1977,6 @@ private void VerifyForm()
                         return;
                     }
                     break;
-                case 718: // Zygarde
-                    if (pkm.AltForm >= 4)
-                    {
-                        AddLine(Severity.Invalid, V310, CheckIdentifier.Form);
-                        return;
-                    }
-                    break;
                 case 773: // Silvally
                     {
                         int item = pkm.HeldItem;
@@ -1996,13 +1989,6 @@ private void VerifyForm()
                             AddLine(Severity.Valid, V309, CheckIdentifier.Form);
                         break;
                     }
-                case 774: // Minior
-                    if (pkm.AltForm < 7)
-                    {
-                        AddLine(Severity.Invalid, V310, CheckIdentifier.Form);
-                        return;
-                    }
-                    break;
 
                 // Party Only Forms
                 case 492: // Shaymin
@@ -2014,6 +2000,13 @@ private void VerifyForm()
                         return;
                     }
                     break;
+
+                // Battle only Forms with other legal forms allowed
+                case 718 when pkm.AltForm >= 4: // Zygarde Complete
+                case 774 when pkm.AltForm < 7: // Minior Shield
+                case 800 when pkm.AltForm == 3: // Ultra Necrozma
+                    AddLine(Severity.Invalid, V310, CheckIdentifier.Form);
+                    return;
             }
 
             if (pkm.Format >= 7 && Info.Generation < 7 && pkm.AltForm != 0)

From 134e676e910626d285bd08da3edd8ae2bc7c69da Mon Sep 17 00:00:00 2001
From: Kurt <kaphotics@gmail.com>
Date: Wed, 8 Nov 2017 18:42:52 -0800
Subject: [PATCH 2/7] Unlock Pokedex & HoF editors

---
 PKHeX.WinForms/Controls/SAV Editor/SAVEditor.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/PKHeX.WinForms/Controls/SAV Editor/SAVEditor.cs b/PKHeX.WinForms/Controls/SAV Editor/SAVEditor.cs
index f35ef618e..e770a1064 100644
--- a/PKHeX.WinForms/Controls/SAV Editor/SAVEditor.cs	
+++ b/PKHeX.WinForms/Controls/SAV Editor/SAVEditor.cs	
@@ -599,7 +599,7 @@ private void B_OpenPokedex_Click(object sender, EventArgs e)
                         new SAV_PokedexXY(SAV).ShowDialog();
                     break;
                 case 7:
-                    if (SAV.SM)
+                    if (SAV.SM || SAV.USUM)
                         new SAV_PokedexSM(SAV).ShowDialog();
                     break;
             }
@@ -695,7 +695,7 @@ private void B_OUTHallofFame_Click(object sender, EventArgs e)
         {
             if (SAV.Generation == 6)
                 new SAV_HallOfFame(SAV).ShowDialog();
-            else if (SAV.SM)
+            else if (SAV.Generation == 7)
                 new SAV_HallOfFame7(SAV).ShowDialog();
         }
         private void B_CGearSkin_Click(object sender, EventArgs e)

From 93bd9742499f2debdd71e89c8f27deb73b859aaa Mon Sep 17 00:00:00 2001
From: Kurt <kaphotics@gmail.com>
Date: Wed, 8 Nov 2017 18:43:55 -0800
Subject: [PATCH 3/7] Add EncounterStatic data

sourced from Ultra Moon, location IDs are not known (need manual docs).
Many of these may be unused, like last gen. Will eventually remove
unused ones once crowdsourced effort finishes.
---
 .../Legality/Encounters/Data/Encounters7.cs   | 288 ++++++++++++++++++
 1 file changed, 288 insertions(+)

diff --git a/PKHeX.Core/Legality/Encounters/Data/Encounters7.cs b/PKHeX.Core/Legality/Encounters/Data/Encounters7.cs
index c5e9abd4e..c2ce81d2b 100644
--- a/PKHeX.Core/Legality/Encounters/Data/Encounters7.cs
+++ b/PKHeX.Core/Legality/Encounters/Data/Encounters7.cs
@@ -166,7 +166,295 @@ private static void MarkG7SMSlots(ref EncounterArea[] Areas)
         };
         private static readonly EncounterStatic[] Encounter_USUM =
         {
+            new EncounterStatic { Gift = true, Species = 722, Level = 05, Location = 24, }, // Rowlet @ ???
+            new EncounterStatic { Gift = true, Species = 725, Level = 05, Location = 24, }, // Litten @ ???
+            new EncounterStatic { Gift = true, Species = 728, Level = 05, Location = 24, }, // Popplio @ ???
+            new EncounterStatic { Gift = true, Species = 138, Level = 15, Location = 58, }, // Omanyte @ ???
+            new EncounterStatic { Gift = true, Species = 140, Level = 15, Location = 58, }, // Kabuto @ ???
+            new EncounterStatic { Gift = true, Species = 142, Level = 15, Location = 58, }, // Aerodactyl @ ???
+            new EncounterStatic { Gift = true, Species = 345, Level = 15, Location = 58, }, // Lileep @ ???
+            new EncounterStatic { Gift = true, Species = 347, Level = 15, Location = 58, }, // Anorith @ ???
+            new EncounterStatic { Gift = true, Species = 408, Level = 15, Location = 58, }, // Cranidos @ ???
+            new EncounterStatic { Gift = true, Species = 410, Level = 15, Location = 58, }, // Shieldon @ ???
+            new EncounterStatic { Gift = true, Species = 564, Level = 15, Location = 58, }, // Tirtouga @ ???
+            new EncounterStatic { Gift = true, Species = 566, Level = 15, Location = 58, }, // Archen @ ???
+            new EncounterStatic { Gift = true, Species = 696, Level = 15, Location = 58, }, // Tyrunt @ ???
+            new EncounterStatic { Gift = true, Species = 698, Level = 15, Location = 58, }, // Amaura @ ???
+            new EncounterStatic { Gift = true, Species = 133, Level = 01, EggLocation = 60002, }, // Eevee @ Nursery helpers
+            new EncounterStatic { Gift = true, Species = 137, Level = 30, Location = -01, }, // Porygon @ ???
+            new EncounterStatic { Gift = true, Species = 772, Level = 60, Location = -01, }, // Type: Null @ ???
+            new EncounterStatic { Gift = true, Species = 801, Level = 50, Location = -01, Shiny = false, HeldItem = 795, }, // Magearna @ ???
+            new EncounterStatic { Gift = true, Species = 789, Level = 05, Location = -01, Shiny = false, }, // Cosmog @ ???
+            new EncounterStatic { Gift = true, Species = 142, Level = 40, Location = 172, }, // Aerodactyl @ ???
+            new EncounterStatic { Gift = true, Species = 025, Level = 40, Location = -01, HeldItem = 796, }, // Pikachu @ ???
+            new EncounterStatic { Gift = true, Species = 803, Level = 40, Location = -01, }, // Poipole @ ???
+            new EncounterStatic { Gift = true, Species = 735, Level = 20, Location = -01, Form = 1, Shiny = false, }, // Gumshoos @ ???
+            new EncounterStatic { Gift = true, Species = 020, Level = 20, Location = -01, Form = 2, Shiny = false, }, // Raticate @ ???
+            new EncounterStatic { Gift = true, Species = 105, Level = 25, Location = -01, Form = 2, Shiny = false, }, // Marowak @ ???
+            new EncounterStatic { Gift = true, Species = 752, Level = 25, Location = -01, Form = 1, Shiny = false, }, // Araquanid @ ???
+            new EncounterStatic { Gift = true, Species = 754, Level = 30, Location = -01, Form = 1, Shiny = false, }, // Lurantis @ ???
+            new EncounterStatic { Gift = true, Species = 758, Level = 30, Location = -01, Form = 1, Shiny = false, }, // Salazzle @ ???
+            new EncounterStatic { Gift = true, Species = 738, Level = 35, Location = -01, Form = 1, Shiny = false, }, // Vikavolt @ ???
+            new EncounterStatic { Gift = true, Species = 777, Level = 35, Location = -01, Form = 1, Shiny = false, }, // Togedemaru @ ???
+            new EncounterStatic { Gift = true, Species = 778, Level = 40, Location = -01, Form = 2, Shiny = false, }, // Mimikyu @ ???
+            new EncounterStatic { Gift = true, Species = 743, Level = 50, Location = -01, Form = 1, Shiny = false, }, // Ribombee @ ???
+            new EncounterStatic { Gift = true, Species = 784, Level = 50, Location = -01, Form = 1, Shiny = false, }, // Kommo-o @ ???
+            new EncounterStatic { Gift = true, Species = 718, Level = 63, Location = -01, Form = 1, Shiny = false, }, // Zygarde @ ???
+            new EncounterStatic { Gift = true, Species = 025, Level = 21, Location = -01, Form = 7, Shiny = false, HeldItem = 571, }, // Pikachu @ ???
 
+            new EncounterStatic { Species = 731, Level = 03, Location = -01, Shiny = false, }, // Pikipek @ ???
+            new EncounterStatic { Species = 793, Level = 27, Location = -01, Shiny = false, }, // Nihilego @ ???
+            new EncounterStatic { Species = 791, Level = 60, Location = -01, Shiny = false, }, // Solgaleo @ ???
+            new EncounterStatic { Species = 792, Level = 60, Location = -01, Shiny = false, }, // Lunala @ ???
+            new EncounterStatic { Species = 735, Level = 12, Location = -01, Form = 1, Shiny = false, HeldItem = 151, }, // Gumshoos @ ???
+            new EncounterStatic { Species = 734, Level = 11, Location = -01, Shiny = false, }, // Yungoos @ ???
+            new EncounterStatic { Species = 735, Level = 11, Location = -01, Shiny = false, }, // Gumshoos @ ???
+            new EncounterStatic { Species = 734, Level = 11, Location = -01, Shiny = false, }, // Yungoos @ ???
+            new EncounterStatic { Species = 734, Level = 10, Location = -01, Shiny = false, }, // Yungoos @ ???
+            new EncounterStatic { Species = 020, Level = 12, Location = -01, Form = 2, Shiny = false, HeldItem = 151, }, // Raticate @ ???
+            new EncounterStatic { Species = 019, Level = 11, Location = -01, Form = 1, Shiny = false, }, // Rattata @ ???
+            new EncounterStatic { Species = 020, Level = 11, Location = -01, Form = 1, Shiny = false, }, // Raticate @ ???
+            new EncounterStatic { Species = 019, Level = 11, Location = -01, Form = 1, Shiny = false, }, // Rattata @ ???
+            new EncounterStatic { Species = 019, Level = 10, Location = -01, Form = 1, Shiny = false, }, // Rattata @ ???
+            new EncounterStatic { Species = 746, Level = 20, Location = -01, Form = 1, Shiny = false, HeldItem = 158, }, // Wishiwashi @ ???
+            new EncounterStatic { Species = 746, Level = 17, Location = -01, Shiny = false, }, // Wishiwashi @ ???
+            new EncounterStatic { Species = 746, Level = 18, Location = -01, Shiny = false, }, // Wishiwashi @ ???
+            new EncounterStatic { Species = 594, Level = 18, Location = -01, Shiny = false, }, // Alomomola @ ???
+            new EncounterStatic { Species = 746, Level = 18, Location = -01, Shiny = false, }, // Wishiwashi @ ???
+            new EncounterStatic { Species = 758, Level = 22, Location = -01, Form = 1, Shiny = false, HeldItem = 204, }, // Salazzle @ ???
+            new EncounterStatic { Species = 105, Level = 18, Location = -01, Form = 1, Shiny = false, }, // Marowak @ ???
+            new EncounterStatic { Species = 105, Level = 18, Location = -01, Form = 1, Shiny = false, }, // Marowak @ ???
+            new EncounterStatic { Species = 025, Level = 20, Location = -01, Shiny = false, }, // Pikachu @ ???
+            new EncounterStatic { Species = 757, Level = 20, Location = -01, Shiny = false, }, // Salandit @ ???
+            new EncounterStatic { Species = 754, Level = 24, Location = -01, Form = 1, Shiny = false, HeldItem = 271, }, // Lurantis @ ???
+            new EncounterStatic { Species = 047, Level = 22, Location = -01, Shiny = false, }, // Parasect @ ???
+            new EncounterStatic { Species = 756, Level = 22, Location = -01, Shiny = false, }, // Shiinotic @ ???
+            new EncounterStatic { Species = 753, Level = 23, Location = -01, Shiny = false, }, // Fomantis @ ???
+            new EncounterStatic { Species = 753, Level = 23, Location = -01, Shiny = false, }, // Fomantis @ ???
+            new EncounterStatic { Species = 753, Level = 23, Location = -01, Shiny = false, }, // Fomantis @ ???
+            new EncounterStatic { Species = 753, Level = 23, Location = -01, Shiny = false, }, // Fomantis @ ???
+            new EncounterStatic { Species = 764, Level = 22, Location = -01, Shiny = false, }, // Comfey @ ???
+            new EncounterStatic { Species = 352, Level = 22, Location = -01, Shiny = false, }, // Kecleon @ ???
+            new EncounterStatic { Species = 738, Level = 29, Location = -01, Form = 1, Shiny = false, HeldItem = 184, }, // Vikavolt @ ???
+            new EncounterStatic { Species = 736, Level = 27, Location = -01, Shiny = false, }, // Grubbin @ ???
+            new EncounterStatic { Species = 737, Level = 27, Location = -01, Shiny = false, }, // Charjabug @ ???
+            new EncounterStatic { Species = 737, Level = 27, Location = -01, Shiny = false, }, // Charjabug @ ???
+            new EncounterStatic { Species = 737, Level = 27, Location = -01, Shiny = false, }, // Charjabug @ ???
+            new EncounterStatic { Species = 737, Level = 28, Location = -01, Shiny = false, }, // Charjabug @ ???
+            new EncounterStatic { Species = 778, Level = 35, Location = -01, Form = 2, Shiny = false, HeldItem = 157, }, // Mimikyu @ ???
+            new EncounterStatic { Species = 092, Level = 30, Location = -01, Shiny = false, }, // Gastly @ ???
+            new EncounterStatic { Species = 093, Level = 30, Location = -01, Shiny = false, }, // Haunter @ ???
+            new EncounterStatic { Species = 094, Level = 30, Location = -01, Shiny = false, }, // Gengar @ ???
+            new EncounterStatic { Species = 354, Level = 32, Location = -01, Shiny = false, }, // Banette @ ???
+            new EncounterStatic { Species = 593, Level = 33, Location = -01, Shiny = false, }, // Jellicent @ ???
+            new EncounterStatic { Species = 784, Level = 49, Location = -01, Form = 1, Shiny = false, HeldItem = 686, }, // Kommo-o @ ???
+            new EncounterStatic { Species = 782, Level = 42, Location = -01, Shiny = false, }, // Jangmo-o @ ???
+            new EncounterStatic { Species = 783, Level = 44, Location = -01, Shiny = false, }, // Hakamo-o @ ???
+            new EncounterStatic { Species = 715, Level = 48, Location = -01, Shiny = false, }, // Noivern @ ???
+            new EncounterStatic { Species = 212, Level = 46, Location = -01, Shiny = false, }, // Scizor @ ???
+            new EncounterStatic { Species = 793, Level = 55, Location = -01, Shiny = false, }, // Nihilego @ ???
+            new EncounterStatic { Species = 793, Level = 55, Location = -01, Shiny = false, }, // Nihilego @ ???
+            new EncounterStatic { Species = 794, Level = 65, Location = -01, Shiny = false, }, // Buzzwole @ ???
+            new EncounterStatic { Species = 794, Level = 65, Location = -01, Shiny = false, }, // Buzzwole @ ???
+            new EncounterStatic { Species = 795, Level = 60, Location = -01, Shiny = false, }, // Pheromosa @ ???
+            new EncounterStatic { Species = 795, Level = 60, Location = -01, Shiny = false, }, // Pheromosa @ ???
+            new EncounterStatic { Species = 795, Level = 60, Location = -01, Shiny = false, }, // Pheromosa @ ???
+            new EncounterStatic { Species = 795, Level = 60, Location = -01, Shiny = false, }, // Pheromosa @ ???
+            new EncounterStatic { Species = 796, Level = 65, Location = -01, Shiny = false, }, // Xurkitree @ ???
+            new EncounterStatic { Species = 796, Level = 65, Location = -01, Shiny = false, }, // Xurkitree @ ???
+            new EncounterStatic { Species = 796, Level = 65, Location = -01, Shiny = false, }, // Xurkitree @ ???
+            new EncounterStatic { Species = 796, Level = 65, Location = -01, Shiny = false, }, // Xurkitree @ ???
+            new EncounterStatic { Species = 796, Level = 65, Location = -01, Shiny = false, }, // Xurkitree @ ???
+            new EncounterStatic { Species = 796, Level = 65, Location = -01, Shiny = false, }, // Xurkitree @ ???
+            new EncounterStatic { Species = 796, Level = 65, Location = -01, Shiny = false, }, // Xurkitree @ ???
+            new EncounterStatic { Species = 796, Level = 65, Location = -01, Shiny = false, }, // Xurkitree @ ???
+            new EncounterStatic { Species = 796, Level = 65, Location = -01, Shiny = false, }, // Xurkitree @ ???
+            new EncounterStatic { Species = 796, Level = 65, Location = -01, Shiny = false, }, // Xurkitree @ ???
+            new EncounterStatic { Species = 798, Level = 60, Location = -01, Shiny = false, }, // Kartana @ ???
+            new EncounterStatic { Species = 798, Level = 60, Location = -01, Shiny = false, }, // Kartana @ ???
+            new EncounterStatic { Species = 798, Level = 60, Location = -01, Shiny = false, }, // Kartana @ ???
+            new EncounterStatic { Species = 798, Level = 60, Location = -01, Shiny = false, }, // Kartana @ ???
+            new EncounterStatic { Species = 798, Level = 60, Location = -01, Shiny = false, }, // Kartana @ ???
+            new EncounterStatic { Species = 798, Level = 60, Location = -01, Shiny = false, }, // Kartana @ ???
+            new EncounterStatic { Species = 798, Level = 60, Location = -01, Shiny = false, }, // Kartana @ ???
+            new EncounterStatic { Species = 798, Level = 60, Location = -01, Shiny = false, }, // Kartana @ ???
+            new EncounterStatic { Species = 798, Level = 60, Location = -01, Shiny = false, }, // Kartana @ ???
+            new EncounterStatic { Species = 798, Level = 60, Location = -01, Shiny = false, }, // Kartana @ ???
+            new EncounterStatic { Species = 798, Level = 60, Location = -01, Shiny = false, }, // Kartana @ ???
+            new EncounterStatic { Species = 798, Level = 60, Location = -01, Shiny = false, }, // Kartana @ ???
+            new EncounterStatic { Species = 797, Level = 65, Location = -01, Shiny = false, }, // Celesteela @ ???
+            new EncounterStatic { Species = 797, Level = 65, Location = -01, Shiny = false, }, // Celesteela @ ???
+            new EncounterStatic { Species = 797, Level = 65, Location = -01, Shiny = false, }, // Celesteela @ ???
+            new EncounterStatic { Species = 797, Level = 65, Location = -01, Shiny = false, }, // Celesteela @ ???
+            new EncounterStatic { Species = 797, Level = 65, Location = -01, Shiny = false, }, // Celesteela @ ???
+            new EncounterStatic { Species = 797, Level = 65, Location = -01, Shiny = false, }, // Celesteela @ ???
+            new EncounterStatic { Species = 797, Level = 65, Location = -01, Shiny = false, }, // Celesteela @ ???
+            new EncounterStatic { Species = 797, Level = 65, Location = -01, Shiny = false, }, // Celesteela @ ???
+            new EncounterStatic { Species = 797, Level = 65, Location = -01, Shiny = false, }, // Celesteela @ ???
+            new EncounterStatic { Species = 797, Level = 65, Location = -01, Shiny = false, }, // Celesteela @ ???
+            new EncounterStatic { Species = 797, Level = 65, Location = -01, Shiny = false, }, // Celesteela @ ???
+            new EncounterStatic { Species = 797, Level = 65, Location = -01, Shiny = false, }, // Celesteela @ ???
+            new EncounterStatic { Species = 797, Level = 65, Location = -01, Shiny = false, }, // Celesteela @ ???
+            new EncounterStatic { Species = 797, Level = 65, Location = -01, Shiny = false, }, // Celesteela @ ???
+            new EncounterStatic { Species = 797, Level = 65, Location = -01, Shiny = false, }, // Celesteela @ ???
+            new EncounterStatic { Species = 797, Level = 65, Location = -01, Shiny = false, }, // Celesteela @ ???
+            new EncounterStatic { Species = 797, Level = 65, Location = -01, Shiny = false, }, // Celesteela @ ???
+            new EncounterStatic { Species = 797, Level = 65, Location = -01, Shiny = false, }, // Celesteela @ ???
+            new EncounterStatic { Species = 799, Level = 70, Location = -01, Shiny = false, }, // Guzzlord @ ???
+            new EncounterStatic { Species = 800, Level = 75, Location = -01, Shiny = false, }, // Necrozma @ ???
+            new EncounterStatic { Species = 004, Level = 12, Location = -01, }, // Charmander @ ???
+            new EncounterStatic { Species = 007, Level = 12, Location = -01, }, // Squirtle @ ???
+            new EncounterStatic { Species = 095, Level = 14, Location = -01, }, // Onix @ ???
+            new EncounterStatic { Species = 116, Level = 18, Location = -01, }, // Horsea @ ???
+            new EncounterStatic { Species = 664, Level = 09, Location = -01, Form = 30, }, // Scatterbug @ ???
+            new EncounterStatic { Species = 001, Level = 10, Location = -01, }, // Bulbasaur @ ???
+            new EncounterStatic { Species = 607, Level = 09, Location = -01, }, // Litwick @ ???
+            new EncounterStatic { Species = 280, Level = 17, Location = -01, }, // Ralts @ ???
+            new EncounterStatic { Species = 363, Level = 19, Location = -01, }, // Spheal @ ???
+            new EncounterStatic { Species = 256, Level = 20, Location = -01, }, // Combusken @ ???
+            new EncounterStatic { Species = 679, Level = 24, Location = -01, }, // Honedge @ ???
+            new EncounterStatic { Species = 015, Level = 14, Location = -01, }, // Beedrill @ ???
+            new EncounterStatic { Species = 253, Level = 16, Location = -01, }, // Grovyle @ ???
+            new EncounterStatic { Species = 259, Level = 17, Location = -01, }, // Marshtomp @ ???
+            new EncounterStatic { Species = 111, Level = 32, Location = -01, }, // Rhyhorn @ ???
+            new EncounterStatic { Species = 220, Level = 33, Location = -01, }, // Swinub @ ???
+            new EncounterStatic { Species = 394, Level = 35, Location = -01, }, // Prinplup @ ???
+            new EncounterStatic { Species = 388, Level = 36, Location = -01, }, // Grotle @ ???
+            new EncounterStatic { Species = 388, Level = 36, Location = -01, }, // Grotle @ ???
+            new EncounterStatic { Species = 018, Level = 29, Location = -01, }, // Pidgeot @ ???
+            new EncounterStatic { Species = 391, Level = 29, Location = -01, }, // Monferno @ ???
+            new EncounterStatic { Species = 610, Level = 30, Location = -01, }, // Axew @ ???
+            new EncounterStatic { Species = 604, Level = 55, Location = -01, }, // Eelektross @ ???
+            new EncounterStatic { Species = 306, Level = 57, Location = -01, }, // Aggron @ ???
+            new EncounterStatic { Species = 479, Level = 61, Location = -01, }, // Rotom @ ???
+            new EncounterStatic { Species = 542, Level = 57, Location = -01, }, // Leavanny @ ???
+            new EncounterStatic { Species = 652, Level = 45, Location = -01, }, // Chesnaught @ ???
+            new EncounterStatic { Species = 658, Level = 44, Location = -01, }, // Greninja @ ???
+            new EncounterStatic { Species = 655, Level = 44, Location = -01, }, // Delphox @ ???
+            new EncounterStatic { Species = 785, Level = 60, Location = -01, Shiny = false, }, // Tapu Koko @ ???
+            new EncounterStatic { Species = 786, Level = 60, Location = -01, Shiny = false, }, // Tapu Lele @ ???
+            new EncounterStatic { Species = 787, Level = 60, Location = -01, Shiny = false, }, // Tapu Bulu @ ???
+            new EncounterStatic { Species = 788, Level = 60, Location = -01, Shiny = false, }, // Tapu Fini @ ???
+            new EncounterStatic { Species = 023, Level = 10, Location = -01, }, // Ekans @ ???
+            new EncounterStatic { Species = 103, Level = 40, Location = -01, Form = 1, }, // Exeggutor @ ???
+            new EncounterStatic { Species = 785, Level = 60, Location = -01, Shiny = false, }, // Tapu Koko @ ???
+
+            new EncounterStatic { Species = 542, Level = 57, Location = -01, }, // Leavanny @ ???
+            new EncounterStatic { Species = 752, Level = 20, Location = -01, Form = 1, Shiny = false, HeldItem = 186, }, // Araquanid @ ???
+            new EncounterStatic { Species = 751, Level = 17, Location = -01, Shiny = false, }, // Dewpider @ ???
+            new EncounterStatic { Species = 751, Level = 18, Location = -01, Shiny = false, }, // Dewpider @ ???
+            new EncounterStatic { Species = 284, Level = 18, Location = -01, Shiny = false, }, // Masquerain @ ???
+            new EncounterStatic { Species = 751, Level = 18, Location = -01, Shiny = false, }, // Dewpider @ ???
+            new EncounterStatic { Species = 753, Level = 17, Location = -01, Shiny = false, }, // Fomantis @ ???
+            new EncounterStatic { Species = 764, Level = 21, Location = -01, Shiny = false, }, // Comfey @ ???
+            new EncounterStatic { Species = 753, Level = 21, Location = -01, Shiny = false, }, // Fomantis @ ???
+            new EncounterStatic { Species = 185, Level = 24, Location = -01, Shiny = false, }, // Sudowoodo @ ???
+            new EncounterStatic { Species = 777, Level = 33, Location = -01, Form = 1, Shiny = false, HeldItem = 158, }, // Togedemaru @ ???
+            new EncounterStatic { Species = 227, Level = 32, Location = -01, Shiny = false, }, // Skarmory @ ???
+            new EncounterStatic { Species = 702, Level = 31, Location = -01, Shiny = false, }, // Dedenne @ ???
+            new EncounterStatic { Species = 239, Level = 29, Location = -01, Shiny = false, }, // Elekid @ ???
+            new EncounterStatic { Species = 125, Level = 30, Location = -01, Shiny = false, }, // Electabuzz @ ???
+            new EncounterStatic { Species = 734, Level = 03, Location = -01, Shiny = false, }, // Yungoos @ ???
+            new EncounterStatic { Species = 019, Level = 03, Location = -01, Form = 1, Shiny = false, }, // Rattata @ ???
+            new EncounterStatic { Species = 736, Level = 04, Location = -01, Shiny = false, }, // Grubbin @ ???
+            new EncounterStatic { Species = 021, Level = 04, Location = -01, Shiny = false, }, // Spearow @ ???
+            new EncounterStatic { Species = 127, Level = 42, Location = -01, Shiny = false, }, // Pinsir @ ???
+            new EncounterStatic { Species = 127, Level = 43, Location = -01, Shiny = false, }, // Pinsir @ ???
+            new EncounterStatic { Species = 127, Level = 42, Location = -01, Shiny = false, }, // Pinsir @ ???
+            new EncounterStatic { Species = 800, Level = 50, Location = -01, Form = 1, Shiny = false, }, // Necrozma @ ???
+            new EncounterStatic { Species = 800, Level = 50, Location = -01, Form = 2, Shiny = false, }, // Necrozma @ ???
+            new EncounterStatic { Species = 800, Level = 60, Location = -01, Form = 3, Shiny = false, }, // Necrozma @ ???
+            new EncounterStatic { Species = 800, Level = 65, Location = -01, Shiny = false, HeldItem = 923, }, // Necrozma @ ???
+            new EncounterStatic { Species = 743, Level = 55, Location = -01, Form = 1, Shiny = false, HeldItem = 184, }, // Ribombee @ ???
+            new EncounterStatic { Species = 279, Level = 52, Location = -01, Shiny = false, }, // Pelipper @ ???
+            new EncounterStatic { Species = 242, Level = 53, Location = -01, Shiny = false, }, // Blissey @ ???
+            new EncounterStatic { Species = 144, Level = 60, Location = -01, }, // Articuno @ ???
+            new EncounterStatic { Species = 145, Level = 60, Location = -01, }, // Zapdos @ ???
+            new EncounterStatic { Species = 146, Level = 60, Location = -01, }, // Moltres @ ???
+            new EncounterStatic { Species = 250, Level = 60, Location = -01, HeldItem = 044, }, // Ho-Oh @ ???
+            new EncounterStatic { Species = 384, Level = 60, Location = -01, }, // Rayquaza @ ???
+            new EncounterStatic { Species = 488, Level = 60, Location = -01, }, // Cresselia @ ???
+            new EncounterStatic { Species = 641, Level = 60, Location = -01, }, // Tornadus @ ???
+            new EncounterStatic { Species = 642, Level = 60, Location = -01, }, // Thundurus @ ???
+            new EncounterStatic { Species = 645, Level = 60, Location = -01, }, // Landorus @ ???
+            new EncounterStatic { Species = 717, Level = 60, Location = -01, }, // Yveltal @ ???
+            new EncounterStatic { Species = 150, Level = 60, Location = -01, }, // Mewtwo @ ???
+            new EncounterStatic { Species = 243, Level = 60, Location = -01, }, // Raikou @ ???
+            new EncounterStatic { Species = 244, Level = 60, Location = -01, }, // Entei @ ???
+            new EncounterStatic { Species = 483, Level = 60, Location = -01, }, // Dialga @ ???
+            new EncounterStatic { Species = 638, Level = 60, Location = -01, }, // Cobalion @ ???
+            new EncounterStatic { Species = 639, Level = 60, Location = -01, }, // Terrakion @ ???
+            new EncounterStatic { Species = 640, Level = 60, Location = -01, }, // Virizion @ ???
+            new EncounterStatic { Species = 643, Level = 60, Location = -01, }, // Reshiram @ ???
+            new EncounterStatic { Species = 644, Level = 60, Location = -01, }, // Zekrom @ ???
+            new EncounterStatic { Species = 716, Level = 60, Location = -01, }, // Xerneas @ ???
+            new EncounterStatic { Species = 377, Level = 60, Location = -01, }, // Regirock @ ???
+            new EncounterStatic { Species = 378, Level = 60, Location = -01, }, // Regice @ ???
+            new EncounterStatic { Species = 379, Level = 60, Location = -01, }, // Registeel @ ???
+            new EncounterStatic { Species = 383, Level = 60, Location = -01, }, // Groudon @ ???
+            new EncounterStatic { Species = 485, Level = 60, Location = -01, }, // Heatran @ ???
+            new EncounterStatic { Species = 486, Level = 60, Location = -01, }, // Regigigas @ ???
+            new EncounterStatic { Species = 484, Level = 60, Location = -01, }, // Palkia @ ???
+            new EncounterStatic { Species = 487, Level = 60, Location = -01, }, // Giratina @ ???
+            new EncounterStatic { Species = 245, Level = 60, Location = -01, }, // Suicune @ ???
+            new EncounterStatic { Species = 249, Level = 60, Location = -01, }, // Lugia @ ???
+            new EncounterStatic { Species = 380, Level = 60, Location = -01, }, // Latias @ ???
+            new EncounterStatic { Species = 381, Level = 60, Location = -01, }, // Latios @ ???
+            new EncounterStatic { Species = 382, Level = 60, Location = -01, }, // Kyogre @ ???
+            new EncounterStatic { Species = 480, Level = 60, Location = -01, }, // Uxie @ ???
+            new EncounterStatic { Species = 481, Level = 60, Location = -01, }, // Mesprit @ ???
+            new EncounterStatic { Species = 482, Level = 60, Location = -01, }, // Azelf @ ???
+            new EncounterStatic { Species = 646, Level = 60, Location = -01, }, // Kyurem @ ???
+            new EncounterStatic { Species = 334, Level = 60, Location = -01, }, // Altaria @ ???
+            new EncounterStatic { Species = 469, Level = 60, Location = -01, }, // Yanmega @ ???
+            new EncounterStatic { Species = 561, Level = 60, Location = -01, }, // Sigilyph @ ???
+            new EncounterStatic { Species = 581, Level = 60, Location = -01, }, // Swanna @ ???
+            new EncounterStatic { Species = 277, Level = 60, Location = -01, }, // Swellow @ ???
+            new EncounterStatic { Species = 452, Level = 60, Location = -01, }, // Drapion @ ???
+            new EncounterStatic { Species = 531, Level = 60, Location = -01, }, // Audino @ ???
+            new EncounterStatic { Species = 695, Level = 60, Location = -01, }, // Heliolisk @ ???
+            new EncounterStatic { Species = 274, Level = 60, Location = -01, }, // Nuzleaf @ ???
+            new EncounterStatic { Species = 326, Level = 60, Location = -01, }, // Grumpig @ ???
+            new EncounterStatic { Species = 460, Level = 60, Location = -01, }, // Abomasnow @ ???
+            new EncounterStatic { Species = 308, Level = 60, Location = -01, }, // Medicham @ ???
+            new EncounterStatic { Species = 450, Level = 60, Location = -01, }, // Hippowdon @ ???
+            new EncounterStatic { Species = 558, Level = 60, Location = -01, }, // Crustle @ ???
+            new EncounterStatic { Species = 219, Level = 60, Location = -01, }, // Magcargo @ ???
+            new EncounterStatic { Species = 689, Level = 60, Location = -01, }, // Barbaracle @ ???
+            new EncounterStatic { Species = 271, Level = 60, Location = -01, }, // Lombre @ ???
+            new EncounterStatic { Species = 618, Level = 60, Location = -01, }, // Stunfisk @ ???
+            new EncounterStatic { Species = 419, Level = 60, Location = -01, }, // Floatzel @ ???
+            new EncounterStatic { Species = 195, Level = 60, Location = -01, }, // Quagsire @ ???
+            new EncounterStatic { Species = 793, Level = 60, Location = -01, }, // Nihilego @ ???
+            new EncounterStatic { Species = 794, Level = 60, Location = -01, }, // Buzzwole @ ???
+            new EncounterStatic { Species = 795, Level = 60, Location = -01, }, // Pheromosa @ ???
+            new EncounterStatic { Species = 796, Level = 60, Location = -01, }, // Xurkitree @ ???
+            new EncounterStatic { Species = 797, Level = 60, Location = -01, }, // Celesteela @ ???
+            new EncounterStatic { Species = 798, Level = 60, Location = -01, }, // Kartana @ ???
+            new EncounterStatic { Species = 799, Level = 60, Location = -01, }, // Guzzlord @ ???
+            new EncounterStatic { Species = 735, Level = 60, Location = -01, Form = 1, Shiny = false, HeldItem = 189, }, // Gumshoos @ ???
+            new EncounterStatic { Species = 734, Level = 58, Location = -01, Shiny = false, }, // Yungoos @ ???
+            new EncounterStatic { Species = 020, Level = 60, Location = -01, Form = 2, Shiny = false, HeldItem = 189, }, // Raticate @ ???
+            new EncounterStatic { Species = 019, Level = 58, Location = -01, Form = 1, Shiny = false, }, // Rattata @ ???
+            new EncounterStatic { Species = 760, Level = 28, Location = -01, Shiny = false, }, // Bewear @ ???
+            new EncounterStatic { Species = 097, Level = 29, Location = -01, Shiny = false, }, // Hypno @ ???
+            new EncounterStatic { Species = 097, Level = 29, Location = -01, Shiny = false, }, // Hypno @ ???
+            new EncounterStatic { Species = 097, Level = 29, Location = -01, Shiny = false, }, // Hypno @ ???
+            new EncounterStatic { Species = 092, Level = 19, Location = -01, Shiny = false, }, // Gastly @ ???
+            new EncounterStatic { Species = 425, Level = 19, Location = -01, Shiny = false, }, // Drifloon @ ???
+            new EncounterStatic { Species = 769, Level = 30, Location = -01, Shiny = false, }, // Sandygast @ ???
+            new EncounterStatic { Species = 592, Level = 34, Location = -01, Shiny = false, }, // Frillish @ ???
+            new EncounterStatic { Species = 132, Level = 29, Location = -01, }, // Ditto @ ???
+            new EncounterStatic { Species = 132, Level = 29, Location = -01, }, // Ditto @ ???
+            new EncounterStatic { Species = 132, Level = 29, Location = -01, }, // Ditto @ ???
+            new EncounterStatic { Species = 132, Level = 29, Location = -01, }, // Ditto @ ???
+            new EncounterStatic { Species = 132, Level = 29, Location = -01, }, // Ditto @ ???
+            new EncounterStatic { Species = 718, Level = 60, Location = -01, Shiny = false, }, // Zygarde @ ???
+            new EncounterStatic { Species = 805, Level = 60, Location = -01, }, // Stakataka @ ???
+            new EncounterStatic { Species = 806, Level = 60, Location = -01, }, // Blacephalon @ ???
+            new EncounterStatic { Species = 105, Level = 22, Location = -01, Form = 2, Shiny = false, HeldItem = 258, }, // Marowak @ ???
+            new EncounterStatic { Species = 758, Level = 20, Location = -01, Shiny = false, }, // Salazzle @ ???
+            new EncounterStatic { Species = 101, Level = 60, Location = -01, Shiny = false, }, // Electrode @ ???
         };
         internal static readonly EncounterTrade[] TradeGift_USUM =
         {

From 93b49928a08f06d5bc3bd4d61023d05bbbedb731 Mon Sep 17 00:00:00 2001
From: Kurt <kaphotics@gmail.com>
Date: Wed, 8 Nov 2017 19:31:07 -0800
Subject: [PATCH 4/7] add lvl/egg move tables for usum

add a few met locations for static encounters, recognizes torracat with
double kick correctly!
---
 .../Legality/Encounters/Data/Encounters7.cs   |  12 ++++++------
 PKHeX.Core/Resources/byte/eggmove_uu.pkl      | Bin 15996 -> 16700 bytes
 PKHeX.Core/Resources/byte/lvlmove_uu.pkl      | Bin 70808 -> 72024 bytes
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/PKHeX.Core/Legality/Encounters/Data/Encounters7.cs b/PKHeX.Core/Legality/Encounters/Data/Encounters7.cs
index c2ce81d2b..7f17eaade 100644
--- a/PKHeX.Core/Legality/Encounters/Data/Encounters7.cs
+++ b/PKHeX.Core/Legality/Encounters/Data/Encounters7.cs
@@ -166,9 +166,9 @@ private static void MarkG7SMSlots(ref EncounterArea[] Areas)
         };
         private static readonly EncounterStatic[] Encounter_USUM =
         {
-            new EncounterStatic { Gift = true, Species = 722, Level = 05, Location = 24, }, // Rowlet @ ???
-            new EncounterStatic { Gift = true, Species = 725, Level = 05, Location = 24, }, // Litten @ ???
-            new EncounterStatic { Gift = true, Species = 728, Level = 05, Location = 24, }, // Popplio @ ???
+            new EncounterStatic { Gift = true, Species = 722, Level = 05, Location = 8, }, // Rowlet @ ???
+            new EncounterStatic { Gift = true, Species = 725, Level = 05, Location = 8, }, // Litten @ ???
+            new EncounterStatic { Gift = true, Species = 728, Level = 05, Location = 8, }, // Popplio @ ???
             new EncounterStatic { Gift = true, Species = 138, Level = 15, Location = 58, }, // Omanyte @ ???
             new EncounterStatic { Gift = true, Species = 140, Level = 15, Location = 58, }, // Kabuto @ ???
             new EncounterStatic { Gift = true, Species = 142, Level = 15, Location = 58, }, // Aerodactyl @ ???
@@ -314,7 +314,7 @@ private static void MarkG7SMSlots(ref EncounterArea[] Areas)
             new EncounterStatic { Species = 256, Level = 20, Location = -01, }, // Combusken @ ???
             new EncounterStatic { Species = 679, Level = 24, Location = -01, }, // Honedge @ ???
             new EncounterStatic { Species = 015, Level = 14, Location = -01, }, // Beedrill @ ???
-            new EncounterStatic { Species = 253, Level = 16, Location = -01, }, // Grovyle @ ???
+            new EncounterStatic { Species = 253, Level = 16, Location = 052, }, // Grovyle @ ???
             new EncounterStatic { Species = 259, Level = 17, Location = -01, }, // Marshtomp @ ???
             new EncounterStatic { Species = 111, Level = 32, Location = -01, }, // Rhyhorn @ ???
             new EncounterStatic { Species = 220, Level = 33, Location = -01, }, // Swinub @ ???
@@ -335,7 +335,7 @@ private static void MarkG7SMSlots(ref EncounterArea[] Areas)
             new EncounterStatic { Species = 786, Level = 60, Location = -01, Shiny = false, }, // Tapu Lele @ ???
             new EncounterStatic { Species = 787, Level = 60, Location = -01, Shiny = false, }, // Tapu Bulu @ ???
             new EncounterStatic { Species = 788, Level = 60, Location = -01, Shiny = false, }, // Tapu Fini @ ???
-            new EncounterStatic { Species = 023, Level = 10, Location = -01, }, // Ekans @ ???
+            new EncounterStatic { Species = 023, Level = 10, Location = 012, }, // Ekans @ ???
             new EncounterStatic { Species = 103, Level = 40, Location = -01, Form = 1, }, // Exeggutor @ ???
             new EncounterStatic { Species = 785, Level = 60, Location = -01, Shiny = false, }, // Tapu Koko @ ???
 
@@ -443,7 +443,7 @@ private static void MarkG7SMSlots(ref EncounterArea[] Areas)
             new EncounterStatic { Species = 092, Level = 19, Location = -01, Shiny = false, }, // Gastly @ ???
             new EncounterStatic { Species = 425, Level = 19, Location = -01, Shiny = false, }, // Drifloon @ ???
             new EncounterStatic { Species = 769, Level = 30, Location = -01, Shiny = false, }, // Sandygast @ ???
-            new EncounterStatic { Species = 592, Level = 34, Location = -01, Shiny = false, }, // Frillish @ ???
+            new EncounterStatic { Species = 592, Level = 34, Location = 126, Shiny = false, }, // Frillish @ ???
             new EncounterStatic { Species = 132, Level = 29, Location = -01, }, // Ditto @ ???
             new EncounterStatic { Species = 132, Level = 29, Location = -01, }, // Ditto @ ???
             new EncounterStatic { Species = 132, Level = 29, Location = -01, }, // Ditto @ ???
diff --git a/PKHeX.Core/Resources/byte/eggmove_uu.pkl b/PKHeX.Core/Resources/byte/eggmove_uu.pkl
index dd77a7ebe46a0c01860d02c4e3cffe9676165764..8f9fb01781e8f2d1b33396b417273c569a773436 100644
GIT binary patch
delta 8947
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

delta 8361
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

diff --git a/PKHeX.Core/Resources/byte/lvlmove_uu.pkl b/PKHeX.Core/Resources/byte/lvlmove_uu.pkl
index 40cafd1d38271e4d9498ab807345971556ce74a4..79426875aee6edb40037ff1c01dc4002ee505042 100644
GIT binary patch
delta 4950
zcmbW)e{_@88Nl)9rf(s|P*NHoYS17Bf&{1-G(wfAQL0wK*#U|_Iz@-t&7#HORt<CA
zR$SE1WRhvbI6GIjOga;xO2FvijGAdEQKMw8XopdQiyAeuO!lpE&d%BP*Wi5K+~j@l
zbD#S>H#w()N44zZnrHp`bXD^NkrwnI1*=h{6<*}gP$#k$Q6!LtWuk~3PHaFFWw`4_
zx{yQ#ZWD1(MAIaZ<p`h%+hp-b+hi6-9A#Lih-^d<MHtK?mtq43p+Ayj5x^h{Xgo@!
z9Z6_Mi>yKbMK~<PM;4B$#6}Pqn2zy~)iGoVFEX$kOE4s%Sw)($0dZKSiL@aMIgYvL
zMFzI%BAv*>)<6uzp`RhL2K}hOJyWCu1E_eoG|v+0Ljf%|5<wQ$*#txs!)Q33_sGIE
zhn*k}qn)y%4@J1<at~3I;h0BDkU{~i^F=}^!Q*HoC<al6{sa<24|<V>WdXZJA4Xt3
zk=-GLBAOf`-AKZ)kYwOR8jUA$4>6R{bTV;~fyGJxJDn^JIfaSvA_v<dc7YgVF_l3S
zh9;gv3|W+6I+b0a4|%vwV=j_tTtfNLj}n%<C_fUgp6;PEr;`9GXgP!Ikc4(7m4Fv1
zSlk>ew4oC*l(F_Kf<Zf*svwLKT9=X#%5XPRQKVozhkFR4;Njvrmqn0(`8@iJF2td=
zaQe}Q92(9idqgpe5?U`1@gohxG8RKGGO#WuLG&SyrVFVI5|D4u|0XV8<YBppQXz&C
znp(*kDLB7LQb=P2Mc7yHIXV%>2+A<8q|E3*KT2p^MUu#&@nXK7NM20;EtjwZ1d)P%
zH9LkE!?0dT+0h5XWju?1WMICW-JuI<G+e==NWk1itB`<vi-gb*xsnQ@2k9&6zv(Kz
z--yDvh6ONyBATxzYh+-*hUy@U3R=HS(x||_mf$GBbuHyb7Ut`SjX@Z$XCsKB1Xnw)
z@Nh{Y3;TCi08y0D@?ENc5}IxxC<-uiups=%z_N~mhi)XG-N;<{k%IXqT7)jdp>=W}
zet1T>IM=fflF)8uF>FK(McBW`E--)+TpM_gI1IP&9vcut8Sd}1Qv{KL;Rlo-?eHQF
zt&4TL=zkZ3UJS#2E5Q&z7N*;%2m;7KPrF>`K@#ST^cV>gVErLy2YpDwcsu6<Vd#HE
zV(=r33LM=8Y3n9ajKKM0CLoR?96zCK$iVzll0gVL*m`&tLFCZ5i81nU-@zCqxPC@8
z5JeeHUN(dxT%J402By0xAyP2jO}WsE6trF@p$92wKc|1_LKJye?qLyxFbunoco>Ai
z&n6K<0q$SW1{C12-^*79ap*TwK7<fO8HNDKU=6}ZK>H=1A&3mD_pvzoP=M`zVqySV
zkeCRe0Otc7Mhrr~h5ol}Asa-If#pFaAPjwoh0uvX<Y0S<;E2QYD;CB83=dNk1dxNR
zkLNG|`8D?tL>|sZIN(S>LjO&_VFARDg|(lFh(mjn?>WLK!1-IsiUcgbBT)>X1V@;S
zAO-X9nTHVMF-i_UGO%ss+#m{rXMhE<2EE9^^#^*5EQ)YE&UYJGSR#xu3~Q8Rkc8n0
zVxS)dxVI4lBd~7g9um+GvN&SUo}~ZHT>Qwx@)W_5gnkDlLkJ}}V;nf7Vcf~?5JCx!
zyQm<tusqFTNI@Ux7ZhO>N5{_)A1PR$Wn<6Me>Vd!QZWCK!0;mpLxNxkL3@sG0oEV^
z?N0<mH<D<0o}D2INfHME6ybP*HIRV$Ma~pDFz_P%H@w6lLKGFaQ<M%VRM7Zm4hs^H
zmzj)S<Y9Y-z(}JpO@)wzVK*@mMiGu7VqgTeJyZ)Bm^~SGgh3SHe3iwKg5@=Kh+YiC
z{5sE~A6Zzk96&@-g8dE71EQ$F`6kst6tb7<p&M~na#RQ&KbIJ^zYq*z6kvag0N98a
z<gX+HKeS=0gf7HTfomVTLKN~gi@}c)T<=gNWYI7}rQm{hg#Kq4*#1T^q+s4pA2A61
zyOa@OXnBI78!;5&c#l3JiXvR^vnY~~4@eR{NWoZO$M7P73S0;1fBOM`xlly&hXg<d
zroXc|!jK}95rTX~Wzd0s48!~}=K?*5ql~ssNCcJ=Z9xXMPuVCkaDGN>JzPfM{G7~?
zgSAXjNI?67Ea628hJ#cG1E^s6KS&CBG*t+QG>re`9{M3)vJnK3h4~Qg5rikt#Vtw#
zs9>#95{E^nqyt$rR4M619Ga%Yg)T%P)k;<&2J;xk2p|XRSS4!^gGsNX1p$metKof(
z@<<1R1oE(tQ{qJ$mLo_2QRody9Oy;{&hbiu7)C=aNh6E`>=Tr<Ba8y<M&2Wg0_=6X
zM;L`Vj}qHNc7r&ydL_*WA`gd2$ws7Lp2Ti20GX_0If5u-)f6TDD5Ke|#E%TjM{*B`
z_&1H}&Xp=TN5;xzsgd(#ye#w0{kSGFZ^Dc9V^;9-4(0puxD~Z4c(PTh<?u(fn-)ca
z(+gF)Yn1PfS(oz?d4JY`Hfg$ip=QY~VwZKYK(1A%$V@psveiCSr&Q#Hd3)592AM8l
zHCtYhMwuZebAO41)Y8b-##@e14@PD*jn&jr-#*tg-?^>@HA`9c1I*%+*}lhI$N&42
z$UfIa+LE1Qe55kUXEKpLekVztZi-x`j*<qk$b0HoSuN9K6Ypm7|7e!=sX4M)&6Af{
zeyf}qx#6rGHFf`;@#1Aur}~WT6C>BPZ>iDUsv_fV{@B14zPNqtnE$9nq;}I&V^mM%
zg}diZ(5=)(4sJQ#?6Ym}i=?-kb&<l8d8Kpee6Q^|WAx>y*uA4Kiw<1kGwl4(w{52}
zQoHLdqwZDe_i{#8T`NP%=zDti(!-;%Lnn+siR1nR$A29j^_?;_?eM+TLrWN$#pt_#
zX!QBf(K|yc504h_Ig?R>&pdlZ?~ab1-?QxNQDjQygfXgj^F#G&Nu>MDRZ25aWM63S
zF}{O)@6p{(Q*&omZBq*)ujCe1SKX+VY(CkfE@N<B<cha1)T)Mb3w&GmKjXQVoLo$u
zi(1Af@_H<%=1nzTQc^D~X~#pf;Vv~pE|uA`P&fapgSUwDx`^lhpZPwuka?$$#_=55
z#)6}#_yNx5E_H;gmpZy#FRNsV>}BB#SokS=ez}@2uQG9_d^PcqgE=RWz$7(RN+i2a
z)ydV&StnCvHS=!caDGn06PTCQE&eL$am?9`jH>1@Hoe>@a}83Xn;>&^_54sx76S*b
zh5!$fl2O+npDLT|*3FR{2@+8YBG<orXZ2|N4;D`2C9>$iF7x;q{20z4=yP=0?fdBU
z^R}0(Rfo3SJWdVkH@8hxEt|^|Rru>>eKOhs-%a~ZJ=}mvz76}G|8pFFqs8YKcKO;~
G@BSAK1<iQ?

delta 4411
zcmZYAe|+O*eE{(1Tf!M6dO65pkskKAdK9b@uu2CJq89Du4bFMOiKikuMP;sRfQO!@
zj=Gg`)4EjXv_hvHR*f1>9GMp}XvIvsQIDvV744v#WyCXL)u<7CpZ?{%*X#ZC`S$z#
z_&lG_^Sv&AE;jw~Snj&(?mi~5IfNv;m}HIaWC*({u+G4i5cV^{6sxr8kU7CSs>DwW
zA<IE(#8cLxOxPMiihY!6ZVkE6can`6r^*_`PYK})$}G{_Z4(Z#Nb+QhaDXBkq@QY2
z>hzrAJ!RVL>Iq?nHpAPj%{0r~a-up_l<a1jRnkwh7<Cf8HfNkw`nHEK$^zlE5cV)l
zlc60pqDi{X92V(+dI(ojBfc|)L9V5i(<Dw0;VOzG`vt-bYYd$swal^3(3##5dxn!R
zPJ`5dH7FB%rg!Y8N}KGnl$Ii?vt)oWxed)=+F;5o5Ifrf>|%;#dd@M4Syt$OwiHvK
zO?FT))JZ%igb@zXB>P<JQ>M+Xa|Oflx$2)Dk_xIM{>Vh8StE0viByT7FYVMxWXxfb
zB8w!RCm?2NGju@+W31D2q2MVH&kCOXG_pB$dcN9FB)q`MIY5OD*%w-fB@)BZM?a$!
z=($KRl<9eqAebZeVt0diHW(VQE;V9*Y#cK=O^eK*ScEza23}$V$|QDKh=Vlf{nHR$
z&m?oiE*3OnRM{YViE^++_ipo<rb+sx_M%9xsmc7Amn@QcnQSmelc7DLW}ShT+k`1*
zSz(>NOPz)(=BX1d6DWI`W0m2(4#6rTuTX+lsQ;o)>~fca15`-7Qcz5?M0}qUP$l*%
zi!x4~?pF(pF&gx~#_6b&yh5KM;kD*bWP_nA&AC$j7j*hxC#BSgz20SEmNvtGZZlR$
zy}?N-5PPGbDX_ubtJISg**E#0k~;lw_GwZj{ucW%M~igsYH47C6;gj;0P}RnywzZu
zWdG6zRM}v7RA4O9bB)iKYbn!V_^)J?I(>gFON>&c!|=80Kc!hGbDcma(<FVpd%!F!
z^uJA3n4?Aiev471MgI-PGtUO`x62OWR0;18BpF62v;GeCA2{G-OtM0Yk$1`n3#8uV
znS)elF{Et!sgoRYYGzm>@osm8{nY6G8zrN{2H6{xig{LVv_N9q228R>>OD@v46F42
zt&73}$-i?dCTNhFFqa8dj`nZz70_bj?`4lBv72R&Io26IXnmSF&E9_yDShu1HB~xf
z-shPj>kLkMrbwIq_gj=H>csw0a2#ZrzP!6cg~XJ1Ow(fM1N!8aH9faDF=gVn8psvQ
zQK3U}TA++lq{GNR$qb9cKIjh@(=_P$khD`IK4VR$S)=#E0;Bw4^>6D8-DX3^s1v{4
zW|ZmBJ8J?HH0b$f0aGLP5gSpV&G1K!qe0J{cNAzd@-MQ*8UuIuI_}6>M5p&-zEQ?m
zq-Wj+6bT;}4AZR9_X$~`PW+QLV3t*e3QEKR;Zsgcffm_MJ0J~GpK)L+In5%;qIxqy
zlflmlh8b2#f6g;?(j_%!k-oCqPle>?-F&8LG5D`8HH#$gG>!^A6$hX~uA>?GHyg1;
z<_n^vM(mK2Q=r9QRe;n<e9=1!tdqV=YFVcDOUAK4tR}M*h}|s<Ot3=hZuJje76218
zNPfjdVw^g?3sOvtHoadJAT?t5Sdej6>HC_KQ6*WI4GOdv`FHbZkoda#bM@ElU)M=}
z!$c~CMVE*PDm2Obhsjh){HMAy#~Q=;8p}F^OUAK4@|!L#^Q@CTEKn9m+$Sr{=QJ&{
z4Ht(R$#03AIhN@Dw!zHOB>f$ihdI{BEW62+3E%b1I5iUYduE&(@&6Jqvn-QKtr);K
z4f-AsHFFecGx$BhQ6uqvn^9$h!BrQF3QY$7+gQrPAG8)lI*dHzjxbA+&O_=yvgXFp
zB=bK~$uj-_Yatfs{(<sPpvAztAXp;yuz8HJK>Yudhe_&$M|_qXV4hV5nhwlTGbi0Y
zbm5p{oy-xFSt0Wyr=!3cJuRi-APaOD{IRcx*rUD($|Qf{<Wxv*Sc64+f2vQN?w`5X
zIn6xb=k5Rps1t8X7jrZj`h`tdq3@S6!y<`aIV}fSBhzsZ8l-+LSf*H}?=e}T!O-K@
zCfCvI4N)kNilT4@MLJ}=qHur;Ei%VMVTv|;V)``bJ~j&bn59j6lX=uxC;bHDnP-t?
zJPM<f<B|Ly=OxoL>3(7qu40k&@lm*z3LUbED2!1fJjpX-)Cf=Z%osJoX3vaKC7HAj
z)2xu*BFHW0ic%+af|FCA&B%!cvPveU&*T1Wm!)ThW5P+Lmv8?5iJJ~ZPY9QW{B1jW
z@|W&7@5zVcY)?2g{O;GK+ji`Xb!`jzdrp6~AEllB#n{%<!Y`to;f8Q#xF$R+yeT>-
z><rH>Ju<MZE5G~3RH^r@YII^D+7bG~8R6cL4o?r~gxToA(ofPi9A6sE#A5kI_SF0>
z*>jG2L@1}TJ^#(@%YN_ajMAmgKQngz$<dR-&q6Ys7ETCTy0(VbMNhHpQ^UhiPk3c`
zTDU1}w|QSUML_xJjBso8jPMOXea0V{FI{x#xGjGe=gpUF+t&5bQ2NBxpFXZ@CX_C}
z{?SBf_l>bl|L^EBa$afXrm;=Y`%Bv<&)VE|e^k2o_A|S?Qc?c;JMW0@DV<z7r7L=<
zboLh>iMmdW@~2i`aP-HO)mx7Kc<jjK`8{7eQo7)-N0X(&dk=R-oAbvXezEql!)Hg=
z<UeqDyZ)iW7iu5>?eAZ5-(~tAyYGeCAKiC!<oS(DqRplEHO}5tTDX5I%I{k#=93Q$
zm-ap|cx-<1!F{FHgS%t-;UCmWgAY#}dvw>kj$GhJ>9Hesb>EqaN29Sj8;NK#ers`S
TRLC#fpSgABq^KM_dJBF7v8!Cz


From da5dd5ccb365ba39bef1a629d3cff7c065ccdb1f Mon Sep 17 00:00:00 2001
From: Kurt <kaphotics@gmail.com>
Date: Wed, 8 Nov 2017 19:34:07 -0800
Subject: [PATCH 5/7] remove usum early return for dex bit setting

I highly doubt this is causing save corruption; looked through the
disassembly and the offset ptrs are the same relative to sun/moon.
Implementation is flexible for both as gamefreak allocated enough space
in each bit array.

pokedex editor recognizes bools correctly (including for formes).
---
 PKHeX.Core/Saves/SAV7.cs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/PKHeX.Core/Saves/SAV7.cs b/PKHeX.Core/Saves/SAV7.cs
index dfd8f1c3a..cf02f6912 100644
--- a/PKHeX.Core/Saves/SAV7.cs
+++ b/PKHeX.Core/Saves/SAV7.cs
@@ -974,9 +974,6 @@ protected override void SetDex(PKM pkm)
             if (pkm.IsEgg) // do not add
                 return;
 
-            if (USUM) // TODO: IMPLEMENT POKEDEX EDITING FOR USUM
-                return;
-
             int bit = pkm.Species - 1;
             int bd = bit >> 3; // div8
             int bm = bit & 7; // mod8

From 115c611120e326cd9a7736223020ec408150b1e4 Mon Sep 17 00:00:00 2001
From: Kurt <kaphotics@gmail.com>
Date: Wed, 8 Nov 2017 19:51:04 -0800
Subject: [PATCH 6/7] add surf to gift pikachu moveset

only gift pkm with special move
---
 PKHeX.Core/Legality/Encounters/Data/Encounters7.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/PKHeX.Core/Legality/Encounters/Data/Encounters7.cs b/PKHeX.Core/Legality/Encounters/Data/Encounters7.cs
index 7f17eaade..48bc96a7f 100644
--- a/PKHeX.Core/Legality/Encounters/Data/Encounters7.cs
+++ b/PKHeX.Core/Legality/Encounters/Data/Encounters7.cs
@@ -186,7 +186,7 @@ private static void MarkG7SMSlots(ref EncounterArea[] Areas)
             new EncounterStatic { Gift = true, Species = 801, Level = 50, Location = -01, Shiny = false, HeldItem = 795, }, // Magearna @ ???
             new EncounterStatic { Gift = true, Species = 789, Level = 05, Location = -01, Shiny = false, }, // Cosmog @ ???
             new EncounterStatic { Gift = true, Species = 142, Level = 40, Location = 172, }, // Aerodactyl @ ???
-            new EncounterStatic { Gift = true, Species = 025, Level = 40, Location = -01, HeldItem = 796, }, // Pikachu @ ???
+            new EncounterStatic { Gift = true, Species = 025, Level = 40, Location = -01, HeldItem = 796, Moves = new[] {057} }, // Pikachu (Surf) @ ???
             new EncounterStatic { Gift = true, Species = 803, Level = 40, Location = -01, }, // Poipole @ ???
             new EncounterStatic { Gift = true, Species = 735, Level = 20, Location = -01, Form = 1, Shiny = false, }, // Gumshoos @ ???
             new EncounterStatic { Gift = true, Species = 020, Level = 20, Location = -01, Form = 2, Shiny = false, }, // Raticate @ ???

From a8000608f252280f8540fe9027feb9fa723f7abc Mon Sep 17 00:00:00 2001
From: Matt <sorafanatic10@gmail.com>
Date: Wed, 8 Nov 2017 22:56:13 -0500
Subject: [PATCH 7/7] Add more USUM static encounter locations

Totems @ Heahea Beach, Island Scan.

Grovyle is Akala-Friday @ Route 5, as is Bellsprout in SM; assume locations were unchanged.
---
 .../Legality/Encounters/Data/Encounters7.cs   | 99 ++++++++++---------
 1 file changed, 54 insertions(+), 45 deletions(-)

diff --git a/PKHeX.Core/Legality/Encounters/Data/Encounters7.cs b/PKHeX.Core/Legality/Encounters/Data/Encounters7.cs
index 48bc96a7f..1934a90f9 100644
--- a/PKHeX.Core/Legality/Encounters/Data/Encounters7.cs
+++ b/PKHeX.Core/Legality/Encounters/Data/Encounters7.cs
@@ -166,9 +166,9 @@ private static void MarkG7SMSlots(ref EncounterArea[] Areas)
         };
         private static readonly EncounterStatic[] Encounter_USUM =
         {
-            new EncounterStatic { Gift = true, Species = 722, Level = 05, Location = 8, }, // Rowlet @ ???
-            new EncounterStatic { Gift = true, Species = 725, Level = 05, Location = 8, }, // Litten @ ???
-            new EncounterStatic { Gift = true, Species = 728, Level = 05, Location = 8, }, // Popplio @ ???
+            new EncounterStatic { Gift = true, Species = 722, Level = 05, Location = 8, }, // Rowlet @ Route 1
+            new EncounterStatic { Gift = true, Species = 725, Level = 05, Location = 8, }, // Litten @ Route 1
+            new EncounterStatic { Gift = true, Species = 728, Level = 05, Location = 8, }, // Popplio @ Route 1
             new EncounterStatic { Gift = true, Species = 138, Level = 15, Location = 58, }, // Omanyte @ ???
             new EncounterStatic { Gift = true, Species = 140, Level = 15, Location = 58, }, // Kabuto @ ???
             new EncounterStatic { Gift = true, Species = 142, Level = 15, Location = 58, }, // Aerodactyl @ ???
@@ -185,20 +185,20 @@ private static void MarkG7SMSlots(ref EncounterArea[] Areas)
             new EncounterStatic { Gift = true, Species = 772, Level = 60, Location = -01, }, // Type: Null @ ???
             new EncounterStatic { Gift = true, Species = 801, Level = 50, Location = -01, Shiny = false, HeldItem = 795, }, // Magearna @ ???
             new EncounterStatic { Gift = true, Species = 789, Level = 05, Location = -01, Shiny = false, }, // Cosmog @ ???
-            new EncounterStatic { Gift = true, Species = 142, Level = 40, Location = 172, }, // Aerodactyl @ ???
-            new EncounterStatic { Gift = true, Species = 025, Level = 40, Location = -01, HeldItem = 796, Moves = new[] {057} }, // Pikachu (Surf) @ ???
+            new EncounterStatic { Gift = true, Species = 142, Level = 40, Location = 172, }, // Aerodactyl @ Seafolk Village
+            new EncounterStatic { Gift = true, Species = 025, Level = 40, Location = -01, HeldItem = 796, }, // Pikachu @ ???
             new EncounterStatic { Gift = true, Species = 803, Level = 40, Location = -01, }, // Poipole @ ???
-            new EncounterStatic { Gift = true, Species = 735, Level = 20, Location = -01, Form = 1, Shiny = false, }, // Gumshoos @ ???
-            new EncounterStatic { Gift = true, Species = 020, Level = 20, Location = -01, Form = 2, Shiny = false, }, // Raticate @ ???
-            new EncounterStatic { Gift = true, Species = 105, Level = 25, Location = -01, Form = 2, Shiny = false, }, // Marowak @ ???
-            new EncounterStatic { Gift = true, Species = 752, Level = 25, Location = -01, Form = 1, Shiny = false, }, // Araquanid @ ???
-            new EncounterStatic { Gift = true, Species = 754, Level = 30, Location = -01, Form = 1, Shiny = false, }, // Lurantis @ ???
-            new EncounterStatic { Gift = true, Species = 758, Level = 30, Location = -01, Form = 1, Shiny = false, }, // Salazzle @ ???
-            new EncounterStatic { Gift = true, Species = 738, Level = 35, Location = -01, Form = 1, Shiny = false, }, // Vikavolt @ ???
-            new EncounterStatic { Gift = true, Species = 777, Level = 35, Location = -01, Form = 1, Shiny = false, }, // Togedemaru @ ???
-            new EncounterStatic { Gift = true, Species = 778, Level = 40, Location = -01, Form = 2, Shiny = false, }, // Mimikyu @ ???
-            new EncounterStatic { Gift = true, Species = 743, Level = 50, Location = -01, Form = 1, Shiny = false, }, // Ribombee @ ???
-            new EncounterStatic { Gift = true, Species = 784, Level = 50, Location = -01, Form = 1, Shiny = false, }, // Kommo-o @ ???
+            new EncounterStatic { Gift = true, Species = 735, Level = 20, Location = 202, Form = 1, Shiny = false, }, // Totem Gumshoos
+            new EncounterStatic { Gift = true, Species = 020, Level = 20, Location = 202, Form = 2, Shiny = false, }, // Totem Raticate
+            new EncounterStatic { Gift = true, Species = 105, Level = 25, Location = 202, Form = 2, Shiny = false, }, // Totem Marowak
+            new EncounterStatic { Gift = true, Species = 752, Level = 25, Location = 202, Form = 1, Shiny = false, }, // Totem Araquanid
+            new EncounterStatic { Gift = true, Species = 754, Level = 30, Location = 202, Form = 1, Shiny = false, }, // Totem Lurantis
+            new EncounterStatic { Gift = true, Species = 758, Level = 30, Location = 202, Form = 1, Shiny = false, }, // Totem Salazzle
+            new EncounterStatic { Gift = true, Species = 738, Level = 35, Location = 202, Form = 1, Shiny = false, }, // Totem Vikavolt
+            new EncounterStatic { Gift = true, Species = 777, Level = 35, Location = 202, Form = 1, Shiny = false, }, // Totem Togedemaru
+            new EncounterStatic { Gift = true, Species = 778, Level = 40, Location = 202, Form = 2, Shiny = false, }, // Totem Mimikyu
+            new EncounterStatic { Gift = true, Species = 743, Level = 50, Location = 202, Form = 1, Shiny = false, }, // Totem Ribombee
+            new EncounterStatic { Gift = true, Species = 784, Level = 50, Location = 202, Form = 1, Shiny = false, }, // Totem Kommo-o
             new EncounterStatic { Gift = true, Species = 718, Level = 63, Location = -01, Form = 1, Shiny = false, }, // Zygarde @ ???
             new EncounterStatic { Gift = true, Species = 025, Level = 21, Location = -01, Form = 7, Shiny = false, HeldItem = 571, }, // Pikachu @ ???
 
@@ -302,35 +302,44 @@ private static void MarkG7SMSlots(ref EncounterArea[] Areas)
             new EncounterStatic { Species = 797, Level = 65, Location = -01, Shiny = false, }, // Celesteela @ ???
             new EncounterStatic { Species = 799, Level = 70, Location = -01, Shiny = false, }, // Guzzlord @ ???
             new EncounterStatic { Species = 800, Level = 75, Location = -01, Shiny = false, }, // Necrozma @ ???
-            new EncounterStatic { Species = 004, Level = 12, Location = -01, }, // Charmander @ ???
-            new EncounterStatic { Species = 007, Level = 12, Location = -01, }, // Squirtle @ ???
-            new EncounterStatic { Species = 095, Level = 14, Location = -01, }, // Onix @ ???
-            new EncounterStatic { Species = 116, Level = 18, Location = -01, }, // Horsea @ ???
-            new EncounterStatic { Species = 664, Level = 09, Location = -01, Form = 30, }, // Scatterbug @ ???
-            new EncounterStatic { Species = 001, Level = 10, Location = -01, }, // Bulbasaur @ ???
-            new EncounterStatic { Species = 607, Level = 09, Location = -01, }, // Litwick @ ???
-            new EncounterStatic { Species = 280, Level = 17, Location = -01, }, // Ralts @ ???
-            new EncounterStatic { Species = 363, Level = 19, Location = -01, }, // Spheal @ ???
-            new EncounterStatic { Species = 256, Level = 20, Location = -01, }, // Combusken @ ???
-            new EncounterStatic { Species = 679, Level = 24, Location = -01, }, // Honedge @ ???
-            new EncounterStatic { Species = 015, Level = 14, Location = -01, }, // Beedrill @ ???
-            new EncounterStatic { Species = 253, Level = 16, Location = 052, }, // Grovyle @ ???
-            new EncounterStatic { Species = 259, Level = 17, Location = -01, }, // Marshtomp @ ???
-            new EncounterStatic { Species = 111, Level = 32, Location = -01, }, // Rhyhorn @ ???
-            new EncounterStatic { Species = 220, Level = 33, Location = -01, }, // Swinub @ ???
-            new EncounterStatic { Species = 394, Level = 35, Location = -01, }, // Prinplup @ ???
-            new EncounterStatic { Species = 388, Level = 36, Location = -01, }, // Grotle @ ???
-            new EncounterStatic { Species = 388, Level = 36, Location = -01, }, // Grotle @ ???
-            new EncounterStatic { Species = 018, Level = 29, Location = -01, }, // Pidgeot @ ???
-            new EncounterStatic { Species = 391, Level = 29, Location = -01, }, // Monferno @ ???
-            new EncounterStatic { Species = 610, Level = 30, Location = -01, }, // Axew @ ???
-            new EncounterStatic { Species = 604, Level = 55, Location = -01, }, // Eelektross @ ???
-            new EncounterStatic { Species = 306, Level = 57, Location = -01, }, // Aggron @ ???
-            new EncounterStatic { Species = 479, Level = 61, Location = -01, }, // Rotom @ ???
-            new EncounterStatic { Species = 542, Level = 57, Location = -01, }, // Leavanny @ ???
-            new EncounterStatic { Species = 652, Level = 45, Location = -01, }, // Chesnaught @ ???
-            new EncounterStatic { Species = 658, Level = 44, Location = -01, }, // Greninja @ ???
-            new EncounterStatic { Species = 655, Level = 44, Location = -01, }, // Delphox @ ???
+
+            // QR Scan: Su/M/Tu/W/Th/F/Sa
+            // Melemele Island
+            new EncounterStatic { Species = 004, Level = 12, Location = 010, }, // Charmander @ Route 3
+            new EncounterStatic { Species = 007, Level = 12, Location = 042, }, // Squirtle @ Seaward Cave
+            new EncounterStatic { Species = 095, Level = 14, Location = 034, }, // Onix @ Ten Carat Hill
+            new EncounterStatic { Species = 116, Level = 18, Location = 014, }, // Horsea @ Kala'e Bay
+            new EncounterStatic { Species = 664, Level = 09, Location = 020, Form = 30, }, // Scatterbug @ Hau'oli City
+            new EncounterStatic { Species = 001, Level = 10, Location = 012, }, // Bulbasaur @ Route 2
+            new EncounterStatic { Species = 607, Level = 09, Location = 038, }, // Litwick @ Hau'oli Cemetery
+			
+            // Akala Island
+            new EncounterStatic { Species = 280, Level = 17, Location = 054, }, // Ralts @ Route 6
+            new EncounterStatic { Species = 363, Level = 19, Location = 056, }, // Spheal @ Route 7
+            new EncounterStatic { Species = 256, Level = 20, Location = 058, }, // Combusken @ Route 8
+            new EncounterStatic { Species = 679, Level = 24, Location = 094, }, // Honedge @ Akala Outskirts
+            new EncounterStatic { Species = 015, Level = 14, Location = 050, }, // Beedrill @ Route 4
+            new EncounterStatic { Species = 253, Level = 16, Location = 052, }, // Grovyle @ Route 5
+            new EncounterStatic { Species = 259, Level = 17, Location = 086, }, // Marshtomp @ Brooklet Hill
+			
+            // Ula'ula Island
+            new EncounterStatic { Species = 111, Level = 32, Location = 138, }, // Rhyhorn @ Blush Mountain
+            new EncounterStatic { Species = 220, Level = 33, Location = 114, }, // Swinub @ Tapu Village
+            new EncounterStatic { Species = 394, Level = 35, Location = 118, }, // Prinplup @ Route 16
+            new EncounterStatic { Species = 388, Level = 36, Location = 128, }, // Grotle @ Ula'ula Meadow
+            new EncounterStatic { Species = 018, Level = 29, Location = 106, }, // Pidgeot @ Route 10
+            new EncounterStatic { Species = 391, Level = 29, Location = 108, }, // Monferno @ Route 11
+            new EncounterStatic { Species = 610, Level = 30, Location = 136, }, // Axew @ Mount Hokulani
+			
+            // Poni Island
+            new EncounterStatic { Species = 604, Level = 55, Location = 164, }, // Eelektross @ Poni Grove
+            new EncounterStatic { Species = 306, Level = 57, Location = 166, }, // Aggron @ Poni Plains
+            new EncounterStatic { Species = 479, Level = 61, Location = 170, }, // Rotom @ Poni Gauntlet
+            new EncounterStatic { Species = 542, Level = 57, Location = 156, }, // Leavanny @ Poni Meadow
+            new EncounterStatic { Species = 652, Level = 45, Location = 184, }, // Chesnaught @ Exeggutor Island
+            new EncounterStatic { Species = 658, Level = 44, Location = 158, }, // Greninja @ Poni Wilds
+            new EncounterStatic { Species = 655, Level = 44, Location = 160, }, // Delphox @ Ancient Poni Path
+            
             new EncounterStatic { Species = 785, Level = 60, Location = -01, Shiny = false, }, // Tapu Koko @ ???
             new EncounterStatic { Species = 786, Level = 60, Location = -01, Shiny = false, }, // Tapu Lele @ ???
             new EncounterStatic { Species = 787, Level = 60, Location = -01, Shiny = false, }, // Tapu Bulu @ ???