From 24c541eeefec2d33a2fd0dd9768229671b1377c5 Mon Sep 17 00:00:00 2001 From: Kurt Date: Tue, 13 Nov 2018 19:19:20 -0800 Subject: [PATCH] Get savefile-context sensitive pkm Generating a IEncounterable -> SAV for pb7 can't start with pk7 --- PKHeX.Core/Legality/Encounters/EncounterEgg.cs | 2 +- PKHeX.Core/Legality/Encounters/EncounterSlot.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/PKHeX.Core/Legality/Encounters/EncounterEgg.cs b/PKHeX.Core/Legality/Encounters/EncounterEgg.cs index ab0b2a620..9fc769a7a 100644 --- a/PKHeX.Core/Legality/Encounters/EncounterEgg.cs +++ b/PKHeX.Core/Legality/Encounters/EncounterEgg.cs @@ -25,7 +25,7 @@ public PKM ConvertToPKM(ITrainerInfo SAV) gen = 2; Version = GameVersion.C; } - var pk = PKMConverter.GetBlank(gen); + var pk = PKMConverter.GetBlank(SAV); SAV.ApplyToPKM(pk); pk.Species = Species; diff --git a/PKHeX.Core/Legality/Encounters/EncounterSlot.cs b/PKHeX.Core/Legality/Encounters/EncounterSlot.cs index e2b309b2a..5b181e597 100644 --- a/PKHeX.Core/Legality/Encounters/EncounterSlot.cs +++ b/PKHeX.Core/Legality/Encounters/EncounterSlot.cs @@ -70,7 +70,7 @@ public PKM ConvertToPKM(ITrainerInfo SAV) var version = this.GetCompatibleVersion((GameVersion)SAV.Game); int lang = (int)Legal.GetSafeLanguage(Generation, (LanguageID)SAV.Language); int level = LevelMin; - var pk = PKMConverter.GetBlank(Generation); + var pk = PKMConverter.GetBlank(SAV); int nature = Util.Rand.Next(25); SAV.ApplyToPKM(pk);