From e83ed49eea5c5d9e7bf33f242d99f249f41a3a60 Mon Sep 17 00:00:00 2001 From: Kurt Date: Thu, 12 Jan 2017 18:29:44 -0800 Subject: [PATCH] Add gender-skin mismatch confirmation Closes #718 --- .../Subforms/Save Editors/Gen7/SAV_Trainer7.cs | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/PKHeX.WinForms/Subforms/Save Editors/Gen7/SAV_Trainer7.cs b/PKHeX.WinForms/Subforms/Save Editors/Gen7/SAV_Trainer7.cs index 8657c7652..63e857b3b 100644 --- a/PKHeX.WinForms/Subforms/Save Editors/Gen7/SAV_Trainer7.cs +++ b/PKHeX.WinForms/Subforms/Save Editors/Gen7/SAV_Trainer7.cs @@ -251,7 +251,15 @@ private void save() SAV.setTreeStreak((int)NUD_SMStreak1.Value, 1, super:true, max:true); SAV.setTreeStreak((int)NUD_SMStreak2.Value, 2, super:true, max:true); - SAV.DressUpSkinColor = CB_SkinColor.SelectedIndex; + // Skin changed && (gender matches || override) + int gender = CB_Gender.SelectedIndex & 1; + int skin = CB_SkinColor.SelectedIndex & 1; + string gStr = CB_Gender.Items[gender].ToString(); + string sStr = CB_Gender.Items[skin].ToString(); + + if (SAV.DressUpSkinColor != CB_SkinColor.SelectedIndex && + (SAV.Gender == skin || DialogResult.Yes != WinFormsUtil.Prompt(MessageBoxButtons.YesNo, $"Gender-Skin mismatch:\nGender: {gStr}, Skin: {sStr}", "Save selected Skin Color?"))) + SAV.DressUpSkinColor = CB_SkinColor.SelectedIndex; } private void clickOT(object sender, MouseEventArgs e)