Merge pull request #1181 from Haselnussbomber/offset-fixes

Offset fixes for UIState.PublicInstance and FateContext
aers · Nov 15, 2024 · fca10ad · fca10ad
2 parents c7f2ffe + ce9cd44
commit fca10ad
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/FFXIVClientStructs/FFXIV/Client/Game/Fate/FateContext.cs b/FFXIVClientStructs/FFXIV/Client/Game/Fate/FateContext.cs
@@ -6,7 +6,7 @@ namespace FFXIVClientStructs.FFXIV.Client.Game.Fate;
 // Client::Game::Fate::FateContext
 // ctor "48 89 5C 24 ?? 48 89 6C 24 ?? 48 89 74 24 ?? 57 48 83 EC 20 66 89 51 18"
 [GenerateInterop]
-[StructLayout(LayoutKind.Explicit, Size = 0x10A0)]
+[StructLayout(LayoutKind.Explicit, Size = 0x10B0)]
 public partial struct FateContext {
     [FieldOffset(0x18)] public ushort FateId;
     [FieldOffset(0x1A)] public byte EurekaFate;
@@ -41,10 +41,10 @@ public partial struct FateContext {
     [FieldOffset(0x400)] public ushort ScreenImageFailed;
     [FieldOffset(0x40A)] public ushort FATEChain;
     [FieldOffset(0x430)] public uint RequiredQuest;
-    [FieldOffset(0x450)] public Vector3 Location;
-    [FieldOffset(0x464)] public float Radius;
+    [FieldOffset(0x460)] public Vector3 Location;
+    [FieldOffset(0x474)] public float Radius;
 
-    [FieldOffset(0x79A)] public ushort TerritoryId;
+    [FieldOffset(0x7AA)] public ushort TerritoryId;
 }
 
 public enum FateState : byte {

diff --git a/FFXIVClientStructs/FFXIV/Client/Game/UI/UIState.cs b/FFXIVClientStructs/FFXIV/Client/Game/UI/UIState.cs
@@ -30,7 +30,7 @@ public unsafe partial struct UIState {
     [FieldOffset(0x38A8)] public ContentsNote ContentsNote;
     [FieldOffset(0x3960)] public RelicNote RelicNote;
     [FieldOffset(0x3978)] public MateriaTrade MateriaTrade;
-    [FieldOffset(0x39D0)] public PublicInstance PublicInstance;
+    [FieldOffset(0x39C0)] public PublicInstance PublicInstance;
     [FieldOffset(0x39E8)] public RelicSphereUpgrade RelicSphereUpgrade;
     [FieldOffset(0x3A60)] public DailyQuestSupply DailyQuestSupply;
     [FieldOffset(0x3E48)] public RidePillon RidePillon;