mirror of
https://github.com/kwsch/PKHeX
synced 2024-09-20 14:21:59 +00:00
Trailing commas
This commit is contained in:
Kurt
parent
7722baa826
commit
2ed8056ea4
9 changed files with 64 additions and 64 deletions
|
|
@ -51,7 +51,7 @@ namespace PKHeX.Core
|
|||
102, 104, 115, 117, 118, 120, 121, 126, 129, 130,
|
||||
135, 138, 143, 156, 086, 149, 153, 157, 161, 164,
|
||||
|
||||
015, 019, 057, 070, 148
|
||||
015, 019, 057, 070, 148,
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,21 +10,21 @@ namespace PKHeX.Core
|
|||
internal const int MaxAbilityID_2 = 0;
|
||||
|
||||
internal static readonly ushort[] Pouch_Items_GSC = {
|
||||
3, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 46, 47, 48, 49, 51, 52, 53, 57, 60, 62, 63, 64, 65, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 91, 92, 93, 94, 95, 96, 97, 98, 99, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 117, 118, 119, 121, 122, 123, 124, 125, 126, 131, 132, 138, 139, 140, 143, 144, 146, 150, 151, 152, 156, 158, 163, 167, 168, 169, 170, 172, 173, 174, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189
|
||||
3, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 46, 47, 48, 49, 51, 52, 53, 57, 60, 62, 63, 64, 65, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 91, 92, 93, 94, 95, 96, 97, 98, 99, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 117, 118, 119, 121, 122, 123, 124, 125, 126, 131, 132, 138, 139, 140, 143, 144, 146, 150, 151, 152, 156, 158, 163, 167, 168, 169, 170, 172, 173, 174, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189,
|
||||
};
|
||||
|
||||
internal static readonly ushort[] Pouch_Ball_GSC = {
|
||||
1, 2, 4, 5, 157, 159, 160, 161, 164, 165, 166
|
||||
1, 2, 4, 5, 157, 159, 160, 161, 164, 165, 166,
|
||||
};
|
||||
|
||||
internal static readonly ushort[] Pouch_Key_GS = {
|
||||
7, 54, 55, 58, 59, 61, 66, 67, 68, 69, 71, 127, 128, 130, 133, 134, 175, 178
|
||||
7, 54, 55, 58, 59, 61, 66, 67, 68, 69, 71, 127, 128, 130, 133, 134, 175, 178,
|
||||
};
|
||||
|
||||
internal static readonly ushort[] Pouch_Key_C = ArrayUtil.ConcatAll(Pouch_Key_GS, new ushort[]{70, 115, 116, 129});
|
||||
|
||||
internal static readonly ushort[] Pouch_TMHM_GSC = {
|
||||
191, 192, 193, 194, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 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
|
||||
191, 192, 193, 194, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 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,
|
||||
};
|
||||
|
||||
internal static readonly ushort[] HeldItems_GSC = ArrayUtil.ConcatAll(Pouch_Items_GSC, Pouch_Ball_GSC, Pouch_TMHM_GSC);
|
||||
|
|
@ -48,7 +48,7 @@ namespace PKHeX.Core
|
|||
189, 104, 008, 207, 214, 188, 201, 126, 129, 111,
|
||||
009, 138, 197, 156, 213, 168, 211, 007, 210, 171,
|
||||
|
||||
015, 019, 057, 070, 148, 250, 127
|
||||
015, 019, 057, 070, 148, 250, 127,
|
||||
};
|
||||
|
||||
internal static readonly int[] Tutors_GSC = { (int)Move.Flamethrower, (int)Move.Thunderbolt, (int)Move.IceBeam };
|
||||
|
|
|
|||
|
|
@ -16,11 +16,11 @@ namespace PKHeX.Core
|
|||
|
||||
#region RS
|
||||
internal static readonly ushort[] Pouch_Items_RS = {
|
||||
13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 63, 64, 65, 66, 67, 68, 69, 70, 71, 73, 74, 75, 76, 77, 78, 79, 80, 81, 83, 84, 85, 86, 93, 94, 95, 96, 97, 98, 103, 104, 106, 107, 108, 109, 110, 111, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 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, 254, 255, 256, 257, 258
|
||||
13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 63, 64, 65, 66, 67, 68, 69, 70, 71, 73, 74, 75, 76, 77, 78, 79, 80, 81, 83, 84, 85, 86, 93, 94, 95, 96, 97, 98, 103, 104, 106, 107, 108, 109, 110, 111, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 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, 254, 255, 256, 257, 258,
|
||||
};
|
||||
|
||||
internal static readonly ushort[] Pouch_Key_RS = {
|
||||
259, 260, 261, 262, 263, 264, 265, 266, 268, 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, 287, 288
|
||||
259, 260, 261, 262, 263, 264, 265, 266, 268, 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, 287, 288,
|
||||
};
|
||||
|
||||
internal static readonly ushort[] Pouch_TM_RS = {
|
||||
|
|
@ -28,15 +28,15 @@ namespace PKHeX.Core
|
|||
};
|
||||
|
||||
public static readonly ushort[] Pouch_HM_RS = {
|
||||
339, 340, 341, 342, 343, 344, 345, 346
|
||||
339, 340, 341, 342, 343, 344, 345, 346,
|
||||
};
|
||||
|
||||
internal static readonly ushort[] Pouch_Berries_RS = {
|
||||
133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175
|
||||
133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175,
|
||||
};
|
||||
|
||||
internal static readonly ushort[] Pouch_Ball_RS = {
|
||||
1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12
|
||||
1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12,
|
||||
};
|
||||
|
||||
internal static readonly ushort[] Pouch_Key_FRLG = ArrayUtil.ConcatAll(Pouch_Key_RS, new ushort[] { 349, 350, 351, 352, 353, 354, 355, 356, 357, 358, 359, 360, 361, 362, 363, 364, 365, 366, 367, 368, 369, 370, 371, 372, 373, 374 });
|
||||
|
|
@ -81,7 +81,7 @@ namespace PKHeX.Core
|
|||
500, 501, 502, 503, 504, 505, 506, 507, 508, 509,
|
||||
510, 512, 516, 517, 518, 519,
|
||||
523, 524, 525, 526, 527, 528, 529,
|
||||
530, 531, 532, 533
|
||||
530, 531, 532, 533,
|
||||
};
|
||||
|
||||
internal static readonly ushort[] Pouch_Disc_XD =
|
||||
|
|
@ -92,7 +92,7 @@ namespace PKHeX.Core
|
|||
560, 561, 562, 563, 564, 565, 566, 567, 568, 569,
|
||||
570, 571, 572, 573, 574, 575, 576, 577, 578, 579,
|
||||
580, 581, 582, 583, 584, 585, 586, 587, 588, 589,
|
||||
590, 591, 592, 593
|
||||
590, 591, 592, 593,
|
||||
};
|
||||
|
||||
internal static readonly bool[] ReleasedHeldItems_3 = GetPermitList(MaxItemID_3, HeldItems_RS, new ushort[] {005}); // Safari Ball
|
||||
|
|
@ -122,7 +122,7 @@ namespace PKHeX.Core
|
|||
{
|
||||
005, 014, 025, 034, 038, 068, 069, 102, 118, 135,
|
||||
138, 086, 153, 157, 164, 223, 205, 244, 173, 196,
|
||||
203, 189, 008, 207, 214, 129, 111, 009, 007, 210
|
||||
203, 189, 008, 207, 214, 129, 111, 009, 007, 210,
|
||||
};
|
||||
|
||||
// subset of Emerald Tutors
|
||||
|
|
@ -143,7 +143,7 @@ namespace PKHeX.Core
|
|||
|
||||
internal static readonly int[] SpecialTutors_XD_Exclusive =
|
||||
{
|
||||
120, 143, 171
|
||||
120, 143, 171,
|
||||
};
|
||||
|
||||
internal static readonly int[][] SpecialTutors_Compatibility_XD_Exclusive =
|
||||
|
|
@ -164,7 +164,7 @@ namespace PKHeX.Core
|
|||
190, 196, 197, 198, 199, 200, 203, 206, 215, 228, 229,
|
||||
233, 234, 238, 248, 249, 250, 251, 280, 281, 282, 284,
|
||||
292, 302, 315, 316, 317, 327, 353, 354, 355, 356, 358,
|
||||
359, 385, 386 }
|
||||
359, 385, 386 },
|
||||
};
|
||||
|
||||
// 064 is an unused location for Meteor Falls
|
||||
|
|
@ -187,7 +187,7 @@ namespace PKHeX.Core
|
|||
120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139,
|
||||
140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 159, 160, 161, 162, 163,
|
||||
164, 165, 166, 167, 168, 169, 170, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186,
|
||||
187, 188, 189, 190, 191, 192, 193, 194, 195, 196
|
||||
187, 188, 189, 190, 191, 192, 193, 194, 195, 196,
|
||||
};
|
||||
|
||||
internal static readonly HashSet<int> ValidMet_E = new(ValidMet_RS)
|
||||
|
|
|
|||
|
|
@ -41,40 +41,40 @@ namespace PKHeX.Core
|
|||
3011, 3012, 3013, 3014, 3015, 3016, 3017, 3018, 3019, 3020, 3021, 3022, 3023, 3024, 3025, 3026, 3027, 3028,
|
||||
3029, 3030, 3031, 3032, 3033, 3034, 3035, 3036, 3037, 3038, 3039, 3040, 3041, 3042, 3043, 3044, 3045, 3046,
|
||||
3047, 3048, 3049, 3050, 3051, 3052, 3053, 3054, 3055, 3056, 3057, 3058, 3059, 3060, 3061, 3062, 3063, 3064,
|
||||
3065, 3066, 3067, 3068, 3069, 3070, 3071, 3072, 3073, 3074, 3075, 3076
|
||||
3065, 3066, 3067, 3068, 3069, 3070, 3071, 3072, 3073, 3074, 3075, 3076,
|
||||
};
|
||||
|
||||
#region DP
|
||||
internal static readonly ushort[] Pouch_Items_DP = {
|
||||
68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 135, 136, 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, 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, 304, 305, 306, 307, 308, 309, 310, 311, 312, 313, 314, 315, 316, 317, 318, 319, 320, 321, 322, 323, 324, 325, 326, 327
|
||||
68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 135, 136, 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, 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, 304, 305, 306, 307, 308, 309, 310, 311, 312, 313, 314, 315, 316, 317, 318, 319, 320, 321, 322, 323, 324, 325, 326, 327,
|
||||
};
|
||||
|
||||
internal static readonly ushort[] Pouch_Key_DP = {
|
||||
428, 429, 430, 431, 432, 433, 434, 435, 436, 437, 438, 439, 440, 441, 442, 443, 444, 445, 446, 447, 448, 449, 450, 451, 452, 453, 454, 455, 456, 457, 458, 459, 460, 461, 462, 463, 464
|
||||
428, 429, 430, 431, 432, 433, 434, 435, 436, 437, 438, 439, 440, 441, 442, 443, 444, 445, 446, 447, 448, 449, 450, 451, 452, 453, 454, 455, 456, 457, 458, 459, 460, 461, 462, 463, 464,
|
||||
};
|
||||
|
||||
internal static readonly ushort[] Pouch_TMHM_DP = {
|
||||
328, 329, 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, 342, 343, 344, 345, 346, 347, 348, 349, 350, 351, 352, 353, 354, 355, 356, 357, 358, 359, 360, 361, 362, 363, 364, 365, 366, 367, 368, 369, 370, 371, 372, 373, 374, 375, 376, 377, 378, 379, 380, 381, 382, 383, 384, 385, 386, 387, 388, 389, 390, 391, 392, 393, 394, 395, 396, 397, 398, 399, 400, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, 415, 416, 417, 418, 419, 420, 421, 422, 423, 424, 425, 426, 427
|
||||
328, 329, 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, 342, 343, 344, 345, 346, 347, 348, 349, 350, 351, 352, 353, 354, 355, 356, 357, 358, 359, 360, 361, 362, 363, 364, 365, 366, 367, 368, 369, 370, 371, 372, 373, 374, 375, 376, 377, 378, 379, 380, 381, 382, 383, 384, 385, 386, 387, 388, 389, 390, 391, 392, 393, 394, 395, 396, 397, 398, 399, 400, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, 415, 416, 417, 418, 419, 420, 421, 422, 423, 424, 425, 426, 427,
|
||||
};
|
||||
|
||||
internal static readonly ushort[] Pouch_Mail_DP = {
|
||||
137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148
|
||||
137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148,
|
||||
};
|
||||
|
||||
internal static readonly ushort[] Pouch_Medicine_DP = {
|
||||
17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54
|
||||
17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54,
|
||||
};
|
||||
|
||||
internal static readonly ushort[] Pouch_Berries_DP = {
|
||||
149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212
|
||||
149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212,
|
||||
};
|
||||
|
||||
internal static readonly ushort[] Pouch_Ball_DP = {
|
||||
1, 2, 3, 4, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16
|
||||
1, 2, 3, 4, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
|
||||
};
|
||||
|
||||
internal static readonly ushort[] Pouch_Battle_DP = {
|
||||
55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67
|
||||
55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67,
|
||||
};
|
||||
|
||||
internal static readonly ushort[] HeldItems_DP = ArrayUtil.ConcatAll(Pouch_Items_DP, Pouch_Mail_DP, Pouch_Medicine_DP, Pouch_Berries_DP, Pouch_Ball_DP, Pouch_TMHM_DP.Slice(0, Pouch_TMHM_DP.Length - 8));
|
||||
|
|
@ -82,11 +82,11 @@ namespace PKHeX.Core
|
|||
|
||||
#region Pt
|
||||
internal static readonly ushort[] Pouch_Items_Pt = {
|
||||
68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 135, 136, 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, 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, 304, 305, 306, 307, 308, 309, 310, 311, 312, 313, 314, 315, 316, 317, 318, 319, 320, 321, 322, 323, 324, 325, 326, 327
|
||||
68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 135, 136, 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, 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, 304, 305, 306, 307, 308, 309, 310, 311, 312, 313, 314, 315, 316, 317, 318, 319, 320, 321, 322, 323, 324, 325, 326, 327,
|
||||
};
|
||||
|
||||
internal static readonly ushort[] Pouch_Key_Pt = {
|
||||
428, 429, 430, 431, 432, 433, 434, 435, 436, 437, 438, 439, 440, 441, 442, 443, 444, 445, 446, 447, 448, 449, 450, 451, 452, 453, 454, 455, 456, 457, 458, 459, 460, 461, 462, 463, 464, 465, 466, 467
|
||||
428, 429, 430, 431, 432, 433, 434, 435, 436, 437, 438, 439, 440, 441, 442, 443, 444, 445, 446, 447, 448, 449, 450, 451, 452, 453, 454, 455, 456, 457, 458, 459, 460, 461, 462, 463, 464, 465, 466, 467,
|
||||
};
|
||||
|
||||
internal static readonly ushort[] Pouch_TMHM_Pt = Pouch_TMHM_DP;
|
||||
|
|
@ -103,7 +103,7 @@ namespace PKHeX.Core
|
|||
internal static readonly ushort[] Pouch_Items_HGSS = Pouch_Items_Pt;
|
||||
|
||||
internal static readonly ushort[] Pouch_Key_HGSS = {
|
||||
434, 435, 437, 444, 445, 446, 447, 450, 456, 464, 465, 466, 468, 469, 470, 471, 472, 473, 474, 475, 476, 477, 478, 479, 480, 481, 482, 483, 484, 501, 502, 503, 504, 532, 533, 534, 535, 536
|
||||
434, 435, 437, 444, 445, 446, 447, 450, 456, 464, 465, 466, 468, 469, 470, 471, 472, 473, 474, 475, 476, 477, 478, 479, 480, 481, 482, 483, 484, 501, 502, 503, 504, 532, 533, 534, 535, 536,
|
||||
};
|
||||
|
||||
internal static readonly ushort[] Pouch_TMHM_HGSS = Pouch_TMHM_DP;
|
||||
|
|
@ -112,7 +112,7 @@ namespace PKHeX.Core
|
|||
internal static readonly ushort[] Pouch_Berries_HGSS = Pouch_Berries_DP;
|
||||
|
||||
internal static readonly ushort[] Pouch_Ball_HGSS = {
|
||||
1, 2, 3, 4, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 492, 493, 494, 495, 496, 497, 498, 499, 500
|
||||
1, 2, 3, 4, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 492, 493, 494, 495, 496, 497, 498, 499, 500,
|
||||
};
|
||||
|
||||
internal static readonly ushort[] Pouch_Battle_HGSS = Pouch_Battle_DP;
|
||||
|
|
@ -204,7 +204,7 @@ namespace PKHeX.Core
|
|||
414, 441, 239, 402, 334, 393, 387, 340,
|
||||
271, 257, 282, 389, 129, 253, 162, 220,
|
||||
081, 366, 356, 388, 277, 272, 215, 067,
|
||||
143, 335, 450, 029
|
||||
143, 335, 450, 029,
|
||||
};
|
||||
|
||||
internal static readonly int[] SpecialTutors_4 =
|
||||
|
|
@ -220,7 +220,7 @@ namespace PKHeX.Core
|
|||
new[] { 006, 157, 257, 392 },
|
||||
new[] { 009, 160, 260, 395 },
|
||||
new[] { 003, 154, 254, 389 },
|
||||
new[] { 147, 148, 149, 230, 329, 330, 334, 371, 372, 373, 380, 381, 384, 443, 444, 445, 483, 484, 487 }
|
||||
new[] { 147, 148, 149, 230, 329, 330, 334, 371, 372, 373, 380, 381, 384, 443, 444, 445, 483, 484, 487 },
|
||||
};
|
||||
|
||||
internal static readonly HashSet<int> ValidMet_DP = new()
|
||||
|
|
@ -257,7 +257,7 @@ namespace PKHeX.Core
|
|||
|
||||
internal static readonly HashSet<int> GiftEggLocation4 = new()
|
||||
{
|
||||
2009, 2010, 2011, 2013, 2014
|
||||
2009, 2010, 2011, 2013, 2014,
|
||||
};
|
||||
|
||||
internal static int GetTransfer45MetLocation(PKM pkm)
|
||||
|
|
@ -269,7 +269,7 @@ namespace PKHeX.Core
|
|||
{
|
||||
243 or 244 or 245 => Locations.Transfer4_CrownUnused, // Beast
|
||||
251 => Locations.Transfer4_CelebiUnused, // Celebi
|
||||
_ => Locations.Transfer4
|
||||
_ => Locations.Transfer4,
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -52,15 +52,15 @@ namespace PKHeX.Core
|
|||
};
|
||||
|
||||
internal static readonly ushort[] Pouch_TMHM_BW = {
|
||||
328, 329, 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, 342, 343, 344, 345, 346, 347, 348, 349, 350, 351, 352, 353, 354, 355, 356, 357, 358, 359, 360, 361, 362, 363, 364, 365, 366, 367, 368, 369, 370, 371, 372, 373, 374, 375, 376, 377, 378, 379, 380, 381, 382, 383, 384, 385, 386, 387, 388, 389, 390, 391, 392, 393, 394, 395, 396, 397, 398, 399, 400, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, 415, 416, 417, 418, 419, 618, 619, 620, 420, 421, 422, 423, 424, 425
|
||||
328, 329, 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, 342, 343, 344, 345, 346, 347, 348, 349, 350, 351, 352, 353, 354, 355, 356, 357, 358, 359, 360, 361, 362, 363, 364, 365, 366, 367, 368, 369, 370, 371, 372, 373, 374, 375, 376, 377, 378, 379, 380, 381, 382, 383, 384, 385, 386, 387, 388, 389, 390, 391, 392, 393, 394, 395, 396, 397, 398, 399, 400, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, 415, 416, 417, 418, 419, 618, 619, 620, 420, 421, 422, 423, 424, 425,
|
||||
};
|
||||
|
||||
internal static readonly ushort[] Pouch_Medicine_BW = {
|
||||
17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 134, 504, 565, 566, 567, 568, 569, 570, 591
|
||||
17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 134, 504, 565, 566, 567, 568, 569, 570, 591,
|
||||
};
|
||||
|
||||
internal static readonly ushort[] Pouch_Berries_BW = {
|
||||
149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212
|
||||
149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212,
|
||||
};
|
||||
|
||||
internal static readonly ushort[] HeldItems_BW = ArrayUtil.ConcatAll(Pouch_Items_BW, Pouch_Medicine_BW, Pouch_Berries_BW);
|
||||
|
|
@ -82,7 +82,7 @@ namespace PKHeX.Core
|
|||
404, 525, 526, 398, 138, 447, 207, 365, 369, 164,
|
||||
430, 433, 528, 249, 555,
|
||||
|
||||
015, 019, 057, 070, 127, 291
|
||||
015, 019, 057, 070, 127, 291,
|
||||
};
|
||||
|
||||
internal static readonly byte[] MovePP_BW =
|
||||
|
|
@ -128,7 +128,7 @@ namespace PKHeX.Core
|
|||
new[] { 450, 343, 162, 530, 324, 442, 402, 529, 340, 067, 441, 253, 009, 007, 008 }, // Driftveil City
|
||||
new[] { 277, 335, 414, 492, 356, 393, 334, 387, 276, 527, 196, 401, 399, 428, 406, 304, 231 }, // Lentimas Town
|
||||
new[] { 020, 173, 282, 235, 257, 272, 215, 366, 143, 220, 202, 409, 355 }, // Humilau City
|
||||
new[] { 380, 388, 180, 495, 270, 271, 478, 472, 283, 200, 278, 289, 446, 214, 285 } // Nacrene City
|
||||
new[] { 380, 388, 180, 495, 270, 271, 478, 472, 283, 200, 278, 289, 446, 214, 285 }, // Nacrene City
|
||||
};
|
||||
|
||||
internal static readonly HashSet<int> ValidMet_BW = new()
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ namespace PKHeX.Core
|
|||
40071, 40072, 40073, 40074, 40075, 40076, 40077, 40078, 40079,
|
||||
};
|
||||
|
||||
internal static readonly int[] Met_XY_6 = {/* XY */ 60001, 60003, /* ORAS */ 60004,};
|
||||
internal static readonly int[] Met_XY_6 = {/* XY */ 60001, 60003, /* ORAS */ 60004 };
|
||||
|
||||
#endregion
|
||||
|
||||
|
|
@ -163,7 +163,7 @@ namespace PKHeX.Core
|
|||
052, 053, 054, 134, 504, 565, 566, 567, 568, 569, 570, 571, 591, 645, 708, 709,
|
||||
|
||||
//ORAS
|
||||
065, 066, 067
|
||||
065, 066, 067,
|
||||
};
|
||||
|
||||
public static readonly ushort[] Pouch_Berry_XY =
|
||||
|
|
@ -241,7 +241,7 @@ namespace PKHeX.Core
|
|||
038, 039, 040, 042, 043, 044, 046, 047, 048, 050, 051, 052, 054, 055, 056, 058, 060, 062, 063, 064, 066, 067,
|
||||
068, 069, 070, 072, 074, 075, 076, 078, 079, 082, 084, 085, 086, 088, 089, 090, 092, 093, 094, 096, 097, 098,
|
||||
100, 101, 102, 103, 104, 106, 108, 110, 112, 114, 116, 118, 120, 122, 124, 126, 128, 130, 132, 134, 135, 136,
|
||||
138, 140, 142, 144, 146, 148, 150, 152, 154, 156, 158, 160, 162, 164, 166, 168
|
||||
138, 140, 142, 144, 146, 148, 150, 152, 154, 156, 158, 160, 162, 164, 166, 168,
|
||||
};
|
||||
|
||||
internal static readonly HashSet<int> ValidMet_AO = new()
|
||||
|
|
@ -250,7 +250,7 @@ namespace PKHeX.Core
|
|||
200, 202, 204, 206, 208, 210, 212, 214, 216, 218, 220, 222, 224, 226, 228, 230, 232, 234, 236, 238, 240, 242,
|
||||
244, 246, 248, 250, 252, 254, 256, 258, 260, 262, 264, 266, 268, 270, 272, 274, 276, 278, 280, 282, 284, 286,
|
||||
288, 290, 292, 294, 296, 298, 300, 302, 304, 306, 308, 310, 312, 314, 316, 318, 320, 322, 324, 326, 328, 330,
|
||||
332, 334, 336, 338, 340, 342, 344, 346, 350, 352, 354
|
||||
332, 334, 336, 338, 340, 342, 344, 346, 350, 352, 354,
|
||||
};
|
||||
|
||||
internal static readonly byte[] MovePP_XY =
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ namespace PKHeX.Core
|
|||
|
||||
internal static readonly int[] Met_SM_3 =
|
||||
{
|
||||
30001, 30003, 30004, 30005, 30006, 30007, 30008, 30009, 30010, 30011, 30012, 30013, 30014, 30015, 30016, 30017
|
||||
30001, 30003, 30004, 30005, 30006, 30007, 30008, 30009, 30010, 30011, 30012, 30013, 30014, 30015, 30016, 30017,
|
||||
};
|
||||
|
||||
internal static readonly int[] Met_SM_4 =
|
||||
|
|
@ -49,7 +49,7 @@ namespace PKHeX.Core
|
|||
40080, 40081, 40082, 40083, 40084, 40085, 40086, 40087, 40088,
|
||||
};
|
||||
|
||||
internal static readonly int[] Met_SM_6 = {/* XY */ 60001, 60003, /* ORAS */ 60004, };
|
||||
internal static readonly int[] Met_SM_6 = {/* XY */ 60001, 60003, /* ORAS */ 60004 };
|
||||
|
||||
#endregion
|
||||
|
||||
|
|
@ -60,7 +60,7 @@ namespace PKHeX.Core
|
|||
020, 173, 282, 235, 257, 272, 215, 366, 143, 220, 202, 409, 264, 351, 352,
|
||||
380, 388, 180, 495, 270, 271, 478, 472, 283, 200, 278, 289, 446, 285,
|
||||
|
||||
477, 502, 432, 710, 707, 675, 673
|
||||
477, 502, 432, 710, 707, 675, 673,
|
||||
};
|
||||
|
||||
internal static readonly ushort[] Pouch_Regular_SM = // 00
|
||||
|
|
@ -84,7 +84,7 @@ namespace PKHeX.Core
|
|||
|
||||
internal static readonly ushort[] Pouch_Ball_SM = { // 08
|
||||
1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 492, 493, 494, 495, 496, 497, 498, 576,
|
||||
851
|
||||
851,
|
||||
};
|
||||
|
||||
internal static readonly ushort[] Pouch_Battle_SM = { // 16
|
||||
|
|
@ -106,7 +106,7 @@ namespace PKHeX.Core
|
|||
});
|
||||
|
||||
public static readonly ushort[] Pouch_Roto_USUM = {
|
||||
949, 950, 951, 952, 953, 954, 955, 956, 957, 958, 959
|
||||
949, 950, 951, 952, 953, 954, 955, 956, 957, 958, 959,
|
||||
};
|
||||
|
||||
internal static readonly ushort[] Pouch_TMHM_SM = { // 02
|
||||
|
|
@ -134,15 +134,15 @@ namespace PKHeX.Core
|
|||
};
|
||||
|
||||
internal static readonly ushort[] Pouch_ZCrystalHeld_SM = { // Piece
|
||||
776, 777, 778, 779, 780, 781, 782, 783, 784, 785, 786, 787, 788, 789, 790, 791, 792, 793, 794, 798, 799, 800, 801, 802, 803, 804, 805, 806, 836
|
||||
776, 777, 778, 779, 780, 781, 782, 783, 784, 785, 786, 787, 788, 789, 790, 791, 792, 793, 794, 798, 799, 800, 801, 802, 803, 804, 805, 806, 836,
|
||||
};
|
||||
|
||||
internal static readonly ushort[] Pouch_ZCrystal_USUM = ArrayUtil.ConcatAll(Pouch_ZCrystal_SM, new ushort[] { // Bead
|
||||
927, 928, 929, 930, 931, 932
|
||||
927, 928, 929, 930, 931, 932,
|
||||
});
|
||||
|
||||
internal static readonly ushort[] Pouch_ZCrystalHeld_USUM = ArrayUtil.ConcatAll(Pouch_ZCrystalHeld_SM, new ushort[] { // Piece
|
||||
921, 922, 923, 924, 925, 926
|
||||
921, 922, 923, 924, 925, 926,
|
||||
});
|
||||
|
||||
public static readonly Dictionary<int, int> ZCrystalDictionary = GetDictionary(Pouch_ZCrystal_USUM, Pouch_ZCrystalHeld_USUM);
|
||||
|
|
@ -230,7 +230,7 @@ namespace PKHeX.Core
|
|||
418, 419, // Floatzel
|
||||
194, 195, // Quagsire
|
||||
|
||||
100, 101 // Voltorb & Electrode
|
||||
100, 101, // Voltorb & Electrode
|
||||
};
|
||||
|
||||
internal static readonly int[] ZygardeMoves =
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ namespace PKHeX.Core
|
|||
|
||||
internal static readonly int[] Met_GG_3 =
|
||||
{
|
||||
30001, 30003, 30004, 30005, 30006, 30007, 30008, 30009, 30010, 30011, 30012, 30013, 30014, 30015, 30016, 30017
|
||||
30001, 30003, 30004, 30005, 30006, 30007, 30008, 30009, 30010, 30011, 30012, 30013, 30014, 30015, 30016, 30017,
|
||||
};
|
||||
|
||||
internal static readonly int[] Met_GG_4 =
|
||||
|
|
@ -44,7 +44,7 @@ namespace PKHeX.Core
|
|||
40070, 40071, 40072, 40073, 40074, 40075, 40076, 40077,
|
||||
};
|
||||
|
||||
internal static readonly int[] Met_GG_6 = {/* XY */ 60001, 60003, /* ORAS */ 60004, };
|
||||
internal static readonly int[] Met_GG_6 = {/* XY */ 60001, 60003, /* ORAS */ 60004 };
|
||||
|
||||
#endregion
|
||||
|
||||
|
|
@ -96,7 +96,7 @@ namespace PKHeX.Core
|
|||
};
|
||||
|
||||
internal static readonly ushort[] Pouch_Catching_GG =
|
||||
{
|
||||
{
|
||||
001, 002, 003, 004, 012, 164, 166, 168,
|
||||
861, 862, 863, 864, 865, 866,
|
||||
};
|
||||
|
|
@ -268,7 +268,7 @@ namespace PKHeX.Core
|
|||
406, 417, 420, 430, 438, 446, 453, 483, 492, 499,
|
||||
503, 504, 525, 529, 583, 585, 603, 605, 606, 607,
|
||||
729, 730, 731, 733, 734, 735, 736, 737, 738, 739,
|
||||
740, 742
|
||||
740, 742,
|
||||
};
|
||||
|
||||
#endregion
|
||||
|
|
|
|||
|
|
@ -12,9 +12,9 @@ namespace PKHeX.Core
|
|||
|
||||
// Orion (No DLC)
|
||||
internal const int MaxSpeciesID_8_O0 = 890; // Eternatus
|
||||
internal const int MaxMoveID_8_O0 = 796; // Steel Beam (jet fuel)
|
||||
internal const int MaxMoveID_8_O0 = 796; // Steel Beam
|
||||
internal const int MaxItemID_8_O0 = 1278; // Rotom Catalog, ignore all catalog parts
|
||||
internal const int MaxAbilityID_8_O0 = 258;
|
||||
internal const int MaxAbilityID_8_O0 = 258; // Hunger Switch
|
||||
|
||||
// Rigel 1 (DLC 1: Isle of Armor)
|
||||
internal const int MaxSpeciesID_8_R1 = 893; // Zarude
|
||||
|
|
@ -26,10 +26,10 @@ namespace PKHeX.Core
|
|||
internal const int MaxSpeciesID_8_R2 = 898; // Calyrex
|
||||
internal const int MaxMoveID_8_R2 = 826; // Eerie Spell
|
||||
internal const int MaxItemID_8_R2 = 1607; // Reins of Unity
|
||||
internal const int MaxAbilityID_8_R2 = 267; // As One
|
||||
internal const int MaxAbilityID_8_R2 = 267; // As One (Glastrier)
|
||||
|
||||
internal const int MaxBallID_8 = 0x1A; // 26 Beast
|
||||
internal const int MaxGameID_8 = 45;
|
||||
internal const int MaxGameID_8 = 45; // Shield
|
||||
|
||||
#region Met Locations
|
||||
internal static readonly int[] Met_SWSH_0 =
|
||||
|
|
@ -65,7 +65,7 @@ namespace PKHeX.Core
|
|||
|
||||
internal static readonly int[] Met_SWSH_3 =
|
||||
{
|
||||
30001, 30003, 30004, 30005, 30006, 30007, 30008, 30009, 30010, 30011, 30012, 30013, 30014, 30015, 30016, 30017, 30018
|
||||
30001, 30003, 30004, 30005, 30006, 30007, 30008, 30009, 30010, 30011, 30012, 30013, 30014, 30015, 30016, 30017, 30018,
|
||||
};
|
||||
|
||||
internal static readonly int[] Met_SWSH_4 =
|
||||
|
|
@ -81,7 +81,7 @@ namespace PKHeX.Core
|
|||
40081, 40082, 40083, 40084, 40085, 40086,
|
||||
};
|
||||
|
||||
internal static readonly int[] Met_SWSH_6 = {/* XY */ 60001, 60003, /* ORAS */ 60004, };
|
||||
internal static readonly int[] Met_SWSH_6 = {/* XY */ 60001, 60003, /* ORAS */ 60004 };
|
||||
#endregion
|
||||
|
||||
internal static readonly ushort[] Pouch_Regular_SWSH =
|
||||
|
|
@ -119,7 +119,7 @@ namespace PKHeX.Core
|
|||
1568, 1569, 1570, 1571, 1572, 1573, 1574, 1575, 1576, 1577, 1578, 1581, 1582, 1588,
|
||||
|
||||
// DLC 2
|
||||
1592, 1604, 1606
|
||||
1592, 1604, 1606,
|
||||
};
|
||||
|
||||
internal static readonly ushort[] Pouch_Ball_SWSH =
|
||||
|
|
@ -132,7 +132,7 @@ namespace PKHeX.Core
|
|||
|
||||
internal static readonly ushort[] Pouch_Battle_SWSH =
|
||||
{
|
||||
055, 056, 057, 058, 059, 060, 061, 062, 063, 1580
|
||||
055, 056, 057, 058, 059, 060, 061, 062, 063, 1580,
|
||||
};
|
||||
|
||||
internal static readonly ushort[] Pouch_Items_SWSH = ArrayUtil.ConcatAll(Pouch_Regular_SWSH, Pouch_Ball_SWSH, Pouch_Battle_SWSH);
|
||||
|
|
|
|||
Loading…
Reference in a new issue