Fix EventHandler/Director vfs

aers · Feb 24, 2025 · bfc83c5 · bfc83c5
1 parent 305bc8c
commit bfc83c5
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 12 deletions.
diff --git 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
@@ -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
@@ -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>: