From e391da5123e5e645ba794d5b928e38e9e9793380 Mon Sep 17 00:00:00 2001 From: Haselnussbomber Date: Wed, 3 Jun 2026 19:57:23 +0200 Subject: [PATCH 1/2] Fix ExcelSheet --- .../FFXIV/Common/Component/Excel/ExcelSheet.cs | 8 +++++++- ida/data.yml | 3 ++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/FFXIVClientStructs/FFXIV/Common/Component/Excel/ExcelSheet.cs b/FFXIVClientStructs/FFXIV/Common/Component/Excel/ExcelSheet.cs index 53149ec1e7..b813f2cfbe 100644 --- a/FFXIVClientStructs/FFXIV/Common/Component/Excel/ExcelSheet.cs +++ b/FFXIVClientStructs/FFXIV/Common/Component/Excel/ExcelSheet.cs @@ -34,9 +34,15 @@ public unsafe partial struct ExcelSheet { [MemberFunction("E8 ?? ?? ?? ?? 8B D0 BD")] public partial uint GetAllocatedRowCount(); - [MemberFunction("E8 ?? ?? ?? ?? 48 8B 4F ?? 49 89 44 0E")] + [MemberFunction("48 89 5C 24 ?? 48 89 6C 24 ?? 48 89 74 24 ?? 57 48 83 EC ?? 48 8B F9 48 8D 74 24")] public partial IExcelRowWrapper* GetRowByDescriptor(ExcelRowDescriptor* descriptor, uint* outErrorCode = null); + [MemberFunction("E8 ?? ?? ?? ?? 48 8B 4F ?? 49 89 44 0E")] + public partial IExcelRowWrapper* GetSubRowByDescriptor(ExcelRowDescriptor* descriptor, uint* outErrorCode = null); + + [MemberFunction("E8 ?? ?? ?? ?? 48 85 C0 74 ?? B0 ?? EB")] + public partial IExcelRowWrapper* GetRowByIndex(uint rowIndex, ExcelRowDescriptor* descriptor); + [MemberFunction("E8 ?? ?? ?? ?? 8B D3 48 8B F8")] public partial IExcelRowWrapper* GetRowById(uint rowId, uint* outErrorCode = null); diff --git a/ida/data.yml b/ida/data.yml index 7e986e3ed7..9e050fe0e5 100644 --- a/ida/data.yml +++ b/ida/data.yml @@ -4776,7 +4776,8 @@ classes: 0x14207D4D0: GetSubRowByDescriptor 0x14207D610: GetRowById 0x14207D750: GetColumnStringByDescriptor - 0x14207D960: GetRowByDescriptor + 0x14207D960: GetRowByIndex + 0x14207D9D0: GetRowByDescriptor 0x14207DB00: GetSheetName 0x14207DB10: GetColumnOffset 0x14207DBC0: GetColumnIndex2 From 538b62f641e69ebe11e428ac710127a190afd9f5 Mon Sep 17 00:00:00 2001 From: wolfcomp <4028289+wolfcomp@users.noreply.github.com> Date: Wed, 3 Jun 2026 21:05:10 +0200 Subject: [PATCH 2/2] Add a quick note for function --- FFXIVClientStructs/FFXIV/Common/Component/Excel/ExcelSheet.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FFXIVClientStructs/FFXIV/Common/Component/Excel/ExcelSheet.cs b/FFXIVClientStructs/FFXIV/Common/Component/Excel/ExcelSheet.cs index b813f2cfbe..8062938fad 100644 --- a/FFXIVClientStructs/FFXIV/Common/Component/Excel/ExcelSheet.cs +++ b/FFXIVClientStructs/FFXIV/Common/Component/Excel/ExcelSheet.cs @@ -35,7 +35,7 @@ public unsafe partial struct ExcelSheet { public partial uint GetAllocatedRowCount(); [MemberFunction("48 89 5C 24 ?? 48 89 6C 24 ?? 48 89 74 24 ?? 57 48 83 EC ?? 48 8B F9 48 8D 74 24")] - public partial IExcelRowWrapper* GetRowByDescriptor(ExcelRowDescriptor* descriptor, uint* outErrorCode = null); + public partial IExcelRowWrapper* GetRowByDescriptor(ExcelRowDescriptor* descriptor, uint* outErrorCode = null); // No xref possibly inlined somewhere [MemberFunction("E8 ?? ?? ?? ?? 48 8B 4F ?? 49 89 44 0E")] public partial IExcelRowWrapper* GetSubRowByDescriptor(ExcelRowDescriptor* descriptor, uint* outErrorCode = null);