diff --git a/pk3DS.Core/Legality/Legal.cs b/pk3DS.Core/Legality/Legal.cs index 8b5057e..c30b606 100644 --- a/pk3DS.Core/Legality/Legal.cs +++ b/pk3DS.Core/Legality/Legal.cs @@ -66,6 +66,10 @@ public static partial class Legal public static readonly int[] SpecialClasses_ORAS = { #region Classes + 064, // Battle Chatelaine + 065, // Battle Chatelaine + 066, // Battle Chatelaine + 067, // Battle Chatelaine 127, // Pokémon Trainer 128, // Pokémon Trainer 174, // Aqua Leader @@ -228,7 +232,6 @@ public static partial class Legal 078, // Team Flare (Admin) 079, // Team Flare (Grunt) 080, // Team Flare (Grunt) - 081, // Team Flare (Lysandre) 102, // Pokémon Trainer (AZ) 103, // Pokémon Trainer (Calem) 104, // Pokémon Trainer (Serena) @@ -241,39 +244,36 @@ public static partial class Legal 128, // Pokémon Trainer (May) 174, // Aqua Leader (Archie) 178, // Magma Leader (Maxie) - 192, // Pokémon Trainer (Wally) - 219, // Pokémon Trainer (Steven) + 198, // Champion (Steven) 221, // Lorekeeper (Zinnia) 272, // Pokémon Trainer (Wally) }; public static readonly int[] TrainerClasses_AO = { - 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 163, 164, 165, - 166, 167, 168, 169, 170, 171, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, - 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, - 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255, 256, 257, 258, 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, - 279, + 064, 065, 066, 067, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, + 161, 163, 164, 165, 166, 167, 168, 169, 170, 171, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 192, 193, 194, 195, 196, 197, 198, 199, 200, + 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, + 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255, 256, 257, 258, 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, + 275, 276, 277, 278, 279, }; public static readonly int[] Z_Moves = { 622, 623, 624, 625, 626, 627, 628, 629, 630, 631, 632, 633, 634, 635, 636, 637, 638, 639, 640, 641, 642, 643, 644, 645, 646, 647, 648, 649, 650, 651, 652, 653, 654, 655, 656, 657, 658, - 695, 696, 697, 698, 699, 700, 701, 702, 703, - 719, - 723, 724, 725, 726, 727, 728 + 695, 696, 697, 698, 699, 700, 701, 702, 703, 719, 723, 724, 725, 726, 727, 728 }; public static readonly int[] ImportantTrainers_SM = { - 012, 013, 014, 023, 052, 074, 075, 076, 077, 078, 079, 081, 082, 083, 084, 089, 090, 129, 131, 132, 138, 144, 146, 149, 152, 153, 154, 155, 156, 158, 159, 160, 164, 167, 185, 215, 216, - 217, 218, 219, 220, 221, 222, 235, 236, 238, 239, 240, 241, 349, 350, 351, 352, 356, 357, 358, 359, 360, 371, 372, 392, 396, 398, 400, 401, 403, 405, 409, 410, 412, 413, 414, 415, 416, - 417, 418, 419, 435, 438, 439, 440, 441, 447, 448, 449, 450, 451, 452, 467, 477, 478, 479, 481, 482, 483, 484, + 012, 013, 014, 023, 052, 074, 075, 076, 077, 078, 079, 089, 090, 129, 131, 132, 138, 144, 146, 149, 152, 153, 154, 155, 156, 158, 159, 160, 164, 167, 215, 216, 217, 218, 219, 220, 221, + 222, 235, 236, 238, 239, 240, 241, 349, 350, 351, 352, 356, 357, 358, 359, 360, 392, 396, 398, 400, 401, 403, 405, 409, 410, 412, 413, 414, 415, 416, 417, 418, 419, 435, 438, 439, 440, + 441, 447, 448, 449, 450, 451, 452, 467, 477, 478, 479, 481, 482, 483, 484, }; public static readonly int[] ImportantTrainers_USUM = { - 012, 013, 014, 023, 052, 074, 075, 076, 077, 078, 079, 081, 082, 083, 084, 089, 090, 131, 132, 138, 144, 146, 149, 153, 154, 156, 159, 160, 185, 215, 216, 217, 218, 219, 220, 221, 222, 235, 236, - 238, 239, 240, 241, 350, 351, 352, 356, 358, 359, 371, 372, 396, 398, 401, 405, 409, 410, 412, 415, 416, 417, 418, 419, 438, 439, 440, 441, 447, 448, 449, 450, 451, 452, 477, 478, 479, 489, 490, - 494, 495, 496, 497, 498, 499, 500, 501, 502, 503, 504, 505, 506, 507, 508, 541, 542, 543, 555, 556, 557, 558, 559, 560, 561, 562, 572, 573, 578, 580, 582, 583, 623, 630, 644, 645, 647, 648, 649, - 650, 651, 652, + 012, 013, 014, 023, 052, 074, 075, 076, 077, 078, 079, 089, 090, 131, 132, 138, 144, 146, 149, 153, 154, 156, 159, 160, 215, 216, 217, 218, 219, 220, 221, 222, 235, 236, 238, 239, 240, + 241, 350, 351, 352, 356, 358, 359, 396, 398, 401, 405, 409, 410, 412, 415, 416, 417, 418, 419, 438, 439, 440, 441, 447, 448, 449, 450, 451, 452, 477, 478, 479, 489, 490, 494, 495, 496, + 497, 498, 499, 500, 501, 502, 503, 504, 505, 506, 507, 508, 541, 542, 543, 555, 556, 557, 558, 559, 560, 561, 562, 572, 573, 578, 580, 582, 583, 623, 630, 644, 645, 647, 648, 649, 650, + 651, 652, }; public static readonly int[] BasicStarters_6 = { @@ -285,6 +285,7 @@ public static partial class Legal { 722, 725, 728, 731, 736, 761, 782, 789 }).ToArray(); + /// /// All final evolutions, excluding Event-exclusive Forms that do not evolve (Pikachu, Floette, etc). Used for forcing fully evolved species. /// Overrides all other randomizer settings, allowing all Generations and Legendary/Mythical Pokemon as well. @@ -305,13 +306,14 @@ public static partial class Legal }; public static readonly int[] FinalEvolutions_SM = FinalEvolutions_6.Concat(new int[] { - 724, 727, 730, 733, 735, 738, 740, 741, 743, 745, 746, 748, 750, 752, 754, 756, 758, 760, 763, 764, 765, 766, 768, 770, 771, - 773, 774, 775, 776, 777, 779, 780, 781, 784, 785, 786, 787, 788, 791, 792, 793, 794, 795, 796, 797, 798, 799, 800, 801, 802, + 724, 727, 730, 733, 735, 738, 740, 741, 743, 745, 746, 748, 750, 752, 754, 756, 758, 760, 763, 764, 765, 766, 768, 770, 771, 773, 774, 775, 776, 777, 779, 780, 781, 784, 785, 786, 787, + 788, 791, 792, 793, 794, 795, 796, 797, 798, 799, 800, 801, 802, }).ToArray(); public static readonly int[] FinalEvolutions_USUM = FinalEvolutions_SM.Concat(new int[] { 804, 805, 806, 807, }).ToArray(); + /// /// All Legendary and Mythical Pokemon. Used for Legendary-for-Legendary replacement. /// Does not include un-evolved species in the array due to potential error with Force Fully Evolved. diff --git a/pk3DS/Subforms/Gen6/RSTE.cs b/pk3DS/Subforms/Gen6/RSTE.cs index 1918cce..a34fa8c 100644 --- a/pk3DS/Subforms/Gen6/RSTE.cs +++ b/pk3DS/Subforms/Gen6/RSTE.cs @@ -758,6 +758,7 @@ private static void RandomizeTrainerAIClass(trdata6 t, string[] trClass) rClass // Classes selected to be randomized && (!rOnlySingles || t.BattleType == 0) // Nonsingles only get changed if rOnlySingles && !rIgnoreClass.Contains(t.Class) // Current class isn't a special class + && Main.Config.XY ) { int randClass() => (int)(rnd32() % trClass.Length); @@ -765,12 +766,11 @@ private static void RandomizeTrainerAIClass(trdata6 t, string[] trClass) // Ensure the Random Class isn't an exclusive class while (rIgnoreClass.Contains(rv) || trClass[rv].StartsWith("[~")); // don't allow disallowed classes t.Class = rv; - - if (Main.Config.ORAS && t.Class <= 126) // 0 to 126 from XY, re-randomize to something from ORAS - { - int fixClass() => (int)(rnd32() % rTrainerClasses.Length); - t.Class = rTrainerClasses[fixClass()]; - } + } + else if (Main.Config.ORAS) // don't allow XY-only classes + { + int randClass() => (int)(rnd32() % rTrainerClasses.Length); + t.Class = rTrainerClasses[randClass()]; } } private static void RandomizeTrainerPrizeItem(trdata6 t) @@ -795,49 +795,54 @@ private string[] GetTagsORAS() { string[] tags = Enumerable.Repeat("", trdata.Length).ToArray(); ImportantTrainers = true; - //Rival Battles + + // Rival Battles TagTrainer(tags, "RIVAL1", 289, 292, 295, 298, 527, 530, 674, 677, 699, 906); // Rival w/ Grass Starter TagTrainer(tags, "RIVAL2", 290, 293, 296, 299, 528, 531, 675, 678, 700, 907); // Rival w/ Fire Starter TagTrainer(tags, "RIVAL3", 291, 294, 297, 300, 529, 532, 676, 679, 701, 908); // Rival w/ Water Starter - //Aqua Admins - TagTrainer(tags, "AQUA1", 178, 231, 266); // Archie - TagTrainer(tags, "AQUA2", 683, 684, 685, 686, 687); // Matt - TagTrainer(tags, "AQUA3", 688, 689, 690); // Shelly + // Aqua Admins + TagTrainer(tags, "AQUA1", 178, 231, 266); // Archie + TagTrainer(tags, "AQUA2", 683, 684, 685, 686, 687); // Matt + TagTrainer(tags, "AQUA3", 688, 689, 690); // Shelly - //Magma Admins - TagTrainer(tags, "MAGMA1", 235, 236, 271); // Maxie - TagTrainer(tags, "MAGMA2", 694, 695, 696, 697, 698); // Courney - TagTrainer(tags, "MAGMA3", 691, 692, 693); // Tabitha + // Magma Admins + TagTrainer(tags, "MAGMA1", 235, 236, 271); // Maxie + TagTrainer(tags, "MAGMA2", 694, 695, 696, 697, 698); // Courney + TagTrainer(tags, "MAGMA3", 691, 692, 693); // Tabitha - //Gym Leaders - TagTrainer(tags, "GYM1", 561); // Roxanne - TagTrainer(tags, "GYM2", 563); // Brawly - TagTrainer(tags, "GYM3", 567); // Wattson - TagTrainer(tags, "GYM4", 569); // Flannery - TagTrainer(tags, "GYM5", 570); // Norman - TagTrainer(tags, "GYM6", 571); // Winona - TagTrainer(tags, "GYM7", 552); // Liza & Tate - TagTrainer(tags, "GYM8", 572, 943); // Wallace + // Gym Leaders + TagTrainer(tags, "GYM1", 561); // Roxanne + TagTrainer(tags, "GYM2", 563); // Brawly + TagTrainer(tags, "GYM3", 567); // Wattson + TagTrainer(tags, "GYM4", 569); // Flannery + TagTrainer(tags, "GYM5", 570); // Norman + TagTrainer(tags, "GYM6", 571); // Winona + TagTrainer(tags, "GYM7", 552); // Liza & Tate + TagTrainer(tags, "GYM8", 572, 943); // Wallace - //Elite 4 - TagTrainer(tags, "ELITE1", 553, 909); // Sidney - TagTrainer(tags, "ELITE2", 554, 910); // Phoebe - TagTrainer(tags, "ELITE3", 555, 911); // Glacia - TagTrainer(tags, "ELITE4", 556, 912); // Drake + // Elite Four + TagTrainer(tags, "ELITE1", 553, 909); // Sidney + TagTrainer(tags, "ELITE2", 554, 910); // Phoebe + TagTrainer(tags, "ELITE3", 555, 911); // Glacia + TagTrainer(tags, "ELITE4", 556, 912); // Drake TagTrainer(tags, "CHAMPION", 557, 680, 913, 942); // Champion Steven - //Wally + // Wally TagTrainer(tags, "WALLY", 518, 583, 944, 945, 946, 947); - //Zinnia + // Zinnia TagTrainer(tags, "LOREKEEPER", 713, 898); + // Aarune + TagTrainer(tags, "EXPERT", 856, 857); + ImportantTrainers = false; TagTrainer(tags, "RIVAL1", 1, 4); // Rival w/ Grass Starter TagTrainer(tags, "RIVAL2", 2, 5); // Rival w/ Fire Starter TagTrainer(tags, "RIVAL3", 3, 6); // Rival w/ Water Starter - //Gym Trainers (Tagged in order of appearance on Bulbapedia's lists) + + // Gym Trainers (Tagged in order of appearance on Bulbapedia's lists) if (rTypeGymTrainers) { TagTrainer(tags, "GYM1", 562, 22, 667); @@ -855,49 +860,62 @@ private string[] GetTagsXY() { string[] tags = Enumerable.Repeat("", trdata.Length).ToArray(); ImportantTrainers = true; - //Rival Battles + + // Rival Battles TagTrainer(tags, "RIVAL1", 130, 184, 329, 332, 335, 338, 341, 435, 519, 604, 575, 578, 581, 584, 587, 590, 593, 596, 599, 607); // Rival w/ Fire Starter TagTrainer(tags, "RIVAL2", 131, 185, 330, 333, 336, 339, 342, 436, 520, 605, 576, 579, 582, 585, 588, 591, 594, 597, 600, 608); // Rival w/ Water Starter TagTrainer(tags, "RIVAL3", 132, 186, 331, 334, 337, 340, 343, 437, 521, 606, 577, 580, 583, 586, 589, 592, 595, 598, 601, 609); // Rival w/ Grass Starter - //Important Flare Members - TagTrainer(tags, "FLAREBOSS", 303, 525, 526); // Lysandre - TagTrainer(tags, "FLARE1", 175, 344); // Aliana - TagTrainer(tags, "FLARE2", 350, 351); // Bryony - TagTrainer(tags, "FLARE3", 348, 349); // Celosia - TagTrainer(tags, "FLARE4", 346, 347); // Mable - TagTrainer(tags, "FLARE5", 345); // Xerosic + // Team Flare Admins + TagTrainer(tags, "FLAREBOSS", 303, 525, 526); // Lysandre + TagTrainer(tags, "FLARE1", 175, 344); // Aliana + TagTrainer(tags, "FLARE2", 350, 351); // Bryony + TagTrainer(tags, "FLARE3", 348, 349); // Celosia + TagTrainer(tags, "FLARE4", 346, 347); // Mable + TagTrainer(tags, "FLARE5", 345); // Xerosic - //Gym Leaders - TagTrainer(tags, "GYM1", 6, 254, 262); // Viola - TagTrainer(tags, "GYM2", 76, 261, 279); // Grant - TagTrainer(tags, "GYM3", 21, 188, 255, 263, 613); // Korrina - TagTrainer(tags, "GYM4", 22, 256, 264); // Ramos - TagTrainer(tags, "GYM5", 23, 257, 265); // Clemont - TagTrainer(tags, "GYM6", 24, 258, 266); // Valerie - TagTrainer(tags, "GYM7", 25, 259, 267); // Olympia - TagTrainer(tags, "GYM8", 26, 260, 268); // Wulfric + // Gym Leaders + TagTrainer(tags, "GYM1", 6, 254, 262); // Viola + TagTrainer(tags, "GYM2", 76, 261, 279); // Grant + TagTrainer(tags, "GYM3", 21, 255, 263, 613); // Korrina + TagTrainer(tags, "GYM4", 22, 256, 264); // Ramos + TagTrainer(tags, "GYM5", 23, 257, 265); // Clemont + TagTrainer(tags, "GYM6", 24, 258, 266); // Valerie + TagTrainer(tags, "GYM7", 25, 259, 267); // Olympia + TagTrainer(tags, "GYM8", 26, 260, 268); // Wulfric - //Elite 4 - TagTrainer(tags, "ELITE1", 269, 273, 507); // Malva - TagTrainer(tags, "ELITE2", 271, 275); // Siebold - TagTrainer(tags, "ELITE3", 187, 272); // Wikstrom - TagTrainer(tags, "ELITE4", 270, 274); // Drasna - TagTrainer(tags, "CHAMPION", 276, 277); // Champion Diantha + // Elite Four + TagTrainer(tags, "ELITE1", 269, 273, 507); // Malva + TagTrainer(tags, "ELITE2", 271, 275); // Siebold + TagTrainer(tags, "ELITE3", 187, 272); // Wikstrom + TagTrainer(tags, "ELITE4", 270, 274); // Drasna + TagTrainer(tags, "CHAMPION", 276, 277); // Champion Diantha - //"Friends" - TagTrainer(tags, "SHAUNA", 137, 138, 139, 321, 322, 323); + // Friends + TagTrainer(tags, "SHAUNA", 321, 322, 323); TagTrainer(tags, "TREVOR", 325, 439); TagTrainer(tags, "TIERNO", 324, 438, 573); - //Prof + // Professor TagTrainer(tags, "PROFESSOR", 327, 328); - //Suspicious Trainer ??? + // Suspicious Trainer ??? TagTrainer(tags, "ESSENTIA", 503, 504, 505, 511, 512, 513, 514, 515); // Emma + // AZ + TagTrainer(tags, "AZ", 602); + + // Battle Chatelaines + TagTrainer(tags, "CHATELAINE1", 559); // Nita + TagTrainer(tags, "CHATELAINE2", 560); // Evelyn + TagTrainer(tags, "CHATELAINE3", 561); // Dana + TagTrainer(tags, "CHATELAINE4", 562); // Morgan + ImportantTrainers = false; - //Gym Trainers (Tagged in order of appearance on Bulbapedia's lists) + TagTrainer(tags, "SHAUNA", 137, 138, 139); + TagTrainer(tags, "GYM3", 188); + + // Gym Trainers (Tagged in order of appearance on Bulbapedia's lists) if (rTypeGymTrainers) { TagTrainer(tags, "GYM1", 39, 40, 48); diff --git a/pk3DS/Subforms/Gen7/SMTE.Designer.cs b/pk3DS/Subforms/Gen7/SMTE.Designer.cs index d35c328..c7d9a17 100644 --- a/pk3DS/Subforms/Gen7/SMTE.Designer.cs +++ b/pk3DS/Subforms/Gen7/SMTE.Designer.cs @@ -182,6 +182,8 @@ private void InitializeComponent() this.CHK_RandomItems = new System.Windows.Forms.CheckBox(); this.CHK_STAB = new System.Windows.Forms.CheckBox(); this.Tab_Trainer1 = new System.Windows.Forms.TabPage(); + this.CHK_ReplaceMega = new System.Windows.Forms.CheckBox(); + this.CHK_ReplaceLegend = new System.Windows.Forms.CheckBox(); this.CHK_6PKM = new System.Windows.Forms.CheckBox(); this.NUD_ForceFullyEvolved = new System.Windows.Forms.NumericUpDown(); this.CHK_ForceFullyEvolved = new System.Windows.Forms.CheckBox(); @@ -193,8 +195,6 @@ private void InitializeComponent() this.CHK_TypeTheme = new System.Windows.Forms.CheckBox(); this.CHK_IgnoreSpecialClass = new System.Windows.Forms.CheckBox(); this.CHK_RandomClass = new System.Windows.Forms.CheckBox(); - this.CHK_ReplaceLegend = new System.Windows.Forms.CheckBox(); - this.CHK_ReplaceMega = new System.Windows.Forms.CheckBox(); ((System.ComponentModel.ISupportInitialize)(this.PB_Team1)).BeginInit(); this.mnuVSD.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.PB_Team2)).BeginInit(); @@ -2038,11 +2038,37 @@ private void InitializeComponent() this.Tab_Trainer1.Text = "Trainer"; this.Tab_Trainer1.UseVisualStyleBackColor = true; // + // CHK_ReplaceMega + // + this.CHK_ReplaceMega.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.CHK_ReplaceMega.AutoSize = true; + this.CHK_ReplaceMega.Checked = true; + this.CHK_ReplaceMega.CheckState = System.Windows.Forms.CheckState.Checked; + this.CHK_ReplaceMega.Location = new System.Drawing.Point(6, 121); + this.CHK_ReplaceMega.Name = "CHK_ReplaceMega"; + this.CHK_ReplaceMega.Size = new System.Drawing.Size(196, 17); + this.CHK_ReplaceMega.TabIndex = 343; + this.CHK_ReplaceMega.Text = "Ensure Post-Game Mega Evolutions"; + this.CHK_ReplaceMega.UseVisualStyleBackColor = true; + // + // CHK_ReplaceLegend + // + this.CHK_ReplaceLegend.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.CHK_ReplaceLegend.AutoSize = true; + this.CHK_ReplaceLegend.Checked = true; + this.CHK_ReplaceLegend.CheckState = System.Windows.Forms.CheckState.Checked; + this.CHK_ReplaceLegend.Location = new System.Drawing.Point(6, 47); + this.CHK_ReplaceLegend.Name = "CHK_ReplaceLegend"; + this.CHK_ReplaceLegend.Size = new System.Drawing.Size(257, 17); + this.CHK_ReplaceLegend.TabIndex = 342; + this.CHK_ReplaceLegend.Text = "Team Rainbow Rocket Legendary-for-Legendary"; + this.CHK_ReplaceLegend.UseVisualStyleBackColor = true; + // // CHK_6PKM // this.CHK_6PKM.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.CHK_6PKM.AutoSize = true; - this.CHK_6PKM.Location = new System.Drawing.Point(6, 104); + this.CHK_6PKM.Location = new System.Drawing.Point(6, 106); this.CHK_6PKM.Name = "CHK_6PKM"; this.CHK_6PKM.Size = new System.Drawing.Size(183, 17); this.CHK_6PKM.TabIndex = 341; @@ -2051,7 +2077,7 @@ private void InitializeComponent() // // NUD_ForceFullyEvolved // - this.NUD_ForceFullyEvolved.Location = new System.Drawing.Point(165, 71); + this.NUD_ForceFullyEvolved.Location = new System.Drawing.Point(165, 73); this.NUD_ForceFullyEvolved.Minimum = new decimal(new int[] { 1, 0, @@ -2070,7 +2096,7 @@ private void InitializeComponent() // this.CHK_ForceFullyEvolved.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.CHK_ForceFullyEvolved.AutoSize = true; - this.CHK_ForceFullyEvolved.Location = new System.Drawing.Point(6, 73); + this.CHK_ForceFullyEvolved.Location = new System.Drawing.Point(6, 75); this.CHK_ForceFullyEvolved.Name = "CHK_ForceFullyEvolved"; this.CHK_ForceFullyEvolved.Size = new System.Drawing.Size(160, 17); this.CHK_ForceFullyEvolved.TabIndex = 339; @@ -2079,7 +2105,7 @@ private void InitializeComponent() // // L_MinPKM // - this.L_MinPKM.Location = new System.Drawing.Point(191, 6); + this.L_MinPKM.Location = new System.Drawing.Point(191, 0); this.L_MinPKM.Name = "L_MinPKM"; this.L_MinPKM.Size = new System.Drawing.Size(60, 20); this.L_MinPKM.TabIndex = 338; @@ -2088,7 +2114,7 @@ private void InitializeComponent() // // L_MaxPKM // - this.L_MaxPKM.Location = new System.Drawing.Point(191, 28); + this.L_MaxPKM.Location = new System.Drawing.Point(191, 22); this.L_MaxPKM.Name = "L_MaxPKM"; this.L_MaxPKM.Size = new System.Drawing.Size(60, 20); this.L_MaxPKM.TabIndex = 337; @@ -2097,7 +2123,7 @@ private void InitializeComponent() // // NUD_RMin // - this.NUD_RMin.Location = new System.Drawing.Point(257, 8); + this.NUD_RMin.Location = new System.Drawing.Point(257, 2); this.NUD_RMin.Maximum = new decimal(new int[] { 6, 0, @@ -2119,7 +2145,7 @@ private void InitializeComponent() // // NUD_RMax // - this.NUD_RMax.Location = new System.Drawing.Point(257, 30); + this.NUD_RMax.Location = new System.Drawing.Point(257, 24); this.NUD_RMax.Maximum = new decimal(new int[] { 6, 0, @@ -2143,7 +2169,7 @@ private void InitializeComponent() // this.CHK_RandomMegaForm.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.CHK_RandomMegaForm.AutoSize = true; - this.CHK_RandomMegaForm.Location = new System.Drawing.Point(6, 89); + this.CHK_RandomMegaForm.Location = new System.Drawing.Point(6, 91); this.CHK_RandomMegaForm.Name = "CHK_RandomMegaForm"; this.CHK_RandomMegaForm.Size = new System.Drawing.Size(127, 17); this.CHK_RandomMegaForm.TabIndex = 333; @@ -2156,7 +2182,7 @@ private void InitializeComponent() this.CHK_TypeTheme.AutoSize = true; this.CHK_TypeTheme.Checked = true; this.CHK_TypeTheme.CheckState = System.Windows.Forms.CheckState.Checked; - this.CHK_TypeTheme.Location = new System.Drawing.Point(6, 38); + this.CHK_TypeTheme.Location = new System.Drawing.Point(6, 32); this.CHK_TypeTheme.Name = "CHK_TypeTheme"; this.CHK_TypeTheme.Size = new System.Drawing.Size(127, 17); this.CHK_TypeTheme.TabIndex = 329; @@ -2169,7 +2195,7 @@ private void InitializeComponent() this.CHK_IgnoreSpecialClass.AutoSize = true; this.CHK_IgnoreSpecialClass.Checked = true; this.CHK_IgnoreSpecialClass.CheckState = System.Windows.Forms.CheckState.Checked; - this.CHK_IgnoreSpecialClass.Location = new System.Drawing.Point(6, 23); + this.CHK_IgnoreSpecialClass.Location = new System.Drawing.Point(6, 17); this.CHK_IgnoreSpecialClass.Name = "CHK_IgnoreSpecialClass"; this.CHK_IgnoreSpecialClass.Size = new System.Drawing.Size(133, 17); this.CHK_IgnoreSpecialClass.TabIndex = 327; @@ -2182,7 +2208,7 @@ private void InitializeComponent() this.CHK_RandomClass.AutoSize = true; this.CHK_RandomClass.Checked = true; this.CHK_RandomClass.CheckState = System.Windows.Forms.CheckState.Checked; - this.CHK_RandomClass.Location = new System.Drawing.Point(6, 8); + this.CHK_RandomClass.Location = new System.Drawing.Point(6, 2); this.CHK_RandomClass.Name = "CHK_RandomClass"; this.CHK_RandomClass.Size = new System.Drawing.Size(141, 17); this.CHK_RandomClass.TabIndex = 326; @@ -2190,32 +2216,6 @@ private void InitializeComponent() this.CHK_RandomClass.UseVisualStyleBackColor = true; this.CHK_RandomClass.CheckedChanged += new System.EventHandler(this.CHK_RandomClass_CheckedChanged); // - // CHK_ReplaceLegend - // - this.CHK_ReplaceLegend.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.CHK_ReplaceLegend.AutoSize = true; - this.CHK_ReplaceLegend.Checked = true; - this.CHK_ReplaceLegend.CheckState = System.Windows.Forms.CheckState.Checked; - this.CHK_ReplaceLegend.Location = new System.Drawing.Point(6, 53); - this.CHK_ReplaceLegend.Name = "CHK_ReplaceLegend"; - this.CHK_ReplaceLegend.Size = new System.Drawing.Size(257, 17); - this.CHK_ReplaceLegend.TabIndex = 342; - this.CHK_ReplaceLegend.Text = "Team Rainbow Rocket Legendary-for-Legendary"; - this.CHK_ReplaceLegend.UseVisualStyleBackColor = true; - // - // CHK_ReplaceMega - // - this.CHK_ReplaceMega.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.CHK_ReplaceMega.AutoSize = true; - this.CHK_ReplaceMega.Checked = true; - this.CHK_ReplaceMega.CheckState = System.Windows.Forms.CheckState.Checked; - this.CHK_ReplaceMega.Location = new System.Drawing.Point(6, 119); - this.CHK_ReplaceMega.Name = "CHK_ReplaceMega"; - this.CHK_ReplaceMega.Size = new System.Drawing.Size(196, 17); - this.CHK_ReplaceMega.TabIndex = 343; - this.CHK_ReplaceMega.Text = "Ensure Post-Game Mega Evolutions"; - this.CHK_ReplaceMega.UseVisualStyleBackColor = true; - // // SMTE // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); diff --git a/pk3DS/Subforms/Gen7/SMTE.resx b/pk3DS/Subforms/Gen7/SMTE.resx index 05589a3..0161958 100644 --- a/pk3DS/Subforms/Gen7/SMTE.resx +++ b/pk3DS/Subforms/Gen7/SMTE.resx @@ -150,54 +150,12 @@ True - - True - - - True - - - True - - - True - True True - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - True @@ -213,12 +171,6 @@ True - - True - - - True - True @@ -228,12 +180,6 @@ True - - True - - - True - True @@ -243,12 +189,6 @@ True - - True - - - True - True @@ -258,12 +198,6 @@ True - - True - - - True - True @@ -273,12 +207,6 @@ True - - True - - - True - True @@ -288,12 +216,6 @@ True - - True - - - True - True @@ -303,54 +225,15 @@ True - - True - - - True - True True - - True - True - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - True @@ -363,15 +246,6 @@ True - - True - - - True - - - True - True @@ -387,18 +261,6 @@ True - - True - - - True - - - True - - - True - True @@ -414,18 +276,6 @@ True - - True - - - True - - - True - - - True - True @@ -441,18 +291,6 @@ True - - True - - - True - - - True - - - True - True @@ -468,18 +306,6 @@ True - - True - - - True - - - True - - - True - True @@ -495,18 +321,6 @@ True - - True - - - True - - - True - - - True - True @@ -522,18 +336,6 @@ True - - True - - - True - - - True - - - True - True @@ -546,15 +348,6 @@ True - - True - - - True - - - True - True @@ -564,33 +357,12 @@ True - - True - - - True - True True - - True - - - True - - - True - - - True - - - True - True