diff --git a/PKHeX.Core/Editing/ShowdownSet.cs b/PKHeX.Core/Editing/ShowdownSet.cs index 57cba932a..e5999e406 100644 --- a/PKHeX.Core/Editing/ShowdownSet.cs +++ b/PKHeX.Core/Editing/ShowdownSet.cs @@ -258,7 +258,10 @@ public static string GetShowdownText(PKM pkm) { if (pkm.Species == 0) return string.Empty; - + return new ShowdownSet(pkm).Text; + } + public ShowdownSet(PKM pkm) + { string[] Forms = PKX.GetFormList(pkm.Species, types, forms, genderForms, pkm.Format); ShowdownSet Set = new ShowdownSet { @@ -281,8 +284,6 @@ public static string GetShowdownText(PKM pkm) if (Set.Form == "F") Set.Gender = string.Empty; - - return Set.Text; } private void ParseFirstLine(string line) { diff --git a/PKHeX.WinForms/Controls/SAV Editor/SlotChangeManager.cs b/PKHeX.WinForms/Controls/SAV Editor/SlotChangeManager.cs index 30292bdf1..27f569228 100644 --- a/PKHeX.WinForms/Controls/SAV Editor/SlotChangeManager.cs +++ b/PKHeX.WinForms/Controls/SAV Editor/SlotChangeManager.cs @@ -170,7 +170,12 @@ private void ShowSimulatorSetTooltip(Control pb, PKM pk) if (pk.Species == 0) ShowSet.RemoveAll(); else - ShowSet.SetToolTip(pb, ShowdownSet.GetShowdownText(pk)); + { + var set = new ShowdownSet(pk); + if (pk.Format <= 2) // Nature preview from IVs + set.Nature = (int)(pk.EXP % 25); + ShowSet.SetToolTip(pb, set.Text); + } } private void PlayCry(PKM pk) {