diff --git a/PKX/f1-Main.cs b/PKX/f1-Main.cs index 40cd6bc84..a44ca5154 100644 --- a/PKX/f1-Main.cs +++ b/PKX/f1-Main.cs @@ -1245,26 +1245,26 @@ public void setForms(int species, ComboBox cb) // ORAS 015, 018, 080, 208, 254, 260, 302, 319, 323, 334, 362, 373, 376, 384, 428, 475, 531, 719, }; - if (Array.IndexOf(mspec, species) > -1) { + if (Array.IndexOf(mspec, species) > -1) { // ... form_list = new[] { new { Text = types[0], Value = 0}, // Normal new { Text = forms[723], Value = 1}, // Mega };} // MegaXY List - else if ((species == 6) || (species == 150)) { + else if ((species == 6) || (species == 150)) { // ... form_list = new[] { new { Text = types[000], Value = 0}, // Normal new { Text = forms[724], Value = 1}, // Mega X new { Text = forms[725], Value = 2}, // Mega Y };} // Gender List - else if ((species == 592) || (species == 593) || (species == 678)) { + else if ((species == 592) || (species == 593) || (species == 678)) { // Frillish, Jellicent, Meowstic form_list = new[] { new { Text = gendersymbols[0], Value = 0 }, // Male new { Text = gendersymbols[1], Value = 1 }, // Female };} // Regular Form List - else if (species == 025) { + else if (species == 025) { // Pikachu form_list = new[] { new { Text = types[000], Value = 0}, // Normal new { Text = forms[729], Value = 1}, // Rockstar @@ -1274,7 +1274,7 @@ public void setForms(int species, ComboBox cb) new { Text = forms[733], Value = 5}, // Libre new { Text = forms[734], Value = 6}, // Cosplay };} - else if (species == 201) { + else if (species == 201) { // Unown form_list = new[] { new { Text = "A", Value = 0 }, new { Text = "B", Value = 1 }, @@ -1305,42 +1305,42 @@ public void setForms(int species, ComboBox cb) new { Text = "!", Value = 26 }, new { Text = "?", Value = 27 }, };} - else if (species == 351) { + else if (species == 351) { // Castform form_list = new[] { new { Text = types[0], Value = 0 }, // Normal new { Text = forms[789], Value = 1 }, // Sunny new { Text = forms[790], Value = 2 }, // Rainy new { Text = forms[791], Value = 3 }, // Snowy };} - else if (species == 382 || species == 383) { + else if (species == 382 || species == 383) { // Kyogre/Groudon form_list = new[] { new { Text = types[0], Value = 0}, // Normal new { Text = forms[800], Value = 1}, // Primal };} - else if (species == 386) { + else if (species == 386) { // Deoxys form_list = new[] { new { Text = types[0], Value = 0 }, // Normal new { Text = forms[802], Value = 1 }, // Attack new { Text = forms[803], Value = 2 }, // Defense new { Text = forms[804], Value = 3 }, // Speed };} - else if ((species == 412) || (species == 413)) { + else if ((species == 412) || (species == 413)) { // Wormadam form_list = new[] { new { Text = forms[412], Value = 0 }, // Plant new { Text = forms[805], Value = 1 }, // Sandy new { Text = forms[806], Value = 2 }, // Trash };} - else if (species == 421) { + else if (species == 421) { // Cherrim form_list = new[] { new { Text = forms[421], Value = 0 }, // Overcast new { Text = forms[809], Value = 1 }, // Sunshine };} - else if ((species == 422) || (species == 423)) { + else if ((species == 422) || (species == 423)) { // Shellos/Gastrodon form_list = new[] { new { Text = forms[422], Value = 0 }, // West new { Text = forms[811], Value = 1 }, // East };} - else if (species == 479) { + else if (species == 479) { // Rotom form_list = new[] { new { Text = types[0], Value = 0 }, // Normal new { Text = forms[817], Value = 1 }, // Heat @@ -1349,17 +1349,17 @@ public void setForms(int species, ComboBox cb) new { Text = forms[820], Value = 4 }, // Fan new { Text = forms[821], Value = 5 }, // Mow };} - else if (species == 487) { + else if (species == 487) { // Giratina form_list = new[] { new { Text = forms[487], Value = 0 }, // Altered new { Text = forms[822], Value = 1 }, // Origin };} - else if (species == 492) { + else if (species == 492) { // Shaymin form_list = new[] { new { Text = forms[492], Value = 0 }, // Land new { Text = forms[823], Value = 1 }, // Sky };} - else if (species == 493) { + else if (species == 493) { // Arceus form_list = new[] { new { Text = types[0], Value = 0 }, // Normal new { Text = types[1], Value = 1 }, // Fighting @@ -1380,45 +1380,45 @@ public void setForms(int species, ComboBox cb) new { Text = types[16], Value = 16 }, new { Text = types[17], Value = 17 }, };} - else if (species == 550) - { form_list = new[] { + else if (species == 550) { // Basculin + form_list = new[] { new { Text = forms[550], Value = 0 }, // Red new { Text = forms[842], Value = 1 }, // Blue };} - else if (species == 555) { + else if (species == 555) { // Darmanitan form_list = new[] { new { Text = forms[555], Value = 0 }, // Standard new { Text = forms[843], Value = 1 }, // Zen };} - else if ((species == 585) || (species == 586)) { + else if ((species == 585) || (species == 586)) { // Deerling/Sawsbuck form_list = new[] { new { Text = forms[585], Value = 0 }, // Spring new { Text = forms[844], Value = 1 }, // Summer new { Text = forms[845], Value = 2 }, // Autumn new { Text = forms[846], Value = 3 }, // Winter };} - else if ((species == 641) || (species == 642) || (species == 645)) { + else if ((species == 641) || (species == 642) || (species == 645)) { // Genies form_list = new[] { new { Text = forms[641], Value = 0 }, // Incarnate new { Text = forms[852], Value = 1 }, // Therian };} - else if (species == 646) { + else if (species == 646) { // Kyurem form_list = new[] { new { Text = types[0], Value = 0 }, // Normal new { Text = forms[853], Value = 1 }, // White new { Text = forms[854], Value = 2 }, // Black };} - else if (species == 647) { + else if (species == 647) { // Keldeo form_list = new[] { new { Text = forms[647], Value = 0 }, // Ordinary new { Text = forms[855], Value = 1 }, // Resolute };} - else if (species == 648) { + else if (species == 648) { // Meloetta form_list = new[] { new { Text = forms[648], Value = 0 }, // Aria new { Text = forms[856], Value = 1 }, // Pirouette };} - else if (species == 649) { + else if (species == 649) { // Genesect form_list = new[] { new { Text = types[0], Value = 0 }, // Normal new { Text = types[10], Value = 1 }, // Douse @@ -1426,7 +1426,7 @@ public void setForms(int species, ComboBox cb) new { Text = types[9], Value = 3 }, // Burn new { Text = types[14], Value = 4 }, // Chill };} - else if ((species == 664) || (species == 665) || (species == 666)) { + else if ((species == 664) || (species == 665) || (species == 666)) { // Vivillon + prevos form_list = new[] { new { Text = forms[666], Value = 0 }, // Icy Snow new { Text = forms[861], Value = 1 }, // Polar @@ -1449,7 +1449,7 @@ public void setForms(int species, ComboBox cb) new { Text = forms[878], Value = 18 }, // Fancy new { Text = forms[879], Value = 19 }, // Poké Ball };} - else if ((species == 669) || (species == 671)) { + else if ((species == 669) || (species == 671)) { // Flabébé form_list = new[] { new { Text = forms[669], Value = 0 }, // Red new { Text = forms[884], Value = 1 }, // Yellow @@ -1457,7 +1457,7 @@ public void setForms(int species, ComboBox cb) new { Text = forms[886], Value = 3 }, // Blue new { Text = forms[887], Value = 4 }, // White };} - else if (species == 670) { + else if (species == 670) { // Floette form_list = new[] { new { Text = forms[669], Value = 0 }, // Red new { Text = forms[884], Value = 1 }, // Yellow @@ -1466,7 +1466,7 @@ public void setForms(int species, ComboBox cb) new { Text = forms[887], Value = 4 }, // White new { Text = forms[888], Value = 5 }, // Eternal };} - else if (species == 676) { + else if (species == 676) { // Furfrou form_list = new[] { new { Text = forms[676], Value = 0 }, // Natural new { Text = forms[893], Value = 1 }, // Heart @@ -1479,19 +1479,24 @@ public void setForms(int species, ComboBox cb) new { Text = forms[900], Value = 8 }, // Kabuki new { Text = forms[901], Value = 9 }, // Pharaoh };} - else if (species == 681) { + else if (species == 681) { // Aegislash form_list = new[] { new { Text = forms[681], Value = 0 }, // Shield new { Text = forms[903], Value = 1 }, // Blade };} - else if ((species == 710) || (species == 711)) { + else if ((species == 710) || (species == 711)) { // Pumpkaboo/Goregeist form_list = new[] { new { Text = forms[904], Value = 0 }, // Small new { Text = forms[710], Value = 1 }, // Average new { Text = forms[905], Value = 2 }, // Large new { Text = forms[906], Value = 3 }, // Super };} - else if (species == 720) { + else if (species == 716) { // Xerneas + form_list = new[] { + new { Text = types[0], Value = 0}, // Normal + new { Text = forms[910], Value = 1}, // Active + };} + else if (species == 720) { // Hoopa form_list = new[] { new { Text = types[0], Value = 0}, // Normal new { Text = forms[912], Value = 1}, // Unbound diff --git a/Resources/img/Pokemon Sprites/716-1.png b/Resources/img/Pokemon Sprites/716-1.png index 5bb0340c3..3d39df18e 100644 Binary files a/Resources/img/Pokemon Sprites/716-1.png and b/Resources/img/Pokemon Sprites/716-1.png differ diff --git a/Resources/img/Pokemon Sprites/716.png b/Resources/img/Pokemon Sprites/716.png index 3d39df18e..5bb0340c3 100644 Binary files a/Resources/img/Pokemon Sprites/716.png and b/Resources/img/Pokemon Sprites/716.png differ