From a7414d53d8317b9aba142d557c9d9c8afb012b70 Mon Sep 17 00:00:00 2001 From: Matt Date: Tue, 13 Mar 2018 16:05:51 -0400 Subject: [PATCH] Add Gen 6 Mythicals to final evolutions (#299) * Add Gen 6 Mythicals to final evolutions * Blaziken ORAS Megas -> XY Also group by Generation on each line. --- pk3DS.Core/Legality/Legal.cs | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/pk3DS.Core/Legality/Legal.cs b/pk3DS.Core/Legality/Legal.cs index 4641ee8..187b7e6 100644 --- a/pk3DS.Core/Legality/Legal.cs +++ b/pk3DS.Core/Legality/Legal.cs @@ -6,18 +6,17 @@ public static partial class Legal { public static readonly ushort[] Mega_XY = { - 3,6,9,65,80, - 115,127,130,142,150,181, - 212,214,229,248,282, - 303,306,308,310,354,359,380,381, - 445,448,460, + 003, 006, 009, 065, 080, 115, 127, 130, 142, 150, + 181, 212, 214, 229, 248, + 257, 282, 303, 306, 308, 310, 354, 359, 380, 381, + 445, 448, 460 }; public static readonly ushort[] Mega_ORAS = Mega_XY.Concat(new ushort[] { - 15,18,94, - 208,254,257,260, - 302,319,323,334,362,373,376,384, - 428,475, + 015, 018, 094, + 208, + 254, 260, 302, 319, 323, 334, 362, 373, 376, 384, + 428, 475, 531, 719 }).ToArray(); @@ -254,7 +253,7 @@ public static partial class Legal 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, + 275, 276, 277, 278, 279 }; public static readonly int[] Z_Moves = { @@ -266,20 +265,20 @@ public static partial class Legal { 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, 480, 481, 482, 483, 484, + 441, 447, 448, 449, 450, 451, 452, 467, 477, 478, 479, 480, 481, 482, 483, 484 }; public static readonly int[] ImportantTrainers_USUM = { 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, 480, 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, + 650, 651, 652 }; public static readonly int[] BasicStarters_6 = { 001, 004, 007, 010, 013, 016, 029, 032, 041, 043, 060, 063, 066, 069, 074, 081, 092, 111, 116, 137, 147, 152, 155, 158, 172, 173, 174, 175, 179, 187, 220, 239, 240, 246, 252, 255, 258, 265, 270, 273, 280, 287, 293, 298, 304, 328, 355, 363, 371, 374, 387, 390, 393, 396, 403, 406, 440, 443, 495, 498, 501, 506, 519, 524, 532, 535, 540, 543, 551, 574, 577, 582, 599, 602, - 607, 610, 633, 650, 653, 656, 661, 664, 669, 679, 704, + 607, 610, 633, 650, 653, 656, 661, 664, 669, 679, 704 }; public static readonly int[] BasicStarters_7 = BasicStarters_6.Concat(new int[] { @@ -302,16 +301,16 @@ public static partial class Legal 489, 490, 491, 492, 493, 494, 497, 500, 503, 505, 508, 510, 512, 514, 516, 518, 521, 523, 526, 528, 530, 531, 534, 537, 538, 539, 542, 545, 547, 549, 550, 553, 555, 556, 558, 560, 561, 563, 565, 567, 569, 571, 573, 576, 579, 581, 584, 586, 587, 589, 591, 593, 594, 596, 598, 601, 604, 606, 609, 612, 614, 615, 617, 618, 620, 621, 623, 625, 626, 628, 630, 631, 632, 635, 637, 638, 639, 640, 641, 642, 643, 644, 645, 646, 647, 648, 649, 652, 655, 658, 660, 663, 666, 668, 671, 673, 675, 676, 678, 681, 683, 685, 687, 689, 691, 693, 695, 697, 699, 700, 701, - 702, 703, 706, 707, 709, 711, 713, 715, 716, 717, 718, + 702, 703, 706, 707, 709, 711, 713, 715, 716, 717, 718, 719, 720, 721 }; 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, + 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, + 804, 805, 806, 807 }).ToArray(); /// @@ -321,11 +320,11 @@ public static partial class Legal public static readonly int[] Legendary_Mythical_6 = { 144, 145, 146, 150, 151, 243, 244, 245, 249, 250, 251, 377, 378, 379, 380, 381, 382, 383, 384, 385, 386, 480, 481, 482, 483, 484, 485, 486, 487, 488, 489, 490, 491, 492, 493, 494, 638, - 639, 640, 641, 642, 643, 644, 645, 646, 647, 648, 649, 716, 717, 718, 719, 720, 721, + 639, 640, 641, 642, 643, 644, 645, 646, 647, 648, 649, 716, 717, 718, 719, 720, 721 }; public static readonly int[] Legendary_Mythical_SM = Legendary_Mythical_6.Concat(new int[] { - 773, 785, 786, 787, 788, 791, 792, 793, 794, 795, 796, 797, 798, 799, 800, 801, 802, + 773, 785, 786, 787, 788, 791, 792, 793, 794, 795, 796, 797, 798, 799, 800, 801, 802 }).ToArray(); public static readonly int[] Legendary_Mythical_USUM = Legendary_Mythical_SM.Concat(new int[] {