Leahnaya/PKHeX
1
0
Fork 0
mirror of https://github.com/kwsch/PKHeX.git synced 2026-08-28 10:27:03 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Skip spiky eared pichu pidiv verification

Browse Source 
Closes #1199
This commit is contained in:
Kurt
2017-06-09 21:30:17 -07:00
parent 0b0020aa6d
commit 6ca2cb16dc
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
PKHeX.Core/Legality/RNG/MethodFinder.cs
View File

@@ -539,6 +539,8 @@ public static bool IsCompatible4(this PIDType val, IEncounterable encounter)
switch (encounter)
{
case EncounterStatic s:
if (s == Legal.SpikyEaredPichu) // nonshiny forced nature, undocumented
return val == PIDType.None;
return s.Shiny == true ? val == PIDType.ChainShiny : val == PIDType.Method_1;
case EncounterSlot _:
return val == PIDType.Method_1;

9
PKHeX.Core/Legality/Tables4.cs
View File

@@ -675,6 +675,13 @@ public static partial class Legal
new EncounterStaticTyped { Species = 380, Level = 35, Version = GameVersion.HG, Roaming = true, TypeEncounter = EncounterType.Surfing_Fishing, }, //Latias
new EncounterStaticTyped { Species = 381, Level = 35, Version = GameVersion.SS, Roaming = true, TypeEncounter = EncounterType.Surfing_Fishing, }, //Latios
};
internal static readonly EncounterStatic SpikyEaredPichu = new EncounterStaticTyped // Spiky-Eared Pichu @ Ilex Forest
{
Species = 172, Level = 30, Gender = 1, Form = 1,
Location = 214, Moves = new[] {344, 270, 207, 220},
TypeEncounter = EncounterType.Starter_Fossil_Gift_Pt_DPTrio,
Shiny = false
};
internal static readonly EncounterStatic[] Encounter_HGSS_Regular =
{
//Starters
@@ -724,7 +731,7 @@ public static partial class Legal
new EncounterStatic { Species = 143, Level = 50, Location = 159, }, //Snorlax @ Route 11
new EncounterStatic { Species = 143, Level = 50, Location = 160, }, //Snorlax @ Route 12
new EncounterStatic { Species = 185, Level = 20, Location = 184, }, //Sudowoodo @ Route 36, Encounter does not have type
new EncounterStaticTyped { Species = 172, Level = 30, Location = 214, Gender = 1, Form = 1, Moves = new[]{344,270,207,220}, TypeEncounter = EncounterType.Starter_Fossil_Gift_Pt_DPTrio, Shiny = false }, //Spiky-eared Pichu @ Ilex forest
SpikyEaredPichu,
//Stationary Lengerdary
new EncounterStaticTyped { Species = 144, Level = 50, Location = 203, TypeEncounter = EncounterType.Cave_HallOfOrigin }, //Articuno @ Seafoam Islands
new EncounterStatic { Species = 145, Level = 50, Location = 158, }, //Zapdos @ Route 10