Merge pull request #7 from kwsch/master

Update from upstream repo kwsch/PKHeX
This commit is contained in:
pokecal
2017-02-26 11:17:11 +09:00
committed by GitHub

View File

@@ -2292,7 +2292,10 @@ private void updateForm(object sender, EventArgs e)
}
}
else if (PKX.getGender(CB_Form.Text) < 2)
Label_Gender.Text = CB_Form.Text;
{
if (CB_Form.Items.Count == 2) // actually M/F; Pumpkaboo formes in German are S,M,L,XL
Label_Gender.Text = gendersymbols[PKX.getGender(CB_Form.Text)];
}
if (changingFields)
return;
@@ -2921,7 +2924,7 @@ private void updateLegality(LegalityAnalysis la = null, bool skipMoveRepop = fal
private void updateGender()
{
int cg = Array.IndexOf(gendersymbols, Label_Gender.Text);
int cg = PKX.getGender(Label_Gender.Text);
int gt = SAV.Personal.getFormeEntry(WinFormsUtil.getIndex(CB_Species), CB_Form.SelectedIndex).Gender;
int Gender;