From b30423ff6ad6993f56ec73f2eaf4261507d74355 Mon Sep 17 00:00:00 2001
From: Hyper <34012267+hyperbx@users.noreply.github.com>
Date: Thu, 21 Nov 2024 05:09:38 +0000
Subject: [PATCH] api: more research

---
 UnleashedRecomp/api/SWA/System/Application.h         | 2 +-
 UnleashedRecomp/api/SWA/System/ApplicationDocument.h | 2 +-
 UnleashedRecomp/api/SWA/System/GameDocument.h        | 2 +-
 UnleashedRecomp/api/SWA/System/GameObject.h          | 2 +-
 UnleashedRecomp/api/SWA/System/InputState.h          | 3 +--
 5 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/UnleashedRecomp/api/SWA/System/Application.h b/UnleashedRecomp/api/SWA/System/Application.h
index 326d734b..5efd399a 100644
--- a/UnleashedRecomp/api/SWA/System/Application.h
+++ b/UnleashedRecomp/api/SWA/System/Application.h
@@ -14,7 +14,7 @@ namespace SWA
             xpointer<CApplicationDocument> m_pApplicationDocument;
         };
 
-        SWA_INSERT_PADDING(0x04); // vftable ptr
+        xpointer<void> m_pVftable;
         xpointer<CMember> m_pMember;
         SWA_INSERT_PADDING(0x18);
     };
diff --git a/UnleashedRecomp/api/SWA/System/ApplicationDocument.h b/UnleashedRecomp/api/SWA/System/ApplicationDocument.h
index 6cf4fd20..fcc39529 100644
--- a/UnleashedRecomp/api/SWA/System/ApplicationDocument.h
+++ b/UnleashedRecomp/api/SWA/System/ApplicationDocument.h
@@ -20,7 +20,7 @@ namespace SWA
         // TODO: Hedgehog::Base::TSynchronizedPtr<CApplicationDocument>
         static CApplicationDocument* GetInstance();
 
-        SWA_INSERT_PADDING(0x04);
+        xpointer<void> m_pVftable;
         xpointer<CMember> m_pMember;
         SWA_INSERT_PADDING(0x14);
         be<uint32_t> m_Region;
diff --git a/UnleashedRecomp/api/SWA/System/GameDocument.h b/UnleashedRecomp/api/SWA/System/GameDocument.h
index cd563e70..f07c3240 100644
--- a/UnleashedRecomp/api/SWA/System/GameDocument.h
+++ b/UnleashedRecomp/api/SWA/System/GameDocument.h
@@ -24,7 +24,7 @@ namespace SWA
         // TODO: Hedgehog::Base::TSynchronizedPtr<CGameDocument>
         static CGameDocument* GetInstance();
 
-        SWA_INSERT_PADDING(0x04); // vftable ptr
+        xpointer<void> m_pVftable;
         xpointer<CMember> m_pMember;
     };
 }
diff --git a/UnleashedRecomp/api/SWA/System/GameObject.h b/UnleashedRecomp/api/SWA/System/GameObject.h
index 2fbc504f..dd4f7fd1 100644
--- a/UnleashedRecomp/api/SWA/System/GameObject.h
+++ b/UnleashedRecomp/api/SWA/System/GameObject.h
@@ -21,7 +21,7 @@ namespace SWA
             SWA_INSERT_PADDING(0x70);
         };
 
-        SWA_INSERT_PADDING(0x04); // vftable ptr
+        xpointer<void> m_pVftable;
         xpointer<CMember> m_pMember;
     };
 }
diff --git a/UnleashedRecomp/api/SWA/System/InputState.h b/UnleashedRecomp/api/SWA/System/InputState.h
index 7bb00ca9..b42c67eb 100644
--- a/UnleashedRecomp/api/SWA/System/InputState.h
+++ b/UnleashedRecomp/api/SWA/System/InputState.h
@@ -5,13 +5,12 @@
 
 namespace SWA
 {
-    class CInputState // : public Hedgehog::Base::CSynchronizedObject
+    class CInputState : public Hedgehog::Base::CSynchronizedObject
     {
     public:
         // TODO: Hedgehog::Base::TSynchronizedPtr<CInputState>
         static CInputState* GetInstance();
 
-        SWA_INSERT_PADDING(0x4);
         SPadState m_PadStates[8];
         be<uint32_t> m_CurrentPadStateIndex;