CrestData found in Inspect, CharaView, DrawDataContainer

aers · Jan 3, 2025 · 0490245 · 0490245
1 parent e751c28
commit 0490245
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/FFXIVClientStructs/FFXIV/Client/Game/Character/DrawDataContainer.cs b/FFXIVClientStructs/FFXIV/Client/Game/Character/DrawDataContainer.cs
@@ -1,5 +1,6 @@
 using System.Diagnostics.CodeAnalysis;
 using FFXIVClientStructs.FFXIV.Client.Graphics.Scene;
+using FFXIVClientStructs.FFXIV.Client.UI.Agent;
 
 namespace FFXIVClientStructs.FFXIV.Client.Game.Character;
 
@@ -15,6 +16,9 @@ public unsafe partial struct DrawDataContainer {
 
     [FieldOffset(0x1CE)] public byte Flags1;
     [FieldOffset(0x1CF)] public byte Flags2;
+    [FieldOffset(0x1D0), FixedSizeArray] internal FixedSizeArray2<ushort> _glassesIds;
+
+    [FieldOffset(0x1E8)] public CrestData FreeCompanyCrestData;
     [FieldOffset(0x1F0)] public byte FreeCompanyCrestBitfield; // & 0x01 for offhand weapon, & 0x02 for head, & 0x04 for top, ..., & 0x20 for feet
 
     [UnscopedRef]
@@ -27,12 +31,9 @@ public ref EquipmentModelId Equipment(EquipmentSlot slot) {
         return ref EquipmentModelIds[(int)slot];
     }
 
-    [FieldOffset(0x1D0), FixedSizeArray] internal FixedSizeArray2<ushort> _glassesIds;
-
     [MemberFunction("E8 ?? ?? ?? ?? B1 01 41 FF C6")]
     public partial void LoadEquipment(EquipmentSlot slot, EquipmentModelId* modelId, bool force);
 
-
     [MemberFunction("E8 ?? ?? ?? ?? 4C 8B 45 7F")]
     public partial void LoadWeapon(WeaponSlot slot, WeaponModelId weaponData, byte redrawOnEquality, byte unk2, byte skipGameObject, byte unk4);
 

diff --git a/FFXIVClientStructs/FFXIV/Client/Game/UI/Inspect.cs b/FFXIVClientStructs/FFXIV/Client/Game/UI/Inspect.cs
@@ -1,4 +1,5 @@
 using FFXIVClientStructs.FFXIV.Client.Game.Character;
+using FFXIVClientStructs.FFXIV.Client.UI.Agent;
 
 namespace FFXIVClientStructs.FFXIV.Client.Game.UI;
 
@@ -40,7 +41,7 @@ public unsafe partial struct Inspect {
     [FieldOffset(0x104), FixedSizeArray] internal FixedSizeArray74<uint> _baseParams;
     [FieldOffset(0x22C)] private byte UnkWord22C;
     [FieldOffset(0x22E)] public byte GearVisibilityFlag; // TODO: use InspectGearVisibilityFlag
-    [FieldOffset(0x230)] private ulong UnkLong230; // -1 if not set - crest data? (see CharaViewModelData)
+    [FieldOffset(0x230)] public CrestData FreeCompanyCrestData;
     [FieldOffset(0x238)] public byte FreeCompanyCrestBitfield;
     [FieldOffset(0x239), FixedSizeArray(isString: true)] internal FixedSizeArray64<byte> _buddyOwnerName;
     [FieldOffset(0x279)] public byte BuddyRank;

diff --git a/FFXIVClientStructs/FFXIV/Client/UI/Misc/CharaView.cs b/FFXIVClientStructs/FFXIV/Client/UI/Misc/CharaView.cs
@@ -99,7 +99,7 @@ public unsafe partial struct CharaViewModelData {
     [FieldOffset(0x89)] public bool WeaponHidden;
     [FieldOffset(0x8A)] public bool VisorClosed;
     [FieldOffset(0x8B)] public byte FreeCompanyCrestBitfield;
-    [FieldOffset(0x90)] private long Unk90; // -1 if not set - crest data? (see Inspect)
+    [FieldOffset(0x90)] public CrestData FreeCompanyCrestData;
 
     [MemberFunction("E8 ?? ?? ?? ?? 0F 28 55 87")]
     public partial void CopyFromCharacter(Character* character);