Leahnaya/PKHeX
1
0
Fork 0
mirror of https://github.com/kwsch/PKHeX.git synced 2026-09-09 19:06:30 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1591 from ReignOfComputer/master

Browse Source 
Add Extra Totem Stickers Locations & Encounters
This commit is contained in:
Kurt
2017-11-12 07:33:08 -08:00
committed by GitHub
parent 6a73b9e6e4 69bdcacaec
commit d11b6b09ae
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
PKHeX.Core/Legality/Encounters/Data/Encounters7.cs
View File

@@ -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
{
@@ -362,11 +362,11 @@ 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 = 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 = 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 = 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

8
PKHeX.WinForms/Subforms/Save Editors/Gen7/SAV_ZygardeCell.cs
View File

@@ -247,9 +247,9 @@ 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",
"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",
@@ -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