Reccmp: Use symbol names in asm output (#433)

* Name substitution for reccmp asm output * Decomp marker corrections * Fix a few annotations * Fix IslePathActor dtor * Fix audio presenter * Fix LegoEntity::Create * Fix Pizza and related * Fix path part * Add missing annotations * Add missing annotations * Add more missing annotations * Fix MxNotificationParam * More fixes * More fixes * Add missing annotations * Fixes * More annotations * More annotations * More annotations * More annotations * Fixes and annotations * Find imports and thunk functions * Fix more bugs * Add some markers for LEGO1 imports, fix SIZE comment * Add more annotations * Rename annotation * Fix bugs and annotations * Fix bug * Order * Update legoanimpresenter.h * Re-enable print-rec-addr option --------- Co-authored-by: Christian Semmler <mail@csemmler.com>
2025-10-23 00:14:22 +00:00 · 2024-01-14 16:28:46 -05:00
parent 7f7e6e37dd
commit 7e9d3bde65
73 changed files with 1357 additions and 427 deletions
--- a/LEGO1/omni/include/mxactionnotificationparam.h
+++ b/LEGO1/omni/include/mxactionnotificationparam.h
@@ -115,13 +115,25 @@ private:
 	MxPresenter* m_unk0x14; // 0x14
 };

+// SYNTHETIC: LEGO1 0x100511e0
+// MxActionNotificationParam::`scalar deleting destructor'
+
 // SYNTHETIC: LEGO1 0x100513a0
 // MxEndActionNotificationParam::`scalar deleting destructor'

+// SYNTHETIC: LEGO1 0x10051410
+// MxEndActionNotificationParam::~MxEndActionNotificationParam
+
 // SYNTHETIC: LEGO1 0x100b0430
 // MxStartActionNotificationParam::`scalar deleting destructor'

+// SYNTHETIC: LEGO1 0x100b04a0
+// MxStartActionNotificationParam::~MxStartActionNotificationParam
+
 // SYNTHETIC: LEGO1 0x100b05c0
 // MxType4NotificationParam::`scalar deleting destructor'

+// SYNTHETIC: LEGO1 0x100b0630
+// MxType4NotificationParam::~MxType4NotificationParam
+
 #endif
