diff --git a/pkNX.Structures.FlatBuffers/pkNX.Structures.FlatBuffers.csproj b/pkNX.Structures.FlatBuffers/pkNX.Structures.FlatBuffers.csproj index e62f4bd2..30350fa0 100644 --- a/pkNX.Structures.FlatBuffers/pkNX.Structures.FlatBuffers.csproj +++ b/pkNX.Structures.FlatBuffers/pkNX.Structures.FlatBuffers.csproj @@ -1,4 +1,4 @@ - + net7.0 @@ -6,7 +6,7 @@ - + diff --git a/pkNX.Tests/pkNX.Tests.csproj b/pkNX.Tests/pkNX.Tests.csproj index 7a9aff12..a2b35a6a 100644 --- a/pkNX.Tests/pkNX.Tests.csproj +++ b/pkNX.Tests/pkNX.Tests.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/pkNX.WinForms/Controls/MegaEvoEntry.cs b/pkNX.WinForms/Controls/MegaEvoEntry.cs index 7ee3681f..0842a2d2 100644 --- a/pkNX.WinForms/Controls/MegaEvoEntry.cs +++ b/pkNX.WinForms/Controls/MegaEvoEntry.cs @@ -1,5 +1,6 @@ using System; using System.Windows.Forms; +using PKHeX.Core; using pkNX.Structures; using PKHeX.Drawing.PokeSprite; @@ -31,8 +32,8 @@ public MegaEvoEntry() private void ChangeSpecies(int form) { - PB_Base.Image = SpriteUtil.GetSprite((ushort)Species, 0, 0, 0, 0, false, PKHeX.Core.Shiny.Never, 7); - PB_Preview.Image = SpriteUtil.GetSprite((ushort)Species, (byte)form, 0, 0, 0, false, PKHeX.Core.Shiny.Never, 7); + PB_Base.Image = SpriteUtil.GetSprite((ushort)Species, 0, 0, 0, 0, false, PKHeX.Core.Shiny.Never, EntityContext.Gen7); + PB_Preview.Image = SpriteUtil.GetSprite((ushort)Species, (byte)form, 0, 0, 0, false, PKHeX.Core.Shiny.Never, EntityContext.Gen7); PB_Preview.Visible = PB_Base.Visible = L_Into.Visible = CB_Method.SelectedIndex > 0; } diff --git a/pkNX.WinForms/Dumping/TeraRaidRipper.cs b/pkNX.WinForms/Dumping/TeraRaidRipper.cs index facd0358..9bdcd29b 100644 --- a/pkNX.WinForms/Dumping/TeraRaidRipper.cs +++ b/pkNX.WinForms/Dumping/TeraRaidRipper.cs @@ -538,7 +538,7 @@ private static void DumpPretty(IFileInternal ROM, DeliveryRaidEnemyTableArray ta private static string GetItemName(ushort item, ReadOnlySpan items, ReadOnlySpan moves) { bool isTM = IsTM(item); - var tm = PKHeX.Core.LearnSource9SV.TM_SV.ToArray(); + var tm = PersonalDumperSV.TMIndexes; if (isTM) // append move name to TM return GetNameTM(item, items, moves, tm); @@ -559,6 +559,6 @@ private static string GetItemName(ushort item, ReadOnlySpan items, ReadO >= 328 and <= 419 => $"{items[item]} {moves[tm[001 + item - 328]]}", // TM001 to TM092, skip TM000 Mega Punch 618 or 619 or 620 => $"{items[item]} {moves[tm[093 + item - 618]]}", // TM093 to TM095 690 or 691 or 692 or 693 => $"{items[item]} {moves[tm[096 + item - 690]]}", // TM096 to TM099 - _ => $"{items[item]} {moves[tm[100 + item - 2160]]}" // TM100 to TM171 + _ => $"{items[item]} {moves[tm[100 + item - 2160]]}", // TM100 to TM171 }; } diff --git a/pkNX.WinForms/deps/PKHeX.Drawing.PokeSprite.deps.json b/pkNX.WinForms/deps/PKHeX.Drawing.PokeSprite.deps.json new file mode 100644 index 00000000..24fac9af --- /dev/null +++ b/pkNX.WinForms/deps/PKHeX.Drawing.PokeSprite.deps.json @@ -0,0 +1,115 @@ +{ + "runtimeTarget": { + "name": ".NETCoreApp,Version=v7.0", + "signature": "" + }, + "compilationOptions": {}, + "targets": { + ".NETCoreApp,Version=v7.0": { + "PKHeX.Drawing.PokeSprite/23.02.27": { + "dependencies": { + "PKHeX.Core": "23.2.27", + "PKHeX.Drawing": "23.2.27", + "System.Resources.Extensions": "7.0.0" + }, + "runtime": { + "PKHeX.Drawing.PokeSprite.dll": {} + } + }, + "Microsoft.Win32.SystemEvents/7.0.0": { + "runtime": { + "lib/net7.0/Microsoft.Win32.SystemEvents.dll": { + "assemblyVersion": "7.0.0.0", + "fileVersion": "7.0.22.51805" + } + }, + "runtimeTargets": { + "runtimes/win/lib/net7.0/Microsoft.Win32.SystemEvents.dll": { + "rid": "win", + "assetType": "runtime", + "assemblyVersion": "7.0.0.0", + "fileVersion": "7.0.22.51805" + } + } + }, + "System.Drawing.Common/7.0.0": { + "dependencies": { + "Microsoft.Win32.SystemEvents": "7.0.0" + }, + "runtime": { + "lib/net7.0/System.Drawing.Common.dll": { + "assemblyVersion": "7.0.0.0", + "fileVersion": "7.0.22.51805" + } + }, + "runtimeTargets": { + "runtimes/win/lib/net7.0/System.Drawing.Common.dll": { + "rid": "win", + "assetType": "runtime", + "assemblyVersion": "7.0.0.0", + "fileVersion": "7.0.22.51805" + } + } + }, + "System.Resources.Extensions/7.0.0": { + "runtime": { + "lib/net7.0/System.Resources.Extensions.dll": { + "assemblyVersion": "7.0.0.0", + "fileVersion": "7.0.22.51805" + } + } + }, + "PKHeX.Core/23.2.27": { + "runtime": { + "PKHeX.Core.dll": {} + } + }, + "PKHeX.Drawing/23.2.27": { + "dependencies": { + "System.Drawing.Common": "7.0.0" + }, + "runtime": { + "PKHeX.Drawing.dll": {} + } + } + } + }, + "libraries": { + "PKHeX.Drawing.PokeSprite/23.02.27": { + "type": "project", + "serviceable": false, + "sha512": "" + }, + "Microsoft.Win32.SystemEvents/7.0.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-2nXPrhdAyAzir0gLl8Yy8S5Mnm/uBSQQA7jEsILOS1MTyS7DbmV1NgViMtvV1sfCD1ebITpNwb1NIinKeJgUVQ==", + "path": "microsoft.win32.systemevents/7.0.0", + "hashPath": "microsoft.win32.systemevents.7.0.0.nupkg.sha512" + }, + "System.Drawing.Common/7.0.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-KIX+oBU38pxkKPxvLcLfIkOV5Ien8ReN78wro7OF5/erwcmortzeFx+iBswlh2Vz6gVne0khocQudGwaO1Ey6A==", + "path": "system.drawing.common/7.0.0", + "hashPath": "system.drawing.common.7.0.0.nupkg.sha512" + }, + "System.Resources.Extensions/7.0.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-65ufm9ABXvxRkQ//hMcUDrQXbGWkC7z0WWZAvHlQ6Qv+JmrIwHH1lmX8aXlNlXpIrT9KxDpuZPqJTVqqwzMD8Q==", + "path": "system.resources.extensions/7.0.0", + "hashPath": "system.resources.extensions.7.0.0.nupkg.sha512" + }, + "PKHeX.Core/23.2.27": { + "type": "project", + "serviceable": false, + "sha512": "" + }, + "PKHeX.Drawing/23.2.27": { + "type": "project", + "serviceable": false, + "sha512": "" + } + } +} \ No newline at end of file diff --git a/pkNX.WinForms/deps/PKHeX.Drawing.PokeSprite.dll b/pkNX.WinForms/deps/PKHeX.Drawing.PokeSprite.dll index 5f50099d..cbcd0c17 100644 Binary files a/pkNX.WinForms/deps/PKHeX.Drawing.PokeSprite.dll and b/pkNX.WinForms/deps/PKHeX.Drawing.PokeSprite.dll differ diff --git a/pkNX.WinForms/deps/PKHeX.Drawing.dll b/pkNX.WinForms/deps/PKHeX.Drawing.dll index 27f525bd..e6b071df 100644 Binary files a/pkNX.WinForms/deps/PKHeX.Drawing.dll and b/pkNX.WinForms/deps/PKHeX.Drawing.dll differ diff --git a/pkNX.WinForms/pkNX.WinForms.csproj b/pkNX.WinForms/pkNX.WinForms.csproj index b25151e0..3cbb91c5 100644 --- a/pkNX.WinForms/pkNX.WinForms.csproj +++ b/pkNX.WinForms/pkNX.WinForms.csproj @@ -23,7 +23,7 @@ - +