From 3213db3020942fc57ebd0f4a05915c2c5016bba2 Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Sat, 30 Apr 2016 14:43:47 -0700 Subject: [PATCH] Keep gender when changing species Only do gender detection if it's from previous games --- PKX/f1-Main.cs | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/PKX/f1-Main.cs b/PKX/f1-Main.cs index 5434a8c49..e03f828f1 100644 --- a/PKX/f1-Main.cs +++ b/PKX/f1-Main.cs @@ -1828,18 +1828,17 @@ private void updateSpecies(object sender, EventArgs e) // Check for Gender Changes // Get Gender Threshold int gt = PKX.Personal[Species].Gender; - int genderflag; if (gt == 255) // Genderless - genderflag = 2; + Gender = 2; else if (gt == 254) // Female Only - genderflag = 1; - else if (gt == 0) // Male Only - genderflag = 0; - else // get gender from old PID correlation - genderflag = (Util.getHEXval(TB_PID.Text) & 0xFF) <= gt ? 1 : 0; - - int Gender = genderflag; + Gender = 1; + else if (gt == 0) // Male Only + Gender = 0; + Gender = (Util.getHEXval(TB_PID.Text) & 0xFF) <= gt ? 1 : 0; + else + Gender = cg; + Label_Gender.Text = gendersymbols[Gender]; Label_Gender.ForeColor = Gender == 2 ? Label_Species.ForeColor : (Gender == 1 ? Color.Red : Color.Blue); setAbilityList(TB_AbilityNumber, Species, CB_Ability, CB_Form);