From 5aa590d7678ce94644542839e173c53356b015a3 Mon Sep 17 00:00:00 2001
From: disinvite <disinvite@users.noreply.github.com>
Date: Sat, 13 Jan 2024 15:09:36 -0500
Subject: [PATCH] Decomp marker corrections

---
 LEGO1/define.cpp                              | 22 +++++++++----------
 .../legoomni/include/legounknown100d9d00.h    |  6 +++++
 LEGO1/lego/legoomni/src/common/gifmanager.cpp |  1 +
 .../src/common/legobackgroundcolor.cpp        |  5 +++++
 .../src/common/legofullscreenmovie.cpp        |  4 ++--
 .../legoomni/src/common/legogamestate.cpp     | 12 +++++-----
 LEGO1/library_msvc.h                          |  4 ++++
 LEGO1/omni/include/mxdsevent.h                |  1 +
 LEGO1/omni/include/mxnotificationmanager.h    |  6 +++++
 LEGO1/omni/include/mxomnicreateparam.h        |  1 +
 LEGO1/omni/include/mxparam.h                  |  2 ++
 LEGO1/omni/include/mxsemaphore.h              |  1 +
 LEGO1/omni/include/mxstreamer.h               |  1 +
 LEGO1/omni/include/mxstringlist.h             | 15 +++++++++++++
 LEGO1/omni/include/mxticklemanager.h          |  3 +++
 LEGO1/omni/include/mxvariabletable.h          |  3 +++
 LEGO1/omni/include/mxvideopresenter.h         |  2 +-
 LEGO1/omni/src/video/mxdisplaysurface.cpp     |  1 +
 LEGO1/omni/src/video/mxstillpresenter.cpp     |  2 +-
 LEGO1/tgl/d3drm/impl.h                        | 18 +++++++--------
 LEGO1/tgl/tgl.h                               | 20 ++++++++---------
 21 files changed, 90 insertions(+), 40 deletions(-)

diff --git a/LEGO1/define.cpp b/LEGO1/define.cpp
index 3f3f70ac..884c8787 100644
--- a/LEGO1/define.cpp
+++ b/LEGO1/define.cpp
@@ -10,20 +10,20 @@ MxS32 g_mxcoreCount[101] = {0,     -6643, -5643, -5058, -4643, -4321, -4058, -38
 							-358,  -340,  -321,  -304,  -286,  -268,  -251,  -234,  -217,  -200,  -184,  -168,  -152,
 							-136,  -120,  -104,  -89,   -74,   -58,   -43,   -29,   -14,   0};
 
-// GLOBAL: LEGO1 0x10101eac
-const char* g_parseExtraTokens = ":;";
+// GLOBAL: LEGO1 0x10102048
+const char* g_strACTION = "ACTION";
 
-// GLOBAL: LEGO1 0x10101edc
-const char* g_strWORLD = "WORLD";
-
-// GLOBAL: LEGO1 0x10101f20
-const char* g_strSOUND = "SOUND";
-
-// GLOBAL: LEGO1 0x10101f58
+// GLOBAL: LEGO1 0x1010209c
 const char* g_strOBJECT = "OBJECT";
 
-// GLOBAL: LEGO1 0x10102040
-const char* g_strACTION = "ACTION";
+// GLOBAL: LEGO1 0x101020b0
+const char* g_strSOUND = "SOUND";
 
 // GLOBAL: LEGO1 0x101020cc
 const char* g_strVISIBILITY = "VISIBILITY";
