From dcdeb361f08fdfe210037623f96160a5e4ff882a Mon Sep 17 00:00:00 2001 From: Kurt Date: Wed, 6 Jun 2018 16:22:14 -0700 Subject: [PATCH] Handle meowstic formes Closes #1984 --- PKHeX.Core/Editing/ShowdownSet.cs | 3 --- PKHeX.Core/Legality/Checks.cs | 4 ++++ .../678-01 ★ - Meowstic - 01873505869C.pk7 | Bin 0 -> 232 bytes 3 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 Tests/PKHeX.Tests/Legality/Illegal/AltForm/678-01 ★ - Meowstic - 01873505869C.pk7 diff --git a/PKHeX.Core/Editing/ShowdownSet.cs b/PKHeX.Core/Editing/ShowdownSet.cs index 13ed55253..fe63be407 100644 --- a/PKHeX.Core/Editing/ShowdownSet.cs +++ b/PKHeX.Core/Editing/ShowdownSet.cs @@ -282,9 +282,6 @@ public ShowdownSet(PKM pkm) string[] Forms = PKX.GetFormList(Species, types, forms, genderForms, pkm.Format); Form = pkm.AltForm > 0 && pkm.AltForm < Forms.Length ? Forms[pkm.AltForm] : string.Empty; Format = pkm.Format; - - if (Form == "F") - Gender = string.Empty; } private void ParseFirstLine(string line) { diff --git a/PKHeX.Core/Legality/Checks.cs b/PKHeX.Core/Legality/Checks.cs index 79fe1752f..363db6d9b 100644 --- a/PKHeX.Core/Legality/Checks.cs +++ b/PKHeX.Core/Legality/Checks.cs @@ -2214,6 +2214,10 @@ bool IsValidPikachuCap() return; } break; + case 678: // Meowstic + if (pkm.AltForm != pkm.Gender) + AddLine(Severity.Invalid, V203, CheckIdentifier.Form); + break; case 773: // Silvally { int item = pkm.HeldItem; diff --git a/Tests/PKHeX.Tests/Legality/Illegal/AltForm/678-01 ★ - Meowstic - 01873505869C.pk7 b/Tests/PKHeX.Tests/Legality/Illegal/AltForm/678-01 ★ - Meowstic - 01873505869C.pk7 new file mode 100644 index 0000000000000000000000000000000000000000..4972082f259c4a5a44d9e7cc1e95916c0b4695a8 GIT binary patch literal 232 zcmbQ!#%jvI(9XDw$%=77G<&;)6F**a06e4REB(pa)x4t z5{68MWF&?CjByMujNcg~1SBMwfq;ua8!9XR=fAxpLlA>Ag9nm&IFk|10yF+IFtV`1 pg&Y}*fVN}+?J9wbK^Xrbln@&m5HTdZGGbt1WKa}hW@G|M008(!8C(DW literal 0 HcmV?d00001