diff --git a/pkNX.Structures.FlatBuffers.Arceus/Arceus/Poke/PokeMiscTable.cs b/pkNX.Structures.FlatBuffers.Arceus/Arceus/Poke/PokeMiscTable.cs index 566037a7..f0469f1e 100644 --- a/pkNX.Structures.FlatBuffers.Arceus/Arceus/Poke/PokeMiscTable.cs +++ b/pkNX.Structures.FlatBuffers.Arceus/Arceus/Poke/PokeMiscTable.cs @@ -11,7 +11,12 @@ namespace pkNX.Structures.FlatBuffers.Arceus; [TypeConverter(typeof(ExpandableObjectConverter))] -public partial class PokeMisc { } +public partial class PokeMisc +{ + // lazy set reference for remembering the fetched object + public PokeDropItem? DropTable { get; set; } + public PokeDropItem? AlphaDropTable { get; set; } +} [TypeConverter(typeof(ExpandableObjectConverter))] public partial class PokeMiscTable diff --git a/pkNX.Structures.FlatBuffers.Arceus/Schemas/Poke/PokeMiscTable.fbs b/pkNX.Structures.FlatBuffers.Arceus/Schemas/Poke/PokeMiscTable.fbs index 6e9d8abb..24d1def7 100644 --- a/pkNX.Structures.FlatBuffers.Arceus/Schemas/Poke/PokeMiscTable.fbs +++ b/pkNX.Structures.FlatBuffers.Arceus/Schemas/Poke/PokeMiscTable.fbs @@ -1,20 +1,17 @@ -include "PokeDropItem.fbs"; namespace pkNX.Structures.FlatBuffers.Arceus; attribute "fs_serializer"; table PokeMisc { Species:int; Form:int; - Field_02:int; + Gender:int; // 0 male/both, 1 female, 2 genderless ScaleFactor:float = 1; // scale factor when not alpha AlphaScaleFactor:float = 2; // scale factor when alpha (forced 255) Field_05:int = 1; // similar scale amplification like Field 6, but not used for levels OybnLevelIndex:int = 2; DropTableRef:ulong; - DropTable:PokeDropItem; // not required AlphaDropTableRef:ulong; - AlphaDropTable:PokeDropItem; // not required /// "pm0000_00_00" Value:string (required); diff --git a/pkNX.Structures.FlatBuffers.Arceus/Schemas/Poke/PokeResource/PokeResourceTable.fbs b/pkNX.Structures.FlatBuffers.Arceus/Schemas/Poke/PokeResource/PokeResourceTable.fbs index 02aea8fa..322e3658 100644 --- a/pkNX.Structures.FlatBuffers.Arceus/Schemas/Poke/PokeResource/PokeResourceTable.fbs +++ b/pkNX.Structures.FlatBuffers.Arceus/Schemas/Poke/PokeResource/PokeResourceTable.fbs @@ -16,7 +16,7 @@ struct NullableInt32 (fs_valueStruct) { table PokeModelConfig { Meta:PokeModelMeta (required); PathModel:string (required); - PathMeshMaterial:string (required); + PathMeshMaterial:string; PathConfig:string (required); Unused:byte; // unused! Animations:[AnimationConfigStringTuple] (required); diff --git a/pkNX.Structures.FlatBuffers.Reflection/ReflectionDumpSchema.cs b/pkNX.Structures.FlatBuffers.Reflection/ReflectionDumpSchema.cs index 7bd00331..09c9dcf6 100644 --- a/pkNX.Structures.FlatBuffers.Reflection/ReflectionDumpSchema.cs +++ b/pkNX.Structures.FlatBuffers.Reflection/ReflectionDumpSchema.cs @@ -29,7 +29,7 @@ public static void DumpSchema(Schema schema, string filePath, string dir, Schema using var fsCS = File.Create(fileCS); using var cs = new StreamWriter(fsCS); - var fileFBS = Path.Combine(dir, $"{rootName}.cs"); + var fileFBS = Path.Combine(dir, $"{rootName}.fbs"); using var fsFBS = File.Create(fileFBS); using var fbs = new StreamWriter(fsFBS); @@ -130,7 +130,7 @@ private static void DumpObjectFBS(Schema schema, TextWriter fbs, bool stripNames fbs.Write(" "); fbs.Write(field.Name); fbs.Write(":"); - fbs.Write(field.Type.ToFBS(schema, field.Id)); + fbs.Write(field.Type.ToFBS(schema, field.Type.Index)); WriteAttributes(fbs, field); diff --git a/pkNX.WinForms/Dumping/GameDumperSV.cs b/pkNX.WinForms/Dumping/GameDumperSV.cs index d0a7091a..f7120b36 100644 --- a/pkNX.WinForms/Dumping/GameDumperSV.cs +++ b/pkNX.WinForms/Dumping/GameDumperSV.cs @@ -583,7 +583,7 @@ private void DumpEncount() private void DumpDLC() { - Dump("world/data/ui/dlc_item_data/dlc_item_group/dlc_item_group_array.bfbs", z=>z.Table); + Dump("world/data/ui/dlc_item_data/dlc_item_group/dlc_item_group_array.bfbs", z => z.Table); } private void DumpJunk() diff --git a/pkNX.WinForms/MainEditor/EditorPLA.cs b/pkNX.WinForms/MainEditor/EditorPLA.cs index f8e4f10c..6d78d894 100644 --- a/pkNX.WinForms/MainEditor/EditorPLA.cs +++ b/pkNX.WinForms/MainEditor/EditorPLA.cs @@ -780,11 +780,11 @@ public void EditArchiveContents() addEntryCallback: x => x.AddEntry()); } - [EditorCallable(EditorCategory.Misc, true)] - public void EditPokedexFormStorage() - { - //PopFlat(GameFile.DexFormStorage, "Pokedex Form Storage Editor", z => z.Rank.ToString()); - } + //[EditorCallable(EditorCategory.Misc, true)] + //public void EditPokedexFormStorage() + //{ + // //PopFlat(GameFile.DexFormStorage, "Pokedex Form Storage Editor", z => z.Rank.ToString()); + //} [EditorCallable(EditorCategory.Misc, true)] public void EditPokeDefaultLocator()