From 596ff57fc384d00e88f507401703c7950f001c1b Mon Sep 17 00:00:00 2001 From: ReignOfComputer Date: Sun, 12 Nov 2017 18:28:39 +0800 Subject: [PATCH 1/4] Add Extra Zygarde Cell Locations Wela Volcano Park (rocks behind sign) Battle Tree Entrance --- PKHeX.WinForms/Subforms/Save Editors/Gen7/SAV_ZygardeCell.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PKHeX.WinForms/Subforms/Save Editors/Gen7/SAV_ZygardeCell.cs b/PKHeX.WinForms/Subforms/Save Editors/Gen7/SAV_ZygardeCell.cs index 2b3b5d059..9c0e86c47 100644 --- a/PKHeX.WinForms/Subforms/Save Editors/Gen7/SAV_ZygardeCell.cs +++ b/PKHeX.WinForms/Subforms/Save Editors/Gen7/SAV_ZygardeCell.cs @@ -247,7 +247,7 @@ private void B_GiveAll_Click(object sender, EventArgs e) "Konikoni City Restaurant 1F", "Iki Town SouthWest", "Hau'oli City (Shopping) Ilima's House SwimPool", - "*** researching No.53", + "Wela Volcano Park (rocks behind sign)", "Route 5 South of PokemonCenter", "*** researching No.55", "Malie City (Outer) RecyclePlant Outside", @@ -294,7 +294,7 @@ private void B_GiveAll_Click(object sender, EventArgs e) "Ancient Poni Path Hapu's House Courtyard", "Ancient Poni Path Hapu's House Outside behind Well", "Ancient Poni Path NorthEast", - "*** researching No.100", + "Battle Tree Entrance", }; #endregion From f1e7c0f759e10cda3860124e914a74dddc652e02 Mon Sep 17 00:00:00 2001 From: ReignOfComputer Date: Sun, 12 Nov 2017 18:33:06 +0800 Subject: [PATCH 2/4] Hypno Trio Encounter at Hau'oli City PD --- PKHeX.Core/Legality/Encounters/Data/Encounters7.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/PKHeX.Core/Legality/Encounters/Data/Encounters7.cs b/PKHeX.Core/Legality/Encounters/Data/Encounters7.cs index 46b861e5b..5e23506bf 100644 --- a/PKHeX.Core/Legality/Encounters/Data/Encounters7.cs +++ b/PKHeX.Core/Legality/Encounters/Data/Encounters7.cs @@ -362,9 +362,9 @@ private static void MarkG7SMSlots(ref EncounterArea[] Areas) new EncounterStatic { Species = 020, Level = 60, Location = -01, Shiny = false, IVs = new[] {31,31,31,31,31,31}, Relearn = new[] {158,675,182,104}, Form = 2, Gender = 0, HeldItem = 189, }, // Raticate @ ??? new EncounterStatic { Species = 019, Level = 58, Location = -01, Shiny = false, IVs = new[] {31,31,31,00,31,31}, Relearn = new[] {162,039,259,242}, Form = 1, }, // Rattata @ ??? new EncounterStatic { Species = 760, Level = 28, Location = -01, Shiny = false, }, // Bewear @ ??? - new EncounterStatic { Species = 097, Level = 29, Location = -01, Shiny = false, Relearn = new[] {095,171,139,029}, }, // Hypno @ ??? - new EncounterStatic { Species = 097, Level = 29, Location = -01, Shiny = false, Relearn = new[] {417,060,050,139}, }, // Hypno @ ??? - new EncounterStatic { Species = 097, Level = 29, Location = -01, Shiny = false, Relearn = new[] {093,050,001,096}, }, // Hypno @ ??? + new EncounterStatic { Species = 097, Level = 29, Location = 020, Shiny = false, Relearn = new[] {095,171,139,029}, }, // Hypno @ Hau'oli City Police Station + new EncounterStatic { Species = 097, Level = 29, Location = 020, Shiny = false, Relearn = new[] {417,060,050,139}, }, // Hypno @ Hau'oli City Police Station + new EncounterStatic { Species = 097, Level = 29, Location = 020, Shiny = false, Relearn = new[] {093,050,001,096}, }, // Hypno @ Hau'oli City Police Station new EncounterStatic { Species = 092, Level = 19, Location = -01, Shiny = false, Relearn = new[] {174,109,122,101}, }, // Gastly @ ??? new EncounterStatic { Species = 425, Level = 19, Location = -01, Shiny = false, Relearn = new[] {310,132,016,371}, }, // Drifloon @ ??? new EncounterStatic { Species = 769, Level = 30, Location = 116, Shiny = false, Relearn = new[] {310,523,072,328}, }, // Sandygast @ Route 15 From 0b95f7d4b8ae1ad7f1ae145fa799e5a8ee0bbc7f Mon Sep 17 00:00:00 2001 From: ReignOfComputer Date: Sun, 12 Nov 2017 22:29:21 +0800 Subject: [PATCH 3/4] Porygon/Zygarde/Trainer School Encounters --- PKHeX.Core/Legality/Encounters/Data/Encounters7.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/PKHeX.Core/Legality/Encounters/Data/Encounters7.cs b/PKHeX.Core/Legality/Encounters/Data/Encounters7.cs index 5e23506bf..c4dc9b076 100644 --- a/PKHeX.Core/Legality/Encounters/Data/Encounters7.cs +++ b/PKHeX.Core/Legality/Encounters/Data/Encounters7.cs @@ -183,7 +183,7 @@ private static void MarkG7SMSlots(ref EncounterArea[] Areas) 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 = 137, Level = 30, Location = 116, }, // Porygon @ Route 15 new EncounterStatic { Gift = true, Species = 772, Level = 60, Location = 188, IV3 = true, }, // Type: Null @ Aether Paradise new EncounterStatic { Gift = true, Species = 772, Level = 60, Location = 160, IV3 = true, }, // Type: Null @ Ancient Poni Path new EncounterStatic { Gift = true, Species = 801, Level = 50, Location = -01, IV3 = true, Shiny = false, Ability = 2, HeldItem = 795, }, // Magearna @ ??? @@ -206,7 +206,7 @@ private static void MarkG7SMSlots(ref EncounterArea[] Areas) new EncounterStatic { Gift = true, Species = 743, Level = 50, Ability = 4, Location = 202, Form = 1, Shiny = false, IV3 = true, Version = GameVersion.US }, // Ribombee new EncounterStatic { Gift = true, Species = 784, Level = 50, Ability = 4, Location = 202, Form = 1, Shiny = false, IV3 = true, Version = GameVersion.UM }, // Kommo-o - new EncounterStatic { Gift = true, Species = 718, Level = 63, Ability = 1, Location = 118, Form = 1, Shiny = false, IV3 = true, }, // Zygarde @ ??? + new EncounterStatic { Gift = true, Species = 718, Level = 63, Ability = 1, Location = 118, Form = 1, Shiny = false, IV3 = true, }, // Zygarde @ Route 16 new EncounterStatic // Pikachu (Pikashunium Z), should probably be a fake mystery gift as it has OT details { @@ -365,8 +365,8 @@ private static void MarkG7SMSlots(ref EncounterArea[] Areas) new EncounterStatic { Species = 097, Level = 29, Location = 020, Shiny = false, Relearn = new[] {095,171,139,029}, }, // Hypno @ Hau'oli City Police Station new EncounterStatic { Species = 097, Level = 29, Location = 020, Shiny = false, Relearn = new[] {417,060,050,139}, }, // Hypno @ Hau'oli City Police Station new EncounterStatic { Species = 097, Level = 29, Location = 020, Shiny = false, Relearn = new[] {093,050,001,096}, }, // Hypno @ Hau'oli City Police Station - new EncounterStatic { Species = 092, Level = 19, Location = -01, Shiny = false, Relearn = new[] {174,109,122,101}, }, // Gastly @ ??? - new EncounterStatic { Species = 425, Level = 19, Location = -01, Shiny = false, Relearn = new[] {310,132,016,371}, }, // Drifloon @ ??? + new EncounterStatic { Species = 092, Level = 19, Location = 230, Shiny = false, Relearn = new[] {174,109,122,101}, }, // Gastly @ Route 1 (Trainers’ School) + new EncounterStatic { Species = 425, Level = 19, Location = 230, Shiny = false, Relearn = new[] {310,132,016,371}, }, // Drifloon @ Route 1 (Trainers’ School) new EncounterStatic { Species = 769, Level = 30, Location = 116, Shiny = false, Relearn = new[] {310,523,072,328}, }, // Sandygast @ Route 15 new EncounterStatic { Species = 592, Level = 34, Location = 126, Shiny = false, Gender = 1, }, // Frillish @ Route 14 new EncounterStatic { Species = 132, Level = 29, Location = 060, IVs = new[] {-1,-1,31,30,-1,00}, }, // Ditto @ Route 9 From 69bdcacaec62e02d669788e9b94a4d7e2bc373c6 Mon Sep 17 00:00:00 2001 From: ReignOfComputer Date: Sun, 12 Nov 2017 22:29:44 +0800 Subject: [PATCH 4/4] Additional Totem Sticker Locations 1 left. --- PKHeX.WinForms/Subforms/Save Editors/Gen7/SAV_ZygardeCell.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PKHeX.WinForms/Subforms/Save Editors/Gen7/SAV_ZygardeCell.cs b/PKHeX.WinForms/Subforms/Save Editors/Gen7/SAV_ZygardeCell.cs index 9c0e86c47..c971588e6 100644 --- a/PKHeX.WinForms/Subforms/Save Editors/Gen7/SAV_ZygardeCell.cs +++ b/PKHeX.WinForms/Subforms/Save Editors/Gen7/SAV_ZygardeCell.cs @@ -249,7 +249,7 @@ private void B_GiveAll_Click(object sender, EventArgs e) "Hau'oli City (Shopping) Ilima's House SwimPool", "Wela Volcano Park (rocks behind sign)", "Route 5 South of PokemonCenter", - "*** researching No.55", + "Hano Beach (below Sandygast)", "Malie City (Outer) RecyclePlant Outside", "Malie City FerryTerminal Outside", "Malie City ApparelShop Outside", @@ -269,7 +269,7 @@ private void B_GiveAll_Click(object sender, EventArgs e) "Route 17 PoliceStation Outside", "Route 17 PoliceStation", "Po Town PokemonCenter Outside", - "*** researching No.75", + "Exeggutor Island (under rock)", "Po Town ShadyHouse Outside (East)", "Po Town PokemonCenter", "Po Town ShadyHouse 1F",