From bf57ff1286987f3b5527da9fa0fefd24dad00dc4 Mon Sep 17 00:00:00 2001 From: sora10pls <17801814+sora10pls@users.noreply.github.com> Date: Tue, 15 Sep 2026 10:37:11 -0400 Subject: [PATCH] Add GO move remapping for GO Park complex summaries --- PKHeX.Core/Moves/MoveInfo.cs | 2 + PKHeX.Core/Moves/MoveInfoGO.cs | 73 +++++++++++++++++++ .../Saves/Substructures/Gen7/LGPE/GP1.cs | 12 ++- 3 files changed, 86 insertions(+), 1 deletion(-) create mode 100644 PKHeX.Core/Moves/MoveInfoGO.cs diff --git a/PKHeX.Core/Moves/MoveInfo.cs b/PKHeX.Core/Moves/MoveInfo.cs index fd5d66a04..29a9d5278 100644 --- a/PKHeX.Core/Moves/MoveInfo.cs +++ b/PKHeX.Core/Moves/MoveInfo.cs @@ -252,4 +252,6 @@ public static bool IsAnyFromGeneration(EntityContext context, ReadOnlySpan MoveInfoGO.GOToCoreSeries[move]; } diff --git a/PKHeX.Core/Moves/MoveInfoGO.cs b/PKHeX.Core/Moves/MoveInfoGO.cs new file mode 100644 index 000000000..75c550026 --- /dev/null +++ b/PKHeX.Core/Moves/MoveInfoGO.cs @@ -0,0 +1,73 @@ +using System; + +namespace PKHeX.Core; + +/// +/// Details about moves in +/// +internal static class MoveInfoGO +{ + public static ReadOnlySpan GOToCoreSeries => + [ + 000, 084, 098, 010, 052, 022, 033, 075, 036, 055, + 044, 001, 003, 035, 063, 122, 399, 123, 124, 232, + 011, 172, 224, 017, 053, 389, 091, 067, 238, 427, + 060, 089, 444, 008, 531, 435, 430, 064, 065, 058, + 059, 403, 257, 041, 398, 332, 529, 572, 072, 405, + 305, 400, 163, 061, 066, 002, 490, 453, 401, 402, + 473, 088, 246, 317, 157, 408, 425, 325, 421, 466, + 247, 418, 443, 211, 442, 570, 209, 009, 087, 085, + 239, 225, 406, 337, 574, 577, 605, 585, 583, 440, + 188, 482, 441, 341, 125, 523, 426, 210, 450, 324, + 404, 488, 481, 126, 362, 352, 503, 056, 094, 540, + 420, 196, 524, 071, 202, 007, 076, 348, 438, 150, + 051, 314, 542, 280, 015, 129, 030, 023, 029, 158, + 021, 034, 156, 165, 503, 056, 035, 035, -01, -01, + -01, -01, -01, -01, -01, -01, -01, -01, -01, -01, + -01, -01, -01, -01, -01, -01, -01, -01, -01, -01, + -01, -01, -01, -01, -01, -01, -01, -01, -01, -01, + -01, -01, -01, -01, -01, -01, -01, -01, -01, -01, + -01, -01, -01, -01, -01, -01, -01, -01, -01, -01, + -01, -01, -01, -01, -01, -01, -01, -01, -01, -01, + 210, 450, 044, 389, 225, 084, 209, 067, 002, 052, + 017, 064, 122, 421, 022, 075, 341, 420, 524, 098, + 010, 033, 001, 015, 398, 051, 427, 088, 232, 418, + 055, 150, 055, 189, 428, 093, 040, 145, 185, 211, + 424, 249, 144, 068, 181, 370, 223, 411, 062, 451, + 521, 528, 192, 525, 419, 403, 413, 143, 328, 350, + 611, 522, 318, 310, 506, 101, 231, 360, 484, 083, + 315, 331, 447, 412, 326, 248, 243, 200, 555, 242, + 492, 237, 036, 127, 057, 434, 353, 281, 354, 618, + 619, 217, 311, 311, 311, 311, 338, 479, 307, 308, + 387, 309, 130, 491, 414, 152, 679, 306, 190, 429, + 276, 565, 536, 141, 409, 708, 330, 299, 534, 612, + 204, 416, 218, 216, 485, 199, 422, 423, 032, 090, + 533, 560, 396, 371, 439, 177, 546, 546, 546, 546, + 546, 019, 557, 437, 161, 016, 510, -01, 297, -01, + 584, -01, 311, 706, 621, 593, 024, 345, 221, 333, + -01, -01, -01, -01, 512, 295, 296, 693, 205, 465, + 792, 467, 800, 594, 559, 558, 809, 667, 549, 784, + 586, 742, 595, 710, 620, 670, 463, 601, 460, 613, + 717, 813, 885, 815, 459, 846, 848, 847, 662, 344, + 663, 149, 319, 028, 713, 714, 783, 783, 136, 757, + 758, 759, 760, 761, 762, 763, 764, 765, 766, 767, + 768, 769, 770, 771, 772, 773, 774, -01, -01, -01, + -01, -01, -01, -01, -01, -01, -01, -01, -01, -01, + -01, -01, -01, -01, -01, -01, -01, -01, -01, -01, + -01, -01, -01, -01, -01, -01, -01, -01, -01, -01, + -01, -01, 395, 664, 889, 870, 553, 554, 871, 781, + 782, 918, 819, -01, -01, -01, -01, -01, -01, 781, + 782, -01, 744, 744, 691, 462, 820, 872, 886, 548, + 690, 720, 778, 780, 893, -01, -01, 721, -01, -01, + -01, -01, -01, -01, -01, -01, -01, -01, -01, -01, + -01, -01, -01, -01, -01, -01, -01, -01, -01, -01, + -01, -01, -01, -01, -01, -01, -01, -01, -01, -01, + -01, -01, -01, -01, -01, -01, -01, -01, -01, -01, + -01, -01, -01, -01, -01, -01, -01, -01, -01, -01, + -01, -01, -01, -01, -01, -01, -01, -01, -01, -01, + -01, -01, -01, -01, -01, -01, -01, -01, -01, -01, + -01, -01, -01, -01, -01, -01, -01, -01, -01, -01, + -01, -01, -01, -01, -01, -01, -01, -01, -01, -01, + 862, -01, 745, 291, -01, -01, + ]; +} diff --git a/PKHeX.Core/Saves/Substructures/Gen7/LGPE/GP1.cs b/PKHeX.Core/Saves/Substructures/Gen7/LGPE/GP1.cs index 84d65877a..70bd45214 100644 --- a/PKHeX.Core/Saves/Substructures/Gen7/LGPE/GP1.cs +++ b/PKHeX.Core/Saves/Substructures/Gen7/LGPE/GP1.cs @@ -134,7 +134,17 @@ public string FileNameWithoutExtension } public string GeoTime => $"Captured in {GeoCityName} by {Username1} on {Year}/{Month:00}/{Day:00}"; - public string StatMove => $"{IV_HP:00}/{IV_ATK:00}/{IV_DEF:00}, CP {CP:0000} (Moves {Move1:000}, {Move2:000})"; + public string StatMove + { + get + { + int indexMove1 = MoveInfo.GetMoveIndexFromGOIndex(Move1); + int indexMove2 = MoveInfo.GetMoveIndexFromGOIndex(Move2); + string nameMove1 = indexMove1 == -1 ? $"{indexMove1:000}" : GameInfo.Strings.movelist[indexMove1]; + string nameMove2 = indexMove2 == -1 ? $"{indexMove2:000}" : GameInfo.Strings.movelist[indexMove2]; + return $"{IV_HP:00}/{IV_ATK:00}/{IV_DEF:00}, CP {CP:0000} ({nameMove1}, {nameMove2})"; + } + } public string Dump(IReadOnlyList speciesNames, int index) => $"{index:000} {Nickname} ({speciesNames[Species]}{FormString} {ShinyString}[{GenderString}]) @ Lv. {Level:00} - {StatMove}, {GeoTime}."; ///