diff --git a/Dalamud/Game/Text/Evaluator/Internal/SheetRedirectResolver.cs b/Dalamud/Game/Text/Evaluator/Internal/SheetRedirectResolver.cs index 262e7ad21..523086f48 100644 --- a/Dalamud/Game/Text/Evaluator/Internal/SheetRedirectResolver.cs +++ b/Dalamud/Game/Text/Evaluator/Internal/SheetRedirectResolver.cs @@ -221,8 +221,8 @@ internal class SheetRedirectResolver : IServiceType sheetName = nameof(LSheets.AkatsukiNoteString); colIndex = 0; - if (this.dataManager.Excel.GetSubrowSheet().TryGetRow(rowId, out var row)) - rowId = (uint)row[0].Unknown2; + if (this.dataManager.Excel.GetSubrowSheet().TryGetSubrow(rowId, 0, out var row)) + rowId = row.ListName.RowId; break; } } diff --git a/Dalamud/Interface/Internal/Windows/Data/Widgets/SeStringCreatorWidget.cs b/Dalamud/Interface/Internal/Windows/Data/Widgets/SeStringCreatorWidget.cs index 3d79fd398..1cb91245a 100644 --- a/Dalamud/Interface/Internal/Windows/Data/Widgets/SeStringCreatorWidget.cs +++ b/Dalamud/Interface/Internal/Windows/Data/Widgets/SeStringCreatorWidget.cs @@ -1065,10 +1065,10 @@ internal class SeStringCreatorWidget : IDataWindowWidget break; case LinkMacroPayloadType.AkatsukiNote when - dataManager.GetSubrowExcelSheet(this.language).TryGetRow(u32, out var akatsukiNoteRow) && - dataManager.GetExcelSheet(this.language).TryGetRow((uint)akatsukiNoteRow[0].Unknown2, out var akatsukiNoteStringRow): + dataManager.GetSubrowExcelSheet(this.language).TryGetSubrow(u32, 0, out var akatsukiNoteRow) && + akatsukiNoteRow.ListName.ValueNullable is { } akatsukiNoteStringRow: ImGui.SameLine(); - ImGui.Text(akatsukiNoteStringRow.Unknown0.ExtractText()); + ImGui.Text(akatsukiNoteStringRow.Text.ExtractText()); break; } }