+
+// GLOBAL: LEGO1 0x101020d0
+const char* g_strWORLD = "WORLD";
+
+// GLOBAL: LEGO1 0x101020e4
+const char* g_parseExtraTokens = ":;";
diff --git a/LEGO1/lego/legoomni/include/legounknown100d9d00.h b/LEGO1/lego/legoomni/include/legounknown100d9d00.h
index d31634fe..394ffbbd 100644
--- a/LEGO1/lego/legoomni/include/legounknown100d9d00.h
+++ b/LEGO1/lego/legoomni/include/legounknown100d9d00.h
@@ -27,9 +27,15 @@ class LegoUnknown100d9d00 : public MxList<LegoUnknown100d7c88*> {
 // TEMPLATE: LEGO1 0x1007b300
 // MxCollection<LegoUnknown100d7c88 *>::Compare
 
+// TEMPLATE: LEGO1 0x1007b310
+// MxCollection<LegoUnknown100d7c88 *>::~MxCollection<LegoUnknown100d7c88 *>
+
 // TEMPLATE: LEGO1 0x1007b360
 // MxCollection<LegoUnknown100d7c88 *>::Destroy
 
+// TEMPLATE: LEGO1 0x1007b370
+// MxList<LegoUnknown100d7c88 *>::~MxList<LegoUnknown100d7c88 *>
+
 // SYNTHETIC: LEGO1 0x1007b400
 // LegoUnknown100d9d00::`scalar deleting destructor'
 
diff --git a/LEGO1/lego/legoomni/src/common/gifmanager.cpp b/LEGO1/lego/legoomni/src/common/gifmanager.cpp
index 0fc25b96..e9b10d49 100644
--- a/LEGO1/lego/legoomni/src/common/gifmanager.cpp
+++ b/LEGO1/lego/legoomni/src/common/gifmanager.cpp
@@ -6,6 +6,7 @@ DECOMP_SIZE_ASSERT(GifMap, 0x08);
 DECOMP_SIZE_ASSERT(GifManagerBase, 0x14);
 DECOMP_SIZE_ASSERT(GifManager, 0x30);
 
+// GLOBAL: LEGO1 0x100f0100
 GifMapEntry* g_unk0x100f0100;
 
 // FUNCTION: LEGO1 0x10001cc0
diff --git a/LEGO1/lego/legoomni/src/common/legobackgroundcolor.cpp b/LEGO1/lego/legoomni/src/common/legobackgroundcolor.cpp
index e682356b..117bc0cc 100644
--- a/LEGO1/lego/legoomni/src/common/legobackgroundcolor.cpp
+++ b/LEGO1/lego/legoomni/src/common/legobackgroundcolor.cpp
@@ -7,8 +7,13 @@
 
 DECOMP_SIZE_ASSERT(LegoBackgroundColor, 0x30)
 
+// GLOBAL: LEGO1 0x100f3fb0
 const char* g_delimiter = "\t";
+
+// GLOBAL: LEGO1 0x100f3fb4
 const char* g_set = "set";
+
+// GLOBAL: LEGO1 0x100f3fb8
 const char* g_reset = "reset";
 
 // FUNCTION: LEGO1 0x1003bfb0
diff --git a/LEGO1/lego/legoomni/src/common/legofullscreenmovie.cpp b/LEGO1/lego/legoomni/src/common/legofullscreenmovie.cpp
index 110a88d0..7fcdce59 100644
--- a/LEGO1/lego/legoomni/src/common/legofullscreenmovie.cpp
+++ b/LEGO1/lego/legoomni/src/common/legofullscreenmovie.cpp
@@ -7,10 +7,10 @@
 
 DECOMP_SIZE_ASSERT(LegoFullScreenMovie, 0x24)
 
-// GLOBAL: LEGO1 0x100f3be8
+// GLOBAL: LEGO1 0x100f3fbc
 const char* g_strEnable = "enable";
 
-// GLOBAL: LEGO1 0x100f3bf4
+// GLOBAL: LEGO1 0x100f3fc0
 const char* g_strDisable = "disable";
 
 // FUNCTION: LEGO1 0x1003c500
diff --git a/LEGO1/lego/legoomni/src/common/legogamestate.cpp b/LEGO1/lego/legoomni/src/common/legogamestate.cpp
index a081248c..96dacac2 100644
--- a/LEGO1/lego/legoomni/src/common/legogamestate.cpp
+++ b/LEGO1/lego/legoomni/src/common/legogamestate.cpp
@@ -15,15 +15,15 @@
 // There may be other members that come after.
 DECOMP_SIZE_ASSERT(LegoGameState, 0x430)
 
-// GLOBAL: LEGO1 0x100f3e24
-const char* g_historyGSI = "History.gsi";
-
-// GLOBAL: LEGO1 0x100f3e30
-const char* g_playersGSI = "Players.gsi";
-
 // GLOBAL: LEGO1 0x100f3e40
 const char* g_fileExtensionGS = ".GS";
 
+// GLOBAL: LEGO1 0x100f3e44
+const char* g_playersGSI = "Players.gsi";
+
+// GLOBAL: LEGO1 0x100f3e48
+const char* g_historyGSI = "History.gsi";
+
 // GLOBAL: LEGO1 0x100f3e58
 ColorStringStruct g_colorSaveData[43] = {
 	{"c_dbbkfny0", "lego red"},    {"c_dbbkxly0", "lego white"},  {"c_chbasey0", "lego black"},
diff --git a/LEGO1/library_msvc.h b/LEGO1/library_msvc.h
index 20ae06ef..e3fa187b 100644
--- a/LEGO1/library_msvc.h
+++ b/LEGO1/library_msvc.h
@@ -18,6 +18,10 @@
 // LIBRARY: LEGO1 0x1008a1c0
 // _free
 
+// LIBRARY: ISLE 0x407ec0
+// LIBRARY: LEGO1 0x1008b020
+// ___CxxFrameHandler
+
 // LIBRARY: ISLE 0x408220
 // LIBRARY: LEGO1 0x1008b400
 // _atol
diff --git a/LEGO1/omni/include/mxdsevent.h b/LEGO1/omni/include/mxdsevent.h
index 01cf1fa4..5d002a88 100644
--- a/LEGO1/omni/include/mxdsevent.h
+++ b/LEGO1/omni/include/mxdsevent.h
@@ -3,6 +3,7 @@
 
 #include "mxdsmediaaction.h"
 
+// VTABLE: LEGO1 0x100dce18
 class MxDSEvent : public MxDSMediaAction {
 public:
 	MxDSEvent();
diff --git a/LEGO1/omni/include/mxnotificationmanager.h b/LEGO1/omni/include/mxnotificationmanager.h
index 4a3d8726..50fc22bc 100644
--- a/LEGO1/omni/include/mxnotificationmanager.h
+++ b/LEGO1/omni/include/mxnotificationmanager.h
@@ -52,4 +52,10 @@ class MxNotificationManager : public MxCore {
 	void FlushPending(MxCore* p_listener);
 };
 
+// FUNCTION: LEGO1 0x100ac3b0
+// MxIdList::~MxIdList
+
+// TEMPLATE: LEGO1 0x100ac540
+// List<MxNotification *>::~List<MxNotification *>
+
 #endif // MXNOTIFICATIONMANAGER_H
diff --git a/LEGO1/omni/include/mxomnicreateparam.h b/LEGO1/omni/include/mxomnicreateparam.h
index 825b5053..78aee1b2 100644
--- a/LEGO1/omni/include/mxomnicreateparam.h
+++ b/LEGO1/omni/include/mxomnicreateparam.h
@@ -8,6 +8,7 @@
 
 #include <windows.h>
 
+// VTABLE: LEGO1 0x100dc218
 class MxOmniCreateParam : public MxParam {
 public:
 	__declspec(dllexport) MxOmniCreateParam(
diff --git a/LEGO1/omni/include/mxparam.h b/LEGO1/omni/include/mxparam.h
index 19e92e0e..461a38ec 100644
--- a/LEGO1/omni/include/mxparam.h
+++ b/LEGO1/omni/include/mxparam.h
@@ -1,8 +1,10 @@
 #ifndef MXPARAM_H
 #define MXPARAM_H
 
+// VTABLE: LEGO1 0x100d56e8
 class MxParam {
 public:
+	// FUNCTION: LEGO1 0x10010360
 	virtual ~MxParam() {}
 };
 
diff --git a/LEGO1/omni/include/mxsemaphore.h b/LEGO1/omni/include/mxsemaphore.h
index ecb6509c..43b4d638 100644
--- a/LEGO1/omni/include/mxsemaphore.h
+++ b/LEGO1/omni/include/mxsemaphore.h
@@ -6,6 +6,7 @@
 #include <windows.h>
 
 // SIZE 0x08
+// VTABLE: LEGO1 0x100dccf0
 class MxSemaphore {
 public:
 	MxSemaphore();
diff --git a/LEGO1/omni/include/mxstreamer.h b/LEGO1/omni/include/mxstreamer.h
index 02f97d12..a99fa0e4 100644
--- a/LEGO1/omni/include/mxstreamer.h
+++ b/LEGO1/omni/include/mxstreamer.h
@@ -48,6 +48,7 @@ class MxStreamerSubClass3 : public MxStreamerSubClass1 {
 	inline MxStreamerSubClass3() : MxStreamerSubClass1(0x80) {}
 };
 
+// VTABLE: LEGO1 0x100dc760
 class MxStreamerNotification : public MxNotificationParam {
 public:
 	inline MxStreamerNotification(NotificationId p_type, MxCore* p_sender, MxStreamController* p_ctrlr)
diff --git a/LEGO1/omni/include/mxstringlist.h b/LEGO1/omni/include/mxstringlist.h
index 6e75683d..d07c7393 100644
--- a/LEGO1/omni/include/mxstringlist.h
+++ b/LEGO1/omni/include/mxstringlist.h
@@ -14,18 +14,33 @@ class MxStringListCursor : public MxListCursor<MxString> {
 	MxStringListCursor(MxStringList* p_list) : MxListCursor<MxString>(p_list){};
 };
 
+// VTABLE: LEGO1 0x100dd010
+// class MxCollection<MxString>
+
+// VTABLE: LEGO1 0x100dd028
+// class MxList<MxString>
+
 // VTABLE: LEGO1 0x100dd070
 // class MxListCursor<MxString>
 
 // TEMPLATE: LEGO1 0x100cb3c0
 // MxCollection<MxString>::Compare
 
+// TEMPLATE: LEGO1 0x100cb420
+// MxCollection<MxString>::~MxCollection<MxString>
+
 // TEMPLATE: LEGO1 0x100cb470
 // MxCollection<MxString>::Destroy
 
 // TEMPLATE: LEGO1 0x100cb4c0
 // MxList<MxString>::~MxList<MxString>
 
+// SYNTHETIC: LEGO1 0x100cb590
+// MxCollection<MxString>::`scalar deleting destructor'
+
+// SYNTHETIC: LEGO1 0x100cb600
+// MxList<MxString>::`scalar deleting destructor'
+
 // TEMPLATE: LEGO1 0x100cbb40
 // MxList<MxString>::Append
 
diff --git a/LEGO1/omni/include/mxticklemanager.h b/LEGO1/omni/include/mxticklemanager.h
index 44694a61..05fa8169 100644
--- a/LEGO1/omni/include/mxticklemanager.h
+++ b/LEGO1/omni/include/mxticklemanager.h
@@ -50,4 +50,7 @@ class MxTickleManager : public MxCore {
 
 #define TICKLE_MANAGER_NOT_FOUND 0x80000000
 
+// TEMPLATE: LEGO1 0x1005a530
+// List<MxTickleClient *>::~List<MxTickleClient *>
+
 #endif // MXTICKLEMANAGER_H
diff --git a/LEGO1/omni/include/mxvariabletable.h b/LEGO1/omni/include/mxvariabletable.h
index 7821311e..a15bc431 100644
--- a/LEGO1/omni/include/mxvariabletable.h
+++ b/LEGO1/omni/include/mxvariabletable.h
@@ -26,6 +26,9 @@ class MxVariableTable : public MxHashTable<MxVariable*> {
 // VTABLE: LEGO1 0x100dc1e8
 // class MxHashTable<MxVariable *>
 
+// VTABLE: LEGO1 0x100dc680
+// class MxHashTableCursor<MxVariable *>
+
 // TEMPLATE: LEGO1 0x100afcd0
 // MxCollection<MxVariable *>::Compare
 
diff --git a/LEGO1/omni/include/mxvideopresenter.h b/LEGO1/omni/include/mxvideopresenter.h
index 48389490..ebd7e054 100644
--- a/LEGO1/omni/include/mxvideopresenter.h
+++ b/LEGO1/omni/include/mxvideopresenter.h
@@ -80,7 +80,7 @@ class MxVideoPresenter : public MxMediaPresenter {
 	// FUNCTION: LEGO1 0x1000c800
 	virtual MxS32 GetHeight() { return m_alpha ? m_alpha->m_height : m_bitmap->GetBmiHeightAbs(); }; // vtable+0x84
 
-	// SIZE 0xc
+	// VTABLE: LEGO1 0x100dc2bc
 	struct AlphaMask {
 		MxU8* m_bitmask;
 		MxU16 m_width;
diff --git a/LEGO1/omni/src/video/mxdisplaysurface.cpp b/LEGO1/omni/src/video/mxdisplaysurface.cpp
index e05b0816..8761cc02 100644
--- a/LEGO1/omni/src/video/mxdisplaysurface.cpp
+++ b/LEGO1/omni/src/video/mxdisplaysurface.cpp
@@ -7,6 +7,7 @@
 
 DECOMP_SIZE_ASSERT(MxDisplaySurface, 0xac);
 
+// GLOBAL: LEGO1 0x1010215c
 MxU32 g_unk0x1010215c = 0;
 
 // FUNCTION: LEGO1 0x100ba500
diff --git a/LEGO1/omni/src/video/mxstillpresenter.cpp b/LEGO1/omni/src/video/mxstillpresenter.cpp
index ea3ba3a6..b0e80f73 100644
--- a/LEGO1/omni/src/video/mxstillpresenter.cpp
+++ b/LEGO1/omni/src/video/mxstillpresenter.cpp
@@ -10,7 +10,7 @@
 
 DECOMP_SIZE_ASSERT(MxStillPresenter, 0x6c);
 
-// GLOBAL: LEGO1 0x10101eb0
+// GLOBAL: LEGO1 0x101020e0
 const char* g_strBmpIsmap = "BMP_ISMAP";
 
 // FUNCTION: LEGO1 0x100b9c70
diff --git a/LEGO1/tgl/d3drm/impl.h b/LEGO1/tgl/d3drm/impl.h
index 0c1e869d..1e017cf2 100644
--- a/LEGO1/tgl/d3drm/impl.h
+++ b/LEGO1/tgl/d3drm/impl.h
@@ -36,7 +36,7 @@ class MeshImpl;
 class TextureImpl;
 class UnkImpl;
 
-// VTABLE 0x100db910
+// VTABLE: LEGO1 0x100db910
 class RendererImpl : public Renderer {
 public:
 	RendererImpl() : m_data(0) {}
@@ -105,7 +105,7 @@ void RendererImpl::Destroy()
 	}
 }
 
-// VTABLE 0x100db988
+// VTABLE: LEGO1 0x100db988
 class DeviceImpl : public Device {
 public:
 	DeviceImpl() : m_data(0) {}
@@ -142,7 +142,7 @@ class DeviceImpl : public Device {
 	IDirect3DRMDevice2* m_data;
 };
 
-// VTABLE 0x100db9e8
+// VTABLE: LEGO1 0x100db9e8
 class ViewImpl : public View {
 public:
 	ViewImpl() : m_data(0) {}
@@ -194,7 +194,7 @@ class ViewImpl : public View {
 	IDirect3DRMViewport* m_data;
 };
 
-// VTABLE 0x100dbad8
+// VTABLE: LEGO1 0x100dbad8
 class CameraImpl : public Camera {
 public:
 	CameraImpl() : m_data(0) {}
@@ -219,7 +219,7 @@ class CameraImpl : public Camera {
 	IDirect3DRMFrame2* m_data;
 };
 
-// VTABLE 0x100dbaf8
+// VTABLE: LEGO1 0x100dbaf8
 class LightImpl : public Light {
 public:
 	LightImpl() : m_data(0) {}
@@ -245,7 +245,7 @@ class LightImpl : public Light {
 	IDirect3DRMFrame2* m_data;
 };
 
-// VTABLE 0x100dbb88
+// VTABLE: LEGO1 0x100dbb88
 class MeshImpl : public Mesh {
 public:
 	MeshImpl() : m_data(0) {}
@@ -285,7 +285,7 @@ class MeshImpl : public Mesh {
 	MeshData* m_data;
 };
 
-// VTABLE 0x100dba68
+// VTABLE: LEGO1 0x100dba68
 class GroupImpl : public Group {
 public:
 	GroupImpl() : m_data(0) {}
@@ -324,7 +324,7 @@ class GroupImpl : public Group {
 	IDirect3DRMFrame2* m_data;
 };
 
-// VTABLE 0x100dbb18
+// VTABLE: LEGO1 0x100dbb18
 class UnkImpl : public Unk {
 public:
 	UnkImpl() : m_data(0) {}
@@ -384,7 +384,7 @@ class TglD3DRMIMAGE {
 	int m_texelsAllocatedByClient;
 };
 
-// VTABLE 0x100dbb48
+// VTABLE: LEGO1 0x100dbb48
 class TextureImpl : public Texture {
 public:
 	TextureImpl() : m_data(0) {}
diff --git a/LEGO1/tgl/tgl.h b/LEGO1/tgl/tgl.h
index 3e09ad5a..137a78ff 100644
--- a/LEGO1/tgl/tgl.h
+++ b/LEGO1/tgl/tgl.h
@@ -98,7 +98,7 @@ class Mesh;
 class Texture;
 class Unk;
 
-// VTABLE 0x100db980
+// VTABLE: LEGO1 0x100db980
 class Object {
 public:
 	virtual ~Object() {}
@@ -106,7 +106,7 @@ class Object {
 	virtual void* ImplementationDataPtr() = 0;
 };
 
-// VTABLE 0x100db948
+// VTABLE: LEGO1 0x100db948
 class Renderer : public Object {
 public:
 	// vtable+0x08
@@ -146,7 +146,7 @@ class Renderer : public Object {
 
 Renderer* CreateRenderer();
 
-// VTABLE 0x100db9b8
+// VTABLE: LEGO1 0x100db9b8
 class Device : public Object {
 public:
 	// vtable+0x08
@@ -165,7 +165,7 @@ class Device : public Object {
 	virtual void InitFromWindowsDevice(Device*) = 0;
 };
 
-// VTABLE 0x100dba28
+// VTABLE: LEGO1 0x100dba28
 class View : public Object {
 public:
 	virtual Result Add(const Light*) = 0;
@@ -219,20 +219,20 @@ class View : public Object {
 	) = 0;
 };
 
-// VTABLE 0x100dbae8
+// VTABLE: LEGO1 0x100dbae8
 class Camera : public Object {
 public:
 	virtual Result SetTransformation(FloatMatrix4&) = 0;
 };
 
-// VTABLE 0x100dbb08
+// VTABLE: LEGO1 0x100dbb08
 class Light : public Object {
 public:
 	virtual Result SetTransformation(FloatMatrix4&) = 0;
 	virtual Result SetColor(float r, float g, float b) = 0;
 };
 
-// VTABLE 0x100dbbb0
+// VTABLE: LEGO1 0x100dbbb0
 class Mesh : public Object {
 public:
 	virtual Result SetColor(float r, float g, float b, float a) = 0;
@@ -249,7 +249,7 @@ class Mesh : public Object {
 	virtual Mesh* ShallowClone(Unk*) = 0;
 };
 
-// VTABLE 0x100dbaa0
+// VTABLE: LEGO1 0x100dbaa0
 class Group : public Object {
 public:
 	virtual Result SetTransformation(FloatMatrix4&) = 0;
@@ -271,7 +271,7 @@ class Group : public Object {
 // Don't know what this is. Seems like another Tgl object which
 // was not in the leaked Tgl code. My suspicion is that it's
 // some kind of builder class for creating meshes.
-// VTABLE 0x100dbb30
+// VTABLE: LEGO1 0x100dbb30
 class Unk : public Object {
 public:
 	virtual Result SetMeshData(
@@ -287,7 +287,7 @@ class Unk : public Object {
 	virtual Unk* Clone() = 0;
 };
 
-// VTABLE 0x100dbb68
+// VTABLE: LEGO1 0x100dbb68
 class Texture : public Object {
 public:
 	// vtable+0x08