diff --git a/PKX/f1-Main.cs b/PKX/f1-Main.cs index 9d12166c8..b1cdf3a97 100644 --- a/PKX/f1-Main.cs +++ b/PKX/f1-Main.cs @@ -441,6 +441,8 @@ private void clickShowdownImportPK6(object sender, EventArgs e) BTN_RerollPID.PerformClick(); BTN_RerollEC.PerformClick(); if (Set.Shiny) BTN_Shinytize.PerformClick(); + pk6 = preparepkx(); + updateLegality(); } private void clickShowdownExportPK6(object sender, EventArgs e) { @@ -2151,16 +2153,15 @@ private void showLegality(PK6 pk, bool tabs) { LegalityAnalysis la = new LegalityAnalysis(pk); Util.Alert(la.Report); // temp - PB_Legal.Visible = pk.Gen6; if (tabs) - PB_Legal.Image = Legality.Valid ? Properties.Resources.valid : Properties.Resources.warn; + updateLegality(la); } - private void updateLegality() + private void updateLegality(LegalityAnalysis la = null) { if (!fieldsLoaded) return; - Legality = new LegalityAnalysis(pk6); + Legality = la ?? new LegalityAnalysis(pk6); PB_Legal.Image = Legality.Valid ? Properties.Resources.valid : Properties.Resources.warn; PB_Legal.Visible = pk6.Gen6;