Leahnaya/PKHeX
1
0
Fork 0
mirror of https://github.com/kwsch/PKHeX.git synced 2026-10-01 08:16:38 -05:00
Code Issues Actions Packages Projects Releases 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
parent c58c5ff904 3eb8575732
commit 100ea25065
2 changed files with 1 additions and 11 deletions
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 @@ private void changeStatVal(object sender, EventArgs e)
{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 @@ private CheckResult verifyHistory()
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;