chore(binana): update files

3.3.5a/include/gx/batch.h

@@ -0,0 +1,17 @@
+#ifndef GX_BATCH_H
+#define GX_BATCH_H
+
+#include "gx/types.h"
+
+typedef struct CGxBatch CGxBatch;
+
+struct CGxBatch {
+  // Member variables
+  EGxPrim m_primType;
+  uint32_t m_start;
+  uint32_t m_count;
+  uint16_t m_minIndex;
+  uint16_t m_maxIndex;
+};
+
+#endif

3.3.5a/include/gx/device.h

@@ -69,7 +69,8 @@ struct CGxDevice__vtable {
   void* v_fn_9;
   // int32_t DeviceCreate(long (*)(void*, uint32_t, uint32_t, int32_t), CGxFormat const&);
   void* v_fn_10_DeviceCreate;
-  void* v_fn_11;
+  // void DeviceDestroy();
+  void* v_fn_11_DeviceDestroy;
   void* v_fn_12;
   // int32_t DeviceSetFormat(struct CGxFormat const &);
   void* v_fn_13_DeviceSetFormat;
@@ -90,7 +91,8 @@ struct CGxDevice__vtable {
   void* v_fn_25;
   void* v_fn_26;
   void* v_fn_27;
-  void* v_fn_28;
+  // void DeviceOverride(EGxOverride, uint32_t);
+  void* v_fn_28_DeviceOverride;
   void* v_fn_29;
   void* v_fn_30;
   void* v_fn_31;
@@ -99,14 +101,17 @@ struct CGxDevice__vtable {
   void* v_fn_34;
   // void CapsWindowSize(CRect&);
   void* v_fn_35_CapsWindowSize;
-  void* v_fn_36;
+  // void CapsWindowSize(CRect&);
+  void* v_fn_36_CapsWindowSizeInScreenCoords;
   void* v_fn_37;
   // void ScenePresent(uint32_t);
   void* v_fn_38_ScenePresent;
-  void* v_fn_39;
+  // void SceneClear(uint32_t, CImVector);
+  void* v_fn_39_SceneClear;
   // void XformSetProjection(const C44Matrix&);
   void* v_fn_40_XformSetProjection;
-  void* v_fn_41;
+  // void XformSetView(const C44Matrix&);
+  void* v_fn_41_XformSetView;
   // void Draw(CGxBatch*, int32_t);
   void* v_fn_42_Draw;
   void* v_fn_43;
@@ -150,14 +155,18 @@ struct CGxDevice__vtable {
   void* v_fn_70_ShaderConstantsSet;
   void* v_fn_71;
   void* v_fn_72;
-  void* v_fn_73;
+  // void CursorSetVisible(int32_t);
-  void* v_fn_74;
+  void* v_fn_73_CursorSetVisible;
-  void* v_fn_75;
+  // void* CursorLock();
+  void* v_fn_74_CursorLock;
+  // void CursorUnlock(uint32_t, uint32_t);
+  void* v_fn_75_CursorUnlock;
   void* v_fn_76;
   void* v_fn_77;
   void* v_fn_78;
   void* v_fn_79;
-  void* v_fn_80;
+  // bool StereoEnabled();
+  void* v_fn_80_StereoEnabled;
   void* v_fn_81;
   void* v_fn_82;
   void* v_fn_83;
@@ -230,11 +239,12 @@ struct CGxDevice {
   uint32_t unk28E8;
   TSFixedArray_CGxAppRenderState m_appRenderStates;
   TSFixedArray_CGxStateBom m_hwRenderStates;
-  uint32_t unk2904[20]; // 0x2904 (size 0x50) 
+  uint32_t unk2904[19]; // 0x2904 (size 0x4C) 
+  int32_t m_cursorVisible;
   int32_t m_hardwareCursor; // 0x2954 (size 0x4)
-  uint32_t unk2958;
+  uint32_t m_cursorHotspotX;
-  uint32_t unk295C;
+  uint32_t m_cursorHotspotY;
-  CImVector m_cursorImage[1024]; // 0x2960 (size 0x4)
+  CImVector m_cursor[1024]; // 0x2960 (size 0x4)
   CGxTex* m_cursorTexture; // 0x3960 (size 0x4)
   // 0x3964 == 14688 (the complete size of CGxDevice)
 };

3.3.5a/include/main.h

@@ -20,7 +20,7 @@
 #include "gx/shader.h"
 #include "gx/state_bom.h"
 #include "gx/types.h"
-
+#include "gx/batch.h"
 #include "gx/d3d9.h"
 
 // include files that define the use of template classes for standard library types

3.3.5a/symbol/camera/func.sym

@@ -0,0 +1,5 @@
+CCamera__SetupWorldProjection 004BECF0 f end=004BEE5E
+CameraSetupScreenProjection 004BEE60 f end=004BF0B9
+CameraSetupWorldProjection 004BF0C0 f end=004BF0E2
+CCamera__CCamera 004BF770 f end=004BFA4E
+CameraCreate 004BFCA0 f end=004BFCD4

3.3.5a/symbol/gx/func.sym

@@ -3,4 +3,10 @@ GxDrawLockedElements 00682340 f end=0068239E
 GxLog 006817E0 f end=006817F5
 OnPaint 004A8720 f end=004A8B58
 GxCapsWindowSizeInScreenCoords 00493BF0 f end=00493C09
-GxTexCreate 00681CB0 f end=00681D87
+GxTexCreate 00681CB0 f end=00681D87
+GxTexUpdate 006813D0 f end=006813EC
+GxXformSetProjection 00408030 f end=00408049
+GxXformViewport 00408070 f end=004080D9
+GxRsSet_int32_t 00408BF0 f end=00408C27
+GxRsSet_CGxShader 00408240 f end=00408258
+GxDraw 00482A40 f end=00482A5D

3.3.5a/symbol/gxdevice/func.sym

@@ -37,6 +37,7 @@ CGxDevice__RsPop 00685FB0 f end=00686116
 CGxDevice__BufCreate 00687660 f end=006876C9
 CGxDevice__PoolCreate 006876D0 f end=0068773F
 CGxDevice__ITexWHDStartEnd 006A5EF0 f end=006A5FDF
+CGxDevice__TexMarkForUpdate 006848A0 f end=000684900
 CGxDevice__ITexMarkAsUpdated 00684900 f end=0068492D
 CGxDevice__ICursorCreate 00684AD0 f end=00684B4A
 CGxDevice__ICursorDestroy 006835E0 f end=00683602
@@ -50,3 +51,6 @@ CGxDevice__BufData 00683130 f end=00683142
 CGxDevice__TexCreate 00685C60 f end=00685CCB
 CGxDevice__ShaderCreate 006897C0 f end=00689A49
 CGxDevice__ShaderConstantsSet 006833E0 f end=00683554
+CGxDevice__CursorSetVisible 00683640 f end=00683650
+CGxDevice__CursorLock 00683650 f end=00683657
+CGxDevice__CursorUnlock 00684B50 f end=00684B99

3.3.5a/symbol/gxdeviced3d/func.sym

@@ -16,4 +16,9 @@ CGxDeviceD3d__BufData 0068FD00 f end=0068FD49
 CGxDeviceD3d__ShaderCreate 006AA130 f end=006AA18A
 CGxDeviceD3d__ICreateWindow 0068EBB0 f end=0068ED78
 CGxDeviceD3d__ISetCaps 0068EE20 f end=0068F36D
-CGxDeviceD3d__ICreateD3dDevice 0068F3D0 f end=0068F692
+CGxDeviceD3d__ICreateD3dDevice 0068F3D0 f end=0068F692
+CGxDeviceD3d__ISceneBegin 006A3350 f
+CGxDeviceD3d__ScenePresent 006A3450 f
+CGxDeviceD3d__Draw 006A3620 f
+CGxDeviceD3d__IStateSyncEnables 006A3810 f
+CGxDeviceD3d__ISetVertexBuffer 006A39E0 f

3.3.5a/symbol/main.sym

@@ -8,6 +8,12 @@ CDataStore__destructor 004038A0 f ; CDataStore::~CDataStore()
 InitializeGlobal 004067F0 f end=00406B67
 DestroyGlobal 00406B70 f end=00406C65
 CommonMain 00406C70 f end=00406D64
+C44Matrix__C44Matrix 00407F40 f end=00407F76
+C44Matrix__operator_equals_C44Matrix 00407F80 f end=00407FEA
+GxXformSetProjection 00408030 f end=00408049
+GxXformViewport 00408070 f end=004080D9
+GxRsSet_CGxShader 00408240 f end=00408258
+GxRsSet_int32_t 00408BF0 f end=00408C27
 CGxDevice__RsPush 00409670 f end=004096CC
 purecall 0040BAA5 f end=0040BACF
 nullsub_1 0040D3B5 f
@@ -104,6 +110,7 @@ IEvtTimerGetNextTime 00480F70 f end=00480FCA
 IEvtTimerDispatch 00481100 f end=00481289
 IEvtTimerKill 00481290 f end=0048138F
 IEvtTimerSet 00481390 f end=004814E4
+GxDraw 00482A40 f end=00482A5D
 GxCapsWindowSizeInScreenCoords 00493BF0 f end=00493C09
 ScrnLayerSetRect 004A8500 f end=004A8522
 OnPaint 004A8720 f end=004A8B58
@@ -114,6 +121,11 @@ TextBlockCreate 004BDAA0 f end=004BDBE4
 TextBlockSetStringPos 004BDBF0 f end=004BDC4C
 TextBlockGetWrappedTextHeight 004BDD80 f
 TextBlockGenerateFont 004BE9C0 f end=004BEB8C
+CCamera__SetupWorldProjection 004BECF0 f end=004BEE5E
+CameraSetupScreenProjection 004BEE60 f end=004BF0B9
+CameraSetupWorldProjection 004BF0C0 f end=004BF0E2
+CCamera__CCamera 004BF770 f end=004BFA4E
+CameraCreate 004BFCA0 f end=004BFCD4
 Script_GetLocale 004DBFD0 f end=004DBFF3 ; thanks namreeb :^)
 Script_IsWindowsClient 004DCE40 f end=004DCE5E
 Script_RestartGx 004DD400 f end=004DD412
@@ -1994,6 +2006,7 @@ Script_GetVehicleUIIndicatorSeat 00614EF0 f end=00614FC6
 nullsub_4 00632050 f
 nullsub_5 00653A10 f
 GxDevCreate 00681290 f end=00681301
+GxTexUpdate 006813D0 f end=006813EC
 GxLog 006817E0 f end=006817F5
 GxPrimIndexPtr 00681AB0 f end=00681AFB
 GxPrimVertexPtr 00681B00 f
@@ -2021,15 +2034,19 @@ CGxDevice__ShaderConstantsLock 00683560 f end=00683577
 CGxDevice__ShaderConstantsUnlock 00683580 f end=006835D6
 CGxDevice__ICursorDestroy 006835E0 f end=00683602
 CGxDevice__ICursorUpdate 00683610 f end=00683632
+CGxDevice__CursorSetVisible 00683640 f end=00683650
+CGxDevice__CursorLock 00683650 f end=00683657
 CGxDevice__DeviceSetFormat 006840F0 f end=0068416C
 CGxDevice__DeviceSetGamma 00684190 f end=006841AF
 CGxDevice__DeviceSetDefWindow 00684360 f end=006843B0
 CGxDevice__ClipPlaneSet 00684440 f end=006844B9
 CGxDevice__LightSet 006847D0 f end=00684843
 CGxDevice__BufStream 00684850 f end=0068489F
+CGxDevice__TexMarkForUpdate 006848A0 f end=000684900
 CGxDevice__ITexMarkAsUpdated 00684900 f end=0068492D
 CGxDevice__IShaderLoad 00684970 f end=00684AC8
 CGxDevice__ICursorCreate 00684AD0 f end=00684B4A
+CGxDevice__CursorUnlock 00684B50 f end=00684B99
 CGxDevice__Log 00684C20 f end=00684C3E
 CGxDevice__Log_CGxCaps 00684C40 f end=00684D07 ; CGxDevice::Log(CGxCaps const&) const
 CGxDevice__Log 00684D10 f end=00684D6C
@@ -2067,7 +2084,12 @@ CGxDeviceD3d__DeviceCreate_WindowProc_CGxFormat 00690750 f end=00690821
 CGxDeviceD3d__ICursorDestroy 006A00C0 f end=006A0102
 CGxDeviceD3d9Ex__CGxDeviceD3d9Ex 006A1A90 f end=006A1C24
 CGxDeviceD3d__ITexMarkAsUpdated 006A3070 f end=006A30CF
+CGxDeviceD3d__ISceneBegin 006A3350 f
+CGxDeviceD3d__ScenePresent 006A3450 f
 CGxDeviceD3d__ScenePresent 006A3450 f end=006A3611
+CGxDeviceD3d__Draw 006A3620 f
+CGxDeviceD3d__IStateSyncEnables 006A3810 f
+CGxDeviceD3d__ISetVertexBuffer 006A39E0 f
 CGxDeviceD3d__IRsSendToHw 006A4C30 f end=006A5499
 CGxDeviceD3d__CapsWindowSize 006A5A00 f end=006A5A25
 CGxDevice__ITexWHDStartEnd 006A5EF0 f end=006A5FDF

3.3.5a/symbol/tempest/func.sym

@@ -0,0 +1,2 @@
+C44Matrix__C44Matrix 00407F40 f end=00407F76
+C44Matrix__operator_equals_C44Matrix 00407F80 f end=00407FEA

3.3.5a/x32dbg/game.dd32

@@ -80,6 +80,54 @@
       "icount": "0x0",
       "parent": "0x6c70"
     },
+    {
+      "manual": true,
+      "start": "0x7f40",
+      "end": "0x7f75",
+      "module": "wow.exe",
+      "icount": "0x0",
+      "parent": "0x7f40"
+    },
+    {
+      "manual": true,
+      "start": "0x7f80",
+      "end": "0x7fe9",
+      "module": "wow.exe",
+      "icount": "0x0",
+      "parent": "0x7f80"
+    },
+    {
+      "manual": true,
+      "start": "0x8030",
+      "end": "0x8048",
+      "module": "wow.exe",
+      "icount": "0x0",
+      "parent": "0x8030"
+    },
+    {
+      "manual": true,
+      "start": "0x8070",
+      "end": "0x80d8",
+      "module": "wow.exe",
+      "icount": "0x0",
+      "parent": "0x8070"
+    },
+    {
+      "manual": true,
+      "start": "0x8240",
+      "end": "0x8257",
+      "module": "wow.exe",
+      "icount": "0x0",
+      "parent": "0x8240"
+    },
+    {
+      "manual": true,
+      "start": "0x8bf0",
+      "end": "0x8c26",
+      "module": "wow.exe",
+      "icount": "0x0",
+      "parent": "0x8bf0"
+    },
     {
       "manual": true,
       "start": "0x9670",
@@ -848,6 +896,14 @@
       "icount": "0x0",
       "parent": "0x81390"
     },
+    {
+      "manual": true,
+      "start": "0x82a40",
+      "end": "0x82a5c",
+      "module": "wow.exe",
+      "icount": "0x0",
+      "parent": "0x82a40"
+    },
     {
       "manual": true,
       "start": "0x93bf0",
@@ -928,6 +984,46 @@
       "icount": "0x0",
       "parent": "0xbe9c0"
     },
+    {
+      "manual": true,
+      "start": "0xbecf0",
+      "end": "0xbee5d",
+      "module": "wow.exe",
+      "icount": "0x0",
+      "parent": "0xbecf0"
+    },
+    {
+      "manual": true,
+      "start": "0xbee60",
+      "end": "0xbf0b8",
+      "module": "wow.exe",
+      "icount": "0x0",
+      "parent": "0xbee60"
+    },
+    {
+      "manual": true,
+      "start": "0xbf0c0",
+      "end": "0xbf0e1",
+      "module": "wow.exe",
+      "icount": "0x0",
+      "parent": "0xbf0c0"
+    },
+    {
+      "manual": true,
+      "start": "0xbf770",
+      "end": "0xbfa4d",
+      "module": "wow.exe",
+      "icount": "0x0",
+      "parent": "0xbf770"
+    },
+    {
+      "manual": true,
+      "start": "0xbfca0",
+      "end": "0xbfcd3",
+      "module": "wow.exe",
+      "icount": "0x0",
+      "parent": "0xbfca0"
+    },
     {
       "manual": true,
       "start": "0xdbfd0",
@@ -15968,6 +16064,14 @@
       "icount": "0x0",
       "parent": "0x281290"
     },
+    {
+      "manual": true,
+      "start": "0x2813d0",
+      "end": "0x2813eb",
+      "module": "wow.exe",
+      "icount": "0x0",
+      "parent": "0x2813d0"
+    },
     {
       "manual": true,
       "start": "0x2817e0",
@@ -16184,6 +16288,22 @@
       "icount": "0x0",
       "parent": "0x283610"
     },
+    {
+      "manual": true,
+      "start": "0x283640",
+      "end": "0x28364f",
+      "module": "wow.exe",
+      "icount": "0x0",
+      "parent": "0x283640"
+    },
+    {
+      "manual": true,
+      "start": "0x283650",
+      "end": "0x283656",
+      "module": "wow.exe",
+      "icount": "0x0",
+      "parent": "0x283650"
+    },
     {
       "manual": true,
       "start": "0x2840f0",
@@ -16232,6 +16352,14 @@
       "icount": "0x0",
       "parent": "0x284850"
     },
+    {
+      "manual": true,
+      "start": "0x2848a0",
+      "end": "0x2848ff",
+      "module": "wow.exe",
+      "icount": "0x0",
+      "parent": "0x2848a0"
+    },
     {
       "manual": true,
       "start": "0x284900",
@@ -16256,6 +16384,14 @@
       "icount": "0x0",
       "parent": "0x284ad0"
     },
+    {
+      "manual": true,
+      "start": "0x284b50",
+      "end": "0x284b98",
+      "module": "wow.exe",
+      "icount": "0x0",
+      "parent": "0x284b50"
+    },
     {
       "manual": true,
       "start": "0x284c20",
@@ -16552,6 +16688,14 @@
       "icount": "0x0",
       "parent": "0x2a3070"
     },
+    {
+      "manual": true,
+      "start": "0x2a3350",
+      "end": "0x2a3350",
+      "module": "wow.exe",
+      "icount": "0x0",
+      "parent": "0x2a3350"
+    },
     {
       "manual": true,
       "start": "0x2a3450",
@@ -16560,6 +16704,38 @@
       "icount": "0x0",
       "parent": "0x2a3450"
     },
+    {
+      "manual": true,
+      "start": "0x2a3450",
+      "end": "0x2a3450",
+      "module": "wow.exe",
+      "icount": "0x0",
+      "parent": "0x2a3450"
+    },
+    {
+      "manual": true,
+      "start": "0x2a3620",
+      "end": "0x2a3620",
+      "module": "wow.exe",
+      "icount": "0x0",
+      "parent": "0x2a3620"
+    },
+    {
+      "manual": true,
+      "start": "0x2a3810",
+      "end": "0x2a3810",
+      "module": "wow.exe",
+      "icount": "0x0",
+      "parent": "0x2a3810"
+    },
+    {
+      "manual": true,
+      "start": "0x2a39e0",
+      "end": "0x2a39e0",
+      "module": "wow.exe",
+      "icount": "0x0",
+      "parent": "0x2a39e0"
+    },
     {
       "manual": true,
       "start": "0x2a4c30",
@@ -19662,6 +19838,42 @@
       "text": "CommonMain",
       "address": "0x6c70"
     },
+    {
+      "manual": true,
+      "module": "wow.exe",
+      "text": "C44Matrix__C44Matrix",
+      "address": "0x7f40"
+    },
+    {
+      "manual": true,
+      "module": "wow.exe",
+      "text": "C44Matrix__operator_equals_C44Matrix",
+      "address": "0x7f80"
+    },
+    {
+      "manual": true,
+      "module": "wow.exe",
+      "text": "GxXformSetProjection",
+      "address": "0x8030"
+    },
+    {
+      "manual": true,
+      "module": "wow.exe",
+      "text": "GxXformViewport",
+      "address": "0x8070"
+    },
+    {
+      "manual": true,
+      "module": "wow.exe",
+      "text": "GxRsSet_CGxShader",
+      "address": "0x8240"
+    },
+    {
+      "manual": true,
+      "module": "wow.exe",
+      "text": "GxRsSet_int32_t",
+      "address": "0x8bf0"
+    },
     {
       "manual": true,
       "module": "wow.exe",
@@ -20238,6 +20450,12 @@
       "text": "IEvtTimerSet",
       "address": "0x81390"
     },
+    {
+      "manual": true,
+      "module": "wow.exe",
+      "text": "GxDraw",
+      "address": "0x82a40"
+    },
     {
       "manual": true,
       "module": "wow.exe",
@@ -20298,6 +20516,36 @@
       "text": "TextBlockGenerateFont",
       "address": "0xbe9c0"
     },
+    {
+      "manual": true,
+      "module": "wow.exe",
+      "text": "CCamera__SetupWorldProjection",
+      "address": "0xbecf0"
+    },
+    {
+      "manual": true,
+      "module": "wow.exe",
+      "text": "CameraSetupScreenProjection",
+      "address": "0xbee60"
+    },
+    {
+      "manual": true,
+      "module": "wow.exe",
+      "text": "CameraSetupWorldProjection",
+      "address": "0xbf0c0"
+    },
+    {
+      "manual": true,
+      "module": "wow.exe",
+      "text": "CCamera__CCamera",
+      "address": "0xbf770"
+    },
+    {
+      "manual": true,
+      "module": "wow.exe",
+      "text": "CameraCreate",
+      "address": "0xbfca0"
+    },
     {
       "manual": true,
       "module": "wow.exe",
@@ -31578,6 +31826,12 @@
       "text": "GxDevCreate",
       "address": "0x281290"
     },
+    {
+      "manual": true,
+      "module": "wow.exe",
+      "text": "GxTexUpdate",
+      "address": "0x2813d0"
+    },
     {
       "manual": true,
       "module": "wow.exe",
@@ -31740,6 +31994,18 @@
       "text": "CGxDevice__ICursorUpdate",
       "address": "0x283610"
     },
+    {
+      "manual": true,
+      "module": "wow.exe",
+      "text": "CGxDevice__CursorSetVisible",
+      "address": "0x283640"
+    },
+    {
+      "manual": true,
+      "module": "wow.exe",
+      "text": "CGxDevice__CursorLock",
+      "address": "0x283650"
+    },
     {
       "manual": true,
       "module": "wow.exe",
@@ -31776,6 +32042,12 @@
       "text": "CGxDevice__BufStream",
       "address": "0x284850"
     },
+    {
+      "manual": true,
+      "module": "wow.exe",
+      "text": "CGxDevice__TexMarkForUpdate",
+      "address": "0x2848a0"
+    },
     {
       "manual": true,
       "module": "wow.exe",
@@ -31794,6 +32066,12 @@
       "text": "CGxDevice__ICursorCreate",
       "address": "0x284ad0"
     },
+    {
+      "manual": true,
+      "module": "wow.exe",
+      "text": "CGxDevice__CursorUnlock",
+      "address": "0x284b50"
+    },
     {
       "manual": true,
       "module": "wow.exe",
@@ -32016,12 +32294,42 @@
       "text": "CGxDeviceD3d__ITexMarkAsUpdated",
       "address": "0x2a3070"
     },
+    {
+      "manual": true,
+      "module": "wow.exe",
+      "text": "CGxDeviceD3d__ISceneBegin",
+      "address": "0x2a3350"
+    },
     {
       "manual": true,
       "module": "wow.exe",
       "text": "CGxDeviceD3d__ScenePresent",
       "address": "0x2a3450"
     },
+    {
+      "manual": true,
+      "module": "wow.exe",
+      "text": "CGxDeviceD3d__ScenePresent",
+      "address": "0x2a3450"
+    },
+    {
+      "manual": true,
+      "module": "wow.exe",
+      "text": "CGxDeviceD3d__Draw",
+      "address": "0x2a3620"
+    },
+    {
+      "manual": true,
+      "module": "wow.exe",
+      "text": "CGxDeviceD3d__IStateSyncEnables",
+      "address": "0x2a3810"
+    },
+    {
+      "manual": true,
+      "module": "wow.exe",
+      "text": "CGxDeviceD3d__ISetVertexBuffer",
+      "address": "0x2a39e0"
+    },
     {
       "manual": true,
       "module": "wow.exe",

3.3.5a/x32dbg/types.json

@@ -1553,9 +1553,14 @@
         {
           "type": "uint32_t",
           "name": "unk2904",
-          "arrsize": 20,
+          "arrsize": 19,
           "offset": 10500
         },
+        {
+          "type": "int32_t",
+          "name": "m_cursorVisible",
+          "offset": 10576
+        },
         {
           "type": "int32_t",
           "name": "m_hardwareCursor",
@@ -1563,17 +1568,17 @@
         },
         {
           "type": "uint32_t",
-          "name": "unk2958",
+          "name": "m_cursorHotspotX",
           "offset": 10584
         },
         {
           "type": "uint32_t",
-          "name": "unk295C",
+          "name": "m_cursorHotspotY",
           "offset": 10588
         },
         {
           "type": "CImVector",
-          "name": "m_cursorImage",
+          "name": "m_cursor",
           "arrsize": 1024,
           "offset": 10592
         },
@@ -1643,7 +1648,7 @@
         },
         {
           "type": "void*",
-          "name": "v_fn_11",
+          "name": "v_fn_11_DeviceDestroy",
           "offset": 44
         },
         {
@@ -1728,7 +1733,7 @@
         },
         {
           "type": "void*",
-          "name": "v_fn_28",
+          "name": "v_fn_28_DeviceOverride",
           "offset": 112
         },
         {
@@ -1768,7 +1773,7 @@
         },
         {
           "type": "void*",
-          "name": "v_fn_36",
+          "name": "v_fn_36_CapsWindowSizeInScreenCoords",
           "offset": 144
         },
         {
@@ -1783,7 +1788,7 @@
         },
         {
           "type": "void*",
-          "name": "v_fn_39",
+          "name": "v_fn_39_SceneClear",
           "offset": 156
         },
         {
@@ -1793,7 +1798,7 @@
         },
         {
           "type": "void*",
-          "name": "v_fn_41",
+          "name": "v_fn_41_XformSetView",
           "offset": 164
         },
         {
@@ -1953,17 +1958,17 @@
         },
         {
           "type": "void*",
-          "name": "v_fn_73",
+          "name": "v_fn_73_CursorSetVisible",
           "offset": 292
         },
         {
           "type": "void*",
-          "name": "v_fn_74",
+          "name": "v_fn_74_CursorLock",
           "offset": 296
         },
         {
           "type": "void*",
-          "name": "v_fn_75",
+          "name": "v_fn_75_CursorUnlock",
           "offset": 300
         },
         {
@@ -1988,7 +1993,7 @@
         },
         {
           "type": "void*",
-          "name": "v_fn_80",
+          "name": "v_fn_80_StereoEnabled",
           "offset": 320
         },
         {
@@ -2608,6 +2613,35 @@
         }
       ]
     },
+    {
+      "name": "CGxBatch",
+      "members": [
+        {
+          "type": "EGxPrim",
+          "name": "m_primType"
+        },
+        {
+          "type": "uint32_t",
+          "name": "m_start",
+          "offset": 4
+        },
+        {
+          "type": "uint32_t",
+          "name": "m_count",
+          "offset": 8
+        },
+        {
+          "type": "uint16_t",
+          "name": "m_minIndex",
+          "offset": 12
+        },
+        {
+          "type": "uint16_t",
+          "name": "m_maxIndex",
+          "offset": 14
+        }
+      ]
+    },
     {
       "name": "CGxDeviceD3d",
       "members": [

script/sort-file

@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+# this script just collects symbols into one file for convenience
+
+if [ $# -eq 0 ]
+  then
+    echo "Select a file"
+    exit 1
+fi
+
+awk 1 $1 | sort -k2 -t' '