diff --git a/PKHeX.WinForms/MainWindow/Main.cs b/PKHeX.WinForms/MainWindow/Main.cs index eca5532d1..92a1f60a0 100644 --- a/PKHeX.WinForms/MainWindow/Main.cs +++ b/PKHeX.WinForms/MainWindow/Main.cs @@ -1060,9 +1060,6 @@ private void openSAV(SaveFile sav, string path) FLP_PKRS.Visible = FLP_EggPKRSRight.Visible = SAV.Generation >= 2; Label_OTGender.Visible = SAV.Generation >= 2; - if (SAV.Generation == 1) - Label_IsShiny.Visible = false; - if (SAV.Version == GameVersion.BATREV) { L_SaveSlot.Visible = CB_SaveSlot.Visible = true; @@ -1581,8 +1578,8 @@ private void setIsShiny(object sender) bool isShiny = pkm.IsShiny; // Set the Controls - BTN_Shinytize.Visible = BTN_Shinytize.Enabled = !isShiny && SAV.Generation > 1; - Label_IsShiny.Visible = isShiny && SAV.Generation > 1; + BTN_Shinytize.Visible = BTN_Shinytize.Enabled = !isShiny; + Label_IsShiny.Visible = isShiny; // Refresh Markings (for Shiny Star if applicable) setMarkings(); @@ -2064,9 +2061,9 @@ private void updateIVs(object sender, EventArgs e) : (pkm.Gender == 1 ? Color.Red : Color.Blue); if (pkm.Species == 201 && e != null) // Unown CB_Form.SelectedIndex = pkm.AltForm; - setIsShiny(null); - getQuickFiller(dragout); } + setIsShiny(null); + getQuickFiller(dragout); } CB_HPType.SelectedValue = pkm.HPType; diff --git a/PKHeX/PKM/PK1.cs b/PKHeX/PKM/PK1.cs index 8e1433e93..105f6779b 100644 --- a/PKHeX/PKM/PK1.cs +++ b/PKHeX/PKM/PK1.cs @@ -231,8 +231,8 @@ public override bool CanHoldItem(ushort[] ValidArray) return false; } + public override bool IsShiny => IV_DEF == 10 && IV_SPE == 10 && IV_SPC == 10 && (IV_ATK & 2) == 2; public override ushort Sanity { get { return 0; } set { } } - public override bool ChecksumValid => true; public override ushort Checksum { get { return 0; } set { } } public override int Language { get { return 0; } set { } }