--- a/LEGO1/omni/include/mxatomidcounter.h
+++ b/LEGO1/omni/include/mxatomidcounter.h
@@ -43,4 +43,50 @@ struct MxAtomIdCounterCompare {

 class MxAtomIdCounterSet : public set<MxAtomIdCounter*, MxAtomIdCounterCompare> {};

+// SYNTHETIC: LEGO1 0x100ad170
+// MxAtomIdCounter::~MxAtomIdCounter
+
+// clang-format off
+// TEMPLATE: LEGO1 0x100ad480
+// _Tree<MxAtomIdCounter *,MxAtomIdCounter *,set<MxAtomIdCounter *,MxAtomIdCounterCompare,allocator<MxAtomIdCounter *> >::_Kfn,MxAtomIdCounterCompare,allocator<MxAtomIdCounter *> >::iterator::_Dec
+// clang-format on
+
+// clang-format off
+// TEMPLATE: LEGO1 0x100ad780
+// _Tree<MxAtomIdCounter *,MxAtomIdCounter *,set<MxAtomIdCounter *,MxAtomIdCounterCompare,allocator<MxAtomIdCounter *> >::_Kfn,MxAtomIdCounterCompare,allocator<MxAtomIdCounter *> >::_Lbound
+// clang-format on
+
+// clang-format off
+// TEMPLATE: LEGO1 0x100ad4d0
+// _Tree<MxAtomIdCounter *,MxAtomIdCounter *,set<MxAtomIdCounter *,MxAtomIdCounterCompare,allocator<MxAtomIdCounter *> >::_Kfn,MxAtomIdCounterCompare,allocator<MxAtomIdCounter *> >::_Insert
+// clang-format on
+
+// clang-format off
+// TEMPLATE: LEGO1 0x100af6d0
+// _Tree<MxAtomIdCounter *,MxAtomIdCounter *,set<MxAtomIdCounter *,MxAtomIdCounterCompare,allocator<MxAtomIdCounter *> >::_Kfn,MxAtomIdCounterCompare,allocator<MxAtomIdCounter *> >::~_Tree<MxAtomIdCounter *,MxAtomIdCounter *,set<MxAtomIdCounter *,MxAtomIdCou
+// clang-format on
+
+// clang-format off
+// TEMPLATE: LEGO1 0x100af7a0
+// _Tree<MxAtomIdCounter *,MxAtomIdCounter *,set<MxAtomIdCounter *,MxAtomIdCounterCompare,allocator<MxAtomIdCounter *> >::_Kfn,MxAtomIdCounterCompare,allocator<MxAtomIdCounter *> >::iterator::_Inc
+// clang-format on
+
+// clang-format off
+// TEMPLATE: LEGO1 0x100af7e0
+// _Tree<MxAtomIdCounter *,MxAtomIdCounter *,set<MxAtomIdCounter *,MxAtomIdCounterCompare,allocator<MxAtomIdCounter *> >::_Kfn,MxAtomIdCounterCompare,allocator<MxAtomIdCounter *> >::erase
+// clang-format on
+
+// clang-format off
+// TEMPLATE: LEGO1 0x100afc40
+// _Tree<MxAtomIdCounter *,MxAtomIdCounter *,set<MxAtomIdCounter *,MxAtomIdCounterCompare,allocator<MxAtomIdCounter *> >::_Kfn,MxAtomIdCounterCompare,allocator<MxAtomIdCounter *> >::_Erase
+// clang-format on
+
+// clang-format off
+// TEMPLATE: LEGO1 0x100afc80
+// set<MxAtomIdCounter *,MxAtomIdCounterCompare,allocator<MxAtomIdCounter *> >::~set<MxAtomIdCounter *,MxAtomIdCounterCompare,allocator<MxAtomIdCounter *> >
+// clang-format on
+
+// TEMPLATE: LEGO1 0x100afe40
+// Set<MxAtomIdCounter *,MxAtomIdCounterCompare>::~Set<MxAtomIdCounter *,MxAtomIdCounterCompare>
+
 #endif // MXATOMIDCOUNTER_H
--- a/LEGO1/omni/include/mxaudiopresenter.h
+++ b/LEGO1/omni/include/mxaudiopresenter.h
@@ -33,4 +33,10 @@ protected:
 	MxS32 m_volume;
 };

+// SYNTHETIC: LEGO1 0x1000d370
+// MxAudioPresenter::`scalar deleting destructor'
+
+// SYNTHETIC: LEGO1 0x1000d3e0
+// MxAudioPresenter::~MxAudioPresenter
+
 #endif // MXAUDIOPRESENTER_H
--- a/LEGO1/omni/include/mxdiskstreamcontroller.h
+++ b/LEGO1/omni/include/mxdiskstreamcontroller.h
@@ -46,6 +46,7 @@ public:
 	void FUN_100c8670(MxDSStreamingAction* p_streamingAction);
 	void InsertToList74(MxDSBuffer* p_buffer);
 	void FUN_100c7cb0(MxDSStreamingAction* p_action);
+	MxResult FUN_100c7890(MxDSStreamingAction* p_action);

 private:
 	MxStreamListMxDSAction m_list0x64; // 0x64
@@ -58,7 +59,6 @@ private:
 	MxStreamListMxDSAction m_list0xb8; // 0xb8
 	MxBool m_unk0xc4;                  // 0xc4

-	MxResult FUN_100c7890(MxDSStreamingAction* p_action);
 	void FUN_100c7970();
 	void FUN_100c7ce0(MxDSBuffer* p_buffer);
 	MxResult FUN_100c7d10();
@@ -69,6 +69,9 @@ private:
 	void FUN_100c8720();
 };

+// TEMPLATE: LEGO1 0x100c14d0
+// list<MxDSAction *,allocator<MxDSAction *> >::erase
+
 // TEMPLATE: LEGO1 0x100c7330
 // list<MxDSAction *,allocator<MxDSAction *> >::_Buynode

--- a/LEGO1/omni/include/mxdiskstreamprovider.h
+++ b/LEGO1/omni/include/mxdiskstreamprovider.h
@@ -20,9 +20,6 @@ public:

 	MxResult Run() override;
 	MxResult StartWithTarget(MxDiskStreamProvider* p_target);
-
-	// SYNTHETIC: LEGO1 0x100d10a0
-	// MxDiskStreamProviderThread::`scalar deleting destructor'
 };

 // VTABLE: LEGO1 0x100dd138
@@ -58,9 +55,6 @@ public:
 	virtual MxU32 GetLengthInDWords() override;                                 // vtable+0x24
 	virtual MxU32* GetBufferForDWords() override;                               // vtable+0x28

-	// SYNTHETIC: LEGO1 0x100d1220
-	// MxDiskStreamProvider::`scalar deleting destructor'
-
 private:
 	MxDiskStreamProviderThread m_thread; // 0x10
 	MxSemaphore m_busySemaphore;         // 0x2c
@@ -70,4 +64,13 @@ private:
 	MxStreamListMxDSAction m_list;       // 0x54
 };

+// SYNTHETIC: LEGO1 0x100d10a0
+// MxDiskStreamProviderThread::`scalar deleting destructor'
+
+// SYNTHETIC: LEGO1 0x100d1110
+// MxDiskStreamProviderThread::~MxDiskStreamProviderThread
+
+// SYNTHETIC: LEGO1 0x100d1220
+// MxDiskStreamProvider::`scalar deleting destructor'
+
 #endif // MXDISKSTREAMPROVIDER_H
--- a/LEGO1/omni/include/mxdsaction.h
+++ b/LEGO1/omni/include/mxdsaction.h
@@ -43,6 +43,7 @@ public:
 		return !strcmp(p_name, MxDSAction::ClassName()) || MxDSObject::IsA(p_name);
 	}

+	virtual undefined4 VTable0x14() override;                            // vtable+14;
 	virtual MxU32 GetSizeOnDisk() override;                              // vtable+18;
 	virtual void Deserialize(MxU8** p_source, MxS16 p_unk0x24) override; // vtable+1c;
 	virtual MxLong GetDuration();                                        // vtable+24;
--- a/LEGO1/omni/include/mxdsactionlist.h
+++ b/LEGO1/omni/include/mxdsactionlist.h
@@ -44,6 +44,9 @@ public:
 // TEMPLATE: LEGO1 0x100c9cc0
 // MxCollection<MxDSAction *>::Compare

+// TEMPLATE: LEGO1 0x100c9cd0
+// MxCollection<MxDSAction *>::~MxCollection<MxDSAction *>
+
 // TEMPLATE: LEGO1 0x100c9d20
 // MxCollection<MxDSAction *>::Destroy

--- 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();
--- a/LEGO1/omni/include/mxdssource.h
+++ b/LEGO1/omni/include/mxdssource.h
@@ -11,6 +11,9 @@ class MxDSSource : public MxCore {
 public:
 	MxDSSource() : m_lengthInDWords(0), m_pBuffer(NULL), m_position(-1) {}

+	// FUNCTION: LEGO1 0x100bff60
+	virtual ~MxDSSource() override { delete[] m_pBuffer; }
+
 	// FUNCTION: LEGO1 0x100c0010
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
@@ -41,4 +44,7 @@ protected:
 	MxLong m_position;        // 0x10
 };

+// SYNTHETIC: LEGO1 0x100c00a0
+// MxDSSource::`scalar deleting destructor'
+
 #endif // MXDSSOURCE_H
--- a/LEGO1/omni/include/mxnotificationmanager.h
+++ b/LEGO1/omni/include/mxnotificationmanager.h
@@ -52,4 +52,34 @@ private:
 	void FlushPending(MxCore* p_listener);
 };

+// TEMPLATE: LEGO1 0x100ac320
+// list<unsigned int,allocator<unsigned int> >::~list<unsigned int,allocator<unsigned int> >
+
+// FUNCTION: LEGO1 0x100ac3b0
+// MxIdList::~MxIdList
+
+// TEMPLATE: LEGO1 0x100ac400
+// List<unsigned int>::~List<unsigned int>
+
+// TEMPLATE: LEGO1 0x100ac540
+// List<MxNotification *>::~List<MxNotification *>
+
+// TEMPLATE: LEGO1 0x100ac590
+// list<MxNotification *,allocator<MxNotification *> >::~list<MxNotification *,allocator<MxNotification *> >
+
+// TEMPLATE: LEGO1 0x100acbf0
+// list<MxNotification *,allocator<MxNotification *> >::begin
+
+// TEMPLATE: LEGO1 0x100acc00
+// list<MxNotification *,allocator<MxNotification *> >::insert
+
+// TEMPLATE: LEGO1 0x100acc50
+// list<MxNotification *,allocator<MxNotification *> >::erase
+
+// TEMPLATE: LEGO1 0x100acca0
+// list<MxNotification *,allocator<MxNotification *> >::_Buynode
+
+// SYNTHETIC: LEGO1 0x100accd0
+// MxNotificationPtrList::~MxNotificationPtrList
+
 #endif // MXNOTIFICATIONMANAGER_H
--- a/LEGO1/omni/include/mxnotificationparam.h
+++ b/LEGO1/omni/include/mxnotificationparam.h
@@ -34,14 +34,13 @@ enum NotificationId {
 };

 // VTABLE: LEGO1 0x100d56e0
+// SIZE 0x0c
 class MxNotificationParam : public MxParam {
 public:
 	inline MxNotificationParam(NotificationId p_type, MxCore* p_sender) : MxParam(), m_type(p_type), m_sender(p_sender)
 	{
 	}

-	virtual ~MxNotificationParam() override {}
-
 	// FUNCTION: LEGO1 0x10010390
 	virtual MxNotificationParam* Clone() { return new MxNotificationParam(m_type, m_sender); }; // vtable+0x4

@@ -50,8 +49,14 @@ public:
 	inline NotificationId GetType() const { return m_type; }

 protected:
-	NotificationId m_type; // 0x4
-	MxCore* m_sender;      // 0x8
+	NotificationId m_type; // 0x04
+	MxCore* m_sender;      // 0x08
 };

+// SYNTHETIC: LEGO1 0x10010430
+// MxNotificationParam::`scalar deleting destructor'
+
+// SYNTHETIC: LEGO1 0x100104a0
+// MxNotificationParam::~MxNotificationParam
+
 #endif // MXNOTIFICATIONPARAM_H
--- 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(
@@ -30,4 +31,7 @@ private:
 	MxOmniCreateFlags m_createFlags;
 };

+// SYNTHETIC: ISLE 0x4014b0
+// MxOmniCreateParam::~MxOmniCreateParam
+
 #endif // MXOMNICREATEPARAM_H
--- a/LEGO1/omni/include/mxparam.h
+++ b/LEGO1/omni/include/mxparam.h
@@ -1,9 +1,18 @@
 #ifndef MXPARAM_H
 #define MXPARAM_H

+// VTABLE: ISLE 0x40f018
+// VTABLE: LEGO1 0x100d56e8
+// SIZE 0x04
 class MxParam {
 public:
+	// FUNCTION: ISLE 0x401530
+	// FUNCTION: LEGO1 0x10010360
 	virtual ~MxParam() {}
 };

+// SYNTHETIC: ISLE 0x401540
+// SYNTHETIC: LEGO1 0x10010370
+// MxParam::`scalar deleting destructor'
+
 #endif // MXPARAM_H
--- a/LEGO1/omni/include/mxpresenterlist.h
+++ b/LEGO1/omni/include/mxpresenterlist.h
@@ -53,6 +53,9 @@ public:
 // TEMPLATE: LEGO1 0x1001ce20
 // MxList<MxPresenter *>::~MxList<MxPresenter *>

+// TEMPLATE: LEGO1 0x1001cf20
+// MxPtrList<MxPresenter>::~MxPtrList<MxPresenter>
+
 // SYNTHETIC: LEGO1 0x1001cf70
 // MxCollection<MxPresenter *>::`scalar deleting destructor'

--- a/LEGO1/omni/include/mxrectlist.h
+++ b/LEGO1/omni/include/mxrectlist.h
@@ -53,6 +53,9 @@ public:
 // SYNTHETIC: LEGO1 0x100b3d80
 // MxRectList::`scalar deleting destructor'

+// TEMPLATE: LEGO1 0x100b3df0
+// MxPtrList<MxRect32>::~MxPtrList<MxRect32>
+
 // SYNTHETIC: LEGO1 0x100b3e40
 // MxCollection<MxRect32 *>::`scalar deleting destructor'

--- a/LEGO1/omni/include/mxregionlist.h
+++ b/LEGO1/omni/include/mxregionlist.h
@@ -116,12 +116,21 @@ public:
 // TEMPLATE: LEGO1 0x100c32e0
 // MxCollection<MxRegionTopBottom *>::Compare

+// TEMPLATE: LEGO1 0x100c32f0
+// MxCollection<MxRegionTopBottom *>::~MxCollection<MxRegionTopBottom *>
+
 // TEMPLATE: LEGO1 0x100c3340
 // MxCollection<MxRegionTopBottom *>::Destroy

+// TEMPLATE: LEGO1 0x100c3350
+// MxList<MxRegionTopBottom *>::~MxList<MxRegionTopBottom *>
+
 // TEMPLATE: LEGO1 0x100c33e0
 // MxPtrList<MxRegionTopBottom>::Destroy

+// TEMPLATE: LEGO1 0x100c3480
+// MxPtrList<MxRegionTopBottom>::~MxPtrList<MxRegionTopBottom>
+
 // SYNTHETIC: LEGO1 0x100c34d0
 // MxCollection<MxRegionTopBottom *>::`scalar deleting destructor'

@@ -167,9 +176,18 @@ public:
 // TEMPLATE: LEGO1 0x100c4d80
 // MxCollection<MxRegionLeftRight *>::Compare

+// TEMPLATE: LEGO1 0x100c4d90
+// MxCollection<MxRegionLeftRight *>::~MxCollection<MxRegionLeftRight *>
+
 // TEMPLATE: LEGO1 0x100c4de0
 // MxCollection<MxRegionLeftRight *>::Destroy

+// TEMPLATE: LEGO1 0x100c4df0
+// MxList<MxRegionLeftRight *>::~MxList<MxRegionLeftRight *>
+
+// TEMPLATE: LEGO1 0x100c4f00
+// MxPtrList<MxRegionLeftRight>::~MxPtrList<MxRegionLeftRight>
+
 // SYNTHETIC: LEGO1 0x100c4f50
 // MxCollection<MxRegionLeftRight *>::`scalar deleting destructor'

--- a/LEGO1/omni/include/mxsemaphore.h
+++ b/LEGO1/omni/include/mxsemaphore.h
@@ -5,12 +5,13 @@

 #include <windows.h>

+// VTABLE: LEGO1 0x100dccf0
 // SIZE 0x08
 class MxSemaphore {
 public:
 	MxSemaphore();

-	// Inlined only, no offset
+	// FUNCTION: LEGO1 0x100c87e0
 	~MxSemaphore() { CloseHandle(m_hSemaphore); }

 	virtual MxResult Init(MxU32 p_initialCount, MxU32 p_maxCount);
--- a/LEGO1/omni/include/mxstreamchunklist.h
+++ b/LEGO1/omni/include/mxstreamchunklist.h
@@ -41,6 +41,9 @@ public:
 // TEMPLATE: LEGO1 0x100b5930
 // MxCollection<MxStreamChunk *>::Compare

+// TEMPLATE: LEGO1 0x100b5940
+// MxCollection<MxStreamChunk *>::~MxCollection<MxStreamChunk *>
+
 // TEMPLATE: LEGO1 0x100b5990
 // MxCollection<MxStreamChunk *>::Destroy

--- a/LEGO1/omni/include/mxstreamer.h
+++ b/LEGO1/omni/include/mxstreamer.h
@@ -24,6 +24,7 @@ public:
 		}
 	}

+	// FUNCTION: LEGO1 0x100b9110
 	~MxStreamerSubClass1() { delete[] m_buffer; }

 	undefined4 GetSize() const { return m_size; }
@@ -48,6 +49,7 @@ public:
 	inline MxStreamerSubClass3() : MxStreamerSubClass1(0x80) {}
 };

+// VTABLE: LEGO1 0x100dc760
 class MxStreamerNotification : public MxNotificationParam {
 public:
 	inline MxStreamerNotification(NotificationId p_type, MxCore* p_sender, MxStreamController* p_ctrlr)
@@ -56,8 +58,6 @@ public:
 		m_controller = p_ctrlr;
 	}

-	virtual ~MxStreamerNotification() override {}
-
 	virtual MxNotificationParam* Clone() override;

 	MxStreamController* GetController() { return m_controller; }
@@ -113,7 +113,21 @@ private:
 	MxStreamerSubClass3 m_subclass2;         // 0x20
 };

+// clang-format off
+// TEMPLATE: LEGO1 0x100b9090
+// list<MxStreamController *,allocator<MxStreamController *> >::~list<MxStreamController *,allocator<MxStreamController *> >
+// clang-format on
+
 // SYNTHETIC: LEGO1 0x100b9120
 // MxStreamer::`scalar deleting destructor'

+// TEMPLATE: LEGO1 0x100b9140
+// List<MxStreamController *>::~List<MxStreamController *>
+
+// SYNTHETIC: LEGO1 0x100b97b0
+// MxStreamerNotification::`scalar deleting destructor'
+
+// SYNTHETIC: LEGO1 0x100b9820
+// MxStreamerNotification::~MxStreamerNotification
+
 #endif // MXSTREAMER_H
--- a/LEGO1/omni/include/mxstreamprovider.h
+++ b/LEGO1/omni/include/mxstreamprovider.h
@@ -41,4 +41,7 @@ protected:
 // SYNTHETIC: LEGO1 0x100d0870
 // MxStreamProvider::`scalar deleting destructor'

+// SYNTHETIC: LEGO1 0x100d08e0
+// MxStreamProvider::~MxStreamProvider
+
 #endif // MXSTREAMPROVIDER_H
--- a/LEGO1/omni/include/mxstringlist.h
+++ b/LEGO1/omni/include/mxstringlist.h
@@ -15,18 +15,33 @@ public:
 	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

--- a/LEGO1/omni/include/mxticklemanager.h
+++ b/LEGO1/omni/include/mxticklemanager.h
@@ -50,4 +50,10 @@ private:

 #define TICKLE_MANAGER_NOT_FOUND 0x80000000

+// TEMPLATE: LEGO1 0x1005a4a0
+// list<MxTickleClient *,allocator<MxTickleClient *> >::~list<MxTickleClient *,allocator<MxTickleClient *> >
+
+// TEMPLATE: LEGO1 0x1005a530
+// List<MxTickleClient *>::~List<MxTickleClient *>
+
 #endif // MXTICKLEMANAGER_H
--- a/LEGO1/omni/include/mxvariable.h
+++ b/LEGO1/omni/include/mxvariable.h
@@ -33,8 +33,11 @@ public:
 	inline const MxString* GetKey() const { return &m_key; }

 protected:
-	MxString m_key;
-	MxString m_value;
+	MxString m_key;   // 0x04
+	MxString m_value; // 0x14
 };

+// SYNTHETIC: LEGO1 0x1003bf40
+// MxVariable::~MxVariable
+
 #endif // MXVARIABLE_H
--- a/LEGO1/omni/include/mxvariabletable.h
+++ b/LEGO1/omni/include/mxvariabletable.h
@@ -26,6 +26,9 @@ public:
 // VTABLE: LEGO1 0x100dc1e8
 // class MxHashTable<MxVariable *>

+// VTABLE: LEGO1 0x100dc680
+// class MxHashTableCursor<MxVariable *>
+
 // TEMPLATE: LEGO1 0x100afcd0
 // MxCollection<MxVariable *>::Compare

@@ -50,6 +53,9 @@ public:
 // SYNTHETIC: LEGO1 0x100b0ca0
 // MxHashTable<MxVariable *>::`scalar deleting destructor'

+// TEMPLATE: LEGO1 0x100b7680
+// MxHashTableCursor<MxVariable *>::~MxHashTableCursor<MxVariable *>
+
 // TEMPLATE: LEGO1 0x100b7ab0
 // MxHashTable<MxVariable *>::Resize

--- a/LEGO1/omni/include/mxvideopresenter.h
+++ b/LEGO1/omni/include/mxvideopresenter.h
@@ -80,6 +80,7 @@ public:
 	// FUNCTION: LEGO1 0x1000c800
 	virtual MxS32 GetHeight() { return m_alpha ? m_alpha->m_height : m_bitmap->GetBmiHeightAbs(); }; // vtable+0x84

+	// VTABLE: LEGO1 0x100dc2bc
 	// SIZE 0xc
 	struct AlphaMask {
 		MxU8* m_bitmask;