From de00f09bde7c1f237db02e331b8444e6a5220aca Mon Sep 17 00:00:00 2001 From: Kurt Date: Sat, 19 Mar 2022 19:50:46 -0700 Subject: [PATCH] Update evolution, add editor --- pkNX.Structures.FlatBuffers/Arceus/EvolutionTable8.cs | 4 ++-- .../Arceus/NewHuge/NewHugeOutbreakGroup8a.cs | 2 +- pkNX.WinForms/MainEditor/EditorPLA.cs | 7 +++++++ 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/pkNX.Structures.FlatBuffers/Arceus/EvolutionTable8.cs b/pkNX.Structures.FlatBuffers/Arceus/EvolutionTable8.cs index 008733a5..875e217b 100644 --- a/pkNX.Structures.FlatBuffers/Arceus/EvolutionTable8.cs +++ b/pkNX.Structures.FlatBuffers/Arceus/EvolutionTable8.cs @@ -54,6 +54,6 @@ public class EvolutionEntry8a [FlatBufferItem(0)] public ushort Method { get; set; } [FlatBufferItem(1)] public ushort Argument { get; set; } [FlatBufferItem(2)] public ushort Species { get; set; } - [FlatBufferItem(3)] public byte Form { get; set; } - [FlatBufferItem(4)] public byte Level { get; set; } + [FlatBufferItem(3)] public ushort Form { get; set; } + [FlatBufferItem(4)] public ushort Level { get; set; } } diff --git a/pkNX.Structures.FlatBuffers/Arceus/NewHuge/NewHugeOutbreakGroup8a.cs b/pkNX.Structures.FlatBuffers/Arceus/NewHuge/NewHugeOutbreakGroup8a.cs index 4e7b5c89..c0325c39 100644 --- a/pkNX.Structures.FlatBuffers/Arceus/NewHuge/NewHugeOutbreakGroup8a.cs +++ b/pkNX.Structures.FlatBuffers/Arceus/NewHuge/NewHugeOutbreakGroup8a.cs @@ -24,7 +24,7 @@ public class NewHugeOutbreakGroupArchive8a : IFlatBufferArchive { [FlatBufferItem(00)] public ulong Group { get; set; } - [FlatBufferItem(01)] public NewHugeOutbreakDetail8a[] Table { get; set; } = Array.Empty(); + [FlatBufferItem(01)] public NewHugeOutbreakDetail8a[] Table { get; set; } = Array.Empty(); // successive tables [FlatBufferItem(02)] public ulong EncounterTableID { get; set; } public int SumTable => Table.Sum(z => z.Rate); diff --git a/pkNX.WinForms/MainEditor/EditorPLA.cs b/pkNX.WinForms/MainEditor/EditorPLA.cs index 9ee98551..12ae64b0 100644 --- a/pkNX.WinForms/MainEditor/EditorPLA.cs +++ b/pkNX.WinForms/MainEditor/EditorPLA.cs @@ -406,6 +406,13 @@ public void PopFlatConfig(GameFile file, string title) public void EditBall_Throw_Config() => PopFlatConfig(GameFile.BallThrowConfig, "Ball Throw Config Editor"); public void EditSize_Scale_Config() => PopFlatConfig(GameFile.SizeScaleConfig, "Size Scale Config Editor"); + public void EditEvolutions() + { + var names = ROM.GetStrings(TextName.SpeciesNames); + PopFlat(GameFile.Evolutions, "Evolution Editor", + z => $"{names[z.Index]}{(z.Form != 0 ? $"-{z.Form}" : "")}"); + } + public void EditOutbreakDetail() => PopFlat(GameFile.Outbreak, "Outbreak Proc Editor", z => z.WorkValueName);