From 7caeebd77231a22ea5953b4dd71481dced3d86ee Mon Sep 17 00:00:00 2001 From: Kurt Date: Sat, 4 Jan 2020 22:31:46 -0800 Subject: [PATCH] Add formcount for scatterbug/spewpa USUM had 20 for both, but XY/AO/SM had only 1 (vivillon had 20); make them consistent so that our generated evolution paths behave correctly Add meowstic specific evolution form modifier... so silly simpler to have it inlined with the sSpecies, for jit optimization could probably do this with silvally but meh, things work fine now Closes #2603 --- .../Legality/Evolutions/EvolutionTree.cs | 2 +- PKHeX.Core/Resources/byte/personal_ao | Bin 66080 -> 66080 bytes PKHeX.Core/Resources/byte/personal_sm | Bin 80724 -> 80724 bytes PKHeX.Core/Resources/byte/personal_xy | Bin 51136 -> 51136 bytes 4 files changed, 1 insertion(+), 1 deletion(-) diff --git a/PKHeX.Core/Legality/Evolutions/EvolutionTree.cs b/PKHeX.Core/Legality/Evolutions/EvolutionTree.cs index 93b0a2c09..3aecfcb0b 100644 --- a/PKHeX.Core/Legality/Evolutions/EvolutionTree.cs +++ b/PKHeX.Core/Legality/Evolutions/EvolutionTree.cs @@ -113,7 +113,7 @@ private EvolutionTree(IReadOnlyList data, GameVersion game, PersonalTabl if (dSpecies == 0) continue; - var dForm = sForm; + var dForm = sSpecies == (int)Species.Espurr && evo.Method == (int)EvolutionType.LevelUpFormFemale1 ? 1 : sForm; var key = GetLookupKey(dSpecies, dForm); var link = new EvolutionLink(sSpecies, sForm, evo); diff --git a/PKHeX.Core/Resources/byte/personal_ao b/PKHeX.Core/Resources/byte/personal_ao index c5a8b6c0c6973b4a73c4f7353e5f0149cd7a9d28..5263c9cbeb92bd15f4d1b8a691e5391eb91aac7a 100644 GIT binary patch delta 22 ecmZ3`!m^-+Wy6B=j3Sd4p7&=I+5GXmz7YU$E(yQ@ delta 22 ecmZ3`!m^-+Wy6B=jEs{Pp7&>D-2Cypz7YU!*a?~d diff --git a/PKHeX.Core/Resources/byte/personal_sm b/PKHeX.Core/Resources/byte/personal_sm index 57989e926fdf01978c8aba8152e170d6de994be8..a5b7a73fa01445ec7c95d8656e2fd37f2b277dc8 100644 GIT binary patch delta 35 rcmccejpfQWmIb#MMJ6-e3T78!@n(=?2$^hHFF(0}i*IwstuqM#{#*@* delta 35 rcmccejpfQWmIb#M87DK|3T9_y@n(=?2$^hHFF(0}i*IwstuqM#`tl87 diff --git a/PKHeX.Core/Resources/byte/personal_xy b/PKHeX.Core/Resources/byte/personal_xy index 8c826eb05bed0bf59731610ab57dccc84048ecaa..defb7168d5bfa4be68ef0ed800e0eb0ce4846ce9 100644 GIT binary patch delta 22 ecmX@m&wQYtd4s|-Mv=*i%j_9NHYYBNR|EiKy9gKn delta 22 ecmX@m&wQYtd4s|-M#jmC%j_8$HzzKOR|EiJWe4&A