From 9e94196459aa3360b7bd85bf62dc0d9f8ee16bef Mon Sep 17 00:00:00 2001 From: Kurt Date: Thu, 9 Sep 2021 20:52:12 -0700 Subject: [PATCH] Add more holder flatbuffer structure details --- .../Holders/PlacementZone8FieldItemHolder.cs | 41 +++++++++++++++++ ...cs => PlacementZone8FlightAnchorHolder.cs} | 5 ++- ...cementZone8PokeCenterSpawnAnchorHolder.cs} | 3 +- .../Holders/PlacementZone8SpeciesHolder.cs | 2 +- ...0Holder.cs => PlacementZone8TreeHolder.cs} | 10 ++++- .../Zone/Holders/PlacementZone8_F04Holder.cs | 7 ++- .../Zone/Holders/PlacementZone8_F06Holder.cs | 22 --------- .../Zone/Holders/PlacementZone8_F08Holder.cs | 45 +++++++++++++++++++ .../Zone/Holders/PlacementZone8_F09Holder.cs | 29 +++++++++++- .../Zone/Holders/PlacementZone8_F13Holder.cs | 10 +++++ .../Zone/Holders/PlacementZone8_F15Holder.cs | 13 +++++- .../Zone/Holders/PlacementZone8_F16Holder.cs | 40 +++++++++++++++++ .../Zone/Holders/PlacementZone8_F24Holder.cs | 31 +++++++++++++ .../Gen8/Placement/Zone/PlacementZone8.cs | 14 +++--- 14 files changed, 234 insertions(+), 38 deletions(-) create mode 100644 pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8FieldItemHolder.cs rename pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/{PlacementZone8_F11Holder.cs => PlacementZone8FlightAnchorHolder.cs} (72%) rename pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/{PlacementZone8_F12Holder.cs => PlacementZone8PokeCenterSpawnAnchorHolder.cs} (81%) rename pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/{PlacementZone8_F10Holder.cs => PlacementZone8TreeHolder.cs} (51%) delete mode 100644 pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8_F06Holder.cs diff --git a/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8FieldItemHolder.cs b/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8FieldItemHolder.cs new file mode 100644 index 00000000..96b7e22a --- /dev/null +++ b/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8FieldItemHolder.cs @@ -0,0 +1,41 @@ +using System.ComponentModel; +using FlatSharp.Attributes; +// ReSharper disable UnusedAutoPropertyAccessor.Global +// ReSharper disable ClassNeverInstantiated.Global +// ReSharper disable MemberCanBePrivate.Global +// ReSharper disable UnusedType.Global +// ReSharper disable UnusedMember.Global +#nullable disable +#pragma warning disable CA1819 // Properties should not return arrays + +namespace pkNX.Structures.FlatBuffers +{ + [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] + public class PlacementZone8FieldItemHolder + { + [FlatBufferItem(00)] public PlacementZone8FieldItem Field_00 { get; set; } + } + + [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] + public class PlacementZone8FieldItem + { + [FlatBufferItem(00)] public PlacementZoneMetaTripleXYZ8 Field_00 { get; set; } + [FlatBufferItem(01)] public ulong Hash_01 { get; set; } + [FlatBufferItem(02)] public string Field_02 { get; set; } + [FlatBufferItem(03)] public float Field_03 { get; set; } + [FlatBufferItem(04)] public float Field_04 { get; set; } + [FlatBufferItem(05)] public ulong Hash_05 { get; set; } + [FlatBufferItem(06)] public ulong[] Flags { get; set; } + [FlatBufferItem(07)] public uint[] Items { get; set; } + [FlatBufferItem(08)] public byte Quantity { get; set; } + [FlatBufferItem(09)] public PlacementZone8FieldItem_A Field_09 { get; set; } + } + + // union??? + [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] + public class PlacementZone8FieldItem_A + { + [FlatBufferItem(00)] public byte Field_00 { get; set; } + // 1 + } +} diff --git a/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8_F11Holder.cs b/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8FlightAnchorHolder.cs similarity index 72% rename from pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8_F11Holder.cs rename to pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8FlightAnchorHolder.cs index 96e5bd1a..6059933e 100644 --- a/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8_F11Holder.cs +++ b/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8FlightAnchorHolder.cs @@ -9,8 +9,9 @@ namespace pkNX.Structures.FlatBuffers { + // player flying to location [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] - public class PlacementZone8_F11Holder + public class PlacementZone8FlightAnchorHolder { [FlatBufferItem(00)] public PlacementZone8_F11 Field_00 { get; set; } } @@ -18,5 +19,7 @@ public class PlacementZone8_F11Holder [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] public class PlacementZone8_F11 { + [FlatBufferItem(00)] public PlacementZoneMetaTripleXYZ8 Field_00 { get; set; } + [FlatBufferItem(01)] public ulong Field_01 { get; set; } } } diff --git a/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8_F12Holder.cs b/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8PokeCenterSpawnAnchorHolder.cs similarity index 81% rename from pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8_F12Holder.cs rename to pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8PokeCenterSpawnAnchorHolder.cs index 3d10ab39..02ccc5e8 100644 --- a/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8_F12Holder.cs +++ b/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8PokeCenterSpawnAnchorHolder.cs @@ -10,7 +10,7 @@ namespace pkNX.Structures.FlatBuffers { [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] - public class PlacementZone8_F12Holder + public class PlacementZone8PokeCenterSpawnAnchorHolder { [FlatBufferItem(00)] public PlacementZone8_F12 Field_00 { get; set; } } @@ -18,5 +18,6 @@ public class PlacementZone8_F12Holder [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] public class PlacementZone8_F12 { + [FlatBufferItem(00)] public PlacementZoneMetaTripleXYZ8 Field_00 { get; set; } } } diff --git a/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8SpeciesHolder.cs b/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8SpeciesHolder.cs index facb6bc1..fa9d2d2e 100644 --- a/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8SpeciesHolder.cs +++ b/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8SpeciesHolder.cs @@ -43,7 +43,7 @@ public class PlacementZone8_F02_Nine [FlatBufferItem(05)] public byte Field_05 { get; set; } // 6 [FlatBufferItem(07)] public ulong Hash_07 { get; set; } - [FlatBufferItem(08)] public int Field_08 { get; set; } // byte? + [FlatBufferItem(08)] public uint Field_08 { get; set; } } [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] diff --git a/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8_F10Holder.cs b/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8TreeHolder.cs similarity index 51% rename from pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8_F10Holder.cs rename to pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8TreeHolder.cs index 87f9565c..e47700c1 100644 --- a/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8_F10Holder.cs +++ b/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8TreeHolder.cs @@ -6,11 +6,12 @@ // ReSharper disable UnusedType.Global // ReSharper disable UnusedMember.Global #nullable disable +#pragma warning disable CA1819 // Properties should not return arrays namespace pkNX.Structures.FlatBuffers { [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] - public class PlacementZone8_F10Holder + public class PlacementZone8TreeHolder { [FlatBufferItem(00)] public PlacementZone8_F10 Field_00 { get; set; } } @@ -18,5 +19,12 @@ public class PlacementZone8_F10Holder [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] public class PlacementZone8_F10 { + [FlatBufferItem(00)] public PlacementZoneMetaTripleXYZ8 Field_00 { get; set; } + [FlatBufferItem(01)] public PlacementZone8_V3f[] Field_01 { get; set; } + [FlatBufferItem(02)] public string PlayName { get; set; } + [FlatBufferItem(03)] public string StopName { get; set; } + [FlatBufferItem(04)] public float Field_04 { get; set; } + [FlatBufferItem(05)] public int Field_05 { get; set; } + [FlatBufferItem(06)] public int Field_06 { get; set; } } } diff --git a/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8_F04Holder.cs b/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8_F04Holder.cs index ebbeee75..4c4a0cf4 100644 --- a/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8_F04Holder.cs +++ b/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8_F04Holder.cs @@ -18,5 +18,10 @@ public class PlacementZone8_F04Holder [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] public class PlacementZone8_F04 { + [FlatBufferItem(00)] public PlacementZoneMetaTripleXYZ8 Field_00 { get; set; } + [FlatBufferItem(01)] public float Field_01 { get; set; } + [FlatBufferItem(02)] public float Field_02 { get; set; } + [FlatBufferItem(03)] public float Field_03 { get; set; } + [FlatBufferItem(04)] public float Field_04 { get; set; } } -} \ No newline at end of file +} diff --git a/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8_F06Holder.cs b/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8_F06Holder.cs deleted file mode 100644 index 58f65c07..00000000 --- a/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8_F06Holder.cs +++ /dev/null @@ -1,22 +0,0 @@ -using System.ComponentModel; -using FlatSharp.Attributes; -// ReSharper disable UnusedAutoPropertyAccessor.Global -// ReSharper disable ClassNeverInstantiated.Global -// ReSharper disable MemberCanBePrivate.Global -// ReSharper disable UnusedType.Global -// ReSharper disable UnusedMember.Global -#nullable disable - -namespace pkNX.Structures.FlatBuffers -{ - [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] - public class PlacementZone8_F06Holder - { - [FlatBufferItem(00)] public PlacementZone8_F06 Field_00 { get; set; } - } - - [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] - public class PlacementZone8_F06 - { - } -} \ No newline at end of file diff --git a/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8_F08Holder.cs b/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8_F08Holder.cs index f49173d7..1ade8f6f 100644 --- a/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8_F08Holder.cs +++ b/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8_F08Holder.cs @@ -13,10 +13,55 @@ namespace pkNX.Structures.FlatBuffers public class PlacementZone8_F08Holder { [FlatBufferItem(00)] public PlacementZone8_F08 Field_00 { get; set; } + [FlatBufferItem(01)] public float Field_01 { get; set; } + [FlatBufferItem(02)] public ulong Hash_02 { get; set; } + [FlatBufferItem(03)] public ulong Hash_03 { get; set; } + [FlatBufferItem(04)] public ulong Hash_04 { get; set; } + // 5 empty-table + [FlatBufferItem(06)] public uint Field_06 { get; set; } + [FlatBufferItem(07)] public PlacementZone8_F08_Nine Field_07 { get; set; } + // 8 + // 9 + [FlatBufferItem(10)] public uint Field_10 { get; set; } + [FlatBufferItem(11)] public uint Field_11 { get; set; } + [FlatBufferItem(12)] public uint Field_12 { get; set; } + } + + [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] + public class PlacementZone8_F08_Nine + { + [FlatBufferItem(0)] public byte Field_00 { get; set; } + [FlatBufferItem(1)] public byte Field_01 { get; set; } + [FlatBufferItem(2)] public byte Field_02 { get; set; } + // 3 + [FlatBufferItem(4)] public ulong Hash_04 { get; set; } + [FlatBufferItem(5)] public byte Field_05 { get; set; } + // 6 + [FlatBufferItem(7)] public ulong Hash_07 { get; set; } + // 8? is this not the same as others? + // 9? } [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] public class PlacementZone8_F08 { + [FlatBufferItem(0)] public PlacementZoneMetaTripleXYZ8 Field_00 { get; set; } + [FlatBufferItem(1)] public ulong Hash_01 { get; set; } + [FlatBufferItem(2)] public ulong Hash_02 { get; set; } + [FlatBufferItem(3)] public ulong Hash_03 { get; set; } + [FlatBufferItem(4)] public PlacementZone8_F08_IntFloat Field_04 { get; set; } + // 5 + [FlatBufferItem(6)] public ulong Hash_06 { get; set; } + [FlatBufferItem(7)] public PlacementZone8_F08_IntFloat Field_07 { get; set; } + } + + [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] + public class PlacementZone8_F08_IntFloat + { + [FlatBufferItem(0)] public int Field_00 { get; set; } + // 1 + // 2 + // 3 + [FlatBufferItem(4)] public float Field_04 { get; set; } } } diff --git a/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8_F09Holder.cs b/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8_F09Holder.cs index 706f9734..776d77c4 100644 --- a/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8_F09Holder.cs +++ b/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8_F09Holder.cs @@ -9,14 +9,39 @@ namespace pkNX.Structures.FlatBuffers { + // trainer signs? [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] public class PlacementZone8_F09Holder { - [FlatBufferItem(00)] public PlacementZone8_F09 Field_00 { get; set; } + [FlatBufferItem(00)] public PlacementZoneMetaTripleXYZ8 Field_00 { get; set; } + [FlatBufferItem(01)] public float Field_01 { get; set; } + [FlatBufferItem(02)] public float Field_02 { get; set; } + [FlatBufferItem(03)] public float Field_03 { get; set; } + [FlatBufferItem(04)] public float Field_04 { get; set; } + [FlatBufferItem(05)] public ulong Field_05 { get; set; } + [FlatBufferItem(06)] public PlacementZone8_F09 Field_06 { get; set; } + [FlatBufferItem(07)] public PlacementZone8_F09_Union Field_07 { get; set; } } [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] public class PlacementZone8_F09 { + [FlatBufferItem(00)] public uint Field_00 { get; set; } + [FlatBufferItem(06)] public float Field_06 { get; set; } } -} \ No newline at end of file + + // union? + [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] + public class PlacementZone8_F09_Union + { + [FlatBufferItem(00)] public byte Field_00 { get; set; } + [FlatBufferItem(06)] public PlacementZone8_F09_Sub Field_06 { get; set; } + } + + [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] + public class PlacementZone8_F09_Sub + { + // 0 default + [FlatBufferItem(1)] public float Field_01 { get; set; } + } +} diff --git a/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8_F13Holder.cs b/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8_F13Holder.cs index 7e4131b3..2bba1768 100644 --- a/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8_F13Holder.cs +++ b/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8_F13Holder.cs @@ -18,5 +18,15 @@ public class PlacementZone8_F13Holder [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] public class PlacementZone8_F13 { + [FlatBufferItem(00)] public PlacementZoneMetaTripleXYZ8 Field_00 { get; set; } + [FlatBufferItem(01)] public ulong Hash_01 { get; set; } + [FlatBufferItem(02)] public ulong Hash_02 { get; set; } + [FlatBufferItem(03)] public uint Field_03 { get; set; } + [FlatBufferItem(04)] public ulong Hash_04 { get; set; } + [FlatBufferItem(05)] public uint Field_05 { get; set; } + [FlatBufferItem(06)] public uint Field_06 { get; set; } + // 7 + [FlatBufferItem(08)] public byte Byte_08 { get; set; } + [FlatBufferItem(09)] public ulong Hash_09 { get; set; } } } diff --git a/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8_F15Holder.cs b/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8_F15Holder.cs index 80f0ac36..c3befe2c 100644 --- a/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8_F15Holder.cs +++ b/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8_F15Holder.cs @@ -6,17 +6,26 @@ // ReSharper disable UnusedType.Global // ReSharper disable UnusedMember.Global #nullable disable +#pragma warning disable CA1819 // Properties should not return arrays namespace pkNX.Structures.FlatBuffers { [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] public class PlacementZone8_F15Holder { - [FlatBufferItem(00)] public PlacementZone8_F15 Field_00 { get; set; } + [FlatBufferItem(00)] public PlacementZoneMetaTripleXYZ8 Field_00 { get; set; } + [FlatBufferItem(01)] public ulong Hash_01 { get; set; } + [FlatBufferItem(02)] public uint Field_02 { get; set; } + [FlatBufferItem(03)] public uint Field_03 { get; set; } + // 4 + [FlatBufferItem(05)] public PlacementZone8_V3f[] Field_05 { get; set; } } [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] - public class PlacementZone8_F15 + public class PlacementZone8_V3f { + [FlatBufferItem(00)] public float Field_00 { get; set; } + [FlatBufferItem(01)] public float Field_01 { get; set; } + [FlatBufferItem(02)] public float Field_02 { get; set; } } } diff --git a/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8_F16Holder.cs b/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8_F16Holder.cs index a32d743b..c892e6ac 100644 --- a/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8_F16Holder.cs +++ b/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8_F16Holder.cs @@ -13,10 +13,50 @@ namespace pkNX.Structures.FlatBuffers public class PlacementZone8_F16Holder { [FlatBufferItem(00)] public PlacementZone8_F16 Field_00 { get; set; } + [FlatBufferItem(01)] public uint Field_01 { get; set; } + [FlatBufferItem(02)] public ulong Hash_02 { get; set; } + [FlatBufferItem(03)] public ulong Hash_03 { get; set; } + // 4 empty-table? + [FlatBufferItem(05)] public ulong Hash_05 { get; set; } + [FlatBufferItem(06)] public byte Field_06 { get; set; } + // 7 + // 8 + [FlatBufferItem(09)] public uint Field_09 { get; set; } + [FlatBufferItem(10)] public float Field_10 { get; set; } + [FlatBufferItem(11)] public PlacementZone8_F02_Nine Field_11 { get; set; } + // 12 + [FlatBufferItem(13)] public uint Field_13 { get; set; } + [FlatBufferItem(14)] public uint Field_14 { get; set; } + [FlatBufferItem(15)] public uint Field_15 { get; set; } + [FlatBufferItem(16)] public uint Field_16 { get; set; } } [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] public class PlacementZone8_F16 { + [FlatBufferItem(00)] public PlacementZone8_F16_A Field_00 { get; set; } + } + + [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] + public class PlacementZone8_F16_A + { + [FlatBufferItem(00)] public PlacementZoneMetaTripleXYZ8 Field_00 { get; set; } + [FlatBufferItem(01)] public ulong Hash_01 { get; set; } + [FlatBufferItem(02)] public ulong Hash_02 { get; set; } + [FlatBufferItem(03)] public ulong Hash_03 { get; set; } + [FlatBufferItem(04)] public PlacementZone8_F16_IntFloat Field_04 { get; set; } + [FlatBufferItem(05)] public byte Byte_05 { get; set; } + [FlatBufferItem(06)] public ulong Hash_06 { get; set; } + [FlatBufferItem(07)] public PlacementZone8_F16_IntFloat Field_07 { get; set; } + } + + [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] + public class PlacementZone8_F16_IntFloat + { + [FlatBufferItem(00)] public int Field_00 { get; set; } + [FlatBufferItem(01)] public float Field_01 { get; set; } + // 2 + // 3 + [FlatBufferItem(04)] public float Field_04 { get; set; } } } diff --git a/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8_F24Holder.cs b/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8_F24Holder.cs index d0dc3530..1747f5d5 100644 --- a/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8_F24Holder.cs +++ b/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/Holders/PlacementZone8_F24Holder.cs @@ -6,6 +6,7 @@ // ReSharper disable UnusedType.Global // ReSharper disable UnusedMember.Global #nullable disable +#pragma warning disable CA1819 // Properties should not return arrays namespace pkNX.Structures.FlatBuffers { @@ -18,5 +19,35 @@ public class PlacementZone8_F24Holder [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] public class PlacementZone8_F24 { + [FlatBufferItem(00)] public PlacementZoneMetaTripleXYZ8 Field_00 { get; set; } + [FlatBufferItem(01)] public PlacementZone8_F24_IntFloat Field_01 { get; set; } + [FlatBufferItem(02)] public float Field_02 { get; set; } + // 3 + // 4 + // 5 + [FlatBufferItem(06)] public ulong Hash_06 { get; set; } + // 7 empty table? + [FlatBufferItem(08)] public PlacementZone8_F24_Table[] Hash_08 { get; set; } + // 9 + [FlatBufferItem(10)] public float Field_10 { get; set; } + // 11 + [FlatBufferItem(12)] public ulong Hash_12 { get; set; } + } + + [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] + public class PlacementZone8_F24_Table + { + [FlatBufferItem(00)] public ulong Hash_00 { get; set; } + [FlatBufferItem(01)] public ulong Hash_01 { get; set; } + } + + [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] + public class PlacementZone8_F24_IntFloat + { + [FlatBufferItem(00)] public int Field_00 { get; set; } + [FlatBufferItem(01)] public float Field_01 { get; set; } + // 2 + // 3 + [FlatBufferItem(04)] public float Field_04 { get; set; } } } diff --git a/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/PlacementZone8.cs b/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/PlacementZone8.cs index 9ba483f1..788f94c9 100644 --- a/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/PlacementZone8.cs +++ b/pkNX.Structures.FlatBuffers/Gen8/Placement/Zone/PlacementZone8.cs @@ -21,13 +21,13 @@ public class PlacementZone8 [FlatBufferItem(03)] public PlacementZone8WarpHolder[] Warps { get; set; } [FlatBufferItem(04)] public PlacementZone8_F04Holder[] Field_04 { get; set; } [FlatBufferItem(05)] public PlacementZone8ParticleHolder[] Particles { get; set; } - [FlatBufferItem(06)] public PlacementZone8_F06Holder[] Field_06 { get; set; } + [FlatBufferItem(06)] public PlacementZone8FieldItemHolder[] Field_06 { get; set; } [FlatBufferItem(07)] public PlacementZone8_F07Holder[] Field_07 { get; set; } [FlatBufferItem(08)] public PlacementZone8_F08Holder[] Field_08 { get; set; } [FlatBufferItem(09)] public PlacementZone8_F09Holder[] Field_09 { get; set; } - [FlatBufferItem(10)] public PlacementZone8_F10Holder[] Field_10 { get; set; } - [FlatBufferItem(11)] public PlacementZone8_F11Holder[] Field_11 { get; set; } - [FlatBufferItem(12)] public PlacementZone8_F12Holder[] Field_12 { get; set; } + [FlatBufferItem(10)] public PlacementZone8TreeHolder[] Field_10 { get; set; } + [FlatBufferItem(11)] public PlacementZone8FlightAnchorHolder[] Field_11 { get; set; } + [FlatBufferItem(12)] public PlacementZone8PokeCenterSpawnAnchorHolder[] Field_12 { get; set; } [FlatBufferItem(13)] public PlacementZone8_F13Holder[] Field_13 { get; set; } [FlatBufferItem(14)] public PlacementZone8_F14Holder[] Field_14 { get; set; } [FlatBufferItem(15)] public PlacementZone8_F15Holder[] Field_15 { get; set; } @@ -117,9 +117,9 @@ public class PlacementZoneMeta8 [FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))] public class PlacementZoneMetaTripleXYZ8 { - [FlatBufferItem(00)] public float Field_00 { get; set; } - [FlatBufferItem(01)] public float Field_01 { get; set; } - [FlatBufferItem(02)] public float Field_02 { get; set; } + [FlatBufferItem(00)] public float LocationX { get; set; } + [FlatBufferItem(01)] public float LocationY { get; set; } + [FlatBufferItem(02)] public float LocationZ { get; set; } [FlatBufferItem(03)] public float Field_03 { get; set; } // assumed [FlatBufferItem(04)] public float Field_04 { get; set; } [FlatBufferItem(05)] public float Field_05 { get; set; } // assumed