From bfc83c50311cc7cbd432dc827473065242313a4b Mon Sep 17 00:00:00 2001
From: Haselnussbomber <mail@haselnussbomber.de>
Date: Mon, 24 Feb 2025 14:52:24 +0100
Subject: [PATCH] Fix EventHandler/Director vfs

---
 .../FFXIV/Client/Game/Event/Director.cs          |  2 +-
 .../FFXIV/Client/Game/Event/EventHandler.cs      | 16 ++++++++--------
 ida/data.yml                                     |  7 ++++---
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/FFXIVClientStructs/FFXIV/Client/Game/Event/Director.cs b/FFXIVClientStructs/FFXIV/Client/Game/Event/Director.cs
index 6c75b1697..1bbab7337 100644
--- a/FFXIVClientStructs/FFXIV/Client/Game/Event/Director.cs
+++ b/FFXIVClientStructs/FFXIV/Client/Game/Event/Director.cs
@@ -22,6 +22,6 @@ public unsafe partial struct Director {
     [FieldOffset(0x498)] public StdVector<EventHandlerObjective> Objectives; // 10 objectives max
     [FieldOffset(0x4B0)] public uint EventItemId;
 
-    [VirtualFunction(267)]
+    [VirtualFunction(272)]
     public partial void PopulateMapMarkers(ushort territoryTypeId, StdVector<MapMarkerData>* markerVector);
 }
diff --git a/FFXIVClientStructs/FFXIV/Client/Game/Event/EventHandler.cs b/FFXIVClientStructs/FFXIV/Client/Game/Event/EventHandler.cs
index f4e31aba3..2591b7527 100644
--- a/FFXIVClientStructs/FFXIV/Client/Game/Event/EventHandler.cs
+++ b/FFXIVClientStructs/FFXIV/Client/Game/Event/EventHandler.cs
@@ -22,28 +22,28 @@ public unsafe partial struct EventHandler {
     [VirtualFunction(154)]
     public partial void CancelInteraction();
 
-    [VirtualFunction(197)]
+    [VirtualFunction(199)]
     public partial void GetTitle(Utf8String* outTitle);
 
-    [VirtualFunction(249)]
+    [VirtualFunction(252)]
     public partial void GetDescription(Utf8String* outDescription);
 
-    [VirtualFunction(250)]
+    [VirtualFunction(253)]
     public partial void GetReliefText(Utf8String* outReliefText);
 
-    [VirtualFunction(251)]
+    [VirtualFunction(254)]
     public partial int GetTimeRemaining(int currentTimestamp);
 
-    [VirtualFunction(252)]
+    [VirtualFunction(255)]
     public partial bool HasTimer();
 
-    [VirtualFunction(254)]
+    [VirtualFunction(257)]
     public partial uint GetEventItemId();
 
-    [VirtualFunction(256)]
+    [VirtualFunction(260)]
     public partial StdVector<EventHandlerObjective>* GetObjectives();
 
-    [VirtualFunction(259)]
+    [VirtualFunction(264)]
     public partial int GetRecommendedLevel();
 }
 
diff --git a/ida/data.yml b/ida/data.yml
index 4a9c8ae37..f45494a87 100644
--- a/ida/data.yml
+++ b/ida/data.yml
@@ -12750,6 +12750,7 @@ classes:
       0: Dtor
       6: Terminate
       7: IsUnlocked
+      154: CancelInteraction
       199: GetTitle # lua function "GetEventHandlerTitle"
       221: GetIconId
       245: GetScriptVersion
@@ -13292,9 +13293,9 @@ classes:
       - ea: 0x141FA0850
         base: Client::Game::Event::LuaEventHandler
     vfuncs:
-      267: PopulateMapMarkers # (this, ushort territoryTypeId, StdVector<MapMarkerData>* markerVector)
-      286: SetSequence
-      287: Synchronize
+      272: PopulateMapMarkers # (this, ushort territoryTypeId, StdVector<MapMarkerData>* markerVector)
+      291: SetSequence
+      292: Synchronize
     funcs:
       0x140B0F210: ctor
   Client::Game::CallbackSheetWaiter<Client::Game::UI::QuestTodoList>: