Mirrors/PKHeX
2
0
Fork 0
mirror of https://github.com/kwsch/PKHeX synced 2025-02-17 05:48:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

Show gen3+ berry analogues on gen2

Browse source 
also change "Reset key" to "Reset Password" to be closer to the game's
prompt
This commit is contained in:
Kurt 2017-09-24 12:05:36 -07:00
parent c0f5166184
commit e166f1eaa9
2 changed files with 26 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
PKHeX.Core/PKM/ItemConverter.cs
View file

@ -30,31 +30,31 @@
/// <summary> Gen2 items (index) and their corresponding Gen4 item ID (value) </summary>
private static readonly ushort[] arr2 =
{
000, 001, 002, 213, 003, 004, NaN, 450, 081, 018,
019, 020, 021, 022, 023, 024, 025, 026, 017, 078,
079, 041, 082, 083, 084, NaN, 045, 046, 047, 048,
256, 049, 050, 060, 085, 257, 092, 063, 027, 028,
029, 055, 076, 077, 056, NaN, 030, 031, 032, 057,
NaN, 058, 059, 061, 444, NaN, NaN, 216, 445, 446,
NaN, 447, 051, 038, 039, 040, 478, 464, 456, 484,
NaN, 482, 033, 217, NaN, NaN, 237, 244, NaN, NaN,
NaN, 245, 221, NaN, NaN, 485, 086, 087, 222, 487,
NaN, 223, 486, 488, 224, 243, 248, 490, 241, 491,
NaN, 489, 240, 473, NaN, 259, 228, 246, 242, NaN,
088, 089, 229, 247, 504, NaN, NaN, 239, 258, 230,
NaN, 034, 035, 036, 037, 238, 231, 475, 481, NaN,
NaN, 090, 091, 476, 480, NaN, NaN, NaN, 249, 043,
232, NaN, NaN, 233, 250, NaN, 234, NaN, NaN, NaN,
NaN, 235, NaN, NaN, NaN, NaN, 044, 495, NaN, 493,
NaN, 492, NaN, 236, 497, 498, 496, NaN, NaN, 080,
NaN, NaN, 252, NaN, NaN, 477, NaN, 500, 483, NaN,
NaN, NaN, NaN, NaN, NaN, NaN, NaN, NaN, NaN, NaN,
NaN, 328, 329, 330, 331, 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,
355, 356, 357, 358, 359, 360, 361, 362, 363, 364,
365, 366, 367, 368, 369, 370, 371, 372, 373, 374,
375, 376, 377, 420, 421, 422, 423, 424, 425, 426,
000, 001, 002, 213, 003, 004, NaN, 450, 081, 018, // 0
019, 020, 021, 022, 023, 024, 025, 026, 017, 078, // 1
079, 041, 082, 083, 084, NaN, 045, 046, 047, 048, // 2
256, 049, 050, 060, 085, 257, 092, 063, 027, 028, // 3
029, 055, 076, 077, 056, NaN, 030, 031, 032, 057, // 4
NaN, 058, 059, 061, 444, NaN, NaN, 216, 445, 446, // 5
NaN, 447, 051, 038, 039, 040, 478, 464, 456, 484, // 6
NaN, 482, 033, 217, 151, NaN, 237, 244, 149, 153, // 7
152, 245, 221, 156, 150, 485, 086, 087, 222, 487, // 8
NaN, 223, 486, 488, 224, 243, 248, 490, 241, 491, // 9
NaN, 489, 240, 473, NaN, 259, 228, 246, 242, 157, // 10
088, 089, 229, 247, 504, NaN, NaN, 239, 258, 230, // 11
NaN, 034, 035, 036, 037, 238, 231, 475, 481, NaN, // 12
NaN, 090, 091, 476, 480, NaN, NaN, NaN, 249, 043, // 13
232, NaN, NaN, 233, 250, NaN, 234, NaN, NaN, NaN, // 14
154, 235, NaN, NaN, NaN, NaN, 044, 495, NaN, 493, // 15
NaN, 492, NaN, 236, 497, 498, 496, NaN, NaN, 080, // 16
NaN, NaN, 252, 155, 158, 477, NaN, 500, 483, NaN, // 17
NaN, NaN, NaN, NaN, NaN, NaN, NaN, NaN, NaN, NaN, // 18
NaN, 328, 329, 330, 331, 331, 332, 333, 334, 335, // 19
336, 337, 338, 339, 340, 341, 342, 343, 344, 345, // 20
346, 347, 348, 349, 350, 351, 352, 353, 354, 355, // 21
355, 356, 357, 358, 359, 360, 361, 362, 363, 364, // 22
365, 366, 367, 368, 369, 370, 371, 372, 373, 374, // 23
375, 376, 377, 420, 421, 422, 423, 424, 425, 426, // 24
427, NaN, NaN, NaN, NaN, NaN,
};
/// <summary> Gen3 items (index) and their corresponding Gen4 item ID (value) </summary>

2
PKHeX.WinForms/Controls/SAV Editor/SAVEditor.cs
View file

@ -616,7 +616,7 @@ namespace PKHeX.WinForms.Controls
switch (SAV.Generation)
{
case 2:
WinFormsUtil.Alert($"Reset key: {((SAV2)SAV).ResetKey:00000}"); break;
WinFormsUtil.Alert($"Reset Password: {((SAV2)SAV).ResetKey:00000}"); break;
case 3:
new SAV_RTC3(SAV).ShowDialog(); break;
}