Mirrors/PKHeX
2
0
Fork 0
mirror of https://github.com/kwsch/PKHeX synced 2025-02-17 13:58:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #5 from kwsch/master

Browse source 
Update from upstream repo kwsch/PKHeX
This commit is contained in:
ReignOfComputer 2017-01-31 23:13:35 +08:00 • committed by GitHub
commit 100ea25065
2 changed files with 1 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
PKHeX.WinForms/Subforms/Save Editors/Gen7/SAV_Trainer7.cs
View file

@ -392,7 +392,7 @@ namespace PKHeX.WinForms
{001, "Times Saved"},
{004, "Wild Pokémon Battles"},
{006, "Pokemon Caught"},
{006, "Pokemon Caught Fishing"},
{007, "Pokemon Caught Fishing"},
{008, "Eggs Hatched"},
{009, "Pokemon Evolved"},
{011, "Link Trades"},

10
PKHeX/Legality/Checks.cs
View file

@ -1156,16 +1156,6 @@ namespace PKHeX.Core
if (pkm.HT_Gender > 1)
return new CheckResult(Severity.Invalid, $"HT Gender invalid {pkm.HT_Gender}.", CheckIdentifier.History);
if (pkm.Format >= 7) // Cleared Values
{
if (pkm.EncounterType != 0)
return new CheckResult(Severity.Invalid, $"EncounterType invalid {pkm.EncounterType}.", CheckIdentifier.History);
if (pkm.Enjoyment != 0)
return new CheckResult(Severity.Invalid, $"Enjoyment invalid {pkm.Enjoyment}.", CheckIdentifier.History);
if (pkm.Fullness != 0)
return new CheckResult(Severity.Invalid, $"Fullness invalid {pkm.Fullness}.", CheckIdentifier.History);
}
MysteryGift mg = EncounterMatch as MysteryGift;
WC6 MatchedWC6 = EncounterMatch as WC6;