From dbdea7b875b740ef8c4cc67fa2f7f7d9395a462d Mon Sep 17 00:00:00 2001 From: Kurt Date: Sat, 6 Dec 2014 11:21:37 -0800 Subject: [PATCH] Fixed form based stats Aegislash/Kyurem base stat mixup, and added some more interaction with form toggling for gendered Pokemon like Meowstic --- Misc/PKX.cs | 4 ++-- PKX/f1-Main.cs | 9 +++++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Misc/PKX.cs b/Misc/PKX.cs index 9e36793fe..c32d1e8d5 100644 --- a/Misc/PKX.cs +++ b/Misc/PKX.cs @@ -679,7 +679,7 @@ namespace PKHeX table.Rows.Add(643, 4, 100, 120, 100, 150, 120, 90, 258); table.Rows.Add(644, 4, 100, 150, 120, 120, 100, 90, 258); table.Rows.Add(645, 4, 89, 125, 90, 115, 80, 101, 256); - table.Rows.Add(646, 4, 125, 170, 100, 120, 90, 95, 258); + table.Rows.Add(646, 4, 125, 130, 90, 130, 90, 95, 258); table.Rows.Add(647, 4, 91, 72, 90, 129, 90, 108, 258); table.Rows.Add(648, 4, 100, 77, 77, 128, 128, 90, 258); table.Rows.Add(649, 4, 71, 120, 95, 120, 95, 99, 258); @@ -714,7 +714,7 @@ namespace PKHeX table.Rows.Add(678, 2, 74, 48, 76, 83, 81, 104, 128); table.Rows.Add(679, 2, 45, 80, 100, 35, 37, 28, 128); table.Rows.Add(680, 2, 59, 110, 150, 45, 49, 35, 128); - table.Rows.Add(681, 2, 60, 150, 50, 150, 50, 60, 128); + table.Rows.Add(681, 2, 60, 50, 150, 50, 150, 60, 128); table.Rows.Add(682, 2, 78, 52, 60, 63, 65, 23, 128); table.Rows.Add(683, 2, 101, 72, 72, 99, 89, 29, 128); table.Rows.Add(684, 2, 62, 48, 66, 59, 57, 49, 128); diff --git a/PKX/f1-Main.cs b/PKX/f1-Main.cs index 123137471..2ec9edb0a 100644 --- a/PKX/f1-Main.cs +++ b/PKX/f1-Main.cs @@ -2238,6 +2238,11 @@ namespace PKHeX Label_Gender.Text = gendersymbols[1]; // ♀ else Label_Gender.Text = gendersymbols[0]; // ♂ + + if (PKX.getGender(CB_Form.Text) == 0 && Label_Gender.Text != gendersymbols[0]) + CB_Form.SelectedIndex = 1; + else if (PKX.getGender(CB_Form.Text) == 1 && Label_Gender.Text != gendersymbols[1]) + CB_Form.SelectedIndex = 0; } if (species == 668 || species == 592 || species == 593) @@ -3395,8 +3400,8 @@ namespace PKHeX else if ((form == 1) && (species == 641)) { HP_B = 79; ATK_B = 100; DEF_B = 80; SPA_B = 110; SPD_B = 90; SPE_B = 121; } else if ((form == 1) && (species == 642)) { HP_B = 79; ATK_B = 105; DEF_B = 70; SPA_B = 145; SPD_B = 80; SPE_B = 101; } else if ((form == 1) && (species == 645)) { HP_B = 89; ATK_B = 145; DEF_B = 90; SPA_B = 105; SPD_B = 80; SPE_B = 91; } - else if ((form == 1) && (species == 646)) { HP_B = 125; ATK_B = 170; DEF_B = 100; SPA_B = 120; SPD_B = 90; SPE_B = 95; } - else if ((form == 2) && (species == 646)) { HP_B = 125; ATK_B = 120; DEF_B = 90; SPA_B = 170; SPD_B = 100; SPE_B = 95; } + else if ((form == 1) && (species == 646)) { HP_B = 125; ATK_B = 120; DEF_B = 90; SPA_B = 170; SPD_B = 100; SPE_B = 95; } // white + else if ((form == 2) && (species == 646)) { HP_B = 125; ATK_B = 170; DEF_B = 100; SPA_B = 120; SPD_B = 90; SPE_B = 95; } // black else if ((form == 1) && (species == 648)) { HP_B = 100; ATK_B = 128; DEF_B = 90; SPA_B = 77; SPD_B = 77; SPE_B = 128; } else if ((form == 5) && (species == 670)) { HP_B = 74; ATK_B = 65; DEF_B = 67; SPA_B = 125; SPD_B = 128; SPE_B = 92; } else if ((form == 1) && (species == 681)) { HP_B = 60; ATK_B = 150; DEF_B = 50; SPA_B = 150; SPD_B = 50; SPE_B = 60; }