From f3c1fc75e226fa9ab38bbb6249ca8664f0f7200a Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Sun, 24 Dec 2023 18:09:01 -0500
Subject: [PATCH 001/210] Mostly match MxDSBuffer::AllocateBuffer

---
 LEGO1/mxdsbuffer.cpp | 63 +++++++++++++++++++++-----------------------
 LEGO1/mxstreamer.h   |  2 +-
 2 files changed, 31 insertions(+), 34 deletions(-)

diff --git a/LEGO1/mxdsbuffer.cpp b/LEGO1/mxdsbuffer.cpp
index 634afc6e..0060dbdc 100644
--- a/LEGO1/mxdsbuffer.cpp
+++ b/LEGO1/mxdsbuffer.cpp
@@ -45,68 +45,65 @@ MxDSBuffer::~MxDSBuffer()
 MxResult MxDSBuffer::AllocateBuffer(MxU32 p_bufferSize, MxDSBufferType p_mode)
 {
 	MxResult result = FAILURE;
-	MxU32 i = 0;
-	if (p_mode == MxDSBufferType_Allocate) {
-		m_pBuffer = new MxU8[p_bufferSize];
-	}
-	else if (p_mode == MxDSBufferType_Chunk) {
-		MxStreamer* streamer = Streamer();
-		// I have no clue as to what this does, or even if its correct. Maybe it's related to storing chunks in
-		// MxDiskStreamController?
-		if (p_bufferSize >> 10 == 0x40) {
-			i = 0;
-			while (i < 22) {
-				if ((*(MxU32*) ((streamer->GetSubclass1().GetUnk08() + ((i & 0xffffffe7) >> 3)) & 1 << ((MxU8) i & 0x1f)
-					)) == 0) {
-					MxU32* ptr = (MxU32*) ((streamer->GetSubclass1().GetUnk08() + ((i & 0xffffffe7) >> 3)) &
-										   1 << ((MxU8) i & 0x1f));
 
-					// mark it as used?
+	switch (p_mode) {
+	case MxDSBufferType_Allocate:
+		m_pBuffer = new MxU8[p_bufferSize];
+		break;
+
+	case MxDSBufferType_Chunk: {
+		MxStreamer* streamer = Streamer();
+
+		switch (p_bufferSize / 1024) {
+		case 0x40: {
+			for (MxU32 i = 0; i < 22; i++) {
+				if (((1 << (i & 0x1f)) & (*(MxU32*) &streamer->GetSubclass1().GetUnk08Ref()[(i & ~0x18u) >> 3])) == 0) {
+					MxU32* ptr = (MxU32*) &streamer->GetSubclass1().GetUnk08Ref()[(i & 0xffffffe7) >> 3];
+
 					*ptr = *ptr ^ 1 << (i & 0x1f);
 
 					m_pBuffer =
 						(MxU8*) (streamer->GetSubclass1().GetSize() * i * 0x400 + streamer->GetSubclass1().GetBuffer());
-					break;
+					goto done;
 				}
-				i++;
 			}
 
 			m_pBuffer = NULL;
+			break;
 		}
-		else if (p_bufferSize >> 10 == 0x80) {
-			i = 0;
-			// Same thing as above but it uses subclass2
-			while (i < 22) {
-				if ((*(MxU32*) ((streamer->GetSubclass2().GetUnk08() + ((i & 0xffffffe7) >> 3)) & 1 << ((MxU8) i & 0x1f)
-					)) == 0) {
-					MxU32* ptr = (MxU32*) ((streamer->GetSubclass2().GetUnk08() + ((i & 0xffffffe7) >> 3)) &
-										   1 << ((MxU8) i & 0x1f));
+		case 0x80: {
+			for (MxU32 i = 0; i < 2; i++) {
+				if (((1 << (i & 0x1f)) & (*(MxU32*) &streamer->GetSubclass2().GetUnk08Ref()[(i & ~0x18u) >> 3])) == 0) {
+					MxU32* ptr = (MxU32*) &streamer->GetSubclass2().GetUnk08Ref()[(i & 0xffffffe7) >> 3];
 
-					// mark it as used?
 					*ptr = *ptr ^ 1 << (i & 0x1f);
 
 					m_pBuffer =
 						(MxU8*) (streamer->GetSubclass2().GetSize() * i * 0x400 + streamer->GetSubclass2().GetBuffer());
-					break;
+					goto done;
 				}
-				i++;
 			}
 
 			m_pBuffer = NULL;
+			break;
 		}
-		else {
-			m_pIntoBuffer = NULL;
+		default:
+			m_pBuffer = NULL;
 		}
 	}
+	}
 
+done:
 	m_pIntoBuffer = m_pBuffer;
 	m_pIntoBuffer2 = m_pBuffer;
+
 	if (m_pBuffer != NULL) {
 		m_mode = p_mode;
 		m_bytesRemaining = p_bufferSize;
 		m_writeOffset = p_bufferSize;
 		result = SUCCESS;
 	}
+
 	return result;
 }
 
@@ -221,8 +218,8 @@ MxResult MxDSBuffer::ParseChunk(
 // FUNCTION: LEGO1 0x100c6d00
 MxCore* MxDSBuffer::ReadChunk(MxDSBuffer* p_buffer, MxU32* p_chunkData, MxU16 p_flags)
 {
-	// This function reads a chunk. If it is an object, this function returns an MxDSObject. If it is a chunk, returns a
-	// MxDSChunk.
+	// This function reads a chunk. If it is an object, this function returns an MxDSObject. If it is a chunk,
+	// returns a MxDSChunk.
 	MxCore* result = NULL;
 	MxU8* dataStart = (MxU8*) p_chunkData + 8;
 
diff --git a/LEGO1/mxstreamer.h b/LEGO1/mxstreamer.h
index 3b58b260..8017e898 100644
--- a/LEGO1/mxstreamer.h
+++ b/LEGO1/mxstreamer.h
@@ -22,7 +22,7 @@ class MxStreamerSubClass1 {
 
 	void SetBuffer(undefined* p_buf) { m_buffer = p_buf; }
 	inline undefined* GetBuffer() const { return m_buffer; }
-	inline undefined4 GetUnk08() const { return m_unk0x08; }
+	inline undefined* GetUnk08Ref() const { return (undefined*) &m_unk0x08; }
 
 private:
 	undefined* m_buffer;

From cb8c143ce50c147ff5bdcb67aa64a3e77a6560bf Mon Sep 17 00:00:00 2001
From: Misha <106913236+MishaProductions@users.noreply.github.com>
Date: Mon, 25 Dec 2023 13:32:01 -0500
Subject: [PATCH 002/210] Finish MxDiskStreamController methods (#359)

* more mxdiskstreamcontroller methods

* further debugging and fixes

* add more functions

* Update mxdiskstreamprovider.cpp

* fix build

* implement MxDiskStreamProvider::PerformWork

* Update mxdiskstreamprovider.cpp

* Update mxdiskstreamprovider.cpp

* Update mxdssource.h

* remove debug prints

* Update mxdiskstreamprovider.cpp

* Mostly match MxDiskStreamController::FUN_100c8540

* Mostly match MxDiskStreamProvider::FUN_100d1780

* Mostly match MxDiskStreamProvider::PerformWork

* Fixes

* Retype some members

* Various annotations

---------

Co-authored-by: Christian Semmler <mail@csemmler.com>
---
 LEGO1/legosoundmanager.cpp       |   2 +-
 LEGO1/mxcriticalsection.h        |   4 +-
 LEGO1/mxdiskstreamcontroller.cpp | 107 ++++++++++++++++++++++++--
 LEGO1/mxdiskstreamcontroller.h   |  10 ++-
 LEGO1/mxdiskstreamprovider.cpp   | 127 ++++++++++++++++++++++++++++---
 LEGO1/mxdiskstreamprovider.h     |  11 +--
 LEGO1/mxdsbuffer.cpp             |   6 +-
 LEGO1/mxdsbuffer.h               |   7 +-
 LEGO1/mxdssource.cpp             |   6 +-
 LEGO1/mxdssource.h               |  26 ++++---
 LEGO1/mxdsstreamingaction.h      |   2 +
 LEGO1/mxnextactiondatastart.h    |   8 +-
 LEGO1/mxsemaphore.cpp            |   4 +
 LEGO1/mxsemaphore.h              |   3 +-
 LEGO1/mxstreamcontroller.cpp     |   1 +
 LEGO1/mxstreamcontroller.h       |   1 +
 LEGO1/mxstreamlist.h             |  14 +++-
 LEGO1/mxstreamprovider.h         |   4 +-
 LEGO1/mxthread.cpp               |   4 +
 LEGO1/mxthread.h                 |  18 ++---
 20 files changed, 301 insertions(+), 64 deletions(-)

diff --git a/LEGO1/legosoundmanager.cpp b/LEGO1/legosoundmanager.cpp
index a74ca419..8b8376fa 100644
--- a/LEGO1/legosoundmanager.cpp
+++ b/LEGO1/legosoundmanager.cpp
@@ -29,7 +29,7 @@ void LegoSoundManager::Destroy(MxBool p_fromDestructor)
 // STUB: LEGO1 0x100299f0
 MxResult LegoSoundManager::Create(MxU32 p_frequencyMS, MxBool p_createThread)
 {
-	return FAILURE;
+	return SUCCESS;
 }
 
 // FUNCTION: LEGO1 0x1002a390
diff --git a/LEGO1/mxcriticalsection.h b/LEGO1/mxcriticalsection.h
index 8756853c..8c5f77d6 100644
--- a/LEGO1/mxcriticalsection.h
+++ b/LEGO1/mxcriticalsection.h
@@ -13,8 +13,8 @@ class MxCriticalSection {
 	void Leave();
 
 private:
-	CRITICAL_SECTION m_criticalSection;
-	HANDLE m_mutex;
+	CRITICAL_SECTION m_criticalSection; // 0x00
+	HANDLE m_mutex;                     // 0x18
 };
 
 #endif // MXCRITICALSECTION_H
diff --git a/LEGO1/mxdiskstreamcontroller.cpp b/LEGO1/mxdiskstreamcontroller.cpp
index 71ebc827..1520ba3b 100644
--- a/LEGO1/mxdiskstreamcontroller.cpp
+++ b/LEGO1/mxdiskstreamcontroller.cpp
@@ -1,5 +1,6 @@
 #include "mxdiskstreamcontroller.h"
 
+#include "mxactionnotificationparam.h"
 #include "mxautolocker.h"
 #include "mxdiskstreamprovider.h"
 #include "mxdsstreamingaction.h"
@@ -52,12 +53,31 @@ MxResult MxDiskStreamController::VTable0x18(undefined4, undefined4)
 	return SUCCESS;
 }
 
+// FUNCTION: LEGO1 0x100c7890
+MxResult MxDiskStreamController::FUN_100c7890(MxDSStreamingAction* p_action)
+{
+	MxAutoLocker lock(&this->m_criticalSection);
+	if (p_action == NULL) {
+		return FAILURE;
+	}
+
+	m_list0x80.push_back(p_action);
+	FUN_100c7970();
+	return SUCCESS;
+}
+
 // FUNCTION: LEGO1 0x100c7960
 MxResult MxDiskStreamController::VTable0x34(undefined4)
 {
 	return FAILURE;
 }
 
+// FUNCTION: LEGO1 0x100c7970
+void MxDiskStreamController::FUN_100c7970()
+{
+	// Empty
+}
+
 // FUNCTION: LEGO1 0x100c7980
 void MxDiskStreamController::FUN_100c7980()
 {
@@ -181,10 +201,29 @@ MxResult MxDiskStreamController::FUN_100c7d10()
 	return SUCCESS;
 }
 
-// STUB: LEGO1 0x100c7db0
+// FUNCTION: LEGO1 0x100c7db0
 MxDSStreamingAction* MxDiskStreamController::FUN_100c7db0()
 {
-	// TODO
+	MxAutoLocker lock(&this->m_criticalSection);
+
+	for (MxStreamListMxNextActionDataStart::iterator it = m_nextActionList.begin(); it != m_nextActionList.end();
+		 it++) {
+		MxNextActionDataStart* data = *it;
+		for (MxStreamListMxDSAction::iterator it2 = m_list0x64.begin(); it2 != m_list0x64.end(); it2++) {
+			MxDSStreamingAction* streamingAction = (MxDSStreamingAction*) *it2;
+			if (streamingAction->GetObjectId() == data->GetObjectId() &&
+				streamingAction->GetUnknown24() == data->GetUnknown24() &&
+				streamingAction->GetBufferOffset() == data->GetData()) {
+				m_nextActionList.erase(it);
+
+				data->SetData(m_provider->GetFileSize() + data->GetData());
+				m_nextActionList.push_back(data);
+
+				m_list0x64.erase(it2);
+				return streamingAction;
+			}
+		}
+	}
 	return NULL;
 }
 
@@ -203,7 +242,6 @@ MxResult MxDiskStreamController::VTable0x20(MxDSAction* p_action)
 	MxAutoLocker lock(&this->m_criticalSection);
 	MxDSStreamingAction* entry =
 		(MxDSStreamingAction*) m_list0x80.Find(p_action, FALSE); // TODO: is this a seperate class?
-
 	if (entry) {
 		MxDSStreamingAction* action = new MxDSStreamingAction(*p_action, 0);
 		action->SetUnknown28(entry->GetUnknown28());
@@ -224,11 +262,39 @@ MxResult MxDiskStreamController::VTable0x20(MxDSAction* p_action)
 	return SUCCESS;
 }
 
-// STUB: LEGO1 0x100c8160
+// FUNCTION: LEGO1 0x100c8160
 MxResult MxDiskStreamController::VTable0x24(MxDSAction* p_action)
 {
-	// TODO
-	return FAILURE;
+	MxAutoLocker lock(&this->m_criticalSection);
+	if (m_unk0x54.Find(p_action, FALSE) == NULL) {
+		if (VTable0x30(p_action) == SUCCESS) {
+			MxOmni::GetInstance()->NotifyCurrentEntity(
+				&MxEndActionNotificationParam(c_notificationEndAction, NULL, p_action, TRUE)
+			);
+		}
+	}
+
+	MxDSAction action;
+	if (m_provider) {
+		m_provider->VTable0x20(p_action);
+	}
+
+	do {
+		if (m_action0x60 != NULL) {
+			delete m_action0x60;
+			m_action0x60 = NULL;
+		}
+
+		action = *p_action;
+		MxStreamController::VTable0x24(&action);
+	} while (m_action0x60 != NULL);
+
+	if (m_unk0x3c.size() == 0) {
+		m_unk0x70 = 0;
+		m_unk0xc4 = 0;
+	}
+
+	return SUCCESS;
 }
 
 // FUNCTION: LEGO1 0x100c8360
@@ -269,10 +335,28 @@ void MxDiskStreamController::InsertToList74(MxDSBuffer* p_buffer)
 	m_list0x74.push_back(p_buffer);
 }
 
-// STUB: LEGO1 0x100c8540
+// FUNCTION: LEGO1 0x100c8540
 void MxDiskStreamController::FUN_100c8540()
 {
-	// TODO
+	MxAutoLocker lock(&this->m_criticalSection);
+	for (list<MxDSBuffer*>::iterator it = m_list0x74.begin(); it != m_list0x74.end();) {
+		MxDSBuffer* buf = *it;
+		// TODO: Match
+		if (buf->GetRefCount() == 0) {
+			m_list0x74.erase(it++);
+			FUN_100c7ce0(buf);
+		}
+		else
+			it++;
+	}
+
+	if (m_nextActionList.empty()) {
+		while (!m_list0x64.empty()) {
+			MxDSStreamingAction* action = (MxDSStreamingAction*) m_list0x64.front();
+			m_list0x64.pop_front();
+			FUN_100c7cb0(action);
+		}
+	}
 }
 
 // FUNCTION: LEGO1 0x100c8640
@@ -292,6 +376,13 @@ MxResult MxDiskStreamController::Tickle()
 	return SUCCESS;
 }
 
+// FUNCTION: LEGO1 0x100c8670
+void MxDiskStreamController::FUN_100c8670(MxDSStreamingAction* p_streamingAction)
+{
+	MxAutoLocker lock(&this->m_critical9c);
+	m_list0xb8.push_back(p_streamingAction);
+}
+
 // FUNCTION: LEGO1 0x100c8720
 void MxDiskStreamController::FUN_100c8720()
 {
diff --git a/LEGO1/mxdiskstreamcontroller.h b/LEGO1/mxdiskstreamcontroller.h
index 1d1cf7d5..28966d9d 100644
--- a/LEGO1/mxdiskstreamcontroller.h
+++ b/LEGO1/mxdiskstreamcontroller.h
@@ -39,6 +39,11 @@ class MxDiskStreamController : public MxStreamController {
 		return !strcmp(p_name, MxDiskStreamController::ClassName()) || MxStreamController::IsA(p_name);
 	}
 
+	inline MxBool GetUnk0xc4() const { return m_unk0xc4; }
+
+	void FUN_100c7f40(MxDSStreamingAction* p_streamingaction);
+	void FUN_100c8670(MxDSStreamingAction* p_streamingAction);
+
 private:
 	MxStreamListMxDSAction m_list0x64; // 0x64
 	undefined m_unk0x70;               // 0x70
@@ -48,14 +53,15 @@ class MxDiskStreamController : public MxStreamController {
 	MxStreamListMxDSAction m_list0x90; // 0x90
 	MxCriticalSection m_critical9c;    // 0x9c
 	MxStreamListMxDSAction m_list0xb8; // 0xb8
-	undefined m_unk0xc4;               // 0xc4
+	MxBool m_unk0xc4;                  // 0xc4
 
+	MxResult FUN_100c7890(MxDSStreamingAction* p_action);
+	void FUN_100c7970();
 	void FUN_100c7cb0(MxDSStreamingAction* p_action);
 	void FUN_100c7ce0(MxDSBuffer* p_buffer);
 	MxResult FUN_100c7d10();
 	void FUN_100c7980();
 	MxDSStreamingAction* FUN_100c7db0();
-	void FUN_100c7f40(MxDSStreamingAction* p_streamingaction);
 	MxResult FUN_100c8360(MxDSStreamingAction* p_action);
 	void InsertToList74(MxDSBuffer* p_buffer);
 	void FUN_100c8540();
diff --git a/LEGO1/mxdiskstreamprovider.cpp b/LEGO1/mxdiskstreamprovider.cpp
index a8d15984..c7e311eb 100644
--- a/LEGO1/mxdiskstreamprovider.cpp
+++ b/LEGO1/mxdiskstreamprovider.cpp
@@ -1,13 +1,20 @@
 #include "mxdiskstreamprovider.h"
 
+#include "mxautolocker.h"
+#include "mxdiskstreamcontroller.h"
 #include "mxdsbuffer.h"
+#include "mxdsstreamingaction.h"
 #include "mxomni.h"
 #include "mxstreamcontroller.h"
 #include "mxstring.h"
 #include "mxthread.h"
 
+DECOMP_SIZE_ASSERT(MxDiskStreamProviderThread, 0x1c)
 DECOMP_SIZE_ASSERT(MxDiskStreamProvider, 0x60);
 
+// GLOBAL: LEGO1 0x10102878
+MxU32 g_unk0x10102878 = 0;
+
 // FUNCTION: LEGO1 0x100d0f30
 MxResult MxDiskStreamProviderThread::Run()
 {
@@ -29,8 +36,8 @@ MxResult MxDiskStreamProviderThread::StartWithTarget(MxDiskStreamProvider* p_tar
 MxDiskStreamProvider::MxDiskStreamProvider()
 {
 	this->m_pFile = NULL;
-	this->m_remainingWork = 0;
-	this->m_unk0x35 = 0;
+	this->m_remainingWork = FALSE;
+	this->m_unk0x35 = FALSE;
 }
 
 // STUB: LEGO1 0x100d1240
@@ -58,7 +65,7 @@ MxResult MxDiskStreamProvider::SetResourceToGet(MxStreamController* p_resource)
 				goto done;
 		}
 
-		m_remainingWork = 1;
+		m_remainingWork = TRUE;
 		m_busySemaphore.Init(0, 100);
 
 		if (m_thread.StartWithTarget(this) == SUCCESS && p_resource != NULL) {
@@ -79,25 +86,125 @@ void MxDiskStreamProvider::VTable0x20(MxDSAction* p_action)
 // FUNCTION: LEGO1 0x100d1750
 MxResult MxDiskStreamProvider::WaitForWorkToComplete()
 {
-	while (m_remainingWork != 0) {
+	while (m_remainingWork) {
 		m_busySemaphore.Wait(INFINITE);
-		if (m_unk0x35 != 0)
+		if (m_unk0x35)
 			PerformWork();
 	}
+
 	return SUCCESS;
 }
 
-// STUB: LEGO1 0x100d1780
+// FUNCTION: LEGO1 0x100d1780
 MxResult MxDiskStreamProvider::FUN_100d1780(MxDSStreamingAction* p_action)
 {
-	// TODO
-	return FAILURE;
+	if (!m_remainingWork)
+		return FAILURE;
+
+	if (p_action->GetUnknown9c() > 0 && !p_action->GetUnknowna0()) {
+		MxDSBuffer* buffer = new MxDSBuffer();
+
+		if (!buffer)
+			return FAILURE;
+
+		if (buffer->AllocateBuffer(GetFileSize(), MxDSBufferType_Allocate) != SUCCESS) {
+			delete buffer;
+			return FAILURE;
+		}
+
+		p_action->SetUnknowna0(buffer);
+	}
+
+	if (p_action->GetUnknowna0()->GetWriteOffset() < 0x20000) {
+		g_unk0x10102878++;
+	}
+
+	{
+		MxAutoLocker lock(&m_criticalSection);
+		m_list.push_back(p_action);
+	}
+
+	m_unk0x35 = TRUE;
+	m_busySemaphore.Release(1);
+	return SUCCESS;
 }
 
-// STUB: LEGO1 0x100d18f0
+// FUNCTION: LEGO1 0x100d18f0
 void MxDiskStreamProvider::PerformWork()
 {
-	// TODO
+	MxDiskStreamController* controller = (MxDiskStreamController*) m_pLookup;
+	MxDSStreamingAction* streamingAction = NULL;
+
+	{
+		MxAutoLocker lock(&m_criticalSection);
+		if (!m_list.empty()) {
+			streamingAction = (MxDSStreamingAction*) m_list.front();
+
+			if (streamingAction && !FUN_100d1af0(streamingAction)) {
+				m_thread.Sleep(500);
+				m_busySemaphore.Release(1);
+				return;
+			}
+		}
+	}
+
+	{
+		MxAutoLocker lock(&m_criticalSection);
+
+		if (!m_list.PopFrontStreamingAction(streamingAction))
+			return;
+	}
+
+	if (streamingAction->GetUnknowna0()->GetWriteOffset() < 0x20000) {
+		g_unk0x10102878--;
+	}
+
+	MxDSBuffer* buffer = streamingAction->GetUnknowna0();
+
+	if (m_pFile->GetPosition() == streamingAction->GetBufferOffset() ||
+		m_pFile->Seek(streamingAction->GetBufferOffset(), 0) == 0) {
+		buffer->SetUnknown14(m_pFile->GetPosition());
+
+		if (m_pFile->ReadToBuffer(buffer) == SUCCESS) {
+			buffer->SetUnknown1c(m_pFile->GetPosition());
+
+			if (streamingAction->GetUnknown9c() > 0) {
+				FUN_100d1b20(streamingAction);
+			}
+			else {
+				if (m_pLookup == NULL || !((MxDiskStreamController*) m_pLookup)->GetUnk0xc4()) {
+					controller->FUN_100c8670(streamingAction);
+				}
+				else {
+					controller->FUN_100c7f40(streamingAction);
+				}
+			}
+
+			streamingAction = NULL;
+		}
+	}
+
+	if (streamingAction) {
+		controller->FUN_100c8670(streamingAction);
+	}
+
+	m_thread.Sleep(0);
+}
+
+// FUNCTION: LEGO1 0x100d1af0
+MxBool MxDiskStreamProvider::FUN_100d1af0(MxDSStreamingAction* p_action)
+{
+	if (p_action->GetUnknowna0()->GetWriteOffset() == 0x20000) {
+		return g_unk0x10102878 == 0;
+	}
+
+	return TRUE;
+}
+
+// STUB: LEGO1 0x100d1b20
+MxResult MxDiskStreamProvider::FUN_100d1b20(MxDSStreamingAction* p_action)
+{
+	return FAILURE;
 }
 
 // FUNCTION: LEGO1 0x100d1e90
diff --git a/LEGO1/mxdiskstreamprovider.h b/LEGO1/mxdiskstreamprovider.h
index 55d4f0f2..bc73c0e4 100644
--- a/LEGO1/mxdiskstreamprovider.h
+++ b/LEGO1/mxdiskstreamprovider.h
@@ -13,21 +13,20 @@ class MxDiskStreamProvider;
 class MxDSStreamingAction;
 
 // VTABLE: LEGO1 0x100dd130
+// SIZE 0x1c
 class MxDiskStreamProviderThread : public MxThread {
 public:
-	// Only inlined, no offset
 	inline MxDiskStreamProviderThread() : MxThread() { m_target = NULL; }
 
 	MxResult Run() override;
-
 	MxResult StartWithTarget(MxDiskStreamProvider* p_target);
 };
 
 // VTABLE: LEGO1 0x100dd138
+// SIZE 0x60
 class MxDiskStreamProvider : public MxStreamProvider {
 public:
 	MxDiskStreamProvider();
-
 	virtual ~MxDiskStreamProvider() override;
 
 	// FUNCTION: LEGO1 0x100d1160
@@ -46,6 +45,8 @@ class MxDiskStreamProvider : public MxStreamProvider {
 	MxResult WaitForWorkToComplete();
 	MxResult FUN_100d1780(MxDSStreamingAction* p_action);
 	void PerformWork();
+	static MxBool FUN_100d1af0(MxDSStreamingAction* p_action);
+	MxResult FUN_100d1b20(MxDSStreamingAction* p_action);
 
 	virtual MxResult SetResourceToGet(MxStreamController* p_resource) override; // vtable+0x14
 	virtual MxU32 GetFileSize() override;                                       // vtable+0x18
@@ -57,8 +58,8 @@ class MxDiskStreamProvider : public MxStreamProvider {
 private:
 	MxDiskStreamProviderThread m_thread; // 0x10
 	MxSemaphore m_busySemaphore;         // 0x2c
-	undefined m_remainingWork;           // 0x34
-	undefined m_unk0x35;                 // 0x35
+	MxBool m_remainingWork;              // 0x34
+	MxBool m_unk0x35;                    // 0x35
 	MxCriticalSection m_criticalSection; // 0x38
 	MxStreamListMxDSAction m_list;       // 0x54
 };
diff --git a/LEGO1/mxdsbuffer.cpp b/LEGO1/mxdsbuffer.cpp
index 0060dbdc..b9908558 100644
--- a/LEGO1/mxdsbuffer.cpp
+++ b/LEGO1/mxdsbuffer.cpp
@@ -135,7 +135,7 @@ MxResult MxDSBuffer::CreateObject(
 	MxStreamController* p_controller,
 	MxU32* p_data,
 	MxDSAction* p_action,
-	undefined4 p_undefined
+	MxDSStreamingAction** p_streamingAction
 )
 {
 	if (p_data == NULL) {
@@ -157,7 +157,7 @@ MxResult MxDSBuffer::CreateObject(
 			return SUCCESS;
 		}
 
-		return ParseChunk(p_controller, p_data, p_action, p_undefined, chunk);
+		return ParseChunk(p_controller, p_data, p_action, p_streamingAction, chunk);
 	}
 
 	delete header;
@@ -207,7 +207,7 @@ MxResult MxDSBuffer::ParseChunk(
 	MxStreamController* p_controller,
 	MxU32* p_data,
 	MxDSAction* p_action,
-	undefined4,
+	MxDSStreamingAction** p_streamingAction,
 	MxStreamChunk* p_header
 )
 {
diff --git a/LEGO1/mxdsbuffer.h b/LEGO1/mxdsbuffer.h
index d8532a55..ac003711 100644
--- a/LEGO1/mxdsbuffer.h
+++ b/LEGO1/mxdsbuffer.h
@@ -42,17 +42,18 @@ class MxDSBuffer : public MxCore {
 		MxStreamController* p_controller,
 		MxU32* p_data,
 		MxDSAction* p_action,
-		undefined4 p_undefined
+		MxDSStreamingAction** p_streamingAction
 	);
 	MxResult StartPresenterFromAction(MxStreamController* p_controller, MxDSAction* p_action1, MxDSAction* p_action2);
 	MxResult ParseChunk(
 		MxStreamController* p_controller,
 		MxU32* p_data,
 		MxDSAction* p_action,
-		undefined4,
+		MxDSStreamingAction** p_streamingAction,
 		MxStreamChunk* p_header
 	);
 	static MxCore* ReadChunk(MxDSBuffer* p_buffer, MxU32* p_chunkData, MxU16 p_flags);
+	void SwapBuffers();
 	MxU8 ReleaseRef(MxDSChunk*);
 	void AddRef(MxDSChunk* p_chunk);
 	void FUN_100c6f80(MxU32 p_writeOffset);
@@ -61,6 +62,8 @@ class MxDSBuffer : public MxCore {
 	inline MxU32 GetWriteOffset() { return m_writeOffset; }
 	inline MxU16 GetRefCount() { return m_refcount; }
 	inline MxDSBufferType GetMode() { return m_mode; }
+	inline void SetUnknown14(undefined4 p_unk0x14) { m_unk0x14 = p_unk0x14; }
+	inline void SetUnknown1c(undefined4 p_unk0x1c) { m_unk0x1c = p_unk0x1c; }
 
 private:
 	MxU8* m_pBuffer;                // 0x08
diff --git a/LEGO1/mxdssource.cpp b/LEGO1/mxdssource.cpp
index c38799d3..c2d86abb 100644
--- a/LEGO1/mxdssource.cpp
+++ b/LEGO1/mxdssource.cpp
@@ -2,10 +2,12 @@
 
 #include "mxdsbuffer.h"
 
+DECOMP_SIZE_ASSERT(MxDSSource, 0x14)
+
 // FUNCTION: LEGO1 0x100bffd0
-void MxDSSource::ReadToBuffer(MxDSBuffer* p_buffer)
+MxResult MxDSSource::ReadToBuffer(MxDSBuffer* p_buffer)
 {
-	Read(p_buffer->GetBuffer(), p_buffer->GetWriteOffset());
+	return Read(p_buffer->GetBuffer(), p_buffer->GetWriteOffset());
 }
 
 // FUNCTION: LEGO1 0x100bfff0
diff --git a/LEGO1/mxdssource.h b/LEGO1/mxdssource.h
index 724efca5..711ba110 100644
--- a/LEGO1/mxdssource.h
+++ b/LEGO1/mxdssource.h
@@ -6,6 +6,7 @@
 class MxDSBuffer;
 
 // VTABLE: LEGO1 0x100dc8c8
+// SIZE 0x14
 class MxDSSource : public MxCore {
 public:
 	MxDSSource() : m_lengthInDWords(0), m_pBuffer(NULL), m_position(-1) {}
@@ -23,20 +24,21 @@ class MxDSSource : public MxCore {
 		return !strcmp(p_name, MxDSSource::ClassName()) || MxCore::IsA(p_name);
 	}
 
-	virtual MxLong Open(MxULong) = 0;
-	virtual MxLong Close() = 0;
-	virtual void ReadToBuffer(MxDSBuffer* p_buffer);
-	virtual MxResult Read(unsigned char*, MxULong) = 0;
-	virtual MxLong Seek(MxLong, int) = 0;
-	virtual MxULong GetBufferSize() = 0;
-	virtual MxULong GetStreamBuffersNum() = 0;
-	virtual MxLong GetLengthInDWords();
-	virtual MxU32* GetBuffer(); // 0x34
+	virtual MxLong Open(MxULong) = 0;                    // vtable+0x14
+	virtual MxLong Close() = 0;                          // vtable+0x18
+	virtual MxResult ReadToBuffer(MxDSBuffer* p_buffer); // vtable+0x1c
+	virtual MxResult Read(unsigned char*, MxULong) = 0;  // vtable+0x20
+	virtual MxLong Seek(MxLong, int) = 0;                // vtable+0x24
+	virtual MxULong GetBufferSize() = 0;                 // vtable+0x28
+	virtual MxULong GetStreamBuffersNum() = 0;           // vtable+0x2c
+	virtual MxLong GetLengthInDWords();                  // vtable+0x30
+	virtual MxU32* GetBuffer();                          // vtable+0x34
+	inline MxLong GetPosition() const { return m_position; }
 
 protected:
-	MxULong m_lengthInDWords;
-	MxU32* m_pBuffer;
-	MxLong m_position;
+	MxULong m_lengthInDWords; // 0x08
+	MxU32* m_pBuffer;         // 0x0c
+	MxLong m_position;        // 0x10
 };
 
 #endif // MXDSSOURCE_H
diff --git a/LEGO1/mxdsstreamingaction.h b/LEGO1/mxdsstreamingaction.h
index 1766bd76..7581b217 100644
--- a/LEGO1/mxdsstreamingaction.h
+++ b/LEGO1/mxdsstreamingaction.h
@@ -32,11 +32,13 @@ class MxDSStreamingAction : public MxDSAction {
 	void FUN_100cd2d0();
 
 	inline MxU32 GetUnknown94() { return m_unk0x94; }
+	inline MxS32 GetUnknown9c() { return m_unk0x9c; }
 	inline MxDSBuffer* GetUnknowna0() { return m_unk0xa0; }
 	inline MxDSBuffer* GetUnknowna4() { return m_unk0xa4; }
 	inline MxDSAction* GetInternalAction() { return m_internalAction; }
 	inline MxU32 GetBufferOffset() { return m_bufferOffset; }
 	inline void SetUnknown94(MxU32 p_unk0x94) { m_unk0x94 = p_unk0x94; }
+	inline void SetUnknown9c(MxS32 p_unk0x9c) { m_unk0x9c = p_unk0x9c; }
 	inline void SetUnknowna0(MxDSBuffer* p_unk0xa0) { m_unk0xa0 = p_unk0xa0; }
 	inline void SetBufferOffset(MxU32 p_bufferOffset) { m_bufferOffset = p_bufferOffset; }
 
diff --git a/LEGO1/mxnextactiondatastart.h b/LEGO1/mxnextactiondatastart.h
index 10d2a2f2..c9534899 100644
--- a/LEGO1/mxnextactiondatastart.h
+++ b/LEGO1/mxnextactiondatastart.h
@@ -30,11 +30,13 @@ class MxNextActionDataStart : public MxCore {
 
 	inline MxU32 GetObjectId() const { return m_objectId; }
 	inline MxS16 GetUnknown24() const { return m_unk0x24; }
+	inline MxU32 GetData() const { return m_data; }
+	inline void SetData(MxU32 p_data) { m_data = p_data; }
 
 private:
-	MxU32 m_objectId;
-	MxS16 m_unk0x24;
-	MxU32 m_data;
+	MxU32 m_objectId; // 0x08
+	MxS16 m_unk0x24;  // 0x0c
+	MxU32 m_data;     // 0x10
 };
 
 #endif // MXNEXTACTIONDATASTART_H
diff --git a/LEGO1/mxsemaphore.cpp b/LEGO1/mxsemaphore.cpp
index 18637185..5692a888 100644
--- a/LEGO1/mxsemaphore.cpp
+++ b/LEGO1/mxsemaphore.cpp
@@ -1,6 +1,10 @@
 
 #include "mxsemaphore.h"
 
+#include "decomp.h"
+
+DECOMP_SIZE_ASSERT(MxSemaphore, 0x08)
+
 // FUNCTION: LEGO1 0x100c87d0
 MxSemaphore::MxSemaphore()
 {
diff --git a/LEGO1/mxsemaphore.h b/LEGO1/mxsemaphore.h
index 3bc6d66b..ecb6509c 100644
--- a/LEGO1/mxsemaphore.h
+++ b/LEGO1/mxsemaphore.h
@@ -5,6 +5,7 @@
 
 #include <windows.h>
 
+// SIZE 0x08
 class MxSemaphore {
 public:
 	MxSemaphore();
@@ -18,7 +19,7 @@ class MxSemaphore {
 	void Release(MxU32 p_releaseCount);
 
 private:
-	HANDLE m_hSemaphore;
+	HANDLE m_hSemaphore; // 0x04
 };
 
 #endif // MX_SEMAPHORE_H
diff --git a/LEGO1/mxstreamcontroller.cpp b/LEGO1/mxstreamcontroller.cpp
index 92dcfb26..c7d30cc4 100644
--- a/LEGO1/mxstreamcontroller.cpp
+++ b/LEGO1/mxstreamcontroller.cpp
@@ -5,6 +5,7 @@
 #include "mxautolocker.h"
 #include "mxdsstreamingaction.h"
 #include "mxnextactiondatastart.h"
+#include "mxstl/stlcompat.h"
 #include "mxstreamchunk.h"
 #include "mxtimer.h"
 
diff --git a/LEGO1/mxstreamcontroller.h b/LEGO1/mxstreamcontroller.h
index ca3b09b3..b8a5bfbd 100644
--- a/LEGO1/mxstreamcontroller.h
+++ b/LEGO1/mxstreamcontroller.h
@@ -53,6 +53,7 @@ class MxStreamController : public MxCore {
 	MxResult InsertActionToList54(MxDSAction* p_action);
 
 	inline MxAtomId& GetAtom() { return m_atom; };
+	inline MxStreamListMxDSAction& GetUnk0x3c() { return m_unk0x3c; };
 	inline MxStreamListMxDSAction& GetUnk0x54() { return m_unk0x54; };
 
 protected:
diff --git a/LEGO1/mxstreamlist.h b/LEGO1/mxstreamlist.h
index 9b65c53d..6aa63de0 100644
--- a/LEGO1/mxstreamlist.h
+++ b/LEGO1/mxstreamlist.h
@@ -1,7 +1,7 @@
 #ifndef MXSTREAMLIST_H
 #define MXSTREAMLIST_H
 
-#include "mxdsaction.h"
+#include "mxdsstreamingaction.h"
 #include "mxdssubscriber.h"
 #include "mxnextactiondatastart.h"
 #include "mxstl/stlcompat.h"
@@ -24,6 +24,18 @@ class MxStreamList : public list<T> {
 class MxStreamListMxDSAction : public MxStreamList<MxDSAction*> {
 public:
 	MxDSAction* Find(MxDSAction* p_action, MxBool p_delete);
+
+	// There chance this list actually holds MxDSStreamingListAction
+	// instead of MxDSAction. Until then, we use this helper.
+	MxBool PopFrontStreamingAction(MxDSStreamingAction*& p_obj)
+	{
+		if (empty())
+			return FALSE;
+
+		p_obj = (MxDSStreamingAction*) front();
+		pop_front();
+		return TRUE;
+	}
 };
 
 // SIZE 0xc
diff --git a/LEGO1/mxstreamprovider.h b/LEGO1/mxstreamprovider.h
index ecbe9ab4..73804684 100644
--- a/LEGO1/mxstreamprovider.h
+++ b/LEGO1/mxstreamprovider.h
@@ -34,8 +34,8 @@ class MxStreamProvider : public MxCore {
 	virtual MxU32* GetBufferForDWords() = 0;                           // vtable+0x28
 
 protected:
-	MxStreamController* m_pLookup;
-	MxDSFile* m_pFile;
+	MxStreamController* m_pLookup; // 0x08
+	MxDSFile* m_pFile;             // 0x0c
 };
 
 #endif // MXSTREAMPROVIDER_H
diff --git a/LEGO1/mxthread.cpp b/LEGO1/mxthread.cpp
index 899e959e..401860a1 100644
--- a/LEGO1/mxthread.cpp
+++ b/LEGO1/mxthread.cpp
@@ -1,11 +1,15 @@
 
 #include "mxthread.h"
 
+#include "decomp.h"
 #include "mxomni.h"
 #include "mxtimer.h"
 
 #include <process.h>
 
+DECOMP_SIZE_ASSERT(MxThread, 0x1c)
+DECOMP_SIZE_ASSERT(MxTickleThread, 0x20)
+
 // FUNCTION: LEGO1 0x100b8bb0
 MxTickleThread::MxTickleThread(MxCore* p_target, MxS32 p_frequencyMS)
 {
diff --git a/LEGO1/mxthread.h b/LEGO1/mxthread.h
index 3c7faab0..e3af186d 100644
--- a/LEGO1/mxthread.h
+++ b/LEGO1/mxthread.h
@@ -8,6 +8,7 @@
 class MxCore;
 
 // VTABLE: LEGO1 0x100dc860
+// SIZE 0x1c
 class MxThread {
 public:
 	// Note: Comes before virtual destructor
@@ -16,10 +17,8 @@ class MxThread {
 	MxResult Start(MxS32 p_stack, MxS32 p_flag);
 
 	void Terminate();
-
 	void Sleep(MxS32 p_milliseconds);
 
-	// Inferred, not in DLL
 	inline MxBool IsRunning() { return m_running; }
 
 protected:
@@ -31,27 +30,26 @@ class MxThread {
 private:
 	static unsigned ThreadProc(void* p_thread);
 
-	MxULong m_hThread;
-	MxU32 m_threadId;
-	MxBool m_running;
-	MxSemaphore m_semaphore;
+	MxULong m_hThread;       // 0x04
+	MxU32 m_threadId;        // 0x08
+	MxBool m_running;        // 0x0c
+	MxSemaphore m_semaphore; // 0x10
 
 protected:
-	MxCore* m_target;
+	MxCore* m_target; // 0x18
 };
 
 // VTABLE: LEGO1 0x100dc6d8
+// SIZE 0x20
 class MxTickleThread : public MxThread {
 public:
 	MxTickleThread(MxCore* p_target, MxS32 p_frequencyMS);
-
-	// Only inlined, no offset
 	virtual ~MxTickleThread() {}
 
 	MxResult Run() override;
 
 private:
-	MxS32 m_frequencyMS;
+	MxS32 m_frequencyMS; // 0x1c
 };
 
 #endif // MXTHREAD_H

From 762681a821701e0d70db3b9bc9867e17e8da5141 Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Mon, 25 Dec 2023 13:34:13 -0500
Subject: [PATCH 003/210] Create MxSoundManager in LegoSoundManager for now

---
 LEGO1/legosoundmanager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LEGO1/legosoundmanager.cpp b/LEGO1/legosoundmanager.cpp
index 8b8376fa..d31e5d1c 100644
--- a/LEGO1/legosoundmanager.cpp
+++ b/LEGO1/legosoundmanager.cpp
@@ -29,7 +29,7 @@ void LegoSoundManager::Destroy(MxBool p_fromDestructor)
 // STUB: LEGO1 0x100299f0
 MxResult LegoSoundManager::Create(MxU32 p_frequencyMS, MxBool p_createThread)
 {
-	return SUCCESS;
+	return MxSoundManager::Create(p_frequencyMS, p_createThread);
 }
 
 // FUNCTION: LEGO1 0x1002a390

From 2827ef74ded0ee82bc3793b38e801cdb19599c60 Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Mon, 25 Dec 2023 15:22:20 -0500
Subject: [PATCH 004/210] Hotfix GetString missing pointer indirection

---
 LEGO1/legoutil.h          | 4 ++--
 LEGO1/mxdsmediaaction.cpp | 2 +-
 LEGO1/mxdsobject.cpp      | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/LEGO1/legoutil.h b/LEGO1/legoutil.h
index a6351395..bd7adae6 100644
--- a/LEGO1/legoutil.h
+++ b/LEGO1/legoutil.h
@@ -49,10 +49,10 @@ inline void GetDouble(MxU8** p_source, T& p_dest)
 }
 
 template <class T>
-inline void GetString(MxU8** p_source, const char* p_dest, T* p_obj, void (T::*p_setter)(const char*))
+inline void GetString(MxU8** p_source, char** p_dest, T* p_obj, void (T::*p_setter)(const char*))
 {
 	(p_obj->*p_setter)((char*) *p_source);
-	*p_source += strlen(p_dest) + 1;
+	*p_source += strlen(*p_dest) + 1;
 }
 
 ExtraActionType MatchActionString(const char*);
diff --git a/LEGO1/mxdsmediaaction.cpp b/LEGO1/mxdsmediaaction.cpp
index 9e07f2d3..fb9425d2 100644
--- a/LEGO1/mxdsmediaaction.cpp
+++ b/LEGO1/mxdsmediaaction.cpp
@@ -84,7 +84,7 @@ void MxDSMediaAction::Deserialize(MxU8** p_source, MxS16 p_unk0x24)
 {
 	MxDSAction::Deserialize(p_source, p_unk0x24);
 
-	GetString(p_source, this->m_mediaSrcPath, this, &MxDSMediaAction::CopyMediaSrcPath);
+	GetString(p_source, &this->m_mediaSrcPath, this, &MxDSMediaAction::CopyMediaSrcPath);
 	GetScalar(p_source, this->m_unk0x9c.m_unk0x00);
 	GetScalar(p_source, this->m_unk0x9c.m_unk0x04);
 	GetScalar(p_source, this->m_framesPerSecond);
diff --git a/LEGO1/mxdsobject.cpp b/LEGO1/mxdsobject.cpp
index fa0b944c..9a5801d1 100644
--- a/LEGO1/mxdsobject.cpp
+++ b/LEGO1/mxdsobject.cpp
@@ -129,9 +129,9 @@ MxU32 MxDSObject::GetSizeOnDisk()
 // FUNCTION: LEGO1 0x100bfa20
 void MxDSObject::Deserialize(MxU8** p_source, MxS16 p_unk0x24)
 {
-	GetString(p_source, this->m_sourceName, this, &MxDSObject::SetSourceName);
+	GetString(p_source, &this->m_sourceName, this, &MxDSObject::SetSourceName);
 	GetScalar(p_source, this->m_unk0x14);
-	GetString(p_source, this->m_objectName, this, &MxDSObject::SetObjectName);
+	GetString(p_source, &this->m_objectName, this, &MxDSObject::SetObjectName);
 	GetScalar(p_source, this->m_objectId);
 
 	this->m_unk0x24 = p_unk0x24;

From 57b11866ed6f75192e69bcf62b0b12bae5a53f62 Mon Sep 17 00:00:00 2001
From: Misha <106913236+MishaProductions@users.noreply.github.com>
Date: Mon, 25 Dec 2023 17:39:31 -0500
Subject: [PATCH 005/210] Implement MxDSBuffer::FUN_100c67b0 (#361)

* push changes

* improve match of SwapBuffers

* rename function

* Improve match of MxDSBuffer::FUN_100c67b0

---------

Co-authored-by: Christian Semmler <mail@csemmler.com>
---
 LEGO1/mxdiskstreamcontroller.h |   4 +-
 LEGO1/mxdsbuffer.cpp           | 101 ++++++++++++++++++++++++++++++++-
 LEGO1/mxdsbuffer.h             |   5 +-
 3 files changed, 104 insertions(+), 6 deletions(-)

diff --git a/LEGO1/mxdiskstreamcontroller.h b/LEGO1/mxdiskstreamcontroller.h
index 28966d9d..703b3bf2 100644
--- a/LEGO1/mxdiskstreamcontroller.h
+++ b/LEGO1/mxdiskstreamcontroller.h
@@ -43,6 +43,8 @@ class MxDiskStreamController : public MxStreamController {
 
 	void FUN_100c7f40(MxDSStreamingAction* p_streamingaction);
 	void FUN_100c8670(MxDSStreamingAction* p_streamingAction);
+	void InsertToList74(MxDSBuffer* p_buffer);
+	void FUN_100c7cb0(MxDSStreamingAction* p_action);
 
 private:
 	MxStreamListMxDSAction m_list0x64; // 0x64
@@ -57,13 +59,11 @@ class MxDiskStreamController : public MxStreamController {
 
 	MxResult FUN_100c7890(MxDSStreamingAction* p_action);
 	void FUN_100c7970();
-	void FUN_100c7cb0(MxDSStreamingAction* p_action);
 	void FUN_100c7ce0(MxDSBuffer* p_buffer);
 	MxResult FUN_100c7d10();
 	void FUN_100c7980();
 	MxDSStreamingAction* FUN_100c7db0();
 	MxResult FUN_100c8360(MxDSStreamingAction* p_action);
-	void InsertToList74(MxDSBuffer* p_buffer);
 	void FUN_100c8540();
 	void FUN_100c8720();
 };
diff --git a/LEGO1/mxdsbuffer.cpp b/LEGO1/mxdsbuffer.cpp
index b9908558..f4b30215 100644
--- a/LEGO1/mxdsbuffer.cpp
+++ b/LEGO1/mxdsbuffer.cpp
@@ -1,5 +1,6 @@
 #include "mxdsbuffer.h"
 
+#include "mxdiskstreamcontroller.h"
 #include "mxdschunk.h"
 #include "mxdsstreamingaction.h"
 #include "mxomni.h"
@@ -119,15 +120,58 @@ MxResult MxDSBuffer::SetBufferPointer(MxU32* p_buffer, MxU32 p_size)
 	return SUCCESS;
 }
 
-// STUB: LEGO1 0x100c67b0
+// FUNCTION: LEGO1 0x100c67b0
 MxResult MxDSBuffer::FUN_100c67b0(
 	MxStreamController* p_controller,
 	MxDSAction* p_action,
 	MxDSStreamingAction** p_streamingAction
 )
 {
-	// TODO STUB
-	return FAILURE;
+	MxResult result = FAILURE;
+
+	m_unk0x30 = (MxDSStreamingAction*) p_controller->GetUnk0x3c().Find(p_action, FALSE);
+	if (m_unk0x30 == NULL)
+		return FAILURE;
+
+	MxU8* data;
+	while (data = (MxU8*) SkipToData()) {
+		if (*p_streamingAction == NULL) {
+			result = CreateObject(p_controller, (MxU32*) data, p_action, p_streamingAction);
+
+			if (result == FAILURE)
+				return result;
+			// TODO: Not a MxResult value?
+			if (result == 1)
+				break;
+		}
+		else {
+			MxDSBuffer* buffer = (*p_streamingAction)->GetUnknowna0();
+
+			if (buffer->CalcBytesRemaining(data) != SUCCESS) {
+				return result;
+			}
+
+			if (buffer->GetBytesRemaining() == 0) {
+				buffer->SetUnk30(m_unk0x30);
+
+				result = buffer->CreateObject(p_controller, (MxU32*) buffer->GetBuffer(), p_action, p_streamingAction);
+				if (result != SUCCESS) {
+					return result;
+				}
+
+				if (buffer->GetRefCount() != 0) {
+					// Note: *p_streamingAction is always null in MxRamStreamProvider
+					((MxDiskStreamController*) p_controller)->InsertToList74(buffer);
+					(*p_streamingAction)->SetUnknowna0(NULL);
+				}
+
+				((MxDiskStreamController*) p_controller)->FUN_100c7cb0(*p_streamingAction);
+				*p_streamingAction = NULL;
+			}
+		}
+	}
+
+	return SUCCESS;
 }
 
 // FUNCTION: LEGO1 0x100c68a0
@@ -212,6 +256,7 @@ MxResult MxDSBuffer::ParseChunk(
 )
 {
 	// TODO
+	OutputDebugString("ParseChunk() todo\n");
 	return FAILURE;
 }
 
@@ -239,6 +284,49 @@ MxCore* MxDSBuffer::ReadChunk(MxDSBuffer* p_buffer, MxU32* p_chunkData, MxU16 p_
 	return result;
 }
 
+// FUNCTION: LEGO1 0x100c6df0
+MxU8* MxDSBuffer::SkipToData()
+{
+	MxU8* result = NULL;
+
+	if (m_pIntoBuffer != NULL) {
+		do {
+			MxU32* ptr = (MxU32*) m_pIntoBuffer;
+			switch (*ptr) {
+			case FOURCC('L', 'I', 'S', 'T'):
+			case FOURCC('R', 'I', 'F', 'F'):
+				m_pIntoBuffer = (MxU8*) (ptr + 3);
+				break;
+			case FOURCC('M', 'x', 'O', 'b'):
+			case FOURCC('M', 'x', 'C', 'h'):
+				result = m_pIntoBuffer;
+				m_pIntoBuffer = (MxU8*) ((ptr[1] & 1) + ptr[1] + (MxU32) ptr);
+				m_pIntoBuffer = (MxU8*) ((MxU32*) m_pIntoBuffer + 2);
+				if (m_pBuffer + (m_writeOffset - 8) < m_pIntoBuffer) {
+					m_pIntoBuffer2 = result;
+					m_pIntoBuffer = NULL;
+					return result;
+				}
+				goto done;
+			case FOURCC('M', 'x', 'D', 'a'):
+			case FOURCC('M', 'x', 'S', 't'):
+				m_pIntoBuffer = (MxU8*) (ptr + 2);
+				break;
+			case FOURCC('M', 'x', 'H', 'd'):
+				m_pIntoBuffer = (MxU8*) ((MxU32) ptr + ptr[1] + 8);
+				break;
+			default:
+				m_pIntoBuffer = NULL;
+				m_pIntoBuffer2 = NULL;
+				return NULL;
+			}
+		} while (m_pIntoBuffer <= m_pBuffer + (m_writeOffset - 8));
+	}
+done:
+	m_pIntoBuffer2 = result;
+	return result;
+}
+
 // FUNCTION: LEGO1 0x100c6ec0
 MxU8 MxDSBuffer::ReleaseRef(MxDSChunk*)
 {
@@ -256,6 +344,13 @@ void MxDSBuffer::AddRef(MxDSChunk* p_chunk)
 	}
 }
 
+// STUB: LEGO1 0x100c6ef0
+MxResult MxDSBuffer::CalcBytesRemaining(MxU8* p_data)
+{
+	// TODO
+	return FAILURE;
+}
+
 // FUNCTION: LEGO1 0x100c6f80
 void MxDSBuffer::FUN_100c6f80(MxU32 p_writeOffset)
 {
diff --git a/LEGO1/mxdsbuffer.h b/LEGO1/mxdsbuffer.h
index ac003711..e9fe2675 100644
--- a/LEGO1/mxdsbuffer.h
+++ b/LEGO1/mxdsbuffer.h
@@ -53,17 +53,20 @@ class MxDSBuffer : public MxCore {
 		MxStreamChunk* p_header
 	);
 	static MxCore* ReadChunk(MxDSBuffer* p_buffer, MxU32* p_chunkData, MxU16 p_flags);
-	void SwapBuffers();
+	MxU8* SkipToData();
 	MxU8 ReleaseRef(MxDSChunk*);
 	void AddRef(MxDSChunk* p_chunk);
+	MxResult CalcBytesRemaining(MxU8* p_data);
 	void FUN_100c6f80(MxU32 p_writeOffset);
 
 	inline MxU8* GetBuffer() { return m_pBuffer; }
 	inline MxU32 GetWriteOffset() { return m_writeOffset; }
+	inline MxU32 GetBytesRemaining() { return m_bytesRemaining; }
 	inline MxU16 GetRefCount() { return m_refcount; }
 	inline MxDSBufferType GetMode() { return m_mode; }
 	inline void SetUnknown14(undefined4 p_unk0x14) { m_unk0x14 = p_unk0x14; }
 	inline void SetUnknown1c(undefined4 p_unk0x1c) { m_unk0x1c = p_unk0x1c; }
+	inline void SetUnk30(MxDSStreamingAction* p_unk0x30) { m_unk0x30 = p_unk0x30; }
 
 private:
 	MxU8* m_pBuffer;                // 0x08

From c8ec60b62c576665e7bbfb503786b72906f3e281 Mon Sep 17 00:00:00 2001
From: Joshua Peisach <itzswirlz2020@outlook.com>
Date: Mon, 25 Dec 2023 17:46:15 -0500
Subject: [PATCH 006/210] LegoLoadCacheSoundPresenter ctor, dtor, init, destroy
 (#360)

* LegoLoadCacheSoundPresenter ctor, dtor, init, destroy

* Fixes

---------

Co-authored-by: Christian Semmler <mail@csemmler.com>
---
 LEGO1/legoloadcachesoundpresenter.cpp | 19 +++++++++++++++----
 LEGO1/legoloadcachesoundpresenter.h   | 12 ++++++++++++
 LEGO1/mxwavepresenter.h               |  4 +++-
 3 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/LEGO1/legoloadcachesoundpresenter.cpp b/LEGO1/legoloadcachesoundpresenter.cpp
index 4bc2cbd6..41445182 100644
--- a/LEGO1/legoloadcachesoundpresenter.cpp
+++ b/LEGO1/legoloadcachesoundpresenter.cpp
@@ -1,19 +1,30 @@
 #include "legoloadcachesoundpresenter.h"
 
+DECOMP_SIZE_ASSERT(LegoLoadCacheSoundPresenter, 0x90)
+
 // FUNCTION: LEGO1 0x10018340
 LegoLoadCacheSoundPresenter::LegoLoadCacheSoundPresenter()
 {
 	Init();
 }
 
-// STUB: LEGO1 0x10018480
+// FUNCTION: LEGO1 0x10018480
 LegoLoadCacheSoundPresenter::~LegoLoadCacheSoundPresenter()
 {
-	// TODO
+	Destroy(TRUE);
 }
 
-// STUB: LEGO1 0x100184e0
+// FUNCTION: LEGO1 0x100184e0
 void LegoLoadCacheSoundPresenter::Init()
 {
-	// TODO
+	this->m_unk0x70 = NULL;
+	this->m_unk0x78 = 0;
+	this->m_unk0x7c = 0;
+}
+
+// FUNCTION: LEGO1 0x100184f0
+void LegoLoadCacheSoundPresenter::Destroy(MxBool p_fromDestructor)
+{
+	delete this->m_unk0x70;
+	MxWavePresenter::Destroy(p_fromDestructor);
 }
diff --git a/LEGO1/legoloadcachesoundpresenter.h b/LEGO1/legoloadcachesoundpresenter.h
index 6f9f473b..c9255b01 100644
--- a/LEGO1/legoloadcachesoundpresenter.h
+++ b/LEGO1/legoloadcachesoundpresenter.h
@@ -1,6 +1,7 @@
 #ifndef LEGOLOADCACHESOUNDPRESENTER_H
 #define LEGOLOADCACHESOUNDPRESENTER_H
 
+#include "decomp.h"
 #include "mxwavepresenter.h"
 
 // VTABLE: LEGO1 0x100d5fa8
@@ -19,6 +20,17 @@ class LegoLoadCacheSoundPresenter : public MxWavePresenter {
 
 private:
 	void Init();
+	void Destroy(MxBool p_fromDestructor);
+
+	undefined4* m_unk0x6c;   // 0x6c
+	undefined4* m_unk0x70;   // 0x70
+	undefined4 m_unk0x74;    // 0x74
+	undefined4 m_unk0x78;    // 0x78
+	undefined m_unk0x7c;     // 0x7c
+	undefined4 m_unk0x80[4]; // 0x80
 };
 
+// SYNTHETIC: LEGO1 0x10018460
+// LegoLoadCacheSoundPresenter::`scalar deleting destructor'
+
 #endif // LEGOLOADCACHESOUNDPRESENTER_H
diff --git a/LEGO1/mxwavepresenter.h b/LEGO1/mxwavepresenter.h
index ddb2b480..4210a44e 100644
--- a/LEGO1/mxwavepresenter.h
+++ b/LEGO1/mxwavepresenter.h
@@ -50,9 +50,11 @@ class MxWavePresenter : public MxSoundPresenter {
 		MxU32 m_flags;
 	};
 
+protected:
+	void Destroy(MxBool p_fromDestructor);
+
 private:
 	void Init();
-	void Destroy(MxBool p_fromDestructor);
 	MxS8 GetPlayedChunks();
 	MxBool FUN_100b1ba0();
 	void WriteToSoundBuffer(void* p_audioPtr, MxU32 p_length);

From 33bf35af95c69012331e798f5adfe70d5a163f96 Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Mon, 25 Dec 2023 17:51:15 -0500
Subject: [PATCH 007/210] Remove OutputDebugString

---
 LEGO1/mxdsbuffer.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/LEGO1/mxdsbuffer.cpp b/LEGO1/mxdsbuffer.cpp
index f4b30215..261f00d3 100644
--- a/LEGO1/mxdsbuffer.cpp
+++ b/LEGO1/mxdsbuffer.cpp
@@ -256,7 +256,6 @@ MxResult MxDSBuffer::ParseChunk(
 )
 {
 	// TODO
-	OutputDebugString("ParseChunk() todo\n");
 	return FAILURE;
 }
 

From 77755570f2858269a6cf2c81d5a4e7902072ea23 Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Mon, 25 Dec 2023 19:42:40 -0500
Subject: [PATCH 008/210] Fix a few annotations

---
 LEGO1/mxrectlist.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/LEGO1/mxrectlist.h b/LEGO1/mxrectlist.h
index c0527f01..e19c4994 100644
--- a/LEGO1/mxrectlist.h
+++ b/LEGO1/mxrectlist.h
@@ -69,13 +69,13 @@ class MxRectListCursor : public MxPtrListCursor<MxRect32> {
 // MxRectListCursor::`scalar deleting destructor'
 
 // TEMPLATE: LEGO1 0x100b4090
-// MxPtrListCursor<MxRect32 *>::~MxPtrListCursor<MxRect32 *>
+// MxPtrListCursor<MxRect32>::~MxPtrListCursor<MxRect32>
 
 // SYNTHETIC: LEGO1 0x100b40e0
 // MxListCursor<MxRect32 *>::`scalar deleting destructor'
 
 // SYNTHETIC: LEGO1 0x100b4150
-// MxPtrListCursor<MxRect32 *>::`scalar deleting destructor'
+// MxPtrListCursor<MxRect32>::`scalar deleting destructor'
 
 // TEMPLATE: LEGO1 0x100b41c0
 // MxListCursor<MxRect32 *>::~MxListCursor<MxRect32 *>

From a25bcecf47d65cbdfe488c97ed80596f9b6cc031 Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Mon, 25 Dec 2023 20:54:44 -0500
Subject: [PATCH 009/210] Fix/match MxBitmap::SetBitDepth

---
 LEGO1/mxbitmap.cpp | 49 +++++++++++++++++++++++++---------------------
 1 file changed, 27 insertions(+), 22 deletions(-)

diff --git a/LEGO1/mxbitmap.cpp b/LEGO1/mxbitmap.cpp
index 0aec1a6e..12719e7f 100644
--- a/LEGO1/mxbitmap.cpp
+++ b/LEGO1/mxbitmap.cpp
@@ -296,36 +296,41 @@ MxResult MxBitmap::SetBitDepth(MxBool p_isHighColor)
 	if (m_isHighColor == p_isHighColor) {
 		// no change: do nothing.
 		ret = SUCCESS;
+		goto done;
 	}
-	else {
-		switch (p_isHighColor) {
-		case FALSE:
-			ImportColorsToPalette(m_paletteData, m_palette);
-			if (m_palette)
-				delete m_palette;
 
-			m_palette = NULL;
-			break;
+	switch (p_isHighColor) {
+	case FALSE:
+		ImportColorsToPalette(m_paletteData, m_palette);
+		if (m_palette)
+			delete m_palette;
 
-		case TRUE:
-			pal = NULL;
-			pal = new MxPalette(m_paletteData);
-			if (pal) {
-				m_palette = pal;
+		m_palette = NULL;
+		break;
+	case TRUE: {
+		pal = NULL;
+		pal = new MxPalette(m_paletteData);
 
-				// TODO: what is this? zeroing out top half of palette?
-				MxU16* buf = (MxU16*) m_paletteData;
-				for (MxU16 i = 0; i < 256; i++) {
-					buf[i] = i;
-				}
+		if (!pal)
+			goto done;
 
-				m_isHighColor = p_isHighColor;
-				ret = SUCCESS;
-			}
-			break;
+		m_palette = pal;
+
+		// TODO: what is this? zeroing out top half of palette?
+		MxU16* buf = (MxU16*) m_paletteData;
+		for (MxU16 i = 0; i < 256; i++) {
+			buf[i] = i;
 		}
+		break;
+	}
+	default:
+		goto done;
 	}
 
+	m_isHighColor = p_isHighColor;
+	ret = SUCCESS;
+
+done:
 	// If we were unsuccessful overall but did manage to alloc
 	// the MxPalette, free it.
 	if (ret && pal)

From c507454dd10b797b1b9845416afff8fb5d420caf Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Mon, 25 Dec 2023 21:16:14 -0500
Subject: [PATCH 010/210] Match MxBitmap::CreatePalette

---
 LEGO1/mxbitmap.cpp | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/LEGO1/mxbitmap.cpp b/LEGO1/mxbitmap.cpp
index 12719e7f..30ba032d 100644
--- a/LEGO1/mxbitmap.cpp
+++ b/LEGO1/mxbitmap.cpp
@@ -250,17 +250,25 @@ MxPalette* MxBitmap::CreatePalette()
 	switch (this->m_isHighColor) {
 	case FALSE:
 		palette = new MxPalette(this->m_paletteData);
-		if (palette)
-			success = TRUE;
-		break;
 
+		if (!palette)
+			goto done;
+
+		break;
 	case TRUE:
 		palette = this->m_palette->Clone();
-		if (palette)
-			success = TRUE;
+
+		if (!palette)
+			goto done;
+
 		break;
+	default:
+		goto done;
 	}
 
+	success = TRUE;
+
+done:
 	if (!success && palette) {
 		delete palette;
 		palette = NULL;

From 17522b98d422d1f8ada53f6c4490217c8e05710f Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Mon, 25 Dec 2023 21:58:39 -0500
Subject: [PATCH 011/210] Refactor MxBitmap inline functions, match
 ImportBitmap

---
 LEGO1/mxbitmap.cpp | 26 ++++----------------------
 LEGO1/mxbitmap.h   | 23 +++++++++++++++++++----
 2 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/LEGO1/mxbitmap.cpp b/LEGO1/mxbitmap.cpp
index 30ba032d..4f2393cf 100644
--- a/LEGO1/mxbitmap.cpp
+++ b/LEGO1/mxbitmap.cpp
@@ -10,22 +10,6 @@ DECOMP_SIZE_ASSERT(MxBITMAPINFO, 0x428);
 // (1998) GLOBAL: LEGO1 0x10102184
 MxU16 g_bitmapSignature = TWOCC('B', 'M');
 
-// Bit mask trick to round up to the nearest multiple of four.
-// Pixel data may be stored with padding.
-// https://learn.microsoft.com/en-us/windows/win32/medfound/image-stride
-inline MxLong AlignToFourByte(MxLong p_value)
-{
-	return (p_value + 3) & -4;
-}
-
-// Same as the one from legoutil.h, but flipped the other way
-// TODO: While it's not outside the realm of possibility that they
-// reimplemented Abs for only this file, that seems odd, right?
-inline MxLong AbsFlipped(MxLong p_value)
-{
-	return p_value > 0 ? p_value : -p_value;
-}
-
 // FUNCTION: LEGO1 0x1004e0d0
 int MxBitmap::VTable0x28(int)
 {
@@ -140,16 +124,14 @@ MxResult MxBitmap::ImportBitmap(MxBitmap* p_bitmap)
 
 	this->m_info = new MxBITMAPINFO;
 	if (this->m_info) {
-		MxLong height = AbsFlipped(p_bitmap->m_bmiHeader->biHeight);
-		this->m_data = new MxU8[AlignToFourByte(p_bitmap->m_bmiHeader->biWidth) * height];
+		this->m_data = new MxU8[p_bitmap->GetDataSize()];
 		if (this->m_data) {
-			memcpy(this->m_info, p_bitmap->m_info, sizeof(*this->m_info));
-			height = AbsFlipped(p_bitmap->m_bmiHeader->biHeight);
-			memcpy(this->m_data, p_bitmap->m_data, AlignToFourByte(p_bitmap->m_bmiHeader->biWidth) * height);
+			memcpy(this->m_info, p_bitmap->GetBitmapInfo(), MxBITMAPINFO::Size());
+			memcpy(this->m_data, p_bitmap->GetBitmapData(), p_bitmap->GetDataSize());
 
-			result = SUCCESS;
 			this->m_bmiHeader = &this->m_info->m_bmiHeader;
 			this->m_paletteData = this->m_info->m_bmiColors;
+			result = SUCCESS;
 		}
 	}
 
diff --git a/LEGO1/mxbitmap.h b/LEGO1/mxbitmap.h
index b87bcdcf..ed944138 100644
--- a/LEGO1/mxbitmap.h
+++ b/LEGO1/mxbitmap.h
@@ -19,6 +19,8 @@
 struct MxBITMAPINFO {
 	BITMAPINFOHEADER m_bmiHeader;
 	RGBQUAD m_bmiColors[256];
+
+	static MxU32 Size() { return sizeof(MxBITMAPINFO); }
 };
 
 // Non-standard value for biCompression in the BITMAPINFOHEADER struct.
@@ -56,16 +58,29 @@ class MxBitmap : public MxCore {
 		MxS32 p_destHeight
 	); // vtable+40
 
+	// Bit mask trick to round up to the nearest multiple of four.
+	// Pixel data may be stored with padding.
+	// https://learn.microsoft.com/en-us/windows/win32/medfound/image-stride
+	inline MxLong AlignToFourByte(MxLong p_value) const { return (p_value + 3) & -4; }
+
+	// Same as the one from legoutil.h, but flipped the other way
+	// TODO: While it's not outside the realm of possibility that they
+	// reimplemented Abs for only this file, that seems odd, right?
+	inline MxLong AbsFlipped(MxLong p_value) const { return p_value > 0 ? p_value : -p_value; }
+
 	inline BITMAPINFOHEADER* GetBmiHeader() const { return m_bmiHeader; }
 	inline MxLong GetBmiWidth() const { return m_bmiHeader->biWidth; }
 	inline MxLong GetBmiStride() const { return ((m_bmiHeader->biWidth + 3) & -4); }
 	inline MxLong GetBmiHeight() const { return m_bmiHeader->biHeight; }
-	inline MxLong GetBmiHeightAbs() const
-	{
-		return m_bmiHeader->biHeight > 0 ? m_bmiHeader->biHeight : -m_bmiHeader->biHeight;
-	}
+	inline MxLong GetBmiHeightAbs() const { return AbsFlipped(m_bmiHeader->biHeight); }
 	inline MxU8* GetBitmapData() const { return m_data; }
 	inline MxBITMAPINFO* GetBitmapInfo() const { return m_info; }
+	inline MxLong GetDataSize() const
+	{
+		MxLong absHeight = GetBmiHeightAbs();
+		MxLong alignedWidth = AlignToFourByte(m_bmiHeader->biWidth);
+		return alignedWidth * absHeight;
+	}
 
 private:
 	MxResult ImportColorsToPalette(RGBQUAD*, MxPalette*);

From e824e321e884f042eb7811b1bb6538821a1ea6e1 Mon Sep 17 00:00:00 2001
From: Misha <106913236+MishaProductions@users.noreply.github.com>
Date: Tue, 26 Dec 2023 16:27:54 -0500
Subject: [PATCH 012/210] Implement chunk parsing (#362)

* partial parsechunk implementation

* fix format

* param name fix

* rename functions

* match MxStreamController::RemoveSubscriber

* implement rest of MxDSBuffer

* Fixes and better matches

* Matche ParseChunk 100%

* Match MxDiskStreamProvider::VTable0x20

* Match MxDSBuffer::CalcBytesRemaining

* Minor stuff

* Minor improvements

* Refactor functions

---------

Co-authored-by: Christian Semmler <mail@csemmler.com>
---
 LEGO1/mxdiskstreamprovider.cpp |  41 ++++++++-
 LEGO1/mxdsbuffer.cpp           | 154 ++++++++++++++++++++++++++++++---
 LEGO1/mxdschunk.cpp            |   6 ++
 LEGO1/mxdschunk.h              |   4 +
 LEGO1/mxdsstreamingaction.h    |   1 +
 LEGO1/mxdssubscriber.cpp       |   4 +-
 LEGO1/mxstreamchunk.cpp        |  44 ++++++++++
 LEGO1/mxstreamchunk.h          |   8 ++
 LEGO1/mxstreamcontroller.cpp   |  18 ++--
 LEGO1/mxstreamcontroller.h     |   7 +-
 10 files changed, 265 insertions(+), 22 deletions(-)

diff --git a/LEGO1/mxdiskstreamprovider.cpp b/LEGO1/mxdiskstreamprovider.cpp
index c7e311eb..badc1623 100644
--- a/LEGO1/mxdiskstreamprovider.cpp
+++ b/LEGO1/mxdiskstreamprovider.cpp
@@ -77,10 +77,47 @@ MxResult MxDiskStreamProvider::SetResourceToGet(MxStreamController* p_resource)
 	return result;
 }
 
-// STUB: LEGO1 0x100d15e0
+// FUNCTION: LEGO1 0x100d15e0
 void MxDiskStreamProvider::VTable0x20(MxDSAction* p_action)
 {
-	// TODO
+	MxDSStreamingAction* action;
+
+	if (p_action->GetObjectId() == -1) {
+		m_unk0x35 = FALSE;
+
+		do {
+			action = NULL;
+
+			{
+				MxAutoLocker lock(&m_criticalSection);
+				m_list.PopFrontStreamingAction(action);
+			}
+
+			if (!action)
+				return;
+
+			if (action->GetUnknowna0()->GetWriteOffset() < 0x20000)
+				g_unk0x10102878--;
+
+			((MxDiskStreamController*) m_pLookup)->FUN_100c8670(action);
+		} while (action);
+	}
+	else {
+		do {
+			{
+				MxAutoLocker lock(&m_criticalSection);
+				action = (MxDSStreamingAction*) m_list.Find(p_action, TRUE);
+			}
+
+			if (!action)
+				return;
+
+			if (action->GetUnknowna0()->GetWriteOffset() < 0x20000)
+				g_unk0x10102878--;
+
+			((MxDiskStreamController*) m_pLookup)->FUN_100c8670(action);
+		} while (action);
+	}
 }
 
 // FUNCTION: LEGO1 0x100d1750
diff --git a/LEGO1/mxdsbuffer.cpp b/LEGO1/mxdsbuffer.cpp
index 261f00d3..da643c17 100644
--- a/LEGO1/mxdsbuffer.cpp
+++ b/LEGO1/mxdsbuffer.cpp
@@ -30,11 +30,45 @@ MxDSBuffer::MxDSBuffer()
 MxDSBuffer::~MxDSBuffer()
 {
 	if (m_pBuffer != NULL) {
-		if (m_mode == MxDSBufferType_Chunk) {
-			// TODO
-		}
-		else if (m_mode == MxDSBufferType_Allocate || m_mode == MxDSBufferType_Unknown) {
+		switch (m_mode) {
+		case MxDSBufferType_Allocate:
+		case MxDSBufferType_Unknown:
 			delete[] m_pBuffer;
+			break;
+
+		case MxDSBufferType_Chunk: {
+			MxU32 offset = m_writeOffset / 1024;
+			MxStreamer* streamer = Streamer();
+
+			switch (offset) {
+			case 0x40: {
+				MxU32 a =
+					(m_pBuffer - streamer->GetSubclass1().GetBuffer()) / (streamer->GetSubclass1().GetSize() << 10);
+
+				MxU32 bit = 1 << ((MxU8) a & 0x1f);
+				MxU32 index = (a & ~0x18u) >> 3;
+
+				if ((*(MxU32*) (&streamer->GetSubclass1().GetUnk08Ref()[index])) & bit) {
+					MxU32* ptr = (MxU32*) (&streamer->GetSubclass1().GetUnk08Ref()[index]);
+					*ptr = *ptr ^ bit;
+				}
+				break;
+			}
+			case 0x80: {
+				MxU32 a =
+					(m_pBuffer - streamer->GetSubclass1().GetBuffer()) / (streamer->GetSubclass1().GetSize() << 10);
+
+				MxU32 bit = 1 << ((MxU8) a & 0x1f);
+				MxU32 index = (a & ~0x18u) >> 3;
+
+				if ((*(MxU32*) (&streamer->GetSubclass2().GetUnk08Ref()[index])) & bit) {
+					MxU32* ptr = (MxU32*) (&streamer->GetSubclass2().GetUnk08Ref()[index]);
+					*ptr = *ptr ^ bit;
+				}
+				break;
+			}
+			}
+		}
 		}
 	}
 
@@ -246,7 +280,7 @@ MxResult MxDSBuffer::StartPresenterFromAction(
 	return SUCCESS;
 }
 
-// STUB: LEGO1 0x100c6a50
+// FUNCTION: LEGO1 0x100c6a50
 MxResult MxDSBuffer::ParseChunk(
 	MxStreamController* p_controller,
 	MxU32* p_data,
@@ -255,8 +289,83 @@ MxResult MxDSBuffer::ParseChunk(
 	MxStreamChunk* p_header
 )
 {
-	// TODO
-	return FAILURE;
+	MxResult result = SUCCESS;
+
+	if (m_unk0x30->GetFlags() & MxDSAction::Flag_Bit3 && m_unk0x30->GetUnknowna8() && p_header->GetTime() < 0) {
+		delete p_header;
+		return SUCCESS;
+	}
+
+	p_header->SetTime(p_header->GetTime() + m_unk0x30->GetUnknowna8());
+
+	if (p_header->GetFlags() & MxDSChunk::Flag_Bit5) {
+		MxU32 length = p_header->GetLength() + MxDSChunk::ReturnE() + 8;
+		MxDSBuffer* buffer = new MxDSBuffer();
+
+		if (buffer && buffer->AllocateBuffer(length, MxDSBufferType_Allocate) == SUCCESS &&
+			buffer->CalcBytesRemaining((MxU8*) p_data) == SUCCESS) {
+			*p_streamingAction = new MxDSStreamingAction((MxDSStreamingAction&) *p_action);
+			;
+
+			if (*p_streamingAction) {
+				MxU16* flags = MxStreamChunk::IntoFlags(buffer->GetBuffer());
+				*flags = p_header->GetFlags() & ~MxDSChunk::Flag_Bit5;
+
+				delete p_header;
+				(*p_streamingAction)->SetUnknowna0(buffer);
+				goto done;
+			}
+		}
+
+		if (buffer)
+			delete buffer;
+
+		delete p_header;
+		return FAILURE;
+	}
+	else {
+		if (p_header->GetFlags() & MxDSChunk::Flag_Bit2) {
+			if (m_unk0x30->HasId(p_header->GetObjectId())) {
+				if (m_unk0x30->GetFlags() & MxDSAction::Flag_Bit3 &&
+					(m_unk0x30->GetLoopCount() > 1 || m_unk0x30->GetDuration() == -1)) {
+
+					if (p_action->GetObjectId() == p_header->GetObjectId()) {
+						MxU32 val = p_controller->GetProvider()->GetBufferForDWords()[m_unk0x30->GetObjectId()];
+
+						m_unk0x30->SetUnknown94(val);
+						m_unk0x30->SetBufferOffset(m_writeOffset * (val / m_writeOffset));
+
+						MxNextActionDataStart* data =
+							p_controller->FindNextActionDataStartFromStreamingAction(m_unk0x30);
+
+						if (data)
+							data->SetData(m_unk0x30->GetBufferOffset());
+
+						m_unk0x30->FUN_100cd2d0();
+					}
+
+					delete p_header;
+					p_header = NULL;
+				}
+				else {
+					if (p_action->GetObjectId() == p_header->GetObjectId() &&
+						p_controller->VTable0x30(p_action) == SUCCESS) {
+						p_controller->GetProvider()->VTable0x20(p_action);
+						result = 1;
+					}
+				}
+			}
+		}
+
+		if (p_header) {
+			if (p_header->SendChunk(p_controller->GetSubscriberList(), TRUE, p_action->GetUnknown24()) != SUCCESS) {
+				delete p_header;
+			}
+		}
+	}
+
+done:
+	return result;
 }
 
 // FUNCTION: LEGO1 0x100c6d00
@@ -343,11 +452,36 @@ void MxDSBuffer::AddRef(MxDSChunk* p_chunk)
 	}
 }
 
-// STUB: LEGO1 0x100c6ef0
+// FUNCTION: LEGO1 0x100c6ef0
 MxResult MxDSBuffer::CalcBytesRemaining(MxU8* p_data)
 {
-	// TODO
-	return FAILURE;
+	MxResult result = FAILURE;
+
+	if (m_mode == MxDSBufferType_Allocate && m_bytesRemaining != 0) {
+		MxU32 bytesRead;
+		MxU8* ptr;
+
+		if (m_writeOffset == m_bytesRemaining) {
+			bytesRead = *(MxU32*) (p_data + 4) + 8;
+			ptr = p_data;
+		}
+		else {
+			ptr = &p_data[MxStreamChunk::ReturnE() + 8];
+			bytesRead = (*(MxU32*) (p_data + 4)) - MxStreamChunk::ReturnE();
+		}
+
+		if (bytesRead <= m_bytesRemaining) {
+			memcpy(m_pBuffer + m_writeOffset - m_bytesRemaining, ptr, bytesRead);
+
+			if (m_writeOffset == m_bytesRemaining)
+				*(MxU32*) (m_pBuffer + 4) = *MxStreamChunk::IntoPlus0x12(m_pBuffer) + MxStreamChunk::ReturnE();
+
+			m_bytesRemaining -= bytesRead;
+			result = SUCCESS;
+		}
+	}
+
+	return result;
 }
 
 // FUNCTION: LEGO1 0x100c6f80
diff --git a/LEGO1/mxdschunk.cpp b/LEGO1/mxdschunk.cpp
index b44bc475..bf7e08a6 100644
--- a/LEGO1/mxdschunk.cpp
+++ b/LEGO1/mxdschunk.cpp
@@ -19,3 +19,9 @@ MxDSChunk::~MxDSChunk()
 		delete[] m_data;
 	}
 }
+
+// FUNCTION: LEGO1 0x100be1e0
+MxU32 MxDSChunk::ReturnE()
+{
+	return 0xe;
+}
diff --git a/LEGO1/mxdschunk.h b/LEGO1/mxdschunk.h
index 4cbb2fc9..ec4a8cbe 100644
--- a/LEGO1/mxdschunk.h
+++ b/LEGO1/mxdschunk.h
@@ -13,6 +13,8 @@ class MxDSChunk : public MxCore {
 		Flag_Bit1 = 0x01,
 		Flag_Bit2 = 0x02,
 		Flag_Bit3 = 0x04,
+		Flag_Bit4 = 0x08,
+		Flag_Bit5 = 0x10,
 		Flag_Bit8 = 0x80,
 		Flag_Bit16 = 0x8000
 	};
@@ -33,6 +35,8 @@ class MxDSChunk : public MxCore {
 		return !strcmp(p_name, MxDSChunk::ClassName()) || MxCore::IsA(p_name);
 	}
 
+	static MxU32 ReturnE();
+
 	inline void SetFlags(MxU16 p_flags) { m_flags = p_flags; }
 	inline void SetObjectId(undefined4 p_objectid) { m_objectId = p_objectid; }
 	inline void SetTime(MxLong p_time) { m_time = p_time; }
diff --git a/LEGO1/mxdsstreamingaction.h b/LEGO1/mxdsstreamingaction.h
index 7581b217..00cd13aa 100644
--- a/LEGO1/mxdsstreamingaction.h
+++ b/LEGO1/mxdsstreamingaction.h
@@ -35,6 +35,7 @@ class MxDSStreamingAction : public MxDSAction {
 	inline MxS32 GetUnknown9c() { return m_unk0x9c; }
 	inline MxDSBuffer* GetUnknowna0() { return m_unk0xa0; }
 	inline MxDSBuffer* GetUnknowna4() { return m_unk0xa4; }
+	inline MxLong GetUnknowna8() { return m_unk0xa8; }
 	inline MxDSAction* GetInternalAction() { return m_internalAction; }
 	inline MxU32 GetBufferOffset() { return m_bufferOffset; }
 	inline void SetUnknown94(MxU32 p_unk0x94) { m_unk0x94 = p_unk0x94; }
diff --git a/LEGO1/mxdssubscriber.cpp b/LEGO1/mxdssubscriber.cpp
index b4fa97a0..33ee11fc 100644
--- a/LEGO1/mxdssubscriber.cpp
+++ b/LEGO1/mxdssubscriber.cpp
@@ -17,7 +17,7 @@ MxDSSubscriber::MxDSSubscriber()
 MxDSSubscriber::~MxDSSubscriber()
 {
 	if (m_controller)
-		m_controller->FUN_100c1620(this);
+		m_controller->RemoveSubscriber(this);
 
 	DeleteChunks();
 
@@ -48,7 +48,7 @@ MxResult MxDSSubscriber::Create(MxStreamController* p_controller, MxU32 p_object
 	if (!m_unk0x3c)
 		return FAILURE;
 
-	m_controller->FUN_100c15d0(this);
+	m_controller->AddSubscriber(this);
 	return SUCCESS;
 }
 
diff --git a/LEGO1/mxstreamchunk.cpp b/LEGO1/mxstreamchunk.cpp
index 93e76a6c..8dd9ed67 100644
--- a/LEGO1/mxstreamchunk.cpp
+++ b/LEGO1/mxstreamchunk.cpp
@@ -2,6 +2,7 @@
 
 #include "legoutil.h"
 #include "mxdsbuffer.h"
+#include "mxstreamlist.h"
 
 // FUNCTION: LEGO1 0x100c2fe0
 MxStreamChunk::~MxStreamChunk()
@@ -48,8 +49,51 @@ MxU32 MxStreamChunk::ReadChunkHeader(MxU8* p_chunkData)
 	return headersize;
 }
 
+// FUNCTION: LEGO1 0x100c30e0
+MxResult MxStreamChunk::SendChunk(MxStreamListMxDSSubscriber& p_subscriberList, MxBool p_append, MxS16 p_obj24val)
+{
+	for (MxStreamListMxDSSubscriber::iterator it = p_subscriberList.begin(); it != p_subscriberList.end(); it++) {
+		if ((*it)->GetObjectId() == m_objectId && (*it)->GetUnknown48() == p_obj24val) {
+			if (m_flags & MxDSChunk::Flag_Bit2 && m_buffer) {
+				m_buffer->ReleaseRef(this);
+				m_buffer = NULL;
+			}
+
+			(*it)->AddChunk(this, p_append);
+
+			return SUCCESS;
+		}
+	}
+
+	return FAILURE;
+}
+
 // FUNCTION: LEGO1 0x100c3170
 void MxStreamChunk::SetBuffer(MxDSBuffer* p_buffer)
 {
 	m_buffer = p_buffer;
 }
+
+// FUNCTION: LEGO1 0x100c3180
+MxU16* MxStreamChunk::IntoFlags(MxU8* p_buffer)
+{
+	return (MxU16*) (p_buffer + 8);
+}
+
+// FUNCTION: LEGO1 0x100c3190
+MxU32* MxStreamChunk::IntoPlus0xa(MxU8* p_buffer)
+{
+	return (MxU32*) (p_buffer + 0xa);
+}
+
+// FUNCTION: LEGO1 0x100c31a0
+MxU32* MxStreamChunk::IntoPlus0xe(MxU8* p_buffer)
+{
+	return (MxU32*) (p_buffer + 0xe);
+}
+
+// FUNCTION: LEGO1 0x100c31b0
+MxU32* MxStreamChunk::IntoPlus0x12(MxU8* p_buffer)
+{
+	return (MxU32*) (p_buffer + 0x12);
+}
diff --git a/LEGO1/mxstreamchunk.h b/LEGO1/mxstreamchunk.h
index 53cbfc68..18bc2335 100644
--- a/LEGO1/mxstreamchunk.h
+++ b/LEGO1/mxstreamchunk.h
@@ -2,8 +2,10 @@
 #define MXSTREAMCHUNK_H
 
 #include "mxdschunk.h"
+#include "mxdsobject.h"
 
 class MxDSBuffer;
+class MxStreamListMxDSSubscriber;
 
 // VTABLE: LEGO1 0x100dc2a8
 // SIZE 0x20
@@ -29,8 +31,14 @@ class MxStreamChunk : public MxDSChunk {
 
 	MxResult ReadChunk(MxDSBuffer* p_buffer, MxU8* p_chunkData);
 	MxU32 ReadChunkHeader(MxU8* p_chunkData);
+	MxResult SendChunk(MxStreamListMxDSSubscriber& p_subscriberList, MxBool p_append, MxS16 p_obj24val);
 	void SetBuffer(MxDSBuffer* p_buffer);
 
+	static MxU16* IntoFlags(MxU8* p_buffer);
+	static MxU32* IntoPlus0x12(MxU8* p_buffer);
+	static MxU32* IntoPlus0xa(MxU8* p_buffer);
+	static MxU32* IntoPlus0xe(MxU8* p_buffer);
+
 private:
 	MxDSBuffer* m_buffer; // 0x1c
 };
diff --git a/LEGO1/mxstreamcontroller.cpp b/LEGO1/mxstreamcontroller.cpp
index c7d30cc4..726a8fa1 100644
--- a/LEGO1/mxstreamcontroller.cpp
+++ b/LEGO1/mxstreamcontroller.cpp
@@ -78,16 +78,16 @@ MxResult MxStreamController::Open(const char* p_filename)
 	return SUCCESS;
 }
 
-// STUB: LEGO1 0x100c15d0
-void MxStreamController::FUN_100c15d0(MxDSSubscriber* p_subscriber)
+// FUNCTION: LEGO1 0x100c15d0
+void MxStreamController::AddSubscriber(MxDSSubscriber* p_subscriber)
 {
-	// TODO
+	m_subscriberList.push_back(p_subscriber);
 }
 
-// STUB: LEGO1 0x100c1620
-void MxStreamController::FUN_100c1620(MxDSSubscriber* p_subscriber)
+// FUNCTION: LEGO1 0x100c1620
+void MxStreamController::RemoveSubscriber(MxDSSubscriber* p_subscriber)
 {
-	// TODO
+	m_subscriberList.remove(p_subscriber);
 }
 
 // FUNCTION: LEGO1 0x100c1690
@@ -259,6 +259,12 @@ MxResult MxStreamController::FUN_100c1f00(MxDSAction* p_action)
 	return FAILURE;
 }
 
+// STUB: LEGO1 0x100c20b0
+MxNextActionDataStart* MxStreamController::FindNextActionDataStartFromStreamingAction(MxDSStreamingAction* p_action)
+{
+	return NULL;
+}
+
 // STUB: LEGO1 0x100c20d0
 MxBool MxStreamController::FUN_100c20d0(MxDSObject& p_obj)
 {
diff --git a/LEGO1/mxstreamcontroller.h b/LEGO1/mxstreamcontroller.h
index b8a5bfbd..0389772b 100644
--- a/LEGO1/mxstreamcontroller.h
+++ b/LEGO1/mxstreamcontroller.h
@@ -43,18 +43,21 @@ class MxStreamController : public MxCore {
 	virtual MxResult VTable0x2c(MxDSAction* p_action, MxU32 p_bufferval); // vtable+0x2c
 	virtual MxResult VTable0x30(MxDSAction* p_action);                    // vtable+0x30
 
-	void FUN_100c15d0(MxDSSubscriber* p_subscriber);
-	void FUN_100c1620(MxDSSubscriber* p_subscriber);
+	void AddSubscriber(MxDSSubscriber* p_subscriber);
+	void RemoveSubscriber(MxDSSubscriber* p_subscriber);
 	MxResult FUN_100c1800(MxDSAction* p_action, MxU32 p_val);
 	MxResult FUN_100c1a00(MxDSAction* p_action, MxU32 p_offset);
 	MxPresenter* FUN_100c1e70(MxDSAction& p_action);
 	MxResult FUN_100c1f00(MxDSAction* p_action);
 	MxBool FUN_100c20d0(MxDSObject& p_obj);
 	MxResult InsertActionToList54(MxDSAction* p_action);
+	MxNextActionDataStart* FindNextActionDataStartFromStreamingAction(MxDSStreamingAction* p_action);
 
 	inline MxAtomId& GetAtom() { return m_atom; };
+	inline MxStreamProvider* GetProvider() { return m_provider; };
 	inline MxStreamListMxDSAction& GetUnk0x3c() { return m_unk0x3c; };
 	inline MxStreamListMxDSAction& GetUnk0x54() { return m_unk0x54; };
+	inline MxStreamListMxDSSubscriber& GetSubscriberList() { return m_subscriberList; };
 
 protected:
 	MxCriticalSection m_criticalSection;                // 0x8

From ceca2aac31277b31088afb81ece417fe13918e48 Mon Sep 17 00:00:00 2001
From: Misha <106913236+MishaProductions@users.noreply.github.com>
Date: Tue, 26 Dec 2023 17:20:20 -0500
Subject: [PATCH 013/210] Implement a few LegoVideoManager/MxDisplaySurface
 functions (#364)

* implement a few functions

* fixes

* Fixes

* Add annotations

---------

Co-authored-by: Christian Semmler <mail@csemmler.com>
---
 LEGO1/lego3dview.h         | 12 ++++++--
 LEGO1/legovideomanager.cpp | 51 ++++++++++++++++++++++++++++++++--
 LEGO1/legovideomanager.h   | 10 ++++++-
 LEGO1/mxdisplaysurface.cpp | 57 ++++++++++++++++++++++++++++++++++++--
 LEGO1/mxdisplaysurface.h   |  2 +-
 5 files changed, 123 insertions(+), 9 deletions(-)

diff --git a/LEGO1/lego3dview.h b/LEGO1/lego3dview.h
index cafca31a..b984ad0f 100644
--- a/LEGO1/lego3dview.h
+++ b/LEGO1/lego3dview.h
@@ -2,6 +2,7 @@
 #define LEGO3DVIEW_H
 
 #include "mxtypes.h"
+#include "tgl/d3drm/impl.h"
 #include "viewmanager/viewmanager.h"
 
 class LegoROI;
@@ -9,11 +10,18 @@ class LegoROI;
 class Lego3DView {
 public:
 	inline ViewManager* GetViewManager() { return this->m_viewManager; }
+	inline TglImpl::ViewImpl* GetViewPort() { return this->m_viewPort; }
 	LegoROI* PickROI(MxLong p_a, MxLong p_b);
 
 private:
-	char m_pad[0x88];
-	ViewManager* m_viewManager;
+	// TODO: all of these fields are in various base classes
+	undefined4 m_vtable;                 // 0x0 (TODO: remove once virtual function added)
+	undefined4 m_unk0x4;                 // 0x4
+	TglImpl::RendererImpl* m_renderImpl; // 0x8
+	TglImpl::DeviceImpl* m_deviceImpl;   // 0xc
+	TglImpl::ViewImpl* m_viewPort;       // 0x10
+	char m_pad[0x78];                    // 0x14
+	ViewManager* m_viewManager;          // 0x88
 };
 
 #endif // LEGO3DVIEW_H
diff --git a/LEGO1/legovideomanager.cpp b/LEGO1/legovideomanager.cpp
index 167b81a3..098bbe6e 100644
--- a/LEGO1/legovideomanager.cpp
+++ b/LEGO1/legovideomanager.cpp
@@ -37,6 +37,13 @@ LegoVideoManager::~LegoVideoManager()
 	delete m_palette;
 }
 
+// STUB: LEGO1 0x1007ac40
+MxResult LegoVideoManager::Create(MxVideoParam& p_videoParam, MxU32 p_frequencyMS, MxBool p_createThread)
+{
+	// TODO
+	return MxVideoManager::Create(p_videoParam, p_frequencyMS, p_createThread);
+}
+
 // FUNCTION: LEGO1 0x1007b5e0
 void LegoVideoManager::Destroy()
 {
@@ -69,6 +76,31 @@ void LegoVideoManager::MoveCursor(MxS32 p_cursorX, MxS32 p_cursorY)
 		m_cursorY = 463;
 }
 
+// STUB: LEGO1 0x1007b770
+MxResult LegoVideoManager::Tickle()
+{
+	// TODO
+	return FAILURE;
+}
+
+// STUB: LEGO1 0x1007c080
+void LegoVideoManager::VTable0x38(undefined4, undefined4)
+{
+	// TODO
+}
+
+// FUNCTION: LEGO1 0x1007c290
+MxResult LegoVideoManager::RealizePalette(MxPalette* p_pallete)
+{
+	if (p_pallete && m_videoParam.GetPalette()) {
+		p_pallete->GetEntries(m_paletteEntries);
+		m_videoParam.GetPalette()->SetEntries(m_paletteEntries);
+		m_displaySurface->SetPalette(m_videoParam.GetPalette());
+	}
+
+	return SUCCESS;
+}
+
 // FUNCTION: LEGO1 0x1007c300
 void LegoVideoManager::EnableFullScreenMovie(MxBool p_enable)
 {
@@ -135,9 +167,7 @@ void LegoVideoManager::SetSkyColor(float p_red, float p_green, float p_blue)
 	colorStrucure.peFlags = -124;
 	m_videoParam.GetPalette()->SetSkyColor(&colorStrucure);
 	m_videoParam.GetPalette()->SetOverrideSkyColor(TRUE);
-
-	// TODO 3d manager
-	// m_3dManager->m_pViewport->VTable0x1c(red, green, blue)
+	m_3dManager->GetLego3DView()->GetViewPort()->SetBackgroundColor(p_red, p_green, p_blue);
 }
 
 // FUNCTION: LEGO1 0x1007c4c0
@@ -146,6 +176,21 @@ void LegoVideoManager::OverrideSkyColor(MxBool p_shouldOverride)
 	this->m_videoParam.GetPalette()->SetOverrideSkyColor(p_shouldOverride);
 }
 
+// FUNCTION: LEGO1 0x1007c4d0
+void LegoVideoManager::VTable0x34(MxU32 p_x, MxU32 p_y, MxU32 p_width, MxU32 p_height)
+{
+	if (p_width == 0) {
+		p_width = m_videoParam.GetRect().GetWidth();
+	}
+	if (p_height == 0) {
+		p_height = m_videoParam.GetRect().GetHeight();
+	}
+
+	if (!m_initialized) {
+		m_3dManager->GetLego3DView()->GetViewPort()->ForceUpdate(p_x, p_y, p_width, p_height);
+	}
+}
+
 // STUB: LEGO1 0x1007c560
 int LegoVideoManager::EnableRMDevice()
 {
diff --git a/LEGO1/legovideomanager.h b/LEGO1/legovideomanager.h
index 11501e2d..122505de 100644
--- a/LEGO1/legovideomanager.h
+++ b/LEGO1/legovideomanager.h
@@ -21,7 +21,15 @@ class LegoVideoManager : public MxVideoManager {
 	__declspec(dllexport) void EnableFullScreenMovie(MxBool p_enable, MxBool p_scale);
 	__declspec(dllexport) void MoveCursor(MxS32 p_cursorX, MxS32 p_cursorY);
 
-	virtual void Destroy() override; // vtable+0x18
+	virtual MxResult Tickle() override; // vtable+0x8
+	virtual void Destroy() override;    // vtable+0x18
+	virtual MxResult Create(MxVideoParam& p_videoParam, MxU32 p_frequencyMS, MxBool p_createThread)
+		override;                                                                          // vtable+0x2c
+	virtual MxResult RealizePalette(MxPalette*) override;                                  // vtable+0x30
+	virtual void VTable0x34(MxU32 p_x, MxU32 p_y, MxU32 p_width, MxU32 p_height) override; // vtable+0x34
+	virtual void VTable0x38(undefined4, undefined4);                                       // vtable+0x38
+	// FUNCTION: LGEO1 0x1007ab10
+	virtual undefined4 VTable0x3c() { return m_unk0x4e8; } // vtable+0x3c
 
 	void SetSkyColor(float p_red, float p_green, float p_blue);
 	void OverrideSkyColor(MxBool p_shouldOverride);
diff --git a/LEGO1/mxdisplaysurface.cpp b/LEGO1/mxdisplaysurface.cpp
index bc1d2078..de4d7006 100644
--- a/LEGO1/mxdisplaysurface.cpp
+++ b/LEGO1/mxdisplaysurface.cpp
@@ -5,6 +5,8 @@
 
 DECOMP_SIZE_ASSERT(MxDisplaySurface, 0xac);
 
+MxU32 g_unk0x1010215c = 0;
+
 // FUNCTION: LEGO1 0x100ba500
 MxDisplaySurface::MxDisplaySurface()
 {
@@ -248,9 +250,60 @@ undefined4 MxDisplaySurface::VTable0x34(undefined4, undefined4, undefined4, unde
 	return 0;
 }
 
-// STUB: LEGO1 0x100bba50
-void MxDisplaySurface::Display(undefined4, undefined4, undefined4, undefined4, undefined4, undefined4)
+// FUNCTION: LEGO1 0x100bba50
+void MxDisplaySurface::Display(MxS32 p_left, MxS32 p_top, MxS32 p_left2, MxS32 p_top2, MxS32 p_width, MxS32 p_height)
 {
+	if (m_videoParam.Flags().GetF2bit1()) {
+		if (m_videoParam.Flags().GetFlipSurfaces()) {
+			if (g_unk0x1010215c < 2) {
+				g_unk0x1010215c++;
+
+				DDSURFACEDESC ddsd;
+				memset(&ddsd, 0, sizeof(ddsd));
+				ddsd.dwSize = sizeof(ddsd);
+				if (m_ddSurface2->Lock(NULL, &ddsd, 1, NULL) == S_OK) {
+					MxU8* surface = (MxU8*) ddsd.lpSurface;
+					MxS32 height = m_videoParam.GetRect().GetHeight();
+
+					for (MxU32 i = 0; i < ddsd.dwHeight; i++) {
+						memset(surface, 0, ddsd.dwWidth * ddsd.ddpfPixelFormat.dwRGBBitCount / 8);
+						surface += ddsd.lPitch;
+					}
+
+					m_ddSurface2->Unlock(ddsd.lpSurface);
+				}
+				else {
+					OutputDebugString("MxDisplaySurface::Display error\n");
+				}
+			}
+			m_ddSurface1->Flip(NULL, 1);
+		}
+		else {
+			POINT point = {0, 0};
+			ClientToScreen(MxOmni::GetInstance()->GetWindowHandle(), &point);
+
+			// TODO: Match
+			RECT rect1, rect2;
+			rect1.left = p_left2 + m_videoParam.GetRect().GetLeft() + point.x;
+			rect2.left = p_left;
+			rect1.top = p_top2 + m_videoParam.GetRect().GetTop() + point.y;
+			rect2.right = p_left + p_width;
+			rect2.top = p_top;
+			rect2.bottom = p_top + p_height;
+			rect1.right = rect1.left + p_width;
+			rect1.bottom = rect1.top + p_height;
+
+			DDBLTFX data;
+			memset(&data, 0, sizeof(data));
+			data.dwSize = sizeof(data);
+			data.dwDDFX = 8;
+
+			if (m_ddSurface1->Blt(&rect1, m_ddSurface2, &rect2, 0, &data) == DDERR_SURFACELOST) {
+				m_ddSurface1->Restore();
+				m_ddSurface1->Blt(&rect1, m_ddSurface2, &rect2, 0, &data);
+			}
+		}
+	}
 }
 
 // FUNCTION: LEGO1 0x100bbc10
diff --git a/LEGO1/mxdisplaysurface.h b/LEGO1/mxdisplaysurface.h
index 3d386bb4..45714ce1 100644
--- a/LEGO1/mxdisplaysurface.h
+++ b/LEGO1/mxdisplaysurface.h
@@ -62,7 +62,7 @@ class MxDisplaySurface : public MxCore {
 		MxBool
 	);
 	virtual undefined4 VTable0x34(undefined4, undefined4, undefined4, undefined4, undefined4, undefined4);
-	virtual void Display(undefined4, undefined4, undefined4, undefined4, undefined4, undefined4);
+	virtual void Display(MxS32 p_left, MxS32 p_top, MxS32 p_left2, MxS32 p_top2, MxS32 p_width, MxS32 p_height);
 	virtual void GetDC(HDC* p_hdc);
 	virtual void ReleaseDC(HDC p_hdc);
 	virtual LPDIRECTDRAWSURFACE VTable0x44(MxBitmap*, undefined4*, undefined4, undefined4);

From 22d72893f926e5c997107ba88bbecc40438d2acc Mon Sep 17 00:00:00 2001
From: Misha <106913236+MishaProductions@users.noreply.github.com>
Date: Tue, 26 Dec 2023 17:42:29 -0500
Subject: [PATCH 014/210] Finish LegoEntityPresenter (#363)

* Lego entity implementation

* Finish LegoEntityPresenter::ReadyTickle

* Update legoentitypresenter.h

* use empty

* Formatting

---------

Co-authored-by: Christian Semmler <mail@csemmler.com>
---
 LEGO1/define.cpp              |  3 ++
 LEGO1/define.h                |  1 +
 LEGO1/legoentity.cpp          |  6 ++++
 LEGO1/legoentity.h            |  1 +
 LEGO1/legoentitypresenter.cpp | 56 +++++++++++++++++++++++++++++++++--
 LEGO1/legoentitypresenter.h   | 14 ++++++---
 LEGO1/mxdsaction.h            |  4 ++-
 LEGO1/mxpresenter.cpp         | 23 ++++++++++++++
 LEGO1/mxpresenter.h           |  2 ++
 9 files changed, 102 insertions(+), 8 deletions(-)

diff --git a/LEGO1/define.cpp b/LEGO1/define.cpp
index 31f1e521..acd811a8 100644
--- a/LEGO1/define.cpp
+++ b/LEGO1/define.cpp
@@ -19,6 +19,9 @@ const char* g_strWORLD = "WORLD";
 // GLOBAL: LEGO1 0x10101f20
 const char* g_strSOUND = "SOUND";
 
+// GLOBAL: LEGO1 0x10101f58
+const char* g_strOBJECT = "OBJECT";
+
 // GLOBAL: LEGO1 0x10102040
 const char* g_strACTION = "ACTION";
 
diff --git a/LEGO1/define.h b/LEGO1/define.h
index 82e93375..45a536a9 100644
--- a/LEGO1/define.h
+++ b/LEGO1/define.h
@@ -7,6 +7,7 @@ extern MxU32 g_mxcoreCount[101];
 extern const char* g_parseExtraTokens;
 extern const char* g_strWORLD;
 extern const char* g_strSOUND;
+extern const char* g_strOBJECT;
 extern const char* g_strACTION;
 extern const char* g_strVISIBILITY;
 
diff --git a/LEGO1/legoentity.cpp b/LEGO1/legoentity.cpp
index 26f9daab..0f813029 100644
--- a/LEGO1/legoentity.cpp
+++ b/LEGO1/legoentity.cpp
@@ -76,6 +76,12 @@ void LegoEntity::SetROI(LegoROI* p_roi, MxBool p_bool1, MxBool p_bool2)
 	// TODO
 }
 
+// STUB: LEGO1 0x100109b0
+void LegoEntity::SetLocation(Vector3Data& p_location, Vector3Data& p_direction, Vector3Data& p_up, MxBool)
+{
+	// TODO
+}
+
 // STUB: LEGO1 0x10010c30
 void LegoEntity::FUN_10010c30()
 {
diff --git a/LEGO1/legoentity.h b/LEGO1/legoentity.h
index cdee29c3..4d4c19b6 100644
--- a/LEGO1/legoentity.h
+++ b/LEGO1/legoentity.h
@@ -49,6 +49,7 @@ class LegoEntity : public MxEntity {
 	virtual void VTable0x4c();                                                        // vtable+0x4c
 
 	void FUN_10010c30();
+	void SetLocation(Vector3Data& p_location, Vector3Data& p_direction, Vector3Data& p_up, MxBool);
 
 protected:
 	void Init();
diff --git a/LEGO1/legoentitypresenter.cpp b/LEGO1/legoentitypresenter.cpp
index dc1a44eb..ea484cf1 100644
--- a/LEGO1/legoentitypresenter.cpp
+++ b/LEGO1/legoentitypresenter.cpp
@@ -1,5 +1,6 @@
 #include "legoentitypresenter.h"
 
+#include "islepathactor.h"
 #include "legoomni.h"
 #include "legovideomanager.h"
 
@@ -14,7 +15,7 @@ LegoEntityPresenter::LegoEntityPresenter()
 // FUNCTION: LEGO1 0x100535c0
 void LegoEntityPresenter::Init()
 {
-	m_unk0x4c = 0;
+	m_objectBackend = 0;
 }
 
 // FUNCTION: LEGO1 0x100535d0
@@ -24,9 +25,9 @@ LegoEntityPresenter::~LegoEntityPresenter()
 }
 
 // FUNCTION: LEGO1 0x10053630
-undefined4 LegoEntityPresenter::VTable0x6c(undefined4 p_unk0x4c)
+undefined4 LegoEntityPresenter::SetBackend(LegoEntity* p_backend)
 {
-	m_unk0x4c = p_unk0x4c;
+	m_objectBackend = p_backend;
 	return 0;
 }
 
@@ -45,3 +46,52 @@ void LegoEntityPresenter::Destroy()
 {
 	Destroy(FALSE);
 }
+
+// FUNCTION: LEGO1 0x10053680
+MxResult LegoEntityPresenter::StartAction(MxStreamController* p_controller, MxDSAction* p_action)
+{
+	MxResult result = MxCompositePresenter::StartAction(p_controller, p_action);
+
+	if (VideoManager()) {
+		VideoManager()->AddPresenter(*this);
+	}
+
+	return result;
+}
+
+// FUNCTION: LEGO1 0x100536c0
+void LegoEntityPresenter::ReadyTickle()
+{
+	if (GetCurrentWorld()) {
+		m_objectBackend = (LegoEntity*) MxPresenter::CreateEntityBackend("LegoEntity");
+		if (m_objectBackend) {
+			m_objectBackend->Create(*m_action);
+			m_objectBackend->SetLocation(m_action->GetLocation(), m_action->GetDirection(), m_action->GetUp(), TRUE);
+			ParseExtra();
+		}
+		m_previousTickleStates |= 1 << (unsigned char) m_currentTickleState;
+		m_currentTickleState = TickleState_Starting;
+	}
+}
+
+// FUNCTION: LEGO1 0x10053720
+void LegoEntityPresenter::RepeatingTickle()
+{
+	if (m_list.empty()) {
+		EndAction();
+	}
+}
+
+// FUNCTION: LEGO1 0x10053750
+void LegoEntityPresenter::ParseExtra()
+{
+	char data[512];
+	MxU16 len = m_action->GetExtraLength();
+	if (len) {
+		memcpy(data, m_action->GetExtraData(), len);
+		data[len] = 0;
+
+		len &= MAXWORD;
+		m_objectBackend->ParseAction(data);
+	}
+}
diff --git a/LEGO1/legoentitypresenter.h b/LEGO1/legoentitypresenter.h
index 9e072498..847a6b8f 100644
--- a/LEGO1/legoentitypresenter.h
+++ b/LEGO1/legoentitypresenter.h
@@ -3,6 +3,8 @@
 
 #include "mxcompositepresenter.h"
 
+class LegoEntity;
+
 // VTABLE: LEGO1 0x100d8398
 // SIZE 0x50
 class LegoEntityPresenter : public MxCompositePresenter {
@@ -23,14 +25,18 @@ class LegoEntityPresenter : public MxCompositePresenter {
 		return !strcmp(p_name, LegoEntityPresenter::ClassName()) || MxCompositePresenter::IsA(p_name);
 	}
 
-	virtual void Destroy() override;                     // vtable+0x38
-	virtual void Init();                                 // vtable+0x68
-	virtual undefined4 VTable0x6c(undefined4 p_unk0x4c); // vtable+0x6c
+	virtual void ReadyTickle() override;                                                           // vtable+0x18
+	virtual void RepeatingTickle();                                                                // vtable+0x24
+	virtual void ParseExtra();                                                                     // vtable+0x30
+	virtual void Destroy() override;                                                               // vtable+0x38
+	virtual MxResult StartAction(MxStreamController* p_controller, MxDSAction* p_action) override; // vtable+0x3c
+	virtual void Init();                                                                           // vtable+0x68
+	virtual undefined4 SetBackend(LegoEntity* p_unk0x4c);                                          // vtable+0x6c
 
 private:
 	void Destroy(MxBool p_fromDestructor);
 
-	undefined4 m_unk0x4c;
+	LegoEntity* m_objectBackend; // 0x4c
 };
 
 #endif // LEGOENTITYPRESENTER_H
diff --git a/LEGO1/mxdsaction.h b/LEGO1/mxdsaction.h
index eb70b18f..4898eb91 100644
--- a/LEGO1/mxdsaction.h
+++ b/LEGO1/mxdsaction.h
@@ -63,7 +63,9 @@ class MxDSAction : public MxDSObject {
 	inline MxLong GetStartTime() const { return m_startTime; }
 	inline MxS32 GetLoopCount() { return m_loopCount; }
 	inline void SetLoopCount(MxS32 p_loopCount) { m_loopCount = p_loopCount; }
-	inline const Vector3Data& GetLocation() const { return m_location; }
+	inline Vector3Data& GetLocation() { return m_location; }
+	inline Vector3Data& GetDirection() { return m_direction; }
+	inline Vector3Data& GetUp() { return m_up; }
 	inline MxCore* GetUnknown84() { return m_unk0x84; }
 	inline void SetUnknown84(MxCore* p_unk0x84) { m_unk0x84 = p_unk0x84; }
 	inline MxCore* GetOrigin() { return m_origin; }
diff --git a/LEGO1/mxpresenter.cpp b/LEGO1/mxpresenter.cpp
index 31279513..b2404439 100644
--- a/LEGO1/mxpresenter.cpp
+++ b/LEGO1/mxpresenter.cpp
@@ -2,12 +2,14 @@
 
 #include "decomp.h"
 #include "define.h"
+#include "legoobjectfactory.h"
 #include "legoomni.h"
 #include "mxactionnotificationparam.h"
 #include "mxautolocker.h"
 #include "mxcompositepresenter.h"
 #include "mxdsanim.h"
 #include "mxdssound.h"
+#include "mxentity.h"
 #include "mxnotificationmanager.h"
 #include "mxparam.h"
 #include "mxstreamer.h"
@@ -304,6 +306,27 @@ const char* PresenterNameDispatch(const MxDSAction& p_action)
 	return name;
 }
 
+// FUNCTION: LEGO1 0x100b5410
+MxEntity* MxPresenter::CreateEntityBackend(const char* p_name)
+{
+	char buffer[512];
+	char buffer2[512];
+	strcpy(buffer, p_name);
+
+	MxU16 extraLen = m_action->GetExtraLength();
+
+	buffer[0] = extraLen;
+	buffer[1] = extraLen >> 8;
+	if (extraLen) {
+		extraLen &= MAXWORD;
+		memcpy(buffer2 + 2, m_action->GetExtraData(), extraLen);
+		buffer2[extraLen + 2] = 0;
+		KeyValueStringParse(buffer, g_strOBJECT, buffer2 + 2);
+	}
+
+	return (MxEntity*) ObjectFactory()->Create(buffer);
+}
+
 // FUNCTION: LEGO1 0x100b54c0
 MxBool MxPresenter::IsEnabled()
 {
diff --git a/LEGO1/mxpresenter.h b/LEGO1/mxpresenter.h
index 160329c1..e0e91fe6 100644
--- a/LEGO1/mxpresenter.h
+++ b/LEGO1/mxpresenter.h
@@ -10,6 +10,7 @@
 
 class MxCompositePresenter;
 class MxStreamController;
+class MxEntity;
 
 // VTABLE: LEGO1 0x100d4d38
 // SIZE 0x40
@@ -65,6 +66,7 @@ class MxPresenter : public MxCore {
 	virtual MxBool IsHit(MxS32 p_x, MxS32 p_y);                                           // vtable+0x50
 	__declspec(dllexport) virtual void Enable(MxBool p_enable);                           // vtable+0x54
 
+	MxEntity* CreateEntityBackend(const char* p_name);
 	MxBool IsEnabled();
 
 	inline MxS32 GetCurrentTickleState() const { return this->m_currentTickleState; }

From 40d51659d3a25d5a9f2e334bd6a3701e818f3d68 Mon Sep 17 00:00:00 2001
From: Misha <106913236+MishaProductions@users.noreply.github.com>
Date: Tue, 26 Dec 2023 18:10:28 -0500
Subject: [PATCH 015/210] Add most of LegoObjectFactory (#365)

* push changes

* push changes

* fix

* Update legoracecar.h
---
 LEGO1/act3actor.h           |  2 +-
 LEGO1/lego3dwavepresenter.h |  4 +-
 LEGO1/legoact2.h            | 11 +++++
 LEGO1/legoobjectfactory.cpp | 97 ++++++++++++++++++++++++++++++++++++
 LEGO1/legoobjectfactory.h   | 98 ++++++++++++++++++++++++++++++++++++-
 LEGO1/legoracecar.h         | 25 ++++++++++
 LEGO1/pizzeria.h            |  6 +--
 7 files changed, 236 insertions(+), 7 deletions(-)
 create mode 100644 LEGO1/legoact2.h
 create mode 100644 LEGO1/legoracecar.h

diff --git a/LEGO1/act3actor.h b/LEGO1/act3actor.h
index ef756436..bfdf879a 100644
--- a/LEGO1/act3actor.h
+++ b/LEGO1/act3actor.h
@@ -3,7 +3,7 @@
 
 // FIXME: Uncertain location. There are three vtables which eventually call this
 //        class' ClassName() function, but none of them call it directly.
-class Act3Actor {
+class Act3Actor : public MxCore {
 public:
 	// FUNCTION: LEGO1 0x100431b0
 	inline virtual const char* ClassName() override
diff --git a/LEGO1/lego3dwavepresenter.h b/LEGO1/lego3dwavepresenter.h
index a2363518..ca72f212 100644
--- a/LEGO1/lego3dwavepresenter.h
+++ b/LEGO1/lego3dwavepresenter.h
@@ -1,11 +1,11 @@
 #ifndef LEGO3DWAVEPRESENTER_H
 #define LEGO3DWAVEPRESENTER_H
 
-#include "legowavepresenter.h"
+#include "mxwavepresenter.h"
 
 // VTABLE: LEGO1 0x100d52b0
 // SIZE 0xa0
-class Lego3DWavePresenter : public LegoWavePresenter {
+class Lego3DWavePresenter : public MxWavePresenter {
 public:
 	// FUNCTION: LEGO1 0x1000d890
 	inline virtual const char* ClassName() const override // vtable+0x0c
diff --git a/LEGO1/legoact2.h b/LEGO1/legoact2.h
new file mode 100644
index 00000000..b504c11c
--- /dev/null
+++ b/LEGO1/legoact2.h
@@ -0,0 +1,11 @@
+#ifndef LEGOACT2_H
+#define LEGOACT2_H
+
+#include "legocarraceactor.h"
+#include "legopathactor.h"
+
+// VTABLE: LEGO1 0x100d82e0
+// SIZE: 0x1154
+class LegoAct2 : public LegoWorld {};
+
+#endif // LEGOACT2_H
diff --git a/LEGO1/legoobjectfactory.cpp b/LEGO1/legoobjectfactory.cpp
index 2c77c7a9..ff52bad1 100644
--- a/LEGO1/legoobjectfactory.cpp
+++ b/LEGO1/legoobjectfactory.cpp
@@ -1,7 +1,104 @@
 #include "legoobjectfactory.h"
 
+#include "carrace.h"
 #include "decomp.h"
+#include "dunebuggy.h"
+#include "elevatorbottom.h"
+#include "gasstation.h"
+#include "gasstationstate.h"
+#include "helicopter.h"
+#include "helicopterstate.h"
+#include "historybook.h"
+#include "hospital.h"
+#include "hospitalstate.h"
+#include "infocenter.h"
+#include "infocenterdoor.h"
 #include "infocenterstate.h"
+#include "isle.h"
+#include "jetskirace.h"
+#include "lego3dwavepresenter.h"
+#include "legoact2.h"
+#include "legoact2state.h"
+#include "legoactioncontrolpresenter.h"
+#include "legoactor.h"
+#include "legoactorpresenter.h"
+#include "legoanimactor.h"
+#include "legoanimpresenter.h"
+#include "legocarbuild.h"
+#include "legocarbuildanimpresenter.h"
+#include "legocarraceactor.h"
+#include "legoentity.h"
+#include "legoentitypresenter.h"
+#include "legoflctexturepresenter.h"
+#include "legohideanimpresenter.h"
+#include "legojetski.h"
+#include "legojetskiraceactor.h"
+#include "legoloadcachesoundpresenter.h"
+#include "legolocomotionanimpresenter.h"
+#include "legoloopinganimpresenter.h"
+#include "legomodelpresenter.h"
+#include "legopalettepresenter.h"
+#include "legopartpresenter.h"
+#include "legopathactor.h"
+#include "legopathpresenter.h"
+#include "legophonemepresenter.h"
+#include "legoracecar.h"
+#include "legotexturepresenter.h"
+#include "legoworld.h"
+#include "legoworldpresenter.h"
+#include "mxcontrolpresenter.h"
+#include "mxvideopresenter.h"
+#include "pizza.h"
+#include "pizzamissionstate.h"
+#include "police.h"
+#include "policestate.h"
+#include "registrationbook.h"
+#include "score.h"
+#include "scorestate.h"
+#include "skateboard.h"
+// #include "act2actor.h"
+#include "act2brick.h"
+// #include "act2genactor.h"
+#include "act2policestation.h"
+#include "act3.h"
+#include "act3state.h"
+#include "ambulance.h"
+#include "ambulancemissionstate.h"
+#include "bike.h"
+#include "doors.h"
+#include "jetski.h"
+#include "legoanimmmpresenter.h"
+#include "motorcycle.h"
+#include "racecar.h"
+#include "towtrack.h"
+#include "towtrackmissionstate.h"
+// #include "act3cop.h"
+// #include "act3brickster.h"
+#include "act1state.h"
+#include "act3actor.h"
+#include "act3shark.h"
+#include "beachhouseentity.h"
+#include "bumpbouy.h"
+#include "carracestate.h"
+#include "gasstationentity.h"
+#include "hospitalentity.h"
+#include "infocenterentity.h"
+#include "jetskiracestate.h"
+#include "jukeboxentity.h"
+#include "pizzeria.h"
+#include "pizzeriastate.h"
+#include "policeentity.h"
+#include "racestandsentity.h"
+#include "radiostate.h"
+// #include "caveentity.h"
+// #include "jailentity.h"
+#include "jukebox.h"
+#include "jukeboxstate.h"
+#include "mxcompositemediapresenter.h"
+// #include "raceskel.h"
+#include "animstate.h"
+
+// TODO: Before HospitalState, add all of the different LegoVehicleBuildState's
 
 // TODO: Uncomment once we have all the relevant types ready
 // DECOMP_SIZE_ASSERT(LegoObjectFactory, 0x1c8);
diff --git a/LEGO1/legoobjectfactory.h b/LEGO1/legoobjectfactory.h
index 82117d34..3a575c52 100644
--- a/LEGO1/legoobjectfactory.h
+++ b/LEGO1/legoobjectfactory.h
@@ -3,7 +3,103 @@
 
 #include "mxobjectfactory.h"
 
-#define FOR_LEGOOBJECTFACTORY_OBJECTS(X) X(InfocenterState)
+#define FOR_LEGOOBJECTFACTORY_OBJECTS(X)                                                                               \
+	X(LegoModelPresenter)                                                                                              \
+	X(LegoTexturePresenter)                                                                                            \
+	X(LegoPhonemePresenter)                                                                                            \
+	X(LegoFlcTexturePresenter)                                                                                         \
+	X(LegoEntityPresenter)                                                                                             \
+	X(LegoActorPresenter)                                                                                              \
+	X(LegoWorldPresenter)                                                                                              \
+	X(LegoWorld)                                                                                                       \
+	X(LegoPalettePresenter)                                                                                            \
+	X(LegoPathPresenter)                                                                                               \
+	X(LegoAnimPresenter)                                                                                               \
+	X(LegoLoopingAnimPresenter)                                                                                        \
+	X(LegoLocomotionAnimPresenter)                                                                                     \
+	X(LegoHideAnimPresenter)                                                                                           \
+	X(LegoPartPresenter)                                                                                               \
+	X(LegoCarBuildAnimPresenter)                                                                                       \
+	X(LegoActionControlPresenter)                                                                                      \
+	X(MxVideoPresenter)                                                                                                \
+	X(LegoLoadCacheSoundPresenter)                                                                                     \
+	X(Lego3DWavePresenter)                                                                                             \
+	X(LegoActor)                                                                                                       \
+	X(LegoPathActor)                                                                                                   \
+	X(LegoRaceCar)                                                                                                     \
+	X(LegoJetski)                                                                                                      \
+	/*X(JetskiRace) \*/                                                                                                \
+	X(LegoEntity)                                                                                                      \
+	X(LegoCarRaceActor)                                                                                                \
+	X(LegoJetskiRaceActor)                                                                                             \
+	X(LegoCarBuild)                                                                                                    \
+	X(Infocenter)                                                                                                      \
+	X(LegoAnimActor)                                                                                                   \
+	X(MxControlPresenter)                                                                                              \
+	X(RegistrationBook)                                                                                                \
+	X(HistoryBook)                                                                                                     \
+	X(ElevatorBottom)                                                                                                  \
+	X(InfocenterDoor)                                                                                                  \
+	X(Score)                                                                                                           \
+	X(ScoreState)                                                                                                      \
+	X(Hospital)                                                                                                        \
+	X(Isle)                                                                                                            \
+	X(Police)                                                                                                          \
+	X(GasStation)                                                                                                      \
+	X(LegoAct2)                                                                                                        \
+	X(LegoAct2State)                                                                                                   \
+	/*X(CarRace)*/                                                                                                     \
+	X(HospitalState)                                                                                                   \
+	X(InfocenterState)                                                                                                 \
+	X(PoliceState)                                                                                                     \
+	X(GasStationState)                                                                                                 \
+	X(SkateBoard)                                                                                                      \
+	X(Helicopter)                                                                                                      \
+	X(HelicopterState)                                                                                                 \
+	X(DuneBuggy)                                                                                                       \
+	X(Pizza)                                                                                                           \
+	X(PizzaMissionState)                                                                                               \
+	/*X(Act2Actor)*/                                                                                                   \
+	/*X(Act2Brick)*/                                                                                                   \
+	/*X(Act2GenActor)*/                                                                                                \
+	X(Act2PoliceStation)                                                                                               \
+	X(Act3)                                                                                                            \
+	X(Act3State)                                                                                                       \
+	X(Doors)                                                                                                           \
+	X(LegoAnimMMPresenter)                                                                                             \
+	X(RaceCar)                                                                                                         \
+	X(Jetski)                                                                                                          \
+	X(Bike)                                                                                                            \
+	X(Motorcycle)                                                                                                      \
+	X(Ambulance)                                                                                                       \
+	X(AmbulanceMissionState)                                                                                           \
+	X(TowTrack)                                                                                                        \
+	X(TowTrackMissionState)                                                                                            \
+	/*X(Act3Cop)*/                                                                                                     \
+	/*X(Act3Brickster)*/                                                                                               \
+	X(Act3Shark)                                                                                                       \
+	X(BumpBouy)                                                                                                        \
+	X(Act3Actor)                                                                                                       \
+	X(JetskiRaceState)                                                                                                 \
+	X(CarRaceState)                                                                                                    \
+	X(Act1State)                                                                                                       \
+	X(Pizzeria)                                                                                                        \
+	X(PizzeriaState)                                                                                                   \
+	X(InfoCenterEntity)                                                                                                \
+	X(HospitalEntity)                                                                                                  \
+	X(GasStationEntity)                                                                                                \
+	X(PoliceEntity)                                                                                                    \
+	X(BeachHouseEntity)                                                                                                \
+	X(RaceStandsEntity)                                                                                                \
+	X(JukeBoxEntity)                                                                                                   \
+	X(RadioState)                                                                                                      \
+	/*X(CaveEntity)*/                                                                                                  \
+	/*X(JailEntity)*/                                                                                                  \
+	X(MxCompositeMediaPresenter)                                                                                       \
+	X(JukeBox)                                                                                                         \
+	X(JukeBoxState)                                                                                                    \
+	/*X(RaceSkel)*/                                                                                                    \
+	X(AnimState)
 
 // VTABLE: LEGO1 0x100d4768
 class LegoObjectFactory : public MxObjectFactory {
diff --git a/LEGO1/legoracecar.h b/LEGO1/legoracecar.h
new file mode 100644
index 00000000..38099af2
--- /dev/null
+++ b/LEGO1/legoracecar.h
@@ -0,0 +1,25 @@
+#ifndef LEGOCARRACE_H
+#define LEGOCARRACE_H
+
+#include "legocarraceactor.h"
+#include "legopathactor.h"
+
+// VTABLE: LEGO1 0x100d58b8
+// SIZE: 0x200
+class LegoRaceCar : public LegoCarRaceActor {
+public:
+	// FUNCTION: LEGO1 0x10014290
+	inline const char* ClassName() const override // vtable+0xc
+	{
+		// GLOBAL: LEGO1 0x100f0548
+		return "LegoRaceCar";
+	}
+
+	// FUNCTION: LEGO1 0x100142b0
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
+	{
+		return !strcmp(p_name, LegoCarRaceActor::ClassName()) || LegoCarRaceActor::IsA(p_name);
+	}
+};
+
+#endif // LEGOCARRACE_H
diff --git a/LEGO1/pizzeria.h b/LEGO1/pizzeria.h
index 65a3b195..b9fcadf3 100644
--- a/LEGO1/pizzeria.h
+++ b/LEGO1/pizzeria.h
@@ -1,5 +1,5 @@
-#ifndef PIZZERIASTATE_H
-#define PIZZERIASTATE_H
+#ifndef PIZZERIA_H
+#define PIZZERIA_H
 
 #include "isleactor.h"
 
@@ -21,4 +21,4 @@ class Pizzeria : public IsleActor {
 	}
 };
 
-#endif // PIZZERIASTATE_H
+#endif // PIZZERIA_H

From b35a121ee2ad19f59f2965e7ce7a0d9a97c1e717 Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Tue, 26 Dec 2023 19:44:55 -0500
Subject: [PATCH 016/210] Fix LegoModelPresenter::IsA

---
 LEGO1/legomodelpresenter.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LEGO1/legomodelpresenter.h b/LEGO1/legomodelpresenter.h
index b529fede..df9cbba1 100644
--- a/LEGO1/legomodelpresenter.h
+++ b/LEGO1/legomodelpresenter.h
@@ -19,7 +19,7 @@ class LegoModelPresenter : public MxVideoPresenter {
 	// FUNCTION: LEGO1 0x1000ccc0
 	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
-		return !strcmp(p_name, LegoModelPresenter::ClassName()) || MxVideoPresenter::IsA(p_name);
+		return !strcmp(p_name, ClassName()) || MxVideoPresenter::IsA(p_name);
 	}
 };
 

From 59d999f6dcfa225f4f6291566afa333835c1e542 Mon Sep 17 00:00:00 2001
From: Misha <106913236+MishaProductions@users.noreply.github.com>
Date: Tue, 26 Dec 2023 19:45:48 -0500
Subject: [PATCH 017/210] LegoWorldPresenter vtables (#366)

* Legoworld vtables

* fixes

* fix

* formatting

---------

Co-authored-by: Christian Semmler <mail@csemmler.com>
---
 LEGO1/legoentitypresenter.cpp |  8 +++++++
 LEGO1/legoentitypresenter.h   |  3 +++
 LEGO1/legoomni.cpp            |  6 ++++++
 LEGO1/legoomni.h              |  1 +
 LEGO1/legoworldpresenter.cpp  | 39 +++++++++++++++++++++++++++++++++++
 LEGO1/legoworldpresenter.h    |  6 ++++++
 6 files changed, 63 insertions(+)

diff --git a/LEGO1/legoentitypresenter.cpp b/LEGO1/legoentitypresenter.cpp
index ea484cf1..7a586c80 100644
--- a/LEGO1/legoentitypresenter.cpp
+++ b/LEGO1/legoentitypresenter.cpp
@@ -82,6 +82,14 @@ void LegoEntityPresenter::RepeatingTickle()
 	}
 }
 
+// FUNCTION: LEGO1 0x10053730
+void LegoEntityPresenter::SetBackendLocation(Vector3Data& p_location, Vector3Data& p_direction, Vector3Data& p_up)
+{
+	if (m_objectBackend) {
+		m_objectBackend->SetLocation(p_location, p_direction, p_up, TRUE);
+	}
+}
+
 // FUNCTION: LEGO1 0x10053750
 void LegoEntityPresenter::ParseExtra()
 {
diff --git a/LEGO1/legoentitypresenter.h b/LEGO1/legoentitypresenter.h
index 847a6b8f..994e5a79 100644
--- a/LEGO1/legoentitypresenter.h
+++ b/LEGO1/legoentitypresenter.h
@@ -33,9 +33,12 @@ class LegoEntityPresenter : public MxCompositePresenter {
 	virtual void Init();                                                                           // vtable+0x68
 	virtual undefined4 SetBackend(LegoEntity* p_unk0x4c);                                          // vtable+0x6c
 
+	void SetBackendLocation(Vector3Data& p_location, Vector3Data& p_direction, Vector3Data& p_up);
+
 private:
 	void Destroy(MxBool p_fromDestructor);
 
+protected:
 	LegoEntity* m_objectBackend; // 0x4c
 };
 
diff --git a/LEGO1/legoomni.cpp b/LEGO1/legoomni.cpp
index cd3438a7..8c9e5905 100644
--- a/LEGO1/legoomni.cpp
+++ b/LEGO1/legoomni.cpp
@@ -568,6 +568,12 @@ LegoOmni* LegoOmni::GetInstance()
 	return (LegoOmni*) MxOmni::GetInstance();
 }
 
+// FUNCTION: LEGO1 0x1005ad20
+void LegoOmni::AddWorld(LegoWorld* p_world)
+{
+	m_worldList->Append(p_world);
+}
+
 // STUB: LEGO1 0x1005af10
 void LegoOmni::RemoveWorld(const MxAtomId&, MxLong)
 {
diff --git a/LEGO1/legoomni.h b/LEGO1/legoomni.h
index 69f6964a..81c3d6f1 100644
--- a/LEGO1/legoomni.h
+++ b/LEGO1/legoomni.h
@@ -98,6 +98,7 @@ class LegoOmni : public MxOmni {
 	virtual void StopTimer() override;                                                                  // vtable+3c
 
 	LegoEntity* FindByEntityIdOrAtomId(const MxAtomId& p_atom, MxS32 p_entityid);
+	void AddWorld(LegoWorld* p_world);
 
 	LegoVideoManager* GetVideoManager() { return (LegoVideoManager*) m_videoManager; }
 	LegoSoundManager* GetSoundManager() { return (LegoSoundManager*) m_soundManager; }
diff --git a/LEGO1/legoworldpresenter.cpp b/LEGO1/legoworldpresenter.cpp
index 9cd12880..52e99926 100644
--- a/LEGO1/legoworldpresenter.cpp
+++ b/LEGO1/legoworldpresenter.cpp
@@ -1,5 +1,8 @@
 #include "legoworldpresenter.h"
 
+#include "legoentity.h"
+#include "legoomni.h"
+
 // GLOBAL: LEGO1 0x100f75d4
 undefined4 g_legoWorldPresenterQuality = 1;
 
@@ -20,3 +23,39 @@ LegoWorldPresenter::~LegoWorldPresenter()
 {
 	// TODO
 }
+
+// STUB: LEGO1 0x10066870
+MxResult LegoWorldPresenter::StartAction(MxStreamController* p_controller, MxDSAction* p_action)
+{
+	return FAILURE;
+}
+
+// FUNCTION: LEGO1 0x10066a50
+void LegoWorldPresenter::ReadyTickle()
+{
+	m_objectBackend = (LegoEntity*) MxPresenter::CreateEntityBackend("LegoWorld");
+	if (m_objectBackend) {
+		m_objectBackend->Create(*m_action);
+		Lego()->AddWorld((LegoWorld*) m_objectBackend);
+		SetBackendLocation(m_action->GetLocation(), m_action->GetDirection(), m_action->GetUp());
+	}
+
+	ParseExtra();
+	m_previousTickleStates |= 1 << (unsigned char) m_currentTickleState;
+	m_currentTickleState = TickleState_Starting;
+}
+
+// STUB: LEGO1 0x10066ac0
+void LegoWorldPresenter::StartingTickle()
+{
+}
+
+// STUB: LEGO1 0x10067a70
+void LegoWorldPresenter::VTable0x60(MxPresenter* p_presenter)
+{
+}
+
+// STUB: LEGO1 0x10067b00
+void LegoWorldPresenter::ParseExtra()
+{
+}
diff --git a/LEGO1/legoworldpresenter.h b/LEGO1/legoworldpresenter.h
index bcae2f5e..3cd02a8f 100644
--- a/LEGO1/legoworldpresenter.h
+++ b/LEGO1/legoworldpresenter.h
@@ -25,6 +25,12 @@ class LegoWorldPresenter : public LegoEntityPresenter {
 		return !strcmp(p_name, LegoWorldPresenter::ClassName()) || LegoEntityPresenter::IsA(p_name);
 	}
 
+	virtual void ReadyTickle() override;                                                           // vtable+0x18
+	virtual void StartingTickle() override;                                                        // vtable+0x1c
+	virtual void ParseExtra() override;                                                            // vtable+0x30
+	virtual MxResult StartAction(MxStreamController* p_controller, MxDSAction* p_action) override; // vtable+0x3c
+	virtual void VTable0x60(MxPresenter* p_presenter) override;                                    // vtable+0x60
+
 private:
 	undefined4 m_unk0x50;
 };

From cfe28a2b26fa6c10d2e2de3ea65900c50b51da4d Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Tue, 26 Dec 2023 20:33:53 -0500
Subject: [PATCH 018/210] Implement/match MxStreamController::FUN_100c1f00
 (#367)

---
 LEGO1/mxdschunk.h            | 10 +++++-----
 LEGO1/mxstreamcontroller.cpp | 31 ++++++++++++++++++++++++++++---
 2 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/LEGO1/mxdschunk.h b/LEGO1/mxdschunk.h
index ec4a8cbe..70209596 100644
--- a/LEGO1/mxdschunk.h
+++ b/LEGO1/mxdschunk.h
@@ -56,11 +56,11 @@ class MxDSChunk : public MxCore {
 	}
 
 protected:
-	MxU16 m_flags;         // 0x8
-	undefined4 m_objectId; // 0xc
-	MxLong m_time;         // 0x10
-	MxU32 m_length;        // 0x14
-	MxU8* m_data;          // 0x18
+	MxU16 m_flags;    // 0x8
+	MxU32 m_objectId; // 0xc
+	MxLong m_time;    // 0x10
+	MxU32 m_length;   // 0x14
+	MxU8* m_data;     // 0x18
 };
 
 #endif // MXDSCHUNK_H
diff --git a/LEGO1/mxstreamcontroller.cpp b/LEGO1/mxstreamcontroller.cpp
index 726a8fa1..02d43a01 100644
--- a/LEGO1/mxstreamcontroller.cpp
+++ b/LEGO1/mxstreamcontroller.cpp
@@ -3,6 +3,7 @@
 #include "legoomni.h"
 #include "legoutil.h"
 #include "mxautolocker.h"
+#include "mxdsmultiaction.h"
 #include "mxdsstreamingaction.h"
 #include "mxnextactiondatastart.h"
 #include "mxstl/stlcompat.h"
@@ -252,11 +253,35 @@ MxPresenter* MxStreamController::FUN_100c1e70(MxDSAction& p_action)
 	return result;
 }
 
-// STUB: LEGO1 0x100c1f00
+// FUNCTION: LEGO1 0x100c1f00
 MxResult MxStreamController::FUN_100c1f00(MxDSAction* p_action)
 {
-	// TODO
-	return FAILURE;
+	MxAutoLocker lock(&m_criticalSection);
+
+	MxU32 objectId = p_action->GetObjectId();
+	MxStreamChunk* chunk = new MxStreamChunk;
+
+	if (!chunk)
+		return FAILURE;
+
+	chunk->SetFlags(MxDSChunk::Flag_Bit3);
+	chunk->SetObjectId(objectId);
+
+	if (chunk->SendChunk(m_subscriberList, FALSE, p_action->GetUnknown24()) != SUCCESS)
+		delete chunk;
+
+	if (p_action->IsA("MxDSMultiAction")) {
+		MxDSActionList* actions = ((MxDSMultiAction*) p_action)->GetActionList();
+		MxDSActionListCursor cursor(actions);
+		MxDSAction* action;
+
+		while (cursor.Next(action)) {
+			if (FUN_100c1f00(action) != SUCCESS)
+				return FAILURE;
+		}
+	}
+
+	return SUCCESS;
 }
 
 // STUB: LEGO1 0x100c20b0

From 88d267f9f3be197110c45ca73f0f7b8bdd77fb92 Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Tue, 26 Dec 2023 20:39:48 -0500
Subject: [PATCH 019/210] Implement/match
 MxStreamController::FindNextActionDataStartFromStreamingAction (#368)

* Implement/match MxStreamController::FUN_100c1f00

* Implement/match MxStreamController::FindNextActionDataStartFromStreamingAction
---
 LEGO1/mxstreamcontroller.cpp |  6 +++---
 LEGO1/mxstreamlist.cpp       | 13 ++++++++++++-
 LEGO1/mxstreamlist.h         |  3 ++-
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/LEGO1/mxstreamcontroller.cpp b/LEGO1/mxstreamcontroller.cpp
index 02d43a01..74df9dc9 100644
--- a/LEGO1/mxstreamcontroller.cpp
+++ b/LEGO1/mxstreamcontroller.cpp
@@ -215,7 +215,7 @@ MxResult MxStreamController::VTable0x30(MxDSAction* p_action)
 	MxResult result = FAILURE;
 	MxDSAction* action = m_unk0x3c.Find(p_action, TRUE);
 	if (action != NULL) {
-		MxNextActionDataStart* data = m_nextActionList.Find(action->GetObjectId(), action->GetUnknown24());
+		MxNextActionDataStart* data = m_nextActionList.FindAndErase(action->GetObjectId(), action->GetUnknown24());
 		delete action;
 		delete data;
 		result = SUCCESS;
@@ -284,10 +284,10 @@ MxResult MxStreamController::FUN_100c1f00(MxDSAction* p_action)
 	return SUCCESS;
 }
 
-// STUB: LEGO1 0x100c20b0
+// FUNCTION: LEGO1 0x100c20b0
 MxNextActionDataStart* MxStreamController::FindNextActionDataStartFromStreamingAction(MxDSStreamingAction* p_action)
 {
-	return NULL;
+	return m_nextActionList.Find(p_action->GetObjectId(), p_action->GetUnknown24());
 }
 
 // STUB: LEGO1 0x100c20d0
diff --git a/LEGO1/mxstreamlist.cpp b/LEGO1/mxstreamlist.cpp
index 1fa4dd48..d422c1cb 100644
--- a/LEGO1/mxstreamlist.cpp
+++ b/LEGO1/mxstreamlist.cpp
@@ -30,8 +30,19 @@ MxDSAction* MxStreamListMxDSAction::Find(MxDSAction* p_action, MxBool p_delete)
 	return found;
 }
 
-// FUNCTION: LEGO1 0x100c2240
+// FUNCTION: LEGO1 0x100c21e0
 MxNextActionDataStart* MxStreamListMxNextActionDataStart::Find(MxU32 p_id, MxS16 p_value)
+{
+	for (iterator it = begin(); it != end(); it++) {
+		if (p_id == (*it)->GetObjectId() && p_value == (*it)->GetUnknown24())
+			return *it;
+	}
+
+	return NULL;
+}
+
+// FUNCTION: LEGO1 0x100c2240
+MxNextActionDataStart* MxStreamListMxNextActionDataStart::FindAndErase(MxU32 p_id, MxS16 p_value)
 {
 	MxNextActionDataStart* match = NULL;
 
diff --git a/LEGO1/mxstreamlist.h b/LEGO1/mxstreamlist.h
index 6aa63de0..86b9a002 100644
--- a/LEGO1/mxstreamlist.h
+++ b/LEGO1/mxstreamlist.h
@@ -41,7 +41,8 @@ class MxStreamListMxDSAction : public MxStreamList<MxDSAction*> {
 // SIZE 0xc
 class MxStreamListMxNextActionDataStart : public MxStreamList<MxNextActionDataStart*> {
 public:
-	MxNextActionDataStart* Find(MxU32, MxS16);
+	MxNextActionDataStart* Find(MxU32 p_id, MxS16 p_value);
+	MxNextActionDataStart* FindAndErase(MxU32 p_id, MxS16 p_value);
 };
 
 // SIZE 0xc

From 6e947c3789021d87797c4c3ee3fba3eb4977cb71 Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Tue, 26 Dec 2023 20:54:17 -0500
Subject: [PATCH 020/210] Implement/match MxStreamController::FUN_100c20d0
 (#369)

* Implement/match MxStreamController::FUN_100c1f00

* Implement/match MxStreamController::FUN_100c20d0
---
 LEGO1/mxstreamcontroller.cpp | 17 +++++++++++++++--
 LEGO1/mxstreamlist.cpp       | 14 ++++++++++++++
 LEGO1/mxstreamlist.h         |  5 ++++-
 3 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/LEGO1/mxstreamcontroller.cpp b/LEGO1/mxstreamcontroller.cpp
index 74df9dc9..e45435ac 100644
--- a/LEGO1/mxstreamcontroller.cpp
+++ b/LEGO1/mxstreamcontroller.cpp
@@ -290,9 +290,22 @@ MxNextActionDataStart* MxStreamController::FindNextActionDataStartFromStreamingA
 	return m_nextActionList.Find(p_action->GetObjectId(), p_action->GetUnknown24());
 }
 
-// STUB: LEGO1 0x100c20d0
+// FUNCTION: LEGO1 0x100c20d0
 MxBool MxStreamController::FUN_100c20d0(MxDSObject& p_obj)
 {
-	// TODO
+	if (m_subscriberList.Find(&p_obj))
+		return FALSE;
+
+	if (p_obj.IsA("MxDSMultiAction")) {
+		MxDSActionList* actions = ((MxDSMultiAction&) p_obj).GetActionList();
+		MxDSActionListCursor cursor(actions);
+		MxDSAction* action;
+
+		while (cursor.Next(action)) {
+			if (!FUN_100c20d0(*action))
+				return FALSE;
+		}
+	}
+
 	return TRUE;
 }
diff --git a/LEGO1/mxstreamlist.cpp b/LEGO1/mxstreamlist.cpp
index d422c1cb..729b0d7b 100644
--- a/LEGO1/mxstreamlist.cpp
+++ b/LEGO1/mxstreamlist.cpp
@@ -5,6 +5,20 @@ DECOMP_SIZE_ASSERT(MxStreamListMxDSAction, 0xc);
 DECOMP_SIZE_ASSERT(MxStreamListMxNextActionDataStart, 0xc);
 DECOMP_SIZE_ASSERT(MxStreamListMxDSSubscriber, 0xc);
 
+// FUNCTION: LEGO1 0x100b8450
+MxDSSubscriber* MxStreamListMxDSSubscriber::Find(MxDSObject* p_object)
+{
+	for (iterator it = begin(); it != end(); it++) {
+		if (p_object->GetObjectId() == -1 || p_object->GetObjectId() == (*it)->GetObjectId()) {
+			if (p_object->GetUnknown24() == -2 || p_object->GetUnknown24() == (*it)->GetUnknown48()) {
+				return *it;
+			}
+		}
+	}
+
+	return NULL;
+}
+
 // FUNCTION: LEGO1 0x100bfa80
 MxDSAction* MxStreamListMxDSAction::Find(MxDSAction* p_action, MxBool p_delete)
 {
diff --git a/LEGO1/mxstreamlist.h b/LEGO1/mxstreamlist.h
index 86b9a002..f9164bfb 100644
--- a/LEGO1/mxstreamlist.h
+++ b/LEGO1/mxstreamlist.h
@@ -46,6 +46,9 @@ class MxStreamListMxNextActionDataStart : public MxStreamList<MxNextActionDataSt
 };
 
 // SIZE 0xc
-class MxStreamListMxDSSubscriber : public MxStreamList<MxDSSubscriber*> {};
+class MxStreamListMxDSSubscriber : public MxStreamList<MxDSSubscriber*> {
+public:
+	MxDSSubscriber* Find(MxDSObject* p_object);
+};
 
 #endif // MXSTREAMLIST_H

From ac6eb28dc4d956b6e85921be335e47dacaad2424 Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Tue, 26 Dec 2023 21:17:20 -0500
Subject: [PATCH 021/210] Implement/match MxStreamer::DeleteObject (#370)

---
 LEGO1/mxstreamer.cpp | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/LEGO1/mxstreamer.cpp b/LEGO1/mxstreamer.cpp
index c35a4e8f..1688c1b8 100644
--- a/LEGO1/mxstreamer.cpp
+++ b/LEGO1/mxstreamer.cpp
@@ -142,7 +142,7 @@ MxResult MxStreamer::FUN_100b99b0(MxDSAction* p_action)
 	return FAILURE;
 }
 
-// STUB: LEGO1 0x100b99f0
+// FUNCTION: LEGO1 0x100b99f0
 MxResult MxStreamer::DeleteObject(MxDSAction* p_dsAction)
 {
 	MxDSAction tempAction;
@@ -156,8 +156,16 @@ MxResult MxStreamer::DeleteObject(MxDSAction* p_dsAction)
 		tempAction.SetUnknown24(p_dsAction->GetUnknown24());
 	}
 
-	// TODO: remove action from list
-	return FAILURE;
+	MxResult result = FAILURE;
+	for (list<MxStreamController*>::iterator it = m_openStreams.begin(); it != m_openStreams.end(); it++) {
+		const char* id = p_dsAction->GetAtomId().GetInternal();
+		if (!id || id == (*it)->GetAtom().GetInternal()) {
+			tempAction.SetAtomId((*it)->GetAtom());
+			result = (*it)->VTable0x24(&tempAction);
+		}
+	}
+
+	return result;
 }
 
 // FUNCTION: LEGO1 0x100b9b30

From 5a1ba0277273e07147649bda9f6edddecae84b38 Mon Sep 17 00:00:00 2001
From: Misha <106913236+MishaProductions@users.noreply.github.com>
Date: Wed, 27 Dec 2023 10:31:06 -0500
Subject: [PATCH 022/210] implement LegoWorldPresenter::StartAction (#371)

---
 LEGO1/legoworldpresenter.cpp | 58 ++++++++++++++++++++++++++++++++++--
 1 file changed, 56 insertions(+), 2 deletions(-)

diff --git a/LEGO1/legoworldpresenter.cpp b/LEGO1/legoworldpresenter.cpp
index 52e99926..7a17ad7a 100644
--- a/LEGO1/legoworldpresenter.cpp
+++ b/LEGO1/legoworldpresenter.cpp
@@ -2,6 +2,14 @@
 
 #include "legoentity.h"
 #include "legoomni.h"
+#include "legovideomanager.h"
+#include "mxactionnotificationparam.h"
+#include "mxautolocker.h"
+#include "mxdsactionlist.h"
+#include "mxdsmultiaction.h"
+#include "mxobjectfactory.h"
+#include "mxpresenter.h"
+#include "mxstl/stlcompat.h"
 
 // GLOBAL: LEGO1 0x100f75d4
 undefined4 g_legoWorldPresenterQuality = 1;
@@ -24,10 +32,56 @@ LegoWorldPresenter::~LegoWorldPresenter()
 	// TODO
 }
 
-// STUB: LEGO1 0x10066870
+// FUNCTION: LEGO1 0x10066870
 MxResult LegoWorldPresenter::StartAction(MxStreamController* p_controller, MxDSAction* p_action)
 {
-	return FAILURE;
+	MxAutoLocker lock(&m_criticalSection);
+
+	MxResult result = FAILURE;
+	MxDSActionList* actions = ((MxDSMultiAction*) p_action)->GetActionList();
+	MxObjectFactory* factory = ObjectFactory();
+	MxDSActionListCursor cursor(actions);
+	MxDSAction* action;
+
+	if (MxPresenter::StartAction(p_controller, p_action) == SUCCESS) {
+		// The usual cursor.Next() loop doesn't match here, even though
+		// the logic is the same. It does match when "deconstructed" into
+		// the following Head(), Current() and NextFragment() calls,
+		// but this seems unlikely to be the original code.
+		// The alpha debug build also uses Next().
+		cursor.Head();
+		while (cursor.Current(action)) {
+			cursor.NextFragment();
+
+			MxBool success = FALSE;
+
+			action->CopyFlags(m_action->GetFlags());
+
+			const char* presenterName = PresenterNameDispatch(*action);
+			MxPresenter* presenter = (MxPresenter*) factory->Create(presenterName);
+
+			if (presenter && presenter->AddToManager() == SUCCESS) {
+				presenter->SetCompositePresenter(this);
+				if (presenter->StartAction(p_controller, action) == SUCCESS) {
+					presenter->SetTickleState(TickleState_Idle);
+					success = TRUE;
+				}
+			}
+
+			if (success) {
+				action->SetOrigin(this);
+				m_list.push_back(presenter);
+			}
+			else if (presenter)
+				delete presenter;
+		}
+
+		VideoManager()->AddPresenter(*this);
+
+		result = SUCCESS;
+	}
+
+	return result;
 }
 
 // FUNCTION: LEGO1 0x10066a50

From f1f6743d08d654b106750dc45d0ec273b8882d4d Mon Sep 17 00:00:00 2001
From: Joshua Peisach <itzswirlz2020@outlook.com>
Date: Wed, 27 Dec 2023 13:27:02 -0500
Subject: [PATCH 023/210] CarRace ctor (#372)

* CarRace ctor

* Fixes

---------

Co-authored-by: Christian Semmler <mail@csemmler.com>
---
 LEGO1/carrace.cpp |  7 +++++--
 LEGO1/carrace.h   |  5 +++++
 LEGO1/legorace.h  | 37 +++++++++++++++++++++----------------
 3 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/LEGO1/carrace.cpp b/LEGO1/carrace.cpp
index 6da96168..9fdb353f 100644
--- a/LEGO1/carrace.cpp
+++ b/LEGO1/carrace.cpp
@@ -1,7 +1,10 @@
 #include "carrace.h"
 
-// STUB: LEGO1 0x10016a90
+DECOMP_SIZE_ASSERT(CarRace, 0x154);
+
+// FUNCTION: LEGO1 0x10016a90
 CarRace::CarRace()
 {
-	// TODO
+	this->m_unk0x150 = 0;
+	this->m_unk0x130 = MxRect32(0x16c, 0x154, 0x1ec, 0x15e);
 }
diff --git a/LEGO1/carrace.h b/LEGO1/carrace.h
index b876fd4d..3b9a768e 100644
--- a/LEGO1/carrace.h
+++ b/LEGO1/carrace.h
@@ -1,6 +1,7 @@
 #ifndef CARRACE_H
 #define CARRACE_H
 
+#include "decomp.h"
 #include "legorace.h"
 
 // VTABLE: LEGO1 0x100d5e50
@@ -21,6 +22,10 @@ class CarRace : public LegoRace {
 	{
 		return !strcmp(p_name, CarRace::ClassName()) || LegoRace::IsA(p_name);
 	}
+
+private:
+	undefined m_unk0x144[12]; // 0x144
+	undefined4 m_unk0x150;    // 0x150
 };
 
 #endif // CARRACE_H
diff --git a/LEGO1/legorace.h b/LEGO1/legorace.h
index 8ae52d8e..9ddbdfb3 100644
--- a/LEGO1/legorace.h
+++ b/LEGO1/legorace.h
@@ -3,6 +3,7 @@
 
 #include "decomp.h"
 #include "legoworld.h"
+#include "mxrect32.h"
 #include "mxtypes.h"
 
 // VTABLE: LEGO1 0x100d5db0
@@ -38,22 +39,26 @@ class LegoRace : public LegoWorld {
 	virtual void VTable0x7c(undefined4, undefined4);          // vtable+0x7c
 
 private:
-	undefined4 m_unk0xf8;     // 0xf8
-	undefined4 m_unk0xfc;     // 0xfc
-	undefined4 m_unk0x100;    // 0x100
-	undefined4 m_unk0x104;    // 0x104
-	undefined4 m_unk0x108;    // 0x108
-	undefined4 m_unk0x10c;    // 0x10c
-	undefined4 m_unk0x110;    // 0x110
-	undefined4 m_unk0x114;    // 0x114
-	undefined4 m_unk0x118;    // 0x118
-	undefined4 m_unk0x11c;    // 0x11c
-	undefined4 m_unk0x120;    // 0x120 - this may be the current vehcle (function at 0x10015880)
-	undefined4 m_unk0x124;    // 0x124 - something game state
-	undefined4 m_unk0x128;    // 0x128
-	undefined4 m_unk0x12c;    // 0x12c
-	undefined4 m_unk0x130[4]; // unconfirmed bytes, ghidra claims these are integers
-	undefined4 m_unk0x140;
+	undefined4 m_unk0xf8;  // 0xf8
+	undefined4 m_unk0xfc;  // 0xfc
+	undefined4 m_unk0x100; // 0x100
+	undefined4 m_unk0x104; // 0x104
+	undefined4 m_unk0x108; // 0x108
+	undefined4 m_unk0x10c; // 0x10c
+	undefined4 m_unk0x110; // 0x110
+	undefined4 m_unk0x114; // 0x114
+	undefined4 m_unk0x118; // 0x118
+	undefined4 m_unk0x11c; // 0x11c
+	undefined4 m_unk0x120; // 0x120
+	undefined4 m_unk0x124; // 0x124
+	undefined4 m_unk0x128; // 0x128
+	undefined4 m_unk0x12c; // 0x12c
+
+protected:
+	MxRect32 m_unk0x130; // 0x130
+
+private:
+	undefined4 m_unk0x140; // 0x140
 };
 
 #endif // LEGORACE_H

From d2b05a09831b71d0e3c4052d6b2b33dd8540c08f Mon Sep 17 00:00:00 2001
From: Joshua Peisach <itzswirlz2020@outlook.com>
Date: Wed, 27 Dec 2023 13:30:16 -0500
Subject: [PATCH 024/210] LegoFlcTexturePresenter init function (#373)

* LegoFlcTexturePresenter init function

say that 5 times fast

* Fixes

---------

Co-authored-by: Christian Semmler <mail@csemmler.com>
---
 LEGO1/legoflctexturepresenter.cpp | 13 +++++++++++--
 LEGO1/legoflctexturepresenter.h   |  7 +++++++
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/LEGO1/legoflctexturepresenter.cpp b/LEGO1/legoflctexturepresenter.cpp
index 29a49814..f96d2b47 100644
--- a/LEGO1/legoflctexturepresenter.cpp
+++ b/LEGO1/legoflctexturepresenter.cpp
@@ -1,7 +1,16 @@
 #include "legoflctexturepresenter.h"
 
-// STUB: LEGO1 0x1005de80
+DECOMP_SIZE_ASSERT(LegoFlcTexturePresenter, 0x70)
+
+// FUNCTION: LEGO1 0x1005de80
 LegoFlcTexturePresenter::LegoFlcTexturePresenter()
 {
-	// TODO
+	Init();
+}
+
+// FUNCTION: LEGO1 0x1005df70
+void LegoFlcTexturePresenter::Init()
+{
+	this->m_unk0x68 = 0;
+	this->m_unk0x6c = 0;
 }
diff --git a/LEGO1/legoflctexturepresenter.h b/LEGO1/legoflctexturepresenter.h
index c68d045d..c55249cf 100644
--- a/LEGO1/legoflctexturepresenter.h
+++ b/LEGO1/legoflctexturepresenter.h
@@ -1,6 +1,7 @@
 #ifndef LEGOFLCTEXTUREPRESENTER_H
 #define LEGOFLCTEXTUREPRESENTER_H
 
+#include "decomp.h"
 #include "mxflcpresenter.h"
 
 // VTABLE: LEGO1 0x100d89e0
@@ -15,6 +16,12 @@ class LegoFlcTexturePresenter : public MxFlcPresenter {
 		// GLOBAL: LEGO1 0x100f0634
 		return "LegoFlcTexturePresenter";
 	}
+
+private:
+	void Init();
+
+	undefined4 m_unk0x68; // 0x68
+	undefined4 m_unk0x6c; // 0x6c
 };
 
 #endif // LEGOFLCTEXTUREPRESENTER_H

From c6174c2a13eac4151d72a85076860c66682c7f20 Mon Sep 17 00:00:00 2001
From: Joshua Peisach <itzswirlz2020@outlook.com>
Date: Wed, 27 Dec 2023 13:32:32 -0500
Subject: [PATCH 025/210] Bootstrap rest of LegoTexturePresenter (#374)

* Bootstrap rest of LegoTexturePresenter

* Fixes

---------

Co-authored-by: Christian Semmler <mail@csemmler.com>
---
 LEGO1/legotexturepresenter.cpp | 19 +++++++++++++++++++
 LEGO1/legotexturepresenter.h   |  2 ++
 2 files changed, 21 insertions(+)

diff --git a/LEGO1/legotexturepresenter.cpp b/LEGO1/legotexturepresenter.cpp
index 36a7e243..6d0cbe8c 100644
--- a/LEGO1/legotexturepresenter.cpp
+++ b/LEGO1/legotexturepresenter.cpp
@@ -2,6 +2,7 @@
 
 #include "legoomni.h"
 #include "legovideomanager.h"
+#include "mxcompositepresenter.h"
 
 // FUNCTION: LEGO1 0x1004eb40
 LegoTexturePresenter::~LegoTexturePresenter()
@@ -15,3 +16,21 @@ MxResult LegoTexturePresenter::AddToManager()
 	VideoManager()->AddPresenter(*this);
 	return SUCCESS;
 }
+
+// STUB: LEGO1 0x1004fc60
+MxResult LegoTexturePresenter::PutData()
+{
+	// TODO
+	return FAILURE;
+}
+
+// FUNCTION: LEGO1 0x1004fcb0
+void LegoTexturePresenter::DoneTickle()
+{
+	if (this->m_compositePresenter && !this->m_compositePresenter->VTable0x64(2)) {
+		SetTickleState(TickleState_Idle);
+		return;
+	}
+
+	MxMediaPresenter::DoneTickle();
+}
diff --git a/LEGO1/legotexturepresenter.h b/LEGO1/legotexturepresenter.h
index 22a23500..36cc59b9 100644
--- a/LEGO1/legotexturepresenter.h
+++ b/LEGO1/legotexturepresenter.h
@@ -22,7 +22,9 @@ class LegoTexturePresenter : public MxMediaPresenter {
 		return !strcmp(p_name, LegoTexturePresenter::ClassName()) || MxMediaPresenter::IsA(p_name);
 	}
 
+	virtual void DoneTickle() override;       // vtable+0x2c
 	virtual MxResult AddToManager() override; // vtable+0x34
+	virtual MxResult PutData() override;      // vtable+0x4c
 };
 
 #endif // LEGOTEXTUREPRESENTER_H

From d5854a46aed638b5d646022976327c8d480044c7 Mon Sep 17 00:00:00 2001
From: Joshua Peisach <itzswirlz2020@outlook.com>
Date: Wed, 27 Dec 2023 13:36:32 -0500
Subject: [PATCH 026/210] HospitalState ctor (#375)

* HospitalState ctor

* Add member offsets in HospitalState header

* Remove unhelpful comment

---------

Co-authored-by: Christian Semmler <mail@csemmler.com>
---
 LEGO1/hospitalstate.cpp | 11 +++++++++--
 LEGO1/hospitalstate.h   | 10 ++++++++++
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/LEGO1/hospitalstate.cpp b/LEGO1/hospitalstate.cpp
index b1727b74..4f865128 100644
--- a/LEGO1/hospitalstate.cpp
+++ b/LEGO1/hospitalstate.cpp
@@ -1,7 +1,14 @@
 #include "hospitalstate.h"
 
-// STUB: LEGO1 0x10076370
+DECOMP_SIZE_ASSERT(HospitalState, 0x18)
+
+// FUNCTION: LEGO1 0x10076370
 HospitalState::HospitalState()
 {
-	// TODO
+	this->m_unk0xc = 0;
+	this->m_unk0xe = 0;
+	this->m_unk0x10 = 0;
+	this->m_unk0x12 = 0;
+	this->m_unk0x14 = 0;
+	this->m_unk0x16 = 0;
 }
diff --git a/LEGO1/hospitalstate.h b/LEGO1/hospitalstate.h
index 795342b0..8b24a3d5 100644
--- a/LEGO1/hospitalstate.h
+++ b/LEGO1/hospitalstate.h
@@ -1,6 +1,7 @@
 #ifndef HOSPITALSTATE_H
 #define HOSPITALSTATE_H
 
+#include "decomp.h"
 #include "legostate.h"
 
 // VTABLE: LEGO1 0x100d97a0
@@ -21,6 +22,15 @@ class HospitalState : public LegoState {
 	{
 		return !strcmp(p_name, HospitalState::ClassName()) || LegoState::IsA(p_name);
 	}
+
+private:
+	undefined m_unk0x8[4]; // 0x8
+	undefined2 m_unk0xc;   // 0xc
+	undefined2 m_unk0xe;   // 0xe
+	undefined2 m_unk0x10;  // 0x10
+	undefined2 m_unk0x12;  // 0x12
+	undefined2 m_unk0x14;  // 0x14
+	undefined2 m_unk0x16;  // 0x16
 };
 
 #endif // HOSPITALSTATE_H

From 306d08c5816c5ca214bc1a6d5aa0478cbc5f88e3 Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Wed, 27 Dec 2023 15:31:51 -0500
Subject: [PATCH 027/210] Reorder delcarations, add some annotations

---
 LEGO1/mxdiskstreamcontroller.h | 17 +++++++++--------
 LEGO1/mxregion.h               | 12 ++++++------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/LEGO1/mxdiskstreamcontroller.h b/LEGO1/mxdiskstreamcontroller.h
index 703b3bf2..3fc5111f 100644
--- a/LEGO1/mxdiskstreamcontroller.h
+++ b/LEGO1/mxdiskstreamcontroller.h
@@ -17,14 +17,7 @@ class MxDiskStreamController : public MxStreamController {
 	MxDiskStreamController();
 	virtual ~MxDiskStreamController() override;
 
-	virtual MxResult Tickle() override;                           // vtable+0x8
-	virtual MxResult Open(const char* p_filename) override;       // vtable+0x14
-	virtual MxResult VTable0x18(undefined4, undefined4) override; // vtable+0x18
-	virtual MxResult VTable0x20(MxDSAction* p_action) override;   // vtable+0x20
-	virtual MxResult VTable0x24(MxDSAction* p_action) override;   // vtable+0x24
-	virtual MxDSStreamingAction* VTable0x28() override;           // vtable+0x28
-	virtual MxResult VTable0x30(MxDSAction* p_action) override;   // vtable+0x30
-	virtual MxResult VTable0x34(undefined4);                      // vtable+0x34
+	virtual MxResult Tickle() override; // vtable+0x8
 
 	// FUNCTION: LEGO1 0x100c7360
 	inline virtual const char* ClassName() const override // vtable+0x0c
@@ -39,6 +32,14 @@ class MxDiskStreamController : public MxStreamController {
 		return !strcmp(p_name, MxDiskStreamController::ClassName()) || MxStreamController::IsA(p_name);
 	}
 
+	virtual MxResult Open(const char* p_filename) override;       // vtable+0x14
+	virtual MxResult VTable0x18(undefined4, undefined4) override; // vtable+0x18
+	virtual MxResult VTable0x20(MxDSAction* p_action) override;   // vtable+0x20
+	virtual MxResult VTable0x24(MxDSAction* p_action) override;   // vtable+0x24
+	virtual MxDSStreamingAction* VTable0x28() override;           // vtable+0x28
+	virtual MxResult VTable0x30(MxDSAction* p_action) override;   // vtable+0x30
+	virtual MxResult VTable0x34(undefined4);                      // vtable+0x34
+
 	inline MxBool GetUnk0xc4() const { return m_unk0xc4; }
 
 	void FUN_100c7f40(MxDSStreamingAction* p_streamingaction);
diff --git a/LEGO1/mxregion.h b/LEGO1/mxregion.h
index be15a672..c7d7dd90 100644
--- a/LEGO1/mxregion.h
+++ b/LEGO1/mxregion.h
@@ -13,16 +13,16 @@ class MxRegion : public MxCore {
 	MxRegion();
 	virtual ~MxRegion() override;
 
-	virtual void Reset();
-	virtual void VTable0x18(MxRect32& p_rect);
-	virtual MxBool VTable0x1c(MxRect32& p_rect);
-	virtual MxBool VTable0x20();
+	virtual void Reset();                        // vtable+0x14
+	virtual void VTable0x18(MxRect32& p_rect);   // vtable+0x18
+	virtual MxBool VTable0x1c(MxRect32& p_rect); // vtable+0x1c
+	virtual MxBool VTable0x20();                 // vtable+0x20
 
 	inline MxRect32& GetRect() { return this->m_rect; }
 
 private:
-	MxRegionList* m_list;
-	MxRect32 m_rect;
+	MxRegionList* m_list; // 0x08
+	MxRect32 m_rect;      // 0x0c
 };
 
 #endif // MXREGION_H

From dfad3238804b625a77a0e3cff0b1a0ec7c7e3833 Mon Sep 17 00:00:00 2001
From: Misha <106913236+MishaProductions@users.noreply.github.com>
Date: Wed, 27 Dec 2023 15:44:51 -0500
Subject: [PATCH 028/210] Finish LegoPalettePresenter (#377)

* LegoPalettePresenter implementation

* Update legopalettepresenter.cpp

* Update legopalettepresenter.h

---------

Co-authored-by: Christian Semmler <mail@csemmler.com>
---
 LEGO1/legopalettepresenter.cpp | 50 ++++++++++++++++++++++++++++++++++
 LEGO1/legopalettepresenter.h   |  7 +++--
 2 files changed, 55 insertions(+), 2 deletions(-)

diff --git a/LEGO1/legopalettepresenter.cpp b/LEGO1/legopalettepresenter.cpp
index 5ee9279f..f18a22c3 100644
--- a/LEGO1/legopalettepresenter.cpp
+++ b/LEGO1/legopalettepresenter.cpp
@@ -1,5 +1,10 @@
 #include "legopalettepresenter.h"
 
+#include "legoomni.h"
+#include "legostream.h"
+#include "legovideomanager.h"
+#include "mxstreamchunk.h"
+
 DECOMP_SIZE_ASSERT(LegoPalettePresenter, 0x68)
 
 // FUNCTION: LEGO1 0x10079e50
@@ -39,3 +44,48 @@ void LegoPalettePresenter::Destroy()
 {
 	Destroy(FALSE);
 }
+
+// FUNCTION: LEGO1 0x1007a130
+MxResult LegoPalettePresenter::ParsePallete(MxStreamChunk* p_chunk)
+{
+	MxU8 buffer[40];
+	RGBQUAD palleteData[256];
+	MxResult result = FAILURE;
+	LegoMemoryStream stream((char*) p_chunk->GetData());
+	if (stream.Read(buffer, 40) == SUCCESS) {
+		if (stream.Read(palleteData, sizeof(RGBQUAD) * 256) == SUCCESS) {
+			m_palette = new MxPalette(palleteData);
+			if (m_palette) {
+				result = SUCCESS;
+			}
+		}
+	}
+
+	if (result != SUCCESS && m_palette) {
+		delete m_palette;
+		m_palette = NULL;
+	}
+
+	return result;
+}
+
+// FUNCTION: LEGO1 0x1007a230
+void LegoPalettePresenter::ReadyTickle()
+{
+	MxStreamChunk* chunk = m_subscriber->FUN_100b8360();
+	if (chunk) {
+		if (chunk->GetTime() <= m_action->GetElapsedTime()) {
+			ParseExtra();
+			m_previousTickleStates |= 1 << (unsigned char) m_currentTickleState;
+			m_currentTickleState = TickleState_Starting;
+			chunk = m_subscriber->FUN_100b8250();
+			MxResult result = ParsePallete(chunk);
+			m_subscriber->FUN_100b8390(chunk);
+
+			if (result == SUCCESS) {
+				VideoManager()->RealizePalette(m_palette);
+			}
+			EndAction();
+		}
+	}
+}
diff --git a/LEGO1/legopalettepresenter.h b/LEGO1/legopalettepresenter.h
index e29b5391..c350159b 100644
--- a/LEGO1/legopalettepresenter.h
+++ b/LEGO1/legopalettepresenter.h
@@ -25,13 +25,16 @@ class LegoPalettePresenter : public MxVideoPresenter {
 		return !strcmp(p_name, ClassName()) || MxVideoPresenter::IsA(p_name);
 	}
 
-	virtual void Destroy() override; // vtable+0x38
+	virtual void ReadyTickle() override; // vtable+0x18
+	virtual void Destroy() override;     // vtable+0x38
+
+	MxResult ParsePallete(MxStreamChunk* p_chunk);
 
 private:
 	void Init();
 	void Destroy(MxBool p_fromDestructor);
 
-	MxPalette* m_palette;
+	MxPalette* m_palette; // 0x64
 };
 
 #endif // LEGOPALETTEPRESENTER_H

From bcb7bec68b472c4aa03a1b34248964512a9af221 Mon Sep 17 00:00:00 2001
From: MS <disinvite@users.noreply.github.com>
Date: Wed, 27 Dec 2023 15:59:42 -0500
Subject: [PATCH 029/210] Improve handling of variables for decomp parser
 (#376)

* Parser refactor:
- Handling LIRBARY and STRING markers
- Extracting global variable name for future comparison
- Marking function static variables
- More fluent error messages

* String constants annotated with STRING

* fix variable name

* Should compare LIBRARY markers
---
 ISLE/define.h                                 |   4 +-
 LEGO1/act1state.h                             |   2 +-
 LEGO1/act2brick.h                             |   2 +-
 LEGO1/act2policestation.h                     |   2 +-
 LEGO1/act3.h                                  |   2 +-
 LEGO1/act3actor.h                             |   2 +-
 LEGO1/act3shark.h                             |   2 +-
 LEGO1/act3state.h                             |   2 +-
 LEGO1/ambulance.h                             |   2 +-
 LEGO1/ambulancemissionstate.h                 |   2 +-
 LEGO1/animstate.h                             |   2 +-
 LEGO1/beachhouseentity.h                      |   2 +-
 LEGO1/bike.h                                  |   2 +-
 LEGO1/buildingentity.h                        |   2 +-
 LEGO1/bumpbouy.h                              |   2 +-
 LEGO1/carrace.h                               |   2 +-
 LEGO1/carracestate.h                          |   2 +-
 LEGO1/doors.h                                 |   2 +-
 LEGO1/dunebuggy.h                             |   2 +-
 LEGO1/elevatorbottom.h                        |   2 +-
 LEGO1/gasstation.h                            |   2 +-
 LEGO1/gasstationentity.h                      |   2 +-
 LEGO1/gasstationstate.h                       |   2 +-
 LEGO1/helicopter.h                            |   2 +-
 LEGO1/helicopterstate.h                       |   2 +-
 LEGO1/historybook.h                           |   2 +-
 LEGO1/hospital.h                              |   2 +-
 LEGO1/hospitalentity.h                        |   2 +-
 LEGO1/hospitalstate.h                         |   2 +-
 LEGO1/infocenter.h                            |   2 +-
 LEGO1/infocenterdoor.h                        |   2 +-
 LEGO1/infocenterentity.h                      |   2 +-
 LEGO1/infocenterstate.h                       |   2 +-
 LEGO1/isle.h                                  |   2 +-
 LEGO1/isleactor.h                             |   2 +-
 LEGO1/islepathactor.h                         |   2 +-
 LEGO1/jetski.h                                |   2 +-
 LEGO1/jetskirace.h                            |   2 +-
 LEGO1/jetskiracestate.h                       |   2 +-
 LEGO1/jukebox.h                               |   2 +-
 LEGO1/jukeboxentity.h                         |   2 +-
 LEGO1/jukeboxstate.h                          |   2 +-
 LEGO1/lego3dwavepresenter.h                   |   2 +-
 LEGO1/legoact2state.h                         |   2 +-
 LEGO1/legoactioncontrolpresenter.h            |   2 +-
 LEGO1/legoactor.h                             |   2 +-
 LEGO1/legoactorpresenter.h                    |   2 +-
 LEGO1/legoanimationmanager.h                  |   2 +-
 LEGO1/legoanimmmpresenter.h                   |   2 +-
 LEGO1/legoanimpresenter.h                     |   2 +-
 LEGO1/legobuildingmanager.h                   |   2 +-
 LEGO1/legocachesound.h                        |   2 +-
 LEGO1/legocameracontroller.h                  |   2 +-
 LEGO1/legocarbuild.h                          |   2 +-
 LEGO1/legocarbuildanimpresenter.h             |   2 +-
 LEGO1/legocarraceactor.h                      |   2 +-
 LEGO1/legocontrolmanager.h                    |   2 +-
 LEGO1/legoentity.h                            |   2 +-
 LEGO1/legoentitypresenter.h                   |   2 +-
 LEGO1/legoextraactor.h                        |   2 +-
 LEGO1/legoflctexturepresenter.h               |   2 +-
 LEGO1/legohideanimpresenter.h                 |   2 +-
 LEGO1/legojetski.h                            |   2 +-
 LEGO1/legojetskiraceactor.h                   |   2 +-
 LEGO1/legoloadcachesoundpresenter.h           |   2 +-
 LEGO1/legolocomotionanimpresenter.h           |   2 +-
 LEGO1/legoloopinganimpresenter.h              |   2 +-
 LEGO1/legomodelpresenter.h                    |   2 +-
 LEGO1/legonavcontroller.h                     |   2 +-
 LEGO1/legoomni.h                              |   2 +-
 LEGO1/legopalettepresenter.h                  |   2 +-
 LEGO1/legopartpresenter.h                     |   2 +-
 LEGO1/legopathactor.h                         |   2 +-
 LEGO1/legopathcontroller.h                    |   2 +-
 LEGO1/legopathpresenter.h                     |   2 +-
 LEGO1/legophonemepresenter.h                  |   2 +-
 LEGO1/legoplantmanager.h                      |   2 +-
 LEGO1/legorace.h                              |   2 +-
 LEGO1/legoraceactor.h                         |   2 +-
 LEGO1/legoracecar.h                           |   2 +-
 LEGO1/legostate.h                             |   2 +-
 LEGO1/legotexturepresenter.h                  |   2 +-
 LEGO1/legoworld.h                             |   2 +-
 LEGO1/legoworldpresenter.h                    |   2 +-
 LEGO1/motorcycle.h                            |   2 +-
 LEGO1/mxaudiopresenter.h                      |   2 +-
 LEGO1/mxbackgroundaudiomanager.h              |   2 +-
 LEGO1/mxcompositemediapresenter.h             |   2 +-
 LEGO1/mxcompositepresenter.h                  |   2 +-
 LEGO1/mxcontrolpresenter.h                    |   2 +-
 LEGO1/mxcore.h                                |   2 +-
 LEGO1/mxdiskstreamcontroller.h                |   2 +-
 LEGO1/mxdiskstreamprovider.h                  |   2 +-
 LEGO1/mxdsaction.h                            |   2 +-
 LEGO1/mxdsanim.h                              |   2 +-
 LEGO1/mxdsbuffer.h                            |   2 +-
 LEGO1/mxdschunk.h                             |   2 +-
 LEGO1/mxdsevent.h                             |   2 +-
 LEGO1/mxdsfile.h                              |   2 +-
 LEGO1/mxdsmediaaction.h                       |   2 +-
 LEGO1/mxdsmultiaction.h                       |   2 +-
 LEGO1/mxdsobjectaction.h                      |   2 +-
 LEGO1/mxdsparallelaction.h                    |   2 +-
 LEGO1/mxdsselectaction.h                      |   2 +-
 LEGO1/mxdsserialaction.h                      |   2 +-
 LEGO1/mxdssound.h                             |   2 +-
 LEGO1/mxdssource.h                            |   2 +-
 LEGO1/mxdsstill.h                             |   2 +-
 LEGO1/mxdssubscriber.h                        |   2 +-
 LEGO1/mxentity.h                              |   2 +-
 LEGO1/mxeventpresenter.h                      |   2 +-
 LEGO1/mxflcpresenter.h                        |   2 +-
 LEGO1/mxloopingflcpresenter.h                 |   2 +-
 LEGO1/mxloopingmidipresenter.h                |   2 +-
 LEGO1/mxloopingsmkpresenter.h                 |   2 +-
 LEGO1/mxmediapresenter.h                      |   2 +-
 LEGO1/mxmidipresenter.h                       |   2 +-
 LEGO1/mxmusicpresenter.h                      |   2 +-
 LEGO1/mxnextactiondatastart.h                 |   2 +-
 LEGO1/mxobjectfactory.h                       |   2 +-
 LEGO1/mxpalette.cpp                           |   1 -
 LEGO1/mxpresenter.h                           |   2 +-
 LEGO1/mxramstreamcontroller.h                 |   2 +-
 LEGO1/mxramstreamprovider.h                   |   2 +-
 LEGO1/mxsmkpresenter.h                        |   2 +-
 LEGO1/mxsoundpresenter.h                      |   2 +-
 LEGO1/mxstillpresenter.h                      |   2 +-
 LEGO1/mxstreamchunk.h                         |   2 +-
 LEGO1/mxstreamcontroller.h                    |   2 +-
 LEGO1/mxstreamer.h                            |   2 +-
 LEGO1/mxvideopresenter.h                      |   2 +-
 LEGO1/mxwavepresenter.h                       |   2 +-
 LEGO1/pizza.h                                 |   2 +-
 LEGO1/pizzamissionstate.h                     |   2 +-
 LEGO1/pizzeria.h                              |   2 +-
 LEGO1/pizzeriastate.h                         |   2 +-
 LEGO1/police.h                                |   2 +-
 LEGO1/policeentity.h                          |   2 +-
 LEGO1/policestate.h                           |   2 +-
 LEGO1/racecar.h                               |   2 +-
 LEGO1/racestate.h                             |   2 +-
 LEGO1/radio.h                                 |   2 +-
 LEGO1/radiostate.h                            |   2 +-
 LEGO1/realtime/matrix.cpp                     |   2 +-
 LEGO1/registrationbook.h                      |   2 +-
 LEGO1/score.h                                 |   2 +-
 LEGO1/scorestate.h                            |   2 +-
 LEGO1/skateboard.h                            |   2 +-
 LEGO1/tgl/d3drm/renderer.cpp                  |   4 +-
 LEGO1/towtrack.h                              |   2 +-
 LEGO1/towtrackmissionstate.h                  |   2 +-
 tools/isledecomp/isledecomp/parser/error.py   |  17 +-
 tools/isledecomp/isledecomp/parser/marker.py  | 103 +++++++++
 tools/isledecomp/isledecomp/parser/node.py    |  50 +++--
 tools/isledecomp/isledecomp/parser/parser.py  | 195 +++++++++++-------
 tools/isledecomp/isledecomp/parser/util.py    |  49 ++---
 tools/isledecomp/tests/test_parser.py         |  73 ++++++-
 .../tests/test_parser_statechange.py          |  84 ++++----
 tools/isledecomp/tests/test_parser_util.py    |  33 ++-
 tools/reccmp/reccmp.py                        |   4 +-
 160 files changed, 586 insertions(+), 327 deletions(-)
 create mode 100644 tools/isledecomp/isledecomp/parser/marker.py

diff --git a/ISLE/define.h b/ISLE/define.h
index aac9f28d..3f92244b 100644
--- a/ISLE/define.h
+++ b/ISLE/define.h
@@ -8,9 +8,9 @@ class IsleApp;
 
 extern IsleApp* g_isle;
 extern int g_closed;
-// GLOBAL: ISLE 0x4101c4
+// STRING: ISLE 0x4101c4
 #define WNDCLASS_NAME "Lego Island MainNoM App"
-// GLOBAL: ISLE 0x4101dc
+// STRING: ISLE 0x4101dc
 #define WINDOW_TITLE "LEGO\xAE"
 extern unsigned char g_mousedown;
 extern unsigned char g_mousemoved;
diff --git a/LEGO1/act1state.h b/LEGO1/act1state.h
index e2e8d3e1..d0daec7d 100644
--- a/LEGO1/act1state.h
+++ b/LEGO1/act1state.h
@@ -12,7 +12,7 @@ class Act1State : public LegoState {
 	// FUNCTION: LEGO1 0x100338a0
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// GLOBAL: LEGO1 0x100f0154
+		// STRING: LEGO1 0x100f0154
 		return "Act1State";
 	};
 
diff --git a/LEGO1/act2brick.h b/LEGO1/act2brick.h
index de4f29b1..10665c40 100644
--- a/LEGO1/act2brick.h
+++ b/LEGO1/act2brick.h
@@ -16,7 +16,7 @@ class Act2Brick : public LegoPathActor {
 	// FUNCTION: LEGO1 0x1007a360
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// GLOBAL: LEGO1 0x100f0438
+		// STRING: LEGO1 0x100f0438
 		return "Act2Brick";
 	}
 
diff --git a/LEGO1/act2policestation.h b/LEGO1/act2policestation.h
index 2ca1a4e8..887ab542 100644
--- a/LEGO1/act2policestation.h
+++ b/LEGO1/act2policestation.h
@@ -12,7 +12,7 @@ class Act2PoliceStation : public LegoEntity {
 	// FUNCTION: LEGO1 0x1000e200
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// GLOBAL: LEGO1 0x100f03fc
+		// STRING: LEGO1 0x100f03fc
 		return "Act2PoliceStation";
 	}
 
diff --git a/LEGO1/act3.h b/LEGO1/act3.h
index cc4a2c3f..76c9722b 100644
--- a/LEGO1/act3.h
+++ b/LEGO1/act3.h
@@ -14,7 +14,7 @@ class Act3 : public LegoWorld {
 	// FUNCTION: LEGO1 0x10072510
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// GLOBAL: LEGO1 0x100f013c
+		// STRING: LEGO1 0x100f013c
 		return "Act3";
 	}
 
diff --git a/LEGO1/act3actor.h b/LEGO1/act3actor.h
index bfdf879a..cd1e1fcd 100644
--- a/LEGO1/act3actor.h
+++ b/LEGO1/act3actor.h
@@ -8,7 +8,7 @@ class Act3Actor : public MxCore {
 	// FUNCTION: LEGO1 0x100431b0
 	inline virtual const char* ClassName() override
 	{
-		// GLOBAL: LEGO1 0x100f03ac
+		// STRING: LEGO1 0x100f03ac
 		return "Act3Actor";
 	}
 };
diff --git a/LEGO1/act3shark.h b/LEGO1/act3shark.h
index 63a4e7a6..611cbc38 100644
--- a/LEGO1/act3shark.h
+++ b/LEGO1/act3shark.h
@@ -9,7 +9,7 @@ class Act3Shark : public LegoAnimActor {
 	// FUNCTION: LEGO1 0x100430c0
 	inline virtual const char* ClassName() const override
 	{
-		// GLOBAL: LEGO1 0x100f03a0
+		// STRING: LEGO1 0x100f03a0
 		return "Act3Shark";
 	}
 };
diff --git a/LEGO1/act3state.h b/LEGO1/act3state.h
index 5da94fac..dca6c3ea 100644
--- a/LEGO1/act3state.h
+++ b/LEGO1/act3state.h
@@ -12,7 +12,7 @@ class Act3State : public LegoState {
 	// FUNCTION: LEGO1 0x1000e300
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// GLOBAL: LEGO1 0x100f03f0
+		// STRING: LEGO1 0x100f03f0
 		return "Act3State";
 	}
 
diff --git a/LEGO1/ambulance.h b/LEGO1/ambulance.h
index eb46a1ed..3bc80212 100644
--- a/LEGO1/ambulance.h
+++ b/LEGO1/ambulance.h
@@ -12,7 +12,7 @@ class Ambulance : public IslePathActor {
 	// FUNCTION: LEGO1 0x10035fa0
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// GLOBAL: LEGO1 0x100f03c4
+		// STRING: LEGO1 0x100f03c4
 		return "Ambulance";
 	}
 
diff --git a/LEGO1/ambulancemissionstate.h b/LEGO1/ambulancemissionstate.h
index 05d09859..a09bf117 100644
--- a/LEGO1/ambulancemissionstate.h
+++ b/LEGO1/ambulancemissionstate.h
@@ -12,7 +12,7 @@ class AmbulanceMissionState : public LegoState {
 	// FUNCTION: LEGO1 0x10037600
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// GLOBAL: LEGO1 0x100f00e8
+		// STRING: LEGO1 0x100f00e8
 		return "AmbulanceMissionState";
 	}
 
diff --git a/LEGO1/animstate.h b/LEGO1/animstate.h
index 5e8fa4e5..c1098b6a 100644
--- a/LEGO1/animstate.h
+++ b/LEGO1/animstate.h
@@ -13,7 +13,7 @@ class AnimState : public LegoState {
 	// FUNCTION: LEGO1 0x10065070
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// GLOBAL: LEGO1 0x100f0460
+		// STRING: LEGO1 0x100f0460
 		return "AnimState";
 	}
 
diff --git a/LEGO1/beachhouseentity.h b/LEGO1/beachhouseentity.h
index cf6a8909..58aa3c68 100644
--- a/LEGO1/beachhouseentity.h
+++ b/LEGO1/beachhouseentity.h
@@ -12,7 +12,7 @@ class BeachHouseEntity : public BuildingEntity {
 	// FUNCTION: LEGO1 0x1000ee80
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// GLOBAL: LEGO1 0x100f0314
+		// STRING: LEGO1 0x100f0314
 		return "BeachHouseEntity";
 	}
 
diff --git a/LEGO1/bike.h b/LEGO1/bike.h
index f3d5c90d..899cfd21 100644
--- a/LEGO1/bike.h
+++ b/LEGO1/bike.h
@@ -13,7 +13,7 @@ class Bike : public IslePathActor {
 	// FUNCTION: LEGO1 0x100766f0
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// GLOBAL: LEGO1 0x100f03d0
+		// STRING: LEGO1 0x100f03d0
 		return "Bike";
 	}
 
diff --git a/LEGO1/buildingentity.h b/LEGO1/buildingentity.h
index f0ba4c3c..7f2abe07 100644
--- a/LEGO1/buildingentity.h
+++ b/LEGO1/buildingentity.h
@@ -13,7 +13,7 @@ class BuildingEntity : public LegoEntity {
 	// FUNCTION: LEGO1 0x10014f20
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// GLOBAL: LEGO1 0x100f07e8
+		// STRING: LEGO1 0x100f07e8
 		return "BuildingEntity";
 	}
 
diff --git a/LEGO1/bumpbouy.h b/LEGO1/bumpbouy.h
index 8399c7ef..a56526e4 100644
--- a/LEGO1/bumpbouy.h
+++ b/LEGO1/bumpbouy.h
@@ -10,7 +10,7 @@ class BumpBouy : public LegoAnimActor {
 	// FUNCTION: LEGO1 0x100274e0
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// GLOBAL: LEGO1 0x100f0394
+		// STRING: LEGO1 0x100f0394
 		return "BumpBouy";
 	}
 
diff --git a/LEGO1/carrace.h b/LEGO1/carrace.h
index 3b9a768e..767fa567 100644
--- a/LEGO1/carrace.h
+++ b/LEGO1/carrace.h
@@ -13,7 +13,7 @@ class CarRace : public LegoRace {
 	// FUNCTION: LEGO1 0x10016b20
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// GLOBAL: LEGO1 0x100f0528
+		// STRING: LEGO1 0x100f0528
 		return "CarRace";
 	}
 
diff --git a/LEGO1/carracestate.h b/LEGO1/carracestate.h
index c922354f..561f277b 100644
--- a/LEGO1/carracestate.h
+++ b/LEGO1/carracestate.h
@@ -10,7 +10,7 @@ class CarRaceState : public RaceState {
 	// FUNCTION: LEGO1 0x1000dd30
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// GLOBAL: LEGO1 0x100f009c
+		// STRING: LEGO1 0x100f009c
 		return "CarRaceState";
 	}
 
diff --git a/LEGO1/doors.h b/LEGO1/doors.h
index a2c142a4..feea0460 100644
--- a/LEGO1/doors.h
+++ b/LEGO1/doors.h
@@ -10,7 +10,7 @@ class Doors : public LegoPathActor {
 	// FUNCTION: LEGO1 0x1000e430
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// GLOBAL: LEGO1 0x100f03e8
+		// STRING: LEGO1 0x100f03e8
 		return "Doors";
 	}
 
diff --git a/LEGO1/dunebuggy.h b/LEGO1/dunebuggy.h
index 1accaa05..e45fe8fe 100644
--- a/LEGO1/dunebuggy.h
+++ b/LEGO1/dunebuggy.h
@@ -13,7 +13,7 @@ class DuneBuggy : public IslePathActor {
 	// FUNCTION: LEGO1 0x10067c30
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// GLOBAL: LEGO1 0x100f0410
+		// STRING: LEGO1 0x100f0410
 		return "DuneBuggy";
 	}
 
diff --git a/LEGO1/elevatorbottom.h b/LEGO1/elevatorbottom.h
index 2a0f2570..64b3f221 100644
--- a/LEGO1/elevatorbottom.h
+++ b/LEGO1/elevatorbottom.h
@@ -14,7 +14,7 @@ class ElevatorBottom : public LegoWorld {
 	// FUNCTION: LEGO1 0x10017f20
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// GLOBAL: LEGO1 0x100f04ac
+		// STRING: LEGO1 0x100f04ac
 		return "ElevatorBottom";
 	}
 
diff --git a/LEGO1/gasstation.h b/LEGO1/gasstation.h
index d6761980..0617e161 100644
--- a/LEGO1/gasstation.h
+++ b/LEGO1/gasstation.h
@@ -17,7 +17,7 @@ class GasStation : public LegoWorld {
 	// FUNCTION: LEGO1 0x10004780
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// GLOBAL: LEGO1 0x100f0168
+		// STRING: LEGO1 0x100f0168
 		return "GasStation";
 	}
 
diff --git a/LEGO1/gasstationentity.h b/LEGO1/gasstationentity.h
index 17aa22cf..b4a27942 100644
--- a/LEGO1/gasstationentity.h
+++ b/LEGO1/gasstationentity.h
@@ -10,7 +10,7 @@ class GasStationEntity : public BuildingEntity {
 	// FUNCTION: LEGO1 0x1000eb20
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// GLOBAL: LEGO1 0x100f0348
+		// STRING: LEGO1 0x100f0348
 		return "GasStationEntity";
 	}
 
diff --git a/LEGO1/gasstationstate.h b/LEGO1/gasstationstate.h
index 2fb7e512..e2768a98 100644
--- a/LEGO1/gasstationstate.h
+++ b/LEGO1/gasstationstate.h
@@ -12,7 +12,7 @@ class GasStationState : public LegoState {
 	// FUNCTION: LEGO1 0x100061d0
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// GLOBAL: LEGO1 0x100f0174
+		// STRING: LEGO1 0x100f0174
 		return "GasStationState";
 	}
 
diff --git a/LEGO1/helicopter.h b/LEGO1/helicopter.h
index cc4f3b35..7c5be4ea 100644
--- a/LEGO1/helicopter.h
+++ b/LEGO1/helicopter.h
@@ -27,7 +27,7 @@ class Helicopter : public IslePathActor {
 	// FUNCTION: LEGO1 0x10003070
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// GLOBAL: LEGO1 0x100f0130
+		// STRING: LEGO1 0x100f0130
 		return "Helicopter";
 	}
 
diff --git a/LEGO1/helicopterstate.h b/LEGO1/helicopterstate.h
index 1c43b04f..2cb3b747 100644
--- a/LEGO1/helicopterstate.h
+++ b/LEGO1/helicopterstate.h
@@ -11,7 +11,7 @@ class HelicopterState : public LegoState {
 	// FUNCTION: LEGO1 0x1000e0d0
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// GLOBAL: LEGO1 0x100f0144
+		// STRING: LEGO1 0x100f0144
 		return "HelicopterState";
 	}
 
diff --git a/LEGO1/historybook.h b/LEGO1/historybook.h
index 18154c79..80cc78b5 100644
--- a/LEGO1/historybook.h
+++ b/LEGO1/historybook.h
@@ -15,7 +15,7 @@ class HistoryBook : public LegoWorld {
 	// FUNCTION: LEGO1 0x10082390
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// GLOBAL: LEGO1 0x100f04bc
+		// STRING: LEGO1 0x100f04bc
 		return "HistoryBook";
 	}
 
diff --git a/LEGO1/hospital.h b/LEGO1/hospital.h
index 014c301d..627dc4cc 100644
--- a/LEGO1/hospital.h
+++ b/LEGO1/hospital.h
@@ -15,7 +15,7 @@ class Hospital : public LegoWorld {
 	// FUNCTION: LEGO1 0x100746b0
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// GLOBAL: LEGO1 0x100f0490
+		// STRING: LEGO1 0x100f0490
 		return "Hospital";
 	}
 
diff --git a/LEGO1/hospitalentity.h b/LEGO1/hospitalentity.h
index 9dc597f1..f4f14b70 100644
--- a/LEGO1/hospitalentity.h
+++ b/LEGO1/hospitalentity.h
@@ -10,7 +10,7 @@ class HospitalEntity : public BuildingEntity {
 	// FUNCTION: LEGO1 0x1000ec40
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// GLOBAL: LEGO1 0x100f0338
+		// STRING: LEGO1 0x100f0338
 		return "HospitalEntity";
 	}
 
diff --git a/LEGO1/hospitalstate.h b/LEGO1/hospitalstate.h
index 8b24a3d5..25c23d96 100644
--- a/LEGO1/hospitalstate.h
+++ b/LEGO1/hospitalstate.h
@@ -13,7 +13,7 @@ class HospitalState : public LegoState {
 	// FUNCTION: LEGO1 0x10076400
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// GLOBAL: LEGO1 0x100f0480
+		// STRING: LEGO1 0x100f0480
 		return "HospitalState";
 	}
 
diff --git a/LEGO1/infocenter.h b/LEGO1/infocenter.h
index 3b4e7856..89fcc54f 100644
--- a/LEGO1/infocenter.h
+++ b/LEGO1/infocenter.h
@@ -16,7 +16,7 @@ class Infocenter : public LegoWorld {
 	// FUNCTION: LEGO1 0x1006eb40
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// GLOBAL: LEGO1 0x100f04ec
+		// STRING: LEGO1 0x100f04ec
 		return "Infocenter";
 	}
 
diff --git a/LEGO1/infocenterdoor.h b/LEGO1/infocenterdoor.h
index 1586dbc8..5bc5e407 100644
--- a/LEGO1/infocenterdoor.h
+++ b/LEGO1/infocenterdoor.h
@@ -15,7 +15,7 @@ class InfocenterDoor : public LegoWorld {
 	// FUNCTION: LEGO1 0x100377b0
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// GLOBAL: LEGO1 0x100f049c
+		// STRING: LEGO1 0x100f049c
 		return "InfocenterDoor";
 	}
 
diff --git a/LEGO1/infocenterentity.h b/LEGO1/infocenterentity.h
index 44121ae2..e011aeb8 100644
--- a/LEGO1/infocenterentity.h
+++ b/LEGO1/infocenterentity.h
@@ -10,7 +10,7 @@ class InfoCenterEntity : public BuildingEntity {
 	// FUNCTION: LEGO1 0x1000ea00
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// GLOBAL: LEGO1 0x100f035c
+		// STRING: LEGO1 0x100f035c
 		return "InfoCenterEntity";
 	}
 
diff --git a/LEGO1/infocenterstate.h b/LEGO1/infocenterstate.h
index 322e7bec..b1bce306 100644
--- a/LEGO1/infocenterstate.h
+++ b/LEGO1/infocenterstate.h
@@ -14,7 +14,7 @@ class InfocenterState : public LegoState {
 	// FUNCTION: LEGO1 0x10071840
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// GLOBAL: LEGO1 0x100f04dc
+		// STRING: LEGO1 0x100f04dc
 		return "InfocenterState";
 	}
 
diff --git a/LEGO1/isle.h b/LEGO1/isle.h
index 9f44eadd..c3579aec 100644
--- a/LEGO1/isle.h
+++ b/LEGO1/isle.h
@@ -30,7 +30,7 @@ class Isle : public LegoWorld {
 	// FUNCTION: LEGO1 0x10030910
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// GLOBAL: LEGO1 0x100f0458
+		// STRING: LEGO1 0x100f0458
 		return "Isle";
 	}
 
diff --git a/LEGO1/isleactor.h b/LEGO1/isleactor.h
index aa205483..8fd7d039 100644
--- a/LEGO1/isleactor.h
+++ b/LEGO1/isleactor.h
@@ -9,7 +9,7 @@ class IsleActor : public LegoActor {
 	// FUNCTION: LEGO1 0x1000e660
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// GLOBAL: LEGO1 0x100f07dc
+		// STRING: LEGO1 0x100f07dc
 		return "IsleActor";
 	}
 
diff --git a/LEGO1/islepathactor.h b/LEGO1/islepathactor.h
index 44f50475..d7a8ff60 100644
--- a/LEGO1/islepathactor.h
+++ b/LEGO1/islepathactor.h
@@ -18,7 +18,7 @@ class IslePathActor : public LegoPathActor {
 	// FUNCTION: LEGO1 0x10002ea0
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// GLOBAL: LEGO1 0x100f0104
+		// STRING: LEGO1 0x100f0104
 		return "IslePathActor";
 	}
 
diff --git a/LEGO1/jetski.h b/LEGO1/jetski.h
index 8c669ca6..1a64a4b6 100644
--- a/LEGO1/jetski.h
+++ b/LEGO1/jetski.h
@@ -13,7 +13,7 @@ class Jetski : public IslePathActor {
 	// FUNCTION: LEGO1 0x1007e430
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// GLOBAL: LEGO1 0x100f03d8
+		// STRING: LEGO1 0x100f03d8
 		return "Jetski";
 	}
 
diff --git a/LEGO1/jetskirace.h b/LEGO1/jetskirace.h
index 9488ed04..9b16d9a7 100644
--- a/LEGO1/jetskirace.h
+++ b/LEGO1/jetskirace.h
@@ -10,7 +10,7 @@ class JetskiRace : public LegoRace {
 	// FUNCTION: LEGO1 0x1000daf0
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// GLOBAL: LEGO1 0x100f0530
+		// STRING: LEGO1 0x100f0530
 		return "JetskiRace";
 	}
 
diff --git a/LEGO1/jetskiracestate.h b/LEGO1/jetskiracestate.h
index 9724e4a1..5610ac32 100644
--- a/LEGO1/jetskiracestate.h
+++ b/LEGO1/jetskiracestate.h
@@ -10,7 +10,7 @@ class JetskiRaceState : public RaceState {
 	// FUNCTION: LEGO1 0x1000dc40
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// GLOBAL: LEGO1 0x100f00ac
+		// STRING: LEGO1 0x100f00ac
 		return "JetskiRaceState";
 	}
 
diff --git a/LEGO1/jukebox.h b/LEGO1/jukebox.h
index 63b04520..59aee194 100644
--- a/LEGO1/jukebox.h
+++ b/LEGO1/jukebox.h
@@ -13,7 +13,7 @@ class JukeBox : public LegoWorld {
 	// FUNCTION: LEGO1 0x1005d6f0
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// GLOBAL: LEGO1 0x100f02cc
+		// STRING: LEGO1 0x100f02cc
 		return "JukeBox";
 	}
 
diff --git a/LEGO1/jukeboxentity.h b/LEGO1/jukeboxentity.h
index 3e175568..c451787d 100644
--- a/LEGO1/jukeboxentity.h
+++ b/LEGO1/jukeboxentity.h
@@ -13,7 +13,7 @@ class JukeBoxEntity : public LegoEntity {
 	// FUNCTION: LEGO1 0x10085cc0
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// GLOBAL: LEGO1 0x100f02f0
+		// STRING: LEGO1 0x100f02f0
 		return "JukeBoxEntity";
 	}
 
diff --git a/LEGO1/jukeboxstate.h b/LEGO1/jukeboxstate.h
index 8a481437..7a517bb0 100644
--- a/LEGO1/jukeboxstate.h
+++ b/LEGO1/jukeboxstate.h
@@ -10,7 +10,7 @@ class JukeBoxState : public LegoState {
 	// FUNCTION: LEGO1 0x1000f310
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// GLOBAL: LEGO1 0x100f02bc
+		// STRING: LEGO1 0x100f02bc
 		return "JukeBoxState";
 	}
 
diff --git a/LEGO1/lego3dwavepresenter.h b/LEGO1/lego3dwavepresenter.h
index ca72f212..ed1942da 100644
--- a/LEGO1/lego3dwavepresenter.h
+++ b/LEGO1/lego3dwavepresenter.h
@@ -10,7 +10,7 @@ class Lego3DWavePresenter : public MxWavePresenter {
 	// FUNCTION: LEGO1 0x1000d890
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// GLOBAL: LEGO1 0x100f058c
+		// STRING: LEGO1 0x100f058c
 		return "Lego3DWavePresenter";
 	}
 
diff --git a/LEGO1/legoact2state.h b/LEGO1/legoact2state.h
index a26cdd7d..38584769 100644
--- a/LEGO1/legoact2state.h
+++ b/LEGO1/legoact2state.h
@@ -10,7 +10,7 @@ class LegoAct2State : public LegoState {
 	// FUNCTION: LEGO1 0x1000df80
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// GLOBAL: LEGO1 0x100f0428
+		// STRING: LEGO1 0x100f0428
 		return "LegoAct2State";
 	}
 
diff --git a/LEGO1/legoactioncontrolpresenter.h b/LEGO1/legoactioncontrolpresenter.h
index 98815348..746300a6 100644
--- a/LEGO1/legoactioncontrolpresenter.h
+++ b/LEGO1/legoactioncontrolpresenter.h
@@ -15,7 +15,7 @@ class LegoActionControlPresenter : public MxMediaPresenter {
 	// FUNCTION: LEGO1 0x1000d0e0
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// GLOBAL: LEGO1 0x100f05bc
+		// STRING: LEGO1 0x100f05bc
 		return "LegoActionControlPresenter";
 	}
 
diff --git a/LEGO1/legoactor.h b/LEGO1/legoactor.h
index c8380177..95c991df 100644
--- a/LEGO1/legoactor.h
+++ b/LEGO1/legoactor.h
@@ -13,7 +13,7 @@ class LegoActor : public LegoEntity {
 	// FUNCTION: LEGO1 0x1002d210
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// GLOBAL: LEGO1 0x100f0124
+		// STRING: LEGO1 0x100f0124
 		return "LegoActor";
 	}
 
diff --git a/LEGO1/legoactorpresenter.h b/LEGO1/legoactorpresenter.h
index 359960dc..a9709686 100644
--- a/LEGO1/legoactorpresenter.h
+++ b/LEGO1/legoactorpresenter.h
@@ -10,7 +10,7 @@ class LegoActorPresenter : public LegoEntityPresenter {
 	// FUNCTION: LEGO1 0x1000cb10
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// GLOBAL: LEGO1 0x100f06a4
+		// STRING: LEGO1 0x100f06a4
 		return "LegoActorPresenter";
 	}
 
diff --git a/LEGO1/legoanimationmanager.h b/LEGO1/legoanimationmanager.h
index 0a647e8f..f943b062 100644
--- a/LEGO1/legoanimationmanager.h
+++ b/LEGO1/legoanimationmanager.h
@@ -16,7 +16,7 @@ class LegoAnimationManager : public MxCore {
 	// FUNCTION: LEGO1 0x1005ec80
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// GLOBAL: LEGO1 0x100f7508
+		// STRING: LEGO1 0x100f7508
 		return "LegoAnimationManager";
 	}
 
diff --git a/LEGO1/legoanimmmpresenter.h b/LEGO1/legoanimmmpresenter.h
index 9fc9d19f..2e1ab918 100644
--- a/LEGO1/legoanimmmpresenter.h
+++ b/LEGO1/legoanimmmpresenter.h
@@ -12,7 +12,7 @@ class LegoAnimMMPresenter : public MxCompositePresenter {
 	// FUNCTION: LEGO1 0x1004a950
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// GLOBAL: LEGO1 0x100f046c
+		// STRING: LEGO1 0x100f046c
 		return "LegoAnimMMPresenter";
 	}
 
diff --git a/LEGO1/legoanimpresenter.h b/LEGO1/legoanimpresenter.h
index 5961f74a..de8e91d9 100644
--- a/LEGO1/legoanimpresenter.h
+++ b/LEGO1/legoanimpresenter.h
@@ -11,7 +11,7 @@ class LegoAnimPresenter : public MxVideoPresenter {
 	// FUNCTION: LEGO1 0x10068530
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// GLOBAL: LEGO1 0x100f071c
+		// STRING: LEGO1 0x100f071c
 		return "LegoAnimPresenter";
 	}
 
diff --git a/LEGO1/legobuildingmanager.h b/LEGO1/legobuildingmanager.h
index 38c9cd57..bb9c96bb 100644
--- a/LEGO1/legobuildingmanager.h
+++ b/LEGO1/legobuildingmanager.h
@@ -13,7 +13,7 @@ class LegoBuildingManager : public MxCore {
 	// FUNCTION: LEGO1 0x1002f930
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// GLOBAL: LEGO1 0x100f37d0
+		// STRING: LEGO1 0x100f37d0
 		return "LegoBuildingManager";
 	}
 
diff --git a/LEGO1/legocachesound.h b/LEGO1/legocachesound.h
index e045a719..6398c04e 100644
--- a/LEGO1/legocachesound.h
+++ b/LEGO1/legocachesound.h
@@ -13,7 +13,7 @@ class LegoCacheSound : public MxCore {
 	// FUNCTION: LEGO1 0x10006580
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// GLOBAL: LEGO1 0x100f01c4
+		// STRING: LEGO1 0x100f01c4
 		return "LegoCacheSound";
 	}
 
diff --git a/LEGO1/legocameracontroller.h b/LEGO1/legocameracontroller.h
index 7fa9552d..09785df1 100644
--- a/LEGO1/legocameracontroller.h
+++ b/LEGO1/legocameracontroller.h
@@ -15,7 +15,7 @@ class LegoCameraController : public MxCore {
 	// FUNCTION: LEGO1 0x10011ec0
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// GLOBAL: LEGO1 0x100f0850
+		// STRING: LEGO1 0x100f0850
 		return "LegoCameraController";
 	}
 
diff --git a/LEGO1/legocarbuild.h b/LEGO1/legocarbuild.h
index b4a93e7c..74d850d4 100644
--- a/LEGO1/legocarbuild.h
+++ b/LEGO1/legocarbuild.h
@@ -16,7 +16,7 @@ class LegoCarBuild : public LegoWorld {
 	// FUNCTION: LEGO1 0x10022940
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// GLOBAL: LEGO1 0x100f0504
+		// STRING: LEGO1 0x100f0504
 		return "LegoCarBuild";
 	}
 
diff --git a/LEGO1/legocarbuildanimpresenter.h b/LEGO1/legocarbuildanimpresenter.h
index 8be926f7..0440a0f3 100644
--- a/LEGO1/legocarbuildanimpresenter.h
+++ b/LEGO1/legocarbuildanimpresenter.h
@@ -13,7 +13,7 @@ class LegoCarBuildAnimPresenter : public LegoAnimPresenter {
 	// FUNCTION: LEGO1 0x10078510
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// GLOBAL: LEGO1 0x100f05ec
+		// STRING: LEGO1 0x100f05ec
 		return "LegoCarBuildAnimPresenter";
 	}
 
diff --git a/LEGO1/legocarraceactor.h b/LEGO1/legocarraceactor.h
index d03b20eb..f00d900e 100644
--- a/LEGO1/legocarraceactor.h
+++ b/LEGO1/legocarraceactor.h
@@ -9,7 +9,7 @@ class LegoCarRaceActor : public LegoRaceActor {
 	// FUNCTION: LEGO1 0x10081650
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// GLOBAL: LEGO1 0x100f0568
+		// STRING: LEGO1 0x100f0568
 		return "LegoCarRaceActor";
 	}
 
diff --git a/LEGO1/legocontrolmanager.h b/LEGO1/legocontrolmanager.h
index 591effb6..7bc8dc0f 100644
--- a/LEGO1/legocontrolmanager.h
+++ b/LEGO1/legocontrolmanager.h
@@ -14,7 +14,7 @@ class LegoControlManager : public MxCore {
 	// FUNCTION: LEGO1 0x10028cb0
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// GLOBAL: LEGO1 0x100f31b8
+		// STRING: LEGO1 0x100f31b8
 		return "LegoControlManager";
 	}
 
diff --git a/LEGO1/legoentity.h b/LEGO1/legoentity.h
index 4d4c19b6..5a2eb715 100644
--- a/LEGO1/legoentity.h
+++ b/LEGO1/legoentity.h
@@ -22,7 +22,7 @@ class LegoEntity : public MxEntity {
 	// FUNCTION: LEGO1 0x1000c2f0
 	inline const char* ClassName() const override // vtable+0xc
 	{
-		// GLOBAL: LEGO1 0x100f0064
+		// STRING: LEGO1 0x100f0064
 		return "LegoEntity";
 	}
 
diff --git a/LEGO1/legoentitypresenter.h b/LEGO1/legoentitypresenter.h
index 994e5a79..72af0498 100644
--- a/LEGO1/legoentitypresenter.h
+++ b/LEGO1/legoentitypresenter.h
@@ -15,7 +15,7 @@ class LegoEntityPresenter : public MxCompositePresenter {
 	// FUNCTION: LEGO1 0x100534b0
 	inline const char* ClassName() const override // vtable+0xc
 	{
-		// GLOBAL: LEGO1 0x100f06b8
+		// STRING: LEGO1 0x100f06b8
 		return "LegoEntityPresenter";
 	}
 
diff --git a/LEGO1/legoextraactor.h b/LEGO1/legoextraactor.h
index 6b8a9198..c4c76cee 100644
--- a/LEGO1/legoextraactor.h
+++ b/LEGO1/legoextraactor.h
@@ -9,7 +9,7 @@ class LegoExtraActor : public LegoAnimActor {
 	// FUNCTION: LEGO1 0x1002b7a0
 	inline const char* ClassName() const override // vtable+0xc
 	{
-		// GLOBAL: LEGO1 0x100f3204
+		// STRING: LEGO1 0x100f3204
 		return "LegoExtraActor";
 	}
 
diff --git a/LEGO1/legoflctexturepresenter.h b/LEGO1/legoflctexturepresenter.h
index c55249cf..36d1fefc 100644
--- a/LEGO1/legoflctexturepresenter.h
+++ b/LEGO1/legoflctexturepresenter.h
@@ -13,7 +13,7 @@ class LegoFlcTexturePresenter : public MxFlcPresenter {
 	// FUNCTION: LEGO1 0x1005def0
 	inline const char* ClassName() const override // vtable+0xc
 	{
-		// GLOBAL: LEGO1 0x100f0634
+		// STRING: LEGO1 0x100f0634
 		return "LegoFlcTexturePresenter";
 	}
 
diff --git a/LEGO1/legohideanimpresenter.h b/LEGO1/legohideanimpresenter.h
index aca44424..f6e86c2e 100644
--- a/LEGO1/legohideanimpresenter.h
+++ b/LEGO1/legohideanimpresenter.h
@@ -12,7 +12,7 @@ class LegoHideAnimPresenter : public LegoLoopingAnimPresenter {
 	// FUNCTION: LEGO1 0x1006d880
 	inline const char* ClassName() const override // vtable+0xc
 	{
-		// GLOBAL: LEGO1 0x100f06cc
+		// STRING: LEGO1 0x100f06cc
 		return "LegoHideAnimPresenter";
 	}
 
diff --git a/LEGO1/legojetski.h b/LEGO1/legojetski.h
index b7909a46..09a9f8d1 100644
--- a/LEGO1/legojetski.h
+++ b/LEGO1/legojetski.h
@@ -9,7 +9,7 @@ class LegoJetski : public LegoJetskiRaceActor {
 	// FUNCTION: LEGO1 0x10013e80
 	inline const char* ClassName() const override // vtable+0xc
 	{
-		// GLOBAL: LEGO1 0x100f053c
+		// STRING: LEGO1 0x100f053c
 		return "LegoJetski";
 	}
 
diff --git a/LEGO1/legojetskiraceactor.h b/LEGO1/legojetskiraceactor.h
index d2ab88d8..28d151e8 100644
--- a/LEGO1/legojetskiraceactor.h
+++ b/LEGO1/legojetskiraceactor.h
@@ -9,7 +9,7 @@ class LegoJetskiRaceActor : public LegoCarRaceActor {
 	// FUNCTION: LEGO1 0x10081d80
 	inline const char* ClassName() const override // vtable+0xc
 	{
-		// GLOBAL: LEGO1 0x100f0554
+		// STRING: LEGO1 0x100f0554
 		return "LegoJetskiRaceActor";
 	}
 
diff --git a/LEGO1/legoloadcachesoundpresenter.h b/LEGO1/legoloadcachesoundpresenter.h
index c9255b01..1c26cdec 100644
--- a/LEGO1/legoloadcachesoundpresenter.h
+++ b/LEGO1/legoloadcachesoundpresenter.h
@@ -14,7 +14,7 @@ class LegoLoadCacheSoundPresenter : public MxWavePresenter {
 	// FUNCTION: LEGO1 0x10018450
 	inline const char* ClassName() const override // vtable+0xc
 	{
-		// GLOBAL: LEGO1 0x100f05a0
+		// STRING: LEGO1 0x100f05a0
 		return "LegoLoadCacheSoundPresenter";
 	}
 
diff --git a/LEGO1/legolocomotionanimpresenter.h b/LEGO1/legolocomotionanimpresenter.h
index e7d7af25..36facd1d 100644
--- a/LEGO1/legolocomotionanimpresenter.h
+++ b/LEGO1/legolocomotionanimpresenter.h
@@ -11,7 +11,7 @@ class LegoLocomotionAnimPresenter : public LegoLoopingAnimPresenter {
 	// FUNCTION: LEGO1 0x1006ce50
 	inline const char* ClassName() const override // vtable+0xc
 	{
-		// GLOBAL: LEGO1 0x100f06e4
+		// STRING: LEGO1 0x100f06e4
 		return "LegoLocomotionAnimPresenter";
 	}
 
diff --git a/LEGO1/legoloopinganimpresenter.h b/LEGO1/legoloopinganimpresenter.h
index 7f033a98..a17c671c 100644
--- a/LEGO1/legoloopinganimpresenter.h
+++ b/LEGO1/legoloopinganimpresenter.h
@@ -10,7 +10,7 @@ class LegoLoopingAnimPresenter : public LegoAnimPresenter {
 	// FUNCTION: LEGO1 0x1000c9a0
 	inline const char* ClassName() const override // vtable+0xc
 	{
-		// GLOBAL: LEGO1 0x100f0700
+		// STRING: LEGO1 0x100f0700
 		return "LegoLoopingAnimPresenter";
 	}
 
diff --git a/LEGO1/legomodelpresenter.h b/LEGO1/legomodelpresenter.h
index df9cbba1..b55372dd 100644
--- a/LEGO1/legomodelpresenter.h
+++ b/LEGO1/legomodelpresenter.h
@@ -12,7 +12,7 @@ class LegoModelPresenter : public MxVideoPresenter {
 	// FUNCTION: LEGO1 0x1000ccb0
 	inline const char* ClassName() const override // vtable+0xc
 	{
-		// GLOBAL: LEGO1 0x100f067c
+		// STRING: LEGO1 0x100f067c
 		return "LegoModelPresenter";
 	}
 
diff --git a/LEGO1/legonavcontroller.h b/LEGO1/legonavcontroller.h
index ffaf99cb..c6505341 100644
--- a/LEGO1/legonavcontroller.h
+++ b/LEGO1/legonavcontroller.h
@@ -42,7 +42,7 @@ class LegoNavController : public MxCore {
 	// FUNCTION: LEGO1 0x10054b80
 	inline const char* ClassName() const override // vtable+0xc
 	{
-		// GLOBAL: LEGO1 0x100f66d8
+		// STRING: LEGO1 0x100f66d8
 		return "LegoNavController";
 	}
 
diff --git a/LEGO1/legoomni.h b/LEGO1/legoomni.h
index 81c3d6f1..f0ac8369 100644
--- a/LEGO1/legoomni.h
+++ b/LEGO1/legoomni.h
@@ -76,7 +76,7 @@ class LegoOmni : public MxOmni {
 	// FUNCTION: LEGO1 0x10058aa0
 	inline virtual const char* ClassName() const override // vtable+0c
 	{
-		// GLOBAL: LEGO1 0x100f671c
+		// STRING: LEGO1 0x100f671c
 		return "LegoOmni";
 	}
 
diff --git a/LEGO1/legopalettepresenter.h b/LEGO1/legopalettepresenter.h
index c350159b..f725149d 100644
--- a/LEGO1/legopalettepresenter.h
+++ b/LEGO1/legopalettepresenter.h
@@ -15,7 +15,7 @@ class LegoPalettePresenter : public MxVideoPresenter {
 	// FUNCTION: LEGO1 0x10079f30
 	inline const char* ClassName() const override // vtable+0xc
 	{
-		// GLOBAL: LEGO1 0x100f061c
+		// STRING: LEGO1 0x100f061c
 		return "LegoPalettePresenter";
 	}
 
diff --git a/LEGO1/legopartpresenter.h b/LEGO1/legopartpresenter.h
index 936d4876..6695a70b 100644
--- a/LEGO1/legopartpresenter.h
+++ b/LEGO1/legopartpresenter.h
@@ -10,7 +10,7 @@ class LegoPartPresenter : public MxMediaPresenter {
 	// FUNCTION: LEGO1 0x1000cf70
 	inline const char* ClassName() const override // vtable+0xc
 	{
-		// GLOBAL: LEGO1 0x100f05d8
+		// STRING: LEGO1 0x100f05d8
 		return "LegoPartPresenter";
 	}
 
diff --git a/LEGO1/legopathactor.h b/LEGO1/legopathactor.h
index f331e8ce..a3f5756c 100644
--- a/LEGO1/legopathactor.h
+++ b/LEGO1/legopathactor.h
@@ -15,7 +15,7 @@ class LegoPathActor : public LegoActor {
 	// FUNCTION: LEGO1 0x1000c430
 	inline const char* ClassName() const override // vtable+0xc
 	{
-		// GLOBAL: LEGO1 0x100f0114
+		// STRING: LEGO1 0x100f0114
 		return "LegoPathActor";
 	}
 
diff --git a/LEGO1/legopathcontroller.h b/LEGO1/legopathcontroller.h
index 7bb6d30d..f7278ca8 100644
--- a/LEGO1/legopathcontroller.h
+++ b/LEGO1/legopathcontroller.h
@@ -15,7 +15,7 @@ class LegoPathController : public MxCore {
 	// FUNCTION: LEGO1 0x10045110
 	inline const char* ClassName() const override // vtable+0xc
 	{
-		// GLOBAL: LEGO1 0x100f11b8
+		// STRING: LEGO1 0x100f11b8
 		return "LegoPathController";
 	}
 
diff --git a/LEGO1/legopathpresenter.h b/LEGO1/legopathpresenter.h
index 8fe2d5ee..de7b14d1 100644
--- a/LEGO1/legopathpresenter.h
+++ b/LEGO1/legopathpresenter.h
@@ -12,7 +12,7 @@ class LegoPathPresenter : public MxMediaPresenter {
 	// FUNCTION: LEGO1 0x100449a0
 	inline const char* ClassName() const override // vtable+0xc
 	{
-		// GLOBAL: LEGO1 0x100f0690
+		// STRING: LEGO1 0x100f0690
 		return "LegoPathPresenter";
 	}
 
diff --git a/LEGO1/legophonemepresenter.h b/LEGO1/legophonemepresenter.h
index 7b620723..330b1c7a 100644
--- a/LEGO1/legophonemepresenter.h
+++ b/LEGO1/legophonemepresenter.h
@@ -16,7 +16,7 @@ class LegoPhonemePresenter : public MxFlcPresenter {
 	// FUNCTION: LEGO1 0x1004e310
 	inline const char* ClassName() const override // vtable+0xc
 	{
-		// GLOBAL: LEGO1 0x100f064c
+		// STRING: LEGO1 0x100f064c
 		return "LegoPhonemePresenter";
 	}
 
diff --git a/LEGO1/legoplantmanager.h b/LEGO1/legoplantmanager.h
index 87a6ec79..7fd20746 100644
--- a/LEGO1/legoplantmanager.h
+++ b/LEGO1/legoplantmanager.h
@@ -15,7 +15,7 @@ class LegoPlantManager : public MxCore {
 	// FUNCTION: LEGO1 0x10026290
 	inline const char* ClassName() const override // vtable+0xc
 	{
-		// GLOBAL: LEGO1 0x100f318c
+		// STRING: LEGO1 0x100f318c
 		return "LegoPlantManager";
 	}
 
diff --git a/LEGO1/legorace.h b/LEGO1/legorace.h
index 9ddbdfb3..530c289c 100644
--- a/LEGO1/legorace.h
+++ b/LEGO1/legorace.h
@@ -18,7 +18,7 @@ class LegoRace : public LegoWorld {
 	// FUNCTION: LEGO1 0x10015ba0
 	inline const char* ClassName() const override // vtable+0xc
 	{
-		// GLOBAL: LEGO1 0x100f07c4
+		// STRING: LEGO1 0x100f07c4
 		return "LegoRace";
 	}
 
diff --git a/LEGO1/legoraceactor.h b/LEGO1/legoraceactor.h
index 9a4e34ec..eb459e81 100644
--- a/LEGO1/legoraceactor.h
+++ b/LEGO1/legoraceactor.h
@@ -9,7 +9,7 @@ class LegoRaceActor : public LegoAnimActor {
 	// FUNCTION: LEGO1 0x10014af0
 	inline const char* ClassName() const override // vtable+0xc
 	{
-		// GLOBAL: LEGO1 0x100f0bf4
+		// STRING: LEGO1 0x100f0bf4
 		return "LegoRaceActor";
 	}
 
diff --git a/LEGO1/legoracecar.h b/LEGO1/legoracecar.h
index 38099af2..d3800b5a 100644
--- a/LEGO1/legoracecar.h
+++ b/LEGO1/legoracecar.h
@@ -11,7 +11,7 @@ class LegoRaceCar : public LegoCarRaceActor {
 	// FUNCTION: LEGO1 0x10014290
 	inline const char* ClassName() const override // vtable+0xc
 	{
-		// GLOBAL: LEGO1 0x100f0548
+		// STRING: LEGO1 0x100f0548
 		return "LegoRaceCar";
 	}
 
diff --git a/LEGO1/legostate.h b/LEGO1/legostate.h
index 55f0a1af..ba4403de 100644
--- a/LEGO1/legostate.h
+++ b/LEGO1/legostate.h
@@ -14,7 +14,7 @@ class LegoState : public MxCore {
 	// FUNCTION: LEGO1 0x100060d0
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// GLOBAL: LEGO1 0x100f01b8
+		// STRING: LEGO1 0x100f01b8
 		return "LegoState";
 	}
 
diff --git a/LEGO1/legotexturepresenter.h b/LEGO1/legotexturepresenter.h
index 36cc59b9..0ac13926 100644
--- a/LEGO1/legotexturepresenter.h
+++ b/LEGO1/legotexturepresenter.h
@@ -12,7 +12,7 @@ class LegoTexturePresenter : public MxMediaPresenter {
 	// FUNCTION: LEGO1 0x1000ce50
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// GLOBAL: LEGO1 0x100f0664
+		// STRING: LEGO1 0x100f0664
 		return "LegoTexturePresenter";
 	}
 
diff --git a/LEGO1/legoworld.h b/LEGO1/legoworld.h
index fadeea5c..f6210e8e 100644
--- a/LEGO1/legoworld.h
+++ b/LEGO1/legoworld.h
@@ -23,7 +23,7 @@ class LegoWorld : public LegoEntity {
 	// FUNCTION: LEGO1 0x1001d690
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// GLOBAL: LEGO1 0x100f0058
+		// STRING: LEGO1 0x100f0058
 		return "LegoWorld";
 	}
 
diff --git a/LEGO1/legoworldpresenter.h b/LEGO1/legoworldpresenter.h
index 3cd02a8f..be18baca 100644
--- a/LEGO1/legoworldpresenter.h
+++ b/LEGO1/legoworldpresenter.h
@@ -15,7 +15,7 @@ class LegoWorldPresenter : public LegoEntityPresenter {
 	// FUNCTION: LEGO1 0x10066630
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// GLOBAL: LEGO1 0x100f0608
+		// STRING: LEGO1 0x100f0608
 		return "LegoWorldPresenter";
 	}
 
diff --git a/LEGO1/motorcycle.h b/LEGO1/motorcycle.h
index a698fcd8..af04b4ad 100644
--- a/LEGO1/motorcycle.h
+++ b/LEGO1/motorcycle.h
@@ -13,7 +13,7 @@ class Motorcycle : public IslePathActor {
 	// FUNCTION: LEGO1 0x10035840
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// GLOBAL: LEGO1 0x100f38e8
+		// STRING: LEGO1 0x100f38e8
 		return "Motorcycle";
 	}
 
diff --git a/LEGO1/mxaudiopresenter.h b/LEGO1/mxaudiopresenter.h
index f1d207e1..73024aac 100644
--- a/LEGO1/mxaudiopresenter.h
+++ b/LEGO1/mxaudiopresenter.h
@@ -13,7 +13,7 @@ class MxAudioPresenter : public MxMediaPresenter {
 	// FUNCTION: LEGO1 0x1000d280
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// GLOBAL: LEGO1 0x100f078c
+		// STRING: LEGO1 0x100f078c
 		return "MxAudioPresenter";
 	}
 
diff --git a/LEGO1/mxbackgroundaudiomanager.h b/LEGO1/mxbackgroundaudiomanager.h
index cb03624c..9d47947f 100644
--- a/LEGO1/mxbackgroundaudiomanager.h
+++ b/LEGO1/mxbackgroundaudiomanager.h
@@ -21,7 +21,7 @@ class MxBackgroundAudioManager : public MxCore {
 	// FUNCTION: LEGO1 0x1007eb70
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// GLOBAL: LEGO1 0x100f7ac4
+		// STRING: LEGO1 0x100f7ac4
 		return "MxBackgroundAudioManager";
 	}
 
diff --git a/LEGO1/mxcompositemediapresenter.h b/LEGO1/mxcompositemediapresenter.h
index 4f0efc76..ed6f1335 100644
--- a/LEGO1/mxcompositemediapresenter.h
+++ b/LEGO1/mxcompositemediapresenter.h
@@ -15,7 +15,7 @@ class MxCompositeMediaPresenter : public MxCompositePresenter {
 	// FUNCTION: LEGO1 0x10073f10
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// GLOBAL: LEGO1 0x100f02d4
+		// STRING: LEGO1 0x100f02d4
 		return "MxCompositeMediaPresenter";
 	}
 
diff --git a/LEGO1/mxcompositepresenter.h b/LEGO1/mxcompositepresenter.h
index f6929b6d..6f14e615 100644
--- a/LEGO1/mxcompositepresenter.h
+++ b/LEGO1/mxcompositepresenter.h
@@ -19,7 +19,7 @@ class MxCompositePresenter : public MxPresenter {
 	// FUNCTION: LEGO1 0x100b6210
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// GLOBAL: LEGO1 0x100f0774
+		// STRING: LEGO1 0x100f0774
 		return "MxCompositePresenter";
 	}
 
diff --git a/LEGO1/mxcontrolpresenter.h b/LEGO1/mxcontrolpresenter.h
index 515af808..9779e45f 100644
--- a/LEGO1/mxcontrolpresenter.h
+++ b/LEGO1/mxcontrolpresenter.h
@@ -14,7 +14,7 @@ class MxControlPresenter : public MxCompositePresenter {
 	// FUNCTION: LEGO1 0x10044000
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// GLOBAL: LEGO1 0x100f0514
+		// STRING: LEGO1 0x100f0514
 		return "MxControlPresenter";
 	}
 
diff --git a/LEGO1/mxcore.h b/LEGO1/mxcore.h
index 5792eaf2..db812bba 100644
--- a/LEGO1/mxcore.h
+++ b/LEGO1/mxcore.h
@@ -20,7 +20,7 @@ class MxCore {
 	// FUNCTION: LEGO1 0x100144c0
 	inline virtual const char* ClassName() const // vtable+0c
 	{
-		// GLOBAL: LEGO1 0x100f007c
+		// STRING: LEGO1 0x100f007c
 		return "MxCore";
 	}
 
diff --git a/LEGO1/mxdiskstreamcontroller.h b/LEGO1/mxdiskstreamcontroller.h
index 3fc5111f..52032675 100644
--- a/LEGO1/mxdiskstreamcontroller.h
+++ b/LEGO1/mxdiskstreamcontroller.h
@@ -22,7 +22,7 @@ class MxDiskStreamController : public MxStreamController {
 	// FUNCTION: LEGO1 0x100c7360
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// GLOBAL: LEGO1 0x10102144
+		// STRING: LEGO1 0x10102144
 		return "MxDiskStreamController";
 	}
 
diff --git a/LEGO1/mxdiskstreamprovider.h b/LEGO1/mxdiskstreamprovider.h
index bc73c0e4..1314e3f9 100644
--- a/LEGO1/mxdiskstreamprovider.h
+++ b/LEGO1/mxdiskstreamprovider.h
@@ -32,7 +32,7 @@ class MxDiskStreamProvider : public MxStreamProvider {
 	// FUNCTION: LEGO1 0x100d1160
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// GLOBAL: LEGO1 0x1010287c
+		// STRING: LEGO1 0x1010287c
 		return "MxDiskStreamProvider";
 	}
 
diff --git a/LEGO1/mxdsaction.h b/LEGO1/mxdsaction.h
index 4898eb91..c32dd4aa 100644
--- a/LEGO1/mxdsaction.h
+++ b/LEGO1/mxdsaction.h
@@ -33,7 +33,7 @@ class MxDSAction : public MxDSObject {
 	// FUNCTION: LEGO1 0x100ad980
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// GLOBAL: LEGO1 0x101013f4
+		// STRING: LEGO1 0x101013f4
 		return "MxDSAction";
 	}
 
diff --git a/LEGO1/mxdsanim.h b/LEGO1/mxdsanim.h
index ee206e6a..213fcf87 100644
--- a/LEGO1/mxdsanim.h
+++ b/LEGO1/mxdsanim.h
@@ -16,7 +16,7 @@ class MxDSAnim : public MxDSMediaAction {
 	// FUNCTION: LEGO1 0x100c9060
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// GLOBAL: LEGO1 0x101025d8
+		// STRING: LEGO1 0x101025d8
 		return "MxDSAnim";
 	}
 
diff --git a/LEGO1/mxdsbuffer.h b/LEGO1/mxdsbuffer.h
index e9fe2675..daa3263e 100644
--- a/LEGO1/mxdsbuffer.h
+++ b/LEGO1/mxdsbuffer.h
@@ -27,7 +27,7 @@ class MxDSBuffer : public MxCore {
 	// FUNCTION: LEGO1 0x100c6500
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// GLOBAL: LEGO1 0x101025b8
+		// STRING: LEGO1 0x101025b8
 		return "MxDSBuffer";
 	}
 
diff --git a/LEGO1/mxdschunk.h b/LEGO1/mxdschunk.h
index 70209596..9f2ac9b6 100644
--- a/LEGO1/mxdschunk.h
+++ b/LEGO1/mxdschunk.h
@@ -25,7 +25,7 @@ class MxDSChunk : public MxCore {
 	// FUNCTION: LEGO1 0x100be0c0
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// GLOBAL: LEGO1 0x10101e6c
+		// STRING: LEGO1 0x10101e6c
 		return "MxDSChunk";
 	}
 
diff --git a/LEGO1/mxdsevent.h b/LEGO1/mxdsevent.h
index 8c6e825e..01cf1fa4 100644
--- a/LEGO1/mxdsevent.h
+++ b/LEGO1/mxdsevent.h
@@ -14,7 +14,7 @@ class MxDSEvent : public MxDSMediaAction {
 	// FUNCTION: LEGO1 0x100c9660
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// GLOBAL: LEGO1 0x101025f0
+		// STRING: LEGO1 0x101025f0
 		return "MxDSEvent";
 	}
 
diff --git a/LEGO1/mxdsfile.h b/LEGO1/mxdsfile.h
index e453cb9a..34afeccb 100644
--- a/LEGO1/mxdsfile.h
+++ b/LEGO1/mxdsfile.h
@@ -17,7 +17,7 @@ class MxDSFile : public MxDSSource {
 	// FUNCTION: LEGO1 0x100c0120
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// GLOBAL: LEGO1 0x10102594
+		// STRING: LEGO1 0x10102594
 		return "MxDSFile";
 	}
 
diff --git a/LEGO1/mxdsmediaaction.h b/LEGO1/mxdsmediaaction.h
index 72fcf036..1f1b97d5 100644
--- a/LEGO1/mxdsmediaaction.h
+++ b/LEGO1/mxdsmediaaction.h
@@ -18,7 +18,7 @@ class MxDSMediaAction : public MxDSAction {
 	// FUNCTION: LEGO1 0x100c8be0
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// GLOBAL: LEGO1 0x100f7624
+		// STRING: LEGO1 0x100f7624
 		return "MxDSMediaAction";
 	}
 
diff --git a/LEGO1/mxdsmultiaction.h b/LEGO1/mxdsmultiaction.h
index 5003a378..a600b787 100644
--- a/LEGO1/mxdsmultiaction.h
+++ b/LEGO1/mxdsmultiaction.h
@@ -17,7 +17,7 @@ class MxDSMultiAction : public MxDSAction {
 	// FUNCTION: LEGO1 0x100c9f50
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// GLOBAL: LEGO1 0x10101dbc
+		// STRING: LEGO1 0x10101dbc
 		return "MxDSMultiAction";
 	}
 
diff --git a/LEGO1/mxdsobjectaction.h b/LEGO1/mxdsobjectaction.h
index 3286f110..a31f6d6b 100644
--- a/LEGO1/mxdsobjectaction.h
+++ b/LEGO1/mxdsobjectaction.h
@@ -15,7 +15,7 @@ class MxDSObjectAction : public MxDSMediaAction {
 	// FUNCTION: LEGO1 0x100c88e0
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// GLOBAL: LEGO1 0x101025c4
+		// STRING: LEGO1 0x101025c4
 		return "MxDSObjectAction";
 	}
 
diff --git a/LEGO1/mxdsparallelaction.h b/LEGO1/mxdsparallelaction.h
index 65028ce3..89fc1df0 100644
--- a/LEGO1/mxdsparallelaction.h
+++ b/LEGO1/mxdsparallelaction.h
@@ -16,7 +16,7 @@ class MxDSParallelAction : public MxDSMultiAction {
 	// FUNCTION: LEGO1 0x100caf00
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// GLOBAL: LEGO1 0x10102608
+		// STRING: LEGO1 0x10102608
 		return "MxDSParallelAction";
 	}
 
diff --git a/LEGO1/mxdsselectaction.h b/LEGO1/mxdsselectaction.h
index 187e3a72..6b68bfc9 100644
--- a/LEGO1/mxdsselectaction.h
+++ b/LEGO1/mxdsselectaction.h
@@ -18,7 +18,7 @@ class MxDSSelectAction : public MxDSParallelAction {
 	// FUNCTION: LEGO1 0x100cb6f0
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// GLOBAL: LEGO1 0x1010261c
+		// STRING: LEGO1 0x1010261c
 		return "MxDSSelectAction";
 	}
 
diff --git a/LEGO1/mxdsserialaction.h b/LEGO1/mxdsserialaction.h
index ea758afa..c4fa18b3 100644
--- a/LEGO1/mxdsserialaction.h
+++ b/LEGO1/mxdsserialaction.h
@@ -17,7 +17,7 @@ class MxDSSerialAction : public MxDSMultiAction {
 	// FUNCTION: LEGO1 0x100caad0
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// GLOBAL: LEGO1 0x100f75dc
+		// STRING: LEGO1 0x100f75dc
 		return "MxDSSerialAction";
 	}
 
diff --git a/LEGO1/mxdssound.h b/LEGO1/mxdssound.h
index 45f93942..5dc6bbd7 100644
--- a/LEGO1/mxdssound.h
+++ b/LEGO1/mxdssound.h
@@ -16,7 +16,7 @@ class MxDSSound : public MxDSMediaAction {
 	// FUNCTION: LEGO1 0x100c9330
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// GLOBAL: LEGO1 0x101025e4
+		// STRING: LEGO1 0x101025e4
 		return "MxDSSound";
 	}
 
diff --git a/LEGO1/mxdssource.h b/LEGO1/mxdssource.h
index 711ba110..db009fb4 100644
--- a/LEGO1/mxdssource.h
+++ b/LEGO1/mxdssource.h
@@ -14,7 +14,7 @@ class MxDSSource : public MxCore {
 	// FUNCTION: LEGO1 0x100c0010
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// GLOBAL: LEGO1 0x10102588
+		// STRING: LEGO1 0x10102588
 		return "MxDSSource";
 	}
 
diff --git a/LEGO1/mxdsstill.h b/LEGO1/mxdsstill.h
index 846f8293..268fe79f 100644
--- a/LEGO1/mxdsstill.h
+++ b/LEGO1/mxdsstill.h
@@ -16,7 +16,7 @@ class MxDSStill : public MxDSMediaAction {
 	// FUNCTION: LEGO1 0x100c9930
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// GLOBAL: LEGO1 0x101025fc
+		// STRING: LEGO1 0x101025fc
 		return "MxDSStill";
 	}
 
diff --git a/LEGO1/mxdssubscriber.h b/LEGO1/mxdssubscriber.h
index 13d62040..8187e354 100644
--- a/LEGO1/mxdssubscriber.h
+++ b/LEGO1/mxdssubscriber.h
@@ -19,7 +19,7 @@ class MxDSSubscriber : public MxCore {
 	// FUNCTION: LEGO1 0x100b7d50
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// GLOBAL: LEGO1 0x101020f8
+		// STRING: LEGO1 0x101020f8
 		return "MxDSSubscriber";
 	}
 
diff --git a/LEGO1/mxentity.h b/LEGO1/mxentity.h
index a83462cd..64a003ee 100644
--- a/LEGO1/mxentity.h
+++ b/LEGO1/mxentity.h
@@ -17,7 +17,7 @@ class MxEntity : public MxCore {
 	// FUNCTION: LEGO1 0x1000c180
 	inline virtual const char* ClassName() const override // vtable+0xc
 	{
-		// GLOBAL: LEGO1 0x100f0070
+		// STRING: LEGO1 0x100f0070
 		return "MxEntity";
 	}
 
diff --git a/LEGO1/mxeventpresenter.h b/LEGO1/mxeventpresenter.h
index d022f609..201b15e5 100644
--- a/LEGO1/mxeventpresenter.h
+++ b/LEGO1/mxeventpresenter.h
@@ -14,7 +14,7 @@ class MxEventPresenter : public MxMediaPresenter {
 	// FUNCTION: LEGO1 0x100c2c30
 	inline virtual const char* ClassName() const override // vtable+0xc
 	{
-		// GLOBAL: LEGO1 0x10101dcc
+		// STRING: LEGO1 0x10101dcc
 		return "MxEventPresenter";
 	}
 
diff --git a/LEGO1/mxflcpresenter.h b/LEGO1/mxflcpresenter.h
index 393e2810..0ad44de3 100644
--- a/LEGO1/mxflcpresenter.h
+++ b/LEGO1/mxflcpresenter.h
@@ -22,7 +22,7 @@ class MxFlcPresenter : public MxVideoPresenter {
 	// FUNCTION: LEGO1 0x100b33f0
 	inline virtual const char* ClassName() const override // vtable+0xc
 	{
-		// GLOBAL: LEGO1 0x100f43c8
+		// STRING: LEGO1 0x100f43c8
 		return "MxFlcPresenter";
 	}
 
diff --git a/LEGO1/mxloopingflcpresenter.h b/LEGO1/mxloopingflcpresenter.h
index e4f781c9..c05c3657 100644
--- a/LEGO1/mxloopingflcpresenter.h
+++ b/LEGO1/mxloopingflcpresenter.h
@@ -14,7 +14,7 @@ class MxLoopingFlcPresenter : public MxFlcPresenter {
 	// FUNCTION: LEGO1 0x100b4380
 	inline virtual const char* ClassName() const override // vtable+0xc
 	{
-		// GLOBAL: LEGO1 0x10101e20
+		// STRING: LEGO1 0x10101e20
 		return "MxLoopingFlcPresenter";
 	}
 
diff --git a/LEGO1/mxloopingmidipresenter.h b/LEGO1/mxloopingmidipresenter.h
index 49df30f4..e47ef30d 100644
--- a/LEGO1/mxloopingmidipresenter.h
+++ b/LEGO1/mxloopingmidipresenter.h
@@ -10,7 +10,7 @@ class MxLoopingMIDIPresenter : public MxMIDIPresenter {
 	// FUNCTION: LEGO1 0x100b1830
 	inline virtual const char* ClassName() const override // vtable+0xc
 	{
-		// GLOBAL: LEGO1 0x10101de0
+		// STRING: LEGO1 0x10101de0
 		return "MxLoopingMIDIPresenter";
 	}
 
diff --git a/LEGO1/mxloopingsmkpresenter.h b/LEGO1/mxloopingsmkpresenter.h
index 2f20676e..9506de84 100644
--- a/LEGO1/mxloopingsmkpresenter.h
+++ b/LEGO1/mxloopingsmkpresenter.h
@@ -14,7 +14,7 @@ class MxLoopingSmkPresenter : public MxSmkPresenter {
 	// FUNCTION: LEGO1 0x100b4920
 	inline virtual const char* ClassName() const override // vtable+0xc
 	{
-		// GLOBAL: LEGO1 0x10101e08
+		// STRING: LEGO1 0x10101e08
 		return "MxLoopingSmkPresenter";
 	}
 
diff --git a/LEGO1/mxmediapresenter.h b/LEGO1/mxmediapresenter.h
index 4a482a78..32c7b6d0 100644
--- a/LEGO1/mxmediapresenter.h
+++ b/LEGO1/mxmediapresenter.h
@@ -18,7 +18,7 @@ class MxMediaPresenter : public MxPresenter {
 	// FUNCTION: LEGO1 0x1000c5c0
 	inline virtual const char* ClassName() const override // vtable+0xc
 	{
-		// GLOBAL: LEGO1 0x100f074c
+		// STRING: LEGO1 0x100f074c
 		return "MxMediaPresenter";
 	}
 
diff --git a/LEGO1/mxmidipresenter.h b/LEGO1/mxmidipresenter.h
index 09e11dde..2ec11b0b 100644
--- a/LEGO1/mxmidipresenter.h
+++ b/LEGO1/mxmidipresenter.h
@@ -14,7 +14,7 @@ class MxMIDIPresenter : public MxMusicPresenter {
 	// FUNCTION: LEGO1 0x100c2650
 	inline virtual const char* ClassName() const override // vtable+0xc
 	{
-		// GLOBAL: LEGO1 0x10101df8
+		// STRING: LEGO1 0x10101df8
 		return "MxMIDIPresenter";
 	}
 
diff --git a/LEGO1/mxmusicpresenter.h b/LEGO1/mxmusicpresenter.h
index 965c38df..bba2afb0 100644
--- a/LEGO1/mxmusicpresenter.h
+++ b/LEGO1/mxmusicpresenter.h
@@ -13,7 +13,7 @@ class MxMusicPresenter : public MxAudioPresenter {
 	// FUNCTION: LEGO1 0x100c23a0
 	inline virtual const char* ClassName() const override // vtable+0xc
 	{
-		// GLOBAL: LEGO1 0x10101e48
+		// STRING: LEGO1 0x10101e48
 		return "MxMusicPresenter";
 	}
 
diff --git a/LEGO1/mxnextactiondatastart.h b/LEGO1/mxnextactiondatastart.h
index c9534899..15e35b00 100644
--- a/LEGO1/mxnextactiondatastart.h
+++ b/LEGO1/mxnextactiondatastart.h
@@ -18,7 +18,7 @@ class MxNextActionDataStart : public MxCore {
 	// FUNCTION: LEGO1 0x100c1900
 	inline virtual const char* ClassName() const override // vtable+0xc
 	{
-		// GLOBAL: LEGO1 0x101025a0
+		// STRING: LEGO1 0x101025a0
 		return "MxNextActionDataStart";
 	}
 
diff --git a/LEGO1/mxobjectfactory.h b/LEGO1/mxobjectfactory.h
index cfc97308..3741bfa3 100644
--- a/LEGO1/mxobjectfactory.h
+++ b/LEGO1/mxobjectfactory.h
@@ -26,7 +26,7 @@ class MxObjectFactory : public MxCore {
 	// FUNCTION: LEGO1 0x10008f70
 	inline virtual const char* ClassName() const override // vtable+0xc
 	{
-		// GLOBAL: LEGO1 0x100f0730
+		// STRING: LEGO1 0x100f0730
 		return "MxObjectFactory";
 	}
 
diff --git a/LEGO1/mxpalette.cpp b/LEGO1/mxpalette.cpp
index 6d4f0306..8431fb76 100644
--- a/LEGO1/mxpalette.cpp
+++ b/LEGO1/mxpalette.cpp
@@ -4,7 +4,6 @@
 #include "mxvideomanager.h"
 
 // GLOBAL: LEGO1 0x10102188
-// SIZE 0x400
 PALETTEENTRY g_defaultPaletteEntries[256] = {
 	{0u, 0u, 0u, 0u},       {128u, 0u, 0u, 0u},     {0u, 128u, 0u, 0u},     {128u, 128u, 0u, 0u},
 	{0u, 0u, 128u, 0u},     {128u, 0u, 128u, 0u},   {0u, 128u, 128u, 0u},   {128u, 128u, 128u, 0u},
diff --git a/LEGO1/mxpresenter.h b/LEGO1/mxpresenter.h
index e0e91fe6..bc327c1f 100644
--- a/LEGO1/mxpresenter.h
+++ b/LEGO1/mxpresenter.h
@@ -34,7 +34,7 @@ class MxPresenter : public MxCore {
 	// FUNCTION: LEGO1 0x1000bfe0
 	inline virtual const char* ClassName() const override // vtable+0xc
 	{
-		// GLOBAL: LEGO1 0x100f0740
+		// STRING: LEGO1 0x100f0740
 		return "MxPresenter";
 	}
 
diff --git a/LEGO1/mxramstreamcontroller.h b/LEGO1/mxramstreamcontroller.h
index 008fe458..aa70ec33 100644
--- a/LEGO1/mxramstreamcontroller.h
+++ b/LEGO1/mxramstreamcontroller.h
@@ -14,7 +14,7 @@ class MxRAMStreamController : public MxStreamController {
 	// FUNCTION: LEGO1 0x100b9430
 	inline virtual const char* ClassName() const override // vtable+0xc
 	{
-		// GLOBAL: LEGO1 0x10102118
+		// STRING: LEGO1 0x10102118
 		return "MxRAMStreamController";
 	}
 
diff --git a/LEGO1/mxramstreamprovider.h b/LEGO1/mxramstreamprovider.h
index 112f6b71..16ed5a4c 100644
--- a/LEGO1/mxramstreamprovider.h
+++ b/LEGO1/mxramstreamprovider.h
@@ -12,7 +12,7 @@ class MxRAMStreamProvider : public MxStreamProvider {
 	// FUNCTION: LEGO1 0x100d0970
 	inline virtual const char* ClassName() const override // vtable+0xc
 	{
-		// GLOBAL: LEGO1 0x10102864
+		// STRING: LEGO1 0x10102864
 		return "MxRAMStreamProvider";
 	}
 
diff --git a/LEGO1/mxsmkpresenter.h b/LEGO1/mxsmkpresenter.h
index 95b6a201..4c3913cc 100644
--- a/LEGO1/mxsmkpresenter.h
+++ b/LEGO1/mxsmkpresenter.h
@@ -15,7 +15,7 @@ class MxSmkPresenter : public MxVideoPresenter {
 	// FUNCTION: LEGO1 0x100b3730
 	inline virtual const char* ClassName() const override // vtable+0xc
 	{
-		// GLOBAL: LEGO1 0x10101e38
+		// STRING: LEGO1 0x10101e38
 		return "MxSmkPresenter";
 	}
 
diff --git a/LEGO1/mxsoundpresenter.h b/LEGO1/mxsoundpresenter.h
index 1c4051ee..d61d8088 100644
--- a/LEGO1/mxsoundpresenter.h
+++ b/LEGO1/mxsoundpresenter.h
@@ -13,7 +13,7 @@ class MxSoundPresenter : public MxAudioPresenter {
 	// FUNCTION: LEGO1 0x1000d4a0
 	inline virtual const char* ClassName() const // vtable+0x0c
 	{
-		// GLOBAL: LEGO1 0x100f07a0
+		// STRING: LEGO1 0x100f07a0
 		return "MxSoundPresenter";
 	};
 
diff --git a/LEGO1/mxstillpresenter.h b/LEGO1/mxstillpresenter.h
index e28ab84f..828f58b7 100644
--- a/LEGO1/mxstillpresenter.h
+++ b/LEGO1/mxstillpresenter.h
@@ -15,7 +15,7 @@ class MxStillPresenter : public MxVideoPresenter {
 	// FUNCTION: LEGO1 0x100435c0
 	inline virtual const char* ClassName() const override // vtable+0xc
 	{
-		// GLOBAL: LEGO1 0x100f0184
+		// STRING: LEGO1 0x100f0184
 		return "MxStillPresenter";
 	}
 
diff --git a/LEGO1/mxstreamchunk.h b/LEGO1/mxstreamchunk.h
index 18bc2335..5b258603 100644
--- a/LEGO1/mxstreamchunk.h
+++ b/LEGO1/mxstreamchunk.h
@@ -17,7 +17,7 @@ class MxStreamChunk : public MxDSChunk {
 	// FUNCTION: LEGO1 0x100b1fe0
 	inline virtual const char* ClassName() const override // vtable+0xc
 	{
-		// GLOBAL: LEGO1 0x10101e5c
+		// STRING: LEGO1 0x10101e5c
 		return "MxStreamChunk";
 	}
 
diff --git a/LEGO1/mxstreamcontroller.h b/LEGO1/mxstreamcontroller.h
index 0389772b..bbd1eb3d 100644
--- a/LEGO1/mxstreamcontroller.h
+++ b/LEGO1/mxstreamcontroller.h
@@ -24,7 +24,7 @@ class MxStreamController : public MxCore {
 	// FUNCTION: LEGO1 0x100c0f10
 	inline virtual const char* ClassName() const override // vtable+0xc
 	{
-		// GLOBAL: LEGO1 0x10102130
+		// STRING: LEGO1 0x10102130
 		return "MxStreamController";
 	}
 
diff --git a/LEGO1/mxstreamer.h b/LEGO1/mxstreamer.h
index 8017e898..4d3684e9 100644
--- a/LEGO1/mxstreamer.h
+++ b/LEGO1/mxstreamer.h
@@ -78,7 +78,7 @@ class MxStreamer : public MxCore {
 	// FUNCTION: LEGO1 0x100b9000
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// GLOBAL: LEGO1 0x1010210c
+		// STRING: LEGO1 0x1010210c
 		return "MxStreamer";
 	}
 
diff --git a/LEGO1/mxvideopresenter.h b/LEGO1/mxvideopresenter.h
index d25ecb2b..4c1bab5e 100644
--- a/LEGO1/mxvideopresenter.h
+++ b/LEGO1/mxvideopresenter.h
@@ -23,7 +23,7 @@ class MxVideoPresenter : public MxMediaPresenter {
 	// FUNCTION: LEGO1 0x1000c820
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// GLOBAL: LEGO1 0x100f0760
+		// STRING: LEGO1 0x100f0760
 		return "MxVideoPresenter";
 	}
 
diff --git a/LEGO1/mxwavepresenter.h b/LEGO1/mxwavepresenter.h
index 4210a44e..cd09d486 100644
--- a/LEGO1/mxwavepresenter.h
+++ b/LEGO1/mxwavepresenter.h
@@ -16,7 +16,7 @@ class MxWavePresenter : public MxSoundPresenter {
 	// FUNCTION: LEGO1 0x1000d6c0
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// GLOBAL: LEGO1 0x100f07b4
+		// STRING: LEGO1 0x100f07b4
 		return "MxWavePresenter";
 	}
 
diff --git a/LEGO1/pizza.h b/LEGO1/pizza.h
index f1ac9f45..11bf6814 100644
--- a/LEGO1/pizza.h
+++ b/LEGO1/pizza.h
@@ -20,7 +20,7 @@ class Pizza : public IsleActor {
 	// FUNCTION: LEGO1 0x10037f90
 	inline const char* ClassName() const // vtable+0c
 	{
-		// GLOBAL: LEGO1 0x100f038c
+		// STRING: LEGO1 0x100f038c
 		return "Pizza";
 	}
 
diff --git a/LEGO1/pizzamissionstate.h b/LEGO1/pizzamissionstate.h
index a9231c81..85b8e4bb 100644
--- a/LEGO1/pizzamissionstate.h
+++ b/LEGO1/pizzamissionstate.h
@@ -18,7 +18,7 @@ class PizzaMissionState : public LegoState {
 	// FUNCTION: LEGO1 0x10039290
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// GLOBAL: LEGO1 0x100f00d4
+		// STRING: LEGO1 0x100f00d4
 		return "PizzaMissionState";
 	}
 
diff --git a/LEGO1/pizzeria.h b/LEGO1/pizzeria.h
index b9fcadf3..0196d616 100644
--- a/LEGO1/pizzeria.h
+++ b/LEGO1/pizzeria.h
@@ -10,7 +10,7 @@ class Pizzeria : public IsleActor {
 	// FUNCTION: LEGO1 0x1000e780
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// GLOBAL: LEGO1 0x100f0380
+		// STRING: LEGO1 0x100f0380
 		return "Pizzeria";
 	}
 
diff --git a/LEGO1/pizzeriastate.h b/LEGO1/pizzeriastate.h
index 53f4ddd5..c27fcef0 100644
--- a/LEGO1/pizzeriastate.h
+++ b/LEGO1/pizzeriastate.h
@@ -12,7 +12,7 @@ class PizzeriaState : public LegoState {
 	// FUNCTION: LEGO1 0x10017c20
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// GLOBAL: LEGO1 0x100f0370
+		// STRING: LEGO1 0x100f0370
 		return "PizzeriaState";
 	}
 
diff --git a/LEGO1/police.h b/LEGO1/police.h
index 0da58828..829c7e66 100644
--- a/LEGO1/police.h
+++ b/LEGO1/police.h
@@ -16,7 +16,7 @@ class Police : public LegoWorld {
 	// FUNCTION: LEGO1 0x1005e1e0
 	inline virtual const char* ClassName() const override // vtable+0xc
 	{
-		// GLOBAL: LEGO1 0x100f0450
+		// STRING: LEGO1 0x100f0450
 		return "Police";
 	}
 
diff --git a/LEGO1/policeentity.h b/LEGO1/policeentity.h
index e2314dd3..735cf0bc 100644
--- a/LEGO1/policeentity.h
+++ b/LEGO1/policeentity.h
@@ -10,7 +10,7 @@ class PoliceEntity : public BuildingEntity {
 	// FUNCTION: LEGO1 0x1000ed60
 	inline virtual const char* ClassName() const override // vtable+0xc
 	{
-		// GLOBAL: LEGO1 0x100f0328
+		// STRING: LEGO1 0x100f0328
 		return "PoliceEntity";
 	}
 
diff --git a/LEGO1/policestate.h b/LEGO1/policestate.h
index b3a732c9..2638a393 100644
--- a/LEGO1/policestate.h
+++ b/LEGO1/policestate.h
@@ -12,7 +12,7 @@ class PoliceState : public LegoState {
 	// FUNCTION: LEGO1 0x1005e860
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// GLOBAL: LEGO1 0x100f0444
+		// STRING: LEGO1 0x100f0444
 		return "PoliceState";
 	}
 
diff --git a/LEGO1/racecar.h b/LEGO1/racecar.h
index b0db77c5..b4a210e6 100644
--- a/LEGO1/racecar.h
+++ b/LEGO1/racecar.h
@@ -14,7 +14,7 @@ class RaceCar : public IslePathActor {
 	// FUNCTION: LEGO1 0x10028270
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// GLOBAL: LEGO1 0x100f03e0
+		// STRING: LEGO1 0x100f03e0
 		return "RaceCar";
 	}
 
diff --git a/LEGO1/racestate.h b/LEGO1/racestate.h
index 63a775d4..ef3cfa63 100644
--- a/LEGO1/racestate.h
+++ b/LEGO1/racestate.h
@@ -20,7 +20,7 @@ class RaceState : public LegoState {
 	// FUNCTION: LEGO1 0x10016010
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// GLOBAL: LEGO1 0x100f07d0
+		// STRING: LEGO1 0x100f07d0
 		return "RaceState";
 	}
 
diff --git a/LEGO1/radio.h b/LEGO1/radio.h
index 8d454483..54aef25b 100644
--- a/LEGO1/radio.h
+++ b/LEGO1/radio.h
@@ -13,7 +13,7 @@ class Radio : public MxCore {
 	// FUNCTION: LEGO1 0x1002c8e0
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// GLOBAL: LEGO1 0x100f328c
+		// STRING: LEGO1 0x100f328c
 		return "Radio";
 	}
 
diff --git a/LEGO1/radiostate.h b/LEGO1/radiostate.h
index dc2c8b8f..a5ea6035 100644
--- a/LEGO1/radiostate.h
+++ b/LEGO1/radiostate.h
@@ -12,7 +12,7 @@ class RadioState : public LegoState {
 	// FUNCTION: LEGO1 0x1002cf60
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// GLOBAL: LEGO1 0x100f04f8
+		// STRING: LEGO1 0x100f04f8
 		return "RadioState";
 	}
 
diff --git a/LEGO1/realtime/matrix.cpp b/LEGO1/realtime/matrix.cpp
index 852e14d0..61f7b1a9 100644
--- a/LEGO1/realtime/matrix.cpp
+++ b/LEGO1/realtime/matrix.cpp
@@ -138,7 +138,7 @@ void Matrix4Impl::ToQuaternion(Vector4Impl* p_outQuat)
 		return;
 	}
 
-	// GLOBAL: LEGO1 0x100d4090
+	// ~GLOBAL: LEGO1 0x100d4090
 	static int rotateIndex[] = {1, 2, 0};
 
 	// Largest element along the trace
diff --git a/LEGO1/registrationbook.h b/LEGO1/registrationbook.h
index 4f19a8dc..3ae904c9 100644
--- a/LEGO1/registrationbook.h
+++ b/LEGO1/registrationbook.h
@@ -15,7 +15,7 @@ class RegistrationBook : public LegoWorld {
 	// FUNCTION: LEGO1 0x10076e10
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// GLOBAL: LEGO1 0x100f04c8
+		// STRING: LEGO1 0x100f04c8
 		return "RegistrationBook";
 	}
 
diff --git a/LEGO1/score.h b/LEGO1/score.h
index 89d9608d..c927863f 100644
--- a/LEGO1/score.h
+++ b/LEGO1/score.h
@@ -18,7 +18,7 @@ class Score : public LegoWorld {
 	// FUNCTION: LEGO1 0x100010c0
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// GLOBAL: LEGO1 0x100f0050
+		// STRING: LEGO1 0x100f0050
 		return "Score";
 	}
 
diff --git a/LEGO1/scorestate.h b/LEGO1/scorestate.h
index 2797ad34..21be3493 100644
--- a/LEGO1/scorestate.h
+++ b/LEGO1/scorestate.h
@@ -10,7 +10,7 @@ class ScoreState : public LegoState {
 	// FUNCTION: LEGO1 0x1000de40
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// GLOBAL: LEGO1 0x100f0084
+		// STRING: LEGO1 0x100f0084
 		return "ScoreState";
 	};
 
diff --git a/LEGO1/skateboard.h b/LEGO1/skateboard.h
index 671c7f86..171705c4 100644
--- a/LEGO1/skateboard.h
+++ b/LEGO1/skateboard.h
@@ -13,7 +13,7 @@ class SkateBoard : public IslePathActor {
 	// FUNCTION: LEGO1 0x1000fdd0
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// GLOBAL: LEGO1 0x100f041c
+		// STRING: LEGO1 0x100f041c
 		return "SkateBoard";
 	}
 
diff --git a/LEGO1/tgl/d3drm/renderer.cpp b/LEGO1/tgl/d3drm/renderer.cpp
index d098f7ff..bd9ed873 100644
--- a/LEGO1/tgl/d3drm/renderer.cpp
+++ b/LEGO1/tgl/d3drm/renderer.cpp
@@ -61,7 +61,7 @@ Device* RendererImpl::CreateDevice(const DeviceDirect3DCreateData& data)
 }
 
 // GLOBAL: LEGO1 0x10101040
-static int gSetBufferCount = 1;
+static int g_SetBufferCount = 1;
 
 // FUNCTION: LEGO1 0x100a1900
 Device* RendererImpl::CreateDevice(const DeviceDirectDrawCreateData& data)
@@ -73,7 +73,7 @@ Device* RendererImpl::CreateDevice(const DeviceDirectDrawCreateData& data)
 		data.m_pBackBuffer,
 		&device->m_data
 	);
-	if (SUCCEEDED(result) && data.m_pBackBuffer && gSetBufferCount) {
+	if (SUCCEEDED(result) && data.m_pBackBuffer && g_SetBufferCount) {
 		device->m_data->SetBufferCount(2);
 	}
 	if (!SUCCEEDED(result)) {
diff --git a/LEGO1/towtrack.h b/LEGO1/towtrack.h
index 2243f9a2..1cc7e6af 100644
--- a/LEGO1/towtrack.h
+++ b/LEGO1/towtrack.h
@@ -13,7 +13,7 @@ class TowTrack : public IslePathActor {
 	// FUNCTION: LEGO1 0x1004c7c0
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// GLOBAL: LEGO1 0x100f03b8
+		// STRING: LEGO1 0x100f03b8
 		return "TowTrack";
 	}
 
diff --git a/LEGO1/towtrackmissionstate.h b/LEGO1/towtrackmissionstate.h
index 7537cb94..9dc7c587 100644
--- a/LEGO1/towtrackmissionstate.h
+++ b/LEGO1/towtrackmissionstate.h
@@ -12,7 +12,7 @@ class TowTrackMissionState : public LegoState {
 	// FUNCTION: LEGO1 0x1004dfa0
 	inline virtual const char* ClassName() const // vtable+0x0c
 	{
-		// GLOBAL: LEGO1 0x100f00bc
+		// STRING: LEGO1 0x100f00bc
 		return "TowTrackMissionState";
 	}
 
diff --git a/tools/isledecomp/isledecomp/parser/error.py b/tools/isledecomp/isledecomp/parser/error.py
index 638a806e..eb1aa7b8 100644
--- a/tools/isledecomp/isledecomp/parser/error.py
+++ b/tools/isledecomp/isledecomp/parser/error.py
@@ -39,6 +39,14 @@ class ParserError(Enum):
     # WARN: We found a marker to be referenced by name outside of a header file.
     BYNAME_FUNCTION_IN_CPP = 109
 
+    # WARN: A GLOBAL marker appeared over a variable without the g_ prefix
+    GLOBAL_MISSING_PREFIX = 110
+
+    # WARN: GLOBAL marker points at something other than variable declaration.
+    # We can't match global variables based on position, but the goal here is
+    # to ignore things like string literal that are not variables.
+    GLOBAL_NOT_VARIABLE = 111
+
     # This code or higher is an error, not a warning
     DECOMP_ERROR_START = 200
 
@@ -50,13 +58,18 @@ class ParserError(Enum):
     # For example, a GLOBAL cannot follow FUNCTION/STUB
     INCOMPATIBLE_MARKER = 201
 
-    # ERROR: The line following a synthetic marker was not a comment
-    BAD_SYNTHETIC = 202
+    # ERROR: The line following an explicit by-name marker was not a comment
+    # We assume a syntax error here rather than try to use the next line
+    BAD_NAMEREF = 202
 
     # ERROR: This function offset comes before the previous offset from the same module
     # This hopefully gives some hint about which functions need to be rearranged.
     FUNCTION_OUT_OF_ORDER = 203
 
+    # ERROR: The line following an explicit by-name marker that does _not_ expect
+    # a comment -- i.e. VTABLE or GLOBAL -- could not extract the name
+    NO_SUITABLE_NAME = 204
+
 
 @dataclass
 class ParserAlert:
diff --git a/tools/isledecomp/isledecomp/parser/marker.py b/tools/isledecomp/isledecomp/parser/marker.py
new file mode 100644
index 00000000..d2e181dd
--- /dev/null
+++ b/tools/isledecomp/isledecomp/parser/marker.py
@@ -0,0 +1,103 @@
+import re
+from typing import Optional
+from enum import Enum
+
+
+class MarkerType(Enum):
+    UNKNOWN = -100
+    FUNCTION = 1
+    STUB = 2
+    SYNTHETIC = 3
+    TEMPLATE = 4
+    GLOBAL = 5
+    VTABLE = 6
+    STRING = 7
+    LIBRARY = 8
+
+
+markerRegex = re.compile(
+    r"\s*//\s*(?P<type>\w+):\s*(?P<module>\w+)\s+(?P<offset>0x[a-f0-9]+)",
+    flags=re.I,
+)
+
+
+markerExactRegex = re.compile(
+    r"\s*// (?P<type>[A-Z]+): (?P<module>[A-Z0-9]+) (?P<offset>0x[a-f0-9]+)$"
+)
+
+
+class DecompMarker:
+    def __init__(self, marker_type: str, module: str, offset: int) -> None:
+        try:
+            self._type = MarkerType[marker_type.upper()]
+        except KeyError:
+            self._type = MarkerType.UNKNOWN
+
+        # Convert to upper here. A lot of other analysis depends on this name
+        # being consistent and predictable. If the name is _not_ capitalized
+        # we will emit a syntax error.
+        self._module: str = module.upper()
+        self._offset: int = offset
+
+    @property
+    def type(self) -> MarkerType:
+        return self._type
+
+    @property
+    def module(self) -> str:
+        return self._module
+
+    @property
+    def offset(self) -> int:
+        return self._offset
+
+    def is_regular_function(self) -> bool:
+        """Regular function, meaning: not an explicit byname lookup. FUNCTION
+        markers can be _implicit_ byname.
+        FUNCTION and STUB markers are (currently) the only heterogenous marker types that
+        can be lumped together, although the reasons for doing so are a little vague."""
+        return self._type in (MarkerType.FUNCTION, MarkerType.STUB)
+
+    def is_explicit_byname(self) -> bool:
+        return self._type in (
+            MarkerType.SYNTHETIC,
+            MarkerType.TEMPLATE,
+            MarkerType.LIBRARY,
+        )
+
+    def is_variable(self) -> bool:
+        return self._type == MarkerType.GLOBAL
+
+    def is_synthetic(self) -> bool:
+        return self._type == MarkerType.SYNTHETIC
+
+    def is_template(self) -> bool:
+        return self._type == MarkerType.TEMPLATE
+
+    def is_vtable(self) -> bool:
+        return self._type == MarkerType.VTABLE
+
+    def is_library(self) -> bool:
+        return self._type == MarkerType.LIBRARY
+
+    def is_string(self) -> bool:
+        return self._type == MarkerType.STRING
+
+    def allowed_in_func(self) -> bool:
+        return self._type in (MarkerType.GLOBAL, MarkerType.STRING)
+
+
+def match_marker(line: str) -> Optional[DecompMarker]:
+    match = markerRegex.match(line)
+    if match is None:
+        return None
+
+    return DecompMarker(
+        marker_type=match.group("type"),
+        module=match.group("module"),
+        offset=int(match.group("offset"), 16),
+    )
+
+
+def is_marker_exact(line: str) -> bool:
+    return markerExactRegex.match(line) is not None
diff --git a/tools/isledecomp/isledecomp/parser/node.py b/tools/isledecomp/isledecomp/parser/node.py
index 721a24b9..b6561fd6 100644
--- a/tools/isledecomp/isledecomp/parser/node.py
+++ b/tools/isledecomp/isledecomp/parser/node.py
@@ -1,35 +1,57 @@
+from typing import Optional
 from dataclasses import dataclass
+from .marker import MarkerType
 
 
 @dataclass
-class ParserNode:
+class ParserSymbol:
+    """Exported decomp marker with all information (except the code filename) required to
+    cross-reference with cvdump data."""
+
+    type: MarkerType
     line_number: int
-
-
-@dataclass
-class ParserSymbol(ParserNode):
     module: str
     offset: int
+    name: str
+
+    # The parser doesn't (currently) know about the code filename, but if you
+    # wanted to set it here after the fact, here's the spot.
+    filename: Optional[str] = None
+
+    def should_skip(self) -> bool:
+        """The default is to compare any symbols we have"""
+        return False
+
+    def is_nameref(self) -> bool:
+        """All symbols default to name lookup"""
+        return True
 
 
 @dataclass
 class ParserFunction(ParserSymbol):
-    name: str
+    # We are able to detect the closing line of a function with some reliability.
+    # This isn't used for anything right now, but perhaps later it will be.
+    end_line: Optional[int] = None
+
+    # All marker types are referenced by name except FUNCTION/STUB. These can also be
+    # referenced by name, but only if this flag is true.
     lookup_by_name: bool = False
-    is_stub: bool = False
-    is_synthetic: bool = False
-    is_template: bool = False
-    end_line: int = -1
+
+    def should_skip(self) -> bool:
+        return self.type == MarkerType.STUB
+
+    def is_nameref(self) -> bool:
+        return (
+            self.type in (MarkerType.SYNTHETIC, MarkerType.TEMPLATE, MarkerType.LIBRARY)
+            or self.lookup_by_name
+        )
 
 
 @dataclass
 class ParserVariable(ParserSymbol):
-    name: str
-    size: int = -1
     is_static: bool = False
 
 
 @dataclass
 class ParserVtable(ParserSymbol):
-    class_name: str
-    num_entries: int = -1
+    pass
diff --git a/tools/isledecomp/isledecomp/parser/parser.py b/tools/isledecomp/isledecomp/parser/parser.py
index 336d4b0c..f9485e65 100644
--- a/tools/isledecomp/isledecomp/parser/parser.py
+++ b/tools/isledecomp/isledecomp/parser/parser.py
@@ -3,15 +3,19 @@
 from typing import List, Iterable, Iterator
 from enum import Enum
 from .util import (
-    DecompMarker,
     is_blank_or_comment,
-    match_marker,
-    is_marker_exact,
     get_class_name,
+    get_variable_name,
     get_synthetic_name,
     remove_trailing_comment,
 )
+from .marker import (
+    DecompMarker,
+    match_marker,
+    is_marker_exact,
+)
 from .node import (
+    ParserSymbol,
     ParserFunction,
     ParserVariable,
     ParserVtable,
@@ -28,44 +32,23 @@ class ReaderState(Enum):
     IN_GLOBAL = 5
     IN_FUNC_GLOBAL = 6
     IN_VTABLE = 7
+    IN_SYNTHETIC = 8
+    IN_LIBRARY = 9
     DONE = 100
 
 
-def marker_is_stub(marker: DecompMarker) -> bool:
-    return marker.type.upper() == "STUB"
-
-
-def marker_is_variable(marker: DecompMarker) -> bool:
-    return marker.type.upper() == "GLOBAL"
-
-
-def marker_is_synthetic(marker: DecompMarker) -> bool:
-    return marker.type.upper() in ("SYNTHETIC", "TEMPLATE")
-
-
-def marker_is_template(marker: DecompMarker) -> bool:
-    return marker.type.upper() == "TEMPLATE"
-
-
-def marker_is_function(marker: DecompMarker) -> bool:
-    return marker.type.upper() in ("FUNCTION", "STUB")
-
-
-def marker_is_vtable(marker: DecompMarker) -> bool:
-    return marker.type.upper() == "VTABLE"
-
-
 class MarkerDict:
     def __init__(self) -> None:
         self.markers: dict = {}
 
     def insert(self, marker: DecompMarker) -> bool:
         """Return True if this insert would overwrite"""
-        module = marker.module.upper()
+        module = marker.module
         if module in self.markers:
             return True
 
-        self.markers[module] = (marker.type, marker.offset)
+        # TODO: type converted back to string version here instead of using enum
+        self.markers[module] = (marker.type.name, marker.offset)
         return False
 
     def iter(self) -> Iterator[DecompMarker]:
@@ -82,9 +65,7 @@ class DecompParser:
     # but not right now
     def __init__(self) -> None:
         # The lists to be populated as we parse
-        self.functions: List[ParserFunction] = []
-        self.vtables: List[ParserVtable] = []
-        self.variables: List[ParserVariable] = []
+        self._symbols: List[ParserSymbol] = []
         self.alerts: List[ParserAlert] = []
 
         self.line_number: int = 0
@@ -113,9 +94,7 @@ def __init__(self) -> None:
         self.function_sig: str = ""
 
     def reset(self):
-        self.functions = []
-        self.vtables = []
-        self.variables = []
+        self._symbols = []
         self.alerts = []
 
         self.line_number = 0
@@ -131,6 +110,18 @@ def reset(self):
         self.function_start = 0
         self.function_sig = ""
 
+    @property
+    def functions(self) -> List[ParserSymbol]:
+        return [s for s in self._symbols if isinstance(s, ParserFunction)]
+
+    @property
+    def vtables(self) -> List[ParserSymbol]:
+        return [s for s in self._symbols if isinstance(s, ParserVtable)]
+
+    @property
+    def variables(self) -> List[ParserSymbol]:
+        return [s for s in self._symbols if isinstance(s, ParserVariable)]
+
     def _recover(self):
         """We hit a syntax error and need to reset temp structures"""
         self.state = ReaderState.SEARCH
@@ -159,10 +150,17 @@ def _function_marker(self, marker: DecompMarker):
             self._syntax_warning(ParserError.DUPLICATE_MODULE)
         self.state = ReaderState.WANT_SIG
 
-    def _synthetic_marker(self, marker: DecompMarker):
+    def _nameref_marker(self, marker: DecompMarker):
+        """Functions explicitly referenced by name are set here"""
         if self.fun_markers.insert(marker):
             self._syntax_warning(ParserError.DUPLICATE_MODULE)
-        self.state = ReaderState.IN_TEMPLATE
+
+        if marker.is_template():
+            self.state = ReaderState.IN_TEMPLATE
+        elif marker.is_synthetic():
+            self.state = ReaderState.IN_SYNTHETIC
+        else:
+            self.state = ReaderState.IN_LIBRARY
 
     def _function_done(self, lookup_by_name: bool = False, unexpected: bool = False):
         end_line = self.line_number
@@ -173,16 +171,14 @@ def _function_done(self, lookup_by_name: bool = False, unexpected: bool = False)
             end_line -= 1
 
         for marker in self.fun_markers.iter():
-            self.functions.append(
+            self._symbols.append(
                 ParserFunction(
+                    type=marker.type,
                     line_number=self.function_start,
                     module=marker.module,
                     offset=marker.offset,
-                    lookup_by_name=lookup_by_name,
-                    is_stub=marker_is_stub(marker),
-                    is_synthetic=marker_is_synthetic(marker),
-                    is_template=marker_is_template(marker),
                     name=self.function_sig,
+                    lookup_by_name=lookup_by_name,
                     end_line=end_line,
                 )
             )
@@ -202,12 +198,13 @@ def _vtable_done(self, class_name: str = None):
             class_name = self.last_line.strip()
 
         for marker in self.tbl_markers.iter():
-            self.vtables.append(
+            self._symbols.append(
                 ParserVtable(
+                    type=marker.type,
                     line_number=self.line_number,
                     module=marker.module,
                     offset=marker.offset,
-                    class_name=class_name,
+                    name=class_name,
                 )
             )
 
@@ -223,14 +220,19 @@ def _variable_marker(self, marker: DecompMarker):
         else:
             self.state = ReaderState.IN_GLOBAL
 
-    def _variable_done(self):
+    def _variable_done(self, name: str):
+        if not name.startswith("g_"):
+            self._syntax_warning(ParserError.GLOBAL_MISSING_PREFIX)
+
         for marker in self.var_markers.iter():
-            self.variables.append(
+            self._symbols.append(
                 ParserVariable(
+                    type=marker.type,
                     line_number=self.line_number,
                     module=marker.module,
                     offset=marker.offset,
-                    name=self.last_line.strip(),
+                    name=name,
+                    is_static=self.state == ReaderState.IN_FUNC_GLOBAL,
                 )
             )
 
@@ -246,12 +248,23 @@ def _handle_marker(self, marker: DecompMarker):
             self._syntax_error(ParserError.UNEXPECTED_MARKER)
             return
 
+        # If we are inside a function, the only markers we accept are:
+        # GLOBAL, indicating a static variable
+        # STRING, indicating a literal string.
+        # Otherwise we assume that the parser missed the end of the function
+        # and we have moved on to something else.
+        # This is unlikely to occur with well-formed code, but
+        # we can recover easily by just ending the function here.
+        if self.state == ReaderState.IN_FUNC and not marker.allowed_in_func():
+            self._syntax_warning(ParserError.MISSED_END_OF_FUNCTION)
+            self._function_done(unexpected=True)
+
         # TODO: How uncertain are we of detecting the end of a function
         # in a clang-formatted file? For now we assume we have missed the
         # end if we detect a non-GLOBAL marker while state is IN_FUNC.
         # Maybe these cases should be syntax errors instead
 
-        if marker_is_function(marker):
+        if marker.is_regular_function():
             if self.state in (
                 ReaderState.SEARCH,
                 ReaderState.WANT_SIG,
@@ -259,29 +272,41 @@ def _handle_marker(self, marker: DecompMarker):
                 # We will allow multiple offsets if we have just begun
                 # the code block, but not after we hit the curly brace.
                 self._function_marker(marker)
-            elif self.state == ReaderState.IN_FUNC:
-                # We hit another offset unexpectedly.
-                # We can recover easily by just ending the function here.
-                self._syntax_warning(ParserError.MISSED_END_OF_FUNCTION)
-                self._function_done(unexpected=True)
-
-                # Start the next function right after so we can
-                # read the next line.
-                self._function_marker(marker)
             else:
                 self._syntax_error(ParserError.INCOMPATIBLE_MARKER)
 
-        elif marker_is_synthetic(marker):
+        elif marker.is_template():
             if self.state in (ReaderState.SEARCH, ReaderState.IN_TEMPLATE):
-                self._synthetic_marker(marker)
-            elif self.state == ReaderState.IN_FUNC:
-                self._syntax_warning(ParserError.MISSED_END_OF_FUNCTION)
-                self._function_done(lookup_by_name=True, unexpected=True)
-                self._synthetic_marker(marker)
+                self._nameref_marker(marker)
             else:
                 self._syntax_error(ParserError.INCOMPATIBLE_MARKER)
 
-        elif marker_is_variable(marker):
+        elif marker.is_synthetic():
+            if self.state in (ReaderState.SEARCH, ReaderState.IN_SYNTHETIC):
+                self._nameref_marker(marker)
+            else:
+                self._syntax_error(ParserError.INCOMPATIBLE_MARKER)
+
+        elif marker.is_library():
+            if self.state in (ReaderState.SEARCH, ReaderState.IN_LIBRARY):
+                self._nameref_marker(marker)
+            else:
+                self._syntax_error(ParserError.INCOMPATIBLE_MARKER)
+
+        elif marker.is_string():
+            # TODO: We are ignoring string markers for the moment.
+            # We already have a lot of them in the codebase, though, so we'll
+            # hang onto them for now in case we can use them later.
+            # To match up string constants, the strategy will be:
+            # 1. Use cvdump to find all string constants in the recomp
+            # 2. In the original binary, look at relocated vaddrs from .rdata
+            # 3. Try to match up string data from #1 with locations in #2
+
+            # Throw the syntax error we would throw if we were parsing these
+            if self.state not in (ReaderState.SEARCH, ReaderState.IN_FUNC):
+                self._syntax_error(ParserError.INCOMPATIBLE_MARKER)
+
+        elif marker.is_variable():
             if self.state in (
                 ReaderState.SEARCH,
                 ReaderState.IN_GLOBAL,
@@ -292,13 +317,9 @@ def _handle_marker(self, marker: DecompMarker):
             else:
                 self._syntax_error(ParserError.INCOMPATIBLE_MARKER)
 
-        elif marker_is_vtable(marker):
+        elif marker.is_vtable():
             if self.state in (ReaderState.SEARCH, ReaderState.IN_VTABLE):
                 self._vtable_marker(marker)
-            elif self.state == ReaderState.IN_FUNC:
-                self._syntax_warning(ParserError.MISSED_END_OF_FUNCTION)
-                self._function_done(unexpected=True)
-                self._vtable_marker(marker)
             else:
                 self._syntax_error(ParserError.INCOMPATIBLE_MARKER)
 
@@ -322,12 +343,16 @@ def read_line(self, line: str):
             return
 
         line_strip = line.strip()
-        if self.state == ReaderState.IN_TEMPLATE:
-            # TEMPLATE functions are a special case. The signature is
-            # given on the next line (in a // comment)
+        if self.state in (
+            ReaderState.IN_SYNTHETIC,
+            ReaderState.IN_TEMPLATE,
+            ReaderState.IN_LIBRARY,
+        ):
+            # Explicit nameref functions provide the function name
+            # on the next line (in a // comment)
             name = get_synthetic_name(line)
             if name is None:
-                self._syntax_error(ParserError.BAD_SYNTHETIC)
+                self._syntax_error(ParserError.BAD_NAMEREF)
             else:
                 self.function_sig = name
                 self._function_starts_here()
@@ -384,8 +409,28 @@ def read_line(self, line: str):
                 self._function_done()
 
         elif self.state in (ReaderState.IN_GLOBAL, ReaderState.IN_FUNC_GLOBAL):
-            if not is_blank_or_comment(line):
-                self._variable_done()
+            # TODO: Known problem that an error here will cause us to abandon a
+            # function we have already parsed if state == IN_FUNC_GLOBAL.
+            # However, we are not tolerant of _any_ syntax problems in our
+            # CI actions, so the solution is to just fix the invalid marker.
+            if is_blank_or_comment(line):
+                self._syntax_error(ParserError.NO_SUITABLE_NAME)
+                return
+
+            # We don't have a foolproof mechanism to tell what is and is not a variable.
+            # If the GLOBAL is being declared on a `return` statement, though, this is
+            # not correct. It is either a string literal (which will be handled differently)
+            # or it is not the variable declaration, which is incorrect decomp syntax.
+            if line.strip().startswith("return"):
+                self._syntax_error(ParserError.GLOBAL_NOT_VARIABLE)
+                return
+
+            name = get_variable_name(line)
+            if name is None:
+                self._syntax_error(ParserError.NO_SUITABLE_NAME)
+                return
+
+            self._variable_done(name)
 
         elif self.state == ReaderState.IN_VTABLE:
             vtable_class = get_class_name(line)
diff --git a/tools/isledecomp/isledecomp/parser/util.py b/tools/isledecomp/isledecomp/parser/util.py
index 99ab1c56..a106d841 100644
--- a/tools/isledecomp/isledecomp/parser/util.py
+++ b/tools/isledecomp/isledecomp/parser/util.py
@@ -1,17 +1,6 @@
 # C++ Parser utility functions and data structures
-from __future__ import annotations  # python <3.10 compatibility
 import re
-from collections import namedtuple
-
-DecompMarker = namedtuple("DecompMarker", ["type", "module", "offset"])
-
-
-markerRegex = re.compile(
-    r"\s*//\s*(\w+):\s*(\w+)\s+(0x[a-f0-9]+)",
-    flags=re.I,
-)
-
-markerExactRegex = re.compile(r"\s*// ([A-Z]+): ([A-Z0-9]+) (0x[a-f0-9]+)$")
+from typing import Optional
 
 # The goal here is to just read whatever is on the next line, so some
 # flexibility in the formatting seems OK
@@ -23,7 +12,7 @@
 trailingCommentRegex = re.compile(r"(\s*(?://|/\*).*)$")
 
 
-def get_synthetic_name(line: str) -> str | None:
+def get_synthetic_name(line: str) -> Optional[str]:
     """Synthetic names appear on a single line comment on the line after the marker.
     If that's not what we have, return None"""
     template_match = templateCommentRegex.match(line)
@@ -51,20 +40,6 @@ def is_blank_or_comment(line: str) -> bool:
     )
 
 
-def match_marker(line: str) -> DecompMarker | None:
-    match = markerRegex.match(line)
-    if match is None:
-        return None
-
-    return DecompMarker(
-        type=match.group(1), module=match.group(2), offset=int(match.group(3), 16)
-    )
-
-
-def is_marker_exact(line: str) -> bool:
-    return markerExactRegex.match(line) is not None
-
-
 template_class_decl_regex = re.compile(
     r"\s*(?:\/\/)?\s*(?:class|struct) (\w+)<([\w]+)\s*(\*+)?\s*>"
 )
@@ -73,7 +48,7 @@ def is_marker_exact(line: str) -> bool:
 class_decl_regex = re.compile(r"\s*(?:\/\/)?\s*(?:class|struct) (\w+)")
 
 
-def get_class_name(line: str) -> str | None:
+def get_class_name(line: str) -> Optional[str]:
     """For VTABLE markers, extract the class name from the code line or comment
     where it appears."""
 
@@ -93,3 +68,21 @@ def get_class_name(line: str) -> str | None:
         return match.group(1)
 
     return None
+
+
+global_regex = re.compile(r"(?P<name>g_\w+)")
+less_strict_global_regex = re.compile(r"(?P<name>\w+)(?:\)\(|\[.*|\s*=.*|;)")
+
+
+def get_variable_name(line: str) -> Optional[str]:
+    """Grab the name of the variable annotated with the GLOBAL marker.
+    Correct syntax would have the variable start with the prefix "g_"
+    but we will try to match regardless."""
+
+    if (match := global_regex.search(line)) is not None:
+        return match.group("name")
+
+    if (match := less_strict_global_regex.search(line)) is not None:
+        return match.group("name")
+
+    return None
diff --git a/tools/isledecomp/tests/test_parser.py b/tools/isledecomp/tests/test_parser.py
index c31602f1..853e773d 100644
--- a/tools/isledecomp/tests/test_parser.py
+++ b/tools/isledecomp/tests/test_parser.py
@@ -115,7 +115,7 @@ def test_different_markers_same_module(parser):
 
     # Use first marker declaration, don't replace
     assert len(parser.functions) == 1
-    assert parser.functions[0].is_stub is False
+    assert parser.functions[0].should_skip() is False
 
     # Should alert to this
     assert len(parser.alerts) == 1
@@ -193,7 +193,7 @@ def test_multiple_vtables(parser):
     )
     assert len(parser.alerts) == 0
     assert len(parser.vtables) == 2
-    assert parser.vtables[0].class_name == "MxString"
+    assert parser.vtables[0].name == "MxString"
 
 
 def test_multiple_vtables_same_module(parser):
@@ -247,7 +247,7 @@ def test_synthetic_no_comment(parser):
     )
     assert len(parser.functions) == 0
     assert len(parser.alerts) == 1
-    assert parser.alerts[0].code == ParserError.BAD_SYNTHETIC
+    assert parser.alerts[0].code == ParserError.BAD_NAMEREF
     assert parser.state == ReaderState.SEARCH
 
 
@@ -375,3 +375,70 @@ def test_unexpected_eof(parser):
     assert len(parser.functions) == 1
     assert len(parser.alerts) == 1
     assert parser.alerts[0].code == ParserError.UNEXPECTED_END_OF_FILE
+
+
+def test_global_variable_prefix(parser):
+    """Global and static variables should have the g_ prefix."""
+    parser.read_lines(
+        [
+            "// GLOBAL: TEST 0x1234",
+            'const char* g_msg = "hello";',
+        ]
+    )
+    assert len(parser.variables) == 1
+    assert len(parser.alerts) == 0
+
+    parser.read_lines(
+        [
+            "// GLOBAL: TEXT 0x5555",
+            "int test = 5;",
+        ]
+    )
+    assert len(parser.alerts) == 1
+    assert parser.alerts[0].code == ParserError.GLOBAL_MISSING_PREFIX
+    # In spite of that, we should still grab the variable name.
+    assert parser.variables[1].name == "test"
+
+
+def test_global_nomatch(parser):
+    """We do our best to grab the variable name, even without the g_ prefix
+    but this (by design) will not match everything."""
+
+    parser.read_lines(
+        [
+            "// GLOBAL: TEST 0x1234",
+            "FunctionCall();",
+        ]
+    )
+    assert len(parser.variables) == 0
+    assert len(parser.alerts) == 1
+    assert parser.alerts[0].code == ParserError.NO_SUITABLE_NAME
+
+
+def test_static_variable(parser):
+    """We can detect whether a variable is a static function variable
+    based on the parser's state when we detect it.
+    Checking for the word `static` alone is not a good test.
+    Static class variables are filed as S_GDATA32, same as regular globals.
+    Only function statics are filed as S_LDATA32."""
+
+    parser.read_lines(
+        [
+            "// GLOBAL: TEST 0x1234",
+            "int g_test = 1234;",
+        ]
+    )
+    assert len(parser.variables) == 1
+    assert parser.variables[0].is_static is False
+
+    parser.read_lines(
+        [
+            "// FUNCTION: TEST 0x5555",
+            "void test_function() {",
+            "// GLOBAL: TEST 0x8888",
+            "int g_internal = 0;",
+            "}",
+        ]
+    )
+    assert len(parser.variables) == 2
+    assert parser.variables[1].is_static is True
diff --git a/tools/isledecomp/tests/test_parser_statechange.py b/tools/isledecomp/tests/test_parser_statechange.py
index 8d18d547..cb54cf0a 100644
--- a/tools/isledecomp/tests/test_parser_statechange.py
+++ b/tools/isledecomp/tests/test_parser_statechange.py
@@ -11,9 +11,11 @@
     (_rs.SEARCH,          "FUNCTION",   _rs.WANT_SIG,        None),
     (_rs.SEARCH,          "GLOBAL",     _rs.IN_GLOBAL,       None),
     (_rs.SEARCH,          "STUB",       _rs.WANT_SIG,        None),
-    (_rs.SEARCH,          "SYNTHETIC",  _rs.IN_TEMPLATE,     None),
+    (_rs.SEARCH,          "SYNTHETIC",  _rs.IN_SYNTHETIC,    None),
     (_rs.SEARCH,          "TEMPLATE",   _rs.IN_TEMPLATE,     None),
     (_rs.SEARCH,          "VTABLE",     _rs.IN_VTABLE,       None),
+    (_rs.SEARCH,          "LIBRARY",    _rs.IN_LIBRARY,      None),
+    (_rs.SEARCH,          "STRING",     _rs.SEARCH,          None),
 
     (_rs.WANT_SIG,        "FUNCTION",   _rs.WANT_SIG,        None),
     (_rs.WANT_SIG,        "GLOBAL",     _rs.SEARCH,          _pe.INCOMPATIBLE_MARKER),
@@ -21,20 +23,26 @@
     (_rs.WANT_SIG,        "SYNTHETIC",  _rs.SEARCH,          _pe.INCOMPATIBLE_MARKER),
     (_rs.WANT_SIG,        "TEMPLATE",   _rs.SEARCH,          _pe.INCOMPATIBLE_MARKER),
     (_rs.WANT_SIG,        "VTABLE",     _rs.SEARCH,          _pe.INCOMPATIBLE_MARKER),
+    (_rs.WANT_SIG,        "LIBRARY",    _rs.SEARCH,          _pe.INCOMPATIBLE_MARKER),
+    (_rs.WANT_SIG,        "STRING",     _rs.SEARCH,          _pe.INCOMPATIBLE_MARKER),
 
     (_rs.IN_FUNC,         "FUNCTION",   _rs.WANT_SIG,        _pe.MISSED_END_OF_FUNCTION),
     (_rs.IN_FUNC,         "GLOBAL",     _rs.IN_FUNC_GLOBAL,  None),
     (_rs.IN_FUNC,         "STUB",       _rs.WANT_SIG,        _pe.MISSED_END_OF_FUNCTION),
-    (_rs.IN_FUNC,         "SYNTHETIC",  _rs.IN_TEMPLATE,     _pe.MISSED_END_OF_FUNCTION),
+    (_rs.IN_FUNC,         "SYNTHETIC",  _rs.IN_SYNTHETIC,    _pe.MISSED_END_OF_FUNCTION),
     (_rs.IN_FUNC,         "TEMPLATE",   _rs.IN_TEMPLATE,     _pe.MISSED_END_OF_FUNCTION),
     (_rs.IN_FUNC,         "VTABLE",     _rs.IN_VTABLE,       _pe.MISSED_END_OF_FUNCTION),
+    (_rs.IN_FUNC,         "LIBRARY",    _rs.IN_LIBRARY,      _pe.MISSED_END_OF_FUNCTION),
+    (_rs.IN_FUNC,         "STRING",     _rs.IN_FUNC,         None),
 
     (_rs.IN_TEMPLATE,     "FUNCTION",   _rs.SEARCH,          _pe.INCOMPATIBLE_MARKER),
     (_rs.IN_TEMPLATE,     "GLOBAL",     _rs.SEARCH,          _pe.INCOMPATIBLE_MARKER),
     (_rs.IN_TEMPLATE,     "STUB",       _rs.SEARCH,          _pe.INCOMPATIBLE_MARKER),
-    (_rs.IN_TEMPLATE,     "SYNTHETIC",  _rs.IN_TEMPLATE,     None),
+    (_rs.IN_TEMPLATE,     "SYNTHETIC",  _rs.SEARCH,          _pe.INCOMPATIBLE_MARKER),
     (_rs.IN_TEMPLATE,     "TEMPLATE",   _rs.IN_TEMPLATE,     None),
     (_rs.IN_TEMPLATE,     "VTABLE",     _rs.SEARCH,          _pe.INCOMPATIBLE_MARKER),
+    (_rs.IN_TEMPLATE,     "LIBRARY",    _rs.SEARCH,          _pe.INCOMPATIBLE_MARKER),
+    (_rs.IN_TEMPLATE,     "STRING",     _rs.SEARCH,          _pe.INCOMPATIBLE_MARKER),
 
     (_rs.WANT_CURLY,      "FUNCTION",   _rs.SEARCH,          _pe.UNEXPECTED_MARKER),
     (_rs.WANT_CURLY,      "GLOBAL",     _rs.SEARCH,          _pe.UNEXPECTED_MARKER),
@@ -42,6 +50,8 @@
     (_rs.WANT_CURLY,      "SYNTHETIC",  _rs.SEARCH,          _pe.UNEXPECTED_MARKER),
     (_rs.WANT_CURLY,      "TEMPLATE",   _rs.SEARCH,          _pe.UNEXPECTED_MARKER),
     (_rs.WANT_CURLY,      "VTABLE",     _rs.SEARCH,          _pe.UNEXPECTED_MARKER),
+    (_rs.WANT_CURLY,      "LIBRARY",    _rs.SEARCH,          _pe.UNEXPECTED_MARKER),
+    (_rs.WANT_CURLY,      "STRING",     _rs.SEARCH,          _pe.UNEXPECTED_MARKER),
 
     (_rs.IN_GLOBAL,       "FUNCTION",   _rs.SEARCH,          _pe.INCOMPATIBLE_MARKER),
     (_rs.IN_GLOBAL,       "GLOBAL",     _rs.IN_GLOBAL,       None),
@@ -49,6 +59,8 @@
     (_rs.IN_GLOBAL,       "SYNTHETIC",  _rs.SEARCH,          _pe.INCOMPATIBLE_MARKER),
     (_rs.IN_GLOBAL,       "TEMPLATE",   _rs.SEARCH,          _pe.INCOMPATIBLE_MARKER),
     (_rs.IN_GLOBAL,       "VTABLE",     _rs.SEARCH,          _pe.INCOMPATIBLE_MARKER),
+    (_rs.IN_GLOBAL,       "LIBRARY",    _rs.SEARCH,          _pe.INCOMPATIBLE_MARKER),
+    (_rs.IN_GLOBAL,       "STRING",     _rs.SEARCH,          _pe.INCOMPATIBLE_MARKER),
 
     (_rs.IN_FUNC_GLOBAL,  "FUNCTION",   _rs.SEARCH,          _pe.INCOMPATIBLE_MARKER),
     (_rs.IN_FUNC_GLOBAL,  "GLOBAL",     _rs.IN_FUNC_GLOBAL,  None),
@@ -56,6 +68,8 @@
     (_rs.IN_FUNC_GLOBAL,  "SYNTHETIC",  _rs.SEARCH,          _pe.INCOMPATIBLE_MARKER),
     (_rs.IN_FUNC_GLOBAL,  "TEMPLATE",   _rs.SEARCH,          _pe.INCOMPATIBLE_MARKER),
     (_rs.IN_FUNC_GLOBAL,  "VTABLE",     _rs.SEARCH,          _pe.INCOMPATIBLE_MARKER),
+    (_rs.IN_FUNC_GLOBAL,  "LIBRARY",    _rs.SEARCH,          _pe.INCOMPATIBLE_MARKER),
+    (_rs.IN_FUNC_GLOBAL,  "STRING",     _rs.SEARCH,          _pe.INCOMPATIBLE_MARKER),
 
     (_rs.IN_VTABLE,       "FUNCTION",   _rs.SEARCH,          _pe.INCOMPATIBLE_MARKER),
     (_rs.IN_VTABLE,       "GLOBAL",     _rs.SEARCH,          _pe.INCOMPATIBLE_MARKER),
@@ -63,6 +77,26 @@
     (_rs.IN_VTABLE,       "SYNTHETIC",  _rs.SEARCH,          _pe.INCOMPATIBLE_MARKER),
     (_rs.IN_VTABLE,       "TEMPLATE",   _rs.SEARCH,          _pe.INCOMPATIBLE_MARKER),
     (_rs.IN_VTABLE,       "VTABLE",     _rs.IN_VTABLE,       None),
+    (_rs.IN_VTABLE,       "LIBRARY",    _rs.SEARCH,          _pe.INCOMPATIBLE_MARKER),
+    (_rs.IN_VTABLE,       "STRING",     _rs.SEARCH,          _pe.INCOMPATIBLE_MARKER),
+
+    (_rs.IN_SYNTHETIC,    "FUNCTION",   _rs.SEARCH,          _pe.INCOMPATIBLE_MARKER),
+    (_rs.IN_SYNTHETIC,    "GLOBAL",     _rs.SEARCH,          _pe.INCOMPATIBLE_MARKER),
+    (_rs.IN_SYNTHETIC,    "STUB",       _rs.SEARCH,          _pe.INCOMPATIBLE_MARKER),
+    (_rs.IN_SYNTHETIC,    "SYNTHETIC",  _rs.IN_SYNTHETIC,    None),
+    (_rs.IN_SYNTHETIC,    "TEMPLATE",   _rs.SEARCH,          _pe.INCOMPATIBLE_MARKER),
+    (_rs.IN_SYNTHETIC,    "VTABLE",     _rs.SEARCH,          _pe.INCOMPATIBLE_MARKER),
+    (_rs.IN_SYNTHETIC,    "LIBRARY",    _rs.SEARCH,          _pe.INCOMPATIBLE_MARKER),
+    (_rs.IN_SYNTHETIC,    "STRING",     _rs.SEARCH,          _pe.INCOMPATIBLE_MARKER),
+
+    (_rs.IN_LIBRARY,      "FUNCTION",   _rs.SEARCH,          _pe.INCOMPATIBLE_MARKER),
+    (_rs.IN_LIBRARY,      "GLOBAL",     _rs.SEARCH,          _pe.INCOMPATIBLE_MARKER),
+    (_rs.IN_LIBRARY,      "STUB",       _rs.SEARCH,          _pe.INCOMPATIBLE_MARKER),
+    (_rs.IN_LIBRARY,      "SYNTHETIC",  _rs.SEARCH,          _pe.INCOMPATIBLE_MARKER),
+    (_rs.IN_LIBRARY,      "TEMPLATE",   _rs.SEARCH,          _pe.INCOMPATIBLE_MARKER),
+    (_rs.IN_LIBRARY,      "VTABLE",     _rs.SEARCH,          _pe.INCOMPATIBLE_MARKER),
+    (_rs.IN_LIBRARY,      "LIBRARY",    _rs.IN_LIBRARY,      None),
+    (_rs.IN_LIBRARY,      "STRING",     _rs.SEARCH,          _pe.INCOMPATIBLE_MARKER),
 ]
 # fmt: on
 
@@ -105,47 +139,3 @@ def test_state_search_line(line: str):
     p.read_line(line)
     assert p.state == _rs.SEARCH
     assert len(p.alerts) == 0
-
-
-global_lines = [
-    ("// A comment", _rs.IN_GLOBAL),
-    ("", _rs.IN_GLOBAL),
-    ("\t", _rs.IN_GLOBAL),
-    ("    ", _rs.IN_GLOBAL),
-    # TODO: no check for "likely" variable declaration so these all count
-    ("void function()", _rs.SEARCH),
-    ("int x = 123;", _rs.SEARCH),
-    ("just some text", _rs.SEARCH),
-]
-
-
-@pytest.mark.parametrize("line, new_state", global_lines)
-def test_state_global_line(line: str, new_state: _rs):
-    p = DecompParser()
-    p.read_line("// GLOBAL: TEST 0x1234")
-    assert p.state == _rs.IN_GLOBAL
-    p.read_line(line)
-    assert p.state == new_state
-
-
-# mostly same as above
-in_func_global_lines = [
-    ("// A comment", _rs.IN_FUNC_GLOBAL),
-    ("", _rs.IN_FUNC_GLOBAL),
-    ("\t", _rs.IN_FUNC_GLOBAL),
-    ("    ", _rs.IN_FUNC_GLOBAL),
-    # TODO: no check for "likely" variable declaration so these all count
-    ("void function()", _rs.IN_FUNC),
-    ("int x = 123;", _rs.IN_FUNC),
-    ("just some text", _rs.IN_FUNC),
-]
-
-
-@pytest.mark.parametrize("line, new_state", in_func_global_lines)
-def test_state_in_func_global_line(line: str, new_state: _rs):
-    p = DecompParser()
-    p.state = _rs.IN_FUNC
-    p.read_line("// GLOBAL: TEST 0x1234")
-    assert p.state == _rs.IN_FUNC_GLOBAL
-    p.read_line(line)
-    assert p.state == new_state
diff --git a/tools/isledecomp/tests/test_parser_util.py b/tools/isledecomp/tests/test_parser_util.py
index 643abf3e..af102fc2 100644
--- a/tools/isledecomp/tests/test_parser_util.py
+++ b/tools/isledecomp/tests/test_parser_util.py
@@ -1,11 +1,15 @@
 import pytest
 from isledecomp.parser.parser import MarkerDict
-from isledecomp.parser.util import (
+from isledecomp.parser.marker import (
     DecompMarker,
-    is_blank_or_comment,
+    MarkerType,
     match_marker,
     is_marker_exact,
+)
+from isledecomp.parser.util import (
+    is_blank_or_comment,
     get_class_name,
+    get_variable_name,
 )
 
 
@@ -96,7 +100,7 @@ def test_marker_dict_type_replace():
     d.insert(DecompMarker("STUB", "TEST", 0x1234))
     markers = list(d.iter())
     assert len(markers) == 1
-    assert markers[0].type == "FUNCTION"
+    assert markers[0].type == MarkerType.FUNCTION
 
 
 class_name_match_cases = [
@@ -131,3 +135,26 @@ def test_get_class_name(line: str, class_name: str):
 @pytest.mark.parametrize("line", class_name_no_match_cases)
 def test_get_class_name_none(line: str):
     assert get_class_name(line) is None
+
+
+variable_name_cases = [
+    # with prefix for easy access
+    ("char* g_test;", "g_test"),
+    ("g_test;", "g_test"),
+    ("void (*g_test)(int);", "g_test"),
+    ("char g_test[50];", "g_test"),
+    ("char g_test[50] = {1234,", "g_test"),
+    ("int g_test = 500;", "g_test"),
+    # no prefix
+    ("char* hello;", "hello"),
+    ("hello;", "hello"),
+    ("void (*hello)(int);", "hello"),
+    ("char hello[50];", "hello"),
+    ("char hello[50] = {1234,", "hello"),
+    ("int hello = 500;", "hello"),
+]
+
+
+@pytest.mark.parametrize("line,name", variable_name_cases)
+def test_get_variable_name(line: str, name: str):
+    assert get_variable_name(line) == name
diff --git a/tools/reccmp/reccmp.py b/tools/reccmp/reccmp.py
index 913154f5..c7db5e2c 100755
--- a/tools/reccmp/reccmp.py
+++ b/tools/reccmp/reccmp.py
@@ -316,7 +316,7 @@ def main():
                 parser.read_lines(srcfile)
 
             for fun in parser.functions:
-                if fun.is_stub:
+                if fun.should_skip():
                     continue
 
                 if fun.module != basename:
@@ -330,7 +330,7 @@ def main():
                     else:
                         continue
 
-                if fun.lookup_by_name:
+                if fun.is_nameref():
                     recinfo = syminfo.get_recompiled_address_from_name(fun.name)
                     if not recinfo:
                         continue

From 4d7968c7af4df3d672ee0d776b04493c6b323529 Mon Sep 17 00:00:00 2001
From: Misha <106913236+MishaProductions@users.noreply.github.com>
Date: Wed, 27 Dec 2023 16:05:21 -0500
Subject: [PATCH 030/210] implement LegoWorldPresenter::StartingTickle (#378)

---
 LEGO1/legovideomanager.cpp   |  2 +-
 LEGO1/legoworldpresenter.cpp | 18 +++++++++++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/LEGO1/legovideomanager.cpp b/LEGO1/legovideomanager.cpp
index 098bbe6e..456b10f5 100644
--- a/LEGO1/legovideomanager.cpp
+++ b/LEGO1/legovideomanager.cpp
@@ -80,7 +80,7 @@ void LegoVideoManager::MoveCursor(MxS32 p_cursorX, MxS32 p_cursorY)
 MxResult LegoVideoManager::Tickle()
 {
 	// TODO
-	return FAILURE;
+	return MxVideoManager::Tickle();
 }
 
 // STUB: LEGO1 0x1007c080
diff --git a/LEGO1/legoworldpresenter.cpp b/LEGO1/legoworldpresenter.cpp
index 7a17ad7a..02578675 100644
--- a/LEGO1/legoworldpresenter.cpp
+++ b/LEGO1/legoworldpresenter.cpp
@@ -99,9 +99,25 @@ void LegoWorldPresenter::ReadyTickle()
 	m_currentTickleState = TickleState_Starting;
 }
 
-// STUB: LEGO1 0x10066ac0
+// FUNCTION: LEGO1 0x10066ac0
 void LegoWorldPresenter::StartingTickle()
 {
+	if (m_action->IsA("MxDSSerialAction")) {
+		MxPresenter* presenter = *m_list.begin();
+		if (presenter->GetCurrentTickleState() == TickleState_Idle) {
+			presenter->SetTickleState(TickleState_Ready);
+		}
+	}
+	else {
+		for (MxCompositePresenterList::iterator it = m_list.begin(); it != m_list.end(); it++) {
+			if ((*it)->GetCurrentTickleState() == TickleState_Idle) {
+				(*it)->SetTickleState(TickleState_Ready);
+			}
+		}
+	}
+
+	m_previousTickleStates |= 1 << (unsigned char) m_currentTickleState;
+	m_currentTickleState = TickleState_Streaming;
 }
 
 // STUB: LEGO1 0x10067a70

From e3488498f95385416a070071ba3c800a5717fbe3 Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Thu, 28 Dec 2023 11:19:40 -0500
Subject: [PATCH 031/210] Implement/match MxDiskStreamController destructor
 (#379)

---
 LEGO1/mxdiskstreamcontroller.cpp | 47 ++++++++++++++++++++++++++------
 LEGO1/mxdiskstreamcontroller.h   |  2 +-
 LEGO1/mxramstreamcontroller.cpp  |  6 ++--
 LEGO1/mxstreamcontroller.cpp     | 14 +++++-----
 4 files changed, 50 insertions(+), 19 deletions(-)

diff --git a/LEGO1/mxdiskstreamcontroller.cpp b/LEGO1/mxdiskstreamcontroller.cpp
index 1520ba3b..f992443d 100644
--- a/LEGO1/mxdiskstreamcontroller.cpp
+++ b/LEGO1/mxdiskstreamcontroller.cpp
@@ -15,10 +15,41 @@ MxDiskStreamController::MxDiskStreamController()
 	m_unk0x8c = 0;
 }
 
-// STUB: LEGO1 0x100c7530
+// FUNCTION: LEGO1 0x100c7530
 MxDiskStreamController::~MxDiskStreamController()
 {
-	// TODO
+	MxAutoLocker lock(&this->m_criticalSection);
+
+	m_unk0xc4 = FALSE;
+	m_unk0x70 = FALSE;
+
+	if (m_provider)
+		m_provider->VTable0x20(&MxDSAction());
+
+	MxDSAction* action;
+	while (m_unk0x3c.PopFront(action))
+		delete action;
+
+	if (m_provider) {
+		delete m_provider;
+		m_provider = NULL;
+	}
+
+	FUN_100c8720();
+
+	while (m_list0x80.PopFront(action))
+		FUN_100c7cb0((MxDSStreamingAction*) action);
+
+	while (m_list0x64.PopFront(action))
+		FUN_100c7cb0((MxDSStreamingAction*) action);
+
+	while (!m_list0x74.empty()) {
+		MxDSBuffer* buffer = m_list0x74.front();
+		m_list0x74.pop_front();
+		FUN_100c7ce0(buffer);
+	}
+
+	TickleManager()->UnregisterClient(this);
 }
 
 // FUNCTION: LEGO1 0x100c7790
@@ -257,8 +288,8 @@ MxResult MxDiskStreamController::VTable0x20(MxDSAction* p_action)
 	else if (MxStreamController::VTable0x20(p_action) != SUCCESS)
 		return FAILURE;
 
-	m_unk0x70 = 1;
-	m_unk0xc4 = 1;
+	m_unk0x70 = TRUE;
+	m_unk0xc4 = TRUE;
 	return SUCCESS;
 }
 
@@ -289,9 +320,9 @@ MxResult MxDiskStreamController::VTable0x24(MxDSAction* p_action)
 		MxStreamController::VTable0x24(&action);
 	} while (m_action0x60 != NULL);
 
-	if (m_unk0x3c.size() == 0) {
-		m_unk0x70 = 0;
-		m_unk0xc4 = 0;
+	if (m_unk0x3c.empty()) {
+		m_unk0x70 = FALSE;
+		m_unk0xc4 = FALSE;
 	}
 
 	return SUCCESS;
@@ -389,7 +420,7 @@ void MxDiskStreamController::FUN_100c8720()
 	MxAutoLocker lock(&this->m_critical9c);
 
 	MxDSStreamingAction* action;
-	while (m_list0xb8.size() != 0) {
+	while (!m_list0xb8.empty()) {
 		action = (MxDSStreamingAction*) m_list0xb8.front();
 		m_list0xb8.pop_front();
 
diff --git a/LEGO1/mxdiskstreamcontroller.h b/LEGO1/mxdiskstreamcontroller.h
index 52032675..bc5cce61 100644
--- a/LEGO1/mxdiskstreamcontroller.h
+++ b/LEGO1/mxdiskstreamcontroller.h
@@ -49,7 +49,7 @@ class MxDiskStreamController : public MxStreamController {
 
 private:
 	MxStreamListMxDSAction m_list0x64; // 0x64
-	undefined m_unk0x70;               // 0x70
+	MxBool m_unk0x70;                  // 0x70
 	list<MxDSBuffer*> m_list0x74;      // 0x74
 	MxStreamListMxDSAction m_list0x80; // 0x80
 	undefined2 m_unk0x8c;              // 0x8c
diff --git a/LEGO1/mxramstreamcontroller.cpp b/LEGO1/mxramstreamcontroller.cpp
index 0a5e29cd..71ee1b92 100644
--- a/LEGO1/mxramstreamcontroller.cpp
+++ b/LEGO1/mxramstreamcontroller.cpp
@@ -11,7 +11,7 @@ undefined* __cdecl ReadData(MxU32* p_fileSizeBuffer, MxU32 p_fileSize);
 // FUNCTION: LEGO1 0x100c6110
 MxResult MxRAMStreamController::Open(const char* p_filename)
 {
-	MxAutoLocker locker(&m_criticalSection);
+	MxAutoLocker lock(&m_criticalSection);
 	if (MxStreamController::Open(p_filename) != SUCCESS) {
 		return FAILURE;
 	}
@@ -39,7 +39,7 @@ MxResult MxRAMStreamController::Open(const char* p_filename)
 // FUNCTION: LEGO1 0x100c6210
 MxResult MxRAMStreamController::VTable0x20(MxDSAction* p_action)
 {
-	MxAutoLocker locker(&m_criticalSection);
+	MxAutoLocker lock(&m_criticalSection);
 	MxS32 unk0x24 = 0;
 	MxResult result = FAILURE;
 
@@ -83,7 +83,7 @@ MxResult MxRAMStreamController::VTable0x24(MxDSAction* p_action)
 // FUNCTION: LEGO1 0x100c63c0
 MxResult MxRAMStreamController::DeserializeObject(MxDSStreamingAction& p_action)
 {
-	MxAutoLocker locker(&m_criticalSection);
+	MxAutoLocker lock(&m_criticalSection);
 	MxResult result;
 	MxDSStreamingAction* value = NULL;
 
diff --git a/LEGO1/mxstreamcontroller.cpp b/LEGO1/mxstreamcontroller.cpp
index e45435ac..f351582a 100644
--- a/LEGO1/mxstreamcontroller.cpp
+++ b/LEGO1/mxstreamcontroller.cpp
@@ -72,7 +72,7 @@ MxStreamController::~MxStreamController()
 MxResult MxStreamController::Open(const char* p_filename)
 {
 	char sourceName[256];
-	MxAutoLocker locker(&m_criticalSection);
+	MxAutoLocker lock(&m_criticalSection);
 
 	MakeSourceName(sourceName, p_filename);
 	this->m_atom = MxAtomId(sourceName, LookupMode_LowerCase2);
@@ -94,7 +94,7 @@ void MxStreamController::RemoveSubscriber(MxDSSubscriber* p_subscriber)
 // FUNCTION: LEGO1 0x100c1690
 MxResult MxStreamController::VTable0x20(MxDSAction* p_action)
 {
-	MxAutoLocker locker(&m_criticalSection);
+	MxAutoLocker lock(&m_criticalSection);
 
 	MxResult result;
 	MxU32 offset = 0;
@@ -116,7 +116,7 @@ MxResult MxStreamController::VTable0x20(MxDSAction* p_action)
 // FUNCTION: LEGO1 0x100c1740
 MxResult MxStreamController::VTable0x24(MxDSAction* p_action)
 {
-	MxAutoLocker locker(&m_criticalSection);
+	MxAutoLocker lock(&m_criticalSection);
 	VTable0x30(p_action);
 	m_action0x60 = m_unk0x54.Find(p_action, TRUE);
 	if (m_action0x60 == NULL) {
@@ -201,7 +201,7 @@ MxResult MxStreamController::FUN_100c1a00(MxDSAction* p_action, MxU32 p_offset)
 // FUNCTION: LEGO1 0x100c1c10
 MxResult MxStreamController::VTable0x2c(MxDSAction* p_action, MxU32 p_bufferval)
 {
-	MxAutoLocker locker(&m_criticalSection);
+	MxAutoLocker lock(&m_criticalSection);
 	if (FUN_100c1a00(p_action, p_bufferval) != SUCCESS) {
 		return FAILURE;
 	}
@@ -211,7 +211,7 @@ MxResult MxStreamController::VTable0x2c(MxDSAction* p_action, MxU32 p_bufferval)
 // FUNCTION: LEGO1 0x100c1ce0
 MxResult MxStreamController::VTable0x30(MxDSAction* p_action)
 {
-	MxAutoLocker locker(&m_criticalSection);
+	MxAutoLocker lock(&m_criticalSection);
 	MxResult result = FAILURE;
 	MxDSAction* action = m_unk0x3c.Find(p_action, TRUE);
 	if (action != NULL) {
@@ -226,7 +226,7 @@ MxResult MxStreamController::VTable0x30(MxDSAction* p_action)
 // FUNCTION: LEGO1 0x100c1da0
 MxResult MxStreamController::InsertActionToList54(MxDSAction* p_action)
 {
-	MxAutoLocker locker(&m_criticalSection);
+	MxAutoLocker lock(&m_criticalSection);
 	MxDSAction* action = p_action->Clone();
 
 	if (action == NULL) {
@@ -241,7 +241,7 @@ MxResult MxStreamController::InsertActionToList54(MxDSAction* p_action)
 // FUNCTION: LEGO1 0x100c1e70
 MxPresenter* MxStreamController::FUN_100c1e70(MxDSAction& p_action)
 {
-	MxAutoLocker locker(&m_criticalSection);
+	MxAutoLocker lock(&m_criticalSection);
 	MxPresenter* result = NULL;
 	if (p_action.GetObjectId() != -1) {
 		MxDSAction* action = m_unk0x3c.Find(&p_action, FALSE);

From e17e8ed5aece899962ec784119b5e2e474e28410 Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Thu, 28 Dec 2023 11:46:12 -0500
Subject: [PATCH 032/210] Implement/match MxDiskStreamProvider destructor
 (#381)

---
 LEGO1/mxdiskstreamprovider.cpp | 33 +++++++++++++++++++++++++++++++--
 1 file changed, 31 insertions(+), 2 deletions(-)

diff --git a/LEGO1/mxdiskstreamprovider.cpp b/LEGO1/mxdiskstreamprovider.cpp
index badc1623..b9ed63d0 100644
--- a/LEGO1/mxdiskstreamprovider.cpp
+++ b/LEGO1/mxdiskstreamprovider.cpp
@@ -40,10 +40,39 @@ MxDiskStreamProvider::MxDiskStreamProvider()
 	this->m_unk0x35 = FALSE;
 }
 
-// STUB: LEGO1 0x100d1240
+// FUNCTION: LEGO1 0x100d1240
 MxDiskStreamProvider::~MxDiskStreamProvider()
 {
-	// TODO
+	MxDSStreamingAction* action;
+	m_unk0x35 = FALSE;
+
+	do {
+		action = NULL;
+
+		{
+			MxAutoLocker lock(&m_criticalSection);
+			m_list.PopFrontStreamingAction(action);
+		}
+
+		if (!action)
+			break;
+
+		if (action->GetUnknowna0()->GetWriteOffset() < 0x20000)
+			g_unk0x10102878--;
+
+		((MxDiskStreamController*) m_pLookup)->FUN_100c8670(action);
+	} while (action);
+
+	if (m_remainingWork) {
+		m_remainingWork = FALSE;
+		m_busySemaphore.Release(1);
+		m_thread.Terminate();
+	}
+
+	if (m_pFile)
+		delete m_pFile;
+
+	m_pFile = NULL;
 }
 
 // FUNCTION: LEGO1 0x100d13d0

From e76cf3427c54cd416d337de584ed5a71f7a82caf Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Thu, 28 Dec 2023 11:56:54 -0500
Subject: [PATCH 033/210] Add and fix some annotations

---
 LEGO1/legoact2.h               |  2 +-
 LEGO1/legoomni.h               |  2 +-
 LEGO1/legoracecar.h            |  2 +-
 LEGO1/mxatomidcounter.h        |  2 +-
 LEGO1/mxdiskstreamcontroller.h |  3 +++
 LEGO1/mxdiskstreamprovider.h   |  3 +++
 LEGO1/mxramstreamcontroller.h  |  5 ++++-
 LEGO1/mxramstreamprovider.h    | 14 +++++++++-----
 LEGO1/mxstreamcontroller.h     |  3 +++
 LEGO1/mxstreamer.h             |  3 +++
 LEGO1/mxstreamprovider.h       |  3 +++
 11 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/LEGO1/legoact2.h b/LEGO1/legoact2.h
index b504c11c..79983416 100644
--- a/LEGO1/legoact2.h
+++ b/LEGO1/legoact2.h
@@ -5,7 +5,7 @@
 #include "legopathactor.h"
 
 // VTABLE: LEGO1 0x100d82e0
-// SIZE: 0x1154
+// SIZE 0x1154
 class LegoAct2 : public LegoWorld {};
 
 #endif // LEGOACT2_H
diff --git a/LEGO1/legoomni.h b/LEGO1/legoomni.h
index f0ac8369..7fb0a4f3 100644
--- a/LEGO1/legoomni.h
+++ b/LEGO1/legoomni.h
@@ -59,7 +59,7 @@ extern MxAtomId* g_creditsScript;
 extern MxAtomId* g_nocdSourceName;
 
 // VTABLE: LEGO1 0x100d8638
-// SIZE: 0x140
+// SIZE 0x140
 class LegoOmni : public MxOmni {
 public:
 	__declspec(dllexport) void CreateBackgroundAudio();
diff --git a/LEGO1/legoracecar.h b/LEGO1/legoracecar.h
index d3800b5a..a2a54afb 100644
--- a/LEGO1/legoracecar.h
+++ b/LEGO1/legoracecar.h
@@ -5,7 +5,7 @@
 #include "legopathactor.h"
 
 // VTABLE: LEGO1 0x100d58b8
-// SIZE: 0x200
+// SIZE 0x200
 class LegoRaceCar : public LegoCarRaceActor {
 public:
 	// FUNCTION: LEGO1 0x10014290
diff --git a/LEGO1/mxatomidcounter.h b/LEGO1/mxatomidcounter.h
index 8fb5ae97..f2c4fb3f 100644
--- a/LEGO1/mxatomidcounter.h
+++ b/LEGO1/mxatomidcounter.h
@@ -13,7 +13,7 @@
 // Also: the increment/decrement methods suggest a custom type was used
 // for the combined key_value_pair, which doesn't seem possible with <map>.
 
-// SIZE: 0x14 (including padding)
+// SIZE 0x14
 class MxAtomIdCounter {
 public:
 	// always inlined
diff --git a/LEGO1/mxdiskstreamcontroller.h b/LEGO1/mxdiskstreamcontroller.h
index bc5cce61..01ddc78a 100644
--- a/LEGO1/mxdiskstreamcontroller.h
+++ b/LEGO1/mxdiskstreamcontroller.h
@@ -78,6 +78,9 @@ class MxDiskStreamController : public MxStreamController {
 // TEMPLATE: LEGO1 0x100c7490
 // list<MxDSBuffer *,allocator<MxDSBuffer *> >::_Buynode
 
+// SYNTHETIC: LEGO1 0x100c74c0
+// MxDiskStreamController::`scalar deleting destructor'
+
 // TEMPLATE: LEGO1 0x100c74e0
 // List<MxDSBuffer *>::~List<MxDSBuffer *>
 
diff --git a/LEGO1/mxdiskstreamprovider.h b/LEGO1/mxdiskstreamprovider.h
index 1314e3f9..2557eaf9 100644
--- a/LEGO1/mxdiskstreamprovider.h
+++ b/LEGO1/mxdiskstreamprovider.h
@@ -64,4 +64,7 @@ class MxDiskStreamProvider : public MxStreamProvider {
 	MxStreamListMxDSAction m_list;       // 0x54
 };
 
+// SYNTHETIC: LEGO1 0x100d1220
+// MxDiskStreamProvider::`scalar deleting destructor'
+
 #endif // MXDISKSTREAMPROVIDER_H
diff --git a/LEGO1/mxramstreamcontroller.h b/LEGO1/mxramstreamcontroller.h
index aa70ec33..6b56ee49 100644
--- a/LEGO1/mxramstreamcontroller.h
+++ b/LEGO1/mxramstreamcontroller.h
@@ -30,9 +30,12 @@ class MxRAMStreamController : public MxStreamController {
 	virtual MxResult VTable0x24(MxDSAction* p_action) override;
 
 private:
-	MxDSBuffer m_buffer;
+	MxDSBuffer m_buffer; // 0x64
 
 	MxResult DeserializeObject(MxDSStreamingAction& p_action);
 };
 
+// SYNTHETIC: LEGO1 0x100b94f0
+// MxRAMStreamController::`scalar deleting destructor'
+
 #endif // MXRAMSTREAMCONTROLLER_H
diff --git a/LEGO1/mxramstreamprovider.h b/LEGO1/mxramstreamprovider.h
index 16ed5a4c..5c8bf59c 100644
--- a/LEGO1/mxramstreamprovider.h
+++ b/LEGO1/mxramstreamprovider.h
@@ -4,6 +4,7 @@
 #include "mxstreamprovider.h"
 
 // VTABLE: LEGO1 0x100dd0d0
+// SIZE 0x24
 class MxRAMStreamProvider : public MxStreamProvider {
 public:
 	MxRAMStreamProvider();
@@ -31,11 +32,14 @@ class MxRAMStreamProvider : public MxStreamProvider {
 	inline MxU32* GetBufferOfFileSize() { return m_pBufferOfFileSize; }
 
 protected:
-	MxU32 m_bufferSize;
-	MxU32 m_fileSize;
-	MxU32* m_pBufferOfFileSize;
-	MxU32 m_lengthInDWords;
-	MxU32* m_bufferForDWords;
+	MxU32 m_bufferSize;         // 0x10
+	MxU32 m_fileSize;           // 0x14
+	MxU32* m_pBufferOfFileSize; // 0x18
+	MxU32 m_lengthInDWords;     // 0x1c
+	MxU32* m_bufferForDWords;   // 0x20
 };
 
+// SYNTHETIC: LEGO1 0x100d0a30
+// MxRAMStreamProvider::`scalar deleting destructor'
+
 #endif // MXRAMSTREAMPROVIDER_H
diff --git a/LEGO1/mxstreamcontroller.h b/LEGO1/mxstreamcontroller.h
index bbd1eb3d..790856c1 100644
--- a/LEGO1/mxstreamcontroller.h
+++ b/LEGO1/mxstreamcontroller.h
@@ -88,6 +88,9 @@ class MxStreamController : public MxCore {
 // TEMPLATE: LEGO1 0x100c0ee0
 // list<MxNextActionDataStart *,allocator<MxNextActionDataStart *> >::_Buynode
 
+// SYNTHETIC: LEGO1 0x100c0fa0
+// MxStreamController::`scalar deleting destructor'
+
 // FUNCTION: LEGO1 0x100c0fc0
 // MxStreamListMxDSSubscriber::~MxStreamListMxDSSubscriber
 
diff --git a/LEGO1/mxstreamer.h b/LEGO1/mxstreamer.h
index 4d3684e9..e76f0e36 100644
--- a/LEGO1/mxstreamer.h
+++ b/LEGO1/mxstreamer.h
@@ -105,4 +105,7 @@ class MxStreamer : public MxCore {
 	MxStreamerSubClass3 m_subclass2;         // 0x20
 };
 
+// SYNTHETIC: LEGO1 0x100b9120
+// MxStreamer::`scalar deleting destructor'
+
 #endif // MXSTREAMER_H
diff --git a/LEGO1/mxstreamprovider.h b/LEGO1/mxstreamprovider.h
index 73804684..17bba38d 100644
--- a/LEGO1/mxstreamprovider.h
+++ b/LEGO1/mxstreamprovider.h
@@ -38,4 +38,7 @@ class MxStreamProvider : public MxCore {
 	MxDSFile* m_pFile;             // 0x0c
 };
 
+// SYNTHETIC: LEGO1 0x100d0870
+// MxStreamProvider::`scalar deleting destructor'
+
 #endif // MXSTREAMPROVIDER_H

From a06a360dc6509f1e4c4caa5407c2b3263f4a11da Mon Sep 17 00:00:00 2001
From: Misha <106913236+MishaProductions@users.noreply.github.com>
Date: Thu, 28 Dec 2023 12:38:37 -0500
Subject: [PATCH 034/210] Implement Lego3DManager (#380)

* Implement Lego3DManager

* Update lego3dview.cpp

* fix

* fixes

* fix wrong vtable address

* Fixes/matches

* Fix Lego3DView

* Use undefined

* More fixes

* Rename

* Rename pad

* Add blank line

* Delete stuff

---------

Co-authored-by: Christian Semmler <mail@csemmler.com>
---
 CMakeLists.txt              |  2 ++
 LEGO1/lego3dmanager.cpp     | 46 +++++++++++++++++++++++++++++++++++++
 LEGO1/lego3dmanager.h       | 19 ++++++++++++---
 LEGO1/lego3dview.cpp        | 19 +++++++++++++++
 LEGO1/lego3dview.h          | 21 +++++++++++++----
 LEGO1/mxrendersettings.cpp  | 21 +++++++++++++++++
 LEGO1/mxrendersettings.h    | 28 ++++++++++++++++++++++
 LEGO1/mxunknown100dbdbc.cpp |  6 +++++
 LEGO1/mxunknown100dbdbc.h   |  3 ++-
 9 files changed, 156 insertions(+), 9 deletions(-)
 create mode 100644 LEGO1/lego3dmanager.cpp
 create mode 100644 LEGO1/mxrendersettings.cpp
 create mode 100644 LEGO1/mxrendersettings.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3650c718..cdf37ff1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -47,6 +47,7 @@ add_library(lego1 SHARED
   LEGO1/jukebox.cpp
   LEGO1/jukeboxentity.cpp
   LEGO1/jukeboxstate.cpp
+  LEGO1/lego3dmanager.cpp
   LEGO1/lego3dview.cpp
   LEGO1/legoact2state.cpp
   LEGO1/legoactioncontrolpresenter.cpp
@@ -161,6 +162,7 @@ add_library(lego1 SHARED
   LEGO1/mxramstreamcontroller.cpp
   LEGO1/mxramstreamprovider.cpp
   LEGO1/mxregion.cpp
+  LEGO1/mxrendersettings.cpp
   LEGO1/mxscheduler.cpp
   LEGO1/mxsemaphore.cpp
   LEGO1/mxsmack.cpp
diff --git a/LEGO1/lego3dmanager.cpp b/LEGO1/lego3dmanager.cpp
new file mode 100644
index 00000000..c399b1a8
--- /dev/null
+++ b/LEGO1/lego3dmanager.cpp
@@ -0,0 +1,46 @@
+#include "lego3dmanager.h"
+
+#include "decomp.h"
+#include "mxrendersettings.h"
+#include "mxunknown100dbdbc.h"
+#include "tgl/tgl.h"
+
+DECOMP_SIZE_ASSERT(Lego3DManager, 0x10);
+
+// FUNCTION: LEGO1 0x100ab320
+Lego3DManager::Lego3DManager()
+{
+	m_render = NULL;
+	m_3dView = NULL;
+	m_unk0x0c = NULL;
+}
+
+// FUNCTION: LEGO1 0x100ab360
+Lego3DManager::~Lego3DManager()
+{
+	Destroy();
+}
+
+// FUNCTION: LEGO1 0x100ab370
+void Lego3DManager::Init(MxRenderSettings& p_settings)
+{
+	m_unk0x0c = new MxUnknown100dbdbc();
+	m_render = Tgl::CreateRenderer();
+	m_3dView = new Lego3DView();
+
+	MxRenderSettings settings;
+	MxRenderSettings::CopyFrom(settings, p_settings);
+
+	m_3dView->Init(settings, *m_render);
+}
+
+// FUNCTION: LEGO1 0x100ab460
+void Lego3DManager::Destroy()
+{
+	delete m_3dView;
+	m_3dView = NULL;
+	delete m_render;
+	m_render = NULL;
+	delete m_unk0x0c;
+	m_unk0x0c = NULL;
+}
diff --git a/LEGO1/lego3dmanager.h b/LEGO1/lego3dmanager.h
index 3e1cf202..78c532a5 100644
--- a/LEGO1/lego3dmanager.h
+++ b/LEGO1/lego3dmanager.h
@@ -3,14 +3,27 @@
 
 #include "lego3dview.h"
 
+class MxUnknown100dbdbc;
+
+// VTABLE: LEGO1 0x100dbfa4
+// SIZE 0x10
 class Lego3DManager {
 public:
+	Lego3DManager();
+	virtual ~Lego3DManager();
+
 	inline Lego3DView* GetLego3DView() { return this->m_3dView; }
 
 private:
-	undefined4 m_unk0x00; // 0x00
-	undefined4 m_unk0x04; // 0x04
-	Lego3DView* m_3dView; // 0x08
+	Tgl::Renderer* m_render;      // 0x04
+	Lego3DView* m_3dView;         // 0x08
+	MxUnknown100dbdbc* m_unk0x0c; // 0x0c
+
+	void Init(MxRenderSettings& p_settings);
+	void Destroy();
 };
 
+// SYNTHETIC: LEGO1 0x100ab340
+// Lego3DManager::`scalar deleting destructor'
+
 #endif // LEGO3DMANAGER_H
diff --git a/LEGO1/lego3dview.cpp b/LEGO1/lego3dview.cpp
index 0bb384e8..096e7b9e 100644
--- a/LEGO1/lego3dview.cpp
+++ b/LEGO1/lego3dview.cpp
@@ -1,6 +1,25 @@
 #include "lego3dview.h"
 
 #include "legoroi.h"
+#include "tgl/tgl.h"
+
+DECOMP_SIZE_ASSERT(Lego3DView, 0xa8)
+
+// STUB: LEGO1 0x100aae90
+Lego3DView::Lego3DView()
+{
+}
+
+// STUB: LEGO1 0x100aaf30
+Lego3DView::~Lego3DView()
+{
+}
+
+// STUB: LEGO1 0x100aaf90
+MxBool Lego3DView::Init(MxRenderSettings& p_renderSettings, Tgl::Renderer& p_render)
+{
+	return FALSE;
+}
 
 // STUB: LEGO1 0x100ab2b0
 LegoROI* Lego3DView::PickROI(MxLong p_a, MxLong p_b)
diff --git a/LEGO1/lego3dview.h b/LEGO1/lego3dview.h
index b984ad0f..0681003f 100644
--- a/LEGO1/lego3dview.h
+++ b/LEGO1/lego3dview.h
@@ -1,27 +1,38 @@
 #ifndef LEGO3DVIEW_H
 #define LEGO3DVIEW_H
 
+#include "mxrendersettings.h"
 #include "mxtypes.h"
 #include "tgl/d3drm/impl.h"
 #include "viewmanager/viewmanager.h"
 
 class LegoROI;
+class Tgl::Renderer;
 
+// VTABLE: LEGO1 0x100dbf78
+// SIZE 0xa8
 class Lego3DView {
 public:
+	Lego3DView();
+	virtual ~Lego3DView();
+
 	inline ViewManager* GetViewManager() { return this->m_viewManager; }
 	inline TglImpl::ViewImpl* GetViewPort() { return this->m_viewPort; }
+	MxBool Init(MxRenderSettings& p_renderSettings, Tgl::Renderer& p_render);
 	LegoROI* PickROI(MxLong p_a, MxLong p_b);
 
 private:
 	// TODO: all of these fields are in various base classes
-	undefined4 m_vtable;                 // 0x0 (TODO: remove once virtual function added)
-	undefined4 m_unk0x4;                 // 0x4
-	TglImpl::RendererImpl* m_renderImpl; // 0x8
-	TglImpl::DeviceImpl* m_deviceImpl;   // 0xc
+	undefined4 m_unk0x4;                 // 0x04
+	TglImpl::RendererImpl* m_renderImpl; // 0x08
+	TglImpl::DeviceImpl* m_deviceImpl;   // 0x0c
 	TglImpl::ViewImpl* m_viewPort;       // 0x10
-	char m_pad[0x78];                    // 0x14
+	undefined m_unk0x14[0x74];           // 0x14
 	ViewManager* m_viewManager;          // 0x88
+	undefined m_unk0x8c[0x1c];           // 0x8c
 };
 
+// SYNTHETIC: LEGO1 0x100aaf10
+// Lego3DView::`scalar deleting destructor'
+
 #endif // LEGO3DVIEW_H
diff --git a/LEGO1/mxrendersettings.cpp b/LEGO1/mxrendersettings.cpp
new file mode 100644
index 00000000..4d4476ec
--- /dev/null
+++ b/LEGO1/mxrendersettings.cpp
@@ -0,0 +1,21 @@
+#include "mxrendersettings.h"
+
+#include "decomp.h"
+
+DECOMP_SIZE_ASSERT(MxRenderSettings, 0x28)
+
+// FUNCTION: LEGO1 0x100ab2d0
+MxU32 MxRenderSettings::CopyFrom(MxRenderSettings& p_dest, const MxRenderSettings& p_src)
+{
+	p_dest.m_unk0x00 = p_src.m_unk0x00;
+	p_dest.m_hwnd = p_src.m_hwnd;
+	p_dest.m_directDraw = p_src.m_directDraw;
+	p_dest.m_ddSurface1 = p_src.m_ddSurface1;
+	p_dest.m_ddSurface2 = p_src.m_ddSurface2;
+	p_dest.m_flags = p_src.m_flags;
+	p_dest.m_unk0x18 = p_src.m_unk0x18;
+	p_dest.m_flags2 = p_src.m_flags2;
+	p_dest.m_direct3d = p_src.m_direct3d;
+	p_dest.m_d3dDevice = p_src.m_d3dDevice;
+	return 1;
+}
diff --git a/LEGO1/mxrendersettings.h b/LEGO1/mxrendersettings.h
new file mode 100644
index 00000000..14909ade
--- /dev/null
+++ b/LEGO1/mxrendersettings.h
@@ -0,0 +1,28 @@
+#ifndef MXRENDERSETTINGS_H
+#define MXRENDERSETTINGS_H
+
+#include "decomp.h"
+#include "mxtypes.h"
+
+#include <d3d.h>
+#include <ddraw.h>
+#include <windows.h>
+
+// SIZE 0x28
+struct MxRenderSettings {
+public:
+	static MxU32 CopyFrom(MxRenderSettings& p_dest, const MxRenderSettings& p_src);
+
+	undefined4 m_unk0x00;             // 0x00
+	HWND m_hwnd;                      // 0x04
+	IDirectDraw* m_directDraw;        // 0x08
+	IDirectDrawSurface* m_ddSurface1; // 0x0c
+	IDirectDrawSurface* m_ddSurface2; // 0x10
+	MxU32 m_flags;                    // 0x14
+	undefined4 m_unk0x18;             // 0x18
+	MxU32 m_flags2;                   // 0x1c
+	IDirect3D* m_direct3d;            // 0x20
+	IDirect3DDevice* m_d3dDevice;     // 0x24
+};
+
+#endif // MXRENDERSETTINGS_H
diff --git a/LEGO1/mxunknown100dbdbc.cpp b/LEGO1/mxunknown100dbdbc.cpp
index a420454a..64254f0b 100644
--- a/LEGO1/mxunknown100dbdbc.cpp
+++ b/LEGO1/mxunknown100dbdbc.cpp
@@ -9,3 +9,9 @@ MxUnknown100dbdbc::MxUnknown100dbdbc()
 {
 	// TODO
 }
+
+// STUB: LEGO1 0x100a7130
+MxUnknown100dbdbc::~MxUnknown100dbdbc()
+{
+	// TODO
+}
diff --git a/LEGO1/mxunknown100dbdbc.h b/LEGO1/mxunknown100dbdbc.h
index 157058a7..b5049760 100644
--- a/LEGO1/mxunknown100dbdbc.h
+++ b/LEGO1/mxunknown100dbdbc.h
@@ -9,9 +9,10 @@
 class MxUnknown100dbdbc {
 public:
 	MxUnknown100dbdbc();
+	virtual ~MxUnknown100dbdbc();
 
 private:
-	undefined m_unk0x4[0x14]; // TODO: change to 0x10 once scalar deconstructor is added
+	undefined m_unk0x4[0x10];
 };
 
 #endif // MXUNKNOWN100DBDBC_H

From ff4845a6ea7bdef4712b8f52dc2a35d883270e8c Mon Sep 17 00:00:00 2001
From: Joshua Peisach <itzswirlz2020@outlook.com>
Date: Thu, 28 Dec 2023 13:55:03 -0500
Subject: [PATCH 035/210] MxLoopingFlcPresenter::Destroy (#382)

* MxLoopingFlcPresenter::Destroy

* Use parent class call

---------

Co-authored-by: Christian Semmler <mail@csemmler.com>
---
 LEGO1/mxloopingflcpresenter.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/LEGO1/mxloopingflcpresenter.cpp b/LEGO1/mxloopingflcpresenter.cpp
index cb4fd40b..03b14a5a 100644
--- a/LEGO1/mxloopingflcpresenter.cpp
+++ b/LEGO1/mxloopingflcpresenter.cpp
@@ -24,10 +24,15 @@ void MxLoopingFlcPresenter::Init()
 	this->m_flags &= ~Flag_Bit3;
 }
 
-// STUB: LEGO1 0x100b4432
+// FUNCTION: LEGO1 0x100b4430
 void MxLoopingFlcPresenter::Destroy(MxBool p_fromDestructor)
 {
-	// TODO
+	m_criticalSection.Enter();
+	Init();
+	m_criticalSection.Leave();
+
+	if (!p_fromDestructor)
+		MxFlcPresenter::Destroy(FALSE);
 }
 
 // FUNCTION: LEGO1 0x100b4470

From 9a6d5555080caac014846dabd6b03f30604ddc4f Mon Sep 17 00:00:00 2001
From: MS <disinvite@users.noreply.github.com>
Date: Thu, 28 Dec 2023 16:10:57 -0500
Subject: [PATCH 036/210] Cvdump parser and comparing library functions (#383)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Cvdump wrapper and parser. Matching library functions

* Remove 'Self' type int (3.11+)

* Add temp reference for entrypoints

* ISLE using multithreaded libc

* 🙄
---
 CMakeLists.txt                                |   2 +-
 LEGO1/library_msvc.h                          |  47 +++++
 tools/isledecomp/isledecomp/bin.py            | 117 ++++++++-----
 .../isledecomp/isledecomp/cvdump/__init__.py  |   2 +
 tools/isledecomp/isledecomp/cvdump/parser.py  | 163 ++++++++++++++++++
 tools/isledecomp/isledecomp/cvdump/runner.py  |  66 +++++++
 tools/isledecomp/isledecomp/syminfo.py        | 115 +++++-------
 7 files changed, 395 insertions(+), 117 deletions(-)
 create mode 100644 LEGO1/library_msvc.h
 create mode 100644 tools/isledecomp/isledecomp/cvdump/__init__.py
 create mode 100644 tools/isledecomp/isledecomp/cvdump/parser.py
 create mode 100644 tools/isledecomp/isledecomp/cvdump/runner.py

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cdf37ff1..b4676767 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -294,7 +294,7 @@ if (MSVC)
   # game was originally built with) and tweaked slightly to produce more debugging info for reccmp.
   # They ensure a recompilation that can be byte/instruction accurate to the original binaries.
   if (ISLE_BUILD_APP)
-    target_compile_options(isle PRIVATE "/ML$<$<CONFIG:Debug>:d>")
+    target_compile_options(isle PRIVATE "/MT$<$<CONFIG:Debug>:d>")
   endif()
   target_compile_options(lego1 PRIVATE "/MT$<$<CONFIG:Debug>:d>")
 
diff --git a/LEGO1/library_msvc.h b/LEGO1/library_msvc.h
new file mode 100644
index 00000000..d07ecef2
--- /dev/null
+++ b/LEGO1/library_msvc.h
@@ -0,0 +1,47 @@
+#ifdef 0
+
+// LIBRARY: ISLE 0x402f80
+// LIBRARY: LEGO1 0x10086240
+// _malloc
+
+// LIBRARY: ISLE 0x402fa0
+// LIBRARY: LEGO1 0x10086260
+// _free
+
+// LIBRARY: ISLE 0x408220
+// LIBRARY: LEGO1 0x1008b400
+// _atol
+
+// LIBRARY: ISLE 0x4082d0
+// LIBRARY: LEGO1 0x1008b4b0
+// _atoi
+
+// LIBRARY: LEGO1 0x1008b4c0
+// _strtok
+
+// LIBRARY: ISLE 0x4085c0
+// LIBRARY: LEGO1 0x1008b5a0
+// _sprintf
+
+// LIBRARY: ISLE 0x4081e0
+// _srand
+
+// LIBRARY: ISLE 0x4081f0
+// LIBRARY: LEGO1 0x1008b640
+// _rand
+
+// entry
+// LIBRARY: ISLE 0x4082e0
+// _WinMainCRTStartup
+
+// entry
+// LIBRARY: LEGO1 0x1008c860
+// __DllMainCRTStartup@12
+
+// LIBRARY: ISLE 0x409110
+// __mtinit
+
+// LIBRARY: ISLE 0x409190
+// __getptd
+
+#endif
diff --git a/tools/isledecomp/isledecomp/bin.py b/tools/isledecomp/isledecomp/bin.py
index 1aec9330..16f70f7a 100644
--- a/tools/isledecomp/isledecomp/bin.py
+++ b/tools/isledecomp/isledecomp/bin.py
@@ -1,4 +1,6 @@
 import struct
+from typing import List, Optional
+from dataclasses import dataclass
 from collections import namedtuple
 
 
@@ -33,44 +35,56 @@ class InvalidVirtualAddressError(IndexError):
     ],
 )
 
-ImageSectionHeader = namedtuple(
-    "ImageSectionHeader",
-    [
-        "Name",
-        "Misc",
-        "VirtualAddress",
-        "SizeOfRawData",
-        "PointerToRawData",
-        "PointerToRelocations",
-        "PointerToLineNumbers",
-        "NumberOfRelocations",
-        "NumberOfLineNumbers",
-        "Characteristics",
-    ],
-)
 
+@dataclass
+class ImageSectionHeader:
+    # pylint: disable=too-many-instance-attributes
+    # Most attributes are unused, but this is the struct format
+    name: bytes
+    virtual_size: int
+    virtual_address: int
+    size_of_raw_data: int
+    pointer_to_raw_data: int
+    pointer_to_relocations: int
+    pointer_to_line_numbers: int
+    number_of_relocations: int
+    number_of_line_numbers: int
+    characteristics: int
 
-def section_name_match(section, name):
-    return section.Name == struct.pack("8s", name.encode("ascii"))
+    def match_name(self, name: str) -> bool:
+        return self.name == struct.pack("8s", name.encode("ascii"))
 
+    def contains_vaddr(self, vaddr: int) -> bool:
+        ofs = vaddr - self.virtual_address
+        return 0 <= ofs < max(self.size_of_raw_data, self.virtual_size)
 
-def section_contains_vaddr(section, imagebase, vaddr) -> bool:
-    debased = vaddr - imagebase
-    ofs = debased - section.VirtualAddress
-    return 0 <= ofs < section.SizeOfRawData
+    def addr_is_uninitialized(self, vaddr: int) -> bool:
+        """We cannot rely on the IMAGE_SCN_CNT_UNINITIALIZED_DATA flag (0x80) in
+        the characteristics field so instead we determine it this way."""
+        if not self.contains_vaddr(vaddr):
+            return False
+
+        # Should include the case where size_of_raw_data == 0,
+        # meaning the entire section is uninitialized
+        return (self.virtual_size > self.size_of_raw_data) and (
+            vaddr - self.virtual_address >= self.size_of_raw_data
+        )
 
 
 class Bin:
     """Parses a PE format EXE and allows reading data from a virtual address.
     Reference: https://learn.microsoft.com/en-us/windows/win32/debug/pe-format"""
 
-    def __init__(self, filename, logger=None):
+    # pylint: disable=too-many-instance-attributes
+
+    def __init__(self, filename: str, logger=None) -> None:
         self.logger = logger
         self._debuglog(f'Parsing headers of "{filename}"... ')
         self.filename = filename
         self.file = None
         self.imagebase = None
-        self.sections = []
+        self.entry = None
+        self.sections: List[ImageSectionHeader] = []
         self.last_section = None
         self._relocated_addrs = set()
 
@@ -95,12 +109,18 @@ def __enter__(self):
 
         optional_hdr = self.file.read(pe_hdr.SizeOfOptionalHeader)
         (self.imagebase,) = struct.unpack("<i", optional_hdr[0x1C:0x20])
+        (entry,) = struct.unpack("<i", optional_hdr[0x10:0x14])
+        self.entry = entry + self.imagebase
 
         self.sections = [
             ImageSectionHeader(*struct.unpack("<8s6I2HI", self.file.read(0x28)))
             for i in range(pe_hdr.NumberOfSections)
         ]
 
+        # Add the imagebase here because we almost never need the base vaddr without it
+        for sect in self.sections:
+            sect.virtual_address += self.imagebase
+
         self._populate_relocations()
 
         text_section = self._get_section_by_name(".text")
@@ -119,7 +139,7 @@ def _debuglog(self, msg):
         if self.logger is not None:
             self.logger.debug(msg)
 
-    def get_relocated_addresses(self):
+    def get_relocated_addresses(self) -> List[int]:
         return sorted(self._relocated_addrs)
 
     def is_relocated_addr(self, vaddr) -> bool:
@@ -165,27 +185,25 @@ def _populate_relocations(self):
             (relocated_addr,) = struct.unpack("<I", self.read(addr, 4))
             self._relocated_addrs.add(relocated_addr)
 
-    def _set_section_for_vaddr(self, vaddr):
-        if self.last_section is not None and section_contains_vaddr(
-            self.last_section, self.imagebase, vaddr
-        ):
+    def _set_section_for_vaddr(self, vaddr: int):
+        if self.last_section is not None and self.last_section.contains_vaddr(vaddr):
             return
 
         # TODO: assumes no potential for section overlap. reasonable?
         self.last_section = next(
             filter(
-                lambda section: section_contains_vaddr(section, self.imagebase, vaddr),
+                lambda section: section.contains_vaddr(vaddr),
                 self.sections,
             ),
             None,
         )
 
         if self.last_section is None:
-            raise InvalidVirtualAddressError
+            raise InvalidVirtualAddressError(f"0x{vaddr:08x}")
 
-    def _get_section_by_name(self, name):
+    def _get_section_by_name(self, name: str):
         section = next(
-            filter(lambda section: section_name_match(section, name), self.sections),
+            filter(lambda section: section.match_name(name), self.sections),
             None,
         )
 
@@ -194,7 +212,7 @@ def _get_section_by_name(self, name):
 
         return section
 
-    def get_section_offset_by_index(self, index) -> int:
+    def get_section_offset_by_index(self, index: int) -> int:
         """The symbols output from cvdump gives addresses in this format: AAAA.BBBBBBBB
         where A is the index (1-based) into the section table and B is the local offset.
         This will return the virtual address for the start of the section at the given index
@@ -202,29 +220,33 @@ def get_section_offset_by_index(self, index) -> int:
         """
 
         section = self.sections[index - 1]
-        return self.imagebase + section.VirtualAddress
+        return section.virtual_address
 
-    def get_section_offset_by_name(self, name) -> int:
+    def get_section_offset_by_name(self, name: str) -> int:
         """Same as above, but use the section name as the lookup"""
 
         section = self._get_section_by_name(name)
-        return self.imagebase + section.VirtualAddress
+        return section.virtual_address
 
-    def get_raw_addr(self, vaddr) -> int:
+    def get_abs_addr(self, section: int, offset: int) -> int:
+        """Convenience function for converting section:offset pairs from cvdump
+        into an absolute vaddr."""
+        return self.get_section_offset_by_index(section) + offset
+
+    def get_raw_addr(self, vaddr: int) -> int:
         """Returns the raw offset in the PE binary for the given virtual address."""
         self._set_section_for_vaddr(vaddr)
         return (
             vaddr
-            - self.imagebase
-            - self.last_section.VirtualAddress
-            + self.last_section.PointerToRawData
+            - self.last_section.virtual_address
+            + self.last_section.pointer_to_raw_data
         )
 
-    def is_valid_vaddr(self, vaddr) -> bool:
+    def is_valid_vaddr(self, vaddr: int) -> bool:
         """Does this virtual address point to anything in the exe?"""
         section = next(
             filter(
-                lambda section: section_contains_vaddr(section, self.imagebase, vaddr),
+                lambda section: section.contains_vaddr(vaddr),
                 self.sections,
             ),
             None,
@@ -232,9 +254,14 @@ def is_valid_vaddr(self, vaddr) -> bool:
 
         return section is not None
 
-    def read(self, offset, size):
+    def read(self, offset: int, size: int) -> Optional[bytes]:
+        """Read (at most) the given number of bytes at the given virtual address.
+        If we return None, the given address points to uninitialized data."""
         self._set_section_for_vaddr(offset)
 
+        if self.last_section.addr_is_uninitialized(offset):
+            return None
+
         raw_addr = self.get_raw_addr(offset)
         self.file.seek(raw_addr)
 
@@ -242,8 +269,8 @@ def read(self, offset, size):
         # Reading off the end will most likely misrepresent the virtual addressing.
         _size = min(
             size,
-            self.last_section.PointerToRawData
-            + self.last_section.SizeOfRawData
+            self.last_section.pointer_to_raw_data
+            + self.last_section.size_of_raw_data
             - raw_addr,
         )
         return self.file.read(_size)
diff --git a/tools/isledecomp/isledecomp/cvdump/__init__.py b/tools/isledecomp/isledecomp/cvdump/__init__.py
new file mode 100644
index 00000000..e9d66298
--- /dev/null
+++ b/tools/isledecomp/isledecomp/cvdump/__init__.py
@@ -0,0 +1,2 @@
+from .parser import CvdumpParser
+from .runner import Cvdump
diff --git a/tools/isledecomp/isledecomp/cvdump/parser.py b/tools/isledecomp/isledecomp/cvdump/parser.py
new file mode 100644
index 00000000..ddc2e5f7
--- /dev/null
+++ b/tools/isledecomp/isledecomp/cvdump/parser.py
@@ -0,0 +1,163 @@
+import re
+from typing import Iterable
+from collections import namedtuple
+
+# e.g. `*** PUBLICS`
+_section_change_regex = re.compile(r"^\*\*\* (?P<section>[A-Z/ ]+)")
+
+# e.g. `     27 00034EC0     28 00034EE2     29 00034EE7     30 00034EF4`
+_line_addr_pairs_findall = re.compile(r"\s+(?P<line_no>\d+) (?P<addr>[A-F0-9]{8})")
+
+# We assume no spaces in the file name
+# e.g. `  Z:\lego-island\isle\LEGO1\viewmanager\viewroi.cpp (None), 0001:00034E90-00034E97, line/addr pairs = 2`
+_lines_subsection_header = re.compile(
+    r"^\s*(?P<filename>\S+).*?, (?P<section>[A-F0-9]{4}):(?P<start>[A-F0-9]{8})-(?P<end>[A-F0-9]{8}), line/addr pairs = (?P<len>\d+)"
+)
+
+# e.g. `S_PUB32: [0001:0003FF60], Flags: 00000000, __read`
+_publics_line_regex = re.compile(
+    r"^(?P<type>\w+): \[(?P<section>\w{4}):(?P<offset>\w{8})], Flags: (?P<flags>\w{8}), (?P<name>\S+)"
+)
+
+# e.g. `(00008C) S_GPROC32: [0001:00034E90], Cb: 00000007, Type:             0x1024, ViewROI::IntrinsicImportance`
+_symbol_line_regex = re.compile(
+    r"\(\w+\) (?P<type>\S+): \[(?P<section>\w{4}):(?P<offset>\w{8})\], Cb: (?P<size>\w+), Type:\s+\S+, (?P<name>.+)"
+)
+
+# e.g. `         Debug start: 00000008, Debug end: 0000016E`
+_gproc_debug_regex = re.compile(
+    r"\s*Debug start: (?P<start>\w{8}), Debug end: (?P<end>\w{8})"
+)
+
+# e.g. `  00DA  0001:00000000  00000073  60501020`
+_section_contrib_regex = re.compile(
+    r"\s*(?P<module>\w{4})  (?P<section>\w{4}):(?P<offset>\w{8})  (?P<size>\w{8})  (?P<flags>\w{8})"
+)
+
+# e.g. `S_GDATA32: [0003:000004A4], Type:   T_32PRCHAR(0470), g_set`
+_gdata32_regex = re.compile(
+    r"S_GDATA32: \[(?P<section>\w{4}):(?P<offset>\w{8})\], Type:\s*(?P<type>\S+), (?P<name>\S+)"
+)
+
+
+LinesEntry = namedtuple("LinesEntry", "filename line_no addr")
+PublicsEntry = namedtuple("PublicsEntry", "type section offset flags name")
+SymbolsEntry = namedtuple("SymbolsEntry", "type section offset size name")
+SizeRefEntry = namedtuple("SizeRefEntry", "section offset size")
+GdataEntry = namedtuple("GdataEntry", "section offset type name")
+
+
+class CvdumpParser:
+    def __init__(self) -> None:
+        self._section: str = ""
+        self._lines_filename: str = ""
+
+        self.lines = []
+        self.publics = []
+        self.symbols = []
+        self.sizerefs = []
+        self.globals = []
+
+    def _lines_section(self, line: str):
+        """Parsing entries from the LINES section. We only care about the pairs of
+        line_number and address and the subsection header to indicate which code file
+        we are in."""
+
+        # Subheader indicates a new function and possibly a new code filename.
+        if (match := _lines_subsection_header.match(line)) is not None:
+            self._lines_filename = match.group(1)
+            return
+
+        if (matches := _line_addr_pairs_findall.findall(line)) is not None:
+            for line_no, addr in matches:
+                self.lines.append(
+                    LinesEntry(
+                        filename=self._lines_filename,
+                        line_no=int(line_no),
+                        addr=int(addr, 16),
+                    )
+                )
+
+    def _publics_section(self, line: str):
+        """Match each line from PUBLICS and pull out the symbol information.
+        These are MSVC mangled symbol names. String constants and vtable
+        addresses can only be found here."""
+        if (match := _publics_line_regex.match(line)) is not None:
+            self.publics.append(
+                PublicsEntry(
+                    type=match.group("type"),
+                    section=int(match.group("section"), 16),
+                    offset=int(match.group("offset"), 16),
+                    flags=int(match.group("flags"), 16),
+                    name=match.group("name"),
+                )
+            )
+
+    def _globals_section(self, line: str):
+        """S_PROCREF may be useful later.
+        Right now we just want S_GDATA32 symbols because it is the simplest
+        way to access global variables."""
+        if (match := _gdata32_regex.match(line)) is not None:
+            self.globals.append(
+                GdataEntry(
+                    section=int(match.group("section"), 16),
+                    offset=int(match.group("offset"), 16),
+                    type=match.group("type"),
+                    name=match.group("name"),
+                )
+            )
+
+    def _symbols_section(self, line: str):
+        """We are interested in S_GPROC32 symbols only."""
+        if (match := _symbol_line_regex.match(line)) is not None:
+            if match.group("type") == "S_GPROC32":
+                self.symbols.append(
+                    SymbolsEntry(
+                        type=match.group("type"),
+                        section=int(match.group("section"), 16),
+                        offset=int(match.group("offset"), 16),
+                        size=int(match.group("size"), 16),
+                        name=match.group("name"),
+                    )
+                )
+
+    def _section_contributions(self, line: str):
+        """Gives the size of elements across all sections of the binary.
+        This is the easiest way to get the data size for .data and .rdata
+        members that do not have a primitive data type."""
+        if (match := _section_contrib_regex.match(line)) is not None:
+            self.sizerefs.append(
+                SizeRefEntry(
+                    section=int(match.group("section"), 16),
+                    offset=int(match.group("offset"), 16),
+                    size=int(match.group("size"), 16),
+                )
+            )
+
+    def read_line(self, line: str):
+        # Blank lines are there to help the reader; they have no context significance
+        if line.strip() == "":
+            return
+
+        if (match := _section_change_regex.match(line)) is not None:
+            self._section = match.group(1)
+            return
+
+        if self._section == "LINES":
+            self._lines_section(line)
+
+        elif self._section == "PUBLICS":
+            self._publics_section(line)
+
+        elif self._section == "SYMBOLS":
+            self._symbols_section(line)
+
+        elif self._section == "SECTION CONTRIBUTIONS":
+            self._section_contributions(line)
+
+        elif self._section == "GLOBALS":
+            self._globals_section(line)
+
+    def read_lines(self, lines: Iterable[str]):
+        for line in lines:
+            self.read_line(line)
diff --git a/tools/isledecomp/isledecomp/cvdump/runner.py b/tools/isledecomp/isledecomp/cvdump/runner.py
new file mode 100644
index 00000000..02083c12
--- /dev/null
+++ b/tools/isledecomp/isledecomp/cvdump/runner.py
@@ -0,0 +1,66 @@
+from os import name as os_name
+from enum import Enum
+from typing import List
+import subprocess
+from isledecomp.lib import lib_path_join
+from isledecomp.dir import winepath_unix_to_win
+from .parser import CvdumpParser
+
+
+class DumpOpt(Enum):
+    LINES = 0
+    SYMBOLS = 1
+    GLOBALS = 2
+    PUBLICS = 3
+    SECTION_CONTRIB = 4
+
+
+cvdump_opt_map = {
+    DumpOpt.LINES: "-l",
+    DumpOpt.SYMBOLS: "-s",
+    DumpOpt.GLOBALS: "-g",
+    DumpOpt.PUBLICS: "-p",
+    DumpOpt.SECTION_CONTRIB: "-seccontrib",
+}
+
+
+class Cvdump:
+    def __init__(self, pdb: str) -> None:
+        self._pdb: str = pdb
+        self._options = set()
+
+    def lines(self):
+        self._options.add(DumpOpt.LINES)
+        return self
+
+    def symbols(self):
+        self._options.add(DumpOpt.SYMBOLS)
+        return self
+
+    def globals(self):
+        self._options.add(DumpOpt.GLOBALS)
+        return self
+
+    def publics(self):
+        self._options.add(DumpOpt.PUBLICS)
+        return self
+
+    def section_contributions(self):
+        self._options.add(DumpOpt.SECTION_CONTRIB)
+        return self
+
+    def cmd_line(self) -> List[str]:
+        cvdump_exe = lib_path_join("cvdump.exe")
+        flags = [cvdump_opt_map[opt] for opt in self._options]
+
+        if os_name == "nt":
+            return [cvdump_exe, *flags, self._pdb]
+
+        return ["wine", *flags, cvdump_exe, winepath_unix_to_win(self._pdb)]
+
+    def run(self) -> CvdumpParser:
+        p = CvdumpParser()
+        call = self.cmd_line()
+        lines = subprocess.check_output(call).decode("utf-8").split("\r\n")
+        p.read_lines(lines)
+        return p
diff --git a/tools/isledecomp/isledecomp/syminfo.py b/tools/isledecomp/isledecomp/syminfo.py
index e7ab0df4..1ecf0010 100644
--- a/tools/isledecomp/isledecomp/syminfo.py
+++ b/tools/isledecomp/isledecomp/syminfo.py
@@ -1,7 +1,6 @@
 import os
-import subprocess
-from isledecomp.lib import lib_path_join
-from isledecomp.dir import PathResolver, winepath_unix_to_win
+from isledecomp.dir import PathResolver
+from isledecomp.cvdump import Cvdump
 
 
 class RecompiledInfo:
@@ -20,81 +19,55 @@ class SymInfo:
     def __init__(self, pdb, sym_recompfile, sym_logger, base_dir):
         self.logger = sym_logger
         path_resolver = PathResolver(base_dir)
-        call = [lib_path_join("cvdump.exe"), "-l", "-s"]
-
-        if os.name != "nt":
-            # Run cvdump through wine and convert path to Windows-friendly wine path
-            call.insert(0, "wine")
-            call.append(winepath_unix_to_win(pdb))
-        else:
-            call.append(pdb)
 
         self.logger.info("Parsing %s ...", pdb)
-        self.logger.debug("Command = %s", call)
-        line_dump = subprocess.check_output(call).decode("utf-8").split("\r\n")
-
-        current_section = None
-
         self.logger.debug("Parsing output of cvdump.exe ...")
 
-        for i, line in enumerate(line_dump):
-            if line.startswith("***"):
-                current_section = line[4:]
-
-            if current_section == "SYMBOLS" and "S_GPROC32" in line:
-                sym_section = int(line[21:25], 16)
-                sym_addr = int(line[26:34], 16)
-
-                info = RecompiledInfo()
-                info.addr = sym_addr + sym_recompfile.get_section_offset_by_index(
-                    sym_section
-                )
-
-                use_dbg_offs = False
-                if use_dbg_offs:
-                    debug_offs = line_dump[i + 2]
-                    debug_start = int(debug_offs[22:30], 16)
-                    debug_end = int(debug_offs[43:], 16)
-
-                    info.start = debug_start
-                    info.size = debug_end - debug_start
-                else:
-                    info.start = 0
-                    info.size = int(line[41:49], 16)
-
-                info.name = line[77:]
-
-                self.names[info.name] = info
-                self.funcs[sym_addr] = info
-            elif (
-                current_section == "LINES"
-                and line.startswith("  ")
-                and not line.startswith("   ")
-            ):
-                sourcepath = line.split()[0]
-                sourcepath = path_resolver.resolve_cvdump(sourcepath)
-
-                if sourcepath not in self.lines:
-                    self.lines[sourcepath] = {}
-
-                j = i + 2
-                while True:
-                    ll = line_dump[j].split()
-                    if len(ll) == 0:
-                        break
-
-                    k = 0
-                    while k < len(ll):
-                        linenum = int(ll[k + 0])
-                        address = int(ll[k + 1], 16)
-                        if linenum not in self.lines[sourcepath]:
-                            self.lines[sourcepath][linenum] = address
-                        k += 2
-
-                    j += 1
+        cv = Cvdump(pdb).lines().symbols().publics().section_contributions().run()
 
         self.logger.debug("... Parsing output of cvdump.exe finished")
 
+        contrib_dict = {(s.section, s.offset): s.size for s in cv.sizerefs}
+        for pub in cv.publics:
+            if (
+                pub.type == "S_PUB32"
+                and pub.name.startswith("_")
+                and (pub.section, pub.offset) in contrib_dict
+            ):
+                size = contrib_dict[(pub.section, pub.offset)]
+
+                info = RecompiledInfo()
+                info.addr = sym_recompfile.get_abs_addr(pub.section, pub.offset)
+
+                info.start = 0
+                info.size = size
+                info.name = pub.name
+                self.names[pub.name] = info
+                self.funcs[pub.offset] = info
+
+        for proc in cv.symbols:
+            if proc.type != "S_GPROC32":
+                continue
+
+            info = RecompiledInfo()
+            info.addr = sym_recompfile.get_abs_addr(proc.section, proc.offset)
+
+            info.start = 0
+            info.size = proc.size
+            info.name = proc.name
+
+            self.names[proc.name] = info
+            self.funcs[proc.offset] = info
+
+        for sourcepath, line_no, offset in cv.lines:
+            sourcepath = path_resolver.resolve_cvdump(sourcepath)
+
+            if sourcepath not in self.lines:
+                self.lines[sourcepath] = {}
+
+            if line_no not in self.lines[sourcepath]:
+                self.lines[sourcepath][line_no] = offset
+
     def get_recompiled_address(self, filename, line):
         recompiled_addr = None
 

From 3f63950a7dac2ce45648ac9cdb66ed84cace61e5 Mon Sep 17 00:00:00 2001
From: MS <disinvite@users.noreply.github.com>
Date: Thu, 28 Dec 2023 18:02:02 -0500
Subject: [PATCH 037/210] Fix new/delete symbol reference (#384)

---
 LEGO1/library_msvc.h                   | 12 +++++++++++-
 tools/isledecomp/isledecomp/syminfo.py |  6 +-----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/LEGO1/library_msvc.h b/LEGO1/library_msvc.h
index d07ecef2..c46154a8 100644
--- a/LEGO1/library_msvc.h
+++ b/LEGO1/library_msvc.h
@@ -1,11 +1,21 @@
 #ifdef 0
 
+// aka `operator new`
 // LIBRARY: ISLE 0x402f80
 // LIBRARY: LEGO1 0x10086240
-// _malloc
+// ??2@YAPAXI@Z
 
+// aka `operator delete`
 // LIBRARY: ISLE 0x402fa0
 // LIBRARY: LEGO1 0x10086260
+// ??3@YAXPAX@Z
+
+// LIBRARY: ISLE 0x406dd0
+// LIBRARY: LEGO1 0x1008a090
+// _malloc
+
+// LIBRARY: ISLE 0x406f00
+// LIBRARY: LEGO1 0x1008a1c0
 // _free
 
 // LIBRARY: ISLE 0x408220
diff --git a/tools/isledecomp/isledecomp/syminfo.py b/tools/isledecomp/isledecomp/syminfo.py
index 1ecf0010..8388eaa5 100644
--- a/tools/isledecomp/isledecomp/syminfo.py
+++ b/tools/isledecomp/isledecomp/syminfo.py
@@ -29,11 +29,7 @@ def __init__(self, pdb, sym_recompfile, sym_logger, base_dir):
 
         contrib_dict = {(s.section, s.offset): s.size for s in cv.sizerefs}
         for pub in cv.publics:
-            if (
-                pub.type == "S_PUB32"
-                and pub.name.startswith("_")
-                and (pub.section, pub.offset) in contrib_dict
-            ):
+            if pub.type == "S_PUB32" and (pub.section, pub.offset) in contrib_dict:
                 size = contrib_dict[(pub.section, pub.offset)]
 
                 info = RecompiledInfo()

From d82d062e926e2a726d951afda2810090b6f8f262 Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Thu, 28 Dec 2023 23:37:21 -0500
Subject: [PATCH 038/210] Implement/match MxRegionCursor class (#385)

* Implement/match MxRegionCursor class

* Rename function
---
 CMakeLists.txt             |   1 +
 LEGO1/mxlist.h             |  30 +++-
 LEGO1/mxrect32.h           |   8 +-
 LEGO1/mxregion.cpp         |   6 +-
 LEGO1/mxregion.h           |   9 +-
 LEGO1/mxregioncursor.cpp   | 284 +++++++++++++++++++++++++++++++++++++
 LEGO1/mxregioncursor.h     |  45 ++++++
 LEGO1/mxregionlist.h       |  31 ++--
 LEGO1/mxvideopresenter.cpp |   4 +-
 LEGO1/mxvideopresenter.h   |   2 +-
 10 files changed, 391 insertions(+), 29 deletions(-)
 create mode 100644 LEGO1/mxregioncursor.cpp
 create mode 100644 LEGO1/mxregioncursor.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b4676767..3b31a548 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -162,6 +162,7 @@ add_library(lego1 SHARED
   LEGO1/mxramstreamcontroller.cpp
   LEGO1/mxramstreamprovider.cpp
   LEGO1/mxregion.cpp
+  LEGO1/mxregioncursor.cpp
   LEGO1/mxrendersettings.cpp
   LEGO1/mxscheduler.cpp
   LEGO1/mxsemaphore.cpp
diff --git a/LEGO1/mxlist.h b/LEGO1/mxlist.h
index 8a5f3e0e..80fa0e00 100644
--- a/LEGO1/mxlist.h
+++ b/LEGO1/mxlist.h
@@ -92,13 +92,23 @@ class MxListCursor : public MxCore {
 	void Detach();
 	void Destroy();
 	MxBool Next(T& p_obj);
+	MxBool Prev(T& p_obj);
 	MxBool Current(T& p_obj);
 	MxBool First(T& p_obj);
 	MxBool Last(T& p_obj);
 	MxBool Advance();
 	MxBool HasMatch() { return m_match != NULL; }
 	void SetValue(T p_obj);
-	void Head() { m_match = m_list->m_first; }
+	MxBool Head()
+	{
+		m_match = m_list->m_first;
+		return m_match != NULL;
+	}
+	MxBool Tail()
+	{
+		m_match = m_list->m_last;
+		return m_match != NULL;
+	}
 	void Reset() { m_match = NULL; }
 	void Prepend(T p_newobj);
 
@@ -110,8 +120,8 @@ class MxListCursor : public MxCore {
 	}
 
 private:
-	MxList<T>* m_list;
-	MxListEntry<T>* m_match;
+	MxList<T>* m_list;       // 0x08
+	MxListEntry<T>* m_match; // 0x0c
 };
 
 template <class T>
@@ -226,6 +236,20 @@ inline MxBool MxListCursor<T>::Next(T& p_obj)
 	return m_match != NULL;
 }
 
+template <class T>
+inline MxBool MxListCursor<T>::Prev(T& p_obj)
+{
+	if (!m_match)
+		m_match = m_list->m_last;
+	else
+		m_match = m_match->GetPrev();
+
+	if (m_match)
+		p_obj = m_match->GetValue();
+
+	return m_match != NULL;
+}
+
 template <class T>
 inline MxBool MxListCursor<T>::Current(T& p_obj)
 {
diff --git a/LEGO1/mxrect32.h b/LEGO1/mxrect32.h
index b54a9d92..7566a9ea 100644
--- a/LEGO1/mxrect32.h
+++ b/LEGO1/mxrect32.h
@@ -110,10 +110,10 @@ class MxRect32 {
 	inline static MxS32 Min(MxS32 p_a, MxS32 p_b) { return p_a <= p_b ? p_a : p_b; };
 	inline static MxS32 Max(MxS32 p_a, MxS32 p_b) { return p_a <= p_b ? p_b : p_a; };
 
-	MxS32 m_left;
-	MxS32 m_top;
-	MxS32 m_right;
-	MxS32 m_bottom;
+	MxS32 m_left;   // 0x00
+	MxS32 m_top;    // 0x04
+	MxS32 m_right;  // 0x08
+	MxS32 m_bottom; // 0x0c
 };
 
 #endif // MXRECT32_H
diff --git a/LEGO1/mxregion.cpp b/LEGO1/mxregion.cpp
index f003aceb..d21b9fdb 100644
--- a/LEGO1/mxregion.cpp
+++ b/LEGO1/mxregion.cpp
@@ -9,7 +9,7 @@ DECOMP_SIZE_ASSERT(MxRegionLeftRight, 0x08);
 // FUNCTION: LEGO1 0x100c31c0
 MxRegion::MxRegion()
 {
-	m_list = new MxRegionList;
+	m_list = new MxRegionTopBottomList;
 	m_rect = MxRect32(INT_MAX, INT_MAX, -1, -1);
 }
 
@@ -38,7 +38,7 @@ void MxRegion::VTable0x18(MxRect32& p_rect)
 {
 	MxRect32 rect(p_rect);
 	MxRect32 newRect;
-	MxRegionListCursor cursor(m_list);
+	MxRegionTopBottomListCursor cursor(m_list);
 	MxRegionTopBottom* topBottom;
 
 	while (rect.IsValid() && cursor.Next(topBottom)) {
@@ -91,7 +91,7 @@ MxBool MxRegion::VTable0x1c(MxRect32& p_rect)
 	if (!m_rect.IntersectsWith(p_rect))
 		return FALSE;
 
-	MxRegionListCursor cursor(m_list);
+	MxRegionTopBottomListCursor cursor(m_list);
 	MxRegionTopBottom* topBottom;
 
 	while (cursor.Next(topBottom)) {
diff --git a/LEGO1/mxregion.h b/LEGO1/mxregion.h
index c7d7dd90..646866a6 100644
--- a/LEGO1/mxregion.h
+++ b/LEGO1/mxregion.h
@@ -18,11 +18,14 @@ class MxRegion : public MxCore {
 	virtual MxBool VTable0x1c(MxRect32& p_rect); // vtable+0x1c
 	virtual MxBool VTable0x20();                 // vtable+0x20
 
-	inline MxRect32& GetRect() { return this->m_rect; }
+	inline MxRegionTopBottomList* GetTopBottomList() const { return m_list; }
+	inline const MxRect32& GetRect() const { return m_rect; }
+
+	friend class MxRegionCursor;
 
 private:
-	MxRegionList* m_list; // 0x08
-	MxRect32 m_rect;      // 0x0c
+	MxRegionTopBottomList* m_list; // 0x08
+	MxRect32 m_rect;               // 0x0c
 };
 
 #endif // MXREGION_H
diff --git a/LEGO1/mxregioncursor.cpp b/LEGO1/mxregioncursor.cpp
new file mode 100644
index 00000000..89c90403
--- /dev/null
+++ b/LEGO1/mxregioncursor.cpp
@@ -0,0 +1,284 @@
+#include "mxregioncursor.h"
+
+DECOMP_SIZE_ASSERT(MxRegionCursor, 0x18);
+
+// FUNCTION: LEGO1 0x100c3f70
+MxRegionCursor::MxRegionCursor(MxRegion* p_region)
+{
+	m_region = p_region;
+	m_rect = NULL;
+	m_topBottomCursor = new MxRegionTopBottomListCursor(m_region->m_list);
+	m_leftRightCursor = NULL;
+}
+
+// FUNCTION: LEGO1 0x100c40b0
+MxRegionCursor::~MxRegionCursor()
+{
+	if (m_rect)
+		delete m_rect;
+
+	if (m_topBottomCursor)
+		delete m_topBottomCursor;
+
+	if (m_leftRightCursor)
+		delete m_leftRightCursor;
+}
+
+// FUNCTION: LEGO1 0x100c4140
+MxRect32* MxRegionCursor::VTable0x18()
+{
+	m_topBottomCursor->Head();
+
+	MxRegionTopBottom* topBottom;
+	if (m_topBottomCursor->Current(topBottom)) {
+		FUN_100c46c0(*topBottom->m_leftRightList);
+
+		MxRegionLeftRight* leftRight;
+		m_leftRightCursor->First(leftRight);
+
+		UpdateRect(leftRight->GetLeft(), topBottom->GetTop(), leftRight->GetRight(), topBottom->GetBottom());
+	}
+	else
+		Reset();
+
+	return m_rect;
+}
+
+// FUNCTION: LEGO1 0x100c41d0
+MxRect32* MxRegionCursor::VTable0x20()
+{
+	m_topBottomCursor->Tail();
+
+	MxRegionTopBottom* topBottom;
+	if (m_topBottomCursor->Current(topBottom)) {
+		FUN_100c46c0(*topBottom->m_leftRightList);
+
+		MxRegionLeftRight* leftRight;
+		m_leftRightCursor->Last(leftRight);
+
+		UpdateRect(leftRight->GetLeft(), topBottom->GetTop(), leftRight->GetRight(), topBottom->GetBottom());
+	}
+	else
+		Reset();
+
+	return m_rect;
+}
+
+// FUNCTION: LEGO1 0x100c4260
+MxRect32* MxRegionCursor::VTable0x28()
+{
+	MxRegionLeftRight* leftRight;
+	MxRegionTopBottom* topBottom;
+
+	if (m_leftRightCursor && m_leftRightCursor->Next(leftRight)) {
+		m_topBottomCursor->Current(topBottom);
+
+		UpdateRect(leftRight->GetLeft(), topBottom->GetTop(), leftRight->GetRight(), topBottom->GetBottom());
+		return m_rect;
+	}
+
+	if (m_topBottomCursor->Next(topBottom)) {
+		FUN_100c46c0(*topBottom->m_leftRightList);
+		m_leftRightCursor->First(leftRight);
+
+		UpdateRect(leftRight->GetLeft(), topBottom->GetTop(), leftRight->GetRight(), topBottom->GetBottom());
+		return m_rect;
+	}
+
+	Reset();
+	return m_rect;
+}
+
+// FUNCTION: LEGO1 0x100c4360
+MxRect32* MxRegionCursor::VTable0x30()
+{
+	MxRegionLeftRight* leftRight;
+	MxRegionTopBottom* topBottom;
+
+	if (m_leftRightCursor && m_leftRightCursor->Prev(leftRight)) {
+		m_topBottomCursor->Current(topBottom);
+
+		UpdateRect(leftRight->GetLeft(), topBottom->GetTop(), leftRight->GetRight(), topBottom->GetBottom());
+		return m_rect;
+	}
+
+	if (m_topBottomCursor->Prev(topBottom)) {
+		FUN_100c46c0(*topBottom->m_leftRightList);
+		m_leftRightCursor->Last(leftRight);
+
+		UpdateRect(leftRight->GetLeft(), topBottom->GetTop(), leftRight->GetRight(), topBottom->GetBottom());
+		return m_rect;
+	}
+
+	Reset();
+	return m_rect;
+}
+
+// FUNCTION: LEGO1 0x100c4460
+MxRect32* MxRegionCursor::VTable0x14(MxRect32& p_rect)
+{
+	m_topBottomCursor->Reset();
+	FUN_100c4a20(p_rect);
+	return m_rect;
+}
+
+// FUNCTION: LEGO1 0x100c4480
+MxRect32* MxRegionCursor::VTable0x1c(MxRect32& p_rect)
+{
+	m_topBottomCursor->Reset();
+	FUN_100c4b50(p_rect);
+	return m_rect;
+}
+
+// FUNCTION: LEGO1 0x100c44a0
+MxRect32* MxRegionCursor::VTable0x24(MxRect32& p_rect)
+{
+	MxRegionLeftRight* leftRight;
+
+	if (m_leftRightCursor && m_leftRightCursor->Next(leftRight)) {
+		MxRegionTopBottom* topBottom;
+
+		m_topBottomCursor->Current(topBottom);
+
+		if (topBottom->IntersectsWith(p_rect) && leftRight->IntersectsWith(p_rect)) {
+			UpdateRect(leftRight->GetLeft(), topBottom->GetTop(), leftRight->GetRight(), topBottom->GetBottom());
+			m_rect->Intersect(p_rect);
+		}
+		else
+			FUN_100c4a20(p_rect);
+	}
+	else
+		FUN_100c4a20(p_rect);
+
+	return m_rect;
+}
+
+// FUNCTION: LEGO1 0x100c4590
+MxRect32* MxRegionCursor::VTable0x2c(MxRect32& p_rect)
+{
+	MxRegionLeftRight* leftRight;
+
+	if (m_leftRightCursor && m_leftRightCursor->Prev(leftRight)) {
+		MxRegionTopBottom* topBottom;
+
+		m_topBottomCursor->Current(topBottom);
+
+		if (topBottom->IntersectsWith(p_rect) && leftRight->IntersectsWith(p_rect)) {
+			UpdateRect(leftRight->GetLeft(), topBottom->GetTop(), leftRight->GetRight(), topBottom->GetBottom());
+			m_rect->Intersect(p_rect);
+		}
+		else
+			FUN_100c4b50(p_rect);
+	}
+	else
+		FUN_100c4b50(p_rect);
+
+	return m_rect;
+}
+
+// FUNCTION: LEGO1 0x100c4680
+void MxRegionCursor::Reset()
+{
+	if (m_rect) {
+		delete m_rect;
+		m_rect = NULL;
+	}
+
+	m_topBottomCursor->Reset();
+
+	if (m_leftRightCursor) {
+		delete m_leftRightCursor;
+		m_leftRightCursor = NULL;
+	}
+}
+
+// FUNCTION: LEGO1 0x100c46c0
+void MxRegionCursor::FUN_100c46c0(MxRegionLeftRightList& p_leftRightList)
+{
+	if (m_leftRightCursor)
+		delete m_leftRightCursor;
+
+	m_leftRightCursor = new MxRegionLeftRightListCursor(&p_leftRightList);
+}
+
+// FUNCTION: LEGO1 0x100c4980
+void MxRegionCursor::UpdateRect(MxS32 p_left, MxS32 p_top, MxS32 p_right, MxS32 p_bottom)
+{
+	if (!m_rect)
+		m_rect = new MxRect32;
+
+	m_rect->SetLeft(p_left);
+	m_rect->SetTop(p_top);
+	m_rect->SetRight(p_right);
+	m_rect->SetBottom(p_bottom);
+}
+
+// FUNCTION: LEGO1 0x100c4a20
+void MxRegionCursor::FUN_100c4a20(MxRect32& p_rect)
+{
+	MxRegionTopBottom* topBottom;
+	while (m_topBottomCursor->Next(topBottom)) {
+		if (p_rect.GetBottom() <= topBottom->GetTop()) {
+			Reset();
+			return;
+		}
+
+		if (p_rect.GetTop() < topBottom->GetBottom()) {
+			FUN_100c46c0(*topBottom->m_leftRightList);
+
+			MxRegionLeftRight* leftRight;
+			while (m_leftRightCursor->Next(leftRight)) {
+				if (p_rect.GetRight() <= leftRight->GetLeft())
+					break;
+
+				if (p_rect.GetLeft() < leftRight->GetRight()) {
+					UpdateRect(
+						leftRight->GetLeft(),
+						topBottom->GetTop(),
+						leftRight->GetRight(),
+						topBottom->GetBottom()
+					);
+					m_rect->Intersect(p_rect);
+					return;
+				}
+			}
+		}
+	}
+
+	Reset();
+}
+
+// FUNCTION: LEGO1 0x100c4b50
+void MxRegionCursor::FUN_100c4b50(MxRect32& p_rect)
+{
+	MxRegionTopBottom* topBottom;
+	while (m_topBottomCursor->Prev(topBottom)) {
+		if (topBottom->GetBottom() <= p_rect.GetTop()) {
+			Reset();
+			return;
+		}
+
+		if (topBottom->GetTop() < p_rect.GetBottom()) {
+			FUN_100c46c0(*topBottom->m_leftRightList);
+
+			MxRegionLeftRight* leftRight;
+			while (m_leftRightCursor->Prev(leftRight)) {
+				if (leftRight->GetRight() <= p_rect.GetLeft())
+					break;
+
+				if (leftRight->GetLeft() < p_rect.GetRight()) {
+					UpdateRect(
+						leftRight->GetLeft(),
+						topBottom->GetTop(),
+						leftRight->GetRight(),
+						topBottom->GetBottom()
+					);
+					m_rect->Intersect(p_rect);
+					return;
+				}
+			}
+		}
+	}
+
+	Reset();
+}
diff --git a/LEGO1/mxregioncursor.h b/LEGO1/mxregioncursor.h
new file mode 100644
index 00000000..5f4a24b8
--- /dev/null
+++ b/LEGO1/mxregioncursor.h
@@ -0,0 +1,45 @@
+#ifndef MXREGIONCURSOR_H
+#define MXREGIONCURSOR_H
+
+#include "mxregion.h"
+
+// VTABLE: LEGO1 0x100dcbb8
+// SIZE 0x18
+class MxRegionCursor : public MxCore {
+public:
+	MxRegionCursor(MxRegion* p_region);
+	virtual ~MxRegionCursor() override;
+
+	virtual MxRect32* VTable0x14(MxRect32& p_rect); // vtable+0x14
+	virtual MxRect32* VTable0x18();                 // vtable+0x18
+	virtual MxRect32* VTable0x1c(MxRect32& p_rect); // vtable+0x1c
+	virtual MxRect32* VTable0x20();                 // vtable+0x20
+	virtual MxRect32* VTable0x24(MxRect32& p_rect); // vtable+0x24
+	virtual MxRect32* VTable0x28();                 // vtable+0x28
+	virtual MxRect32* VTable0x2c(MxRect32& p_rect); // vtable+0x2c
+	virtual MxRect32* VTable0x30();                 // vtable+0x30
+
+	// FUNCTION: LEGO1 0x100c4070
+	virtual MxRect32* GetRect() { return m_rect; } // vtable+0x34
+
+	// FUNCTION: LEGO1 0x100c4080
+	virtual MxBool HasRect() { return m_rect != NULL; } // vtable+0x38
+
+	virtual void Reset(); // vtable+0x3c
+
+private:
+	void FUN_100c46c0(MxRegionLeftRightList& p_leftRightList);
+	void UpdateRect(MxS32 p_left, MxS32 p_top, MxS32 p_right, MxS32 p_bottom);
+	void FUN_100c4a20(MxRect32& p_rect);
+	void FUN_100c4b50(MxRect32& p_rect);
+
+	MxRegion* m_region;                             // 0x08
+	MxRect32* m_rect;                               // 0x0c
+	MxRegionTopBottomListCursor* m_topBottomCursor; // 0x10
+	MxRegionLeftRightListCursor* m_leftRightCursor; // 0x14
+};
+
+// SYNTHETIC: LEGO1 0x100c4090
+// MxRegionCursor::`scalar deleting destructor'
+
+#endif // MXREGIONCURSOR_H
diff --git a/LEGO1/mxregionlist.h b/LEGO1/mxregionlist.h
index ef3712cb..7c6da5c2 100644
--- a/LEGO1/mxregionlist.h
+++ b/LEGO1/mxregionlist.h
@@ -19,9 +19,11 @@ struct MxRegionLeftRight {
 	inline void SetLeft(MxS32 p_left) { m_left = p_left; }
 	inline void SetRight(MxS32 p_right) { m_right = p_right; }
 
+	inline MxBool IntersectsWith(MxRect32& p_rect) { return m_left < p_rect.GetRight() && p_rect.GetTop() < m_right; }
+
 private:
-	MxS32 m_left;
-	MxS32 m_right;
+	MxS32 m_left;  // 0x00
+	MxS32 m_right; // 0x04
 };
 
 // VTABLE: LEGO1 0x100dcc40
@@ -68,12 +70,15 @@ struct MxRegionTopBottom {
 	inline void SetTop(MxS32 p_top) { m_top = p_top; }
 	inline void SetBottom(MxS32 p_bottom) { m_bottom = p_bottom; }
 
-	friend class MxRegionList;
+	inline MxBool IntersectsWith(MxRect32& p_rect) { return m_top < p_rect.GetBottom() && p_rect.GetTop() < m_bottom; }
+
+	friend class MxRegionTopBottomList;
+	friend class MxRegionCursor;
 
 private:
-	MxS32 m_top;
-	MxS32 m_bottom;
-	MxRegionLeftRightList* m_leftRightList;
+	MxS32 m_top;                            // 0x00
+	MxS32 m_bottom;                         // 0x04
+	MxRegionLeftRightList* m_leftRightList; // 0x08
 };
 
 // VTABLE: LEGO1 0x100dcb10
@@ -87,9 +92,9 @@ struct MxRegionTopBottom {
 
 // VTABLE: LEGO1 0x100dcb58
 // SIZE 0x18
-class MxRegionList : public MxPtrList<MxRegionTopBottom> {
+class MxRegionTopBottomList : public MxPtrList<MxRegionTopBottom> {
 public:
-	MxRegionList() : MxPtrList<MxRegionTopBottom>(TRUE) {}
+	MxRegionTopBottomList() : MxPtrList<MxRegionTopBottom>(TRUE) {}
 };
 
 // VTABLE: LEGO1 0x100dcb70
@@ -98,14 +103,14 @@ class MxRegionList : public MxPtrList<MxRegionTopBottom> {
 // VTABLE: LEGO1 0x100dcba0
 // class MxListCursor<MxRegionTopBottom *>
 
-// TODO: The initialize list param type should be MxRegionList, but doing that
+// TODO: The initialize list param type should be MxRegionTopBottomList, but doing that
 // drastically reduced the match percentage for MxRegion::VTable0x18.
 // It also works with MxPtrList, so we'll do that until we figure this out.
 
 // VTABLE: LEGO1 0x100dcb88
-class MxRegionListCursor : public MxPtrListCursor<MxRegionTopBottom> {
+class MxRegionTopBottomListCursor : public MxPtrListCursor<MxRegionTopBottom> {
 public:
-	MxRegionListCursor(MxPtrList<MxRegionTopBottom>* p_list) : MxPtrListCursor<MxRegionTopBottom>(p_list){};
+	MxRegionTopBottomListCursor(MxPtrList<MxRegionTopBottom>* p_list) : MxPtrListCursor<MxRegionTopBottom>(p_list){};
 };
 
 // TEMPLATE: LEGO1 0x100c32e0
@@ -127,7 +132,7 @@ class MxRegionListCursor : public MxPtrListCursor<MxRegionTopBottom> {
 // MxPtrList<MxRegionTopBottom>::`scalar deleting destructor'
 
 // SYNTHETIC: LEGO1 0x100c3be0
-// MxRegionListCursor::`scalar deleting destructor'
+// MxRegionTopBottomListCursor::`scalar deleting destructor'
 
 // TEMPLATE: LEGO1 0x100c3c50
 // MxPtrListCursor<MxRegionTopBottom>::~MxPtrListCursor<MxRegionTopBottom>
@@ -142,7 +147,7 @@ class MxRegionListCursor : public MxPtrListCursor<MxRegionTopBottom> {
 // MxListCursor<MxRegionTopBottom *>::~MxListCursor<MxRegionTopBottom *>
 
 // FUNCTION: LEGO1 0x100c3dd0
-// MxRegionListCursor::~MxRegionListCursor
+// MxRegionTopBottomListCursor::~MxRegionTopBottomListCursor
 
 // SYNTHETIC: LEGO1 0x100c4790
 // MxRegionLeftRightListCursor::`scalar deleting destructor'
diff --git a/LEGO1/mxvideopresenter.cpp b/LEGO1/mxvideopresenter.cpp
index b1beb08e..4162be43 100644
--- a/LEGO1/mxvideopresenter.cpp
+++ b/LEGO1/mxvideopresenter.cpp
@@ -313,7 +313,7 @@ MxBool MxVideoPresenter::IsHit(MxS32 p_x, MxS32 p_y)
 }
 
 // STUB: LEGO1 0x100b2a70
-void MxVideoPresenter::VTable0x6c()
+void MxVideoPresenter::PutFrame()
 {
 	// TODO
 }
@@ -482,7 +482,7 @@ MxResult MxVideoPresenter::PutData()
 	MxAutoLocker lock(&m_criticalSection);
 
 	if (IsEnabled() && m_currentTickleState >= TickleState_Streaming && m_currentTickleState <= TickleState_unk5)
-		VTable0x6c();
+		PutFrame();
 
 	return SUCCESS;
 }
diff --git a/LEGO1/mxvideopresenter.h b/LEGO1/mxvideopresenter.h
index 4c1bab5e..72ea33d8 100644
--- a/LEGO1/mxvideopresenter.h
+++ b/LEGO1/mxvideopresenter.h
@@ -47,7 +47,7 @@ class MxVideoPresenter : public MxMediaPresenter {
 	virtual void CreateBitmap();                         // vtable+0x60
 	virtual void NextFrame();                            // vtable+0x64
 	virtual void LoadFrame(MxStreamChunk* p_chunk);      // vtable+0x68
-	virtual void VTable0x6c();                           // vtable+0x6c
+	virtual void PutFrame();                             // vtable+0x6c
 	virtual void RealizePalette();                       // vtable+0x70
 	virtual undefined VTable0x74();                      // vtable+0x74
 	virtual LPDIRECTDRAWSURFACE VTable0x78();            // vtable+0x78

From a95bdcc4ad205c7a89da32db0ef93dd6ae961391 Mon Sep 17 00:00:00 2001
From: Misha <106913236+MishaProductions@users.noreply.github.com>
Date: Fri, 29 Dec 2023 10:22:18 -0500
Subject: [PATCH 039/210] Implement InvokeAction (#386)

* push changes

* Update legoutil.cpp

* Fixes / match

---------

Co-authored-by: Christian Semmler <mail@csemmler.com>
---
 LEGO1/legoomni.cpp |  2 +-
 LEGO1/legoomni.h   |  4 ++-
 LEGO1/legoutil.cpp | 81 ++++++++++++++++++++++++++++++++++++++++++++--
 LEGO1/legoutil.h   |  2 +-
 4 files changed, 84 insertions(+), 5 deletions(-)

diff --git a/LEGO1/legoomni.cpp b/LEGO1/legoomni.cpp
index 8c9e5905..ddf0e454 100644
--- a/LEGO1/legoomni.cpp
+++ b/LEGO1/legoomni.cpp
@@ -390,7 +390,7 @@ void LegoOmni::Init()
 	m_gifManager = NULL;
 	m_worldList = NULL;
 	m_currentWorld = NULL;
-	m_unk0x80 = FALSE;
+	m_exit = FALSE;
 	m_currentVehicle = NULL;
 	m_saveDataWriter = NULL;
 	m_plantManager = NULL;
diff --git a/LEGO1/legoomni.h b/LEGO1/legoomni.h
index 7fb0a4f3..dff06fb5 100644
--- a/LEGO1/legoomni.h
+++ b/LEGO1/legoomni.h
@@ -116,6 +116,8 @@ class LegoOmni : public MxOmni {
 	MxTransitionManager* GetTransitionManager() { return m_transitionManager; }
 	MxDSAction& GetCurrentAction() { return m_action; }
 
+	inline void SetExit(MxBool p_exit) { m_exit = p_exit; };
+
 private:
 	undefined4* m_unk0x68;                       // 0x68
 	MxUnknown100dbdbc* m_renderMgr;              // 0x6c
@@ -123,7 +125,7 @@ class LegoOmni : public MxOmni {
 	GifManager* m_gifManager;                    // 0x74
 	LegoWorldList* m_worldList;                  // 0x78
 	LegoWorld* m_currentWorld;                   // 0x7c
-	MxBool m_unk0x80;                            // 0x80
+	MxBool m_exit;                               // 0x80
 	LegoNavController* m_navController;          // 0x84
 	IslePathActor* m_currentVehicle;             // 0x88
 	LegoUnkSaveDataWriter* m_saveDataWriter;     // 0x8c
diff --git a/LEGO1/legoutil.cpp b/LEGO1/legoutil.cpp
index 42d14dac..4941d968 100644
--- a/LEGO1/legoutil.cpp
+++ b/LEGO1/legoutil.cpp
@@ -1,8 +1,13 @@
 #include "legoutil.h"
 
+#include "legoomni.h"
+#include "legoworld.h"
+#include "mxdsaction.h"
 #include "mxomni.h"
+#include "mxstreamer.h"
 #include "mxtypes.h"
 
+#include <process.h>
 #include <string.h>
 
 // FUNCTION: LEGO1 0x1003e300
@@ -34,8 +39,79 @@ ExtraActionType MatchActionString(const char* p_str)
 	return result;
 }
 
-// STUB: LEGO1 0x1003e430
+MxBool CheckIfEntityExists(MxBool p_enable, const char* p_filename, MxS32 p_entityId);
+void NotifyEntity(const char* p_filename, MxS32 p_entityId, LegoEntity* p_sender);
+
+// FUNCTION: LEGO1 0x1003e430
 void InvokeAction(ExtraActionType p_actionId, MxAtomId& p_pAtom, int p_targetEntityId, LegoEntity* p_sender)
+{
+	MxDSAction action;
+	action.SetAtomId(p_pAtom);
+	action.SetObjectId(p_targetEntityId);
+
+	switch (p_actionId) {
+	case ExtraActionType_opendisk:
+		if (!CheckIfEntityExists(TRUE, p_pAtom.GetInternal(), p_targetEntityId)) {
+			Streamer()->Open(p_pAtom.GetInternal(), MxStreamer::e_DiskStream);
+			Start(&action);
+		}
+		break;
+	case ExtraActionType_openram:
+		if (!CheckIfEntityExists(TRUE, p_pAtom.GetInternal(), p_targetEntityId)) {
+			Streamer()->Open(p_pAtom.GetInternal(), MxStreamer::e_RAMStream);
+			Start(&action);
+		}
+		break;
+	case ExtraActionType_close:
+		action.SetUnknown24(-2);
+		DeleteObject(action);
+		Streamer()->Close(p_pAtom.GetInternal());
+		break;
+	case ExtraActionType_start:
+		if (!CheckIfEntityExists(TRUE, p_pAtom.GetInternal(), p_targetEntityId)) {
+			Start(&action);
+		}
+		break;
+	case ExtraActionType_stop:
+		action.SetUnknown24(-2);
+		if (!FUN_1003ee00(p_pAtom, p_targetEntityId)) {
+			DeleteObject(action);
+		}
+		break;
+	case ExtraActionType_run:
+		_spawnl(0, "\\lego\\sources\\main\\main.exe", "\\lego\\sources\\main\\main.exe", "/script", &p_pAtom, 0);
+		break;
+	case ExtraActionType_exit:
+		Lego()->SetExit(TRUE);
+		break;
+	case ExtraActionType_enable:
+		CheckIfEntityExists(TRUE, p_pAtom.GetInternal(), p_targetEntityId);
+		break;
+	case ExtraActionType_disable:
+		CheckIfEntityExists(FALSE, p_pAtom.GetInternal(), p_targetEntityId);
+		break;
+	case ExtraActionType_notify:
+		NotifyEntity(p_pAtom.GetInternal(), p_targetEntityId, p_sender);
+		break;
+	}
+}
+
+// FUNCTION: LEGO1 0x1003e670
+MxBool CheckIfEntityExists(MxBool p_enable, const char* p_filename, MxS32 p_entityId)
+{
+	LegoWorld* world =
+		(LegoWorld*) FindEntityByAtomIdOrEntityId(MxAtomId(p_filename, LookupMode_LowerCase2), p_entityId);
+	if (world) {
+		world->VTable0x68(p_enable);
+		return TRUE;
+	}
+	else {
+		return FALSE;
+	}
+}
+
+// STUB: LEGO1 0x1003e700
+void NotifyEntity(const char* p_filename, MxS32 p_entityId, LegoEntity* p_sender)
 {
 }
 
@@ -108,8 +184,9 @@ void ConvertHSVToRGB(float p_h, float p_s, float p_v, float* p_rOut, float* p_bO
 }
 
 // STUB: LEGO1 0x1003ee00
-void FUN_1003ee00(MxAtomId& p_atomId, MxS32 p_id)
+MxBool FUN_1003ee00(MxAtomId& p_atomId, MxS32 p_id)
 {
+	return TRUE;
 }
 
 // STUB: LEGO1 0x1003ef00
diff --git a/LEGO1/legoutil.h b/LEGO1/legoutil.h
index bd7adae6..827b8488 100644
--- a/LEGO1/legoutil.h
+++ b/LEGO1/legoutil.h
@@ -58,7 +58,7 @@ inline void GetString(MxU8** p_source, char** p_dest, T* p_obj, void (T::*p_sett
 ExtraActionType MatchActionString(const char*);
 void InvokeAction(ExtraActionType p_actionId, MxAtomId& p_pAtom, int p_targetEntityId, LegoEntity* p_sender);
 void ConvertHSVToRGB(float p_h, float p_s, float p_v, float* p_rOut, float* p_bOut, float* p_gOut);
-void FUN_1003ee00(MxAtomId& p_atomId, MxS32 p_id);
+MxBool FUN_1003ee00(MxAtomId& p_atomId, MxS32 p_id);
 void FUN_1003ef00(MxBool);
 void SetAppCursor(WPARAM p_wparam);
 MxBool FUN_1003ef60();

From 343715af23a45da767fa8db69c851c2c6f8f236a Mon Sep 17 00:00:00 2001
From: MS <disinvite@users.noreply.github.com>
Date: Fri, 29 Dec 2023 11:23:42 -0500
Subject: [PATCH 040/210] Wine cvdump bugfix (#388)

---
 tools/isledecomp/isledecomp/cvdump/runner.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/isledecomp/isledecomp/cvdump/runner.py b/tools/isledecomp/isledecomp/cvdump/runner.py
index 02083c12..f1c163b5 100644
--- a/tools/isledecomp/isledecomp/cvdump/runner.py
+++ b/tools/isledecomp/isledecomp/cvdump/runner.py
@@ -56,7 +56,7 @@ def cmd_line(self) -> List[str]:
         if os_name == "nt":
             return [cvdump_exe, *flags, self._pdb]
 
-        return ["wine", *flags, cvdump_exe, winepath_unix_to_win(self._pdb)]
+        return ["wine", cvdump_exe, *flags, winepath_unix_to_win(self._pdb)]
 
     def run(self) -> CvdumpParser:
         p = CvdumpParser()

From ceb5339369b96a9fc47f4b44b11f5e2a81e6bc1d Mon Sep 17 00:00:00 2001
From: Misha <106913236+MishaProductions@users.noreply.github.com>
Date: Fri, 29 Dec 2023 13:04:18 -0500
Subject: [PATCH 041/210] Infocenter vtable (#387)

* implement parts of legoworld/infocenter

* Update infocenter.cpp

* Update infocenter.cpp

* Update infocenter.cpp

* Update infocenter.cpp

* Update infocenter.cpp

* Match LegoWorld::Tickle

---------

Co-authored-by: Christian Semmler <mail@csemmler.com>
---
 LEGO1/infocenter.cpp | 32 ++++++++++++++++++++++++++++++--
 LEGO1/infocenter.h   |  6 ++++++
 LEGO1/legoworld.cpp  | 29 +++++++++++++++++++++++++++--
 LEGO1/legoworld.h    |  6 ++++--
 4 files changed, 67 insertions(+), 6 deletions(-)

diff --git a/LEGO1/infocenter.cpp b/LEGO1/infocenter.cpp
index f062f1e9..8c6bcb8d 100644
--- a/LEGO1/infocenter.cpp
+++ b/LEGO1/infocenter.cpp
@@ -12,18 +12,46 @@ Infocenter::~Infocenter()
 	// TODO
 }
 
+// STUB: LEGO1 0x1006ed90
+MxResult Infocenter::Create(MxDSObject& p_dsObject)
+{
+	return FAILURE;
+}
+
 // STUB: LEGO1 0x1006ef10
 MxLong Infocenter::Notify(MxParam& p_param)
 {
 	// TODO
-
 	return 0;
 }
 
+// STUB: LEGO1 0x1006f4e0
+void Infocenter::Stop()
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x10070aa0
+void Infocenter::VTable0x68(MxBool p_add)
+{
+	// TODO
+}
+
 // STUB: LEGO1 0x10070af0
 MxResult Infocenter::Tickle()
 {
 	// TODO
-
 	return 0;
 }
+
+// FUNCTION: LEGO1 0x10070d00
+MxBool Infocenter::VTable0x5c()
+{
+	return TRUE;
+}
+
+// STUB: LEGO1 0x10070f60
+MxBool Infocenter::VTable0x64()
+{
+	return FALSE;
+}
diff --git a/LEGO1/infocenter.h b/LEGO1/infocenter.h
index 89fcc54f..ec0be745 100644
--- a/LEGO1/infocenter.h
+++ b/LEGO1/infocenter.h
@@ -25,6 +25,12 @@ class Infocenter : public LegoWorld {
 	{
 		return !strcmp(p_name, Infocenter::ClassName()) || LegoWorld::IsA(p_name);
 	}
+
+	virtual MxResult Create(MxDSObject& p_dsObject) override; // vtable+0x18
+	virtual void Stop() override;                             // vtable+0x50
+	virtual MxBool VTable0x5c() override;                     // vtable+0x5c
+	virtual MxBool VTable0x64() override;                     // vtable+0x64
+	virtual void VTable0x68(MxBool p_add) override;           // vtable+0x68
 };
 
 #endif // INFOCENTER_H
diff --git a/LEGO1/legoworld.cpp b/LEGO1/legoworld.cpp
index 03139566..ff3969bd 100644
--- a/LEGO1/legoworld.cpp
+++ b/LEGO1/legoworld.cpp
@@ -2,7 +2,9 @@
 
 #include "legoinputmanager.h"
 #include "legoomni.h"
+#include "legoutil.h"
 #include "mxactionnotificationparam.h"
+#include "mxnotificationmanager.h"
 #include "mxnotificationparam.h"
 #include "mxomni.h"
 #include "mxticklemanager.h"
@@ -13,6 +15,9 @@ DECOMP_SIZE_ASSERT(LegoWorld, 0xf8);
 LegoWorld::LegoWorld() : m_list0x68(TRUE)
 {
 	// TODO
+	m_unk0xf6 = FALSE;
+	m_unk0xf4 = 4;
+	NotificationManager()->Register(this);
 }
 
 // FUNCTION: LEGO1 0x1001d670
@@ -93,10 +98,30 @@ void LegoWorld::VTable0x68(MxBool p_add)
 	// TODO
 }
 
-// STUB: LEGO1 0x10022080
+// FUNCTION: LEGO1 0x10022080
 MxResult LegoWorld::Tickle()
 {
-	return SUCCESS;
+	if (!m_unk0xf6) {
+		switch (m_unk0xf4) {
+		case 0:
+			m_unk0xf6 = TRUE;
+			SetAppCursor(0);
+			Stop();
+			return TRUE;
+		case 2:
+			if (FUN_100220e0() == 1)
+				break;
+		default:
+			m_unk0xf4--;
+		}
+	}
+	return TRUE;
+}
+
+// STUB: LEGO1 0x100220e0
+undefined LegoWorld::FUN_100220e0()
+{
+	return TRUE;
 }
 
 // FUNCTION: LEGO1 0x10022340
diff --git a/LEGO1/legoworld.h b/LEGO1/legoworld.h
index f6210e8e..d855b530 100644
--- a/LEGO1/legoworld.h
+++ b/LEGO1/legoworld.h
@@ -44,6 +44,7 @@ class LegoWorld : public LegoEntity {
 
 	inline LegoCameraController* GetCamera() { return m_camera; }
 
+	undefined FUN_100220e0();
 	MxResult SetAsCurrentWorld(MxDSObject& p_dsObject);
 	void EndAction(MxCore* p_object);
 	void FUN_1001fc80(IslePathActor* p_actor);
@@ -59,8 +60,9 @@ class LegoWorld : public LegoEntity {
 	LegoCameraController* m_camera;    // 0x98
 	undefined m_unk0x9c[0x1c];         // 0x9c
 	MxPresenterList m_list0xb8;        // 0xb8
-	undefined m_unk0xd0[0x26];         // 0xd0
-	undefined m_unk0xf6;               // 0xf6
+	undefined m_unk0xd0[0x24];         // 0xd0
+	MxS16 m_unk0xf4;                   // 0xf4
+	MxBool m_unk0xf6;                  // 0xf6
 	undefined m_unk0xf7;               // 0xf7
 };
 

From 51adb31541ee49f8eccabd3ed0f22d667d11dbaa Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Fri, 29 Dec 2023 16:30:17 -0500
Subject: [PATCH 042/210] Implement MxVideoPresenter::PutFrame (#389)

* Implementation of MxVideoPresenter::PutFrame

* Add TODOs
---
 LEGO1/mxdisplaysurface.cpp |  24 ++++---
 LEGO1/mxdisplaysurface.h   |  24 ++++---
 LEGO1/mxrect32.h           |  18 ++---
 LEGO1/mxsize32.h           |  12 ++--
 LEGO1/mxstillpresenter.cpp |  15 +---
 LEGO1/mxvideomanager.h     |   1 +
 LEGO1/mxvideopresenter.cpp | 140 ++++++++++++++++++++++++++++++++++---
 LEGO1/mxvideopresenter.h   |   2 +
 8 files changed, 186 insertions(+), 50 deletions(-)

diff --git a/LEGO1/mxdisplaysurface.cpp b/LEGO1/mxdisplaysurface.cpp
index de4d7006..59aadaff 100644
--- a/LEGO1/mxdisplaysurface.cpp
+++ b/LEGO1/mxdisplaysurface.cpp
@@ -224,20 +224,28 @@ void MxDisplaySurface::SetPalette(MxPalette* p_palette)
 }
 
 // STUB: LEGO1 0x100bacc0
-MxBool MxDisplaySurface::VTable0x28(undefined4, undefined4, undefined4, undefined4, undefined4, undefined4, undefined4)
+MxBool MxDisplaySurface::VTable0x28(
+	MxBitmap* p_bitmap,
+	MxS32 p_left,
+	MxS32 p_top,
+	MxS32 p_right,
+	MxS32 p_bottom,
+	MxS32 p_width,
+	MxS32 p_height
+)
 {
 	return 0;
 }
 
 // STUB: LEGO1 0x100bb1d0
 MxBool MxDisplaySurface::VTable0x30(
-	undefined4,
-	undefined4,
-	undefined4,
-	undefined4,
-	undefined4,
-	undefined4,
-	undefined4,
+	MxBitmap* p_bitmap,
+	MxS32 p_left,
+	MxS32 p_top,
+	MxS32 p_right,
+	MxS32 p_bottom,
+	MxS32 p_width,
+	MxS32 p_height,
 	MxBool
 )
 {
diff --git a/LEGO1/mxdisplaysurface.h b/LEGO1/mxdisplaysurface.h
index 45714ce1..46732afe 100644
--- a/LEGO1/mxdisplaysurface.h
+++ b/LEGO1/mxdisplaysurface.h
@@ -39,7 +39,15 @@ class MxDisplaySurface : public MxCore {
 		undefined4,
 		undefined4
 	);
-	virtual MxBool VTable0x28(undefined4, undefined4, undefined4, undefined4, undefined4, undefined4, undefined4);
+	virtual MxBool VTable0x28(
+		MxBitmap* p_bitmap,
+		MxS32 p_left,
+		MxS32 p_top,
+		MxS32 p_right,
+		MxS32 p_bottom,
+		MxS32 p_width,
+		MxS32 p_height
+	);
 	virtual MxBool VTable0x2c(
 		LPDDSURFACEDESC,
 		MxBitmap*,
@@ -52,13 +60,13 @@ class MxDisplaySurface : public MxCore {
 		MxBool
 	);
 	virtual MxBool VTable0x30(
-		undefined4,
-		undefined4,
-		undefined4,
-		undefined4,
-		undefined4,
-		undefined4,
-		undefined4,
+		MxBitmap* p_bitmap,
+		MxS32 p_left,
+		MxS32 p_top,
+		MxS32 p_right,
+		MxS32 p_bottom,
+		MxS32 p_width,
+		MxS32 p_height,
 		MxBool
 	);
 	virtual undefined4 VTable0x34(undefined4, undefined4, undefined4, undefined4, undefined4, undefined4);
diff --git a/LEGO1/mxrect32.h b/LEGO1/mxrect32.h
index 7566a9ea..c05d5c67 100644
--- a/LEGO1/mxrect32.h
+++ b/LEGO1/mxrect32.h
@@ -16,13 +16,7 @@ class MxRect32 {
 		this->m_bottom = p_bottom;
 	}
 
-	MxRect32(const MxPoint32& p_point, const MxSize32& p_size)
-	{
-		this->m_left = p_point.GetX();
-		this->m_top = p_point.GetY();
-		this->m_right = p_size.GetWidth();
-		this->m_bottom = p_size.GetHeight();
-	}
+	MxRect32(const MxPoint32& p_point, const MxSize32& p_size) { CopyFrom(p_point, p_size); }
 
 	MxRect32(const MxRect32& p_a, const MxRect32& p_b)
 	{
@@ -98,7 +92,6 @@ class MxRect32 {
 	inline void SetRight(MxS32 p_right) { m_right = p_right; }
 	inline void SetBottom(MxS32 p_bottom) { m_bottom = p_bottom; }
 
-private:
 	inline void CopyFrom(const MxRect32& p_rect)
 	{
 		this->m_left = p_rect.m_left;
@@ -107,6 +100,15 @@ class MxRect32 {
 		this->m_bottom = p_rect.m_bottom;
 	}
 
+	inline void CopyFrom(const MxPoint32& p_point, const MxSize32& p_size)
+	{
+		this->m_left = p_point.GetX();
+		this->m_top = p_point.GetY();
+		this->m_right = p_size.GetWidth() + p_point.GetX();
+		this->m_bottom = p_size.GetHeight() + p_point.GetY();
+	}
+
+private:
 	inline static MxS32 Min(MxS32 p_a, MxS32 p_b) { return p_a <= p_b ? p_a : p_b; };
 	inline static MxS32 Max(MxS32 p_a, MxS32 p_b) { return p_a <= p_b ? p_b : p_a; };
 
diff --git a/LEGO1/mxsize32.h b/LEGO1/mxsize32.h
index a8b30368..2c0141bc 100644
--- a/LEGO1/mxsize32.h
+++ b/LEGO1/mxsize32.h
@@ -6,16 +6,18 @@
 class MxSize32 {
 public:
 	MxSize32() {}
-	MxSize32(MxS32 p_width, MxS32 p_height)
-	{
-		this->m_width = p_width;
-		this->m_height = p_height;
-	}
+	MxSize32(MxS32 p_width, MxS32 p_height) { Assign(p_width, p_height); }
 
 	inline MxS32 GetWidth() const { return m_width; }
 	inline MxS32 GetHeight() const { return m_height; }
 
 private:
+	inline void Assign(MxS32 p_width, MxS32 p_height)
+	{
+		this->m_width = p_width;
+		this->m_height = p_height;
+	}
+
 	MxS32 m_width;
 	MxS32 m_height;
 };
diff --git a/LEGO1/mxstillpresenter.cpp b/LEGO1/mxstillpresenter.cpp
index 5474f8e3..8b17207f 100644
--- a/LEGO1/mxstillpresenter.cpp
+++ b/LEGO1/mxstillpresenter.cpp
@@ -71,12 +71,7 @@ void MxStillPresenter::LoadFrame(MxStreamChunk* p_chunk)
 {
 	memcpy(m_bitmap->GetBitmapData(), p_chunk->GetData(), p_chunk->GetLength());
 
-	MxS32 height = GetHeight() - 1;
-	MxS32 width = GetWidth() - 1;
-	MxS32 x = m_location.GetX();
-	MxS32 y = m_location.GetY();
-
-	MxRect32 rect(x, y, width + x, height + y);
+	MxRect32 rect(m_location, MxSize32(GetWidth() - 1, GetHeight() - 1));
 	MVideoManager()->InvalidateRect(rect);
 
 	if (m_flags & Flag_Bit2) {
@@ -154,6 +149,7 @@ void MxStillPresenter::VTable0x88(MxS32 p_x, MxS32 p_y)
 	m_location.SetY(p_y);
 
 	if (IsEnabled()) {
+		// Most likely needs to work with MxSize32 and MxPoint32
 		MxS32 height = GetHeight() - 1;
 		MxS32 width = GetWidth() - 1;
 
@@ -174,12 +170,7 @@ void MxStillPresenter::Enable(MxBool p_enable)
 	MxVideoPresenter::Enable(p_enable);
 
 	if (MVideoManager() && (m_alpha || m_bitmap)) {
-		MxS32 height = GetHeight();
-		MxS32 width = GetWidth();
-		MxS32 x = m_location.GetX();
-		MxS32 y = m_location.GetY();
-
-		MxRect32 rect(x, y, width + x, height + y);
+		MxRect32 rect(m_location, MxSize32(GetWidth(), GetHeight()));
 		MVideoManager()->InvalidateRect(rect);
 		MVideoManager()->VTable0x34(rect.GetLeft(), rect.GetTop(), rect.GetWidth(), rect.GetHeight());
 	}
diff --git a/LEGO1/mxvideomanager.h b/LEGO1/mxvideomanager.h
index 6d03d84e..8d4d088c 100644
--- a/LEGO1/mxvideomanager.h
+++ b/LEGO1/mxvideomanager.h
@@ -40,6 +40,7 @@ class MxVideoManager : public MxMediaManager {
 	inline MxVideoParam& GetVideoParam() { return this->m_videoParam; }
 	inline LPDIRECTDRAW GetDirectDraw() { return this->m_pDirectDraw; }
 	inline MxDisplaySurface* GetDisplaySurface() { return this->m_displaySurface; }
+	inline MxRegion* GetRegion() { return this->m_region; }
 
 protected:
 	MxVideoParam m_videoParam;          // 0x2c
diff --git a/LEGO1/mxvideopresenter.cpp b/LEGO1/mxvideopresenter.cpp
index 4162be43..957c5a01 100644
--- a/LEGO1/mxvideopresenter.cpp
+++ b/LEGO1/mxvideopresenter.cpp
@@ -2,6 +2,7 @@
 
 #include "mxautolocker.h"
 #include "mxdsmediaaction.h"
+#include "mxregioncursor.h"
 #include "mxvideomanager.h"
 
 DECOMP_SIZE_ASSERT(MxVideoPresenter, 0x64);
@@ -214,13 +215,7 @@ void MxVideoPresenter::Destroy(MxBool p_fromDestructor)
 	}
 
 	if (MVideoManager() && (m_alpha || m_bitmap)) {
-		MxS32 height = GetHeight();
-		MxS32 width = GetWidth();
-
-		MxS32 x = m_location.GetX();
-		MxS32 y = m_location.GetY();
-		MxRect32 rect(x, y, x + width, y + height);
-
+		MxRect32 rect(m_location, MxSize32(GetWidth(), GetHeight()));
 		MVideoManager()->InvalidateRect(rect);
 		MVideoManager()->VTable0x34(rect.GetLeft(), rect.GetTop(), rect.GetWidth(), rect.GetHeight());
 	}
@@ -312,10 +307,137 @@ MxBool MxVideoPresenter::IsHit(MxS32 p_x, MxS32 p_y)
 	return TRUE;
 }
 
-// STUB: LEGO1 0x100b2a70
+inline MxS32 MxVideoPresenter::PrepareRects(MxRect32& p_rectDest, MxRect32& p_rectSrc)
+{
+	if (p_rectDest.GetTop() > 480 || p_rectDest.GetLeft() > 640 || p_rectSrc.GetTop() > 480 ||
+		p_rectSrc.GetLeft() > 640)
+		return -1;
+
+	if (p_rectDest.GetBottom() > 480)
+		p_rectDest.SetBottom(480);
+
+	if (p_rectDest.GetRight() > 640)
+		p_rectDest.SetRight(640);
+
+	if (p_rectSrc.GetBottom() > 480)
+		p_rectSrc.SetBottom(480);
+
+	if (p_rectSrc.GetRight() > 640)
+		p_rectSrc.SetRight(640);
+
+	MxS32 height = p_rectDest.GetHeight();
+	if (height <= 1)
+		return -1;
+
+	MxS32 width = p_rectDest.GetWidth();
+	if (width <= 1)
+		return -1;
+
+	if (p_rectSrc.GetRight() - width - p_rectSrc.GetLeft() == -1 &&
+		p_rectSrc.GetBottom() - height - p_rectSrc.GetTop() == -1)
+		return 1;
+
+	p_rectSrc.SetRight(p_rectSrc.GetLeft() + width - 1);
+	p_rectSrc.SetBottom(p_rectSrc.GetTop() + height - 1);
+	return 0;
+}
+
+// FUNCTION: LEGO1 0x100b2a70
 void MxVideoPresenter::PutFrame()
 {
-	// TODO
+	MxDisplaySurface* displaySurface = MVideoManager()->GetDisplaySurface();
+	MxRegion* region = MVideoManager()->GetRegion();
+	MxRect32 rect(m_location, MxSize32(GetWidth() - 1, GetHeight() - 1));
+	LPDIRECTDRAWSURFACE ddSurface = displaySurface->GetDirectDrawSurface2();
+
+	MxRect32 rectSrc, rectDest;
+	if (m_action->GetFlags() & MxDSAction::Flag_Bit5) {
+		if (m_unk0x58) {
+			// TODO: Match
+			rectSrc.CopyFrom(MxPoint32(0, 0), MxSize32(GetWidth(), GetHeight()));
+			rectDest.CopyFrom(m_location, MxSize32(GetWidth(), GetHeight()));
+
+			switch (PrepareRects(rectDest, rectSrc)) {
+			case 0:
+				ddSurface->Blt((LPRECT) &rectDest, m_unk0x58, (LPRECT) &rectSrc, DDBLT_KEYSRC, NULL);
+				break;
+			case 1:
+				ddSurface->BltFast(
+					rectDest.GetLeft(),
+					rectDest.GetTop(),
+					m_unk0x58,
+					(LPRECT) &rectSrc,
+					DDBLTFAST_SRCCOLORKEY | DDBLTFAST_WAIT
+				);
+			}
+		}
+		else {
+			displaySurface->VTable0x30(
+				m_bitmap,
+				0,
+				0,
+				rect.GetLeft(),
+				rect.GetTop(),
+				m_bitmap->GetBmiWidth(),
+				m_bitmap->GetBmiHeightAbs(),
+				TRUE
+			);
+		}
+	}
+	else {
+		MxRegionCursor cursor(region);
+		MxRect32* regionRect;
+
+		while (regionRect = cursor.VTable0x24(rect)) {
+			if (regionRect->GetWidth() >= 1 && regionRect->GetHeight() >= 1) {
+				if (m_unk0x58) {
+					// TODO: Match
+					rectSrc.CopyFrom(
+						MxPoint32(regionRect->GetLeft() - m_location.GetX(), regionRect->GetTop() - m_location.GetY()),
+						MxSize32(regionRect->GetWidth(), regionRect->GetHeight())
+					);
+					rectDest.CopyFrom(
+						MxPoint32(regionRect->GetLeft(), regionRect->GetTop()),
+						MxSize32(regionRect->GetWidth(), regionRect->GetHeight())
+					);
+				}
+
+				if (m_action->GetFlags() & MxDSAction::Flag_Bit4) {
+					if (m_unk0x58) {
+						if (PrepareRects(rectDest, rectSrc) >= 0)
+							ddSurface->Blt((LPRECT) &rectDest, m_unk0x58, (LPRECT) &rectSrc, DDBLT_KEYSRC, NULL);
+					}
+					else {
+						displaySurface->VTable0x30(
+							m_bitmap,
+							regionRect->GetLeft() - m_location.GetX(),
+							regionRect->GetTop() - m_location.GetY(),
+							regionRect->GetLeft(),
+							regionRect->GetTop(),
+							regionRect->GetWidth(),
+							regionRect->GetHeight(),
+							FALSE
+						);
+					}
+				}
+				else if (m_unk0x58) {
+					if (PrepareRects(rectDest, rectSrc) >= 0)
+						ddSurface->Blt((LPRECT) &rectDest, m_unk0x58, (LPRECT) &rectSrc, 0, NULL);
+				}
+				else {
+					displaySurface->VTable0x28(
+						m_bitmap,
+						regionRect->GetLeft() - m_location.GetX(),
+						regionRect->GetTop() - m_location.GetY(),
+						regionRect->GetLeft(),
+						regionRect->GetTop(),
+						regionRect->GetWidth(),
+						regionRect->GetHeight()
+					);
+				}
+			}
+		}
+	}
 }
 
 // FUNCTION: LEGO1 0x100b2f60
diff --git a/LEGO1/mxvideopresenter.h b/LEGO1/mxvideopresenter.h
index 72ea33d8..f02f3f08 100644
--- a/LEGO1/mxvideopresenter.h
+++ b/LEGO1/mxvideopresenter.h
@@ -4,6 +4,7 @@
 #include "decomp.h"
 #include "mxbitmap.h"
 #include "mxmediapresenter.h"
+#include "mxrect32.h"
 
 // VTABLE: LEGO1 0x100d4be8
 // SIZE 0x64
@@ -68,6 +69,7 @@ class MxVideoPresenter : public MxMediaPresenter {
 		MxS32 IsHit(MxU32 p_x, MxU32 p_y);
 	};
 
+	inline MxS32 PrepareRects(MxRect32& p_rectDest, MxRect32& p_rectSrc);
 	inline MxBitmap* GetBitmap() { return m_bitmap; }
 
 private:

From a8837a72cf12ebc9d272e89e1b98d90ed8133c73 Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Fri, 29 Dec 2023 17:34:10 -0500
Subject: [PATCH 043/210] MxVideoPresenter::GetHeight hotfix

---
 LEGO1/mxvideopresenter.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/LEGO1/mxvideopresenter.cpp b/LEGO1/mxvideopresenter.cpp
index 957c5a01..cac090b1 100644
--- a/LEGO1/mxvideopresenter.cpp
+++ b/LEGO1/mxvideopresenter.cpp
@@ -59,13 +59,13 @@ MxBool MxVideoPresenter::VTable0x7c()
 // FUNCTION: LEGO1 0x1000c7e0
 MxS32 MxVideoPresenter::GetWidth()
 {
-	return m_alpha ? m_alpha->m_width : m_bitmap->GetBmiHeader()->biWidth;
+	return m_alpha ? m_alpha->m_width : m_bitmap->GetBmiWidth();
 }
 
 // FUNCTION: LEGO1 0x1000c800
 MxS32 MxVideoPresenter::GetHeight()
 {
-	return m_alpha ? m_alpha->m_height : m_bitmap->GetBmiHeader()->biHeight;
+	return m_alpha ? m_alpha->m_height : m_bitmap->GetBmiHeightAbs();
 }
 
 // FUNCTION: LEGO1 0x100b24f0

From 6ac505fb4913518bafa961ff3aac18a47f56dd73 Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Fri, 29 Dec 2023 17:59:09 -0500
Subject: [PATCH 044/210] Add missing annotations to MxDisplaySurface

---
 LEGO1/mxdisplaysurface.h | 62 ++++++++++++++++++++++++----------------
 1 file changed, 38 insertions(+), 24 deletions(-)

diff --git a/LEGO1/mxdisplaysurface.h b/LEGO1/mxdisplaysurface.h
index 46732afe..aed5b24a 100644
--- a/LEGO1/mxdisplaysurface.h
+++ b/LEGO1/mxdisplaysurface.h
@@ -16,19 +16,15 @@ class MxDisplaySurface : public MxCore {
 	MxDisplaySurface();
 	virtual ~MxDisplaySurface() override;
 
-	void Reset();
-
-	void FUN_100ba640();
-
 	virtual MxResult Init(
 		MxVideoParam& p_videoParam,
 		LPDIRECTDRAWSURFACE p_ddSurface1,
 		LPDIRECTDRAWSURFACE p_ddSurface2,
 		LPDIRECTDRAWCLIPPER p_ddClipper
-	);
-	virtual MxResult Create(MxVideoParam& p_videoParam);
-	virtual void Clear();
-	virtual void SetPalette(MxPalette* p_palette);
+	);                                                   // vtable+0x14
+	virtual MxResult Create(MxVideoParam& p_videoParam); // vtable+0x18
+	virtual void Clear();                                // vtable+0x1c
+	virtual void SetPalette(MxPalette* p_palette);       // vtable+0x20
 	virtual void VTable0x24(
 		LPDDSURFACEDESC,
 		MxBitmap*,
@@ -38,7 +34,7 @@ class MxDisplaySurface : public MxCore {
 		undefined4,
 		undefined4,
 		undefined4
-	);
+	); // vtable+0x24
 	virtual MxBool VTable0x28(
 		MxBitmap* p_bitmap,
 		MxS32 p_left,
@@ -47,7 +43,7 @@ class MxDisplaySurface : public MxCore {
 		MxS32 p_bottom,
 		MxS32 p_width,
 		MxS32 p_height
-	);
+	); // vtable+0x28
 	virtual MxBool VTable0x2c(
 		LPDDSURFACEDESC,
 		MxBitmap*,
@@ -58,7 +54,7 @@ class MxDisplaySurface : public MxCore {
 		undefined4,
 		undefined4,
 		MxBool
-	);
+	); // vtable+0x2c
 	virtual MxBool VTable0x30(
 		MxBitmap* p_bitmap,
 		MxS32 p_left,
@@ -68,25 +64,43 @@ class MxDisplaySurface : public MxCore {
 		MxS32 p_width,
 		MxS32 p_height,
 		MxBool
-	);
-	virtual undefined4 VTable0x34(undefined4, undefined4, undefined4, undefined4, undefined4, undefined4);
-	virtual void Display(MxS32 p_left, MxS32 p_top, MxS32 p_left2, MxS32 p_top2, MxS32 p_width, MxS32 p_height);
-	virtual void GetDC(HDC* p_hdc);
-	virtual void ReleaseDC(HDC p_hdc);
-	virtual LPDIRECTDRAWSURFACE VTable0x44(MxBitmap*, undefined4*, undefined4, undefined4);
+	); // vtable+0x30
+	virtual undefined4 VTable0x34(
+		undefined4,
+		undefined4,
+		undefined4,
+		undefined4,
+		undefined4,
+		undefined4
+	); // vtable+0x34
+	virtual void Display(
+		MxS32 p_left,
+		MxS32 p_top,
+		MxS32 p_left2,
+		MxS32 p_top2,
+		MxS32 p_width,
+		MxS32 p_height
+	);                                                                                      // vtable+0x38
+	virtual void GetDC(HDC* p_hdc);                                                         // vtable+0x3c
+	virtual void ReleaseDC(HDC p_hdc);                                                      // vtable+0x40
+	virtual LPDIRECTDRAWSURFACE VTable0x44(MxBitmap*, undefined4*, undefined4, undefined4); // vtable+0x44
+
+	void FUN_100ba640();
 
 	inline LPDIRECTDRAWSURFACE GetDirectDrawSurface1() { return this->m_ddSurface1; }
 	inline LPDIRECTDRAWSURFACE GetDirectDrawSurface2() { return this->m_ddSurface2; }
 	inline MxVideoParam& GetVideoParam() { return this->m_videoParam; }
 
 private:
-	MxVideoParam m_videoParam;
-	LPDIRECTDRAWSURFACE m_ddSurface1;
-	LPDIRECTDRAWSURFACE m_ddSurface2;
-	LPDIRECTDRAWCLIPPER m_ddClipper;
-	MxBool m_initialized;
-	DDSURFACEDESC m_surfaceDesc;
-	MxU16* m_16bitPal;
+	void Reset();
+
+	MxVideoParam m_videoParam;        // 0x08
+	LPDIRECTDRAWSURFACE m_ddSurface1; // 0x2c
+	LPDIRECTDRAWSURFACE m_ddSurface2; // 0x30
+	LPDIRECTDRAWCLIPPER m_ddClipper;  // 0x34
+	MxBool m_initialized;             // 0x38
+	DDSURFACEDESC m_surfaceDesc;      // 0x3c
+	MxU16* m_16bitPal;                // 0xa8
 };
 
 #endif // MXDISPLAYSURFACE_H

From 4b08cb4a7ed0a190afc76261a7391a8f3135e99b Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Fri, 29 Dec 2023 18:01:24 -0500
Subject: [PATCH 045/210] Rename functions for consistency

---
 LEGO1/mxdisplaysurface.cpp | 10 +++++-----
 LEGO1/mxdisplaysurface.h   |  7 +++++--
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/LEGO1/mxdisplaysurface.cpp b/LEGO1/mxdisplaysurface.cpp
index 59aadaff..0aec323e 100644
--- a/LEGO1/mxdisplaysurface.cpp
+++ b/LEGO1/mxdisplaysurface.cpp
@@ -10,17 +10,17 @@ MxU32 g_unk0x1010215c = 0;
 // FUNCTION: LEGO1 0x100ba500
 MxDisplaySurface::MxDisplaySurface()
 {
-	this->Reset();
+	this->Init();
 }
 
 // FUNCTION: LEGO1 0x100ba5a0
 MxDisplaySurface::~MxDisplaySurface()
 {
-	this->Clear();
+	this->Destroy();
 }
 
 // FUNCTION: LEGO1 0x100ba610
-void MxDisplaySurface::Reset()
+void MxDisplaySurface::Init()
 {
 	this->m_ddSurface1 = NULL;
 	this->m_ddSurface2 = NULL;
@@ -199,7 +199,7 @@ MxResult MxDisplaySurface::Create(MxVideoParam& p_videoParam)
 }
 
 // FUNCTION: LEGO1 0x100baa90
-void MxDisplaySurface::Clear()
+void MxDisplaySurface::Destroy()
 {
 	if (this->m_initialized) {
 		if (this->m_ddSurface2)
@@ -215,7 +215,7 @@ void MxDisplaySurface::Clear()
 	if (this->m_16bitPal)
 		delete this->m_16bitPal;
 
-	this->Reset();
+	this->Init();
 }
 
 // STUB: LEGO1 0x100baae0
diff --git a/LEGO1/mxdisplaysurface.h b/LEGO1/mxdisplaysurface.h
index aed5b24a..39a2fda8 100644
--- a/LEGO1/mxdisplaysurface.h
+++ b/LEGO1/mxdisplaysurface.h
@@ -23,7 +23,7 @@ class MxDisplaySurface : public MxCore {
 		LPDIRECTDRAWCLIPPER p_ddClipper
 	);                                                   // vtable+0x14
 	virtual MxResult Create(MxVideoParam& p_videoParam); // vtable+0x18
-	virtual void Clear();                                // vtable+0x1c
+	virtual void Destroy();                              // vtable+0x1c
 	virtual void SetPalette(MxPalette* p_palette);       // vtable+0x20
 	virtual void VTable0x24(
 		LPDDSURFACEDESC,
@@ -92,7 +92,7 @@ class MxDisplaySurface : public MxCore {
 	inline MxVideoParam& GetVideoParam() { return this->m_videoParam; }
 
 private:
-	void Reset();
+	void Init();
 
 	MxVideoParam m_videoParam;        // 0x08
 	LPDIRECTDRAWSURFACE m_ddSurface1; // 0x2c
@@ -103,4 +103,7 @@ class MxDisplaySurface : public MxCore {
 	MxU16* m_16bitPal;                // 0xa8
 };
 
+// SYNTHETIC: LEGO1 0x100ba580
+// MxDisplaySurface::`scalar deleting destructor'
+
 #endif // MXDISPLAYSURFACE_H

From c890831c41f5e473661db03fd6147ce35886d5d0 Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Fri, 29 Dec 2023 18:04:54 -0500
Subject: [PATCH 046/210] Remove obsolete comment

---
 LEGO1/mxdiskstreamcontroller.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/LEGO1/mxdiskstreamcontroller.cpp b/LEGO1/mxdiskstreamcontroller.cpp
index f992443d..a7e95798 100644
--- a/LEGO1/mxdiskstreamcontroller.cpp
+++ b/LEGO1/mxdiskstreamcontroller.cpp
@@ -372,7 +372,6 @@ void MxDiskStreamController::FUN_100c8540()
 	MxAutoLocker lock(&this->m_criticalSection);
 	for (list<MxDSBuffer*>::iterator it = m_list0x74.begin(); it != m_list0x74.end();) {
 		MxDSBuffer* buf = *it;
-		// TODO: Match
 		if (buf->GetRefCount() == 0) {
 			m_list0x74.erase(it++);
 			FUN_100c7ce0(buf);

From 562d6a966eac11f9c1d0916f8a03b32769ab5067 Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Fri, 29 Dec 2023 18:33:30 -0500
Subject: [PATCH 047/210] Match MxRAMStreamProvider::SetResourceToGet

---
 LEGO1/mxramstreamprovider.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/LEGO1/mxramstreamprovider.cpp b/LEGO1/mxramstreamprovider.cpp
index 9c52c20e..fc20bf33 100644
--- a/LEGO1/mxramstreamprovider.cpp
+++ b/LEGO1/mxramstreamprovider.cpp
@@ -77,14 +77,14 @@ MxResult MxRAMStreamProvider::SetResourceToGet(MxStreamController* p_resource)
 		m_fileSize = m_pFile->CalcFileSize();
 		if (m_fileSize != 0) {
 			m_bufferSize = m_pFile->GetBufferSize();
-			m_pBufferOfFileSize = new MxU32[m_fileSize];
+			m_pBufferOfFileSize = (MxU32*) new MxU8[m_fileSize];
 			if (m_pBufferOfFileSize != NULL &&
 				m_pFile->Read((unsigned char*) m_pBufferOfFileSize, m_fileSize) == SUCCESS) {
 				m_lengthInDWords = m_pFile->GetLengthInDWords();
-				m_bufferForDWords = new MxU32[m_lengthInDWords * sizeof(MxU32)];
+				m_bufferForDWords = new MxU32[m_lengthInDWords];
 
 				if (m_bufferForDWords != NULL) {
-					memcpy(m_bufferForDWords, m_pFile->GetBuffer(), m_lengthInDWords);
+					memcpy(m_bufferForDWords, m_pFile->GetBuffer(), m_lengthInDWords * sizeof(MxU32));
 					result = SUCCESS;
 				}
 			}

From 56687e86fbdc4e95d188aa657d888792a9bae05b Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Fri, 29 Dec 2023 18:40:54 -0500
Subject: [PATCH 048/210] Mostly match MxStreamer::Close

---
 LEGO1/mxstreamer.cpp | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/LEGO1/mxstreamer.cpp b/LEGO1/mxstreamer.cpp
index 1688c1b8..add5adcc 100644
--- a/LEGO1/mxstreamer.cpp
+++ b/LEGO1/mxstreamer.cpp
@@ -79,14 +79,10 @@ MxLong MxStreamer::Close(const char* p_name)
 		if (!p_name || !strcmp(p_name, c->GetAtom().GetInternal())) {
 			m_openStreams.erase(it);
 
-			if (!c->FUN_100c20d0(ds)) {
-				MxStreamerNotification notif(MXSTREAMER_DELETE_NOTIFY, NULL, c);
-
-				NotificationManager()->Send(this, &notif);
-			}
-			else {
+			if (c->FUN_100c20d0(ds))
 				delete c;
-			}
+			else
+				NotificationManager()->Send(this, &MxStreamerNotification(MXSTREAMER_DELETE_NOTIFY, NULL, c));
 
 			return SUCCESS;
 		}

From b4b73465d0f244099be2a17a90870abc724b72a8 Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Fri, 29 Dec 2023 18:44:46 -0500
Subject: [PATCH 049/210] Mostly match MxStreamer::Notify

---
 LEGO1/mxstreamer.cpp | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/LEGO1/mxstreamer.cpp b/LEGO1/mxstreamer.cpp
index add5adcc..cd2272c6 100644
--- a/LEGO1/mxstreamer.cpp
+++ b/LEGO1/mxstreamer.cpp
@@ -183,13 +183,10 @@ MxLong MxStreamer::Notify(MxParam& p_param)
 
 		MxStreamController* c = static_cast<MxStreamerNotification&>(p_param).GetController();
 
-		if (!c->FUN_100c20d0(ds)) {
-			MxStreamerNotification notif(MXSTREAMER_DELETE_NOTIFY, NULL, c);
-			NotificationManager()->Send(this, &notif);
-		}
-		else {
+		if (c->FUN_100c20d0(ds))
 			delete c;
-		}
+		else
+			NotificationManager()->Send(this, &MxStreamerNotification(MXSTREAMER_DELETE_NOTIFY, NULL, c));
 	}
 
 	return 0;

From bb22b2126014884d917dc67824761424bbcded2f Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Fri, 29 Dec 2023 23:55:36 -0500
Subject: [PATCH 050/210] Implement `FUN_100b6e10` and MxRect32 adjustments
 (#390)

* Some WIP rect

* Adjustments to MxRect32

* Spacing

* Changes

* Spacing

* Spacing
---
 LEGO1/legoomni.cpp         | 46 ++++++++++++++++++++++++++++++++++++++
 LEGO1/legoomni.h           | 13 +++++++++++
 LEGO1/mxpoint32.h          | 17 +++++++-------
 LEGO1/mxrect32.h           | 37 +++++++++++++++++-------------
 LEGO1/mxsize32.h           |  4 ++--
 LEGO1/mxstillpresenter.cpp | 16 +++++++++++--
 LEGO1/mxvideopresenter.cpp | 37 +++++++++++++++++++-----------
 7 files changed, 129 insertions(+), 41 deletions(-)

diff --git a/LEGO1/legoomni.cpp b/LEGO1/legoomni.cpp
index ddf0e454..48c7a1f5 100644
--- a/LEGO1/legoomni.cpp
+++ b/LEGO1/legoomni.cpp
@@ -695,6 +695,52 @@ MxResult Start(MxDSAction* p_dsAction)
 	return MxOmni::GetInstance()->Start(p_dsAction);
 }
 
+// Probably should be somewhere else
+// FUNCTION: LEGO1 0x100b6e10
+MxBool FUN_100b6e10(
+	MxS32 p_bitmapWidth,
+	MxS32 p_bitmapHeight,
+	MxS32 p_videoParamWidth,
+	MxS32 p_videoParamHeight,
+	MxS32* p_left,
+	MxS32* p_top,
+	MxS32* p_right,
+	MxS32* p_bottom,
+	MxS32* p_width,
+	MxS32* p_height
+)
+{
+	MxPoint32 topLeft(*p_left, *p_top);
+	MxRect32 bitmapRect(MxPoint32(0, 0), MxSize32(p_bitmapWidth, p_bitmapHeight));
+
+	MxPoint32 bottomRight(*p_right, *p_bottom);
+	MxRect32 videoParamRect(MxPoint32(0, 0), MxSize32(p_videoParamWidth, p_videoParamHeight));
+
+	MxRect32 rect(0, 0, *p_width, *p_height);
+	rect.AddPoint(topLeft);
+
+	if (!rect.IntersectsWith(bitmapRect))
+		return FALSE;
+
+	rect.Intersect(bitmapRect);
+	rect.SubtractPoint(topLeft);
+	rect.AddPoint(bottomRight);
+
+	if (!rect.IntersectsWith(videoParamRect))
+		return FALSE;
+
+	rect.Intersect(videoParamRect);
+	rect.SubtractPoint(bottomRight);
+
+	*p_left += rect.GetLeft();
+	*p_top += rect.GetTop();
+	*p_right += rect.GetLeft();
+	*p_bottom += rect.GetTop();
+	*p_width = rect.GetWidth();
+	*p_height = rect.GetHeight();
+	return TRUE;
+}
+
 // FUNCTION: LEGO1 0x100b6ff0
 void MakeSourceName(char* p_output, const char* p_input)
 {
diff --git a/LEGO1/legoomni.h b/LEGO1/legoomni.h
index dff06fb5..2aaba4cc 100644
--- a/LEGO1/legoomni.h
+++ b/LEGO1/legoomni.h
@@ -166,6 +166,19 @@ void FUN_10015820(MxU32, MxU32);
 LegoEntity* FindEntityByAtomIdOrEntityId(const MxAtomId& p_atom, MxS32 p_entityid);
 MxDSAction& GetCurrentAction();
 
+MxBool FUN_100b6e10(
+	MxS32 p_bitmapWidth,
+	MxS32 p_bitmapHeight,
+	MxS32 p_videoParamWidth,
+	MxS32 p_videoParamHeight,
+	MxS32* p_left,
+	MxS32* p_top,
+	MxS32* p_right,
+	MxS32* p_bottom,
+	MxS32* p_width,
+	MxS32* p_height
+);
+
 void PlayMusic(MxU32 p_index);
 void SetIsWorldActive(MxBool p_isWorldActive);
 void RegisterScripts();
diff --git a/LEGO1/mxpoint32.h b/LEGO1/mxpoint32.h
index d041e894..37c6dd19 100755
--- a/LEGO1/mxpoint32.h
+++ b/LEGO1/mxpoint32.h
@@ -6,12 +6,7 @@
 class MxPoint32 {
 public:
 	MxPoint32() {}
-	MxPoint32(MxS32 p_x, MxS32 p_y)
-	{
-		this->m_x = p_x;
-		this->m_y = p_y;
-	}
-
+	MxPoint32(MxS32 p_x, MxS32 p_y) { CopyFrom(p_x, p_y); }
 	MxPoint32(const MxPoint32& p_point)
 	{
 		this->m_x = p_point.m_x;
@@ -25,8 +20,14 @@ class MxPoint32 {
 	inline void SetY(MxS32 p_y) { m_y = p_y; }
 
 private:
-	MxS32 m_x;
-	MxS32 m_y;
+	inline void CopyFrom(MxS32 p_x, MxS32 p_y)
+	{
+		this->m_x = p_x;
+		this->m_y = p_y;
+	}
+
+	MxS32 m_x; // 0x00
+	MxS32 m_y; // 0x04
 };
 
 #endif // MXPOINT32_H
diff --git a/LEGO1/mxrect32.h b/LEGO1/mxrect32.h
index c05d5c67..b52a0c31 100644
--- a/LEGO1/mxrect32.h
+++ b/LEGO1/mxrect32.h
@@ -8,16 +8,8 @@
 class MxRect32 {
 public:
 	MxRect32() {}
-	MxRect32(MxS32 p_left, MxS32 p_top, MxS32 p_right, MxS32 p_bottom)
-	{
-		this->m_left = p_left;
-		this->m_top = p_top;
-		this->m_right = p_right;
-		this->m_bottom = p_bottom;
-	}
-
+	MxRect32(MxS32 p_left, MxS32 p_top, MxS32 p_right, MxS32 p_bottom) { CopyFrom(p_left, p_top, p_right, p_bottom); }
 	MxRect32(const MxPoint32& p_point, const MxSize32& p_size) { CopyFrom(p_point, p_size); }
-
 	MxRect32(const MxRect32& p_a, const MxRect32& p_b)
 	{
 		m_left = Max(p_a.m_left, p_b.m_left);
@@ -56,10 +48,12 @@ class MxRect32 {
 		this->m_bottom += p_point.GetY();
 	}
 
-	inline void SetSize(const MxSize32& p_size)
+	inline void SubtractPoint(const MxPoint32& p_point)
 	{
-		this->m_right = p_size.GetWidth();
-		this->m_bottom = p_size.GetHeight();
+		this->m_left -= p_point.GetX();
+		this->m_top -= p_point.GetY();
+		this->m_right -= p_point.GetX();
+		this->m_bottom -= p_point.GetY();
 	}
 
 	inline void UpdateBounds(const MxRect32& p_rect)
@@ -92,6 +86,15 @@ class MxRect32 {
 	inline void SetRight(MxS32 p_right) { m_right = p_right; }
 	inline void SetBottom(MxS32 p_bottom) { m_bottom = p_bottom; }
 
+private:
+	inline void CopyFrom(MxS32 p_left, MxS32 p_top, MxS32 p_right, MxS32 p_bottom)
+	{
+		this->m_left = p_left;
+		this->m_top = p_top;
+		this->m_right = p_right;
+		this->m_bottom = p_bottom;
+	}
+
 	inline void CopyFrom(const MxRect32& p_rect)
 	{
 		this->m_left = p_rect.m_left;
@@ -100,15 +103,17 @@ class MxRect32 {
 		this->m_bottom = p_rect.m_bottom;
 	}
 
-	inline void CopyFrom(const MxPoint32& p_point, const MxSize32& p_size)
+	// The address might also be the constructor that calls CopyFrom
+	// FUNCTION: LEGO1 0x100b6fc0
+	inline MxRect32* CopyFrom(const MxPoint32& p_point, const MxSize32& p_size)
 	{
 		this->m_left = p_point.GetX();
 		this->m_top = p_point.GetY();
-		this->m_right = p_size.GetWidth() + p_point.GetX();
-		this->m_bottom = p_size.GetHeight() + p_point.GetY();
+		this->m_right = p_size.GetWidth() + p_point.GetX() - 1;
+		this->m_bottom = p_size.GetHeight() + p_point.GetY() - 1;
+		return this;
 	}
 
-private:
 	inline static MxS32 Min(MxS32 p_a, MxS32 p_b) { return p_a <= p_b ? p_a : p_b; };
 	inline static MxS32 Max(MxS32 p_a, MxS32 p_b) { return p_a <= p_b ? p_b : p_a; };
 
diff --git a/LEGO1/mxsize32.h b/LEGO1/mxsize32.h
index 2c0141bc..8fb90210 100644
--- a/LEGO1/mxsize32.h
+++ b/LEGO1/mxsize32.h
@@ -6,13 +6,13 @@
 class MxSize32 {
 public:
 	MxSize32() {}
-	MxSize32(MxS32 p_width, MxS32 p_height) { Assign(p_width, p_height); }
+	MxSize32(MxS32 p_width, MxS32 p_height) { CopyFrom(p_width, p_height); }
 
 	inline MxS32 GetWidth() const { return m_width; }
 	inline MxS32 GetHeight() const { return m_height; }
 
 private:
-	inline void Assign(MxS32 p_width, MxS32 p_height)
+	inline void CopyFrom(MxS32 p_width, MxS32 p_height)
 	{
 		this->m_width = p_width;
 		this->m_height = p_height;
diff --git a/LEGO1/mxstillpresenter.cpp b/LEGO1/mxstillpresenter.cpp
index 8b17207f..ee659827 100644
--- a/LEGO1/mxstillpresenter.cpp
+++ b/LEGO1/mxstillpresenter.cpp
@@ -71,7 +71,13 @@ void MxStillPresenter::LoadFrame(MxStreamChunk* p_chunk)
 {
 	memcpy(m_bitmap->GetBitmapData(), p_chunk->GetData(), p_chunk->GetLength());
 
-	MxRect32 rect(m_location, MxSize32(GetWidth() - 1, GetHeight() - 1));
+	// MxRect32 rect(m_location, MxSize32(GetWidth(), GetHeight()));
+	MxS32 height = GetHeight() - 1;
+	MxS32 width = GetWidth() - 1;
+	MxS32 x = m_location.GetX();
+	MxS32 y = m_location.GetY();
+
+	MxRect32 rect(x, y, width + x, height + y);
 	MVideoManager()->InvalidateRect(rect);
 
 	if (m_flags & Flag_Bit2) {
@@ -170,7 +176,13 @@ void MxStillPresenter::Enable(MxBool p_enable)
 	MxVideoPresenter::Enable(p_enable);
 
 	if (MVideoManager() && (m_alpha || m_bitmap)) {
-		MxRect32 rect(m_location, MxSize32(GetWidth(), GetHeight()));
+		// MxRect32 rect(m_location, MxSize32(GetWidth(), GetHeight()));
+		MxS32 height = GetHeight();
+		MxS32 width = GetWidth();
+		MxS32 x = m_location.GetX();
+		MxS32 y = m_location.GetY();
+
+		MxRect32 rect(x, y, width + x, height + y);
 		MVideoManager()->InvalidateRect(rect);
 		MVideoManager()->VTable0x34(rect.GetLeft(), rect.GetTop(), rect.GetWidth(), rect.GetHeight());
 	}
diff --git a/LEGO1/mxvideopresenter.cpp b/LEGO1/mxvideopresenter.cpp
index cac090b1..0e4f3d5b 100644
--- a/LEGO1/mxvideopresenter.cpp
+++ b/LEGO1/mxvideopresenter.cpp
@@ -215,7 +215,13 @@ void MxVideoPresenter::Destroy(MxBool p_fromDestructor)
 	}
 
 	if (MVideoManager() && (m_alpha || m_bitmap)) {
-		MxRect32 rect(m_location, MxSize32(GetWidth(), GetHeight()));
+		// MxRect32 rect(m_location, MxSize32(GetWidth(), GetHeight()));
+		MxS32 height = GetHeight();
+		MxS32 width = GetWidth();
+		MxS32 x = m_location.GetX();
+		MxS32 y = m_location.GetY();
+
+		MxRect32 rect(x, y, x + width, y + height);
 		MVideoManager()->InvalidateRect(rect);
 		MVideoManager()->VTable0x34(rect.GetLeft(), rect.GetTop(), rect.GetWidth(), rect.GetHeight());
 	}
@@ -347,15 +353,20 @@ void MxVideoPresenter::PutFrame()
 {
 	MxDisplaySurface* displaySurface = MVideoManager()->GetDisplaySurface();
 	MxRegion* region = MVideoManager()->GetRegion();
-	MxRect32 rect(m_location, MxSize32(GetWidth() - 1, GetHeight() - 1));
+	MxRect32 rect(m_location, MxSize32(GetWidth(), GetHeight()));
 	LPDIRECTDRAWSURFACE ddSurface = displaySurface->GetDirectDrawSurface2();
 
 	MxRect32 rectSrc, rectDest;
 	if (m_action->GetFlags() & MxDSAction::Flag_Bit5) {
 		if (m_unk0x58) {
 			// TODO: Match
-			rectSrc.CopyFrom(MxPoint32(0, 0), MxSize32(GetWidth(), GetHeight()));
-			rectDest.CopyFrom(m_location, MxSize32(GetWidth(), GetHeight()));
+			rectSrc.SetPoint(MxPoint32(0, 0));
+			rectSrc.SetRight(GetWidth());
+			rectSrc.SetBottom(GetHeight());
+
+			rectDest.SetPoint(m_location);
+			rectDest.SetRight(rectDest.GetLeft() + GetWidth());
+			rectDest.SetBottom(rectDest.GetTop() + GetHeight());
 
 			switch (PrepareRects(rectDest, rectSrc)) {
 			case 0:
@@ -391,15 +402,15 @@ void MxVideoPresenter::PutFrame()
 		while (regionRect = cursor.VTable0x24(rect)) {
 			if (regionRect->GetWidth() >= 1 && regionRect->GetHeight() >= 1) {
 				if (m_unk0x58) {
-					// TODO: Match
-					rectSrc.CopyFrom(
-						MxPoint32(regionRect->GetLeft() - m_location.GetX(), regionRect->GetTop() - m_location.GetY()),
-						MxSize32(regionRect->GetWidth(), regionRect->GetHeight())
-					);
-					rectDest.CopyFrom(
-						MxPoint32(regionRect->GetLeft(), regionRect->GetTop()),
-						MxSize32(regionRect->GetWidth(), regionRect->GetHeight())
-					);
+					rectSrc.SetLeft(regionRect->GetLeft() - m_location.GetX());
+					rectSrc.SetTop(regionRect->GetTop() - m_location.GetY());
+					rectSrc.SetRight(rectSrc.GetLeft() + regionRect->GetWidth());
+					rectSrc.SetBottom(rectSrc.GetTop() + regionRect->GetHeight());
+
+					rectDest.SetLeft(regionRect->GetLeft());
+					rectDest.SetTop(regionRect->GetTop());
+					rectDest.SetRight(rectDest.GetLeft() + regionRect->GetWidth());
+					rectDest.SetBottom(rectDest.GetTop() + regionRect->GetHeight());
 				}
 
 				if (m_action->GetFlags() & MxDSAction::Flag_Bit4) {

From 5400d7476f6f48266d830c6c97846cd927ee8ed4 Mon Sep 17 00:00:00 2001
From: Joshua Peisach <itzswirlz2020@outlook.com>
Date: Sat, 30 Dec 2023 16:47:07 -0500
Subject: [PATCH 051/210] MxDisplaySurface::SetPalette() (#358)

* Start MxDisplaySurface::SetPalette()

* Add Counting functions, more on SetPalette

* Finish base implementation of SetPalette and begin cleanup

* clang-format

* Fixes/improvements

* Format

* Fix naming

---------

Co-authored-by: Christian Semmler <mail@csemmler.com>
---
 LEGO1/mxdisplaysurface.cpp | 72 +++++++++++++++++++++++++++++++++++++-
 LEGO1/mxdisplaysurface.h   |  3 ++
 2 files changed, 74 insertions(+), 1 deletion(-)

diff --git a/LEGO1/mxdisplaysurface.cpp b/LEGO1/mxdisplaysurface.cpp
index 0aec323e..c1952e32 100644
--- a/LEGO1/mxdisplaysurface.cpp
+++ b/LEGO1/mxdisplaysurface.cpp
@@ -3,6 +3,8 @@
 #include "mxomni.h"
 #include "mxvideomanager.h"
 
+#include <windows.h>
+
 DECOMP_SIZE_ASSERT(MxDisplaySurface, 0xac);
 
 MxU32 g_unk0x1010215c = 0;
@@ -73,6 +75,28 @@ void MxDisplaySurface::FUN_100ba640()
 	}
 }
 
+// FUNCTION: LEGO1 0x100ba750
+MxU8 MxDisplaySurface::CountTotalBitsSetTo1(MxU32 p_param)
+{
+	MxU8 count = 0;
+
+	for (; p_param; p_param >>= 1)
+		count += ((MxU8) p_param & 1);
+
+	return count;
+}
+
+// FUNCTION: LEGO1 0x100ba770
+MxU8 MxDisplaySurface::CountContiguousBitsSetTo1(MxU32 p_param)
+{
+	MxU8 count = 0;
+
+	for (; (p_param & 1) == 0; p_param >>= 1)
+		count++;
+
+	return count;
+}
+
 // FUNCTION: LEGO1 0x100ba790
 MxResult MxDisplaySurface::Init(
 	MxVideoParam& p_videoParam,
@@ -218,9 +242,55 @@ void MxDisplaySurface::Destroy()
 	this->Init();
 }
 
-// STUB: LEGO1 0x100baae0
+// FUNCTION: LEGO1 0x100baae0
 void MxDisplaySurface::SetPalette(MxPalette* p_palette)
 {
+	if (m_surfaceDesc.ddpfPixelFormat.dwFlags & DDPF_PALETTEINDEXED8) {
+		m_ddSurface1->SetPalette(p_palette->CreateNativePalette());
+		m_ddSurface2->SetPalette(p_palette->CreateNativePalette());
+
+		if ((m_videoParam.Flags().GetFullScreen() & 1) == 0) {
+			struct {
+				WORD m_palVersion;
+				WORD m_palNumEntries;
+				PALETTEENTRY m_palPalEntry[256];
+			} lpal;
+
+			lpal.m_palVersion = 0x300;
+			lpal.m_palNumEntries = 256;
+
+			memset(lpal.m_palPalEntry, 0, sizeof(lpal.m_palPalEntry));
+			p_palette->GetEntries(lpal.m_palPalEntry);
+
+			HPALETTE hpal = CreatePalette((LPLOGPALETTE) &lpal);
+			HDC hdc = ::GetDC(0);
+			SelectPalette(hdc, hpal, FALSE);
+			RealizePalette(hdc);
+			::ReleaseDC(NULL, hdc);
+			DeleteObject(hpal);
+		}
+	}
+
+	if (m_surfaceDesc.ddpfPixelFormat.dwRGBBitCount == 16) {
+		if (!m_16bitPal)
+			m_16bitPal = new MxU16[256];
+
+		PALETTEENTRY palette[256];
+		p_palette->GetEntries(palette);
+
+		MxU8 contiguousBitsRed = CountContiguousBitsSetTo1(m_surfaceDesc.ddpfPixelFormat.dwRBitMask);
+		MxU8 totalBitsRed = CountTotalBitsSetTo1(m_surfaceDesc.ddpfPixelFormat.dwRBitMask);
+		MxU8 contiguousBitsGreen = CountContiguousBitsSetTo1(m_surfaceDesc.ddpfPixelFormat.dwGBitMask);
+		MxU8 totalBitsGreen = CountTotalBitsSetTo1(m_surfaceDesc.ddpfPixelFormat.dwGBitMask);
+		MxU8 contiguousBitsBlue = CountContiguousBitsSetTo1(m_surfaceDesc.ddpfPixelFormat.dwBBitMask);
+		MxU8 totalBitsBlue = CountTotalBitsSetTo1(m_surfaceDesc.ddpfPixelFormat.dwBBitMask);
+
+		for (MxS32 i = 0; i < 256; i++) {
+			m_16bitPal[i] = (((palette[i].peRed >> (8 - totalBitsRed & 0x1f)) << (contiguousBitsRed & 0x1f))) |
+							(((palette[i].peGreen >> (8 - totalBitsGreen & 0x1f)) << (contiguousBitsGreen & 0x1f))) |
+							(((palette[i].peBlue >> (8 - totalBitsBlue & 0x1f)) << (contiguousBitsBlue & 0x1f)));
+		}
+	}
 }
 
 // STUB: LEGO1 0x100bacc0
diff --git a/LEGO1/mxdisplaysurface.h b/LEGO1/mxdisplaysurface.h
index 39a2fda8..d77e4883 100644
--- a/LEGO1/mxdisplaysurface.h
+++ b/LEGO1/mxdisplaysurface.h
@@ -92,6 +92,9 @@ class MxDisplaySurface : public MxCore {
 	inline MxVideoParam& GetVideoParam() { return this->m_videoParam; }
 
 private:
+	MxU8 CountTotalBitsSetTo1(MxU32 p_param);
+	MxU8 CountContiguousBitsSetTo1(MxU32 p_param);
+
 	void Init();
 
 	MxVideoParam m_videoParam;        // 0x08

From 1e43f20af5d68d80dc5f72ac09d4a6a1f96a063e Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Sun, 31 Dec 2023 15:29:05 -0500
Subject: [PATCH 052/210] Implement MxDisplaySurface::VTable0x28 (#391)

* WIP

* Fixes

* Fixes

* Fixes

* Remove comments

* Create native palette in LegoVideoManager

* Improvements

* Improvements

* Improvements

* Improvements

* Improvements

* Improvements

* Improvements

* Improvements

* Fixes

* Improvements
---
 LEGO1/legovideomanager.cpp |   5 +-
 LEGO1/mxbitmap.h           |   7 ++
 LEGO1/mxdisplaysurface.cpp | 179 +++++++++++++++++++++++++++++++++++--
 LEGO1/mxdisplaysurface.h   |   2 +-
 4 files changed, 182 insertions(+), 11 deletions(-)

diff --git a/LEGO1/legovideomanager.cpp b/LEGO1/legovideomanager.cpp
index 456b10f5..b6a44a79 100644
--- a/LEGO1/legovideomanager.cpp
+++ b/LEGO1/legovideomanager.cpp
@@ -40,8 +40,9 @@ LegoVideoManager::~LegoVideoManager()
 // STUB: LEGO1 0x1007ac40
 MxResult LegoVideoManager::Create(MxVideoParam& p_videoParam, MxU32 p_frequencyMS, MxBool p_createThread)
 {
-	// TODO
-	return MxVideoManager::Create(p_videoParam, p_frequencyMS, p_createThread);
+	MxResult result = MxVideoManager::Create(p_videoParam, p_frequencyMS, p_createThread);
+	m_videoParam.GetPalette()->CreateNativePalette();
+	return result;
 }
 
 // FUNCTION: LEGO1 0x1007b5e0
diff --git a/LEGO1/mxbitmap.h b/LEGO1/mxbitmap.h
index ed944138..d9fda78d 100644
--- a/LEGO1/mxbitmap.h
+++ b/LEGO1/mxbitmap.h
@@ -81,6 +81,13 @@ class MxBitmap : public MxCore {
 		MxLong alignedWidth = AlignToFourByte(m_bmiHeader->biWidth);
 		return alignedWidth * absHeight;
 	}
+	inline MxLong GetAdjustedStride()
+	{
+		if (m_bmiHeader->biCompression == BI_RGB_TOPDOWN || m_bmiHeader->biHeight < 0)
+			return GetBmiStride();
+		else
+			return -GetBmiStride();
+	}
 
 private:
 	MxResult ImportColorsToPalette(RGBQUAD*, MxPalette*);
diff --git a/LEGO1/mxdisplaysurface.cpp b/LEGO1/mxdisplaysurface.cpp
index c1952e32..46789886 100644
--- a/LEGO1/mxdisplaysurface.cpp
+++ b/LEGO1/mxdisplaysurface.cpp
@@ -1,6 +1,6 @@
 #include "mxdisplaysurface.h"
 
-#include "mxomni.h"
+#include "legoomni.h"
 #include "mxvideomanager.h"
 
 #include <windows.h>
@@ -56,7 +56,7 @@ void MxDisplaySurface::FUN_100ba640()
 			hr = m_ddSurface2->Lock(NULL, &desc, DDLOCK_WAIT, NULL);
 		}
 
-		if (hr != S_OK) {
+		if (hr != DD_OK) {
 			return;
 		}
 
@@ -70,7 +70,7 @@ void MxDisplaySurface::FUN_100ba640()
 
 		m_ddSurface2->Unlock(desc.lpSurface);
 		if (m_videoParam.Flags().GetFlipSurfaces()) {
-			m_ddSurface1->Flip(NULL, 1);
+			m_ddSurface1->Flip(NULL, DDFLIP_WAIT);
 		}
 	}
 }
@@ -293,8 +293,8 @@ void MxDisplaySurface::SetPalette(MxPalette* p_palette)
 	}
 }
 
-// STUB: LEGO1 0x100bacc0
-MxBool MxDisplaySurface::VTable0x28(
+// FUNCTION: LEGO1 0x100bacc0
+void MxDisplaySurface::VTable0x28(
 	MxBitmap* p_bitmap,
 	MxS32 p_left,
 	MxS32 p_top,
@@ -304,7 +304,170 @@ MxBool MxDisplaySurface::VTable0x28(
 	MxS32 p_height
 )
 {
-	return 0;
+	if (FUN_100b6e10(
+			p_bitmap->GetBmiWidth(),
+			p_bitmap->GetBmiHeightAbs(),
+			m_videoParam.GetRect().GetWidth(),
+			m_videoParam.GetRect().GetHeight(),
+			&p_left,
+			&p_top,
+			&p_right,
+			&p_bottom,
+			&p_width,
+			&p_height
+		)) {
+		DDSURFACEDESC ddsd;
+		memset(&ddsd, 0, sizeof(ddsd));
+		ddsd.dwSize = sizeof(ddsd);
+
+		HRESULT hr = m_ddSurface2->Lock(NULL, &ddsd, DDLOCK_WAIT, NULL);
+		if (hr == DDERR_SURFACELOST) {
+			m_ddSurface2->Restore();
+			hr = m_ddSurface2->Lock(NULL, &ddsd, DDLOCK_WAIT, NULL);
+		}
+
+		if (hr == DD_OK) {
+			MxU8* data;
+
+			switch (p_bitmap->GetBmiHeader()->biCompression) {
+			case BI_RGB: {
+				MxS32 rowsBeforeTop;
+				if (p_bitmap->GetBmiHeight() < 0)
+					rowsBeforeTop = p_top;
+				else
+					rowsBeforeTop = p_bitmap->GetBmiHeightAbs() - p_top - 1;
+				data = p_bitmap->GetBitmapData() + p_left + (p_bitmap->GetBmiStride() * rowsBeforeTop);
+				break;
+			}
+			case BI_RGB_TOPDOWN:
+				data = p_bitmap->GetBitmapData();
+				break;
+			default: {
+				MxS32 rowsBeforeTop;
+				if (p_bitmap->GetBmiHeight() < 0)
+					rowsBeforeTop = 0;
+				else
+					rowsBeforeTop = p_bitmap->GetBmiHeightAbs() - 1;
+				data = p_bitmap->GetBitmapData() + (p_bitmap->GetBmiStride() * rowsBeforeTop);
+			}
+			}
+
+			if (m_videoParam.Flags().GetF1bit3()) {
+				p_bottom *= 2;
+				p_right *= 2;
+
+				switch (m_surfaceDesc.ddpfPixelFormat.dwRGBBitCount) {
+				case 8: {
+					MxU8* surface = (MxU8*) ddsd.lpSurface + p_right + (p_bottom * ddsd.lPitch);
+					MxLong stride = p_bitmap->GetAdjustedStride();
+
+					MxLong v22 = stride - p_width;
+					MxLong length = ddsd.lPitch - (2 * p_width);
+					while (p_height--) {
+						MxU8* surfaceBefore = surface;
+
+						for (MxS32 i = 0; p_width > i; i++) {
+							MxU8 element = *data;
+							*surface++ = element;
+							data++;
+							*surface++ = *(data - 1);
+						}
+
+						data += v22;
+						surface += length;
+
+						memcpy(surface, surfaceBefore, 2 * p_width);
+						surface += ddsd.lPitch;
+					}
+					break;
+				}
+				case 16: {
+					MxU8* surface = (MxU8*) ddsd.lpSurface + (2 * p_right) + (p_bottom * ddsd.lPitch);
+					MxLong stride = p_bitmap->GetAdjustedStride();
+
+					// TODO: Match
+					stride -= p_width;
+					MxS32 length = p_width * 4;
+					MxLong v62 = ddsd.lPitch - length;
+					MxS32 height = p_height;
+					MxS32 width = p_width;
+					MxU16* p16BitPal = m_16bitPal;
+
+					if (stride || v62) {
+						while (height--) {
+							MxU8* surfaceBefore = surface;
+
+							for (MxS32 i = width; i > 0; i--) {
+								MxU16 element = p16BitPal[*data++];
+								*(MxU16*) surface = element;
+								surface += 2;
+								*(MxU16*) surface = element;
+								surface += 2;
+							}
+
+							data += stride;
+							surface += v62;
+
+							// Odd expression for the length?
+							memcpy(surface, surfaceBefore, 4 * ((MxU32) (4 * p_width) / 4));
+							surface += ddsd.lPitch;
+						}
+					}
+					else {
+						while (height--) {
+							MxU8* surfaceBefore = surface;
+
+							for (MxS32 i = width; i > 0; i--) {
+								MxU16 element = p16BitPal[*data++];
+								*(MxU16*) surface = element;
+								surface += 2;
+								*(MxU16*) surface = element;
+								surface += 2;
+							}
+
+							memcpy(surface, surfaceBefore, length);
+							surface += ddsd.lPitch;
+						}
+					}
+				}
+				}
+			}
+			else {
+				switch (m_surfaceDesc.ddpfPixelFormat.dwRGBBitCount) {
+				case 8: {
+					MxU8* surface = (MxU8*) ddsd.lpSurface + p_right + (p_bottom * ddsd.lPitch);
+					MxLong stride = p_bitmap->GetAdjustedStride();
+
+					MxLong length = ddsd.lPitch;
+					while (p_height--) {
+						memcpy(surface, data, p_width);
+						data += stride;
+						surface += length;
+					}
+					break;
+				}
+				case 16: {
+					MxU8* surface = (MxU8*) ddsd.lpSurface + (2 * p_right) + (p_bottom * ddsd.lPitch);
+					MxLong stride = p_bitmap->GetAdjustedStride();
+
+					MxLong v50 = stride - p_width;
+					MxLong length = ddsd.lPitch - (2 * p_width);
+					for (MxS32 i = 0; p_height > i; i++) {
+						for (MxS32 j = 0; p_width > j; j++) {
+							*(MxU16*) surface = m_16bitPal[*data++];
+							surface += 2;
+						}
+
+						data += v50;
+						surface += length;
+					}
+				}
+				}
+			}
+
+			m_ddSurface2->Unlock(ddsd.lpSurface);
+		}
+	}
 }
 
 // STUB: LEGO1 0x100bb1d0
@@ -339,7 +502,7 @@ void MxDisplaySurface::Display(MxS32 p_left, MxS32 p_top, MxS32 p_left2, MxS32 p
 				DDSURFACEDESC ddsd;
 				memset(&ddsd, 0, sizeof(ddsd));
 				ddsd.dwSize = sizeof(ddsd);
-				if (m_ddSurface2->Lock(NULL, &ddsd, 1, NULL) == S_OK) {
+				if (m_ddSurface2->Lock(NULL, &ddsd, DDLOCK_WAIT, NULL) == DD_OK) {
 					MxU8* surface = (MxU8*) ddsd.lpSurface;
 					MxS32 height = m_videoParam.GetRect().GetHeight();
 
@@ -354,7 +517,7 @@ void MxDisplaySurface::Display(MxS32 p_left, MxS32 p_top, MxS32 p_left2, MxS32 p
 					OutputDebugString("MxDisplaySurface::Display error\n");
 				}
 			}
-			m_ddSurface1->Flip(NULL, 1);
+			m_ddSurface1->Flip(NULL, DDFLIP_WAIT);
 		}
 		else {
 			POINT point = {0, 0};
diff --git a/LEGO1/mxdisplaysurface.h b/LEGO1/mxdisplaysurface.h
index d77e4883..7b578c68 100644
--- a/LEGO1/mxdisplaysurface.h
+++ b/LEGO1/mxdisplaysurface.h
@@ -35,7 +35,7 @@ class MxDisplaySurface : public MxCore {
 		undefined4,
 		undefined4
 	); // vtable+0x24
-	virtual MxBool VTable0x28(
+	virtual void VTable0x28(
 		MxBitmap* p_bitmap,
 		MxS32 p_left,
 		MxS32 p_top,

From 935ebe69102062d12273af3f0fc430b6d3d45e89 Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Mon, 1 Jan 2024 19:17:38 -0500
Subject: [PATCH 053/210] Implement LegoVideoManager::Create and related (#393)

* WIP

* Match

* Changes

* Fix format

* Style fixes

* Update naming.yml

* Match to ~85%
---
 .github/workflows/format.yml      |   1 +
 .github/workflows/naming.yml      |   2 +-
 CMakeLists.txt                    |   4 +-
 LEGO1/lego3dmanager.cpp           |  49 +++++---
 LEGO1/lego3dmanager.h             |  26 ++++-
 LEGO1/lego3dview.cpp              |  14 ++-
 LEGO1/lego3dview.h                |   6 +-
 LEGO1/legoomni.cpp                |  14 +--
 LEGO1/legoomni.h                  |   4 +-
 LEGO1/legoroi.cpp                 |  21 ++++
 LEGO1/legoroi.h                   |  16 +++
 LEGO1/legovideomanager.cpp        | 167 ++++++++++++++++++++++++++--
 LEGO1/legovideomanager.h          |  19 ++--
 LEGO1/mxdirect3d.cpp              |  56 ++++++++--
 LEGO1/mxdirect3d.h                |  85 ++++++++------
 LEGO1/mxdirectdraw.h              |  15 ++-
 LEGO1/mxdirectx/mxstopwatch.h     | 179 ++++++++++++++++++++++++++++++
 LEGO1/mxrendersettings.cpp        |  21 ----
 LEGO1/mxrendersettings.h          |  28 -----
 LEGO1/mxstring.h                  |   5 +-
 LEGO1/mxunknown100d7c88.cpp       |  12 ++
 LEGO1/mxunknown100d7c88.h         |  19 ++++
 LEGO1/mxunknown100d9d00.h         |  42 +++++++
 LEGO1/mxunknown100dbdbc.cpp       |  17 ---
 LEGO1/mxunknown100dbdbc.h         |  18 ---
 LEGO1/mxvideomanager.cpp          |  10 +-
 LEGO1/mxvideomanager.h            |   6 +-
 LEGO1/mxvideoparam.h              |   2 +-
 LEGO1/tglsurface.h                |  27 +++++
 LEGO1/viewmanager/viewlodlist.cpp |  28 +++++
 LEGO1/viewmanager/viewlodlist.h   |   3 +
 LEGO1/viewmanager/viewroi.cpp     |  12 +-
 LEGO1/viewmanager/viewroi.h       |  13 ++-
 33 files changed, 742 insertions(+), 199 deletions(-)
 create mode 100644 LEGO1/mxdirectx/mxstopwatch.h
 delete mode 100644 LEGO1/mxrendersettings.cpp
 delete mode 100644 LEGO1/mxrendersettings.h
 create mode 100644 LEGO1/mxunknown100d7c88.cpp
 create mode 100644 LEGO1/mxunknown100d7c88.h
 create mode 100644 LEGO1/mxunknown100d9d00.h
 delete mode 100644 LEGO1/mxunknown100dbdbc.cpp
 delete mode 100644 LEGO1/mxunknown100dbdbc.h
 create mode 100644 LEGO1/tglsurface.h
 create mode 100644 LEGO1/viewmanager/viewlodlist.cpp

diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml
index 22b39806..d8fbe442 100644
--- a/.github/workflows/format.yml
+++ b/.github/workflows/format.yml
@@ -17,6 +17,7 @@ jobs:
           --style=file \
           ISLE/*.cpp ISLE/*.h \
           LEGO1/*.cpp LEGO1/*.h \
+          LEGO1/mxdirectx/*.h \
           LEGO1/mxstl/*.h \
           LEGO1/realtime/*.cpp LEGO1/realtime/*.h \
           LEGO1/tgl/*.h \
diff --git a/.github/workflows/naming.yml b/.github/workflows/naming.yml
index 11738779..f0d72616 100644
--- a/.github/workflows/naming.yml
+++ b/.github/workflows/naming.yml
@@ -24,6 +24,6 @@ jobs:
           --clang-lib ${{ env.LLVM_PATH }}/lib/libclang.so \
           --style tools/ncc/ncc.style \
           --skip tools/ncc/skip.yml \
-          --definition WINAPI FAR HWND__=HWND \
+          --definition WINAPI FAR CALLBACK HWND__=HWND \
           --include util \
           --path LEGO1
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3b31a548..61a70e1c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -163,7 +163,6 @@ add_library(lego1 SHARED
   LEGO1/mxramstreamprovider.cpp
   LEGO1/mxregion.cpp
   LEGO1/mxregioncursor.cpp
-  LEGO1/mxrendersettings.cpp
   LEGO1/mxscheduler.cpp
   LEGO1/mxsemaphore.cpp
   LEGO1/mxsmack.cpp
@@ -182,7 +181,7 @@ add_library(lego1 SHARED
   LEGO1/mxtimer.cpp
   LEGO1/mxtransitionmanager.cpp
   LEGO1/mxtype17notificationparam.cpp
-  LEGO1/mxunknown100dbdbc.cpp
+  LEGO1/mxunknown100d7c88.cpp
   LEGO1/mxvariable.cpp
   LEGO1/mxvariabletable.cpp
   LEGO1/mxvideomanager.cpp
@@ -222,6 +221,7 @@ add_library(lego1 SHARED
   LEGO1/tgl/d3drm/view.cpp
   LEGO1/towtrack.cpp
   LEGO1/towtrackmissionstate.cpp
+  LEGO1/viewmanager/viewlodlist.cpp
   LEGO1/viewmanager/viewmanager.cpp
   LEGO1/viewmanager/viewroi.cpp
 )
diff --git a/LEGO1/lego3dmanager.cpp b/LEGO1/lego3dmanager.cpp
index c399b1a8..2b52fbd9 100644
--- a/LEGO1/lego3dmanager.cpp
+++ b/LEGO1/lego3dmanager.cpp
@@ -1,18 +1,34 @@
 #include "lego3dmanager.h"
 
 #include "decomp.h"
-#include "mxrendersettings.h"
-#include "mxunknown100dbdbc.h"
 #include "tgl/tgl.h"
+#include "tglsurface.h"
+#include "viewmanager/viewlodlist.h"
 
 DECOMP_SIZE_ASSERT(Lego3DManager, 0x10);
 
+// FUNCTION: LEGO1 0x100ab2d0
+BOOL InitializeCreateStruct(TglSurface::CreateStruct& p_tglSurface, const Lego3DManager::CreateStruct& p_createStruct)
+{
+	p_tglSurface.m_unk0x00 = p_createStruct.m_unk0x00;
+	p_tglSurface.m_hwnd = p_createStruct.m_hwnd;
+	p_tglSurface.m_directDraw = p_createStruct.m_directDraw;
+	p_tglSurface.m_ddSurface1 = p_createStruct.m_ddSurface1;
+	p_tglSurface.m_ddSurface2 = p_createStruct.m_ddSurface2;
+	p_tglSurface.m_ddPalette = p_createStruct.m_ddPalette;
+	p_tglSurface.m_isFullScreen = p_createStruct.m_isFullScreen;
+	p_tglSurface.m_flags = p_createStruct.m_flags;
+	p_tglSurface.m_direct3d = p_createStruct.m_direct3d;
+	p_tglSurface.m_d3dDevice = p_createStruct.m_d3dDevice;
+	return TRUE;
+}
+
 // FUNCTION: LEGO1 0x100ab320
 Lego3DManager::Lego3DManager()
 {
-	m_render = NULL;
+	m_renderer = NULL;
 	m_3dView = NULL;
-	m_unk0x0c = NULL;
+	m_viewLODListManager = NULL;
 }
 
 // FUNCTION: LEGO1 0x100ab360
@@ -22,16 +38,17 @@ Lego3DManager::~Lego3DManager()
 }
 
 // FUNCTION: LEGO1 0x100ab370
-void Lego3DManager::Init(MxRenderSettings& p_settings)
+BOOL Lego3DManager::Create(Lego3DManager::CreateStruct& p_createStruct)
 {
-	m_unk0x0c = new MxUnknown100dbdbc();
-	m_render = Tgl::CreateRenderer();
-	m_3dView = new Lego3DView();
+	TglSurface::CreateStruct surfaceCreateStruct;
 
-	MxRenderSettings settings;
-	MxRenderSettings::CopyFrom(settings, p_settings);
+	m_viewLODListManager = new ViewLODListManager;
+	m_renderer = Tgl::CreateRenderer();
+	m_3dView = new Lego3DView;
 
-	m_3dView->Init(settings, *m_render);
+	InitializeCreateStruct(surfaceCreateStruct, p_createStruct);
+
+	return m_3dView->Create(surfaceCreateStruct, m_renderer);
 }
 
 // FUNCTION: LEGO1 0x100ab460
@@ -39,8 +56,10 @@ void Lego3DManager::Destroy()
 {
 	delete m_3dView;
 	m_3dView = NULL;
-	delete m_render;
-	m_render = NULL;
-	delete m_unk0x0c;
-	m_unk0x0c = NULL;
+
+	delete m_renderer;
+	m_renderer = NULL;
+
+	delete m_viewLODListManager;
+	m_viewLODListManager = NULL;
 }
diff --git a/LEGO1/lego3dmanager.h b/LEGO1/lego3dmanager.h
index 78c532a5..0a856f90 100644
--- a/LEGO1/lego3dmanager.h
+++ b/LEGO1/lego3dmanager.h
@@ -3,23 +3,39 @@
 
 #include "lego3dview.h"
 
-class MxUnknown100dbdbc;
+class ViewLODListManager;
 
 // VTABLE: LEGO1 0x100dbfa4
 // SIZE 0x10
 class Lego3DManager {
 public:
+	// SIZE 0x28
+	struct CreateStruct {
+		undefined4 m_unk0x00;             // 0x00
+		HWND m_hwnd;                      // 0x04
+		IDirectDraw* m_directDraw;        // 0x08
+		IDirectDrawSurface* m_ddSurface1; // 0x0c
+		IDirectDrawSurface* m_ddSurface2; // 0x10
+		IDirectDrawPalette* m_ddPalette;  // 0x14
+		BOOL m_isFullScreen;              // 0x18
+		MxU32 m_flags;                    // 0x1c
+		IDirect3D* m_direct3d;            // 0x20
+		IDirect3DDevice* m_d3dDevice;     // 0x24
+	};
+
 	Lego3DManager();
 	virtual ~Lego3DManager();
 
+	BOOL Create(CreateStruct& p_createStruct);
+
 	inline Lego3DView* GetLego3DView() { return this->m_3dView; }
+	inline ViewLODListManager* GetViewLODListManager() { return this->m_viewLODListManager; }
 
 private:
-	Tgl::Renderer* m_render;      // 0x04
-	Lego3DView* m_3dView;         // 0x08
-	MxUnknown100dbdbc* m_unk0x0c; // 0x0c
+	Tgl::Renderer* m_renderer;                // 0x04
+	Lego3DView* m_3dView;                     // 0x08
+	ViewLODListManager* m_viewLODListManager; // 0x0c
 
-	void Init(MxRenderSettings& p_settings);
 	void Destroy();
 };
 
diff --git a/LEGO1/lego3dview.cpp b/LEGO1/lego3dview.cpp
index 096e7b9e..efe79db1 100644
--- a/LEGO1/lego3dview.cpp
+++ b/LEGO1/lego3dview.cpp
@@ -16,11 +16,23 @@ Lego3DView::~Lego3DView()
 }
 
 // STUB: LEGO1 0x100aaf90
-MxBool Lego3DView::Init(MxRenderSettings& p_renderSettings, Tgl::Renderer& p_render)
+BOOL Lego3DView::Create(TglSurface::CreateStruct& p_createStruct, Tgl::Renderer* p_renderer)
 {
 	return FALSE;
 }
 
+// STUB: LEGO1 0x100ab100
+void Lego3DView::FUN_100ab100(LegoROI* p_roi)
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x100ab1b0
+void Lego3DView::FUN_100ab1b0(LegoROI* p_roi)
+{
+	// TODO
+}
+
 // STUB: LEGO1 0x100ab2b0
 LegoROI* Lego3DView::PickROI(MxLong p_a, MxLong p_b)
 {
diff --git a/LEGO1/lego3dview.h b/LEGO1/lego3dview.h
index 0681003f..49e64567 100644
--- a/LEGO1/lego3dview.h
+++ b/LEGO1/lego3dview.h
@@ -1,9 +1,9 @@
 #ifndef LEGO3DVIEW_H
 #define LEGO3DVIEW_H
 
-#include "mxrendersettings.h"
 #include "mxtypes.h"
 #include "tgl/d3drm/impl.h"
+#include "tglsurface.h"
 #include "viewmanager/viewmanager.h"
 
 class LegoROI;
@@ -18,8 +18,10 @@ class Lego3DView {
 
 	inline ViewManager* GetViewManager() { return this->m_viewManager; }
 	inline TglImpl::ViewImpl* GetViewPort() { return this->m_viewPort; }
-	MxBool Init(MxRenderSettings& p_renderSettings, Tgl::Renderer& p_render);
+	BOOL Create(TglSurface::CreateStruct& p_createStruct, Tgl::Renderer* p_renderer);
 	LegoROI* PickROI(MxLong p_a, MxLong p_b);
+	void FUN_100ab100(LegoROI* p_roi);
+	void FUN_100ab1b0(LegoROI* p_roi);
 
 private:
 	// TODO: all of these fields are in various base classes
diff --git a/LEGO1/legoomni.cpp b/LEGO1/legoomni.cpp
index 48c7a1f5..f8c6b819 100644
--- a/LEGO1/legoomni.cpp
+++ b/LEGO1/legoomni.cpp
@@ -21,7 +21,6 @@
 #include "mxomnicreateparam.h"
 #include "mxticklemanager.h"
 #include "mxtransitionmanager.h"
-#include "mxunknown100dbdbc.h"
 
 DECOMP_SIZE_ASSERT(LegoWorldList, 0x18);
 
@@ -386,7 +385,7 @@ void LegoOmni::Init()
 	MxOmni::Init();
 	m_unk0x68 = 0;
 	m_inputMgr = NULL;
-	m_renderMgr = NULL;
+	m_viewLODListManager = NULL;
 	m_gifManager = NULL;
 	m_worldList = NULL;
 	m_currentWorld = NULL;
@@ -444,9 +443,9 @@ void LegoOmni::Destroy()
 		m_gifManager = NULL;
 	}
 
-	if (m_renderMgr) {
-		delete m_renderMgr;
-		m_renderMgr = NULL;
+	if (m_viewLODListManager) {
+		delete m_viewLODListManager;
+		m_viewLODListManager = NULL;
 	}
 
 	if (m_inputMgr) {
@@ -524,7 +523,7 @@ MxResult LegoOmni::Create(MxOmniCreateParam& p_param)
 		}
 	}
 
-	m_renderMgr = new MxUnknown100dbdbc();
+	m_viewLODListManager = new ViewLODListManager();
 	m_gifManager = new GifManager();
 	// TODO: there is another class here
 	m_plantManager = new LegoPlantManager();
@@ -533,7 +532,8 @@ MxResult LegoOmni::Create(MxOmniCreateParam& p_param)
 	m_gameState = new LegoGameState();
 	m_worldList = new LegoWorldList(TRUE);
 
-	if (m_renderMgr && m_gifManager && m_worldList && m_plantManager && m_animationManager && m_buildingManager) {
+	if (m_viewLODListManager && m_gifManager && m_worldList && m_plantManager && m_animationManager &&
+		m_buildingManager) {
 		// TODO: initialize a bunch of MxVariables
 		RegisterScripts();
 		FUN_1001a700();
diff --git a/LEGO1/legoomni.h b/LEGO1/legoomni.h
index 2aaba4cc..613ddd85 100644
--- a/LEGO1/legoomni.h
+++ b/LEGO1/legoomni.h
@@ -27,7 +27,7 @@ class MxAtomId;
 class MxBackgroundAudioManager;
 class MxDSFile;
 class MxTransitionManager;
-class MxUnknown100dbdbc;
+class ViewLODListManager;
 
 extern MxAtomId* g_copterScript;
 extern MxAtomId* g_dunecarScript;
@@ -120,7 +120,7 @@ class LegoOmni : public MxOmni {
 
 private:
 	undefined4* m_unk0x68;                       // 0x68
-	MxUnknown100dbdbc* m_renderMgr;              // 0x6c
+	ViewLODListManager* m_viewLODListManager;    // 0x6c
 	LegoInputManager* m_inputMgr;                // 0x70
 	GifManager* m_gifManager;                    // 0x74
 	LegoWorldList* m_worldList;                  // 0x78
diff --git a/LEGO1/legoroi.cpp b/LEGO1/legoroi.cpp
index f23901ad..dab06a1a 100644
--- a/LEGO1/legoroi.cpp
+++ b/LEGO1/legoroi.cpp
@@ -2,6 +2,8 @@
 
 #include <string.h>
 
+DECOMP_SIZE_ASSERT(LegoROI, 0x10c);
+
 // SIZE 0x14
 typedef struct {
 	const char* m_name;
@@ -35,6 +37,12 @@ MxS32 g_roiConfig = 100;
 // GLOBAL: LEGO1 0x101013ac
 ROIHandler g_someHandlerFunction = NULL;
 
+// FUNCTION: LEGO1 0x100a46a0
+void LegoROI::WrappedSetLocalTransform(Matrix4Impl& p_transform)
+{
+	SetLocalTransform(p_transform);
+}
+
 // STUB: LEGO1 0x100a46b0
 void LegoROI::FUN_100a46b0(Matrix4Impl& p_transform)
 {
@@ -51,6 +59,12 @@ void LegoROI::configureLegoROI(MxS32 p_roiConfig)
 	g_roiConfig = p_roiConfig;
 }
 
+// STUB: LEGO1 0x100a9a50
+LegoROI::LegoROI(Tgl::Renderer* p_renderer, ViewLODList* p_lodList, MxTime p_time) : ViewROI(p_renderer, p_lodList)
+{
+	m_time = p_time;
+}
+
 // FUNCTION: LEGO1 0x100a9bf0
 MxBool LegoROI::CallTheHandlerFunction(
 	char* p_param,
@@ -104,3 +118,10 @@ void LegoROI::SetDisplayBB(MxS32 p_displayBB)
 {
 	// Intentionally empty function
 }
+
+// Note: Actually part of parent class (doesn't exist yet)
+// STUB: LEGO1 0x100aa350
+void LegoROI::UpdateWorldBoundingVolumes()
+{
+	// TODO
+}
diff --git a/LEGO1/legoroi.h b/LEGO1/legoroi.h
index 74024ce6..d84e8df4 100644
--- a/LEGO1/legoroi.h
+++ b/LEGO1/legoroi.h
@@ -6,8 +6,15 @@
 
 typedef MxBool (*ROIHandler)(char*, char*, MxU32);
 
+// Note: There is an extra class between LegoROI and ViewROI,
+// maybe called "AutoROI". VTABLE 0x100dbe38
+
+// VTABLE: LEGO1 0x100dbea8
+// SIZE 0x10c
 class LegoROI : public ViewROI {
 public:
+	LegoROI(Tgl::Renderer* p_renderer, ViewLODList* p_lodList, MxTime p_time);
+
 	__declspec(dllexport) void SetDisplayBB(MxS32 p_displayBB);
 	__declspec(dllexport) static void configureLegoROI(MxS32 p_roi);
 
@@ -20,8 +27,17 @@ class LegoROI : public ViewROI {
 		MxFloat& p_other
 	);
 	static MxBool ColorAliasLookup(char* p_param, MxFloat& p_red, MxFloat& p_green, MxFloat& p_blue, MxFloat& p_other);
+
+	void WrappedSetLocalTransform(Matrix4Impl& p_transform);
 	void FUN_100a46b0(Matrix4Impl& p_transform);
 	void FUN_100a58f0(Matrix4Impl& p_transform);
+
+	// Note: Actually part of parent class (doesn't exist yet)
+	virtual void UpdateWorldBoundingVolumes() override; // vtable+0x18
+
+private:
+	undefined m_pad[0x28]; // 0xe0
+	MxTime m_time;         // 0x108
 };
 
 #endif // LEGOROI_H
diff --git a/LEGO1/legovideomanager.cpp b/LEGO1/legovideomanager.cpp
index b6a44a79..b061faef 100644
--- a/LEGO1/legovideomanager.cpp
+++ b/LEGO1/legovideomanager.cpp
@@ -1,21 +1,28 @@
 #include "legovideomanager.h"
 
+#include "legoomni.h"
+#include "legoroi.h"
+#include "mxtimer.h"
+#include "realtime/matrix.h"
+#include "viewmanager/viewroi.h"
+
 DECOMP_SIZE_ASSERT(LegoVideoManager, 0x590);
+DECOMP_SIZE_ASSERT(MxStopWatch, 0x18);
 
 // FUNCTION: LEGO1 0x1007aa20
 LegoVideoManager::LegoVideoManager()
 {
-	m_unk0x64 = 0;
+	m_renderer = NULL;
 	m_3dManager = NULL;
-	m_unk0x6c = 0;
+	m_viewROI = NULL;
 	m_direct3d = 0;
 	m_unk0xe6 = FALSE;
 	memset(m_unk0x78, 0, sizeof(m_unk0x78));
 	m_unk0x78[0] = 0x6c;
-	m_unk0x4e8 = 0;
+	m_unk0x100d9d00 = NULL;
 	m_isFullscreenMovie = FALSE;
 	m_palette = NULL;
-	m_prefCounter = NULL;
+	m_stopWatch = NULL;
 	m_cursorMoved = FALSE;
 	m_cursorX = m_cursorY;
 	m_cursorYCopy = m_cursorY;
@@ -37,11 +44,148 @@ LegoVideoManager::~LegoVideoManager()
 	delete m_palette;
 }
 
-// STUB: LEGO1 0x1007ac40
+// STUB: LEGO1 0x1007abb0
+MxResult LegoVideoManager::CreateDirect3D()
+{
+	return SUCCESS;
+}
+
+// FUNCTION: LEGO1 0x1007ac40
 MxResult LegoVideoManager::Create(MxVideoParam& p_videoParam, MxU32 p_frequencyMS, MxBool p_createThread)
 {
-	MxResult result = MxVideoManager::Create(p_videoParam, p_frequencyMS, p_createThread);
-	m_videoParam.GetPalette()->CreateNativePalette();
+	MxBool paletteCreated = FALSE;
+	undefined* und1 = NULL;
+	undefined* und2 = NULL;
+	MxResult result = FAILURE;
+
+	MxDeviceEnumerate100d9cc8 deviceEnumerate;
+	Vector3Data posVec(0.0, 1.25, -50.0);
+	Vector3Data dirVec(0.0, 0.0, 1.0);
+	Vector3Data upVec(0.0, 1.0, 0.0);
+	Matrix4Data outMatrix;
+	HWND hwnd = MxOmni::GetInstance()->GetWindowHandle();
+	MxS32 bits = p_videoParam.Flags().Get16Bit() ? 16 : 8;
+	MxS32 und3 = -1;
+
+	if (!p_videoParam.GetPalette()) {
+		MxPalette* palette = new MxPalette;
+		p_videoParam.SetPalette(palette);
+
+		if (!palette)
+			goto done;
+		paletteCreated = TRUE;
+	}
+
+	PALETTEENTRY paletteEntries[256];
+	p_videoParam.GetPalette()->GetEntries(paletteEntries);
+
+	if (CreateDirect3D() != SUCCESS)
+		goto done;
+
+	if (deviceEnumerate.DoEnumerate() != SUCCESS)
+		goto done;
+
+	if (p_videoParam.GetDeviceName()) {
+		und3 = deviceEnumerate.ParseDeviceName(p_videoParam.GetDeviceName());
+		if (und3 >= 0) {
+			if ((und3 = deviceEnumerate.FUN_1009d030(und3, &und1, &und2)) != SUCCESS)
+				und3 = -1;
+		}
+	}
+
+	if (und3 < 0) {
+		deviceEnumerate.FUN_1009d210();
+		und3 = deviceEnumerate.FUN_1009d0d0();
+		deviceEnumerate.FUN_1009d030(und3, &und1, &und2);
+	}
+
+	m_direct3d->FUN_1009b5f0(deviceEnumerate, und1, und2);
+
+	if (!*((MxU32*) &und1[0x14]) && *((MxU32*) &und1[0xe0]) != 2)
+		p_videoParam.Flags().SetF2bit0(TRUE);
+	else
+		p_videoParam.Flags().SetF2bit0(FALSE);
+
+	ViewROI::SetUnk101013d8(p_videoParam.Flags().GetF2bit0() == FALSE);
+
+	if (!m_direct3d->Create(
+			hwnd,
+			p_videoParam.Flags().GetFullScreen(),
+			p_videoParam.Flags().GetFlipSurfaces(),
+			p_videoParam.Flags().GetBackBuffers() == FALSE,
+			p_videoParam.GetRect().GetWidth(),
+			p_videoParam.GetRect().GetHeight(),
+			bits,
+			paletteEntries,
+			sizeof(paletteEntries) / sizeof(paletteEntries[0])
+		))
+		goto done;
+
+	if (MxVideoManager::VTable0x28(
+			p_videoParam,
+			m_direct3d->GetDirectDraw(),
+			m_direct3d->GetDirect3D(),
+			m_direct3d->GetFrontBuffer(),
+			m_direct3d->GetBackBuffer(),
+			m_direct3d->GetClipper(),
+			p_frequencyMS,
+			p_createThread
+		) != SUCCESS)
+		goto done;
+
+	m_renderer = Tgl::CreateRenderer();
+
+	if (!m_renderer)
+		goto done;
+
+	m_3dManager = new Lego3DManager;
+
+	if (!m_3dManager)
+		goto done;
+
+	Lego3DManager::CreateStruct createStruct;
+	memset(&createStruct, 0, sizeof(createStruct));
+	createStruct.m_hwnd = LegoOmni::GetInstance()->GetWindowHandle();
+	createStruct.m_directDraw = m_pDirectDraw;
+	createStruct.m_ddSurface1 = m_displaySurface->GetDirectDrawSurface1();
+	createStruct.m_ddSurface2 = m_displaySurface->GetDirectDrawSurface2();
+	createStruct.m_ddPalette = m_videoParam.GetPalette()->CreateNativePalette();
+	createStruct.m_isFullScreen = FALSE;
+	createStruct.m_flags = m_videoParam.Flags().GetWideViewAngle();
+	createStruct.m_direct3d = m_direct3d->GetDirect3D();
+	createStruct.m_d3dDevice = m_direct3d->GetDirect3DDevice();
+
+	if (!m_3dManager->Create(createStruct))
+		goto done;
+
+	ViewLODList* pLODList;
+
+	if (FUN_1007c930() != SUCCESS)
+		goto done;
+
+	pLODList = m_3dManager->GetViewLODListManager()->Create("CameraROI", 1);
+	m_viewROI = new LegoROI(m_renderer, pLODList, Timer()->GetTime());
+	pLODList->Release();
+
+	CalcLocalTransform(posVec, dirVec, upVec, outMatrix);
+	m_viewROI->WrappedSetLocalTransform(outMatrix);
+
+	m_3dManager->GetLego3DView()->FUN_100ab100(m_viewROI);
+	m_3dManager->GetLego3DView()->FUN_100ab1b0(m_viewROI);
+
+	m_unk0x100d9d00 = new MxUnknown100d9d00;
+	m_unk0xe4 = FALSE;
+	m_stopWatch = new MxStopWatch;
+	m_stopWatch->Start();
+
+	result = SUCCESS;
+
+done:
+	if (paletteCreated) {
+		delete p_videoParam.GetPalette();
+		p_videoParam.SetPalette(NULL);
+	}
+
 	return result;
 }
 
@@ -59,8 +203,7 @@ void LegoVideoManager::Destroy()
 
 	delete m_3dManager;
 	MxVideoManager::Destroy();
-	// todo: delete m_unk0x4e8
-	delete[] m_prefCounter;
+	delete m_stopWatch;
 }
 
 // FUNCTION: LEGO1 0x1007b6a0
@@ -205,3 +348,9 @@ int LegoVideoManager::DisableRMDevice()
 	// TODO
 	return 0;
 }
+
+// STUB: LEGO1 0x1007c930
+MxResult LegoVideoManager::FUN_1007c930()
+{
+	return SUCCESS;
+}
diff --git a/LEGO1/legovideomanager.h b/LEGO1/legovideomanager.h
index 122505de..1f9c49d0 100644
--- a/LEGO1/legovideomanager.h
+++ b/LEGO1/legovideomanager.h
@@ -4,6 +4,8 @@
 #include "decomp.h"
 #include "lego3dmanager.h"
 #include "mxdirect3d.h"
+#include "mxdirectx/mxstopwatch.h"
+#include "mxunknown100d9d00.h"
 #include "mxvideomanager.h"
 
 #include <ddraw.h>
@@ -29,7 +31,7 @@ class LegoVideoManager : public MxVideoManager {
 	virtual void VTable0x34(MxU32 p_x, MxU32 p_y, MxU32 p_width, MxU32 p_height) override; // vtable+0x34
 	virtual void VTable0x38(undefined4, undefined4);                                       // vtable+0x38
 	// FUNCTION: LGEO1 0x1007ab10
-	virtual undefined4 VTable0x3c() { return m_unk0x4e8; } // vtable+0x3c
+	virtual MxUnknown100d9d00* VTable0x3c() { return m_unk0x100d9d00; } // vtable+0x3c
 
 	void SetSkyColor(float p_red, float p_green, float p_blue);
 	void OverrideSkyColor(MxBool p_shouldOverride);
@@ -39,9 +41,12 @@ class LegoVideoManager : public MxVideoManager {
 	inline void SetUnkE4(MxBool p_unk0xe4) { this->m_unk0xe4 = p_unk0xe4; }
 
 private:
-	undefined4 m_unk0x64;
+	MxResult CreateDirect3D();
+	MxResult FUN_1007c930();
+
+	Tgl::Renderer* m_renderer;
 	Lego3DManager* m_3dManager; // 0x68
-	undefined4 m_unk0x6c;
+	LegoROI* m_viewROI;         // 0x6c
 	undefined4 m_unk0x70;
 	MxDirect3D* m_direct3d; // 0x74
 	undefined4 m_unk0x78[27];
@@ -50,10 +55,10 @@ class LegoVideoManager : public MxVideoManager {
 	MxBool m_unk0xe6;
 	PALETTEENTRY m_paletteEntries[256]; // 0xe7
 	undefined m_padding0x4e7;
-	undefined4 m_unk0x4e8;
-	MxBool m_isFullscreenMovie;   // 0x4ec
-	MxPalette* m_palette;         // 0x4f0
-	LARGE_INTEGER* m_prefCounter; // 0x4f4
+	MxUnknown100d9d00* m_unk0x100d9d00; // 0x4e8
+	MxBool m_isFullscreenMovie;         // 0x4ec
+	MxPalette* m_palette;               // 0x4f0
+	MxStopWatch* m_stopWatch;           // 0x4f4
 	undefined m_padding0x4f4[8];
 	MxBool m_unk0x500;
 	MxBool m_cursorMoved; // 0x501
diff --git a/LEGO1/mxdirect3d.cpp b/LEGO1/mxdirect3d.cpp
index 58a982b3..619dbcb6 100644
--- a/LEGO1/mxdirect3d.cpp
+++ b/LEGO1/mxdirect3d.cpp
@@ -2,9 +2,10 @@
 
 #include <stdio.h> // for vsprintf
 
-DECOMP_SIZE_ASSERT(MxDirect3D, 0x894);
 DECOMP_SIZE_ASSERT(MxDeviceModeFinder, 0xe4);
-DECOMP_SIZE_ASSERT(MxDeviceEnumerate, 0x198);
+DECOMP_SIZE_ASSERT(MxDirect3D, 0x894);
+DECOMP_SIZE_ASSERT(MxDeviceEnumerateElement, 0x190);
+DECOMP_SIZE_ASSERT(MxDeviceEnumerate, 0x14);
 
 // FUNCTION: LEGO1 0x1009b0a0
 MxDirect3D::MxDirect3D()
@@ -85,7 +86,7 @@ void MxDirect3D::Destroy()
 }
 
 // FUNCTION: LEGO1 0x1009b290
-void MxDirect3D::Clear()
+void MxDirect3D::DestroyButNotDirectDraw()
 {
 	if (this->m_pDirect3dDevice) {
 		this->m_pDirect3dDevice->Release();
@@ -122,6 +123,12 @@ BOOL MxDirect3D::D3DSetMode()
 	return TRUE;
 }
 
+// STUB: LEGO1 0x1009b5f0
+BOOL MxDirect3D::FUN_1009b5f0(MxDeviceEnumerate& p_deviceEnumerate, undefined* p_und1, undefined* p_und2)
+{
+	return TRUE;
+}
+
 // FUNCTION: LEGO1 0x1009b8b0
 MxDeviceModeFinder::MxDeviceModeFinder()
 {
@@ -137,6 +144,12 @@ MxDeviceModeFinder::~MxDeviceModeFinder()
 	}
 }
 
+// FUNCTION: LEGO1 0x1009bec0
+MxDeviceEnumerate::MxDeviceEnumerate()
+{
+	m_unk0x10 = FALSE;
+}
+
 // STUB: LEGO1 0x1009c070
 BOOL MxDeviceEnumerate::FUN_1009c070()
 {
@@ -144,14 +157,14 @@ BOOL MxDeviceEnumerate::FUN_1009c070()
 	// HRESULT ret = DirectDrawCreate();
 	HRESULT ret = 0;
 	if (ret) {
-		MxDirect3D::BuildErrorString("GetCaps failed: %s\n", EnumerateErrorToString(ret));
+		BuildErrorString("GetCaps failed: %s\n", EnumerateErrorToString(ret));
 	}
 	// IDirect3D2_EnumDevices
 	return TRUE;
 }
 
 // FUNCTION: LEGO1 0x1009c4c0
-void MxDirect3D::BuildErrorString(const char* p_format, ...)
+void MxDeviceEnumerate::BuildErrorString(const char* p_format, ...)
 {
 	va_list args;
 	char buf[512];
@@ -166,22 +179,21 @@ void MxDirect3D::BuildErrorString(const char* p_format, ...)
 // FUNCTION: LEGO1 0x1009c6c0
 MxResult MxDeviceEnumerate::DoEnumerate()
 {
-	// TODO: what does ECX refer to in this context?
-	if (m_unk0x010)
+	if (m_unk0x10)
 		return FAILURE;
 
 	HRESULT ret = DirectDrawEnumerate(EnumerateCallback, this);
 	if (ret) {
-		MxDirect3D::BuildErrorString("DirectDrawEnumerate returned error %s\n", EnumerateErrorToString(ret));
+		BuildErrorString("DirectDrawEnumerate returned error %s\n", EnumerateErrorToString(ret));
 		return FAILURE;
 	}
 
-	m_unk0x010 = TRUE;
+	m_unk0x10 = TRUE;
 	return SUCCESS;
 }
 
 // STUB: LEGO1 0x1009c710
-BOOL FAR PASCAL EnumerateCallback(GUID FAR*, LPSTR, LPSTR, LPVOID)
+BOOL CALLBACK EnumerateCallback(GUID FAR*, LPSTR, LPSTR, LPVOID)
 {
 	// TODO
 	return FALSE;
@@ -195,3 +207,27 @@ const char* MxDeviceEnumerate::EnumerateErrorToString(HRESULT p_error)
 	// Probably just copied from a sample file in the dx5 sdk.
 	return "";
 }
+
+// STUB: LEGO1 0x1009ce60
+MxS32 MxDeviceEnumerate::ParseDeviceName(const char* p_deviceId)
+{
+	return -1;
+}
+
+// STUB: LEGO1 0x1009d030
+MxResult MxDeviceEnumerate::FUN_1009d030(MxS32 p_und1, undefined** p_und2, undefined** p_und3)
+{
+	return FAILURE;
+}
+
+// STUB: LEGO1 0x1009d0d0
+MxResult MxDeviceEnumerate::FUN_1009d0d0()
+{
+	return FAILURE;
+}
+
+// STUB: LEGO1 0x1009d210
+MxResult MxDeviceEnumerate::FUN_1009d210()
+{
+	return FAILURE;
+}
diff --git a/LEGO1/mxdirect3d.h b/LEGO1/mxdirect3d.h
index 34178023..d22b3873 100644
--- a/LEGO1/mxdirect3d.h
+++ b/LEGO1/mxdirect3d.h
@@ -3,6 +3,7 @@
 
 #include "decomp.h"
 #include "mxdirectdraw.h"
+#include "mxstl/stlcompat.h"
 #include "mxtypes.h"
 
 #include <d3d.h>
@@ -13,40 +14,19 @@ class MxDeviceModeFinder {
 	MxDeviceModeFinder();
 	~MxDeviceModeFinder();
 
-	undefined4 m_pad[56];
-	MxDirectDraw::DeviceModesInfo* m_deviceInfo; // +0xe0
+	undefined m_pad[0xe0];                       // 0x00
+	MxDirectDraw::DeviceModesInfo* m_deviceInfo; // 0xe0
 };
 
-// VTABLE: LEGO1 0x100db814
-// or is it 0x100d9cc8?
-// SIZE 0x198
-class MxDeviceEnumerate {
-public:
-	MxDeviceEnumerate();
-	virtual MxResult DoEnumerate();
-
-	BOOL FUN_1009c070();
-
-	const char* EnumerateErrorToString(HRESULT p_error);
-
-	undefined4 m_unk0x004;
-	undefined4 m_unk0x008;
-	undefined4 m_unk0x00c;
-	MxBool m_unk0x010; // +0x10
-
-	undefined4 m_unk0x014[97];
-};
+class MxDeviceEnumerate;
 
 // VTABLE: LEGO1 0x100db800
 // SIZE 0x894
 class MxDirect3D : public MxDirectDraw {
 public:
 	MxDirect3D();
-
-	void Clear();
-	inline MxDeviceModeFinder* GetDeviceModeFinder() { return this->m_pDeviceModeFinder; };
-
 	virtual ~MxDirect3D();
+
 	virtual BOOL Create(
 		HWND hWnd,
 		BOOL fullscreen_1,
@@ -57,22 +37,59 @@ class MxDirect3D : public MxDirectDraw {
 		int bpp,
 		const PALETTEENTRY* pPaletteEntries,
 		int paletteEntryCount
-	);
-	virtual void Destroy();
+	) override;                                      // vtable+0x04
+	virtual void Destroy() override;                 // vtable+0x08
+	virtual void DestroyButNotDirectDraw() override; // vtable+0x0c
 
 	BOOL CreateIDirect3D();
 	BOOL D3DSetMode();
+	BOOL FUN_1009b5f0(MxDeviceEnumerate& p_deviceEnumerate, undefined* p_und1, undefined* p_und2);
+
+	inline MxDeviceModeFinder* GetDeviceModeFinder() { return this->m_pDeviceModeFinder; };
+	inline IDirect3D* GetDirect3D() { return this->m_pDirect3d; }
+	inline IDirect3DDevice* GetDirect3DDevice() { return this->m_pDirect3dDevice; }
+
+private:
+	MxDeviceModeFinder* m_pDeviceModeFinder; // 0x880
+	IDirect3D* m_pDirect3d;                  // 0x884
+	IDirect3DDevice* m_pDirect3dDevice;      // 0x888
+	undefined4 m_unk0x88c;                   // 0x88c
+	undefined4 m_unk0x890;                   // 0x890
+};
+
+// SIZE 0x190
+struct MxDeviceEnumerateElement {
+	undefined m_pad[0x190]; // 0x00
+
+	MxBool operator==(MxDeviceEnumerateElement) const { return TRUE; }
+	MxBool operator<(MxDeviceEnumerateElement) const { return TRUE; }
+};
+
+// VTABLE: LEGO1 0x100db814
+// SIZE 0x14
+class MxDeviceEnumerate {
+public:
+	MxDeviceEnumerate();
+
+	virtual MxResult DoEnumerate(); // vtable+0x00
+
+	BOOL FUN_1009c070();
+	const char* EnumerateErrorToString(HRESULT p_error);
+	MxS32 ParseDeviceName(const char* p_deviceId);
+	MxResult FUN_1009d030(MxS32 p_und1, undefined** p_und2, undefined** p_und3);
+	MxResult FUN_1009d0d0();
+	MxResult FUN_1009d210();
 
 	static void BuildErrorString(const char*, ...);
 
-private:
-	MxDeviceModeFinder* m_pDeviceModeFinder; // +0x880
-	IDirect3D* m_pDirect3d;                  // +0x884
-	IDirect3DDevice* m_pDirect3dDevice;
-	undefined4 m_unk0x88c;
-	undefined4 m_unk0x890;
+	list<MxDeviceEnumerateElement> m_list; // 0x04
+	MxBool m_unk0x10;                      // 0x10
 };
 
-BOOL FAR PASCAL EnumerateCallback(GUID FAR*, LPSTR, LPSTR, LPVOID);
+BOOL CALLBACK EnumerateCallback(GUID FAR*, LPSTR, LPSTR, LPVOID);
+
+// VTABLE: LEGO1 0x100d9cc8
+// SIZE 0x14
+class MxDeviceEnumerate100d9cc8 : public MxDeviceEnumerate {};
 
 #endif // MXDIRECT3D_H
diff --git a/LEGO1/mxdirectdraw.h b/LEGO1/mxdirectdraw.h
index 8c51b220..6d3d190b 100644
--- a/LEGO1/mxdirectdraw.h
+++ b/LEGO1/mxdirectdraw.h
@@ -76,8 +76,8 @@ class MxDirectDraw {
 	__declspec(dllexport) int Pause(int);
 
 	MxDirectDraw();
-
 	virtual ~MxDirectDraw();
+
 	virtual BOOL Create(
 		HWND hWnd,
 		BOOL fullscreen_1,
@@ -88,10 +88,15 @@ class MxDirectDraw {
 		int bpp,
 		const PALETTEENTRY* pPaletteEntries,
 		int paletteEntryCount
-	);
-	virtual void Destroy();
-	virtual void DestroyButNotDirectDraw();
-	virtual const char* ErrorToString(HRESULT p_error);
+	);                                                  // vtable+0x04
+	virtual void Destroy();                             // vtable+0x08
+	virtual void DestroyButNotDirectDraw();             // vtable+0x0c
+	virtual const char* ErrorToString(HRESULT p_error); // vtable+0x10
+
+	inline IDirectDraw* GetDirectDraw() { return m_pDirectDraw; }
+	inline IDirectDrawSurface* GetFrontBuffer() { return m_pFrontBuffer; }
+	inline IDirectDrawSurface* GetBackBuffer() { return m_pBackBuffer; }
+	inline IDirectDrawClipper* GetClipper() { return m_pClipper; }
 
 protected:
 	BOOL CacheOriginalPaletteEntries();
diff --git a/LEGO1/mxdirectx/mxstopwatch.h b/LEGO1/mxdirectx/mxstopwatch.h
new file mode 100644
index 00000000..bb37e484
--- /dev/null
+++ b/LEGO1/mxdirectx/mxstopwatch.h
@@ -0,0 +1,179 @@
+#ifndef _MxStopWatch_h
+#define _MxStopWatch_h
+
+#include "assert.h"
+#include "winbase.h"
+
+//////////////////////////////////////////////////////////////////////////////
+//
+// MxStopWatch
+//
+// NOTE:	MxStopWatch measures elapsed (wall clock) time.
+//
+
+class MxStopWatch {
+public:
+	MxStopWatch();
+	~MxStopWatch() {}
+
+	void Start();
+	void Stop();
+	void Reset();
+
+	double ElapsedSeconds() const;
+
+protected:
+	unsigned long TicksPerSeconds() const;
+
+private:
+	LARGE_INTEGER m_startTick;
+	// ??? when we provide LARGE_INTEGER arithmetic, use a
+	//     LARGE_INTEGER m_elapsedTicks rather than m_elapsedSeconds
+	double m_elapsedSeconds;
+	unsigned long m_ticksPerSeconds;
+};
+
+inline MxStopWatch::MxStopWatch()
+{
+	Reset();
+	m_ticksPerSeconds = TicksPerSeconds();
+}
+
+inline void MxStopWatch::Start()
+{
+	QueryPerformanceCounter(&m_startTick);
+}
+
+inline void MxStopWatch::Stop()
+{
+	LARGE_INTEGER endTick;
+	BOOL result;
+
+	result = QueryPerformanceCounter(&endTick);
+	assert(result);
+
+	if (endTick.HighPart != m_startTick.HighPart) {
+		// LARGE_INTEGER arithmetic not yet provided
+		m_elapsedSeconds = HUGE_VAL;
+	}
+	else {
+		m_elapsedSeconds += ((endTick.LowPart - m_startTick.LowPart) / (double) m_ticksPerSeconds);
+	}
+}
+
+inline void MxStopWatch::Reset()
+{
+	m_startTick.LowPart = 0;
+	m_startTick.HighPart = 0;
+	m_elapsedSeconds = 0;
+}
+
+inline unsigned long MxStopWatch::TicksPerSeconds() const
+{
+	LARGE_INTEGER ticksPerSeconds;
+	BOOL result;
+
+	result = QueryPerformanceFrequency(&ticksPerSeconds);
+	assert(result);
+
+	if (ticksPerSeconds.HighPart) {
+		// LARGE_INTEGER arithmetic not yet provided
+
+		// timer is too fast (faster than 32bits/s, i.e. faster than 4GHz)
+		return ULONG_MAX;
+	}
+	else {
+		return ticksPerSeconds.LowPart;
+	}
+}
+
+inline double MxStopWatch::ElapsedSeconds() const
+{
+	return m_elapsedSeconds;
+}
+
+//////////////////////////////////////////////////////////////////////////////
+//
+// MxFrequencyMeter
+//
+
+class MxFrequencyMeter {
+public:
+	MxFrequencyMeter();
+
+	void StartOperation();
+	void EndOperation();
+	double Frequency() const;
+	void Reset();
+
+	unsigned long OperationCount() const;
+	double ElapsedSeconds() const;
+
+	void IncreaseOperationCount(unsigned long);
+
+private:
+	unsigned long m_operationCount;
+	MxStopWatch m_stopWatch;
+};
+
+//////////////////////////////////////////////////////////////////////////////
+//
+// MxFrequencyMeter implementation
+//
+
+inline MxFrequencyMeter::MxFrequencyMeter() : m_operationCount(0)
+{
+}
+
+inline void MxFrequencyMeter::StartOperation()
+{
+	m_stopWatch.Start();
+}
+
+inline void MxFrequencyMeter::EndOperation()
+{
+	m_stopWatch.Stop();
+	m_operationCount++;
+}
+
+inline double MxFrequencyMeter::Frequency() const
+{
+	double elapsedSeconds = m_stopWatch.ElapsedSeconds();
+
+	if (elapsedSeconds > 0) {
+		return m_operationCount / elapsedSeconds;
+	}
+	else {
+		if (m_operationCount) {
+			// operations performed - no time elapsed
+			return HUGE_VAL;
+		}
+		else {
+			// no operations performed - no time elapsed
+			return 0;
+		}
+	}
+}
+
+inline void MxFrequencyMeter::Reset()
+{
+	m_stopWatch.Reset();
+	m_operationCount = 0;
+}
+
+inline unsigned long MxFrequencyMeter::OperationCount() const
+{
+	return m_operationCount;
+}
+
+inline void MxFrequencyMeter::IncreaseOperationCount(unsigned long delta)
+{
+	m_operationCount += delta;
+}
+
+inline double MxFrequencyMeter::ElapsedSeconds() const
+{
+	return m_stopWatch.ElapsedSeconds();
+}
+
+#endif /* _MxStopWatch_h */
diff --git a/LEGO1/mxrendersettings.cpp b/LEGO1/mxrendersettings.cpp
deleted file mode 100644
index 4d4476ec..00000000
--- a/LEGO1/mxrendersettings.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-#include "mxrendersettings.h"
-
-#include "decomp.h"
-
-DECOMP_SIZE_ASSERT(MxRenderSettings, 0x28)
-
-// FUNCTION: LEGO1 0x100ab2d0
-MxU32 MxRenderSettings::CopyFrom(MxRenderSettings& p_dest, const MxRenderSettings& p_src)
-{
-	p_dest.m_unk0x00 = p_src.m_unk0x00;
-	p_dest.m_hwnd = p_src.m_hwnd;
-	p_dest.m_directDraw = p_src.m_directDraw;
-	p_dest.m_ddSurface1 = p_src.m_ddSurface1;
-	p_dest.m_ddSurface2 = p_src.m_ddSurface2;
-	p_dest.m_flags = p_src.m_flags;
-	p_dest.m_unk0x18 = p_src.m_unk0x18;
-	p_dest.m_flags2 = p_src.m_flags2;
-	p_dest.m_direct3d = p_src.m_direct3d;
-	p_dest.m_d3dDevice = p_src.m_d3dDevice;
-	return 1;
-}
diff --git a/LEGO1/mxrendersettings.h b/LEGO1/mxrendersettings.h
deleted file mode 100644
index 14909ade..00000000
--- a/LEGO1/mxrendersettings.h
+++ /dev/null
@@ -1,28 +0,0 @@
-#ifndef MXRENDERSETTINGS_H
-#define MXRENDERSETTINGS_H
-
-#include "decomp.h"
-#include "mxtypes.h"
-
-#include <d3d.h>
-#include <ddraw.h>
-#include <windows.h>
-
-// SIZE 0x28
-struct MxRenderSettings {
-public:
-	static MxU32 CopyFrom(MxRenderSettings& p_dest, const MxRenderSettings& p_src);
-
-	undefined4 m_unk0x00;             // 0x00
-	HWND m_hwnd;                      // 0x04
-	IDirectDraw* m_directDraw;        // 0x08
-	IDirectDrawSurface* m_ddSurface1; // 0x0c
-	IDirectDrawSurface* m_ddSurface2; // 0x10
-	MxU32 m_flags;                    // 0x14
-	undefined4 m_unk0x18;             // 0x18
-	MxU32 m_flags2;                   // 0x1c
-	IDirect3D* m_direct3d;            // 0x20
-	IDirect3DDevice* m_d3dDevice;     // 0x24
-};
-
-#endif // MXRENDERSETTINGS_H
diff --git a/LEGO1/mxstring.h b/LEGO1/mxstring.h
index 13130a70..6d8a9936 100644
--- a/LEGO1/mxstring.h
+++ b/LEGO1/mxstring.h
@@ -4,6 +4,7 @@
 #include "mxcore.h"
 
 // VTABLE: LEGO1 0x100dc110
+// SIZE 0x10
 class MxString : public MxCore {
 public:
 	__declspec(dllexport) MxString(const MxString& p_str);
@@ -22,8 +23,8 @@ class MxString : public MxCore {
 	inline const char* GetData() const { return m_data; }
 
 private:
-	char* m_data;
-	MxU16 m_length;
+	char* m_data;   // 0x08
+	MxU16 m_length; // 0x0c
 };
 
 #endif // MXSTRING_H
diff --git a/LEGO1/mxunknown100d7c88.cpp b/LEGO1/mxunknown100d7c88.cpp
new file mode 100644
index 00000000..04ddbf4f
--- /dev/null
+++ b/LEGO1/mxunknown100d7c88.cpp
@@ -0,0 +1,12 @@
+#include "mxunknown100d7c88.h"
+
+// FUNCTION: LEGO1 0x10044e50
+MxUnknown100d7c88::~MxUnknown100d7c88()
+{
+}
+
+// FUNCTION: LEGO1 0x10044eb0
+MxU32 MxUnknown100d7c88::VTable0x00()
+{
+	return m_unk0x14;
+}
diff --git a/LEGO1/mxunknown100d7c88.h b/LEGO1/mxunknown100d7c88.h
new file mode 100644
index 00000000..eccc6ee4
--- /dev/null
+++ b/LEGO1/mxunknown100d7c88.h
@@ -0,0 +1,19 @@
+#ifndef MXUNKNOWN100D7C88_H
+#define MXUNKNOWN100D7C88_H
+
+#include "decomp.h"
+#include "mxstring.h"
+
+class MxUnknown100d7c88 {
+public:
+	~MxUnknown100d7c88();
+
+	virtual undefined4 VTable0x00(); // vtable+0x00
+									 // More virtual functions
+
+private:
+	MxString m_unk0x04;   // 0x04
+	undefined4 m_unk0x14; // 0x14
+};
+
+#endif // MXUNKNOWN100D7C88_H
diff --git a/LEGO1/mxunknown100d9d00.h b/LEGO1/mxunknown100d9d00.h
new file mode 100644
index 00000000..d5dd456f
--- /dev/null
+++ b/LEGO1/mxunknown100d9d00.h
@@ -0,0 +1,42 @@
+#ifndef MXUNKNOWN100D9D00_H
+#define MXUNKNOWN100D9D00_H
+
+#include "decomp.h"
+#include "mxlist.h"
+#include "mxunknown100d7c88.h"
+
+// VTABLE: LEGO1 0x100d9cd0
+// class MxCollection<MxUnknown100d7c88 *>
+
+// VTABLE: LEGO1 0x100d9ce8
+// class MxList<MxUnknown100d7c88 *>
+
+// VTABLE: LEGO1 0x100d9d00
+// SIZE 0x18
+class MxUnknown100d9d00 : public MxList<MxUnknown100d7c88*> {
+public:
+	MxUnknown100d9d00() { SetDestroy(Destroy); }
+
+	// STUB: LEGO1 0x1007b210
+	virtual MxS8 Compare(MxUnknown100d7c88* p_a, MxUnknown100d7c88* p_b) override { return -1; } // vtable+0x14
+
+	// FUNCTION: LEGO1 0x1007b2e0
+	static void Destroy(MxUnknown100d7c88* p_element) { delete p_element; }
+};
+
+// TEMPLATE: LEGO1 0x1007b300
+// MxCollection<MxUnknown100d7c88 *>::Compare
+
+// TEMPLATE: LEGO1 0x1007b360
+// MxCollection<MxUnknown100d7c88 *>::Destroy
+
+// SYNTHETIC: LEGO1 0x1007b400
+// MxUnknown100d9d00::`scalar deleting destructor'
+
+// SYNTHETIC: LEGO1 0x1007b470
+// MxCollection<MxUnknown100d7c88 *>::`scalar deleting destructor'
+
+// SYNTHETIC: LEGO1 0x1007b4e0
+// MxList<MxUnknown100d7c88 *>::`scalar deleting destructor'
+
+#endif // MXUNKNOWN100D9D00_H
diff --git a/LEGO1/mxunknown100dbdbc.cpp b/LEGO1/mxunknown100dbdbc.cpp
deleted file mode 100644
index 64254f0b..00000000
--- a/LEGO1/mxunknown100dbdbc.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-#include "mxunknown100dbdbc.h"
-
-#include "decomp.h"
-
-DECOMP_SIZE_ASSERT(MxUnknown100dbdbc, 0x14)
-
-// STUB: LEGO1 0x100a6fd0
-MxUnknown100dbdbc::MxUnknown100dbdbc()
-{
-	// TODO
-}
-
-// STUB: LEGO1 0x100a7130
-MxUnknown100dbdbc::~MxUnknown100dbdbc()
-{
-	// TODO
-}
diff --git a/LEGO1/mxunknown100dbdbc.h b/LEGO1/mxunknown100dbdbc.h
deleted file mode 100644
index b5049760..00000000
--- a/LEGO1/mxunknown100dbdbc.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef MXUNKNOWN100DBDBC_H
-#define MXUNKNOWN100DBDBC_H
-
-#include "decomp.h"
-#include "mxtypes.h"
-
-// VTABLE: LEGO1 0x100dbdbc
-// SIZE 0x14
-class MxUnknown100dbdbc {
-public:
-	MxUnknown100dbdbc();
-	virtual ~MxUnknown100dbdbc();
-
-private:
-	undefined m_unk0x4[0x10];
-};
-
-#endif // MXUNKNOWN100DBDBC_H
diff --git a/LEGO1/mxvideomanager.cpp b/LEGO1/mxvideomanager.cpp
index aa2158f0..3ffd8e7a 100644
--- a/LEGO1/mxvideomanager.cpp
+++ b/LEGO1/mxvideomanager.cpp
@@ -28,7 +28,7 @@ MxVideoManager::~MxVideoManager()
 MxResult MxVideoManager::Init()
 {
 	this->m_pDirectDraw = NULL;
-	this->m_pDDSurface = NULL;
+	this->m_pDirect3D = NULL;
 	this->m_displaySurface = NULL;
 	this->m_region = NULL;
 	this->m_videoParam.SetPalette(NULL);
@@ -60,8 +60,8 @@ void MxVideoManager::Destroy(MxBool p_fromDestructor)
 	if (m_unk0x60) {
 		if (m_pDirectDraw)
 			m_pDirectDraw->Release();
-		if (m_pDDSurface)
-			m_pDDSurface->Release();
+		if (m_pDirect3D)
+			m_pDirect3D->Release();
 	}
 
 	Init();
@@ -120,7 +120,7 @@ void MxVideoManager::SortPresenterList()
 MxResult MxVideoManager::VTable0x28(
 	MxVideoParam& p_videoParam,
 	LPDIRECTDRAW p_pDirectDraw,
-	LPDIRECTDRAWSURFACE p_pDDSurface,
+	LPDIRECT3D p_pDirect3D,
 	LPDIRECTDRAWSURFACE p_ddSurface1,
 	LPDIRECTDRAWSURFACE p_ddSurface2,
 	LPDIRECTDRAWCLIPPER p_ddClipper,
@@ -146,7 +146,7 @@ MxResult MxVideoManager::VTable0x28(
 		goto done;
 
 	m_pDirectDraw = p_pDirectDraw;
-	m_pDDSurface = p_pDDSurface;
+	m_pDirect3D = p_pDirect3D;
 
 	MxPalette* palette;
 	if (p_videoParam.GetPalette() == NULL) {
diff --git a/LEGO1/mxvideomanager.h b/LEGO1/mxvideomanager.h
index 8d4d088c..4b458f1b 100644
--- a/LEGO1/mxvideomanager.h
+++ b/LEGO1/mxvideomanager.h
@@ -7,6 +7,8 @@
 #include "mxregion.h"
 #include "mxvideoparam.h"
 
+#include <d3d.h>
+
 // VTABLE: LEGO1 0x100dc810
 // SIZE 0x64
 class MxVideoManager : public MxMediaManager {
@@ -19,7 +21,7 @@ class MxVideoManager : public MxMediaManager {
 	virtual MxResult VTable0x28(
 		MxVideoParam& p_videoParam,
 		LPDIRECTDRAW p_pDirectDraw,
-		LPDIRECTDRAWSURFACE p_pDDSurface,
+		LPDIRECT3D p_pDirect3D,
 		LPDIRECTDRAWSURFACE p_ddSurface1,
 		LPDIRECTDRAWSURFACE p_ddSurface2,
 		LPDIRECTDRAWCLIPPER p_ddClipper,
@@ -45,7 +47,7 @@ class MxVideoManager : public MxMediaManager {
 protected:
 	MxVideoParam m_videoParam;          // 0x2c
 	LPDIRECTDRAW m_pDirectDraw;         // 0x50
-	LPDIRECTDRAWSURFACE m_pDDSurface;   // 0x54
+	LPDIRECT3D m_pDirect3D;             // 0x54
 	MxDisplaySurface* m_displaySurface; // 0x58
 	MxRegion* m_region;                 // 0x5c
 	MxBool m_unk0x60;                   // 0x60
diff --git a/LEGO1/mxvideoparam.h b/LEGO1/mxvideoparam.h
index 977c0b48..33aecb32 100644
--- a/LEGO1/mxvideoparam.h
+++ b/LEGO1/mxvideoparam.h
@@ -23,7 +23,6 @@ class MxVideoParam {
 	);
 	__declspec(dllexport) MxVideoParam& operator=(const MxVideoParam& p_videoParam);
 	__declspec(dllexport) ~MxVideoParam();
-
 	__declspec(dllexport) void SetDeviceName(char* p_deviceId);
 
 	inline MxVideoParamFlags& Flags() { return m_flags; }
@@ -34,6 +33,7 @@ class MxVideoParam {
 	inline MxRect32& GetRect() { return this->m_rect; }
 	inline MxPalette* GetPalette() { return this->m_palette; }
 	inline MxU32 GetBackBuffers() { return this->m_backBuffers; }
+	inline char* GetDeviceName() { return this->m_deviceId; }
 
 private:
 	MxRect32 m_rect;           // 0x00
diff --git a/LEGO1/tglsurface.h b/LEGO1/tglsurface.h
new file mode 100644
index 00000000..bafb2fb3
--- /dev/null
+++ b/LEGO1/tglsurface.h
@@ -0,0 +1,27 @@
+#ifndef TGLSURFACE_H
+#define TGLSURFACE_H
+
+#include "decomp.h"
+#include "mxtypes.h"
+
+#include <d3d.h>
+#include <windows.h>
+
+class TglSurface {
+public:
+	// SIZE 0x28
+	struct CreateStruct {
+		undefined4 m_unk0x00;             // 0x00
+		HWND m_hwnd;                      // 0x04
+		IDirectDraw* m_directDraw;        // 0x08
+		IDirectDrawSurface* m_ddSurface1; // 0x0c
+		IDirectDrawSurface* m_ddSurface2; // 0x10
+		IDirectDrawPalette* m_ddPalette;  // 0x14
+		BOOL m_isFullScreen;              // 0x18
+		MxU32 m_flags;                    // 0x1c
+		IDirect3D* m_direct3d;            // 0x20
+		IDirect3DDevice* m_d3dDevice;     // 0x24
+	};
+};
+
+#endif // TGLSURFACE_H
diff --git a/LEGO1/viewmanager/viewlodlist.cpp b/LEGO1/viewmanager/viewlodlist.cpp
new file mode 100644
index 00000000..50628b18
--- /dev/null
+++ b/LEGO1/viewmanager/viewlodlist.cpp
@@ -0,0 +1,28 @@
+#include "viewlodlist.h"
+
+#include "decomp.h"
+
+DECOMP_SIZE_ASSERT(ViewLODListManager, 0x14);
+
+// FUNCTION: LEGO1 0x100a6fd0
+ViewLODListManager::ViewLODListManager()
+{
+}
+
+// STUB: LEGO1 0x100a7130
+ViewLODListManager::~ViewLODListManager()
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x100a72c0
+ViewLODList* ViewLODListManager::Create(const ROIName&, int lodCount)
+{
+	// TODO
+	return NULL;
+}
+
+// STUB: LEGO1 0x100a7680
+void ViewLODListManager::Destroy(ViewLODList* lodList)
+{
+}
diff --git a/LEGO1/viewmanager/viewlodlist.h b/LEGO1/viewmanager/viewlodlist.h
index 5fa31454..fe86f04e 100644
--- a/LEGO1/viewmanager/viewlodlist.h
+++ b/LEGO1/viewmanager/viewlodlist.h
@@ -1,6 +1,7 @@
 #ifndef VIEWLODLIST_H
 #define VIEWLODLIST_H
 
+#include "../mxstl/stlcompat.h"
 #include "../realtime/lodlist.h"
 #include "assert.h"
 #include "compat.h"
@@ -59,6 +60,8 @@ struct ROINameComparator {
 // It stores ViewLODLists under a name, the name of the ROI where
 // the ViewLODList belongs.
 
+// VTABLE: LEGO1 0x100dbdbc
+// SIZE 0x14
 class ViewLODListManager {
 
 	typedef map<ROIName, ViewLODList*, ROINameComparator> ViewLODListMap;
diff --git a/LEGO1/viewmanager/viewroi.cpp b/LEGO1/viewmanager/viewroi.cpp
index bb5dcaab..523814a2 100644
--- a/LEGO1/viewmanager/viewroi.cpp
+++ b/LEGO1/viewmanager/viewroi.cpp
@@ -4,6 +4,9 @@
 
 DECOMP_SIZE_ASSERT(ViewROI, 0xe0)
 
+// GLOBAL: LEGO1 0x101013d8
+undefined g_unk101013d8 = 0;
+
 // FUNCTION: LEGO1 0x100a9eb0
 float ViewROI::IntrinsicImportance() const
 {
@@ -34,9 +37,10 @@ void ViewROI::UpdateWorldData(const Matrix4Data& parent2world)
 	}
 }
 
-inline ViewROI::~ViewROI()
+// FUNCTION: LEGO1 0x100aa500
+undefined ViewROI::SetUnk101013d8(undefined p_flag)
 {
-	// SetLODList() will decrease refCount of LODList
-	SetLODList(0);
-	delete geometry;
+	undefined oldFlag = g_unk101013d8;
+	g_unk101013d8 = p_flag;
+	return oldFlag;
 }
diff --git a/LEGO1/viewmanager/viewroi.h b/LEGO1/viewmanager/viewroi.h
index e54e6113..fb2e8e54 100644
--- a/LEGO1/viewmanager/viewroi.h
+++ b/LEGO1/viewmanager/viewroi.h
@@ -3,6 +3,7 @@
 
 #include "../realtime/orientableroi.h"
 #include "../tgl/tgl.h"
+#include "decomp.h"
 #include "viewlodlist.h"
 
 /*
@@ -10,6 +11,9 @@
 	etc. Basically, anything which can be placed in a scene and manipilated
 	by the view manager is a ViewROI.
 */
+
+// VTABLE: LEGO1 0x100dbe70
+// SIZE 0xe0
 class ViewROI : public OrientableROI {
 public:
 	inline ViewROI(Tgl::Renderer* pRenderer, ViewLODList* lodList)
@@ -17,7 +21,12 @@ class ViewROI : public OrientableROI {
 		SetLODList(lodList);
 		geometry = pRenderer->CreateGroup();
 	}
-	inline ~ViewROI();
+	inline ~ViewROI()
+	{
+		// SetLODList() will decrease refCount of LODList
+		SetLODList(0);
+		delete geometry;
+	}
 	inline void SetLODList(ViewLODList* lodList)
 	{
 		// ??? inherently type unsafe - kind of... because, now, ROI
@@ -39,6 +48,8 @@ class ViewROI : public OrientableROI {
 	virtual Tgl::Group* GetGeometry();
 	virtual const Tgl::Group* GetGeometry() const;
 
+	static undefined SetUnk101013d8(undefined p_flag);
+
 protected:
 	Tgl::Group* geometry;
 	void UpdateWorldData(const Matrix4Data& parent2world);

From 56af87b22959e48ce2bcaed465889aa871398820 Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Mon, 1 Jan 2024 21:23:47 -0500
Subject: [PATCH 054/210] Implement/match LegoVideoManager::CreateDirect3D

---
 LEGO1/legovideomanager.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/LEGO1/legovideomanager.cpp b/LEGO1/legovideomanager.cpp
index b061faef..8d0a872a 100644
--- a/LEGO1/legovideomanager.cpp
+++ b/LEGO1/legovideomanager.cpp
@@ -44,10 +44,13 @@ LegoVideoManager::~LegoVideoManager()
 	delete m_palette;
 }
 
-// STUB: LEGO1 0x1007abb0
+// FUNCTION: LEGO1 0x1007abb0
 MxResult LegoVideoManager::CreateDirect3D()
 {
-	return SUCCESS;
+	if (!m_direct3d)
+		m_direct3d = new MxDirect3D;
+
+	return m_direct3d ? SUCCESS : FAILURE;
 }
 
 // FUNCTION: LEGO1 0x1007ac40

From 3f2fac72e41e1c962177646fca8eb44347e39dcd Mon Sep 17 00:00:00 2001
From: Joshua Peisach <itzswirlz2020@outlook.com>
Date: Mon, 1 Jan 2024 22:30:50 -0500
Subject: [PATCH 055/210] Hospital ctor (#392)

* Hospital ctor

* Remove padding

---------

Co-authored-by: Christian Semmler <mail@csemmler.com>
---
 LEGO1/hospital.cpp | 21 +++++++++++++++++++--
 LEGO1/hospital.h   | 16 ++++++++++++++++
 2 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/LEGO1/hospital.cpp b/LEGO1/hospital.cpp
index 3d8ff578..e8de5495 100644
--- a/LEGO1/hospital.cpp
+++ b/LEGO1/hospital.cpp
@@ -1,9 +1,26 @@
 #include "hospital.h"
 
-// STUB: LEGO1 0x100745e0
+#include "mxnotificationmanager.h"
+#include "mxomni.h"
+
+DECOMP_SIZE_ASSERT(Hospital, 0x12c)
+
+// FUNCTION: LEGO1 0x100745e0
 Hospital::Hospital()
 {
-	// TODO
+	this->m_unk0xf8 = 0;
+	this->m_unk0x100 = 0;
+	this->m_unk0x104 = 0;
+	this->m_unk0x108 = 0;
+	this->m_unk0xfc = 0;
+	this->m_unk0x10c = 0;
+	this->m_unk0x110 = 0;
+	this->m_unk0x114 = 0;
+	this->m_unk0x118 = 0;
+	this->m_unk0x11c = 0;
+	this->m_unk0x120 = 0;
+	this->m_unk0x128 = 0;
+	NotificationManager()->Register(this);
 }
 
 // STUB: LEGO1 0x100747f0
diff --git a/LEGO1/hospital.h b/LEGO1/hospital.h
index 627dc4cc..29ff1177 100644
--- a/LEGO1/hospital.h
+++ b/LEGO1/hospital.h
@@ -1,6 +1,7 @@
 #ifndef HOSPITAL_H
 #define HOSPITAL_H
 
+#include "decomp.h"
 #include "legoworld.h"
 
 // VTABLE: LEGO1 0x100d9730
@@ -24,6 +25,21 @@ class Hospital : public LegoWorld {
 	{
 		return !strcmp(p_name, Hospital::ClassName()) || LegoWorld::IsA(p_name);
 	}
+
+private:
+	undefined2 m_unk0xf8;    // 0xf8
+	undefined4 m_unk0xfc;    // 0xfc
+	undefined2 m_unk0x100;   // 0x100
+	undefined4 m_unk0x104;   // 0x104 - VTable0x18 suggests this may be pointer to a LegoGameState
+	undefined2 m_unk0x108;   // 0x108
+	undefined4 m_unk0x10c;   // 0x10c
+	undefined4 m_unk0x110;   // 0x110
+	undefined4 m_unk0x114;   // 0x114
+	undefined m_unk0x118;    // 0x118
+	undefined4 m_unk0x11c;   // 0x11c
+	undefined4 m_unk0x120;   // 0x120
+	undefined m_unk0x124[4]; // 0x124
+	undefined m_unk0x128;    // 0x128
 };
 
 #endif // HOSPITAL_H

From afe537b99efd37cc998a1f32fbae54d41094f02f Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Tue, 2 Jan 2024 13:32:01 -0500
Subject: [PATCH 056/210] Name some MxDSChunk flags (#394)

---
 LEGO1/mxdsbuffer.cpp            |  9 ++++-----
 LEGO1/mxdschunk.cpp             |  3 +--
 LEGO1/mxdschunk.h               |  6 ++----
 LEGO1/mxdssubscriber.cpp        |  2 +-
 LEGO1/mxloopingflcpresenter.cpp |  2 +-
 LEGO1/mxloopingsmkpresenter.cpp |  2 +-
 LEGO1/mxmediapresenter.cpp      |  2 +-
 LEGO1/mxstreamchunk.cpp         | 14 +++++++-------
 LEGO1/mxstreamchunk.h           |  6 +++---
 LEGO1/mxvideopresenter.cpp      |  2 +-
 LEGO1/mxwavepresenter.cpp       |  2 +-
 11 files changed, 23 insertions(+), 27 deletions(-)

diff --git a/LEGO1/mxdsbuffer.cpp b/LEGO1/mxdsbuffer.cpp
index da643c17..5e4b277d 100644
--- a/LEGO1/mxdsbuffer.cpp
+++ b/LEGO1/mxdsbuffer.cpp
@@ -298,18 +298,17 @@ MxResult MxDSBuffer::ParseChunk(
 
 	p_header->SetTime(p_header->GetTime() + m_unk0x30->GetUnknowna8());
 
-	if (p_header->GetFlags() & MxDSChunk::Flag_Bit5) {
+	if (p_header->GetFlags() & MxDSChunk::Flag_Split) {
 		MxU32 length = p_header->GetLength() + MxDSChunk::ReturnE() + 8;
 		MxDSBuffer* buffer = new MxDSBuffer();
 
 		if (buffer && buffer->AllocateBuffer(length, MxDSBufferType_Allocate) == SUCCESS &&
 			buffer->CalcBytesRemaining((MxU8*) p_data) == SUCCESS) {
 			*p_streamingAction = new MxDSStreamingAction((MxDSStreamingAction&) *p_action);
-			;
 
 			if (*p_streamingAction) {
 				MxU16* flags = MxStreamChunk::IntoFlags(buffer->GetBuffer());
-				*flags = p_header->GetFlags() & ~MxDSChunk::Flag_Bit5;
+				*flags = p_header->GetFlags() & ~MxDSChunk::Flag_Split;
 
 				delete p_header;
 				(*p_streamingAction)->SetUnknowna0(buffer);
@@ -324,7 +323,7 @@ MxResult MxDSBuffer::ParseChunk(
 		return FAILURE;
 	}
 	else {
-		if (p_header->GetFlags() & MxDSChunk::Flag_Bit2) {
+		if (p_header->GetFlags() & MxDSChunk::Flag_End) {
 			if (m_unk0x30->HasId(p_header->GetObjectId())) {
 				if (m_unk0x30->GetFlags() & MxDSAction::Flag_Bit3 &&
 					(m_unk0x30->GetLoopCount() > 1 || m_unk0x30->GetDuration() == -1)) {
@@ -474,7 +473,7 @@ MxResult MxDSBuffer::CalcBytesRemaining(MxU8* p_data)
 			memcpy(m_pBuffer + m_writeOffset - m_bytesRemaining, ptr, bytesRead);
 
 			if (m_writeOffset == m_bytesRemaining)
-				*(MxU32*) (m_pBuffer + 4) = *MxStreamChunk::IntoPlus0x12(m_pBuffer) + MxStreamChunk::ReturnE();
+				*(MxU32*) (m_pBuffer + 4) = *MxStreamChunk::IntoLength(m_pBuffer) + MxStreamChunk::ReturnE();
 
 			m_bytesRemaining -= bytesRead;
 			result = SUCCESS;
diff --git a/LEGO1/mxdschunk.cpp b/LEGO1/mxdschunk.cpp
index bf7e08a6..bee247d2 100644
--- a/LEGO1/mxdschunk.cpp
+++ b/LEGO1/mxdschunk.cpp
@@ -15,9 +15,8 @@ MxDSChunk::MxDSChunk()
 // FUNCTION: LEGO1 0x100be170
 MxDSChunk::~MxDSChunk()
 {
-	if (m_flags & Flag_Bit1) {
+	if (m_flags & Flag_Bit1)
 		delete[] m_data;
-	}
 }
 
 // FUNCTION: LEGO1 0x100be1e0
diff --git a/LEGO1/mxdschunk.h b/LEGO1/mxdschunk.h
index 9f2ac9b6..83693bc0 100644
--- a/LEGO1/mxdschunk.h
+++ b/LEGO1/mxdschunk.h
@@ -11,11 +11,9 @@ class MxDSChunk : public MxCore {
 public:
 	enum {
 		Flag_Bit1 = 0x01,
-		Flag_Bit2 = 0x02,
+		Flag_End = 0x02,
 		Flag_Bit3 = 0x04,
-		Flag_Bit4 = 0x08,
-		Flag_Bit5 = 0x10,
-		Flag_Bit8 = 0x80,
+		Flag_Split = 0x10,
 		Flag_Bit16 = 0x8000
 	};
 
diff --git a/LEGO1/mxdssubscriber.cpp b/LEGO1/mxdssubscriber.cpp
index 33ee11fc..f50d34a1 100644
--- a/LEGO1/mxdssubscriber.cpp
+++ b/LEGO1/mxdssubscriber.cpp
@@ -119,7 +119,7 @@ void MxDSSubscriber::FUN_100b8390(MxStreamChunk* p_chunk)
 			if (p_chunk)
 				delete p_chunk;
 		}
-		else if ((p_chunk->GetFlags() & MxStreamChunk::Flag_Bit1) != 0 && p_chunk)
+		else if (p_chunk->GetFlags() & MxDSChunk::Flag_Bit1 && p_chunk)
 			delete p_chunk;
 	}
 }
diff --git a/LEGO1/mxloopingflcpresenter.cpp b/LEGO1/mxloopingflcpresenter.cpp
index 03b14a5a..152bd385 100644
--- a/LEGO1/mxloopingflcpresenter.cpp
+++ b/LEGO1/mxloopingflcpresenter.cpp
@@ -40,7 +40,7 @@ void MxLoopingFlcPresenter::NextFrame()
 {
 	MxStreamChunk* chunk = NextChunk();
 
-	if (chunk->GetFlags() & MxStreamChunk::Flag_Bit2) {
+	if (chunk->GetFlags() & MxDSChunk::Flag_End) {
 		m_previousTickleStates |= 1 << (unsigned char) m_currentTickleState;
 		m_currentTickleState = TickleState_Repeating;
 	}
diff --git a/LEGO1/mxloopingsmkpresenter.cpp b/LEGO1/mxloopingsmkpresenter.cpp
index b000c835..11ab8388 100644
--- a/LEGO1/mxloopingsmkpresenter.cpp
+++ b/LEGO1/mxloopingsmkpresenter.cpp
@@ -51,7 +51,7 @@ void MxLoopingSmkPresenter::NextFrame()
 {
 	MxStreamChunk* chunk = NextChunk();
 
-	if (chunk->GetFlags() & MxStreamChunk::Flag_Bit2) {
+	if (chunk->GetFlags() & MxDSChunk::Flag_End) {
 		m_previousTickleStates |= 1 << (unsigned char) m_currentTickleState;
 		m_currentTickleState = TickleState_Repeating;
 	}
diff --git a/LEGO1/mxmediapresenter.cpp b/LEGO1/mxmediapresenter.cpp
index b3eb2274..ca5eb7d7 100644
--- a/LEGO1/mxmediapresenter.cpp
+++ b/LEGO1/mxmediapresenter.cpp
@@ -185,7 +185,7 @@ void MxMediaPresenter::StreamingTickle()
 		m_currentChunk = NextChunk();
 
 		if (m_currentChunk) {
-			if (m_currentChunk->GetFlags() & MxDSChunk::Flag_Bit2) {
+			if (m_currentChunk->GetFlags() & MxDSChunk::Flag_End) {
 				m_subscriber->FUN_100b8390(m_currentChunk);
 				m_currentChunk = NULL;
 				m_previousTickleStates |= 1 << (unsigned char) m_currentTickleState;
diff --git a/LEGO1/mxstreamchunk.cpp b/LEGO1/mxstreamchunk.cpp
index 8dd9ed67..57945957 100644
--- a/LEGO1/mxstreamchunk.cpp
+++ b/LEGO1/mxstreamchunk.cpp
@@ -54,7 +54,7 @@ MxResult MxStreamChunk::SendChunk(MxStreamListMxDSSubscriber& p_subscriberList,
 {
 	for (MxStreamListMxDSSubscriber::iterator it = p_subscriberList.begin(); it != p_subscriberList.end(); it++) {
 		if ((*it)->GetObjectId() == m_objectId && (*it)->GetUnknown48() == p_obj24val) {
-			if (m_flags & MxDSChunk::Flag_Bit2 && m_buffer) {
+			if (m_flags & MxDSChunk::Flag_End && m_buffer) {
 				m_buffer->ReleaseRef(this);
 				m_buffer = NULL;
 			}
@@ -77,23 +77,23 @@ void MxStreamChunk::SetBuffer(MxDSBuffer* p_buffer)
 // FUNCTION: LEGO1 0x100c3180
 MxU16* MxStreamChunk::IntoFlags(MxU8* p_buffer)
 {
-	return (MxU16*) (p_buffer + 8);
+	return (MxU16*) (p_buffer + 0x08);
 }
 
 // FUNCTION: LEGO1 0x100c3190
-MxU32* MxStreamChunk::IntoPlus0xa(MxU8* p_buffer)
+MxU32* MxStreamChunk::IntoObjectId(MxU8* p_buffer)
 {
-	return (MxU32*) (p_buffer + 0xa);
+	return (MxU32*) (p_buffer + 0x0a);
 }
 
 // FUNCTION: LEGO1 0x100c31a0
-MxU32* MxStreamChunk::IntoPlus0xe(MxU8* p_buffer)
+MxLong* MxStreamChunk::IntoTime(MxU8* p_buffer)
 {
-	return (MxU32*) (p_buffer + 0xe);
+	return (MxLong*) (p_buffer + 0x0e);
 }
 
 // FUNCTION: LEGO1 0x100c31b0
-MxU32* MxStreamChunk::IntoPlus0x12(MxU8* p_buffer)
+MxU32* MxStreamChunk::IntoLength(MxU8* p_buffer)
 {
 	return (MxU32*) (p_buffer + 0x12);
 }
diff --git a/LEGO1/mxstreamchunk.h b/LEGO1/mxstreamchunk.h
index 5b258603..5b9ecb64 100644
--- a/LEGO1/mxstreamchunk.h
+++ b/LEGO1/mxstreamchunk.h
@@ -35,9 +35,9 @@ class MxStreamChunk : public MxDSChunk {
 	void SetBuffer(MxDSBuffer* p_buffer);
 
 	static MxU16* IntoFlags(MxU8* p_buffer);
-	static MxU32* IntoPlus0x12(MxU8* p_buffer);
-	static MxU32* IntoPlus0xa(MxU8* p_buffer);
-	static MxU32* IntoPlus0xe(MxU8* p_buffer);
+	static MxU32* IntoObjectId(MxU8* p_buffer);
+	static MxLong* IntoTime(MxU8* p_buffer);
+	static MxU32* IntoLength(MxU8* p_buffer);
 
 private:
 	MxDSBuffer* m_buffer; // 0x1c
diff --git a/LEGO1/mxvideopresenter.cpp b/LEGO1/mxvideopresenter.cpp
index 0e4f3d5b..5d507409 100644
--- a/LEGO1/mxvideopresenter.cpp
+++ b/LEGO1/mxvideopresenter.cpp
@@ -240,7 +240,7 @@ void MxVideoPresenter::NextFrame()
 {
 	MxStreamChunk* chunk = NextChunk();
 
-	if (chunk->GetFlags() & MxStreamChunk::Flag_Bit2) {
+	if (chunk->GetFlags() & MxDSChunk::Flag_End) {
 		m_subscriber->FUN_100b8390(chunk);
 		m_previousTickleStates |= 1 << (unsigned char) m_currentTickleState;
 		m_currentTickleState = TickleState_Repeating;
diff --git a/LEGO1/mxwavepresenter.cpp b/LEGO1/mxwavepresenter.cpp
index 80096f73..6d08a899 100644
--- a/LEGO1/mxwavepresenter.cpp
+++ b/LEGO1/mxwavepresenter.cpp
@@ -201,7 +201,7 @@ void MxWavePresenter::StreamingTickle()
 		if (!(m_action->GetFlags() & MxDSAction::Flag_Looping)) {
 			MxStreamChunk* chunk = FUN_100b5650();
 
-			if (chunk && chunk->GetFlags() & MxDSChunk::Flag_Bit2 && !(chunk->GetFlags() & MxDSChunk::Flag_Bit16)) {
+			if (chunk && chunk->GetFlags() & MxDSChunk::Flag_End && !(chunk->GetFlags() & MxDSChunk::Flag_Bit16)) {
 				chunk->SetFlags(chunk->GetFlags() | MxDSChunk::Flag_Bit16);
 
 				m_currentChunk = new MxStreamChunk;

From 7d4e94abd6d9c7339142363b2239b20ff4e1aa9a Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Tue, 2 Jan 2024 14:57:30 -0500
Subject: [PATCH 057/210] Match EnumerateCallback

---
 LEGO1/mxdirect3d.cpp | 10 +++++-----
 LEGO1/mxdirect3d.h   |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/LEGO1/mxdirect3d.cpp b/LEGO1/mxdirect3d.cpp
index 619dbcb6..0ee2c501 100644
--- a/LEGO1/mxdirect3d.cpp
+++ b/LEGO1/mxdirect3d.cpp
@@ -151,7 +151,7 @@ MxDeviceEnumerate::MxDeviceEnumerate()
 }
 
 // STUB: LEGO1 0x1009c070
-BOOL MxDeviceEnumerate::FUN_1009c070()
+BOOL MxDeviceEnumerate::EnumDirectDrawCallback(GUID FAR* p_guid, LPSTR p_driverName, LPSTR p_driverDesc)
 {
 	// TODO
 	// HRESULT ret = DirectDrawCreate();
@@ -192,11 +192,11 @@ MxResult MxDeviceEnumerate::DoEnumerate()
 	return SUCCESS;
 }
 
-// STUB: LEGO1 0x1009c710
-BOOL CALLBACK EnumerateCallback(GUID FAR*, LPSTR, LPSTR, LPVOID)
+// FUNCTION: LEGO1 0x1009c710
+BOOL CALLBACK EnumerateCallback(GUID FAR* p_guid, LPSTR p_driverName, LPSTR p_driverDesc, LPVOID p_context)
 {
-	// TODO
-	return FALSE;
+	MxDeviceEnumerate* deviceEnumerate = (MxDeviceEnumerate*) p_context;
+	return deviceEnumerate->EnumDirectDrawCallback(p_guid, p_driverName, p_driverDesc);
 }
 
 // STUB: LEGO1 0x1009c730
diff --git a/LEGO1/mxdirect3d.h b/LEGO1/mxdirect3d.h
index d22b3873..67cf1420 100644
--- a/LEGO1/mxdirect3d.h
+++ b/LEGO1/mxdirect3d.h
@@ -73,7 +73,7 @@ class MxDeviceEnumerate {
 
 	virtual MxResult DoEnumerate(); // vtable+0x00
 
-	BOOL FUN_1009c070();
+	BOOL EnumDirectDrawCallback(GUID FAR* p_guid, LPSTR p_driverName, LPSTR p_driverDesc);
 	const char* EnumerateErrorToString(HRESULT p_error);
 	MxS32 ParseDeviceName(const char* p_deviceId);
 	MxResult FUN_1009d030(MxS32 p_und1, undefined** p_und2, undefined** p_und3);

From af2b223d30f9c78626144375fcd24644b6230166 Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Tue, 2 Jan 2024 15:45:53 -0500
Subject: [PATCH 058/210] Fix naming

---
 .github/workflows/naming.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/naming.yml b/.github/workflows/naming.yml
index f0d72616..c870d7dd 100644
--- a/.github/workflows/naming.yml
+++ b/.github/workflows/naming.yml
@@ -24,6 +24,6 @@ jobs:
           --clang-lib ${{ env.LLVM_PATH }}/lib/libclang.so \
           --style tools/ncc/ncc.style \
           --skip tools/ncc/skip.yml \
-          --definition WINAPI FAR CALLBACK HWND__=HWND \
+          --definition WINAPI FAR BOOL CALLBACK HWND__=HWND \
           --include util \
           --path LEGO1

From 31a5562034fd2cd986fed564c699d7bb53858da9 Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Wed, 3 Jan 2024 11:35:55 -0500
Subject: [PATCH 059/210] Implement/match
 MxDeviceEnumerate::EnumDirectDrawCallback (#395)

* Implement/match MxDeviceEnumerate::EnumDirectDrawCallback

* Change type

* Annotate copy ctor

* Fix type
---
 LEGO1/mxdirect3d.cpp | 140 +++++++++++++++++++++++++++++++++++++++----
 LEGO1/mxdirect3d.h   |  63 ++++++++++++++++++-
 2 files changed, 188 insertions(+), 15 deletions(-)

diff --git a/LEGO1/mxdirect3d.cpp b/LEGO1/mxdirect3d.cpp
index 0ee2c501..0c621503 100644
--- a/LEGO1/mxdirect3d.cpp
+++ b/LEGO1/mxdirect3d.cpp
@@ -4,6 +4,8 @@
 
 DECOMP_SIZE_ASSERT(MxDeviceModeFinder, 0xe4);
 DECOMP_SIZE_ASSERT(MxDirect3D, 0x894);
+DECOMP_SIZE_ASSERT(MxDeviceEnumerate0x178Element, 0x1a4);
+DECOMP_SIZE_ASSERT(MxDeviceEnumerate0x184Element, 0x0c);
 DECOMP_SIZE_ASSERT(MxDeviceEnumerateElement, 0x190);
 DECOMP_SIZE_ASSERT(MxDeviceEnumerate, 0x14);
 
@@ -144,23 +146,118 @@ MxDeviceModeFinder::~MxDeviceModeFinder()
 	}
 }
 
+// FUNCTION: LEGO1 0x1009ba80
+MxDeviceEnumerateElement::MxDeviceEnumerateElement(LPGUID p_guid, LPSTR p_driverDesc, LPSTR p_driverName)
+{
+	m_guid = NULL;
+	m_driverDesc = NULL;
+	m_driverName = NULL;
+	memset(&m_ddCaps, 0, sizeof(m_ddCaps));
+
+	Init(p_guid, p_driverDesc, p_driverName);
+}
+
+// FUNCTION: LEGO1 0x1009bb80
+MxDeviceEnumerateElement::~MxDeviceEnumerateElement()
+{
+	if (m_guid)
+		delete m_guid;
+
+	if (m_driverDesc)
+		delete[] m_driverDesc;
+
+	if (m_driverName)
+		delete[] m_driverName;
+}
+
+// FUNCTION: LEGO1 0x1009bc30
+void MxDeviceEnumerateElement::Init(LPGUID p_guid, LPSTR p_driverDesc, LPSTR p_driverName)
+{
+	if (m_driverDesc) {
+		delete[] m_driverDesc;
+		m_driverDesc = NULL;
+	}
+
+	if (m_driverName) {
+		delete[] m_driverName;
+		m_driverName = NULL;
+	}
+
+	if (p_guid) {
+		m_guid = new GUID;
+		memcpy(m_guid, p_guid, sizeof(*m_guid));
+	}
+
+	if (p_driverDesc) {
+		m_driverDesc = new char[strlen(p_driverDesc) + 1];
+		strcpy(m_driverDesc, p_driverDesc);
+	}
+
+	if (p_driverName) {
+		m_driverName = new char[strlen(p_driverName) + 1];
+		strcpy(m_driverName, p_driverName);
+	}
+}
+
 // FUNCTION: LEGO1 0x1009bec0
 MxDeviceEnumerate::MxDeviceEnumerate()
 {
 	m_unk0x10 = FALSE;
 }
 
-// STUB: LEGO1 0x1009c070
-BOOL MxDeviceEnumerate::EnumDirectDrawCallback(GUID FAR* p_guid, LPSTR p_driverName, LPSTR p_driverDesc)
+// FUNCTION: LEGO1 0x1009c070
+BOOL MxDeviceEnumerate::EnumDirectDrawCallback(LPGUID p_guid, LPSTR p_driverDesc, LPSTR p_driverName)
 {
-	// TODO
-	// HRESULT ret = DirectDrawCreate();
-	HRESULT ret = 0;
-	if (ret) {
-		BuildErrorString("GetCaps failed: %s\n", EnumerateErrorToString(ret));
+	MxDeviceEnumerateElement device(p_guid, p_driverDesc, p_driverName);
+	m_list.push_back(device);
+
+	// Must be zeroed because held resources are copied by pointer only
+	// and should not be freed at the end of this function
+	device.m_guid = NULL;
+	device.m_driverDesc = NULL;
+	device.m_driverName = NULL;
+	memset(&device.m_ddCaps, 0, sizeof(device.m_ddCaps));
+
+	LPDIRECTDRAW lpDD = NULL;
+	LPDIRECT3D2 lpDirect3d2 = NULL;
+	MxDeviceEnumerateElement& newDevice = m_list.back();
+	HRESULT result = DirectDrawCreate(newDevice.m_guid, &lpDD, NULL);
+
+	if (result != DD_OK)
+		BuildErrorString("DirectDraw Create failed: %s\n", EnumerateErrorToString(result));
+	else {
+		lpDD->EnumDisplayModes(0, NULL, this, DisplayModesEnumerateCallback);
+		newDevice.m_ddCaps.dwSize = sizeof(newDevice.m_ddCaps);
+		result = lpDD->GetCaps(&newDevice.m_ddCaps, NULL);
+
+		if (result != DD_OK)
+			BuildErrorString("GetCaps failed: %s\n", EnumerateErrorToString(result));
+		else {
+			result = lpDD->QueryInterface(IID_IDirect3D2, (LPVOID*) &lpDirect3d2);
+
+			if (result != DD_OK)
+				BuildErrorString("D3D creation failed: %s\n", EnumerateErrorToString(result));
+			else {
+				result = lpDirect3d2->EnumDevices(DevicesEnumerateCallback, this);
+
+				if (result != DD_OK)
+					BuildErrorString("D3D enum devices failed: %s\n", EnumerateErrorToString(result));
+				else {
+					if (newDevice.m_unk0x178.empty()) {
+						m_list.pop_back();
+					}
+				}
+			}
+		}
 	}
-	// IDirect3D2_EnumDevices
-	return TRUE;
+
+	if (lpDirect3d2)
+		lpDirect3d2->Release();
+
+	if (lpDD)
+		lpDD->Release();
+
+	return DDENUMRET_OK;
 }
 
 // FUNCTION: LEGO1 0x1009c4c0
@@ -176,13 +273,32 @@ void MxDeviceEnumerate::BuildErrorString(const char* p_format, ...)
 	OutputDebugString(buf);
 }
 
+// STUB: LEGO1 0x1009c4f0
+HRESULT CALLBACK DisplayModesEnumerateCallback(LPDDSURFACEDESC, LPVOID)
+{
+	return TRUE;
+}
+
+// STUB: LEGO1 0x1009c510
+HRESULT CALLBACK DevicesEnumerateCallback(
+	LPGUID p_lpGuid,
+	LPSTR p_lpDeviceDescription,
+	LPSTR p_lpDeviceName,
+	LPD3DDEVICEDESC p_pHWDesc,
+	LPD3DDEVICEDESC p_pHELDesc,
+	LPVOID p_context
+)
+{
+	return TRUE;
+}
+
 // FUNCTION: LEGO1 0x1009c6c0
 MxResult MxDeviceEnumerate::DoEnumerate()
 {
 	if (m_unk0x10)
 		return FAILURE;
 
-	HRESULT ret = DirectDrawEnumerate(EnumerateCallback, this);
+	HRESULT ret = DirectDrawEnumerate(DirectDrawEnumerateCallback, this);
 	if (ret) {
 		BuildErrorString("DirectDrawEnumerate returned error %s\n", EnumerateErrorToString(ret));
 		return FAILURE;
@@ -193,10 +309,10 @@ MxResult MxDeviceEnumerate::DoEnumerate()
 }
 
 // FUNCTION: LEGO1 0x1009c710
-BOOL CALLBACK EnumerateCallback(GUID FAR* p_guid, LPSTR p_driverName, LPSTR p_driverDesc, LPVOID p_context)
+BOOL CALLBACK DirectDrawEnumerateCallback(LPGUID p_guid, LPSTR p_driverDesc, LPSTR p_driverName, LPVOID p_context)
 {
 	MxDeviceEnumerate* deviceEnumerate = (MxDeviceEnumerate*) p_context;
-	return deviceEnumerate->EnumDirectDrawCallback(p_guid, p_driverName, p_driverDesc);
+	return deviceEnumerate->EnumDirectDrawCallback(p_guid, p_driverDesc, p_driverName);
 }
 
 // STUB: LEGO1 0x1009c730
diff --git a/LEGO1/mxdirect3d.h b/LEGO1/mxdirect3d.h
index 67cf1420..963efc8f 100644
--- a/LEGO1/mxdirect3d.h
+++ b/LEGO1/mxdirect3d.h
@@ -57,14 +57,61 @@ class MxDirect3D : public MxDirectDraw {
 	undefined4 m_unk0x890;                   // 0x890
 };
 
+// SIZE 0x1a4
+struct MxDeviceEnumerate0x178Element {
+	undefined m_unk0x00[0x1a4]; // 0x00
+
+	MxBool operator==(MxDeviceEnumerate0x178Element) const { return TRUE; }
+	MxBool operator<(MxDeviceEnumerate0x178Element) const { return TRUE; }
+};
+
+// SIZE 0x0c
+struct MxDeviceEnumerate0x184Element {
+	undefined m_unk0x00[0x0c]; // 0x00
+
+	MxBool operator==(MxDeviceEnumerate0x184Element) const { return TRUE; }
+	MxBool operator<(MxDeviceEnumerate0x184Element) const { return TRUE; }
+};
+
 // SIZE 0x190
 struct MxDeviceEnumerateElement {
-	undefined m_pad[0x190]; // 0x00
+	MxDeviceEnumerateElement() {}
+	~MxDeviceEnumerateElement();
+	MxDeviceEnumerateElement(LPGUID p_guid, LPSTR p_driverDesc, LPSTR p_driverName);
+
+	void Init(LPGUID p_guid, LPSTR p_driverDesc, LPSTR p_driverName);
+
+	LPGUID m_guid;                                  // 0x00
+	char* m_driverDesc;                             // 0x04
+	char* m_driverName;                             // 0x08
+	DDCAPS m_ddCaps;                                // 0x0c
+	list<MxDeviceEnumerate0x178Element> m_unk0x178; // 0x178
+	list<MxDeviceEnumerate0x184Element> m_unk0x184; // 0x184
 
 	MxBool operator==(MxDeviceEnumerateElement) const { return TRUE; }
 	MxBool operator<(MxDeviceEnumerateElement) const { return TRUE; }
 };
 
+// clang-format off
+// TEMPLATE: LEGO1 0x1009b900
+// list<MxDeviceEnumerate0x184Element,allocator<MxDeviceEnumerate0x184Element> >::~list<MxDeviceEnumerate0x184Element,allocator<MxDeviceEnumerate0x184Element> >
+// clang-format on
+
+// clang-format off
+// TEMPLATE: LEGO1 0x1009b970
+// list<MxDeviceEnumerate0x178Element,allocator<MxDeviceEnumerate0x178Element> >::~list<MxDeviceEnumerate0x178Element,allocator<MxDeviceEnumerate0x178Element> >
+// clang-format on
+
+// TEMPLATE: LEGO1 0x1009b9e0
+// List<MxDeviceEnumerate0x184Element>::~List<MxDeviceEnumerate0x184Element>
+
+// TEMPLATE: LEGO1 0x1009ba30
+// List<MxDeviceEnumerate0x178Element>::~List<MxDeviceEnumerate0x178Element>
+
+// Compiler-generated copy ctor
+// SYNTHETIC: LEGO1 0x1009c290
+// MxDeviceEnumerateElement::MxDeviceEnumerateElement
+
 // VTABLE: LEGO1 0x100db814
 // SIZE 0x14
 class MxDeviceEnumerate {
@@ -73,7 +120,7 @@ class MxDeviceEnumerate {
 
 	virtual MxResult DoEnumerate(); // vtable+0x00
 
-	BOOL EnumDirectDrawCallback(GUID FAR* p_guid, LPSTR p_driverName, LPSTR p_driverDesc);
+	BOOL EnumDirectDrawCallback(LPGUID p_guid, LPSTR p_driverDesc, LPSTR p_driverName);
 	const char* EnumerateErrorToString(HRESULT p_error);
 	MxS32 ParseDeviceName(const char* p_deviceId);
 	MxResult FUN_1009d030(MxS32 p_und1, undefined** p_und2, undefined** p_und3);
@@ -82,11 +129,21 @@ class MxDeviceEnumerate {
 
 	static void BuildErrorString(const char*, ...);
 
+private:
 	list<MxDeviceEnumerateElement> m_list; // 0x04
 	MxBool m_unk0x10;                      // 0x10
 };
 
-BOOL CALLBACK EnumerateCallback(GUID FAR*, LPSTR, LPSTR, LPVOID);
+BOOL CALLBACK DirectDrawEnumerateCallback(LPGUID p_guid, LPSTR p_driverDesc, LPSTR p_driverName, LPVOID p_context);
+HRESULT CALLBACK DisplayModesEnumerateCallback(LPDDSURFACEDESC, LPVOID);
+HRESULT CALLBACK DevicesEnumerateCallback(
+	LPGUID p_lpGuid,
+	LPSTR p_lpDeviceDescription,
+	LPSTR p_lpDeviceName,
+	LPD3DDEVICEDESC p_pHWDesc,
+	LPD3DDEVICEDESC p_pHELDesc,
+	LPVOID p_context
+);
 
 // VTABLE: LEGO1 0x100d9cc8
 // SIZE 0x14

From 106dd7cebcc6d94387f4e7125ac14abfa0cbaa02 Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Wed, 3 Jan 2024 12:12:17 -0500
Subject: [PATCH 060/210] Implement/match display mode enumeration (#396)

* Implement/match display mode enumeration

* Improve match of EnumDirectDrawCallback

* Fix annotations
---
 LEGO1/mxdirect3d.cpp | 28 +++++++++++++++++++++-------
 LEGO1/mxdirect3d.h   | 43 +++++++++++++++++++++++--------------------
 2 files changed, 44 insertions(+), 27 deletions(-)

diff --git a/LEGO1/mxdirect3d.cpp b/LEGO1/mxdirect3d.cpp
index 0c621503..eb81b419 100644
--- a/LEGO1/mxdirect3d.cpp
+++ b/LEGO1/mxdirect3d.cpp
@@ -5,7 +5,7 @@
 DECOMP_SIZE_ASSERT(MxDeviceModeFinder, 0xe4);
 DECOMP_SIZE_ASSERT(MxDirect3D, 0x894);
 DECOMP_SIZE_ASSERT(MxDeviceEnumerate0x178Element, 0x1a4);
-DECOMP_SIZE_ASSERT(MxDeviceEnumerate0x184Element, 0x0c);
+DECOMP_SIZE_ASSERT(MxDeviceDisplayMode, 0x0c);
 DECOMP_SIZE_ASSERT(MxDeviceEnumerateElement, 0x190);
 DECOMP_SIZE_ASSERT(MxDeviceEnumerate, 0x14);
 
@@ -218,8 +218,8 @@ BOOL MxDeviceEnumerate::EnumDirectDrawCallback(LPGUID p_guid, LPSTR p_driverDesc
 	device.m_driverName = NULL;
 	memset(&device.m_ddCaps, 0, sizeof(device.m_ddCaps));
 
-	LPDIRECTDRAW lpDD = NULL;
 	LPDIRECT3D2 lpDirect3d2 = NULL;
+	LPDIRECTDRAW lpDD = NULL;
 	MxDeviceEnumerateElement& newDevice = m_list.back();
 	HRESULT result = DirectDrawCreate(newDevice.m_guid, &lpDD, NULL);
 
@@ -273,14 +273,15 @@ void MxDeviceEnumerate::BuildErrorString(const char* p_format, ...)
 	OutputDebugString(buf);
 }
 
-// STUB: LEGO1 0x1009c4f0
-HRESULT CALLBACK DisplayModesEnumerateCallback(LPDDSURFACEDESC, LPVOID)
+// FUNCTION: LEGO1 0x1009c4f0
+HRESULT CALLBACK MxDeviceEnumerate::DisplayModesEnumerateCallback(LPDDSURFACEDESC p_ddsd, LPVOID p_context)
 {
-	return TRUE;
+	MxDeviceEnumerate* deviceEnumerate = (MxDeviceEnumerate*) p_context;
+	return deviceEnumerate->EnumDisplayModesCallback(p_ddsd);
 }
 
 // STUB: LEGO1 0x1009c510
-HRESULT CALLBACK DevicesEnumerateCallback(
+HRESULT CALLBACK MxDeviceEnumerate::DevicesEnumerateCallback(
 	LPGUID p_lpGuid,
 	LPSTR p_lpDeviceDescription,
 	LPSTR p_lpDeviceName,
@@ -292,6 +293,18 @@ HRESULT CALLBACK DevicesEnumerateCallback(
 	return TRUE;
 }
 
+// FUNCTION: LEGO1 0x1009c540
+HRESULT MxDeviceEnumerate::EnumDisplayModesCallback(LPDDSURFACEDESC p_ddsd)
+{
+	MxDeviceDisplayMode displayMode;
+	displayMode.m_width = p_ddsd->dwWidth;
+	displayMode.m_height = p_ddsd->dwHeight;
+	displayMode.m_bitsPerPixel = p_ddsd->ddpfPixelFormat.dwRGBBitCount;
+
+	m_list.back().m_displayModes.push_back(displayMode);
+	return DDENUMRET_OK;
+}
+
 // FUNCTION: LEGO1 0x1009c6c0
 MxResult MxDeviceEnumerate::DoEnumerate()
 {
@@ -309,7 +322,8 @@ MxResult MxDeviceEnumerate::DoEnumerate()
 }
 
 // FUNCTION: LEGO1 0x1009c710
-BOOL CALLBACK DirectDrawEnumerateCallback(LPGUID p_guid, LPSTR p_driverDesc, LPSTR p_driverName, LPVOID p_context)
+BOOL CALLBACK
+MxDeviceEnumerate::DirectDrawEnumerateCallback(LPGUID p_guid, LPSTR p_driverDesc, LPSTR p_driverName, LPVOID p_context)
 {
 	MxDeviceEnumerate* deviceEnumerate = (MxDeviceEnumerate*) p_context;
 	return deviceEnumerate->EnumDirectDrawCallback(p_guid, p_driverDesc, p_driverName);
diff --git a/LEGO1/mxdirect3d.h b/LEGO1/mxdirect3d.h
index 963efc8f..d226a12d 100644
--- a/LEGO1/mxdirect3d.h
+++ b/LEGO1/mxdirect3d.h
@@ -66,11 +66,13 @@ struct MxDeviceEnumerate0x178Element {
 };
 
 // SIZE 0x0c
-struct MxDeviceEnumerate0x184Element {
-	undefined m_unk0x00[0x0c]; // 0x00
+struct MxDeviceDisplayMode {
+	DWORD m_width;        // 0x00
+	DWORD m_height;       // 0x04
+	DWORD m_bitsPerPixel; // 0x08
 
-	MxBool operator==(MxDeviceEnumerate0x184Element) const { return TRUE; }
-	MxBool operator<(MxDeviceEnumerate0x184Element) const { return TRUE; }
+	MxBool operator==(MxDeviceDisplayMode) const { return TRUE; }
+	MxBool operator<(MxDeviceDisplayMode) const { return TRUE; }
 };
 
 // SIZE 0x190
@@ -86,7 +88,7 @@ struct MxDeviceEnumerateElement {
 	char* m_driverName;                             // 0x08
 	DDCAPS m_ddCaps;                                // 0x0c
 	list<MxDeviceEnumerate0x178Element> m_unk0x178; // 0x178
-	list<MxDeviceEnumerate0x184Element> m_unk0x184; // 0x184
+	list<MxDeviceDisplayMode> m_displayModes;       // 0x184
 
 	MxBool operator==(MxDeviceEnumerateElement) const { return TRUE; }
 	MxBool operator<(MxDeviceEnumerateElement) const { return TRUE; }
@@ -94,19 +96,19 @@ struct MxDeviceEnumerateElement {
 
 // clang-format off
 // TEMPLATE: LEGO1 0x1009b900
-// list<MxDeviceEnumerate0x184Element,allocator<MxDeviceEnumerate0x184Element> >::~list<MxDeviceEnumerate0x184Element,allocator<MxDeviceEnumerate0x184Element> >
+// list<MxDeviceEnumerate0x178Element,allocator<MxDeviceEnumerate0x178Element> >::~list<MxDeviceEnumerate0x178Element,allocator<MxDeviceEnumerate0x178Element> >
 // clang-format on
 
 // clang-format off
 // TEMPLATE: LEGO1 0x1009b970
-// list<MxDeviceEnumerate0x178Element,allocator<MxDeviceEnumerate0x178Element> >::~list<MxDeviceEnumerate0x178Element,allocator<MxDeviceEnumerate0x178Element> >
+// list<MxDeviceDisplayMode,allocator<MxDeviceDisplayMode> >::~list<MxDeviceDisplayMode,allocator<MxDeviceDisplayMode> >
 // clang-format on
 
 // TEMPLATE: LEGO1 0x1009b9e0
-// List<MxDeviceEnumerate0x184Element>::~List<MxDeviceEnumerate0x184Element>
+// List<MxDeviceEnumerate0x178Element>::~List<MxDeviceEnumerate0x178Element>
 
 // TEMPLATE: LEGO1 0x1009ba30
-// List<MxDeviceEnumerate0x178Element>::~List<MxDeviceEnumerate0x178Element>
+// List<MxDeviceDisplayMode>::~List<MxDeviceDisplayMode>
 
 // Compiler-generated copy ctor
 // SYNTHETIC: LEGO1 0x1009c290
@@ -121,6 +123,7 @@ class MxDeviceEnumerate {
 	virtual MxResult DoEnumerate(); // vtable+0x00
 
 	BOOL EnumDirectDrawCallback(LPGUID p_guid, LPSTR p_driverDesc, LPSTR p_driverName);
+	HRESULT EnumDisplayModesCallback(LPDDSURFACEDESC p_ddsd);
 	const char* EnumerateErrorToString(HRESULT p_error);
 	MxS32 ParseDeviceName(const char* p_deviceId);
 	MxResult FUN_1009d030(MxS32 p_und1, undefined** p_und2, undefined** p_und3);
@@ -128,23 +131,23 @@ class MxDeviceEnumerate {
 	MxResult FUN_1009d210();
 
 	static void BuildErrorString(const char*, ...);
+	static BOOL CALLBACK
+	DirectDrawEnumerateCallback(LPGUID p_guid, LPSTR p_driverDesc, LPSTR p_driverName, LPVOID p_context);
+	static HRESULT CALLBACK DisplayModesEnumerateCallback(LPDDSURFACEDESC p_ddsd, LPVOID p_context);
+	static HRESULT CALLBACK DevicesEnumerateCallback(
+		LPGUID p_lpGuid,
+		LPSTR p_lpDeviceDescription,
+		LPSTR p_lpDeviceName,
+		LPD3DDEVICEDESC p_pHWDesc,
+		LPD3DDEVICEDESC p_pHELDesc,
+		LPVOID p_context
+	);
 
 private:
 	list<MxDeviceEnumerateElement> m_list; // 0x04
 	MxBool m_unk0x10;                      // 0x10
 };
 
-BOOL CALLBACK DirectDrawEnumerateCallback(LPGUID p_guid, LPSTR p_driverDesc, LPSTR p_driverName, LPVOID p_context);
-HRESULT CALLBACK DisplayModesEnumerateCallback(LPDDSURFACEDESC, LPVOID);
-HRESULT CALLBACK DevicesEnumerateCallback(
-	LPGUID p_lpGuid,
-	LPSTR p_lpDeviceDescription,
-	LPSTR p_lpDeviceName,
-	LPD3DDEVICEDESC p_pHWDesc,
-	LPD3DDEVICEDESC p_pHELDesc,
-	LPVOID p_context
-);
-
 // VTABLE: LEGO1 0x100d9cc8
 // SIZE 0x14
 class MxDeviceEnumerate100d9cc8 : public MxDeviceEnumerate {};

From 5ee268a36c97c84e306fdd3b377b0b15a8741cb8 Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Wed, 3 Jan 2024 12:50:25 -0500
Subject: [PATCH 061/210] Implement/match device enumeration (#397)

* Implement/match device enumeration

* Update skip
---
 LEGO1/mxdirect3d.cpp | 106 +++++++++++++++++++++++++++++++++++++------
 LEGO1/mxdirect3d.h   |  85 +++++++++++++++++++++++++---------
 tools/ncc/skip.yml   |   4 ++
 3 files changed, 160 insertions(+), 35 deletions(-)

diff --git a/LEGO1/mxdirect3d.cpp b/LEGO1/mxdirect3d.cpp
index eb81b419..974c5654 100644
--- a/LEGO1/mxdirect3d.cpp
+++ b/LEGO1/mxdirect3d.cpp
@@ -4,8 +4,8 @@
 
 DECOMP_SIZE_ASSERT(MxDeviceModeFinder, 0xe4);
 DECOMP_SIZE_ASSERT(MxDirect3D, 0x894);
-DECOMP_SIZE_ASSERT(MxDeviceEnumerate0x178Element, 0x1a4);
-DECOMP_SIZE_ASSERT(MxDeviceDisplayMode, 0x0c);
+DECOMP_SIZE_ASSERT(MxDevice, 0x1a4);
+DECOMP_SIZE_ASSERT(MxDisplayMode, 0x0c);
 DECOMP_SIZE_ASSERT(MxDeviceEnumerateElement, 0x190);
 DECOMP_SIZE_ASSERT(MxDeviceEnumerate, 0x14);
 
@@ -162,10 +162,8 @@ MxDeviceEnumerateElement::~MxDeviceEnumerateElement()
 {
 	if (m_guid)
 		delete m_guid;
-
 	if (m_driverDesc)
 		delete[] m_driverDesc;
-
 	if (m_driverName)
 		delete[] m_driverName;
 }
@@ -199,6 +197,72 @@ void MxDeviceEnumerateElement::Init(LPGUID p_guid, LPSTR p_driverDesc, LPSTR p_d
 	}
 }
 
+// FUNCTION: LEGO1 0x1009bd20
+MxDevice::MxDevice(
+	LPGUID p_guid,
+	LPSTR p_deviceDesc,
+	LPSTR p_deviceName,
+	LPD3DDEVICEDESC p_HWDesc,
+	LPD3DDEVICEDESC p_HELDesc
+)
+{
+	memset(this, 0, sizeof(*this));
+
+	Init(p_guid, p_deviceDesc, p_deviceName, p_HWDesc, p_HELDesc);
+}
+
+// FUNCTION: LEGO1 0x1009bd60
+MxDevice::~MxDevice()
+{
+	if (m_guid)
+		delete m_guid;
+	if (m_deviceDesc)
+		delete[] m_deviceDesc;
+	if (m_deviceName)
+		delete[] m_deviceName;
+}
+
+// FUNCTION: LEGO1 0x1009bda0
+void MxDevice::Init(
+	LPGUID p_guid,
+	LPSTR p_deviceDesc,
+	LPSTR p_deviceName,
+	LPD3DDEVICEDESC p_HWDesc,
+	LPD3DDEVICEDESC p_HELDesc
+)
+{
+	if (m_deviceDesc) {
+		delete[] m_deviceDesc;
+		m_deviceDesc = NULL;
+	}
+
+	if (m_deviceName) {
+		delete[] m_deviceName;
+		m_deviceName = NULL;
+	}
+
+	if (p_guid) {
+		m_guid = new GUID;
+		memcpy(m_guid, p_guid, sizeof(*m_guid));
+	}
+
+	if (p_deviceDesc) {
+		m_deviceDesc = new char[strlen(p_deviceDesc) + 1];
+		strcpy(m_deviceDesc, p_deviceDesc);
+	}
+
+	if (p_deviceName) {
+		m_deviceName = new char[strlen(p_deviceName) + 1];
+		strcpy(m_deviceName, p_deviceName);
+	}
+
+	if (p_HWDesc)
+		memcpy(&m_HWDesc, p_HWDesc, sizeof(m_HWDesc));
+
+	if (p_HELDesc)
+		memcpy(&m_HELDesc, p_HELDesc, sizeof(m_HELDesc));
+}
+
 // FUNCTION: LEGO1 0x1009bec0
 MxDeviceEnumerate::MxDeviceEnumerate()
 {
@@ -243,7 +307,7 @@ BOOL MxDeviceEnumerate::EnumDirectDrawCallback(LPGUID p_guid, LPSTR p_driverDesc
 				if (result != DD_OK)
 					BuildErrorString("D3D enum devices failed: %s\n", EnumerateErrorToString(result));
 				else {
-					if (newDevice.m_unk0x178.empty()) {
+					if (newDevice.m_devices.empty()) {
 						m_list.pop_back();
 					}
 				}
@@ -280,23 +344,24 @@ HRESULT CALLBACK MxDeviceEnumerate::DisplayModesEnumerateCallback(LPDDSURFACEDES
 	return deviceEnumerate->EnumDisplayModesCallback(p_ddsd);
 }
 
-// STUB: LEGO1 0x1009c510
+// FUNCTION: LEGO1 0x1009c510
 HRESULT CALLBACK MxDeviceEnumerate::DevicesEnumerateCallback(
-	LPGUID p_lpGuid,
-	LPSTR p_lpDeviceDescription,
-	LPSTR p_lpDeviceName,
-	LPD3DDEVICEDESC p_pHWDesc,
-	LPD3DDEVICEDESC p_pHELDesc,
+	LPGUID p_guid,
+	LPSTR p_deviceDesc,
+	LPSTR p_deviceName,
+	LPD3DDEVICEDESC p_HWDesc,
+	LPD3DDEVICEDESC p_HELDesc,
 	LPVOID p_context
 )
 {
-	return TRUE;
+	MxDeviceEnumerate* deviceEnumerate = (MxDeviceEnumerate*) p_context;
+	return deviceEnumerate->EnumDevicesCallback(p_guid, p_deviceDesc, p_deviceName, p_HWDesc, p_HELDesc);
 }
 
 // FUNCTION: LEGO1 0x1009c540
 HRESULT MxDeviceEnumerate::EnumDisplayModesCallback(LPDDSURFACEDESC p_ddsd)
 {
-	MxDeviceDisplayMode displayMode;
+	MxDisplayMode displayMode;
 	displayMode.m_width = p_ddsd->dwWidth;
 	displayMode.m_height = p_ddsd->dwHeight;
 	displayMode.m_bitsPerPixel = p_ddsd->ddpfPixelFormat.dwRGBBitCount;
@@ -305,6 +370,21 @@ HRESULT MxDeviceEnumerate::EnumDisplayModesCallback(LPDDSURFACEDESC p_ddsd)
 	return DDENUMRET_OK;
 }
 
+// FUNCTION: LEGO1 0x1009c5d0
+HRESULT MxDeviceEnumerate::EnumDevicesCallback(
+	LPGUID p_guid,
+	LPSTR p_deviceDesc,
+	LPSTR p_deviceName,
+	LPD3DDEVICEDESC p_HWDesc,
+	LPD3DDEVICEDESC p_HELDesc
+)
+{
+	MxDevice device(p_guid, p_deviceDesc, p_deviceName, p_HWDesc, p_HELDesc);
+	m_list.back().m_devices.push_back(device);
+	memset(&device, 0, sizeof(device));
+	return DDENUMRET_OK;
+}
+
 // FUNCTION: LEGO1 0x1009c6c0
 MxResult MxDeviceEnumerate::DoEnumerate()
 {
diff --git a/LEGO1/mxdirect3d.h b/LEGO1/mxdirect3d.h
index d226a12d..ca16cd89 100644
--- a/LEGO1/mxdirect3d.h
+++ b/LEGO1/mxdirect3d.h
@@ -58,21 +58,43 @@ class MxDirect3D : public MxDirectDraw {
 };
 
 // SIZE 0x1a4
-struct MxDeviceEnumerate0x178Element {
-	undefined m_unk0x00[0x1a4]; // 0x00
+struct MxDevice {
+	MxDevice() {}
+	~MxDevice();
+	MxDevice(
+		LPGUID p_guid,
+		LPSTR p_deviceDesc,
+		LPSTR p_deviceName,
+		LPD3DDEVICEDESC p_HWDesc,
+		LPD3DDEVICEDESC p_HELDesc
+	);
 
-	MxBool operator==(MxDeviceEnumerate0x178Element) const { return TRUE; }
-	MxBool operator<(MxDeviceEnumerate0x178Element) const { return TRUE; }
+	void Init(
+		LPGUID p_guid,
+		LPSTR p_deviceDesc,
+		LPSTR p_deviceName,
+		LPD3DDEVICEDESC p_HWDesc,
+		LPD3DDEVICEDESC p_HELDesc
+	);
+
+	LPGUID m_guid;           // 0x00
+	char* m_deviceDesc;      // 0x04
+	char* m_deviceName;      // 0x08
+	D3DDEVICEDESC m_HWDesc;  // 0x0c
+	D3DDEVICEDESC m_HELDesc; // 0xd8
+
+	MxBool operator==(MxDevice) const { return TRUE; }
+	MxBool operator<(MxDevice) const { return TRUE; }
 };
 
 // SIZE 0x0c
-struct MxDeviceDisplayMode {
+struct MxDisplayMode {
 	DWORD m_width;        // 0x00
 	DWORD m_height;       // 0x04
 	DWORD m_bitsPerPixel; // 0x08
 
-	MxBool operator==(MxDeviceDisplayMode) const { return TRUE; }
-	MxBool operator<(MxDeviceDisplayMode) const { return TRUE; }
+	MxBool operator==(MxDisplayMode) const { return TRUE; }
+	MxBool operator<(MxDisplayMode) const { return TRUE; }
 };
 
 // SIZE 0x190
@@ -83,12 +105,12 @@ struct MxDeviceEnumerateElement {
 
 	void Init(LPGUID p_guid, LPSTR p_driverDesc, LPSTR p_driverName);
 
-	LPGUID m_guid;                                  // 0x00
-	char* m_driverDesc;                             // 0x04
-	char* m_driverName;                             // 0x08
-	DDCAPS m_ddCaps;                                // 0x0c
-	list<MxDeviceEnumerate0x178Element> m_unk0x178; // 0x178
-	list<MxDeviceDisplayMode> m_displayModes;       // 0x184
+	LPGUID m_guid;                      // 0x00
+	char* m_driverDesc;                 // 0x04
+	char* m_driverName;                 // 0x08
+	DDCAPS m_ddCaps;                    // 0x0c
+	list<MxDevice> m_devices;           // 0x178
+	list<MxDisplayMode> m_displayModes; // 0x184
 
 	MxBool operator==(MxDeviceEnumerateElement) const { return TRUE; }
 	MxBool operator<(MxDeviceEnumerateElement) const { return TRUE; }
@@ -96,21 +118,31 @@ struct MxDeviceEnumerateElement {
 
 // clang-format off
 // TEMPLATE: LEGO1 0x1009b900
-// list<MxDeviceEnumerate0x178Element,allocator<MxDeviceEnumerate0x178Element> >::~list<MxDeviceEnumerate0x178Element,allocator<MxDeviceEnumerate0x178Element> >
+// list<MxDevice,allocator<MxDevice> >::~list<MxDevice,allocator<MxDevice> >
 // clang-format on
 
 // clang-format off
 // TEMPLATE: LEGO1 0x1009b970
-// list<MxDeviceDisplayMode,allocator<MxDeviceDisplayMode> >::~list<MxDeviceDisplayMode,allocator<MxDeviceDisplayMode> >
+// list<MxDisplayMode,allocator<MxDisplayMode> >::~list<MxDisplayMode,allocator<MxDisplayMode> >
 // clang-format on
 
 // TEMPLATE: LEGO1 0x1009b9e0
-// List<MxDeviceEnumerate0x178Element>::~List<MxDeviceEnumerate0x178Element>
+// List<MxDevice>::~List<MxDevice>
 
 // TEMPLATE: LEGO1 0x1009ba30
-// List<MxDeviceDisplayMode>::~List<MxDeviceDisplayMode>
+// List<MxDisplayMode>::~List<MxDisplayMode>
+
+// clang-format off
+// TEMPLATE: LEGO1 0x1009bf50
+// list<MxDeviceEnumerateElement,allocator<MxDeviceEnumerateElement> >::~list<MxDeviceEnumerateElement,allocator<MxDeviceEnumerateElement> >
+// clang-format on
+
+// TEMPLATE: LEGO1 0x1009bfc0
+// List<MxDeviceEnumerateElement>::~List<MxDeviceEnumerateElement>
 
 // Compiler-generated copy ctor
+// Part of this function are two more synthetic sub-routines,
+// LEGO1 0x1009c400 and LEGO1 0x1009c460
 // SYNTHETIC: LEGO1 0x1009c290
 // MxDeviceEnumerateElement::MxDeviceEnumerateElement
 
@@ -119,11 +151,20 @@ struct MxDeviceEnumerateElement {
 class MxDeviceEnumerate {
 public:
 	MxDeviceEnumerate();
+	// FUNCTION: LEGO1 0x1009c010
+	~MxDeviceEnumerate() {}
 
 	virtual MxResult DoEnumerate(); // vtable+0x00
 
 	BOOL EnumDirectDrawCallback(LPGUID p_guid, LPSTR p_driverDesc, LPSTR p_driverName);
 	HRESULT EnumDisplayModesCallback(LPDDSURFACEDESC p_ddsd);
+	HRESULT EnumDevicesCallback(
+		LPGUID p_guid,
+		LPSTR p_deviceDesc,
+		LPSTR p_deviceName,
+		LPD3DDEVICEDESC p_HWDesc,
+		LPD3DDEVICEDESC p_HELDesc
+	);
 	const char* EnumerateErrorToString(HRESULT p_error);
 	MxS32 ParseDeviceName(const char* p_deviceId);
 	MxResult FUN_1009d030(MxS32 p_und1, undefined** p_und2, undefined** p_und3);
@@ -135,11 +176,11 @@ class MxDeviceEnumerate {
 	DirectDrawEnumerateCallback(LPGUID p_guid, LPSTR p_driverDesc, LPSTR p_driverName, LPVOID p_context);
 	static HRESULT CALLBACK DisplayModesEnumerateCallback(LPDDSURFACEDESC p_ddsd, LPVOID p_context);
 	static HRESULT CALLBACK DevicesEnumerateCallback(
-		LPGUID p_lpGuid,
-		LPSTR p_lpDeviceDescription,
-		LPSTR p_lpDeviceName,
-		LPD3DDEVICEDESC p_pHWDesc,
-		LPD3DDEVICEDESC p_pHELDesc,
+		LPGUID p_guid,
+		LPSTR p_deviceDesc,
+		LPSTR p_deviceName,
+		LPD3DDEVICEDESC p_HWDesc,
+		LPD3DDEVICEDESC p_HELDesc,
 		LPVOID p_context
 	);
 
diff --git a/tools/ncc/skip.yml b/tools/ncc/skip.yml
index 75a186ca..fa8546d9 100644
--- a/tools/ncc/skip.yml
+++ b/tools/ncc/skip.yml
@@ -8,6 +8,10 @@ GetNoCD_SourceName(): 'DLL exported function'
 m_3dView: 'Allow this variable name'
 m_3dManager: 'Allow this variable name'
 m_16bitPal: 'Allow this variable name'
+m_HWDesc: 'Allow this variable name'
+m_HELDesc: 'Allow this variable name'
+p_HWDesc: 'Allow this variable name'
+p_HELDesc: 'Allow this variable name'
 p_milliseconds: 'Probably a bug with function call'
 m_increaseAmount: "Can't currently detect member in union"
 m_increaseFactor: "Can't currently detect member in union"

From 778b0f21088729321f8182f298c7669e8a772865 Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Wed, 3 Jan 2024 15:53:21 -0500
Subject: [PATCH 062/210] Implement/match MxDeviceEnumerate::ParseDeviceName
 and ProcessDeviceBytes (#398)

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP
---
 LEGO1/mxdirect3d.cpp | 70 +++++++++++++++++++++++++++++++++++++++++---
 LEGO1/mxdirect3d.h   |  3 +-
 util/compat.h        |  3 +-
 3 files changed, 70 insertions(+), 6 deletions(-)

diff --git a/LEGO1/mxdirect3d.cpp b/LEGO1/mxdirect3d.cpp
index 974c5654..fae5e38e 100644
--- a/LEGO1/mxdirect3d.cpp
+++ b/LEGO1/mxdirect3d.cpp
@@ -266,7 +266,7 @@ void MxDevice::Init(
 // FUNCTION: LEGO1 0x1009bec0
 MxDeviceEnumerate::MxDeviceEnumerate()
 {
-	m_unk0x10 = FALSE;
+	m_initialized = FALSE;
 }
 
 // FUNCTION: LEGO1 0x1009c070
@@ -388,7 +388,7 @@ HRESULT MxDeviceEnumerate::EnumDevicesCallback(
 // FUNCTION: LEGO1 0x1009c6c0
 MxResult MxDeviceEnumerate::DoEnumerate()
 {
-	if (m_unk0x10)
+	if (m_initialized)
 		return FAILURE;
 
 	HRESULT ret = DirectDrawEnumerate(DirectDrawEnumerateCallback, this);
@@ -397,7 +397,7 @@ MxResult MxDeviceEnumerate::DoEnumerate()
 		return FAILURE;
 	}
 
-	m_unk0x10 = TRUE;
+	m_initialized = TRUE;
 	return SUCCESS;
 }
 
@@ -418,9 +418,71 @@ const char* MxDeviceEnumerate::EnumerateErrorToString(HRESULT p_error)
 	return "";
 }
 
-// STUB: LEGO1 0x1009ce60
+// FUNCTION: LEGO1 0x1009ce60
 MxS32 MxDeviceEnumerate::ParseDeviceName(const char* p_deviceId)
 {
+	if (!m_initialized)
+		return -1;
+
+	MxS32 num = -1;
+	MxS32 hex[4];
+
+	if (sscanf(p_deviceId, "%d 0x%x 0x%x 0x%x 0x%x", &num, &hex[0], &hex[1], &hex[2], &hex[3]) != 5)
+		return -1;
+
+	if (num < 0)
+		return -1;
+
+	GUID guid;
+	memcpy(&guid, hex, sizeof(guid));
+
+	MxS32 result = ProcessDeviceBytes(num, guid);
+
+	if (result < 0)
+		return ProcessDeviceBytes(-1, guid);
+	return result;
+}
+
+// FUNCTION: LEGO1 0x1009cf20
+MxS32 MxDeviceEnumerate::ProcessDeviceBytes(MxS32 p_num, GUID& p_guid)
+{
+	if (!m_initialized)
+		return -1;
+
+	MxS32 i = 0;
+	MxS32 j = 0;
+
+	struct GUID4 {
+		MxS32 m_data1;
+		MxS32 m_data2;
+		MxS32 m_data3;
+		MxS32 m_data4;
+	};
+
+	static_assert(sizeof(GUID4) == sizeof(GUID), "Equal size");
+
+	GUID4 deviceGuid;
+	memcpy(&deviceGuid, &p_guid, sizeof(GUID4));
+
+	for (list<MxDeviceEnumerateElement>::iterator it = m_list.begin(); it != m_list.end(); it++) {
+		if (p_num >= 0 && p_num < i)
+			return -1;
+
+		GUID4 compareGuid;
+		MxDeviceEnumerateElement& elem = *it;
+		for (list<MxDevice>::iterator it2 = elem.m_devices.begin(); it2 != elem.m_devices.end(); it2++) {
+			memcpy(&compareGuid, (*it2).m_guid, sizeof(GUID4));
+
+			if (compareGuid.m_data1 == deviceGuid.m_data1 && compareGuid.m_data2 == deviceGuid.m_data2 &&
+				compareGuid.m_data3 == deviceGuid.m_data3 && compareGuid.m_data4 == deviceGuid.m_data4 && i == p_num)
+				return j;
+
+			j++;
+		}
+
+		i++;
+	}
+
 	return -1;
 }
 
diff --git a/LEGO1/mxdirect3d.h b/LEGO1/mxdirect3d.h
index ca16cd89..fb9d5618 100644
--- a/LEGO1/mxdirect3d.h
+++ b/LEGO1/mxdirect3d.h
@@ -167,6 +167,7 @@ class MxDeviceEnumerate {
 	);
 	const char* EnumerateErrorToString(HRESULT p_error);
 	MxS32 ParseDeviceName(const char* p_deviceId);
+	MxS32 ProcessDeviceBytes(MxS32 p_num, GUID& p_guid);
 	MxResult FUN_1009d030(MxS32 p_und1, undefined** p_und2, undefined** p_und3);
 	MxResult FUN_1009d0d0();
 	MxResult FUN_1009d210();
@@ -186,7 +187,7 @@ class MxDeviceEnumerate {
 
 private:
 	list<MxDeviceEnumerateElement> m_list; // 0x04
-	MxBool m_unk0x10;                      // 0x10
+	MxBool m_initialized;                  // 0x10
 };
 
 // VTABLE: LEGO1 0x100d9cc8
diff --git a/util/compat.h b/util/compat.h
index c1175cd2..e83b115e 100644
--- a/util/compat.h
+++ b/util/compat.h
@@ -21,8 +21,9 @@
 // We use `override` so newer compilers can tell us our vtables are valid,
 // however this keyword was added in C++11, so we define it as empty for
 // compatibility with older compilers.
-#if defined(_MSC_VER) && _MSC_VER <= 1200 // 1200 corresponds to VC6.0 but "override" was probably added even later
+#if __cplusplus < 201103L
 #define override
+#define static_assert(expr, msg)
 #endif
 
 #endif // COMPAT_H

From 49e3fa238fe473c76b4aaba1339e0bf90bfe3945 Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Wed, 3 Jan 2024 22:03:02 -0500
Subject: [PATCH 063/210] Implement/match most remaining MxDirect3D device
 enumeration functions (#400)

* WIP

* WIP

* Implement/match most remaining MxDirect3D device enumeration functions

* Fix names
---
 LEGO1/legovideomanager.cpp |  30 +++----
 LEGO1/mxdirect3d.cpp       | 166 +++++++++++++++++++++++++++++++------
 LEGO1/mxdirect3d.h         |  42 ++++++----
 3 files changed, 183 insertions(+), 55 deletions(-)

diff --git a/LEGO1/legovideomanager.cpp b/LEGO1/legovideomanager.cpp
index 8d0a872a..a17714fc 100644
--- a/LEGO1/legovideomanager.cpp
+++ b/LEGO1/legovideomanager.cpp
@@ -57,18 +57,18 @@ MxResult LegoVideoManager::CreateDirect3D()
 MxResult LegoVideoManager::Create(MxVideoParam& p_videoParam, MxU32 p_frequencyMS, MxBool p_createThread)
 {
 	MxBool paletteCreated = FALSE;
-	undefined* und1 = NULL;
-	undefined* und2 = NULL;
+	MxDriver* driver = NULL;
+	MxDevice* device = NULL;
 	MxResult result = FAILURE;
 
-	MxDeviceEnumerate100d9cc8 deviceEnumerate;
+	MxDeviceEnumerate100d9cc8 deviceEnumerator;
 	Vector3Data posVec(0.0, 1.25, -50.0);
 	Vector3Data dirVec(0.0, 0.0, 1.0);
 	Vector3Data upVec(0.0, 1.0, 0.0);
 	Matrix4Data outMatrix;
 	HWND hwnd = MxOmni::GetInstance()->GetWindowHandle();
 	MxS32 bits = p_videoParam.Flags().Get16Bit() ? 16 : 8;
-	MxS32 und3 = -1;
+	MxS32 deviceNum = -1;
 
 	if (!p_videoParam.GetPalette()) {
 		MxPalette* palette = new MxPalette;
@@ -85,26 +85,26 @@ MxResult LegoVideoManager::Create(MxVideoParam& p_videoParam, MxU32 p_frequencyM
 	if (CreateDirect3D() != SUCCESS)
 		goto done;
 
-	if (deviceEnumerate.DoEnumerate() != SUCCESS)
+	if (deviceEnumerator.DoEnumerate() != SUCCESS)
 		goto done;
 
 	if (p_videoParam.GetDeviceName()) {
-		und3 = deviceEnumerate.ParseDeviceName(p_videoParam.GetDeviceName());
-		if (und3 >= 0) {
-			if ((und3 = deviceEnumerate.FUN_1009d030(und3, &und1, &und2)) != SUCCESS)
-				und3 = -1;
+		deviceNum = deviceEnumerator.ParseDeviceName(p_videoParam.GetDeviceName());
+		if (deviceNum >= 0) {
+			if ((deviceNum = deviceEnumerator.GetDevice(deviceNum, driver, device)) != SUCCESS)
+				deviceNum = -1;
 		}
 	}
 
-	if (und3 < 0) {
-		deviceEnumerate.FUN_1009d210();
-		und3 = deviceEnumerate.FUN_1009d0d0();
-		deviceEnumerate.FUN_1009d030(und3, &und1, &und2);
+	if (deviceNum < 0) {
+		deviceEnumerator.FUN_1009d210();
+		deviceNum = deviceEnumerator.FUN_1009d0d0();
+		deviceEnumerator.GetDevice(deviceNum, driver, device);
 	}
 
-	m_direct3d->FUN_1009b5f0(deviceEnumerate, und1, und2);
+	m_direct3d->FUN_1009b5f0(deviceEnumerator, driver, device);
 
-	if (!*((MxU32*) &und1[0x14]) && *((MxU32*) &und1[0xe0]) != 2)
+	if (!driver->m_ddCaps.dwCaps2 && driver->m_ddCaps.dwSVBRops[7] != 2)
 		p_videoParam.Flags().SetF2bit0(TRUE);
 	else
 		p_videoParam.Flags().SetF2bit0(FALSE);
diff --git a/LEGO1/mxdirect3d.cpp b/LEGO1/mxdirect3d.cpp
index fae5e38e..5ea3202c 100644
--- a/LEGO1/mxdirect3d.cpp
+++ b/LEGO1/mxdirect3d.cpp
@@ -6,7 +6,7 @@ DECOMP_SIZE_ASSERT(MxDeviceModeFinder, 0xe4);
 DECOMP_SIZE_ASSERT(MxDirect3D, 0x894);
 DECOMP_SIZE_ASSERT(MxDevice, 0x1a4);
 DECOMP_SIZE_ASSERT(MxDisplayMode, 0x0c);
-DECOMP_SIZE_ASSERT(MxDeviceEnumerateElement, 0x190);
+DECOMP_SIZE_ASSERT(MxDriver, 0x190);
 DECOMP_SIZE_ASSERT(MxDeviceEnumerate, 0x14);
 
 // FUNCTION: LEGO1 0x1009b0a0
@@ -126,7 +126,7 @@ BOOL MxDirect3D::D3DSetMode()
 }
 
 // STUB: LEGO1 0x1009b5f0
-BOOL MxDirect3D::FUN_1009b5f0(MxDeviceEnumerate& p_deviceEnumerate, undefined* p_und1, undefined* p_und2)
+BOOL MxDirect3D::FUN_1009b5f0(MxDeviceEnumerate& p_deviceEnumerator, MxDriver* p_driver, MxDevice* p_device)
 {
 	return TRUE;
 }
@@ -147,7 +147,7 @@ MxDeviceModeFinder::~MxDeviceModeFinder()
 }
 
 // FUNCTION: LEGO1 0x1009ba80
-MxDeviceEnumerateElement::MxDeviceEnumerateElement(LPGUID p_guid, LPSTR p_driverDesc, LPSTR p_driverName)
+MxDriver::MxDriver(LPGUID p_guid, LPSTR p_driverDesc, LPSTR p_driverName)
 {
 	m_guid = NULL;
 	m_driverDesc = NULL;
@@ -158,7 +158,7 @@ MxDeviceEnumerateElement::MxDeviceEnumerateElement(LPGUID p_guid, LPSTR p_driver
 }
 
 // FUNCTION: LEGO1 0x1009bb80
-MxDeviceEnumerateElement::~MxDeviceEnumerateElement()
+MxDriver::~MxDriver()
 {
 	if (m_guid)
 		delete m_guid;
@@ -169,7 +169,7 @@ MxDeviceEnumerateElement::~MxDeviceEnumerateElement()
 }
 
 // FUNCTION: LEGO1 0x1009bc30
-void MxDeviceEnumerateElement::Init(LPGUID p_guid, LPSTR p_driverDesc, LPSTR p_driverName)
+void MxDriver::Init(LPGUID p_guid, LPSTR p_driverDesc, LPSTR p_driverName)
 {
 	if (m_driverDesc) {
 		delete[] m_driverDesc;
@@ -272,19 +272,19 @@ MxDeviceEnumerate::MxDeviceEnumerate()
 // FUNCTION: LEGO1 0x1009c070
 BOOL MxDeviceEnumerate::EnumDirectDrawCallback(LPGUID p_guid, LPSTR p_driverDesc, LPSTR p_driverName)
 {
-	MxDeviceEnumerateElement device(p_guid, p_driverDesc, p_driverName);
-	m_list.push_back(device);
+	MxDriver driver(p_guid, p_driverDesc, p_driverName);
+	m_list.push_back(driver);
 
 	// Must be zeroed because held resources are copied by pointer only
 	// and should not be freed at the end of this function
-	device.m_guid = NULL;
-	device.m_driverDesc = NULL;
-	device.m_driverName = NULL;
-	memset(&device.m_ddCaps, 0, sizeof(device.m_ddCaps));
+	driver.m_guid = NULL;
+	driver.m_driverDesc = NULL;
+	driver.m_driverName = NULL;
+	memset(&driver.m_ddCaps, 0, sizeof(driver.m_ddCaps));
 
 	LPDIRECT3D2 lpDirect3d2 = NULL;
 	LPDIRECTDRAW lpDD = NULL;
-	MxDeviceEnumerateElement& newDevice = m_list.back();
+	MxDriver& newDevice = m_list.back();
 	HRESULT result = DirectDrawCreate(newDevice.m_guid, &lpDD, NULL);
 
 	if (result != DD_OK)
@@ -444,7 +444,7 @@ MxS32 MxDeviceEnumerate::ParseDeviceName(const char* p_deviceId)
 }
 
 // FUNCTION: LEGO1 0x1009cf20
-MxS32 MxDeviceEnumerate::ProcessDeviceBytes(MxS32 p_num, GUID& p_guid)
+MxS32 MxDeviceEnumerate::ProcessDeviceBytes(MxS32 p_deviceNum, GUID& p_guid)
 {
 	if (!m_initialized)
 		return -1;
@@ -464,17 +464,18 @@ MxS32 MxDeviceEnumerate::ProcessDeviceBytes(MxS32 p_num, GUID& p_guid)
 	GUID4 deviceGuid;
 	memcpy(&deviceGuid, &p_guid, sizeof(GUID4));
 
-	for (list<MxDeviceEnumerateElement>::iterator it = m_list.begin(); it != m_list.end(); it++) {
-		if (p_num >= 0 && p_num < i)
+	for (list<MxDriver>::iterator it = m_list.begin(); it != m_list.end(); it++) {
+		if (p_deviceNum >= 0 && p_deviceNum < i)
 			return -1;
 
 		GUID4 compareGuid;
-		MxDeviceEnumerateElement& elem = *it;
-		for (list<MxDevice>::iterator it2 = elem.m_devices.begin(); it2 != elem.m_devices.end(); it2++) {
+		MxDriver& driver = *it;
+		for (list<MxDevice>::iterator it2 = driver.m_devices.begin(); it2 != driver.m_devices.end(); it2++) {
 			memcpy(&compareGuid, (*it2).m_guid, sizeof(GUID4));
 
 			if (compareGuid.m_data1 == deviceGuid.m_data1 && compareGuid.m_data2 == deviceGuid.m_data2 &&
-				compareGuid.m_data3 == deviceGuid.m_data3 && compareGuid.m_data4 == deviceGuid.m_data4 && i == p_num)
+				compareGuid.m_data3 == deviceGuid.m_data3 && compareGuid.m_data4 == deviceGuid.m_data4 &&
+				i == p_deviceNum)
 				return j;
 
 			j++;
@@ -486,20 +487,135 @@ MxS32 MxDeviceEnumerate::ProcessDeviceBytes(MxS32 p_num, GUID& p_guid)
 	return -1;
 }
 
-// STUB: LEGO1 0x1009d030
-MxResult MxDeviceEnumerate::FUN_1009d030(MxS32 p_und1, undefined** p_und2, undefined** p_und3)
+// FUNCTION: LEGO1 0x1009d030
+MxResult MxDeviceEnumerate::GetDevice(MxS32 p_deviceNum, MxDriver*& p_driver, MxDevice*& p_device)
 {
+	if (p_deviceNum >= 0 && m_initialized) {
+		MxS32 i = 0;
+
+		for (list<MxDriver>::iterator it = m_list.begin(); it != m_list.end(); it++) {
+			p_driver = &*it;
+
+			for (list<MxDevice>::iterator it2 = p_driver->m_devices.begin(); it2 != p_driver->m_devices.end(); it2++) {
+				if (i == p_deviceNum) {
+					p_device = &*it2;
+					return SUCCESS;
+				}
+				i++;
+			}
+		}
+
+		return FAILURE;
+	}
+
 	return FAILURE;
 }
 
-// STUB: LEGO1 0x1009d0d0
-MxResult MxDeviceEnumerate::FUN_1009d0d0()
+// FUNCTION: LEGO1 0x1009d0d0
+MxS32 MxDeviceEnumerate::FUN_1009d0d0()
 {
-	return FAILURE;
+	if (!m_initialized)
+		return -1;
+
+	if (m_list.empty())
+		return -1;
+
+	MxS32 i = 0;
+	MxS32 j = 0;
+	MxS32 k = -1;
+	MxU32 und = FUN_1009d1a0();
+
+	for (list<MxDriver>::iterator it = m_list.begin();; it++) {
+		if (it == m_list.end())
+			return k;
+
+		for (list<MxDevice>::iterator it2 = (*it).m_devices.begin(); it2 != (*it).m_devices.end(); it2++) {
+			if ((*it2).m_HWDesc.dcmColorModel)
+				return j;
+
+			if ((und && (*it2).m_HELDesc.dcmColorModel == D3DCOLOR_RGB && i == 0) ||
+				(*it2).m_HELDesc.dcmColorModel == D3DCOLOR_MONO && i == 0 && k < 0)
+				k = j;
+
+			j++;
+		}
+
+		i++;
+	}
+
+	return -1;
 }
 
-// STUB: LEGO1 0x1009d210
+// STUB: LEGO1 0x1009d1a0
+undefined4 MxDeviceEnumerate::FUN_1009d1a0()
+{
+	return 1;
+}
+
+// STUB: LEGO1 0x1009d1e0
+undefined4 MxDeviceEnumerate::FUN_1009d1e0()
+{
+	return 1;
+}
+
+// FUNCTION: LEGO1 0x1009d210
 MxResult MxDeviceEnumerate::FUN_1009d210()
 {
-	return FAILURE;
+	if (!m_initialized)
+		return FAILURE;
+
+	for (list<MxDriver>::iterator it = m_list.begin(); it != m_list.end();) {
+		MxDriver& driver = *it;
+
+		if (!FUN_1009d370(driver))
+			m_list.erase(it++);
+		else {
+			for (list<MxDevice>::iterator it2 = driver.m_devices.begin(); it2 != driver.m_devices.end();) {
+				MxDevice& device = *it2;
+
+				if (!FUN_1009d3d0(device))
+					driver.m_devices.erase(it2++);
+				else
+					it2++;
+			}
+
+			if (driver.m_devices.empty())
+				m_list.erase(it++);
+			else
+				it++;
+		}
+	}
+
+	return m_list.empty() ? FAILURE : SUCCESS;
+}
+
+// FUNCTION: LEGO1 0x1009d370
+MxBool MxDeviceEnumerate::FUN_1009d370(MxDriver& p_driver)
+{
+	for (list<MxDisplayMode>::iterator it = p_driver.m_displayModes.begin(); it != p_driver.m_displayModes.end();
+		 it++) {
+		if ((*it).m_width == 640 && (*it).m_height == 480) {
+			if ((*it).m_bitsPerPixel == 8 || (*it).m_bitsPerPixel == 16)
+				return TRUE;
+		}
+	}
+
+	return FALSE;
+}
+
+// FUNCTION: LEGO1 0x1009d3d0
+MxBool MxDeviceEnumerate::FUN_1009d3d0(MxDevice& p_device)
+{
+	if (m_list.size() <= 0)
+		return FALSE;
+
+	if (p_device.m_HWDesc.dcmColorModel)
+		return p_device.m_HWDesc.dwDeviceZBufferBitDepth & DDBD_16 && p_device.m_HWDesc.dpcTriCaps.dwTextureCaps & 1;
+
+	for (list<MxDevice>::iterator it = m_list.front().m_devices.begin(); it != m_list.front().m_devices.end(); it++) {
+		if ((&*it) == &p_device)
+			return TRUE;
+	}
+
+	return FALSE;
 }
diff --git a/LEGO1/mxdirect3d.h b/LEGO1/mxdirect3d.h
index fb9d5618..8b792ac0 100644
--- a/LEGO1/mxdirect3d.h
+++ b/LEGO1/mxdirect3d.h
@@ -19,6 +19,8 @@ class MxDeviceModeFinder {
 };
 
 class MxDeviceEnumerate;
+struct MxDriver;
+struct MxDevice;
 
 // VTABLE: LEGO1 0x100db800
 // SIZE 0x894
@@ -43,7 +45,7 @@ class MxDirect3D : public MxDirectDraw {
 
 	BOOL CreateIDirect3D();
 	BOOL D3DSetMode();
-	BOOL FUN_1009b5f0(MxDeviceEnumerate& p_deviceEnumerate, undefined* p_und1, undefined* p_und2);
+	BOOL FUN_1009b5f0(MxDeviceEnumerate& p_deviceEnumerator, MxDriver* p_driver, MxDevice* p_device);
 
 	inline MxDeviceModeFinder* GetDeviceModeFinder() { return this->m_pDeviceModeFinder; };
 	inline IDirect3D* GetDirect3D() { return this->m_pDirect3d; }
@@ -98,10 +100,10 @@ struct MxDisplayMode {
 };
 
 // SIZE 0x190
-struct MxDeviceEnumerateElement {
-	MxDeviceEnumerateElement() {}
-	~MxDeviceEnumerateElement();
-	MxDeviceEnumerateElement(LPGUID p_guid, LPSTR p_driverDesc, LPSTR p_driverName);
+struct MxDriver {
+	MxDriver() {}
+	~MxDriver();
+	MxDriver(LPGUID p_guid, LPSTR p_driverDesc, LPSTR p_driverName);
 
 	void Init(LPGUID p_guid, LPSTR p_driverDesc, LPSTR p_driverName);
 
@@ -112,8 +114,8 @@ struct MxDeviceEnumerateElement {
 	list<MxDevice> m_devices;           // 0x178
 	list<MxDisplayMode> m_displayModes; // 0x184
 
-	MxBool operator==(MxDeviceEnumerateElement) const { return TRUE; }
-	MxBool operator<(MxDeviceEnumerateElement) const { return TRUE; }
+	MxBool operator==(MxDriver) const { return TRUE; }
+	MxBool operator<(MxDriver) const { return TRUE; }
 };
 
 // clang-format off
@@ -134,17 +136,23 @@ struct MxDeviceEnumerateElement {
 
 // clang-format off
 // TEMPLATE: LEGO1 0x1009bf50
-// list<MxDeviceEnumerateElement,allocator<MxDeviceEnumerateElement> >::~list<MxDeviceEnumerateElement,allocator<MxDeviceEnumerateElement> >
+// list<MxDriver,allocator<MxDriver> >::~list<MxDriver,allocator<MxDriver> >
 // clang-format on
 
 // TEMPLATE: LEGO1 0x1009bfc0
-// List<MxDeviceEnumerateElement>::~List<MxDeviceEnumerateElement>
+// List<MxDriver>::~List<MxDriver>
 
 // Compiler-generated copy ctor
 // Part of this function are two more synthetic sub-routines,
 // LEGO1 0x1009c400 and LEGO1 0x1009c460
 // SYNTHETIC: LEGO1 0x1009c290
-// MxDeviceEnumerateElement::MxDeviceEnumerateElement
+// MxDriver::MxDriver
+
+// SYNTHETIC: LEGO1 0x1009d450
+// MxDriver::`scalar deleting destructor'
+
+// SYNTHETIC: LEGO1 0x1009d470
+// MxDevice::`scalar deleting destructor'
 
 // VTABLE: LEGO1 0x100db814
 // SIZE 0x14
@@ -167,10 +175,12 @@ class MxDeviceEnumerate {
 	);
 	const char* EnumerateErrorToString(HRESULT p_error);
 	MxS32 ParseDeviceName(const char* p_deviceId);
-	MxS32 ProcessDeviceBytes(MxS32 p_num, GUID& p_guid);
-	MxResult FUN_1009d030(MxS32 p_und1, undefined** p_und2, undefined** p_und3);
-	MxResult FUN_1009d0d0();
+	MxS32 ProcessDeviceBytes(MxS32 p_deviceNum, GUID& p_guid);
+	MxResult GetDevice(MxS32 p_deviceNum, MxDriver*& p_driver, MxDevice*& p_device);
+	MxS32 FUN_1009d0d0();
 	MxResult FUN_1009d210();
+	MxBool FUN_1009d370(MxDriver& p_driver);
+	MxBool FUN_1009d3d0(MxDevice& p_device);
 
 	static void BuildErrorString(const char*, ...);
 	static BOOL CALLBACK
@@ -184,10 +194,12 @@ class MxDeviceEnumerate {
 		LPD3DDEVICEDESC p_HELDesc,
 		LPVOID p_context
 	);
+	static undefined4 FUN_1009d1a0();
+	static undefined4 FUN_1009d1e0();
 
 private:
-	list<MxDeviceEnumerateElement> m_list; // 0x04
-	MxBool m_initialized;                  // 0x10
+	list<MxDriver> m_list; // 0x04
+	MxBool m_initialized;  // 0x10
 };
 
 // VTABLE: LEGO1 0x100d9cc8

From 21d096dcd2fc43e694e285af3722134441a6fa86 Mon Sep 17 00:00:00 2001
From: Misha <106913236+MishaProductions@users.noreply.github.com>
Date: Wed, 3 Jan 2024 23:31:55 -0400
Subject: [PATCH 064/210] implement TowTrackMissionState (#399)

* TowTrackMissionState

* Fixes

---------

Co-authored-by: Christian Semmler <mail@csemmler.com>
---
 LEGO1/towtrackmissionstate.cpp | 51 ++++++++++++++++++++++++++++++++--
 LEGO1/towtrackmissionstate.h   | 21 ++++++++++----
 2 files changed, 64 insertions(+), 8 deletions(-)

diff --git a/LEGO1/towtrackmissionstate.cpp b/LEGO1/towtrackmissionstate.cpp
index cdef8a88..8d3d56b9 100644
--- a/LEGO1/towtrackmissionstate.cpp
+++ b/LEGO1/towtrackmissionstate.cpp
@@ -2,8 +2,55 @@
 
 DECOMP_SIZE_ASSERT(TowTrackMissionState, 0x28)
 
-// STUB: LEGO1 0x1004dd30
+// FUNCTION: LEGO1 0x1004dd30
 TowTrackMissionState::TowTrackMissionState()
 {
-	// TODO
+	m_unk0x12 = 0;
+	m_unk0x14 = 0;
+	m_unk0x16 = 0;
+	m_unk0x08 = 0;
+	m_unk0x18 = 0;
+	m_unk0x0c = 0;
+	m_unk0x1a = 0;
+	m_unk0x10 = 0;
+	m_unk0x1c = 0;
+	m_color1 = 0;
+	m_color2 = 0;
+	m_color3 = 0;
+	m_color4 = 0;
+}
+
+// FUNCTION: LEGO1 0x1004dde0
+MxResult TowTrackMissionState::VTable0x1c(LegoFileStream* p_legoFileStream)
+{
+	if (p_legoFileStream->IsWriteMode()) {
+		p_legoFileStream->FUN_10006030(this->ClassName());
+	}
+
+	if (p_legoFileStream->IsReadMode()) {
+		p_legoFileStream->Write(&m_unk0x12, sizeof(MxU16));
+		p_legoFileStream->Write(&m_unk0x14, sizeof(MxU16));
+		p_legoFileStream->Write(&m_unk0x16, sizeof(MxU16));
+		p_legoFileStream->Write(&m_unk0x18, sizeof(MxU16));
+		p_legoFileStream->Write(&m_unk0x1a, sizeof(MxU16));
+		p_legoFileStream->Write(&m_unk0x1c, sizeof(MxU16));
+		p_legoFileStream->Write(&m_color1, sizeof(MxU16));
+		p_legoFileStream->Write(&m_color2, sizeof(MxU16));
+		p_legoFileStream->Write(&m_color3, sizeof(MxU16));
+		p_legoFileStream->Write(&m_color4, sizeof(MxU16));
+	}
+	else if (p_legoFileStream->IsWriteMode()) {
+		p_legoFileStream->Read(&m_unk0x12, sizeof(MxU16));
+		p_legoFileStream->Read(&m_unk0x14, sizeof(MxU16));
+		p_legoFileStream->Read(&m_unk0x16, sizeof(MxU16));
+		p_legoFileStream->Read(&m_unk0x18, sizeof(MxU16));
+		p_legoFileStream->Read(&m_unk0x1a, sizeof(MxU16));
+		p_legoFileStream->Read(&m_unk0x1c, sizeof(MxU16));
+		p_legoFileStream->Read(&m_color1, sizeof(MxU16));
+		p_legoFileStream->Read(&m_color2, sizeof(MxU16));
+		p_legoFileStream->Read(&m_color3, sizeof(MxU16));
+		p_legoFileStream->Read(&m_color4, sizeof(MxU16));
+	}
+
+	return SUCCESS;
 }
diff --git a/LEGO1/towtrackmissionstate.h b/LEGO1/towtrackmissionstate.h
index 9dc7c587..c0ad3145 100644
--- a/LEGO1/towtrackmissionstate.h
+++ b/LEGO1/towtrackmissionstate.h
@@ -21,6 +21,7 @@ class TowTrackMissionState : public LegoState {
 	{
 		return !strcmp(p_name, TowTrackMissionState::ClassName()) || LegoState::IsA(p_name);
 	}
+	virtual MxResult VTable0x1c(LegoFileStream* p_legoFileStream) override; // vtable+0x1C
 
 	inline MxU16 GetColor(MxU8 p_id)
 	{
@@ -41,12 +42,20 @@ class TowTrackMissionState : public LegoState {
 	}
 
 protected:
-	undefined m_unk0x8[0x14];
-	MxU16 m_color1;
-	MxU16 m_color2;
-	MxU16 m_color3;
-	MxU16 m_color4;
-	MxU16 m_color5;
+	undefined4 m_unk0x08; // 0x08
+	undefined4 m_unk0x0c; // 0x0c
+	MxU8 m_unk0x10;       // 0x10
+	MxU16 m_unk0x12;      // 0x12
+	MxU16 m_unk0x14;      // 0x14
+	MxU16 m_unk0x16;      // 0x16
+	MxU16 m_unk0x18;      // 0x18
+	MxU16 m_unk0x1a;      // 0x1a
+	MxU16 m_unk0x1c;      // 0x1c
+	MxU16 m_color1;       // 0x1e
+	MxU16 m_color2;       // 0x20
+	MxU16 m_color3;       // 0x22
+	MxU16 m_color4;       // 0x24
+	MxU16 m_color5;       // 0x26
 };
 
 #endif // TOWTRACKMISSIONSTATE_H

From d4e7bb11326a73f74715a4097566e9af3cdcaa01 Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Thu, 4 Jan 2024 14:37:15 -0500
Subject: [PATCH 065/210] Implement/match MxDirect3D::SetDevice (#401)

* WIP

* WIP

* WIP

* Rename class

* Rename vars

* Rename function

* Rename

* Rename flag

* Fix deletion of modeArray

* Remove obsolete comment
---
 ISLE/isleapp.cpp           |   2 +-
 LEGO1/legovideomanager.cpp |  16 +++---
 LEGO1/mxdirect3d.cpp       | 101 ++++++++++++++++++++++++++++++++-----
 LEGO1/mxdirect3d.h         |  40 ++++++++++-----
 LEGO1/mxdirectdraw.cpp     |   2 +-
 LEGO1/mxdirectdraw.h       |  80 ++++++++++++++---------------
 6 files changed, 164 insertions(+), 77 deletions(-)

diff --git a/ISLE/isleapp.cpp b/ISLE/isleapp.cpp
index ab0d2290..c402098d 100644
--- a/ISLE/isleapp.cpp
+++ b/ISLE/isleapp.cpp
@@ -388,7 +388,7 @@ LRESULT WINAPI WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 		return DefWindowProcA(hWnd, uMsg, wParam, lParam);
 	case WM_DISPLAYCHANGE:
 		if (g_isle && VideoManager() && g_isle->m_fullScreen && VideoManager()->GetDirect3D()) {
-			if (VideoManager()->GetDirect3D()->GetDeviceModeFinder()) {
+			if (VideoManager()->GetDirect3D()->GetAssignedDevice()) {
 				int targetDepth = wParam;
 				int targetWidth = LOWORD(lParam);
 				int targetHeight = HIWORD(lParam);
diff --git a/LEGO1/legovideomanager.cpp b/LEGO1/legovideomanager.cpp
index a17714fc..1572423f 100644
--- a/LEGO1/legovideomanager.cpp
+++ b/LEGO1/legovideomanager.cpp
@@ -61,7 +61,7 @@ MxResult LegoVideoManager::Create(MxVideoParam& p_videoParam, MxU32 p_frequencyM
 	MxDevice* device = NULL;
 	MxResult result = FAILURE;
 
-	MxDeviceEnumerate100d9cc8 deviceEnumerator;
+	MxDeviceEnumerate100d9cc8 deviceEnumerate;
 	Vector3Data posVec(0.0, 1.25, -50.0);
 	Vector3Data dirVec(0.0, 0.0, 1.0);
 	Vector3Data upVec(0.0, 1.0, 0.0);
@@ -85,24 +85,24 @@ MxResult LegoVideoManager::Create(MxVideoParam& p_videoParam, MxU32 p_frequencyM
 	if (CreateDirect3D() != SUCCESS)
 		goto done;
 
-	if (deviceEnumerator.DoEnumerate() != SUCCESS)
+	if (deviceEnumerate.DoEnumerate() != SUCCESS)
 		goto done;
 
 	if (p_videoParam.GetDeviceName()) {
-		deviceNum = deviceEnumerator.ParseDeviceName(p_videoParam.GetDeviceName());
+		deviceNum = deviceEnumerate.ParseDeviceName(p_videoParam.GetDeviceName());
 		if (deviceNum >= 0) {
-			if ((deviceNum = deviceEnumerator.GetDevice(deviceNum, driver, device)) != SUCCESS)
+			if ((deviceNum = deviceEnumerate.GetDevice(deviceNum, driver, device)) != SUCCESS)
 				deviceNum = -1;
 		}
 	}
 
 	if (deviceNum < 0) {
-		deviceEnumerator.FUN_1009d210();
-		deviceNum = deviceEnumerator.FUN_1009d0d0();
-		deviceEnumerator.GetDevice(deviceNum, driver, device);
+		deviceEnumerate.FUN_1009d210();
+		deviceNum = deviceEnumerate.FUN_1009d0d0();
+		deviceEnumerate.GetDevice(deviceNum, driver, device);
 	}
 
-	m_direct3d->FUN_1009b5f0(deviceEnumerator, driver, device);
+	m_direct3d->SetDevice(deviceEnumerate, driver, device);
 
 	if (!driver->m_ddCaps.dwCaps2 && driver->m_ddCaps.dwSVBRops[7] != 2)
 		p_videoParam.Flags().SetF2bit0(TRUE);
diff --git a/LEGO1/mxdirect3d.cpp b/LEGO1/mxdirect3d.cpp
index 5ea3202c..544252aa 100644
--- a/LEGO1/mxdirect3d.cpp
+++ b/LEGO1/mxdirect3d.cpp
@@ -2,7 +2,7 @@
 
 #include <stdio.h> // for vsprintf
 
-DECOMP_SIZE_ASSERT(MxDeviceModeFinder, 0xe4);
+DECOMP_SIZE_ASSERT(MxAssignedDevice, 0xe4);
 DECOMP_SIZE_ASSERT(MxDirect3D, 0x894);
 DECOMP_SIZE_ASSERT(MxDevice, 0x1a4);
 DECOMP_SIZE_ASSERT(MxDisplayMode, 0x0c);
@@ -15,7 +15,7 @@ MxDirect3D::MxDirect3D()
 	this->m_pDirect3d = NULL;
 	this->m_pDirect3dDevice = NULL;
 	this->m_unk0x88c = NULL;
-	this->m_pDeviceModeFinder = NULL;
+	this->m_assignedDevice = NULL;
 }
 
 // FUNCTION: LEGO1 0x1009b140
@@ -73,16 +73,13 @@ void MxDirect3D::Destroy()
 		this->m_pDirect3d = NULL;
 	}
 
-	if (this->m_pDeviceModeFinder) {
-		delete m_pDeviceModeFinder;
-		this->m_pDeviceModeFinder = NULL;
+	if (this->m_assignedDevice) {
+		delete m_assignedDevice;
+		this->m_assignedDevice = NULL;
 	}
 
-	// This should get deleted by MxDirectDraw::Destroy
-	if (m_pCurrentDeviceModesList) {
-		// delete m_pCurrentDeviceModesList; // missing?
+	if (m_pCurrentDeviceModesList)
 		m_pCurrentDeviceModesList = NULL;
-	}
 
 	MxDirectDraw::Destroy();
 }
@@ -118,27 +115,103 @@ BOOL MxDirect3D::CreateIDirect3D()
 BOOL MxDirect3D::D3DSetMode()
 {
 	// TODO
-	// if (m_pDeviceModeFinder)
+	// if (m_assignedDevice)
 	Error("This device cannot support the current display mode", 0);
 	OutputDebugString("MxDirect3D::D3DSetMode() front lock failed\n");
 	OutputDebugString("MxDirect3D::D3DSetMode() back lock failed\n");
 	return TRUE;
 }
 
-// STUB: LEGO1 0x1009b5f0
-BOOL MxDirect3D::FUN_1009b5f0(MxDeviceEnumerate& p_deviceEnumerator, MxDriver* p_driver, MxDevice* p_device)
+// FUNCTION: LEGO1 0x1009b5f0
+BOOL MxDirect3D::SetDevice(MxDeviceEnumerate& p_deviceEnumerate, MxDriver* p_driver, MxDevice* p_device)
 {
+	if (m_assignedDevice) {
+		delete m_assignedDevice;
+		m_assignedDevice = NULL;
+		m_pCurrentDeviceModesList = NULL;
+	}
+
+	MxAssignedDevice* assignedDevice = new MxAssignedDevice;
+	MxS32 i = 0;
+
+	for (list<MxDriver>::iterator it = p_deviceEnumerate.m_list.begin(); it != p_deviceEnumerate.m_list.end(); it++) {
+		MxDriver& driver = *it;
+
+		if (&driver == p_driver) {
+			assignedDevice->m_deviceInfo = new MxDirectDraw::DeviceModesInfo;
+
+			if (driver.m_guid) {
+				assignedDevice->m_deviceInfo->m_guid = new GUID;
+				memcpy(assignedDevice->m_deviceInfo->m_guid, driver.m_guid, sizeof(GUID));
+			}
+
+			assignedDevice->m_deviceInfo->m_count = driver.m_displayModes.size();
+
+			if (assignedDevice->m_deviceInfo->m_count > 0) {
+				assignedDevice->m_deviceInfo->m_modeArray =
+					new MxDirectDraw::Mode[assignedDevice->m_deviceInfo->m_count];
+
+				MxS32 j = 0;
+				for (list<MxDisplayMode>::iterator it2 = driver.m_displayModes.begin();
+					 it2 != driver.m_displayModes.end();
+					 it2++) {
+					assignedDevice->m_deviceInfo->m_modeArray[j].m_width = (*it2).m_width;
+					assignedDevice->m_deviceInfo->m_modeArray[j].m_height = (*it2).m_height;
+					assignedDevice->m_deviceInfo->m_modeArray[j].m_bitsPerPixel = (*it2).m_bitsPerPixel;
+					j++;
+				}
+			}
+
+			memcpy(
+				&assignedDevice->m_deviceInfo->m_ddcaps,
+				&driver.m_ddCaps,
+				sizeof(assignedDevice->m_deviceInfo->m_ddcaps)
+			);
+
+			if (i == 0)
+				assignedDevice->m_flags |= MxAssignedDevice::Flag_PrimaryDevice;
+
+			for (list<MxDevice>::iterator it2 = driver.m_devices.begin(); it2 != driver.m_devices.end(); it2++) {
+				MxDevice& device = *it2;
+				if (&device != p_device)
+					continue;
+
+				memcpy(&assignedDevice->m_guid, device.m_guid, sizeof(assignedDevice->m_guid));
+
+				D3DDEVICEDESC* desc;
+				if (device.m_HWDesc.dcmColorModel) {
+					assignedDevice->m_flags |= MxAssignedDevice::Flag_HardwareMode;
+					desc = &device.m_HWDesc;
+				}
+				else
+					desc = &device.m_HELDesc;
+
+				memcpy(&assignedDevice->m_desc, desc, sizeof(assignedDevice->m_desc));
+				m_assignedDevice = assignedDevice;
+				m_pCurrentDeviceModesList = assignedDevice->m_deviceInfo;
+				break;
+			}
+		}
+
+		i++;
+	}
+
+	if (!m_assignedDevice) {
+		delete assignedDevice;
+		return FALSE;
+	}
+
 	return TRUE;
 }
 
 // FUNCTION: LEGO1 0x1009b8b0
-MxDeviceModeFinder::MxDeviceModeFinder()
+MxAssignedDevice::MxAssignedDevice()
 {
 	memset(this, 0, sizeof(*this));
 }
 
 // FUNCTION: LEGO1 0x1009b8d0
-MxDeviceModeFinder::~MxDeviceModeFinder()
+MxAssignedDevice::~MxAssignedDevice()
 {
 	if (m_deviceInfo) {
 		delete m_deviceInfo;
diff --git a/LEGO1/mxdirect3d.h b/LEGO1/mxdirect3d.h
index 8b792ac0..4877159b 100644
--- a/LEGO1/mxdirect3d.h
+++ b/LEGO1/mxdirect3d.h
@@ -8,13 +8,25 @@
 
 #include <d3d.h>
 
-// SIZE 0xe4
-class MxDeviceModeFinder {
-public:
-	MxDeviceModeFinder();
-	~MxDeviceModeFinder();
+class MxDirect3D;
 
-	undefined m_pad[0xe0];                       // 0x00
+// SIZE 0xe4
+class MxAssignedDevice {
+public:
+	enum {
+		Flag_HardwareMode = 0x01,
+		Flag_PrimaryDevice = 0x02
+	};
+
+	MxAssignedDevice();
+	~MxAssignedDevice();
+
+	friend class MxDirect3D;
+
+private:
+	GUID m_guid;                                 // 0x00
+	MxU32 m_flags;                               // 0x10
+	D3DDEVICEDESC m_desc;                        // 0x14
 	MxDirectDraw::DeviceModesInfo* m_deviceInfo; // 0xe0
 };
 
@@ -45,18 +57,18 @@ class MxDirect3D : public MxDirectDraw {
 
 	BOOL CreateIDirect3D();
 	BOOL D3DSetMode();
-	BOOL FUN_1009b5f0(MxDeviceEnumerate& p_deviceEnumerator, MxDriver* p_driver, MxDevice* p_device);
+	BOOL SetDevice(MxDeviceEnumerate& p_deviceEnumerate, MxDriver* p_driver, MxDevice* p_device);
 
-	inline MxDeviceModeFinder* GetDeviceModeFinder() { return this->m_pDeviceModeFinder; };
+	inline MxAssignedDevice* GetAssignedDevice() { return this->m_assignedDevice; };
 	inline IDirect3D* GetDirect3D() { return this->m_pDirect3d; }
 	inline IDirect3DDevice* GetDirect3DDevice() { return this->m_pDirect3dDevice; }
 
 private:
-	MxDeviceModeFinder* m_pDeviceModeFinder; // 0x880
-	IDirect3D* m_pDirect3d;                  // 0x884
-	IDirect3DDevice* m_pDirect3dDevice;      // 0x888
-	undefined4 m_unk0x88c;                   // 0x88c
-	undefined4 m_unk0x890;                   // 0x890
+	MxAssignedDevice* m_assignedDevice; // 0x880
+	IDirect3D* m_pDirect3d;             // 0x884
+	IDirect3DDevice* m_pDirect3dDevice; // 0x888
+	undefined4 m_unk0x88c;              // 0x88c
+	undefined4 m_unk0x890;              // 0x890
 };
 
 // SIZE 0x1a4
@@ -197,6 +209,8 @@ class MxDeviceEnumerate {
 	static undefined4 FUN_1009d1a0();
 	static undefined4 FUN_1009d1e0();
 
+	friend class MxDirect3D;
+
 private:
 	list<MxDriver> m_list; // 0x04
 	MxBool m_initialized;  // 0x10
diff --git a/LEGO1/mxdirectdraw.cpp b/LEGO1/mxdirectdraw.cpp
index 12a7cde0..fa030eb8 100644
--- a/LEGO1/mxdirectdraw.cpp
+++ b/LEGO1/mxdirectdraw.cpp
@@ -1127,6 +1127,6 @@ MxDirectDraw::DeviceModesInfo::~DeviceModesInfo()
 	}
 
 	if (m_modeArray != NULL) {
-		delete m_modeArray;
+		delete[] m_modeArray;
 	}
 }
diff --git a/LEGO1/mxdirectdraw.h b/LEGO1/mxdirectdraw.h
index 6d3d190b..ce45a823 100644
--- a/LEGO1/mxdirectdraw.h
+++ b/LEGO1/mxdirectdraw.h
@@ -12,12 +12,8 @@ class MxDirectDraw {
 public:
 	typedef void (*ErrorHandler)(const char*, HRESULT, void*);
 
-	// size 0x0c
+	// SIZE 0x0c
 	struct Mode {
-		MxS32 m_width;
-		MxS32 m_height;
-		MxS32 m_bitsPerPixel;
-
 		MxS32 operator==(const Mode& p_mode) const
 		{
 			return (
@@ -25,50 +21,54 @@ class MxDirectDraw {
 				(m_bitsPerPixel == p_mode.m_bitsPerPixel)
 			);
 		}
+
+		MxS32 m_width;        // 0x00
+		MxS32 m_height;       // 0x04
+		MxS32 m_bitsPerPixel; // 0x08
 	};
 
 	// SIZE 0x17c
 	struct DeviceModesInfo {
-		GUID* m_guid;
-		Mode* m_modeArray;
-		MxS32 m_count;
-		DDCAPS m_ddcaps;
-		void* m_unk0x178;
-
 		DeviceModesInfo();
 		~DeviceModesInfo();
+
+		GUID* m_guid;      // 0x00
+		Mode* m_modeArray; // 0x04
+		MxS32 m_count;     // 0x08
+		DDCAPS m_ddcaps;   // 0x0c
+		void* m_unk0x178;  // 0x178
 	};
 
 protected:
-	BOOL m_bOnlySoftRender;
-	BOOL m_bFlipSurfaces;
-	IDirectDraw* m_pDirectDraw;
-	IDirectDrawSurface* m_pFrontBuffer;
-	IDirectDrawSurface* m_pBackBuffer;
-	IDirectDrawSurface* m_pZBuffer;
-	IDirectDrawSurface* m_pText1Surface;
-	IDirectDrawSurface* m_pText2Surface;
-	IDirectDrawClipper* m_pClipper;
-	IDirectDrawPalette* m_pPalette;
-	PALETTEENTRY m_paletteEntries[256];
-	PALETTEENTRY m_originalPaletteEntries[256];
-	SIZE m_text1SizeOnSurface;
-	SIZE m_text2SizeOnSurface;
-	HWND m_hWndMain;
-	HFONT m_hFont;
-	BOOL m_bIgnoreWMSIZE;
-	BOOL m_bPrimaryPalettized;
-	BOOL m_bFullScreen;
-	void* m_unk0x850;
-	BOOL m_bOnlySystemMemory;
-	BOOL m_bIsOnPrimaryDevice;
-	ErrorHandler m_pErrorHandler;
-	ErrorHandler m_pFatalErrorHandler;
-	void* m_pErrorHandlerArg;
-	void* m_pFatalErrorHandlerArg;
-	int m_pauseCount;
-	DeviceModesInfo* m_pCurrentDeviceModesList;
-	Mode m_currentMode;
+	BOOL m_bOnlySoftRender;                     // 0x04
+	BOOL m_bFlipSurfaces;                       // 0x08
+	IDirectDraw* m_pDirectDraw;                 // 0x0c
+	IDirectDrawSurface* m_pFrontBuffer;         // 0x10
+	IDirectDrawSurface* m_pBackBuffer;          // 0x14
+	IDirectDrawSurface* m_pZBuffer;             // 0x18
+	IDirectDrawSurface* m_pText1Surface;        // 0x1c
+	IDirectDrawSurface* m_pText2Surface;        // 0x20
+	IDirectDrawClipper* m_pClipper;             // 0x24
+	IDirectDrawPalette* m_pPalette;             // 0x28
+	PALETTEENTRY m_paletteEntries[256];         // 0x2c
+	PALETTEENTRY m_originalPaletteEntries[256]; // 0x42c
+	SIZE m_text1SizeOnSurface;                  // 0x82c
+	SIZE m_text2SizeOnSurface;                  // 0x834
+	HWND m_hWndMain;                            // 0x83c
+	HFONT m_hFont;                              // 0x840
+	BOOL m_bIgnoreWMSIZE;                       // 0x844
+	BOOL m_bPrimaryPalettized;                  // 0x848
+	BOOL m_bFullScreen;                         // 0x84c
+	void* m_unk0x850;                           // 0x850
+	BOOL m_bOnlySystemMemory;                   // 0x854
+	BOOL m_bIsOnPrimaryDevice;                  // 0x858
+	ErrorHandler m_pErrorHandler;               // 0x85c
+	ErrorHandler m_pFatalErrorHandler;          // 0x860
+	void* m_pErrorHandlerArg;                   // 0x864
+	void* m_pFatalErrorHandlerArg;              // 0x868
+	int m_pauseCount;                           // 0x86c
+	DeviceModesInfo* m_pCurrentDeviceModesList; // 0x870
+	Mode m_currentMode;                         // 0x87c
 
 public:
 	__declspec(dllexport) int FlipToGDISurface();

From a899b06f5a6d2f8c0c333c3c6a504249169b5fb6 Mon Sep 17 00:00:00 2001
From: Misha <106913236+MishaProductions@users.noreply.github.com>
Date: Thu, 4 Jan 2024 16:35:52 -0400
Subject: [PATCH 066/210] implement MxDirect3D::GetZBufferDepth (#402)

* GetZBufferDepth

* Match

---------

Co-authored-by: Christian Semmler <mail@csemmler.com>
---
 LEGO1/mxdirect3d.cpp | 22 ++++++++++++++++++++++
 LEGO1/mxdirect3d.h   |  3 ++-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/LEGO1/mxdirect3d.cpp b/LEGO1/mxdirect3d.cpp
index 544252aa..517a9aad 100644
--- a/LEGO1/mxdirect3d.cpp
+++ b/LEGO1/mxdirect3d.cpp
@@ -122,6 +122,28 @@ BOOL MxDirect3D::D3DSetMode()
 	return TRUE;
 }
 
+// FUNCTION: LEGO1 0x1009b5a0
+DWORD MxDirect3D::GetZBufferBitDepth(MxAssignedDevice* p_assignedDevice)
+{
+	DWORD bitDepth;
+
+	if (p_assignedDevice->m_desc.dwFlags & D3DDD_DEVICEZBUFFERBITDEPTH)
+		bitDepth = p_assignedDevice->m_desc.dwDeviceZBufferBitDepth;
+	else
+		bitDepth = 0;
+
+	if (bitDepth & DDBD_32)
+		return 32;
+	if (bitDepth & DDBD_24)
+		return 24;
+	if (bitDepth & DDBD_16)
+		return 16;
+	if (bitDepth & DDBD_8)
+		return 8;
+
+	return -1;
+}
+
 // FUNCTION: LEGO1 0x1009b5f0
 BOOL MxDirect3D::SetDevice(MxDeviceEnumerate& p_deviceEnumerate, MxDriver* p_driver, MxDevice* p_device)
 {
diff --git a/LEGO1/mxdirect3d.h b/LEGO1/mxdirect3d.h
index 4877159b..8ad41593 100644
--- a/LEGO1/mxdirect3d.h
+++ b/LEGO1/mxdirect3d.h
@@ -23,7 +23,7 @@ class MxAssignedDevice {
 
 	friend class MxDirect3D;
 
-private:
+public:
 	GUID m_guid;                                 // 0x00
 	MxU32 m_flags;                               // 0x10
 	D3DDEVICEDESC m_desc;                        // 0x14
@@ -57,6 +57,7 @@ class MxDirect3D : public MxDirectDraw {
 
 	BOOL CreateIDirect3D();
 	BOOL D3DSetMode();
+	DWORD GetZBufferBitDepth(MxAssignedDevice* p_assignedDevice);
 	BOOL SetDevice(MxDeviceEnumerate& p_deviceEnumerate, MxDriver* p_driver, MxDevice* p_device);
 
 	inline MxAssignedDevice* GetAssignedDevice() { return this->m_assignedDevice; };

From 54ed98b9d6507e63d4f1e01bf87a22cd2d45d615 Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Thu, 4 Jan 2024 16:16:16 -0500
Subject: [PATCH 067/210] Implement/match MxDirect3D::D3DSetMode (#403)

* Implement/match MxDirect3D::D3DSetMode

* Match
---
 LEGO1/lego3dmanager.h    |  4 +-
 LEGO1/mxdirect3d.cpp     | 87 +++++++++++++++++++++++++++++++++++++---
 LEGO1/mxdirect3d.h       | 14 +++----
 LEGO1/mxdirectdraw.h     |  2 +-
 LEGO1/mxvideomanager.cpp |  2 +-
 LEGO1/mxvideomanager.h   |  4 +-
 LEGO1/tglsurface.h       |  4 +-
 7 files changed, 96 insertions(+), 21 deletions(-)

diff --git a/LEGO1/lego3dmanager.h b/LEGO1/lego3dmanager.h
index 0a856f90..2482218b 100644
--- a/LEGO1/lego3dmanager.h
+++ b/LEGO1/lego3dmanager.h
@@ -19,8 +19,8 @@ class Lego3DManager {
 		IDirectDrawPalette* m_ddPalette;  // 0x14
 		BOOL m_isFullScreen;              // 0x18
 		MxU32 m_flags;                    // 0x1c
-		IDirect3D* m_direct3d;            // 0x20
-		IDirect3DDevice* m_d3dDevice;     // 0x24
+		IDirect3D2* m_direct3d;           // 0x20
+		IDirect3DDevice2* m_d3dDevice;    // 0x24
 	};
 
 	Lego3DManager();
diff --git a/LEGO1/mxdirect3d.cpp b/LEGO1/mxdirect3d.cpp
index 517a9aad..a006b4bb 100644
--- a/LEGO1/mxdirect3d.cpp
+++ b/LEGO1/mxdirect3d.cpp
@@ -111,14 +111,89 @@ BOOL MxDirect3D::CreateIDirect3D()
 	return TRUE;
 }
 
-// STUB: LEGO1 0x1009b310
+// FUNCTION: LEGO1 0x1009b310
 BOOL MxDirect3D::D3DSetMode()
 {
-	// TODO
-	// if (m_assignedDevice)
-	Error("This device cannot support the current display mode", 0);
-	OutputDebugString("MxDirect3D::D3DSetMode() front lock failed\n");
-	OutputDebugString("MxDirect3D::D3DSetMode() back lock failed\n");
+	if (m_assignedDevice->m_flags & MxAssignedDevice::Flag_HardwareMode) {
+		if (m_bOnlySoftRender) {
+			Error("Failed to place vital surfaces in video memory for hardware driver", DDERR_GENERIC);
+			return FALSE;
+		}
+
+		if (m_assignedDevice->m_desc.dpcTriCaps.dwTextureCaps & D3DPTEXTURECAPS_PERSPECTIVE)
+			m_unk0x88c = FALSE;
+		else
+			m_unk0x88c = TRUE;
+
+		DWORD bitDepth = GetZBufferBitDepth(m_assignedDevice);
+		if (!CreateZBuffer(DDSCAPS_VIDEOMEMORY, bitDepth))
+			return FALSE;
+	}
+	else {
+		if (m_assignedDevice->m_desc.dpcTriCaps.dwTextureCaps & D3DPTEXTURECAPS_PERSPECTIVE)
+			m_unk0x88c = FALSE;
+		else
+			m_unk0x88c = TRUE;
+
+		DWORD bitDepth = GetZBufferBitDepth(m_assignedDevice);
+		if (!CreateZBuffer(DDSCAPS_SYSTEMMEMORY, bitDepth))
+			return FALSE;
+	}
+
+	HRESULT result = m_pDirect3d->CreateDevice(m_assignedDevice->m_guid, m_pBackBuffer, &m_pDirect3dDevice);
+
+	if (result != DD_OK) {
+		Error("Create D3D device failed", result);
+		return FALSE;
+	}
+
+	MxDirectDraw::Mode mode = m_currentMode;
+
+	if (m_bFullScreen && !IsSupportedMode(mode.m_width, mode.m_height, mode.m_bitsPerPixel)) {
+		Error("This device cannot support the current display mode", DDERR_GENERIC);
+		return FALSE;
+	}
+
+	LPDIRECTDRAWSURFACE frontBuffer = m_pFrontBuffer;
+	LPDIRECTDRAWSURFACE backBuffer = m_pBackBuffer;
+
+	DDSURFACEDESC desc;
+	memset(&desc, 0, sizeof(desc));
+	desc.dwSize = sizeof(desc);
+
+	if (backBuffer->Lock(NULL, &desc, DDLOCK_WAIT, NULL) == DD_OK) {
+		MxU8* surface = (MxU8*) desc.lpSurface;
+
+		for (MxS32 i = mode.m_height; i > 0; i--) {
+			memset(surface, 0, mode.m_width * desc.ddpfPixelFormat.dwRGBBitCount / 8);
+			surface += desc.lPitch;
+		}
+
+		backBuffer->Unlock(desc.lpSurface);
+	}
+	else {
+		OutputDebugString("MxDirect3D::D3DSetMode() back lock failed\n");
+	}
+
+	if (m_bFullScreen) {
+		memset(&desc, 0, sizeof(desc));
+		desc.dwSize = sizeof(desc);
+
+		if (frontBuffer->Lock(NULL, &desc, DDLOCK_WAIT, NULL) == DD_OK) {
+			MxU8* surface = (MxU8*) desc.lpSurface;
+
+			for (MxS32 i = mode.m_height; i > 0; i--) {
+				memset(surface, 0, mode.m_width * desc.ddpfPixelFormat.dwRGBBitCount / 8);
+				surface += desc.lPitch;
+			}
+
+			frontBuffer->Unlock(desc.lpSurface);
+		}
+		else {
+			OutputDebugString("MxDirect3D::D3DSetMode() front lock failed\n");
+		}
+	}
+
 	return TRUE;
 }
 
diff --git a/LEGO1/mxdirect3d.h b/LEGO1/mxdirect3d.h
index 8ad41593..41cafad9 100644
--- a/LEGO1/mxdirect3d.h
+++ b/LEGO1/mxdirect3d.h
@@ -61,15 +61,15 @@ class MxDirect3D : public MxDirectDraw {
 	BOOL SetDevice(MxDeviceEnumerate& p_deviceEnumerate, MxDriver* p_driver, MxDevice* p_device);
 
 	inline MxAssignedDevice* GetAssignedDevice() { return this->m_assignedDevice; };
-	inline IDirect3D* GetDirect3D() { return this->m_pDirect3d; }
-	inline IDirect3DDevice* GetDirect3DDevice() { return this->m_pDirect3dDevice; }
+	inline IDirect3D2* GetDirect3D() { return this->m_pDirect3d; }
+	inline IDirect3DDevice2* GetDirect3DDevice() { return this->m_pDirect3dDevice; }
 
 private:
-	MxAssignedDevice* m_assignedDevice; // 0x880
-	IDirect3D* m_pDirect3d;             // 0x884
-	IDirect3DDevice* m_pDirect3dDevice; // 0x888
-	undefined4 m_unk0x88c;              // 0x88c
-	undefined4 m_unk0x890;              // 0x890
+	MxAssignedDevice* m_assignedDevice;  // 0x880
+	IDirect3D2* m_pDirect3d;             // 0x884
+	IDirect3DDevice2* m_pDirect3dDevice; // 0x888
+	BOOL m_unk0x88c;                     // 0x88c
+	undefined4 m_unk0x890;               // 0x890
 };
 
 // SIZE 0x1a4
diff --git a/LEGO1/mxdirectdraw.h b/LEGO1/mxdirectdraw.h
index ce45a823..248537cd 100644
--- a/LEGO1/mxdirectdraw.h
+++ b/LEGO1/mxdirectdraw.h
@@ -68,7 +68,7 @@ class MxDirectDraw {
 	void* m_pFatalErrorHandlerArg;              // 0x868
 	int m_pauseCount;                           // 0x86c
 	DeviceModesInfo* m_pCurrentDeviceModesList; // 0x870
-	Mode m_currentMode;                         // 0x87c
+	Mode m_currentMode;                         // 0x874
 
 public:
 	__declspec(dllexport) int FlipToGDISurface();
diff --git a/LEGO1/mxvideomanager.cpp b/LEGO1/mxvideomanager.cpp
index 3ffd8e7a..5ce00bab 100644
--- a/LEGO1/mxvideomanager.cpp
+++ b/LEGO1/mxvideomanager.cpp
@@ -120,7 +120,7 @@ void MxVideoManager::SortPresenterList()
 MxResult MxVideoManager::VTable0x28(
 	MxVideoParam& p_videoParam,
 	LPDIRECTDRAW p_pDirectDraw,
-	LPDIRECT3D p_pDirect3D,
+	LPDIRECT3D2 p_pDirect3D,
 	LPDIRECTDRAWSURFACE p_ddSurface1,
 	LPDIRECTDRAWSURFACE p_ddSurface2,
 	LPDIRECTDRAWCLIPPER p_ddClipper,
diff --git a/LEGO1/mxvideomanager.h b/LEGO1/mxvideomanager.h
index 4b458f1b..41a7ce93 100644
--- a/LEGO1/mxvideomanager.h
+++ b/LEGO1/mxvideomanager.h
@@ -21,7 +21,7 @@ class MxVideoManager : public MxMediaManager {
 	virtual MxResult VTable0x28(
 		MxVideoParam& p_videoParam,
 		LPDIRECTDRAW p_pDirectDraw,
-		LPDIRECT3D p_pDirect3D,
+		LPDIRECT3D2 p_pDirect3D,
 		LPDIRECTDRAWSURFACE p_ddSurface1,
 		LPDIRECTDRAWSURFACE p_ddSurface2,
 		LPDIRECTDRAWCLIPPER p_ddClipper,
@@ -47,7 +47,7 @@ class MxVideoManager : public MxMediaManager {
 protected:
 	MxVideoParam m_videoParam;          // 0x2c
 	LPDIRECTDRAW m_pDirectDraw;         // 0x50
-	LPDIRECT3D m_pDirect3D;             // 0x54
+	LPDIRECT3D2 m_pDirect3D;            // 0x54
 	MxDisplaySurface* m_displaySurface; // 0x58
 	MxRegion* m_region;                 // 0x5c
 	MxBool m_unk0x60;                   // 0x60
diff --git a/LEGO1/tglsurface.h b/LEGO1/tglsurface.h
index bafb2fb3..01bfad78 100644
--- a/LEGO1/tglsurface.h
+++ b/LEGO1/tglsurface.h
@@ -19,8 +19,8 @@ class TglSurface {
 		IDirectDrawPalette* m_ddPalette;  // 0x14
 		BOOL m_isFullScreen;              // 0x18
 		MxU32 m_flags;                    // 0x1c
-		IDirect3D* m_direct3d;            // 0x20
-		IDirect3DDevice* m_d3dDevice;     // 0x24
+		IDirect3D2* m_direct3d;           // 0x20
+		IDirect3DDevice2* m_d3dDevice;    // 0x24
 	};
 };
 

From 5aef35d9c7b80d713724eb88202a3f196d37becd Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Thu, 4 Jan 2024 06:35:28 -0500
Subject: [PATCH 068/210] Fix member visibility

---
 LEGO1/mxdirect3d.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LEGO1/mxdirect3d.h b/LEGO1/mxdirect3d.h
index 41cafad9..c0aea3e4 100644
--- a/LEGO1/mxdirect3d.h
+++ b/LEGO1/mxdirect3d.h
@@ -23,7 +23,7 @@ class MxAssignedDevice {
 
 	friend class MxDirect3D;
 
-public:
+private:
 	GUID m_guid;                                 // 0x00
 	MxU32 m_flags;                               // 0x10
 	D3DDEVICEDESC m_desc;                        // 0x14

From eeb980fa0ffb129781edea5882e01912925e36fb Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Thu, 4 Jan 2024 16:46:16 -0500
Subject: [PATCH 069/210] Let game boot again (#404)

---
 LEGO1/lego3dview.cpp              |  2 +-
 LEGO1/viewmanager/viewlodlist.cpp | 26 +++++++++++++++++++++++---
 LEGO1/viewmanager/viewlodlist.h   |  2 +-
 3 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/LEGO1/lego3dview.cpp b/LEGO1/lego3dview.cpp
index efe79db1..b9576815 100644
--- a/LEGO1/lego3dview.cpp
+++ b/LEGO1/lego3dview.cpp
@@ -18,7 +18,7 @@ Lego3DView::~Lego3DView()
 // STUB: LEGO1 0x100aaf90
 BOOL Lego3DView::Create(TglSurface::CreateStruct& p_createStruct, Tgl::Renderer* p_renderer)
 {
-	return FALSE;
+	return TRUE;
 }
 
 // STUB: LEGO1 0x100ab100
diff --git a/LEGO1/viewmanager/viewlodlist.cpp b/LEGO1/viewmanager/viewlodlist.cpp
index 50628b18..9a8456fc 100644
--- a/LEGO1/viewmanager/viewlodlist.cpp
+++ b/LEGO1/viewmanager/viewlodlist.cpp
@@ -16,10 +16,30 @@ ViewLODListManager::~ViewLODListManager()
 }
 
 // STUB: LEGO1 0x100a72c0
-ViewLODList* ViewLODListManager::Create(const ROIName&, int lodCount)
+ViewLODList* ViewLODListManager::Create(const ROIName& rROIName, int lodCount)
 {
-	// TODO
-	return NULL;
+	// returned ViewLODList has a refCount of 1, i.e. caller must call Release()
+	// when it no longer holds on to the list
+
+	ViewLODList* pLODList;
+	int refCount;
+	char* pROIName;
+
+	assert(!Lookup(rROIName));
+
+	pLODList = new ViewLODList(lodCount);
+	refCount = pLODList->AddRef();
+	assert(refCount == 1);
+
+	pROIName = new char[strlen(rROIName) + 1];
+	strcpy(pROIName, rROIName);
+
+	m_map[pROIName] = pLODList;
+
+	// NOTE: Lookup() adds a refCount
+	assert((Lookup(rROIName) == pLODList) && (pLODList->Release() == 1));
+
+	return pLODList;
 }
 
 // STUB: LEGO1 0x100a7680
diff --git a/LEGO1/viewmanager/viewlodlist.h b/LEGO1/viewmanager/viewlodlist.h
index fe86f04e..c0d5ed82 100644
--- a/LEGO1/viewmanager/viewlodlist.h
+++ b/LEGO1/viewmanager/viewlodlist.h
@@ -75,7 +75,7 @@ class ViewLODListManager {
 	// creates an LODList with room for lodCount LODs for a named ROI
 	// returned LODList has a refCount of 1, i.e. caller must call Release()
 	// when it no longer holds on to the list
-	ViewLODList* Create(const ROIName&, int lodCount);
+	ViewLODList* Create(const ROIName& rROIName, int lodCount);
 
 	// returns an LODList for a named ROI
 	// returned LODList's refCount is increased, i.e. caller must call Release()

From ce68a7b1f49f54dbe32d038bd648bbea1131ac5f Mon Sep 17 00:00:00 2001
From: MS <disinvite@users.noreply.github.com>
Date: Thu, 4 Jan 2024 18:12:55 -0500
Subject: [PATCH 070/210] Reccmp comparison engine refactor (#405)

* Reccmp comparison engine refactor

* Remove redundant references to 'entry' symbol
---
 LEGO1/library_msvc.h                          |   8 -
 tools/isledecomp/isledecomp/__init__.py       |   1 -
 tools/isledecomp/isledecomp/bin.py            |  89 ++++++-
 .../isledecomp/isledecomp/compare/__init__.py |   1 +
 tools/isledecomp/isledecomp/compare/core.py   | 149 +++++++++++
 tools/isledecomp/isledecomp/compare/db.py     | 149 +++++++++++
 tools/isledecomp/isledecomp/compare/lines.py  |  58 ++++
 .../isledecomp/isledecomp/cvdump/__init__.py  |   1 +
 .../isledecomp/isledecomp/cvdump/analysis.py  | 184 +++++++++++++
 .../isledecomp/isledecomp/cvdump/demangler.py |  74 ++++++
 tools/isledecomp/isledecomp/cvdump/parser.py  |  40 ++-
 .../isledecomp/isledecomp/parser/__init__.py  |   1 +
 .../isledecomp/isledecomp/parser/codebase.py  |  44 ++++
 tools/isledecomp/isledecomp/parser/parser.py  |   7 +-
 tools/isledecomp/isledecomp/syminfo.py        | 107 --------
 tools/isledecomp/isledecomp/types.py          |  12 +
 tools/isledecomp/tests/test_cvdump.py         |  39 +++
 tools/isledecomp/tests/test_demangler.py      |  55 ++++
 tools/reccmp/reccmp.py                        | 247 ++++++++----------
 19 files changed, 987 insertions(+), 279 deletions(-)
 create mode 100644 tools/isledecomp/isledecomp/compare/__init__.py
 create mode 100644 tools/isledecomp/isledecomp/compare/core.py
 create mode 100644 tools/isledecomp/isledecomp/compare/db.py
 create mode 100644 tools/isledecomp/isledecomp/compare/lines.py
 create mode 100644 tools/isledecomp/isledecomp/cvdump/analysis.py
 create mode 100644 tools/isledecomp/isledecomp/cvdump/demangler.py
 create mode 100644 tools/isledecomp/isledecomp/parser/codebase.py
 delete mode 100644 tools/isledecomp/isledecomp/syminfo.py
 create mode 100644 tools/isledecomp/isledecomp/types.py
 create mode 100644 tools/isledecomp/tests/test_cvdump.py
 create mode 100644 tools/isledecomp/tests/test_demangler.py

diff --git a/LEGO1/library_msvc.h b/LEGO1/library_msvc.h
index c46154a8..20ae06ef 100644
--- a/LEGO1/library_msvc.h
+++ b/LEGO1/library_msvc.h
@@ -40,14 +40,6 @@
 // LIBRARY: LEGO1 0x1008b640
 // _rand
 
-// entry
-// LIBRARY: ISLE 0x4082e0
-// _WinMainCRTStartup
-
-// entry
-// LIBRARY: LEGO1 0x1008c860
-// __DllMainCRTStartup@12
-
 // LIBRARY: ISLE 0x409110
 // __mtinit
 
diff --git a/tools/isledecomp/isledecomp/__init__.py b/tools/isledecomp/isledecomp/__init__.py
index a95f1869..59c55869 100644
--- a/tools/isledecomp/isledecomp/__init__.py
+++ b/tools/isledecomp/isledecomp/__init__.py
@@ -1,5 +1,4 @@
 from .bin import *
 from .dir import *
 from .parser import *
-from .syminfo import *
 from .utils import *
diff --git a/tools/isledecomp/isledecomp/bin.py b/tools/isledecomp/isledecomp/bin.py
index 16f70f7a..26dd00f8 100644
--- a/tools/isledecomp/isledecomp/bin.py
+++ b/tools/isledecomp/isledecomp/bin.py
@@ -1,3 +1,4 @@
+import logging
 import struct
 from typing import List, Optional
 from dataclasses import dataclass
@@ -51,12 +52,17 @@ class ImageSectionHeader:
     number_of_line_numbers: int
     characteristics: int
 
+    @property
+    def extent(self):
+        """Get the highest possible offset of this section"""
+        return max(self.size_of_raw_data, self.virtual_size)
+
     def match_name(self, name: str) -> bool:
         return self.name == struct.pack("8s", name.encode("ascii"))
 
     def contains_vaddr(self, vaddr: int) -> bool:
         ofs = vaddr - self.virtual_address
-        return 0 <= ofs < max(self.size_of_raw_data, self.virtual_size)
+        return 0 <= ofs < self.extent
 
     def addr_is_uninitialized(self, vaddr: int) -> bool:
         """We cannot rely on the IMAGE_SCN_CNT_UNINITIALIZED_DATA flag (0x80) in
@@ -71,25 +77,29 @@ def addr_is_uninitialized(self, vaddr: int) -> bool:
         )
 
 
+logger = logging.getLogger(__name__)
+
+
 class Bin:
     """Parses a PE format EXE and allows reading data from a virtual address.
     Reference: https://learn.microsoft.com/en-us/windows/win32/debug/pe-format"""
 
     # pylint: disable=too-many-instance-attributes
 
-    def __init__(self, filename: str, logger=None) -> None:
-        self.logger = logger
-        self._debuglog(f'Parsing headers of "{filename}"... ')
+    def __init__(self, filename: str, find_str: bool = False) -> None:
+        logger.debug('Parsing headers of "%s"... ', filename)
         self.filename = filename
         self.file = None
         self.imagebase = None
         self.entry = None
         self.sections: List[ImageSectionHeader] = []
         self.last_section = None
+        self.find_str = find_str
+        self._potential_strings = {}
         self._relocated_addrs = set()
 
     def __enter__(self):
-        self._debuglog(f"Bin {self.filename} Enter")
+        logger.debug("Bin %s Enter", self.filename)
         self.file = open(self.filename, "rb")
 
         (mz_str,) = struct.unpack("2s", self.file.read(2))
@@ -123,28 +133,71 @@ def __enter__(self):
 
         self._populate_relocations()
 
+        # This is a (semi) expensive lookup that is not necesssary in every case.
+        # We can find strings in the original if we have coverage using STRING markers.
+        # For the recomp, we can find strings using the PDB.
+        if self.find_str:
+            self._prepare_string_search()
+
         text_section = self._get_section_by_name(".text")
         self.last_section = text_section
 
-        self._debuglog("... Parsing finished")
+        logger.debug("... Parsing finished")
         return self
 
     def __exit__(self, exc_type, exc_value, exc_traceback):
-        self._debuglog(f"Bin {self.filename} Exit")
+        logger.debug("Bin %s Exit", self.filename)
         if self.file:
             self.file.close()
 
-    def _debuglog(self, msg):
-        """Write to the logger, if present"""
-        if self.logger is not None:
-            self.logger.debug(msg)
-
     def get_relocated_addresses(self) -> List[int]:
         return sorted(self._relocated_addrs)
 
+    def find_string(self, target: str) -> Optional[int]:
+        # Pad with null terminator to make sure we don't
+        # match on a subset of the full string
+        if not target.endswith(b"\x00"):
+            target += b"\x00"
+
+        c = target[0]
+        if c not in self._potential_strings:
+            return None
+
+        for addr in self._potential_strings[c]:
+            if target == self.read(addr, len(target)):
+                return addr
+
+        return None
+
     def is_relocated_addr(self, vaddr) -> bool:
         return vaddr in self._relocated_addrs
 
+    def _prepare_string_search(self):
+        """We are intersted in deduplicated string constants found in the
+        .rdata and .data sections. For each relocated address in these sections,
+        read the first byte and save the address if that byte is an ASCII character.
+        When we search for an arbitrary string later, we can narrow down the list
+        of potential locations by a lot."""
+
+        def is_ascii(b):
+            return b" " <= b < b"\x7f"
+
+        sect_data = self._get_section_by_name(".data")
+        sect_rdata = self._get_section_by_name(".rdata")
+        potentials = filter(
+            lambda a: sect_data.contains_vaddr(a) or sect_rdata.contains_vaddr(a),
+            self.get_relocated_addresses(),
+        )
+
+        for addr in potentials:
+            c = self.read(addr, 1)
+            if c is not None and is_ascii(c):
+                k = ord(c)
+                if k not in self._potential_strings:
+                    self._potential_strings[k] = set()
+
+                self._potential_strings[k].add(addr)
+
     def _populate_relocations(self):
         """The relocation table in .reloc gives each virtual address where the next four
         bytes are, itself, another virtual address. During loading, these values will be
@@ -212,6 +265,9 @@ def _get_section_by_name(self, name: str):
 
         return section
 
+    def get_section_extent_by_index(self, index: int) -> int:
+        return self.sections[index - 1].extent
+
     def get_section_offset_by_index(self, index: int) -> int:
         """The symbols output from cvdump gives addresses in this format: AAAA.BBBBBBBB
         where A is the index (1-based) into the section table and B is the local offset.
@@ -242,6 +298,15 @@ def get_raw_addr(self, vaddr: int) -> int:
             + self.last_section.pointer_to_raw_data
         )
 
+    def is_valid_section(self, section: int) -> bool:
+        """The PDB will refer to sections that are not listed in the headers
+        and so should ignore these references."""
+        try:
+            _ = self.sections[section - 1]
+            return True
+        except IndexError:
+            return False
+
     def is_valid_vaddr(self, vaddr: int) -> bool:
         """Does this virtual address point to anything in the exe?"""
         section = next(
diff --git a/tools/isledecomp/isledecomp/compare/__init__.py b/tools/isledecomp/isledecomp/compare/__init__.py
new file mode 100644
index 00000000..f8d18500
--- /dev/null
+++ b/tools/isledecomp/isledecomp/compare/__init__.py
@@ -0,0 +1 @@
+from .core import Compare
diff --git a/tools/isledecomp/isledecomp/compare/core.py b/tools/isledecomp/isledecomp/compare/core.py
new file mode 100644
index 00000000..07860203
--- /dev/null
+++ b/tools/isledecomp/isledecomp/compare/core.py
@@ -0,0 +1,149 @@
+import os
+import logging
+from typing import List, Optional
+from isledecomp.cvdump.demangler import demangle_string_const
+from isledecomp.cvdump import Cvdump, CvdumpAnalysis
+from isledecomp.parser import DecompCodebase
+from isledecomp.dir import walk_source_dir
+from isledecomp.types import SymbolType
+from .db import CompareDb, MatchInfo
+from .lines import LinesDb
+
+
+logger = logging.getLogger(__name__)
+
+
+class Compare:
+    # pylint: disable=too-many-instance-attributes
+    def __init__(self, orig_bin, recomp_bin, pdb_file, code_dir):
+        self.orig_bin = orig_bin
+        self.recomp_bin = recomp_bin
+        self.pdb_file = pdb_file
+        self.code_dir = code_dir
+
+        self._lines_db = LinesDb(code_dir)
+        self._db = CompareDb()
+
+        self._load_cvdump()
+        self._load_markers()
+        self._find_original_strings()
+
+    def _load_cvdump(self):
+        logger.info("Parsing %s ...", self.pdb_file)
+        cv = (
+            Cvdump(self.pdb_file)
+            .lines()
+            .globals()
+            .publics()
+            .symbols()
+            .section_contributions()
+            .run()
+        )
+        res = CvdumpAnalysis(cv)
+
+        for sym in res.nodes:
+            # The PDB might contain sections that do not line up with the
+            # actual binary. The symbol "__except_list" is one example.
+            # In these cases, just skip this symbol and move on because
+            # we can't do much with it.
+            if not self.recomp_bin.is_valid_section(sym.section):
+                continue
+
+            addr = self.recomp_bin.get_abs_addr(sym.section, sym.offset)
+
+            # If this symbol is the final one in its section, we were not able to
+            # estimate its size because we didn't have the total size of that section.
+            # We can get this estimate now and assume that the final symbol occupies
+            # the remainder of the section.
+            if sym.estimated_size is None:
+                sym.estimated_size = (
+                    self.recomp_bin.get_section_extent_by_index(sym.section)
+                    - sym.offset
+                )
+
+            if sym.node_type == SymbolType.STRING:
+                string_info = demangle_string_const(sym.decorated_name)
+                # TODO: skip unicode for now. will need to handle these differently.
+                if string_info.is_utf16:
+                    continue
+
+                raw = self.recomp_bin.read(addr, sym.size())
+                try:
+                    sym.friendly_name = raw.decode("latin1")
+                except UnicodeDecodeError:
+                    pass
+
+            self._db.set_recomp_symbol(addr, sym.node_type, sym.name(), sym.size())
+
+        for lineref in cv.lines:
+            addr = self.recomp_bin.get_abs_addr(lineref.section, lineref.offset)
+            self._lines_db.add_line(lineref.filename, lineref.line_no, addr)
+
+        # The _entry symbol is referenced in the PE header so we get this match for free.
+        self._db.set_function_pair(self.orig_bin.entry, self.recomp_bin.entry)
+
+    def _load_markers(self):
+        # Guess at module name from PDB file name
+        # reccmp checks the original binary filename; we could use this too
+        (module, _) = os.path.splitext(os.path.basename(self.pdb_file))
+
+        codefiles = list(walk_source_dir(self.code_dir))
+        codebase = DecompCodebase(codefiles, module)
+
+        # Match lineref functions first because this is a guaranteed match.
+        # If we have two functions that share the same name, and one is
+        # a lineref, we can match the nameref correctly because the lineref
+        # was already removed from consideration.
+        for fun in codebase.iter_line_functions():
+            recomp_addr = self._lines_db.search_line(fun.filename, fun.line_number)
+            if recomp_addr is not None:
+                self._db.set_function_pair(fun.offset, recomp_addr)
+                if fun.should_skip():
+                    self._db.skip_compare(fun.offset)
+
+        for fun in codebase.iter_name_functions():
+            self._db.match_function(fun.offset, fun.name)
+            if fun.should_skip():
+                self._db.skip_compare(fun.offset)
+
+        for var in codebase.iter_variables():
+            self._db.match_variable(var.offset, var.name)
+
+        for tbl in codebase.iter_vtables():
+            self._db.match_vtable(tbl.offset, tbl.name)
+
+    def _find_original_strings(self):
+        """Go to the original binary and look for the specified string constants
+        to find a match. This is a (relatively) expensive operation so we only
+        look at strings that we have not already matched via a STRING annotation."""
+
+        for string in self._db.get_unmatched_strings():
+            addr = self.orig_bin.find_string(string.encode("latin1"))
+            if addr is None:
+                escaped = repr(string)
+                logger.debug("Failed to find this string in the original: %s", escaped)
+                continue
+
+            self._db.match_string(addr, string)
+
+    def get_one_function(self, addr: int) -> Optional[MatchInfo]:
+        """i.e. verbose mode for reccmp"""
+        return self._db.get_one_function(addr)
+
+    def get_functions(self) -> List[MatchInfo]:
+        return self._db.get_matches(SymbolType.FUNCTION)
+
+    def compare_functions(self):
+        pass
+
+    def compare_variables(self):
+        pass
+
+    def compare_pointers(self):
+        pass
+
+    def compare_strings(self):
+        pass
+
+    def compare_vtables(self):
+        pass
diff --git a/tools/isledecomp/isledecomp/compare/db.py b/tools/isledecomp/isledecomp/compare/db.py
new file mode 100644
index 00000000..850f25fd
--- /dev/null
+++ b/tools/isledecomp/isledecomp/compare/db.py
@@ -0,0 +1,149 @@
+"""Wrapper for database (here an in-memory sqlite database) that collects the
+addresses/symbols that we want to compare between the original and recompiled binaries."""
+import sqlite3
+import logging
+from collections import namedtuple
+from typing import List, Optional
+from isledecomp.types import SymbolType
+
+_SETUP_SQL = """
+    DROP TABLE IF EXISTS `symbols`;
+    CREATE TABLE `symbols` (
+        compare_type int,
+        orig_addr int,
+        recomp_addr int,
+        name text,
+        size int,
+        should_skip int default(FALSE)
+    );
+    CREATE INDEX `symbols_re` ON `symbols` (recomp_addr);
+    CREATE INDEX `symbols_na` ON `symbols` (compare_type, name);    
+"""
+
+
+MatchInfo = namedtuple("MatchInfo", "orig_addr, recomp_addr, size, name")
+
+
+def matchinfo_factory(_, row):
+    return MatchInfo(*row)
+
+
+logger = logging.getLogger(__name__)
+
+
+class CompareDb:
+    def __init__(self):
+        self._db = sqlite3.connect(":memory:")
+        self._db.executescript(_SETUP_SQL)
+
+    def set_recomp_symbol(
+        self,
+        addr: int,
+        compare_type: Optional[SymbolType],
+        name: Optional[str],
+        size: Optional[int],
+    ):
+        compare_value = compare_type.value if compare_type is not None else None
+        self._db.execute(
+            "INSERT INTO `symbols` (recomp_addr, compare_type, name, size) VALUES (?,?,?,?)",
+            (addr, compare_value, name, size),
+        )
+
+    def get_unmatched_strings(self) -> List[str]:
+        """Return any strings not already identified by STRING markers."""
+
+        cur = self._db.execute(
+            "SELECT name FROM `symbols` WHERE compare_type = ? AND orig_addr IS NULL",
+            (SymbolType.STRING.value,),
+        )
+
+        return [string for (string,) in cur.fetchall()]
+
+    def get_one_function(self, addr: int) -> Optional[MatchInfo]:
+        cur = self._db.execute(
+            """SELECT orig_addr, recomp_addr, size, name
+            FROM `symbols`
+            WHERE compare_type = ?
+            AND orig_addr = ?
+            AND recomp_addr IS NOT NULL
+            AND should_skip IS FALSE
+            ORDER BY orig_addr
+            """,
+            (SymbolType.FUNCTION.value, addr),
+        )
+        cur.row_factory = matchinfo_factory
+        return cur.fetchone()
+
+    def get_matches(self, compare_type: SymbolType) -> List[MatchInfo]:
+        cur = self._db.execute(
+            """SELECT orig_addr, recomp_addr, size, name
+            FROM `symbols`
+            WHERE compare_type = ?
+            AND orig_addr IS NOT NULL
+            AND recomp_addr IS NOT NULL
+            AND should_skip IS FALSE
+            ORDER BY orig_addr
+            """,
+            (compare_type.value,),
+        )
+        cur.row_factory = matchinfo_factory
+
+        return cur.fetchall()
+
+    def set_function_pair(self, orig: int, recomp: int) -> bool:
+        """For lineref match or _entry"""
+        cur = self._db.execute(
+            "UPDATE `symbols` SET orig_addr = ?, compare_type = ? WHERE recomp_addr = ?",
+            (orig, SymbolType.FUNCTION.value, recomp),
+        )
+
+        return cur.rowcount > 0
+        # TODO: Both ways required?
+
+    def skip_compare(self, orig: int):
+        self._db.execute(
+            "UPDATE `symbols` SET should_skip = TRUE WHERE orig_addr = ?", (orig,)
+        )
+
+    def _match_on(self, compare_type: SymbolType, addr: int, name: str) -> bool:
+        # Update the compare_type here too since the marker tells us what we should do
+        logger.debug("Looking for %s %s", compare_type.name.lower(), name)
+        cur = self._db.execute(
+            """UPDATE `symbols`
+            SET orig_addr = ?, compare_type = ?
+            WHERE name = ?
+            AND orig_addr IS NULL
+            AND (compare_type = ? OR compare_type IS NULL)""",
+            (addr, compare_type.value, name, compare_type.value),
+        )
+
+        return cur.rowcount > 0
+
+    def match_function(self, addr: int, name: str) -> bool:
+        did_match = self._match_on(SymbolType.FUNCTION, addr, name)
+        if not did_match:
+            logger.error("Failed to find function symbol with name: %s", name)
+
+        return did_match
+
+    def match_vtable(self, addr: int, name: str) -> bool:
+        did_match = self._match_on(SymbolType.VTABLE, addr, name)
+        if not did_match:
+            logger.error("Failed to find vtable for class: %s", name)
+
+        return did_match
+
+    def match_variable(self, addr: int, name: str) -> bool:
+        did_match = self._match_on(SymbolType.DATA, addr, name) or self._match_on(
+            SymbolType.POINTER, addr, name
+        )
+        if not did_match:
+            logger.error("Failed to find variable: %s", name)
+
+        return did_match
+
+    def match_string(self, addr: int, value: str) -> bool:
+        did_match = self._match_on(SymbolType.STRING, addr, value)
+        if not did_match:
+            escaped = repr(value)
+            logger.error("Failed to find string: %s", escaped)
diff --git a/tools/isledecomp/isledecomp/compare/lines.py b/tools/isledecomp/isledecomp/compare/lines.py
new file mode 100644
index 00000000..ced3c117
--- /dev/null
+++ b/tools/isledecomp/isledecomp/compare/lines.py
@@ -0,0 +1,58 @@
+"""Database used to match (filename, line_number) pairs
+between FUNCTION markers and PDB analysis."""
+import sqlite3
+import logging
+from typing import Optional
+from pathlib import Path
+from isledecomp.dir import PathResolver
+
+
+_SETUP_SQL = """
+    DROP TABLE IF EXISTS `lineref`;
+    CREATE TABLE `lineref` (
+        path text not null,
+        filename text not null,
+        line int not null,
+        addr int not null
+    );
+    CREATE INDEX `file_line` ON `lineref` (filename, line);
+"""
+
+
+logger = logging.getLogger(__name__)
+
+
+class LinesDb:
+    def __init__(self, code_dir) -> None:
+        self._db = sqlite3.connect(":memory:")
+        self._db.executescript(_SETUP_SQL)
+        self._path_resolver = PathResolver(code_dir)
+
+    def add_line(self, path: str, line_no: int, addr: int):
+        """To be added from the LINES section of cvdump."""
+        sourcepath = self._path_resolver.resolve_cvdump(path)
+        filename = Path(sourcepath).name.lower()
+
+        self._db.execute(
+            "INSERT INTO `lineref` (path, filename, line, addr) VALUES (?,?,?,?)",
+            (sourcepath, filename, line_no, addr),
+        )
+
+    def search_line(self, path: str, line_no: int) -> Optional[int]:
+        """Using path and line number from FUNCTION marker,
+        get the address of this function in the recomp."""
+        filename = Path(path).name.lower()
+        cur = self._db.execute(
+            "SELECT path, addr FROM `lineref` WHERE filename = ? AND line = ?",
+            (filename, line_no),
+        )
+        for source_path, addr in cur.fetchall():
+            if Path(path).samefile(source_path):
+                return addr
+
+        logger.error(
+            "Failed to find function symbol with filename and line: %s:%d",
+            path,
+            line_no,
+        )
+        return None
diff --git a/tools/isledecomp/isledecomp/cvdump/__init__.py b/tools/isledecomp/isledecomp/cvdump/__init__.py
index e9d66298..635ef5cd 100644
--- a/tools/isledecomp/isledecomp/cvdump/__init__.py
+++ b/tools/isledecomp/isledecomp/cvdump/__init__.py
@@ -1,2 +1,3 @@
+from .analysis import CvdumpAnalysis
 from .parser import CvdumpParser
 from .runner import Cvdump
diff --git a/tools/isledecomp/isledecomp/cvdump/analysis.py b/tools/isledecomp/isledecomp/cvdump/analysis.py
new file mode 100644
index 00000000..720593be
--- /dev/null
+++ b/tools/isledecomp/isledecomp/cvdump/analysis.py
@@ -0,0 +1,184 @@
+"""For collating the results from parsing cvdump.exe into a more directly useful format."""
+from typing import List, Optional, Tuple
+from isledecomp.types import SymbolType
+from .parser import CvdumpParser
+from .demangler import demangle_string_const, demangle_vtable
+
+
+def data_type_info(type_name: str) -> Optional[Tuple[int, bool]]:
+    """cvdump type aliases are listed here:
+    https://github.com/microsoft/microsoft-pdb/blob/master/include/cvinfo.h
+    For the given type, return tuple(size, is_pointer) if possible."""
+    # pylint: disable=too-many-return-statements
+    # TODO: refactor to be as simple as possble
+
+    # Ignore complex types. We can get the size of those from the TYPES section.
+    if not type_name.startswith("T"):
+        return None
+
+    # if 32-bit pointer
+    if type_name.startswith("T_32P"):
+        return (4, True)
+
+    if type_name.endswith("QUAD") or type_name.endswith("64"):
+        return (8, False)
+
+    if (
+        type_name.endswith("LONG")
+        or type_name.endswith("INT4")
+        or type_name.endswith("32")
+    ):
+        return (4, False)
+
+    if type_name.endswith("SHORT") or type_name.endswith("WCHAR"):
+        return (2, False)
+
+    if "CHAR" in type_name:
+        return (1, False)
+
+    if type_name in ("T_NOTYPE", "T_VOID"):
+        return (0, False)
+
+    return None
+
+
+class CvdumpNode:
+    # pylint: disable=too-many-instance-attributes
+    # These two are required and allow us to identify the symbol
+    section: int
+    offset: int
+    # aka the mangled name from the PUBLICS section
+    decorated_name: Optional[str] = None
+    # optional "nicer" name (e.g. of a function from SYMBOLS section)
+    friendly_name: Optional[str] = None
+    # To be determined by context after inserting data, unless the decorated
+    # name makes this obvious. (i.e. string constants or vtables)
+    # We choose not to assume that section 1 (probably ".text") contains only
+    # functions. Smacker functions are linked to their own section "_UNSTEXT"
+    node_type: Optional[SymbolType] = None
+    # Function size can be read from the LINES section so use this over any
+    # other value if we have it.
+    # TYPES section can tell us the size of structs and other complex types.
+    confirmed_size: Optional[int] = None
+    # Estimated by reading the distance between this symbol and the one that
+    # follows in the same section.
+    # If this is the last symbol in the section, we cannot estimate a size.
+    estimated_size: Optional[int] = None
+    # Size as reported by SECTION CONTRIBUTIONS section. Not guaranteed to be
+    # accurate.
+    section_contribution: Optional[int] = None
+
+    def __init__(self, section: int, offset: int) -> None:
+        self.section = section
+        self.offset = offset
+
+    def set_decorated(self, name: str):
+        self.decorated_name = name
+
+        if self.decorated_name.startswith("??_7"):
+            self.node_type = SymbolType.VTABLE
+            self.friendly_name = demangle_vtable(self.decorated_name)
+
+        elif self.decorated_name.startswith("??_C@"):
+            self.node_type = SymbolType.STRING
+            (strlen, _) = demangle_string_const(self.decorated_name)
+            self.confirmed_size = strlen
+
+        elif not self.decorated_name.startswith("?") and "@" in self.decorated_name:
+            # C mangled symbol. The trailing at-sign with number tells the number of bytes
+            # in the parameter list for __stdcall, __fastcall, or __vectorcall
+            # For __cdecl it is more ambiguous and we would have to know which section we are in.
+            # https://learn.microsoft.com/en-us/cpp/build/reference/decorated-names?view=msvc-170#FormatC
+            self.node_type = SymbolType.FUNCTION
+
+    def name(self) -> Optional[str]:
+        """Prefer "friendly" name if we have it.
+        This is what we have been using to match functions."""
+        return self.friendly_name or self.decorated_name
+
+    def size(self) -> Optional[int]:
+        if self.confirmed_size is not None:
+            return self.confirmed_size
+
+        # Better to undershoot the size because we can identify a comparison gap easily
+        if self.estimated_size is not None and self.section_contribution is not None:
+            return min(self.estimated_size, self.section_contribution)
+
+        # Return whichever one we have, or neither
+        return self.estimated_size or self.section_contribution
+
+
+class CvdumpAnalysis:
+    """Collects the results from CvdumpParser into a list of nodes (i.e. symbols).
+    These can then be analyzed by a downstream tool."""
+
+    nodes = List[CvdumpNode]
+
+    def __init__(self, parser: CvdumpParser):
+        """Read in as much information as we have from the parser.
+        The more sections we have, the better our information will be."""
+        node_dict = {}
+
+        # PUBLICS is our roadmap for everything that follows.
+        for pub in parser.publics:
+            key = (pub.section, pub.offset)
+            if key not in node_dict:
+                node_dict[key] = CvdumpNode(*key)
+
+            node_dict[key].set_decorated(pub.name)
+
+        for sizeref in parser.sizerefs:
+            key = (sizeref.section, sizeref.offset)
+            if key not in node_dict:
+                node_dict[key] = CvdumpNode(*key)
+
+            node_dict[key].section_contribution = sizeref.size
+
+        for glo in parser.globals:
+            key = (glo.section, glo.offset)
+            if key not in node_dict:
+                node_dict[key] = CvdumpNode(*key)
+
+            node_dict[key].node_type = SymbolType.DATA
+            node_dict[key].friendly_name = glo.name
+
+            if (g_info := data_type_info(glo.type)) is not None:
+                (size, is_pointer) = g_info
+                node_dict[key].confirmed_size = size
+                if is_pointer:
+                    node_dict[key].node_type = SymbolType.POINTER
+
+        for lin in parser.lines:
+            key = (lin.section, lin.offset)
+            # Here we only set if the section:offset already exists
+            # because our values include offsets inside of the function.
+            if key in node_dict:
+                node_dict[key].node_type = SymbolType.FUNCTION
+
+        for sym in parser.symbols:
+            key = (sym.section, sym.offset)
+            if key not in node_dict:
+                node_dict[key] = CvdumpNode(*key)
+
+            if sym.type == "S_GPROC32":
+                node_dict[key].friendly_name = sym.name
+                node_dict[key].confirmed_size = sym.size
+                node_dict[key].node_type = SymbolType.FUNCTION
+
+        self.nodes = [v for _, v in dict(sorted(node_dict.items())).items()]
+        self._estimate_size()
+
+    def _estimate_size(self):
+        """Get the distance between one section:offset value and the next one
+        in the same section. This gives a rough estimate of the size of the symbol.
+        If we have information from SECTION CONTRIBUTIONS, take whichever one is
+        less to get the best approximate size."""
+        for i in range(len(self.nodes) - 1):
+            this_node = self.nodes[i]
+            next_node = self.nodes[i + 1]
+
+            # If they are in different sections, we can't compare them
+            if this_node.section != next_node.section:
+                continue
+
+            this_node.estimated_size = next_node.offset - this_node.offset
diff --git a/tools/isledecomp/isledecomp/cvdump/demangler.py b/tools/isledecomp/isledecomp/cvdump/demangler.py
new file mode 100644
index 00000000..340f19a3
--- /dev/null
+++ b/tools/isledecomp/isledecomp/cvdump/demangler.py
@@ -0,0 +1,74 @@
+"""For demangling a subset of MSVC mangled symbols.
+Some unofficial information about the mangling scheme is here:
+https://en.wikiversity.org/wiki/Visual_C%2B%2B_name_mangling
+"""
+import re
+from collections import namedtuple
+
+
+class InvalidEncodedNumberError(Exception):
+    pass
+
+
+_encoded_number_translate = str.maketrans("ABCDEFGHIJKLMNOP", "0123456789ABCDEF")
+
+
+def parse_encoded_number(string: str) -> int:
+    # TODO: assert string ends in "@"?
+    if string.endswith("@"):
+        string = string[:-1]
+
+    try:
+        return int(string.translate(_encoded_number_translate), 16)
+    except ValueError as e:
+        raise InvalidEncodedNumberError(string) from e
+
+
+string_const_regex = re.compile(
+    r"\?\?_C@\_(?P<is_utf16>[0-1])(?P<len>\d|[A-P]+@)(?P<hash>\w+)@(?P<value>.+)@"
+)
+StringConstInfo = namedtuple("StringConstInfo", "len is_utf16")
+
+
+def demangle_string_const(symbol: str) -> StringConstInfo:
+    """Don't bother to decode the string text from the symbol.
+    We can just read it from the binary once we have the length."""
+    match = string_const_regex.match(symbol)
+    if match is None:
+        # See below
+        return StringConstInfo(0, False)
+
+    try:
+        strlen = (
+            parse_encoded_number(match.group("len"))
+            if "@" in match.group("len")
+            else int(match.group("len"))
+        )
+    except (ValueError, InvalidEncodedNumberError):
+        # This would be an annoying error to fail on if we get a bad symbol.
+        # For now, just assume a zero length string because this will probably
+        # raise some eyebrows during the comparison.
+        strlen = 0
+
+    is_utf16 = match.group("is_utf16") == "1"
+    return StringConstInfo(len=strlen, is_utf16=is_utf16)
+
+
+def demangle_vtable(symbol: str) -> str:
+    """Get the class name referenced in the vtable symbol."""
+
+    # Seek ahead 4 chars to strip off "??_7" prefix
+    t = symbol[4:].split("@")
+    # "?$" indicates a template class
+    if t[0].startswith("?$"):
+        class_name = t[0][2:]
+        # PA = Pointer/reference
+        # V or U = class or struct
+        if t[1].startswith("PA"):
+            generic = f"{t[1][3:]} *"
+        else:
+            generic = t[1][1:]
+
+        return f"{class_name}<{generic}>"
+
+    return t[0]
diff --git a/tools/isledecomp/isledecomp/cvdump/parser.py b/tools/isledecomp/isledecomp/cvdump/parser.py
index ddc2e5f7..613cd4a4 100644
--- a/tools/isledecomp/isledecomp/cvdump/parser.py
+++ b/tools/isledecomp/isledecomp/cvdump/parser.py
@@ -1,5 +1,5 @@
 import re
-from typing import Iterable
+from typing import Iterable, Tuple
 from collections import namedtuple
 
 # e.g. `*** PUBLICS`
@@ -40,17 +40,28 @@
 )
 
 
-LinesEntry = namedtuple("LinesEntry", "filename line_no addr")
+# User functions only
+LinesEntry = namedtuple("LinesEntry", "filename line_no section offset")
+
+# Strings, vtables, functions
+# superset of everything else
+# only place you can find the C symbols (library functions, smacker, etc)
 PublicsEntry = namedtuple("PublicsEntry", "type section offset flags name")
+
+# S_GPROC32 = functions
 SymbolsEntry = namedtuple("SymbolsEntry", "type section offset size name")
+
+# (Estimated) size of any symbol
 SizeRefEntry = namedtuple("SizeRefEntry", "section offset size")
+
+# global variables
 GdataEntry = namedtuple("GdataEntry", "section offset type name")
 
 
 class CvdumpParser:
     def __init__(self) -> None:
         self._section: str = ""
-        self._lines_filename: str = ""
+        self._lines_function: Tuple[str, int] = ("", 0)
 
         self.lines = []
         self.publics = []
@@ -64,19 +75,24 @@ def _lines_section(self, line: str):
         we are in."""
 
         # Subheader indicates a new function and possibly a new code filename.
+        # Save the section here because it is not given on the lines that follow.
         if (match := _lines_subsection_header.match(line)) is not None:
-            self._lines_filename = match.group(1)
+            self._lines_function = (
+                match.group("filename"),
+                int(match.group("section"), 16),
+            )
             return
 
-        if (matches := _line_addr_pairs_findall.findall(line)) is not None:
-            for line_no, addr in matches:
-                self.lines.append(
-                    LinesEntry(
-                        filename=self._lines_filename,
-                        line_no=int(line_no),
-                        addr=int(addr, 16),
-                    )
+        # Match any pairs as we find them
+        for line_no, offset in _line_addr_pairs_findall.findall(line):
+            self.lines.append(
+                LinesEntry(
+                    filename=self._lines_function[0],
+                    line_no=int(line_no),
+                    section=self._lines_function[1],
+                    offset=int(offset, 16),
                 )
+            )
 
     def _publics_section(self, line: str):
         """Match each line from PUBLICS and pull out the symbol information.
diff --git a/tools/isledecomp/isledecomp/parser/__init__.py b/tools/isledecomp/isledecomp/parser/__init__.py
index 3034a562..14549700 100644
--- a/tools/isledecomp/isledecomp/parser/__init__.py
+++ b/tools/isledecomp/isledecomp/parser/__init__.py
@@ -1,2 +1,3 @@
+from .codebase import DecompCodebase
 from .parser import DecompParser
 from .linter import DecompLinter
diff --git a/tools/isledecomp/isledecomp/parser/codebase.py b/tools/isledecomp/isledecomp/parser/codebase.py
new file mode 100644
index 00000000..54ab4035
--- /dev/null
+++ b/tools/isledecomp/isledecomp/parser/codebase.py
@@ -0,0 +1,44 @@
+"""For aggregating decomp markers read from an entire directory and for a single module."""
+from typing import Iterable, Iterator, List
+from .parser import DecompParser
+from .node import (
+    ParserSymbol,
+    ParserFunction,
+    ParserVtable,
+    ParserVariable,
+)
+
+
+class DecompCodebase:
+    def __init__(self, filenames: Iterable[str], module: str) -> None:
+        self._symbols: List[ParserSymbol] = []
+
+        parser = DecompParser()
+        for filename in filenames:
+            parser.reset()
+            with open(filename, "r", encoding="utf-8") as f:
+                parser.read_lines(f)
+
+            for sym in parser.iter_symbols(module):
+                sym.filename = filename
+                self._symbols.append(sym)
+
+    def iter_line_functions(self) -> Iterator[ParserFunction]:
+        """Return lineref functions separately from nameref. Assuming the PDB matches
+        the state of the source code, a line reference is a guaranteed match, even if
+        multiple functions share the same name. (i.e. polymorphism)"""
+        return filter(
+            lambda s: isinstance(s, ParserFunction) and not s.is_nameref(),
+            self._symbols,
+        )
+
+    def iter_name_functions(self) -> Iterator[ParserFunction]:
+        return filter(
+            lambda s: isinstance(s, ParserFunction) and s.is_nameref(), self._symbols
+        )
+
+    def iter_vtables(self) -> Iterator[ParserVtable]:
+        return filter(lambda s: isinstance(s, ParserVtable), self._symbols)
+
+    def iter_variables(self) -> Iterator[ParserVariable]:
+        return filter(lambda s: isinstance(s, ParserVariable), self._symbols)
diff --git a/tools/isledecomp/isledecomp/parser/parser.py b/tools/isledecomp/isledecomp/parser/parser.py
index f9485e65..d4153b3c 100644
--- a/tools/isledecomp/isledecomp/parser/parser.py
+++ b/tools/isledecomp/isledecomp/parser/parser.py
@@ -1,6 +1,6 @@
 # C++ file parser
 
-from typing import List, Iterable, Iterator
+from typing import List, Iterable, Iterator, Optional
 from enum import Enum
 from .util import (
     is_blank_or_comment,
@@ -122,6 +122,11 @@ def vtables(self) -> List[ParserSymbol]:
     def variables(self) -> List[ParserSymbol]:
         return [s for s in self._symbols if isinstance(s, ParserVariable)]
 
+    def iter_symbols(self, module: Optional[str] = None) -> Iterator[ParserSymbol]:
+        for s in self._symbols:
+            if module is None or s.module == module:
+                yield s
+
     def _recover(self):
         """We hit a syntax error and need to reset temp structures"""
         self.state = ReaderState.SEARCH
diff --git a/tools/isledecomp/isledecomp/syminfo.py b/tools/isledecomp/isledecomp/syminfo.py
deleted file mode 100644
index 8388eaa5..00000000
--- a/tools/isledecomp/isledecomp/syminfo.py
+++ /dev/null
@@ -1,107 +0,0 @@
-import os
-from isledecomp.dir import PathResolver
-from isledecomp.cvdump import Cvdump
-
-
-class RecompiledInfo:
-    addr = None
-    size = None
-    name = None
-    start = None
-
-
-# Declare a class that parses the output of cvdump for fast access later
-class SymInfo:
-    funcs = {}
-    lines = {}
-    names = {}
-
-    def __init__(self, pdb, sym_recompfile, sym_logger, base_dir):
-        self.logger = sym_logger
-        path_resolver = PathResolver(base_dir)
-
-        self.logger.info("Parsing %s ...", pdb)
-        self.logger.debug("Parsing output of cvdump.exe ...")
-
-        cv = Cvdump(pdb).lines().symbols().publics().section_contributions().run()
-
-        self.logger.debug("... Parsing output of cvdump.exe finished")
-
-        contrib_dict = {(s.section, s.offset): s.size for s in cv.sizerefs}
-        for pub in cv.publics:
-            if pub.type == "S_PUB32" and (pub.section, pub.offset) in contrib_dict:
-                size = contrib_dict[(pub.section, pub.offset)]
-
-                info = RecompiledInfo()
-                info.addr = sym_recompfile.get_abs_addr(pub.section, pub.offset)
-
-                info.start = 0
-                info.size = size
-                info.name = pub.name
-                self.names[pub.name] = info
-                self.funcs[pub.offset] = info
-
-        for proc in cv.symbols:
-            if proc.type != "S_GPROC32":
-                continue
-
-            info = RecompiledInfo()
-            info.addr = sym_recompfile.get_abs_addr(proc.section, proc.offset)
-
-            info.start = 0
-            info.size = proc.size
-            info.name = proc.name
-
-            self.names[proc.name] = info
-            self.funcs[proc.offset] = info
-
-        for sourcepath, line_no, offset in cv.lines:
-            sourcepath = path_resolver.resolve_cvdump(sourcepath)
-
-            if sourcepath not in self.lines:
-                self.lines[sourcepath] = {}
-
-            if line_no not in self.lines[sourcepath]:
-                self.lines[sourcepath][line_no] = offset
-
-    def get_recompiled_address(self, filename, line):
-        recompiled_addr = None
-
-        self.logger.debug("Looking for %s:%s", filename, line)
-        filename_basename = os.path.basename(filename).lower()
-
-        for fn in self.lines:
-            # Sometimes a PDB is compiled with a relative path while we always have
-            # an absolute path. Therefore we must
-            try:
-                if os.path.basename(
-                    fn
-                ).lower() == filename_basename and os.path.samefile(fn, filename):
-                    filename = fn
-                    break
-            except FileNotFoundError:
-                continue
-
-        if filename in self.lines and line in self.lines[filename]:
-            recompiled_addr = self.lines[filename][line]
-
-            if recompiled_addr in self.funcs:
-                return self.funcs[recompiled_addr]
-            self.logger.error(
-                "Failed to find function symbol with address: %x", recompiled_addr
-            )
-            return None
-        self.logger.error(
-            "Failed to find function symbol with filename and line: %s:%s",
-            filename,
-            line,
-        )
-        return None
-
-    def get_recompiled_address_from_name(self, name):
-        self.logger.debug("Looking for %s", name)
-
-        if name in self.names:
-            return self.names[name]
-        self.logger.error("Failed to find function symbol with name: %s", name)
-        return None
diff --git a/tools/isledecomp/isledecomp/types.py b/tools/isledecomp/isledecomp/types.py
new file mode 100644
index 00000000..4d518dd3
--- /dev/null
+++ b/tools/isledecomp/isledecomp/types.py
@@ -0,0 +1,12 @@
+"""Types shared by other modules"""
+from enum import Enum
+
+
+class SymbolType(Enum):
+    """Broadly tells us what kind of comparison is required for this symbol."""
+
+    FUNCTION = 1
+    DATA = 2
+    POINTER = 3
+    STRING = 4
+    VTABLE = 5
diff --git a/tools/isledecomp/tests/test_cvdump.py b/tools/isledecomp/tests/test_cvdump.py
new file mode 100644
index 00000000..cfaff7a9
--- /dev/null
+++ b/tools/isledecomp/tests/test_cvdump.py
@@ -0,0 +1,39 @@
+import pytest
+from isledecomp.cvdump.analysis import data_type_info
+
+# fmt: off
+type_check_cases = [
+    ("T_32PINT4",      4, True),
+    ("T_32PLONG",      4, True),
+    ("T_32PRCHAR",     4, True),
+    ("T_32PREAL32",    4, True),
+    ("T_32PUCHAR",     4, True),
+    ("T_32PUINT4",     4, True),
+    ("T_32PULONG",     4, True),
+    ("T_32PUSHORT",    4, True),
+    ("T_32PVOID",      4, True),
+    ("T_CHAR",         1, False),
+    ("T_INT4",         4, False),
+    ("T_LONG",         4, False),
+    ("T_NOTYPE",       0, False),  # ?
+    ("T_QUAD",         8, False),
+    ("T_RCHAR",        1, False),
+    ("T_REAL32",       4, False),
+    ("T_REAL64",       8, False),
+    ("T_SHORT",        2, False),
+    ("T_UCHAR",        1, False),
+    ("T_UINT4",        4, False),
+    ("T_ULONG",        4, False),
+    ("T_UQUAD",        8, False),
+    ("T_USHORT",       2, False),
+    ("T_VOID",         0, False),  # ?
+    ("T_WCHAR",        2, False),
+]
+# fmt: on
+
+
+@pytest.mark.parametrize("type_name, size, is_pointer", type_check_cases)
+def test_type_check(type_name: str, size: int, is_pointer: bool):
+    assert (info := data_type_info(type_name)) is not None
+    assert info[0] == size
+    assert info[1] == is_pointer
diff --git a/tools/isledecomp/tests/test_demangler.py b/tools/isledecomp/tests/test_demangler.py
new file mode 100644
index 00000000..5343bdcc
--- /dev/null
+++ b/tools/isledecomp/tests/test_demangler.py
@@ -0,0 +1,55 @@
+import pytest
+from isledecomp.cvdump.demangler import (
+    demangle_string_const,
+    demangle_vtable,
+    parse_encoded_number,
+    InvalidEncodedNumberError,
+)
+
+string_demangle_cases = [
+    ("??_C@_08LIDF@December?$AA@", 8, False),
+    ("??_C@_0L@EGPP@english?9nz?$AA@", 11, False),
+    (
+        "??_C@_1O@POHA@?$AA?$CI?$AAn?$AAu?$AAl?$AAl?$AA?$CJ?$AA?$AA?$AA?$AA?$AA?$AH?$AA?$AA?$AA?$AA?$AA?$AA?$AA?$9A?$AE?$;I@",
+        14,
+        True,
+    ),
+]
+
+
+@pytest.mark.parametrize("symbol, strlen, is_utf16", string_demangle_cases)
+def test_strings(symbol, is_utf16, strlen):
+    s = demangle_string_const(symbol)
+    assert s.len == strlen
+    assert s.is_utf16 == is_utf16
+
+
+encoded_numbers = [
+    ("A@", 0),
+    ("AA@", 0),  # would never happen?
+    ("P@", 15),
+    ("BA@", 16),
+    ("BCD@", 291),
+]
+
+
+@pytest.mark.parametrize("string, value", encoded_numbers)
+def test_encoded_numbers(string, value):
+    assert parse_encoded_number(string) == value
+
+
+def test_invalid_encoded_number():
+    with pytest.raises(InvalidEncodedNumberError):
+        parse_encoded_number("Hello")
+
+
+vtable_cases = [
+    ("??_7LegoCarBuildAnimPresenter@@6B@", "LegoCarBuildAnimPresenter"),
+    ("??_7?$MxCollection@PAVLegoWorld@@@@6B@", "MxCollection<LegoWorld *>"),
+    ("??_7?$MxPtrList@VLegoPathController@@@@6B@", "MxPtrList<LegoPathController>"),
+]
+
+
+@pytest.mark.parametrize("symbol, class_name", vtable_cases)
+def test_vtable(symbol, class_name):
+    assert demangle_vtable(symbol) == class_name
diff --git a/tools/reccmp/reccmp.py b/tools/reccmp/reccmp.py
index c7db5e2c..b7027435 100755
--- a/tools/reccmp/reccmp.py
+++ b/tools/reccmp/reccmp.py
@@ -10,13 +10,11 @@
 
 from isledecomp import (
     Bin,
-    DecompParser,
     get_file_in_script_dir,
     OffsetPlaceholderGenerator,
     print_diff,
-    SymInfo,
-    walk_source_dir,
 )
+from isledecomp.compare import Compare as IsleCompare
 
 from capstone import Cs, CS_ARCH_X86, CS_MODE_32
 import colorama
@@ -261,7 +259,6 @@ def main():
     args = parser.parse_args()
 
     logging.basicConfig(level=args.loglevel, format="[%(levelname)s] %(message)s")
-    logger = logging.getLogger(__name__)
 
     colorama.init()
 
@@ -294,8 +291,13 @@ def main():
 
     svg = args.svg
 
-    with Bin(original, logger) as origfile, Bin(recomp, logger) as recompfile:
-        syminfo = SymInfo(syms, recompfile, logger, source)
+    with Bin(original, find_str=True) as origfile, Bin(recomp) as recompfile:
+        if verbose is not None:
+            # Mute logger events from compare engine
+            logging.getLogger("isledecomp.compare.db").setLevel(logging.CRITICAL)
+            logging.getLogger("isledecomp.compare.lines").setLevel(logging.CRITICAL)
+
+        isle_compare = IsleCompare(origfile, recompfile, syms, source)
 
         print()
 
@@ -306,151 +308,120 @@ def main():
         total_effective_accuracy = 0
         htmlinsert = []
 
-        # Generate basename of original file, used in locating OFFSET lines
-        basename = os.path.basename(os.path.splitext(original)[0])
+        matches = []
+        if verbose is not None:
+            match = isle_compare.get_one_function(verbose)
+            if match is not None:
+                found_verbose_target = True
+                matches = [match]
+        else:
+            matches = isle_compare.get_functions()
 
-        parser = DecompParser()
-        for srcfilename in walk_source_dir(source):
-            parser.reset()
-            with open(srcfilename, "r", encoding="utf-8") as srcfile:
-                parser.read_lines(srcfile)
+        for match in matches:
+            # The effective_ratio is the ratio when ignoring differing register
+            # allocation vs the ratio is the true ratio.
+            ratio = 0.0
+            effective_ratio = 0.0
+            if match.size:
+                origasm = parse_asm(
+                    capstone_disassembler,
+                    origfile,
+                    match.orig_addr,
+                    match.size,
+                )
+                recompasm = parse_asm(
+                    capstone_disassembler,
+                    recompfile,
+                    match.recomp_addr,
+                    match.size,
+                )
 
-            for fun in parser.functions:
-                if fun.should_skip():
-                    continue
+                diff = difflib.SequenceMatcher(None, origasm, recompasm)
+                ratio = diff.ratio()
+                effective_ratio = ratio
 
-                if fun.module != basename:
-                    continue
+                if ratio != 1.0:
+                    # Check whether we can resolve register swaps which are actually
+                    # perfect matches modulo compiler entropy.
+                    if can_resolve_register_differences(origasm, recompasm):
+                        effective_ratio = 1.0
+            else:
+                ratio = 0
 
-                addr = fun.offset
-                # Verbose flag handling
+            percenttext = f"{(effective_ratio * 100):.2f}%"
+            if not plain:
+                if effective_ratio == 1.0:
+                    percenttext = (
+                        colorama.Fore.GREEN + percenttext + colorama.Style.RESET_ALL
+                    )
+                elif effective_ratio > 0.8:
+                    percenttext = (
+                        colorama.Fore.YELLOW + percenttext + colorama.Style.RESET_ALL
+                    )
+                else:
+                    percenttext = (
+                        colorama.Fore.RED + percenttext + colorama.Style.RESET_ALL
+                    )
+
+            if effective_ratio == 1.0 and ratio != 1.0:
+                if plain:
+                    percenttext += "*"
+                else:
+                    percenttext += colorama.Fore.RED + "*" + colorama.Style.RESET_ALL
+
+            if args.print_rec_addr:
+                addrs = f"0x{match.orig_addr:x} / 0x{match.recomp_addr:x}"
+            else:
+                addrs = hex(match.orig_addr)
+
+            if not verbose:
+                print(
+                    f"  {match.name} ({addrs}) is {percenttext} similar to the original"
+                )
+
+            function_count += 1
+            total_accuracy += ratio
+            total_effective_accuracy += effective_ratio
+
+            if match.size:
+                udiff = difflib.unified_diff(origasm, recompasm, n=10)
+
+                # If verbose, print the diff for that function to the output
                 if verbose:
-                    if addr == verbose:
-                        found_verbose_target = True
-                    else:
-                        continue
-
-                if fun.is_nameref():
-                    recinfo = syminfo.get_recompiled_address_from_name(fun.name)
-                    if not recinfo:
-                        continue
-                else:
-                    recinfo = syminfo.get_recompiled_address(
-                        srcfilename, fun.line_number
-                    )
-                    if not recinfo:
-                        continue
-
-                # The effective_ratio is the ratio when ignoring differing register
-                # allocation vs the ratio is the true ratio.
-                ratio = 0.0
-                effective_ratio = 0.0
-                if recinfo.size:
-                    origasm = parse_asm(
-                        capstone_disassembler,
-                        origfile,
-                        addr + recinfo.start,
-                        recinfo.size,
-                    )
-                    recompasm = parse_asm(
-                        capstone_disassembler,
-                        recompfile,
-                        recinfo.addr + recinfo.start,
-                        recinfo.size,
-                    )
-
-                    diff = difflib.SequenceMatcher(None, origasm, recompasm)
-                    ratio = diff.ratio()
-                    effective_ratio = ratio
-
-                    if ratio != 1.0:
-                        # Check whether we can resolve register swaps which are actually
-                        # perfect matches modulo compiler entropy.
-                        if can_resolve_register_differences(origasm, recompasm):
-                            effective_ratio = 1.0
-                else:
-                    ratio = 0
-
-                percenttext = f"{(effective_ratio * 100):.2f}%"
-                if not plain:
                     if effective_ratio == 1.0:
-                        percenttext = (
-                            colorama.Fore.GREEN + percenttext + colorama.Style.RESET_ALL
-                        )
-                    elif effective_ratio > 0.8:
-                        percenttext = (
-                            colorama.Fore.YELLOW
-                            + percenttext
-                            + colorama.Style.RESET_ALL
-                        )
-                    else:
-                        percenttext = (
-                            colorama.Fore.RED + percenttext + colorama.Style.RESET_ALL
-                        )
-
-                if effective_ratio == 1.0 and ratio != 1.0:
-                    if plain:
-                        percenttext += "*"
-                    else:
-                        percenttext += (
-                            colorama.Fore.RED + "*" + colorama.Style.RESET_ALL
-                        )
-
-                if args.print_rec_addr:
-                    addrs = f"0x{addr:x} / 0x{recinfo.addr:x}"
-                else:
-                    addrs = hex(addr)
-
-                if not verbose:
-                    print(
-                        f"  {recinfo.name} ({addrs}) is {percenttext} similar to the original"
-                    )
-
-                function_count += 1
-                total_accuracy += ratio
-                total_effective_accuracy += effective_ratio
-
-                if recinfo.size:
-                    udiff = difflib.unified_diff(origasm, recompasm, n=10)
-
-                    # If verbose, print the diff for that function to the output
-                    if verbose:
-                        if effective_ratio == 1.0:
-                            ok_text = (
-                                "OK!"
-                                if plain
-                                else (
-                                    colorama.Fore.GREEN
-                                    + "✨ OK! ✨"
-                                    + colorama.Style.RESET_ALL
-                                )
+                        ok_text = (
+                            "OK!"
+                            if plain
+                            else (
+                                colorama.Fore.GREEN
+                                + "✨ OK! ✨"
+                                + colorama.Style.RESET_ALL
                             )
-                            if ratio == 1.0:
-                                print(
-                                    f"{addrs}: {recinfo.name} 100% match.\n\n{ok_text}\n\n"
-                                )
-                            else:
-                                print(
-                                    f"{addrs}: {recinfo.name} Effective 100%% match. (Differs in register allocation only)\n\n{ok_text} (still differs in register allocation)\n\n"
-                                )
+                        )
+                        if ratio == 1.0:
+                            print(f"{addrs}: {match.name} 100% match.\n\n{ok_text}\n\n")
                         else:
-                            print_diff(udiff, plain)
-
                             print(
-                                f"\n{recinfo.name} is only {percenttext} similar to the original, diff above"
+                                f"{addrs}: {match.name} Effective 100%% match. (Differs in register allocation only)\n\n{ok_text} (still differs in register allocation)\n\n"
                             )
+                    else:
+                        print_diff(udiff, plain)
 
-                    # If html, record the diffs to an HTML file
-                    if html_path:
-                        htmlinsert.append(
-                            {
-                                "address": f"0x{addr:x}",
-                                "name": recinfo.name,
-                                "matching": effective_ratio,
-                                "diff": "\n".join(udiff),
-                            }
+                        print(
+                            f"\n{match.name} is only {percenttext} similar to the original, diff above"
                         )
 
+                # If html, record the diffs to an HTML file
+                if html_path:
+                    htmlinsert.append(
+                        {
+                            "address": f"0x{match.orig_addr:x}",
+                            "name": match.name,
+                            "matching": effective_ratio,
+                            "diff": "\n".join(udiff),
+                        }
+                    )
+
         if html_path:
             gen_html(html_path, json.dumps(htmlinsert))
 

From 9a5e1cb853d0b85fd549aedcb98787474c3b11f7 Mon Sep 17 00:00:00 2001
From: Misha <106913236+MishaProductions@users.noreply.github.com>
Date: Thu, 4 Jan 2024 21:01:04 -0400
Subject: [PATCH 071/210] legomodelpresenter vtable (#406)

* legomodelpresenter vtable

* Update legomodelpresenter.cpp

* Update legomodelpresenter.cpp
---
 LEGO1/legomodelpresenter.cpp | 24 ++++++++++++++++++++++++
 LEGO1/legomodelpresenter.h   |  7 +++++++
 2 files changed, 31 insertions(+)

diff --git a/LEGO1/legomodelpresenter.cpp b/LEGO1/legomodelpresenter.cpp
index 75ed1750..d9608461 100644
--- a/LEGO1/legomodelpresenter.cpp
+++ b/LEGO1/legomodelpresenter.cpp
@@ -3,8 +3,32 @@
 // GLOBAL: LEGO1 0x100f7ae0
 int g_modelPresenterConfig = 1;
 
+// FUNCTION: LEGO1 0x1000cca0
+void LegoModelPresenter::Destroy()
+{
+	Destroy(FALSE);
+}
+
 // FUNCTION: LEGO1 0x1007f660
 void LegoModelPresenter::configureLegoModelPresenter(MxS32 p_modelPresenterConfig)
 {
 	g_modelPresenterConfig = p_modelPresenterConfig;
 }
+
+// STUB: LEGO1 0x1007f670
+void LegoModelPresenter::Destroy(MxBool p_fromDestructor)
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x10080050
+void LegoModelPresenter::ReadyTickle()
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x100801b0
+void LegoModelPresenter::ParseExtra()
+{
+	// TODO
+}
diff --git a/LEGO1/legomodelpresenter.h b/LEGO1/legomodelpresenter.h
index b55372dd..ca3e216f 100644
--- a/LEGO1/legomodelpresenter.h
+++ b/LEGO1/legomodelpresenter.h
@@ -21,6 +21,13 @@ class LegoModelPresenter : public MxVideoPresenter {
 	{
 		return !strcmp(p_name, ClassName()) || MxVideoPresenter::IsA(p_name);
 	}
+
+	virtual void ReadyTickle() override; // vtable+0x18
+	virtual void ParseExtra() override;  // vtable+0x30
+	virtual void Destroy() override;     // vtable+0x38
+
+protected:
+	void Destroy(MxBool p_fromDestructor);
 };
 
 #endif // LEGOMODELPRESENTER_H

From 9651ece809734f791b664f8cf75b83cadef110cb Mon Sep 17 00:00:00 2001
From: Misha <106913236+MishaProductions@users.noreply.github.com>
Date: Fri, 5 Jan 2024 13:31:19 -0400
Subject: [PATCH 072/210] Improve accuracy of MxOmni::CreatePresenter (#407)

* Improve accuracy of MxOmni::CreatePresenter

* Update mxactionnotificationparam.cpp

* Match to 100%

---------

Co-authored-by: Christian Semmler <mail@csemmler.com>
---
 LEGO1/mxactionnotificationparam.cpp |  7 ++++++-
 LEGO1/mxomni.cpp                    | 21 ++++++++++++---------
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/LEGO1/mxactionnotificationparam.cpp b/LEGO1/mxactionnotificationparam.cpp
index b5d84832..5573677f 100644
--- a/LEGO1/mxactionnotificationparam.cpp
+++ b/LEGO1/mxactionnotificationparam.cpp
@@ -18,7 +18,12 @@ MxNotificationParam* MxEndActionNotificationParam::Clone()
 // FUNCTION: LEGO1 0x100b0300
 MxNotificationParam* MxStartActionNotificationParam::Clone()
 {
-	return new MxEndActionNotificationParam(c_notificationStartAction, this->m_sender, this->m_action, this->m_realloc);
+	return new MxStartActionNotificationParam(
+		c_notificationStartAction,
+		this->m_sender,
+		this->m_action,
+		this->m_realloc
+	);
 }
 
 // FUNCTION: LEGO1 0x100b04f0
diff --git a/LEGO1/mxomni.cpp b/LEGO1/mxomni.cpp
index 561974da..8ae93d74 100644
--- a/LEGO1/mxomni.cpp
+++ b/LEGO1/mxomni.cpp
@@ -324,22 +324,24 @@ void MxOmni::DeleteObject(MxDSAction& p_dsAction)
 MxResult MxOmni::CreatePresenter(MxStreamController* p_controller, MxDSAction& p_action)
 {
 	MxResult result = FAILURE;
-	MxPresenter* object = (MxPresenter*) m_objectFactory->Create(PresenterNameDispatch(p_action));
+	const char* name = PresenterNameDispatch(p_action);
+	MxPresenter* object = (MxPresenter*) m_objectFactory->Create(name);
 
 	if (object) {
 		if (object->AddToManager() == SUCCESS) {
 			MxPresenter* sender = p_action.GetUnknown28();
-			if (sender == NULL && (sender = p_controller->FUN_100c1e70(p_action)) == NULL) {
-				if (p_action.GetOrigin() == NULL) {
-					p_action.SetOrigin(this);
-				}
+			if (!sender)
+				sender = p_controller->FUN_100c1e70(p_action);
 
-				object->SetCompositePresenter(NULL);
-			}
-			else {
+			if (sender) {
 				p_action.SetOrigin(sender);
 				object->SetCompositePresenter((MxCompositePresenter*) sender);
 			}
+			else {
+				if (!p_action.GetOrigin())
+					p_action.SetOrigin(this);
+				object->SetCompositePresenter(NULL);
+			}
 
 			if (object->StartAction(p_controller, &p_action) == SUCCESS) {
 				if (sender) {
@@ -349,13 +351,14 @@ MxResult MxOmni::CreatePresenter(MxStreamController* p_controller, MxDSAction& p
 				if (p_action.GetUnknown84()) {
 					NotificationManager()->Send(
 						p_action.GetUnknown84(),
-						&MxStartActionNotificationParam(c_notificationStartAction, this, &p_action, FALSE)
+						&MxStartActionNotificationParam(c_notificationStartAction, object, &p_action, FALSE)
 					);
 				}
 				result = SUCCESS;
 			}
 		}
 	}
+
 	return result;
 }
 

From 27269647f881c19bbdd7723389d65c2b8ed580f4 Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Fri, 5 Jan 2024 14:38:34 -0500
Subject: [PATCH 073/210] Implement/match LegoVideoManager::ConfigureD3DRM
 (#408)

* Implement/match LegoVideoManager::ConfigureD3DRM

* Fix name

* Remove unnecessary forward decl
---
 LEGO1/lego3dmanager.cpp      |  2 +-
 LEGO1/lego3dmanager.h        |  2 +-
 LEGO1/lego3dview.cpp         |  9 +++++++++
 LEGO1/lego3dview.h           | 21 +++++++++++----------
 LEGO1/legovideomanager.cpp   | 28 +++++++++++++++++++++++-----
 LEGO1/legovideomanager.h     |  2 +-
 LEGO1/mxdirect3d.h           |  3 +++
 LEGO1/tgl/d3drm/impl.h       | 24 ++++++++++++------------
 LEGO1/tgl/d3drm/renderer.cpp | 19 ++++++++++---------
 LEGO1/tgl/d3drm/view.cpp     | 18 +++++++++---------
 LEGO1/tgl/tgl.h              |  4 ++--
 LEGO1/tglsurface.h           |  2 +-
 12 files changed, 83 insertions(+), 51 deletions(-)

diff --git a/LEGO1/lego3dmanager.cpp b/LEGO1/lego3dmanager.cpp
index 2b52fbd9..13b5711c 100644
--- a/LEGO1/lego3dmanager.cpp
+++ b/LEGO1/lego3dmanager.cpp
@@ -10,7 +10,7 @@ DECOMP_SIZE_ASSERT(Lego3DManager, 0x10);
 // FUNCTION: LEGO1 0x100ab2d0
 BOOL InitializeCreateStruct(TglSurface::CreateStruct& p_tglSurface, const Lego3DManager::CreateStruct& p_createStruct)
 {
-	p_tglSurface.m_unk0x00 = p_createStruct.m_unk0x00;
+	p_tglSurface.m_driverGUID = p_createStruct.m_driverGUID;
 	p_tglSurface.m_hwnd = p_createStruct.m_hwnd;
 	p_tglSurface.m_directDraw = p_createStruct.m_directDraw;
 	p_tglSurface.m_ddSurface1 = p_createStruct.m_ddSurface1;
diff --git a/LEGO1/lego3dmanager.h b/LEGO1/lego3dmanager.h
index 2482218b..37b7c1ff 100644
--- a/LEGO1/lego3dmanager.h
+++ b/LEGO1/lego3dmanager.h
@@ -11,7 +11,7 @@ class Lego3DManager {
 public:
 	// SIZE 0x28
 	struct CreateStruct {
-		undefined4 m_unk0x00;             // 0x00
+		GUID* m_driverGUID;               // 0x00
 		HWND m_hwnd;                      // 0x04
 		IDirectDraw* m_directDraw;        // 0x08
 		IDirectDrawSurface* m_ddSurface1; // 0x0c
diff --git a/LEGO1/lego3dview.cpp b/LEGO1/lego3dview.cpp
index b9576815..92319630 100644
--- a/LEGO1/lego3dview.cpp
+++ b/LEGO1/lego3dview.cpp
@@ -18,6 +18,15 @@ Lego3DView::~Lego3DView()
 // STUB: LEGO1 0x100aaf90
 BOOL Lego3DView::Create(TglSurface::CreateStruct& p_createStruct, Tgl::Renderer* p_renderer)
 {
+	Tgl::DeviceDirectDrawCreateData createData = {
+		p_createStruct.m_driverGUID,
+		p_createStruct.m_hwnd,
+		p_createStruct.m_directDraw,
+		p_createStruct.m_ddSurface1,
+		p_createStruct.m_ddSurface2
+	};
+
+	m_device = p_renderer->CreateDevice(createData);
 	return TRUE;
 }
 
diff --git a/LEGO1/lego3dview.h b/LEGO1/lego3dview.h
index 49e64567..4222a35f 100644
--- a/LEGO1/lego3dview.h
+++ b/LEGO1/lego3dview.h
@@ -7,7 +7,6 @@
 #include "viewmanager/viewmanager.h"
 
 class LegoROI;
-class Tgl::Renderer;
 
 // VTABLE: LEGO1 0x100dbf78
 // SIZE 0xa8
@@ -16,22 +15,24 @@ class Lego3DView {
 	Lego3DView();
 	virtual ~Lego3DView();
 
-	inline ViewManager* GetViewManager() { return this->m_viewManager; }
-	inline TglImpl::ViewImpl* GetViewPort() { return this->m_viewPort; }
 	BOOL Create(TglSurface::CreateStruct& p_createStruct, Tgl::Renderer* p_renderer);
 	LegoROI* PickROI(MxLong p_a, MxLong p_b);
 	void FUN_100ab100(LegoROI* p_roi);
 	void FUN_100ab1b0(LegoROI* p_roi);
 
+	inline ViewManager* GetViewManager() { return this->m_viewManager; }
+	inline Tgl::Device* GetDevice() { return this->m_device; }
+	inline Tgl::View* GetView() { return this->m_view; }
+
 private:
 	// TODO: all of these fields are in various base classes
-	undefined4 m_unk0x4;                 // 0x04
-	TglImpl::RendererImpl* m_renderImpl; // 0x08
-	TglImpl::DeviceImpl* m_deviceImpl;   // 0x0c
-	TglImpl::ViewImpl* m_viewPort;       // 0x10
-	undefined m_unk0x14[0x74];           // 0x14
-	ViewManager* m_viewManager;          // 0x88
-	undefined m_unk0x8c[0x1c];           // 0x8c
+	undefined4 m_unk0x4;        // 0x04
+	Tgl::Renderer* m_renderer;  // 0x08
+	Tgl::Device* m_device;      // 0x0c
+	Tgl::View* m_view;          // 0x10
+	undefined m_unk0x14[0x74];  // 0x14
+	ViewManager* m_viewManager; // 0x88
+	undefined m_unk0x8c[0x1c];  // 0x8c
 };
 
 // SYNTHETIC: LEGO1 0x100aaf10
diff --git a/LEGO1/legovideomanager.cpp b/LEGO1/legovideomanager.cpp
index 1572423f..8ab9fc35 100644
--- a/LEGO1/legovideomanager.cpp
+++ b/LEGO1/legovideomanager.cpp
@@ -163,7 +163,7 @@ MxResult LegoVideoManager::Create(MxVideoParam& p_videoParam, MxU32 p_frequencyM
 
 	ViewLODList* pLODList;
 
-	if (FUN_1007c930() != SUCCESS)
+	if (ConfigureD3DRM() != SUCCESS)
 		goto done;
 
 	pLODList = m_3dManager->GetViewLODListManager()->Create("CameraROI", 1);
@@ -314,7 +314,7 @@ void LegoVideoManager::SetSkyColor(float p_red, float p_green, float p_blue)
 	colorStrucure.peFlags = -124;
 	m_videoParam.GetPalette()->SetSkyColor(&colorStrucure);
 	m_videoParam.GetPalette()->SetOverrideSkyColor(TRUE);
-	m_3dManager->GetLego3DView()->GetViewPort()->SetBackgroundColor(p_red, p_green, p_blue);
+	m_3dManager->GetLego3DView()->GetView()->SetBackgroundColor(p_red, p_green, p_blue);
 }
 
 // FUNCTION: LEGO1 0x1007c4c0
@@ -334,7 +334,7 @@ void LegoVideoManager::VTable0x34(MxU32 p_x, MxU32 p_y, MxU32 p_width, MxU32 p_h
 	}
 
 	if (!m_initialized) {
-		m_3dManager->GetLego3DView()->GetViewPort()->ForceUpdate(p_x, p_y, p_width, p_height);
+		m_3dManager->GetLego3DView()->GetView()->ForceUpdate(p_x, p_y, p_width, p_height);
 	}
 }
 
@@ -352,8 +352,26 @@ int LegoVideoManager::DisableRMDevice()
 	return 0;
 }
 
-// STUB: LEGO1 0x1007c930
-MxResult LegoVideoManager::FUN_1007c930()
+// FUNCTION: LEGO1 0x1007c930
+MxResult LegoVideoManager::ConfigureD3DRM()
 {
+	IDirect3DRMDevice2* d3drm =
+		((TglImpl::DeviceImpl*) m_3dManager->GetLego3DView()->GetDevice())->ImplementationData();
+
+	if (!d3drm)
+		return FAILURE;
+
+	MxAssignedDevice* assignedDevice = m_direct3d->GetAssignedDevice();
+
+	if (assignedDevice && assignedDevice->GetFlags() & MxAssignedDevice::Flag_HardwareMode) {
+		if (assignedDevice->GetDesc().dpcTriCaps.dwTextureFilterCaps & D3DPTFILTERCAPS_LINEAR)
+			d3drm->SetTextureQuality(D3DRMTEXTURE_LINEAR);
+
+		d3drm->SetDither(TRUE);
+
+		if (assignedDevice->GetDesc().dpcTriCaps.dwShadeCaps & D3DPSHADECAPS_ALPHAFLATBLEND)
+			d3drm->SetRenderMode(D3DRMRENDERMODE_BLENDEDTRANSPARENCY);
+	}
+
 	return SUCCESS;
 }
diff --git a/LEGO1/legovideomanager.h b/LEGO1/legovideomanager.h
index 1f9c49d0..24b35507 100644
--- a/LEGO1/legovideomanager.h
+++ b/LEGO1/legovideomanager.h
@@ -42,7 +42,7 @@ class LegoVideoManager : public MxVideoManager {
 
 private:
 	MxResult CreateDirect3D();
-	MxResult FUN_1007c930();
+	MxResult ConfigureD3DRM();
 
 	Tgl::Renderer* m_renderer;
 	Lego3DManager* m_3dManager; // 0x68
diff --git a/LEGO1/mxdirect3d.h b/LEGO1/mxdirect3d.h
index c0aea3e4..42ef54ec 100644
--- a/LEGO1/mxdirect3d.h
+++ b/LEGO1/mxdirect3d.h
@@ -21,6 +21,9 @@ class MxAssignedDevice {
 	MxAssignedDevice();
 	~MxAssignedDevice();
 
+	inline MxU32 GetFlags() { return m_flags; }
+	inline D3DDEVICEDESC& GetDesc() { return m_desc; }
+
 	friend class MxDirect3D;
 
 private:
diff --git a/LEGO1/tgl/d3drm/impl.h b/LEGO1/tgl/d3drm/impl.h
index 5ba877bb..e1488508 100644
--- a/LEGO1/tgl/d3drm/impl.h
+++ b/LEGO1/tgl/d3drm/impl.h
@@ -5,10 +5,10 @@
 #include <d3drm.h>
 
 // Forward declare D3D types
-struct IDirect3DRM;
-struct IDirect3DRMDevice;
+struct IDirect3DRM2;
+struct IDirect3DRMDevice2;
 struct IDirect3DRMViewport;
-struct IDirect3DRMFrame;
+struct IDirect3DRMFrame2;
 struct IDirect3DRMMesh;
 struct IDirect3DRMMeshBuilder;
 struct IDirect3DRMTexture;
@@ -82,7 +82,7 @@ class RendererImpl : public Renderer {
 	inline void Destroy();
 
 private:
-	IDirect3DRM* m_data;
+	IDirect3DRM2* m_data;
 };
 
 // VTABLE 0x100db988
@@ -114,12 +114,12 @@ class DeviceImpl : public Device {
 	virtual void InitFromD3DDevice(Device*);
 	virtual void InitFromWindowsDevice(Device*);
 
-	inline IDirect3DRMDevice* ImplementationData() const { return m_data; }
+	inline IDirect3DRMDevice2* ImplementationData() const { return m_data; }
 
 	friend class RendererImpl;
 
 private:
-	IDirect3DRMDevice* m_data;
+	IDirect3DRMDevice2* m_data;
 };
 
 // VTABLE 0x100db9e8
@@ -166,7 +166,7 @@ class ViewImpl : public View {
 
 	inline IDirect3DRMViewport* ImplementationData() const { return m_data; }
 
-	static Result ViewportCreateAppData(IDirect3DRM*, IDirect3DRMViewport*, IDirect3DRMFrame*);
+	static Result ViewportCreateAppData(IDirect3DRM2*, IDirect3DRMViewport*, IDirect3DRMFrame2*);
 
 	friend class RendererImpl;
 
@@ -191,12 +191,12 @@ class CameraImpl : public Camera {
 	// vtable+0x08
 	virtual Result SetTransformation(const FloatMatrix4&);
 
-	inline IDirect3DRMFrame* ImplementationData() const { return m_data; }
+	inline IDirect3DRMFrame2* ImplementationData() const { return m_data; }
 
 	friend class RendererImpl;
 
 private:
-	IDirect3DRMFrame* m_data;
+	IDirect3DRMFrame2* m_data;
 };
 
 // VTABLE 0x100dbaf8
@@ -217,12 +217,12 @@ class LightImpl : public Light {
 	virtual Result SetTransformation(const FloatMatrix4&);
 	virtual Result SetColor(float r, float g, float b);
 
-	inline IDirect3DRMFrame* ImplementationData() const { return m_data; }
+	inline IDirect3DRMFrame2* ImplementationData() const { return m_data; }
 
 	friend class RendererImpl;
 
 private:
-	IDirect3DRMFrame* m_data;
+	IDirect3DRMFrame2* m_data;
 };
 
 // VTABLE 0x100dbb88
@@ -301,7 +301,7 @@ class GroupImpl : public Group {
 	friend class RendererImpl;
 
 private:
-	IDirect3DRMFrame* m_data;
+	IDirect3DRMFrame2* m_data;
 };
 
 // VTABLE 0x100dbb18
diff --git a/LEGO1/tgl/d3drm/renderer.cpp b/LEGO1/tgl/d3drm/renderer.cpp
index bd9ed873..11e7d8e9 100644
--- a/LEGO1/tgl/d3drm/renderer.cpp
+++ b/LEGO1/tgl/d3drm/renderer.cpp
@@ -14,7 +14,7 @@ Renderer* Tgl::CreateRenderer()
 }
 
 // GLOBAL: LEGO1 0x1010103c
-IDirect3DRM* g_pD3DRM = NULL;
+IDirect3DRM2* g_pD3DRM = NULL;
 
 // Inlined only
 Result RendererImpl::Create()
@@ -31,7 +31,7 @@ Result RendererImpl::Create()
 	return (m_data != NULL) ? Success : Error;
 }
 
-inline void RendererDestroy(IDirect3DRM* pRenderer)
+inline void RendererDestroy(IDirect3DRM2* pRenderer)
 {
 	int refCount = pRenderer->Release();
 	if (refCount <= 0) {
@@ -84,9 +84,9 @@ Device* RendererImpl::CreateDevice(const DeviceDirectDrawCreateData& data)
 }
 
 inline Result RendererCreateView(
-	IDirect3DRM* pRenderer,
-	IDirect3DRMDevice* pDevice,
-	IDirect3DRMFrame* pCamera,
+	IDirect3DRM2* pRenderer,
+	IDirect3DRMDevice2* pDevice,
+	IDirect3DRMFrame2* pCamera,
 	IDirect3DRMViewport*& rpView,
 	unsigned long x,
 	unsigned long y,
@@ -133,7 +133,7 @@ View* RendererImpl::CreateView(
 	return view;
 }
 
-inline Result RendererCreateGroup(IDirect3DRM* pRenderer, IDirect3DRMFrame* pParent, IDirect3DRMFrame*& rpGroup)
+inline Result RendererCreateGroup(IDirect3DRM2* pRenderer, IDirect3DRMFrame2* pParent, IDirect3DRMFrame2*& rpGroup)
 {
 	Result result = ResultVal(pRenderer->CreateFrame(NULL, &rpGroup));
 	if (Succeeded(result) && pParent) {
@@ -195,7 +195,7 @@ Light* RendererImpl::CreateLight(LightType type, float r, float g, float b)
 		translatedType = D3DRMLIGHT_AMBIENT;
 	}
 
-	LPDIRECT3DRMFRAME frame;
+	LPDIRECT3DRMFRAME2 frame;
 	Result result = ResultVal(m_data->CreateFrame(NULL, &frame));
 	if (Succeeded(result)) {
 		LPDIRECT3DRMLIGHT d3dLight;
@@ -240,7 +240,7 @@ Unk* RendererImpl::CreateUnk()
 }
 
 inline Result RendererCreateTexture(
-	IDirect3DRM* renderer,
+	IDirect3DRM2* renderer,
 	IDirect3DRMTexture*& texture,
 	int width,
 	int height,
@@ -255,7 +255,8 @@ inline Result RendererCreateTexture(
 	Result result;
 
 	image = new TglD3DRMIMAGE(width, height, bytesPerPixel, pBuffer, useBuffer, paletteSize, pEntries);
-	result = ResultVal(renderer->CreateTexture(&image->m_image, &texture));
+	// TODO: LPDIRECT3DRMTEXTURE2?
+	result = ResultVal(renderer->CreateTexture(&image->m_image, (LPDIRECT3DRMTEXTURE2*) &texture));
 	if (Succeeded(result)) {
 		result = TextureImpl::SetImage(texture, image);
 		if (!Succeeded(result)) {
diff --git a/LEGO1/tgl/d3drm/view.cpp b/LEGO1/tgl/d3drm/view.cpp
index f8302bc2..dcaa21ae 100644
--- a/LEGO1/tgl/d3drm/view.cpp
+++ b/LEGO1/tgl/d3drm/view.cpp
@@ -3,12 +3,12 @@
 using namespace TglImpl;
 
 struct ViewportAppData {
-	ViewportAppData(IDirect3DRM* pRenderer);
+	ViewportAppData(IDirect3DRM2* pRenderer);
 	~ViewportAppData();
 
-	IDirect3DRMFrame* m_pLightFrame;
-	IDirect3DRMFrame* m_pCamera;
-	IDirect3DRMFrame* m_pLastRenderedFrame;
+	IDirect3DRMFrame2* m_pLightFrame;
+	IDirect3DRMFrame2* m_pCamera;
+	IDirect3DRMFrame2* m_pLastRenderedFrame;
 	float m_backgroundColorRed;
 	float m_backgroundColorGreen;
 	float m_backgroundColorBlue;
@@ -17,7 +17,7 @@ struct ViewportAppData {
 DECOMP_SIZE_ASSERT(ViewportAppData, 0x18);
 
 // FUNCTION: LEGO1 0x100a10b0
-ViewportAppData::ViewportAppData(IDirect3DRM* pRenderer)
+ViewportAppData::ViewportAppData(IDirect3DRM2* pRenderer)
 {
 	pRenderer->CreateFrame(NULL, &m_pLightFrame);
 	m_pCamera = NULL;
@@ -46,7 +46,7 @@ ViewportAppData::~ViewportAppData()
 void ViewportDestroyCallback(IDirect3DRMObject* pObject, void* pArg);
 
 // FUNCTION: LEGO1 0x100a1160
-Result ViewImpl::ViewportCreateAppData(IDirect3DRM* pDevice, IDirect3DRMViewport* pView, IDirect3DRMFrame* pCamera)
+Result ViewImpl::ViewportCreateAppData(IDirect3DRM2* pDevice, IDirect3DRMViewport* pView, IDirect3DRMFrame2* pCamera)
 {
 	ViewportAppData* data = new ViewportAppData(pDevice);
 	data->m_pCamera = pCamera;
@@ -145,7 +145,7 @@ Result ViewImpl::Remove(const Light* pLight)
 Result ViewImpl::SetCamera(const Camera* pCamera)
 {
 	const CameraImpl* camera = static_cast<const CameraImpl*>(pCamera);
-	IDirect3DRMFrame* frame = camera->ImplementationData();
+	IDirect3DRMFrame2* frame = camera->ImplementationData();
 
 	ViewportAppData* pViewportAppData;
 	Result result;
@@ -249,9 +249,9 @@ Result ViewImpl::Render(const Light* pCamera)
 {
 	ViewportAppData* appdata = ViewportGetData(m_data);
 
-	IDirect3DRMFrame* light = static_cast<const LightImpl*>(pCamera)->ImplementationData();
+	IDirect3DRMFrame2* light = static_cast<const LightImpl*>(pCamera)->ImplementationData();
 
-	IDirect3DRMFrame* lastRendered = appdata->m_pLastRenderedFrame;
+	IDirect3DRMFrame2* lastRendered = appdata->m_pLastRenderedFrame;
 	if (light != lastRendered) {
 		if (lastRendered) {
 			lastRendered->DeleteChild(appdata->m_pCamera);
diff --git a/LEGO1/tgl/tgl.h b/LEGO1/tgl/tgl.h
index 9bf4ce3a..4af0fae5 100644
--- a/LEGO1/tgl/tgl.h
+++ b/LEGO1/tgl/tgl.h
@@ -57,8 +57,8 @@ struct PaletteEntry {
 };
 
 struct DeviceDirect3DCreateData {
-	IDirect3D* m_pDirect3D;
-	IDirect3DDevice* m_pDirect3DDevice;
+	IDirect3D2* m_pDirect3D;
+	IDirect3DDevice2* m_pDirect3DDevice;
 };
 
 struct DeviceDirectDrawCreateData {
diff --git a/LEGO1/tglsurface.h b/LEGO1/tglsurface.h
index 01bfad78..24776493 100644
--- a/LEGO1/tglsurface.h
+++ b/LEGO1/tglsurface.h
@@ -11,7 +11,7 @@ class TglSurface {
 public:
 	// SIZE 0x28
 	struct CreateStruct {
-		undefined4 m_unk0x00;             // 0x00
+		GUID* m_driverGUID;               // 0x00
 		HWND m_hwnd;                      // 0x04
 		IDirectDraw* m_directDraw;        // 0x08
 		IDirectDrawSurface* m_ddSurface1; // 0x0c

From dac2a517c3d9953d00f634cf060f648f8ae84577 Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Sat, 6 Jan 2024 12:06:50 -0500
Subject: [PATCH 074/210] Implement/match LegoVideoManager::Tickle (#409)

* Implement LegoVideoManager::Tickle

* Match

* Remove duplicate annotations

* Add missing annotations

* Rename list functions

* Fix

* Rename some symbols
---
 LEGO1/lego3dmanager.cpp         |   7 +++
 LEGO1/lego3dmanager.h           |   1 +
 LEGO1/legovideomanager.cpp      | 107 ++++++++++++++++++++++++++++++--
 LEGO1/legovideomanager.h        |  62 +++++++++---------
 LEGO1/legoworld.h               |   3 +
 LEGO1/mxdirectdraw.h            | 100 +++++++++++++++--------------
 LEGO1/mxdirectx/mxstopwatch.h   |   4 +-
 LEGO1/mxdisplaysurface.cpp      |   6 ++
 LEGO1/mxdisplaysurface.h        |   1 +
 LEGO1/mxlist.h                  |  36 +++++++----
 LEGO1/mxloopingsmkpresenter.cpp |   2 +-
 LEGO1/mxregion.cpp              |   2 +-
 LEGO1/mxtransitionmanager.h     |  30 ++++-----
 13 files changed, 247 insertions(+), 114 deletions(-)

diff --git a/LEGO1/lego3dmanager.cpp b/LEGO1/lego3dmanager.cpp
index 13b5711c..ebc488ff 100644
--- a/LEGO1/lego3dmanager.cpp
+++ b/LEGO1/lego3dmanager.cpp
@@ -63,3 +63,10 @@ void Lego3DManager::Destroy()
 	delete m_viewLODListManager;
 	m_viewLODListManager = NULL;
 }
+
+// STUB: LEGO1 0xx100ab4b0
+double Lego3DManager::FUN_100ab4b0(double p_und)
+{
+	// TODO
+	return 0.0;
+}
diff --git a/LEGO1/lego3dmanager.h b/LEGO1/lego3dmanager.h
index 37b7c1ff..732bf978 100644
--- a/LEGO1/lego3dmanager.h
+++ b/LEGO1/lego3dmanager.h
@@ -27,6 +27,7 @@ class Lego3DManager {
 	virtual ~Lego3DManager();
 
 	BOOL Create(CreateStruct& p_createStruct);
+	double FUN_100ab4b0(double p_und);
 
 	inline Lego3DView* GetLego3DView() { return this->m_3dView; }
 	inline ViewLODListManager* GetViewLODListManager() { return this->m_viewLODListManager; }
diff --git a/LEGO1/legovideomanager.cpp b/LEGO1/legovideomanager.cpp
index 8ab9fc35..218406e6 100644
--- a/LEGO1/legovideomanager.cpp
+++ b/LEGO1/legovideomanager.cpp
@@ -3,6 +3,7 @@
 #include "legoomni.h"
 #include "legoroi.h"
 #include "mxtimer.h"
+#include "mxtransitionmanager.h"
 #include "realtime/matrix.h"
 #include "viewmanager/viewroi.h"
 
@@ -23,7 +24,7 @@ LegoVideoManager::LegoVideoManager()
 	m_isFullscreenMovie = FALSE;
 	m_palette = NULL;
 	m_stopWatch = NULL;
-	m_cursorMoved = FALSE;
+	m_drawCursor = FALSE;
 	m_cursorX = m_cursorY;
 	m_cursorYCopy = m_cursorY;
 	m_cursorXCopy = m_cursorY;
@@ -33,7 +34,7 @@ LegoVideoManager::LegoVideoManager()
 	m_unk0x528 = 0;
 	m_arialFont = NULL;
 	m_unk0xe5 = FALSE;
-	m_unk0x554 = 0;
+	m_unk0x554 = FALSE;
 	m_initialized = FALSE;
 }
 
@@ -214,7 +215,7 @@ void LegoVideoManager::MoveCursor(MxS32 p_cursorX, MxS32 p_cursorY)
 {
 	m_cursorX = p_cursorX;
 	m_cursorY = p_cursorY;
-	m_cursorMoved = TRUE;
+	m_drawCursor = TRUE;
 
 	if (623 < p_cursorX)
 		m_cursorX = 623;
@@ -223,11 +224,107 @@ void LegoVideoManager::MoveCursor(MxS32 p_cursorX, MxS32 p_cursorY)
 		m_cursorY = 463;
 }
 
-// STUB: LEGO1 0x1007b770
+inline void LegoVideoManager::DrawCursor()
+{
+	if (m_cursorX != m_cursorXCopy || m_cursorY != m_cursorYCopy) {
+		if (m_cursorX >= 0 && m_cursorY >= 0) {
+			m_cursorXCopy = m_cursorX;
+			m_cursorYCopy = m_cursorY;
+		}
+	}
+
+	LPDIRECTDRAWSURFACE ddSurface2 = m_displaySurface->GetDirectDrawSurface2();
+
+	if (!m_unk0x514) {
+		m_unk0x518.top = 0;
+		m_unk0x518.left = 0;
+		m_unk0x518.bottom = 16;
+		m_unk0x518.right = 16;
+		m_unk0x514 = MxDisplaySurface::FUN_100bc070();
+
+		if (!m_unk0x514)
+			m_drawCursor = FALSE;
+	}
+
+	ddSurface2->BltFast(m_cursorXCopy, m_cursorYCopy, m_unk0x514, &m_unk0x518, DDBLTFAST_WAIT | DDBLTFAST_SRCCOLORKEY);
+}
+
+// FUNCTION: LEGO1 0x1007b770
 MxResult LegoVideoManager::Tickle()
+{
+	if (m_unk0x554 && !m_videoParam.Flags().GetFlipSurfaces() &&
+		TransitionManager()->GetTransitionType() == MxTransitionManager::NOT_TRANSITIONING)
+		Sleep(30);
+
+	m_stopWatch->Stop();
+	m_elapsedSeconds = m_stopWatch->ElapsedSeconds();
+	m_stopWatch->Reset();
+	m_stopWatch->Start();
+
+	m_direct3d->RestoreSurfaces();
+
+	SortPresenterList();
+
+	MxPresenter* presenter;
+	MxPresenterListCursor cursor(m_presenters);
+
+	while (cursor.Next(presenter))
+		presenter->Tickle();
+
+	if (m_unk0xe4 && !m_initialized)
+		m_3dManager->GetLego3DView()->GetView()->Clear();
+
+	MxRect32 rect(0, 0, m_videoParam.GetRect().GetWidth() - 1, m_videoParam.GetRect().GetHeight() - 1);
+	InvalidateRect(rect);
+
+	if (!m_initialized && (m_unk0xe4 || m_unk0xe5)) {
+		cursor.Reset();
+
+		while (cursor.Next(presenter) && presenter->GetDisplayZ() >= 0)
+			presenter->PutData();
+
+		if (!m_unk0xe5) {
+			m_3dManager->FUN_100ab4b0(0.0);
+			m_3dManager->GetLego3DView()->GetDevice()->Update();
+		}
+
+		cursor.Prev();
+
+		while (cursor.Next(presenter))
+			presenter->PutData();
+
+		if (m_drawCursor)
+			DrawCursor();
+
+		if (m_drawFPS)
+			DrawFPS();
+	}
+	else if (m_unk0x500) {
+		MxPresenter* presenter;
+		MxPresenterListCursor cursor(m_presenters);
+
+		if (cursor.Last(presenter))
+			presenter->PutData();
+	}
+
+	if (!m_initialized) {
+		if (m_unk0xe4 && m_videoParam.Flags().GetFlipSurfaces()) {
+			m_3dManager->GetLego3DView()
+				->GetView()
+				->ForceUpdate(0, 0, m_videoParam.GetRect().GetWidth(), m_videoParam.GetRect().GetHeight());
+		}
+
+		UpdateRegion();
+	}
+
+	m_region->Reset();
+	return SUCCESS;
+}
+
+// STUB: LEGO1 0x1007bbc0
+void LegoVideoManager::DrawFPS()
 {
 	// TODO
-	return MxVideoManager::Tickle();
 }
 
 // STUB: LEGO1 0x1007c080
diff --git a/LEGO1/legovideomanager.h b/LEGO1/legovideomanager.h
index 24b35507..e4ef28ea 100644
--- a/LEGO1/legovideomanager.h
+++ b/LEGO1/legovideomanager.h
@@ -43,40 +43,46 @@ class LegoVideoManager : public MxVideoManager {
 private:
 	MxResult CreateDirect3D();
 	MxResult ConfigureD3DRM();
+	void DrawFPS();
 
-	Tgl::Renderer* m_renderer;
-	Lego3DManager* m_3dManager; // 0x68
-	LegoROI* m_viewROI;         // 0x6c
-	undefined4 m_unk0x70;
-	MxDirect3D* m_direct3d; // 0x74
-	undefined4 m_unk0x78[27];
-	MxBool m_unk0xe4;
-	MxBool m_unk0xe5;
-	MxBool m_unk0xe6;
+	inline void DrawCursor();
+
+	Tgl::Renderer* m_renderer;          // 0x64
+	Lego3DManager* m_3dManager;         // 0x68
+	LegoROI* m_viewROI;                 // 0x6c
+	undefined4 m_unk0x70;               // 0x70
+	MxDirect3D* m_direct3d;             // 0x74
+	undefined4 m_unk0x78[27];           // 0x78
+	MxBool m_unk0xe4;                   // 0xe4
+	MxBool m_unk0xe5;                   // 0xe5
+	MxBool m_unk0xe6;                   // 0xe6
 	PALETTEENTRY m_paletteEntries[256]; // 0xe7
-	undefined m_padding0x4e7;
+	undefined m_padding0x4e7;           // 0x4e7
 	MxUnknown100d9d00* m_unk0x100d9d00; // 0x4e8
 	MxBool m_isFullscreenMovie;         // 0x4ec
 	MxPalette* m_palette;               // 0x4f0
 	MxStopWatch* m_stopWatch;           // 0x4f4
-	undefined m_padding0x4f4[8];
-	MxBool m_unk0x500;
-	MxBool m_cursorMoved; // 0x501
-	MxS32 m_cursorXCopy;  // 0x504
-	MxS32 m_cursorYCopy;  // 0x508
-	MxS32 m_cursorX;      // 0x50c
-	MxS32 m_cursorY;      // 0x510
-	undefined4 m_unk0x514;
-	undefined m_pad0x518[0x10];
-	undefined4 m_unk0x528;
-	MxBool m_drawFPS;  // 0x52c
-	RECT m_fpsRect;    // 0x530
-	HFONT m_arialFont; // 0x540
-	SIZE m_fpsSize;    // 0x544
-	undefined m_pad0x54c[8];
-	undefined m_unk0x554;
-	MxBool m_initialized; // 0x555
-	undefined m_pad0x556[0x39];
+	double m_elapsedSeconds;            // 0x4f8
+	MxBool m_unk0x500;                  // 0x500
+	MxBool m_drawCursor;                // 0x501
+	MxS32 m_cursorXCopy;                // 0x504
+	MxS32 m_cursorYCopy;                // 0x508
+	MxS32 m_cursorX;                    // 0x50c
+	MxS32 m_cursorY;                    // 0x510
+	LPDIRECTDRAWSURFACE m_unk0x514;     // 0x514
+	RECT m_unk0x518;                    // 0x518
+	undefined4 m_unk0x528;              // 0x528
+	MxBool m_drawFPS;                   // 0x52c
+	RECT m_fpsRect;                     // 0x530
+	HFONT m_arialFont;                  // 0x540
+	SIZE m_fpsSize;                     // 0x544
+	undefined m_pad0x54c[8];            // 0x54c
+	MxBool m_unk0x554;                  // 0x554
+	MxBool m_initialized;               // 0x555
+	undefined m_pad0x556[0x39];         // 0x556
 };
 
+// SYNTHETIC: LEGO1 0x1007ab20
+// LegoVideoManager::`scalar deleting destructor'
+
 #endif // LEGOVIDEOMANAGER_H
diff --git a/LEGO1/legoworld.h b/LEGO1/legoworld.h
index d855b530..c4f53913 100644
--- a/LEGO1/legoworld.h
+++ b/LEGO1/legoworld.h
@@ -84,4 +84,7 @@ class LegoWorld : public LegoEntity {
 // FUNCTION: LEGO1 0x1001f0c0
 // MxPresenterListCursor::~MxPresenterListCursor
 
+// TEMPLATE: LEGO1 0x10020760
+// MxListCursor<MxPresenter *>::MxListCursor<MxPresenter *>
+
 #endif // LEGOWORLD_H
diff --git a/LEGO1/mxdirectdraw.h b/LEGO1/mxdirectdraw.h
index 248537cd..90be31c5 100644
--- a/LEGO1/mxdirectdraw.h
+++ b/LEGO1/mxdirectdraw.h
@@ -39,6 +39,55 @@ class MxDirectDraw {
 		void* m_unk0x178;  // 0x178
 	};
 
+	__declspec(dllexport) int FlipToGDISurface();
+	__declspec(dllexport) static int GetPrimaryBitDepth();
+	__declspec(dllexport) int Pause(int);
+
+	MxDirectDraw();
+	virtual ~MxDirectDraw();
+
+	virtual BOOL Create(
+		HWND hWnd,
+		BOOL fullscreen_1,
+		BOOL surface_fullscreen,
+		BOOL onlySystemMemory,
+		int width,
+		int height,
+		int bpp,
+		const PALETTEENTRY* pPaletteEntries,
+		int paletteEntryCount
+	);                                                  // vtable+0x04
+	virtual void Destroy();                             // vtable+0x08
+	virtual void DestroyButNotDirectDraw();             // vtable+0x0c
+	virtual const char* ErrorToString(HRESULT p_error); // vtable+0x10
+
+	BOOL CacheOriginalPaletteEntries();
+	HRESULT CreateDDSurface(LPDDSURFACEDESC a2, LPDIRECTDRAWSURFACE* a3, IUnknown* a4);
+	BOOL CreateTextSurfaces();
+	BOOL CreateZBuffer(DWORD memorytype, DWORD depth);
+	BOOL DDCreateSurfaces();
+	BOOL DDInit(BOOL fullscreen);
+	BOOL DDSetMode(int width, int height, int bpp);
+	void Error(const char* p_message, MxS32 p_error);
+
+	BOOL GetDDSurfaceDesc(LPDDSURFACEDESC lpDDSurfDesc, LPDIRECTDRAWSURFACE lpDDSurf);
+	BOOL IsSupportedMode(int width, int height, int bpp);
+	BOOL RecreateDirectDraw(GUID** a2);
+	BOOL RestoreOriginalPaletteEntries();
+	BOOL RestorePaletteEntries();
+	BOOL RestoreSurfaces();
+	BOOL SetPaletteEntries(const PALETTEENTRY* pPaletteEntries, int paletteEntryCount, BOOL fullscreen);
+	BOOL TextToTextSurface(const char* text, IDirectDrawSurface* pSurface, SIZE& textSizeOnSurface);
+	BOOL TextToTextSurface1(const char* text);
+	BOOL TextToTextSurface2(const char* lpString);
+	void FUN_1009e020();
+	void FUN_1009d920();
+
+	inline IDirectDraw* GetDirectDraw() { return m_pDirectDraw; }
+	inline IDirectDrawSurface* GetFrontBuffer() { return m_pFrontBuffer; }
+	inline IDirectDrawSurface* GetBackBuffer() { return m_pBackBuffer; }
+	inline IDirectDrawClipper* GetClipper() { return m_pClipper; }
+
 protected:
 	BOOL m_bOnlySoftRender;                     // 0x04
 	BOOL m_bFlipSurfaces;                       // 0x08
@@ -69,57 +118,6 @@ class MxDirectDraw {
 	int m_pauseCount;                           // 0x86c
 	DeviceModesInfo* m_pCurrentDeviceModesList; // 0x870
 	Mode m_currentMode;                         // 0x874
-
-public:
-	__declspec(dllexport) int FlipToGDISurface();
-	__declspec(dllexport) static int GetPrimaryBitDepth();
-	__declspec(dllexport) int Pause(int);
-
-	MxDirectDraw();
-	virtual ~MxDirectDraw();
-
-	virtual BOOL Create(
-		HWND hWnd,
-		BOOL fullscreen_1,
-		BOOL surface_fullscreen,
-		BOOL onlySystemMemory,
-		int width,
-		int height,
-		int bpp,
-		const PALETTEENTRY* pPaletteEntries,
-		int paletteEntryCount
-	);                                                  // vtable+0x04
-	virtual void Destroy();                             // vtable+0x08
-	virtual void DestroyButNotDirectDraw();             // vtable+0x0c
-	virtual const char* ErrorToString(HRESULT p_error); // vtable+0x10
-
-	inline IDirectDraw* GetDirectDraw() { return m_pDirectDraw; }
-	inline IDirectDrawSurface* GetFrontBuffer() { return m_pFrontBuffer; }
-	inline IDirectDrawSurface* GetBackBuffer() { return m_pBackBuffer; }
-	inline IDirectDrawClipper* GetClipper() { return m_pClipper; }
-
-protected:
-	BOOL CacheOriginalPaletteEntries();
-	HRESULT CreateDDSurface(LPDDSURFACEDESC a2, LPDIRECTDRAWSURFACE* a3, IUnknown* a4);
-	BOOL CreateTextSurfaces();
-	BOOL CreateZBuffer(DWORD memorytype, DWORD depth);
-	BOOL DDCreateSurfaces();
-	BOOL DDInit(BOOL fullscreen);
-	BOOL DDSetMode(int width, int height, int bpp);
-	void Error(const char* p_message, MxS32 p_error);
-
-	BOOL GetDDSurfaceDesc(LPDDSURFACEDESC lpDDSurfDesc, LPDIRECTDRAWSURFACE lpDDSurf);
-	BOOL IsSupportedMode(int width, int height, int bpp);
-	BOOL RecreateDirectDraw(GUID** a2);
-	BOOL RestoreOriginalPaletteEntries();
-	BOOL RestorePaletteEntries();
-	BOOL RestoreSurfaces();
-	BOOL SetPaletteEntries(const PALETTEENTRY* pPaletteEntries, int paletteEntryCount, BOOL fullscreen);
-	BOOL TextToTextSurface(const char* text, IDirectDrawSurface* pSurface, SIZE& textSizeOnSurface);
-	BOOL TextToTextSurface1(const char* text);
-	BOOL TextToTextSurface2(const char* lpString);
-	void FUN_1009e020();
-	void FUN_1009d920();
 };
 
 #endif // MXDIRECTDRAW_H
diff --git a/LEGO1/mxdirectx/mxstopwatch.h b/LEGO1/mxdirectx/mxstopwatch.h
index bb37e484..1ce3275f 100644
--- a/LEGO1/mxdirectx/mxstopwatch.h
+++ b/LEGO1/mxdirectx/mxstopwatch.h
@@ -11,6 +11,8 @@
 // NOTE:	MxStopWatch measures elapsed (wall clock) time.
 //
 
+#define HUGE_VAL_IMMEDIATE 1.7976931348623157e+308
+
 class MxStopWatch {
 public:
 	MxStopWatch();
@@ -54,7 +56,7 @@ inline void MxStopWatch::Stop()
 
 	if (endTick.HighPart != m_startTick.HighPart) {
 		// LARGE_INTEGER arithmetic not yet provided
-		m_elapsedSeconds = HUGE_VAL;
+		m_elapsedSeconds = HUGE_VAL_IMMEDIATE;
 	}
 	else {
 		m_elapsedSeconds += ((endTick.LowPart - m_startTick.LowPart) / (double) m_ticksPerSeconds);
diff --git a/LEGO1/mxdisplaysurface.cpp b/LEGO1/mxdisplaysurface.cpp
index 46789886..69d28822 100644
--- a/LEGO1/mxdisplaysurface.cpp
+++ b/LEGO1/mxdisplaysurface.cpp
@@ -569,6 +569,12 @@ LPDIRECTDRAWSURFACE MxDisplaySurface::VTable0x44(MxBitmap*, undefined4*, undefin
 	return NULL;
 }
 
+// STUB: LEGO1 0x100bc070
+LPDIRECTDRAWSURFACE MxDisplaySurface::FUN_100bc070()
+{
+	return NULL;
+}
+
 // STUB: LEGO1 0x100bc200
 void MxDisplaySurface::VTable0x24(
 	LPDDSURFACEDESC,
diff --git a/LEGO1/mxdisplaysurface.h b/LEGO1/mxdisplaysurface.h
index 7b578c68..25fe95aa 100644
--- a/LEGO1/mxdisplaysurface.h
+++ b/LEGO1/mxdisplaysurface.h
@@ -86,6 +86,7 @@ class MxDisplaySurface : public MxCore {
 	virtual LPDIRECTDRAWSURFACE VTable0x44(MxBitmap*, undefined4*, undefined4, undefined4); // vtable+0x44
 
 	void FUN_100ba640();
+	static LPDIRECTDRAWSURFACE FUN_100bc070();
 
 	inline LPDIRECTDRAWSURFACE GetDirectDrawSurface1() { return this->m_ddSurface1; }
 	inline LPDIRECTDRAWSURFACE GetDirectDrawSurface2() { return this->m_ddSurface2; }
diff --git a/LEGO1/mxlist.h b/LEGO1/mxlist.h
index 80fa0e00..33fbbcd0 100644
--- a/LEGO1/mxlist.h
+++ b/LEGO1/mxlist.h
@@ -91,12 +91,13 @@ class MxListCursor : public MxCore {
 	MxBool Find(T p_obj);
 	void Detach();
 	void Destroy();
+	MxBool Next();
 	MxBool Next(T& p_obj);
+	MxBool Prev();
 	MxBool Prev(T& p_obj);
 	MxBool Current(T& p_obj);
 	MxBool First(T& p_obj);
 	MxBool Last(T& p_obj);
-	MxBool Advance();
 	MxBool HasMatch() { return m_match != NULL; }
 	void SetValue(T p_obj);
 	MxBool Head()
@@ -222,6 +223,17 @@ inline void MxListCursor<T>::Destroy()
 	}
 }
 
+template <class T>
+inline MxBool MxListCursor<T>::Next()
+{
+	if (!m_match)
+		m_match = m_list->m_first;
+	else
+		m_match = m_match->GetNext();
+
+	return m_match != NULL;
+}
+
 template <class T>
 inline MxBool MxListCursor<T>::Next(T& p_obj)
 {
@@ -236,6 +248,17 @@ inline MxBool MxListCursor<T>::Next(T& p_obj)
 	return m_match != NULL;
 }
 
+template <class T>
+inline MxBool MxListCursor<T>::Prev()
+{
+	if (!m_match)
+		m_match = m_list->m_last;
+	else
+		m_match = m_match->GetPrev();
+
+	return m_match != NULL;
+}
+
 template <class T>
 inline MxBool MxListCursor<T>::Prev(T& p_obj)
 {
@@ -279,17 +302,6 @@ inline MxBool MxListCursor<T>::Last(T& p_obj)
 	return m_match != NULL;
 }
 
-template <class T>
-inline MxBool MxListCursor<T>::Advance()
-{
-	if (!m_match)
-		m_match = m_list->m_first;
-	else
-		m_match = m_match->GetNext();
-
-	return m_match != NULL;
-}
-
 template <class T>
 inline void MxListCursor<T>::SetValue(T p_obj)
 {
diff --git a/LEGO1/mxloopingsmkpresenter.cpp b/LEGO1/mxloopingsmkpresenter.cpp
index 11ab8388..8d0f4d00 100644
--- a/LEGO1/mxloopingsmkpresenter.cpp
+++ b/LEGO1/mxloopingsmkpresenter.cpp
@@ -99,7 +99,7 @@ void MxLoopingSmkPresenter::RepeatingTickle()
 			while (cursor.Next(chunk))
 				chunk->SetTime(chunk->GetTime() + time);
 
-			m_cursor->Advance();
+			m_cursor->Next();
 		}
 
 		MxStreamChunk* chunk;
diff --git a/LEGO1/mxregion.cpp b/LEGO1/mxregion.cpp
index d21b9fdb..ea7fab55 100644
--- a/LEGO1/mxregion.cpp
+++ b/LEGO1/mxregion.cpp
@@ -146,7 +146,7 @@ void MxRegionTopBottom::FUN_100c5280(MxS32 p_left, MxS32 p_right)
 				p_right = leftRight->GetRight();
 
 			b = a;
-			b.Advance();
+			b.Next();
 			a.Destroy();
 
 			if (!b.Current(leftRight))
diff --git a/LEGO1/mxtransitionmanager.h b/LEGO1/mxtransitionmanager.h
index e55e4804..ac87ffcc 100644
--- a/LEGO1/mxtransitionmanager.h
+++ b/LEGO1/mxtransitionmanager.h
@@ -43,6 +43,8 @@ class MxTransitionManager : public MxCore {
 
 	MxResult StartTransition(TransitionType p_animationType, MxS32 p_speed, MxBool p_doCopy, MxBool p_playMusicInAnim);
 
+	inline TransitionType GetTransitionType() { return m_transitionType; }
+
 private:
 	void EndTransition(MxBool p_notifyWorld);
 	void TransitionNone();
@@ -55,21 +57,19 @@ class MxTransitionManager : public MxCore {
 	void SubmitCopyRect(LPDDSURFACEDESC p_ddsc);
 	void SetupCopyRect(LPDDSURFACEDESC p_ddsc);
 
-	MxVideoPresenter* m_waitIndicator;
-	RECT m_copyRect;
-	MxU8* m_copyBuffer;
-
-	FlagBitfield m_copyFlags;
-	undefined4 m_unk0x24;
-	FlagBitfield m_unk0x28;
-
-	TransitionType m_transitionType;
-	LPDIRECTDRAWSURFACE m_ddSurface;
-	MxU16 m_animationTimer;
-	MxU16 m_columnOrder[640]; // 0x36
-	MxU16 m_randomShift[480]; // 0x536
-	MxULong m_systemTime;     // 0x8f8
-	MxS32 m_animationSpeed;   // 0x8fc
+	MxVideoPresenter* m_waitIndicator; // 0x08
+	RECT m_copyRect;                   // 0x0c
+	MxU8* m_copyBuffer;                // 0x1c
+	FlagBitfield m_copyFlags;          // 0x20
+	undefined4 m_unk0x24;              // 0x24
+	FlagBitfield m_unk0x28;            // 0x28
+	TransitionType m_transitionType;   // 0x2c
+	LPDIRECTDRAWSURFACE m_ddSurface;   // 0x30
+	MxU16 m_animationTimer;            // 0x34
+	MxU16 m_columnOrder[640];          // 0x36
+	MxU16 m_randomShift[480];          // 0x536
+	MxULong m_systemTime;              // 0x8f8
+	MxS32 m_animationSpeed;            // 0x8fc
 };
 
 #endif // MXTRANSITIONMANAGER_H

From dc3500f631e141b5811d7946999c9a3a3413aa5d Mon Sep 17 00:00:00 2001
From: Anonymous Maarten <madebr@users.noreply.github.com>
Date: Sat, 6 Jan 2024 18:56:15 +0100
Subject: [PATCH 075/210] Fixes for building isle with mingw on Linux (#410)

* Add LEGO1.DLL resources

* Rename smack files to lowercase

This fixes casing issues with mingw on Linux
Also use double quotes for #error

* cmake: dxguid must come after dinput

* cmake: create LEGO1.DLL instead of libLEGO1.DLL, when using mingw

* act3actor.h  was not including mxcore.h, and using incorrect override

* g_mcoreCount seem to be signed integers

* LegoCameraController: return references to static data in stub functions

* Include string.h, stdlib.h and stdio.h for use of libc functions

* Override MxAtomId::operator!=

* Fix use of STL's std::map + std::vector

* Fix template functions for mingw

* iterator object is used after the for loop

* IDirectDrawSurface::BltFast's first 2 arguments are x/y coordinates, not pointers

* Add stub ViewLODListManager::Lookup

* Fixes

* Format

* Remove unnecessary COMPAT_CONST use

---------

Co-authored-by: Christian Semmler <mail@csemmler.com>
---
 3rdparty/flic/flic.h                    |   2 +-
 3rdparty/smack/{RAD.H => rad.h}         |   2 +-
 3rdparty/smack/{SMACK.H => smack.h}     |   0
 3rdparty/smack/{SMACK.LIB => smack.lib} | Bin
 CMakeLists.txt                          |   4 ++-
 LEGO1/act3actor.h                       |   4 ++-
 LEGO1/define.cpp                        |   2 +-
 LEGO1/define.h                          |   2 +-
 LEGO1/legocameracontroller.cpp          |  12 ++++++--
 LEGO1/legoeventnotificationparam.h      |   2 ++
 LEGO1/legogamestate.cpp                 |   6 ++--
 LEGO1/legogamestate.h                   |   4 +--
 LEGO1/mxatomid.h                        |   1 +
 LEGO1/mxcore.cpp                        |   2 +-
 LEGO1/mxlist.h                          |   5 ++-
 LEGO1/mxqueue.h                         |   8 ++---
 LEGO1/mxstl/stlcompat.h                 |   4 +++
 LEGO1/mxstreamlist.cpp                  |   5 +++
 LEGO1/mxstreamlist.h                    |   6 ++--
 LEGO1/mxtransitionmanager.cpp           |   4 +--
 LEGO1/res/arrow.cur                     | Bin 0 -> 326 bytes
 LEGO1/res/busy.cur                      | Bin 0 -> 326 bytes
 LEGO1/res/leaf_0.cur                    | Bin 0 -> 766 bytes
 LEGO1/res/leaf_1.cur                    | Bin 0 -> 766 bytes
 LEGO1/res/leaf_2.cur                    | Bin 0 -> 766 bytes
 LEGO1/res/leaf_3.cur                    | Bin 0 -> 766 bytes
 LEGO1/res/leaf_4.cur                    | Bin 0 -> 766 bytes
 LEGO1/res/leaf_5.cur                    | Bin 0 -> 766 bytes
 LEGO1/res/leaf_6.cur                    | Bin 0 -> 766 bytes
 LEGO1/res/leaf_7.cur                    | Bin 0 -> 766 bytes
 LEGO1/res/lego1.rc                      |  39 ++++++++++++++++++++++++
 LEGO1/res/resource.h                    |  12 ++++++++
 LEGO1/viewmanager/viewlodlist.cpp       |   6 ++++
 LEGO1/viewmanager/viewlodlist.h         |   2 ++
 util/compat.h                           |   4 +++
 35 files changed, 114 insertions(+), 24 deletions(-)
 rename 3rdparty/smack/{RAD.H => rad.h} (99%)
 rename 3rdparty/smack/{SMACK.H => smack.h} (100%)
 rename 3rdparty/smack/{SMACK.LIB => smack.lib} (100%)
 create mode 100644 LEGO1/res/arrow.cur
 create mode 100644 LEGO1/res/busy.cur
 create mode 100644 LEGO1/res/leaf_0.cur
 create mode 100644 LEGO1/res/leaf_1.cur
 create mode 100644 LEGO1/res/leaf_2.cur
 create mode 100644 LEGO1/res/leaf_3.cur
 create mode 100644 LEGO1/res/leaf_4.cur
 create mode 100644 LEGO1/res/leaf_5.cur
 create mode 100644 LEGO1/res/leaf_6.cur
 create mode 100644 LEGO1/res/leaf_7.cur
 create mode 100644 LEGO1/res/lego1.rc
 create mode 100644 LEGO1/res/resource.h

diff --git a/3rdparty/flic/flic.h b/3rdparty/flic/flic.h
index 6d8495f4..42969e5c 100644
--- a/3rdparty/flic/flic.h
+++ b/3rdparty/flic/flic.h
@@ -33,4 +33,4 @@ typedef struct {
   BYTE  reserved3[40]; /* Set to zero */
 } FLIC_HEADER;
 
-#endif FLIC_H // FLIC_H
\ No newline at end of file
+#endif // FLIC_H
diff --git a/3rdparty/smack/RAD.H b/3rdparty/smack/rad.h
similarity index 99%
rename from 3rdparty/smack/RAD.H
rename to 3rdparty/smack/rad.h
index f041dc1c..610bd794 100644
--- a/3rdparty/smack/RAD.H
+++ b/3rdparty/smack/rad.h
@@ -82,7 +82,7 @@
 #endif
 
 #if !defined(__RADDOS__) && !defined(__RADWIN__) && !defined(__RADMAC__)
-  #error RAD.H didn'y detect your platform.  Define __DOS__, __WINDOWS__, WIN32, macintosh, or powerc.
+  #error "RAD.H didn'y detect your platform.  Define __DOS__, __WINDOWS__, WIN32, macintosh, or powerc."
 #endif
 
 #ifdef __RADMAC__
diff --git a/3rdparty/smack/SMACK.H b/3rdparty/smack/smack.h
similarity index 100%
rename from 3rdparty/smack/SMACK.H
rename to 3rdparty/smack/smack.h
diff --git a/3rdparty/smack/SMACK.LIB b/3rdparty/smack/smack.lib
similarity index 100%
rename from 3rdparty/smack/SMACK.LIB
rename to 3rdparty/smack/smack.lib
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 61a70e1c..4e509e01 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -207,6 +207,7 @@ add_library(lego1 SHARED
   LEGO1/realtime/realtimeview.cpp
   LEGO1/realtime/vector.cpp
   LEGO1/registrationbook.cpp
+  LEGO1/res/lego1.rc
   LEGO1/score.cpp
   LEGO1/scorestate.cpp
   LEGO1/skateboard.cpp
@@ -254,10 +255,11 @@ endif()
 target_link_directories(lego1 PRIVATE "${CMAKE_SOURCE_DIR}/3rdparty/smack")
 
 # Link libraries
-target_link_libraries(lego1 PRIVATE ddraw dsound dxguid dinput winmm d3drm smack)
+target_link_libraries(lego1 PRIVATE ddraw dsound dinput dxguid winmm d3drm smack)
 
 # Make sure filenames are ALL CAPS
 set_property(TARGET lego1 PROPERTY OUTPUT_NAME LEGO1)
+set_property(TARGET lego1 PROPERTY PREFIX "")
 set_property(TARGET lego1 PROPERTY SUFFIX ".DLL")
 
 if (ISLE_BUILD_APP)
diff --git a/LEGO1/act3actor.h b/LEGO1/act3actor.h
index cd1e1fcd..00d06495 100644
--- a/LEGO1/act3actor.h
+++ b/LEGO1/act3actor.h
@@ -1,12 +1,14 @@
 #ifndef ACT3ACTOR_H
 #define ACT3ACTOR_H
 
+#include "mxcore.h"
+
 // FIXME: Uncertain location. There are three vtables which eventually call this
 //        class' ClassName() function, but none of them call it directly.
 class Act3Actor : public MxCore {
 public:
 	// FUNCTION: LEGO1 0x100431b0
-	inline virtual const char* ClassName() override
+	inline virtual const char* ClassName() const override
 	{
 		// STRING: LEGO1 0x100f03ac
 		return "Act3Actor";
diff --git a/LEGO1/define.cpp b/LEGO1/define.cpp
index acd811a8..3f3f70ac 100644
--- a/LEGO1/define.cpp
+++ b/LEGO1/define.cpp
@@ -1,7 +1,7 @@
 #include "define.h"
 
 // GLOBAL: LEGO1 0x1010141c
-MxU32 g_mxcoreCount[101] = {0,     -6643, -5643, -5058, -4643, -4321, -4058, -3836, -3643, -3473, -3321, -3184, -3058,
+MxS32 g_mxcoreCount[101] = {0,     -6643, -5643, -5058, -4643, -4321, -4058, -3836, -3643, -3473, -3321, -3184, -3058,
 							-2943, -2836, -2736, -2643, -2556, -2473, -2395, -2321, -2251, -2184, -2120, -2058, -2000,
 							-1943, -1888, -1836, -1785, -1736, -1689, -1643, -1599, -1556, -1514, -1473, -1434, -1395,
 							-1358, -1321, -1286, -1251, -1217, -1184, -1152, -1120, -1089, -1058, -1029, -1000, -971,
diff --git a/LEGO1/define.h b/LEGO1/define.h
index 45a536a9..d45d02c3 100644
--- a/LEGO1/define.h
+++ b/LEGO1/define.h
@@ -3,7 +3,7 @@
 
 #include "mxtypes.h"
 
-extern MxU32 g_mxcoreCount[101];
+extern MxS32 g_mxcoreCount[101];
 extern const char* g_parseExtraTokens;
 extern const char* g_strWORLD;
 extern const char* g_strSOUND;
diff --git a/LEGO1/legocameracontroller.cpp b/LEGO1/legocameracontroller.cpp
index a182d025..ad1dbb67 100644
--- a/LEGO1/legocameracontroller.cpp
+++ b/LEGO1/legocameracontroller.cpp
@@ -25,17 +25,23 @@ void LegoCameraController::FUN_100123e0(Matrix4Data& p_transform, MxU32)
 // STUB: LEGO1 0x10012740
 Vector3Data& LegoCameraController::FUN_10012740()
 {
-	return Vector3Data();
+	// Actually returns reference to a member
+	static Vector3Data g_v;
+	return g_v;
 }
 
 // STUB: LEGO1 0x100127f0
 Vector3Data& LegoCameraController::FUN_100127f0()
 {
-	return Vector3Data();
+	// Actually returns reference to a member
+	static Vector3Data g_v;
+	return g_v;
 }
 
 // STUB: LEGO1 0x100128a0
 Vector3Data& LegoCameraController::FUN_100128a0()
 {
-	return Vector3Data();
+	// Actually returns reference to a member
+	static Vector3Data g_v;
+	return g_v;
 }
diff --git a/LEGO1/legoeventnotificationparam.h b/LEGO1/legoeventnotificationparam.h
index 5f0195ec..c9087909 100644
--- a/LEGO1/legoeventnotificationparam.h
+++ b/LEGO1/legoeventnotificationparam.h
@@ -4,6 +4,8 @@
 #include "mxnotificationparam.h"
 #include "mxtypes.h"
 
+#include <stdlib.h>
+
 // VTABLE: LEGO1 0x100d6aa0
 class LegoEventNotificationParam : public MxNotificationParam {
 public:
diff --git a/LEGO1/legogamestate.cpp b/LEGO1/legogamestate.cpp
index 62a30db4..23e04601 100644
--- a/LEGO1/legogamestate.cpp
+++ b/LEGO1/legogamestate.cpp
@@ -9,6 +9,8 @@
 #include "mxstring.h"
 #include "mxvariabletable.h"
 
+#include <stdio.h>
+
 // Based on the highest dword offset (0x42c) referenced in the constructor.
 // There may be other members that come after.
 DECOMP_SIZE_ASSERT(LegoGameState, 0x430)
@@ -217,7 +219,7 @@ MxBool ROIHandlerFunction(char* p_input, char* p_output, MxU32 p_copyLen)
 }
 
 // FUNCTION: LEGO1 0x1003bbb0
-LegoState* LegoGameState::GetState(COMPAT_CONST char* p_stateName)
+LegoState* LegoGameState::GetState(const char* p_stateName)
 {
 	for (MxS32 i = 0; i < m_stateCount; ++i)
 		if (m_stateArray[i]->IsA(p_stateName))
@@ -226,7 +228,7 @@ LegoState* LegoGameState::GetState(COMPAT_CONST char* p_stateName)
 }
 
 // FUNCTION: LEGO1 0x1003bc00
-LegoState* LegoGameState::CreateState(COMPAT_CONST char* p_stateName)
+LegoState* LegoGameState::CreateState(const char* p_stateName)
 {
 	LegoState* newState = (LegoState*) ObjectFactory()->Create(p_stateName);
 	RegisterState(newState);
diff --git a/LEGO1/legogamestate.h b/LEGO1/legogamestate.h
index 656b990c..5f62b107 100644
--- a/LEGO1/legogamestate.h
+++ b/LEGO1/legogamestate.h
@@ -27,8 +27,8 @@ class LegoGameState {
 	__declspec(dllexport) void SerializeScoreHistory(MxS16 p_flags);
 	__declspec(dllexport) void SetSavePath(char*);
 
-	LegoState* GetState(COMPAT_CONST char* p_stateName);
-	LegoState* CreateState(COMPAT_CONST char* p_stateName);
+	LegoState* GetState(const char* p_stateName);
+	LegoState* CreateState(const char* p_stateName);
 
 	void GetFileSavePath(MxString* p_outPath, MxULong p_slotn);
 	void FUN_1003a720(MxU32);
diff --git a/LEGO1/mxatomid.h b/LEGO1/mxatomid.h
index 5d4cd10f..3abe6479 100644
--- a/LEGO1/mxatomid.h
+++ b/LEGO1/mxatomid.h
@@ -20,6 +20,7 @@ class MxAtomId {
 	MxAtomId() { this->m_internal = 0; }
 
 	inline MxBool operator==(const MxAtomId& p_atomId) const { return this->m_internal == p_atomId.m_internal; }
+	inline MxBool operator!=(const MxAtomId& p_atomId) const { return this->m_internal != p_atomId.m_internal; }
 
 	void Clear();
 
diff --git a/LEGO1/mxcore.cpp b/LEGO1/mxcore.cpp
index 18c37597..237ed1da 100644
--- a/LEGO1/mxcore.cpp
+++ b/LEGO1/mxcore.cpp
@@ -11,7 +11,7 @@ MxResult MxCore::Tickle()
 // FUNCTION: LEGO1 0x100ae1a0
 MxCore::MxCore()
 {
-	m_id = g_mxcoreCount[0];
+	m_id = (MxU32) g_mxcoreCount[0];
 	g_mxcoreCount[0]++;
 }
 
diff --git a/LEGO1/mxlist.h b/LEGO1/mxlist.h
index 33fbbcd0..911d5a36 100644
--- a/LEGO1/mxlist.h
+++ b/LEGO1/mxlist.h
@@ -76,7 +76,10 @@ class MxPtrList : public MxList<T*> {
 
 	static void Destroy(T* p_obj) { delete p_obj; };
 
-	void SetOwnership(MxBool p_ownership) { SetDestroy(p_ownership ? Destroy : MxCollection<T*>::Destroy); }
+	void SetOwnership(MxBool p_ownership)
+	{
+		MxCollection<T*>::SetDestroy(p_ownership ? MxPtrList<T>::Destroy : MxCollection<T*>::Destroy);
+	}
 };
 
 template <class T>
diff --git a/LEGO1/mxqueue.h b/LEGO1/mxqueue.h
index b6eaad55..4e45c035 100644
--- a/LEGO1/mxqueue.h
+++ b/LEGO1/mxqueue.h
@@ -13,10 +13,10 @@ class MxQueue : public MxList<T> {
 
 	MxBool Dequeue(T& p_obj)
 	{
-		MxBool hasNext = (m_first != NULL);
-		if (m_first) {
-			p_obj = m_first->GetValue();
-			DeleteEntry(m_first);
+		MxBool hasNext = (this->m_first != NULL);
+		if (this->m_first) {
+			p_obj = this->m_first->GetValue();
+			this->DeleteEntry(this->m_first);
 		}
 
 		return hasNext;
diff --git a/LEGO1/mxstl/stlcompat.h b/LEGO1/mxstl/stlcompat.h
index bc0076bf..29c31549 100644
--- a/LEGO1/mxstl/stlcompat.h
+++ b/LEGO1/mxstl/stlcompat.h
@@ -10,9 +10,13 @@
 #else
 #include <algorithm>
 #include <list>
+#include <map>
 #include <set>
+#include <vector>
 using std::list;
+using std::map;
 using std::set;
+using std::vector;
 #endif
 
 #endif // STLCOMPAT_H
diff --git a/LEGO1/mxstreamlist.cpp b/LEGO1/mxstreamlist.cpp
index 729b0d7b..46e9841b 100644
--- a/LEGO1/mxstreamlist.cpp
+++ b/LEGO1/mxstreamlist.cpp
@@ -26,7 +26,12 @@ MxDSAction* MxStreamListMxDSAction::Find(MxDSAction* p_action, MxBool p_delete)
 
 	MxDSAction* found = NULL;
 
+#ifdef COMPAT_MODE
+	iterator it;
+	for (it = begin(); it != end(); it++) {
+#else
 	for (iterator it = begin(); it != end(); it++) {
+#endif
 		if (p_action->GetObjectId() == -1 || p_action->GetObjectId() == (*it)->GetObjectId()) {
 			if (p_action->GetUnknown24() == -2 || p_action->GetUnknown24() == -3 ||
 				p_action->GetUnknown24() == (*it)->GetUnknown24()) {
diff --git a/LEGO1/mxstreamlist.h b/LEGO1/mxstreamlist.h
index f9164bfb..cbe53eae 100644
--- a/LEGO1/mxstreamlist.h
+++ b/LEGO1/mxstreamlist.h
@@ -11,11 +11,11 @@ class MxStreamList : public list<T> {
 public:
 	MxBool PopFront(T& p_obj)
 	{
-		if (empty())
+		if (this->empty())
 			return FALSE;
 
-		p_obj = front();
-		pop_front();
+		p_obj = this->front();
+		this->pop_front();
 		return TRUE;
 	}
 };
diff --git a/LEGO1/mxtransitionmanager.cpp b/LEGO1/mxtransitionmanager.cpp
index b10ac7c1..db658249 100644
--- a/LEGO1/mxtransitionmanager.cpp
+++ b/LEGO1/mxtransitionmanager.cpp
@@ -229,7 +229,7 @@ void MxTransitionManager::TransitionDissolve()
 
 		if (VideoManager()->GetVideoParam().Flags().GetFlipSurfaces()) {
 			LPDIRECTDRAWSURFACE surf = VideoManager()->GetDisplaySurface()->GetDirectDrawSurface1();
-			surf->BltFast(NULL, NULL, m_ddSurface, &g_fullScreenRect, DDBLTFAST_WAIT);
+			surf->BltFast(0, 0, m_ddSurface, &g_fullScreenRect, DDBLTFAST_WAIT);
 		}
 
 		m_animationTimer++;
@@ -346,7 +346,7 @@ void MxTransitionManager::TransitionPixelation()
 
 		if (VideoManager()->GetVideoParam().Flags().GetFlipSurfaces()) {
 			LPDIRECTDRAWSURFACE surf = VideoManager()->GetDisplaySurface()->GetDirectDrawSurface1();
-			surf->BltFast(NULL, NULL, m_ddSurface, &g_fullScreenRect, DDBLTFAST_WAIT);
+			surf->BltFast(0, 0, m_ddSurface, &g_fullScreenRect, DDBLTFAST_WAIT);
 		}
 
 		m_animationTimer++;
diff --git a/LEGO1/res/arrow.cur b/LEGO1/res/arrow.cur
new file mode 100644
index 0000000000000000000000000000000000000000..15f687a1502fd874b0ea6471e16713a5ac593630
GIT binary patch
literal 326
zcmZ|JF$%&!5QX8lDp;CIQm9F3X=$fN@&*Zbu~k9K93et3kkUdN{|OPn;4I(1Wrkf=
z8Yw8xMNYH{(p=ISw6sTHd6nHh+{|p)T+njc-ho7Nmr^XFl(`q4c%TKdu3wUpR`6$1
uB=}eS;ad&IQ}0Nko|;v-&dkn;8B~A_7=wBI%yyg$aNVD};D!n{e(Mc!(S2h8

literal 0
HcmV?d00001

diff --git a/LEGO1/res/busy.cur b/LEGO1/res/busy.cur
new file mode 100644
index 0000000000000000000000000000000000000000..2a63b536f2ab9db09fd5de69c43b0c707b96728e
GIT binary patch
literal 326
zcmZQzU}9ioP*7k10|Q0|1~DK@1BexX*a3(cfe-{5z$7N||Nno8;Q#*(Kt&KZ{||(Y
zTFbx?8_U2Dx0ivzzmkDL{SyO&a0&wh=LrS|mI<gBBnFaG+r+@&8_B>B{}+Klroqev
zvFm|$ApxKpK(46Azzqx_S0V5L#{d5xF#rGmf&KsgAN;5oBnFZLsX^8QVq-HKY$=2Q
E06(H~eE<Le

literal 0
HcmV?d00001

diff --git a/LEGO1/res/leaf_0.cur b/LEGO1/res/leaf_0.cur
new file mode 100644
index 0000000000000000000000000000000000000000..e8735671d7a27c35e51a55f3dcf9d81ec63f2b6d
GIT binary patch
literal 766
zcmd5)F%H5o47^6DNEu*bZIq!x`2;)#b<8KoQ&7jgB2QstWMn`xHdQ63MGQ>1IVWew
zK36SZP{BE1g9bMP>;UW;9Kw-NVa1+}bDu2%ypYnkvF9TrA?M5qdM^;kiNTMA#Qleb
zatsqMMWD6i1s4l$>d@-~<73dgt*zGut_y?azO{Z(g6<T0oo|f|nj06r?!VCQN_{Nm
zFXZ{dTHTKM?ERtDWzad7*iS}J{tLe0aVEMSh_20uyd@H(^%7G~_UXRV3Z#!fYZ1{4
Di<go&

literal 0
HcmV?d00001

diff --git a/LEGO1/res/leaf_1.cur b/LEGO1/res/leaf_1.cur
new file mode 100644
index 0000000000000000000000000000000000000000..e7e0cde9de1663265be0e75474369832746e24cb
GIT binary patch
literal 766
zcmdUtK~BRk5Ji6sDv~$s*w&f_Lb*gaOD<9$rSftvL5{+bWtK&%`uiPF<5uk!iHV;*
zf4(P<tN;NWQUV^a!dC!Z0K5s6@Gd$zbI7|L8PGt^KZ|CiB4Zp!8Jq{mnh8C%RHuIt
z(cPO5jb6+e?bdsHH|D+@7C*RKX#7~L42@sZy|QJ0?>igPS?lm%q0uE-YPOgD)oiiR
zSO46NsP0BWr?(REQZ9{ulIb6~jt><!<Z(+Llzx-@2lDfY97X;GTE%hZnFmzX++!oQ
PoH}ySmT4{Yrh9P$Ss0P-

literal 0
HcmV?d00001

diff --git a/LEGO1/res/leaf_2.cur b/LEGO1/res/leaf_2.cur
new file mode 100644
index 0000000000000000000000000000000000000000..1abce39b3826001de417273af9b4777de106bdbe
GIT binary patch
literal 766
zcmdT?u?@m75Inz7kkX{1#d2YxOu;Bo7Qv%LDKmvfp=1Oqp8GgKAW@{v+4ugxdt0_-
zK;Ym#7#lnUI03kjlyD^-4vYl7|40BQQYs50Q!*jvOhe}hRm(^YlPv5L^)!87ydK*y
z4IiZ*#~*=(3GLFs%?pYkUEg`%cSG;X5wVI<swhhdG1spydxUmaUE3oe*s?$H4{XD$
bQGGhqJ8qhB)`Vl?bB&hInt9e^y&LfcyV#Y_

literal 0
HcmV?d00001

diff --git a/LEGO1/res/leaf_3.cur b/LEGO1/res/leaf_3.cur
new file mode 100644
index 0000000000000000000000000000000000000000..25e6935f16c0e6ec51d7a2acc978e09107e6f892
GIT binary patch
literal 766
zcmdUtO$x#=5QSgkA7tasZA%s+xkNom@gmJlELr9hJ&H@0E-OgK*9z?jT?<a~O=j|D
zl2QT~WGD(?!*Msj0l<lH3ulsHO;4k?Yysdz2%m+XAqi;PmV%5EB11$thONQ<&TRU+
z%lfEu8<SHx)kfteChv+#r<$C~llN(>{tl}fH@EX_Z&bOBJY45KI;YyLZ>nl;hxO*D
z%3+J@qGVX7E}K5`F9N=S1?zK>j@(GdrAICuN_mhQ>XDYuXC&h~up&FMC#A?$M7Z>|
K$cy2VEZG~(Ws<=F

literal 0
HcmV?d00001

diff --git a/LEGO1/res/leaf_4.cur b/LEGO1/res/leaf_4.cur
new file mode 100644
index 0000000000000000000000000000000000000000..73ec0799ea68db62028b6973dfc34db6a5ec6564
GIT binary patch
literal 766
zcmcgqF%H5o47^&XNEu*bCCU(?d;*?=I_4APDX3##k*6>+GBO|;hpK84RZIvc=lJ5Y
z<4Oex4YUR}0PY0r<U9!E3MWB>m3T49En5I&BZTn~FQFhH#wZE?Y%r%tAS+!Z_ZxFn
zn~Iaa76MWw*F#xgRl%wAE-#?g^##}7<lK^Sc>{fRea?+lX25K^bHxC*RVLSy`Tjn%
y&*eZhKkDyCDW50#dnEq=^DD#i!kq9pj=1fa6XJG8STom{@{>N*r#^Y_h4>BI8<H3R

literal 0
HcmV?d00001

diff --git a/LEGO1/res/leaf_5.cur b/LEGO1/res/leaf_5.cur
new file mode 100644
index 0000000000000000000000000000000000000000..8d8df94ec1b4e68f516c19cb86399687777d3745
GIT binary patch
literal 766
zcmdUtF>b>!3`M`yGy%M1%aEml2BYvL+_U5&(M@7_<SBfUcFfo@gAwJaO%NIB+99+a
zDe_A+3{!Hd<h``jtBy|ENO}iK`hZFcJcjnSMTw;te*>N^M2+K!kbag@$~)l6rR@IS
zhA@AJg?YjHdBIt5<%v2ByV;4XJAZF#bnwLuXXctBuY>h|S6&Eh(-e7YgU>(UX0A0`
z7I{774mXu(d_$R2u)ffrXUhyc*r`kDw1yX8N+xyimd;wkimAyU#w#N+^9A29RrH+T
MyvKELfKPa^3&UBIJ^%m!

literal 0
HcmV?d00001

diff --git a/LEGO1/res/leaf_6.cur b/LEGO1/res/leaf_6.cur
new file mode 100644
index 0000000000000000000000000000000000000000..04615d16e1ab2a8021d63f221bb9dcc22c844983
GIT binary patch
literal 766
zcmdT?F%H5o47?arq%3TV5Ot_fU%^wVe1tp&b<8XJ6h=lyCd|133K9crFFD7)v!y5s
zAaDo)*kX-~02=^%k`fN2!;+Dp_Ztb|MoQ&iWJ)Fs!$3pF4OPoXE|V<G5;>nf?(K8k
zx05iI?OX6Y-Igp9KEF^Vr14cFQZ-d54H9A(V(elm`RWZ_k*7^nYBo$ImAd{asmulZ
f1OMTAR82d*W2HAN^bBX8#~Cd*%{=Q->-`fC#X*xA

literal 0
HcmV?d00001

diff --git a/LEGO1/res/leaf_7.cur b/LEGO1/res/leaf_7.cur
new file mode 100644
index 0000000000000000000000000000000000000000..9795b1dfeba0d18bd81b3daf831dddb7a8367bdc
GIT binary patch
literal 766
zcmds#F%E)25Jf+$!Gy-nL>o3!7{ev>D8`GhH<3{8DL9Iyr6neW@q-4IsGXI=zM1*^
zhux3>7(}oZ*kFyT0agHZgj+a}2y<ozz0ctQE;#or%xsB6RaG>!Ur_Bj!l&En(tm`A
z6v3CsHa3Aaa<XNhC61F&Tahf#MkL9yao&h6eV}PmkJs6wFH1jYzV4^TaoP?xczAFb
z!0BRifvF4li5pJ-pyxmEEzUIds%@^?u)VX)RBz-$D&k&%m9$v&G+1hbRBPl~N2>LL
Jq$Jn3cmRiNm81Xw

literal 0
HcmV?d00001

diff --git a/LEGO1/res/lego1.rc b/LEGO1/res/lego1.rc
new file mode 100644
index 00000000..44e07d7c
--- /dev/null
+++ b/LEGO1/res/lego1.rc
@@ -0,0 +1,39 @@
+#include "resource.h"
+
+LEGO1_LEAF4 CURSOR "leaf_4.cur"
+LEGO1_LEAF7 CURSOR "leaf_7.cur"
+LEGO1_LEAF1 CURSOR "leaf_1.cur"
+LEGO1_LEAF2 CURSOR "leaf_2.cur"
+LEGO1_LEAF6 CURSOR "leaf_6.cur"
+LEGO1_LEAF0 CURSOR "leaf_0.cur"
+LEGO1_LEAF5 CURSOR "leaf_5.cur"
+LEGO1_LEAF3 CURSOR "leaf_3.cur"
+LEGO1_ARROW CURSOR "arrow.cur"
+LEGO1_BUSY  CURSOR "busy.cur"
+
+1 VERSIONINFO
+FILEVERSION 1,1,0,0
+PRODUCTVERSION 1,1,0,0
+FILEOS 0x40004
+FILETYPE 0x2
+{
+BLOCK "StringFileInfo"
+{
+	BLOCK "040904b0"
+	{
+		VALUE "CompanyName", "Mindscape, Inc."
+		VALUE "FileDescription", "LegoOmni Library"
+		VALUE "FileVersion", "1, 1, 0, 0"
+		VALUE "InternalName", "LegoOmni Library"
+		VALUE "LegalCopyright", "Copyright \xA9 1997"
+		VALUE "OriginalFilename", "LegoOmni Library"
+		VALUE "ProductName", "LegoOmni Library"
+		VALUE "ProductVersion", "1, 1, 0, 0"
+	}
+}
+
+BLOCK "VarFileInfo"
+{
+	VALUE "Translation", 0x0409, 0x04B0
+}
+}
diff --git a/LEGO1/res/resource.h b/LEGO1/res/resource.h
new file mode 100644
index 00000000..d11b6281
--- /dev/null
+++ b/LEGO1/res/resource.h
@@ -0,0 +1,12 @@
+#define LEGO1_ARROW  101
+#define LEGO1_LEAF4  102
+#define LEGO1_LEAF7  103
+#define LEGO1_LEAF1  104
+#define LEGO1_LEAF2  105
+#define LEGO1_LEAF6  106
+#define LEGO1_LEAF0  107
+#define LEGO1_LEAF5  108
+#define LEGO1_LEAF3  109
+#define LEGO1_BUSY   111
+
+#define APP_ICON    105
diff --git a/LEGO1/viewmanager/viewlodlist.cpp b/LEGO1/viewmanager/viewlodlist.cpp
index 9a8456fc..1cd0783e 100644
--- a/LEGO1/viewmanager/viewlodlist.cpp
+++ b/LEGO1/viewmanager/viewlodlist.cpp
@@ -42,6 +42,12 @@ ViewLODList* ViewLODListManager::Create(const ROIName& rROIName, int lodCount)
 	return pLODList;
 }
 
+// STUB: LEGO1 0x100a75b0
+ViewLODList* ViewLODListManager::Lookup(const ROIName&) const
+{
+	return NULL;
+}
+
 // STUB: LEGO1 0x100a7680
 void ViewLODListManager::Destroy(ViewLODList* lodList)
 {
diff --git a/LEGO1/viewmanager/viewlodlist.h b/LEGO1/viewmanager/viewlodlist.h
index c0d5ed82..4d848533 100644
--- a/LEGO1/viewmanager/viewlodlist.h
+++ b/LEGO1/viewmanager/viewlodlist.h
@@ -6,6 +6,8 @@
 #include "assert.h"
 #include "compat.h"
 
+#include <string.h>
+
 #pragma warning(disable : 4237)
 #pragma warning(disable : 4786)
 
diff --git a/util/compat.h b/util/compat.h
index e83b115e..3c83def6 100644
--- a/util/compat.h
+++ b/util/compat.h
@@ -3,6 +3,10 @@
 
 // Various macros to enable compiling with other/newer compilers.
 
+#ifdef __MINGW32__
+#define COMPAT_MODE
+#endif
+
 // Use `COMPAT_CONST` where something ought to be 'const', and a newer compiler would complain if it
 // wasn't, but we know it isn't 'const' in the original code.
 #ifdef __MINGW32__

From 8db36722d85cf0d7f8e4460c114e55642cbe4483 Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Sat, 6 Jan 2024 21:29:32 -0500
Subject: [PATCH 076/210] Implement/match Lego3DView and parent classes (#412)

* Implement/match TglSurface

* Implement/match LegoView/1

* Lego3DView

* Fixes

* Lego3DManager

* Remove garbage

* Remove garbage

* Use shorthand calls
---
 .github/workflows/format.yml      |   1 +
 CMakeLists.txt                    |   6 +-
 ISLE/isleapp.cpp                  |   1 +
 LEGO1/3dmanager/lego3dmanager.cpp |  96 +++++++++++++
 LEGO1/3dmanager/lego3dmanager.h   | 117 ++++++++++++++++
 LEGO1/3dmanager/lego3dview.cpp    | 221 +++++++++++++++++++++++++++++
 LEGO1/3dmanager/lego3dview.h      |  62 +++++++++
 LEGO1/3dmanager/legoview1.cpp     | 184 ++++++++++++++++++++++++
 LEGO1/3dmanager/legoview1.h       |  72 ++++++++++
 LEGO1/3dmanager/tglsurface.cpp    | 224 ++++++++++++++++++++++++++++++
 LEGO1/3dmanager/tglsurface.h      |  87 ++++++++++++
 LEGO1/lego3dmanager.cpp           |  72 ----------
 LEGO1/lego3dmanager.h             |  46 ------
 LEGO1/lego3dview.cpp              |  50 -------
 LEGO1/lego3dview.h                |  41 ------
 LEGO1/legoomni.cpp                |   2 +-
 LEGO1/legovideomanager.cpp        |  69 ++++-----
 LEGO1/legovideomanager.h          |   4 +-
 LEGO1/mxdirectx/mxstopwatch.h     |  16 ++-
 LEGO1/tgl/d3drm/impl.h            |  25 ++--
 LEGO1/tgl/tgl.h                   |   2 +-
 LEGO1/tglsurface.h                |  27 ----
 22 files changed, 1132 insertions(+), 293 deletions(-)
 create mode 100644 LEGO1/3dmanager/lego3dmanager.cpp
 create mode 100644 LEGO1/3dmanager/lego3dmanager.h
 create mode 100644 LEGO1/3dmanager/lego3dview.cpp
 create mode 100644 LEGO1/3dmanager/lego3dview.h
 create mode 100644 LEGO1/3dmanager/legoview1.cpp
 create mode 100644 LEGO1/3dmanager/legoview1.h
 create mode 100644 LEGO1/3dmanager/tglsurface.cpp
 create mode 100644 LEGO1/3dmanager/tglsurface.h
 delete mode 100644 LEGO1/lego3dmanager.cpp
 delete mode 100644 LEGO1/lego3dmanager.h
 delete mode 100644 LEGO1/lego3dview.cpp
 delete mode 100644 LEGO1/lego3dview.h
 delete mode 100644 LEGO1/tglsurface.h

diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml
index d8fbe442..6f1c7065 100644
--- a/.github/workflows/format.yml
+++ b/.github/workflows/format.yml
@@ -17,6 +17,7 @@ jobs:
           --style=file \
           ISLE/*.cpp ISLE/*.h \
           LEGO1/*.cpp LEGO1/*.h \
+          LEGO1/3dmanager/*.cpp LEGO1/3dmanager/*.h \
           LEGO1/mxdirectx/*.h \
           LEGO1/mxstl/*.h \
           LEGO1/realtime/*.cpp LEGO1/realtime/*.h \
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4e509e01..ea171888 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,6 +7,10 @@ option(ISLE_USE_SMARTHEAP "Build with SmartHeap" ${MSVC})
 option(ISLE_USE_DX5 "Build with internal DirectX 5 SDK" ON)
 
 add_library(lego1 SHARED
+  LEGO1/3dmanager/lego3dmanager.cpp
+  LEGO1/3dmanager/lego3dview.cpp
+  LEGO1/3dmanager/legoview1.cpp
+  LEGO1/3dmanager/tglsurface.cpp
   LEGO1/act1state.cpp
   LEGO1/act2brick.cpp
   LEGO1/act2policestation.cpp
@@ -47,8 +51,6 @@ add_library(lego1 SHARED
   LEGO1/jukebox.cpp
   LEGO1/jukeboxentity.cpp
   LEGO1/jukeboxstate.cpp
-  LEGO1/lego3dmanager.cpp
-  LEGO1/lego3dview.cpp
   LEGO1/legoact2state.cpp
   LEGO1/legoactioncontrolpresenter.cpp
   LEGO1/legoactor.cpp
diff --git a/ISLE/isleapp.cpp b/ISLE/isleapp.cpp
index c402098d..7ecb6272 100644
--- a/ISLE/isleapp.cpp
+++ b/ISLE/isleapp.cpp
@@ -21,6 +21,7 @@
 #include "mxtimer.h"
 #include "mxtransitionmanager.h"
 #include "res/resource.h"
+#include "viewmanager/viewmanager.h"
 
 #include <dsound.h>
 
diff --git a/LEGO1/3dmanager/lego3dmanager.cpp b/LEGO1/3dmanager/lego3dmanager.cpp
new file mode 100644
index 00000000..99c977d5
--- /dev/null
+++ b/LEGO1/3dmanager/lego3dmanager.cpp
@@ -0,0 +1,96 @@
+// Lego3DManager.cpp : implementation file
+//
+#include "lego3dmanager.h"
+
+#include "../viewmanager/viewlodlist.h"
+#include "decomp.h"
+
+DECOMP_SIZE_ASSERT(Lego3DManager, 0x10);
+
+//////////////////////////////////////////////////////////////////////////////
+
+// FUNCTION: LEGO1 0x100ab2d0
+BOOL InitializeCreateStruct(
+	TglSurface::CreateStruct& rTglSurfaceCreateStruct,
+	const Lego3DManager::CreateStruct& rCreateStruct
+)
+{
+	// initializes a TglSurface::CreateStruct from a Lego3DManager::CreateStruct
+	rTglSurfaceCreateStruct.m_pDriverGUID = rCreateStruct.m_pDriverGUID;
+	rTglSurfaceCreateStruct.m_hWnd = rCreateStruct.m_hWnd;
+	rTglSurfaceCreateStruct.m_pDirectDraw = rCreateStruct.m_pDirectDraw;
+	rTglSurfaceCreateStruct.m_pFrontBuffer = rCreateStruct.m_pFrontBuffer;
+	rTglSurfaceCreateStruct.m_pBackBuffer = rCreateStruct.m_pBackBuffer;
+	rTglSurfaceCreateStruct.m_pPalette = rCreateStruct.m_pPalette;
+	rTglSurfaceCreateStruct.m_isFullScreen = rCreateStruct.m_isFullScreen;
+	rTglSurfaceCreateStruct.m_isWideViewAngle = rCreateStruct.m_isWideViewAngle;
+	rTglSurfaceCreateStruct.m_direct3d = rCreateStruct.m_direct3d;
+	rTglSurfaceCreateStruct.m_d3dDevice = rCreateStruct.m_d3dDevice;
+	return TRUE;
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
+// FUNCTION: LEGO1 0x100ab320
+Lego3DManager::Lego3DManager()
+{
+	// Tgl things
+	m_pRenderer = 0;
+
+	m_pLego3DView = 0;
+	m_pViewLODListManager = 0;
+}
+
+// FUNCTION: LEGO1 0x100ab360
+Lego3DManager::~Lego3DManager()
+{
+	Destroy();
+}
+
+// FUNCTION: LEGO1 0x100ab370
+BOOL Lego3DManager::Create(CreateStruct& rCreateStruct)
+{
+	TglSurface::CreateStruct tglSurfaceCreateStruct;
+	BOOL result;
+
+	assert(!m_pViewLODListManager);
+	assert(!m_pRenderer);
+	assert(!m_pLego3DView);
+
+	m_pViewLODListManager = new ViewLODListManager;
+	assert(m_pViewLODListManager);
+
+	m_pRenderer = Tgl::CreateRenderer();
+	assert(m_pRenderer);
+
+	m_pLego3DView = new Lego3DView;
+
+	result = InitializeCreateStruct(tglSurfaceCreateStruct, rCreateStruct);
+	assert(result);
+
+	result = m_pLego3DView->Create(tglSurfaceCreateStruct, m_pRenderer);
+	assert(result);
+
+	return result;
+}
+
+// FUNCTION: LEGO1 0x100ab460
+void Lego3DManager::Destroy()
+{
+	delete m_pLego3DView;
+	m_pLego3DView = 0;
+
+	delete m_pRenderer;
+	m_pRenderer = 0;
+
+	delete m_pViewLODListManager;
+	m_pViewLODListManager = 0;
+}
+
+// FUNCTION: LEGO1 0x100ab4b0
+double Lego3DManager::Render(double p_und)
+{
+	assert(m_pLego3DView);
+
+	return m_pLego3DView->Render(p_und);
+}
diff --git a/LEGO1/3dmanager/lego3dmanager.h b/LEGO1/3dmanager/lego3dmanager.h
new file mode 100644
index 00000000..8445800b
--- /dev/null
+++ b/LEGO1/3dmanager/lego3dmanager.h
@@ -0,0 +1,117 @@
+#ifndef _Lego3DManager_h
+#define _Lego3DManager_h
+
+#include "assert.h"
+#include "lego3dview.h"
+
+class Tgl::Renderer;
+class Tgl::Group;
+class ViewROI;
+
+// ??? for now
+class ViewLODListManager;
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Lego3DManager
+
+// VTABLE: LEGO1 0x100dbfa4
+// SIZE 0x10
+class Lego3DManager {
+public:
+	// SIZE 0x28
+	struct CreateStruct {
+		const GUID* m_pDriverGUID;          // 0x00
+		HWND m_hWnd;                        // 0x04
+		IDirectDraw* m_pDirectDraw;         // 0x08
+		IDirectDrawSurface* m_pFrontBuffer; // 0x0c
+		IDirectDrawSurface* m_pBackBuffer;  // 0x10
+		IDirectDrawPalette* m_pPalette;     // 0x14
+		BOOL m_isFullScreen;                // 0x18
+		BOOL m_isWideViewAngle;             // 0x1c
+		IDirect3D2* m_direct3d;             // 0x20
+		IDirect3DDevice2* m_d3dDevice;      // 0x24
+	};
+
+public:
+	Lego3DManager();
+	virtual ~Lego3DManager();
+
+	BOOL Create(CreateStruct&);
+	void Destroy();
+
+	BOOL Add(ViewROI&);
+	BOOL Remove(ViewROI&);
+	BOOL Moved(ViewROI&);
+	BOOL SetPointOfView(ViewROI&);
+
+	double Render(double p_und);
+
+	Tgl::Renderer* GetRenderer();
+	Tgl::Group* GetScene();
+	Lego3DView* GetLego3DView();
+	// ??? for now
+	ViewLODListManager* GetViewLODListManager();
+
+private:
+	Tgl::Renderer* m_pRenderer; // 0x04
+
+	Lego3DView* m_pLego3DView;                 // 0x08
+	ViewLODListManager* m_pViewLODListManager; // 0x0c
+};
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Lego3DManager implementaion
+
+inline BOOL Lego3DManager::Add(ViewROI& rROI)
+{
+	assert(m_pLego3DView);
+
+	return m_pLego3DView->Add(rROI);
+}
+
+inline BOOL Lego3DManager::Remove(ViewROI& rROI)
+{
+	assert(m_pLego3DView);
+
+	return m_pLego3DView->Remove(rROI);
+}
+
+inline BOOL Lego3DManager::SetPointOfView(ViewROI& rROI)
+{
+	assert(m_pLego3DView);
+
+	return m_pLego3DView->SetPointOfView(rROI);
+}
+
+inline BOOL Lego3DManager::Moved(ViewROI& rROI)
+{
+	assert(m_pLego3DView);
+
+	return m_pLego3DView->Moved(rROI);
+}
+
+inline Tgl::Renderer* Lego3DManager::GetRenderer()
+{
+	return m_pRenderer;
+}
+
+inline Tgl::Group* Lego3DManager::GetScene()
+{
+	assert(m_pLego3DView);
+
+	return m_pLego3DView->GetScene();
+}
+
+inline Lego3DView* Lego3DManager::GetLego3DView()
+{
+	return m_pLego3DView;
+}
+
+inline ViewLODListManager* Lego3DManager::GetViewLODListManager()
+{
+	return m_pViewLODListManager;
+}
+
+#endif /* _Lego3DManager_h */
diff --git a/LEGO1/3dmanager/lego3dview.cpp b/LEGO1/3dmanager/lego3dview.cpp
new file mode 100644
index 00000000..cdededa5
--- /dev/null
+++ b/LEGO1/3dmanager/lego3dview.cpp
@@ -0,0 +1,221 @@
+// Lego3DView.cpp : implementation file
+//
+
+#include "lego3dview.h"
+
+#include "../viewmanager/viewmanager.h"
+
+DECOMP_SIZE_ASSERT(Lego3DView, 0xa8)
+
+/////////////////////////////////////////////////////////////////////////////
+// Lego3DView
+
+// STUB: LEGO1 0x100aae90
+Lego3DView::Lego3DView()
+{
+	m_pViewManager = 0;
+	m_previousRenderTime = 0;
+	m_pPointOfView = 0;
+}
+
+// FUNCTION: LEGO1 0x100aaf30
+Lego3DView::~Lego3DView()
+{
+	Destroy();
+}
+
+// STUB: LEGO1 0x100aaf90
+BOOL Lego3DView::Create(const TglSurface::CreateStruct& rCreateStruct, Tgl::Renderer* pRenderer)
+{
+	double viewAngle = 45;
+	double frontClippingDistance = 1;
+	double backClippingDistance = 5000;
+
+	if (!LegoView1::Create(rCreateStruct, pRenderer)) {
+		return FALSE;
+	}
+
+	// assert(GetView());
+	// GetView()->SetFrustrum(frontClippingDistance, backClippingDistance, viewAngle);
+
+	// assert(GetScene());
+	// assert(!m_pViewManager);
+
+	// m_pViewManager = new ViewManager(GetScene(), 0);
+	// m_pViewManager->SetResolution(GetWidth(), GetHeight());
+	// m_pViewManager->SetFrustrum(viewAngle, -frontClippingDistance, -backClippingDistance);
+	// m_previousRenderTime = 0;
+
+	// // NOTE: a derived class must inform view manager when it configures
+	// //       its (Tgl) view: calling Tgl::View::SetFrustrum() should be
+	// //       accompanied by calling ViewManager::SetFrustrum()
+
+	return TRUE;
+}
+
+// STUB: LEGO1 0x100ab0b0
+void Lego3DView::Destroy()
+{
+	if (m_pPointOfView) {
+		m_pPointOfView = 0;
+		// m_pViewManager->SetPOVSource(0);
+	}
+
+	delete m_pViewManager;
+	m_pViewManager = 0;
+
+	LegoView1::Destroy();
+}
+
+// STUB: LEGO1 0x100ab100
+BOOL Lego3DView::Add(ViewROI& rROI)
+{
+	// assert(m_pViewManager);
+
+	// m_pViewManager->Add(rROI);
+
+	return TRUE;
+}
+
+// STUB: LEGO1 0x100ab170
+BOOL Lego3DView::Remove(ViewROI& rROI)
+{
+	// assert(m_pViewManager);
+
+	// m_pViewManager->Remove(rROI);
+
+	// if (m_pPointOfView == &rROI) {
+	// 	m_pPointOfView = 0;
+	// 	m_pViewManager->SetPOVSource(0);
+	// }
+
+	return TRUE;
+}
+
+// STUB: LEGO1 0x100ab1b0
+BOOL Lego3DView::SetPointOfView(ViewROI& rROI)
+{
+	// Tgl::DoubleMatrix4 transformation;
+	// Tgl::Result result;
+
+	// m_pPointOfView = &rROI;
+
+	// assert(m_pViewManager);
+	// m_pViewManager->SetPOVSource(m_pPointOfView);
+
+	// assert(GetCamera());
+	// SETMAT4(transformation, rROI.GetLocalTransform());
+	// result = GetCamera()->SetTransformation(transformation);
+	// assert(Tgl::Succeeded(result));
+
+	return TRUE;
+}
+
+// STUB: LEGO1 0x100ab210
+BOOL Lego3DView::Moved(ViewROI& rROI)
+{
+	// assert(m_pViewManager);
+
+	// m_pViewManager->Moved(rROI);
+
+	// if (m_pPointOfView == &rROI) {
+	// 	// move the camera
+	// 	Tgl::DoubleMatrix4 transformation;
+	// 	Tgl::Result result;
+
+	// 	assert(GetCamera());
+
+	// 	SETMAT4(transformation, rROI.GetLocalTransform());
+	// 	result = GetCamera()->SetTransformation(transformation);
+	// 	assert(Tgl::Succeeded(result));
+	// }
+
+	return TRUE;
+}
+
+// STUB: LEGO1 0x100ab270
+double Lego3DView::Render(double p_und)
+{
+	// assert(m_pViewManager);
+
+	// m_pViewManager->Update(m_previousRenderTime);
+
+	// m_previousRenderTime = LegoView1::Render();
+
+	return m_previousRenderTime;
+}
+
+/*
+virtual Tgl::Result  Tgl::View::Pick(unsigned long x,
+						 unsigned long y,
+						 const Tgl::Group** ppGroupsToPickFrom,
+						 int groupsToPickFromCount,
+						 const Tgl::Group**& rppPickedGroups,
+						 int& rPickedGroupCount) = 0;
+*/
+
+// typedef std::map<const Tgl::Group*, const ROI*, std::less<const Tgl::Group*>> Group2ROI;
+
+// STUB: LEGO1 0x100ab2b0
+ViewROI* Lego3DView::Pick(unsigned long x, unsigned long y)
+{
+	// const ROIList& visible_rois = m_pViewManager->GetVisibleROIs();
+	// int n_in = 0, n_out;
+	// const Tgl::Group** groups_in = new const Tgl::Group*[visible_rois.size()];
+	// const Tgl::Group** groups_out = NULL;
+	// Group2ROI roi_map;
+	// ViewROI* viewROI = NULL;
+
+	// // generate the list of groups to pick from which is all the geometry
+	// // groups of all the currently visible ROIs in the view manager.
+	// // Also, construct a mapping from each group back to it's ROI since that's
+	// // what we need to return.
+	// //
+	// WALK_STL_OBJECT(visible_rois, ROIList, vi)
+	// {
+	// 	ViewROI* vroi = (ViewROI*) (*vi);
+	// 	Tgl::Group* g = vroi->GetGeometry();
+	// 	assert(g);
+	// 	groups_in[n_in++] = g;
+	// 	roi_map[g] = *vi;
+	// }
+
+	// // perform the pick on our TglView passing the visible groups
+	// //
+	// Tgl::View* tglview = GetView();
+	// assert(tglview);
+	// tglview->Pick(x, y, groups_in, n_in, groups_out, n_out);
+
+	// // search the returned group hierarchy from the bottom for the
+	// // first group which was in groups_in.
+	// //
+	// for (int i = n_out - 1; i >= 0; i--) {
+	// 	const Tgl::Group* g = (const Tgl::Group*) (groups_out[i]);
+	// 	if (!g) // null entries means group node wasn't in groups_in
+	// 		continue;
+	// 	Group2ROI::iterator gi = roi_map.find(g);
+	// 	if (gi != roi_map.end()) {
+	// 		viewROI = (ViewROI*) ((*gi).second);
+	// 		break;
+	// 	}
+	// }
+
+	// // delete the heap allocated arrays.
+	// //
+	// delete[] groups_in;
+	// if (groups_out)
+	// 	delete[] groups_out;
+
+	return NULL;
+}
+
+// double Lego3DView::GetTargetRenderingRate() const
+// {
+// 	double secondsAllowed;
+
+// 	assert(m_pViewManager);
+
+// 	secondsAllowed = m_pViewManager->GetSecondsAllowed();
+
+// 	return (secondsAllowed ? (1 / secondsAllowed) : HUGE_VAL);
+// }
diff --git a/LEGO1/3dmanager/lego3dview.h b/LEGO1/3dmanager/lego3dview.h
new file mode 100644
index 00000000..986d652c
--- /dev/null
+++ b/LEGO1/3dmanager/lego3dview.h
@@ -0,0 +1,62 @@
+#ifndef _Lego3DView_h
+#define _Lego3DView_h
+
+#include "decomp.h"
+#include "legoview1.h"
+
+class ViewROI;
+class ViewManager;
+
+/////////////////////////////////////////////////////////////////////////////
+// Lego3DView
+
+// VTABLE: LEGO1 0x100dbf78
+// SIZE 0xa8
+class Lego3DView : public LegoView1 {
+public:
+	Lego3DView();
+	virtual ~Lego3DView() override;
+
+	BOOL Create(const CreateStruct&, Tgl::Renderer*);
+	virtual void Destroy() override; // vtable+0x08
+
+	BOOL Add(ViewROI&);
+	BOOL Remove(ViewROI&);
+	BOOL Moved(ViewROI&);
+	BOOL SetPointOfView(ViewROI&);
+
+	double Render(double p_und);
+
+	ViewROI* Pick(unsigned long x, unsigned long y);
+
+	ViewROI* GetPointOfView();
+	ViewManager* GetViewManager();
+	// double GetTargetRenderingRate() const;
+
+private:
+	ViewManager* m_pViewManager; // 0x88
+	double m_previousRenderTime; // 0x8c
+
+	ViewROI* m_pPointOfView; // 0x90
+
+	undefined m_unk0x94[0x0c]; // 0x94
+};
+
+// SYNTHETIC: LEGO1 0x100aaf10
+// Lego3DView::`scalar deleting destructor'
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Lego3DView implementation
+
+inline ViewManager* Lego3DView::GetViewManager()
+{
+	return m_pViewManager;
+}
+
+inline ViewROI* Lego3DView::GetPointOfView()
+{
+	return m_pPointOfView;
+}
+
+#endif /* _Lego3DView_h */
diff --git a/LEGO1/3dmanager/legoview1.cpp b/LEGO1/3dmanager/legoview1.cpp
new file mode 100644
index 00000000..57117e9c
--- /dev/null
+++ b/LEGO1/3dmanager/legoview1.cpp
@@ -0,0 +1,184 @@
+// LegoView1.cpp : implementation file
+//
+
+#include "legoview1.h"
+
+#include "../realtime/realtime.h"
+#include "decomp.h"
+
+#include <vec.h> // SETMAT4
+
+DECOMP_SIZE_ASSERT(LegoView, 0x78);
+DECOMP_SIZE_ASSERT(LegoView1, 0x88);
+
+/////////////////////////////////////////////////////////////////////////////
+// LegoView
+
+// FUNCTION: LEGO1 0x100ab510
+LegoView::LegoView()
+{
+	m_pScene = 0;
+	m_pCamera = 0;
+}
+
+// FUNCTION: LEGO1 0x100ab5a0
+LegoView::~LegoView()
+{
+	Destroy();
+}
+
+// FUNCTION: LEGO1 0x100ab600
+BOOL LegoView::Create(const TglSurface::CreateStruct& rCreateStruct, Tgl::Renderer* pRenderer)
+{
+	float viewAngle = 45;
+	if (rCreateStruct.m_isWideViewAngle)
+		viewAngle = 90;
+
+	float frontClippingDistance = 0.1;
+	float backClippingDistance = 500;
+
+	assert(!m_pScene);
+	assert(!m_pCamera);
+	assert(pRenderer);
+
+	m_pScene = pRenderer->CreateGroup();
+	assert(m_pScene);
+	// TglSurface::Create() calls CreateView(), and we need the camera in
+	// CreateView(), so create camera before calling TglSurface::Create()
+	m_pCamera = pRenderer->CreateCamera();
+	assert(m_pCamera);
+
+	if (!TglSurface::Create(rCreateStruct, pRenderer, m_pScene)) {
+		delete m_pScene;
+		m_pScene = 0;
+
+		delete m_pCamera;
+		m_pCamera = 0;
+
+		return FALSE;
+	}
+
+	assert(GetView());
+	GetView()->SetFrustrum(frontClippingDistance, backClippingDistance, viewAngle);
+	GetView()->SetBackgroundColor(.223, .639, .851);
+
+	return TRUE;
+}
+
+// FUNCTION: LEGO1 0x100ab6c0
+Tgl::View* LegoView::CreateView(Tgl::Renderer* pRenderer, Tgl::Device* pDevice)
+{
+	assert(pRenderer);
+	assert(pDevice);
+
+	return pRenderer->CreateView(pDevice, m_pCamera, 0, 0, GetWidth(), GetHeight());
+}
+
+// FUNCTION: LEGO1 0x100ab6f0
+void LegoView::Destroy()
+{
+	delete m_pScene;
+	m_pScene = 0;
+
+	delete m_pCamera;
+	m_pCamera = 0;
+
+	TglSurface::Destroy();
+}
+
+/////////////////////////////////////////////////////////////////////////////
+// LegoView1
+
+// FUNCTION: LEGO1 0x100ab730
+LegoView1::LegoView1()
+{
+	m_pSunLight = 0;
+	m_pDirectionalLight = 0;
+	m_pAmbientLight = 0;
+}
+
+// FUNCTION: LEGO1 0x100ab7c0
+LegoView1::~LegoView1()
+{
+	Destroy();
+}
+
+// FUNCTION: LEGO1 0x100ab820
+BOOL LegoView1::AddLightsToViewport()
+{
+	GetView()->Add(m_pSunLight);
+	GetView()->Add(m_pDirectionalLight);
+	GetView()->Add(m_pAmbientLight);
+	return TRUE;
+}
+
+// STUB: LEGO1 0x100ab860
+BOOL LegoView1::Create(const TglSurface::CreateStruct& rCreateStruct, Tgl::Renderer* pRenderer)
+{
+	double position[3] = {0, 0, 0};
+	double direction[3];
+	double up[3] = {0, 1, 0};
+
+	if (!LegoView::Create(rCreateStruct, pRenderer)) {
+		return FALSE;
+	}
+
+	// lights
+	m_pSunLight = pRenderer->CreateLight(Tgl::Directional, .9, .9, .9);
+	m_pDirectionalLight = pRenderer->CreateLight(Tgl::Directional, .4, .4, .4);
+	m_pAmbientLight = pRenderer->CreateLight(Tgl::Ambient, .3, .3, .3);
+
+#if 0
+    direction[0] = 1, direction[1] = -1, direction[2] = 2;
+    m_pSunLight->SetOrientation(direction, up);
+    direction[0] = -1, direction[1] = -2, direction[2] = -1;
+    m_pDirectionalLight->SetOrientation(direction, up);
+#else
+	{
+		// Change everything to float and proper Matrix types
+		/*
+		Tgl::FloatMatrix4 transformation;
+		Matrix4Data transform;
+
+		direction[0] = 1, direction[1] = -1, direction[2] = 2;
+		CalcLocalTransform(position, direction, up, transform);
+		SETMAT4(transformation, transform);
+		m_pSunLight->SetTransformation(transformation);
+
+		direction[0] = -1, direction[1] = -2, direction[2] = -1;
+		CalcLocalTransform(position, direction, up, transform);
+		SETMAT4(transformation, transform);
+		m_pDirectionalLight->SetTransformation(transformation);
+		*/
+	}
+#endif
+
+	assert(GetView());
+	AddLightsToViewport();
+
+	return TRUE;
+}
+
+// FUNCTION: LEGO1 0x100abad0
+void LegoView1::Destroy()
+{
+	if (m_pSunLight) {
+		GetView()->Remove(m_pSunLight);
+		delete m_pSunLight;
+		m_pSunLight = 0;
+	}
+
+	if (m_pDirectionalLight) {
+		GetView()->Remove(m_pDirectionalLight);
+		delete m_pDirectionalLight;
+		m_pDirectionalLight = 0;
+	}
+
+	if (m_pAmbientLight) {
+		GetView()->Remove(m_pAmbientLight);
+		delete m_pAmbientLight;
+		m_pAmbientLight = 0;
+	}
+
+	LegoView::Destroy();
+}
diff --git a/LEGO1/3dmanager/legoview1.h b/LEGO1/3dmanager/legoview1.h
new file mode 100644
index 00000000..20ccadfa
--- /dev/null
+++ b/LEGO1/3dmanager/legoview1.h
@@ -0,0 +1,72 @@
+#ifndef _LegoView1_h
+#define _LegoView1_h
+
+#include "compat.h"
+#include "tglsurface.h"
+
+class Tgl::Camera;
+
+/////////////////////////////////////////////////////////////////////////////
+// LegoView
+
+// VTABLE: 0x100dc000
+// SIZE 0x78
+class LegoView : public TglSurface {
+public:
+	LegoView();
+	virtual ~LegoView() override;
+
+	BOOL Create(const CreateStruct&, Tgl::Renderer*);
+	virtual void Destroy() override; // vtable+0x08
+
+	Tgl::Group* GetScene() const;
+	Tgl::Camera* GetCamera() const;
+
+protected:
+	virtual Tgl::View* CreateView(Tgl::Renderer*, Tgl::Device*); // vtable+0x10
+
+private:
+	Tgl::Group* m_pScene;   // 0x70
+	Tgl::Camera* m_pCamera; // 0x74
+};
+
+/////////////////////////////////////////////////////////////////////////////
+// LegoView implementation
+
+inline Tgl::Group* LegoView::GetScene() const
+{
+	return m_pScene;
+}
+
+inline Tgl::Camera* LegoView::GetCamera() const
+{
+	return m_pCamera;
+}
+
+// SYNTHETIC: LEGO1 0x100ab580
+// LegoView::`scalar deleting destructor'
+
+/////////////////////////////////////////////////////////////////////////////
+// LegoView1
+
+// VTABLE: LEGO1 0x100dc018
+// SIZE 0x88
+class LegoView1 : public LegoView {
+public:
+	LegoView1();
+	virtual ~LegoView1() override;
+
+	BOOL AddLightsToViewport();
+	BOOL Create(const TglSurface::CreateStruct&, Tgl::Renderer*);
+	virtual void Destroy() override; // vtable+0x08
+
+private:
+	Tgl::Light* m_pSunLight;         // 0x78
+	Tgl::Light* m_pDirectionalLight; // 0x7c
+	Tgl::Light* m_pAmbientLight;     // 0x80
+};
+
+// SYNTHETIC: LEGO1 0x100ab7a0
+// LegoView1::`scalar deleting destructor'
+
+#endif /* _LegoView1_h */
diff --git a/LEGO1/3dmanager/tglsurface.cpp b/LEGO1/3dmanager/tglsurface.cpp
new file mode 100644
index 00000000..2493e00c
--- /dev/null
+++ b/LEGO1/3dmanager/tglsurface.cpp
@@ -0,0 +1,224 @@
+// TglSurface.cpp : implementation file
+
+#include "tglsurface.h"
+
+#include "decomp.h"
+
+DECOMP_SIZE_ASSERT(TglSurface, 0x70);
+
+using namespace Tgl;
+
+/////////////////////////////////////////////////////////////////////////////
+// TglSurface
+
+// FUNCTION: LEGO1 0x100abbf0
+TglSurface::TglSurface()
+{
+	m_pRenderer = 0;
+	m_pDevice = 0;
+	m_pView = 0;
+	m_pScene = 0;
+
+	m_width = 0;
+	m_height = 0;
+
+	m_stopRendering = FALSE;
+	m_isInitialized = FALSE;
+
+	// statistics
+	m_frameCount = 0;
+#ifdef _DEBUG
+	m_triangleCount = 0;
+#endif
+}
+
+// FUNCTION: LEGO1 0x100abd60
+TglSurface::~TglSurface()
+{
+	Destroy();
+}
+
+// FUNCTION: LEGO1 0x100abde0
+void TglSurface::Destroy()
+{
+	DestroyView();
+
+	delete m_pDevice;
+	m_pDevice = 0;
+
+	m_pRenderer = 0;
+	m_pScene = 0;
+}
+
+// ???
+// FUNCTION: LEGO1 0x100abe10
+int GetBitsPerPixel(IDirectDrawSurface* pSurface)
+{
+	DDPIXELFORMAT pixelFormat;
+	HRESULT result;
+
+	memset(&pixelFormat, 0, sizeof(pixelFormat));
+	pixelFormat.dwSize = sizeof(pixelFormat);
+
+	result = pSurface->GetPixelFormat(&pixelFormat);
+	assert(result == DD_OK);
+	assert(pixelFormat.dwFlags & DDPF_RGB);
+
+	return pixelFormat.dwRGBBitCount;
+}
+
+// FUNCTION: LEGO1 0x100abe50
+BOOL TglSurface::Create(const CreateStruct& rCreateStruct, Renderer* pRenderer, Group* pScene)
+{
+	DeviceDirect3DCreateData createData = {rCreateStruct.m_direct3d, rCreateStruct.m_d3dDevice};
+	int bitsPerPixel = GetBitsPerPixel(rCreateStruct.m_pFrontBuffer);
+
+	ColorModel colorModel = Ramp;
+	ShadingModel shadingModel = Gouraud;
+	int shadeCount = 32;
+	BOOL dither = TRUE;
+	int textureShadeCount = -1;
+	int textureColorCount = -1;
+	Result result;
+
+	m_pRenderer = pRenderer;
+	m_pScene = pScene;
+	m_pDevice = m_pRenderer->CreateDevice(createData);
+
+	if (!m_pDevice) {
+		assert(0);
+		m_pRenderer = 0;
+		m_pScene = 0;
+		return FALSE;
+	}
+
+	if (bitsPerPixel == 1) {
+		shadeCount = 4;
+		textureShadeCount = 4;
+	}
+	else if (bitsPerPixel == 8) {
+		shadeCount = 16;
+		dither = FALSE;
+		textureShadeCount = 16;
+		textureColorCount = 256;
+	}
+	else if (bitsPerPixel == 16) {
+		shadeCount = 32;
+		dither = FALSE;
+		textureShadeCount = 32;
+		textureColorCount = 256;
+	}
+	else if (bitsPerPixel >= 24) {
+		shadeCount = 256;
+		dither = FALSE;
+		textureShadeCount = 256;
+		textureColorCount = 64;
+	}
+	else {
+		dither = FALSE;
+	}
+
+	if (textureShadeCount != -1) {
+		result = pRenderer->SetTextureDefaultShadeCount(textureShadeCount);
+		assert(Succeeded(result));
+	}
+	if (textureColorCount != -1) {
+		result = pRenderer->SetTextureDefaultColorCount(textureColorCount);
+		assert(Succeeded(result));
+	}
+
+	result = m_pDevice->SetColorModel(colorModel);
+	assert(Succeeded(result));
+	result = m_pDevice->SetShadingModel(shadingModel);
+	assert(Succeeded(result));
+	result = m_pDevice->SetShadeCount(shadeCount);
+	assert(Succeeded(result));
+	result = m_pDevice->SetDither(dither);
+	assert(Succeeded(result));
+
+	m_width = m_pDevice->GetWidth();
+	m_height = m_pDevice->GetHeight();
+
+	m_pView = CreateView(m_pRenderer, m_pDevice);
+	if (!m_pView) {
+		delete m_pDevice;
+		m_pDevice = 0;
+		m_pRenderer = 0;
+		m_pScene = 0;
+		return FALSE;
+	}
+
+	m_frameRateMeter.Reset();
+	m_renderingRateMeter.Reset();
+#ifdef _DEBUG
+	m_triangleRateMeter.Reset();
+#endif
+	m_frameRateMeter.StartOperation();
+
+	m_isInitialized = TRUE;
+
+	return TRUE;
+}
+
+// FUNCTION: LEGO1 0x100ac030
+void TglSurface::DestroyView()
+{
+	delete m_pView;
+	m_pView = 0;
+}
+
+// FUNCTION: LEGO1 0x100ac050
+double TglSurface::Render()
+{
+	MxStopWatch renderTimer;
+
+	if (m_isInitialized && !m_stopRendering) {
+		Result result;
+
+#ifdef _DEBUG
+		m_triangleRateMeter.StartOperation();
+#endif
+		m_renderingRateMeter.StartOperation();
+		renderTimer.Start();
+
+		// TODO: Wrong interface
+		result = m_pView->Render((Tgl::Light*) m_pScene);
+
+		renderTimer.Stop();
+		assert(Succeeded(result));
+		m_renderingRateMeter.EndOperation();
+#ifdef _DEBUG
+		m_triangleRateMeter.EndOperation();
+#endif
+		m_frameRateMeter.EndOperation();
+		m_frameCount++;
+
+#ifdef _DEBUG
+		{
+			unsigned long triangleCount = m_pDevice->GetDrawnTriangleCount();
+
+			m_triangleRateMeter.IncreaseOperationCount(triangleCount - m_triangleCount - 1);
+			m_triangleCount = triangleCount;
+		}
+#endif
+
+#if 0
+        // reset rate meters every 20 frames
+        if ((++m_frameCount % 20) == 0)
+#else
+		// reset rate meters every 4 seconds
+		if (m_frameRateMeter.ElapsedSeconds() > 4.0)
+#endif
+		{
+			m_frameRateMeter.Reset();
+			m_renderingRateMeter.Reset();
+#ifdef _DEBUG
+			m_triangleRateMeter.Reset();
+#endif
+		}
+
+		m_frameRateMeter.StartOperation();
+	}
+
+	return renderTimer.ElapsedSeconds();
+}
diff --git a/LEGO1/3dmanager/tglsurface.h b/LEGO1/3dmanager/tglsurface.h
new file mode 100644
index 00000000..1e4abc09
--- /dev/null
+++ b/LEGO1/3dmanager/tglsurface.h
@@ -0,0 +1,87 @@
+#ifndef _TglSurface_h
+#define _TglSurface_h
+
+#include "../mxdirectx/mxstopwatch.h"
+#include "../tgl/tgl.h"
+
+class Tgl::Renderer;
+class Tgl::Device;
+class Tgl::View;
+class Tgl::Group;
+
+/////////////////////////////////////////////////////////////////////////////
+// TglSurface
+
+// VTABLE: LEGO1 0x100dc060
+// SIZE 0x70
+class TglSurface {
+public:
+	// SIZE 0x28
+	struct CreateStruct {
+		const GUID* m_pDriverGUID;          // 0x00
+		HWND m_hWnd;                        // 0x04
+		IDirectDraw* m_pDirectDraw;         // 0x08
+		IDirectDrawSurface* m_pFrontBuffer; // 0x0c
+		IDirectDrawSurface* m_pBackBuffer;  // 0x10
+		IDirectDrawPalette* m_pPalette;     // 0x14
+		BOOL m_isFullScreen;                // 0x18
+		BOOL m_isWideViewAngle;             // 0x1c
+		IDirect3D2* m_direct3d;             // 0x20
+		IDirect3DDevice2* m_d3dDevice;      // 0x24
+	};
+
+public:
+	TglSurface();
+	virtual ~TglSurface();
+
+	virtual BOOL Create(const CreateStruct&, Tgl::Renderer*, Tgl::Group* pScene); // vtable+0x04
+	virtual void Destroy();                                                       // vtable+0x08
+	virtual double Render(); // render time in seconds // vtable+0x0c
+
+	Tgl::Renderer* GetRenderer() const { return m_pRenderer; }
+	Tgl::Device* GetDevice() const { return m_pDevice; }
+	Tgl::View* GetView() const { return m_pView; }
+	Tgl::Group* GetScene() const { return m_pScene; }
+
+	unsigned long GetWidth() const { return m_width; }
+	unsigned long GetHeight() const { return m_height; }
+
+	double GetRenderingRate() const { return m_renderingRateMeter.Frequency(); }
+	double GetFrameRate() const { return m_frameRateMeter.Frequency(); }
+	unsigned long GetFrameCount() const { return m_frameCount; }
+#ifdef _DEBUG
+	double GetTriangleRate() const { return m_triangleRateMeter.Frequency(); }
+#endif
+
+protected:
+	virtual Tgl::View* CreateView(Tgl::Renderer*, Tgl::Device*) = 0; // vtable+0x10
+	virtual void DestroyView();                                      // vtable+0x14
+
+private:
+	Tgl::Renderer* m_pRenderer; // 0x08
+	Tgl::Device* m_pDevice;     // 0x0c
+	Tgl::View* m_pView;         // 0x10
+	Tgl::Group* m_pScene;       // 0x14
+
+	unsigned long m_width;  // 0x18
+	unsigned long m_height; // 0x1c
+
+	BOOL m_isInitialized; // 0x20
+	BOOL m_stopRendering; // 0x24
+
+	// statistics
+	MxFrequencyMeter m_renderingRateMeter; // 0x28
+	MxFrequencyMeter m_frameRateMeter;     // 0x48
+	unsigned long m_frameCount;            // 0x68
+#ifdef _DEBUG
+	MxFrequencyMeter m_triangleRateMeter;
+	unsigned long m_triangleCount;
+#endif
+};
+
+/////////////////////////////////////////////////////////////////////////////
+
+// SYNTHETIC: LEGO1 0x100abcf0
+// TglSurface::`scalar deleting destructor'
+
+#endif /* _TglSurface_h */
diff --git a/LEGO1/lego3dmanager.cpp b/LEGO1/lego3dmanager.cpp
deleted file mode 100644
index ebc488ff..00000000
--- a/LEGO1/lego3dmanager.cpp
+++ /dev/null
@@ -1,72 +0,0 @@
-#include "lego3dmanager.h"
-
-#include "decomp.h"
-#include "tgl/tgl.h"
-#include "tglsurface.h"
-#include "viewmanager/viewlodlist.h"
-
-DECOMP_SIZE_ASSERT(Lego3DManager, 0x10);
-
-// FUNCTION: LEGO1 0x100ab2d0
-BOOL InitializeCreateStruct(TglSurface::CreateStruct& p_tglSurface, const Lego3DManager::CreateStruct& p_createStruct)
-{
-	p_tglSurface.m_driverGUID = p_createStruct.m_driverGUID;
-	p_tglSurface.m_hwnd = p_createStruct.m_hwnd;
-	p_tglSurface.m_directDraw = p_createStruct.m_directDraw;
-	p_tglSurface.m_ddSurface1 = p_createStruct.m_ddSurface1;
-	p_tglSurface.m_ddSurface2 = p_createStruct.m_ddSurface2;
-	p_tglSurface.m_ddPalette = p_createStruct.m_ddPalette;
-	p_tglSurface.m_isFullScreen = p_createStruct.m_isFullScreen;
-	p_tglSurface.m_flags = p_createStruct.m_flags;
-	p_tglSurface.m_direct3d = p_createStruct.m_direct3d;
-	p_tglSurface.m_d3dDevice = p_createStruct.m_d3dDevice;
-	return TRUE;
-}
-
-// FUNCTION: LEGO1 0x100ab320
-Lego3DManager::Lego3DManager()
-{
-	m_renderer = NULL;
-	m_3dView = NULL;
-	m_viewLODListManager = NULL;
-}
-
-// FUNCTION: LEGO1 0x100ab360
-Lego3DManager::~Lego3DManager()
-{
-	Destroy();
-}
-
-// FUNCTION: LEGO1 0x100ab370
-BOOL Lego3DManager::Create(Lego3DManager::CreateStruct& p_createStruct)
-{
-	TglSurface::CreateStruct surfaceCreateStruct;
-
-	m_viewLODListManager = new ViewLODListManager;
-	m_renderer = Tgl::CreateRenderer();
-	m_3dView = new Lego3DView;
-
-	InitializeCreateStruct(surfaceCreateStruct, p_createStruct);
-
-	return m_3dView->Create(surfaceCreateStruct, m_renderer);
-}
-
-// FUNCTION: LEGO1 0x100ab460
-void Lego3DManager::Destroy()
-{
-	delete m_3dView;
-	m_3dView = NULL;
-
-	delete m_renderer;
-	m_renderer = NULL;
-
-	delete m_viewLODListManager;
-	m_viewLODListManager = NULL;
-}
-
-// STUB: LEGO1 0xx100ab4b0
-double Lego3DManager::FUN_100ab4b0(double p_und)
-{
-	// TODO
-	return 0.0;
-}
diff --git a/LEGO1/lego3dmanager.h b/LEGO1/lego3dmanager.h
deleted file mode 100644
index 732bf978..00000000
--- a/LEGO1/lego3dmanager.h
+++ /dev/null
@@ -1,46 +0,0 @@
-#ifndef LEGO3DMANAGER_H
-#define LEGO3DMANAGER_H
-
-#include "lego3dview.h"
-
-class ViewLODListManager;
-
-// VTABLE: LEGO1 0x100dbfa4
-// SIZE 0x10
-class Lego3DManager {
-public:
-	// SIZE 0x28
-	struct CreateStruct {
-		GUID* m_driverGUID;               // 0x00
-		HWND m_hwnd;                      // 0x04
-		IDirectDraw* m_directDraw;        // 0x08
-		IDirectDrawSurface* m_ddSurface1; // 0x0c
-		IDirectDrawSurface* m_ddSurface2; // 0x10
-		IDirectDrawPalette* m_ddPalette;  // 0x14
-		BOOL m_isFullScreen;              // 0x18
-		MxU32 m_flags;                    // 0x1c
-		IDirect3D2* m_direct3d;           // 0x20
-		IDirect3DDevice2* m_d3dDevice;    // 0x24
-	};
-
-	Lego3DManager();
-	virtual ~Lego3DManager();
-
-	BOOL Create(CreateStruct& p_createStruct);
-	double FUN_100ab4b0(double p_und);
-
-	inline Lego3DView* GetLego3DView() { return this->m_3dView; }
-	inline ViewLODListManager* GetViewLODListManager() { return this->m_viewLODListManager; }
-
-private:
-	Tgl::Renderer* m_renderer;                // 0x04
-	Lego3DView* m_3dView;                     // 0x08
-	ViewLODListManager* m_viewLODListManager; // 0x0c
-
-	void Destroy();
-};
-
-// SYNTHETIC: LEGO1 0x100ab340
-// Lego3DManager::`scalar deleting destructor'
-
-#endif // LEGO3DMANAGER_H
diff --git a/LEGO1/lego3dview.cpp b/LEGO1/lego3dview.cpp
deleted file mode 100644
index 92319630..00000000
--- a/LEGO1/lego3dview.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-#include "lego3dview.h"
-
-#include "legoroi.h"
-#include "tgl/tgl.h"
-
-DECOMP_SIZE_ASSERT(Lego3DView, 0xa8)
-
-// STUB: LEGO1 0x100aae90
-Lego3DView::Lego3DView()
-{
-}
-
-// STUB: LEGO1 0x100aaf30
-Lego3DView::~Lego3DView()
-{
-}
-
-// STUB: LEGO1 0x100aaf90
-BOOL Lego3DView::Create(TglSurface::CreateStruct& p_createStruct, Tgl::Renderer* p_renderer)
-{
-	Tgl::DeviceDirectDrawCreateData createData = {
-		p_createStruct.m_driverGUID,
-		p_createStruct.m_hwnd,
-		p_createStruct.m_directDraw,
-		p_createStruct.m_ddSurface1,
-		p_createStruct.m_ddSurface2
-	};
-
-	m_device = p_renderer->CreateDevice(createData);
-	return TRUE;
-}
-
-// STUB: LEGO1 0x100ab100
-void Lego3DView::FUN_100ab100(LegoROI* p_roi)
-{
-	// TODO
-}
-
-// STUB: LEGO1 0x100ab1b0
-void Lego3DView::FUN_100ab1b0(LegoROI* p_roi)
-{
-	// TODO
-}
-
-// STUB: LEGO1 0x100ab2b0
-LegoROI* Lego3DView::PickROI(MxLong p_a, MxLong p_b)
-{
-	// TODO
-	return NULL;
-}
diff --git a/LEGO1/lego3dview.h b/LEGO1/lego3dview.h
deleted file mode 100644
index 4222a35f..00000000
--- a/LEGO1/lego3dview.h
+++ /dev/null
@@ -1,41 +0,0 @@
-#ifndef LEGO3DVIEW_H
-#define LEGO3DVIEW_H
-
-#include "mxtypes.h"
-#include "tgl/d3drm/impl.h"
-#include "tglsurface.h"
-#include "viewmanager/viewmanager.h"
-
-class LegoROI;
-
-// VTABLE: LEGO1 0x100dbf78
-// SIZE 0xa8
-class Lego3DView {
-public:
-	Lego3DView();
-	virtual ~Lego3DView();
-
-	BOOL Create(TglSurface::CreateStruct& p_createStruct, Tgl::Renderer* p_renderer);
-	LegoROI* PickROI(MxLong p_a, MxLong p_b);
-	void FUN_100ab100(LegoROI* p_roi);
-	void FUN_100ab1b0(LegoROI* p_roi);
-
-	inline ViewManager* GetViewManager() { return this->m_viewManager; }
-	inline Tgl::Device* GetDevice() { return this->m_device; }
-	inline Tgl::View* GetView() { return this->m_view; }
-
-private:
-	// TODO: all of these fields are in various base classes
-	undefined4 m_unk0x4;        // 0x04
-	Tgl::Renderer* m_renderer;  // 0x08
-	Tgl::Device* m_device;      // 0x0c
-	Tgl::View* m_view;          // 0x10
-	undefined m_unk0x14[0x74];  // 0x14
-	ViewManager* m_viewManager; // 0x88
-	undefined m_unk0x8c[0x1c];  // 0x8c
-};
-
-// SYNTHETIC: LEGO1 0x100aaf10
-// Lego3DView::`scalar deleting destructor'
-
-#endif // LEGO3DVIEW_H
diff --git a/LEGO1/legoomni.cpp b/LEGO1/legoomni.cpp
index f8c6b819..29150f95 100644
--- a/LEGO1/legoomni.cpp
+++ b/LEGO1/legoomni.cpp
@@ -255,7 +255,7 @@ void FUN_1001a700()
 // FUNCTION: LEGO1 0x1003dd70
 LegoROI* PickROI(MxLong p_a, MxLong p_b)
 {
-	return VideoManager()->Get3DManager()->GetLego3DView()->PickROI(p_a, p_b);
+	return (LegoROI*) VideoManager()->Get3DManager()->GetLego3DView()->Pick(p_a, p_b);
 }
 
 // STUB: LEGO1 0x1003ddc0
diff --git a/LEGO1/legovideomanager.cpp b/LEGO1/legovideomanager.cpp
index 218406e6..78f3788e 100644
--- a/LEGO1/legovideomanager.cpp
+++ b/LEGO1/legovideomanager.cpp
@@ -5,6 +5,7 @@
 #include "mxtimer.h"
 #include "mxtransitionmanager.h"
 #include "realtime/matrix.h"
+#include "tgl/d3drm/impl.h"
 #include "viewmanager/viewroi.h"
 
 DECOMP_SIZE_ASSERT(LegoVideoManager, 0x590);
@@ -149,13 +150,13 @@ MxResult LegoVideoManager::Create(MxVideoParam& p_videoParam, MxU32 p_frequencyM
 
 	Lego3DManager::CreateStruct createStruct;
 	memset(&createStruct, 0, sizeof(createStruct));
-	createStruct.m_hwnd = LegoOmni::GetInstance()->GetWindowHandle();
-	createStruct.m_directDraw = m_pDirectDraw;
-	createStruct.m_ddSurface1 = m_displaySurface->GetDirectDrawSurface1();
-	createStruct.m_ddSurface2 = m_displaySurface->GetDirectDrawSurface2();
-	createStruct.m_ddPalette = m_videoParam.GetPalette()->CreateNativePalette();
+	createStruct.m_hWnd = LegoOmni::GetInstance()->GetWindowHandle();
+	createStruct.m_pDirectDraw = m_pDirectDraw;
+	createStruct.m_pFrontBuffer = m_displaySurface->GetDirectDrawSurface1();
+	createStruct.m_pBackBuffer = m_displaySurface->GetDirectDrawSurface2();
+	createStruct.m_pPalette = m_videoParam.GetPalette()->CreateNativePalette();
 	createStruct.m_isFullScreen = FALSE;
-	createStruct.m_flags = m_videoParam.Flags().GetWideViewAngle();
+	createStruct.m_isWideViewAngle = m_videoParam.Flags().GetWideViewAngle();
 	createStruct.m_direct3d = m_direct3d->GetDirect3D();
 	createStruct.m_d3dDevice = m_direct3d->GetDirect3DDevice();
 
@@ -174,8 +175,8 @@ MxResult LegoVideoManager::Create(MxVideoParam& p_videoParam, MxU32 p_frequencyM
 	CalcLocalTransform(posVec, dirVec, upVec, outMatrix);
 	m_viewROI->WrappedSetLocalTransform(outMatrix);
 
-	m_3dManager->GetLego3DView()->FUN_100ab100(m_viewROI);
-	m_3dManager->GetLego3DView()->FUN_100ab1b0(m_viewROI);
+	m_3dManager->Add(*m_viewROI);
+	m_3dManager->SetPointOfView(*m_viewROI);
 
 	m_unk0x100d9d00 = new MxUnknown100d9d00;
 	m_unk0xe4 = FALSE;
@@ -224,31 +225,6 @@ void LegoVideoManager::MoveCursor(MxS32 p_cursorX, MxS32 p_cursorY)
 		m_cursorY = 463;
 }
 
-inline void LegoVideoManager::DrawCursor()
-{
-	if (m_cursorX != m_cursorXCopy || m_cursorY != m_cursorYCopy) {
-		if (m_cursorX >= 0 && m_cursorY >= 0) {
-			m_cursorXCopy = m_cursorX;
-			m_cursorYCopy = m_cursorY;
-		}
-	}
-
-	LPDIRECTDRAWSURFACE ddSurface2 = m_displaySurface->GetDirectDrawSurface2();
-
-	if (!m_unk0x514) {
-		m_unk0x518.top = 0;
-		m_unk0x518.left = 0;
-		m_unk0x518.bottom = 16;
-		m_unk0x518.right = 16;
-		m_unk0x514 = MxDisplaySurface::FUN_100bc070();
-
-		if (!m_unk0x514)
-			m_drawCursor = FALSE;
-	}
-
-	ddSurface2->BltFast(m_cursorXCopy, m_cursorYCopy, m_unk0x514, &m_unk0x518, DDBLTFAST_WAIT | DDBLTFAST_SRCCOLORKEY);
-}
-
 // FUNCTION: LEGO1 0x1007b770
 MxResult LegoVideoManager::Tickle()
 {
@@ -284,7 +260,7 @@ MxResult LegoVideoManager::Tickle()
 			presenter->PutData();
 
 		if (!m_unk0xe5) {
-			m_3dManager->FUN_100ab4b0(0.0);
+			m_3dManager->Render(0.0);
 			m_3dManager->GetLego3DView()->GetDevice()->Update();
 		}
 
@@ -321,6 +297,31 @@ MxResult LegoVideoManager::Tickle()
 	return SUCCESS;
 }
 
+inline void LegoVideoManager::DrawCursor()
+{
+	if (m_cursorX != m_cursorXCopy || m_cursorY != m_cursorYCopy) {
+		if (m_cursorX >= 0 && m_cursorY >= 0) {
+			m_cursorXCopy = m_cursorX;
+			m_cursorYCopy = m_cursorY;
+		}
+	}
+
+	LPDIRECTDRAWSURFACE ddSurface2 = m_displaySurface->GetDirectDrawSurface2();
+
+	if (!m_unk0x514) {
+		m_unk0x518.top = 0;
+		m_unk0x518.left = 0;
+		m_unk0x518.bottom = 16;
+		m_unk0x518.right = 16;
+		m_unk0x514 = MxDisplaySurface::FUN_100bc070();
+
+		if (!m_unk0x514)
+			m_drawCursor = FALSE;
+	}
+
+	ddSurface2->BltFast(m_cursorXCopy, m_cursorYCopy, m_unk0x514, &m_unk0x518, DDBLTFAST_WAIT | DDBLTFAST_SRCCOLORKEY);
+}
+
 // STUB: LEGO1 0x1007bbc0
 void LegoVideoManager::DrawFPS()
 {
diff --git a/LEGO1/legovideomanager.h b/LEGO1/legovideomanager.h
index e4ef28ea..07ea0904 100644
--- a/LEGO1/legovideomanager.h
+++ b/LEGO1/legovideomanager.h
@@ -1,8 +1,8 @@
 #ifndef LEGOVIDEOMANAGER_H
 #define LEGOVIDEOMANAGER_H
 
+#include "3dmanager/lego3dmanager.h"
 #include "decomp.h"
-#include "lego3dmanager.h"
 #include "mxdirect3d.h"
 #include "mxdirectx/mxstopwatch.h"
 #include "mxunknown100d9d00.h"
@@ -10,6 +10,8 @@
 
 #include <ddraw.h>
 
+class LegoROI;
+
 // VTABLE: LEGO1 0x100d9c88
 // SIZE 0x590
 class LegoVideoManager : public MxVideoManager {
diff --git a/LEGO1/mxdirectx/mxstopwatch.h b/LEGO1/mxdirectx/mxstopwatch.h
index 1ce3275f..7e7fcc38 100644
--- a/LEGO1/mxdirectx/mxstopwatch.h
+++ b/LEGO1/mxdirectx/mxstopwatch.h
@@ -2,7 +2,9 @@
 #define _MxStopWatch_h
 
 #include "assert.h"
-#include "winbase.h"
+
+#include <math.h>
+#include <windows.h>
 
 //////////////////////////////////////////////////////////////////////////////
 //
@@ -13,6 +15,7 @@
 
 #define HUGE_VAL_IMMEDIATE 1.7976931348623157e+308
 
+// SIZE 0x18
 class MxStopWatch {
 public:
 	MxStopWatch();
@@ -28,11 +31,11 @@ class MxStopWatch {
 	unsigned long TicksPerSeconds() const;
 
 private:
-	LARGE_INTEGER m_startTick;
+	LARGE_INTEGER m_startTick; // 0x00
 	// ??? when we provide LARGE_INTEGER arithmetic, use a
 	//     LARGE_INTEGER m_elapsedTicks rather than m_elapsedSeconds
-	double m_elapsedSeconds;
-	unsigned long m_ticksPerSeconds;
+	double m_elapsedSeconds;         // 0x0c
+	unsigned long m_ticksPerSeconds; // 0x14
 };
 
 inline MxStopWatch::MxStopWatch()
@@ -99,6 +102,7 @@ inline double MxStopWatch::ElapsedSeconds() const
 // MxFrequencyMeter
 //
 
+// SIZE 0x20
 class MxFrequencyMeter {
 public:
 	MxFrequencyMeter();
@@ -114,8 +118,8 @@ class MxFrequencyMeter {
 	void IncreaseOperationCount(unsigned long);
 
 private:
-	unsigned long m_operationCount;
-	MxStopWatch m_stopWatch;
+	unsigned long m_operationCount; // 0x00
+	MxStopWatch m_stopWatch;        // 0x08
 };
 
 //////////////////////////////////////////////////////////////////////////////
diff --git a/LEGO1/tgl/d3drm/impl.h b/LEGO1/tgl/d3drm/impl.h
index e1488508..f4d85cf4 100644
--- a/LEGO1/tgl/d3drm/impl.h
+++ b/LEGO1/tgl/d3drm/impl.h
@@ -1,5 +1,6 @@
 
 #include "../tgl.h"
+#include "compat.h"
 #include "decomp.h"
 
 #include <d3drm.h>
@@ -41,11 +42,11 @@ class RendererImpl : public Renderer {
 	RendererImpl() : m_data(0) {}
 	~RendererImpl() { Destroy(); };
 
-	virtual void* ImplementationDataPtr();
+	virtual void* ImplementationDataPtr() override;
 
 	// vtable+0x08
-	virtual Device* CreateDevice(const DeviceDirect3DCreateData&);
-	virtual Device* CreateDevice(const DeviceDirectDrawCreateData&);
+	virtual Device* CreateDevice(const DeviceDirectDrawCreateData&) override;
+	virtual Device* CreateDevice(const DeviceDirect3DCreateData&) override;
 
 	// vtable+0x10
 	virtual View* CreateView(
@@ -55,14 +56,14 @@ class RendererImpl : public Renderer {
 		unsigned long y,
 		unsigned long width,
 		unsigned long height
-	);
-	virtual Camera* CreateCamera();
-	virtual Light* CreateLight(LightType, float r, float g, float b);
-	virtual Group* CreateGroup(const Group* pParent);
+	) override;
+	virtual Camera* CreateCamera() override;
+	virtual Light* CreateLight(LightType, float r, float g, float b) override;
+	virtual Group* CreateGroup(const Group* pParent) override;
 
 	// vtable+0x20
-	virtual Unk* CreateUnk();
-	virtual Texture* CreateTexture();
+	virtual Unk* CreateUnk() override;
+	virtual Texture* CreateTexture() override;
 	virtual Texture* CreateTexture(
 		int width,
 		int height,
@@ -71,11 +72,11 @@ class RendererImpl : public Renderer {
 		int pTexelsArePersistent,
 		int paletteEntryCount,
 		const PaletteEntry* pEntries
-	);
-	virtual Result SetTextureDefaultShadeCount(unsigned long);
+	) override;
+	virtual Result SetTextureDefaultShadeCount(unsigned long) override;
 
 	// vtable+0x30
-	virtual Result SetTextureDefaultColorCount(unsigned long);
+	virtual Result SetTextureDefaultColorCount(unsigned long) override;
 
 public:
 	inline Result Create();
diff --git a/LEGO1/tgl/tgl.h b/LEGO1/tgl/tgl.h
index 4af0fae5..dfc18f3f 100644
--- a/LEGO1/tgl/tgl.h
+++ b/LEGO1/tgl/tgl.h
@@ -110,8 +110,8 @@ class Object {
 class Renderer : public Object {
 public:
 	// vtable+0x08
-	virtual Device* CreateDevice(const DeviceDirect3DCreateData&) = 0;
 	virtual Device* CreateDevice(const DeviceDirectDrawCreateData&) = 0;
+	virtual Device* CreateDevice(const DeviceDirect3DCreateData&) = 0;
 
 	// vtable+0x10
 	virtual View* CreateView(
diff --git a/LEGO1/tglsurface.h b/LEGO1/tglsurface.h
deleted file mode 100644
index 24776493..00000000
--- a/LEGO1/tglsurface.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#ifndef TGLSURFACE_H
-#define TGLSURFACE_H
-
-#include "decomp.h"
-#include "mxtypes.h"
-
-#include <d3d.h>
-#include <windows.h>
-
-class TglSurface {
-public:
-	// SIZE 0x28
-	struct CreateStruct {
-		GUID* m_driverGUID;               // 0x00
-		HWND m_hwnd;                      // 0x04
-		IDirectDraw* m_directDraw;        // 0x08
-		IDirectDrawSurface* m_ddSurface1; // 0x0c
-		IDirectDrawSurface* m_ddSurface2; // 0x10
-		IDirectDrawPalette* m_ddPalette;  // 0x14
-		BOOL m_isFullScreen;              // 0x18
-		MxU32 m_flags;                    // 0x1c
-		IDirect3D2* m_direct3d;           // 0x20
-		IDirect3DDevice2* m_d3dDevice;    // 0x24
-	};
-};
-
-#endif // TGLSURFACE_H

From bb7e4df11b863f7f374685b39893f1c4b0308109 Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Sun, 7 Jan 2024 12:07:22 -0500
Subject: [PATCH 077/210] Move MxDirectDraw and MxDirect3D to mxdirectx (#413)

---
 .github/workflows/format.yml           |  2 +-
 CMakeLists.txt                         |  4 +-
 ISLE/isleapp.cpp                       |  1 -
 LEGO1/legovideomanager.h               |  2 +-
 LEGO1/{ => mxdirectx}/mxdirect3d.cpp   | 89 +++++++++++++-------------
 LEGO1/{ => mxdirectx}/mxdirect3d.h     | 39 ++++++-----
 LEGO1/{ => mxdirectx}/mxdirectdraw.cpp | 24 +++----
 LEGO1/{ => mxdirectx}/mxdirectdraw.h   | 19 ++----
 8 files changed, 86 insertions(+), 94 deletions(-)
 rename LEGO1/{ => mxdirectx}/mxdirect3d.cpp (90%)
 rename LEGO1/{ => mxdirectx}/mxdirect3d.h (85%)
 rename LEGO1/{ => mxdirectx}/mxdirectdraw.cpp (98%)
 rename LEGO1/{ => mxdirectx}/mxdirectdraw.h (91%)

diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml
index 6f1c7065..aaa41235 100644
--- a/.github/workflows/format.yml
+++ b/.github/workflows/format.yml
@@ -18,7 +18,7 @@ jobs:
           ISLE/*.cpp ISLE/*.h \
           LEGO1/*.cpp LEGO1/*.h \
           LEGO1/3dmanager/*.cpp LEGO1/3dmanager/*.h \
-          LEGO1/mxdirectx/*.h \
+          LEGO1/mxdirectx/*.cpp LEGO1/mxdirectx/*.h \
           LEGO1/mxstl/*.h \
           LEGO1/realtime/*.cpp LEGO1/realtime/*.h \
           LEGO1/tgl/*.h \
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ea171888..536c96c6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -116,8 +116,8 @@ add_library(lego1 SHARED
   LEGO1/mxcontrolpresenter.cpp
   LEGO1/mxcore.cpp
   LEGO1/mxcriticalsection.cpp
-  LEGO1/mxdirect3d.cpp
-  LEGO1/mxdirectdraw.cpp
+  LEGO1/mxdirectx/mxdirect3d.cpp
+  LEGO1/mxdirectx/mxdirectdraw.cpp
   LEGO1/mxdiskstreamcontroller.cpp
   LEGO1/mxdiskstreamprovider.cpp
   LEGO1/mxdisplaysurface.cpp
diff --git a/ISLE/isleapp.cpp b/ISLE/isleapp.cpp
index 7ecb6272..1d5c8e12 100644
--- a/ISLE/isleapp.cpp
+++ b/ISLE/isleapp.cpp
@@ -12,7 +12,6 @@
 #include "legovideomanager.h"
 #include "legoworldpresenter.h"
 #include "mxbackgroundaudiomanager.h"
-#include "mxdirectdraw.h"
 #include "mxdsaction.h"
 #include "mxomnicreateflags.h"
 #include "mxomnicreateparam.h"
diff --git a/LEGO1/legovideomanager.h b/LEGO1/legovideomanager.h
index 07ea0904..884b31ad 100644
--- a/LEGO1/legovideomanager.h
+++ b/LEGO1/legovideomanager.h
@@ -3,7 +3,7 @@
 
 #include "3dmanager/lego3dmanager.h"
 #include "decomp.h"
-#include "mxdirect3d.h"
+#include "mxdirectx/mxdirect3d.h"
 #include "mxdirectx/mxstopwatch.h"
 #include "mxunknown100d9d00.h"
 #include "mxvideomanager.h"
diff --git a/LEGO1/mxdirect3d.cpp b/LEGO1/mxdirectx/mxdirect3d.cpp
similarity index 90%
rename from LEGO1/mxdirect3d.cpp
rename to LEGO1/mxdirectx/mxdirect3d.cpp
index a006b4bb..b0816a94 100644
--- a/LEGO1/mxdirect3d.cpp
+++ b/LEGO1/mxdirectx/mxdirect3d.cpp
@@ -38,7 +38,6 @@ BOOL MxDirect3D::Create(
 )
 {
 	BOOL success = FALSE;
-
 	BOOL ret = MxDirectDraw::Create(
 		hWnd,
 		fullscreen_1,
@@ -101,7 +100,7 @@ void MxDirect3D::DestroyButNotDirectDraw()
 // FUNCTION: LEGO1 0x1009b2d0
 BOOL MxDirect3D::CreateIDirect3D()
 {
-	MxResult ret = IDirect3D_QueryInterface(m_pDirectDraw, IID_IDirect3D2, (LPVOID*) &m_pDirect3d);
+	HRESULT ret = IDirect3D_QueryInterface(m_pDirectDraw, IID_IDirect3D2, (LPVOID*) &m_pDirect3d);
 
 	if (ret) {
 		Error("Creation of IDirect3D failed", ret);
@@ -149,7 +148,7 @@ BOOL MxDirect3D::D3DSetMode()
 
 	MxDirectDraw::Mode mode = m_currentMode;
 
-	if (m_bFullScreen && !IsSupportedMode(mode.m_width, mode.m_height, mode.m_bitsPerPixel)) {
+	if (m_bFullScreen && !IsSupportedMode(mode.width, mode.height, mode.bitsPerPixel)) {
 		Error("This device cannot support the current display mode", DDERR_GENERIC);
 		return FALSE;
 	}
@@ -162,10 +161,10 @@ BOOL MxDirect3D::D3DSetMode()
 	desc.dwSize = sizeof(desc);
 
 	if (backBuffer->Lock(NULL, &desc, DDLOCK_WAIT, NULL) == DD_OK) {
-		MxU8* surface = (MxU8*) desc.lpSurface;
+		unsigned char* surface = (unsigned char*) desc.lpSurface;
 
-		for (MxS32 i = mode.m_height; i > 0; i--) {
-			memset(surface, 0, mode.m_width * desc.ddpfPixelFormat.dwRGBBitCount / 8);
+		for (int i = mode.height; i > 0; i--) {
+			memset(surface, 0, mode.width * desc.ddpfPixelFormat.dwRGBBitCount / 8);
 			surface += desc.lPitch;
 		}
 
@@ -180,10 +179,10 @@ BOOL MxDirect3D::D3DSetMode()
 		desc.dwSize = sizeof(desc);
 
 		if (frontBuffer->Lock(NULL, &desc, DDLOCK_WAIT, NULL) == DD_OK) {
-			MxU8* surface = (MxU8*) desc.lpSurface;
+			unsigned char* surface = (unsigned char*) desc.lpSurface;
 
-			for (MxS32 i = mode.m_height; i > 0; i--) {
-				memset(surface, 0, mode.m_width * desc.ddpfPixelFormat.dwRGBBitCount / 8);
+			for (int i = mode.height; i > 0; i--) {
+				memset(surface, 0, mode.width * desc.ddpfPixelFormat.dwRGBBitCount / 8);
 				surface += desc.lPitch;
 			}
 
@@ -229,7 +228,7 @@ BOOL MxDirect3D::SetDevice(MxDeviceEnumerate& p_deviceEnumerate, MxDriver* p_dri
 	}
 
 	MxAssignedDevice* assignedDevice = new MxAssignedDevice;
-	MxS32 i = 0;
+	int i = 0;
 
 	for (list<MxDriver>::iterator it = p_deviceEnumerate.m_list.begin(); it != p_deviceEnumerate.m_list.end(); it++) {
 		MxDriver& driver = *it;
@@ -248,13 +247,13 @@ BOOL MxDirect3D::SetDevice(MxDeviceEnumerate& p_deviceEnumerate, MxDriver* p_dri
 				assignedDevice->m_deviceInfo->m_modeArray =
 					new MxDirectDraw::Mode[assignedDevice->m_deviceInfo->m_count];
 
-				MxS32 j = 0;
+				int j = 0;
 				for (list<MxDisplayMode>::iterator it2 = driver.m_displayModes.begin();
 					 it2 != driver.m_displayModes.end();
 					 it2++) {
-					assignedDevice->m_deviceInfo->m_modeArray[j].m_width = (*it2).m_width;
-					assignedDevice->m_deviceInfo->m_modeArray[j].m_height = (*it2).m_height;
-					assignedDevice->m_deviceInfo->m_modeArray[j].m_bitsPerPixel = (*it2).m_bitsPerPixel;
+					assignedDevice->m_deviceInfo->m_modeArray[j].width = (*it2).m_width;
+					assignedDevice->m_deviceInfo->m_modeArray[j].height = (*it2).m_height;
+					assignedDevice->m_deviceInfo->m_modeArray[j].bitsPerPixel = (*it2).m_bitsPerPixel;
 					j++;
 				}
 			}
@@ -556,19 +555,19 @@ HRESULT MxDeviceEnumerate::EnumDevicesCallback(
 }
 
 // FUNCTION: LEGO1 0x1009c6c0
-MxResult MxDeviceEnumerate::DoEnumerate()
+int MxDeviceEnumerate::DoEnumerate()
 {
 	if (m_initialized)
-		return FAILURE;
+		return -1;
 
 	HRESULT ret = DirectDrawEnumerate(DirectDrawEnumerateCallback, this);
-	if (ret) {
+	if (ret != DD_OK) {
 		BuildErrorString("DirectDrawEnumerate returned error %s\n", EnumerateErrorToString(ret));
-		return FAILURE;
+		return -1;
 	}
 
 	m_initialized = TRUE;
-	return SUCCESS;
+	return 0;
 }
 
 // FUNCTION: LEGO1 0x1009c710
@@ -589,13 +588,13 @@ const char* MxDeviceEnumerate::EnumerateErrorToString(HRESULT p_error)
 }
 
 // FUNCTION: LEGO1 0x1009ce60
-MxS32 MxDeviceEnumerate::ParseDeviceName(const char* p_deviceId)
+int MxDeviceEnumerate::ParseDeviceName(const char* p_deviceId)
 {
 	if (!m_initialized)
 		return -1;
 
-	MxS32 num = -1;
-	MxS32 hex[4];
+	int num = -1;
+	int hex[4];
 
 	if (sscanf(p_deviceId, "%d 0x%x 0x%x 0x%x 0x%x", &num, &hex[0], &hex[1], &hex[2], &hex[3]) != 5)
 		return -1;
@@ -606,7 +605,7 @@ MxS32 MxDeviceEnumerate::ParseDeviceName(const char* p_deviceId)
 	GUID guid;
 	memcpy(&guid, hex, sizeof(guid));
 
-	MxS32 result = ProcessDeviceBytes(num, guid);
+	int result = ProcessDeviceBytes(num, guid);
 
 	if (result < 0)
 		return ProcessDeviceBytes(-1, guid);
@@ -614,19 +613,19 @@ MxS32 MxDeviceEnumerate::ParseDeviceName(const char* p_deviceId)
 }
 
 // FUNCTION: LEGO1 0x1009cf20
-MxS32 MxDeviceEnumerate::ProcessDeviceBytes(MxS32 p_deviceNum, GUID& p_guid)
+int MxDeviceEnumerate::ProcessDeviceBytes(int p_deviceNum, GUID& p_guid)
 {
 	if (!m_initialized)
 		return -1;
 
-	MxS32 i = 0;
-	MxS32 j = 0;
+	int i = 0;
+	int j = 0;
 
 	struct GUID4 {
-		MxS32 m_data1;
-		MxS32 m_data2;
-		MxS32 m_data3;
-		MxS32 m_data4;
+		int m_data1;
+		int m_data2;
+		int m_data3;
+		int m_data4;
 	};
 
 	static_assert(sizeof(GUID4) == sizeof(GUID), "Equal size");
@@ -658,10 +657,10 @@ MxS32 MxDeviceEnumerate::ProcessDeviceBytes(MxS32 p_deviceNum, GUID& p_guid)
 }
 
 // FUNCTION: LEGO1 0x1009d030
-MxResult MxDeviceEnumerate::GetDevice(MxS32 p_deviceNum, MxDriver*& p_driver, MxDevice*& p_device)
+int MxDeviceEnumerate::GetDevice(int p_deviceNum, MxDriver*& p_driver, MxDevice*& p_device)
 {
 	if (p_deviceNum >= 0 && m_initialized) {
-		MxS32 i = 0;
+		int i = 0;
 
 		for (list<MxDriver>::iterator it = m_list.begin(); it != m_list.end(); it++) {
 			p_driver = &*it;
@@ -669,20 +668,20 @@ MxResult MxDeviceEnumerate::GetDevice(MxS32 p_deviceNum, MxDriver*& p_driver, Mx
 			for (list<MxDevice>::iterator it2 = p_driver->m_devices.begin(); it2 != p_driver->m_devices.end(); it2++) {
 				if (i == p_deviceNum) {
 					p_device = &*it2;
-					return SUCCESS;
+					return 0;
 				}
 				i++;
 			}
 		}
 
-		return FAILURE;
+		return -1;
 	}
 
-	return FAILURE;
+	return -1;
 }
 
 // FUNCTION: LEGO1 0x1009d0d0
-MxS32 MxDeviceEnumerate::FUN_1009d0d0()
+int MxDeviceEnumerate::FUN_1009d0d0()
 {
 	if (!m_initialized)
 		return -1;
@@ -690,10 +689,10 @@ MxS32 MxDeviceEnumerate::FUN_1009d0d0()
 	if (m_list.empty())
 		return -1;
 
-	MxS32 i = 0;
-	MxS32 j = 0;
-	MxS32 k = -1;
-	MxU32 und = FUN_1009d1a0();
+	int i = 0;
+	int j = 0;
+	int k = -1;
+	unsigned int und = FUN_1009d1a0();
 
 	for (list<MxDriver>::iterator it = m_list.begin();; it++) {
 		if (it == m_list.end())
@@ -729,10 +728,10 @@ undefined4 MxDeviceEnumerate::FUN_1009d1e0()
 }
 
 // FUNCTION: LEGO1 0x1009d210
-MxResult MxDeviceEnumerate::FUN_1009d210()
+int MxDeviceEnumerate::FUN_1009d210()
 {
 	if (!m_initialized)
-		return FAILURE;
+		return -1;
 
 	for (list<MxDriver>::iterator it = m_list.begin(); it != m_list.end();) {
 		MxDriver& driver = *it;
@@ -756,11 +755,11 @@ MxResult MxDeviceEnumerate::FUN_1009d210()
 		}
 	}
 
-	return m_list.empty() ? FAILURE : SUCCESS;
+	return m_list.empty() ? -1 : 0;
 }
 
 // FUNCTION: LEGO1 0x1009d370
-MxBool MxDeviceEnumerate::FUN_1009d370(MxDriver& p_driver)
+unsigned char MxDeviceEnumerate::FUN_1009d370(MxDriver& p_driver)
 {
 	for (list<MxDisplayMode>::iterator it = p_driver.m_displayModes.begin(); it != p_driver.m_displayModes.end();
 		 it++) {
@@ -774,7 +773,7 @@ MxBool MxDeviceEnumerate::FUN_1009d370(MxDriver& p_driver)
 }
 
 // FUNCTION: LEGO1 0x1009d3d0
-MxBool MxDeviceEnumerate::FUN_1009d3d0(MxDevice& p_device)
+unsigned char MxDeviceEnumerate::FUN_1009d3d0(MxDevice& p_device)
 {
 	if (m_list.size() <= 0)
 		return FALSE;
diff --git a/LEGO1/mxdirect3d.h b/LEGO1/mxdirectx/mxdirect3d.h
similarity index 85%
rename from LEGO1/mxdirect3d.h
rename to LEGO1/mxdirectx/mxdirect3d.h
index 42ef54ec..34c28b42 100644
--- a/LEGO1/mxdirect3d.h
+++ b/LEGO1/mxdirectx/mxdirect3d.h
@@ -1,10 +1,9 @@
 #ifndef MXDIRECT3D_H
 #define MXDIRECT3D_H
 
+#include "../mxstl/stlcompat.h"
 #include "decomp.h"
 #include "mxdirectdraw.h"
-#include "mxstl/stlcompat.h"
-#include "mxtypes.h"
 
 #include <d3d.h>
 
@@ -21,14 +20,14 @@ class MxAssignedDevice {
 	MxAssignedDevice();
 	~MxAssignedDevice();
 
-	inline MxU32 GetFlags() { return m_flags; }
+	inline unsigned int GetFlags() { return m_flags; }
 	inline D3DDEVICEDESC& GetDesc() { return m_desc; }
 
 	friend class MxDirect3D;
 
 private:
 	GUID m_guid;                                 // 0x00
-	MxU32 m_flags;                               // 0x10
+	unsigned int m_flags;                        // 0x10
 	D3DDEVICEDESC m_desc;                        // 0x14
 	MxDirectDraw::DeviceModesInfo* m_deviceInfo; // 0xe0
 };
@@ -101,8 +100,8 @@ struct MxDevice {
 	D3DDEVICEDESC m_HWDesc;  // 0x0c
 	D3DDEVICEDESC m_HELDesc; // 0xd8
 
-	MxBool operator==(MxDevice) const { return TRUE; }
-	MxBool operator<(MxDevice) const { return TRUE; }
+	int operator==(MxDevice) const { return 0; }
+	int operator<(MxDevice) const { return 0; }
 };
 
 // SIZE 0x0c
@@ -111,8 +110,8 @@ struct MxDisplayMode {
 	DWORD m_height;       // 0x04
 	DWORD m_bitsPerPixel; // 0x08
 
-	MxBool operator==(MxDisplayMode) const { return TRUE; }
-	MxBool operator<(MxDisplayMode) const { return TRUE; }
+	int operator==(MxDisplayMode) const { return 0; }
+	int operator<(MxDisplayMode) const { return 0; }
 };
 
 // SIZE 0x190
@@ -130,8 +129,8 @@ struct MxDriver {
 	list<MxDevice> m_devices;           // 0x178
 	list<MxDisplayMode> m_displayModes; // 0x184
 
-	MxBool operator==(MxDriver) const { return TRUE; }
-	MxBool operator<(MxDriver) const { return TRUE; }
+	int operator==(MxDriver) const { return 0; }
+	int operator<(MxDriver) const { return 0; }
 };
 
 // clang-format off
@@ -178,7 +177,7 @@ class MxDeviceEnumerate {
 	// FUNCTION: LEGO1 0x1009c010
 	~MxDeviceEnumerate() {}
 
-	virtual MxResult DoEnumerate(); // vtable+0x00
+	virtual int DoEnumerate(); // vtable+0x00
 
 	BOOL EnumDirectDrawCallback(LPGUID p_guid, LPSTR p_driverDesc, LPSTR p_driverName);
 	HRESULT EnumDisplayModesCallback(LPDDSURFACEDESC p_ddsd);
@@ -190,13 +189,13 @@ class MxDeviceEnumerate {
 		LPD3DDEVICEDESC p_HELDesc
 	);
 	const char* EnumerateErrorToString(HRESULT p_error);
-	MxS32 ParseDeviceName(const char* p_deviceId);
-	MxS32 ProcessDeviceBytes(MxS32 p_deviceNum, GUID& p_guid);
-	MxResult GetDevice(MxS32 p_deviceNum, MxDriver*& p_driver, MxDevice*& p_device);
-	MxS32 FUN_1009d0d0();
-	MxResult FUN_1009d210();
-	MxBool FUN_1009d370(MxDriver& p_driver);
-	MxBool FUN_1009d3d0(MxDevice& p_device);
+	int ParseDeviceName(const char* p_deviceId);
+	int ProcessDeviceBytes(int p_deviceNum, GUID& p_guid);
+	int GetDevice(int p_deviceNum, MxDriver*& p_driver, MxDevice*& p_device);
+	int FUN_1009d0d0();
+	int FUN_1009d210();
+	unsigned char FUN_1009d370(MxDriver& p_driver);
+	unsigned char FUN_1009d3d0(MxDevice& p_device);
 
 	static void BuildErrorString(const char*, ...);
 	static BOOL CALLBACK
@@ -216,8 +215,8 @@ class MxDeviceEnumerate {
 	friend class MxDirect3D;
 
 private:
-	list<MxDriver> m_list; // 0x04
-	MxBool m_initialized;  // 0x10
+	list<MxDriver> m_list;       // 0x04
+	unsigned char m_initialized; // 0x10
 };
 
 // VTABLE: LEGO1 0x100d9cc8
diff --git a/LEGO1/mxdirectdraw.cpp b/LEGO1/mxdirectx/mxdirectdraw.cpp
similarity index 98%
rename from LEGO1/mxdirectdraw.cpp
rename to LEGO1/mxdirectx/mxdirectdraw.cpp
index fa030eb8..7e78cf69 100644
--- a/LEGO1/mxdirectdraw.cpp
+++ b/LEGO1/mxdirectx/mxdirectdraw.cpp
@@ -348,9 +348,9 @@ BOOL MxDirectDraw::DDSetMode(int width, int height, int bpp)
 		}
 
 		if (!IsSupportedMode(width, height, bpp)) {
-			width = m_pCurrentDeviceModesList->m_modeArray[0].m_width;
-			height = m_pCurrentDeviceModesList->m_modeArray[0].m_height;
-			bpp = m_pCurrentDeviceModesList->m_modeArray[0].m_bitsPerPixel;
+			width = m_pCurrentDeviceModesList->m_modeArray[0].width;
+			height = m_pCurrentDeviceModesList->m_modeArray[0].height;
+			bpp = m_pCurrentDeviceModesList->m_modeArray[0].bitsPerPixel;
 		}
 
 		m_bIgnoreWMSIZE = TRUE;
@@ -396,9 +396,9 @@ BOOL MxDirectDraw::DDSetMode(int width, int height, int bpp)
 		m_bIgnoreWMSIZE = FALSE;
 	}
 
-	m_currentMode.m_width = width;
-	m_currentMode.m_height = height;
-	m_currentMode.m_bitsPerPixel = bpp;
+	m_currentMode.width = width;
+	m_currentMode.height = height;
+	m_currentMode.bitsPerPixel = bpp;
 
 	if (!DDCreateSurfaces()) {
 		return FALSE;
@@ -506,8 +506,8 @@ BOOL MxDirectDraw::DDCreateSurfaces()
 			Error("CreateSurface for window front buffer failed", result);
 			return FALSE;
 		}
-		ddsd.dwHeight = m_currentMode.m_height;
-		ddsd.dwWidth = m_currentMode.m_width;
+		ddsd.dwHeight = m_currentMode.height;
+		ddsd.dwWidth = m_currentMode.width;
 		ddsd.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_CAPS;
 		ddsd.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE;
 		if (m_bOnlySystemMemory)
@@ -640,7 +640,7 @@ BOOL MxDirectDraw::CreateTextSurfaces()
 	}
 
 	m_hFont = CreateFontA(
-		m_currentMode.m_width <= 600 ? 12 : 24,
+		m_currentMode.width <= 600 ? 12 : 24,
 		0,
 		0,
 		0,
@@ -774,8 +774,8 @@ BOOL MxDirectDraw::CreateZBuffer(DWORD memorytype, DWORD depth)
 
 	memset(&ddsd, 0, sizeof(ddsd));
 	ddsd.dwSize = sizeof(ddsd);
-	ddsd.dwHeight = m_currentMode.m_height;
-	ddsd.dwWidth = m_currentMode.m_width;
+	ddsd.dwHeight = m_currentMode.height;
+	ddsd.dwWidth = m_currentMode.width;
 	ddsd.dwZBufferBitDepth = depth;
 	ddsd.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_CAPS | DDSD_ZBUFFERBITDEPTH;
 	ddsd.ddsCaps.dwCaps = DDSCAPS_ZBUFFER | memorytype;
@@ -889,7 +889,7 @@ int MxDirectDraw::FlipToGDISurface()
 }
 
 // FUNCTION: LEGO1 0x1009e830
-void MxDirectDraw::Error(const char* p_message, MxS32 p_error)
+void MxDirectDraw::Error(const char* p_message, int p_error)
 {
 	// GLOBAL: LEGO1 0x10100c70
 	static BOOL g_isInsideError = FALSE;
diff --git a/LEGO1/mxdirectdraw.h b/LEGO1/mxdirectx/mxdirectdraw.h
similarity index 91%
rename from LEGO1/mxdirectdraw.h
rename to LEGO1/mxdirectx/mxdirectdraw.h
index 90be31c5..490233b5 100644
--- a/LEGO1/mxdirectdraw.h
+++ b/LEGO1/mxdirectx/mxdirectdraw.h
@@ -1,8 +1,6 @@
 #ifndef MXDIRECTDRAW_H
 #define MXDIRECTDRAW_H
 
-#include "mxtypes.h"
-
 #include <ddraw.h>
 #include <windows.h>
 
@@ -14,17 +12,14 @@ class MxDirectDraw {
 
 	// SIZE 0x0c
 	struct Mode {
-		MxS32 operator==(const Mode& p_mode) const
+		int operator==(const Mode& p_mode) const
 		{
-			return (
-				(m_width == p_mode.m_width) && (m_height == p_mode.m_height) &&
-				(m_bitsPerPixel == p_mode.m_bitsPerPixel)
-			);
+			return ((width == p_mode.width) && (height == p_mode.height) && (bitsPerPixel == p_mode.bitsPerPixel));
 		}
 
-		MxS32 m_width;        // 0x00
-		MxS32 m_height;       // 0x04
-		MxS32 m_bitsPerPixel; // 0x08
+		int width;        // 0x00
+		int height;       // 0x04
+		int bitsPerPixel; // 0x08
 	};
 
 	// SIZE 0x17c
@@ -34,7 +29,7 @@ class MxDirectDraw {
 
 		GUID* m_guid;      // 0x00
 		Mode* m_modeArray; // 0x04
-		MxS32 m_count;     // 0x08
+		int m_count;       // 0x08
 		DDCAPS m_ddcaps;   // 0x0c
 		void* m_unk0x178;  // 0x178
 	};
@@ -68,7 +63,7 @@ class MxDirectDraw {
 	BOOL DDCreateSurfaces();
 	BOOL DDInit(BOOL fullscreen);
 	BOOL DDSetMode(int width, int height, int bpp);
-	void Error(const char* p_message, MxS32 p_error);
+	void Error(const char* p_message, int p_error);
 
 	BOOL GetDDSurfaceDesc(LPDDSURFACEDESC lpDDSurfDesc, LPDIRECTDRAWSURFACE lpDDSurf);
 	BOOL IsSupportedMode(int width, int height, int bpp);

From fbe7f8bbb03d9b738c92eaeb319f7cef41448d88 Mon Sep 17 00:00:00 2001
From: Anonymous Maarten <madebr@users.noreply.github.com>
Date: Sun, 7 Jan 2024 18:30:45 +0100
Subject: [PATCH 078/210] Fix all mingw errors & warnings (#411)

* Use COMPAT_MODE macro to fix errors with mingw gcc 12.2

* MxOmni::m_timerRunning is a MxBool

* MxDirect3D::m_unk0x88c is a MxBool

* MxBackgroundAudioManager::m_unk0x13c is a MxS32

* Fix warning: deleting 'void*' is undefined [-Wdelete-incomplete]

* Fix inline function 'void TglImpl::RendererImpl::Destroy()' used but never defined

* Fix warning: inline function 'MxStreamerSubClass1::MxStreamerSubClass1(undefined4)' used but never defined

* Use `FALSE` for m_timerRunning

* Format

* Format

* Remove comment

* Limit scope for variables in compat mode

* clang-format

---------

Co-authored-by: Christian Semmler <mail@csemmler.com>
---
 3rdparty/dx5/inc/d3drmdef.h        |  4 ++--
 ISLE/isleapp.cpp                   |  9 +++++++++
 LEGO1/mxatomid.cpp                 | 10 ++++++++--
 LEGO1/mxbackgroundaudiomanager.cpp |  4 ++--
 LEGO1/mxcompositepresenter.cpp     |  7 +++++++
 LEGO1/mxdirectx/mxdirect3d.cpp     |  2 +-
 LEGO1/mxdiskstreamcontroller.cpp   | 17 +++++++++++++++-
 LEGO1/mxmediapresenter.cpp         |  7 +++++++
 LEGO1/mxomni.cpp                   | 16 ++++++++++++++-
 LEGO1/mxpresenter.cpp              | 14 ++++++++++++++
 LEGO1/mxstreamcontroller.cpp       |  7 +++++++
 LEGO1/mxstreamer.cpp               | 31 +++++++++++++++++-------------
 LEGO1/mxstreamer.h                 | 10 +++++++++-
 LEGO1/mxtransitionmanager.cpp      |  7 +++++++
 LEGO1/tgl/d3drm/impl.h             | 19 ++++++++++++++++++
 LEGO1/tgl/d3drm/renderer.cpp       | 20 +++----------------
 16 files changed, 144 insertions(+), 40 deletions(-)

diff --git a/3rdparty/dx5/inc/d3drmdef.h b/3rdparty/dx5/inc/d3drmdef.h
index aadf2644..109b2674 100644
--- a/3rdparty/dx5/inc/d3drmdef.h
+++ b/3rdparty/dx5/inc/d3drmdef.h
@@ -136,8 +136,8 @@ typedef struct _D3DRMIMAGE
     int bytes_per_line;		/* number of bytes of memory for a
 				   scanline. This must be a multiple
 				   of 4. */
-    void* buffer1;		/* memory to render into (first buffer). */
-    void* buffer2;		/* second rendering buffer for double
+    char* buffer1;		/* memory to render into (first buffer). */
+    char* buffer2;		/* second rendering buffer for double
 				   buffering, set to NULL for single
 				   buffering. */
     unsigned long red_mask;
diff --git a/ISLE/isleapp.cpp b/ISLE/isleapp.cpp
index 1d5c8e12..12a3b6f7 100644
--- a/ISLE/isleapp.cpp
+++ b/ISLE/isleapp.cpp
@@ -132,9 +132,18 @@ BOOL IsleApp::SetupLegoOmni()
 	char mediaPath[256];
 	GetProfileStringA("LEGO Island", "MediaPath", "", mediaPath, sizeof(mediaPath));
 
+#ifdef COMPAT_MODE
+	BOOL failure;
+	{
+		MxOmniCreateParam param(mediaPath, (struct HWND__*) m_windowHandle, m_videoParam, MxOmniCreateFlags());
+		failure = Lego()->Create(param) == FAILURE;
+	}
+#else
 	BOOL failure =
 		Lego()->Create(MxOmniCreateParam(mediaPath, (struct HWND__*) m_windowHandle, m_videoParam, MxOmniCreateFlags())
 		) == FAILURE;
+#endif
+
 	if (!failure) {
 		VariableTable()->SetVariable("ACTOR_01", "");
 		TickleManager()->SetClientTickleInterval(VideoManager(), 10);
diff --git a/LEGO1/mxatomid.cpp b/LEGO1/mxatomid.cpp
index 722f5432..ae57c820 100644
--- a/LEGO1/mxatomid.cpp
+++ b/LEGO1/mxatomid.cpp
@@ -34,9 +34,15 @@ void MxAtomId::Destroy()
 	if (!AtomIdCounterSet())
 		return;
 
-	// The dtor is called on the counter object immediately,
-	// so this syntax should be correct.
+#ifdef COMPAT_MODE
+	MxAtomIdCounterSet::iterator it;
+	{
+		MxAtomIdCounter id_counter(m_internal);
+		it = AtomIdCounterSet()->find(&id_counter);
+	}
+#else
 	MxAtomIdCounterSet::iterator it = AtomIdCounterSet()->find(&MxAtomIdCounter(m_internal));
+#endif
 
 	MxAtomIdCounter* counter = (MxAtomIdCounter*) (*it);
 	counter->Dec();
diff --git a/LEGO1/mxbackgroundaudiomanager.cpp b/LEGO1/mxbackgroundaudiomanager.cpp
index c4b8b6bd..9fe20941 100644
--- a/LEGO1/mxbackgroundaudiomanager.cpp
+++ b/LEGO1/mxbackgroundaudiomanager.cpp
@@ -104,7 +104,7 @@ void MxBackgroundAudioManager::FUN_1007ee70()
 		m_unk0x138 = NULL;
 		m_action2.SetObjectId(-1);
 		m_action2.SetAtomId(MxAtomId());
-		m_unk0x13c = NULL;
+		m_unk0x13c = 0;
 	}
 }
 
@@ -133,7 +133,7 @@ void MxBackgroundAudioManager::FUN_1007ef40()
 				m_unk0x138 = NULL;
 				m_action2.SetObjectId(-1);
 				m_action2.SetAtomId(MxAtomId());
-				m_unk0x13c = NULL;
+				m_unk0x13c = 0;
 			}
 		}
 	}
diff --git a/LEGO1/mxcompositepresenter.cpp b/LEGO1/mxcompositepresenter.cpp
index 7685fe57..d22c979d 100644
--- a/LEGO1/mxcompositepresenter.cpp
+++ b/LEGO1/mxcompositepresenter.cpp
@@ -97,10 +97,17 @@ void MxCompositePresenter::EndAction()
 	MxPresenter::EndAction();
 
 	if (action && action->GetOrigin()) {
+#ifdef COMPAT_MODE
+		{
+			MxEndActionNotificationParam param(c_notificationEndAction, this, action, FALSE);
+			NotificationManager()->Send(action->GetOrigin(), &param);
+		}
+#else
 		NotificationManager()->Send(
 			action->GetOrigin(),
 			&MxEndActionNotificationParam(c_notificationEndAction, this, action, FALSE)
 		);
+#endif
 	}
 }
 
diff --git a/LEGO1/mxdirectx/mxdirect3d.cpp b/LEGO1/mxdirectx/mxdirect3d.cpp
index b0816a94..c97ad0a9 100644
--- a/LEGO1/mxdirectx/mxdirect3d.cpp
+++ b/LEGO1/mxdirectx/mxdirect3d.cpp
@@ -14,7 +14,7 @@ MxDirect3D::MxDirect3D()
 {
 	this->m_pDirect3d = NULL;
 	this->m_pDirect3dDevice = NULL;
-	this->m_unk0x88c = NULL;
+	this->m_unk0x88c = 0;
 	this->m_assignedDevice = NULL;
 }
 
diff --git a/LEGO1/mxdiskstreamcontroller.cpp b/LEGO1/mxdiskstreamcontroller.cpp
index a7e95798..c0708acc 100644
--- a/LEGO1/mxdiskstreamcontroller.cpp
+++ b/LEGO1/mxdiskstreamcontroller.cpp
@@ -23,8 +23,16 @@ MxDiskStreamController::~MxDiskStreamController()
 	m_unk0xc4 = FALSE;
 	m_unk0x70 = FALSE;
 
-	if (m_provider)
+	if (m_provider) {
+#ifdef COMPAT_MODE
+		{
+			MxDSAction action;
+			m_provider->VTable0x20(&action);
+		}
+#else
 		m_provider->VTable0x20(&MxDSAction());
+#endif
+	}
 
 	MxDSAction* action;
 	while (m_unk0x3c.PopFront(action))
@@ -299,9 +307,16 @@ MxResult MxDiskStreamController::VTable0x24(MxDSAction* p_action)
 	MxAutoLocker lock(&this->m_criticalSection);
 	if (m_unk0x54.Find(p_action, FALSE) == NULL) {
 		if (VTable0x30(p_action) == SUCCESS) {
+#ifdef COMPAT_MODE
+			{
+				MxEndActionNotificationParam param(c_notificationEndAction, NULL, p_action, TRUE);
+				MxOmni::GetInstance()->NotifyCurrentEntity(&param);
+			}
+#else
 			MxOmni::GetInstance()->NotifyCurrentEntity(
 				&MxEndActionNotificationParam(c_notificationEndAction, NULL, p_action, TRUE)
 			);
+#endif
 		}
 	}
 
diff --git a/LEGO1/mxmediapresenter.cpp b/LEGO1/mxmediapresenter.cpp
index ca5eb7d7..eb05a9d4 100644
--- a/LEGO1/mxmediapresenter.cpp
+++ b/LEGO1/mxmediapresenter.cpp
@@ -160,10 +160,17 @@ void MxMediaPresenter::EndAction()
 		}
 
 		if (action && action->GetOrigin()) {
+#ifdef COMPAT_MODE
+			{
+				MxEndActionNotificationParam param(c_notificationEndAction, this, action, FALSE);
+				NotificationManager()->Send(action->GetOrigin(), &param);
+			}
+#else
 			NotificationManager()->Send(
 				action->GetOrigin(),
 				&MxEndActionNotificationParam(c_notificationEndAction, this, action, FALSE)
 			);
+#endif
 		}
 	}
 }
diff --git a/LEGO1/mxomni.cpp b/LEGO1/mxomni.cpp
index 8ae93d74..377ba481 100644
--- a/LEGO1/mxomni.cpp
+++ b/LEGO1/mxomni.cpp
@@ -157,7 +157,7 @@ void MxOmni::Init()
 	m_timer = NULL;
 	m_streamer = NULL;
 	m_atomIdCounterSet = NULL;
-	m_timerRunning = NULL;
+	m_timerRunning = FALSE;
 }
 
 // FUNCTION: LEGO1 0x100af0b0
@@ -345,14 +345,28 @@ MxResult MxOmni::CreatePresenter(MxStreamController* p_controller, MxDSAction& p
 
 			if (object->StartAction(p_controller, &p_action) == SUCCESS) {
 				if (sender) {
+#ifdef COMPAT_MODE
+					{
+						MxType4NotificationParam param(this, &p_action, object);
+						NotificationManager()->Send(sender, &param);
+					}
+#else
 					NotificationManager()->Send(sender, &MxType4NotificationParam(this, &p_action, object));
+#endif
 				}
 
 				if (p_action.GetUnknown84()) {
+#ifdef COMPAT_MODE
+					{
+						MxStartActionNotificationParam param(c_notificationStartAction, object, &p_action, FALSE);
+						NotificationManager()->Send(p_action.GetUnknown84(), &param);
+					}
+#else
 					NotificationManager()->Send(
 						p_action.GetUnknown84(),
 						&MxStartActionNotificationParam(c_notificationStartAction, object, &p_action, FALSE)
 					);
+#endif
 				}
 				result = SUCCESS;
 			}
diff --git a/LEGO1/mxpresenter.cpp b/LEGO1/mxpresenter.cpp
index b2404439..0640d550 100644
--- a/LEGO1/mxpresenter.cpp
+++ b/LEGO1/mxpresenter.cpp
@@ -147,9 +147,16 @@ void MxPresenter::EndAction()
 	MxAutoLocker lock(&this->m_criticalSection);
 
 	if (!this->m_compositePresenter) {
+#ifdef COMPAT_MODE
+		{
+			MxEndActionNotificationParam param(c_notificationEndAction, NULL, this->m_action, TRUE);
+			MxOmni::GetInstance()->NotifyCurrentEntity(&param);
+		}
+#else
 		MxOmni::GetInstance()->NotifyCurrentEntity(
 			&MxEndActionNotificationParam(c_notificationEndAction, NULL, this->m_action, TRUE)
 		);
+#endif
 	}
 
 	this->m_action = NULL;
@@ -195,7 +202,14 @@ void MxPresenter::SendToCompositePresenter(MxOmni* p_omni)
 	if (m_compositePresenter) {
 		MxAutoLocker lock(&m_criticalSection);
 
+#ifdef COMPAT_MODE
+		{
+			MxNotificationParam param(MXPRESENTER_NOTIFICATION, this);
+			NotificationManager()->Send(m_compositePresenter, &param);
+		}
+#else
 		NotificationManager()->Send(m_compositePresenter, &MxNotificationParam(MXPRESENTER_NOTIFICATION, this));
+#endif
 
 		m_action->SetOrigin(p_omni ? p_omni : MxOmni::GetInstance());
 		m_compositePresenter = NULL;
diff --git a/LEGO1/mxstreamcontroller.cpp b/LEGO1/mxstreamcontroller.cpp
index f351582a..4e054b98 100644
--- a/LEGO1/mxstreamcontroller.cpp
+++ b/LEGO1/mxstreamcontroller.cpp
@@ -55,7 +55,14 @@ MxStreamController::~MxStreamController()
 	if (m_provider) {
 		MxStreamProvider* provider = m_provider;
 		m_provider = NULL;
+#ifdef COMPAT_MODE
+		{
+			MxDSAction action;
+			provider->VTable0x20(&action);
+		}
+#else
 		provider->VTable0x20(&MxDSAction());
+#endif
 		delete provider;
 	}
 
diff --git a/LEGO1/mxstreamer.cpp b/LEGO1/mxstreamer.cpp
index cd2272c6..49fb31c3 100644
--- a/LEGO1/mxstreamer.cpp
+++ b/LEGO1/mxstreamer.cpp
@@ -81,8 +81,16 @@ MxLong MxStreamer::Close(const char* p_name)
 
 			if (c->FUN_100c20d0(ds))
 				delete c;
-			else
+			else {
+#ifdef COMPAT_MODE
+				{
+					MxStreamerNotification notification(MXSTREAMER_DELETE_NOTIFY, NULL, c);
+					NotificationManager()->Send(this, &notification);
+				}
+#else
 				NotificationManager()->Send(this, &MxStreamerNotification(MXSTREAMER_DELETE_NOTIFY, NULL, c));
+#endif
+			}
 
 			return SUCCESS;
 		}
@@ -185,20 +193,17 @@ MxLong MxStreamer::Notify(MxParam& p_param)
 
 		if (c->FUN_100c20d0(ds))
 			delete c;
-		else
+		else {
+#ifdef COMPAT_MODE
+			{
+				MxStreamerNotification notification(MXSTREAMER_DELETE_NOTIFY, NULL, c);
+				NotificationManager()->Send(this, &notification);
+			}
+#else
 			NotificationManager()->Send(this, &MxStreamerNotification(MXSTREAMER_DELETE_NOTIFY, NULL, c));
+#endif
+		}
 	}
 
 	return 0;
 }
-
-// No offset, function is always inlined
-MxStreamerSubClass1::MxStreamerSubClass1(undefined4 p_size)
-{
-	m_buffer = NULL;
-	m_size = p_size;
-	undefined4* ptr = &m_unk0x08;
-	for (int i = 0; i >= 0; i--) {
-		ptr[i] = 0;
-	}
-}
diff --git a/LEGO1/mxstreamer.h b/LEGO1/mxstreamer.h
index e76f0e36..02f97d12 100644
--- a/LEGO1/mxstreamer.h
+++ b/LEGO1/mxstreamer.h
@@ -14,7 +14,15 @@
 //       STL. But I haven't figured out what yet (it's definitely not a vector).
 class MxStreamerSubClass1 {
 public:
-	inline MxStreamerSubClass1(undefined4 p_size);
+	inline MxStreamerSubClass1(undefined4 p_size)
+	{
+		m_buffer = NULL;
+		m_size = p_size;
+		undefined4* ptr = &m_unk0x08;
+		for (int i = 0; i >= 0; i--) {
+			ptr[i] = 0;
+		}
+	}
 
 	~MxStreamerSubClass1() { delete[] m_buffer; }
 
diff --git a/LEGO1/mxtransitionmanager.cpp b/LEGO1/mxtransitionmanager.cpp
index db658249..565908a0 100644
--- a/LEGO1/mxtransitionmanager.cpp
+++ b/LEGO1/mxtransitionmanager.cpp
@@ -140,7 +140,14 @@ void MxTransitionManager::EndTransition(MxBool p_notifyWorld)
 			LegoWorld* world = GetCurrentWorld();
 
 			if (world) {
+#ifdef COMPAT_MODE
+				{
+					MxNotificationParam param(MXTRANSITIONMANAGER_TRANSITIONENDED, this);
+					world->Notify(param);
+				}
+#else
 				world->Notify(MxNotificationParam(MXTRANSITIONMANAGER_TRANSITIONENDED, this));
+#endif
 			}
 		}
 	}
diff --git a/LEGO1/tgl/d3drm/impl.h b/LEGO1/tgl/d3drm/impl.h
index f4d85cf4..cf14ada1 100644
--- a/LEGO1/tgl/d3drm/impl.h
+++ b/LEGO1/tgl/d3drm/impl.h
@@ -86,6 +86,25 @@ class RendererImpl : public Renderer {
 	IDirect3DRM2* m_data;
 };
 
+extern IDirect3DRM2* g_pD3DRM;
+
+inline void RendererDestroy(IDirect3DRM2* pRenderer)
+{
+	int refCount = pRenderer->Release();
+	if (refCount <= 0) {
+		g_pD3DRM = NULL;
+	}
+}
+
+// Inlined only
+void RendererImpl::Destroy()
+{
+	if (m_data) {
+		RendererDestroy(m_data);
+		m_data = NULL;
+	}
+}
+
 // VTABLE 0x100db988
 class DeviceImpl : public Device {
 public:
diff --git a/LEGO1/tgl/d3drm/renderer.cpp b/LEGO1/tgl/d3drm/renderer.cpp
index 11e7d8e9..4a8ca6c7 100644
--- a/LEGO1/tgl/d3drm/renderer.cpp
+++ b/LEGO1/tgl/d3drm/renderer.cpp
@@ -13,8 +13,11 @@ Renderer* Tgl::CreateRenderer()
 	return renderer;
 }
 
+namespace TglImpl
+{
 // GLOBAL: LEGO1 0x1010103c
 IDirect3DRM2* g_pD3DRM = NULL;
+} // namespace TglImpl
 
 // Inlined only
 Result RendererImpl::Create()
@@ -31,23 +34,6 @@ Result RendererImpl::Create()
 	return (m_data != NULL) ? Success : Error;
 }
 
-inline void RendererDestroy(IDirect3DRM2* pRenderer)
-{
-	int refCount = pRenderer->Release();
-	if (refCount <= 0) {
-		g_pD3DRM = NULL;
-	}
-}
-
-// Inlined only
-void RendererImpl::Destroy()
-{
-	if (m_data) {
-		RendererDestroy(m_data);
-		m_data = NULL;
-	}
-}
-
 // FUNCTION: LEGO1 0x100a1894
 Device* RendererImpl::CreateDevice(const DeviceDirect3DCreateData& data)
 {

From 4c0de81b6a4d82d094ea890188fd13c783fd12cf Mon Sep 17 00:00:00 2001
From: Misha <106913236+MishaProductions@users.noreply.github.com>
Date: Sun, 7 Jan 2024 17:03:04 -0500
Subject: [PATCH 079/210] Update legoactioncontrolpresenter.cpp (#416)

---
 LEGO1/legoactioncontrolpresenter.cpp | 31 ++++++++++++++++++++++++----
 1 file changed, 27 insertions(+), 4 deletions(-)

diff --git a/LEGO1/legoactioncontrolpresenter.cpp b/LEGO1/legoactioncontrolpresenter.cpp
index 88c3143f..5f4867ea 100644
--- a/LEGO1/legoactioncontrolpresenter.cpp
+++ b/LEGO1/legoactioncontrolpresenter.cpp
@@ -4,22 +4,45 @@
 #include "extra.h"
 #include "legoomni.h"
 #include "legoutil.h"
+#include "mxcompositepresenter.h"
 #include "mxmediapresenter.h"
 #include "mxomni.h"
+#include "mxstreamchunk.h"
 #include "mxticklemanager.h"
 
 DECOMP_SIZE_ASSERT(LegoActionControlPresenter, 0x68)
 
-// STUB: LEGO1 0x10043ce0
+// FUNCTION: LEGO1 0x10043ce0
 void LegoActionControlPresenter::ReadyTickle()
 {
-	// TODO
+	MxStreamChunk* chunk = NextChunk();
+
+	if (chunk) {
+		ParseExtra();
+		m_previousTickleStates |= 1 << (unsigned char) m_currentTickleState;
+		m_currentTickleState = TickleState_Starting;
+
+		m_subscriber->FUN_100b8390(chunk);
+		if (m_compositePresenter) {
+			if (m_action->GetDuration() == -1 || m_action->GetFlags() & 1) {
+				m_compositePresenter->VTable0x60(this);
+			}
+		}
+	}
 }
 
-// STUB: LEGO1 0x10043d40
+// FUNCTION: LEGO1 0x10043d40
 void LegoActionControlPresenter::RepeatingTickle()
 {
-	// TODO
+	if (IsEnabled()) {
+		if (m_unk0x50 == 0) {
+			ParseExtra();
+		}
+
+		InvokeAction(m_unk0x50, MxAtomId(m_unk0x54.GetData(), LookupMode_LowerCase2), m_unk0x64, NULL);
+		m_previousTickleStates |= 1 << (unsigned char) m_currentTickleState;
+		m_currentTickleState = TickleState_Done;
+	}
 }
 
 // FUNCTION: LEGO1 0x10043df0

From 78ee66336a20cfcd14d54c7dee2f1a19cd00d8cb Mon Sep 17 00:00:00 2001
From: Anonymous Maarten <madebr@users.noreply.github.com>
Date: Sun, 7 Jan 2024 23:31:31 +0100
Subject: [PATCH 080/210] cmake: fix default ninja + add clang-format target
 (#75)

* Add job pools with 1 job to disable parallel builds of lego1 and isle

* cmake: add clang-format target
---
 CMakeLists.txt | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 536c96c6..f0e3eae5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -320,4 +320,38 @@ if (MSVC)
   set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "/incremental:no")
   set(CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO "/incremental:no /debug")
   set(CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL "/incremental:no")
+
+  # Older MSVC versions don't support building in parallel.
+  # Force non-parallel builds of isle and lego1 by putting them in a pool with 1 available job.
+  if(CMAKE_CXX_COMPILER_ID VERSION_LESS 12)
+    set_property(GLOBAL PROPERTY JOB_POOLS "msvc_lego=1;msvc_lego1=1")
+    set_property(TARGET isle PROPERTY JOB_POOL_COMPILE msvc_lego)
+    set_property(TARGET isle PROPERTY JOB_POOL_LINK msvc_lego)
+    set_property(TARGET lego1 PROPERTY JOB_POOL_COMPILE msvc_lego1)
+    set_property(TARGET lego1 PROPERTY JOB_POOL_LINK msvc_lego1)
+  endif()
+endif()
+
+find_program(CLANGFORMAT_BIN NAMES clang-format)
+if(EXISTS "${CLANGFORMAT_BIN}")
+  execute_process(COMMAND "${CLANGFORMAT_BIN}" --version
+    OUTPUT_VARIABLE "CLANGFORMAT_VERSION_OUTPUT"
+    RESULT_VARIABLE "CLANGFORMAT_RESULT"
+  )
+  if(CLANGFORMAT_RESULT EQUAL 0 AND CLANGFORMAT_VERSION_OUTPUT MATCHES "version ([0-9\\.]+)")
+    set(CLANGFORMAT_VERSION "${CMAKE_MATCH_1}")
+    set(CLANGFORMAT_VERSION_REQUIRED "17.0")
+    message(DEBUG "Found clang-format version ${CLANGFORMAT_VERSION} (needs ${CLANGFORMAT_VERSION_REQUIRED}")
+    if(CLANGFORMAT_VERSION VERSION_GREATER_EQUAL "${CLANGFORMAT_VERSION_REQUIRED}")
+      file(GLOB_RECURSE isle_sources
+        "${PROJECT_SOURCE_DIR}/ISLE/*.cpp"
+        "${PROJECT_SOURCE_DIR}/ISLE/*.h"
+        "${PROJECT_SOURCE_DIR}/LEGO1/*.cpp"
+        "${PROJECT_SOURCE_DIR}/LEGO1/*.h"
+      )
+      string(REPLACE ";" "\n" isle_sources_lines "${isle_sources}")
+      file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/isle_sources.txt" "${isle_sources_lines}\n")
+      add_custom_target(clang-format ${CLANGFORMAT_BIN} -i "--files=${CMAKE_CURRENT_BINARY_DIR}/isle_sources.txt")
+    endif()
+  endif()
 endif()

From 6a85e6240605107970efd9e94d3651656f4219a4 Mon Sep 17 00:00:00 2001
From: Ramen2X <64166386+Ramen2X@users.noreply.github.com>
Date: Sun, 7 Jan 2024 19:52:17 -0500
Subject: [PATCH 081/210] refresh readme (#415) [skip ci]

* readme refresh

* correct 64-bit registry path in readme
---
 README.md | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index 2e2ea906..0f7edf0b 100644
--- a/README.md
+++ b/README.md
@@ -2,29 +2,29 @@
 
 [Development Vlog](https://www.youtube.com/playlist?list=PLbpl-gZkNl2COf_bB6cfgTapD5WduAfPz) | [Contributing](/CONTRIBUTING.md) | [Matrix](https://matrix.to/#/#isledecomp:matrix.org) | [Forums](https://forum.mattkc.com/viewforum.php?f=1) | [Patreon](https://www.patreon.com/mattkc)
   
-This is a **work-in-progress** decompilation of LEGO Island version 1.1. It aims to be as accurate as possible, matching the recompiled instructions to the original machine code as much as possible. The goal is to provide a workable codebase that can be modified, improved, and ported to other platforms later on.
+This is a **work-in-progress** decompilation of LEGO Island (Version 1.1, English). It aims to be as accurate as possible, matching the recompiled instructions to the original machine code as much as possible. The goal is to provide a workable codebase that can be modified, improved, and ported to other platforms later on.
 
 ## Status
 
 <img src="https://legoisland.org/progress/ISLEPROGRESS.SVG" width="50%"><img src="https://legoisland.org/progress/LEGO1PROGRESS.SVG" width="50%">
 
-Currently `ISLE.EXE` is completely decompiled and behaves identically to the original. A handful of stubborn instructions are not yet matching, however we anticipate they will as more of the overall codebase is implemented.
+Currently, `ISLE.EXE` is completely decompiled and behaves identically to the original. A handful of stubborn instructions are not yet matching; however, we anticipate they will as more of the overall codebase is implemented.
 
-`LEGO1.DLL` is still very much incomplete and cannot be used at this time. Instead, if you want to test this, it is recommended to pair the recompiled `ISLE.EXE` with the `LEGO1.DLL` from the original game.
+`LEGO1.DLL` is still incomplete and cannot be used for gameplay at this time. If you would like to use this, it is instead recommended to pair the recompiled `ISLE.EXE` with the `LEGO1.DLL` from the original game.
 
 ## Building
 
-This projects uses the [CMake](https://cmake.org/) build system, which allows for a high degree of versatility regarding compilers and development environments. For the most accurate results, it is recommended to use Microsoft Visual C++ 4.20 (the same compiler used to build the original game). Since we're trying to match this to the original executable as closely as possible, all contributions will be graded with the output of this compiler.
+This project uses the [CMake](https://cmake.org/) build system, which allows for a high degree of versatility regarding compilers and development environments. For the most accurate results, it is recommended to use Microsoft Visual C++ 4.20 (the same compiler used to build the original game). Since we're trying to match the output of this code to the original executables as closely as possible, all contributions will be graded with the output of this compiler.
 
 
-These instructions will outline how to compile this repository into an accurate instruction-matching binary with Visual C++ 4.2. If you wish, you can try using other compilers, but this is at your own risk and won't be covered in this guide.
+These instructions will outline how to compile this repository into accurate instruction-matching binaries with Visual C++ 4.2. If you wish, you can try using other compilers, but this is at your own risk and won't be covered in this guide.
 
 #### Prerequisites
 
 You will need the following software installed:
 
-- Microsoft Visual C++ 4.2. This can be found on many abandonware sites, but the installer can be a little iffy on modern versions of Windows. For convenience, I made a [portable version](https://github.com/itsmattkc/msvc420) that can be downloaded and used quickly instead.
-- [CMake](https://cmake.org/). A copy is often included with the "Desktop development with C++" workload in newer versions of Visual Studio, however it can also be installed as a standalone app.
+- Microsoft Visual C++ 4.2. This can be found on many abandonware sites, but the installer can be a little iffy on modern versions of Windows. For convenience, a [portable version](https://github.com/itsmattkc/msvc420) is available that can be downloaded and used quickly instead.
+- [CMake](https://cmake.org/). A copy is often included with the "Desktop development with C++" workload in newer versions of Visual Studio; however, it can also be installed as a standalone app.
 
 #### Compiling
 
@@ -37,8 +37,8 @@ You will need the following software installed:
 cmake <path-to-source> -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=RelWithDebInfo
 ```
   - **Visual C++ 4.2 has issues with paths containing spaces**. If you get configure or build errors, make sure neither CMake, the repository, nor Visual C++ 4.2 is in a path that contains spaces.
-  - Replace `<path-to-source>` with the source repository. Can be `..` if your build folder is inside the source repository.
-  - `RelWithDebInfo` is recommended because it will produce debug symbols useful for further decompilation work. However, you can change this to `Release` if you don't need them. `Debug` builds are not recommended because they are unlikely to be compatible with the retail `LEGO1.DLL`, which is currently the only way to really use this decomp.
+  - Replace `<path-to-source>` with the source repository. This can be `..` if your build folder is inside the source repository.
+  - `RelWithDebInfo` is recommended because it will produce debug symbols useful for further decompilation work. However, you can change this to `Release` if you don't need them. `Debug` builds are not recommended because they are unlikely to be compatible with the retail `LEGO1.DLL`, which is currently the only way to use this decompilation for gameplay.
   - `NMake Makefiles` is most recommended because it will be immediately compatible with Visual C++ 4.2. For faster builds, you can use `Ninja` (if you have it installed), however due to limitations in Visual C++ 4.2, you can only build `Release` builds this way (debug symbols cannot be generated with `Ninja`).
 1. Build the project by running `nmake` or `cmake --build <build-folder>`
 1. When this is done, there should a recompiled `ISLE.EXE` and `LEGO1.DLL` in the build folder.
@@ -47,14 +47,17 @@ If you have a CMake-compatible IDE, it should be pretty straightforward to use t
 
 ## Usage
 
-Simply place the compiled `ISLE.EXE` into LEGO Island's install folder (usually `C:\Program Files\LEGO Island` or `C:\Program Files (x86)\LEGO Island`). Unless you're a developer, disregard the compiled `LEGO1.DLL` for now as it is too incomplete to be usable. Alternatively, LEGO Island can run from any directory as long as `ISLE.EXE` and `LEGO1.DLL` are in the same directory, and the registry keys point to the correct location for the asset files.
+Simply place the compiled `ISLE.EXE` into LEGO Island's install folder (usually `C:\Program Files\LEGO Island` or `C:\Program Files (x86)\LEGO Island`). Unless you're a developer, disregard the compiled `LEGO1.DLL` for now as it is too incomplete to be usable. Alternatively, LEGO Island can run from any directory as long as `ISLE.EXE` and `LEGO1.DLL` are in the same directory, and the registry keys (usually `HKEY_LOCAL_MACHINE\Software\Mindscape\LEGO Island` or `HKEY_LOCAL_MACHINE\Software\Wow6432Node\Mindscape\LEGO Island`) point to the correct location for the asset files.
 
 ## Contributing
 
-If you're interested in helping/contributing to this project, check out the [CONTRIBUTING](/CONTRIBUTING.md) page.
+If you're interested in helping or contributing to this project, check out the [CONTRIBUTING](/CONTRIBUTING.md) page.
 
 ## Additional Information
 
 ### Which version of LEGO Island do I have?
 
-Right click on `LEGO1.DLL`, select `Properties`, and switch to the `Details` tab. Under `Version` you should either see `1.0.0.0` (1.0) or `1.1.0.0` (1.1). Additionally, you can look at the game disc files; 1.0's files will all say August 8, 1997, and 1.1's files will all say September 8, 1997. Version 1.1 is by far the most common, especially if you're not using the English or Japanese versions, so that's most likely the version you have.
+Right click on `LEGO1.DLL`, select `Properties`, and switch to the `Details` tab. Under `Version` you should either see `1.0.0.0` (1.0) or `1.1.0.0` (1.1). Additionally, you can look at the game disc files; 1.0's files will all say August 8, 1997, and 1.1's files will all say September 8, 1997. Version 1.1 is by far the most common, especially if you're not using the English or Japanese versions, so that's most likely the version you have. Please note that some localized versions of LEGO Island were recompiled with small changes despite maintaining a version number parallel with other versions; this decompilation is specifically targeting the English release of version 1.1 of LEGO Island. You can verify you have the correct version using the checksums below:
+
+* ISLE.EXE `md5: f6da12249e03eed1c74810cd23beb9f5`
+* LEGO1.DLL `md5: 4e2f6d969ea2ef8655ba3fc221a0c8fe`

From c47206617dff353abc6b9d9cf3198de3b5b5126b Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Mon, 8 Jan 2024 04:58:49 -0500
Subject: [PATCH 082/210] Reorganize sources and files (#414)

* Reorganize sources

* Refactor

* Remove relative paths

* Renames

* Fix gitignore

* Remove stuff

* Try fixing format script

* Fix format

* Fix format

* Fix naming script

* Test format

* Fix format
---
 .github/workflows/format.yml                  |  11 +-
 .github/workflows/naming.yml                  |  10 +-
 .gitignore                                    |   2 +-
 3rdparty/{smack => smacker}/rad.h             |   0
 3rdparty/{smack => smacker}/smack.h           |   0
 3rdparty/{smack => smacker}/smack.lib         | Bin
 CMakeLists.txt                                | 413 +++++++++---------
 ISLE/isleapp.cpp                              |   1 -
 ISLE/res/resource.h                           |   8 +-
 LEGO1/{ => lego/legoomni/include}/act1state.h |   0
 LEGO1/{ => lego/legoomni/include}/act2brick.h |   0
 .../legoomni/include}/act2policestation.h     |   0
 LEGO1/{ => lego/legoomni/include}/act3.h      |   0
 LEGO1/{ => lego/legoomni/include}/act3actor.h |   0
 LEGO1/{ => lego/legoomni/include}/act3shark.h |   0
 LEGO1/{ => lego/legoomni/include}/act3state.h |   0
 LEGO1/{ => lego/legoomni/include}/ambulance.h |   0
 .../legoomni/include}/ambulancemissionstate.h |   0
 LEGO1/{ => lego/legoomni/include}/animstate.h |   0
 .../legoomni/include}/beachhouseentity.h      |   0
 LEGO1/{ => lego/legoomni/include}/bike.h      |   0
 .../legoomni/include}/buildingentity.h        |   0
 LEGO1/{ => lego/legoomni/include}/bumpbouy.h  |   0
 LEGO1/{ => lego/legoomni/include}/carrace.h   |   0
 .../legoomni/include}/carracestate.h          |   0
 LEGO1/{ => lego/legoomni/include}/doors.h     |   0
 LEGO1/{ => lego/legoomni/include}/dunebuggy.h |   0
 .../legoomni/include}/elevatorbottom.h        |   0
 LEGO1/{ => lego/legoomni/include}/extra.h     |   0
 .../{ => lego/legoomni/include}/gasstation.h  |   0
 .../legoomni/include}/gasstationentity.h      |   0
 .../legoomni/include}/gasstationstate.h       |   0
 .../{ => lego/legoomni/include}/gifmanager.h  |   0
 .../{ => lego/legoomni/include}/helicopter.h  |   0
 .../legoomni/include}/helicopterstate.h       |   0
 .../{ => lego/legoomni/include}/historybook.h |   0
 LEGO1/{ => lego/legoomni/include}/hospital.h  |   0
 .../legoomni/include}/hospitalentity.h        |   0
 .../legoomni/include}/hospitalstate.h         |   0
 .../{ => lego/legoomni/include}/infocenter.h  |   0
 .../legoomni/include}/infocenterdoor.h        |   0
 .../legoomni/include}/infocenterentity.h      |   0
 .../legoomni/include}/infocenterstate.h       |   0
 LEGO1/{ => lego/legoomni/include}/isle.h      |   0
 LEGO1/{ => lego/legoomni/include}/isleactor.h |   0
 .../legoomni/include}/islepathactor.h         |   0
 LEGO1/{ => lego/legoomni/include}/jetski.h    |   0
 .../{ => lego/legoomni/include}/jetskirace.h  |   0
 .../legoomni/include}/jetskiracestate.h       |   0
 LEGO1/{ => lego/legoomni/include}/jukebox.h   |   0
 .../legoomni/include}/jukeboxentity.h         |   0
 .../legoomni/include}/jukeboxstate.h          |   0
 .../legoomni/include}/lego3dwavepresenter.h   |   0
 LEGO1/{ => lego/legoomni/include}/legoact2.h  |   0
 .../legoomni/include}/legoact2state.h         |   0
 .../include}/legoactioncontrolpresenter.h     |   0
 LEGO1/{ => lego/legoomni/include}/legoactor.h |   0
 .../legoomni/include}/legoactorpresenter.h    |   0
 .../legoomni/include}/legoanimactor.h         |   0
 .../legoomni/include}/legoanimationmanager.h  |   0
 .../legoomni/include}/legoanimmmpresenter.h   |   0
 .../legoomni/include}/legoanimpresenter.h     |   0
 .../legoomni/include}/legobackgroundcolor.h   |   0
 .../legoomni/include}/legobuildingmanager.h   |   0
 .../legoomni/include}/legocachesound.h        |   0
 .../legoomni/include}/legocameracontroller.h  |   0
 .../legoomni/include}/legocarbuild.h          |   0
 .../include}/legocarbuildanimpresenter.h      |   0
 .../legoomni/include}/legocarraceactor.h      |   0
 .../legoomni/include}/legocontrolmanager.h    |   0
 .../{ => lego/legoomni/include}/legoentity.h  |   2 +-
 .../legoomni/include}/legoentitypresenter.h   |   0
 .../include}/legoeventnotificationparam.h     |   0
 .../legoomni/include}/legoextraactor.h        |   0
 .../include}/legoflctexturepresenter.h        |   0
 .../legoomni/include}/legofullscreenmovie.h   |   0
 .../legoomni/include}/legogamestate.h         |   0
 .../legoomni/include}/legohideanimpresenter.h |   0
 .../legoomni/include}/legoinputmanager.h      |   0
 .../{ => lego/legoomni/include}/legojetski.h  |   0
 .../legoomni/include}/legojetskiraceactor.h   |   0
 .../include}/legoloadcachesoundpresenter.h    |   0
 .../include}/legolocomotionanimpresenter.h    |   0
 .../include}/legoloopinganimpresenter.h       |   0
 .../legoomni/include}/legometerpresenter.h    |   0
 .../legoomni/include}/legomodelpresenter.h    |   0
 .../legoomni/include}/legonavcontroller.h     |   0
 .../legoomni/include}/legoobjectfactory.h     |   0
 LEGO1/{ => lego/legoomni/include}/legoomni.h  |   0
 .../legoomni/include}/legopalettepresenter.h  |   0
 .../legoomni/include}/legopartpresenter.h     |   0
 .../legoomni/include}/legopathactor.h         |   0
 .../legoomni/include}/legopathboundary.h      |   0
 .../legoomni/include}/legopathcontroller.h    |   0
 .../include}/legopathcontrollerlist.h         |   0
 .../legoomni/include}/legopathpresenter.h     |   0
 .../legoomni/include}/legophonemepresenter.h  |   0
 .../legoomni/include}/legoplantmanager.h      |   0
 LEGO1/{ => lego/legoomni/include}/legorace.h  |   0
 .../legoomni/include}/legoraceactor.h         |   0
 .../{ => lego/legoomni/include}/legoracecar.h |   0
 .../legoomni/include}/legosoundmanager.h      |   0
 LEGO1/{ => lego/legoomni/include}/legostate.h |   0
 .../{ => lego/legoomni/include}/legostream.h  |   0
 .../legoomni/include}/legotexturepresenter.h  |   0
 .../legoomni/include/legounknown100d7c88.h}   |  10 +-
 .../legoomni/include/legounknown100d9d00.h    |  42 ++
 .../legoomni/include}/legounksavedatawriter.h |   0
 LEGO1/{ => lego/legoomni/include}/legoutil.h  |   0
 .../legoomni/include}/legovehiclebuildstate.h |   0
 .../legoomni/include}/legovideomanager.h      |  70 +--
 LEGO1/{ => lego/legoomni/include}/legoworld.h |   0
 .../legoomni/include}/legoworldlist.h         |   0
 .../legoomni/include}/legoworldpresenter.h    |   0
 .../{ => lego/legoomni/include}/motorcycle.h  |   0
 LEGO1/{ => lego/legoomni/include}/pizza.h     |   0
 .../legoomni/include}/pizzamissionstate.h     |   0
 LEGO1/{ => lego/legoomni/include}/pizzeria.h  |   0
 .../legoomni/include}/pizzeriastate.h         |   0
 LEGO1/{ => lego/legoomni/include}/police.h    |   0
 .../legoomni/include}/policeentity.h          |   0
 .../{ => lego/legoomni/include}/policestate.h |   0
 LEGO1/{ => lego/legoomni/include}/racecar.h   |   0
 .../legoomni/include}/racestandsentity.h      |   0
 LEGO1/{ => lego/legoomni/include}/racestate.h |   0
 LEGO1/{ => lego/legoomni/include}/radio.h     |   0
 .../{ => lego/legoomni/include}/radiostate.h  |   0
 .../legoomni/include}/registrationbook.h      |   0
 LEGO1/{ => lego/legoomni/include}/score.h     |   0
 .../{ => lego/legoomni/include}/scorestate.h  |   0
 .../{ => lego/legoomni/include}/skateboard.h  |   0
 LEGO1/{ => lego/legoomni/include}/towtrack.h  |   0
 .../legoomni/include}/towtrackmissionstate.h  |   0
 .../legoomni/src/act1}/act1state.cpp          |   0
 .../legoomni/src/act2}/act2brick.cpp          |   0
 .../legoomni/src/act2}/act2policestation.cpp  |   0
 .../legoomni/src/act2}/legoact2state.cpp      |   0
 LEGO1/{ => lego/legoomni/src/act3}/act3.cpp   |   0
 .../legoomni/src/act3}/act3shark.cpp          |   0
 .../legoomni/src/act3}/act3state.cpp          |   0
 .../legoomni/src/audio}/legocachesound.cpp    |   0
 .../audio}/legoloadcachesoundpresenter.cpp    |   0
 .../legoomni/src/audio}/legosoundmanager.cpp  |   0
 .../legoomni/src/build}/buildingentity.cpp    |   0
 .../legoomni/src/build}/dunebuggy.cpp         |   0
 .../legoomni/src/build}/helicopter.cpp        |   0
 .../legoomni/src/build}/helicopterstate.cpp   |   0
 .../{ => lego/legoomni/src/build}/jetski.cpp  |   0
 .../src/build}/legobuildingmanager.cpp        |   0
 .../legoomni/src/build}/legocarbuild.cpp      |   0
 .../src/build}/legovehiclebuildstate.cpp      |   0
 .../{ => lego/legoomni/src/build}/racecar.cpp |   0
 .../legoomni/src/common}/animstate.cpp        |   0
 .../legoomni/src/common}/gifmanager.cpp       |   0
 .../common}/legoactioncontrolpresenter.cpp    |   0
 .../src/common}/legobackgroundcolor.cpp       |   0
 .../src/common}/legocameracontroller.cpp      |   0
 .../src/common}/legofullscreenmovie.cpp       |   0
 .../legoomni/src/common}/legogamestate.cpp    |   2 +-
 .../src/common}/legonavcontroller.cpp         |   0
 .../src/common}/legoobjectfactory.cpp         |   0
 .../legoomni/src/common}/legoplantmanager.cpp |   0
 .../legoomni/src/common}/legostate.cpp        |   0
 .../legoomni/src/common}/legostream.cpp       |   0
 .../src/common}/legounksavedatawriter.cpp     |   0
 .../legoomni/src/common}/legoutil.cpp         |   0
 .../src/control}/legocontrolmanager.cpp       |   0
 .../legoomni/src/entity}/legoactor.cpp        |   0
 .../legoomni/src/entity}/legoanimactor.cpp    |   0
 .../legoomni/src/entity}/legoentity.cpp       |   0
 .../src/entity}/legoentitypresenter.cpp       |   0
 .../legoomni/src/entity}/legojetski.cpp       |   0
 .../legoomni/src/entity}/legopathactor.cpp    |   0
 .../legoomni/src/entity}/legorace.cpp         |   0
 .../legoomni/src/entity}/legoworld.cpp        |   0
 .../src/entity}/legoworldpresenter.cpp        |   0
 .../legoomni/src/gasstation}/gasstation.cpp   |   0
 .../src/gasstation}/gasstationentity.cpp      |   0
 .../src/gasstation}/gasstationstate.cpp       |   0
 .../legoomni/src/hospital}/ambulance.cpp      |   0
 .../src/hospital}/ambulancemissionstate.cpp   |   0
 .../legoomni/src/hospital}/hospital.cpp       |   0
 .../legoomni/src/hospital}/hospitalentity.cpp |   0
 .../legoomni/src/hospital}/hospitalstate.cpp  |   0
 .../src/infocenter}/elevatorbottom.cpp        |   0
 .../legoomni/src/infocenter}/infocenter.cpp   |   0
 .../src/infocenter}/infocenterdoor.cpp        |   0
 .../src/infocenter}/infocenterentity.cpp      |   0
 .../src/infocenter}/infocenterstate.cpp       |   0
 .../src/infocenter}/registrationbook.cpp      |   0
 .../legoomni/src/infocenter}/score.cpp        |   0
 .../legoomni/src/infocenter}/scorestate.cpp   |   0
 .../legoomni/src/input}/legoinputmanager.cpp  |   0
 .../legoomni/src/isle}/beachhouseentity.cpp   |   0
 LEGO1/{ => lego/legoomni/src/isle}/bike.cpp   |   0
 .../{ => lego/legoomni/src/isle}/bumpbouy.cpp |   0
 .../legoomni/src/isle}/historybook.cpp        |   0
 LEGO1/{ => lego/legoomni/src/isle}/isle.cpp   |   0
 .../legoomni/src/isle}/isleactor.cpp          |   0
 .../legoomni/src/isle}/islepathactor.cpp      |   0
 .../{ => lego/legoomni/src/isle}/jukebox.cpp  |   0
 .../legoomni/src/isle}/jukeboxentity.cpp      |   0
 .../legoomni/src/isle}/jukeboxstate.cpp       |   0
 .../legoomni/src/isle}/motorcycle.cpp         |   0
 LEGO1/{ => lego/legoomni/src/isle}/radio.cpp  |   0
 .../legoomni/src/isle}/radiostate.cpp         |   0
 .../legoomni/src/isle}/skateboard.cpp         |   0
 .../{ => lego/legoomni/src/main}/legoomni.cpp |   0
 .../notify}/legoeventnotificationparam.cpp    |   0
 .../src/paths}/legopathcontroller.cpp         |   0
 .../legoomni/src/paths}/legopathpresenter.cpp |   0
 .../legoomni/src/pizzeria}/pizza.cpp          |   0
 .../src/pizzeria}/pizzamissionstate.cpp       |   0
 .../legoomni/src/pizzeria}/pizzeria.cpp       |   0
 .../legoomni/src/pizzeria}/pizzeriastate.cpp  |   0
 .../{ => lego/legoomni/src/police}/police.cpp |   0
 .../legoomni/src/police}/policeentity.cpp     |   0
 .../legoomni/src/police}/policestate.cpp      |   0
 .../{ => lego/legoomni/src/race}/carrace.cpp  |   0
 .../legoomni/src/race}/jetskirace.cpp         |   0
 .../legoomni/src/race}/racestandsentity.cpp   |   0
 .../legoomni/src/race}/racestate.cpp          |   0
 .../legoomni/src/towtrack}/towtrack.cpp       |   0
 .../src/towtrack}/towtrackmissionstate.cpp    |   0
 .../src/unknown/legounknown100d7c88.cpp       |  12 +
 .../src/video}/legoanimationmanager.cpp       |   0
 .../src/video}/legoanimmmpresenter.cpp        |   0
 .../legoomni/src/video}/legoanimpresenter.cpp |   0
 .../src/video}/legocarbuildanimpresenter.cpp  |   0
 .../src/video}/legoflctexturepresenter.cpp    |   0
 .../src/video}/legohideanimpresenter.cpp      |   0
 .../video}/legolocomotionanimpresenter.cpp    |   0
 .../src/video}/legometerpresenter.cpp         |   0
 .../src/video}/legomodelpresenter.cpp         |   0
 .../src/video}/legopalettepresenter.cpp       |   0
 .../legoomni/src/video}/legopartpresenter.cpp |   0
 .../src/video}/legophonemepresenter.cpp       |   0
 .../src/video}/legotexturepresenter.cpp       |   0
 .../legoomni/src/video}/legovideomanager.cpp  |   4 +-
 .../sources}/3dmanager/lego3dmanager.cpp      |   2 +-
 .../sources}/3dmanager/lego3dmanager.h        |   0
 .../sources}/3dmanager/lego3dview.cpp         |   2 +-
 .../{ => lego/sources}/3dmanager/lego3dview.h |   0
 .../sources}/3dmanager/legoview1.cpp          |   2 +-
 .../{ => lego/sources}/3dmanager/legoview1.h  |   0
 .../sources}/3dmanager/tglsurface.cpp         |   0
 .../{ => lego/sources}/3dmanager/tglsurface.h |   4 +-
 LEGO1/{ => lego/sources/roi}/legoroi.cpp      |   0
 LEGO1/{ => lego/sources/roi}/legoroi.h        |   0
 LEGO1/mxdirectx/mxdirect3d.h                  |   2 +-
 LEGO1/mxparam.cpp                             |   1 -
 LEGO1/mxunknown100d7c88.cpp                   |  12 -
 LEGO1/mxunknown100d9d00.h                     |  42 --
 .../include}/mxactionnotificationparam.h      |   0
 LEGO1/{ => omni/include}/mxatomid.h           |   0
 LEGO1/{ => omni/include}/mxatomidcounter.h    |   0
 LEGO1/{ => omni/include}/mxaudiomanager.h     |   0
 LEGO1/{ => omni/include}/mxaudiopresenter.h   |   0
 LEGO1/{ => omni/include}/mxautolocker.h       |   0
 .../include}/mxbackgroundaudiomanager.h       |   0
 LEGO1/{ => omni/include}/mxbitmap.h           |   0
 LEGO1/{ => omni/include}/mxcollection.h       |   0
 .../include}/mxcompositemediapresenter.h      |   0
 .../{ => omni/include}/mxcompositepresenter.h |   0
 LEGO1/{ => omni/include}/mxcontrolpresenter.h |   0
 LEGO1/{ => omni/include}/mxcore.h             |   0
 LEGO1/{ => omni/include}/mxcriticalsection.h  |   0
 .../include}/mxdiskstreamcontroller.h         |   0
 .../{ => omni/include}/mxdiskstreamprovider.h |   0
 LEGO1/{ => omni/include}/mxdisplaysurface.h   |   0
 LEGO1/{ => omni/include}/mxdsaction.h         |   0
 LEGO1/{ => omni/include}/mxdsactionlist.h     |   0
 LEGO1/{ => omni/include}/mxdsanim.h           |   0
 LEGO1/{ => omni/include}/mxdsbuffer.h         |   0
 LEGO1/{ => omni/include}/mxdschunk.h          |   0
 LEGO1/{ => omni/include}/mxdsevent.h          |   0
 LEGO1/{ => omni/include}/mxdsfile.h           |   0
 LEGO1/{ => omni/include}/mxdsmediaaction.h    |   0
 LEGO1/{ => omni/include}/mxdsmultiaction.h    |   0
 LEGO1/{ => omni/include}/mxdsobject.h         |   0
 LEGO1/{ => omni/include}/mxdsobjectaction.h   |   0
 LEGO1/{ => omni/include}/mxdsparallelaction.h |   0
 LEGO1/{ => omni/include}/mxdsselectaction.h   |   0
 LEGO1/{ => omni/include}/mxdsserialaction.h   |   0
 LEGO1/{ => omni/include}/mxdssound.h          |   0
 LEGO1/{ => omni/include}/mxdssource.h         |   0
 LEGO1/{ => omni/include}/mxdsstill.h          |   0
 .../{ => omni/include}/mxdsstreamingaction.h  |   0
 LEGO1/{ => omni/include}/mxdssubscriber.h     |   0
 LEGO1/{ => omni/include}/mxdstypes.h          |   0
 LEGO1/{ => omni/include}/mxentity.h           |   0
 LEGO1/{ => omni/include}/mxeventmanager.h     |   0
 LEGO1/{ => omni/include}/mxeventpresenter.h   |   0
 LEGO1/{ => omni/include}/mxflcpresenter.h     |   0
 LEGO1/{ => omni/include}/mxhashtable.h        |   0
 LEGO1/{ => omni/include}/mxioinfo.h           |   0
 LEGO1/{ => omni/include}/mxlist.h             |   0
 .../include}/mxloopingflcpresenter.h          |   0
 .../include}/mxloopingmidipresenter.h         |   0
 .../include}/mxloopingsmkpresenter.h          |   0
 LEGO1/{ => omni/include}/mxmediamanager.h     |   0
 LEGO1/{ => omni/include}/mxmediapresenter.h   |   0
 LEGO1/{ => omni/include}/mxmidipresenter.h    |   0
 LEGO1/{ => omni/include}/mxmusicmanager.h     |   0
 LEGO1/{ => omni/include}/mxmusicpresenter.h   |   0
 .../include}/mxnextactiondatastart.h          |   0
 .../include}/mxnotificationmanager.h          |   0
 .../{ => omni/include}/mxnotificationparam.h  |   0
 LEGO1/{ => omni/include}/mxobjectfactory.h    |   0
 LEGO1/{ => omni/include}/mxomni.h             |   0
 LEGO1/{ => omni/include}/mxomnicreateflags.h  |   0
 LEGO1/{ => omni/include}/mxomnicreateparam.h  |   0
 LEGO1/{ => omni/include}/mxpalette.h          |   0
 LEGO1/{ => omni/include}/mxparam.h            |   0
 LEGO1/{ => omni/include}/mxpoint32.h          |   0
 LEGO1/{ => omni/include}/mxpresenter.h        |   0
 LEGO1/{ => omni/include}/mxpresenterlist.h    |   0
 LEGO1/{ => omni/include}/mxqueue.h            |   0
 .../include}/mxramstreamcontroller.h          |   0
 .../{ => omni/include}/mxramstreamprovider.h  |   0
 LEGO1/{ => omni/include}/mxrect32.h           |   0
 LEGO1/{ => omni/include}/mxrectlist.h         |   0
 LEGO1/{ => omni/include}/mxregion.h           |   0
 LEGO1/{ => omni/include}/mxregioncursor.h     |   0
 LEGO1/{ => omni/include}/mxregionlist.h       |   0
 LEGO1/{ => omni/include}/mxscheduler.h        |   0
 LEGO1/{ => omni/include}/mxsemaphore.h        |   0
 LEGO1/{ => omni/include}/mxsize32.h           |   0
 LEGO1/{ => omni/include}/mxsmack.h            |   0
 LEGO1/{ => omni/include}/mxsmkpresenter.h     |   0
 LEGO1/{ => omni/include}/mxsoundmanager.h     |   0
 LEGO1/{ => omni/include}/mxsoundpresenter.h   |   0
 LEGO1/{ => omni/include}/mxstillpresenter.h   |   0
 LEGO1/{ => omni/include}/mxstreamchunk.h      |   0
 LEGO1/{ => omni/include}/mxstreamchunklist.h  |   0
 LEGO1/{ => omni/include}/mxstreamcontroller.h |   0
 LEGO1/{ => omni/include}/mxstreamer.h         |   0
 LEGO1/{ => omni/include}/mxstreamlist.h       |   0
 LEGO1/{ => omni/include}/mxstreamprovider.h   |   0
 LEGO1/{ => omni/include}/mxstring.h           |   0
 LEGO1/{ => omni/include}/mxstringlist.h       |   0
 LEGO1/{ => omni/include}/mxthread.h           |   0
 LEGO1/{ => omni/include}/mxticklemanager.h    |   0
 LEGO1/{ => omni/include}/mxtimer.h            |   0
 .../{ => omni/include}/mxtransitionmanager.h  |   0
 .../include}/mxtype17notificationparam.h      |   0
 .../include}/mxtype18notificationparam.h      |   0
 .../include}/mxtype19notificationparam.h      |   0
 LEGO1/{ => omni/include}/mxtypes.h            |   0
 LEGO1/{ => omni/include}/mxvariable.h         |   0
 LEGO1/{ => omni/include}/mxvariabletable.h    |   0
 LEGO1/{ => omni/include}/mxvideomanager.h     |   0
 LEGO1/{ => omni/include}/mxvideoparam.h       |   0
 LEGO1/{ => omni/include}/mxvideoparamflags.h  |   0
 LEGO1/{ => omni/include}/mxvideopresenter.h   |   0
 LEGO1/{ => omni/include}/mxwavepresenter.h    |   0
 LEGO1/{ => omni/src/action}/mxdsaction.cpp    |   0
 LEGO1/{ => omni/src/action}/mxdsanim.cpp      |   0
 LEGO1/{ => omni/src/action}/mxdsevent.cpp     |   0
 .../{ => omni/src/action}/mxdsmediaaction.cpp |   0
 .../{ => omni/src/action}/mxdsmultiaction.cpp |   0
 LEGO1/{ => omni/src/action}/mxdsobject.cpp    |   0
 .../src/action}/mxdsobjectaction.cpp          |   0
 .../src/action}/mxdsparallelaction.cpp        |   0
 .../src/action}/mxdsselectaction.cpp          |   0
 .../src/action}/mxdsserialaction.cpp          |   0
 LEGO1/{ => omni/src/action}/mxdssound.cpp     |   0
 LEGO1/{ => omni/src/action}/mxdsstill.cpp     |   0
 .../src/action}/mxdsstreamingaction.cpp       |   0
 LEGO1/{ => omni/src/audio}/mxaudiomanager.cpp |   0
 .../{ => omni/src/audio}/mxaudiopresenter.cpp |   0
 .../src/audio}/mxbackgroundaudiomanager.cpp   |   0
 .../src/audio}/mxloopingmidipresenter.cpp     |   0
 .../{ => omni/src/audio}/mxmidipresenter.cpp  |   0
 LEGO1/{ => omni/src/audio}/mxmusicmanager.cpp |   0
 .../{ => omni/src/audio}/mxmusicpresenter.cpp |   0
 LEGO1/{ => omni/src/audio}/mxsoundmanager.cpp |   0
 .../{ => omni/src/audio}/mxsoundpresenter.cpp |   0
 .../{ => omni/src/audio}/mxwavepresenter.cpp  |   0
 LEGO1/{ => omni/src/common}/mxatomid.cpp      |   0
 .../{ => omni/src/common}/mxatomidcounter.cpp |   0
 .../src/common}/mxcompositemediapresenter.cpp |   0
 .../src/common}/mxcompositepresenter.cpp      |   0
 LEGO1/{ => omni/src/common}/mxcore.cpp        |   0
 .../{ => omni/src/common}/mxmediamanager.cpp  |   0
 .../src/common}/mxmediapresenter.cpp          |   0
 .../{ => omni/src/common}/mxobjectfactory.cpp |   0
 LEGO1/{ => omni/src/common}/mxpresenter.cpp   |   0
 LEGO1/{ => omni/src/common}/mxstring.cpp      |   0
 .../{ => omni/src/common}/mxticklemanager.cpp |   0
 LEGO1/{ => omni/src/common}/mxtimer.cpp       |   0
 LEGO1/{ => omni/src/common}/mxvariable.cpp    |   0
 .../{ => omni/src/common}/mxvariabletable.cpp |   0
 .../src/control}/mxcontrolpresenter.cpp       |   0
 LEGO1/{ => omni/src/entity}/mxentity.cpp      |   0
 LEGO1/{ => omni/src/event}/mxeventmanager.cpp |   0
 .../{ => omni/src/event}/mxeventpresenter.cpp |   0
 .../{dllmain.cpp => omni/src/main/mxmain.cpp} |   0
 LEGO1/{ => omni/src/main}/mxomni.cpp          |   0
 .../{ => omni/src/main}/mxomnicreateflags.cpp |   0
 .../{ => omni/src/main}/mxomnicreateparam.cpp |   0
 .../src/notify}/mxactionnotificationparam.cpp |   0
 .../src/notify}/mxnotificationmanager.cpp     |   0
 .../src/notify}/mxnotificationparam.cpp       |   0
 .../src/notify}/mxtype17notificationparam.cpp |   0
 .../src/stream}/mxdiskstreamcontroller.cpp    |   0
 .../src/stream}/mxdiskstreamprovider.cpp      |   0
 LEGO1/{ => omni/src/stream}/mxdsbuffer.cpp    |   0
 LEGO1/{ => omni/src/stream}/mxdschunk.cpp     |   0
 LEGO1/{ => omni/src/stream}/mxdsfile.cpp      |   0
 LEGO1/{ => omni/src/stream}/mxdssource.cpp    |   0
 .../{ => omni/src/stream}/mxdssubscriber.cpp  |   0
 LEGO1/{ => omni/src/stream}/mxioinfo.cpp      |   0
 .../src/stream}/mxramstreamcontroller.cpp     |   0
 .../src/stream}/mxramstreamprovider.cpp       |   0
 LEGO1/{ => omni/src/stream}/mxstreamchunk.cpp |   0
 .../src/stream}/mxstreamcontroller.cpp        |   0
 LEGO1/{ => omni/src/stream}/mxstreamer.cpp    |   0
 LEGO1/{ => omni/src/stream}/mxstreamlist.cpp  |   0
 .../src/stream}/mxstreamprovider.cpp          |   0
 LEGO1/{ => omni/src/system}/mxautolocker.cpp  |   0
 .../src/system}/mxcriticalsection.cpp         |   0
 LEGO1/{ => omni/src/system}/mxscheduler.cpp   |   0
 LEGO1/{ => omni/src/system}/mxsemaphore.cpp   |   0
 LEGO1/{ => omni/src/system}/mxthread.cpp      |   0
 LEGO1/{ => omni/src/video}/mxbitmap.cpp       |   0
 .../{ => omni/src/video}/mxdisplaysurface.cpp |   0
 LEGO1/{ => omni/src/video}/mxflcpresenter.cpp |   0
 .../src/video}/mxloopingflcpresenter.cpp      |   0
 .../src/video}/mxloopingsmkpresenter.cpp      |   0
 LEGO1/{ => omni/src/video}/mxpalette.cpp      |   0
 LEGO1/{ => omni/src/video}/mxregion.cpp       |   0
 LEGO1/{ => omni/src/video}/mxregioncursor.cpp |   0
 LEGO1/{ => omni/src/video}/mxsmack.cpp        |   0
 LEGO1/{ => omni/src/video}/mxsmkpresenter.cpp |   0
 .../{ => omni/src/video}/mxstillpresenter.cpp |   0
 .../src/video}/mxtransitionmanager.cpp        |   0
 LEGO1/{ => omni/src/video}/mxvideomanager.cpp |   0
 LEGO1/{ => omni/src/video}/mxvideoparam.cpp   |   0
 .../src/video}/mxvideoparamflags.cpp          |   0
 .../{ => omni/src/video}/mxvideopresenter.cpp |   0
 LEGO1/realtime/roi.h                          |   4 +-
 LEGO1/res/resource.h                          |  22 +-
 LEGO1/tgl/d3drm/impl.h                        |   2 +-
 LEGO1/viewmanager/viewlodlist.h               |   4 +-
 LEGO1/viewmanager/viewroi.h                   |   4 +-
 tools/isledecomp/.gitignore                   |   3 +-
 447 files changed, 347 insertions(+), 346 deletions(-)
 rename 3rdparty/{smack => smacker}/rad.h (100%)
 rename 3rdparty/{smack => smacker}/smack.h (100%)
 rename 3rdparty/{smack => smacker}/smack.lib (100%)
 rename LEGO1/{ => lego/legoomni/include}/act1state.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/act2brick.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/act2policestation.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/act3.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/act3actor.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/act3shark.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/act3state.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/ambulance.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/ambulancemissionstate.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/animstate.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/beachhouseentity.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/bike.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/buildingentity.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/bumpbouy.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/carrace.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/carracestate.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/doors.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/dunebuggy.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/elevatorbottom.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/extra.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/gasstation.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/gasstationentity.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/gasstationstate.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/gifmanager.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/helicopter.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/helicopterstate.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/historybook.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/hospital.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/hospitalentity.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/hospitalstate.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/infocenter.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/infocenterdoor.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/infocenterentity.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/infocenterstate.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/isle.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/isleactor.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/islepathactor.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/jetski.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/jetskirace.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/jetskiracestate.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/jukebox.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/jukeboxentity.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/jukeboxstate.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/lego3dwavepresenter.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/legoact2.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/legoact2state.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/legoactioncontrolpresenter.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/legoactor.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/legoactorpresenter.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/legoanimactor.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/legoanimationmanager.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/legoanimmmpresenter.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/legoanimpresenter.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/legobackgroundcolor.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/legobuildingmanager.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/legocachesound.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/legocameracontroller.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/legocarbuild.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/legocarbuildanimpresenter.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/legocarraceactor.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/legocontrolmanager.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/legoentity.h (99%)
 rename LEGO1/{ => lego/legoomni/include}/legoentitypresenter.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/legoeventnotificationparam.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/legoextraactor.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/legoflctexturepresenter.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/legofullscreenmovie.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/legogamestate.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/legohideanimpresenter.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/legoinputmanager.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/legojetski.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/legojetskiraceactor.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/legoloadcachesoundpresenter.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/legolocomotionanimpresenter.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/legoloopinganimpresenter.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/legometerpresenter.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/legomodelpresenter.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/legonavcontroller.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/legoobjectfactory.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/legoomni.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/legopalettepresenter.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/legopartpresenter.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/legopathactor.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/legopathboundary.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/legopathcontroller.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/legopathcontrollerlist.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/legopathpresenter.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/legophonemepresenter.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/legoplantmanager.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/legorace.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/legoraceactor.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/legoracecar.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/legosoundmanager.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/legostate.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/legostream.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/legotexturepresenter.h (100%)
 rename LEGO1/{mxunknown100d7c88.h => lego/legoomni/include/legounknown100d7c88.h} (59%)
 create mode 100644 LEGO1/lego/legoomni/include/legounknown100d9d00.h
 rename LEGO1/{ => lego/legoomni/include}/legounksavedatawriter.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/legoutil.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/legovehiclebuildstate.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/legovideomanager.h (52%)
 rename LEGO1/{ => lego/legoomni/include}/legoworld.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/legoworldlist.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/legoworldpresenter.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/motorcycle.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/pizza.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/pizzamissionstate.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/pizzeria.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/pizzeriastate.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/police.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/policeentity.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/policestate.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/racecar.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/racestandsentity.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/racestate.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/radio.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/radiostate.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/registrationbook.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/score.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/scorestate.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/skateboard.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/towtrack.h (100%)
 rename LEGO1/{ => lego/legoomni/include}/towtrackmissionstate.h (100%)
 rename LEGO1/{ => lego/legoomni/src/act1}/act1state.cpp (100%)
 rename LEGO1/{ => lego/legoomni/src/act2}/act2brick.cpp (100%)
 rename LEGO1/{ => lego/legoomni/src/act2}/act2policestation.cpp (100%)
 rename LEGO1/{ => lego/legoomni/src/act2}/legoact2state.cpp (100%)
 rename LEGO1/{ => lego/legoomni/src/act3}/act3.cpp (100%)
 rename LEGO1/{ => lego/legoomni/src/act3}/act3shark.cpp (100%)
 rename LEGO1/{ => lego/legoomni/src/act3}/act3state.cpp (100%)
 rename LEGO1/{ => lego/legoomni/src/audio}/legocachesound.cpp (100%)
 rename LEGO1/{ => lego/legoomni/src/audio}/legoloadcachesoundpresenter.cpp (100%)
 rename LEGO1/{ => lego/legoomni/src/audio}/legosoundmanager.cpp (100%)
 rename LEGO1/{ => lego/legoomni/src/build}/buildingentity.cpp (100%)
 rename LEGO1/{ => lego/legoomni/src/build}/dunebuggy.cpp (100%)
 rename LEGO1/{ => lego/legoomni/src/build}/helicopter.cpp (100%)
 rename LEGO1/{ => lego/legoomni/src/build}/helicopterstate.cpp (100%)
 rename LEGO1/{ => lego/legoomni/src/build}/jetski.cpp (100%)
 rename LEGO1/{ => lego/legoomni/src/build}/legobuildingmanager.cpp (100%)
 rename LEGO1/{ => lego/legoomni/src/build}/legocarbuild.cpp (100%)
 rename LEGO1/{ => lego/legoomni/src/build}/legovehiclebuildstate.cpp (100%)
 rename LEGO1/{ => lego/legoomni/src/build}/racecar.cpp (100%)
 rename LEGO1/{ => lego/legoomni/src/common}/animstate.cpp (100%)
 rename LEGO1/{ => lego/legoomni/src/common}/gifmanager.cpp (100%)
 rename LEGO1/{ => lego/legoomni/src/common}/legoactioncontrolpresenter.cpp (100%)
 rename LEGO1/{ => lego/legoomni/src/common}/legobackgroundcolor.cpp (100%)
 rename LEGO1/{ => lego/legoomni/src/common}/legocameracontroller.cpp (100%)
 rename LEGO1/{ => lego/legoomni/src/common}/legofullscreenmovie.cpp (100%)
 rename LEGO1/{ => lego/legoomni/src/common}/legogamestate.cpp (99%)
 rename LEGO1/{ => lego/legoomni/src/common}/legonavcontroller.cpp (100%)
 rename LEGO1/{ => lego/legoomni/src/common}/legoobjectfactory.cpp (100%)
 rename LEGO1/{ => lego/legoomni/src/common}/legoplantmanager.cpp (100%)
 rename LEGO1/{ => lego/legoomni/src/common}/legostate.cpp (100%)
 rename LEGO1/{ => lego/legoomni/src/common}/legostream.cpp (100%)
 rename LEGO1/{ => lego/legoomni/src/common}/legounksavedatawriter.cpp (100%)
 rename LEGO1/{ => lego/legoomni/src/common}/legoutil.cpp (100%)
 rename LEGO1/{ => lego/legoomni/src/control}/legocontrolmanager.cpp (100%)
 rename LEGO1/{ => lego/legoomni/src/entity}/legoactor.cpp (100%)
 rename LEGO1/{ => lego/legoomni/src/entity}/legoanimactor.cpp (100%)
 rename LEGO1/{ => lego/legoomni/src/entity}/legoentity.cpp (100%)
 rename LEGO1/{ => lego/legoomni/src/entity}/legoentitypresenter.cpp (100%)
 rename LEGO1/{ => lego/legoomni/src/entity}/legojetski.cpp (100%)
 rename LEGO1/{ => lego/legoomni/src/entity}/legopathactor.cpp (100%)
 rename LEGO1/{ => lego/legoomni/src/entity}/legorace.cpp (100%)
 rename LEGO1/{ => lego/legoomni/src/entity}/legoworld.cpp (100%)
 rename LEGO1/{ => lego/legoomni/src/entity}/legoworldpresenter.cpp (100%)
 rename LEGO1/{ => lego/legoomni/src/gasstation}/gasstation.cpp (100%)
 rename LEGO1/{ => lego/legoomni/src/gasstation}/gasstationentity.cpp (100%)
 rename LEGO1/{ => lego/legoomni/src/gasstation}/gasstationstate.cpp (100%)
 rename LEGO1/{ => lego/legoomni/src/hospital}/ambulance.cpp (100%)
 rename LEGO1/{ => lego/legoomni/src/hospital}/ambulancemissionstate.cpp (100%)
 rename LEGO1/{ => lego/legoomni/src/hospital}/hospital.cpp (100%)
 rename LEGO1/{ => lego/legoomni/src/hospital}/hospitalentity.cpp (100%)
 rename LEGO1/{ => lego/legoomni/src/hospital}/hospitalstate.cpp (100%)
 rename LEGO1/{ => lego/legoomni/src/infocenter}/elevatorbottom.cpp (100%)
 rename LEGO1/{ => lego/legoomni/src/infocenter}/infocenter.cpp (100%)
 rename LEGO1/{ => lego/legoomni/src/infocenter}/infocenterdoor.cpp (100%)
 rename LEGO1/{ => lego/legoomni/src/infocenter}/infocenterentity.cpp (100%)
 rename LEGO1/{ => lego/legoomni/src/infocenter}/infocenterstate.cpp (100%)
 rename LEGO1/{ => lego/legoomni/src/infocenter}/registrationbook.cpp (100%)
 rename LEGO1/{ => lego/legoomni/src/infocenter}/score.cpp (100%)
 rename LEGO1/{ => lego/legoomni/src/infocenter}/scorestate.cpp (100%)
 rename LEGO1/{ => lego/legoomni/src/input}/legoinputmanager.cpp (100%)
 rename LEGO1/{ => lego/legoomni/src/isle}/beachhouseentity.cpp (100%)
 rename LEGO1/{ => lego/legoomni/src/isle}/bike.cpp (100%)
 rename LEGO1/{ => lego/legoomni/src/isle}/bumpbouy.cpp (100%)
 rename LEGO1/{ => lego/legoomni/src/isle}/historybook.cpp (100%)
 rename LEGO1/{ => lego/legoomni/src/isle}/isle.cpp (100%)
 rename LEGO1/{ => lego/legoomni/src/isle}/isleactor.cpp (100%)
 rename LEGO1/{ => lego/legoomni/src/isle}/islepathactor.cpp (100%)
 rename LEGO1/{ => lego/legoomni/src/isle}/jukebox.cpp (100%)
 rename LEGO1/{ => lego/legoomni/src/isle}/jukeboxentity.cpp (100%)
 rename LEGO1/{ => lego/legoomni/src/isle}/jukeboxstate.cpp (100%)
 rename LEGO1/{ => lego/legoomni/src/isle}/motorcycle.cpp (100%)
 rename LEGO1/{ => lego/legoomni/src/isle}/radio.cpp (100%)
 rename LEGO1/{ => lego/legoomni/src/isle}/radiostate.cpp (100%)
 rename LEGO1/{ => lego/legoomni/src/isle}/skateboard.cpp (100%)
 rename LEGO1/{ => lego/legoomni/src/main}/legoomni.cpp (100%)
 rename LEGO1/{ => lego/legoomni/src/notify}/legoeventnotificationparam.cpp (100%)
 rename LEGO1/{ => lego/legoomni/src/paths}/legopathcontroller.cpp (100%)
 rename LEGO1/{ => lego/legoomni/src/paths}/legopathpresenter.cpp (100%)
 rename LEGO1/{ => lego/legoomni/src/pizzeria}/pizza.cpp (100%)
 rename LEGO1/{ => lego/legoomni/src/pizzeria}/pizzamissionstate.cpp (100%)
 rename LEGO1/{ => lego/legoomni/src/pizzeria}/pizzeria.cpp (100%)
 rename LEGO1/{ => lego/legoomni/src/pizzeria}/pizzeriastate.cpp (100%)
 rename LEGO1/{ => lego/legoomni/src/police}/police.cpp (100%)
 rename LEGO1/{ => lego/legoomni/src/police}/policeentity.cpp (100%)
 rename LEGO1/{ => lego/legoomni/src/police}/policestate.cpp (100%)
 rename LEGO1/{ => lego/legoomni/src/race}/carrace.cpp (100%)
 rename LEGO1/{ => lego/legoomni/src/race}/jetskirace.cpp (100%)
 rename LEGO1/{ => lego/legoomni/src/race}/racestandsentity.cpp (100%)
 rename LEGO1/{ => lego/legoomni/src/race}/racestate.cpp (100%)
 rename LEGO1/{ => lego/legoomni/src/towtrack}/towtrack.cpp (100%)
 rename LEGO1/{ => lego/legoomni/src/towtrack}/towtrackmissionstate.cpp (100%)
 create mode 100644 LEGO1/lego/legoomni/src/unknown/legounknown100d7c88.cpp
 rename LEGO1/{ => lego/legoomni/src/video}/legoanimationmanager.cpp (100%)
 rename LEGO1/{ => lego/legoomni/src/video}/legoanimmmpresenter.cpp (100%)
 rename LEGO1/{ => lego/legoomni/src/video}/legoanimpresenter.cpp (100%)
 rename LEGO1/{ => lego/legoomni/src/video}/legocarbuildanimpresenter.cpp (100%)
 rename LEGO1/{ => lego/legoomni/src/video}/legoflctexturepresenter.cpp (100%)
 rename LEGO1/{ => lego/legoomni/src/video}/legohideanimpresenter.cpp (100%)
 rename LEGO1/{ => lego/legoomni/src/video}/legolocomotionanimpresenter.cpp (100%)
 rename LEGO1/{ => lego/legoomni/src/video}/legometerpresenter.cpp (100%)
 rename LEGO1/{ => lego/legoomni/src/video}/legomodelpresenter.cpp (100%)
 rename LEGO1/{ => lego/legoomni/src/video}/legopalettepresenter.cpp (100%)
 rename LEGO1/{ => lego/legoomni/src/video}/legopartpresenter.cpp (100%)
 rename LEGO1/{ => lego/legoomni/src/video}/legophonemepresenter.cpp (100%)
 rename LEGO1/{ => lego/legoomni/src/video}/legotexturepresenter.cpp (100%)
 rename LEGO1/{ => lego/legoomni/src/video}/legovideomanager.cpp (99%)
 rename LEGO1/{ => lego/sources}/3dmanager/lego3dmanager.cpp (98%)
 rename LEGO1/{ => lego/sources}/3dmanager/lego3dmanager.h (100%)
 rename LEGO1/{ => lego/sources}/3dmanager/lego3dview.cpp (99%)
 rename LEGO1/{ => lego/sources}/3dmanager/lego3dview.h (100%)
 rename LEGO1/{ => lego/sources}/3dmanager/legoview1.cpp (99%)
 rename LEGO1/{ => lego/sources}/3dmanager/legoview1.h (100%)
 rename LEGO1/{ => lego/sources}/3dmanager/tglsurface.cpp (100%)
 rename LEGO1/{ => lego/sources}/3dmanager/tglsurface.h (97%)
 rename LEGO1/{ => lego/sources/roi}/legoroi.cpp (100%)
 rename LEGO1/{ => lego/sources/roi}/legoroi.h (100%)
 delete mode 100644 LEGO1/mxparam.cpp
 delete mode 100644 LEGO1/mxunknown100d7c88.cpp
 delete mode 100644 LEGO1/mxunknown100d9d00.h
 rename LEGO1/{ => omni/include}/mxactionnotificationparam.h (100%)
 rename LEGO1/{ => omni/include}/mxatomid.h (100%)
 rename LEGO1/{ => omni/include}/mxatomidcounter.h (100%)
 rename LEGO1/{ => omni/include}/mxaudiomanager.h (100%)
 rename LEGO1/{ => omni/include}/mxaudiopresenter.h (100%)
 rename LEGO1/{ => omni/include}/mxautolocker.h (100%)
 rename LEGO1/{ => omni/include}/mxbackgroundaudiomanager.h (100%)
 rename LEGO1/{ => omni/include}/mxbitmap.h (100%)
 rename LEGO1/{ => omni/include}/mxcollection.h (100%)
 rename LEGO1/{ => omni/include}/mxcompositemediapresenter.h (100%)
 rename LEGO1/{ => omni/include}/mxcompositepresenter.h (100%)
 rename LEGO1/{ => omni/include}/mxcontrolpresenter.h (100%)
 rename LEGO1/{ => omni/include}/mxcore.h (100%)
 rename LEGO1/{ => omni/include}/mxcriticalsection.h (100%)
 rename LEGO1/{ => omni/include}/mxdiskstreamcontroller.h (100%)
 rename LEGO1/{ => omni/include}/mxdiskstreamprovider.h (100%)
 rename LEGO1/{ => omni/include}/mxdisplaysurface.h (100%)
 rename LEGO1/{ => omni/include}/mxdsaction.h (100%)
 rename LEGO1/{ => omni/include}/mxdsactionlist.h (100%)
 rename LEGO1/{ => omni/include}/mxdsanim.h (100%)
 rename LEGO1/{ => omni/include}/mxdsbuffer.h (100%)
 rename LEGO1/{ => omni/include}/mxdschunk.h (100%)
 rename LEGO1/{ => omni/include}/mxdsevent.h (100%)
 rename LEGO1/{ => omni/include}/mxdsfile.h (100%)
 rename LEGO1/{ => omni/include}/mxdsmediaaction.h (100%)
 rename LEGO1/{ => omni/include}/mxdsmultiaction.h (100%)
 rename LEGO1/{ => omni/include}/mxdsobject.h (100%)
 rename LEGO1/{ => omni/include}/mxdsobjectaction.h (100%)
 rename LEGO1/{ => omni/include}/mxdsparallelaction.h (100%)
 rename LEGO1/{ => omni/include}/mxdsselectaction.h (100%)
 rename LEGO1/{ => omni/include}/mxdsserialaction.h (100%)
 rename LEGO1/{ => omni/include}/mxdssound.h (100%)
 rename LEGO1/{ => omni/include}/mxdssource.h (100%)
 rename LEGO1/{ => omni/include}/mxdsstill.h (100%)
 rename LEGO1/{ => omni/include}/mxdsstreamingaction.h (100%)
 rename LEGO1/{ => omni/include}/mxdssubscriber.h (100%)
 rename LEGO1/{ => omni/include}/mxdstypes.h (100%)
 mode change 100755 => 100644
 rename LEGO1/{ => omni/include}/mxentity.h (100%)
 rename LEGO1/{ => omni/include}/mxeventmanager.h (100%)
 rename LEGO1/{ => omni/include}/mxeventpresenter.h (100%)
 rename LEGO1/{ => omni/include}/mxflcpresenter.h (100%)
 rename LEGO1/{ => omni/include}/mxhashtable.h (100%)
 rename LEGO1/{ => omni/include}/mxioinfo.h (100%)
 rename LEGO1/{ => omni/include}/mxlist.h (100%)
 rename LEGO1/{ => omni/include}/mxloopingflcpresenter.h (100%)
 rename LEGO1/{ => omni/include}/mxloopingmidipresenter.h (100%)
 rename LEGO1/{ => omni/include}/mxloopingsmkpresenter.h (100%)
 rename LEGO1/{ => omni/include}/mxmediamanager.h (100%)
 rename LEGO1/{ => omni/include}/mxmediapresenter.h (100%)
 rename LEGO1/{ => omni/include}/mxmidipresenter.h (100%)
 rename LEGO1/{ => omni/include}/mxmusicmanager.h (100%)
 rename LEGO1/{ => omni/include}/mxmusicpresenter.h (100%)
 rename LEGO1/{ => omni/include}/mxnextactiondatastart.h (100%)
 rename LEGO1/{ => omni/include}/mxnotificationmanager.h (100%)
 rename LEGO1/{ => omni/include}/mxnotificationparam.h (100%)
 rename LEGO1/{ => omni/include}/mxobjectfactory.h (100%)
 rename LEGO1/{ => omni/include}/mxomni.h (100%)
 rename LEGO1/{ => omni/include}/mxomnicreateflags.h (100%)
 rename LEGO1/{ => omni/include}/mxomnicreateparam.h (100%)
 rename LEGO1/{ => omni/include}/mxpalette.h (100%)
 rename LEGO1/{ => omni/include}/mxparam.h (100%)
 rename LEGO1/{ => omni/include}/mxpoint32.h (100%)
 mode change 100755 => 100644
 rename LEGO1/{ => omni/include}/mxpresenter.h (100%)
 rename LEGO1/{ => omni/include}/mxpresenterlist.h (100%)
 rename LEGO1/{ => omni/include}/mxqueue.h (100%)
 rename LEGO1/{ => omni/include}/mxramstreamcontroller.h (100%)
 rename LEGO1/{ => omni/include}/mxramstreamprovider.h (100%)
 rename LEGO1/{ => omni/include}/mxrect32.h (100%)
 rename LEGO1/{ => omni/include}/mxrectlist.h (100%)
 rename LEGO1/{ => omni/include}/mxregion.h (100%)
 rename LEGO1/{ => omni/include}/mxregioncursor.h (100%)
 rename LEGO1/{ => omni/include}/mxregionlist.h (100%)
 rename LEGO1/{ => omni/include}/mxscheduler.h (100%)
 rename LEGO1/{ => omni/include}/mxsemaphore.h (100%)
 rename LEGO1/{ => omni/include}/mxsize32.h (100%)
 rename LEGO1/{ => omni/include}/mxsmack.h (100%)
 rename LEGO1/{ => omni/include}/mxsmkpresenter.h (100%)
 rename LEGO1/{ => omni/include}/mxsoundmanager.h (100%)
 rename LEGO1/{ => omni/include}/mxsoundpresenter.h (100%)
 rename LEGO1/{ => omni/include}/mxstillpresenter.h (100%)
 rename LEGO1/{ => omni/include}/mxstreamchunk.h (100%)
 rename LEGO1/{ => omni/include}/mxstreamchunklist.h (100%)
 rename LEGO1/{ => omni/include}/mxstreamcontroller.h (100%)
 rename LEGO1/{ => omni/include}/mxstreamer.h (100%)
 rename LEGO1/{ => omni/include}/mxstreamlist.h (100%)
 rename LEGO1/{ => omni/include}/mxstreamprovider.h (100%)
 rename LEGO1/{ => omni/include}/mxstring.h (100%)
 rename LEGO1/{ => omni/include}/mxstringlist.h (100%)
 rename LEGO1/{ => omni/include}/mxthread.h (100%)
 rename LEGO1/{ => omni/include}/mxticklemanager.h (100%)
 rename LEGO1/{ => omni/include}/mxtimer.h (100%)
 rename LEGO1/{ => omni/include}/mxtransitionmanager.h (100%)
 rename LEGO1/{ => omni/include}/mxtype17notificationparam.h (100%)
 rename LEGO1/{ => omni/include}/mxtype18notificationparam.h (100%)
 rename LEGO1/{ => omni/include}/mxtype19notificationparam.h (100%)
 rename LEGO1/{ => omni/include}/mxtypes.h (100%)
 rename LEGO1/{ => omni/include}/mxvariable.h (100%)
 rename LEGO1/{ => omni/include}/mxvariabletable.h (100%)
 rename LEGO1/{ => omni/include}/mxvideomanager.h (100%)
 rename LEGO1/{ => omni/include}/mxvideoparam.h (100%)
 rename LEGO1/{ => omni/include}/mxvideoparamflags.h (100%)
 rename LEGO1/{ => omni/include}/mxvideopresenter.h (100%)
 rename LEGO1/{ => omni/include}/mxwavepresenter.h (100%)
 rename LEGO1/{ => omni/src/action}/mxdsaction.cpp (100%)
 rename LEGO1/{ => omni/src/action}/mxdsanim.cpp (100%)
 rename LEGO1/{ => omni/src/action}/mxdsevent.cpp (100%)
 rename LEGO1/{ => omni/src/action}/mxdsmediaaction.cpp (100%)
 rename LEGO1/{ => omni/src/action}/mxdsmultiaction.cpp (100%)
 rename LEGO1/{ => omni/src/action}/mxdsobject.cpp (100%)
 rename LEGO1/{ => omni/src/action}/mxdsobjectaction.cpp (100%)
 rename LEGO1/{ => omni/src/action}/mxdsparallelaction.cpp (100%)
 rename LEGO1/{ => omni/src/action}/mxdsselectaction.cpp (100%)
 rename LEGO1/{ => omni/src/action}/mxdsserialaction.cpp (100%)
 rename LEGO1/{ => omni/src/action}/mxdssound.cpp (100%)
 rename LEGO1/{ => omni/src/action}/mxdsstill.cpp (100%)
 rename LEGO1/{ => omni/src/action}/mxdsstreamingaction.cpp (100%)
 rename LEGO1/{ => omni/src/audio}/mxaudiomanager.cpp (100%)
 rename LEGO1/{ => omni/src/audio}/mxaudiopresenter.cpp (100%)
 rename LEGO1/{ => omni/src/audio}/mxbackgroundaudiomanager.cpp (100%)
 rename LEGO1/{ => omni/src/audio}/mxloopingmidipresenter.cpp (100%)
 rename LEGO1/{ => omni/src/audio}/mxmidipresenter.cpp (100%)
 rename LEGO1/{ => omni/src/audio}/mxmusicmanager.cpp (100%)
 rename LEGO1/{ => omni/src/audio}/mxmusicpresenter.cpp (100%)
 rename LEGO1/{ => omni/src/audio}/mxsoundmanager.cpp (100%)
 rename LEGO1/{ => omni/src/audio}/mxsoundpresenter.cpp (100%)
 rename LEGO1/{ => omni/src/audio}/mxwavepresenter.cpp (100%)
 rename LEGO1/{ => omni/src/common}/mxatomid.cpp (100%)
 rename LEGO1/{ => omni/src/common}/mxatomidcounter.cpp (100%)
 rename LEGO1/{ => omni/src/common}/mxcompositemediapresenter.cpp (100%)
 rename LEGO1/{ => omni/src/common}/mxcompositepresenter.cpp (100%)
 rename LEGO1/{ => omni/src/common}/mxcore.cpp (100%)
 rename LEGO1/{ => omni/src/common}/mxmediamanager.cpp (100%)
 rename LEGO1/{ => omni/src/common}/mxmediapresenter.cpp (100%)
 rename LEGO1/{ => omni/src/common}/mxobjectfactory.cpp (100%)
 rename LEGO1/{ => omni/src/common}/mxpresenter.cpp (100%)
 rename LEGO1/{ => omni/src/common}/mxstring.cpp (100%)
 rename LEGO1/{ => omni/src/common}/mxticklemanager.cpp (100%)
 rename LEGO1/{ => omni/src/common}/mxtimer.cpp (100%)
 rename LEGO1/{ => omni/src/common}/mxvariable.cpp (100%)
 rename LEGO1/{ => omni/src/common}/mxvariabletable.cpp (100%)
 rename LEGO1/{ => omni/src/control}/mxcontrolpresenter.cpp (100%)
 rename LEGO1/{ => omni/src/entity}/mxentity.cpp (100%)
 rename LEGO1/{ => omni/src/event}/mxeventmanager.cpp (100%)
 rename LEGO1/{ => omni/src/event}/mxeventpresenter.cpp (100%)
 rename LEGO1/{dllmain.cpp => omni/src/main/mxmain.cpp} (100%)
 rename LEGO1/{ => omni/src/main}/mxomni.cpp (100%)
 rename LEGO1/{ => omni/src/main}/mxomnicreateflags.cpp (100%)
 rename LEGO1/{ => omni/src/main}/mxomnicreateparam.cpp (100%)
 rename LEGO1/{ => omni/src/notify}/mxactionnotificationparam.cpp (100%)
 rename LEGO1/{ => omni/src/notify}/mxnotificationmanager.cpp (100%)
 rename LEGO1/{ => omni/src/notify}/mxnotificationparam.cpp (100%)
 rename LEGO1/{ => omni/src/notify}/mxtype17notificationparam.cpp (100%)
 rename LEGO1/{ => omni/src/stream}/mxdiskstreamcontroller.cpp (100%)
 rename LEGO1/{ => omni/src/stream}/mxdiskstreamprovider.cpp (100%)
 rename LEGO1/{ => omni/src/stream}/mxdsbuffer.cpp (100%)
 rename LEGO1/{ => omni/src/stream}/mxdschunk.cpp (100%)
 rename LEGO1/{ => omni/src/stream}/mxdsfile.cpp (100%)
 rename LEGO1/{ => omni/src/stream}/mxdssource.cpp (100%)
 rename LEGO1/{ => omni/src/stream}/mxdssubscriber.cpp (100%)
 rename LEGO1/{ => omni/src/stream}/mxioinfo.cpp (100%)
 rename LEGO1/{ => omni/src/stream}/mxramstreamcontroller.cpp (100%)
 rename LEGO1/{ => omni/src/stream}/mxramstreamprovider.cpp (100%)
 rename LEGO1/{ => omni/src/stream}/mxstreamchunk.cpp (100%)
 rename LEGO1/{ => omni/src/stream}/mxstreamcontroller.cpp (100%)
 rename LEGO1/{ => omni/src/stream}/mxstreamer.cpp (100%)
 rename LEGO1/{ => omni/src/stream}/mxstreamlist.cpp (100%)
 rename LEGO1/{ => omni/src/stream}/mxstreamprovider.cpp (100%)
 rename LEGO1/{ => omni/src/system}/mxautolocker.cpp (100%)
 rename LEGO1/{ => omni/src/system}/mxcriticalsection.cpp (100%)
 rename LEGO1/{ => omni/src/system}/mxscheduler.cpp (100%)
 rename LEGO1/{ => omni/src/system}/mxsemaphore.cpp (100%)
 rename LEGO1/{ => omni/src/system}/mxthread.cpp (100%)
 rename LEGO1/{ => omni/src/video}/mxbitmap.cpp (100%)
 rename LEGO1/{ => omni/src/video}/mxdisplaysurface.cpp (100%)
 rename LEGO1/{ => omni/src/video}/mxflcpresenter.cpp (100%)
 rename LEGO1/{ => omni/src/video}/mxloopingflcpresenter.cpp (100%)
 rename LEGO1/{ => omni/src/video}/mxloopingsmkpresenter.cpp (100%)
 rename LEGO1/{ => omni/src/video}/mxpalette.cpp (100%)
 rename LEGO1/{ => omni/src/video}/mxregion.cpp (100%)
 rename LEGO1/{ => omni/src/video}/mxregioncursor.cpp (100%)
 rename LEGO1/{ => omni/src/video}/mxsmack.cpp (100%)
 rename LEGO1/{ => omni/src/video}/mxsmkpresenter.cpp (100%)
 rename LEGO1/{ => omni/src/video}/mxstillpresenter.cpp (100%)
 rename LEGO1/{ => omni/src/video}/mxtransitionmanager.cpp (100%)
 rename LEGO1/{ => omni/src/video}/mxvideomanager.cpp (100%)
 rename LEGO1/{ => omni/src/video}/mxvideoparam.cpp (100%)
 rename LEGO1/{ => omni/src/video}/mxvideoparamflags.cpp (100%)
 rename LEGO1/{ => omni/src/video}/mxvideopresenter.cpp (100%)

diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml
index aaa41235..07b646fb 100644
--- a/.github/workflows/format.yml
+++ b/.github/workflows/format.yml
@@ -11,19 +11,12 @@ jobs:
 
     - name: Run clang-format
       run: |
+        find LEGO1 ISLE -iname '*.h' -o -iname '*.cpp' | xargs \
         pipx run "clang-format>=17,<18" \
           --Werror \
           --dry-run \
           --style=file \
-          ISLE/*.cpp ISLE/*.h \
-          LEGO1/*.cpp LEGO1/*.h \
-          LEGO1/3dmanager/*.cpp LEGO1/3dmanager/*.h \
-          LEGO1/mxdirectx/*.cpp LEGO1/mxdirectx/*.h \
-          LEGO1/mxstl/*.h \
-          LEGO1/realtime/*.cpp LEGO1/realtime/*.h \
-          LEGO1/tgl/*.h \
-          LEGO1/tgl/d3drm/*.cpp LEGO1/tgl/d3drm/*.h \
-          LEGO1/viewmanager/*.cpp LEGO1/viewmanager/*.h
+          -i
 
   python-format:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/naming.yml b/.github/workflows/naming.yml
index c870d7dd..163354d5 100644
--- a/.github/workflows/naming.yml
+++ b/.github/workflows/naming.yml
@@ -22,8 +22,14 @@ jobs:
       run: |
         python3 tools/ncc/ncc.py \
           --clang-lib ${{ env.LLVM_PATH }}/lib/libclang.so \
+          --recurse \
           --style tools/ncc/ncc.style \
           --skip tools/ncc/skip.yml \
           --definition WINAPI FAR BOOL CALLBACK HWND__=HWND \
-          --include util \
-          --path LEGO1
+          --include \
+            util \
+            LEGO1 \
+            LEGO1/omni/include \
+            LEGO1/lego/legoomni/include \
+            LEGO1/lego/sources \
+          --path LEGO1/omni LEGO1/lego/legoomni
diff --git a/.gitignore b/.gitignore
index 72d6fef6..7e16a6ce 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,7 +14,7 @@ env.bak/
 venv.bak/
 ISLE.EXE
 LEGO1.DLL
-build/
+/build/
 *.swp
 LEGO1PROGRESS.*
 ISLEPROGRESS.*
diff --git a/3rdparty/smack/rad.h b/3rdparty/smacker/rad.h
similarity index 100%
rename from 3rdparty/smack/rad.h
rename to 3rdparty/smacker/rad.h
diff --git a/3rdparty/smack/smack.h b/3rdparty/smacker/smack.h
similarity index 100%
rename from 3rdparty/smack/smack.h
rename to 3rdparty/smacker/smack.h
diff --git a/3rdparty/smack/smack.lib b/3rdparty/smacker/smack.lib
similarity index 100%
rename from 3rdparty/smack/smack.lib
rename to 3rdparty/smacker/smack.lib
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f0e3eae5..10f30c5b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,212 +7,210 @@ option(ISLE_USE_SMARTHEAP "Build with SmartHeap" ${MSVC})
 option(ISLE_USE_DX5 "Build with internal DirectX 5 SDK" ON)
 
 add_library(lego1 SHARED
-  LEGO1/3dmanager/lego3dmanager.cpp
-  LEGO1/3dmanager/lego3dview.cpp
-  LEGO1/3dmanager/legoview1.cpp
-  LEGO1/3dmanager/tglsurface.cpp
-  LEGO1/act1state.cpp
-  LEGO1/act2brick.cpp
-  LEGO1/act2policestation.cpp
-  LEGO1/act3.cpp
-  LEGO1/act3shark.cpp
-  LEGO1/act3state.cpp
-  LEGO1/ambulance.cpp
-  LEGO1/ambulancemissionstate.cpp
-  LEGO1/animstate.cpp
-  LEGO1/beachhouseentity.cpp
-  LEGO1/bike.cpp
-  LEGO1/buildingentity.cpp
-  LEGO1/bumpbouy.cpp
-  LEGO1/carrace.cpp
   LEGO1/define.cpp
-  LEGO1/dllmain.cpp
-  LEGO1/dunebuggy.cpp
-  LEGO1/elevatorbottom.cpp
-  LEGO1/gasstation.cpp
-  LEGO1/gasstationentity.cpp
-  LEGO1/gasstationstate.cpp
-  LEGO1/gifmanager.cpp
-  LEGO1/helicopter.cpp
-  LEGO1/helicopterstate.cpp
-  LEGO1/historybook.cpp
-  LEGO1/hospital.cpp
-  LEGO1/hospitalentity.cpp
-  LEGO1/hospitalstate.cpp
-  LEGO1/infocenter.cpp
-  LEGO1/infocenterdoor.cpp
-  LEGO1/infocenterentity.cpp
-  LEGO1/infocenterstate.cpp
-  LEGO1/isle.cpp
-  LEGO1/isleactor.cpp
-  LEGO1/islepathactor.cpp
-  LEGO1/jetski.cpp
-  LEGO1/jetskirace.cpp
-  LEGO1/jukebox.cpp
-  LEGO1/jukeboxentity.cpp
-  LEGO1/jukeboxstate.cpp
-  LEGO1/legoact2state.cpp
-  LEGO1/legoactioncontrolpresenter.cpp
-  LEGO1/legoactor.cpp
-  LEGO1/legoactor.cpp
-  LEGO1/legoanimactor.cpp
-  LEGO1/legoanimationmanager.cpp
-  LEGO1/legoanimmmpresenter.cpp
-  LEGO1/legoanimpresenter.cpp
-  LEGO1/legobackgroundcolor.cpp
-  LEGO1/legobackgroundcolor.cpp
-  LEGO1/legobuildingmanager.cpp
-  LEGO1/legocachesound.cpp
-  LEGO1/legocameracontroller.cpp
-  LEGO1/legocarbuild.cpp
-  LEGO1/legocarbuildanimpresenter.cpp
-  LEGO1/legocontrolmanager.cpp
-  LEGO1/legoentity.cpp
-  LEGO1/legoentitypresenter.cpp
-  LEGO1/legoeventnotificationparam.cpp
-  LEGO1/legoflctexturepresenter.cpp
-  LEGO1/legofullscreenmovie.cpp
-  LEGO1/legogamestate.cpp
-  LEGO1/legohideanimpresenter.cpp
-  LEGO1/legoinputmanager.cpp
-  LEGO1/legojetski.cpp
-  LEGO1/legoloadcachesoundpresenter.cpp
-  LEGO1/legolocomotionanimpresenter.cpp
-  LEGO1/legometerpresenter.cpp
-  LEGO1/legomodelpresenter.cpp
-  LEGO1/legonavcontroller.cpp
-  LEGO1/legoobjectfactory.cpp
-  LEGO1/legoomni.cpp
-  LEGO1/legopalettepresenter.cpp
-  LEGO1/legopartpresenter.cpp
-  LEGO1/legopathactor.cpp
-  LEGO1/legopathcontroller.cpp
-  LEGO1/legopathpresenter.cpp
-  LEGO1/legophonemepresenter.cpp
-  LEGO1/legoplantmanager.cpp
-  LEGO1/legorace.cpp
-  LEGO1/legoroi.cpp
-  LEGO1/legosoundmanager.cpp
-  LEGO1/legostate.cpp
-  LEGO1/legostream.cpp
-  LEGO1/legotexturepresenter.cpp
-  LEGO1/legoutil.cpp
-  LEGO1/legounksavedatawriter.cpp
-  LEGO1/legovehiclebuildstate.cpp
-  LEGO1/legovideomanager.cpp
-  LEGO1/legoworld.cpp
-  LEGO1/legoworldpresenter.cpp
-  LEGO1/motorcycle.cpp
-  LEGO1/mxactionnotificationparam.cpp
-  LEGO1/mxatomid.cpp
-  LEGO1/mxatomidcounter.cpp
-  LEGO1/mxaudiomanager.cpp
-  LEGO1/mxaudiopresenter.cpp
-  LEGO1/mxautolocker.cpp
-  LEGO1/mxbackgroundaudiomanager.cpp
-  LEGO1/mxbitmap.cpp
-  LEGO1/mxcompositemediapresenter.cpp
-  LEGO1/mxcompositepresenter.cpp
-  LEGO1/mxcontrolpresenter.cpp
-  LEGO1/mxcore.cpp
-  LEGO1/mxcriticalsection.cpp
+  LEGO1/lego/legoomni/src/act1/act1state.cpp
+  LEGO1/lego/legoomni/src/act2/act2brick.cpp
+  LEGO1/lego/legoomni/src/act2/act2policestation.cpp
+  LEGO1/lego/legoomni/src/act2/legoact2state.cpp
+  LEGO1/lego/legoomni/src/act3/act3.cpp
+  LEGO1/lego/legoomni/src/act3/act3shark.cpp
+  LEGO1/lego/legoomni/src/act3/act3state.cpp
+  LEGO1/lego/legoomni/src/audio/legocachesound.cpp
+  LEGO1/lego/legoomni/src/audio/legoloadcachesoundpresenter.cpp
+  LEGO1/lego/legoomni/src/audio/legosoundmanager.cpp
+  LEGO1/lego/legoomni/src/build/buildingentity.cpp
+  LEGO1/lego/legoomni/src/build/dunebuggy.cpp
+  LEGO1/lego/legoomni/src/build/helicopter.cpp
+  LEGO1/lego/legoomni/src/build/helicopterstate.cpp
+  LEGO1/lego/legoomni/src/build/jetski.cpp
+  LEGO1/lego/legoomni/src/build/legobuildingmanager.cpp
+  LEGO1/lego/legoomni/src/build/legocarbuild.cpp
+  LEGO1/lego/legoomni/src/build/legovehiclebuildstate.cpp
+  LEGO1/lego/legoomni/src/build/racecar.cpp
+  LEGO1/lego/legoomni/src/common/animstate.cpp
+  LEGO1/lego/legoomni/src/common/gifmanager.cpp
+  LEGO1/lego/legoomni/src/common/legoactioncontrolpresenter.cpp
+  LEGO1/lego/legoomni/src/common/legobackgroundcolor.cpp
+  LEGO1/lego/legoomni/src/common/legocameracontroller.cpp
+  LEGO1/lego/legoomni/src/common/legofullscreenmovie.cpp
+  LEGO1/lego/legoomni/src/common/legogamestate.cpp
+  LEGO1/lego/legoomni/src/common/legonavcontroller.cpp
+  LEGO1/lego/legoomni/src/common/legoobjectfactory.cpp
+  LEGO1/lego/legoomni/src/common/legoplantmanager.cpp
+  LEGO1/lego/legoomni/src/common/legostate.cpp
+  LEGO1/lego/legoomni/src/common/legostream.cpp
+  LEGO1/lego/legoomni/src/common/legounksavedatawriter.cpp
+  LEGO1/lego/legoomni/src/common/legoutil.cpp
+  LEGO1/lego/legoomni/src/control/legocontrolmanager.cpp
+  LEGO1/lego/legoomni/src/entity/legoactor.cpp
+  LEGO1/lego/legoomni/src/entity/legoanimactor.cpp
+  LEGO1/lego/legoomni/src/entity/legoentity.cpp
+  LEGO1/lego/legoomni/src/entity/legoentitypresenter.cpp
+  LEGO1/lego/legoomni/src/entity/legojetski.cpp
+  LEGO1/lego/legoomni/src/entity/legopathactor.cpp
+  LEGO1/lego/legoomni/src/entity/legorace.cpp
+  LEGO1/lego/legoomni/src/entity/legoworld.cpp
+  LEGO1/lego/legoomni/src/entity/legoworldpresenter.cpp
+  LEGO1/lego/legoomni/src/gasstation/gasstation.cpp
+  LEGO1/lego/legoomni/src/gasstation/gasstationentity.cpp
+  LEGO1/lego/legoomni/src/gasstation/gasstationstate.cpp
+  LEGO1/lego/legoomni/src/hospital/ambulance.cpp
+  LEGO1/lego/legoomni/src/hospital/ambulancemissionstate.cpp
+  LEGO1/lego/legoomni/src/hospital/hospital.cpp
+  LEGO1/lego/legoomni/src/hospital/hospitalentity.cpp
+  LEGO1/lego/legoomni/src/hospital/hospitalstate.cpp
+  LEGO1/lego/legoomni/src/infocenter/elevatorbottom.cpp
+  LEGO1/lego/legoomni/src/infocenter/infocenter.cpp
+  LEGO1/lego/legoomni/src/infocenter/infocenterdoor.cpp
+  LEGO1/lego/legoomni/src/infocenter/infocenterentity.cpp
+  LEGO1/lego/legoomni/src/infocenter/infocenterstate.cpp
+  LEGO1/lego/legoomni/src/infocenter/registrationbook.cpp
+  LEGO1/lego/legoomni/src/infocenter/score.cpp
+  LEGO1/lego/legoomni/src/infocenter/scorestate.cpp
+  LEGO1/lego/legoomni/src/input/legoinputmanager.cpp
+  LEGO1/lego/legoomni/src/isle/beachhouseentity.cpp
+  LEGO1/lego/legoomni/src/isle/bike.cpp
+  LEGO1/lego/legoomni/src/isle/bumpbouy.cpp
+  LEGO1/lego/legoomni/src/isle/historybook.cpp
+  LEGO1/lego/legoomni/src/isle/isleactor.cpp
+  LEGO1/lego/legoomni/src/isle/isle.cpp
+  LEGO1/lego/legoomni/src/isle/islepathactor.cpp
+  LEGO1/lego/legoomni/src/isle/jukebox.cpp
+  LEGO1/lego/legoomni/src/isle/jukeboxentity.cpp
+  LEGO1/lego/legoomni/src/isle/jukeboxstate.cpp
+  LEGO1/lego/legoomni/src/isle/motorcycle.cpp
+  LEGO1/lego/legoomni/src/isle/radio.cpp
+  LEGO1/lego/legoomni/src/isle/radiostate.cpp
+  LEGO1/lego/legoomni/src/isle/skateboard.cpp
+  LEGO1/lego/legoomni/src/main/legoomni.cpp
+  LEGO1/lego/legoomni/src/notify/legoeventnotificationparam.cpp
+  LEGO1/lego/legoomni/src/paths/legopathcontroller.cpp
+  LEGO1/lego/legoomni/src/paths/legopathpresenter.cpp
+  LEGO1/lego/legoomni/src/pizzeria/pizza.cpp
+  LEGO1/lego/legoomni/src/pizzeria/pizzamissionstate.cpp
+  LEGO1/lego/legoomni/src/pizzeria/pizzeria.cpp
+  LEGO1/lego/legoomni/src/pizzeria/pizzeriastate.cpp
+  LEGO1/lego/legoomni/src/police/police.cpp
+  LEGO1/lego/legoomni/src/police/policeentity.cpp
+  LEGO1/lego/legoomni/src/police/policestate.cpp
+  LEGO1/lego/legoomni/src/race/carrace.cpp
+  LEGO1/lego/legoomni/src/race/jetskirace.cpp
+  LEGO1/lego/legoomni/src/race/racestandsentity.cpp
+  LEGO1/lego/legoomni/src/race/racestate.cpp
+  LEGO1/lego/legoomni/src/towtrack/towtrack.cpp
+  LEGO1/lego/legoomni/src/towtrack/towtrackmissionstate.cpp
+  LEGO1/lego/legoomni/src/unknown/legounknown100d7c88.cpp
+  LEGO1/lego/legoomni/src/video/legoanimationmanager.cpp
+  LEGO1/lego/legoomni/src/video/legoanimmmpresenter.cpp
+  LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp
+  LEGO1/lego/legoomni/src/video/legocarbuildanimpresenter.cpp
+  LEGO1/lego/legoomni/src/video/legoflctexturepresenter.cpp
+  LEGO1/lego/legoomni/src/video/legohideanimpresenter.cpp
+  LEGO1/lego/legoomni/src/video/legolocomotionanimpresenter.cpp
+  LEGO1/lego/legoomni/src/video/legometerpresenter.cpp
+  LEGO1/lego/legoomni/src/video/legomodelpresenter.cpp
+  LEGO1/lego/legoomni/src/video/legopalettepresenter.cpp
+  LEGO1/lego/legoomni/src/video/legopartpresenter.cpp
+  LEGO1/lego/legoomni/src/video/legophonemepresenter.cpp
+  LEGO1/lego/legoomni/src/video/legotexturepresenter.cpp
+  LEGO1/lego/legoomni/src/video/legovideomanager.cpp
+  LEGO1/lego/sources/3dmanager/lego3dmanager.cpp
+  LEGO1/lego/sources/3dmanager/lego3dview.cpp
+  LEGO1/lego/sources/3dmanager/legoview1.cpp
+  LEGO1/lego/sources/3dmanager/tglsurface.cpp
+  LEGO1/lego/sources/roi/legoroi.cpp
   LEGO1/mxdirectx/mxdirect3d.cpp
   LEGO1/mxdirectx/mxdirectdraw.cpp
-  LEGO1/mxdiskstreamcontroller.cpp
-  LEGO1/mxdiskstreamprovider.cpp
-  LEGO1/mxdisplaysurface.cpp
-  LEGO1/mxdsaction.cpp
-  LEGO1/mxdsanim.cpp
-  LEGO1/mxdsbuffer.cpp
-  LEGO1/mxdschunk.cpp
-  LEGO1/mxdsevent.cpp
-  LEGO1/mxdsfile.cpp
-  LEGO1/mxdsmediaaction.cpp
-  LEGO1/mxdsmultiaction.cpp
-  LEGO1/mxdsobject.cpp
-  LEGO1/mxdsobjectaction.cpp
-  LEGO1/mxdsparallelaction.cpp
-  LEGO1/mxdsselectaction.cpp
-  LEGO1/mxdsserialaction.cpp
-  LEGO1/mxdssound.cpp
-  LEGO1/mxdssource.cpp
-  LEGO1/mxdsstill.cpp
-  LEGO1/mxdsstreamingaction.cpp
-  LEGO1/mxdssubscriber.cpp
-  LEGO1/mxentity.cpp
-  LEGO1/mxeventmanager.cpp
-  LEGO1/mxeventpresenter.cpp
-  LEGO1/mxflcpresenter.cpp
-  LEGO1/mxioinfo.cpp
-  LEGO1/mxloopingflcpresenter.cpp
-  LEGO1/mxloopingmidipresenter.cpp
-  LEGO1/mxloopingsmkpresenter.cpp
-  LEGO1/mxmediamanager.cpp
-  LEGO1/mxmediapresenter.cpp
-  LEGO1/mxmidipresenter.cpp
-  LEGO1/mxmusicmanager.cpp
-  LEGO1/mxmusicpresenter.cpp
-  LEGO1/mxnotificationmanager.cpp
-  LEGO1/mxnotificationparam.cpp
-  LEGO1/mxobjectfactory.cpp
-  LEGO1/mxomni.cpp
-  LEGO1/mxomnicreateflags.cpp
-  LEGO1/mxomnicreateparam.cpp
-  LEGO1/mxpalette.cpp
-  LEGO1/mxparam.cpp
-  LEGO1/mxpresenter.cpp
-  LEGO1/mxramstreamcontroller.cpp
-  LEGO1/mxramstreamprovider.cpp
-  LEGO1/mxregion.cpp
-  LEGO1/mxregioncursor.cpp
-  LEGO1/mxscheduler.cpp
-  LEGO1/mxsemaphore.cpp
-  LEGO1/mxsmack.cpp
-  LEGO1/mxsmkpresenter.cpp
-  LEGO1/mxsoundmanager.cpp
-  LEGO1/mxsoundpresenter.cpp
-  LEGO1/mxstillpresenter.cpp
-  LEGO1/mxstreamchunk.cpp
-  LEGO1/mxstreamcontroller.cpp
-  LEGO1/mxstreamer.cpp
-  LEGO1/mxstreamlist.cpp
-  LEGO1/mxstreamprovider.cpp
-  LEGO1/mxstring.cpp
-  LEGO1/mxthread.cpp
-  LEGO1/mxticklemanager.cpp
-  LEGO1/mxtimer.cpp
-  LEGO1/mxtransitionmanager.cpp
-  LEGO1/mxtype17notificationparam.cpp
-  LEGO1/mxunknown100d7c88.cpp
-  LEGO1/mxvariable.cpp
-  LEGO1/mxvariabletable.cpp
-  LEGO1/mxvideomanager.cpp
-  LEGO1/mxvideoparam.cpp
-  LEGO1/mxvideoparamflags.cpp
-  LEGO1/mxvideopresenter.cpp
-  LEGO1/mxwavepresenter.cpp
-  LEGO1/pizza.cpp
-  LEGO1/pizzamissionstate.cpp
-  LEGO1/pizzeria.cpp
-  LEGO1/pizzeriastate.cpp
-  LEGO1/police.cpp
-  LEGO1/policeentity.cpp
-  LEGO1/policestate.cpp
-  LEGO1/racecar.cpp
-  LEGO1/racestandsentity.cpp
-  LEGO1/racestate.cpp
-  LEGO1/radio.cpp
-  LEGO1/radiostate.cpp
+  LEGO1/omni/src/action/mxdsaction.cpp
+  LEGO1/omni/src/action/mxdsanim.cpp
+  LEGO1/omni/src/action/mxdsevent.cpp
+  LEGO1/omni/src/action/mxdsmediaaction.cpp
+  LEGO1/omni/src/action/mxdsmultiaction.cpp
+  LEGO1/omni/src/action/mxdsobjectaction.cpp
+  LEGO1/omni/src/action/mxdsobject.cpp
+  LEGO1/omni/src/action/mxdsparallelaction.cpp
+  LEGO1/omni/src/action/mxdsselectaction.cpp
+  LEGO1/omni/src/action/mxdsserialaction.cpp
+  LEGO1/omni/src/action/mxdssound.cpp
+  LEGO1/omni/src/action/mxdsstill.cpp
+  LEGO1/omni/src/action/mxdsstreamingaction.cpp
+  LEGO1/omni/src/audio/mxaudiomanager.cpp
+  LEGO1/omni/src/audio/mxaudiopresenter.cpp
+  LEGO1/omni/src/audio/mxbackgroundaudiomanager.cpp
+  LEGO1/omni/src/audio/mxloopingmidipresenter.cpp
+  LEGO1/omni/src/audio/mxmidipresenter.cpp
+  LEGO1/omni/src/audio/mxmusicmanager.cpp
+  LEGO1/omni/src/audio/mxmusicpresenter.cpp
+  LEGO1/omni/src/audio/mxsoundmanager.cpp
+  LEGO1/omni/src/audio/mxsoundpresenter.cpp
+  LEGO1/omni/src/audio/mxwavepresenter.cpp
+  LEGO1/omni/src/common/mxatomidcounter.cpp
+  LEGO1/omni/src/common/mxatomid.cpp
+  LEGO1/omni/src/common/mxcompositemediapresenter.cpp
+  LEGO1/omni/src/common/mxcompositepresenter.cpp
+  LEGO1/omni/src/common/mxcore.cpp
+  LEGO1/omni/src/common/mxmediamanager.cpp
+  LEGO1/omni/src/common/mxmediapresenter.cpp
+  LEGO1/omni/src/common/mxobjectfactory.cpp
+  LEGO1/omni/src/common/mxpresenter.cpp
+  LEGO1/omni/src/common/mxstring.cpp
+  LEGO1/omni/src/common/mxticklemanager.cpp
+  LEGO1/omni/src/common/mxtimer.cpp
+  LEGO1/omni/src/common/mxvariable.cpp
+  LEGO1/omni/src/common/mxvariabletable.cpp
+  LEGO1/omni/src/control/mxcontrolpresenter.cpp
+  LEGO1/omni/src/entity/mxentity.cpp
+  LEGO1/omni/src/event/mxeventmanager.cpp
+  LEGO1/omni/src/event/mxeventpresenter.cpp
+  LEGO1/omni/src/main/mxmain.cpp
+  LEGO1/omni/src/main/mxomni.cpp
+  LEGO1/omni/src/main/mxomnicreateflags.cpp
+  LEGO1/omni/src/main/mxomnicreateparam.cpp
+  LEGO1/omni/src/notify/mxactionnotificationparam.cpp
+  LEGO1/omni/src/notify/mxnotificationmanager.cpp
+  LEGO1/omni/src/notify/mxnotificationparam.cpp
+  LEGO1/omni/src/notify/mxtype17notificationparam.cpp
+  LEGO1/omni/src/stream/mxdiskstreamcontroller.cpp
+  LEGO1/omni/src/stream/mxdiskstreamprovider.cpp
+  LEGO1/omni/src/stream/mxdsbuffer.cpp
+  LEGO1/omni/src/stream/mxdschunk.cpp
+  LEGO1/omni/src/stream/mxdsfile.cpp
+  LEGO1/omni/src/stream/mxdssource.cpp
+  LEGO1/omni/src/stream/mxdssubscriber.cpp
+  LEGO1/omni/src/stream/mxioinfo.cpp
+  LEGO1/omni/src/stream/mxramstreamcontroller.cpp
+  LEGO1/omni/src/stream/mxramstreamprovider.cpp
+  LEGO1/omni/src/stream/mxstreamchunk.cpp
+  LEGO1/omni/src/stream/mxstreamcontroller.cpp
+  LEGO1/omni/src/stream/mxstreamer.cpp
+  LEGO1/omni/src/stream/mxstreamlist.cpp
+  LEGO1/omni/src/stream/mxstreamprovider.cpp
+  LEGO1/omni/src/system/mxautolocker.cpp
+  LEGO1/omni/src/system/mxcriticalsection.cpp
+  LEGO1/omni/src/system/mxscheduler.cpp
+  LEGO1/omni/src/system/mxsemaphore.cpp
+  LEGO1/omni/src/system/mxthread.cpp
+  LEGO1/omni/src/video/mxbitmap.cpp
+  LEGO1/omni/src/video/mxdisplaysurface.cpp
+  LEGO1/omni/src/video/mxflcpresenter.cpp
+  LEGO1/omni/src/video/mxloopingflcpresenter.cpp
+  LEGO1/omni/src/video/mxloopingsmkpresenter.cpp
+  LEGO1/omni/src/video/mxpalette.cpp
+  LEGO1/omni/src/video/mxregion.cpp
+  LEGO1/omni/src/video/mxregioncursor.cpp
+  LEGO1/omni/src/video/mxsmack.cpp
+  LEGO1/omni/src/video/mxsmkpresenter.cpp
+  LEGO1/omni/src/video/mxstillpresenter.cpp
+  LEGO1/omni/src/video/mxtransitionmanager.cpp
+  LEGO1/omni/src/video/mxvideomanager.cpp
+  LEGO1/omni/src/video/mxvideoparam.cpp
+  LEGO1/omni/src/video/mxvideoparamflags.cpp
+  LEGO1/omni/src/video/mxvideopresenter.cpp
   LEGO1/realtime/matrix.cpp
   LEGO1/realtime/orientableroi.cpp
   LEGO1/realtime/realtime.cpp
   LEGO1/realtime/realtimeview.cpp
   LEGO1/realtime/vector.cpp
-  LEGO1/registrationbook.cpp
-  LEGO1/res/lego1.rc
-  LEGO1/score.cpp
-  LEGO1/scorestate.cpp
-  LEGO1/skateboard.cpp
   LEGO1/tgl/d3drm/camera.cpp
   LEGO1/tgl/d3drm/device.cpp
   LEGO1/tgl/d3drm/group.cpp
@@ -222,21 +220,25 @@ add_library(lego1 SHARED
   LEGO1/tgl/d3drm/texture.cpp
   LEGO1/tgl/d3drm/unk.cpp
   LEGO1/tgl/d3drm/view.cpp
-  LEGO1/towtrack.cpp
-  LEGO1/towtrackmissionstate.cpp
   LEGO1/viewmanager/viewlodlist.cpp
   LEGO1/viewmanager/viewmanager.cpp
   LEGO1/viewmanager/viewroi.cpp
 )
+
 if (MINGW)
   target_compile_definitions(lego1 PRIVATE DIRECTINPUT_VERSION=0x0500)
 endif()
 
-# Additional include directories
 target_include_directories(lego1 PRIVATE "${CMAKE_SOURCE_DIR}/util")
+target_include_directories(lego1 PRIVATE "${CMAKE_SOURCE_DIR}/LEGO1")
+target_include_directories(lego1 PRIVATE "${CMAKE_SOURCE_DIR}/LEGO1/omni/include")
+target_include_directories(lego1 PRIVATE "${CMAKE_SOURCE_DIR}/LEGO1/lego/sources")
+target_include_directories(lego1 PRIVATE "${CMAKE_SOURCE_DIR}/LEGO1/lego/legoomni/include")
+
+# Additional include directories
 target_include_directories(lego1 PUBLIC "${CMAKE_SOURCE_DIR}/3rdparty/vec")
 target_include_directories(lego1 PRIVATE "${CMAKE_SOURCE_DIR}/3rdparty/flic")
-target_include_directories(lego1 PRIVATE "${CMAKE_SOURCE_DIR}/3rdparty/smack")
+target_include_directories(lego1 PRIVATE "${CMAKE_SOURCE_DIR}/3rdparty/smacker")
 
 if (ISLE_USE_SMARTHEAP)
   add_library(SmartHeap::SmartHeap STATIC IMPORTED)
@@ -254,7 +256,7 @@ if (ISLE_USE_DX5)
   target_link_directories(lego1 PRIVATE "${CMAKE_SOURCE_DIR}/3rdparty/dx5/lib")
 endif()
 
-target_link_directories(lego1 PRIVATE "${CMAKE_SOURCE_DIR}/3rdparty/smack")
+target_link_directories(lego1 PRIVATE "${CMAKE_SOURCE_DIR}/3rdparty/smacker")
 
 # Link libraries
 target_link_libraries(lego1 PRIVATE ddraw dsound dinput dxguid winmm d3drm smack)
@@ -272,9 +274,10 @@ if (ISLE_BUILD_APP)
   )
 
   target_include_directories(isle PRIVATE "${CMAKE_SOURCE_DIR}/util")
-
-  # Include LEGO1 headers in ISLE
   target_include_directories(isle PRIVATE "${CMAKE_SOURCE_DIR}/LEGO1")
+  target_include_directories(isle PRIVATE "${CMAKE_SOURCE_DIR}/LEGO1/omni/include")
+  target_include_directories(isle PRIVATE "${CMAKE_SOURCE_DIR}/LEGO1/lego/sources")
+  target_include_directories(isle PRIVATE "${CMAKE_SOURCE_DIR}/LEGO1/lego/legoomni/include")
 
   # Use internal DirectX 5 if required
   if (ISLE_USE_DX5)
diff --git a/ISLE/isleapp.cpp b/ISLE/isleapp.cpp
index 12a3b6f7..d6f9c293 100644
--- a/ISLE/isleapp.cpp
+++ b/ISLE/isleapp.cpp
@@ -8,7 +8,6 @@
 #include "legomodelpresenter.h"
 #include "legoomni.h"
 #include "legopartpresenter.h"
-#include "legoroi.h"
 #include "legovideomanager.h"
 #include "legoworldpresenter.h"
 #include "mxbackgroundaudiomanager.h"
diff --git a/ISLE/res/resource.h b/ISLE/res/resource.h
index 6148e89f..647c616e 100644
--- a/ISLE/res/resource.h
+++ b/ISLE/res/resource.h
@@ -1,5 +1,5 @@
-#define ISLE_ARROW  102
-#define ISLE_NO     103
-#define ISLE_BUSY   104
+#define ISLE_ARROW 102
+#define ISLE_NO 103
+#define ISLE_BUSY 104
 
-#define APP_ICON    105
+#define APP_ICON 105
diff --git a/LEGO1/act1state.h b/LEGO1/lego/legoomni/include/act1state.h
similarity index 100%
rename from LEGO1/act1state.h
rename to LEGO1/lego/legoomni/include/act1state.h
diff --git a/LEGO1/act2brick.h b/LEGO1/lego/legoomni/include/act2brick.h
similarity index 100%
rename from LEGO1/act2brick.h
rename to LEGO1/lego/legoomni/include/act2brick.h
diff --git a/LEGO1/act2policestation.h b/LEGO1/lego/legoomni/include/act2policestation.h
similarity index 100%
rename from LEGO1/act2policestation.h
rename to LEGO1/lego/legoomni/include/act2policestation.h
diff --git a/LEGO1/act3.h b/LEGO1/lego/legoomni/include/act3.h
similarity index 100%
rename from LEGO1/act3.h
rename to LEGO1/lego/legoomni/include/act3.h
diff --git a/LEGO1/act3actor.h b/LEGO1/lego/legoomni/include/act3actor.h
similarity index 100%
rename from LEGO1/act3actor.h
rename to LEGO1/lego/legoomni/include/act3actor.h
diff --git a/LEGO1/act3shark.h b/LEGO1/lego/legoomni/include/act3shark.h
similarity index 100%
rename from LEGO1/act3shark.h
rename to LEGO1/lego/legoomni/include/act3shark.h
diff --git a/LEGO1/act3state.h b/LEGO1/lego/legoomni/include/act3state.h
similarity index 100%
rename from LEGO1/act3state.h
rename to LEGO1/lego/legoomni/include/act3state.h
diff --git a/LEGO1/ambulance.h b/LEGO1/lego/legoomni/include/ambulance.h
similarity index 100%
rename from LEGO1/ambulance.h
rename to LEGO1/lego/legoomni/include/ambulance.h
diff --git a/LEGO1/ambulancemissionstate.h b/LEGO1/lego/legoomni/include/ambulancemissionstate.h
similarity index 100%
rename from LEGO1/ambulancemissionstate.h
rename to LEGO1/lego/legoomni/include/ambulancemissionstate.h
diff --git a/LEGO1/animstate.h b/LEGO1/lego/legoomni/include/animstate.h
similarity index 100%
rename from LEGO1/animstate.h
rename to LEGO1/lego/legoomni/include/animstate.h
diff --git a/LEGO1/beachhouseentity.h b/LEGO1/lego/legoomni/include/beachhouseentity.h
similarity index 100%
rename from LEGO1/beachhouseentity.h
rename to LEGO1/lego/legoomni/include/beachhouseentity.h
diff --git a/LEGO1/bike.h b/LEGO1/lego/legoomni/include/bike.h
similarity index 100%
rename from LEGO1/bike.h
rename to LEGO1/lego/legoomni/include/bike.h
diff --git a/LEGO1/buildingentity.h b/LEGO1/lego/legoomni/include/buildingentity.h
similarity index 100%
rename from LEGO1/buildingentity.h
rename to LEGO1/lego/legoomni/include/buildingentity.h
diff --git a/LEGO1/bumpbouy.h b/LEGO1/lego/legoomni/include/bumpbouy.h
similarity index 100%
rename from LEGO1/bumpbouy.h
rename to LEGO1/lego/legoomni/include/bumpbouy.h
diff --git a/LEGO1/carrace.h b/LEGO1/lego/legoomni/include/carrace.h
similarity index 100%
rename from LEGO1/carrace.h
rename to LEGO1/lego/legoomni/include/carrace.h
diff --git a/LEGO1/carracestate.h b/LEGO1/lego/legoomni/include/carracestate.h
similarity index 100%
rename from LEGO1/carracestate.h
rename to LEGO1/lego/legoomni/include/carracestate.h
diff --git a/LEGO1/doors.h b/LEGO1/lego/legoomni/include/doors.h
similarity index 100%
rename from LEGO1/doors.h
rename to LEGO1/lego/legoomni/include/doors.h
diff --git a/LEGO1/dunebuggy.h b/LEGO1/lego/legoomni/include/dunebuggy.h
similarity index 100%
rename from LEGO1/dunebuggy.h
rename to LEGO1/lego/legoomni/include/dunebuggy.h
diff --git a/LEGO1/elevatorbottom.h b/LEGO1/lego/legoomni/include/elevatorbottom.h
similarity index 100%
rename from LEGO1/elevatorbottom.h
rename to LEGO1/lego/legoomni/include/elevatorbottom.h
diff --git a/LEGO1/extra.h b/LEGO1/lego/legoomni/include/extra.h
similarity index 100%
rename from LEGO1/extra.h
rename to LEGO1/lego/legoomni/include/extra.h
diff --git a/LEGO1/gasstation.h b/LEGO1/lego/legoomni/include/gasstation.h
similarity index 100%
rename from LEGO1/gasstation.h
rename to LEGO1/lego/legoomni/include/gasstation.h
diff --git a/LEGO1/gasstationentity.h b/LEGO1/lego/legoomni/include/gasstationentity.h
similarity index 100%
rename from LEGO1/gasstationentity.h
rename to LEGO1/lego/legoomni/include/gasstationentity.h
diff --git a/LEGO1/gasstationstate.h b/LEGO1/lego/legoomni/include/gasstationstate.h
similarity index 100%
rename from LEGO1/gasstationstate.h
rename to LEGO1/lego/legoomni/include/gasstationstate.h
diff --git a/LEGO1/gifmanager.h b/LEGO1/lego/legoomni/include/gifmanager.h
similarity index 100%
rename from LEGO1/gifmanager.h
rename to LEGO1/lego/legoomni/include/gifmanager.h
diff --git a/LEGO1/helicopter.h b/LEGO1/lego/legoomni/include/helicopter.h
similarity index 100%
rename from LEGO1/helicopter.h
rename to LEGO1/lego/legoomni/include/helicopter.h
diff --git a/LEGO1/helicopterstate.h b/LEGO1/lego/legoomni/include/helicopterstate.h
similarity index 100%
rename from LEGO1/helicopterstate.h
rename to LEGO1/lego/legoomni/include/helicopterstate.h
diff --git a/LEGO1/historybook.h b/LEGO1/lego/legoomni/include/historybook.h
similarity index 100%
rename from LEGO1/historybook.h
rename to LEGO1/lego/legoomni/include/historybook.h
diff --git a/LEGO1/hospital.h b/LEGO1/lego/legoomni/include/hospital.h
similarity index 100%
rename from LEGO1/hospital.h
rename to LEGO1/lego/legoomni/include/hospital.h
diff --git a/LEGO1/hospitalentity.h b/LEGO1/lego/legoomni/include/hospitalentity.h
similarity index 100%
rename from LEGO1/hospitalentity.h
rename to LEGO1/lego/legoomni/include/hospitalentity.h
diff --git a/LEGO1/hospitalstate.h b/LEGO1/lego/legoomni/include/hospitalstate.h
similarity index 100%
rename from LEGO1/hospitalstate.h
rename to LEGO1/lego/legoomni/include/hospitalstate.h
diff --git a/LEGO1/infocenter.h b/LEGO1/lego/legoomni/include/infocenter.h
similarity index 100%
rename from LEGO1/infocenter.h
rename to LEGO1/lego/legoomni/include/infocenter.h
diff --git a/LEGO1/infocenterdoor.h b/LEGO1/lego/legoomni/include/infocenterdoor.h
similarity index 100%
rename from LEGO1/infocenterdoor.h
rename to LEGO1/lego/legoomni/include/infocenterdoor.h
diff --git a/LEGO1/infocenterentity.h b/LEGO1/lego/legoomni/include/infocenterentity.h
similarity index 100%
rename from LEGO1/infocenterentity.h
rename to LEGO1/lego/legoomni/include/infocenterentity.h
diff --git a/LEGO1/infocenterstate.h b/LEGO1/lego/legoomni/include/infocenterstate.h
similarity index 100%
rename from LEGO1/infocenterstate.h
rename to LEGO1/lego/legoomni/include/infocenterstate.h
diff --git a/LEGO1/isle.h b/LEGO1/lego/legoomni/include/isle.h
similarity index 100%
rename from LEGO1/isle.h
rename to LEGO1/lego/legoomni/include/isle.h
diff --git a/LEGO1/isleactor.h b/LEGO1/lego/legoomni/include/isleactor.h
similarity index 100%
rename from LEGO1/isleactor.h
rename to LEGO1/lego/legoomni/include/isleactor.h
diff --git a/LEGO1/islepathactor.h b/LEGO1/lego/legoomni/include/islepathactor.h
similarity index 100%
rename from LEGO1/islepathactor.h
rename to LEGO1/lego/legoomni/include/islepathactor.h
diff --git a/LEGO1/jetski.h b/LEGO1/lego/legoomni/include/jetski.h
similarity index 100%
rename from LEGO1/jetski.h
rename to LEGO1/lego/legoomni/include/jetski.h
diff --git a/LEGO1/jetskirace.h b/LEGO1/lego/legoomni/include/jetskirace.h
similarity index 100%
rename from LEGO1/jetskirace.h
rename to LEGO1/lego/legoomni/include/jetskirace.h
diff --git a/LEGO1/jetskiracestate.h b/LEGO1/lego/legoomni/include/jetskiracestate.h
similarity index 100%
rename from LEGO1/jetskiracestate.h
rename to LEGO1/lego/legoomni/include/jetskiracestate.h
diff --git a/LEGO1/jukebox.h b/LEGO1/lego/legoomni/include/jukebox.h
similarity index 100%
rename from LEGO1/jukebox.h
rename to LEGO1/lego/legoomni/include/jukebox.h
diff --git a/LEGO1/jukeboxentity.h b/LEGO1/lego/legoomni/include/jukeboxentity.h
similarity index 100%
rename from LEGO1/jukeboxentity.h
rename to LEGO1/lego/legoomni/include/jukeboxentity.h
diff --git a/LEGO1/jukeboxstate.h b/LEGO1/lego/legoomni/include/jukeboxstate.h
similarity index 100%
rename from LEGO1/jukeboxstate.h
rename to LEGO1/lego/legoomni/include/jukeboxstate.h
diff --git a/LEGO1/lego3dwavepresenter.h b/LEGO1/lego/legoomni/include/lego3dwavepresenter.h
similarity index 100%
rename from LEGO1/lego3dwavepresenter.h
rename to LEGO1/lego/legoomni/include/lego3dwavepresenter.h
diff --git a/LEGO1/legoact2.h b/LEGO1/lego/legoomni/include/legoact2.h
similarity index 100%
rename from LEGO1/legoact2.h
rename to LEGO1/lego/legoomni/include/legoact2.h
diff --git a/LEGO1/legoact2state.h b/LEGO1/lego/legoomni/include/legoact2state.h
similarity index 100%
rename from LEGO1/legoact2state.h
rename to LEGO1/lego/legoomni/include/legoact2state.h
diff --git a/LEGO1/legoactioncontrolpresenter.h b/LEGO1/lego/legoomni/include/legoactioncontrolpresenter.h
similarity index 100%
rename from LEGO1/legoactioncontrolpresenter.h
rename to LEGO1/lego/legoomni/include/legoactioncontrolpresenter.h
diff --git a/LEGO1/legoactor.h b/LEGO1/lego/legoomni/include/legoactor.h
similarity index 100%
rename from LEGO1/legoactor.h
rename to LEGO1/lego/legoomni/include/legoactor.h
diff --git a/LEGO1/legoactorpresenter.h b/LEGO1/lego/legoomni/include/legoactorpresenter.h
similarity index 100%
rename from LEGO1/legoactorpresenter.h
rename to LEGO1/lego/legoomni/include/legoactorpresenter.h
diff --git a/LEGO1/legoanimactor.h b/LEGO1/lego/legoomni/include/legoanimactor.h
similarity index 100%
rename from LEGO1/legoanimactor.h
rename to LEGO1/lego/legoomni/include/legoanimactor.h
diff --git a/LEGO1/legoanimationmanager.h b/LEGO1/lego/legoomni/include/legoanimationmanager.h
similarity index 100%
rename from LEGO1/legoanimationmanager.h
rename to LEGO1/lego/legoomni/include/legoanimationmanager.h
diff --git a/LEGO1/legoanimmmpresenter.h b/LEGO1/lego/legoomni/include/legoanimmmpresenter.h
similarity index 100%
rename from LEGO1/legoanimmmpresenter.h
rename to LEGO1/lego/legoomni/include/legoanimmmpresenter.h
diff --git a/LEGO1/legoanimpresenter.h b/LEGO1/lego/legoomni/include/legoanimpresenter.h
similarity index 100%
rename from LEGO1/legoanimpresenter.h
rename to LEGO1/lego/legoomni/include/legoanimpresenter.h
diff --git a/LEGO1/legobackgroundcolor.h b/LEGO1/lego/legoomni/include/legobackgroundcolor.h
similarity index 100%
rename from LEGO1/legobackgroundcolor.h
rename to LEGO1/lego/legoomni/include/legobackgroundcolor.h
diff --git a/LEGO1/legobuildingmanager.h b/LEGO1/lego/legoomni/include/legobuildingmanager.h
similarity index 100%
rename from LEGO1/legobuildingmanager.h
rename to LEGO1/lego/legoomni/include/legobuildingmanager.h
diff --git a/LEGO1/legocachesound.h b/LEGO1/lego/legoomni/include/legocachesound.h
similarity index 100%
rename from LEGO1/legocachesound.h
rename to LEGO1/lego/legoomni/include/legocachesound.h
diff --git a/LEGO1/legocameracontroller.h b/LEGO1/lego/legoomni/include/legocameracontroller.h
similarity index 100%
rename from LEGO1/legocameracontroller.h
rename to LEGO1/lego/legoomni/include/legocameracontroller.h
diff --git a/LEGO1/legocarbuild.h b/LEGO1/lego/legoomni/include/legocarbuild.h
similarity index 100%
rename from LEGO1/legocarbuild.h
rename to LEGO1/lego/legoomni/include/legocarbuild.h
diff --git a/LEGO1/legocarbuildanimpresenter.h b/LEGO1/lego/legoomni/include/legocarbuildanimpresenter.h
similarity index 100%
rename from LEGO1/legocarbuildanimpresenter.h
rename to LEGO1/lego/legoomni/include/legocarbuildanimpresenter.h
diff --git a/LEGO1/legocarraceactor.h b/LEGO1/lego/legoomni/include/legocarraceactor.h
similarity index 100%
rename from LEGO1/legocarraceactor.h
rename to LEGO1/lego/legoomni/include/legocarraceactor.h
diff --git a/LEGO1/legocontrolmanager.h b/LEGO1/lego/legoomni/include/legocontrolmanager.h
similarity index 100%
rename from LEGO1/legocontrolmanager.h
rename to LEGO1/lego/legoomni/include/legocontrolmanager.h
diff --git a/LEGO1/legoentity.h b/LEGO1/lego/legoomni/include/legoentity.h
similarity index 99%
rename from LEGO1/legoentity.h
rename to LEGO1/lego/legoomni/include/legoentity.h
index 5a2eb715..ba0e1a7b 100644
--- a/LEGO1/legoentity.h
+++ b/LEGO1/lego/legoomni/include/legoentity.h
@@ -3,10 +3,10 @@
 
 #include "decomp.h"
 #include "extra.h"
-#include "legoroi.h"
 #include "mxdsobject.h"
 #include "mxentity.h"
 #include "realtime/vector.h"
+#include "roi/legoroi.h"
 
 // VTABLE: LEGO1 0x100d4858
 // SIZE 0x68 (probably)
diff --git a/LEGO1/legoentitypresenter.h b/LEGO1/lego/legoomni/include/legoentitypresenter.h
similarity index 100%
rename from LEGO1/legoentitypresenter.h
rename to LEGO1/lego/legoomni/include/legoentitypresenter.h
diff --git a/LEGO1/legoeventnotificationparam.h b/LEGO1/lego/legoomni/include/legoeventnotificationparam.h
similarity index 100%
rename from LEGO1/legoeventnotificationparam.h
rename to LEGO1/lego/legoomni/include/legoeventnotificationparam.h
diff --git a/LEGO1/legoextraactor.h b/LEGO1/lego/legoomni/include/legoextraactor.h
similarity index 100%
rename from LEGO1/legoextraactor.h
rename to LEGO1/lego/legoomni/include/legoextraactor.h
diff --git a/LEGO1/legoflctexturepresenter.h b/LEGO1/lego/legoomni/include/legoflctexturepresenter.h
similarity index 100%
rename from LEGO1/legoflctexturepresenter.h
rename to LEGO1/lego/legoomni/include/legoflctexturepresenter.h
diff --git a/LEGO1/legofullscreenmovie.h b/LEGO1/lego/legoomni/include/legofullscreenmovie.h
similarity index 100%
rename from LEGO1/legofullscreenmovie.h
rename to LEGO1/lego/legoomni/include/legofullscreenmovie.h
diff --git a/LEGO1/legogamestate.h b/LEGO1/lego/legoomni/include/legogamestate.h
similarity index 100%
rename from LEGO1/legogamestate.h
rename to LEGO1/lego/legoomni/include/legogamestate.h
diff --git a/LEGO1/legohideanimpresenter.h b/LEGO1/lego/legoomni/include/legohideanimpresenter.h
similarity index 100%
rename from LEGO1/legohideanimpresenter.h
rename to LEGO1/lego/legoomni/include/legohideanimpresenter.h
diff --git a/LEGO1/legoinputmanager.h b/LEGO1/lego/legoomni/include/legoinputmanager.h
similarity index 100%
rename from LEGO1/legoinputmanager.h
rename to LEGO1/lego/legoomni/include/legoinputmanager.h
diff --git a/LEGO1/legojetski.h b/LEGO1/lego/legoomni/include/legojetski.h
similarity index 100%
rename from LEGO1/legojetski.h
rename to LEGO1/lego/legoomni/include/legojetski.h
diff --git a/LEGO1/legojetskiraceactor.h b/LEGO1/lego/legoomni/include/legojetskiraceactor.h
similarity index 100%
rename from LEGO1/legojetskiraceactor.h
rename to LEGO1/lego/legoomni/include/legojetskiraceactor.h
diff --git a/LEGO1/legoloadcachesoundpresenter.h b/LEGO1/lego/legoomni/include/legoloadcachesoundpresenter.h
similarity index 100%
rename from LEGO1/legoloadcachesoundpresenter.h
rename to LEGO1/lego/legoomni/include/legoloadcachesoundpresenter.h
diff --git a/LEGO1/legolocomotionanimpresenter.h b/LEGO1/lego/legoomni/include/legolocomotionanimpresenter.h
similarity index 100%
rename from LEGO1/legolocomotionanimpresenter.h
rename to LEGO1/lego/legoomni/include/legolocomotionanimpresenter.h
diff --git a/LEGO1/legoloopinganimpresenter.h b/LEGO1/lego/legoomni/include/legoloopinganimpresenter.h
similarity index 100%
rename from LEGO1/legoloopinganimpresenter.h
rename to LEGO1/lego/legoomni/include/legoloopinganimpresenter.h
diff --git a/LEGO1/legometerpresenter.h b/LEGO1/lego/legoomni/include/legometerpresenter.h
similarity index 100%
rename from LEGO1/legometerpresenter.h
rename to LEGO1/lego/legoomni/include/legometerpresenter.h
diff --git a/LEGO1/legomodelpresenter.h b/LEGO1/lego/legoomni/include/legomodelpresenter.h
similarity index 100%
rename from LEGO1/legomodelpresenter.h
rename to LEGO1/lego/legoomni/include/legomodelpresenter.h
diff --git a/LEGO1/legonavcontroller.h b/LEGO1/lego/legoomni/include/legonavcontroller.h
similarity index 100%
rename from LEGO1/legonavcontroller.h
rename to LEGO1/lego/legoomni/include/legonavcontroller.h
diff --git a/LEGO1/legoobjectfactory.h b/LEGO1/lego/legoomni/include/legoobjectfactory.h
similarity index 100%
rename from LEGO1/legoobjectfactory.h
rename to LEGO1/lego/legoomni/include/legoobjectfactory.h
diff --git a/LEGO1/legoomni.h b/LEGO1/lego/legoomni/include/legoomni.h
similarity index 100%
rename from LEGO1/legoomni.h
rename to LEGO1/lego/legoomni/include/legoomni.h
diff --git a/LEGO1/legopalettepresenter.h b/LEGO1/lego/legoomni/include/legopalettepresenter.h
similarity index 100%
rename from LEGO1/legopalettepresenter.h
rename to LEGO1/lego/legoomni/include/legopalettepresenter.h
diff --git a/LEGO1/legopartpresenter.h b/LEGO1/lego/legoomni/include/legopartpresenter.h
similarity index 100%
rename from LEGO1/legopartpresenter.h
rename to LEGO1/lego/legoomni/include/legopartpresenter.h
diff --git a/LEGO1/legopathactor.h b/LEGO1/lego/legoomni/include/legopathactor.h
similarity index 100%
rename from LEGO1/legopathactor.h
rename to LEGO1/lego/legoomni/include/legopathactor.h
diff --git a/LEGO1/legopathboundary.h b/LEGO1/lego/legoomni/include/legopathboundary.h
similarity index 100%
rename from LEGO1/legopathboundary.h
rename to LEGO1/lego/legoomni/include/legopathboundary.h
diff --git a/LEGO1/legopathcontroller.h b/LEGO1/lego/legoomni/include/legopathcontroller.h
similarity index 100%
rename from LEGO1/legopathcontroller.h
rename to LEGO1/lego/legoomni/include/legopathcontroller.h
diff --git a/LEGO1/legopathcontrollerlist.h b/LEGO1/lego/legoomni/include/legopathcontrollerlist.h
similarity index 100%
rename from LEGO1/legopathcontrollerlist.h
rename to LEGO1/lego/legoomni/include/legopathcontrollerlist.h
diff --git a/LEGO1/legopathpresenter.h b/LEGO1/lego/legoomni/include/legopathpresenter.h
similarity index 100%
rename from LEGO1/legopathpresenter.h
rename to LEGO1/lego/legoomni/include/legopathpresenter.h
diff --git a/LEGO1/legophonemepresenter.h b/LEGO1/lego/legoomni/include/legophonemepresenter.h
similarity index 100%
rename from LEGO1/legophonemepresenter.h
rename to LEGO1/lego/legoomni/include/legophonemepresenter.h
diff --git a/LEGO1/legoplantmanager.h b/LEGO1/lego/legoomni/include/legoplantmanager.h
similarity index 100%
rename from LEGO1/legoplantmanager.h
rename to LEGO1/lego/legoomni/include/legoplantmanager.h
diff --git a/LEGO1/legorace.h b/LEGO1/lego/legoomni/include/legorace.h
similarity index 100%
rename from LEGO1/legorace.h
rename to LEGO1/lego/legoomni/include/legorace.h
diff --git a/LEGO1/legoraceactor.h b/LEGO1/lego/legoomni/include/legoraceactor.h
similarity index 100%
rename from LEGO1/legoraceactor.h
rename to LEGO1/lego/legoomni/include/legoraceactor.h
diff --git a/LEGO1/legoracecar.h b/LEGO1/lego/legoomni/include/legoracecar.h
similarity index 100%
rename from LEGO1/legoracecar.h
rename to LEGO1/lego/legoomni/include/legoracecar.h
diff --git a/LEGO1/legosoundmanager.h b/LEGO1/lego/legoomni/include/legosoundmanager.h
similarity index 100%
rename from LEGO1/legosoundmanager.h
rename to LEGO1/lego/legoomni/include/legosoundmanager.h
diff --git a/LEGO1/legostate.h b/LEGO1/lego/legoomni/include/legostate.h
similarity index 100%
rename from LEGO1/legostate.h
rename to LEGO1/lego/legoomni/include/legostate.h
diff --git a/LEGO1/legostream.h b/LEGO1/lego/legoomni/include/legostream.h
similarity index 100%
rename from LEGO1/legostream.h
rename to LEGO1/lego/legoomni/include/legostream.h
diff --git a/LEGO1/legotexturepresenter.h b/LEGO1/lego/legoomni/include/legotexturepresenter.h
similarity index 100%
rename from LEGO1/legotexturepresenter.h
rename to LEGO1/lego/legoomni/include/legotexturepresenter.h
diff --git a/LEGO1/mxunknown100d7c88.h b/LEGO1/lego/legoomni/include/legounknown100d7c88.h
similarity index 59%
rename from LEGO1/mxunknown100d7c88.h
rename to LEGO1/lego/legoomni/include/legounknown100d7c88.h
index eccc6ee4..a6004053 100644
--- a/LEGO1/mxunknown100d7c88.h
+++ b/LEGO1/lego/legoomni/include/legounknown100d7c88.h
@@ -1,12 +1,12 @@
-#ifndef MXUNKNOWN100D7C88_H
-#define MXUNKNOWN100D7C88_H
+#ifndef LEGOUNKNOWN100D7C88_H
+#define LEGOUNKNOWN100D7C88_H
 
 #include "decomp.h"
 #include "mxstring.h"
 
-class MxUnknown100d7c88 {
+class LegoUnknown100d7c88 {
 public:
-	~MxUnknown100d7c88();
+	~LegoUnknown100d7c88();
 
 	virtual undefined4 VTable0x00(); // vtable+0x00
 									 // More virtual functions
@@ -16,4 +16,4 @@ class MxUnknown100d7c88 {
 	undefined4 m_unk0x14; // 0x14
 };
 
-#endif // MXUNKNOWN100D7C88_H
+#endif // LEGOUNKNOWN100D7C88_H
diff --git a/LEGO1/lego/legoomni/include/legounknown100d9d00.h b/LEGO1/lego/legoomni/include/legounknown100d9d00.h
new file mode 100644
index 00000000..d31634fe
--- /dev/null
+++ b/LEGO1/lego/legoomni/include/legounknown100d9d00.h
@@ -0,0 +1,42 @@
+#ifndef LEGOUNKNOWN100D9D00_H
+#define LEGOUNKNOWN100D9D00_H
+
+#include "decomp.h"
+#include "legounknown100d7c88.h"
+#include "mxlist.h"
+
+// VTABLE: LEGO1 0x100d9cd0
+// class MxCollection<LegoUnknown100d7c88 *>
+
+// VTABLE: LEGO1 0x100d9ce8
+// class MxList<LegoUnknown100d7c88 *>
+
+// VTABLE: LEGO1 0x100d9d00
+// SIZE 0x18
+class LegoUnknown100d9d00 : public MxList<LegoUnknown100d7c88*> {
+public:
+	LegoUnknown100d9d00() { SetDestroy(Destroy); }
+
+	// STUB: LEGO1 0x1007b210
+	virtual MxS8 Compare(LegoUnknown100d7c88* p_a, LegoUnknown100d7c88* p_b) override { return -1; } // vtable+0x14
+
+	// FUNCTION: LEGO1 0x1007b2e0
+	static void Destroy(LegoUnknown100d7c88* p_element) { delete p_element; }
+};
+
+// TEMPLATE: LEGO1 0x1007b300
+// MxCollection<LegoUnknown100d7c88 *>::Compare
+
+// TEMPLATE: LEGO1 0x1007b360
+// MxCollection<LegoUnknown100d7c88 *>::Destroy
+
+// SYNTHETIC: LEGO1 0x1007b400
+// LegoUnknown100d9d00::`scalar deleting destructor'
+
+// SYNTHETIC: LEGO1 0x1007b470
+// MxCollection<LegoUnknown100d7c88 *>::`scalar deleting destructor'
+
+// SYNTHETIC: LEGO1 0x1007b4e0
+// MxList<LegoUnknown100d7c88 *>::`scalar deleting destructor'
+
+#endif // LEGOUNKNOWN100D9D00_H
diff --git a/LEGO1/legounksavedatawriter.h b/LEGO1/lego/legoomni/include/legounksavedatawriter.h
similarity index 100%
rename from LEGO1/legounksavedatawriter.h
rename to LEGO1/lego/legoomni/include/legounksavedatawriter.h
diff --git a/LEGO1/legoutil.h b/LEGO1/lego/legoomni/include/legoutil.h
similarity index 100%
rename from LEGO1/legoutil.h
rename to LEGO1/lego/legoomni/include/legoutil.h
diff --git a/LEGO1/legovehiclebuildstate.h b/LEGO1/lego/legoomni/include/legovehiclebuildstate.h
similarity index 100%
rename from LEGO1/legovehiclebuildstate.h
rename to LEGO1/lego/legoomni/include/legovehiclebuildstate.h
diff --git a/LEGO1/legovideomanager.h b/LEGO1/lego/legoomni/include/legovideomanager.h
similarity index 52%
rename from LEGO1/legovideomanager.h
rename to LEGO1/lego/legoomni/include/legovideomanager.h
index 884b31ad..0783931a 100644
--- a/LEGO1/legovideomanager.h
+++ b/LEGO1/lego/legoomni/include/legovideomanager.h
@@ -3,9 +3,9 @@
 
 #include "3dmanager/lego3dmanager.h"
 #include "decomp.h"
+#include "legounknown100d9d00.h"
 #include "mxdirectx/mxdirect3d.h"
 #include "mxdirectx/mxstopwatch.h"
-#include "mxunknown100d9d00.h"
 #include "mxvideomanager.h"
 
 #include <ddraw.h>
@@ -33,7 +33,7 @@ class LegoVideoManager : public MxVideoManager {
 	virtual void VTable0x34(MxU32 p_x, MxU32 p_y, MxU32 p_width, MxU32 p_height) override; // vtable+0x34
 	virtual void VTable0x38(undefined4, undefined4);                                       // vtable+0x38
 	// FUNCTION: LGEO1 0x1007ab10
-	virtual MxUnknown100d9d00* VTable0x3c() { return m_unk0x100d9d00; } // vtable+0x3c
+	virtual LegoUnknown100d9d00* VTable0x3c() { return m_unk0x100d9d00; } // vtable+0x3c
 
 	void SetSkyColor(float p_red, float p_green, float p_blue);
 	void OverrideSkyColor(MxBool p_shouldOverride);
@@ -49,39 +49,39 @@ class LegoVideoManager : public MxVideoManager {
 
 	inline void DrawCursor();
 
-	Tgl::Renderer* m_renderer;          // 0x64
-	Lego3DManager* m_3dManager;         // 0x68
-	LegoROI* m_viewROI;                 // 0x6c
-	undefined4 m_unk0x70;               // 0x70
-	MxDirect3D* m_direct3d;             // 0x74
-	undefined4 m_unk0x78[27];           // 0x78
-	MxBool m_unk0xe4;                   // 0xe4
-	MxBool m_unk0xe5;                   // 0xe5
-	MxBool m_unk0xe6;                   // 0xe6
-	PALETTEENTRY m_paletteEntries[256]; // 0xe7
-	undefined m_padding0x4e7;           // 0x4e7
-	MxUnknown100d9d00* m_unk0x100d9d00; // 0x4e8
-	MxBool m_isFullscreenMovie;         // 0x4ec
-	MxPalette* m_palette;               // 0x4f0
-	MxStopWatch* m_stopWatch;           // 0x4f4
-	double m_elapsedSeconds;            // 0x4f8
-	MxBool m_unk0x500;                  // 0x500
-	MxBool m_drawCursor;                // 0x501
-	MxS32 m_cursorXCopy;                // 0x504
-	MxS32 m_cursorYCopy;                // 0x508
-	MxS32 m_cursorX;                    // 0x50c
-	MxS32 m_cursorY;                    // 0x510
-	LPDIRECTDRAWSURFACE m_unk0x514;     // 0x514
-	RECT m_unk0x518;                    // 0x518
-	undefined4 m_unk0x528;              // 0x528
-	MxBool m_drawFPS;                   // 0x52c
-	RECT m_fpsRect;                     // 0x530
-	HFONT m_arialFont;                  // 0x540
-	SIZE m_fpsSize;                     // 0x544
-	undefined m_pad0x54c[8];            // 0x54c
-	MxBool m_unk0x554;                  // 0x554
-	MxBool m_initialized;               // 0x555
-	undefined m_pad0x556[0x39];         // 0x556
+	Tgl::Renderer* m_renderer;            // 0x64
+	Lego3DManager* m_3dManager;           // 0x68
+	LegoROI* m_viewROI;                   // 0x6c
+	undefined4 m_unk0x70;                 // 0x70
+	MxDirect3D* m_direct3d;               // 0x74
+	undefined4 m_unk0x78[27];             // 0x78
+	MxBool m_unk0xe4;                     // 0xe4
+	MxBool m_unk0xe5;                     // 0xe5
+	MxBool m_unk0xe6;                     // 0xe6
+	PALETTEENTRY m_paletteEntries[256];   // 0xe7
+	undefined m_padding0x4e7;             // 0x4e7
+	LegoUnknown100d9d00* m_unk0x100d9d00; // 0x4e8
+	MxBool m_isFullscreenMovie;           // 0x4ec
+	MxPalette* m_palette;                 // 0x4f0
+	MxStopWatch* m_stopWatch;             // 0x4f4
+	double m_elapsedSeconds;              // 0x4f8
+	MxBool m_unk0x500;                    // 0x500
+	MxBool m_drawCursor;                  // 0x501
+	MxS32 m_cursorXCopy;                  // 0x504
+	MxS32 m_cursorYCopy;                  // 0x508
+	MxS32 m_cursorX;                      // 0x50c
+	MxS32 m_cursorY;                      // 0x510
+	LPDIRECTDRAWSURFACE m_unk0x514;       // 0x514
+	RECT m_unk0x518;                      // 0x518
+	undefined4 m_unk0x528;                // 0x528
+	MxBool m_drawFPS;                     // 0x52c
+	RECT m_fpsRect;                       // 0x530
+	HFONT m_arialFont;                    // 0x540
+	SIZE m_fpsSize;                       // 0x544
+	undefined m_pad0x54c[8];              // 0x54c
+	MxBool m_unk0x554;                    // 0x554
+	MxBool m_initialized;                 // 0x555
+	undefined m_pad0x556[0x39];           // 0x556
 };
 
 // SYNTHETIC: LEGO1 0x1007ab20
diff --git a/LEGO1/legoworld.h b/LEGO1/lego/legoomni/include/legoworld.h
similarity index 100%
rename from LEGO1/legoworld.h
rename to LEGO1/lego/legoomni/include/legoworld.h
diff --git a/LEGO1/legoworldlist.h b/LEGO1/lego/legoomni/include/legoworldlist.h
similarity index 100%
rename from LEGO1/legoworldlist.h
rename to LEGO1/lego/legoomni/include/legoworldlist.h
diff --git a/LEGO1/legoworldpresenter.h b/LEGO1/lego/legoomni/include/legoworldpresenter.h
similarity index 100%
rename from LEGO1/legoworldpresenter.h
rename to LEGO1/lego/legoomni/include/legoworldpresenter.h
diff --git a/LEGO1/motorcycle.h b/LEGO1/lego/legoomni/include/motorcycle.h
similarity index 100%
rename from LEGO1/motorcycle.h
rename to LEGO1/lego/legoomni/include/motorcycle.h
diff --git a/LEGO1/pizza.h b/LEGO1/lego/legoomni/include/pizza.h
similarity index 100%
rename from LEGO1/pizza.h
rename to LEGO1/lego/legoomni/include/pizza.h
diff --git a/LEGO1/pizzamissionstate.h b/LEGO1/lego/legoomni/include/pizzamissionstate.h
similarity index 100%
rename from LEGO1/pizzamissionstate.h
rename to LEGO1/lego/legoomni/include/pizzamissionstate.h
diff --git a/LEGO1/pizzeria.h b/LEGO1/lego/legoomni/include/pizzeria.h
similarity index 100%
rename from LEGO1/pizzeria.h
rename to LEGO1/lego/legoomni/include/pizzeria.h
diff --git a/LEGO1/pizzeriastate.h b/LEGO1/lego/legoomni/include/pizzeriastate.h
similarity index 100%
rename from LEGO1/pizzeriastate.h
rename to LEGO1/lego/legoomni/include/pizzeriastate.h
diff --git a/LEGO1/police.h b/LEGO1/lego/legoomni/include/police.h
similarity index 100%
rename from LEGO1/police.h
rename to LEGO1/lego/legoomni/include/police.h
diff --git a/LEGO1/policeentity.h b/LEGO1/lego/legoomni/include/policeentity.h
similarity index 100%
rename from LEGO1/policeentity.h
rename to LEGO1/lego/legoomni/include/policeentity.h
diff --git a/LEGO1/policestate.h b/LEGO1/lego/legoomni/include/policestate.h
similarity index 100%
rename from LEGO1/policestate.h
rename to LEGO1/lego/legoomni/include/policestate.h
diff --git a/LEGO1/racecar.h b/LEGO1/lego/legoomni/include/racecar.h
similarity index 100%
rename from LEGO1/racecar.h
rename to LEGO1/lego/legoomni/include/racecar.h
diff --git a/LEGO1/racestandsentity.h b/LEGO1/lego/legoomni/include/racestandsentity.h
similarity index 100%
rename from LEGO1/racestandsentity.h
rename to LEGO1/lego/legoomni/include/racestandsentity.h
diff --git a/LEGO1/racestate.h b/LEGO1/lego/legoomni/include/racestate.h
similarity index 100%
rename from LEGO1/racestate.h
rename to LEGO1/lego/legoomni/include/racestate.h
diff --git a/LEGO1/radio.h b/LEGO1/lego/legoomni/include/radio.h
similarity index 100%
rename from LEGO1/radio.h
rename to LEGO1/lego/legoomni/include/radio.h
diff --git a/LEGO1/radiostate.h b/LEGO1/lego/legoomni/include/radiostate.h
similarity index 100%
rename from LEGO1/radiostate.h
rename to LEGO1/lego/legoomni/include/radiostate.h
diff --git a/LEGO1/registrationbook.h b/LEGO1/lego/legoomni/include/registrationbook.h
similarity index 100%
rename from LEGO1/registrationbook.h
rename to LEGO1/lego/legoomni/include/registrationbook.h
diff --git a/LEGO1/score.h b/LEGO1/lego/legoomni/include/score.h
similarity index 100%
rename from LEGO1/score.h
rename to LEGO1/lego/legoomni/include/score.h
diff --git a/LEGO1/scorestate.h b/LEGO1/lego/legoomni/include/scorestate.h
similarity index 100%
rename from LEGO1/scorestate.h
rename to LEGO1/lego/legoomni/include/scorestate.h
diff --git a/LEGO1/skateboard.h b/LEGO1/lego/legoomni/include/skateboard.h
similarity index 100%
rename from LEGO1/skateboard.h
rename to LEGO1/lego/legoomni/include/skateboard.h
diff --git a/LEGO1/towtrack.h b/LEGO1/lego/legoomni/include/towtrack.h
similarity index 100%
rename from LEGO1/towtrack.h
rename to LEGO1/lego/legoomni/include/towtrack.h
diff --git a/LEGO1/towtrackmissionstate.h b/LEGO1/lego/legoomni/include/towtrackmissionstate.h
similarity index 100%
rename from LEGO1/towtrackmissionstate.h
rename to LEGO1/lego/legoomni/include/towtrackmissionstate.h
diff --git a/LEGO1/act1state.cpp b/LEGO1/lego/legoomni/src/act1/act1state.cpp
similarity index 100%
rename from LEGO1/act1state.cpp
rename to LEGO1/lego/legoomni/src/act1/act1state.cpp
diff --git a/LEGO1/act2brick.cpp b/LEGO1/lego/legoomni/src/act2/act2brick.cpp
similarity index 100%
rename from LEGO1/act2brick.cpp
rename to LEGO1/lego/legoomni/src/act2/act2brick.cpp
diff --git a/LEGO1/act2policestation.cpp b/LEGO1/lego/legoomni/src/act2/act2policestation.cpp
similarity index 100%
rename from LEGO1/act2policestation.cpp
rename to LEGO1/lego/legoomni/src/act2/act2policestation.cpp
diff --git a/LEGO1/legoact2state.cpp b/LEGO1/lego/legoomni/src/act2/legoact2state.cpp
similarity index 100%
rename from LEGO1/legoact2state.cpp
rename to LEGO1/lego/legoomni/src/act2/legoact2state.cpp
diff --git a/LEGO1/act3.cpp b/LEGO1/lego/legoomni/src/act3/act3.cpp
similarity index 100%
rename from LEGO1/act3.cpp
rename to LEGO1/lego/legoomni/src/act3/act3.cpp
diff --git a/LEGO1/act3shark.cpp b/LEGO1/lego/legoomni/src/act3/act3shark.cpp
similarity index 100%
rename from LEGO1/act3shark.cpp
rename to LEGO1/lego/legoomni/src/act3/act3shark.cpp
diff --git a/LEGO1/act3state.cpp b/LEGO1/lego/legoomni/src/act3/act3state.cpp
similarity index 100%
rename from LEGO1/act3state.cpp
rename to LEGO1/lego/legoomni/src/act3/act3state.cpp
diff --git a/LEGO1/legocachesound.cpp b/LEGO1/lego/legoomni/src/audio/legocachesound.cpp
similarity index 100%
rename from LEGO1/legocachesound.cpp
rename to LEGO1/lego/legoomni/src/audio/legocachesound.cpp
diff --git a/LEGO1/legoloadcachesoundpresenter.cpp b/LEGO1/lego/legoomni/src/audio/legoloadcachesoundpresenter.cpp
similarity index 100%
rename from LEGO1/legoloadcachesoundpresenter.cpp
rename to LEGO1/lego/legoomni/src/audio/legoloadcachesoundpresenter.cpp
diff --git a/LEGO1/legosoundmanager.cpp b/LEGO1/lego/legoomni/src/audio/legosoundmanager.cpp
similarity index 100%
rename from LEGO1/legosoundmanager.cpp
rename to LEGO1/lego/legoomni/src/audio/legosoundmanager.cpp
diff --git a/LEGO1/buildingentity.cpp b/LEGO1/lego/legoomni/src/build/buildingentity.cpp
similarity index 100%
rename from LEGO1/buildingentity.cpp
rename to LEGO1/lego/legoomni/src/build/buildingentity.cpp
diff --git a/LEGO1/dunebuggy.cpp b/LEGO1/lego/legoomni/src/build/dunebuggy.cpp
similarity index 100%
rename from LEGO1/dunebuggy.cpp
rename to LEGO1/lego/legoomni/src/build/dunebuggy.cpp
diff --git a/LEGO1/helicopter.cpp b/LEGO1/lego/legoomni/src/build/helicopter.cpp
similarity index 100%
rename from LEGO1/helicopter.cpp
rename to LEGO1/lego/legoomni/src/build/helicopter.cpp
diff --git a/LEGO1/helicopterstate.cpp b/LEGO1/lego/legoomni/src/build/helicopterstate.cpp
similarity index 100%
rename from LEGO1/helicopterstate.cpp
rename to LEGO1/lego/legoomni/src/build/helicopterstate.cpp
diff --git a/LEGO1/jetski.cpp b/LEGO1/lego/legoomni/src/build/jetski.cpp
similarity index 100%
rename from LEGO1/jetski.cpp
rename to LEGO1/lego/legoomni/src/build/jetski.cpp
diff --git a/LEGO1/legobuildingmanager.cpp b/LEGO1/lego/legoomni/src/build/legobuildingmanager.cpp
similarity index 100%
rename from LEGO1/legobuildingmanager.cpp
rename to LEGO1/lego/legoomni/src/build/legobuildingmanager.cpp
diff --git a/LEGO1/legocarbuild.cpp b/LEGO1/lego/legoomni/src/build/legocarbuild.cpp
similarity index 100%
rename from LEGO1/legocarbuild.cpp
rename to LEGO1/lego/legoomni/src/build/legocarbuild.cpp
diff --git a/LEGO1/legovehiclebuildstate.cpp b/LEGO1/lego/legoomni/src/build/legovehiclebuildstate.cpp
similarity index 100%
rename from LEGO1/legovehiclebuildstate.cpp
rename to LEGO1/lego/legoomni/src/build/legovehiclebuildstate.cpp
diff --git a/LEGO1/racecar.cpp b/LEGO1/lego/legoomni/src/build/racecar.cpp
similarity index 100%
rename from LEGO1/racecar.cpp
rename to LEGO1/lego/legoomni/src/build/racecar.cpp
diff --git a/LEGO1/animstate.cpp b/LEGO1/lego/legoomni/src/common/animstate.cpp
similarity index 100%
rename from LEGO1/animstate.cpp
rename to LEGO1/lego/legoomni/src/common/animstate.cpp
diff --git a/LEGO1/gifmanager.cpp b/LEGO1/lego/legoomni/src/common/gifmanager.cpp
similarity index 100%
rename from LEGO1/gifmanager.cpp
rename to LEGO1/lego/legoomni/src/common/gifmanager.cpp
diff --git a/LEGO1/legoactioncontrolpresenter.cpp b/LEGO1/lego/legoomni/src/common/legoactioncontrolpresenter.cpp
similarity index 100%
rename from LEGO1/legoactioncontrolpresenter.cpp
rename to LEGO1/lego/legoomni/src/common/legoactioncontrolpresenter.cpp
diff --git a/LEGO1/legobackgroundcolor.cpp b/LEGO1/lego/legoomni/src/common/legobackgroundcolor.cpp
similarity index 100%
rename from LEGO1/legobackgroundcolor.cpp
rename to LEGO1/lego/legoomni/src/common/legobackgroundcolor.cpp
diff --git a/LEGO1/legocameracontroller.cpp b/LEGO1/lego/legoomni/src/common/legocameracontroller.cpp
similarity index 100%
rename from LEGO1/legocameracontroller.cpp
rename to LEGO1/lego/legoomni/src/common/legocameracontroller.cpp
diff --git a/LEGO1/legofullscreenmovie.cpp b/LEGO1/lego/legoomni/src/common/legofullscreenmovie.cpp
similarity index 100%
rename from LEGO1/legofullscreenmovie.cpp
rename to LEGO1/lego/legoomni/src/common/legofullscreenmovie.cpp
diff --git a/LEGO1/legogamestate.cpp b/LEGO1/lego/legoomni/src/common/legogamestate.cpp
similarity index 99%
rename from LEGO1/legogamestate.cpp
rename to LEGO1/lego/legoomni/src/common/legogamestate.cpp
index 23e04601..a081248c 100644
--- a/LEGO1/legogamestate.cpp
+++ b/LEGO1/lego/legoomni/src/common/legogamestate.cpp
@@ -2,12 +2,12 @@
 
 #include "infocenterstate.h"
 #include "legoomni.h"
-#include "legoroi.h"
 #include "legostate.h"
 #include "legostream.h"
 #include "mxobjectfactory.h"
 #include "mxstring.h"
 #include "mxvariabletable.h"
+#include "roi/legoroi.h"
 
 #include <stdio.h>
 
diff --git a/LEGO1/legonavcontroller.cpp b/LEGO1/lego/legoomni/src/common/legonavcontroller.cpp
similarity index 100%
rename from LEGO1/legonavcontroller.cpp
rename to LEGO1/lego/legoomni/src/common/legonavcontroller.cpp
diff --git a/LEGO1/legoobjectfactory.cpp b/LEGO1/lego/legoomni/src/common/legoobjectfactory.cpp
similarity index 100%
rename from LEGO1/legoobjectfactory.cpp
rename to LEGO1/lego/legoomni/src/common/legoobjectfactory.cpp
diff --git a/LEGO1/legoplantmanager.cpp b/LEGO1/lego/legoomni/src/common/legoplantmanager.cpp
similarity index 100%
rename from LEGO1/legoplantmanager.cpp
rename to LEGO1/lego/legoomni/src/common/legoplantmanager.cpp
diff --git a/LEGO1/legostate.cpp b/LEGO1/lego/legoomni/src/common/legostate.cpp
similarity index 100%
rename from LEGO1/legostate.cpp
rename to LEGO1/lego/legoomni/src/common/legostate.cpp
diff --git a/LEGO1/legostream.cpp b/LEGO1/lego/legoomni/src/common/legostream.cpp
similarity index 100%
rename from LEGO1/legostream.cpp
rename to LEGO1/lego/legoomni/src/common/legostream.cpp
diff --git a/LEGO1/legounksavedatawriter.cpp b/LEGO1/lego/legoomni/src/common/legounksavedatawriter.cpp
similarity index 100%
rename from LEGO1/legounksavedatawriter.cpp
rename to LEGO1/lego/legoomni/src/common/legounksavedatawriter.cpp
diff --git a/LEGO1/legoutil.cpp b/LEGO1/lego/legoomni/src/common/legoutil.cpp
similarity index 100%
rename from LEGO1/legoutil.cpp
rename to LEGO1/lego/legoomni/src/common/legoutil.cpp
diff --git a/LEGO1/legocontrolmanager.cpp b/LEGO1/lego/legoomni/src/control/legocontrolmanager.cpp
similarity index 100%
rename from LEGO1/legocontrolmanager.cpp
rename to LEGO1/lego/legoomni/src/control/legocontrolmanager.cpp
diff --git a/LEGO1/legoactor.cpp b/LEGO1/lego/legoomni/src/entity/legoactor.cpp
similarity index 100%
rename from LEGO1/legoactor.cpp
rename to LEGO1/lego/legoomni/src/entity/legoactor.cpp
diff --git a/LEGO1/legoanimactor.cpp b/LEGO1/lego/legoomni/src/entity/legoanimactor.cpp
similarity index 100%
rename from LEGO1/legoanimactor.cpp
rename to LEGO1/lego/legoomni/src/entity/legoanimactor.cpp
diff --git a/LEGO1/legoentity.cpp b/LEGO1/lego/legoomni/src/entity/legoentity.cpp
similarity index 100%
rename from LEGO1/legoentity.cpp
rename to LEGO1/lego/legoomni/src/entity/legoentity.cpp
diff --git a/LEGO1/legoentitypresenter.cpp b/LEGO1/lego/legoomni/src/entity/legoentitypresenter.cpp
similarity index 100%
rename from LEGO1/legoentitypresenter.cpp
rename to LEGO1/lego/legoomni/src/entity/legoentitypresenter.cpp
diff --git a/LEGO1/legojetski.cpp b/LEGO1/lego/legoomni/src/entity/legojetski.cpp
similarity index 100%
rename from LEGO1/legojetski.cpp
rename to LEGO1/lego/legoomni/src/entity/legojetski.cpp
diff --git a/LEGO1/legopathactor.cpp b/LEGO1/lego/legoomni/src/entity/legopathactor.cpp
similarity index 100%
rename from LEGO1/legopathactor.cpp
rename to LEGO1/lego/legoomni/src/entity/legopathactor.cpp
diff --git a/LEGO1/legorace.cpp b/LEGO1/lego/legoomni/src/entity/legorace.cpp
similarity index 100%
rename from LEGO1/legorace.cpp
rename to LEGO1/lego/legoomni/src/entity/legorace.cpp
diff --git a/LEGO1/legoworld.cpp b/LEGO1/lego/legoomni/src/entity/legoworld.cpp
similarity index 100%
rename from LEGO1/legoworld.cpp
rename to LEGO1/lego/legoomni/src/entity/legoworld.cpp
diff --git a/LEGO1/legoworldpresenter.cpp b/LEGO1/lego/legoomni/src/entity/legoworldpresenter.cpp
similarity index 100%
rename from LEGO1/legoworldpresenter.cpp
rename to LEGO1/lego/legoomni/src/entity/legoworldpresenter.cpp
diff --git a/LEGO1/gasstation.cpp b/LEGO1/lego/legoomni/src/gasstation/gasstation.cpp
similarity index 100%
rename from LEGO1/gasstation.cpp
rename to LEGO1/lego/legoomni/src/gasstation/gasstation.cpp
diff --git a/LEGO1/gasstationentity.cpp b/LEGO1/lego/legoomni/src/gasstation/gasstationentity.cpp
similarity index 100%
rename from LEGO1/gasstationentity.cpp
rename to LEGO1/lego/legoomni/src/gasstation/gasstationentity.cpp
diff --git a/LEGO1/gasstationstate.cpp b/LEGO1/lego/legoomni/src/gasstation/gasstationstate.cpp
similarity index 100%
rename from LEGO1/gasstationstate.cpp
rename to LEGO1/lego/legoomni/src/gasstation/gasstationstate.cpp
diff --git a/LEGO1/ambulance.cpp b/LEGO1/lego/legoomni/src/hospital/ambulance.cpp
similarity index 100%
rename from LEGO1/ambulance.cpp
rename to LEGO1/lego/legoomni/src/hospital/ambulance.cpp
diff --git a/LEGO1/ambulancemissionstate.cpp b/LEGO1/lego/legoomni/src/hospital/ambulancemissionstate.cpp
similarity index 100%
rename from LEGO1/ambulancemissionstate.cpp
rename to LEGO1/lego/legoomni/src/hospital/ambulancemissionstate.cpp
diff --git a/LEGO1/hospital.cpp b/LEGO1/lego/legoomni/src/hospital/hospital.cpp
similarity index 100%
rename from LEGO1/hospital.cpp
rename to LEGO1/lego/legoomni/src/hospital/hospital.cpp
diff --git a/LEGO1/hospitalentity.cpp b/LEGO1/lego/legoomni/src/hospital/hospitalentity.cpp
similarity index 100%
rename from LEGO1/hospitalentity.cpp
rename to LEGO1/lego/legoomni/src/hospital/hospitalentity.cpp
diff --git a/LEGO1/hospitalstate.cpp b/LEGO1/lego/legoomni/src/hospital/hospitalstate.cpp
similarity index 100%
rename from LEGO1/hospitalstate.cpp
rename to LEGO1/lego/legoomni/src/hospital/hospitalstate.cpp
diff --git a/LEGO1/elevatorbottom.cpp b/LEGO1/lego/legoomni/src/infocenter/elevatorbottom.cpp
similarity index 100%
rename from LEGO1/elevatorbottom.cpp
rename to LEGO1/lego/legoomni/src/infocenter/elevatorbottom.cpp
diff --git a/LEGO1/infocenter.cpp b/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp
similarity index 100%
rename from LEGO1/infocenter.cpp
rename to LEGO1/lego/legoomni/src/infocenter/infocenter.cpp
diff --git a/LEGO1/infocenterdoor.cpp b/LEGO1/lego/legoomni/src/infocenter/infocenterdoor.cpp
similarity index 100%
rename from LEGO1/infocenterdoor.cpp
rename to LEGO1/lego/legoomni/src/infocenter/infocenterdoor.cpp
diff --git a/LEGO1/infocenterentity.cpp b/LEGO1/lego/legoomni/src/infocenter/infocenterentity.cpp
similarity index 100%
rename from LEGO1/infocenterentity.cpp
rename to LEGO1/lego/legoomni/src/infocenter/infocenterentity.cpp
diff --git a/LEGO1/infocenterstate.cpp b/LEGO1/lego/legoomni/src/infocenter/infocenterstate.cpp
similarity index 100%
rename from LEGO1/infocenterstate.cpp
rename to LEGO1/lego/legoomni/src/infocenter/infocenterstate.cpp
diff --git a/LEGO1/registrationbook.cpp b/LEGO1/lego/legoomni/src/infocenter/registrationbook.cpp
similarity index 100%
rename from LEGO1/registrationbook.cpp
rename to LEGO1/lego/legoomni/src/infocenter/registrationbook.cpp
diff --git a/LEGO1/score.cpp b/LEGO1/lego/legoomni/src/infocenter/score.cpp
similarity index 100%
rename from LEGO1/score.cpp
rename to LEGO1/lego/legoomni/src/infocenter/score.cpp
diff --git a/LEGO1/scorestate.cpp b/LEGO1/lego/legoomni/src/infocenter/scorestate.cpp
similarity index 100%
rename from LEGO1/scorestate.cpp
rename to LEGO1/lego/legoomni/src/infocenter/scorestate.cpp
diff --git a/LEGO1/legoinputmanager.cpp b/LEGO1/lego/legoomni/src/input/legoinputmanager.cpp
similarity index 100%
rename from LEGO1/legoinputmanager.cpp
rename to LEGO1/lego/legoomni/src/input/legoinputmanager.cpp
diff --git a/LEGO1/beachhouseentity.cpp b/LEGO1/lego/legoomni/src/isle/beachhouseentity.cpp
similarity index 100%
rename from LEGO1/beachhouseentity.cpp
rename to LEGO1/lego/legoomni/src/isle/beachhouseentity.cpp
diff --git a/LEGO1/bike.cpp b/LEGO1/lego/legoomni/src/isle/bike.cpp
similarity index 100%
rename from LEGO1/bike.cpp
rename to LEGO1/lego/legoomni/src/isle/bike.cpp
diff --git a/LEGO1/bumpbouy.cpp b/LEGO1/lego/legoomni/src/isle/bumpbouy.cpp
similarity index 100%
rename from LEGO1/bumpbouy.cpp
rename to LEGO1/lego/legoomni/src/isle/bumpbouy.cpp
diff --git a/LEGO1/historybook.cpp b/LEGO1/lego/legoomni/src/isle/historybook.cpp
similarity index 100%
rename from LEGO1/historybook.cpp
rename to LEGO1/lego/legoomni/src/isle/historybook.cpp
diff --git a/LEGO1/isle.cpp b/LEGO1/lego/legoomni/src/isle/isle.cpp
similarity index 100%
rename from LEGO1/isle.cpp
rename to LEGO1/lego/legoomni/src/isle/isle.cpp
diff --git a/LEGO1/isleactor.cpp b/LEGO1/lego/legoomni/src/isle/isleactor.cpp
similarity index 100%
rename from LEGO1/isleactor.cpp
rename to LEGO1/lego/legoomni/src/isle/isleactor.cpp
diff --git a/LEGO1/islepathactor.cpp b/LEGO1/lego/legoomni/src/isle/islepathactor.cpp
similarity index 100%
rename from LEGO1/islepathactor.cpp
rename to LEGO1/lego/legoomni/src/isle/islepathactor.cpp
diff --git a/LEGO1/jukebox.cpp b/LEGO1/lego/legoomni/src/isle/jukebox.cpp
similarity index 100%
rename from LEGO1/jukebox.cpp
rename to LEGO1/lego/legoomni/src/isle/jukebox.cpp
diff --git a/LEGO1/jukeboxentity.cpp b/LEGO1/lego/legoomni/src/isle/jukeboxentity.cpp
similarity index 100%
rename from LEGO1/jukeboxentity.cpp
rename to LEGO1/lego/legoomni/src/isle/jukeboxentity.cpp
diff --git a/LEGO1/jukeboxstate.cpp b/LEGO1/lego/legoomni/src/isle/jukeboxstate.cpp
similarity index 100%
rename from LEGO1/jukeboxstate.cpp
rename to LEGO1/lego/legoomni/src/isle/jukeboxstate.cpp
diff --git a/LEGO1/motorcycle.cpp b/LEGO1/lego/legoomni/src/isle/motorcycle.cpp
similarity index 100%
rename from LEGO1/motorcycle.cpp
rename to LEGO1/lego/legoomni/src/isle/motorcycle.cpp
diff --git a/LEGO1/radio.cpp b/LEGO1/lego/legoomni/src/isle/radio.cpp
similarity index 100%
rename from LEGO1/radio.cpp
rename to LEGO1/lego/legoomni/src/isle/radio.cpp
diff --git a/LEGO1/radiostate.cpp b/LEGO1/lego/legoomni/src/isle/radiostate.cpp
similarity index 100%
rename from LEGO1/radiostate.cpp
rename to LEGO1/lego/legoomni/src/isle/radiostate.cpp
diff --git a/LEGO1/skateboard.cpp b/LEGO1/lego/legoomni/src/isle/skateboard.cpp
similarity index 100%
rename from LEGO1/skateboard.cpp
rename to LEGO1/lego/legoomni/src/isle/skateboard.cpp
diff --git a/LEGO1/legoomni.cpp b/LEGO1/lego/legoomni/src/main/legoomni.cpp
similarity index 100%
rename from LEGO1/legoomni.cpp
rename to LEGO1/lego/legoomni/src/main/legoomni.cpp
diff --git a/LEGO1/legoeventnotificationparam.cpp b/LEGO1/lego/legoomni/src/notify/legoeventnotificationparam.cpp
similarity index 100%
rename from LEGO1/legoeventnotificationparam.cpp
rename to LEGO1/lego/legoomni/src/notify/legoeventnotificationparam.cpp
diff --git a/LEGO1/legopathcontroller.cpp b/LEGO1/lego/legoomni/src/paths/legopathcontroller.cpp
similarity index 100%
rename from LEGO1/legopathcontroller.cpp
rename to LEGO1/lego/legoomni/src/paths/legopathcontroller.cpp
diff --git a/LEGO1/legopathpresenter.cpp b/LEGO1/lego/legoomni/src/paths/legopathpresenter.cpp
similarity index 100%
rename from LEGO1/legopathpresenter.cpp
rename to LEGO1/lego/legoomni/src/paths/legopathpresenter.cpp
diff --git a/LEGO1/pizza.cpp b/LEGO1/lego/legoomni/src/pizzeria/pizza.cpp
similarity index 100%
rename from LEGO1/pizza.cpp
rename to LEGO1/lego/legoomni/src/pizzeria/pizza.cpp
diff --git a/LEGO1/pizzamissionstate.cpp b/LEGO1/lego/legoomni/src/pizzeria/pizzamissionstate.cpp
similarity index 100%
rename from LEGO1/pizzamissionstate.cpp
rename to LEGO1/lego/legoomni/src/pizzeria/pizzamissionstate.cpp
diff --git a/LEGO1/pizzeria.cpp b/LEGO1/lego/legoomni/src/pizzeria/pizzeria.cpp
similarity index 100%
rename from LEGO1/pizzeria.cpp
rename to LEGO1/lego/legoomni/src/pizzeria/pizzeria.cpp
diff --git a/LEGO1/pizzeriastate.cpp b/LEGO1/lego/legoomni/src/pizzeria/pizzeriastate.cpp
similarity index 100%
rename from LEGO1/pizzeriastate.cpp
rename to LEGO1/lego/legoomni/src/pizzeria/pizzeriastate.cpp
diff --git a/LEGO1/police.cpp b/LEGO1/lego/legoomni/src/police/police.cpp
similarity index 100%
rename from LEGO1/police.cpp
rename to LEGO1/lego/legoomni/src/police/police.cpp
diff --git a/LEGO1/policeentity.cpp b/LEGO1/lego/legoomni/src/police/policeentity.cpp
similarity index 100%
rename from LEGO1/policeentity.cpp
rename to LEGO1/lego/legoomni/src/police/policeentity.cpp
diff --git a/LEGO1/policestate.cpp b/LEGO1/lego/legoomni/src/police/policestate.cpp
similarity index 100%
rename from LEGO1/policestate.cpp
rename to LEGO1/lego/legoomni/src/police/policestate.cpp
diff --git a/LEGO1/carrace.cpp b/LEGO1/lego/legoomni/src/race/carrace.cpp
similarity index 100%
rename from LEGO1/carrace.cpp
rename to LEGO1/lego/legoomni/src/race/carrace.cpp
diff --git a/LEGO1/jetskirace.cpp b/LEGO1/lego/legoomni/src/race/jetskirace.cpp
similarity index 100%
rename from LEGO1/jetskirace.cpp
rename to LEGO1/lego/legoomni/src/race/jetskirace.cpp
diff --git a/LEGO1/racestandsentity.cpp b/LEGO1/lego/legoomni/src/race/racestandsentity.cpp
similarity index 100%
rename from LEGO1/racestandsentity.cpp
rename to LEGO1/lego/legoomni/src/race/racestandsentity.cpp
diff --git a/LEGO1/racestate.cpp b/LEGO1/lego/legoomni/src/race/racestate.cpp
similarity index 100%
rename from LEGO1/racestate.cpp
rename to LEGO1/lego/legoomni/src/race/racestate.cpp
diff --git a/LEGO1/towtrack.cpp b/LEGO1/lego/legoomni/src/towtrack/towtrack.cpp
similarity index 100%
rename from LEGO1/towtrack.cpp
rename to LEGO1/lego/legoomni/src/towtrack/towtrack.cpp
diff --git a/LEGO1/towtrackmissionstate.cpp b/LEGO1/lego/legoomni/src/towtrack/towtrackmissionstate.cpp
similarity index 100%
rename from LEGO1/towtrackmissionstate.cpp
rename to LEGO1/lego/legoomni/src/towtrack/towtrackmissionstate.cpp
diff --git a/LEGO1/lego/legoomni/src/unknown/legounknown100d7c88.cpp b/LEGO1/lego/legoomni/src/unknown/legounknown100d7c88.cpp
new file mode 100644
index 00000000..b3f386e3
--- /dev/null
+++ b/LEGO1/lego/legoomni/src/unknown/legounknown100d7c88.cpp
@@ -0,0 +1,12 @@
+#include "legounknown100d7c88.h"
+
+// FUNCTION: LEGO1 0x10044e50
+LegoUnknown100d7c88::~LegoUnknown100d7c88()
+{
+}
+
+// FUNCTION: LEGO1 0x10044eb0
+MxU32 LegoUnknown100d7c88::VTable0x00()
+{
+	return m_unk0x14;
+}
diff --git a/LEGO1/legoanimationmanager.cpp b/LEGO1/lego/legoomni/src/video/legoanimationmanager.cpp
similarity index 100%
rename from LEGO1/legoanimationmanager.cpp
rename to LEGO1/lego/legoomni/src/video/legoanimationmanager.cpp
diff --git a/LEGO1/legoanimmmpresenter.cpp b/LEGO1/lego/legoomni/src/video/legoanimmmpresenter.cpp
similarity index 100%
rename from LEGO1/legoanimmmpresenter.cpp
rename to LEGO1/lego/legoomni/src/video/legoanimmmpresenter.cpp
diff --git a/LEGO1/legoanimpresenter.cpp b/LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp
similarity index 100%
rename from LEGO1/legoanimpresenter.cpp
rename to LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp
diff --git a/LEGO1/legocarbuildanimpresenter.cpp b/LEGO1/lego/legoomni/src/video/legocarbuildanimpresenter.cpp
similarity index 100%
rename from LEGO1/legocarbuildanimpresenter.cpp
rename to LEGO1/lego/legoomni/src/video/legocarbuildanimpresenter.cpp
diff --git a/LEGO1/legoflctexturepresenter.cpp b/LEGO1/lego/legoomni/src/video/legoflctexturepresenter.cpp
similarity index 100%
rename from LEGO1/legoflctexturepresenter.cpp
rename to LEGO1/lego/legoomni/src/video/legoflctexturepresenter.cpp
diff --git a/LEGO1/legohideanimpresenter.cpp b/LEGO1/lego/legoomni/src/video/legohideanimpresenter.cpp
similarity index 100%
rename from LEGO1/legohideanimpresenter.cpp
rename to LEGO1/lego/legoomni/src/video/legohideanimpresenter.cpp
diff --git a/LEGO1/legolocomotionanimpresenter.cpp b/LEGO1/lego/legoomni/src/video/legolocomotionanimpresenter.cpp
similarity index 100%
rename from LEGO1/legolocomotionanimpresenter.cpp
rename to LEGO1/lego/legoomni/src/video/legolocomotionanimpresenter.cpp
diff --git a/LEGO1/legometerpresenter.cpp b/LEGO1/lego/legoomni/src/video/legometerpresenter.cpp
similarity index 100%
rename from LEGO1/legometerpresenter.cpp
rename to LEGO1/lego/legoomni/src/video/legometerpresenter.cpp
diff --git a/LEGO1/legomodelpresenter.cpp b/LEGO1/lego/legoomni/src/video/legomodelpresenter.cpp
similarity index 100%
rename from LEGO1/legomodelpresenter.cpp
rename to LEGO1/lego/legoomni/src/video/legomodelpresenter.cpp
diff --git a/LEGO1/legopalettepresenter.cpp b/LEGO1/lego/legoomni/src/video/legopalettepresenter.cpp
similarity index 100%
rename from LEGO1/legopalettepresenter.cpp
rename to LEGO1/lego/legoomni/src/video/legopalettepresenter.cpp
diff --git a/LEGO1/legopartpresenter.cpp b/LEGO1/lego/legoomni/src/video/legopartpresenter.cpp
similarity index 100%
rename from LEGO1/legopartpresenter.cpp
rename to LEGO1/lego/legoomni/src/video/legopartpresenter.cpp
diff --git a/LEGO1/legophonemepresenter.cpp b/LEGO1/lego/legoomni/src/video/legophonemepresenter.cpp
similarity index 100%
rename from LEGO1/legophonemepresenter.cpp
rename to LEGO1/lego/legoomni/src/video/legophonemepresenter.cpp
diff --git a/LEGO1/legotexturepresenter.cpp b/LEGO1/lego/legoomni/src/video/legotexturepresenter.cpp
similarity index 100%
rename from LEGO1/legotexturepresenter.cpp
rename to LEGO1/lego/legoomni/src/video/legotexturepresenter.cpp
diff --git a/LEGO1/legovideomanager.cpp b/LEGO1/lego/legoomni/src/video/legovideomanager.cpp
similarity index 99%
rename from LEGO1/legovideomanager.cpp
rename to LEGO1/lego/legoomni/src/video/legovideomanager.cpp
index 78f3788e..43cdde24 100644
--- a/LEGO1/legovideomanager.cpp
+++ b/LEGO1/lego/legoomni/src/video/legovideomanager.cpp
@@ -1,10 +1,10 @@
 #include "legovideomanager.h"
 
 #include "legoomni.h"
-#include "legoroi.h"
 #include "mxtimer.h"
 #include "mxtransitionmanager.h"
 #include "realtime/matrix.h"
+#include "roi/legoroi.h"
 #include "tgl/d3drm/impl.h"
 #include "viewmanager/viewroi.h"
 
@@ -178,7 +178,7 @@ MxResult LegoVideoManager::Create(MxVideoParam& p_videoParam, MxU32 p_frequencyM
 	m_3dManager->Add(*m_viewROI);
 	m_3dManager->SetPointOfView(*m_viewROI);
 
-	m_unk0x100d9d00 = new MxUnknown100d9d00;
+	m_unk0x100d9d00 = new LegoUnknown100d9d00;
 	m_unk0xe4 = FALSE;
 	m_stopWatch = new MxStopWatch;
 	m_stopWatch->Start();
diff --git a/LEGO1/3dmanager/lego3dmanager.cpp b/LEGO1/lego/sources/3dmanager/lego3dmanager.cpp
similarity index 98%
rename from LEGO1/3dmanager/lego3dmanager.cpp
rename to LEGO1/lego/sources/3dmanager/lego3dmanager.cpp
index 99c977d5..4fa43a3c 100644
--- a/LEGO1/3dmanager/lego3dmanager.cpp
+++ b/LEGO1/lego/sources/3dmanager/lego3dmanager.cpp
@@ -2,8 +2,8 @@
 //
 #include "lego3dmanager.h"
 
-#include "../viewmanager/viewlodlist.h"
 #include "decomp.h"
+#include "viewmanager/viewlodlist.h"
 
 DECOMP_SIZE_ASSERT(Lego3DManager, 0x10);
 
diff --git a/LEGO1/3dmanager/lego3dmanager.h b/LEGO1/lego/sources/3dmanager/lego3dmanager.h
similarity index 100%
rename from LEGO1/3dmanager/lego3dmanager.h
rename to LEGO1/lego/sources/3dmanager/lego3dmanager.h
diff --git a/LEGO1/3dmanager/lego3dview.cpp b/LEGO1/lego/sources/3dmanager/lego3dview.cpp
similarity index 99%
rename from LEGO1/3dmanager/lego3dview.cpp
rename to LEGO1/lego/sources/3dmanager/lego3dview.cpp
index cdededa5..04c9ea22 100644
--- a/LEGO1/3dmanager/lego3dview.cpp
+++ b/LEGO1/lego/sources/3dmanager/lego3dview.cpp
@@ -3,7 +3,7 @@
 
 #include "lego3dview.h"
 
-#include "../viewmanager/viewmanager.h"
+#include "viewmanager/viewmanager.h"
 
 DECOMP_SIZE_ASSERT(Lego3DView, 0xa8)
 
diff --git a/LEGO1/3dmanager/lego3dview.h b/LEGO1/lego/sources/3dmanager/lego3dview.h
similarity index 100%
rename from LEGO1/3dmanager/lego3dview.h
rename to LEGO1/lego/sources/3dmanager/lego3dview.h
diff --git a/LEGO1/3dmanager/legoview1.cpp b/LEGO1/lego/sources/3dmanager/legoview1.cpp
similarity index 99%
rename from LEGO1/3dmanager/legoview1.cpp
rename to LEGO1/lego/sources/3dmanager/legoview1.cpp
index 57117e9c..3705eb33 100644
--- a/LEGO1/3dmanager/legoview1.cpp
+++ b/LEGO1/lego/sources/3dmanager/legoview1.cpp
@@ -3,8 +3,8 @@
 
 #include "legoview1.h"
 
-#include "../realtime/realtime.h"
 #include "decomp.h"
+#include "realtime/realtime.h"
 
 #include <vec.h> // SETMAT4
 
diff --git a/LEGO1/3dmanager/legoview1.h b/LEGO1/lego/sources/3dmanager/legoview1.h
similarity index 100%
rename from LEGO1/3dmanager/legoview1.h
rename to LEGO1/lego/sources/3dmanager/legoview1.h
diff --git a/LEGO1/3dmanager/tglsurface.cpp b/LEGO1/lego/sources/3dmanager/tglsurface.cpp
similarity index 100%
rename from LEGO1/3dmanager/tglsurface.cpp
rename to LEGO1/lego/sources/3dmanager/tglsurface.cpp
diff --git a/LEGO1/3dmanager/tglsurface.h b/LEGO1/lego/sources/3dmanager/tglsurface.h
similarity index 97%
rename from LEGO1/3dmanager/tglsurface.h
rename to LEGO1/lego/sources/3dmanager/tglsurface.h
index 1e4abc09..2ea4cf12 100644
--- a/LEGO1/3dmanager/tglsurface.h
+++ b/LEGO1/lego/sources/3dmanager/tglsurface.h
@@ -1,8 +1,8 @@
 #ifndef _TglSurface_h
 #define _TglSurface_h
 
-#include "../mxdirectx/mxstopwatch.h"
-#include "../tgl/tgl.h"
+#include "mxdirectx/mxstopwatch.h"
+#include "tgl/tgl.h"
 
 class Tgl::Renderer;
 class Tgl::Device;
diff --git a/LEGO1/legoroi.cpp b/LEGO1/lego/sources/roi/legoroi.cpp
similarity index 100%
rename from LEGO1/legoroi.cpp
rename to LEGO1/lego/sources/roi/legoroi.cpp
diff --git a/LEGO1/legoroi.h b/LEGO1/lego/sources/roi/legoroi.h
similarity index 100%
rename from LEGO1/legoroi.h
rename to LEGO1/lego/sources/roi/legoroi.h
diff --git a/LEGO1/mxdirectx/mxdirect3d.h b/LEGO1/mxdirectx/mxdirect3d.h
index 34c28b42..f0c87c69 100644
--- a/LEGO1/mxdirectx/mxdirect3d.h
+++ b/LEGO1/mxdirectx/mxdirect3d.h
@@ -1,9 +1,9 @@
 #ifndef MXDIRECT3D_H
 #define MXDIRECT3D_H
 
-#include "../mxstl/stlcompat.h"
 #include "decomp.h"
 #include "mxdirectdraw.h"
+#include "mxstl/stlcompat.h"
 
 #include <d3d.h>
 
diff --git a/LEGO1/mxparam.cpp b/LEGO1/mxparam.cpp
deleted file mode 100644
index 4faa1625..00000000
--- a/LEGO1/mxparam.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include "mxparam.h"
diff --git a/LEGO1/mxunknown100d7c88.cpp b/LEGO1/mxunknown100d7c88.cpp
deleted file mode 100644
index 04ddbf4f..00000000
--- a/LEGO1/mxunknown100d7c88.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-#include "mxunknown100d7c88.h"
-
-// FUNCTION: LEGO1 0x10044e50
-MxUnknown100d7c88::~MxUnknown100d7c88()
-{
-}
-
-// FUNCTION: LEGO1 0x10044eb0
-MxU32 MxUnknown100d7c88::VTable0x00()
-{
-	return m_unk0x14;
-}
diff --git a/LEGO1/mxunknown100d9d00.h b/LEGO1/mxunknown100d9d00.h
deleted file mode 100644
index d5dd456f..00000000
--- a/LEGO1/mxunknown100d9d00.h
+++ /dev/null
@@ -1,42 +0,0 @@
-#ifndef MXUNKNOWN100D9D00_H
-#define MXUNKNOWN100D9D00_H
-
-#include "decomp.h"
-#include "mxlist.h"
-#include "mxunknown100d7c88.h"
-
-// VTABLE: LEGO1 0x100d9cd0
-// class MxCollection<MxUnknown100d7c88 *>
-
-// VTABLE: LEGO1 0x100d9ce8
-// class MxList<MxUnknown100d7c88 *>
-
-// VTABLE: LEGO1 0x100d9d00
-// SIZE 0x18
-class MxUnknown100d9d00 : public MxList<MxUnknown100d7c88*> {
-public:
-	MxUnknown100d9d00() { SetDestroy(Destroy); }
-
-	// STUB: LEGO1 0x1007b210
-	virtual MxS8 Compare(MxUnknown100d7c88* p_a, MxUnknown100d7c88* p_b) override { return -1; } // vtable+0x14
-
-	// FUNCTION: LEGO1 0x1007b2e0
-	static void Destroy(MxUnknown100d7c88* p_element) { delete p_element; }
-};
-
-// TEMPLATE: LEGO1 0x1007b300
-// MxCollection<MxUnknown100d7c88 *>::Compare
-
-// TEMPLATE: LEGO1 0x1007b360
-// MxCollection<MxUnknown100d7c88 *>::Destroy
-
-// SYNTHETIC: LEGO1 0x1007b400
-// MxUnknown100d9d00::`scalar deleting destructor'
-
-// SYNTHETIC: LEGO1 0x1007b470
-// MxCollection<MxUnknown100d7c88 *>::`scalar deleting destructor'
-
-// SYNTHETIC: LEGO1 0x1007b4e0
-// MxList<MxUnknown100d7c88 *>::`scalar deleting destructor'
-
-#endif // MXUNKNOWN100D9D00_H
diff --git a/LEGO1/mxactionnotificationparam.h b/LEGO1/omni/include/mxactionnotificationparam.h
similarity index 100%
rename from LEGO1/mxactionnotificationparam.h
rename to LEGO1/omni/include/mxactionnotificationparam.h
diff --git a/LEGO1/mxatomid.h b/LEGO1/omni/include/mxatomid.h
similarity index 100%
rename from LEGO1/mxatomid.h
rename to LEGO1/omni/include/mxatomid.h
diff --git a/LEGO1/mxatomidcounter.h b/LEGO1/omni/include/mxatomidcounter.h
similarity index 100%
rename from LEGO1/mxatomidcounter.h
rename to LEGO1/omni/include/mxatomidcounter.h
diff --git a/LEGO1/mxaudiomanager.h b/LEGO1/omni/include/mxaudiomanager.h
similarity index 100%
rename from LEGO1/mxaudiomanager.h
rename to LEGO1/omni/include/mxaudiomanager.h
diff --git a/LEGO1/mxaudiopresenter.h b/LEGO1/omni/include/mxaudiopresenter.h
similarity index 100%
rename from LEGO1/mxaudiopresenter.h
rename to LEGO1/omni/include/mxaudiopresenter.h
diff --git a/LEGO1/mxautolocker.h b/LEGO1/omni/include/mxautolocker.h
similarity index 100%
rename from LEGO1/mxautolocker.h
rename to LEGO1/omni/include/mxautolocker.h
diff --git a/LEGO1/mxbackgroundaudiomanager.h b/LEGO1/omni/include/mxbackgroundaudiomanager.h
similarity index 100%
rename from LEGO1/mxbackgroundaudiomanager.h
rename to LEGO1/omni/include/mxbackgroundaudiomanager.h
diff --git a/LEGO1/mxbitmap.h b/LEGO1/omni/include/mxbitmap.h
similarity index 100%
rename from LEGO1/mxbitmap.h
rename to LEGO1/omni/include/mxbitmap.h
diff --git a/LEGO1/mxcollection.h b/LEGO1/omni/include/mxcollection.h
similarity index 100%
rename from LEGO1/mxcollection.h
rename to LEGO1/omni/include/mxcollection.h
diff --git a/LEGO1/mxcompositemediapresenter.h b/LEGO1/omni/include/mxcompositemediapresenter.h
similarity index 100%
rename from LEGO1/mxcompositemediapresenter.h
rename to LEGO1/omni/include/mxcompositemediapresenter.h
diff --git a/LEGO1/mxcompositepresenter.h b/LEGO1/omni/include/mxcompositepresenter.h
similarity index 100%
rename from LEGO1/mxcompositepresenter.h
rename to LEGO1/omni/include/mxcompositepresenter.h
diff --git a/LEGO1/mxcontrolpresenter.h b/LEGO1/omni/include/mxcontrolpresenter.h
similarity index 100%
rename from LEGO1/mxcontrolpresenter.h
rename to LEGO1/omni/include/mxcontrolpresenter.h
diff --git a/LEGO1/mxcore.h b/LEGO1/omni/include/mxcore.h
similarity index 100%
rename from LEGO1/mxcore.h
rename to LEGO1/omni/include/mxcore.h
diff --git a/LEGO1/mxcriticalsection.h b/LEGO1/omni/include/mxcriticalsection.h
similarity index 100%
rename from LEGO1/mxcriticalsection.h
rename to LEGO1/omni/include/mxcriticalsection.h
diff --git a/LEGO1/mxdiskstreamcontroller.h b/LEGO1/omni/include/mxdiskstreamcontroller.h
similarity index 100%
rename from LEGO1/mxdiskstreamcontroller.h
rename to LEGO1/omni/include/mxdiskstreamcontroller.h
diff --git a/LEGO1/mxdiskstreamprovider.h b/LEGO1/omni/include/mxdiskstreamprovider.h
similarity index 100%
rename from LEGO1/mxdiskstreamprovider.h
rename to LEGO1/omni/include/mxdiskstreamprovider.h
diff --git a/LEGO1/mxdisplaysurface.h b/LEGO1/omni/include/mxdisplaysurface.h
similarity index 100%
rename from LEGO1/mxdisplaysurface.h
rename to LEGO1/omni/include/mxdisplaysurface.h
diff --git a/LEGO1/mxdsaction.h b/LEGO1/omni/include/mxdsaction.h
similarity index 100%
rename from LEGO1/mxdsaction.h
rename to LEGO1/omni/include/mxdsaction.h
diff --git a/LEGO1/mxdsactionlist.h b/LEGO1/omni/include/mxdsactionlist.h
similarity index 100%
rename from LEGO1/mxdsactionlist.h
rename to LEGO1/omni/include/mxdsactionlist.h
diff --git a/LEGO1/mxdsanim.h b/LEGO1/omni/include/mxdsanim.h
similarity index 100%
rename from LEGO1/mxdsanim.h
rename to LEGO1/omni/include/mxdsanim.h
diff --git a/LEGO1/mxdsbuffer.h b/LEGO1/omni/include/mxdsbuffer.h
similarity index 100%
rename from LEGO1/mxdsbuffer.h
rename to LEGO1/omni/include/mxdsbuffer.h
diff --git a/LEGO1/mxdschunk.h b/LEGO1/omni/include/mxdschunk.h
similarity index 100%
rename from LEGO1/mxdschunk.h
rename to LEGO1/omni/include/mxdschunk.h
diff --git a/LEGO1/mxdsevent.h b/LEGO1/omni/include/mxdsevent.h
similarity index 100%
rename from LEGO1/mxdsevent.h
rename to LEGO1/omni/include/mxdsevent.h
diff --git a/LEGO1/mxdsfile.h b/LEGO1/omni/include/mxdsfile.h
similarity index 100%
rename from LEGO1/mxdsfile.h
rename to LEGO1/omni/include/mxdsfile.h
diff --git a/LEGO1/mxdsmediaaction.h b/LEGO1/omni/include/mxdsmediaaction.h
similarity index 100%
rename from LEGO1/mxdsmediaaction.h
rename to LEGO1/omni/include/mxdsmediaaction.h
diff --git a/LEGO1/mxdsmultiaction.h b/LEGO1/omni/include/mxdsmultiaction.h
similarity index 100%
rename from LEGO1/mxdsmultiaction.h
rename to LEGO1/omni/include/mxdsmultiaction.h
diff --git a/LEGO1/mxdsobject.h b/LEGO1/omni/include/mxdsobject.h
similarity index 100%
rename from LEGO1/mxdsobject.h
rename to LEGO1/omni/include/mxdsobject.h
diff --git a/LEGO1/mxdsobjectaction.h b/LEGO1/omni/include/mxdsobjectaction.h
similarity index 100%
rename from LEGO1/mxdsobjectaction.h
rename to LEGO1/omni/include/mxdsobjectaction.h
diff --git a/LEGO1/mxdsparallelaction.h b/LEGO1/omni/include/mxdsparallelaction.h
similarity index 100%
rename from LEGO1/mxdsparallelaction.h
rename to LEGO1/omni/include/mxdsparallelaction.h
diff --git a/LEGO1/mxdsselectaction.h b/LEGO1/omni/include/mxdsselectaction.h
similarity index 100%
rename from LEGO1/mxdsselectaction.h
rename to LEGO1/omni/include/mxdsselectaction.h
diff --git a/LEGO1/mxdsserialaction.h b/LEGO1/omni/include/mxdsserialaction.h
similarity index 100%
rename from LEGO1/mxdsserialaction.h
rename to LEGO1/omni/include/mxdsserialaction.h
diff --git a/LEGO1/mxdssound.h b/LEGO1/omni/include/mxdssound.h
similarity index 100%
rename from LEGO1/mxdssound.h
rename to LEGO1/omni/include/mxdssound.h
diff --git a/LEGO1/mxdssource.h b/LEGO1/omni/include/mxdssource.h
similarity index 100%
rename from LEGO1/mxdssource.h
rename to LEGO1/omni/include/mxdssource.h
diff --git a/LEGO1/mxdsstill.h b/LEGO1/omni/include/mxdsstill.h
similarity index 100%
rename from LEGO1/mxdsstill.h
rename to LEGO1/omni/include/mxdsstill.h
diff --git a/LEGO1/mxdsstreamingaction.h b/LEGO1/omni/include/mxdsstreamingaction.h
similarity index 100%
rename from LEGO1/mxdsstreamingaction.h
rename to LEGO1/omni/include/mxdsstreamingaction.h
diff --git a/LEGO1/mxdssubscriber.h b/LEGO1/omni/include/mxdssubscriber.h
similarity index 100%
rename from LEGO1/mxdssubscriber.h
rename to LEGO1/omni/include/mxdssubscriber.h
diff --git a/LEGO1/mxdstypes.h b/LEGO1/omni/include/mxdstypes.h
old mode 100755
new mode 100644
similarity index 100%
rename from LEGO1/mxdstypes.h
rename to LEGO1/omni/include/mxdstypes.h
diff --git a/LEGO1/mxentity.h b/LEGO1/omni/include/mxentity.h
similarity index 100%
rename from LEGO1/mxentity.h
rename to LEGO1/omni/include/mxentity.h
diff --git a/LEGO1/mxeventmanager.h b/LEGO1/omni/include/mxeventmanager.h
similarity index 100%
rename from LEGO1/mxeventmanager.h
rename to LEGO1/omni/include/mxeventmanager.h
diff --git a/LEGO1/mxeventpresenter.h b/LEGO1/omni/include/mxeventpresenter.h
similarity index 100%
rename from LEGO1/mxeventpresenter.h
rename to LEGO1/omni/include/mxeventpresenter.h
diff --git a/LEGO1/mxflcpresenter.h b/LEGO1/omni/include/mxflcpresenter.h
similarity index 100%
rename from LEGO1/mxflcpresenter.h
rename to LEGO1/omni/include/mxflcpresenter.h
diff --git a/LEGO1/mxhashtable.h b/LEGO1/omni/include/mxhashtable.h
similarity index 100%
rename from LEGO1/mxhashtable.h
rename to LEGO1/omni/include/mxhashtable.h
diff --git a/LEGO1/mxioinfo.h b/LEGO1/omni/include/mxioinfo.h
similarity index 100%
rename from LEGO1/mxioinfo.h
rename to LEGO1/omni/include/mxioinfo.h
diff --git a/LEGO1/mxlist.h b/LEGO1/omni/include/mxlist.h
similarity index 100%
rename from LEGO1/mxlist.h
rename to LEGO1/omni/include/mxlist.h
diff --git a/LEGO1/mxloopingflcpresenter.h b/LEGO1/omni/include/mxloopingflcpresenter.h
similarity index 100%
rename from LEGO1/mxloopingflcpresenter.h
rename to LEGO1/omni/include/mxloopingflcpresenter.h
diff --git a/LEGO1/mxloopingmidipresenter.h b/LEGO1/omni/include/mxloopingmidipresenter.h
similarity index 100%
rename from LEGO1/mxloopingmidipresenter.h
rename to LEGO1/omni/include/mxloopingmidipresenter.h
diff --git a/LEGO1/mxloopingsmkpresenter.h b/LEGO1/omni/include/mxloopingsmkpresenter.h
similarity index 100%
rename from LEGO1/mxloopingsmkpresenter.h
rename to LEGO1/omni/include/mxloopingsmkpresenter.h
diff --git a/LEGO1/mxmediamanager.h b/LEGO1/omni/include/mxmediamanager.h
similarity index 100%
rename from LEGO1/mxmediamanager.h
rename to LEGO1/omni/include/mxmediamanager.h
diff --git a/LEGO1/mxmediapresenter.h b/LEGO1/omni/include/mxmediapresenter.h
similarity index 100%
rename from LEGO1/mxmediapresenter.h
rename to LEGO1/omni/include/mxmediapresenter.h
diff --git a/LEGO1/mxmidipresenter.h b/LEGO1/omni/include/mxmidipresenter.h
similarity index 100%
rename from LEGO1/mxmidipresenter.h
rename to LEGO1/omni/include/mxmidipresenter.h
diff --git a/LEGO1/mxmusicmanager.h b/LEGO1/omni/include/mxmusicmanager.h
similarity index 100%
rename from LEGO1/mxmusicmanager.h
rename to LEGO1/omni/include/mxmusicmanager.h
diff --git a/LEGO1/mxmusicpresenter.h b/LEGO1/omni/include/mxmusicpresenter.h
similarity index 100%
rename from LEGO1/mxmusicpresenter.h
rename to LEGO1/omni/include/mxmusicpresenter.h
diff --git a/LEGO1/mxnextactiondatastart.h b/LEGO1/omni/include/mxnextactiondatastart.h
similarity index 100%
rename from LEGO1/mxnextactiondatastart.h
rename to LEGO1/omni/include/mxnextactiondatastart.h
diff --git a/LEGO1/mxnotificationmanager.h b/LEGO1/omni/include/mxnotificationmanager.h
similarity index 100%
rename from LEGO1/mxnotificationmanager.h
rename to LEGO1/omni/include/mxnotificationmanager.h
diff --git a/LEGO1/mxnotificationparam.h b/LEGO1/omni/include/mxnotificationparam.h
similarity index 100%
rename from LEGO1/mxnotificationparam.h
rename to LEGO1/omni/include/mxnotificationparam.h
diff --git a/LEGO1/mxobjectfactory.h b/LEGO1/omni/include/mxobjectfactory.h
similarity index 100%
rename from LEGO1/mxobjectfactory.h
rename to LEGO1/omni/include/mxobjectfactory.h
diff --git a/LEGO1/mxomni.h b/LEGO1/omni/include/mxomni.h
similarity index 100%
rename from LEGO1/mxomni.h
rename to LEGO1/omni/include/mxomni.h
diff --git a/LEGO1/mxomnicreateflags.h b/LEGO1/omni/include/mxomnicreateflags.h
similarity index 100%
rename from LEGO1/mxomnicreateflags.h
rename to LEGO1/omni/include/mxomnicreateflags.h
diff --git a/LEGO1/mxomnicreateparam.h b/LEGO1/omni/include/mxomnicreateparam.h
similarity index 100%
rename from LEGO1/mxomnicreateparam.h
rename to LEGO1/omni/include/mxomnicreateparam.h
diff --git a/LEGO1/mxpalette.h b/LEGO1/omni/include/mxpalette.h
similarity index 100%
rename from LEGO1/mxpalette.h
rename to LEGO1/omni/include/mxpalette.h
diff --git a/LEGO1/mxparam.h b/LEGO1/omni/include/mxparam.h
similarity index 100%
rename from LEGO1/mxparam.h
rename to LEGO1/omni/include/mxparam.h
diff --git a/LEGO1/mxpoint32.h b/LEGO1/omni/include/mxpoint32.h
old mode 100755
new mode 100644
similarity index 100%
rename from LEGO1/mxpoint32.h
rename to LEGO1/omni/include/mxpoint32.h
diff --git a/LEGO1/mxpresenter.h b/LEGO1/omni/include/mxpresenter.h
similarity index 100%
rename from LEGO1/mxpresenter.h
rename to LEGO1/omni/include/mxpresenter.h
diff --git a/LEGO1/mxpresenterlist.h b/LEGO1/omni/include/mxpresenterlist.h
similarity index 100%
rename from LEGO1/mxpresenterlist.h
rename to LEGO1/omni/include/mxpresenterlist.h
diff --git a/LEGO1/mxqueue.h b/LEGO1/omni/include/mxqueue.h
similarity index 100%
rename from LEGO1/mxqueue.h
rename to LEGO1/omni/include/mxqueue.h
diff --git a/LEGO1/mxramstreamcontroller.h b/LEGO1/omni/include/mxramstreamcontroller.h
similarity index 100%
rename from LEGO1/mxramstreamcontroller.h
rename to LEGO1/omni/include/mxramstreamcontroller.h
diff --git a/LEGO1/mxramstreamprovider.h b/LEGO1/omni/include/mxramstreamprovider.h
similarity index 100%
rename from LEGO1/mxramstreamprovider.h
rename to LEGO1/omni/include/mxramstreamprovider.h
diff --git a/LEGO1/mxrect32.h b/LEGO1/omni/include/mxrect32.h
similarity index 100%
rename from LEGO1/mxrect32.h
rename to LEGO1/omni/include/mxrect32.h
diff --git a/LEGO1/mxrectlist.h b/LEGO1/omni/include/mxrectlist.h
similarity index 100%
rename from LEGO1/mxrectlist.h
rename to LEGO1/omni/include/mxrectlist.h
diff --git a/LEGO1/mxregion.h b/LEGO1/omni/include/mxregion.h
similarity index 100%
rename from LEGO1/mxregion.h
rename to LEGO1/omni/include/mxregion.h
diff --git a/LEGO1/mxregioncursor.h b/LEGO1/omni/include/mxregioncursor.h
similarity index 100%
rename from LEGO1/mxregioncursor.h
rename to LEGO1/omni/include/mxregioncursor.h
diff --git a/LEGO1/mxregionlist.h b/LEGO1/omni/include/mxregionlist.h
similarity index 100%
rename from LEGO1/mxregionlist.h
rename to LEGO1/omni/include/mxregionlist.h
diff --git a/LEGO1/mxscheduler.h b/LEGO1/omni/include/mxscheduler.h
similarity index 100%
rename from LEGO1/mxscheduler.h
rename to LEGO1/omni/include/mxscheduler.h
diff --git a/LEGO1/mxsemaphore.h b/LEGO1/omni/include/mxsemaphore.h
similarity index 100%
rename from LEGO1/mxsemaphore.h
rename to LEGO1/omni/include/mxsemaphore.h
diff --git a/LEGO1/mxsize32.h b/LEGO1/omni/include/mxsize32.h
similarity index 100%
rename from LEGO1/mxsize32.h
rename to LEGO1/omni/include/mxsize32.h
diff --git a/LEGO1/mxsmack.h b/LEGO1/omni/include/mxsmack.h
similarity index 100%
rename from LEGO1/mxsmack.h
rename to LEGO1/omni/include/mxsmack.h
diff --git a/LEGO1/mxsmkpresenter.h b/LEGO1/omni/include/mxsmkpresenter.h
similarity index 100%
rename from LEGO1/mxsmkpresenter.h
rename to LEGO1/omni/include/mxsmkpresenter.h
diff --git a/LEGO1/mxsoundmanager.h b/LEGO1/omni/include/mxsoundmanager.h
similarity index 100%
rename from LEGO1/mxsoundmanager.h
rename to LEGO1/omni/include/mxsoundmanager.h
diff --git a/LEGO1/mxsoundpresenter.h b/LEGO1/omni/include/mxsoundpresenter.h
similarity index 100%
rename from LEGO1/mxsoundpresenter.h
rename to LEGO1/omni/include/mxsoundpresenter.h
diff --git a/LEGO1/mxstillpresenter.h b/LEGO1/omni/include/mxstillpresenter.h
similarity index 100%
rename from LEGO1/mxstillpresenter.h
rename to LEGO1/omni/include/mxstillpresenter.h
diff --git a/LEGO1/mxstreamchunk.h b/LEGO1/omni/include/mxstreamchunk.h
similarity index 100%
rename from LEGO1/mxstreamchunk.h
rename to LEGO1/omni/include/mxstreamchunk.h
diff --git a/LEGO1/mxstreamchunklist.h b/LEGO1/omni/include/mxstreamchunklist.h
similarity index 100%
rename from LEGO1/mxstreamchunklist.h
rename to LEGO1/omni/include/mxstreamchunklist.h
diff --git a/LEGO1/mxstreamcontroller.h b/LEGO1/omni/include/mxstreamcontroller.h
similarity index 100%
rename from LEGO1/mxstreamcontroller.h
rename to LEGO1/omni/include/mxstreamcontroller.h
diff --git a/LEGO1/mxstreamer.h b/LEGO1/omni/include/mxstreamer.h
similarity index 100%
rename from LEGO1/mxstreamer.h
rename to LEGO1/omni/include/mxstreamer.h
diff --git a/LEGO1/mxstreamlist.h b/LEGO1/omni/include/mxstreamlist.h
similarity index 100%
rename from LEGO1/mxstreamlist.h
rename to LEGO1/omni/include/mxstreamlist.h
diff --git a/LEGO1/mxstreamprovider.h b/LEGO1/omni/include/mxstreamprovider.h
similarity index 100%
rename from LEGO1/mxstreamprovider.h
rename to LEGO1/omni/include/mxstreamprovider.h
diff --git a/LEGO1/mxstring.h b/LEGO1/omni/include/mxstring.h
similarity index 100%
rename from LEGO1/mxstring.h
rename to LEGO1/omni/include/mxstring.h
diff --git a/LEGO1/mxstringlist.h b/LEGO1/omni/include/mxstringlist.h
similarity index 100%
rename from LEGO1/mxstringlist.h
rename to LEGO1/omni/include/mxstringlist.h
diff --git a/LEGO1/mxthread.h b/LEGO1/omni/include/mxthread.h
similarity index 100%
rename from LEGO1/mxthread.h
rename to LEGO1/omni/include/mxthread.h
diff --git a/LEGO1/mxticklemanager.h b/LEGO1/omni/include/mxticklemanager.h
similarity index 100%
rename from LEGO1/mxticklemanager.h
rename to LEGO1/omni/include/mxticklemanager.h
diff --git a/LEGO1/mxtimer.h b/LEGO1/omni/include/mxtimer.h
similarity index 100%
rename from LEGO1/mxtimer.h
rename to LEGO1/omni/include/mxtimer.h
diff --git a/LEGO1/mxtransitionmanager.h b/LEGO1/omni/include/mxtransitionmanager.h
similarity index 100%
rename from LEGO1/mxtransitionmanager.h
rename to LEGO1/omni/include/mxtransitionmanager.h
diff --git a/LEGO1/mxtype17notificationparam.h b/LEGO1/omni/include/mxtype17notificationparam.h
similarity index 100%
rename from LEGO1/mxtype17notificationparam.h
rename to LEGO1/omni/include/mxtype17notificationparam.h
diff --git a/LEGO1/mxtype18notificationparam.h b/LEGO1/omni/include/mxtype18notificationparam.h
similarity index 100%
rename from LEGO1/mxtype18notificationparam.h
rename to LEGO1/omni/include/mxtype18notificationparam.h
diff --git a/LEGO1/mxtype19notificationparam.h b/LEGO1/omni/include/mxtype19notificationparam.h
similarity index 100%
rename from LEGO1/mxtype19notificationparam.h
rename to LEGO1/omni/include/mxtype19notificationparam.h
diff --git a/LEGO1/mxtypes.h b/LEGO1/omni/include/mxtypes.h
similarity index 100%
rename from LEGO1/mxtypes.h
rename to LEGO1/omni/include/mxtypes.h
diff --git a/LEGO1/mxvariable.h b/LEGO1/omni/include/mxvariable.h
similarity index 100%
rename from LEGO1/mxvariable.h
rename to LEGO1/omni/include/mxvariable.h
diff --git a/LEGO1/mxvariabletable.h b/LEGO1/omni/include/mxvariabletable.h
similarity index 100%
rename from LEGO1/mxvariabletable.h
rename to LEGO1/omni/include/mxvariabletable.h
diff --git a/LEGO1/mxvideomanager.h b/LEGO1/omni/include/mxvideomanager.h
similarity index 100%
rename from LEGO1/mxvideomanager.h
rename to LEGO1/omni/include/mxvideomanager.h
diff --git a/LEGO1/mxvideoparam.h b/LEGO1/omni/include/mxvideoparam.h
similarity index 100%
rename from LEGO1/mxvideoparam.h
rename to LEGO1/omni/include/mxvideoparam.h
diff --git a/LEGO1/mxvideoparamflags.h b/LEGO1/omni/include/mxvideoparamflags.h
similarity index 100%
rename from LEGO1/mxvideoparamflags.h
rename to LEGO1/omni/include/mxvideoparamflags.h
diff --git a/LEGO1/mxvideopresenter.h b/LEGO1/omni/include/mxvideopresenter.h
similarity index 100%
rename from LEGO1/mxvideopresenter.h
rename to LEGO1/omni/include/mxvideopresenter.h
diff --git a/LEGO1/mxwavepresenter.h b/LEGO1/omni/include/mxwavepresenter.h
similarity index 100%
rename from LEGO1/mxwavepresenter.h
rename to LEGO1/omni/include/mxwavepresenter.h
diff --git a/LEGO1/mxdsaction.cpp b/LEGO1/omni/src/action/mxdsaction.cpp
similarity index 100%
rename from LEGO1/mxdsaction.cpp
rename to LEGO1/omni/src/action/mxdsaction.cpp
diff --git a/LEGO1/mxdsanim.cpp b/LEGO1/omni/src/action/mxdsanim.cpp
similarity index 100%
rename from LEGO1/mxdsanim.cpp
rename to LEGO1/omni/src/action/mxdsanim.cpp
diff --git a/LEGO1/mxdsevent.cpp b/LEGO1/omni/src/action/mxdsevent.cpp
similarity index 100%
rename from LEGO1/mxdsevent.cpp
rename to LEGO1/omni/src/action/mxdsevent.cpp
diff --git a/LEGO1/mxdsmediaaction.cpp b/LEGO1/omni/src/action/mxdsmediaaction.cpp
similarity index 100%
rename from LEGO1/mxdsmediaaction.cpp
rename to LEGO1/omni/src/action/mxdsmediaaction.cpp
diff --git a/LEGO1/mxdsmultiaction.cpp b/LEGO1/omni/src/action/mxdsmultiaction.cpp
similarity index 100%
rename from LEGO1/mxdsmultiaction.cpp
rename to LEGO1/omni/src/action/mxdsmultiaction.cpp
diff --git a/LEGO1/mxdsobject.cpp b/LEGO1/omni/src/action/mxdsobject.cpp
similarity index 100%
rename from LEGO1/mxdsobject.cpp
rename to LEGO1/omni/src/action/mxdsobject.cpp
diff --git a/LEGO1/mxdsobjectaction.cpp b/LEGO1/omni/src/action/mxdsobjectaction.cpp
similarity index 100%
rename from LEGO1/mxdsobjectaction.cpp
rename to LEGO1/omni/src/action/mxdsobjectaction.cpp
diff --git a/LEGO1/mxdsparallelaction.cpp b/LEGO1/omni/src/action/mxdsparallelaction.cpp
similarity index 100%
rename from LEGO1/mxdsparallelaction.cpp
rename to LEGO1/omni/src/action/mxdsparallelaction.cpp
diff --git a/LEGO1/mxdsselectaction.cpp b/LEGO1/omni/src/action/mxdsselectaction.cpp
similarity index 100%
rename from LEGO1/mxdsselectaction.cpp
rename to LEGO1/omni/src/action/mxdsselectaction.cpp
diff --git a/LEGO1/mxdsserialaction.cpp b/LEGO1/omni/src/action/mxdsserialaction.cpp
similarity index 100%
rename from LEGO1/mxdsserialaction.cpp
rename to LEGO1/omni/src/action/mxdsserialaction.cpp
diff --git a/LEGO1/mxdssound.cpp b/LEGO1/omni/src/action/mxdssound.cpp
similarity index 100%
rename from LEGO1/mxdssound.cpp
rename to LEGO1/omni/src/action/mxdssound.cpp
diff --git a/LEGO1/mxdsstill.cpp b/LEGO1/omni/src/action/mxdsstill.cpp
similarity index 100%
rename from LEGO1/mxdsstill.cpp
rename to LEGO1/omni/src/action/mxdsstill.cpp
diff --git a/LEGO1/mxdsstreamingaction.cpp b/LEGO1/omni/src/action/mxdsstreamingaction.cpp
similarity index 100%
rename from LEGO1/mxdsstreamingaction.cpp
rename to LEGO1/omni/src/action/mxdsstreamingaction.cpp
diff --git a/LEGO1/mxaudiomanager.cpp b/LEGO1/omni/src/audio/mxaudiomanager.cpp
similarity index 100%
rename from LEGO1/mxaudiomanager.cpp
rename to LEGO1/omni/src/audio/mxaudiomanager.cpp
diff --git a/LEGO1/mxaudiopresenter.cpp b/LEGO1/omni/src/audio/mxaudiopresenter.cpp
similarity index 100%
rename from LEGO1/mxaudiopresenter.cpp
rename to LEGO1/omni/src/audio/mxaudiopresenter.cpp
diff --git a/LEGO1/mxbackgroundaudiomanager.cpp b/LEGO1/omni/src/audio/mxbackgroundaudiomanager.cpp
similarity index 100%
rename from LEGO1/mxbackgroundaudiomanager.cpp
rename to LEGO1/omni/src/audio/mxbackgroundaudiomanager.cpp
diff --git a/LEGO1/mxloopingmidipresenter.cpp b/LEGO1/omni/src/audio/mxloopingmidipresenter.cpp
similarity index 100%
rename from LEGO1/mxloopingmidipresenter.cpp
rename to LEGO1/omni/src/audio/mxloopingmidipresenter.cpp
diff --git a/LEGO1/mxmidipresenter.cpp b/LEGO1/omni/src/audio/mxmidipresenter.cpp
similarity index 100%
rename from LEGO1/mxmidipresenter.cpp
rename to LEGO1/omni/src/audio/mxmidipresenter.cpp
diff --git a/LEGO1/mxmusicmanager.cpp b/LEGO1/omni/src/audio/mxmusicmanager.cpp
similarity index 100%
rename from LEGO1/mxmusicmanager.cpp
rename to LEGO1/omni/src/audio/mxmusicmanager.cpp
diff --git a/LEGO1/mxmusicpresenter.cpp b/LEGO1/omni/src/audio/mxmusicpresenter.cpp
similarity index 100%
rename from LEGO1/mxmusicpresenter.cpp
rename to LEGO1/omni/src/audio/mxmusicpresenter.cpp
diff --git a/LEGO1/mxsoundmanager.cpp b/LEGO1/omni/src/audio/mxsoundmanager.cpp
similarity index 100%
rename from LEGO1/mxsoundmanager.cpp
rename to LEGO1/omni/src/audio/mxsoundmanager.cpp
diff --git a/LEGO1/mxsoundpresenter.cpp b/LEGO1/omni/src/audio/mxsoundpresenter.cpp
similarity index 100%
rename from LEGO1/mxsoundpresenter.cpp
rename to LEGO1/omni/src/audio/mxsoundpresenter.cpp
diff --git a/LEGO1/mxwavepresenter.cpp b/LEGO1/omni/src/audio/mxwavepresenter.cpp
similarity index 100%
rename from LEGO1/mxwavepresenter.cpp
rename to LEGO1/omni/src/audio/mxwavepresenter.cpp
diff --git a/LEGO1/mxatomid.cpp b/LEGO1/omni/src/common/mxatomid.cpp
similarity index 100%
rename from LEGO1/mxatomid.cpp
rename to LEGO1/omni/src/common/mxatomid.cpp
diff --git a/LEGO1/mxatomidcounter.cpp b/LEGO1/omni/src/common/mxatomidcounter.cpp
similarity index 100%
rename from LEGO1/mxatomidcounter.cpp
rename to LEGO1/omni/src/common/mxatomidcounter.cpp
diff --git a/LEGO1/mxcompositemediapresenter.cpp b/LEGO1/omni/src/common/mxcompositemediapresenter.cpp
similarity index 100%
rename from LEGO1/mxcompositemediapresenter.cpp
rename to LEGO1/omni/src/common/mxcompositemediapresenter.cpp
diff --git a/LEGO1/mxcompositepresenter.cpp b/LEGO1/omni/src/common/mxcompositepresenter.cpp
similarity index 100%
rename from LEGO1/mxcompositepresenter.cpp
rename to LEGO1/omni/src/common/mxcompositepresenter.cpp
diff --git a/LEGO1/mxcore.cpp b/LEGO1/omni/src/common/mxcore.cpp
similarity index 100%
rename from LEGO1/mxcore.cpp
rename to LEGO1/omni/src/common/mxcore.cpp
diff --git a/LEGO1/mxmediamanager.cpp b/LEGO1/omni/src/common/mxmediamanager.cpp
similarity index 100%
rename from LEGO1/mxmediamanager.cpp
rename to LEGO1/omni/src/common/mxmediamanager.cpp
diff --git a/LEGO1/mxmediapresenter.cpp b/LEGO1/omni/src/common/mxmediapresenter.cpp
similarity index 100%
rename from LEGO1/mxmediapresenter.cpp
rename to LEGO1/omni/src/common/mxmediapresenter.cpp
diff --git a/LEGO1/mxobjectfactory.cpp b/LEGO1/omni/src/common/mxobjectfactory.cpp
similarity index 100%
rename from LEGO1/mxobjectfactory.cpp
rename to LEGO1/omni/src/common/mxobjectfactory.cpp
diff --git a/LEGO1/mxpresenter.cpp b/LEGO1/omni/src/common/mxpresenter.cpp
similarity index 100%
rename from LEGO1/mxpresenter.cpp
rename to LEGO1/omni/src/common/mxpresenter.cpp
diff --git a/LEGO1/mxstring.cpp b/LEGO1/omni/src/common/mxstring.cpp
similarity index 100%
rename from LEGO1/mxstring.cpp
rename to LEGO1/omni/src/common/mxstring.cpp
diff --git a/LEGO1/mxticklemanager.cpp b/LEGO1/omni/src/common/mxticklemanager.cpp
similarity index 100%
rename from LEGO1/mxticklemanager.cpp
rename to LEGO1/omni/src/common/mxticklemanager.cpp
diff --git a/LEGO1/mxtimer.cpp b/LEGO1/omni/src/common/mxtimer.cpp
similarity index 100%
rename from LEGO1/mxtimer.cpp
rename to LEGO1/omni/src/common/mxtimer.cpp
diff --git a/LEGO1/mxvariable.cpp b/LEGO1/omni/src/common/mxvariable.cpp
similarity index 100%
rename from LEGO1/mxvariable.cpp
rename to LEGO1/omni/src/common/mxvariable.cpp
diff --git a/LEGO1/mxvariabletable.cpp b/LEGO1/omni/src/common/mxvariabletable.cpp
similarity index 100%
rename from LEGO1/mxvariabletable.cpp
rename to LEGO1/omni/src/common/mxvariabletable.cpp
diff --git a/LEGO1/mxcontrolpresenter.cpp b/LEGO1/omni/src/control/mxcontrolpresenter.cpp
similarity index 100%
rename from LEGO1/mxcontrolpresenter.cpp
rename to LEGO1/omni/src/control/mxcontrolpresenter.cpp
diff --git a/LEGO1/mxentity.cpp b/LEGO1/omni/src/entity/mxentity.cpp
similarity index 100%
rename from LEGO1/mxentity.cpp
rename to LEGO1/omni/src/entity/mxentity.cpp
diff --git a/LEGO1/mxeventmanager.cpp b/LEGO1/omni/src/event/mxeventmanager.cpp
similarity index 100%
rename from LEGO1/mxeventmanager.cpp
rename to LEGO1/omni/src/event/mxeventmanager.cpp
diff --git a/LEGO1/mxeventpresenter.cpp b/LEGO1/omni/src/event/mxeventpresenter.cpp
similarity index 100%
rename from LEGO1/mxeventpresenter.cpp
rename to LEGO1/omni/src/event/mxeventpresenter.cpp
diff --git a/LEGO1/dllmain.cpp b/LEGO1/omni/src/main/mxmain.cpp
similarity index 100%
rename from LEGO1/dllmain.cpp
rename to LEGO1/omni/src/main/mxmain.cpp
diff --git a/LEGO1/mxomni.cpp b/LEGO1/omni/src/main/mxomni.cpp
similarity index 100%
rename from LEGO1/mxomni.cpp
rename to LEGO1/omni/src/main/mxomni.cpp
diff --git a/LEGO1/mxomnicreateflags.cpp b/LEGO1/omni/src/main/mxomnicreateflags.cpp
similarity index 100%
rename from LEGO1/mxomnicreateflags.cpp
rename to LEGO1/omni/src/main/mxomnicreateflags.cpp
diff --git a/LEGO1/mxomnicreateparam.cpp b/LEGO1/omni/src/main/mxomnicreateparam.cpp
similarity index 100%
rename from LEGO1/mxomnicreateparam.cpp
rename to LEGO1/omni/src/main/mxomnicreateparam.cpp
diff --git a/LEGO1/mxactionnotificationparam.cpp b/LEGO1/omni/src/notify/mxactionnotificationparam.cpp
similarity index 100%
rename from LEGO1/mxactionnotificationparam.cpp
rename to LEGO1/omni/src/notify/mxactionnotificationparam.cpp
diff --git a/LEGO1/mxnotificationmanager.cpp b/LEGO1/omni/src/notify/mxnotificationmanager.cpp
similarity index 100%
rename from LEGO1/mxnotificationmanager.cpp
rename to LEGO1/omni/src/notify/mxnotificationmanager.cpp
diff --git a/LEGO1/mxnotificationparam.cpp b/LEGO1/omni/src/notify/mxnotificationparam.cpp
similarity index 100%
rename from LEGO1/mxnotificationparam.cpp
rename to LEGO1/omni/src/notify/mxnotificationparam.cpp
diff --git a/LEGO1/mxtype17notificationparam.cpp b/LEGO1/omni/src/notify/mxtype17notificationparam.cpp
similarity index 100%
rename from LEGO1/mxtype17notificationparam.cpp
rename to LEGO1/omni/src/notify/mxtype17notificationparam.cpp
diff --git a/LEGO1/mxdiskstreamcontroller.cpp b/LEGO1/omni/src/stream/mxdiskstreamcontroller.cpp
similarity index 100%
rename from LEGO1/mxdiskstreamcontroller.cpp
rename to LEGO1/omni/src/stream/mxdiskstreamcontroller.cpp
diff --git a/LEGO1/mxdiskstreamprovider.cpp b/LEGO1/omni/src/stream/mxdiskstreamprovider.cpp
similarity index 100%
rename from LEGO1/mxdiskstreamprovider.cpp
rename to LEGO1/omni/src/stream/mxdiskstreamprovider.cpp
diff --git a/LEGO1/mxdsbuffer.cpp b/LEGO1/omni/src/stream/mxdsbuffer.cpp
similarity index 100%
rename from LEGO1/mxdsbuffer.cpp
rename to LEGO1/omni/src/stream/mxdsbuffer.cpp
diff --git a/LEGO1/mxdschunk.cpp b/LEGO1/omni/src/stream/mxdschunk.cpp
similarity index 100%
rename from LEGO1/mxdschunk.cpp
rename to LEGO1/omni/src/stream/mxdschunk.cpp
diff --git a/LEGO1/mxdsfile.cpp b/LEGO1/omni/src/stream/mxdsfile.cpp
similarity index 100%
rename from LEGO1/mxdsfile.cpp
rename to LEGO1/omni/src/stream/mxdsfile.cpp
diff --git a/LEGO1/mxdssource.cpp b/LEGO1/omni/src/stream/mxdssource.cpp
similarity index 100%
rename from LEGO1/mxdssource.cpp
rename to LEGO1/omni/src/stream/mxdssource.cpp
diff --git a/LEGO1/mxdssubscriber.cpp b/LEGO1/omni/src/stream/mxdssubscriber.cpp
similarity index 100%
rename from LEGO1/mxdssubscriber.cpp
rename to LEGO1/omni/src/stream/mxdssubscriber.cpp
diff --git a/LEGO1/mxioinfo.cpp b/LEGO1/omni/src/stream/mxioinfo.cpp
similarity index 100%
rename from LEGO1/mxioinfo.cpp
rename to LEGO1/omni/src/stream/mxioinfo.cpp
diff --git a/LEGO1/mxramstreamcontroller.cpp b/LEGO1/omni/src/stream/mxramstreamcontroller.cpp
similarity index 100%
rename from LEGO1/mxramstreamcontroller.cpp
rename to LEGO1/omni/src/stream/mxramstreamcontroller.cpp
diff --git a/LEGO1/mxramstreamprovider.cpp b/LEGO1/omni/src/stream/mxramstreamprovider.cpp
similarity index 100%
rename from LEGO1/mxramstreamprovider.cpp
rename to LEGO1/omni/src/stream/mxramstreamprovider.cpp
diff --git a/LEGO1/mxstreamchunk.cpp b/LEGO1/omni/src/stream/mxstreamchunk.cpp
similarity index 100%
rename from LEGO1/mxstreamchunk.cpp
rename to LEGO1/omni/src/stream/mxstreamchunk.cpp
diff --git a/LEGO1/mxstreamcontroller.cpp b/LEGO1/omni/src/stream/mxstreamcontroller.cpp
similarity index 100%
rename from LEGO1/mxstreamcontroller.cpp
rename to LEGO1/omni/src/stream/mxstreamcontroller.cpp
diff --git a/LEGO1/mxstreamer.cpp b/LEGO1/omni/src/stream/mxstreamer.cpp
similarity index 100%
rename from LEGO1/mxstreamer.cpp
rename to LEGO1/omni/src/stream/mxstreamer.cpp
diff --git a/LEGO1/mxstreamlist.cpp b/LEGO1/omni/src/stream/mxstreamlist.cpp
similarity index 100%
rename from LEGO1/mxstreamlist.cpp
rename to LEGO1/omni/src/stream/mxstreamlist.cpp
diff --git a/LEGO1/mxstreamprovider.cpp b/LEGO1/omni/src/stream/mxstreamprovider.cpp
similarity index 100%
rename from LEGO1/mxstreamprovider.cpp
rename to LEGO1/omni/src/stream/mxstreamprovider.cpp
diff --git a/LEGO1/mxautolocker.cpp b/LEGO1/omni/src/system/mxautolocker.cpp
similarity index 100%
rename from LEGO1/mxautolocker.cpp
rename to LEGO1/omni/src/system/mxautolocker.cpp
diff --git a/LEGO1/mxcriticalsection.cpp b/LEGO1/omni/src/system/mxcriticalsection.cpp
similarity index 100%
rename from LEGO1/mxcriticalsection.cpp
rename to LEGO1/omni/src/system/mxcriticalsection.cpp
diff --git a/LEGO1/mxscheduler.cpp b/LEGO1/omni/src/system/mxscheduler.cpp
similarity index 100%
rename from LEGO1/mxscheduler.cpp
rename to LEGO1/omni/src/system/mxscheduler.cpp
diff --git a/LEGO1/mxsemaphore.cpp b/LEGO1/omni/src/system/mxsemaphore.cpp
similarity index 100%
rename from LEGO1/mxsemaphore.cpp
rename to LEGO1/omni/src/system/mxsemaphore.cpp
diff --git a/LEGO1/mxthread.cpp b/LEGO1/omni/src/system/mxthread.cpp
similarity index 100%
rename from LEGO1/mxthread.cpp
rename to LEGO1/omni/src/system/mxthread.cpp
diff --git a/LEGO1/mxbitmap.cpp b/LEGO1/omni/src/video/mxbitmap.cpp
similarity index 100%
rename from LEGO1/mxbitmap.cpp
rename to LEGO1/omni/src/video/mxbitmap.cpp
diff --git a/LEGO1/mxdisplaysurface.cpp b/LEGO1/omni/src/video/mxdisplaysurface.cpp
similarity index 100%
rename from LEGO1/mxdisplaysurface.cpp
rename to LEGO1/omni/src/video/mxdisplaysurface.cpp
diff --git a/LEGO1/mxflcpresenter.cpp b/LEGO1/omni/src/video/mxflcpresenter.cpp
similarity index 100%
rename from LEGO1/mxflcpresenter.cpp
rename to LEGO1/omni/src/video/mxflcpresenter.cpp
diff --git a/LEGO1/mxloopingflcpresenter.cpp b/LEGO1/omni/src/video/mxloopingflcpresenter.cpp
similarity index 100%
rename from LEGO1/mxloopingflcpresenter.cpp
rename to LEGO1/omni/src/video/mxloopingflcpresenter.cpp
diff --git a/LEGO1/mxloopingsmkpresenter.cpp b/LEGO1/omni/src/video/mxloopingsmkpresenter.cpp
similarity index 100%
rename from LEGO1/mxloopingsmkpresenter.cpp
rename to LEGO1/omni/src/video/mxloopingsmkpresenter.cpp
diff --git a/LEGO1/mxpalette.cpp b/LEGO1/omni/src/video/mxpalette.cpp
similarity index 100%
rename from LEGO1/mxpalette.cpp
rename to LEGO1/omni/src/video/mxpalette.cpp
diff --git a/LEGO1/mxregion.cpp b/LEGO1/omni/src/video/mxregion.cpp
similarity index 100%
rename from LEGO1/mxregion.cpp
rename to LEGO1/omni/src/video/mxregion.cpp
diff --git a/LEGO1/mxregioncursor.cpp b/LEGO1/omni/src/video/mxregioncursor.cpp
similarity index 100%
rename from LEGO1/mxregioncursor.cpp
rename to LEGO1/omni/src/video/mxregioncursor.cpp
diff --git a/LEGO1/mxsmack.cpp b/LEGO1/omni/src/video/mxsmack.cpp
similarity index 100%
rename from LEGO1/mxsmack.cpp
rename to LEGO1/omni/src/video/mxsmack.cpp
diff --git a/LEGO1/mxsmkpresenter.cpp b/LEGO1/omni/src/video/mxsmkpresenter.cpp
similarity index 100%
rename from LEGO1/mxsmkpresenter.cpp
rename to LEGO1/omni/src/video/mxsmkpresenter.cpp
diff --git a/LEGO1/mxstillpresenter.cpp b/LEGO1/omni/src/video/mxstillpresenter.cpp
similarity index 100%
rename from LEGO1/mxstillpresenter.cpp
rename to LEGO1/omni/src/video/mxstillpresenter.cpp
diff --git a/LEGO1/mxtransitionmanager.cpp b/LEGO1/omni/src/video/mxtransitionmanager.cpp
similarity index 100%
rename from LEGO1/mxtransitionmanager.cpp
rename to LEGO1/omni/src/video/mxtransitionmanager.cpp
diff --git a/LEGO1/mxvideomanager.cpp b/LEGO1/omni/src/video/mxvideomanager.cpp
similarity index 100%
rename from LEGO1/mxvideomanager.cpp
rename to LEGO1/omni/src/video/mxvideomanager.cpp
diff --git a/LEGO1/mxvideoparam.cpp b/LEGO1/omni/src/video/mxvideoparam.cpp
similarity index 100%
rename from LEGO1/mxvideoparam.cpp
rename to LEGO1/omni/src/video/mxvideoparam.cpp
diff --git a/LEGO1/mxvideoparamflags.cpp b/LEGO1/omni/src/video/mxvideoparamflags.cpp
similarity index 100%
rename from LEGO1/mxvideoparamflags.cpp
rename to LEGO1/omni/src/video/mxvideoparamflags.cpp
diff --git a/LEGO1/mxvideopresenter.cpp b/LEGO1/omni/src/video/mxvideopresenter.cpp
similarity index 100%
rename from LEGO1/mxvideopresenter.cpp
rename to LEGO1/omni/src/video/mxvideopresenter.cpp
diff --git a/LEGO1/realtime/roi.h b/LEGO1/realtime/roi.h
index 287407ac..c8458cd7 100644
--- a/LEGO1/realtime/roi.h
+++ b/LEGO1/realtime/roi.h
@@ -3,10 +3,10 @@
 
 // ROI stands for Real-time Object Instance.
 
-#include "../mxstl/stlcompat.h"
-#include "../realtime/realtime.h"
 #include "compat.h"
 #include "lodlist.h"
+#include "mxstl/stlcompat.h"
+#include "realtime/realtime.h"
 #include "vector.h"
 
 /*
diff --git a/LEGO1/res/resource.h b/LEGO1/res/resource.h
index d11b6281..5a51e019 100644
--- a/LEGO1/res/resource.h
+++ b/LEGO1/res/resource.h
@@ -1,12 +1,12 @@
-#define LEGO1_ARROW  101
-#define LEGO1_LEAF4  102
-#define LEGO1_LEAF7  103
-#define LEGO1_LEAF1  104
-#define LEGO1_LEAF2  105
-#define LEGO1_LEAF6  106
-#define LEGO1_LEAF0  107
-#define LEGO1_LEAF5  108
-#define LEGO1_LEAF3  109
-#define LEGO1_BUSY   111
+#define LEGO1_ARROW 101
+#define LEGO1_LEAF4 102
+#define LEGO1_LEAF7 103
+#define LEGO1_LEAF1 104
+#define LEGO1_LEAF2 105
+#define LEGO1_LEAF6 106
+#define LEGO1_LEAF0 107
+#define LEGO1_LEAF5 108
+#define LEGO1_LEAF3 109
+#define LEGO1_BUSY 111
 
-#define APP_ICON    105
+#define APP_ICON 105
diff --git a/LEGO1/tgl/d3drm/impl.h b/LEGO1/tgl/d3drm/impl.h
index cf14ada1..4c76a365 100644
--- a/LEGO1/tgl/d3drm/impl.h
+++ b/LEGO1/tgl/d3drm/impl.h
@@ -1,7 +1,7 @@
 
-#include "../tgl.h"
 #include "compat.h"
 #include "decomp.h"
+#include "tgl/tgl.h"
 
 #include <d3drm.h>
 
diff --git a/LEGO1/viewmanager/viewlodlist.h b/LEGO1/viewmanager/viewlodlist.h
index 4d848533..9dc06d7b 100644
--- a/LEGO1/viewmanager/viewlodlist.h
+++ b/LEGO1/viewmanager/viewlodlist.h
@@ -1,10 +1,10 @@
 #ifndef VIEWLODLIST_H
 #define VIEWLODLIST_H
 
-#include "../mxstl/stlcompat.h"
-#include "../realtime/lodlist.h"
 #include "assert.h"
 #include "compat.h"
+#include "mxstl/stlcompat.h"
+#include "realtime/lodlist.h"
 
 #include <string.h>
 
diff --git a/LEGO1/viewmanager/viewroi.h b/LEGO1/viewmanager/viewroi.h
index fb2e8e54..02d69ab5 100644
--- a/LEGO1/viewmanager/viewroi.h
+++ b/LEGO1/viewmanager/viewroi.h
@@ -1,9 +1,9 @@
 #ifndef VIEWROI_H
 #define VIEWROI_H
 
-#include "../realtime/orientableroi.h"
-#include "../tgl/tgl.h"
 #include "decomp.h"
+#include "realtime/orientableroi.h"
+#include "tgl/tgl.h"
 #include "viewlodlist.h"
 
 /*
diff --git a/tools/isledecomp/.gitignore b/tools/isledecomp/.gitignore
index 00aa29cb..a7c50887 100644
--- a/tools/isledecomp/.gitignore
+++ b/tools/isledecomp/.gitignore
@@ -1 +1,2 @@
-isledecomp.egg-info/
\ No newline at end of file
+isledecomp.egg-info/
+build
\ No newline at end of file

From 091ecd5935c1b61f42dc8a55c0793154708d14d3 Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Mon, 8 Jan 2024 06:45:07 -0500
Subject: [PATCH 083/210] Move some classes to LegoOmni (#417)

---
 CMakeLists.txt                                |   7 +-
 LEGO1/lego/legoomni/include/legoomni.h        |  17 --
 LEGO1/lego/legoomni/include/legoutil.h        |  51 +-----
 .../include/mxbackgroundaudiomanager.h        |   0
 .../include/mxcompositemediapresenter.h       |   0
 .../legoomni}/include/mxtransitionmanager.h   |   0
 .../src/audio/mxbackgroundaudiomanager.cpp    |   0
 .../src/common/mxcompositemediapresenter.cpp  |   0
 LEGO1/lego/legoomni/src/main/legoomni.cpp     | 144 -----------------
 .../src/video/mxtransitionmanager.cpp         |   0
 LEGO1/omni/include/mxutil.h                   |  75 +++++++++
 LEGO1/omni/src/action/mxdsaction.cpp          |   2 +-
 LEGO1/omni/src/action/mxdsmediaaction.cpp     |   2 +-
 LEGO1/omni/src/action/mxdsobject.cpp          |   2 +-
 LEGO1/omni/src/action/mxdssound.cpp           |   2 +-
 LEGO1/omni/src/audio/mxmidipresenter.cpp      |   1 -
 LEGO1/omni/src/audio/mxwavepresenter.cpp      |   2 +-
 LEGO1/omni/src/common/mxpresenter.cpp         |   4 +-
 LEGO1/omni/src/common/mxutil.cpp              | 149 ++++++++++++++++++
 LEGO1/omni/src/control/mxcontrolpresenter.cpp |   1 -
 .../omni/src/notify/mxnotificationmanager.cpp |   2 +-
 LEGO1/omni/src/stream/mxstreamchunk.cpp       |   2 +-
 LEGO1/omni/src/stream/mxstreamcontroller.cpp  |   4 +-
 LEGO1/omni/src/stream/mxstreamer.cpp          |   2 +-
 LEGO1/omni/src/video/mxdisplaysurface.cpp     |   2 +-
 LEGO1/omni/src/video/mxstillpresenter.cpp     |   2 +-
 LEGO1/omni/src/video/mxvideomanager.cpp       |   1 -
 27 files changed, 245 insertions(+), 229 deletions(-)
 rename LEGO1/{omni => lego/legoomni}/include/mxbackgroundaudiomanager.h (100%)
 rename LEGO1/{omni => lego/legoomni}/include/mxcompositemediapresenter.h (100%)
 rename LEGO1/{omni => lego/legoomni}/include/mxtransitionmanager.h (100%)
 rename LEGO1/{omni => lego/legoomni}/src/audio/mxbackgroundaudiomanager.cpp (100%)
 rename LEGO1/{omni => lego/legoomni}/src/common/mxcompositemediapresenter.cpp (100%)
 rename LEGO1/{omni => lego/legoomni}/src/video/mxtransitionmanager.cpp (100%)
 create mode 100644 LEGO1/omni/include/mxutil.h
 create mode 100644 LEGO1/omni/src/common/mxutil.cpp

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 10f30c5b..eb5f1c25 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,6 +18,7 @@ add_library(lego1 SHARED
   LEGO1/lego/legoomni/src/audio/legocachesound.cpp
   LEGO1/lego/legoomni/src/audio/legoloadcachesoundpresenter.cpp
   LEGO1/lego/legoomni/src/audio/legosoundmanager.cpp
+  LEGO1/lego/legoomni/src/audio/mxbackgroundaudiomanager.cpp
   LEGO1/lego/legoomni/src/build/buildingentity.cpp
   LEGO1/lego/legoomni/src/build/dunebuggy.cpp
   LEGO1/lego/legoomni/src/build/helicopter.cpp
@@ -41,6 +42,7 @@ add_library(lego1 SHARED
   LEGO1/lego/legoomni/src/common/legostream.cpp
   LEGO1/lego/legoomni/src/common/legounksavedatawriter.cpp
   LEGO1/lego/legoomni/src/common/legoutil.cpp
+  LEGO1/lego/legoomni/src/common/mxcompositemediapresenter.cpp
   LEGO1/lego/legoomni/src/control/legocontrolmanager.cpp
   LEGO1/lego/legoomni/src/entity/legoactor.cpp
   LEGO1/lego/legoomni/src/entity/legoanimactor.cpp
@@ -114,6 +116,7 @@ add_library(lego1 SHARED
   LEGO1/lego/legoomni/src/video/legophonemepresenter.cpp
   LEGO1/lego/legoomni/src/video/legotexturepresenter.cpp
   LEGO1/lego/legoomni/src/video/legovideomanager.cpp
+  LEGO1/lego/legoomni/src/video/mxtransitionmanager.cpp
   LEGO1/lego/sources/3dmanager/lego3dmanager.cpp
   LEGO1/lego/sources/3dmanager/lego3dview.cpp
   LEGO1/lego/sources/3dmanager/legoview1.cpp
@@ -136,7 +139,6 @@ add_library(lego1 SHARED
   LEGO1/omni/src/action/mxdsstreamingaction.cpp
   LEGO1/omni/src/audio/mxaudiomanager.cpp
   LEGO1/omni/src/audio/mxaudiopresenter.cpp
-  LEGO1/omni/src/audio/mxbackgroundaudiomanager.cpp
   LEGO1/omni/src/audio/mxloopingmidipresenter.cpp
   LEGO1/omni/src/audio/mxmidipresenter.cpp
   LEGO1/omni/src/audio/mxmusicmanager.cpp
@@ -146,7 +148,6 @@ add_library(lego1 SHARED
   LEGO1/omni/src/audio/mxwavepresenter.cpp
   LEGO1/omni/src/common/mxatomidcounter.cpp
   LEGO1/omni/src/common/mxatomid.cpp
-  LEGO1/omni/src/common/mxcompositemediapresenter.cpp
   LEGO1/omni/src/common/mxcompositepresenter.cpp
   LEGO1/omni/src/common/mxcore.cpp
   LEGO1/omni/src/common/mxmediamanager.cpp
@@ -156,6 +157,7 @@ add_library(lego1 SHARED
   LEGO1/omni/src/common/mxstring.cpp
   LEGO1/omni/src/common/mxticklemanager.cpp
   LEGO1/omni/src/common/mxtimer.cpp
+  LEGO1/omni/src/common/mxutil.cpp
   LEGO1/omni/src/common/mxvariable.cpp
   LEGO1/omni/src/common/mxvariabletable.cpp
   LEGO1/omni/src/control/mxcontrolpresenter.cpp
@@ -201,7 +203,6 @@ add_library(lego1 SHARED
   LEGO1/omni/src/video/mxsmack.cpp
   LEGO1/omni/src/video/mxsmkpresenter.cpp
   LEGO1/omni/src/video/mxstillpresenter.cpp
-  LEGO1/omni/src/video/mxtransitionmanager.cpp
   LEGO1/omni/src/video/mxvideomanager.cpp
   LEGO1/omni/src/video/mxvideoparam.cpp
   LEGO1/omni/src/video/mxvideoparamflags.cpp
diff --git a/LEGO1/lego/legoomni/include/legoomni.h b/LEGO1/lego/legoomni/include/legoomni.h
index 613ddd85..77cf47f5 100644
--- a/LEGO1/lego/legoomni/include/legoomni.h
+++ b/LEGO1/lego/legoomni/include/legoomni.h
@@ -140,15 +140,12 @@ class LegoOmni : public MxOmni {
 };
 
 __declspec(dllexport) MxBackgroundAudioManager* BackgroundAudioManager();
-__declspec(dllexport) MxDSObject* CreateStreamObject(MxDSFile*, MxS16);
 __declspec(dllexport) LegoGameState* GameState();
 __declspec(dllexport) const char* GetNoCD_SourceName();
 __declspec(dllexport) LegoInputManager* InputManager();
 __declspec(dllexport) LegoOmni* Lego();
-__declspec(dllexport) void MakeSourceName(char*, const char*);
 __declspec(dllexport) LegoEntity* PickEntity(MxLong, MxLong);
 __declspec(dllexport) LegoROI* PickROI(MxLong, MxLong);
-__declspec(dllexport) void SetOmniUserMessage(void (*)(const char*, int));
 __declspec(dllexport) LegoSoundManager* SoundManager();
 __declspec(dllexport) MxResult Start(MxDSAction*);
 __declspec(dllexport) MxTransitionManager* TransitionManager();
@@ -159,26 +156,12 @@ LegoBuildingManager* BuildingManager();
 LegoControlManager* ControlManager();
 IslePathActor* GetCurrentVehicle();
 LegoPlantManager* PlantManager();
-MxBool KeyValueStringParse(char*, const char*, const char*);
 LegoWorld* GetCurrentWorld();
 GifManager* GetGifManager();
 void FUN_10015820(MxU32, MxU32);
 LegoEntity* FindEntityByAtomIdOrEntityId(const MxAtomId& p_atom, MxS32 p_entityid);
 MxDSAction& GetCurrentAction();
 
-MxBool FUN_100b6e10(
-	MxS32 p_bitmapWidth,
-	MxS32 p_bitmapHeight,
-	MxS32 p_videoParamWidth,
-	MxS32 p_videoParamHeight,
-	MxS32* p_left,
-	MxS32* p_top,
-	MxS32* p_right,
-	MxS32* p_bottom,
-	MxS32* p_width,
-	MxS32* p_height
-);
-
 void PlayMusic(MxU32 p_index);
 void SetIsWorldActive(MxBool p_isWorldActive);
 void RegisterScripts();
diff --git a/LEGO1/lego/legoomni/include/legoutil.h b/LEGO1/lego/legoomni/include/legoutil.h
index 827b8488..1539f28f 100644
--- a/LEGO1/lego/legoomni/include/legoutil.h
+++ b/LEGO1/lego/legoomni/include/legoutil.h
@@ -2,58 +2,13 @@
 #define LEGOUTIL_H
 
 #include "extra.h"
-#include "legoentity.h"
-#include "mxatomid.h"
 #include "mxtypes.h"
+#include "mxutil.h"
 
 #include <windows.h>
 
-template <class T>
-inline T Abs(T p_t)
-{
-	return p_t < 0 ? -p_t : p_t;
-}
-
-template <class T>
-inline T Min(T p_t1, T p_t2)
-{
-	return p_t1 < p_t2 ? p_t1 : p_t2;
-}
-
-template <class T>
-inline T Max(T p_t1, T p_t2)
-{
-	return p_t1 > p_t2 ? p_t1 : p_t2;
-}
-
-template <class T>
-inline void GetScalar(MxU8** p_source, T& p_dest)
-{
-	p_dest = *(T*) *p_source;
-	*p_source += sizeof(T);
-}
-
-template <class T>
-inline T GetScalar(T** p_source)
-{
-	T val = **p_source;
-	*p_source += 1;
-	return val;
-}
-
-template <class T>
-inline void GetDouble(MxU8** p_source, T& p_dest)
-{
-	p_dest = *(double*) *p_source;
-	*p_source += sizeof(double);
-}
-
-template <class T>
-inline void GetString(MxU8** p_source, char** p_dest, T* p_obj, void (T::*p_setter)(const char*))
-{
-	(p_obj->*p_setter)((char*) *p_source);
-	*p_source += strlen(*p_dest) + 1;
-}
+class MxAtomId;
+class LegoEntity;
 
 ExtraActionType MatchActionString(const char*);
 void InvokeAction(ExtraActionType p_actionId, MxAtomId& p_pAtom, int p_targetEntityId, LegoEntity* p_sender);
diff --git a/LEGO1/omni/include/mxbackgroundaudiomanager.h b/LEGO1/lego/legoomni/include/mxbackgroundaudiomanager.h
similarity index 100%
rename from LEGO1/omni/include/mxbackgroundaudiomanager.h
rename to LEGO1/lego/legoomni/include/mxbackgroundaudiomanager.h
diff --git a/LEGO1/omni/include/mxcompositemediapresenter.h b/LEGO1/lego/legoomni/include/mxcompositemediapresenter.h
similarity index 100%
rename from LEGO1/omni/include/mxcompositemediapresenter.h
rename to LEGO1/lego/legoomni/include/mxcompositemediapresenter.h
diff --git a/LEGO1/omni/include/mxtransitionmanager.h b/LEGO1/lego/legoomni/include/mxtransitionmanager.h
similarity index 100%
rename from LEGO1/omni/include/mxtransitionmanager.h
rename to LEGO1/lego/legoomni/include/mxtransitionmanager.h
diff --git a/LEGO1/omni/src/audio/mxbackgroundaudiomanager.cpp b/LEGO1/lego/legoomni/src/audio/mxbackgroundaudiomanager.cpp
similarity index 100%
rename from LEGO1/omni/src/audio/mxbackgroundaudiomanager.cpp
rename to LEGO1/lego/legoomni/src/audio/mxbackgroundaudiomanager.cpp
diff --git a/LEGO1/omni/src/common/mxcompositemediapresenter.cpp b/LEGO1/lego/legoomni/src/common/mxcompositemediapresenter.cpp
similarity index 100%
rename from LEGO1/omni/src/common/mxcompositemediapresenter.cpp
rename to LEGO1/lego/legoomni/src/common/mxcompositemediapresenter.cpp
diff --git a/LEGO1/lego/legoomni/src/main/legoomni.cpp b/LEGO1/lego/legoomni/src/main/legoomni.cpp
index 29150f95..9f27a980 100644
--- a/LEGO1/lego/legoomni/src/main/legoomni.cpp
+++ b/LEGO1/lego/legoomni/src/main/legoomni.cpp
@@ -111,9 +111,6 @@ MxAtomId* g_nocdSourceName = NULL;
 // GLOBAL: LEGO1 0x100f6718
 const char* g_current = "current";
 
-// GLOBAL: LEGO1 0x101020e8
-void (*g_omniUserMessage)(const char*, int);
-
 // GLOBAL: LEGO1 0x100f4c58
 MxBool g_isWorldActive = TRUE;
 
@@ -694,144 +691,3 @@ MxResult Start(MxDSAction* p_dsAction)
 {
 	return MxOmni::GetInstance()->Start(p_dsAction);
 }
-
-// Probably should be somewhere else
-// FUNCTION: LEGO1 0x100b6e10
-MxBool FUN_100b6e10(
-	MxS32 p_bitmapWidth,
-	MxS32 p_bitmapHeight,
-	MxS32 p_videoParamWidth,
-	MxS32 p_videoParamHeight,
-	MxS32* p_left,
-	MxS32* p_top,
-	MxS32* p_right,
-	MxS32* p_bottom,
-	MxS32* p_width,
-	MxS32* p_height
-)
-{
-	MxPoint32 topLeft(*p_left, *p_top);
-	MxRect32 bitmapRect(MxPoint32(0, 0), MxSize32(p_bitmapWidth, p_bitmapHeight));
-
-	MxPoint32 bottomRight(*p_right, *p_bottom);
-	MxRect32 videoParamRect(MxPoint32(0, 0), MxSize32(p_videoParamWidth, p_videoParamHeight));
-
-	MxRect32 rect(0, 0, *p_width, *p_height);
-	rect.AddPoint(topLeft);
-
-	if (!rect.IntersectsWith(bitmapRect))
-		return FALSE;
-
-	rect.Intersect(bitmapRect);
-	rect.SubtractPoint(topLeft);
-	rect.AddPoint(bottomRight);
-
-	if (!rect.IntersectsWith(videoParamRect))
-		return FALSE;
-
-	rect.Intersect(videoParamRect);
-	rect.SubtractPoint(bottomRight);
-
-	*p_left += rect.GetLeft();
-	*p_top += rect.GetTop();
-	*p_right += rect.GetLeft();
-	*p_bottom += rect.GetTop();
-	*p_width = rect.GetWidth();
-	*p_height = rect.GetHeight();
-	return TRUE;
-}
-
-// FUNCTION: LEGO1 0x100b6ff0
-void MakeSourceName(char* p_output, const char* p_input)
-{
-	const char* cln = strchr(p_input, ':');
-	if (cln) {
-		p_input = cln + 1;
-	}
-
-	strcpy(p_output, p_input);
-
-	strlwr(p_output);
-
-	char* extLoc = strstr(p_output, ".si");
-	if (extLoc) {
-		*extLoc = 0;
-	}
-}
-
-// FUNCTION: LEGO1 0x100b7050
-MxBool KeyValueStringParse(char* p_outputValue, const char* p_key, const char* p_source)
-{
-	MxBool didMatch = FALSE;
-
-	MxS16 len = strlen(p_source);
-	char* temp = new char[len + 1];
-	strcpy(temp, p_source);
-
-	char* token = strtok(temp, ", \t\r\n:");
-	while (token) {
-		len -= (strlen(token) + 1);
-
-		if (strcmpi(token, p_key) == 0) {
-			if (p_outputValue && len > 0) {
-				char* cur = &token[strlen(p_key)];
-				cur++;
-				while (*cur != ',') {
-					if (*cur == ' ' || *cur == '\0' || *cur == '\t' || *cur == '\n' || *cur == '\r')
-						break;
-					*p_outputValue++ = *cur++;
-				}
-				*p_outputValue = '\0';
-			}
-
-			didMatch = TRUE;
-			break;
-		}
-
-		token = strtok(NULL, ", \t\r\n:");
-	}
-
-	delete[] temp;
-	return didMatch;
-}
-
-// FUNCTION: LEGO1 0x100b7210
-void SetOmniUserMessage(void (*p_userMsg)(const char*, int))
-{
-	g_omniUserMessage = p_userMsg;
-}
-
-// FUNCTION: LEGO1 0x100c0280
-MxDSObject* CreateStreamObject(MxDSFile* p_file, MxS16 p_ofs)
-{
-	MxU8* buf;
-	_MMCKINFO tmpChunk;
-
-	if (p_file->Seek(((MxLong*) p_file->GetBuffer())[p_ofs], 0)) {
-		return NULL;
-	}
-
-	if (p_file->Read((MxU8*) &tmpChunk.ckid, 8) == 0 && tmpChunk.ckid == FOURCC('M', 'x', 'S', 't')) {
-		if (p_file->Read((MxU8*) &tmpChunk.ckid, 8) == 0 && tmpChunk.ckid == FOURCC('M', 'x', 'O', 'b')) {
-
-			buf = new MxU8[tmpChunk.cksize];
-			if (!buf) {
-				return NULL;
-			}
-
-			if (p_file->Read(buf, tmpChunk.cksize) != 0) {
-				return NULL;
-			}
-
-			// Save a copy so we can clean up properly, because
-			// this function will alter the pointer value.
-			MxU8* copy = buf;
-			MxDSObject* obj = DeserializeDSObjectDispatch(&buf, -1);
-			delete[] copy;
-			return obj;
-		}
-		return NULL;
-	}
-
-	return NULL;
-}
diff --git a/LEGO1/omni/src/video/mxtransitionmanager.cpp b/LEGO1/lego/legoomni/src/video/mxtransitionmanager.cpp
similarity index 100%
rename from LEGO1/omni/src/video/mxtransitionmanager.cpp
rename to LEGO1/lego/legoomni/src/video/mxtransitionmanager.cpp
diff --git a/LEGO1/omni/include/mxutil.h b/LEGO1/omni/include/mxutil.h
new file mode 100644
index 00000000..f9febef1
--- /dev/null
+++ b/LEGO1/omni/include/mxutil.h
@@ -0,0 +1,75 @@
+#ifndef MXUTIL_H
+#define MXUTIL_H
+
+#include "mxtypes.h"
+
+class MxDSFile;
+class MxDSObject;
+
+template <class T>
+inline T Abs(T p_t)
+{
+	return p_t < 0 ? -p_t : p_t;
+}
+
+template <class T>
+inline T Min(T p_t1, T p_t2)
+{
+	return p_t1 < p_t2 ? p_t1 : p_t2;
+}
+
+template <class T>
+inline T Max(T p_t1, T p_t2)
+{
+	return p_t1 > p_t2 ? p_t1 : p_t2;
+}
+
+template <class T>
+inline void GetScalar(MxU8** p_source, T& p_dest)
+{
+	p_dest = *(T*) *p_source;
+	*p_source += sizeof(T);
+}
+
+template <class T>
+inline T GetScalar(T** p_source)
+{
+	T val = **p_source;
+	*p_source += 1;
+	return val;
+}
+
+template <class T>
+inline void GetDouble(MxU8** p_source, T& p_dest)
+{
+	p_dest = *(double*) *p_source;
+	*p_source += sizeof(double);
+}
+
+template <class T>
+inline void GetString(MxU8** p_source, char** p_dest, T* p_obj, void (T::*p_setter)(const char*))
+{
+	(p_obj->*p_setter)((char*) *p_source);
+	*p_source += strlen(*p_dest) + 1;
+}
+
+MxBool FUN_100b6e10(
+	MxS32 p_bitmapWidth,
+	MxS32 p_bitmapHeight,
+	MxS32 p_videoParamWidth,
+	MxS32 p_videoParamHeight,
+	MxS32* p_left,
+	MxS32* p_top,
+	MxS32* p_right,
+	MxS32* p_bottom,
+	MxS32* p_width,
+	MxS32* p_height
+);
+
+__declspec(dllexport) void MakeSourceName(char*, const char*);
+__declspec(dllexport) void SetOmniUserMessage(void (*)(const char*, int));
+__declspec(dllexport) MxDSObject* CreateStreamObject(MxDSFile*, MxS16);
+
+MxBool KeyValueStringParse(char*, const char*, const char*);
+
+#endif // MXUTIL_H
diff --git a/LEGO1/omni/src/action/mxdsaction.cpp b/LEGO1/omni/src/action/mxdsaction.cpp
index 36533a1a..b24ff347 100644
--- a/LEGO1/omni/src/action/mxdsaction.cpp
+++ b/LEGO1/omni/src/action/mxdsaction.cpp
@@ -1,8 +1,8 @@
 #include "mxdsaction.h"
 
-#include "legoutil.h"
 #include "mxomni.h"
 #include "mxtimer.h"
+#include "mxutil.h"
 
 #include <float.h>
 #include <limits.h>
diff --git a/LEGO1/omni/src/action/mxdsmediaaction.cpp b/LEGO1/omni/src/action/mxdsmediaaction.cpp
index fb9425d2..c631dec8 100644
--- a/LEGO1/omni/src/action/mxdsmediaaction.cpp
+++ b/LEGO1/omni/src/action/mxdsmediaaction.cpp
@@ -1,6 +1,6 @@
 #include "mxdsmediaaction.h"
 
-#include "legoutil.h"
+#include "mxutil.h"
 
 DECOMP_SIZE_ASSERT(MxDSMediaAction, 0xb8)
 
diff --git a/LEGO1/omni/src/action/mxdsobject.cpp b/LEGO1/omni/src/action/mxdsobject.cpp
index 9a5801d1..7ee92937 100644
--- a/LEGO1/omni/src/action/mxdsobject.cpp
+++ b/LEGO1/omni/src/action/mxdsobject.cpp
@@ -1,6 +1,5 @@
 #include "mxdsobject.h"
 
-#include "legoutil.h"
 #include "mxdsaction.h"
 #include "mxdsanim.h"
 #include "mxdsevent.h"
@@ -13,6 +12,7 @@
 #include "mxdssound.h"
 #include "mxdsstill.h"
 #include "mxdstypes.h"
+#include "mxutil.h"
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/LEGO1/omni/src/action/mxdssound.cpp b/LEGO1/omni/src/action/mxdssound.cpp
index 359ff906..49806ce0 100644
--- a/LEGO1/omni/src/action/mxdssound.cpp
+++ b/LEGO1/omni/src/action/mxdssound.cpp
@@ -1,6 +1,6 @@
 #include "mxdssound.h"
 
-#include "legoutil.h"
+#include "mxutil.h"
 
 DECOMP_SIZE_ASSERT(MxDSSound, 0xc0)
 
diff --git a/LEGO1/omni/src/audio/mxmidipresenter.cpp b/LEGO1/omni/src/audio/mxmidipresenter.cpp
index b648eff7..ebf6ab68 100644
--- a/LEGO1/omni/src/audio/mxmidipresenter.cpp
+++ b/LEGO1/omni/src/audio/mxmidipresenter.cpp
@@ -1,7 +1,6 @@
 #include "mxmidipresenter.h"
 
 #include "decomp.h"
-#include "legoomni.h"
 #include "mxautolocker.h"
 #include "mxdssound.h"
 #include "mxmusicmanager.h"
diff --git a/LEGO1/omni/src/audio/mxwavepresenter.cpp b/LEGO1/omni/src/audio/mxwavepresenter.cpp
index 6d08a899..9c141781 100644
--- a/LEGO1/omni/src/audio/mxwavepresenter.cpp
+++ b/LEGO1/omni/src/audio/mxwavepresenter.cpp
@@ -2,11 +2,11 @@
 
 #include "decomp.h"
 #include "define.h"
-#include "legoomni.h"
 #include "mxautolocker.h"
 #include "mxdssound.h"
 #include "mxomni.h"
 #include "mxsoundmanager.h"
+#include "mxutil.h"
 
 DECOMP_SIZE_ASSERT(MxWavePresenter, 0x6c);
 DECOMP_SIZE_ASSERT(MxWavePresenter::WaveFormat, 0x1c);
diff --git a/LEGO1/omni/src/common/mxpresenter.cpp b/LEGO1/omni/src/common/mxpresenter.cpp
index 0640d550..0595aee7 100644
--- a/LEGO1/omni/src/common/mxpresenter.cpp
+++ b/LEGO1/omni/src/common/mxpresenter.cpp
@@ -2,8 +2,6 @@
 
 #include "decomp.h"
 #include "define.h"
-#include "legoobjectfactory.h"
-#include "legoomni.h"
 #include "mxactionnotificationparam.h"
 #include "mxautolocker.h"
 #include "mxcompositepresenter.h"
@@ -11,8 +9,10 @@
 #include "mxdssound.h"
 #include "mxentity.h"
 #include "mxnotificationmanager.h"
+#include "mxobjectfactory.h"
 #include "mxparam.h"
 #include "mxstreamer.h"
+#include "mxutil.h"
 
 #include <string.h>
 
diff --git a/LEGO1/omni/src/common/mxutil.cpp b/LEGO1/omni/src/common/mxutil.cpp
new file mode 100644
index 00000000..538368d1
--- /dev/null
+++ b/LEGO1/omni/src/common/mxutil.cpp
@@ -0,0 +1,149 @@
+#include "mxutil.h"
+
+#include "mxdsfile.h"
+#include "mxdsobject.h"
+#include "mxrect32.h"
+
+// GLOBAL: LEGO1 0x101020e8
+void (*g_omniUserMessage)(const char*, int);
+
+// FUNCTION: LEGO1 0x100b6e10
+MxBool FUN_100b6e10(
+	MxS32 p_bitmapWidth,
+	MxS32 p_bitmapHeight,
+	MxS32 p_videoParamWidth,
+	MxS32 p_videoParamHeight,
+	MxS32* p_left,
+	MxS32* p_top,
+	MxS32* p_right,
+	MxS32* p_bottom,
+	MxS32* p_width,
+	MxS32* p_height
+)
+{
+	MxPoint32 topLeft(*p_left, *p_top);
+	MxRect32 bitmapRect(MxPoint32(0, 0), MxSize32(p_bitmapWidth, p_bitmapHeight));
+
+	MxPoint32 bottomRight(*p_right, *p_bottom);
+	MxRect32 videoParamRect(MxPoint32(0, 0), MxSize32(p_videoParamWidth, p_videoParamHeight));
+
+	MxRect32 rect(0, 0, *p_width, *p_height);
+	rect.AddPoint(topLeft);
+
+	if (!rect.IntersectsWith(bitmapRect))
+		return FALSE;
+
+	rect.Intersect(bitmapRect);
+	rect.SubtractPoint(topLeft);
+	rect.AddPoint(bottomRight);
+
+	if (!rect.IntersectsWith(videoParamRect))
+		return FALSE;
+
+	rect.Intersect(videoParamRect);
+	rect.SubtractPoint(bottomRight);
+
+	*p_left += rect.GetLeft();
+	*p_top += rect.GetTop();
+	*p_right += rect.GetLeft();
+	*p_bottom += rect.GetTop();
+	*p_width = rect.GetWidth();
+	*p_height = rect.GetHeight();
+	return TRUE;
+}
+
+// FUNCTION: LEGO1 0x100b6ff0
+void MakeSourceName(char* p_output, const char* p_input)
+{
+	const char* cln = strchr(p_input, ':');
+	if (cln) {
+		p_input = cln + 1;
+	}
+
+	strcpy(p_output, p_input);
+
+	strlwr(p_output);
+
+	char* extLoc = strstr(p_output, ".si");
+	if (extLoc) {
+		*extLoc = 0;
+	}
+}
+
+// FUNCTION: LEGO1 0x100b7050
+MxBool KeyValueStringParse(char* p_outputValue, const char* p_key, const char* p_source)
+{
+	MxBool didMatch = FALSE;
+
+	MxS16 len = strlen(p_source);
+	char* temp = new char[len + 1];
+	strcpy(temp, p_source);
+
+	char* token = strtok(temp, ", \t\r\n:");
+	while (token) {
+		len -= (strlen(token) + 1);
+
+		if (strcmpi(token, p_key) == 0) {
+			if (p_outputValue && len > 0) {
+				char* cur = &token[strlen(p_key)];
+				cur++;
+				while (*cur != ',') {
+					if (*cur == ' ' || *cur == '\0' || *cur == '\t' || *cur == '\n' || *cur == '\r')
+						break;
+					*p_outputValue++ = *cur++;
+				}
+				*p_outputValue = '\0';
+			}
+
+			didMatch = TRUE;
+			break;
+		}
+
+		token = strtok(NULL, ", \t\r\n:");
+	}
+
+	delete[] temp;
+	return didMatch;
+}
+
+// FUNCTION: LEGO1 0x100b7210
+void SetOmniUserMessage(void (*p_userMsg)(const char*, int))
+{
+	g_omniUserMessage = p_userMsg;
+}
+
+// Should probably be somewhere else
+// FUNCTION: LEGO1 0x100c0280
+MxDSObject* CreateStreamObject(MxDSFile* p_file, MxS16 p_ofs)
+{
+	MxU8* buf;
+	_MMCKINFO tmpChunk;
+
+	if (p_file->Seek(((MxLong*) p_file->GetBuffer())[p_ofs], 0)) {
+		return NULL;
+	}
+
+	if (p_file->Read((MxU8*) &tmpChunk.ckid, 8) == 0 && tmpChunk.ckid == FOURCC('M', 'x', 'S', 't')) {
+		if (p_file->Read((MxU8*) &tmpChunk.ckid, 8) == 0 && tmpChunk.ckid == FOURCC('M', 'x', 'O', 'b')) {
+
+			buf = new MxU8[tmpChunk.cksize];
+			if (!buf) {
+				return NULL;
+			}
+
+			if (p_file->Read(buf, tmpChunk.cksize) != 0) {
+				return NULL;
+			}
+
+			// Save a copy so we can clean up properly, because
+			// this function will alter the pointer value.
+			MxU8* copy = buf;
+			MxDSObject* obj = DeserializeDSObjectDispatch(&buf, -1);
+			delete[] copy;
+			return obj;
+		}
+		return NULL;
+	}
+
+	return NULL;
+}
diff --git a/LEGO1/omni/src/control/mxcontrolpresenter.cpp b/LEGO1/omni/src/control/mxcontrolpresenter.cpp
index 47e8a720..2c7fb81d 100644
--- a/LEGO1/omni/src/control/mxcontrolpresenter.cpp
+++ b/LEGO1/omni/src/control/mxcontrolpresenter.cpp
@@ -1,6 +1,5 @@
 #include "mxcontrolpresenter.h"
 
-#include "legoomni.h"
 #include "mxticklemanager.h"
 
 DECOMP_SIZE_ASSERT(MxControlPresenter, 0x5c)
diff --git a/LEGO1/omni/src/notify/mxnotificationmanager.cpp b/LEGO1/omni/src/notify/mxnotificationmanager.cpp
index cc9f3930..37eab387 100644
--- a/LEGO1/omni/src/notify/mxnotificationmanager.cpp
+++ b/LEGO1/omni/src/notify/mxnotificationmanager.cpp
@@ -2,8 +2,8 @@
 
 #include "compat.h"
 #include "decomp.h"
-#include "legoomni.h"
 #include "mxautolocker.h"
+#include "mxomni.h"
 #include "mxparam.h"
 #include "mxticklemanager.h"
 #include "mxtypes.h"
diff --git a/LEGO1/omni/src/stream/mxstreamchunk.cpp b/LEGO1/omni/src/stream/mxstreamchunk.cpp
index 57945957..4dceabec 100644
--- a/LEGO1/omni/src/stream/mxstreamchunk.cpp
+++ b/LEGO1/omni/src/stream/mxstreamchunk.cpp
@@ -1,8 +1,8 @@
 #include "mxstreamchunk.h"
 
-#include "legoutil.h"
 #include "mxdsbuffer.h"
 #include "mxstreamlist.h"
+#include "mxutil.h"
 
 // FUNCTION: LEGO1 0x100c2fe0
 MxStreamChunk::~MxStreamChunk()
diff --git a/LEGO1/omni/src/stream/mxstreamcontroller.cpp b/LEGO1/omni/src/stream/mxstreamcontroller.cpp
index 4e054b98..caacbb5f 100644
--- a/LEGO1/omni/src/stream/mxstreamcontroller.cpp
+++ b/LEGO1/omni/src/stream/mxstreamcontroller.cpp
@@ -1,14 +1,14 @@
 #include "mxstreamcontroller.h"
 
-#include "legoomni.h"
-#include "legoutil.h"
 #include "mxautolocker.h"
 #include "mxdsmultiaction.h"
 #include "mxdsstreamingaction.h"
 #include "mxnextactiondatastart.h"
+#include "mxomni.h"
 #include "mxstl/stlcompat.h"
 #include "mxstreamchunk.h"
 #include "mxtimer.h"
+#include "mxutil.h"
 
 DECOMP_SIZE_ASSERT(MxStreamController, 0x64)
 DECOMP_SIZE_ASSERT(MxNextActionDataStart, 0x14)
diff --git a/LEGO1/omni/src/stream/mxstreamer.cpp b/LEGO1/omni/src/stream/mxstreamer.cpp
index 49fb31c3..245a757f 100644
--- a/LEGO1/omni/src/stream/mxstreamer.cpp
+++ b/LEGO1/omni/src/stream/mxstreamer.cpp
@@ -1,8 +1,8 @@
 #include "mxstreamer.h"
 
-#include "legoomni.h"
 #include "mxdiskstreamcontroller.h"
 #include "mxnotificationmanager.h"
+#include "mxomni.h"
 #include "mxramstreamcontroller.h"
 
 #include <algorithm>
diff --git a/LEGO1/omni/src/video/mxdisplaysurface.cpp b/LEGO1/omni/src/video/mxdisplaysurface.cpp
index 69d28822..e05b0816 100644
--- a/LEGO1/omni/src/video/mxdisplaysurface.cpp
+++ b/LEGO1/omni/src/video/mxdisplaysurface.cpp
@@ -1,6 +1,6 @@
 #include "mxdisplaysurface.h"
 
-#include "legoomni.h"
+#include "mxutil.h"
 #include "mxvideomanager.h"
 
 #include <windows.h>
diff --git a/LEGO1/omni/src/video/mxstillpresenter.cpp b/LEGO1/omni/src/video/mxstillpresenter.cpp
index ee659827..8e81f498 100644
--- a/LEGO1/omni/src/video/mxstillpresenter.cpp
+++ b/LEGO1/omni/src/video/mxstillpresenter.cpp
@@ -2,10 +2,10 @@
 
 #include "decomp.h"
 #include "define.h"
-#include "legoomni.h"
 #include "mxcompositepresenter.h"
 #include "mxdsmediaaction.h"
 #include "mxomni.h"
+#include "mxutil.h"
 #include "mxvideomanager.h"
 
 DECOMP_SIZE_ASSERT(MxStillPresenter, 0x6c);
diff --git a/LEGO1/omni/src/video/mxvideomanager.cpp b/LEGO1/omni/src/video/mxvideomanager.cpp
index 5ce00bab..f58ff13f 100644
--- a/LEGO1/omni/src/video/mxvideomanager.cpp
+++ b/LEGO1/omni/src/video/mxvideomanager.cpp
@@ -1,6 +1,5 @@
 #include "mxvideomanager.h"
 
-#include "legoomni.h"
 #include "mxautolocker.h"
 #include "mxpresenter.h"
 #include "mxticklemanager.h"

From 569d8ace96cd75a163bffd1bfcc0cbfddb1dcaa8 Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Sun, 7 Jan 2024 20:55:32 -0500
Subject: [PATCH 084/210] Fix actions not ending

---
 LEGO1/omni/src/common/mxmediapresenter.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LEGO1/omni/src/common/mxmediapresenter.cpp b/LEGO1/omni/src/common/mxmediapresenter.cpp
index eb05a9d4..874734e3 100644
--- a/LEGO1/omni/src/common/mxmediapresenter.cpp
+++ b/LEGO1/omni/src/common/mxmediapresenter.cpp
@@ -226,7 +226,7 @@ void MxMediaPresenter::RepeatingTickle()
 			}
 		}
 		else {
-			if (m_action->GetElapsedTime() <= m_action->GetStartTime() + m_action->GetDuration()) {
+			if (m_action->GetStartTime() + m_action->GetDuration() <= m_action->GetElapsedTime()) {
 				m_previousTickleStates |= 1 << (unsigned char) m_currentTickleState;
 				m_currentTickleState = TickleState_unk5;
 			}

From 855e548516587acc308e20c13cb584233a666a3a Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Sun, 7 Jan 2024 21:23:09 -0500
Subject: [PATCH 085/210] Make comparison more obvious

---
 LEGO1/omni/src/common/mxmediapresenter.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LEGO1/omni/src/common/mxmediapresenter.cpp b/LEGO1/omni/src/common/mxmediapresenter.cpp
index 874734e3..66b98f5c 100644
--- a/LEGO1/omni/src/common/mxmediapresenter.cpp
+++ b/LEGO1/omni/src/common/mxmediapresenter.cpp
@@ -226,7 +226,7 @@ void MxMediaPresenter::RepeatingTickle()
 			}
 		}
 		else {
-			if (m_action->GetStartTime() + m_action->GetDuration() <= m_action->GetElapsedTime()) {
+			if (m_action->GetElapsedTime() >= m_action->GetStartTime() + m_action->GetDuration()) {
 				m_previousTickleStates |= 1 << (unsigned char) m_currentTickleState;
 				m_currentTickleState = TickleState_unk5;
 			}

From 79465d358d6bb41c96832f265151477baf7a47f7 Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Sun, 7 Jan 2024 22:28:16 -0500
Subject: [PATCH 086/210] Fix MxWavePresenter::StartingTickle

---
 LEGO1/omni/src/audio/mxwavepresenter.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LEGO1/omni/src/audio/mxwavepresenter.cpp b/LEGO1/omni/src/audio/mxwavepresenter.cpp
index 9c141781..a2102ae8 100644
--- a/LEGO1/omni/src/audio/mxwavepresenter.cpp
+++ b/LEGO1/omni/src/audio/mxwavepresenter.cpp
@@ -144,7 +144,7 @@ void MxWavePresenter::ReadyTickle()
 // FUNCTION: LEGO1 0x100b1d50
 void MxWavePresenter::StartingTickle()
 {
-	MxStreamChunk* chunk = NextChunk();
+	MxStreamChunk* chunk = FUN_100b5650();
 
 	if (chunk && m_action->GetElapsedTime() >= chunk->GetTime()) {
 		MxU32 length = chunk->GetLength();

From 58ea45f4cc72e8f71b19b9817c0b40d83c4412ed Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Mon, 8 Jan 2024 13:07:13 -0500
Subject: [PATCH 087/210] Name various functions and other members (#418)

* Name various functions and other members

* Rename var
---
 .../legoomni/include/legopalettepresenter.h   |  2 +-
 .../src/common/legoactioncontrolpresenter.cpp |  2 +-
 .../src/common/mxcompositemediapresenter.cpp  |  2 +-
 .../src/video/legopalettepresenter.cpp        | 10 +--
 LEGO1/omni/include/mxdssubscriber.h           | 20 +++---
 LEGO1/omni/include/mxmediapresenter.h         | 12 ++--
 LEGO1/omni/include/mxwavepresenter.h          | 30 ++++----
 LEGO1/omni/src/audio/mxmidipresenter.cpp      |  6 +-
 LEGO1/omni/src/audio/mxwavepresenter.cpp      | 12 ++--
 LEGO1/omni/src/common/mxmediapresenter.cpp    | 72 +++++++++----------
 LEGO1/omni/src/event/mxeventpresenter.cpp     |  4 +-
 LEGO1/omni/src/stream/mxdssubscriber.cpp      | 60 ++++++++--------
 .../omni/src/video/mxloopingflcpresenter.cpp  |  4 +-
 .../omni/src/video/mxloopingsmkpresenter.cpp  | 16 ++---
 LEGO1/omni/src/video/mxstillpresenter.cpp     |  4 +-
 LEGO1/omni/src/video/mxvideopresenter.cpp     | 10 +--
 16 files changed, 133 insertions(+), 133 deletions(-)

diff --git a/LEGO1/lego/legoomni/include/legopalettepresenter.h b/LEGO1/lego/legoomni/include/legopalettepresenter.h
index f725149d..858e1097 100644
--- a/LEGO1/lego/legoomni/include/legopalettepresenter.h
+++ b/LEGO1/lego/legoomni/include/legopalettepresenter.h
@@ -28,7 +28,7 @@ class LegoPalettePresenter : public MxVideoPresenter {
 	virtual void ReadyTickle() override; // vtable+0x18
 	virtual void Destroy() override;     // vtable+0x38
 
-	MxResult ParsePallete(MxStreamChunk* p_chunk);
+	MxResult ParsePalette(MxStreamChunk* p_chunk);
 
 private:
 	void Init();
diff --git a/LEGO1/lego/legoomni/src/common/legoactioncontrolpresenter.cpp b/LEGO1/lego/legoomni/src/common/legoactioncontrolpresenter.cpp
index 5f4867ea..953aef36 100644
--- a/LEGO1/lego/legoomni/src/common/legoactioncontrolpresenter.cpp
+++ b/LEGO1/lego/legoomni/src/common/legoactioncontrolpresenter.cpp
@@ -22,7 +22,7 @@ void LegoActionControlPresenter::ReadyTickle()
 		m_previousTickleStates |= 1 << (unsigned char) m_currentTickleState;
 		m_currentTickleState = TickleState_Starting;
 
-		m_subscriber->FUN_100b8390(chunk);
+		m_subscriber->DestroyChunk(chunk);
 		if (m_compositePresenter) {
 			if (m_action->GetDuration() == -1 || m_action->GetFlags() & 1) {
 				m_compositePresenter->VTable0x60(this);
diff --git a/LEGO1/lego/legoomni/src/common/mxcompositemediapresenter.cpp b/LEGO1/lego/legoomni/src/common/mxcompositemediapresenter.cpp
index 0547c815..2a15d445 100644
--- a/LEGO1/lego/legoomni/src/common/mxcompositemediapresenter.cpp
+++ b/LEGO1/lego/legoomni/src/common/mxcompositemediapresenter.cpp
@@ -114,7 +114,7 @@ void MxCompositeMediaPresenter::StartingTickle()
 	}
 	else {
 		for (MxCompositePresenterList::iterator it = m_list.begin(); it != m_list.end(); it++) {
-			if (!(*it)->GetAction()->GetStartTime() && ((MxMediaPresenter*) *it)->FUN_100b5650() &&
+			if (!(*it)->GetAction()->GetStartTime() && ((MxMediaPresenter*) *it)->CurrentChunk() &&
 				!((*it)->GetAction()->GetFlags() & MxDSAction::Flag_Bit9)) {
 				(*it)->Tickle();
 				(*it)->GetAction()->SetFlags((*it)->GetAction()->GetFlags() | MxDSAction::Flag_Bit9);
diff --git a/LEGO1/lego/legoomni/src/video/legopalettepresenter.cpp b/LEGO1/lego/legoomni/src/video/legopalettepresenter.cpp
index f18a22c3..821942b9 100644
--- a/LEGO1/lego/legoomni/src/video/legopalettepresenter.cpp
+++ b/LEGO1/lego/legoomni/src/video/legopalettepresenter.cpp
@@ -46,7 +46,7 @@ void LegoPalettePresenter::Destroy()
 }
 
 // FUNCTION: LEGO1 0x1007a130
-MxResult LegoPalettePresenter::ParsePallete(MxStreamChunk* p_chunk)
+MxResult LegoPalettePresenter::ParsePalette(MxStreamChunk* p_chunk)
 {
 	MxU8 buffer[40];
 	RGBQUAD palleteData[256];
@@ -72,15 +72,15 @@ MxResult LegoPalettePresenter::ParsePallete(MxStreamChunk* p_chunk)
 // FUNCTION: LEGO1 0x1007a230
 void LegoPalettePresenter::ReadyTickle()
 {
-	MxStreamChunk* chunk = m_subscriber->FUN_100b8360();
+	MxStreamChunk* chunk = m_subscriber->CurrentChunk();
 	if (chunk) {
 		if (chunk->GetTime() <= m_action->GetElapsedTime()) {
 			ParseExtra();
 			m_previousTickleStates |= 1 << (unsigned char) m_currentTickleState;
 			m_currentTickleState = TickleState_Starting;
-			chunk = m_subscriber->FUN_100b8250();
-			MxResult result = ParsePallete(chunk);
-			m_subscriber->FUN_100b8390(chunk);
+			chunk = m_subscriber->NextChunk();
+			MxResult result = ParsePalette(chunk);
+			m_subscriber->DestroyChunk(chunk);
 
 			if (result == SUCCESS) {
 				VideoManager()->RealizePalette(m_palette);
diff --git a/LEGO1/omni/include/mxdssubscriber.h b/LEGO1/omni/include/mxdssubscriber.h
index 8187e354..1156be36 100644
--- a/LEGO1/omni/include/mxdssubscriber.h
+++ b/LEGO1/omni/include/mxdssubscriber.h
@@ -32,21 +32,21 @@ class MxDSSubscriber : public MxCore {
 	MxResult Create(MxStreamController* p_controller, MxU32 p_objectId, MxS16 p_unk0x48);
 	void DeleteChunks();
 	MxResult AddChunk(MxStreamChunk* p_chunk, MxBool p_append);
-	MxStreamChunk* FUN_100b8250();
-	MxStreamChunk* FUN_100b8360();
-	void FUN_100b8390(MxStreamChunk* p_chunk);
+	MxStreamChunk* NextChunk();
+	MxStreamChunk* CurrentChunk();
+	void DestroyChunk(MxStreamChunk* p_chunk);
 
 	inline MxU32 GetObjectId() { return m_objectId; }
 	inline MxS16 GetUnknown48() { return m_unk0x48; }
 
 private:
-	MxStreamChunkList m_unk0x08;        // 0x08
-	MxStreamChunkListCursor* m_unk0x20; // 0x20
-	MxStreamChunkList m_unk0x24;        // 0x24
-	MxStreamChunkListCursor* m_unk0x3c; // 0x3c
-	MxStreamController* m_controller;   // 0x40
-	MxU32 m_objectId;                   // 0x44
-	MxS16 m_unk0x48;                    // 0x48
+	MxStreamChunkList m_pendingChunks;              // 0x08
+	MxStreamChunkListCursor* m_pendingChunkCursor;  // 0x20
+	MxStreamChunkList m_consumedChunks;             // 0x24
+	MxStreamChunkListCursor* m_consumedChunkCursor; // 0x3c
+	MxStreamController* m_controller;               // 0x40
+	MxU32 m_objectId;                               // 0x44
+	MxS16 m_unk0x48;                                // 0x48
 };
 
 // SYNTHETIC: LEGO1 0x100b7de0
diff --git a/LEGO1/omni/include/mxmediapresenter.h b/LEGO1/omni/include/mxmediapresenter.h
index 32c7b6d0..64baa409 100644
--- a/LEGO1/omni/include/mxmediapresenter.h
+++ b/LEGO1/omni/include/mxmediapresenter.h
@@ -35,19 +35,19 @@ class MxMediaPresenter : public MxPresenter {
 	virtual MxResult StartAction(MxStreamController*, MxDSAction*) override; // vtable+0x3c
 	virtual void EndAction() override;                                       // vtable+0x40
 	virtual void Enable(MxBool p_enable) override;                           // vtable+0x54
-	virtual void AppendChunk(MxStreamChunk* p_chunk);                        // vtable+0x58
+	virtual void LoopChunk(MxStreamChunk* p_chunk);                          // vtable+0x58
 
 protected:
-	MxDSSubscriber* m_subscriber;      // 0x40
-	MxStreamChunkList* m_chunks;       // 0x44
-	MxStreamChunkListCursor* m_cursor; // 0x48
-	MxStreamChunk* m_currentChunk;     // 0x4c
+	MxDSSubscriber* m_subscriber;                  // 0x40
+	MxStreamChunkList* m_loopingChunks;            // 0x44
+	MxStreamChunkListCursor* m_loopingChunkCursor; // 0x48
+	MxStreamChunk* m_currentChunk;                 // 0x4c
 
 	void Init();
 	void Destroy(MxBool p_fromDestructor);
 
 public:
-	MxStreamChunk* FUN_100b5650();
+	MxStreamChunk* CurrentChunk();
 	MxStreamChunk* NextChunk();
 };
 
diff --git a/LEGO1/omni/include/mxwavepresenter.h b/LEGO1/omni/include/mxwavepresenter.h
index cd09d486..383659ab 100644
--- a/LEGO1/omni/include/mxwavepresenter.h
+++ b/LEGO1/omni/include/mxwavepresenter.h
@@ -26,21 +26,21 @@ class MxWavePresenter : public MxSoundPresenter {
 		return !strcmp(p_name, MxWavePresenter::ClassName()) || MxSoundPresenter::IsA(p_name);
 	}
 
-	virtual void ReadyTickle() override;                       // vtable+0x18
-	virtual void StartingTickle() override;                    // vtable+0x1c
-	virtual void StreamingTickle() override;                   // vtable+0x20
-	virtual void DoneTickle() override;                        // vtable+0x2c
-	virtual void ParseExtra() override;                        // vtable+0x30
-	virtual MxResult AddToManager() override;                  // vtable+0x34
-	virtual void Destroy() override;                           // vtable+0x38
-	virtual void EndAction() override;                         // vtable+0x40
-	virtual MxResult PutData() override;                       // vtable+0x4c
-	virtual void Enable(MxBool p_enable) override;             // vtable+0x54
-	virtual void AppendChunk(MxStreamChunk* p_chunk) override; // vtable+0x58
-	virtual void SetVolume(MxS32 p_volume) override;           // vtable+0x60
-	virtual void Pause();                                      // vtable+0x64
-	virtual void Resume();                                     // vtable+0x68
-	virtual MxBool IsPaused();                                 // vtable+0x6c
+	virtual void ReadyTickle() override;                     // vtable+0x18
+	virtual void StartingTickle() override;                  // vtable+0x1c
+	virtual void StreamingTickle() override;                 // vtable+0x20
+	virtual void DoneTickle() override;                      // vtable+0x2c
+	virtual void ParseExtra() override;                      // vtable+0x30
+	virtual MxResult AddToManager() override;                // vtable+0x34
+	virtual void Destroy() override;                         // vtable+0x38
+	virtual void EndAction() override;                       // vtable+0x40
+	virtual MxResult PutData() override;                     // vtable+0x4c
+	virtual void Enable(MxBool p_enable) override;           // vtable+0x54
+	virtual void LoopChunk(MxStreamChunk* p_chunk) override; // vtable+0x58
+	virtual void SetVolume(MxS32 p_volume) override;         // vtable+0x60
+	virtual void Pause();                                    // vtable+0x64
+	virtual void Resume();                                   // vtable+0x68
+	virtual MxBool IsPaused();                               // vtable+0x6c
 
 	// Reference: https://github.com/itsmattkc/SIEdit/blob/master/lib/othertypes.h
 	// SIZE 0x1c
diff --git a/LEGO1/omni/src/audio/mxmidipresenter.cpp b/LEGO1/omni/src/audio/mxmidipresenter.cpp
index ebf6ab68..95add150 100644
--- a/LEGO1/omni/src/audio/mxmidipresenter.cpp
+++ b/LEGO1/omni/src/audio/mxmidipresenter.cpp
@@ -35,7 +35,7 @@ void MxMIDIPresenter::Destroy(MxBool p_fromDestructor)
 	m_criticalSection.Enter();
 
 	if (m_subscriber && m_chunk)
-		m_subscriber->FUN_100b8390(m_chunk);
+		m_subscriber->DestroyChunk(m_chunk);
 	Init();
 
 	m_criticalSection.Leave();
@@ -50,7 +50,7 @@ void MxMIDIPresenter::ReadyTickle()
 	MxStreamChunk* chunk = NextChunk();
 
 	if (chunk) {
-		m_subscriber->FUN_100b8390(chunk);
+		m_subscriber->DestroyChunk(chunk);
 		ParseExtra();
 		m_previousTickleStates |= 1 << (unsigned char) m_currentTickleState;
 		m_currentTickleState = TickleState_Starting;
@@ -60,7 +60,7 @@ void MxMIDIPresenter::ReadyTickle()
 // FUNCTION: LEGO1 0x100c28d0
 void MxMIDIPresenter::StartingTickle()
 {
-	MxStreamChunk* chunk = FUN_100b5650();
+	MxStreamChunk* chunk = CurrentChunk();
 
 	if (chunk && m_action->GetElapsedTime() >= chunk->GetTime()) {
 		m_previousTickleStates |= 1 << (unsigned char) m_currentTickleState;
diff --git a/LEGO1/omni/src/audio/mxwavepresenter.cpp b/LEGO1/omni/src/audio/mxwavepresenter.cpp
index a2102ae8..d77ccac2 100644
--- a/LEGO1/omni/src/audio/mxwavepresenter.cpp
+++ b/LEGO1/omni/src/audio/mxwavepresenter.cpp
@@ -134,7 +134,7 @@ void MxWavePresenter::ReadyTickle()
 	if (chunk) {
 		m_waveFormat = (WaveFormat*) new MxU8[chunk->GetLength()];
 		memcpy(m_waveFormat, chunk->GetData(), chunk->GetLength());
-		m_subscriber->FUN_100b8390(chunk);
+		m_subscriber->DestroyChunk(chunk);
 		ParseExtra();
 		m_previousTickleStates |= 1 << (unsigned char) m_currentTickleState;
 		m_currentTickleState = TickleState_Starting;
@@ -144,7 +144,7 @@ void MxWavePresenter::ReadyTickle()
 // FUNCTION: LEGO1 0x100b1d50
 void MxWavePresenter::StartingTickle()
 {
-	MxStreamChunk* chunk = FUN_100b5650();
+	MxStreamChunk* chunk = CurrentChunk();
 
 	if (chunk && m_action->GetElapsedTime() >= chunk->GetTime()) {
 		MxU32 length = chunk->GetLength();
@@ -199,7 +199,7 @@ void MxWavePresenter::StreamingTickle()
 {
 	if (!m_currentChunk) {
 		if (!(m_action->GetFlags() & MxDSAction::Flag_Looping)) {
-			MxStreamChunk* chunk = FUN_100b5650();
+			MxStreamChunk* chunk = CurrentChunk();
 
 			if (chunk && chunk->GetFlags() & MxDSChunk::Flag_End && !(chunk->GetFlags() & MxDSChunk::Flag_Bit16)) {
 				chunk->SetFlags(chunk->GetFlags() | MxDSChunk::Flag_Bit16);
@@ -237,11 +237,11 @@ void MxWavePresenter::DoneTickle()
 }
 
 // FUNCTION: LEGO1 0x100b2130
-void MxWavePresenter::AppendChunk(MxStreamChunk* p_chunk)
+void MxWavePresenter::LoopChunk(MxStreamChunk* p_chunk)
 {
 	WriteToSoundBuffer(p_chunk->GetData(), p_chunk->GetLength());
 	if (IsEnabled())
-		m_subscriber->FUN_100b8390(p_chunk);
+		m_subscriber->DestroyChunk(p_chunk);
 }
 
 // FUNCTION: LEGO1 0x100b2160
@@ -254,7 +254,7 @@ MxResult MxWavePresenter::PutData()
 		case TickleState_Streaming:
 			if (m_currentChunk && FUN_100b1ba0()) {
 				WriteToSoundBuffer(m_currentChunk->GetData(), m_currentChunk->GetLength());
-				m_subscriber->FUN_100b8390(m_currentChunk);
+				m_subscriber->DestroyChunk(m_currentChunk);
 				m_currentChunk = NULL;
 			}
 
diff --git a/LEGO1/omni/src/common/mxmediapresenter.cpp b/LEGO1/omni/src/common/mxmediapresenter.cpp
index 66b98f5c..a9383e4d 100644
--- a/LEGO1/omni/src/common/mxmediapresenter.cpp
+++ b/LEGO1/omni/src/common/mxmediapresenter.cpp
@@ -27,8 +27,8 @@ void MxMediaPresenter::Destroy()
 void MxMediaPresenter::Init()
 {
 	this->m_subscriber = NULL;
-	this->m_chunks = NULL;
-	this->m_cursor = NULL;
+	this->m_loopingChunks = NULL;
+	this->m_loopingChunkCursor = NULL;
 	this->m_currentChunk = NULL;
 }
 
@@ -39,22 +39,22 @@ void MxMediaPresenter::Destroy(MxBool p_fromDestructor)
 		MxAutoLocker lock(&m_criticalSection);
 
 		if (m_currentChunk && m_subscriber)
-			m_subscriber->FUN_100b8390(m_currentChunk);
+			m_subscriber->DestroyChunk(m_currentChunk);
 
 		if (m_subscriber)
 			delete m_subscriber;
 
-		if (m_cursor)
-			delete m_cursor;
+		if (m_loopingChunkCursor)
+			delete m_loopingChunkCursor;
 
-		if (m_chunks) {
-			MxStreamChunkListCursor cursor(m_chunks);
+		if (m_loopingChunks) {
+			MxStreamChunkListCursor cursor(m_loopingChunks);
 			MxStreamChunk* chunk;
 
 			while (cursor.Next(chunk))
 				chunk->Release();
 
-			delete m_chunks;
+			delete m_loopingChunks;
 		}
 
 		Init();
@@ -65,44 +65,44 @@ void MxMediaPresenter::Destroy(MxBool p_fromDestructor)
 }
 
 // FUNCTION: LEGO1 0x100b5650
-MxStreamChunk* MxMediaPresenter::FUN_100b5650()
+MxStreamChunk* MxMediaPresenter::CurrentChunk()
 {
-	MxStreamChunk* result = NULL;
+	MxStreamChunk* chunk = NULL;
 
 	if (m_subscriber) {
-		result = m_subscriber->FUN_100b8360();
+		chunk = m_subscriber->CurrentChunk();
 
-		if (result && result->GetFlags() & MxDSChunk::Flag_Bit3) {
+		if (chunk && chunk->GetFlags() & MxDSChunk::Flag_Bit3) {
 			m_action->SetFlags(m_action->GetFlags() | MxDSAction::Flag_Bit7);
-			m_subscriber->FUN_100b8250();
-			m_subscriber->FUN_100b8390(result);
-			result = NULL;
+			m_subscriber->NextChunk();
+			m_subscriber->DestroyChunk(chunk);
+			chunk = NULL;
 			m_previousTickleStates |= 1 << (unsigned char) m_currentTickleState;
 			m_currentTickleState = TickleState_Done;
 		}
 	}
 
-	return result;
+	return chunk;
 }
 
 // FUNCTION: LEGO1 0x100b56b0
 MxStreamChunk* MxMediaPresenter::NextChunk()
 {
-	MxStreamChunk* result = NULL;
+	MxStreamChunk* chunk = NULL;
 
 	if (m_subscriber) {
-		result = m_subscriber->FUN_100b8250();
+		chunk = m_subscriber->NextChunk();
 
-		if (result && result->GetFlags() & MxDSChunk::Flag_Bit3) {
+		if (chunk && chunk->GetFlags() & MxDSChunk::Flag_Bit3) {
 			m_action->SetFlags(m_action->GetFlags() | MxDSAction::Flag_Bit7);
-			m_subscriber->FUN_100b8390(result);
-			result = NULL;
+			m_subscriber->DestroyChunk(chunk);
+			chunk = NULL;
 			m_previousTickleStates |= 1 << (unsigned char) m_currentTickleState;
 			m_currentTickleState = TickleState_Done;
 		}
 	}
 
-	return result;
+	return chunk;
 }
 
 // FUNCTION: LEGO1 0x100b5700
@@ -113,10 +113,10 @@ MxResult MxMediaPresenter::StartAction(MxStreamController* p_controller, MxDSAct
 
 	if (MxPresenter::StartAction(p_controller, p_action) == SUCCESS) {
 		if (m_action->GetFlags() & MxDSAction::Flag_Looping) {
-			m_chunks = new MxStreamChunkList;
-			m_cursor = new MxStreamChunkListCursor(m_chunks);
+			m_loopingChunks = new MxStreamChunkList;
+			m_loopingChunkCursor = new MxStreamChunkListCursor(m_loopingChunks);
 
-			if (!m_chunks && !m_cursor)
+			if (!m_loopingChunks && !m_loopingChunkCursor)
 				goto done;
 		}
 
@@ -180,7 +180,7 @@ MxResult MxMediaPresenter::Tickle()
 {
 	MxAutoLocker lock(&m_criticalSection);
 
-	FUN_100b5650();
+	CurrentChunk();
 
 	return MxPresenter::Tickle();
 }
@@ -193,16 +193,16 @@ void MxMediaPresenter::StreamingTickle()
 
 		if (m_currentChunk) {
 			if (m_currentChunk->GetFlags() & MxDSChunk::Flag_End) {
-				m_subscriber->FUN_100b8390(m_currentChunk);
+				m_subscriber->DestroyChunk(m_currentChunk);
 				m_currentChunk = NULL;
 				m_previousTickleStates |= 1 << (unsigned char) m_currentTickleState;
 				m_currentTickleState = TickleState_Repeating;
 			}
 			else if (m_action->GetFlags() & MxDSAction::Flag_Looping) {
-				AppendChunk(m_currentChunk);
+				LoopChunk(m_currentChunk);
 
 				if (!IsEnabled()) {
-					m_subscriber->FUN_100b8390(m_currentChunk);
+					m_subscriber->DestroyChunk(m_currentChunk);
 					m_currentChunk = NULL;
 				}
 			}
@@ -214,9 +214,9 @@ void MxMediaPresenter::StreamingTickle()
 void MxMediaPresenter::RepeatingTickle()
 {
 	if (IsEnabled() && !m_currentChunk) {
-		if (m_cursor)
-			if (!m_cursor->Next(m_currentChunk))
-				m_cursor->Next(m_currentChunk);
+		if (m_loopingChunkCursor)
+			if (!m_loopingChunkCursor->Next(m_currentChunk))
+				m_loopingChunkCursor->Next(m_currentChunk);
 
 		if (m_currentChunk) {
 			MxLong time = m_currentChunk->GetTime();
@@ -243,7 +243,7 @@ void MxMediaPresenter::DoneTickle()
 }
 
 // FUNCTION: LEGO1 0x100b5f10
-void MxMediaPresenter::AppendChunk(MxStreamChunk* p_chunk)
+void MxMediaPresenter::LoopChunk(MxStreamChunk* p_chunk)
 {
 	MxStreamChunk* chunk = new MxStreamChunk;
 
@@ -253,7 +253,7 @@ void MxMediaPresenter::AppendChunk(MxStreamChunk* p_chunk)
 	chunk->SetTime(p_chunk->GetTime());
 
 	memcpy(chunk->GetData(), p_chunk->GetData(), chunk->GetLength());
-	m_chunks->Append(chunk);
+	m_loopingChunks->Append(chunk);
 }
 
 // FUNCTION: LEGO1 0x100b6030
@@ -268,8 +268,8 @@ void MxMediaPresenter::Enable(MxBool p_enable)
 			SetTickleState(TickleState_Repeating);
 		}
 		else {
-			if (m_cursor)
-				m_cursor->Reset();
+			if (m_loopingChunkCursor)
+				m_loopingChunkCursor->Reset();
 			m_currentChunk = NULL;
 			SetTickleState(TickleState_Done);
 		}
diff --git a/LEGO1/omni/src/event/mxeventpresenter.cpp b/LEGO1/omni/src/event/mxeventpresenter.cpp
index ce3fdbdf..6a0a0cbd 100644
--- a/LEGO1/omni/src/event/mxeventpresenter.cpp
+++ b/LEGO1/omni/src/event/mxeventpresenter.cpp
@@ -69,7 +69,7 @@ void MxEventPresenter::ReadyTickle()
 
 	if (chunk) {
 		CopyData(chunk);
-		m_subscriber->FUN_100b8390(chunk);
+		m_subscriber->DestroyChunk(chunk);
 		ParseExtra();
 		m_previousTickleStates |= 1 << (unsigned char) m_currentTickleState;
 		m_currentTickleState = TickleState_Starting;
@@ -107,7 +107,7 @@ MxResult MxEventPresenter::PutData()
 				}
 
 				if (m_currentTickleState == TickleState_Streaming)
-					m_subscriber->FUN_100b8390(m_currentChunk);
+					m_subscriber->DestroyChunk(m_currentChunk);
 				m_currentChunk = NULL;
 			}
 		}
diff --git a/LEGO1/omni/src/stream/mxdssubscriber.cpp b/LEGO1/omni/src/stream/mxdssubscriber.cpp
index f50d34a1..f93969e1 100644
--- a/LEGO1/omni/src/stream/mxdssubscriber.cpp
+++ b/LEGO1/omni/src/stream/mxdssubscriber.cpp
@@ -9,8 +9,8 @@ MxDSSubscriber::MxDSSubscriber()
 {
 	m_unk0x48 = -1;
 	m_objectId = -1;
-	m_unk0x20 = NULL;
-	m_unk0x3c = NULL;
+	m_pendingChunkCursor = NULL;
+	m_consumedChunkCursor = NULL;
 }
 
 // FUNCTION: LEGO1 0x100b7e00
@@ -21,13 +21,13 @@ MxDSSubscriber::~MxDSSubscriber()
 
 	DeleteChunks();
 
-	if (m_unk0x20)
-		delete m_unk0x20;
-	m_unk0x20 = NULL;
+	if (m_pendingChunkCursor)
+		delete m_pendingChunkCursor;
+	m_pendingChunkCursor = NULL;
 
-	if (m_unk0x3c)
-		delete m_unk0x3c;
-	m_unk0x3c = NULL;
+	if (m_consumedChunkCursor)
+		delete m_consumedChunkCursor;
+	m_consumedChunkCursor = NULL;
 }
 
 // FUNCTION: LEGO1 0x100b7ed0
@@ -40,12 +40,12 @@ MxResult MxDSSubscriber::Create(MxStreamController* p_controller, MxU32 p_object
 		return FAILURE;
 	m_controller = p_controller;
 
-	m_unk0x20 = new MxStreamChunkListCursor(&m_unk0x08);
-	if (!m_unk0x20)
+	m_pendingChunkCursor = new MxStreamChunkListCursor(&m_pendingChunks);
+	if (!m_pendingChunkCursor)
 		return FAILURE;
 
-	m_unk0x3c = new MxStreamChunkListCursor(&m_unk0x24);
-	if (!m_unk0x3c)
+	m_consumedChunkCursor = new MxStreamChunkListCursor(&m_consumedChunks);
+	if (!m_consumedChunkCursor)
 		return FAILURE;
 
 	m_controller->AddSubscriber(this);
@@ -58,13 +58,13 @@ void MxDSSubscriber::DeleteChunks()
 	if (m_controller) {
 		MxStreamChunk* chunk = NULL;
 
-		while (m_unk0x20->First(chunk)) {
-			m_unk0x20->Detach();
+		while (m_pendingChunkCursor->First(chunk)) {
+			m_pendingChunkCursor->Detach();
 			delete chunk;
 		}
 
-		while (m_unk0x3c->First(chunk)) {
-			m_unk0x3c->Detach();
+		while (m_consumedChunkCursor->First(chunk)) {
+			m_consumedChunkCursor->Detach();
 			delete chunk;
 		}
 	}
@@ -73,49 +73,49 @@ void MxDSSubscriber::DeleteChunks()
 // FUNCTION: LEGO1 0x100b8150
 MxResult MxDSSubscriber::AddChunk(MxStreamChunk* p_chunk, MxBool p_append)
 {
-	if (m_unk0x20) {
+	if (m_pendingChunkCursor) {
 		if (p_append)
-			m_unk0x08.Append(p_chunk);
+			m_pendingChunks.Append(p_chunk);
 		else
-			m_unk0x08.Prepend(p_chunk);
+			m_pendingChunks.Prepend(p_chunk);
 	}
 
 	return SUCCESS;
 }
 
 // FUNCTION: LEGO1 0x100b8250
-MxStreamChunk* MxDSSubscriber::FUN_100b8250()
+MxStreamChunk* MxDSSubscriber::NextChunk()
 {
 	MxStreamChunk* chunk = NULL;
 
-	if (m_unk0x20)
-		m_unk0x20->First(chunk);
+	if (m_pendingChunkCursor)
+		m_pendingChunkCursor->First(chunk);
 
 	if (chunk) {
-		m_unk0x20->Detach();
-		m_unk0x24.Append(chunk);
+		m_pendingChunkCursor->Detach();
+		m_consumedChunks.Append(chunk);
 	}
 
 	return chunk;
 }
 
 // FUNCTION: LEGO1 0x100b8360
-MxStreamChunk* MxDSSubscriber::FUN_100b8360()
+MxStreamChunk* MxDSSubscriber::CurrentChunk()
 {
 	MxStreamChunk* chunk = NULL;
 
-	if (m_unk0x20)
-		m_unk0x20->First(chunk);
+	if (m_pendingChunkCursor)
+		m_pendingChunkCursor->First(chunk);
 
 	return chunk;
 }
 
 // FUNCTION: LEGO1 0x100b8390
-void MxDSSubscriber::FUN_100b8390(MxStreamChunk* p_chunk)
+void MxDSSubscriber::DestroyChunk(MxStreamChunk* p_chunk)
 {
 	if (p_chunk) {
-		if (m_unk0x3c->Find(p_chunk)) {
-			m_unk0x3c->Detach();
+		if (m_consumedChunkCursor->Find(p_chunk)) {
+			m_consumedChunkCursor->Detach();
 			if (p_chunk)
 				delete p_chunk;
 		}
diff --git a/LEGO1/omni/src/video/mxloopingflcpresenter.cpp b/LEGO1/omni/src/video/mxloopingflcpresenter.cpp
index 152bd385..fdd991a9 100644
--- a/LEGO1/omni/src/video/mxloopingflcpresenter.cpp
+++ b/LEGO1/omni/src/video/mxloopingflcpresenter.cpp
@@ -46,9 +46,9 @@ void MxLoopingFlcPresenter::NextFrame()
 	}
 	else {
 		LoadFrame(chunk);
-		AppendChunk(chunk);
+		LoopChunk(chunk);
 		m_unk0x68 += m_flicHeader->speed;
 	}
 
-	m_subscriber->FUN_100b8390(chunk);
+	m_subscriber->DestroyChunk(chunk);
 }
diff --git a/LEGO1/omni/src/video/mxloopingsmkpresenter.cpp b/LEGO1/omni/src/video/mxloopingsmkpresenter.cpp
index 8d0f4d00..efa758cd 100644
--- a/LEGO1/omni/src/video/mxloopingsmkpresenter.cpp
+++ b/LEGO1/omni/src/video/mxloopingsmkpresenter.cpp
@@ -57,11 +57,11 @@ void MxLoopingSmkPresenter::NextFrame()
 	}
 	else {
 		LoadFrame(chunk);
-		AppendChunk(chunk);
+		LoopChunk(chunk);
 		m_elapsedDuration += 1000 / ((MxDSMediaAction*) m_action)->GetFramesPerSecond();
 	}
 
-	m_subscriber->FUN_100b8390(chunk);
+	m_subscriber->DestroyChunk(chunk);
 }
 
 // FUNCTION: LEGO1 0x100b4a90
@@ -73,7 +73,7 @@ void MxLoopingSmkPresenter::VTable0x8c()
 	}
 	else {
 		MxStreamChunk* chunk;
-		m_cursor->Current(chunk);
+		m_loopingChunkCursor->Current(chunk);
 		LoadFrame(chunk);
 		m_elapsedDuration += 1000 / ((MxDSMediaAction*) m_action)->GetFramesPerSecond();
 	}
@@ -83,9 +83,9 @@ void MxLoopingSmkPresenter::VTable0x8c()
 void MxLoopingSmkPresenter::RepeatingTickle()
 {
 	for (MxS16 i = 0; i < m_unk0x5c; i++) {
-		if (!m_cursor->HasMatch()) {
+		if (!m_loopingChunkCursor->HasMatch()) {
 			MxStreamChunk* chunk;
-			MxStreamChunkListCursor cursor(m_chunks);
+			MxStreamChunkListCursor cursor(m_loopingChunks);
 
 			cursor.Last(chunk);
 			MxLong time = chunk->GetTime();
@@ -99,18 +99,18 @@ void MxLoopingSmkPresenter::RepeatingTickle()
 			while (cursor.Next(chunk))
 				chunk->SetTime(chunk->GetTime() + time);
 
-			m_cursor->Next();
+			m_loopingChunkCursor->Next();
 		}
 
 		MxStreamChunk* chunk;
-		m_cursor->Current(chunk);
+		m_loopingChunkCursor->Current(chunk);
 
 		if (m_action->GetElapsedTime() < chunk->GetTime())
 			break;
 
 		VTable0x8c();
 
-		m_cursor->Next(chunk);
+		m_loopingChunkCursor->Next(chunk);
 
 		if (m_currentTickleState != TickleState_Repeating)
 			break;
diff --git a/LEGO1/omni/src/video/mxstillpresenter.cpp b/LEGO1/omni/src/video/mxstillpresenter.cpp
index 8e81f498..20e6b3a2 100644
--- a/LEGO1/omni/src/video/mxstillpresenter.cpp
+++ b/LEGO1/omni/src/video/mxstillpresenter.cpp
@@ -63,7 +63,7 @@ void MxStillPresenter::NextFrame()
 {
 	MxStreamChunk* chunk = NextChunk();
 	LoadFrame(chunk);
-	m_subscriber->FUN_100b8390(chunk);
+	m_subscriber->DestroyChunk(chunk);
 }
 
 // FUNCTION: LEGO1 0x100b9dd0
@@ -122,7 +122,7 @@ void MxStillPresenter::StartingTickle()
 // FUNCTION: LEGO1 0x100b9f90
 void MxStillPresenter::StreamingTickle()
 {
-	MxStreamChunk* chunk = FUN_100b5650();
+	MxStreamChunk* chunk = CurrentChunk();
 
 	if (chunk && m_action->GetElapsedTime() >= chunk->GetTime()) {
 		m_chunkTime = chunk->GetTime();
diff --git a/LEGO1/omni/src/video/mxvideopresenter.cpp b/LEGO1/omni/src/video/mxvideopresenter.cpp
index 5d507409..23c12cfb 100644
--- a/LEGO1/omni/src/video/mxvideopresenter.cpp
+++ b/LEGO1/omni/src/video/mxvideopresenter.cpp
@@ -241,13 +241,13 @@ void MxVideoPresenter::NextFrame()
 	MxStreamChunk* chunk = NextChunk();
 
 	if (chunk->GetFlags() & MxDSChunk::Flag_End) {
-		m_subscriber->FUN_100b8390(chunk);
+		m_subscriber->DestroyChunk(chunk);
 		m_previousTickleStates |= 1 << (unsigned char) m_currentTickleState;
 		m_currentTickleState = TickleState_Repeating;
 	}
 	else {
 		LoadFrame(chunk);
-		m_subscriber->FUN_100b8390(chunk);
+		m_subscriber->DestroyChunk(chunk);
 	}
 }
 
@@ -458,7 +458,7 @@ void MxVideoPresenter::ReadyTickle()
 
 	if (chunk) {
 		LoadHeader(chunk);
-		m_subscriber->FUN_100b8390(chunk);
+		m_subscriber->DestroyChunk(chunk);
 		ParseExtra();
 		m_previousTickleStates |= 1 << (unsigned char) m_currentTickleState;
 		m_currentTickleState = TickleState_Starting;
@@ -468,7 +468,7 @@ void MxVideoPresenter::ReadyTickle()
 // FUNCTION: LEGO1 0x100b2fa0
 void MxVideoPresenter::StartingTickle()
 {
-	MxStreamChunk* chunk = FUN_100b5650();
+	MxStreamChunk* chunk = CurrentChunk();
 
 	if (chunk && m_action->GetElapsedTime() >= chunk->GetTime()) {
 		CreateBitmap();
@@ -502,7 +502,7 @@ void MxVideoPresenter::StreamingTickle()
 				break;
 
 			LoadFrame(m_currentChunk);
-			m_subscriber->FUN_100b8390(m_currentChunk);
+			m_subscriber->DestroyChunk(m_currentChunk);
 			m_currentChunk = NULL;
 			m_flags |= Flag_Bit1;
 

From 58085df6b0248a0f1a3d0633789bc4acec04702c Mon Sep 17 00:00:00 2001
From: Misha <106913236+MishaProductions@users.noreply.github.com>
Date: Tue, 9 Jan 2024 04:43:21 -0500
Subject: [PATCH 088/210] Implement most of LegoCameraController (#419)

* Implement LegoCameraController subclasses

* Update legopovcontroller.cpp

* fixes

* Update legocameracontroller.cpp

* fix naming conventions

* Update legopointofviewcontroller.h

* Update legopointofviewcontroller.h

* Fixes

* Match LegoPointOfViewController::Create

---------

Co-authored-by: Christian Semmler <mail@csemmler.com>
---
 CMakeLists.txt                                |   5 +-
 .../legoomni/include/legocameracontroller.h   |  19 ++-
 .../lego/legoomni/include/legoinputmanager.h  |   1 +
 .../lego/legoomni/include/legonavcontroller.h |   2 +
 LEGO1/lego/legoomni/include/legonotify.h      |  11 ++
 LEGO1/lego/legoomni/include/legoomni.h        |   3 +-
 .../include/legopointofviewcontroller.h       |  94 ++++++++++++
 LEGO1/lego/legoomni/src/build/helicopter.cpp  |   4 +-
 .../src/common/legocameracontroller.cpp       |  47 ------
 .../src/entity/legocameracontroller.cpp       | 107 ++++++++++++++
 .../{common => entity}/legonavcontroller.cpp  |   0
 .../legoomni/src/entity/legopovcontroller.cpp | 134 ++++++++++++++++++
 12 files changed, 373 insertions(+), 54 deletions(-)
 create mode 100644 LEGO1/lego/legoomni/include/legonotify.h
 create mode 100644 LEGO1/lego/legoomni/include/legopointofviewcontroller.h
 delete mode 100644 LEGO1/lego/legoomni/src/common/legocameracontroller.cpp
 create mode 100644 LEGO1/lego/legoomni/src/entity/legocameracontroller.cpp
 rename LEGO1/lego/legoomni/src/{common => entity}/legonavcontroller.cpp (100%)
 create mode 100644 LEGO1/lego/legoomni/src/entity/legopovcontroller.cpp

diff --git a/CMakeLists.txt b/CMakeLists.txt
index eb5f1c25..483ba9db 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -32,10 +32,8 @@ add_library(lego1 SHARED
   LEGO1/lego/legoomni/src/common/gifmanager.cpp
   LEGO1/lego/legoomni/src/common/legoactioncontrolpresenter.cpp
   LEGO1/lego/legoomni/src/common/legobackgroundcolor.cpp
-  LEGO1/lego/legoomni/src/common/legocameracontroller.cpp
   LEGO1/lego/legoomni/src/common/legofullscreenmovie.cpp
   LEGO1/lego/legoomni/src/common/legogamestate.cpp
-  LEGO1/lego/legoomni/src/common/legonavcontroller.cpp
   LEGO1/lego/legoomni/src/common/legoobjectfactory.cpp
   LEGO1/lego/legoomni/src/common/legoplantmanager.cpp
   LEGO1/lego/legoomni/src/common/legostate.cpp
@@ -46,10 +44,13 @@ add_library(lego1 SHARED
   LEGO1/lego/legoomni/src/control/legocontrolmanager.cpp
   LEGO1/lego/legoomni/src/entity/legoactor.cpp
   LEGO1/lego/legoomni/src/entity/legoanimactor.cpp
+  LEGO1/lego/legoomni/src/entity/legocameracontroller.cpp
   LEGO1/lego/legoomni/src/entity/legoentity.cpp
   LEGO1/lego/legoomni/src/entity/legoentitypresenter.cpp
   LEGO1/lego/legoomni/src/entity/legojetski.cpp
+  LEGO1/lego/legoomni/src/entity/legonavcontroller.cpp
   LEGO1/lego/legoomni/src/entity/legopathactor.cpp
+  LEGO1/lego/legoomni/src/entity/legopovcontroller.cpp
   LEGO1/lego/legoomni/src/entity/legorace.cpp
   LEGO1/lego/legoomni/src/entity/legoworld.cpp
   LEGO1/lego/legoomni/src/entity/legoworldpresenter.cpp
diff --git a/LEGO1/lego/legoomni/include/legocameracontroller.h b/LEGO1/lego/legoomni/include/legocameracontroller.h
index 09785df1..660ee5ae 100644
--- a/LEGO1/lego/legoomni/include/legocameracontroller.h
+++ b/LEGO1/lego/legoomni/include/legocameracontroller.h
@@ -1,17 +1,21 @@
 #ifndef LEGOCAMERACONTROLLER_H
 #define LEGOCAMERACONTROLLER_H
 
+#include "legopointofviewcontroller.h"
 #include "mxcore.h"
+#include "mxpoint32.h"
 #include "realtime/matrix.h"
 #include "realtime/vector.h"
 
 // VTABLE: LEGO1 0x100d57b0
 // SIZE 0xc8
-class LegoCameraController : public MxCore {
+class LegoCameraController : public LegoPointOfViewController {
 public:
 	LegoCameraController();
 	virtual ~LegoCameraController() override; // vtable+0x0
 
+	virtual MxLong Notify(MxParam& p_param) override; // vtable+04
+
 	// FUNCTION: LEGO1 0x10011ec0
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
@@ -25,11 +29,22 @@ class LegoCameraController : public MxCore {
 		return !strcmp(p_name, ClassName()) || MxCore::IsA(p_name);
 	}
 
-	void LookAt(Vector3Impl& p_at, Vector3Impl& p_dir, Vector3Impl& p_up);
+	virtual void OnLButtonDown(MxPoint32 p_point) override;                // vtable+0x30
+	virtual void OnLButtonUp(MxPoint32 p_point) override;                  // vtable+0x34
+	virtual void OnRButtonDown(MxPoint32 p_point) override;                // vtable+0x38
+	virtual void OnRButtonUp(MxPoint32 p_point) override;                  // vtable+0x3c
+	virtual void OnMouseMove(MxU8 p_modifier, MxPoint32 p_point) override; // vtable+0x40
+	virtual MxResult Create();                                             // vtable+0x44
+
+	void SetWorldTransform(Vector3Impl& p_at, Vector3Impl& p_dir, Vector3Impl& p_up);
 	void FUN_100123e0(Matrix4Data& p_transform, MxU32);
 	Vector3Data& FUN_10012740();
 	Vector3Data& FUN_100127f0();
 	Vector3Data& FUN_100128a0();
+
+private:
+	Matrix4Data m_matrix1; // 0x38
+	Matrix4Data m_matrix2; // 0x80
 };
 
 #endif // LEGOCAMERACONTROLLER_H
diff --git a/LEGO1/lego/legoomni/include/legoinputmanager.h b/LEGO1/lego/legoomni/include/legoinputmanager.h
index fcb9b560..961d8ffc 100644
--- a/LEGO1/lego/legoomni/include/legoinputmanager.h
+++ b/LEGO1/lego/legoomni/include/legoinputmanager.h
@@ -56,6 +56,7 @@ class LegoInputManager : public MxPresenter {
 
 	inline LegoControlManager* GetControlManager() { return m_controlManager; }
 	inline LegoWorld* GetWorld() { return m_world; }
+	inline LegoCameraController* GetCamera() { return m_camera; }
 
 	void ProcessEvents();
 	MxBool ProcessOneEvent(LegoEventNotificationParam& p_param);
diff --git a/LEGO1/lego/legoomni/include/legonavcontroller.h b/LEGO1/lego/legoomni/include/legonavcontroller.h
index c6505341..97882566 100644
--- a/LEGO1/lego/legoomni/include/legonavcontroller.h
+++ b/LEGO1/lego/legoomni/include/legonavcontroller.h
@@ -59,6 +59,8 @@ class LegoNavController : public MxCore {
 	float CalculateNewAccel(int p_pos, int p_center, float p_maxAccel, int p_minAccel);
 	float CalculateNewVel(float p_targetVel, float p_currentVel, float p_accel, float p_time);
 
+	inline void SetTrackDefaultParams(MxBool p_trackDefault) { m_trackDefault = p_trackDefault; }
+
 private:
 	int m_hMax;
 	int m_vMax;
diff --git a/LEGO1/lego/legoomni/include/legonotify.h b/LEGO1/lego/legoomni/include/legonotify.h
new file mode 100644
index 00000000..ed4218b2
--- /dev/null
+++ b/LEGO1/lego/legoomni/include/legonotify.h
@@ -0,0 +1,11 @@
+#ifndef LEGONOTIFY_H
+#define LEGONOTIFY_H
+
+enum LegoEventNotificationParamType {
+	c_lButtonState = 1,
+	c_rButtonState = 2,
+	c_modKey1 = 4,
+	c_modKey2 = 8,
+};
+
+#endif // LEGONOTIFY_H
diff --git a/LEGO1/lego/legoomni/include/legoomni.h b/LEGO1/lego/legoomni/include/legoomni.h
index 77cf47f5..fc9ba1c2 100644
--- a/LEGO1/lego/legoomni/include/legoomni.h
+++ b/LEGO1/lego/legoomni/include/legoomni.h
@@ -102,7 +102,6 @@ class LegoOmni : public MxOmni {
 
 	LegoVideoManager* GetVideoManager() { return (LegoVideoManager*) m_videoManager; }
 	LegoSoundManager* GetSoundManager() { return (LegoSoundManager*) m_soundManager; }
-
 	LegoInputManager* GetInputManager() { return m_inputMgr; }
 	GifManager* GetGifManager() { return m_gifManager; }
 	LegoWorld* GetCurrentOmniWorld() { return m_currentWorld; }
@@ -116,6 +115,8 @@ class LegoOmni : public MxOmni {
 	MxTransitionManager* GetTransitionManager() { return m_transitionManager; }
 	MxDSAction& GetCurrentAction() { return m_action; }
 
+	inline void SetNavController(LegoNavController* p_navController) { m_navController = p_navController; }
+
 	inline void SetExit(MxBool p_exit) { m_exit = p_exit; };
 
 private:
diff --git a/LEGO1/lego/legoomni/include/legopointofviewcontroller.h b/LEGO1/lego/legoomni/include/legopointofviewcontroller.h
new file mode 100644
index 00000000..f0f8c3b1
--- /dev/null
+++ b/LEGO1/lego/legoomni/include/legopointofviewcontroller.h
@@ -0,0 +1,94 @@
+#ifndef LEGOPOINTOFVIEWCONTROLLER_H
+#define LEGOPOINTOFVIEWCONTROLLER_H
+
+#include "decomp.h"
+#include "mxcore.h"
+
+#include <windows.h>
+
+class Lego3DView;
+class LegoEntity;
+class LegoNavController;
+
+//////////////////////////////////////////////////////////////////////////////
+//
+// LegoMouseController
+
+// VTABLE: LEGO1 0x100d8dd8
+// SIZE 0x20
+class LegoMouseController : public MxCore {
+public:
+	LegoMouseController();
+	virtual ~LegoMouseController() override;
+
+	virtual void LeftDown(int, int);  // vtable+0x14
+	virtual void LeftDrag(int, int);  // vtable+0x18
+	virtual void LeftUp(int, int);    // vtable+0x1c
+	virtual void RightDown(int, int); // vtable+0x20
+	virtual void RightDrag(int, int); // vtable+0x24
+	virtual void RightUp(int, int);   // vtable+0x28
+
+private:
+	BOOL m_isButtonDown; // 0x08
+	undefined4 m_unk0xc; // 0x0c
+	MxDouble m_buttonX;  // 0x10
+	MxDouble m_buttonY;  // 0x18
+};
+
+// VTABLE: LEGO1 0x100d8e08
+// SIZE 0x38
+class LegoPointOfViewController : public LegoMouseController {
+public:
+	LegoPointOfViewController();
+	virtual ~LegoPointOfViewController() override;
+
+	virtual MxResult Tickle() override;               // vtable+0x08
+	virtual void LeftDown(int p_x, int p_y) override; // vtable+0x0c
+	virtual void LeftDrag(int p_x, int p_y) override; // vtable+0x10
+
+	// FUNCTION: LEGO1 0x10011e40
+	virtual void LeftUp(int p_x, int p_y) override
+	{
+		LegoMouseController::LeftUp(p_x, p_y);
+		AffectPointOfView();
+	}
+	// vtable+0x14
+
+	// FUNCTION: LEGO1 0x10011e60
+	virtual void RightDown(int p_x, int p_y) override
+	{
+		LegoMouseController::RightDown(p_x, p_y);
+		AffectPointOfView();
+	}
+	// vtable+0x20
+
+	// FUNCTION: LEGO1 0x10011e80
+	virtual void RightDrag(int p_x, int p_y) override
+	{
+		LegoMouseController::RightDrag(p_x, p_y);
+		AffectPointOfView();
+	}
+	// vtable+0x24
+
+	// FUNCTION: LEGO1 0x10011ea0
+	virtual void RightUp(int p_x, int p_y) override
+	{
+		LegoMouseController::RightUp(p_x, p_y);
+		AffectPointOfView();
+	}                                             // vtable+0x28
+	virtual void SetEntity(LegoEntity* p_entity); // vtable+0x2c
+
+	MxResult Create(Lego3DView* p_lego3DView);
+
+	inline LegoEntity* GetEntity() { return m_entity; }
+
+protected:
+	void AffectPointOfView();
+
+	Lego3DView* m_lego3DView;  // 0x20
+	LegoEntity* m_entity;      // 0x24
+	MxDouble m_entityOffsetUp; // 0x28
+	LegoNavController* m_nav;  // 0x30
+};
+
+#endif /* LEGOPOINTOFVIEWCONTROLLER_H */
diff --git a/LEGO1/lego/legoomni/src/build/helicopter.cpp b/LEGO1/lego/legoomni/src/build/helicopter.cpp
index 87ee1dcb..f4220183 100644
--- a/LEGO1/lego/legoomni/src/build/helicopter.cpp
+++ b/LEGO1/lego/legoomni/src/build/helicopter.cpp
@@ -238,7 +238,7 @@ MxU32 Helicopter::VTable0xd8(MxType18NotificationParam& p_param)
 			mat.GetMatrix()[i][2] = mat2[i][2] * c + mat2[i][1] * s;
 		}
 		Vector3Impl at(mat.GetMatrix()[3]), dir(mat.GetMatrix()[2]), up(mat.GetMatrix()[1]);
-		m_world->GetCamera()->LookAt(at, dir, up);
+		m_world->GetCamera()->SetWorldTransform(at, dir, up);
 		FUN_10010c30();
 		break;
 	}
@@ -247,7 +247,7 @@ MxU32 Helicopter::VTable0xd8(MxType18NotificationParam& p_param)
 		mat.SetIdentity();
 		Vector3Impl at(mat.GetMatrix()[3]), dir(mat.GetMatrix()[2]), up(mat.GetMatrix()[1]);
 		at[1] = 1.25;
-		m_world->GetCamera()->LookAt(at, dir, up);
+		m_world->GetCamera()->SetWorldTransform(at, dir, up);
 		if (GameState()->GetUnknown10() == 0) {
 			((Act1State*) GameState()->GetState("Act1State"))->SetUnknown18(0);
 			VTable0xe8(0x29, TRUE, 7);
diff --git a/LEGO1/lego/legoomni/src/common/legocameracontroller.cpp b/LEGO1/lego/legoomni/src/common/legocameracontroller.cpp
deleted file mode 100644
index ad1dbb67..00000000
--- a/LEGO1/lego/legoomni/src/common/legocameracontroller.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-#include "legocameracontroller.h"
-
-// STUB: LEGO1 0x10011d50
-LegoCameraController::LegoCameraController()
-{
-	// TODO
-}
-
-// STUB: LEGO1 0x10011f70
-LegoCameraController::~LegoCameraController()
-{
-	// TODO
-}
-
-// STUB: LEGO1 0x10012260
-void LegoCameraController::LookAt(Vector3Impl& p_at, Vector3Impl& p_dir, Vector3Impl& p_up)
-{
-}
-
-// STUB: LEGO1 0x100123e0
-void LegoCameraController::FUN_100123e0(Matrix4Data& p_transform, MxU32)
-{
-}
-
-// STUB: LEGO1 0x10012740
-Vector3Data& LegoCameraController::FUN_10012740()
-{
-	// Actually returns reference to a member
-	static Vector3Data g_v;
-	return g_v;
-}
-
-// STUB: LEGO1 0x100127f0
-Vector3Data& LegoCameraController::FUN_100127f0()
-{
-	// Actually returns reference to a member
-	static Vector3Data g_v;
-	return g_v;
-}
-
-// STUB: LEGO1 0x100128a0
-Vector3Data& LegoCameraController::FUN_100128a0()
-{
-	// Actually returns reference to a member
-	static Vector3Data g_v;
-	return g_v;
-}
diff --git a/LEGO1/lego/legoomni/src/entity/legocameracontroller.cpp b/LEGO1/lego/legoomni/src/entity/legocameracontroller.cpp
new file mode 100644
index 00000000..34afaac0
--- /dev/null
+++ b/LEGO1/lego/legoomni/src/entity/legocameracontroller.cpp
@@ -0,0 +1,107 @@
+#include "legocameracontroller.h"
+
+#include "legoinputmanager.h"
+#include "legonotify.h"
+#include "legoomni.h"
+#include "legovideomanager.h"
+
+DECOMP_SIZE_ASSERT(LegoCameraController, 0xc8);
+
+// FUNCTION: LEGO1 0x10011d50
+LegoCameraController::LegoCameraController()
+{
+	SetWorldTransform(Vector3Data(0, 0, 0), Vector3Data(0, 0, 1), Vector3Data(0, 1, 0));
+}
+
+// FUNCTION: LEGO1 0x10011f70
+LegoCameraController::~LegoCameraController()
+{
+	if (InputManager()) {
+		if (InputManager()->GetCamera() == this) {
+			InputManager()->ClearCamera();
+		}
+	}
+}
+
+// FUNCTION: LEGO1 0x10011ff0
+MxResult LegoCameraController::Create()
+{
+	InputManager()->SetCamera(this);
+	return LegoPointOfViewController::Create(VideoManager()->Get3DManager()->GetLego3DView());
+}
+
+// STUB: LEGO1 0x10012020
+MxLong LegoCameraController::Notify(MxParam& p_param)
+{
+	// TODO
+	return 0;
+}
+
+// FUNCTION: LEGO1 0x100121b0
+void LegoCameraController::OnLButtonDown(MxPoint32 p_point)
+{
+	LeftDown(p_point.GetX(), p_point.GetY());
+}
+
+// FUNCTION: LEGO1 0x100121d0
+void LegoCameraController::OnLButtonUp(MxPoint32 p_point)
+{
+	LeftUp(p_point.GetX(), p_point.GetY());
+}
+
+// FUNCTION: LEGO1 0x100121f0
+void LegoCameraController::OnRButtonDown(MxPoint32 p_point)
+{
+	RightDown(p_point.GetX(), p_point.GetY());
+}
+
+// FUNCTION: LEGO1 0x10012210
+void LegoCameraController::OnRButtonUp(MxPoint32 p_point)
+{
+	RightUp(p_point.GetX(), p_point.GetY());
+}
+
+// FUNCTION: LEGO1 0x10012230
+void LegoCameraController::OnMouseMove(MxU8 p_modifier, MxPoint32 p_point)
+{
+	if (p_modifier & c_lButtonState)
+		LeftDrag(p_point.GetX(), p_point.GetY());
+	else if (p_modifier & c_rButtonState)
+		RightDrag(p_point.GetX(), p_point.GetY());
+}
+
+// FUNCTION: LEGO1 0x10012260
+void LegoCameraController::SetWorldTransform(Vector3Impl& p_at, Vector3Impl& p_dir, Vector3Impl& p_up)
+{
+	CalcLocalTransform(p_at, p_dir, p_up, m_matrix1);
+	m_matrix2 = m_matrix1;
+}
+
+// STUB: LEGO1 0x100123e0
+void LegoCameraController::FUN_100123e0(Matrix4Data& p_transform, MxU32)
+{
+}
+
+// STUB: LEGO1 0x10012740
+Vector3Data& LegoCameraController::FUN_10012740()
+{
+	// Actually returns reference to a member
+	static Vector3Data g_v;
+	return g_v;
+}
+
+// STUB: LEGO1 0x100127f0
+Vector3Data& LegoCameraController::FUN_100127f0()
+{
+	// Actually returns reference to a member
+	static Vector3Data g_v;
+	return g_v;
+}
+
+// STUB: LEGO1 0x100128a0
+Vector3Data& LegoCameraController::FUN_100128a0()
+{
+	// Actually returns reference to a member
+	static Vector3Data g_v;
+	return g_v;
+}
diff --git a/LEGO1/lego/legoomni/src/common/legonavcontroller.cpp b/LEGO1/lego/legoomni/src/entity/legonavcontroller.cpp
similarity index 100%
rename from LEGO1/lego/legoomni/src/common/legonavcontroller.cpp
rename to LEGO1/lego/legoomni/src/entity/legonavcontroller.cpp
diff --git a/LEGO1/lego/legoomni/src/entity/legopovcontroller.cpp b/LEGO1/lego/legoomni/src/entity/legopovcontroller.cpp
new file mode 100644
index 00000000..a2e1bb04
--- /dev/null
+++ b/LEGO1/lego/legoomni/src/entity/legopovcontroller.cpp
@@ -0,0 +1,134 @@
+#include "legonavcontroller.h"
+#include "legoomni.h"
+#include "legopointofviewcontroller.h"
+#include "mxticklemanager.h"
+
+DECOMP_SIZE_ASSERT(LegoMouseController, 0x20);
+DECOMP_SIZE_ASSERT(LegoPointOfViewController, 0x38);
+
+//////////////////////////////////////////////////////////////////////
+
+// FUNCTION: LEGO1 0x10065550
+LegoMouseController::LegoMouseController()
+{
+	m_isButtonDown = FALSE;
+}
+
+// FUNCTION: LEGO1 0x100655d0
+LegoMouseController::~LegoMouseController()
+{
+}
+
+// FUNCTION: LEGO1 0x10065620
+void LegoMouseController::LeftDown(int p_x, int p_y)
+{
+	m_isButtonDown = TRUE;
+	m_buttonX = p_x;
+	m_buttonY = p_y;
+}
+
+// FUNCTION: LEGO1 0x10065640
+void LegoMouseController::LeftUp(int p_x, int p_y)
+{
+	m_isButtonDown = FALSE;
+	m_buttonX = p_x;
+	m_buttonY = p_y;
+}
+
+// FUNCTION: LEGO1 0x10065660
+void LegoMouseController::LeftDrag(int p_x, int p_y)
+{
+	m_buttonX = p_x;
+	m_buttonY = p_y;
+}
+
+// FUNCTION: LEGO1 0x10065680
+void LegoMouseController::RightDown(int p_x, int p_y)
+{
+	m_isButtonDown = TRUE;
+	m_buttonX = p_x;
+	m_buttonY = p_y;
+}
+
+// FUNCTION: LEGO1 0x100656a0
+void LegoMouseController::RightUp(int p_x, int p_y)
+{
+	m_isButtonDown = FALSE;
+	m_buttonX = p_x;
+	m_buttonY = p_y;
+}
+
+// FUNCTION: LEGO1 0x100656c0
+void LegoMouseController::RightDrag(int p_x, int p_y)
+{
+	m_buttonX = p_x;
+	m_buttonY = p_y;
+}
+
+//////////////////////////////////////////////////////////////////////
+
+// FUNCTION: LEGO1 0x100656e0
+LegoPointOfViewController::LegoPointOfViewController()
+{
+	m_lego3DView = NULL;
+	m_entity = NULL;
+	m_nav = NULL;
+	// m_entityOffsetUp is a temporary kludge.  It should be replaced
+	// by 3D camera offset and position stored in the entity since each
+	// entity may have a different best viewpoint.
+	m_entityOffsetUp = 0.0;
+}
+
+// FUNCTION: LEGO1 0x10065770
+LegoPointOfViewController::~LegoPointOfViewController()
+{
+	TickleManager()->UnregisterClient(this);
+	if (m_nav) {
+		delete m_nav;
+		m_nav = NULL;
+	}
+}
+
+// FUNCTION: LEGO1 0x100657f0
+MxResult LegoPointOfViewController::Create(Lego3DView* p_lego3DView)
+{
+	m_lego3DView = p_lego3DView;
+	m_nav = new LegoNavController();
+	LegoOmni::GetInstance()->SetNavController(m_nav);
+	m_nav->SetTrackDefaultParams(TRUE);
+	TickleManager()->RegisterClient(this, 10);
+	return SUCCESS;
+}
+
+// FUNCTION: LEGO1 0x100658c0
+void LegoPointOfViewController::LeftDown(int p_x, int p_y)
+{
+	LegoMouseController::LeftDown(p_x, p_y);
+	AffectPointOfView();
+}
+
+// FUNCTION: LEGO1 0x100658e0
+void LegoPointOfViewController::LeftDrag(int p_x, int p_y)
+{
+	LegoMouseController::LeftDrag(p_x, p_y);
+	AffectPointOfView();
+}
+
+// STUB: LEGO1 0x10065900
+void LegoPointOfViewController::AffectPointOfView()
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x10065930
+MxResult LegoPointOfViewController::Tickle()
+{
+	// TODO
+	return SUCCESS;
+}
+
+// STUB: LEGO1 0x10065ae0
+void LegoPointOfViewController::SetEntity(LegoEntity* p_entity)
+{
+	// TODO
+}

From f6ced08b20bc13dedb985e770b4b797f5a2393c6 Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Tue, 9 Jan 2024 05:31:00 -0500
Subject: [PATCH 089/210] Add scalar ddtor annotations

---
 LEGO1/lego/legoomni/include/legocameracontroller.h      | 3 +++
 LEGO1/lego/legoomni/include/legopointofviewcontroller.h | 6 ++++++
 2 files changed, 9 insertions(+)

diff --git a/LEGO1/lego/legoomni/include/legocameracontroller.h b/LEGO1/lego/legoomni/include/legocameracontroller.h
index 660ee5ae..05c974a3 100644
--- a/LEGO1/lego/legoomni/include/legocameracontroller.h
+++ b/LEGO1/lego/legoomni/include/legocameracontroller.h
@@ -47,4 +47,7 @@ class LegoCameraController : public LegoPointOfViewController {
 	Matrix4Data m_matrix2; // 0x80
 };
 
+// SYNTHETIC: LEGO1 0x10011f50
+// LegoCameraController::`scalar deleting destructor'
+
 #endif // LEGOCAMERACONTROLLER_H
diff --git a/LEGO1/lego/legoomni/include/legopointofviewcontroller.h b/LEGO1/lego/legoomni/include/legopointofviewcontroller.h
index f0f8c3b1..a7e92e97 100644
--- a/LEGO1/lego/legoomni/include/legopointofviewcontroller.h
+++ b/LEGO1/lego/legoomni/include/legopointofviewcontroller.h
@@ -35,6 +35,9 @@ class LegoMouseController : public MxCore {
 	MxDouble m_buttonY;  // 0x18
 };
 
+// SYNTHETIC: LEGO1 0x100655b0
+// LegoMouseController::`scalar deleting destructor'
+
 // VTABLE: LEGO1 0x100d8e08
 // SIZE 0x38
 class LegoPointOfViewController : public LegoMouseController {
@@ -91,4 +94,7 @@ class LegoPointOfViewController : public LegoMouseController {
 	LegoNavController* m_nav;  // 0x30
 };
 
+// SYNTHETIC: LEGO1 0x10065750
+// LegoPointOfViewController::`scalar deleting destructor'
+
 #endif /* LEGOPOINTOFVIEWCONTROLLER_H */

From 872c62fd39ac4341c3319fc793424d27d65c9525 Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Tue, 9 Jan 2024 10:30:37 -0500
Subject: [PATCH 090/210] Match LegoCameraController::LegoCameraController

---
 LEGO1/realtime/matrix.cpp | 6 ------
 LEGO1/realtime/matrix.h   | 5 +++--
 LEGO1/realtime/vector.h   | 4 ++--
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/LEGO1/realtime/matrix.cpp b/LEGO1/realtime/matrix.cpp
index 61f7b1a9..818650eb 100644
--- a/LEGO1/realtime/matrix.cpp
+++ b/LEGO1/realtime/matrix.cpp
@@ -28,12 +28,6 @@ void Matrix4Impl::AnotherSetData(Matrix4& p_data)
 	m_data = &p_data;
 }
 
-// FUNCTION: LEGO1 0x10002370
-void Matrix4Impl::SetData(Matrix4& p_data)
-{
-	m_data = &p_data;
-}
-
 // FUNCTION: LEGO1 0x10002380
 const Matrix4* Matrix4Impl::GetData() const
 {
diff --git a/LEGO1/realtime/matrix.h b/LEGO1/realtime/matrix.h
index 58db7a9f..c087d331 100644
--- a/LEGO1/realtime/matrix.h
+++ b/LEGO1/realtime/matrix.h
@@ -35,12 +35,13 @@ class Matrix4 {
 // SIZE 0x8
 class Matrix4Impl {
 public:
-	inline Matrix4Impl(Matrix4& p_data) : m_data(&p_data) {}
+	inline Matrix4Impl(Matrix4& p_data) { SetData(p_data); }
 
 	// vtable + 0x00
 	virtual void EqualsMatrixImpl(const Matrix4Impl* p_other);
 	virtual void EqualsMatrixData(const Matrix4& p_matrix);
-	virtual void SetData(Matrix4& p_data);
+	// FUNCTION: LEGO1 0x10002370
+	virtual void SetData(Matrix4& p_data) { m_data = &p_data; }
 	virtual void AnotherSetData(Matrix4& p_data);
 
 	// vtable + 0x10
diff --git a/LEGO1/realtime/vector.h b/LEGO1/realtime/vector.h
index 5c31f24e..1af21c9a 100644
--- a/LEGO1/realtime/vector.h
+++ b/LEGO1/realtime/vector.h
@@ -61,7 +61,7 @@ struct Vector4 {
 class Vector2Impl {
 public:
 	// FUNCTION: LEGO1 0x1000c0f0
-	inline Vector2Impl(float* p_data) { this->SetData(p_data); }
+	inline Vector2Impl(float* p_data) { SetData(p_data); }
 
 	// vtable + 0x00 (no virtual destructor)
 	virtual void AddScalarImpl(float p_value) = 0;
@@ -74,7 +74,7 @@ class Vector2Impl {
 	virtual void DivScalarImpl(float* p_value) = 0;
 	virtual float DotImpl(float* p_a, float* p_b) const = 0;
 	// FUNCTION: LEGO1 0x10002060
-	virtual void SetData(float* p_data) { this->m_data = p_data; }
+	virtual void SetData(float* p_data) { m_data = p_data; }
 
 	// vtable + 0x20
 	virtual void EqualsImpl(float* p_data) = 0;

From 5a2be934be68db6eea90b2711a3cad07284788a8 Mon Sep 17 00:00:00 2001
From: Nathan M Gilbert <tahgtahv@gmail.com>
Date: Wed, 10 Jan 2024 06:55:25 -0500
Subject: [PATCH 091/210] Finish StreamProvider classes (#420)

* Finish StreamProvider classes

* Fix variable name

* Use FOURCC

* Match FUN_100c7090

* Changes

* Readability

---------

Co-authored-by: Christian Semmler <mail@csemmler.com>
---
 LEGO1/omni/include/mxdiskstreamprovider.h     |  9 +-
 LEGO1/omni/include/mxdsbuffer.h               | 15 ++-
 LEGO1/omni/include/mxdschunk.h                |  6 +-
 LEGO1/omni/include/mxdsstreamingaction.h      |  1 +
 LEGO1/omni/include/mxramstreamprovider.h      | 14 +--
 .../omni/src/stream/mxdiskstreamprovider.cpp  | 98 ++++++++++++++++++-
 LEGO1/omni/src/stream/mxdsbuffer.cpp          | 74 ++++++++++++--
 LEGO1/omni/src/stream/mxdschunk.cpp           |  2 +-
 .../omni/src/stream/mxramstreamcontroller.cpp |  8 --
 LEGO1/omni/src/stream/mxramstreamprovider.cpp | 60 +++++++++++-
 10 files changed, 253 insertions(+), 34 deletions(-)

diff --git a/LEGO1/omni/include/mxdiskstreamprovider.h b/LEGO1/omni/include/mxdiskstreamprovider.h
index 2557eaf9..6df049da 100644
--- a/LEGO1/omni/include/mxdiskstreamprovider.h
+++ b/LEGO1/omni/include/mxdiskstreamprovider.h
@@ -20,6 +20,9 @@ class MxDiskStreamProviderThread : public MxThread {
 
 	MxResult Run() override;
 	MxResult StartWithTarget(MxDiskStreamProvider* p_target);
+
+	// SYNTHETIC: LEGO1 0x100d10a0
+	// MxDiskStreamProviderThread::`scalar deleting destructor'
 };
 
 // VTABLE: LEGO1 0x100dd138
@@ -55,6 +58,9 @@ class MxDiskStreamProvider : public MxStreamProvider {
 	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
@@ -64,7 +70,4 @@ class MxDiskStreamProvider : public MxStreamProvider {
 	MxStreamListMxDSAction m_list;       // 0x54
 };
 
-// SYNTHETIC: LEGO1 0x100d1220
-// MxDiskStreamProvider::`scalar deleting destructor'
-
 #endif // MXDISKSTREAMPROVIDER_H
diff --git a/LEGO1/omni/include/mxdsbuffer.h b/LEGO1/omni/include/mxdsbuffer.h
index daa3263e..3a336af7 100644
--- a/LEGO1/omni/include/mxdsbuffer.h
+++ b/LEGO1/omni/include/mxdsbuffer.h
@@ -32,7 +32,7 @@ class MxDSBuffer : public MxCore {
 	}
 
 	MxResult AllocateBuffer(MxU32 p_bufferSize, MxDSBufferType p_mode);
-	MxResult SetBufferPointer(MxU32* p_buffer, MxU32 p_size);
+	MxResult SetBufferPointer(MxU8* p_buffer, MxU32 p_size);
 	MxResult FUN_100c67b0(
 		MxStreamController* p_controller,
 		MxDSAction* p_action,
@@ -52,20 +52,27 @@ class MxDSBuffer : public MxCore {
 		MxDSStreamingAction** p_streamingAction,
 		MxStreamChunk* p_header
 	);
-	static MxCore* ReadChunk(MxDSBuffer* p_buffer, MxU32* p_chunkData, MxU16 p_flags);
 	MxU8* SkipToData();
 	MxU8 ReleaseRef(MxDSChunk*);
 	void AddRef(MxDSChunk* p_chunk);
 	MxResult CalcBytesRemaining(MxU8* p_data);
 	void FUN_100c6f80(MxU32 p_writeOffset);
+	MxU8* FUN_100c6fa0(MxU8* p_data);
+	MxResult FUN_100c7090(MxDSBuffer* p_buf);
+
+	static MxCore* ReadChunk(MxDSBuffer* p_buffer, MxU32* p_chunkData, MxU16 p_flags);
+	static MxResult Append(MxU8* p_buffer1, MxU8* p_buffer2);
 
 	inline MxU8* GetBuffer() { return m_pBuffer; }
-	inline MxU32 GetWriteOffset() { return m_writeOffset; }
-	inline MxU32 GetBytesRemaining() { return m_bytesRemaining; }
+	inline MxU8** GetBufferRef() { return &m_pBuffer; }
+	inline undefined4 GetUnknown14() { return m_unk0x14; }
 	inline MxU16 GetRefCount() { return m_refcount; }
 	inline MxDSBufferType GetMode() { return m_mode; }
+	inline MxU32 GetWriteOffset() { return m_writeOffset; }
+	inline MxU32 GetBytesRemaining() { return m_bytesRemaining; }
 	inline void SetUnknown14(undefined4 p_unk0x14) { m_unk0x14 = p_unk0x14; }
 	inline void SetUnknown1c(undefined4 p_unk0x1c) { m_unk0x1c = p_unk0x1c; }
+	inline void SetMode(MxDSBufferType p_mode) { m_mode = p_mode; }
 	inline void SetUnk30(MxDSStreamingAction* p_unk0x30) { m_unk0x30 = p_unk0x30; }
 
 private:
diff --git a/LEGO1/omni/include/mxdschunk.h b/LEGO1/omni/include/mxdschunk.h
index 83693bc0..3cd60b27 100644
--- a/LEGO1/omni/include/mxdschunk.h
+++ b/LEGO1/omni/include/mxdschunk.h
@@ -33,7 +33,11 @@ class MxDSChunk : public MxCore {
 		return !strcmp(p_name, MxDSChunk::ClassName()) || MxCore::IsA(p_name);
 	}
 
-	static MxU32 ReturnE();
+	static MxU32 GetHeaderSize();
+	inline static MxU32* IntoType(MxU8* p_buffer) { return (MxU32*) p_buffer; }
+	inline static MxU32* IntoLength(MxU8* p_buffer) { return (MxU32*) (p_buffer + 4); }
+	inline static MxU32 Size(MxU32 p_dataSize) { return (p_dataSize & 1) + p_dataSize + 8; }
+	inline static MxU8* End(MxU8* p_buffer) { return p_buffer + Size(*IntoLength(p_buffer)); }
 
 	inline void SetFlags(MxU16 p_flags) { m_flags = p_flags; }
 	inline void SetObjectId(undefined4 p_objectid) { m_objectId = p_objectid; }
diff --git a/LEGO1/omni/include/mxdsstreamingaction.h b/LEGO1/omni/include/mxdsstreamingaction.h
index 00cd13aa..ab21bac2 100644
--- a/LEGO1/omni/include/mxdsstreamingaction.h
+++ b/LEGO1/omni/include/mxdsstreamingaction.h
@@ -41,6 +41,7 @@ class MxDSStreamingAction : public MxDSAction {
 	inline void SetUnknown94(MxU32 p_unk0x94) { m_unk0x94 = p_unk0x94; }
 	inline void SetUnknown9c(MxS32 p_unk0x9c) { m_unk0x9c = p_unk0x9c; }
 	inline void SetUnknowna0(MxDSBuffer* p_unk0xa0) { m_unk0xa0 = p_unk0xa0; }
+	inline void SetUnknowna4(MxDSBuffer* p_unk0xa4) { m_unk0xa4 = p_unk0xa4; }
 	inline void SetBufferOffset(MxU32 p_bufferOffset) { m_bufferOffset = p_bufferOffset; }
 
 private:
diff --git a/LEGO1/omni/include/mxramstreamprovider.h b/LEGO1/omni/include/mxramstreamprovider.h
index 5c8bf59c..f5ac0897 100644
--- a/LEGO1/omni/include/mxramstreamprovider.h
+++ b/LEGO1/omni/include/mxramstreamprovider.h
@@ -29,17 +29,19 @@ class MxRAMStreamProvider : public MxStreamProvider {
 	virtual MxU32 GetLengthInDWords() override;                                 // vtable+0x24
 	virtual MxU32* GetBufferForDWords() override;                               // vtable+0x28
 
-	inline MxU32* GetBufferOfFileSize() { return m_pBufferOfFileSize; }
+	inline MxU8* GetBufferOfFileSize() { return m_pBufferOfFileSize; }
 
 protected:
-	MxU32 m_bufferSize;         // 0x10
-	MxU32 m_fileSize;           // 0x14
-	MxU32* m_pBufferOfFileSize; // 0x18
-	MxU32 m_lengthInDWords;     // 0x1c
-	MxU32* m_bufferForDWords;   // 0x20
+	MxU32 m_bufferSize;        // 0x10
+	MxU32 m_fileSize;          // 0x14
+	MxU8* m_pBufferOfFileSize; // 0x18
+	MxU32 m_lengthInDWords;    // 0x1c
+	MxU32* m_bufferForDWords;  // 0x20
 };
 
 // SYNTHETIC: LEGO1 0x100d0a30
 // MxRAMStreamProvider::`scalar deleting destructor'
 
+MxU32 ReadData(MxU8* p_fileSizeBuffer, MxU32 p_fileSize);
+
 #endif // MXRAMSTREAMPROVIDER_H
diff --git a/LEGO1/omni/src/stream/mxdiskstreamprovider.cpp b/LEGO1/omni/src/stream/mxdiskstreamprovider.cpp
index b9ed63d0..08046ad4 100644
--- a/LEGO1/omni/src/stream/mxdiskstreamprovider.cpp
+++ b/LEGO1/omni/src/stream/mxdiskstreamprovider.cpp
@@ -5,6 +5,7 @@
 #include "mxdsbuffer.h"
 #include "mxdsstreamingaction.h"
 #include "mxomni.h"
+#include "mxramstreamprovider.h"
 #include "mxstreamcontroller.h"
 #include "mxstring.h"
 #include "mxthread.h"
@@ -267,10 +268,103 @@ MxBool MxDiskStreamProvider::FUN_100d1af0(MxDSStreamingAction* p_action)
 	return TRUE;
 }
 
-// STUB: LEGO1 0x100d1b20
+// FUNCTION: LEGO1 0x100d1b20
 MxResult MxDiskStreamProvider::FUN_100d1b20(MxDSStreamingAction* p_action)
 {
-	return FAILURE;
+	MxDSBuffer* buffer = new MxDSBuffer();
+
+	if (!buffer)
+		return FAILURE;
+
+	MxU32 size = p_action->GetUnknowna0()->GetWriteOffset() - p_action->GetUnknown94() + p_action->GetBufferOffset() +
+				 (p_action->GetUnknowna4() ? p_action->GetUnknowna4()->GetWriteOffset() : 0);
+
+	if (buffer->AllocateBuffer(size, MxDSBufferType_Allocate) != SUCCESS) {
+		if (!buffer)
+			return FAILURE;
+
+		delete buffer;
+		return FAILURE;
+	}
+
+	MxDSBuffer* buffer2 = p_action->GetUnknowna4();
+	MxU8** pdata;
+	MxU8* data;
+
+	if (buffer2 == NULL) {
+		pdata = buffer->GetBufferRef();
+
+		memcpy(
+			data = *pdata,
+			p_action->GetUnknowna0()->GetBuffer() - p_action->GetBufferOffset() + p_action->GetUnknown94(),
+			size
+		);
+	}
+	else {
+		buffer->FUN_100c7090(buffer2);
+		pdata = buffer->GetBufferRef();
+
+		memcpy(
+			data = (p_action->GetUnknowna4()->GetWriteOffset() + *pdata),
+			p_action->GetUnknowna0()->GetBuffer(),
+			p_action->GetUnknowna0()->GetWriteOffset()
+		);
+
+		delete p_action->GetUnknowna4();
+	}
+
+	p_action->SetUnknowna4(buffer);
+
+	while (data) {
+		if (*MxDSChunk::IntoType(data) != FOURCC('M', 'x', 'O', 'b')) {
+			if (*MxStreamChunk::IntoTime(data) > p_action->GetUnknown9c()) {
+				*MxDSChunk::IntoType(data) = FOURCC('p', 'a', 'd', ' ');
+
+				memcpy(data + 8, *pdata, buffer->GetWriteOffset() + *pdata - data - 8);
+				size = ReadData(*pdata, buffer->GetWriteOffset());
+
+				MxDSBuffer* buffer3 = new MxDSBuffer();
+				if (!buffer3)
+					return FAILURE;
+
+				if (buffer3->AllocateBuffer(size, MxDSBufferType_Allocate) == SUCCESS) {
+					memcpy(buffer3->GetBuffer(), p_action->GetUnknowna4()->GetBuffer(), size);
+					p_action->GetUnknowna4()->SetMode(MxDSBufferType_Allocate);
+					delete p_action->GetUnknowna4();
+
+					buffer3->SetMode(MxDSBufferType_Unknown);
+					p_action->SetUnknowna4(buffer3);
+					MxDSBuffer* buffer4 = p_action->GetUnknowna0();
+					MxU32 unk0x14 = buffer4->GetUnknown14();
+					MxU8* data2 = buffer4->GetBuffer();
+
+					while (TRUE) {
+						if (*MxStreamChunk::IntoTime(data2) > p_action->GetUnknown9c())
+							break;
+
+						data += MxDSChunk::Size(*MxDSChunk::IntoLength(data));
+						unk0x14 += MxDSChunk::Size(*MxDSChunk::IntoLength(data));
+					}
+
+					p_action->SetUnknown94(unk0x14);
+					p_action->SetBufferOffset(p_action->GetUnknowna0()->GetUnknown14());
+					delete p_action->GetUnknowna0();
+					return SUCCESS;
+				}
+				else {
+					delete buffer3;
+					return FAILURE;
+				}
+			}
+		}
+
+		data = buffer->FUN_100c6fa0(data);
+	}
+
+	p_action->SetUnknown94(GetFileSize() + p_action->GetBufferOffset());
+	p_action->SetBufferOffset(GetFileSize() + p_action->GetBufferOffset());
+	FUN_100d1780(p_action);
+	return SUCCESS;
 }
 
 // FUNCTION: LEGO1 0x100d1e90
diff --git a/LEGO1/omni/src/stream/mxdsbuffer.cpp b/LEGO1/omni/src/stream/mxdsbuffer.cpp
index 5e4b277d..54ed0ca2 100644
--- a/LEGO1/omni/src/stream/mxdsbuffer.cpp
+++ b/LEGO1/omni/src/stream/mxdsbuffer.cpp
@@ -143,11 +143,11 @@ MxResult MxDSBuffer::AllocateBuffer(MxU32 p_bufferSize, MxDSBufferType p_mode)
 }
 
 // FUNCTION: LEGO1 0x100c6780
-MxResult MxDSBuffer::SetBufferPointer(MxU32* p_buffer, MxU32 p_size)
+MxResult MxDSBuffer::SetBufferPointer(MxU8* p_buffer, MxU32 p_size)
 {
-	m_pBuffer = (MxU8*) p_buffer;
-	m_pIntoBuffer = (MxU8*) p_buffer;
-	m_pIntoBuffer2 = (MxU8*) p_buffer;
+	m_pBuffer = p_buffer;
+	m_pIntoBuffer = p_buffer;
+	m_pIntoBuffer2 = p_buffer;
 	m_bytesRemaining = p_size;
 	m_writeOffset = p_size;
 	m_mode = MxDSBufferType_Preallocated;
@@ -299,7 +299,7 @@ MxResult MxDSBuffer::ParseChunk(
 	p_header->SetTime(p_header->GetTime() + m_unk0x30->GetUnknowna8());
 
 	if (p_header->GetFlags() & MxDSChunk::Flag_Split) {
-		MxU32 length = p_header->GetLength() + MxDSChunk::ReturnE() + 8;
+		MxU32 length = p_header->GetLength() + MxDSChunk::GetHeaderSize() + 8;
 		MxDSBuffer* buffer = new MxDSBuffer();
 
 		if (buffer && buffer->AllocateBuffer(length, MxDSBufferType_Allocate) == SUCCESS &&
@@ -465,15 +465,15 @@ MxResult MxDSBuffer::CalcBytesRemaining(MxU8* p_data)
 			ptr = p_data;
 		}
 		else {
-			ptr = &p_data[MxStreamChunk::ReturnE() + 8];
-			bytesRead = (*(MxU32*) (p_data + 4)) - MxStreamChunk::ReturnE();
+			ptr = &p_data[MxStreamChunk::GetHeaderSize() + 8];
+			bytesRead = (*(MxU32*) (p_data + 4)) - MxStreamChunk::GetHeaderSize();
 		}
 
 		if (bytesRead <= m_bytesRemaining) {
 			memcpy(m_pBuffer + m_writeOffset - m_bytesRemaining, ptr, bytesRead);
 
 			if (m_writeOffset == m_bytesRemaining)
-				*(MxU32*) (m_pBuffer + 4) = *MxStreamChunk::IntoLength(m_pBuffer) + MxStreamChunk::ReturnE();
+				*(MxU32*) (m_pBuffer + 4) = *MxStreamChunk::IntoLength(m_pBuffer) + MxStreamChunk::GetHeaderSize();
 
 			m_bytesRemaining -= bytesRead;
 			result = SUCCESS;
@@ -491,3 +491,61 @@ void MxDSBuffer::FUN_100c6f80(MxU32 p_writeOffset)
 		m_pIntoBuffer = m_pBuffer + p_writeOffset;
 	}
 }
+
+// FUNCTION: LEGO1 0x100c6fa0
+MxU8* MxDSBuffer::FUN_100c6fa0(MxU8* p_data)
+{
+	MxU8* current = p_data ? p_data : m_pBuffer;
+	MxU8* end = m_writeOffset + m_pBuffer - 8;
+
+	while (current <= end) {
+		switch (*((MxU32*) current)) {
+		case FOURCC('L', 'I', 'S', 'T'):
+		case FOURCC('R', 'I', 'F', 'F'):
+			current += 12;
+			break;
+		case FOURCC('M', 'x', 'D', 'a'):
+		case FOURCC('M', 'x', 'S', 't'):
+			current += 8;
+			break;
+		case FOURCC('M', 'x', 'O', 'b'):
+		case FOURCC('M', 'x', 'C', 'h'):
+			if (current != p_data)
+				return current;
+			current = ((MxU32) current & 1) + current;
+			current += 8;
+			break;
+		case FOURCC('M', 'x', 'H', 'd'):
+			current += (((MxU32*) current)[1] + 8);
+			break;
+		}
+	}
+
+	return NULL;
+}
+
+// FUNCTION: LEGO1 0x100c7090
+MxResult MxDSBuffer::FUN_100c7090(MxDSBuffer* p_buf)
+{
+	MxResult result = FAILURE;
+
+	if (m_writeOffset >= p_buf->m_writeOffset) {
+		memcpy(m_pBuffer, p_buf->m_pBuffer, p_buf->m_writeOffset);
+		result = SUCCESS;
+	}
+
+	m_unk0x1c = p_buf->m_unk0x1c;
+	return result;
+}
+
+// FUNCTION: LEGO1 0x100c70d0
+MxResult MxDSBuffer::Append(MxU8* p_buffer1, MxU8* p_buffer2)
+{
+	if (p_buffer1 && p_buffer2) {
+		MxU32 size = ((MxU32*) p_buffer2)[1] - MxDSChunk::GetHeaderSize();
+		memcpy(p_buffer1 + ((MxU32*) p_buffer1)[1] + 8, p_buffer2 + MxDSChunk::GetHeaderSize() + 8, size);
+		((MxU32*) p_buffer1)[1] += size;
+		return SUCCESS;
+	}
+	return FAILURE;
+}
diff --git a/LEGO1/omni/src/stream/mxdschunk.cpp b/LEGO1/omni/src/stream/mxdschunk.cpp
index bee247d2..79b9fea1 100644
--- a/LEGO1/omni/src/stream/mxdschunk.cpp
+++ b/LEGO1/omni/src/stream/mxdschunk.cpp
@@ -20,7 +20,7 @@ MxDSChunk::~MxDSChunk()
 }
 
 // FUNCTION: LEGO1 0x100be1e0
-MxU32 MxDSChunk::ReturnE()
+MxU32 MxDSChunk::GetHeaderSize()
 {
 	return 0xe;
 }
diff --git a/LEGO1/omni/src/stream/mxramstreamcontroller.cpp b/LEGO1/omni/src/stream/mxramstreamcontroller.cpp
index 71ee1b92..b480255c 100644
--- a/LEGO1/omni/src/stream/mxramstreamcontroller.cpp
+++ b/LEGO1/omni/src/stream/mxramstreamcontroller.cpp
@@ -6,8 +6,6 @@
 
 DECOMP_SIZE_ASSERT(MxRAMStreamController, 0x98);
 
-undefined* __cdecl ReadData(MxU32* p_fileSizeBuffer, MxU32 p_fileSize);
-
 // FUNCTION: LEGO1 0x100c6110
 MxResult MxRAMStreamController::Open(const char* p_filename)
 {
@@ -95,9 +93,3 @@ MxResult MxRAMStreamController::DeserializeObject(MxDSStreamingAction& p_action)
 
 	return result == SUCCESS ? SUCCESS : FAILURE;
 }
-
-// STUB: LEGO1 0x100d0d80
-undefined* __cdecl ReadData(MxU32* p_fileSizeBuffer, MxU32 p_fileSize)
-{
-	return NULL;
-}
diff --git a/LEGO1/omni/src/stream/mxramstreamprovider.cpp b/LEGO1/omni/src/stream/mxramstreamprovider.cpp
index fc20bf33..232e347b 100644
--- a/LEGO1/omni/src/stream/mxramstreamprovider.cpp
+++ b/LEGO1/omni/src/stream/mxramstreamprovider.cpp
@@ -1,6 +1,7 @@
 #include "mxramstreamprovider.h"
 
 #include "decomp.h"
+#include "mxdsbuffer.h"
 #include "mxomni.h"
 #include "mxstreamcontroller.h"
 
@@ -77,7 +78,7 @@ MxResult MxRAMStreamProvider::SetResourceToGet(MxStreamController* p_resource)
 		m_fileSize = m_pFile->CalcFileSize();
 		if (m_fileSize != 0) {
 			m_bufferSize = m_pFile->GetBufferSize();
-			m_pBufferOfFileSize = (MxU32*) new MxU8[m_fileSize];
+			m_pBufferOfFileSize = new MxU8[m_fileSize];
 			if (m_pBufferOfFileSize != NULL &&
 				m_pFile->Read((unsigned char*) m_pBufferOfFileSize, m_fileSize) == SUCCESS) {
 				m_lengthInDWords = m_pFile->GetLengthInDWords();
@@ -96,3 +97,60 @@ MxResult MxRAMStreamProvider::SetResourceToGet(MxStreamController* p_resource)
 	m_pFile = NULL;
 	return result;
 }
+
+// FUNCTION: LEGO1 0x100d0d80
+MxU32 ReadData(MxU8* p_buffer, MxU32 p_size)
+{
+	MxU32 id;
+	MxU8* data = p_buffer;
+	MxU8* end = p_buffer + p_size;
+	MxU8* data2;
+
+	if (p_buffer < end) {
+		do {
+			if (*MxDSChunk::IntoType(data) == FOURCC('M', 'x', 'O', 'b')) {
+				data2 = data;
+				data += 8;
+
+				MxDSObject* obj = DeserializeDSObjectDispatch(&data, -1);
+				id = obj->GetObjectId();
+				delete obj;
+
+				data = MxDSChunk::End(data2);
+				while (data < end) {
+					if (*MxDSChunk::IntoType(data) == FOURCC('M', 'x', 'C', 'h')) {
+						MxU8* data3 = data;
+						MxU32* psize = MxDSChunk::IntoLength(data);
+						data += MxDSChunk::Size(*psize);
+
+						if ((*MxDSChunk::IntoType(data2) == FOURCC('M', 'x', 'C', 'h')) &&
+							(*MxStreamChunk::IntoFlags(data2) & MxDSChunk::Flag_Split)) {
+							if (*MxStreamChunk::IntoObjectId(data2) == *MxStreamChunk::IntoObjectId(data3) &&
+								(*MxStreamChunk::IntoFlags(data3) & MxDSChunk::Flag_Split) &&
+								*MxStreamChunk::IntoTime(data2) == *MxStreamChunk::IntoTime(data3)) {
+								MxDSBuffer::Append(data2, data3);
+								continue;
+							}
+							else
+								*MxStreamChunk::IntoFlags(data2) &= ~MxDSChunk::Flag_Split;
+						}
+
+						data2 += MxDSChunk::Size(*MxDSChunk::IntoLength(data2));
+						memcpy(data2, data3, MxDSChunk::Size(*psize));
+
+						if (*MxStreamChunk::IntoObjectId(data2) == id &&
+							(*MxStreamChunk::IntoFlags(data2) & MxDSChunk::Flag_End))
+							break;
+					}
+					else
+						data++;
+				}
+			}
+			else
+				data++;
+		} while (data < end);
+	}
+
+	*MxStreamChunk::IntoFlags(data2) &= ~MxDSChunk::Flag_Split;
+	return MxDSChunk::End(data2) - p_buffer;
+}

From e55b2ad6395d3b6f2ef43d7d2d982c2fb9138ad2 Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Wed, 10 Jan 2024 13:45:52 -0500
Subject: [PATCH 092/210] Name a few members in LegoVideoManager

---
 .../lego/legoomni/include/legovideomanager.h  |  8 +++---
 .../legoomni/src/video/legovideomanager.cpp   | 26 +++++++++----------
 .../src/video/mxtransitionmanager.cpp         |  2 +-
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/LEGO1/lego/legoomni/include/legovideomanager.h b/LEGO1/lego/legoomni/include/legovideomanager.h
index 0783931a..898204da 100644
--- a/LEGO1/lego/legoomni/include/legovideomanager.h
+++ b/LEGO1/lego/legoomni/include/legovideomanager.h
@@ -40,7 +40,7 @@ class LegoVideoManager : public MxVideoManager {
 
 	inline Lego3DManager* Get3DManager() { return this->m_3dManager; }
 	inline MxDirect3D* GetDirect3D() { return this->m_direct3d; }
-	inline void SetUnkE4(MxBool p_unk0xe4) { this->m_unk0xe4 = p_unk0xe4; }
+	inline void SetRender3D(MxBool p_render3d) { this->m_render3d = p_render3d; }
 
 private:
 	MxResult CreateDirect3D();
@@ -55,7 +55,7 @@ class LegoVideoManager : public MxVideoManager {
 	undefined4 m_unk0x70;                 // 0x70
 	MxDirect3D* m_direct3d;               // 0x74
 	undefined4 m_unk0x78[27];             // 0x78
-	MxBool m_unk0xe4;                     // 0xe4
+	MxBool m_render3d;                    // 0xe4
 	MxBool m_unk0xe5;                     // 0xe5
 	MxBool m_unk0xe6;                     // 0xe6
 	PALETTEENTRY m_paletteEntries[256];   // 0xe7
@@ -65,7 +65,7 @@ class LegoVideoManager : public MxVideoManager {
 	MxPalette* m_palette;                 // 0x4f0
 	MxStopWatch* m_stopWatch;             // 0x4f4
 	double m_elapsedSeconds;              // 0x4f8
-	MxBool m_unk0x500;                    // 0x500
+	MxBool m_fullScreenMovie;             // 0x500
 	MxBool m_drawCursor;                  // 0x501
 	MxS32 m_cursorXCopy;                  // 0x504
 	MxS32 m_cursorYCopy;                  // 0x508
@@ -80,7 +80,7 @@ class LegoVideoManager : public MxVideoManager {
 	SIZE m_fpsSize;                       // 0x544
 	undefined m_pad0x54c[8];              // 0x54c
 	MxBool m_unk0x554;                    // 0x554
-	MxBool m_initialized;                 // 0x555
+	MxBool m_paused;                      // 0x555
 	undefined m_pad0x556[0x39];           // 0x556
 };
 
diff --git a/LEGO1/lego/legoomni/src/video/legovideomanager.cpp b/LEGO1/lego/legoomni/src/video/legovideomanager.cpp
index 43cdde24..df88ad58 100644
--- a/LEGO1/lego/legoomni/src/video/legovideomanager.cpp
+++ b/LEGO1/lego/legoomni/src/video/legovideomanager.cpp
@@ -30,13 +30,13 @@ LegoVideoManager::LegoVideoManager()
 	m_cursorYCopy = m_cursorY;
 	m_cursorXCopy = m_cursorY;
 	m_unk0x514 = 0;
-	m_unk0x500 = FALSE;
+	m_fullScreenMovie = FALSE;
 	m_drawFPS = FALSE;
 	m_unk0x528 = 0;
 	m_arialFont = NULL;
 	m_unk0xe5 = FALSE;
 	m_unk0x554 = FALSE;
-	m_initialized = FALSE;
+	m_paused = FALSE;
 }
 
 // FUNCTION: LEGO1 0x1007ab40
@@ -179,7 +179,7 @@ MxResult LegoVideoManager::Create(MxVideoParam& p_videoParam, MxU32 p_frequencyM
 	m_3dManager->SetPointOfView(*m_viewROI);
 
 	m_unk0x100d9d00 = new LegoUnknown100d9d00;
-	m_unk0xe4 = FALSE;
+	m_render3d = FALSE;
 	m_stopWatch = new MxStopWatch;
 	m_stopWatch->Start();
 
@@ -247,13 +247,13 @@ MxResult LegoVideoManager::Tickle()
 	while (cursor.Next(presenter))
 		presenter->Tickle();
 
-	if (m_unk0xe4 && !m_initialized)
+	if (m_render3d && !m_paused)
 		m_3dManager->GetLego3DView()->GetView()->Clear();
 
 	MxRect32 rect(0, 0, m_videoParam.GetRect().GetWidth() - 1, m_videoParam.GetRect().GetHeight() - 1);
 	InvalidateRect(rect);
 
-	if (!m_initialized && (m_unk0xe4 || m_unk0xe5)) {
+	if (!m_paused && (m_render3d || m_unk0xe5)) {
 		cursor.Reset();
 
 		while (cursor.Next(presenter) && presenter->GetDisplayZ() >= 0)
@@ -275,7 +275,7 @@ MxResult LegoVideoManager::Tickle()
 		if (m_drawFPS)
 			DrawFPS();
 	}
-	else if (m_unk0x500) {
+	else if (m_fullScreenMovie) {
 		MxPresenter* presenter;
 		MxPresenterListCursor cursor(m_presenters);
 
@@ -283,8 +283,8 @@ MxResult LegoVideoManager::Tickle()
 			presenter->PutData();
 	}
 
-	if (!m_initialized) {
-		if (m_unk0xe4 && m_videoParam.Flags().GetFlipSurfaces()) {
+	if (!m_paused) {
+		if (m_render3d && m_videoParam.Flags().GetFlipSurfaces()) {
 			m_3dManager->GetLego3DView()
 				->GetView()
 				->ForceUpdate(0, 0, m_videoParam.GetRect().GetWidth(), m_videoParam.GetRect().GetHeight());
@@ -364,8 +364,8 @@ void LegoVideoManager::EnableFullScreenMovie(MxBool p_enable, MxBool p_scale)
 
 			m_displaySurface->GetVideoParam().Flags().SetF1bit3(p_scale);
 
-			m_unk0xe4 = FALSE;
-			m_unk0x500 = TRUE;
+			m_render3d = FALSE;
+			m_fullScreenMovie = TRUE;
 		}
 		else {
 			m_displaySurface->FUN_100ba640();
@@ -388,8 +388,8 @@ void LegoVideoManager::EnableFullScreenMovie(MxBool p_enable, MxBool p_scale)
 			UpdateRegion();
 			OverrideSkyColor(TRUE);
 
-			m_unk0xe4 = TRUE;
-			m_unk0x500 = FALSE;
+			m_render3d = TRUE;
+			m_fullScreenMovie = FALSE;
 		}
 	}
 
@@ -431,7 +431,7 @@ void LegoVideoManager::VTable0x34(MxU32 p_x, MxU32 p_y, MxU32 p_width, MxU32 p_h
 		p_height = m_videoParam.GetRect().GetHeight();
 	}
 
-	if (!m_initialized) {
+	if (!m_paused) {
 		m_3dManager->GetLego3DView()->GetView()->ForceUpdate(p_x, p_y, p_width, p_height);
 	}
 }
diff --git a/LEGO1/lego/legoomni/src/video/mxtransitionmanager.cpp b/LEGO1/lego/legoomni/src/video/mxtransitionmanager.cpp
index 565908a0..734b4eae 100644
--- a/LEGO1/lego/legoomni/src/video/mxtransitionmanager.cpp
+++ b/LEGO1/lego/legoomni/src/video/mxtransitionmanager.cpp
@@ -118,7 +118,7 @@ MxResult MxTransitionManager::StartTransition(
 		inputManager->m_unk0x336 = FALSE;
 
 		LegoVideoManager* videoManager = VideoManager();
-		videoManager->SetUnkE4(FALSE);
+		videoManager->SetRender3D(FALSE);
 
 		SetAppCursor(1);
 		return SUCCESS;

From 01f3168e71393d38489b21772e8b584c44c13d89 Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Wed, 10 Jan 2024 13:47:54 -0500
Subject: [PATCH 093/210] Use NULL where appropriate

---
 LEGO1/lego/legoomni/src/video/legovideomanager.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/LEGO1/lego/legoomni/src/video/legovideomanager.cpp b/LEGO1/lego/legoomni/src/video/legovideomanager.cpp
index df88ad58..1db16c2c 100644
--- a/LEGO1/lego/legoomni/src/video/legovideomanager.cpp
+++ b/LEGO1/lego/legoomni/src/video/legovideomanager.cpp
@@ -17,7 +17,7 @@ LegoVideoManager::LegoVideoManager()
 	m_renderer = NULL;
 	m_3dManager = NULL;
 	m_viewROI = NULL;
-	m_direct3d = 0;
+	m_direct3d = NULL;
 	m_unk0xe6 = FALSE;
 	memset(m_unk0x78, 0, sizeof(m_unk0x78));
 	m_unk0x78[0] = 0x6c;
@@ -29,7 +29,7 @@ LegoVideoManager::LegoVideoManager()
 	m_cursorX = m_cursorY;
 	m_cursorYCopy = m_cursorY;
 	m_cursorXCopy = m_cursorY;
-	m_unk0x514 = 0;
+	m_unk0x514 = NULL;
 	m_fullScreenMovie = FALSE;
 	m_drawFPS = FALSE;
 	m_unk0x528 = 0;

From b996fff6fa87e95913856acc6de5cdf82be3c147 Mon Sep 17 00:00:00 2001
From: Anonymous Maarten <madebr@users.noreply.github.com>
Date: Wed, 10 Jan 2024 23:34:32 +0100
Subject: [PATCH 094/210] Support building isle with modern MSVC + msys2 (#421)

* cmake: detect older MSVC and define ENABLE_DECOMP_ASSERTS to enable decomp asserts

* Add /Zc:__cplusplus to define __cplusplus with c++ version number

* Silence deprecated CRT releated warnings

* LegoCameraController overrids some methods that are not defined in its parent(s)

* Tgl::Device::GetDrawnTriangleCount does not exist (FIXME: INCORRECT FIX -> Tgl::Device should be updated instead)

* Remove copy/pasted APP_ICON from lego1 resource.h header

* Implement empty ViewLODList::Dump method

* Also enable "compat mode" for newer MSVC compilers

* Only do decomp assertions when using older MSVC compilers

* msys2 mingw compat (cannot pass reference of rvalue)

* Fix msys2 mingw warning: declaration 'class Tgl::Group' does not declare anything

* Add FIXME comment to LEgo3DView::m_previousRenderTime

* LegoView1 is 16 bytes bigger then LegoView ==> 4 32-bit pointers

* include string.h for strlen

* Fix overrides

* Fix constness of method

* Fixes

* Formatting

* Add size assert for MxFrequencyMeter

* ci: build isle with msys2 + msvc on GitHub actions

* Set vcvars for msvc

* msys2 needs the msys2 shell

* Build in default shell

* isle is not 64-bit yet (I think)

* Print bitness

* Use amd64_x64 cross tools

* Minor updates

* Add more names

---------

Co-authored-by: Christian Semmler <mail@csemmler.com>
---
 .github/workflows/analyze.yml                 |  2 +
 .github/workflows/build.yml                   | 54 +++++++++++++++++--
 CMakeLists.txt                                | 41 +++++++++++++-
 .../legoomni/include/legocameracontroller.h   | 14 ++---
 LEGO1/lego/legoomni/include/legoentity.h      | 16 +++---
 .../include/legopointofviewcontroller.h       |  1 +
 .../src/common/legoactioncontrolpresenter.cpp |  7 +++
 .../src/entity/legocameracontroller.cpp       |  2 +-
 LEGO1/lego/legoomni/src/entity/legoentity.cpp |  2 +-
 .../legoomni/src/video/legovideomanager.cpp   |  1 +
 LEGO1/lego/sources/3dmanager/lego3dmanager.h  |  8 ++-
 LEGO1/lego/sources/3dmanager/lego3dview.h     |  6 +--
 LEGO1/lego/sources/3dmanager/legoview1.h      |  6 ++-
 LEGO1/lego/sources/3dmanager/tglsurface.cpp   |  5 ++
 LEGO1/lego/sources/3dmanager/tglsurface.h     | 11 ++--
 LEGO1/omni/include/mxutil.h                   |  2 +
 LEGO1/res/resource.h                          |  2 -
 LEGO1/viewmanager/viewlodlist.h               |  7 +++
 util/compat.h                                 |  4 +-
 util/decomp.h                                 |  2 +-
 20 files changed, 157 insertions(+), 36 deletions(-)

diff --git a/.github/workflows/analyze.yml b/.github/workflows/analyze.yml
index e139b8bf..01b85f47 100644
--- a/.github/workflows/analyze.yml
+++ b/.github/workflows/analyze.yml
@@ -4,6 +4,7 @@ on: [push, pull_request]
 
 jobs:
   decomplint-isle:
+    name: 'ISLE annotations'
     runs-on: ubuntu-latest
 
     steps:
@@ -18,6 +19,7 @@ jobs:
         python3 tools/decomplint/decomplint.py ISLE --module ISLE --warnfail
 
   decomplint-lego1:
+    name: 'LEGO1 annotations'
     runs-on: ubuntu-latest
 
     steps:
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 2c285836..419033cc 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -3,7 +3,53 @@ name: Build
 on: [push, pull_request]
 
 jobs:
+  build-current-toolchain:
+    name: 'Current ${{ matrix.toolchain.name }}'
+    runs-on: windows-latest
+    defaults:
+      run:
+        shell: ${{ matrix.toolchain.shell }}
+    strategy:
+      fail-fast: false
+      matrix:
+        toolchain:
+        - { name: 'MSVC',           shell: 'sh',        setup-cmake: true, setup-ninja: true, setup-msvc: true }
+        - { name: 'msys2 mingw32',  shell: 'msys2 {0}', setup-msys2: true }
+
+    steps:
+      - name: Set up MSYS2
+        if: matrix.toolchain.setup-msys2
+        uses: msys2/setup-msys2@v2
+        with:
+          msystem: mingw32
+          install: >-
+            mingw-w64-i686-cc
+            mingw-w64-i686-cmake
+            mingw-w64-i686-ninja
+
+      - name: Setup cmake
+        if: matrix.toolchain.setup-cmake
+        uses: jwlawson/actions-setup-cmake@v1.13
+
+      - name: Setup ninja
+        if: matrix.toolchain.setup-ninja
+        uses: ashutoshvarma/setup-ninja@master
+
+      - name: Setup vcvars
+        if: matrix.toolchain.setup-msvc
+        uses: ilammy/msvc-dev-cmd@v1
+        with:
+          arch: amd64_x86  # Use the 64-bit x64-native cross tools to build 32-bit x86 code
+
+      - uses: actions/checkout@v3
+
+      - name: Build
+        run: |
+          cmake -S . -B build -DCMAKE_BUILD_TYPE=Debug -GNinja -Werror=dev
+          cmake --build build
+
   build:
+    name: 'MSVC 4.20'
     runs-on: windows-latest
 
     steps:
@@ -28,10 +74,8 @@ jobs:
       shell: cmd
       run: |
         call .\msvc420\bin\VCVARS32.BAT x86
-        mkdir build
-        cd build
-        cmake .. -DCMAKE_BUILD_TYPE=RelWithDebInfo -G "NMake Makefiles"
-        cmake --build .
+        cmake -B build -DCMAKE_BUILD_TYPE=RelWithDebInfo -G "NMake Makefiles"
+        cmake --build build
 
     - name: Upload Artifact
       uses: actions/upload-artifact@master
@@ -44,6 +88,7 @@ jobs:
           build/LEGO1.PDB
 
   compare:
+    name: 'Compare with master'
     needs: build
     runs-on: windows-latest
     steps:
@@ -109,6 +154,7 @@ jobs:
           LEGO1PROGRESS.*
 
   upload:
+    name: 'Upload artifacts'
     needs: [build, compare]
     runs-on: ubuntu-latest
     if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' && github.repository == 'isledecomp/isle' }}
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 483ba9db..6378a2b0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,8 +2,24 @@ cmake_minimum_required(VERSION 3.13 FATAL_ERROR)
 
 project(isle CXX)
 
+math(EXPR bits "8 * ${CMAKE_SIZEOF_VOID_P}")
+message(STATUS "Building ${bits}-bit LEGO Island")
+if (NOT bits EQUAL 32)
+    message(WARNING "Only 32-bit executables are supported")
+endif()
+
+set(MSVC_FOR_DECOMP FALSE)
+if (MSVC)
+    # Visual C++ 4.2 -> cl version 10.2.0
+    if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "11.0")
+        set(MSVC_FOR_DECOMP TRUE)
+    endif()
+endif()
+
+message(STATUS "MSVC for decompilation: ${MSVC_FOR_DECOMP}")
+
 option(ISLE_BUILD_APP "Build ISLE.EXE application" ON)
-option(ISLE_USE_SMARTHEAP "Build with SmartHeap" ${MSVC})
+option(ISLE_USE_SMARTHEAP "Build with SmartHeap" ${MSVC_FOR_DECOMP})
 option(ISLE_USE_DX5 "Build with internal DirectX 5 SDK" ON)
 
 add_library(lego1 SHARED
@@ -300,6 +316,29 @@ if (ISLE_BUILD_APP)
 endif()
 
 if (MSVC)
+  if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL "15")
+    target_compile_definitions(lego1 PRIVATE _CRT_SECURE_NO_WARNINGS)
+    if (ISLE_BUILD_APP)
+      target_compile_definitions(isle PRIVATE "_CRT_SECURE_NO_WARNINGS")
+    endif()
+  endif()
+  # Visual Studio 2017 version 15.7 needs "/Zc:__cplusplus" for __cplusplus
+  if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL "19.14.26428")
+    target_compile_options(lego1 PRIVATE "-Zc:__cplusplus")
+    if (ISLE_BUILD_APP)
+      target_compile_options(isle PRIVATE "-Zc:__cplusplus")
+    endif()
+  endif()
+endif()
+
+if (MSVC_FOR_DECOMP)
+    target_compile_definitions(lego1 PRIVATE "ENABLE_DECOMP_ASSERTS")
+    if (ISLE_BUILD_APP)
+        target_compile_definitions(isle PRIVATE "ENABLE_DECOMP_ASSERTS")
+    endif()
+endif()
+
+if (MSVC_FOR_DECOMP)
   # These flags have been taken from the defaults for a Visual C++ 4.20 project (the compiler the
   # game was originally built with) and tweaked slightly to produce more debugging info for reccmp.
   # They ensure a recompilation that can be byte/instruction accurate to the original binaries.
diff --git a/LEGO1/lego/legoomni/include/legocameracontroller.h b/LEGO1/lego/legoomni/include/legocameracontroller.h
index 05c974a3..ba66461a 100644
--- a/LEGO1/lego/legoomni/include/legocameracontroller.h
+++ b/LEGO1/lego/legoomni/include/legocameracontroller.h
@@ -29,14 +29,14 @@ class LegoCameraController : public LegoPointOfViewController {
 		return !strcmp(p_name, ClassName()) || MxCore::IsA(p_name);
 	}
 
-	virtual void OnLButtonDown(MxPoint32 p_point) override;                // vtable+0x30
-	virtual void OnLButtonUp(MxPoint32 p_point) override;                  // vtable+0x34
-	virtual void OnRButtonDown(MxPoint32 p_point) override;                // vtable+0x38
-	virtual void OnRButtonUp(MxPoint32 p_point) override;                  // vtable+0x3c
-	virtual void OnMouseMove(MxU8 p_modifier, MxPoint32 p_point) override; // vtable+0x40
-	virtual MxResult Create();                                             // vtable+0x44
+	virtual void OnLButtonDown(MxPoint32 p_point);                // vtable+0x30
+	virtual void OnLButtonUp(MxPoint32 p_point);                  // vtable+0x34
+	virtual void OnRButtonDown(MxPoint32 p_point);                // vtable+0x38
+	virtual void OnRButtonUp(MxPoint32 p_point);                  // vtable+0x3c
+	virtual void OnMouseMove(MxU8 p_modifier, MxPoint32 p_point); // vtable+0x40
+	virtual MxResult Create();                                    // vtable+0x44
 
-	void SetWorldTransform(Vector3Impl& p_at, Vector3Impl& p_dir, Vector3Impl& p_up);
+	void SetWorldTransform(const Vector3Impl& p_at, const Vector3Impl& p_dir, const Vector3Impl& p_up);
 	void FUN_100123e0(Matrix4Data& p_transform, MxU32);
 	Vector3Data& FUN_10012740();
 	Vector3Data& FUN_100127f0();
diff --git a/LEGO1/lego/legoomni/include/legoentity.h b/LEGO1/lego/legoomni/include/legoentity.h
index ba0e1a7b..d911457c 100644
--- a/LEGO1/lego/legoomni/include/legoentity.h
+++ b/LEGO1/lego/legoomni/include/legoentity.h
@@ -32,12 +32,16 @@ class LegoEntity : public MxEntity {
 		return !strcmp(p_name, LegoEntity::ClassName()) || MxEntity::IsA(p_name);
 	}
 
-	virtual MxResult Create(MxDSObject& p_dsObject);                                           // vtable+0x18
-	virtual void Destroy(MxBool p_fromDestructor);                                             // vtable+0x1c
-	virtual void ParseAction(char*);                                                           // vtable+0x20
-	virtual void SetROI(LegoROI* p_roi, MxBool p_bool1, MxBool p_bool2);                       // vtable+0x24
-	virtual void SetWorldTransform(Vector3Impl& p_loc, Vector3Impl& p_dir, Vector3Impl& p_up); // vtable+0x28
-	virtual void ResetWorldTransform(MxBool p_inVehicle);                                      // vtable+0x2c
+	virtual MxResult Create(MxDSObject& p_dsObject);                     // vtable+0x18
+	virtual void Destroy(MxBool p_fromDestructor);                       // vtable+0x1c
+	virtual void ParseAction(char*);                                     // vtable+0x20
+	virtual void SetROI(LegoROI* p_roi, MxBool p_bool1, MxBool p_bool2); // vtable+0x24
+	virtual void SetWorldTransform(
+		const Vector3Impl& p_loc,
+		const Vector3Impl& p_dir,
+		const Vector3Impl& p_up
+	);                                                    // vtable+0x28
+	virtual void ResetWorldTransform(MxBool p_inVehicle); // vtable+0x2c
 	// FUNCTION: LEGO1 0x10001090
 	virtual void SetWorldSpeed(MxFloat p_worldSpeed) { m_worldSpeed = p_worldSpeed; } // vtable+0x30
 	virtual void VTable0x34();                                                        // vtable+0x34
diff --git a/LEGO1/lego/legoomni/include/legopointofviewcontroller.h b/LEGO1/lego/legoomni/include/legopointofviewcontroller.h
index a7e92e97..444a08ad 100644
--- a/LEGO1/lego/legoomni/include/legopointofviewcontroller.h
+++ b/LEGO1/lego/legoomni/include/legopointofviewcontroller.h
@@ -3,6 +3,7 @@
 
 #include "decomp.h"
 #include "mxcore.h"
+#include "mxpoint32.h"
 
 #include <windows.h>
 
diff --git a/LEGO1/lego/legoomni/src/common/legoactioncontrolpresenter.cpp b/LEGO1/lego/legoomni/src/common/legoactioncontrolpresenter.cpp
index 953aef36..3649bb50 100644
--- a/LEGO1/lego/legoomni/src/common/legoactioncontrolpresenter.cpp
+++ b/LEGO1/lego/legoomni/src/common/legoactioncontrolpresenter.cpp
@@ -39,7 +39,14 @@ void LegoActionControlPresenter::RepeatingTickle()
 			ParseExtra();
 		}
 
+#ifdef COMPAT_MODE
+		{
+			MxAtomId atom(m_unk0x54.GetData(), LookupMode_LowerCase2);
+			InvokeAction(m_unk0x50, atom, m_unk0x64, NULL);
+		}
+#else
 		InvokeAction(m_unk0x50, MxAtomId(m_unk0x54.GetData(), LookupMode_LowerCase2), m_unk0x64, NULL);
+#endif
 		m_previousTickleStates |= 1 << (unsigned char) m_currentTickleState;
 		m_currentTickleState = TickleState_Done;
 	}
diff --git a/LEGO1/lego/legoomni/src/entity/legocameracontroller.cpp b/LEGO1/lego/legoomni/src/entity/legocameracontroller.cpp
index 34afaac0..d339b104 100644
--- a/LEGO1/lego/legoomni/src/entity/legocameracontroller.cpp
+++ b/LEGO1/lego/legoomni/src/entity/legocameracontroller.cpp
@@ -71,7 +71,7 @@ void LegoCameraController::OnMouseMove(MxU8 p_modifier, MxPoint32 p_point)
 }
 
 // FUNCTION: LEGO1 0x10012260
-void LegoCameraController::SetWorldTransform(Vector3Impl& p_at, Vector3Impl& p_dir, Vector3Impl& p_up)
+void LegoCameraController::SetWorldTransform(const Vector3Impl& p_at, const Vector3Impl& p_dir, const Vector3Impl& p_up)
 {
 	CalcLocalTransform(p_at, p_dir, p_up, m_matrix1);
 	m_matrix2 = m_matrix1;
diff --git a/LEGO1/lego/legoomni/src/entity/legoentity.cpp b/LEGO1/lego/legoomni/src/entity/legoentity.cpp
index 0f813029..b000da96 100644
--- a/LEGO1/lego/legoomni/src/entity/legoentity.cpp
+++ b/LEGO1/lego/legoomni/src/entity/legoentity.cpp
@@ -36,7 +36,7 @@ void LegoEntity::ResetWorldTransform(MxBool p_inVehicle)
 }
 
 // STUB: LEGO1 0x10010790
-void LegoEntity::SetWorldTransform(Vector3Impl& p_loc, Vector3Impl& p_dir, Vector3Impl& p_up)
+void LegoEntity::SetWorldTransform(const Vector3Impl& p_loc, const Vector3Impl& p_dir, const Vector3Impl& p_up)
 {
 	// TODO
 }
diff --git a/LEGO1/lego/legoomni/src/video/legovideomanager.cpp b/LEGO1/lego/legoomni/src/video/legovideomanager.cpp
index 1db16c2c..4d3dd304 100644
--- a/LEGO1/lego/legoomni/src/video/legovideomanager.cpp
+++ b/LEGO1/lego/legoomni/src/video/legovideomanager.cpp
@@ -10,6 +10,7 @@
 
 DECOMP_SIZE_ASSERT(LegoVideoManager, 0x590);
 DECOMP_SIZE_ASSERT(MxStopWatch, 0x18);
+DECOMP_SIZE_ASSERT(MxFrequencyMeter, 0x20);
 
 // FUNCTION: LEGO1 0x1007aa20
 LegoVideoManager::LegoVideoManager()
diff --git a/LEGO1/lego/sources/3dmanager/lego3dmanager.h b/LEGO1/lego/sources/3dmanager/lego3dmanager.h
index 8445800b..ab2bdefc 100644
--- a/LEGO1/lego/sources/3dmanager/lego3dmanager.h
+++ b/LEGO1/lego/sources/3dmanager/lego3dmanager.h
@@ -4,8 +4,12 @@
 #include "assert.h"
 #include "lego3dview.h"
 
-class Tgl::Renderer;
-class Tgl::Group;
+namespace Tgl
+{
+class Renderer;
+class Group;
+} // namespace Tgl
+
 class ViewROI;
 
 // ??? for now
diff --git a/LEGO1/lego/sources/3dmanager/lego3dview.h b/LEGO1/lego/sources/3dmanager/lego3dview.h
index 986d652c..f02e7d31 100644
--- a/LEGO1/lego/sources/3dmanager/lego3dview.h
+++ b/LEGO1/lego/sources/3dmanager/lego3dview.h
@@ -36,10 +36,8 @@ class Lego3DView : public LegoView1 {
 private:
 	ViewManager* m_pViewManager; // 0x88
 	double m_previousRenderTime; // 0x8c
-
-	ViewROI* m_pPointOfView; // 0x90
-
-	undefined m_unk0x94[0x0c]; // 0x94
+	ViewROI* m_pPointOfView;     // 0x94
+	undefined m_unk0x98[0x0c];   // 0x98
 };
 
 // SYNTHETIC: LEGO1 0x100aaf10
diff --git a/LEGO1/lego/sources/3dmanager/legoview1.h b/LEGO1/lego/sources/3dmanager/legoview1.h
index 20ccadfa..bfee4e3d 100644
--- a/LEGO1/lego/sources/3dmanager/legoview1.h
+++ b/LEGO1/lego/sources/3dmanager/legoview1.h
@@ -2,9 +2,13 @@
 #define _LegoView1_h
 
 #include "compat.h"
+#include "decomp.h"
 #include "tglsurface.h"
 
-class Tgl::Camera;
+namespace Tgl
+{
+class Camera;
+}
 
 /////////////////////////////////////////////////////////////////////////////
 // LegoView
diff --git a/LEGO1/lego/sources/3dmanager/tglsurface.cpp b/LEGO1/lego/sources/3dmanager/tglsurface.cpp
index 2493e00c..394e03e5 100644
--- a/LEGO1/lego/sources/3dmanager/tglsurface.cpp
+++ b/LEGO1/lego/sources/3dmanager/tglsurface.cpp
@@ -195,7 +195,12 @@ double TglSurface::Render()
 
 #ifdef _DEBUG
 		{
+#if 0
+			// FIXME: Tgl::Device::GetDrawnTriangleCount does not exist
 			unsigned long triangleCount = m_pDevice->GetDrawnTriangleCount();
+#else
+			unsigned long triangleCount = 0;
+#endif
 
 			m_triangleRateMeter.IncreaseOperationCount(triangleCount - m_triangleCount - 1);
 			m_triangleCount = triangleCount;
diff --git a/LEGO1/lego/sources/3dmanager/tglsurface.h b/LEGO1/lego/sources/3dmanager/tglsurface.h
index 2ea4cf12..2b97db50 100644
--- a/LEGO1/lego/sources/3dmanager/tglsurface.h
+++ b/LEGO1/lego/sources/3dmanager/tglsurface.h
@@ -4,10 +4,13 @@
 #include "mxdirectx/mxstopwatch.h"
 #include "tgl/tgl.h"
 
-class Tgl::Renderer;
-class Tgl::Device;
-class Tgl::View;
-class Tgl::Group;
+namespace Tgl
+{
+class Renderer;
+class Device;
+class View;
+class Group;
+} // namespace Tgl
 
 /////////////////////////////////////////////////////////////////////////////
 // TglSurface
diff --git a/LEGO1/omni/include/mxutil.h b/LEGO1/omni/include/mxutil.h
index f9febef1..ca2ab867 100644
--- a/LEGO1/omni/include/mxutil.h
+++ b/LEGO1/omni/include/mxutil.h
@@ -3,6 +3,8 @@
 
 #include "mxtypes.h"
 
+#include <string.h>
+
 class MxDSFile;
 class MxDSObject;
 
diff --git a/LEGO1/res/resource.h b/LEGO1/res/resource.h
index 5a51e019..2402acad 100644
--- a/LEGO1/res/resource.h
+++ b/LEGO1/res/resource.h
@@ -8,5 +8,3 @@
 #define LEGO1_LEAF5 108
 #define LEGO1_LEAF3 109
 #define LEGO1_BUSY 111
-
-#define APP_ICON 105
diff --git a/LEGO1/viewmanager/viewlodlist.h b/LEGO1/viewmanager/viewlodlist.h
index 9dc06d7b..0fc35d07 100644
--- a/LEGO1/viewmanager/viewlodlist.h
+++ b/LEGO1/viewmanager/viewlodlist.h
@@ -119,4 +119,11 @@ inline int ViewLODList::Release()
 	return m_refCount;
 }
 
+#ifdef _DEBUG
+inline void ViewLODList::Dump(void (*pTracer)(const char*, ...)) const
+{
+	// FIXME: dump something
+}
+#endif
+
 #endif // VIEWLODLIST_H
diff --git a/util/compat.h b/util/compat.h
index 3c83def6..b38a1c7c 100644
--- a/util/compat.h
+++ b/util/compat.h
@@ -3,13 +3,13 @@
 
 // Various macros to enable compiling with other/newer compilers.
 
-#ifdef __MINGW32__
+#if defined(__MINGW32__) || (defined(_MSC_VER) && _MSC_VER >= 1100)
 #define COMPAT_MODE
 #endif
 
 // Use `COMPAT_CONST` where something ought to be 'const', and a newer compiler would complain if it
 // wasn't, but we know it isn't 'const' in the original code.
-#ifdef __MINGW32__
+#if defined(__MINGW32__) || (defined(_MSC_VER) && _MSC_VER >= 1100)
 #define COMPAT_CONST const
 #else
 #define COMPAT_CONST
diff --git a/util/decomp.h b/util/decomp.h
index 4e539eaf..3470fcc3 100644
--- a/util/decomp.h
+++ b/util/decomp.h
@@ -1,7 +1,7 @@
 #ifndef DECOMP_H
 #define DECOMP_H
 
-#if defined(_MSC_VER)
+#if defined(ENABLE_DECOMP_ASSERTS)
 #define DECOMP_STATIC_ASSERT(V)                                                                                        \
 	namespace                                                                                                          \
 	{                                                                                                                  \

From 9eea48f62956bd239165f64088a9cb8d9fece3e6 Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Wed, 10 Jan 2024 17:40:24 -0500
Subject: [PATCH 095/210] Fix structure of Lego3DView (#422)

---
 LEGO1/lego/sources/3dmanager/lego3dview.cpp |  7 ++++---
 LEGO1/lego/sources/3dmanager/lego3dview.h   | 10 ++++------
 LEGO1/viewmanager/viewmanager.cpp           | 15 +++++++++++++++
 LEGO1/viewmanager/viewmanager.h             |  9 ++++++++-
 4 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/LEGO1/lego/sources/3dmanager/lego3dview.cpp b/LEGO1/lego/sources/3dmanager/lego3dview.cpp
index 04c9ea22..9225e2ea 100644
--- a/LEGO1/lego/sources/3dmanager/lego3dview.cpp
+++ b/LEGO1/lego/sources/3dmanager/lego3dview.cpp
@@ -10,11 +10,12 @@ DECOMP_SIZE_ASSERT(Lego3DView, 0xa8)
 /////////////////////////////////////////////////////////////////////////////
 // Lego3DView
 
-// STUB: LEGO1 0x100aae90
+// FUNCTION: LEGO1 0x100aae90
 Lego3DView::Lego3DView()
 {
 	m_pViewManager = 0;
 	m_previousRenderTime = 0;
+	m_unk0x98 = 0;
 	m_pPointOfView = 0;
 }
 
@@ -53,12 +54,12 @@ BOOL Lego3DView::Create(const TglSurface::CreateStruct& rCreateStruct, Tgl::Rend
 	return TRUE;
 }
 
-// STUB: LEGO1 0x100ab0b0
+// FUNCTION: LEGO1 0x100ab0b0
 void Lego3DView::Destroy()
 {
 	if (m_pPointOfView) {
 		m_pPointOfView = 0;
-		// m_pViewManager->SetPOVSource(0);
+		m_pViewManager->SetPOVSource(0);
 	}
 
 	delete m_pViewManager;
diff --git a/LEGO1/lego/sources/3dmanager/lego3dview.h b/LEGO1/lego/sources/3dmanager/lego3dview.h
index f02e7d31..7e68bdcb 100644
--- a/LEGO1/lego/sources/3dmanager/lego3dview.h
+++ b/LEGO1/lego/sources/3dmanager/lego3dview.h
@@ -3,9 +3,7 @@
 
 #include "decomp.h"
 #include "legoview1.h"
-
-class ViewROI;
-class ViewManager;
+#include "viewmanager/viewmanager.h"
 
 /////////////////////////////////////////////////////////////////////////////
 // Lego3DView
@@ -35,9 +33,9 @@ class Lego3DView : public LegoView1 {
 
 private:
 	ViewManager* m_pViewManager; // 0x88
-	double m_previousRenderTime; // 0x8c
-	ViewROI* m_pPointOfView;     // 0x94
-	undefined m_unk0x98[0x0c];   // 0x98
+	double m_previousRenderTime; // 0x90
+	double m_unk0x98;            // 0x98
+	ViewROI* m_pPointOfView;     // 0xa0
 };
 
 // SYNTHETIC: LEGO1 0x100aaf10
diff --git a/LEGO1/viewmanager/viewmanager.cpp b/LEGO1/viewmanager/viewmanager.cpp
index 8ec2aad2..71ab5fcc 100644
--- a/LEGO1/viewmanager/viewmanager.cpp
+++ b/LEGO1/viewmanager/viewmanager.cpp
@@ -1,7 +1,22 @@
 #include "viewmanager.h"
 
+// STUB: LEGO1 0x100a5eb0
+ViewManager::ViewManager(Tgl::Group* scene, const OrientableROI* point_of_view)
+{
+}
+
+// STUB: LEGO1 0x100a60c0
+ViewManager::~ViewManager()
+{
+}
+
 // STUB: LEGO1 0x100a64d0
 void ViewManager::RemoveAll(ViewROI*)
 {
 	// TODO
 }
+
+// STUB: LEGO1 0x100a6da0
+void ViewManager::SetPOVSource(const OrientableROI* point_of_view)
+{
+}
diff --git a/LEGO1/viewmanager/viewmanager.h b/LEGO1/viewmanager/viewmanager.h
index 2b0d102e..41421b14 100644
--- a/LEGO1/viewmanager/viewmanager.h
+++ b/LEGO1/viewmanager/viewmanager.h
@@ -1,11 +1,18 @@
 #ifndef VIEWMANAGER_H
 #define VIEWMANAGER_H
 
-class ViewROI;
+#include "viewroi.h"
 
+// VTABLE: LEGO1 0x100dbd88
+// SIZE 0x1bc
 class ViewManager {
 public:
+	ViewManager(Tgl::Group* scene, const OrientableROI* point_of_view);
+	virtual ~ViewManager();
+
 	__declspec(dllexport) void RemoveAll(ViewROI*);
+
+	void SetPOVSource(const OrientableROI* point_of_view);
 };
 
 #endif // VIEWMANAGER_H

From 75f7791d6fbbc79fccc44c4882ca0c2bd1ff556c Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Thu, 11 Jan 2024 04:46:37 -0500
Subject: [PATCH 096/210] Add names for other GH actions

---
 .github/workflows/format.yml   | 2 ++
 .github/workflows/naming.yml   | 1 +
 .github/workflows/unittest.yml | 4 +++-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml
index 07b646fb..ccec2b50 100644
--- a/.github/workflows/format.yml
+++ b/.github/workflows/format.yml
@@ -4,6 +4,7 @@ on: [push, pull_request]
 
 jobs:
   clang-format:
+    name: 'C++'
     runs-on: ubuntu-latest
 
     steps:
@@ -19,6 +20,7 @@ jobs:
           -i
 
   python-format:
+    name: 'Python'
     runs-on: ubuntu-latest
 
     steps:
diff --git a/.github/workflows/naming.yml b/.github/workflows/naming.yml
index 163354d5..a23275e1 100644
--- a/.github/workflows/naming.yml
+++ b/.github/workflows/naming.yml
@@ -4,6 +4,7 @@ on: [push, pull_request]
 
 jobs:
   ncc:
+    name: 'C++'
     runs-on: ubuntu-latest
 
     steps:
diff --git a/.github/workflows/unittest.yml b/.github/workflows/unittest.yml
index 06446888..612ae3ae 100644
--- a/.github/workflows/unittest.yml
+++ b/.github/workflows/unittest.yml
@@ -1,9 +1,10 @@
-name: Unit Tests
+name: Test
 
 on: [push, pull_request]
 
 jobs:
   pytest-win:
+    name: 'Python Windows'
     runs-on: windows-latest
 
     steps:
@@ -20,6 +21,7 @@ jobs:
         pytest tools/isledecomp
 
   pytest-ubuntu:
+    name: 'Python Linux'
     runs-on: ubuntu-latest
 
     steps:

From 516e16faf68f7f7715bb77207028bce5471d0f04 Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Thu, 11 Jan 2024 10:02:55 -0500
Subject: [PATCH 097/210] Further clean up Omni/LegoOmni separation (#423)

* Fix inline functions

* Whitespace

* Try this

* Fix MxEntity

* Further fixes

* Move main out

* Replace tickle code
---
 CMakeLists.txt                                |  4 +-
 LEGO1/lego/legoomni/include/legoomni.h        |  2 +-
 .../legoomni}/include/mxcontrolpresenter.h    |  0
 .../src/common/legoactioncontrolpresenter.cpp |  6 +-
 .../src/common/mxcompositemediapresenter.cpp  |  6 +-
 .../src/control/mxcontrolpresenter.cpp        |  4 +-
 .../src/entity/legoentitypresenter.cpp        |  3 +-
 .../src/entity/legoworldpresenter.cpp         |  6 +-
 LEGO1/lego/legoomni/src/main/legoomni.cpp     | 20 ++--
 .../src/video/legopalettepresenter.cpp        |  4 +-
 LEGO1/{omni/src/main/mxmain.cpp => main.cpp}  |  0
 .../omni/include/mxactionnotificationparam.h  | 17 +++-
 LEGO1/omni/include/mxaudiomanager.h           |  8 +-
 LEGO1/omni/include/mxaudiopresenter.h         |  7 +-
 LEGO1/omni/include/mxbitmap.h                 |  5 +-
 LEGO1/omni/include/mxcompositepresenter.h     |  9 +-
 LEGO1/omni/include/mxcore.h                   |  4 +-
 LEGO1/omni/include/mxentity.h                 | 16 +++-
 LEGO1/omni/include/mxmediapresenter.h         | 15 ++-
 LEGO1/omni/include/mxnotificationparam.h      |  6 +-
 LEGO1/omni/include/mxomni.h                   |  6 +-
 LEGO1/omni/include/mxpresenter.h              | 77 ++++++++++++----
 LEGO1/omni/include/mxsoundpresenter.h         |  7 +-
 LEGO1/omni/include/mxstillpresenter.h         | 13 ++-
 LEGO1/omni/include/mxvariable.h               | 12 ++-
 LEGO1/omni/include/mxvideopresenter.h         | 61 ++++++++----
 LEGO1/omni/include/mxwavepresenter.h          | 25 +++--
 LEGO1/omni/src/audio/mxaudiomanager.cpp       |  6 --
 LEGO1/omni/src/audio/mxaudiopresenter.cpp     | 12 ---
 .../omni/src/audio/mxloopingmidipresenter.cpp |  6 +-
 LEGO1/omni/src/audio/mxmidipresenter.cpp      | 15 +--
 LEGO1/omni/src/audio/mxsoundpresenter.cpp     | 12 ---
 LEGO1/omni/src/audio/mxwavepresenter.cpp      | 24 +----
 .../omni/src/common/mxcompositepresenter.cpp  | 11 +--
 LEGO1/omni/src/common/mxcore.cpp              |  6 --
 LEGO1/omni/src/common/mxmediapresenter.cpp    | 33 ++-----
 LEGO1/omni/src/common/mxpresenter.cpp         | 92 +------------------
 LEGO1/omni/src/common/mxvariable.cpp          | 18 ----
 LEGO1/omni/src/entity/mxentity.cpp            | 19 ----
 LEGO1/omni/src/event/mxeventpresenter.cpp     |  9 +-
 LEGO1/omni/src/main/mxomni.cpp                | 26 ++----
 .../src/notify/mxactionnotificationparam.cpp  | 12 ---
 LEGO1/omni/src/notify/mxnotificationparam.cpp |  6 --
 LEGO1/omni/src/video/mxbitmap.cpp             |  6 --
 .../omni/src/video/mxloopingflcpresenter.cpp  |  6 +-
 .../omni/src/video/mxloopingsmkpresenter.cpp  | 12 +--
 LEGO1/omni/src/video/mxstillpresenter.cpp     | 15 +--
 LEGO1/omni/src/video/mxvideopresenter.cpp     | 81 ++--------------
 48 files changed, 285 insertions(+), 485 deletions(-)
 rename LEGO1/{omni => lego/legoomni}/include/mxcontrolpresenter.h (100%)
 rename LEGO1/{omni => lego/legoomni}/src/control/mxcontrolpresenter.cpp (94%)
 rename LEGO1/{omni/src/main/mxmain.cpp => main.cpp} (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6378a2b0..a3519ea9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -58,6 +58,7 @@ add_library(lego1 SHARED
   LEGO1/lego/legoomni/src/common/legoutil.cpp
   LEGO1/lego/legoomni/src/common/mxcompositemediapresenter.cpp
   LEGO1/lego/legoomni/src/control/legocontrolmanager.cpp
+  LEGO1/lego/legoomni/src/control/mxcontrolpresenter.cpp
   LEGO1/lego/legoomni/src/entity/legoactor.cpp
   LEGO1/lego/legoomni/src/entity/legoanimactor.cpp
   LEGO1/lego/legoomni/src/entity/legocameracontroller.cpp
@@ -139,6 +140,7 @@ add_library(lego1 SHARED
   LEGO1/lego/sources/3dmanager/legoview1.cpp
   LEGO1/lego/sources/3dmanager/tglsurface.cpp
   LEGO1/lego/sources/roi/legoroi.cpp
+  LEGO1/main.cpp
   LEGO1/mxdirectx/mxdirect3d.cpp
   LEGO1/mxdirectx/mxdirectdraw.cpp
   LEGO1/omni/src/action/mxdsaction.cpp
@@ -177,11 +179,9 @@ add_library(lego1 SHARED
   LEGO1/omni/src/common/mxutil.cpp
   LEGO1/omni/src/common/mxvariable.cpp
   LEGO1/omni/src/common/mxvariabletable.cpp
-  LEGO1/omni/src/control/mxcontrolpresenter.cpp
   LEGO1/omni/src/entity/mxentity.cpp
   LEGO1/omni/src/event/mxeventmanager.cpp
   LEGO1/omni/src/event/mxeventpresenter.cpp
-  LEGO1/omni/src/main/mxmain.cpp
   LEGO1/omni/src/main/mxomni.cpp
   LEGO1/omni/src/main/mxomnicreateflags.cpp
   LEGO1/omni/src/main/mxomnicreateparam.cpp
diff --git a/LEGO1/lego/legoomni/include/legoomni.h b/LEGO1/lego/legoomni/include/legoomni.h
index fc9ba1c2..21c84801 100644
--- a/LEGO1/lego/legoomni/include/legoomni.h
+++ b/LEGO1/lego/legoomni/include/legoomni.h
@@ -148,7 +148,6 @@ __declspec(dllexport) LegoOmni* Lego();
 __declspec(dllexport) LegoEntity* PickEntity(MxLong, MxLong);
 __declspec(dllexport) LegoROI* PickROI(MxLong, MxLong);
 __declspec(dllexport) LegoSoundManager* SoundManager();
-__declspec(dllexport) MxResult Start(MxDSAction*);
 __declspec(dllexport) MxTransitionManager* TransitionManager();
 __declspec(dllexport) LegoVideoManager* VideoManager();
 
@@ -165,6 +164,7 @@ MxDSAction& GetCurrentAction();
 
 void PlayMusic(MxU32 p_index);
 void SetIsWorldActive(MxBool p_isWorldActive);
+void DeleteObjects(MxAtomId* p_id, MxS32 p_first, MxS32 p_last);
 void RegisterScripts();
 void UnregisterScripts();
 
diff --git a/LEGO1/omni/include/mxcontrolpresenter.h b/LEGO1/lego/legoomni/include/mxcontrolpresenter.h
similarity index 100%
rename from LEGO1/omni/include/mxcontrolpresenter.h
rename to LEGO1/lego/legoomni/include/mxcontrolpresenter.h
diff --git a/LEGO1/lego/legoomni/src/common/legoactioncontrolpresenter.cpp b/LEGO1/lego/legoomni/src/common/legoactioncontrolpresenter.cpp
index 3649bb50..75890bec 100644
--- a/LEGO1/lego/legoomni/src/common/legoactioncontrolpresenter.cpp
+++ b/LEGO1/lego/legoomni/src/common/legoactioncontrolpresenter.cpp
@@ -19,8 +19,7 @@ void LegoActionControlPresenter::ReadyTickle()
 
 	if (chunk) {
 		ParseExtra();
-		m_previousTickleStates |= 1 << (unsigned char) m_currentTickleState;
-		m_currentTickleState = TickleState_Starting;
+		ProgressTickleState(TickleState_Starting);
 
 		m_subscriber->DestroyChunk(chunk);
 		if (m_compositePresenter) {
@@ -47,8 +46,7 @@ void LegoActionControlPresenter::RepeatingTickle()
 #else
 		InvokeAction(m_unk0x50, MxAtomId(m_unk0x54.GetData(), LookupMode_LowerCase2), m_unk0x64, NULL);
 #endif
-		m_previousTickleStates |= 1 << (unsigned char) m_currentTickleState;
-		m_currentTickleState = TickleState_Done;
+		ProgressTickleState(TickleState_Done);
 	}
 }
 
diff --git a/LEGO1/lego/legoomni/src/common/mxcompositemediapresenter.cpp b/LEGO1/lego/legoomni/src/common/mxcompositemediapresenter.cpp
index 2a15d445..6b0a32ca 100644
--- a/LEGO1/lego/legoomni/src/common/mxcompositemediapresenter.cpp
+++ b/LEGO1/lego/legoomni/src/common/mxcompositemediapresenter.cpp
@@ -123,8 +123,7 @@ void MxCompositeMediaPresenter::StartingTickle()
 		}
 
 		if (!m_unk0x4c) {
-			m_previousTickleStates |= 1 << (unsigned char) m_currentTickleState;
-			m_currentTickleState = TickleState_Streaming;
+			ProgressTickleState(TickleState_Streaming);
 			MxLong time = Timer()->GetTime();
 			m_action->SetUnknown90(time);
 		}
@@ -138,8 +137,7 @@ MxResult MxCompositeMediaPresenter::Tickle()
 
 	switch (m_currentTickleState) {
 	case TickleState_Ready:
-		m_previousTickleStates |= 1 << (unsigned char) m_currentTickleState;
-		m_currentTickleState = TickleState_Starting;
+		ProgressTickleState(TickleState_Starting);
 	case TickleState_Starting:
 		StartingTickle();
 		break;
diff --git a/LEGO1/omni/src/control/mxcontrolpresenter.cpp b/LEGO1/lego/legoomni/src/control/mxcontrolpresenter.cpp
similarity index 94%
rename from LEGO1/omni/src/control/mxcontrolpresenter.cpp
rename to LEGO1/lego/legoomni/src/control/mxcontrolpresenter.cpp
index 2c7fb81d..b7f8fa8e 100644
--- a/LEGO1/omni/src/control/mxcontrolpresenter.cpp
+++ b/LEGO1/lego/legoomni/src/control/mxcontrolpresenter.cpp
@@ -88,9 +88,7 @@ void MxControlPresenter::ReadyTickle()
 {
 	MxPresenter::ParseExtra();
 	TickleManager()->UnregisterClient(this);
-
-	m_previousTickleStates |= 1 << (unsigned char) m_currentTickleState;
-	m_currentTickleState = TickleState_Repeating;
+	ProgressTickleState(TickleState_Repeating);
 }
 
 // STUB: LEGO1 0x10044640
diff --git a/LEGO1/lego/legoomni/src/entity/legoentitypresenter.cpp b/LEGO1/lego/legoomni/src/entity/legoentitypresenter.cpp
index 7a586c80..995705bd 100644
--- a/LEGO1/lego/legoomni/src/entity/legoentitypresenter.cpp
+++ b/LEGO1/lego/legoomni/src/entity/legoentitypresenter.cpp
@@ -69,8 +69,7 @@ void LegoEntityPresenter::ReadyTickle()
 			m_objectBackend->SetLocation(m_action->GetLocation(), m_action->GetDirection(), m_action->GetUp(), TRUE);
 			ParseExtra();
 		}
-		m_previousTickleStates |= 1 << (unsigned char) m_currentTickleState;
-		m_currentTickleState = TickleState_Starting;
+		ProgressTickleState(TickleState_Starting);
 	}
 }
 
diff --git a/LEGO1/lego/legoomni/src/entity/legoworldpresenter.cpp b/LEGO1/lego/legoomni/src/entity/legoworldpresenter.cpp
index 02578675..9e5e930c 100644
--- a/LEGO1/lego/legoomni/src/entity/legoworldpresenter.cpp
+++ b/LEGO1/lego/legoomni/src/entity/legoworldpresenter.cpp
@@ -95,8 +95,7 @@ void LegoWorldPresenter::ReadyTickle()
 	}
 
 	ParseExtra();
-	m_previousTickleStates |= 1 << (unsigned char) m_currentTickleState;
-	m_currentTickleState = TickleState_Starting;
+	ProgressTickleState(TickleState_Starting);
 }
 
 // FUNCTION: LEGO1 0x10066ac0
@@ -116,8 +115,7 @@ void LegoWorldPresenter::StartingTickle()
 		}
 	}
 
-	m_previousTickleStates |= 1 << (unsigned char) m_currentTickleState;
-	m_currentTickleState = TickleState_Streaming;
+	ProgressTickleState(TickleState_Streaming);
 }
 
 // STUB: LEGO1 0x10067a70
diff --git a/LEGO1/lego/legoomni/src/main/legoomni.cpp b/LEGO1/lego/legoomni/src/main/legoomni.cpp
index 9f27a980..cd0bc4a0 100644
--- a/LEGO1/lego/legoomni/src/main/legoomni.cpp
+++ b/LEGO1/lego/legoomni/src/main/legoomni.cpp
@@ -241,6 +241,20 @@ void SetIsWorldActive(MxBool p_isWorldActive)
 	g_isWorldActive = p_isWorldActive;
 }
 
+// FUNCTION: LEGO1 0x100159e0
+void DeleteObjects(MxAtomId* p_id, MxS32 p_first, MxS32 p_last)
+{
+	MxDSAction action;
+
+	action.SetAtomId(*p_id);
+	action.SetUnknown24(-2);
+
+	for (MxS32 first = p_first, last = p_last; first <= last; first++) {
+		action.SetObjectId(first);
+		DeleteObject(action);
+	}
+}
+
 // STUB: LEGO1 0x1001a700
 void FUN_1001a700()
 {
@@ -685,9 +699,3 @@ void LegoOmni::StopTimer()
 	MxOmni::StopTimer();
 	SetAppCursor(0);
 }
-
-// FUNCTION: LEGO1 0x100acf50
-MxResult Start(MxDSAction* p_dsAction)
-{
-	return MxOmni::GetInstance()->Start(p_dsAction);
-}
diff --git a/LEGO1/lego/legoomni/src/video/legopalettepresenter.cpp b/LEGO1/lego/legoomni/src/video/legopalettepresenter.cpp
index 821942b9..6fbc7803 100644
--- a/LEGO1/lego/legoomni/src/video/legopalettepresenter.cpp
+++ b/LEGO1/lego/legoomni/src/video/legopalettepresenter.cpp
@@ -76,8 +76,8 @@ void LegoPalettePresenter::ReadyTickle()
 	if (chunk) {
 		if (chunk->GetTime() <= m_action->GetElapsedTime()) {
 			ParseExtra();
-			m_previousTickleStates |= 1 << (unsigned char) m_currentTickleState;
-			m_currentTickleState = TickleState_Starting;
+			ProgressTickleState(TickleState_Starting);
+
 			chunk = m_subscriber->NextChunk();
 			MxResult result = ParsePalette(chunk);
 			m_subscriber->DestroyChunk(chunk);
diff --git a/LEGO1/omni/src/main/mxmain.cpp b/LEGO1/main.cpp
similarity index 100%
rename from LEGO1/omni/src/main/mxmain.cpp
rename to LEGO1/main.cpp
diff --git a/LEGO1/omni/include/mxactionnotificationparam.h b/LEGO1/omni/include/mxactionnotificationparam.h
index 24d9e5e1..750abd6d 100644
--- a/LEGO1/omni/include/mxactionnotificationparam.h
+++ b/LEGO1/omni/include/mxactionnotificationparam.h
@@ -43,7 +43,11 @@ class MxActionNotificationParam : public MxNotificationParam {
 			delete this->m_action;
 	}
 
-	virtual MxNotificationParam* Clone() override; // vtable+0x4
+	// FUNCTION: LEGO1 0x100510c0
+	virtual MxNotificationParam* Clone() override
+	{
+		return new MxActionNotificationParam(this->m_type, this->m_sender, this->m_action, this->m_realloc);
+	}; // vtable+0x4
 
 	inline MxDSAction* GetAction() { return m_action; }
 
@@ -83,7 +87,16 @@ class MxEndActionNotificationParam : public MxActionNotificationParam {
 	{
 	}
 
-	virtual MxNotificationParam* Clone() override; // vtable+0x4
+	// FUNCTION: LEGO1 0x10051270
+	virtual MxNotificationParam* Clone() override
+	{
+		return new MxEndActionNotificationParam(
+			c_notificationEndAction,
+			this->m_sender,
+			this->m_action,
+			this->m_realloc
+		);
+	}; // vtable+0x4
 };
 
 // VTABLE: LEGO1 0x100dc208
diff --git a/LEGO1/omni/include/mxaudiomanager.h b/LEGO1/omni/include/mxaudiomanager.h
index c910a493..a7b58fd0 100644
--- a/LEGO1/omni/include/mxaudiomanager.h
+++ b/LEGO1/omni/include/mxaudiomanager.h
@@ -5,6 +5,7 @@
 #include "mxmediamanager.h"
 
 // VTABLE: LEGO1 0x100dc6e0
+// SIZE 0x30
 class MxAudioManager : public MxMediaManager {
 public:
 	MxAudioManager();
@@ -12,8 +13,11 @@ class MxAudioManager : public MxMediaManager {
 
 	virtual MxResult InitPresenters() override; // vtable+14
 	virtual void Destroy() override;            // vtable+18
-	virtual MxS32 GetVolume();                  // vtable+28
-	virtual void SetVolume(MxS32 p_volume);     // vtable+2c
+
+	// FUNCTION: LEGO1 0x10029910
+	virtual MxS32 GetVolume() { return this->m_volume; }; // vtable+28
+
+	virtual void SetVolume(MxS32 p_volume); // vtable+2c
 
 private:
 	void Destroy(MxBool p_fromDestructor);
diff --git a/LEGO1/omni/include/mxaudiopresenter.h b/LEGO1/omni/include/mxaudiopresenter.h
index 73024aac..4033f84d 100644
--- a/LEGO1/omni/include/mxaudiopresenter.h
+++ b/LEGO1/omni/include/mxaudiopresenter.h
@@ -23,8 +23,11 @@ class MxAudioPresenter : public MxMediaPresenter {
 		return !strcmp(p_name, MxAudioPresenter::ClassName()) || MxMediaPresenter::IsA(p_name);
 	}
 
-	virtual MxS32 GetVolume();              // vtable+0x5c
-	virtual void SetVolume(MxS32 p_volume); // vtable+0x60
+	// FUNCTION: LEGO1 0x1000d260
+	virtual MxS32 GetVolume() { return m_volume; }; // vtable+0x5c
+
+	// FUNCTION: LEGO1 0x1000d270
+	virtual void SetVolume(MxS32 p_volume) { m_volume = p_volume; }; // vtable+0x60
 
 protected:
 	MxS32 m_volume;
diff --git a/LEGO1/omni/include/mxbitmap.h b/LEGO1/omni/include/mxbitmap.h
index d9fda78d..d756b865 100644
--- a/LEGO1/omni/include/mxbitmap.h
+++ b/LEGO1/omni/include/mxbitmap.h
@@ -42,7 +42,10 @@ class MxBitmap : public MxCore {
 	virtual MxResult SetSize(MxS32 p_width, MxS32 p_height, MxPalette* p_palette, MxBool); // vtable+1c
 	virtual MxResult LoadFile(HANDLE p_handle);                                            // vtable+20
 	__declspec(dllexport) virtual MxLong Read(const char* p_filename);                     // vtable+24
-	virtual int VTable0x28(int);
+
+	// FUNCTION: LEGO1 0x1004e0d0
+	virtual int VTable0x28(int) { return -1; };
+
 	virtual void VTable0x2c(int, int, int, int, int, int, int);
 	virtual void VTable0x30(int, int, int, int, int, int, int);
 	__declspec(dllexport) virtual MxPalette* CreatePalette(); // vtable+34
diff --git a/LEGO1/omni/include/mxcompositepresenter.h b/LEGO1/omni/include/mxcompositepresenter.h
index 6f14e615..33d00dc8 100644
--- a/LEGO1/omni/include/mxcompositepresenter.h
+++ b/LEGO1/omni/include/mxcompositepresenter.h
@@ -37,7 +37,14 @@ class MxCompositePresenter : public MxPresenter {
 	virtual void VTable0x58(MxEndActionNotificationParam& p_param);                                // vtable+0x58
 	virtual void VTable0x5c(MxNotificationParam& p_param);                                         // vtable+0x5c
 	virtual void VTable0x60(MxPresenter* p_presenter);                                             // vtable+0x60
-	virtual MxBool VTable0x64(undefined4 p_undefined);                                             // vtable+0x64
+
+	// FUNCTION: LEGO1 0x1000caf0
+	virtual MxBool VTable0x64(undefined4 p_undefined)
+	{
+		if (m_compositePresenter)
+			return m_compositePresenter->VTable0x64(p_undefined);
+		return TRUE;
+	}; // vtable+0x64
 
 protected:
 	MxCompositePresenterList m_list; // 0x40
diff --git a/LEGO1/omni/include/mxcore.h b/LEGO1/omni/include/mxcore.h
index db812bba..22c06d32 100644
--- a/LEGO1/omni/include/mxcore.h
+++ b/LEGO1/omni/include/mxcore.h
@@ -15,7 +15,9 @@ class MxCore {
 	__declspec(dllexport) MxCore();
 	__declspec(dllexport) virtual ~MxCore();                       // vtable+00
 	__declspec(dllexport) virtual MxLong Notify(MxParam& p_param); // vtable+04
-	virtual MxResult Tickle();                                     // vtable+08
+
+	// FUNCTION: LEGO1 0x10001f70
+	virtual MxResult Tickle() { return SUCCESS; }; // vtable+08
 
 	// FUNCTION: LEGO1 0x100144c0
 	inline virtual const char* ClassName() const // vtable+0c
diff --git a/LEGO1/omni/include/mxentity.h b/LEGO1/omni/include/mxentity.h
index 64a003ee..2dd9ccf1 100644
--- a/LEGO1/omni/include/mxentity.h
+++ b/LEGO1/omni/include/mxentity.h
@@ -11,8 +11,11 @@
 // SIZE 0x10
 class MxEntity : public MxCore {
 public:
-	MxEntity();
-	virtual ~MxEntity() override;
+	// FUNCTION: LEGO1 0x1001d190
+	MxEntity() { this->m_mxEntityId = -1; }
+
+	// FUNCTION: LEGO1 0x1000c110
+	virtual ~MxEntity() override{};
 
 	// FUNCTION: LEGO1 0x1000c180
 	inline virtual const char* ClassName() const override // vtable+0xc
@@ -27,7 +30,14 @@ class MxEntity : public MxCore {
 		return !strcmp(p_name, MxEntity::ClassName()) || MxCore::IsA(p_name);
 	}
 
-	virtual MxResult Create(MxS32 p_id, const MxAtomId& p_atom); // vtable+0x14
+	// FUNCTION: LEGO1 0x10001070
+	virtual MxResult Create(MxS32 p_id, const MxAtomId& p_atom)
+	{
+		this->m_mxEntityId = p_id;
+		this->m_atom = p_atom;
+		return SUCCESS;
+	}; // vtable+0x14
+
 	inline MxResult Create(MxDSObject& p_dsObject)
 	{
 		m_mxEntityId = p_dsObject.GetObjectId();
diff --git a/LEGO1/omni/include/mxmediapresenter.h b/LEGO1/omni/include/mxmediapresenter.h
index 64baa409..360e978e 100644
--- a/LEGO1/omni/include/mxmediapresenter.h
+++ b/LEGO1/omni/include/mxmediapresenter.h
@@ -11,7 +11,9 @@
 class MxMediaPresenter : public MxPresenter {
 public:
 	inline MxMediaPresenter() { Init(); }
-	virtual ~MxMediaPresenter() override;
+
+	// FUNCTION: LEGO1 0x1000c550
+	virtual ~MxMediaPresenter() override { Destroy(TRUE); };
 
 	virtual MxResult Tickle() override; // vtable+0x8
 
@@ -28,10 +30,13 @@ class MxMediaPresenter : public MxPresenter {
 		return !strcmp(p_name, MxMediaPresenter::ClassName()) || MxPresenter::IsA(p_name);
 	}
 
-	virtual void StreamingTickle() override;                                 // vtable+0x20
-	virtual void RepeatingTickle() override;                                 // vtable+0x24
-	virtual void DoneTickle() override;                                      // vtable+0x2c
-	virtual void Destroy() override;                                         // vtable+0x38
+	virtual void StreamingTickle() override; // vtable+0x20
+	virtual void RepeatingTickle() override; // vtable+0x24
+	virtual void DoneTickle() override;      // vtable+0x2c
+
+	// FUNCTION: LEGO1 0x1000c5b0
+	virtual void Destroy() override { Destroy(FALSE); }; // vtable+0x38
+
 	virtual MxResult StartAction(MxStreamController*, MxDSAction*) override; // vtable+0x3c
 	virtual void EndAction() override;                                       // vtable+0x40
 	virtual void Enable(MxBool p_enable) override;                           // vtable+0x54
diff --git a/LEGO1/omni/include/mxnotificationparam.h b/LEGO1/omni/include/mxnotificationparam.h
index 66f9dd95..256dd882 100644
--- a/LEGO1/omni/include/mxnotificationparam.h
+++ b/LEGO1/omni/include/mxnotificationparam.h
@@ -40,8 +40,10 @@ class MxNotificationParam : public MxParam {
 	{
 	}
 
-	virtual ~MxNotificationParam() override {} // vtable+0x0 (scalar deleting destructor)
-	virtual MxNotificationParam* Clone();      // vtable+0x4
+	virtual ~MxNotificationParam() override {}
+
+	// FUNCTION: LEGO1 0x10010390
+	virtual MxNotificationParam* Clone() { return new MxNotificationParam(m_type, m_sender); }; // vtable+0x4
 
 	inline NotificationId GetNotification() const { return m_type; }
 	inline MxCore* GetSender() const { return m_sender; }
diff --git a/LEGO1/omni/include/mxomni.h b/LEGO1/omni/include/mxomni.h
index 7bac0723..9f448c26 100644
--- a/LEGO1/omni/include/mxomni.h
+++ b/LEGO1/omni/include/mxomni.h
@@ -52,7 +52,9 @@ class MxOmni : public MxCore {
 	virtual void NotifyCurrentEntity(MxNotificationParam* p_param);                           // vtable+34
 	virtual void StartTimer();                                                                // vtable+38
 	virtual void StopTimer();                                                                 // vtable+3c
-	virtual MxBool IsTimerRunning();                                                          // vtable+40
+
+	// FUNCTION: LEGO1 0x10058a90
+	virtual MxBool IsTimerRunning() { return m_timerRunning; }; // vtable+40
 
 	static void SetInstance(MxOmni* p_instance);
 	static MxBool FUN_100b06b0(MxDSAction* p_action, const char* p_name);
@@ -98,12 +100,12 @@ __declspec(dllexport) MxSoundManager* MSoundManager();
 __declspec(dllexport) MxVariableTable* VariableTable();
 __declspec(dllexport) MxMusicManager* MusicManager();
 __declspec(dllexport) MxEventManager* EventManager();
+__declspec(dllexport) MxResult Start(MxDSAction*);
 __declspec(dllexport) MxNotificationManager* NotificationManager();
 
 MxVideoManager* MVideoManager();
 MxAtomIdCounterSet* AtomIdCounterSet();
 MxObjectFactory* ObjectFactory();
 void DeleteObject(MxDSAction& p_dsAction);
-void DeleteObjects(MxAtomId* p_id, MxS32 p_first, MxS32 p_last);
 
 #endif // MXOMNI_H
diff --git a/LEGO1/omni/include/mxpresenter.h b/LEGO1/omni/include/mxpresenter.h
index bc327c1f..5659402b 100644
--- a/LEGO1/omni/include/mxpresenter.h
+++ b/LEGO1/omni/include/mxpresenter.h
@@ -28,8 +28,14 @@ class MxPresenter : public MxCore {
 
 	MxPresenter() { Init(); }
 
-	__declspec(dllexport) virtual ~MxPresenter();             // vtable+0x0
-	__declspec(dllexport) virtual MxResult Tickle() override; // vtable+0x8
+#ifdef COMPAT_MODE
+	__declspec(dllexport) virtual ~MxPresenter() override; // vtable+0x00
+#else
+	// FUNCTION: LEGO1 0x1000bf00
+	__declspec(dllexport) virtual ~MxPresenter() override{}; // vtable+0x00
+#endif
+
+	__declspec(dllexport) virtual MxResult Tickle() override; // vtable+0x08
 
 	// FUNCTION: LEGO1 0x1000bfe0
 	inline virtual const char* ClassName() const override // vtable+0xc
@@ -44,27 +50,66 @@ class MxPresenter : public MxCore {
 		return !strcmp(p_name, MxPresenter::ClassName()) || MxCore::IsA(p_name);
 	}
 
-	virtual void VTable0x14();      // vtable+0x14
-	virtual void ReadyTickle();     // vtable+0x18
-	virtual void StartingTickle();  // vtable+0x1c
-	virtual void StreamingTickle(); // vtable+0x20
-	virtual void RepeatingTickle(); // vtable+0x24
-	virtual void Unk5Tickle();      // vtable+0x28
+	// FUNCTION: LEGO1 0x1000be30
+	virtual void VTable0x14() {} // vtable+0x14
+
+	// FUNCTION: LEGO1 0x1000be40
+	virtual void ReadyTickle()
+	{
+		ParseExtra();
+		ProgressTickleState(TickleState_Starting);
+	} // vtable+0x18
+
+	// FUNCTION: LEGO1 0x1000be60
+	virtual void StartingTickle() { ProgressTickleState(TickleState_Streaming); } // vtable+0x1c
+
+	// FUNCTION: LEGO1 0x1000be80
+	virtual void StreamingTickle() { ProgressTickleState(TickleState_Repeating); }; // vtable+0x20
+
+	// FUNCTION: LEGO1 0x1000bea0
+	virtual void RepeatingTickle() { ProgressTickleState(TickleState_unk5); }; // vtable+0x24
+
+	// FUNCTION: LEGO1 0x1000bec0
+	virtual void Unk5Tickle() { ProgressTickleState(TickleState_Done); }; // vtable+0x28
 
 protected:
-	__declspec(dllexport) virtual void DoneTickle(); // vtable+0x2c
+	// FUNCTION: LEGO1 0x1000bee0
+	__declspec(dllexport) virtual void DoneTickle() { ProgressTickleState(TickleState_Idle); }; // vtable+0x2c
+
 	__declspec(dllexport) virtual void ParseExtra(); // vtable+0x30
 
+	inline void ProgressTickleState(TickleState p_tickleState)
+	{
+		m_previousTickleStates |= 1 << (MxU8) m_currentTickleState;
+		m_currentTickleState = p_tickleState;
+	}
+
 public:
-	virtual MxResult AddToManager();                                                      // vtable+0x34
-	virtual void Destroy();                                                               // vtable+0x38
+	// FUNCTION: LEGO1 0x1000bf70
+	virtual MxResult AddToManager() { return SUCCESS; }; // vtable+0x34
+
+	// FUNCTION: LEGO1 0x1000bf80
+	virtual void Destroy() { Init(); }; // vtable+0x38
+
 	__declspec(dllexport) virtual MxResult StartAction(MxStreamController*, MxDSAction*); // vtable+0x3c
 	__declspec(dllexport) virtual void EndAction();                                       // vtable+0x40
-	virtual void SetTickleState(TickleState p_tickleState);                               // vtable+0x44
-	virtual MxBool HasTickleStatePassed(TickleState p_tickleState);                       // vtable+0x48
-	virtual MxResult PutData();                                                           // vtable+0x4c
-	virtual MxBool IsHit(MxS32 p_x, MxS32 p_y);                                           // vtable+0x50
-	__declspec(dllexport) virtual void Enable(MxBool p_enable);                           // vtable+0x54
+
+	// FUNCTION: LEGO1 0x1000bf90
+	virtual void SetTickleState(TickleState p_tickleState) { ProgressTickleState(p_tickleState); } // vtable+0x44
+
+	// FUNCTION: LEGO1 0x1000bfb0
+	virtual MxBool HasTickleStatePassed(TickleState p_tickleState)
+	{
+		return m_previousTickleStates & (1 << (MxU8) p_tickleState);
+	}; // vtable+0x48
+
+	// FUNCTION: LEGO1 0x1000bfc0
+	virtual MxResult PutData() { return SUCCESS; }; // vtable+0x4c
+
+	// FUNCTION: LEGO1 0x1000bfd0
+	virtual MxBool IsHit(MxS32 p_x, MxS32 p_y) { return FALSE; }; // vtable+0x50
+
+	__declspec(dllexport) virtual void Enable(MxBool p_enable); // vtable+0x54
 
 	MxEntity* CreateEntityBackend(const char* p_name);
 	MxBool IsEnabled();
diff --git a/LEGO1/omni/include/mxsoundpresenter.h b/LEGO1/omni/include/mxsoundpresenter.h
index d61d8088..1d49204a 100644
--- a/LEGO1/omni/include/mxsoundpresenter.h
+++ b/LEGO1/omni/include/mxsoundpresenter.h
@@ -8,7 +8,8 @@
 // SIZE 0x54
 class MxSoundPresenter : public MxAudioPresenter {
 public:
-	virtual ~MxSoundPresenter() override;
+	// FUNCTION: LEGO1 0x1000d430
+	virtual ~MxSoundPresenter() override { Destroy(TRUE); };
 
 	// FUNCTION: LEGO1 0x1000d4a0
 	inline virtual const char* ClassName() const // vtable+0x0c
@@ -24,7 +25,9 @@ class MxSoundPresenter : public MxAudioPresenter {
 	};
 
 	virtual MxResult AddToManager() override; // vtable+0x34
-	virtual void Destroy() override;          // vtable+0x38
+
+	// FUNCTION: LEGO1 0x1000d490
+	virtual void Destroy() override { Destroy(FALSE); }; // vtable+0x38
 
 protected:
 	void Destroy(MxBool p_fromDestructor);
diff --git a/LEGO1/omni/include/mxstillpresenter.h b/LEGO1/omni/include/mxstillpresenter.h
index 828f58b7..0fa48bf3 100644
--- a/LEGO1/omni/include/mxstillpresenter.h
+++ b/LEGO1/omni/include/mxstillpresenter.h
@@ -25,11 +25,14 @@ class MxStillPresenter : public MxVideoPresenter {
 		return !strcmp(p_name, MxStillPresenter::ClassName()) || MxVideoPresenter::IsA(p_name);
 	}
 
-	virtual void StartingTickle() override;                   // vtable+0x1c
-	virtual void StreamingTickle() override;                  // vtable+0x20
-	virtual void RepeatingTickle() override;                  // vtable+0x24
-	virtual void ParseExtra() override;                       // vtable+0x30
-	virtual void Destroy() override;                          // vtable+0x38
+	virtual void StartingTickle() override;  // vtable+0x1c
+	virtual void StreamingTickle() override; // vtable+0x20
+	virtual void RepeatingTickle() override; // vtable+0x24
+	virtual void ParseExtra() override;      // vtable+0x30
+
+	// FUNCTION: LEGO1 0x100435b0
+	virtual void Destroy() override { Destroy(FALSE); }; // vtable+0x38
+
 	virtual void Enable(MxBool p_enable) override;            // vtable+0x54
 	virtual void LoadHeader(MxStreamChunk* p_chunk) override; // vtable+0x5c
 	virtual void CreateBitmap() override;                     // vtable+0x60
diff --git a/LEGO1/omni/include/mxvariable.h b/LEGO1/omni/include/mxvariable.h
index d1434467..52fc48bc 100644
--- a/LEGO1/omni/include/mxvariable.h
+++ b/LEGO1/omni/include/mxvariable.h
@@ -20,9 +20,15 @@ class MxVariable {
 		m_key.ToUpperCase();
 		m_value = p_value;
 	}
-	virtual MxString* GetValue();
-	virtual void SetValue(const char* p_value);
-	virtual void Destroy();
+
+	// FUNCTION: LEGO1 0x1003bea0
+	virtual MxString* GetValue() { return &m_value; };
+
+	// FUNCTION: LEGO1 0x1003beb0
+	virtual void SetValue(const char* p_value) { m_value = p_value; };
+
+	// FUNCTION: LEGO1 0x1003bec0
+	virtual void Destroy() { delete this; };
 
 	inline const MxString* GetKey() const { return &m_key; }
 
diff --git a/LEGO1/omni/include/mxvideopresenter.h b/LEGO1/omni/include/mxvideopresenter.h
index f02f3f08..78c89f14 100644
--- a/LEGO1/omni/include/mxvideopresenter.h
+++ b/LEGO1/omni/include/mxvideopresenter.h
@@ -19,7 +19,9 @@ class MxVideoPresenter : public MxMediaPresenter {
 	};
 
 	MxVideoPresenter() { Init(); }
-	virtual ~MxVideoPresenter() override; // vtable+0x0
+
+	// FUNCTION: LEGO1 0x1000c740
+	virtual ~MxVideoPresenter() override { Destroy(TRUE); }; // vtable+0x0
 
 	// FUNCTION: LEGO1 0x1000c820
 	inline virtual const char* ClassName() const override // vtable+0x0c
@@ -34,27 +36,48 @@ class MxVideoPresenter : public MxMediaPresenter {
 		return !strcmp(p_name, MxVideoPresenter::ClassName()) || MxMediaPresenter::IsA(p_name);
 	}
 
-	virtual void ReadyTickle() override;                 // vtable+0x18
-	virtual void StartingTickle() override;              // vtable+0x1c
-	virtual void StreamingTickle() override;             // vtable+0x20
-	virtual void RepeatingTickle() override;             // vtable+0x24
-	virtual void Unk5Tickle() override;                  // vtable+0x28
-	virtual MxResult AddToManager() override;            // vtable+0x34
-	virtual void Destroy() override;                     // vtable+0x38
+	virtual void ReadyTickle() override;      // vtable+0x18
+	virtual void StartingTickle() override;   // vtable+0x1c
+	virtual void StreamingTickle() override;  // vtable+0x20
+	virtual void RepeatingTickle() override;  // vtable+0x24
+	virtual void Unk5Tickle() override;       // vtable+0x28
+	virtual MxResult AddToManager() override; // vtable+0x34
+
+	// FUNCTION: LEGO1 0x1000c7a0
+	virtual void Destroy() override { Destroy(FALSE); }; // vtable+0x38
+
 	virtual void EndAction() override;                   // vtable+0x40
 	virtual MxResult PutData() override;                 // vtable+0x4c
 	virtual MxBool IsHit(MxS32 p_x, MxS32 p_y) override; // vtable+0x50
-	virtual void LoadHeader(MxStreamChunk* p_chunk);     // vtable+0x5c
-	virtual void CreateBitmap();                         // vtable+0x60
-	virtual void NextFrame();                            // vtable+0x64
-	virtual void LoadFrame(MxStreamChunk* p_chunk);      // vtable+0x68
-	virtual void PutFrame();                             // vtable+0x6c
-	virtual void RealizePalette();                       // vtable+0x70
-	virtual undefined VTable0x74();                      // vtable+0x74
-	virtual LPDIRECTDRAWSURFACE VTable0x78();            // vtable+0x78
-	virtual MxBool VTable0x7c();                         // vtable+0x7c
-	virtual MxS32 GetWidth();                            // vtable+0x80
-	virtual MxS32 GetHeight();                           // vtable+0x84
+
+	// FUNCTION: LEGO1 0x1000c700
+	virtual void LoadHeader(MxStreamChunk* p_chunk){}; // vtable+0x5c
+
+	// FUNCTION: LEGO1 0x1000c710
+	virtual void CreateBitmap(){}; // vtable+0x60
+
+	virtual void NextFrame(); // vtable+0x64
+
+	// FUNCTION: LEGO1 0x1000c720
+	virtual void LoadFrame(MxStreamChunk* p_chunk){}; // vtable+0x68
+
+	virtual void PutFrame(); // vtable+0x6c
+
+	// FUNCTION: LEGO1 0x1000c730
+	virtual void RealizePalette(){}; // vtable+0x70
+	virtual undefined VTable0x74();  // vtable+0x74
+
+	// FUNCTION: LEGO1 0x1000c7b0
+	virtual LPDIRECTDRAWSURFACE VTable0x78() { return m_unk0x58; }; // vtable+0x78
+
+	// FUNCTION: LEGO1 0x1000c7c0
+	virtual MxBool VTable0x7c() { return (m_bitmap != NULL) || (m_alpha != NULL); }; // vtable+0x7c
+
+	// FUNCTION: LEGO1 0x1000c7e0
+	virtual MxS32 GetWidth() { return m_alpha ? m_alpha->m_width : m_bitmap->GetBmiWidth(); }; // vtable+0x80
+
+	// FUNCTION: LEGO1 0x1000c800
+	virtual MxS32 GetHeight() { return m_alpha ? m_alpha->m_height : m_bitmap->GetBmiHeightAbs(); }; // vtable+0x84
 
 	// SIZE 0xc
 	struct AlphaMask {
diff --git a/LEGO1/omni/include/mxwavepresenter.h b/LEGO1/omni/include/mxwavepresenter.h
index 383659ab..3bdf734f 100644
--- a/LEGO1/omni/include/mxwavepresenter.h
+++ b/LEGO1/omni/include/mxwavepresenter.h
@@ -11,7 +11,9 @@
 class MxWavePresenter : public MxSoundPresenter {
 public:
 	MxWavePresenter() { Init(); }
-	virtual ~MxWavePresenter() override; // vtable+0x00
+
+	// FUNCTION: LEGO1 0x1000d640
+	virtual ~MxWavePresenter() override { Destroy(TRUE); }; // vtable+0x00
 
 	// FUNCTION: LEGO1 0x1000d6c0
 	inline virtual const char* ClassName() const override // vtable+0x0c
@@ -26,13 +28,16 @@ class MxWavePresenter : public MxSoundPresenter {
 		return !strcmp(p_name, MxWavePresenter::ClassName()) || MxSoundPresenter::IsA(p_name);
 	}
 
-	virtual void ReadyTickle() override;                     // vtable+0x18
-	virtual void StartingTickle() override;                  // vtable+0x1c
-	virtual void StreamingTickle() override;                 // vtable+0x20
-	virtual void DoneTickle() override;                      // vtable+0x2c
-	virtual void ParseExtra() override;                      // vtable+0x30
-	virtual MxResult AddToManager() override;                // vtable+0x34
-	virtual void Destroy() override;                         // vtable+0x38
+	virtual void ReadyTickle() override;      // vtable+0x18
+	virtual void StartingTickle() override;   // vtable+0x1c
+	virtual void StreamingTickle() override;  // vtable+0x20
+	virtual void DoneTickle() override;       // vtable+0x2c
+	virtual void ParseExtra() override;       // vtable+0x30
+	virtual MxResult AddToManager() override; // vtable+0x34
+
+	// FUNCTION: LEGO1 0x1000d6a0
+	virtual void Destroy() override { Destroy(FALSE); }; // vtable+0x38
+
 	virtual void EndAction() override;                       // vtable+0x40
 	virtual MxResult PutData() override;                     // vtable+0x4c
 	virtual void Enable(MxBool p_enable) override;           // vtable+0x54
@@ -40,7 +45,9 @@ class MxWavePresenter : public MxSoundPresenter {
 	virtual void SetVolume(MxS32 p_volume) override;         // vtable+0x60
 	virtual void Pause();                                    // vtable+0x64
 	virtual void Resume();                                   // vtable+0x68
-	virtual MxBool IsPaused();                               // vtable+0x6c
+
+	// FUNCTION: LEGO1 0x1000d6b0
+	virtual MxBool IsPaused() { return m_paused; }; // vtable+0x6c
 
 	// Reference: https://github.com/itsmattkc/SIEdit/blob/master/lib/othertypes.h
 	// SIZE 0x1c
diff --git a/LEGO1/omni/src/audio/mxaudiomanager.cpp b/LEGO1/omni/src/audio/mxaudiomanager.cpp
index 318a8446..a2d6072a 100644
--- a/LEGO1/omni/src/audio/mxaudiomanager.cpp
+++ b/LEGO1/omni/src/audio/mxaudiomanager.cpp
@@ -5,12 +5,6 @@ DECOMP_SIZE_ASSERT(MxAudioManager, 0x30);
 // GLOBAL: LEGO1 0x10102108
 MxS32 MxAudioManager::g_count = 0;
 
-// FUNCTION: LEGO1 0x10029910
-MxS32 MxAudioManager::GetVolume()
-{
-	return this->m_volume;
-}
-
 // FUNCTION: LEGO1 0x100b8d00
 MxAudioManager::MxAudioManager()
 {
diff --git a/LEGO1/omni/src/audio/mxaudiopresenter.cpp b/LEGO1/omni/src/audio/mxaudiopresenter.cpp
index 1ef74dea..ac634362 100644
--- a/LEGO1/omni/src/audio/mxaudiopresenter.cpp
+++ b/LEGO1/omni/src/audio/mxaudiopresenter.cpp
@@ -3,15 +3,3 @@
 #include "decomp.h"
 
 DECOMP_SIZE_ASSERT(MxAudioPresenter, 0x54);
-
-// FUNCTION: LEGO1 0x1000d260
-MxS32 MxAudioPresenter::GetVolume()
-{
-	return m_volume;
-}
-
-// FUNCTION: LEGO1 0x1000d270
-void MxAudioPresenter::SetVolume(MxS32 p_volume)
-{
-	m_volume = p_volume;
-}
diff --git a/LEGO1/omni/src/audio/mxloopingmidipresenter.cpp b/LEGO1/omni/src/audio/mxloopingmidipresenter.cpp
index 84b33229..921bc607 100644
--- a/LEGO1/omni/src/audio/mxloopingmidipresenter.cpp
+++ b/LEGO1/omni/src/audio/mxloopingmidipresenter.cpp
@@ -20,10 +20,8 @@ void MxLoopingMIDIPresenter::StreamingTickle()
 		return;
 	}
 
-	if (m_chunk->GetTime() + m_action->GetDuration() <= m_action->GetElapsedTime()) {
-		m_previousTickleStates |= 1 << (unsigned char) m_currentTickleState;
-		m_currentTickleState = TickleState_Done;
-	}
+	if (m_chunk->GetTime() + m_action->GetDuration() <= m_action->GetElapsedTime())
+		ProgressTickleState(TickleState_Done);
 }
 
 // FUNCTION: LEGO1 0x100c2ae0
diff --git a/LEGO1/omni/src/audio/mxmidipresenter.cpp b/LEGO1/omni/src/audio/mxmidipresenter.cpp
index 95add150..b6d22d81 100644
--- a/LEGO1/omni/src/audio/mxmidipresenter.cpp
+++ b/LEGO1/omni/src/audio/mxmidipresenter.cpp
@@ -52,8 +52,7 @@ void MxMIDIPresenter::ReadyTickle()
 	if (chunk) {
 		m_subscriber->DestroyChunk(chunk);
 		ParseExtra();
-		m_previousTickleStates |= 1 << (unsigned char) m_currentTickleState;
-		m_currentTickleState = TickleState_Starting;
+		ProgressTickleState(TickleState_Starting);
 	}
 }
 
@@ -62,19 +61,15 @@ void MxMIDIPresenter::StartingTickle()
 {
 	MxStreamChunk* chunk = CurrentChunk();
 
-	if (chunk && m_action->GetElapsedTime() >= chunk->GetTime()) {
-		m_previousTickleStates |= 1 << (unsigned char) m_currentTickleState;
-		m_currentTickleState = TickleState_Streaming;
-	}
+	if (chunk && m_action->GetElapsedTime() >= chunk->GetTime())
+		ProgressTickleState(TickleState_Streaming);
 }
 
 // FUNCTION: LEGO1 0x100c2910
 void MxMIDIPresenter::StreamingTickle()
 {
-	if (m_chunk) {
-		m_previousTickleStates |= 1 << (unsigned char) m_currentTickleState;
-		m_currentTickleState = TickleState_Done;
-	}
+	if (m_chunk)
+		ProgressTickleState(TickleState_Done);
 	else
 		m_chunk = NextChunk();
 }
diff --git a/LEGO1/omni/src/audio/mxsoundpresenter.cpp b/LEGO1/omni/src/audio/mxsoundpresenter.cpp
index 1065fc99..07e4a022 100644
--- a/LEGO1/omni/src/audio/mxsoundpresenter.cpp
+++ b/LEGO1/omni/src/audio/mxsoundpresenter.cpp
@@ -5,18 +5,6 @@
 
 DECOMP_SIZE_ASSERT(MxSoundPresenter, 0x54)
 
-// FUNCTION: LEGO1 0x1000d430
-MxSoundPresenter::~MxSoundPresenter()
-{
-	Destroy(TRUE);
-}
-
-// FUNCTION: LEGO1 0x1000d490
-void MxSoundPresenter::Destroy()
-{
-	Destroy(FALSE);
-}
-
 // FUNCTION: LEGO1 0x100b1a50
 void MxSoundPresenter::Destroy(MxBool p_fromDestructor)
 {
diff --git a/LEGO1/omni/src/audio/mxwavepresenter.cpp b/LEGO1/omni/src/audio/mxwavepresenter.cpp
index d77ccac2..e47a2630 100644
--- a/LEGO1/omni/src/audio/mxwavepresenter.cpp
+++ b/LEGO1/omni/src/audio/mxwavepresenter.cpp
@@ -11,24 +11,6 @@
 DECOMP_SIZE_ASSERT(MxWavePresenter, 0x6c);
 DECOMP_SIZE_ASSERT(MxWavePresenter::WaveFormat, 0x1c);
 
-// FUNCTION: LEGO1 0x1000d640
-MxWavePresenter::~MxWavePresenter()
-{
-	Destroy(TRUE);
-}
-
-// FUNCTION: LEGO1 0x1000d6a0
-void MxWavePresenter::Destroy()
-{
-	Destroy(FALSE);
-}
-
-// FUNCTION: LEGO1 0x1000d6b0
-MxBool MxWavePresenter::IsPaused()
-{
-	return m_paused;
-}
-
 // FUNCTION: LEGO1 0x100b1ad0
 void MxWavePresenter::Init()
 {
@@ -136,8 +118,7 @@ void MxWavePresenter::ReadyTickle()
 		memcpy(m_waveFormat, chunk->GetData(), chunk->GetLength());
 		m_subscriber->DestroyChunk(chunk);
 		ParseExtra();
-		m_previousTickleStates |= 1 << (unsigned char) m_currentTickleState;
-		m_currentTickleState = TickleState_Starting;
+		ProgressTickleState(TickleState_Starting);
 	}
 }
 
@@ -188,8 +169,7 @@ void MxWavePresenter::StartingTickle()
 		}
 		else {
 			SetVolume(((MxDSSound*) m_action)->GetVolume());
-			m_previousTickleStates |= 1 << (unsigned char) m_currentTickleState;
-			m_currentTickleState = TickleState_Streaming;
+			ProgressTickleState(TickleState_Streaming);
 		}
 	}
 }
diff --git a/LEGO1/omni/src/common/mxcompositepresenter.cpp b/LEGO1/omni/src/common/mxcompositepresenter.cpp
index d22c979d..0b787a42 100644
--- a/LEGO1/omni/src/common/mxcompositepresenter.cpp
+++ b/LEGO1/omni/src/common/mxcompositepresenter.cpp
@@ -8,14 +8,6 @@
 
 DECOMP_SIZE_ASSERT(MxCompositePresenter, 0x4c);
 
-// FUNCTION: LEGO1 0x1000caf0
-MxBool MxCompositePresenter::VTable0x64(undefined4 p_undefined)
-{
-	if (m_compositePresenter)
-		return m_compositePresenter->VTable0x64(p_undefined);
-	return TRUE;
-}
-
 // FUNCTION: LEGO1 0x100b60b0
 MxCompositePresenter::MxCompositePresenter()
 {
@@ -229,8 +221,7 @@ void MxCompositePresenter::VTable0x60(MxPresenter* p_presenter)
 // FUNCTION: LEGO1 0x100b6bc0
 void MxCompositePresenter::SetTickleState(TickleState p_tickleState)
 {
-	m_previousTickleStates |= 1 << (unsigned char) m_currentTickleState;
-	m_currentTickleState = p_tickleState;
+	ProgressTickleState(p_tickleState);
 
 	for (MxCompositePresenterList::iterator it = m_list.begin(); it != m_list.end(); it++) {
 		MxPresenter* presenter = *it;
diff --git a/LEGO1/omni/src/common/mxcore.cpp b/LEGO1/omni/src/common/mxcore.cpp
index 237ed1da..1266a1cb 100644
--- a/LEGO1/omni/src/common/mxcore.cpp
+++ b/LEGO1/omni/src/common/mxcore.cpp
@@ -2,12 +2,6 @@
 
 #include "define.h"
 
-// FUNCTION: LEGO1 0x10001f70
-MxResult MxCore::Tickle()
-{
-	return SUCCESS;
-}
-
 // FUNCTION: LEGO1 0x100ae1a0
 MxCore::MxCore()
 {
diff --git a/LEGO1/omni/src/common/mxmediapresenter.cpp b/LEGO1/omni/src/common/mxmediapresenter.cpp
index a9383e4d..56297f53 100644
--- a/LEGO1/omni/src/common/mxmediapresenter.cpp
+++ b/LEGO1/omni/src/common/mxmediapresenter.cpp
@@ -11,18 +11,6 @@ DECOMP_SIZE_ASSERT(MxMediaPresenter, 0x50);
 DECOMP_SIZE_ASSERT(MxStreamChunkList, 0x18);
 DECOMP_SIZE_ASSERT(MxStreamChunkListCursor, 0x10);
 
-// FUNCTION: LEGO1 0x1000c550
-MxMediaPresenter::~MxMediaPresenter()
-{
-	Destroy(TRUE);
-}
-
-// FUNCTION: LEGO1 0x1000c5b0
-void MxMediaPresenter::Destroy()
-{
-	Destroy(FALSE);
-}
-
 // FUNCTION: LEGO1 0x100b54e0
 void MxMediaPresenter::Init()
 {
@@ -77,8 +65,7 @@ MxStreamChunk* MxMediaPresenter::CurrentChunk()
 			m_subscriber->NextChunk();
 			m_subscriber->DestroyChunk(chunk);
 			chunk = NULL;
-			m_previousTickleStates |= 1 << (unsigned char) m_currentTickleState;
-			m_currentTickleState = TickleState_Done;
+			ProgressTickleState(TickleState_Done);
 		}
 	}
 
@@ -97,8 +84,7 @@ MxStreamChunk* MxMediaPresenter::NextChunk()
 			m_action->SetFlags(m_action->GetFlags() | MxDSAction::Flag_Bit7);
 			m_subscriber->DestroyChunk(chunk);
 			chunk = NULL;
-			m_previousTickleStates |= 1 << (unsigned char) m_currentTickleState;
-			m_currentTickleState = TickleState_Done;
+			ProgressTickleState(TickleState_Done);
 		}
 	}
 
@@ -195,8 +181,7 @@ void MxMediaPresenter::StreamingTickle()
 			if (m_currentChunk->GetFlags() & MxDSChunk::Flag_End) {
 				m_subscriber->DestroyChunk(m_currentChunk);
 				m_currentChunk = NULL;
-				m_previousTickleStates |= 1 << (unsigned char) m_currentTickleState;
-				m_currentTickleState = TickleState_Repeating;
+				ProgressTickleState(TickleState_Repeating);
 			}
 			else if (m_action->GetFlags() & MxDSAction::Flag_Looping) {
 				LoopChunk(m_currentChunk);
@@ -220,16 +205,12 @@ void MxMediaPresenter::RepeatingTickle()
 
 		if (m_currentChunk) {
 			MxLong time = m_currentChunk->GetTime();
-			if (time <= m_action->GetElapsedTime() % m_action->GetLoopCount()) {
-				m_previousTickleStates |= 1 << (unsigned char) m_currentTickleState;
-				m_currentTickleState = TickleState_unk5;
-			}
+			if (time <= m_action->GetElapsedTime() % m_action->GetLoopCount())
+				ProgressTickleState(TickleState_unk5);
 		}
 		else {
-			if (m_action->GetElapsedTime() >= m_action->GetStartTime() + m_action->GetDuration()) {
-				m_previousTickleStates |= 1 << (unsigned char) m_currentTickleState;
-				m_currentTickleState = TickleState_unk5;
-			}
+			if (m_action->GetElapsedTime() >= m_action->GetStartTime() + m_action->GetDuration())
+				ProgressTickleState(TickleState_unk5);
 		}
 	}
 }
diff --git a/LEGO1/omni/src/common/mxpresenter.cpp b/LEGO1/omni/src/common/mxpresenter.cpp
index 0595aee7..6582d43c 100644
--- a/LEGO1/omni/src/common/mxpresenter.cpp
+++ b/LEGO1/omni/src/common/mxpresenter.cpp
@@ -18,96 +18,11 @@
 
 DECOMP_SIZE_ASSERT(MxPresenter, 0x40);
 
-// FUNCTION: LEGO1 0x1000be30
-void MxPresenter::VTable0x14()
-{
-}
-
-// FUNCTION: LEGO1 0x1000be40
-void MxPresenter::ReadyTickle()
-{
-	ParseExtra();
-
-	m_previousTickleStates |= 1 << (unsigned char) m_currentTickleState;
-	m_currentTickleState = TickleState_Starting;
-}
-
-// FUNCTION: LEGO1 0x1000be60
-void MxPresenter::StartingTickle()
-{
-	m_previousTickleStates |= 1 << (unsigned char) m_currentTickleState;
-	m_currentTickleState = TickleState_Streaming;
-}
-
-// FUNCTION: LEGO1 0x1000be80
-void MxPresenter::StreamingTickle()
-{
-	m_previousTickleStates |= 1 << (unsigned char) m_currentTickleState;
-	m_currentTickleState = TickleState_Repeating;
-}
-
-// FUNCTION: LEGO1 0x1000bea0
-void MxPresenter::RepeatingTickle()
-{
-	m_previousTickleStates |= 1 << (unsigned char) m_currentTickleState;
-	m_currentTickleState = TickleState_unk5;
-}
-
-// FUNCTION: LEGO1 0x1000bec0
-void MxPresenter::Unk5Tickle()
-{
-	m_previousTickleStates |= 1 << (unsigned char) m_currentTickleState;
-	m_currentTickleState = TickleState_Done;
-}
-
-// FUNCTION: LEGO1 0x1000bee0
-void MxPresenter::DoneTickle()
-{
-	m_previousTickleStates |= 1 << m_currentTickleState;
-	m_currentTickleState = TickleState_Idle;
-}
-
-// FUNCTION: LEGO1 0x1000bf00
+#ifdef COMPAT_MODE
 MxPresenter::~MxPresenter()
 {
 }
-
-// FUNCTION: LEGO1 0x1000bf70
-MxResult MxPresenter::AddToManager()
-{
-	return SUCCESS;
-}
-
-// FUNCTION: LEGO1 0x1000bf80
-void MxPresenter::Destroy()
-{
-	Init();
-}
-
-// FUNCTION: LEGO1 0x1000bf90
-void MxPresenter::SetTickleState(TickleState p_tickleState)
-{
-	m_previousTickleStates |= 1 << (unsigned char) m_currentTickleState;
-	m_currentTickleState = p_tickleState;
-}
-
-// FUNCTION: LEGO1 0x1000bfb0
-MxBool MxPresenter::HasTickleStatePassed(TickleState p_tickleState)
-{
-	return m_previousTickleStates & (1 << (unsigned char) p_tickleState);
-}
-
-// FUNCTION: LEGO1 0x1000bfc0
-MxResult MxPresenter::PutData()
-{
-	return SUCCESS;
-}
-
-// FUNCTION: LEGO1 0x1000bfd0
-MxBool MxPresenter::IsHit(MxS32 p_x, MxS32 p_y)
-{
-	return FALSE;
-}
+#endif
 
 // FUNCTION: LEGO1 0x100b4d50
 void MxPresenter::Init()
@@ -132,8 +47,7 @@ MxResult MxPresenter::StartAction(MxStreamController*, MxDSAction* p_action)
 
 	this->m_location = MxPoint32(this->m_action->GetLocation()[0], this->m_action->GetLocation()[1]);
 	this->m_displayZ = this->m_action->GetLocation()[2];
-	this->m_previousTickleStates |= 1 << (unsigned char) previousTickleState;
-	this->m_currentTickleState = TickleState_Ready;
+	ProgressTickleState(TickleState_Ready);
 
 	return SUCCESS;
 }
diff --git a/LEGO1/omni/src/common/mxvariable.cpp b/LEGO1/omni/src/common/mxvariable.cpp
index a60051fd..7b0a46c1 100644
--- a/LEGO1/omni/src/common/mxvariable.cpp
+++ b/LEGO1/omni/src/common/mxvariable.cpp
@@ -4,21 +4,3 @@
 #include "mxstring.h"
 
 DECOMP_SIZE_ASSERT(MxVariable, 0x24)
-
-// FUNCTION: LEGO1 0x1003bea0
-MxString* MxVariable::GetValue()
-{
-	return &m_value;
-}
-
-// FUNCTION: LEGO1 0x1003beb0
-void MxVariable::SetValue(const char* p_value)
-{
-	m_value = p_value;
-}
-
-// FUNCTION: LEGO1 0x1003bec0
-void MxVariable::Destroy()
-{
-	delete this;
-}
diff --git a/LEGO1/omni/src/entity/mxentity.cpp b/LEGO1/omni/src/entity/mxentity.cpp
index 1f507257..2edc65f6 100644
--- a/LEGO1/omni/src/entity/mxentity.cpp
+++ b/LEGO1/omni/src/entity/mxentity.cpp
@@ -1,22 +1,3 @@
 #include "mxentity.h"
 
 DECOMP_SIZE_ASSERT(MxEntity, 0x10)
-
-// FUNCTION: LEGO1 0x10001070
-MxResult MxEntity::Create(MxS32 p_id, const MxAtomId& p_atom)
-{
-	this->m_mxEntityId = p_id;
-	this->m_atom = p_atom;
-	return SUCCESS;
-}
-
-// FUNCTION: LEGO1 0x1000c110
-MxEntity::~MxEntity()
-{
-}
-
-// FUNCTION: LEGO1 0x1001d190
-MxEntity::MxEntity()
-{
-	this->m_mxEntityId = -1;
-}
diff --git a/LEGO1/omni/src/event/mxeventpresenter.cpp b/LEGO1/omni/src/event/mxeventpresenter.cpp
index 6a0a0cbd..d934660a 100644
--- a/LEGO1/omni/src/event/mxeventpresenter.cpp
+++ b/LEGO1/omni/src/event/mxeventpresenter.cpp
@@ -71,8 +71,7 @@ void MxEventPresenter::ReadyTickle()
 		CopyData(chunk);
 		m_subscriber->DestroyChunk(chunk);
 		ParseExtra();
-		m_previousTickleStates |= 1 << (unsigned char) m_currentTickleState;
-		m_currentTickleState = TickleState_Starting;
+		ProgressTickleState(TickleState_Starting);
 	}
 }
 
@@ -81,10 +80,8 @@ void MxEventPresenter::StartingTickle()
 {
 	MxStreamChunk* chunk = NextChunk();
 
-	if (chunk && m_action->GetElapsedTime() >= chunk->GetTime()) {
-		m_previousTickleStates |= 1 << (unsigned char) m_currentTickleState;
-		m_currentTickleState = TickleState_Streaming;
-	}
+	if (chunk && m_action->GetElapsedTime() >= chunk->GetTime())
+		ProgressTickleState(TickleState_Streaming);
 }
 
 // FUNCTION: LEGO1 0x100c2ef0
diff --git a/LEGO1/omni/src/main/mxomni.cpp b/LEGO1/omni/src/main/mxomni.cpp
index 377ba481..6df6d009 100644
--- a/LEGO1/omni/src/main/mxomni.cpp
+++ b/LEGO1/omni/src/main/mxomni.cpp
@@ -27,26 +27,6 @@ MxBool g_use3dSound;
 // GLOBAL: LEGO1 0x101015b0
 MxOmni* MxOmni::g_instance = NULL;
 
-// FUNCTION: LEGO1 0x100159e0
-void DeleteObjects(MxAtomId* p_id, MxS32 p_first, MxS32 p_last)
-{
-	MxDSAction action;
-
-	action.SetAtomId(*p_id);
-	action.SetUnknown24(-2);
-
-	for (MxS32 first = p_first, last = p_last; first <= last; first++) {
-		action.SetObjectId(first);
-		DeleteObject(action);
-	}
-}
-
-// FUNCTION: LEGO1 0x10058a90
-MxBool MxOmni::IsTimerRunning()
-{
-	return m_timerRunning;
-}
-
 // FUNCTION: LEGO1 0x100acea0
 MxObjectFactory* ObjectFactory()
 {
@@ -113,6 +93,12 @@ MxEventManager* EventManager()
 	return MxOmni::GetInstance()->GetEventManager();
 }
 
+// FUNCTION: LEGO1 0x100acf50
+MxResult Start(MxDSAction* p_dsAction)
+{
+	return MxOmni::GetInstance()->Start(p_dsAction);
+}
+
 // FUNCTION: LEGO1 0x100acf70
 void DeleteObject(MxDSAction& p_dsAction)
 {
diff --git a/LEGO1/omni/src/notify/mxactionnotificationparam.cpp b/LEGO1/omni/src/notify/mxactionnotificationparam.cpp
index 5573677f..c5f816e7 100644
--- a/LEGO1/omni/src/notify/mxactionnotificationparam.cpp
+++ b/LEGO1/omni/src/notify/mxactionnotificationparam.cpp
@@ -3,18 +3,6 @@
 DECOMP_SIZE_ASSERT(MxActionNotificationParam, 0x14)
 DECOMP_SIZE_ASSERT(MxEndActionNotificationParam, 0x14)
 
-// FUNCTION: LEGO1 0x100510c0
-MxNotificationParam* MxActionNotificationParam::Clone()
-{
-	return new MxActionNotificationParam(this->m_type, this->m_sender, this->m_action, this->m_realloc);
-}
-
-// FUNCTION: LEGO1 0x10051270
-MxNotificationParam* MxEndActionNotificationParam::Clone()
-{
-	return new MxEndActionNotificationParam(c_notificationEndAction, this->m_sender, this->m_action, this->m_realloc);
-}
-
 // FUNCTION: LEGO1 0x100b0300
 MxNotificationParam* MxStartActionNotificationParam::Clone()
 {
diff --git a/LEGO1/omni/src/notify/mxnotificationparam.cpp b/LEGO1/omni/src/notify/mxnotificationparam.cpp
index 0797c9f1..cb15a2df 100644
--- a/LEGO1/omni/src/notify/mxnotificationparam.cpp
+++ b/LEGO1/omni/src/notify/mxnotificationparam.cpp
@@ -3,9 +3,3 @@
 #include "decomp.h"
 
 DECOMP_SIZE_ASSERT(MxNotificationParam, 0xc);
-
-// FUNCTION: LEGO1 0x10010390
-MxNotificationParam* MxNotificationParam::Clone()
-{
-	return new MxNotificationParam(m_type, m_sender);
-}
diff --git a/LEGO1/omni/src/video/mxbitmap.cpp b/LEGO1/omni/src/video/mxbitmap.cpp
index 4f2393cf..ea93279b 100644
--- a/LEGO1/omni/src/video/mxbitmap.cpp
+++ b/LEGO1/omni/src/video/mxbitmap.cpp
@@ -10,12 +10,6 @@ DECOMP_SIZE_ASSERT(MxBITMAPINFO, 0x428);
 // (1998) GLOBAL: LEGO1 0x10102184
 MxU16 g_bitmapSignature = TWOCC('B', 'M');
 
-// FUNCTION: LEGO1 0x1004e0d0
-int MxBitmap::VTable0x28(int)
-{
-	return -1;
-}
-
 // FUNCTION: LEGO1 0x100bc980
 MxBitmap::MxBitmap()
 {
diff --git a/LEGO1/omni/src/video/mxloopingflcpresenter.cpp b/LEGO1/omni/src/video/mxloopingflcpresenter.cpp
index fdd991a9..07af2513 100644
--- a/LEGO1/omni/src/video/mxloopingflcpresenter.cpp
+++ b/LEGO1/omni/src/video/mxloopingflcpresenter.cpp
@@ -40,10 +40,8 @@ void MxLoopingFlcPresenter::NextFrame()
 {
 	MxStreamChunk* chunk = NextChunk();
 
-	if (chunk->GetFlags() & MxDSChunk::Flag_End) {
-		m_previousTickleStates |= 1 << (unsigned char) m_currentTickleState;
-		m_currentTickleState = TickleState_Repeating;
-	}
+	if (chunk->GetFlags() & MxDSChunk::Flag_End)
+		ProgressTickleState(TickleState_Repeating);
 	else {
 		LoadFrame(chunk);
 		LoopChunk(chunk);
diff --git a/LEGO1/omni/src/video/mxloopingsmkpresenter.cpp b/LEGO1/omni/src/video/mxloopingsmkpresenter.cpp
index efa758cd..29ee1747 100644
--- a/LEGO1/omni/src/video/mxloopingsmkpresenter.cpp
+++ b/LEGO1/omni/src/video/mxloopingsmkpresenter.cpp
@@ -51,10 +51,8 @@ void MxLoopingSmkPresenter::NextFrame()
 {
 	MxStreamChunk* chunk = NextChunk();
 
-	if (chunk->GetFlags() & MxDSChunk::Flag_End) {
-		m_previousTickleStates |= 1 << (unsigned char) m_currentTickleState;
-		m_currentTickleState = TickleState_Repeating;
-	}
+	if (chunk->GetFlags() & MxDSChunk::Flag_End)
+		ProgressTickleState(TickleState_Repeating);
 	else {
 		LoadFrame(chunk);
 		LoopChunk(chunk);
@@ -67,10 +65,8 @@ void MxLoopingSmkPresenter::NextFrame()
 // FUNCTION: LEGO1 0x100b4a90
 void MxLoopingSmkPresenter::VTable0x8c()
 {
-	if (m_action->GetDuration() < m_elapsedDuration) {
-		m_previousTickleStates |= 1 << (unsigned char) m_currentTickleState;
-		m_currentTickleState = TickleState_unk5;
-	}
+	if (m_action->GetDuration() < m_elapsedDuration)
+		ProgressTickleState(TickleState_unk5);
 	else {
 		MxStreamChunk* chunk;
 		m_loopingChunkCursor->Current(chunk);
diff --git a/LEGO1/omni/src/video/mxstillpresenter.cpp b/LEGO1/omni/src/video/mxstillpresenter.cpp
index 20e6b3a2..ea3ba3a6 100644
--- a/LEGO1/omni/src/video/mxstillpresenter.cpp
+++ b/LEGO1/omni/src/video/mxstillpresenter.cpp
@@ -13,12 +13,6 @@ DECOMP_SIZE_ASSERT(MxStillPresenter, 0x6c);
 // GLOBAL: LEGO1 0x10101eb0
 const char* g_strBmpIsmap = "BMP_ISMAP";
 
-// FUNCTION: LEGO1 0x100435b0
-void MxStillPresenter::Destroy()
-{
-	Destroy(FALSE);
-}
-
 // FUNCTION: LEGO1 0x100b9c70
 void MxStillPresenter::Destroy(MxBool p_fromDestructor)
 {
@@ -127,8 +121,7 @@ void MxStillPresenter::StreamingTickle()
 	if (chunk && m_action->GetElapsedTime() >= chunk->GetTime()) {
 		m_chunkTime = chunk->GetTime();
 		NextFrame();
-		m_previousTickleStates |= 1 << (unsigned char) m_currentTickleState;
-		m_currentTickleState = TickleState_Repeating;
+		ProgressTickleState(TickleState_Repeating);
 
 		if (m_action->GetDuration() == -1 && m_compositePresenter)
 			m_compositePresenter->VTable0x60(this);
@@ -139,10 +132,8 @@ void MxStillPresenter::StreamingTickle()
 void MxStillPresenter::RepeatingTickle()
 {
 	if (m_action->GetDuration() != -1) {
-		if (m_action->GetElapsedTime() >= m_action->GetStartTime() + m_action->GetDuration()) {
-			m_previousTickleStates |= 1 << (unsigned char) m_currentTickleState;
-			m_currentTickleState = TickleState_unk5;
-		}
+		if (m_action->GetElapsedTime() >= m_action->GetStartTime() + m_action->GetDuration())
+			ProgressTickleState(TickleState_unk5);
 	}
 }
 
diff --git a/LEGO1/omni/src/video/mxvideopresenter.cpp b/LEGO1/omni/src/video/mxvideopresenter.cpp
index 23c12cfb..765bb497 100644
--- a/LEGO1/omni/src/video/mxvideopresenter.cpp
+++ b/LEGO1/omni/src/video/mxvideopresenter.cpp
@@ -8,66 +8,6 @@
 DECOMP_SIZE_ASSERT(MxVideoPresenter, 0x64);
 DECOMP_SIZE_ASSERT(MxVideoPresenter::AlphaMask, 0xc);
 
-// FUNCTION: LEGO1 0x1000c700
-void MxVideoPresenter::LoadHeader(MxStreamChunk* p_chunk)
-{
-	// Empty
-}
-
-// FUNCTION: LEGO1 0x1000c710
-void MxVideoPresenter::CreateBitmap()
-{
-	// Empty
-}
-
-// FUNCTION: LEGO1 0x1000c720
-void MxVideoPresenter::LoadFrame(MxStreamChunk* p_chunk)
-{
-	// Empty
-}
-
-// FUNCTION: LEGO1 0x1000c730
-void MxVideoPresenter::RealizePalette()
-{
-	// Empty
-}
-
-// FUNCTION: LEGO1 0x1000c740
-MxVideoPresenter::~MxVideoPresenter()
-{
-	Destroy(TRUE);
-}
-
-// FUNCTION: LEGO1 0x1000c7a0
-void MxVideoPresenter::Destroy()
-{
-	Destroy(FALSE);
-}
-
-// FUNCTION: LEGO1 0x1000c7b0
-LPDIRECTDRAWSURFACE MxVideoPresenter::VTable0x78()
-{
-	return m_unk0x58;
-}
-
-// FUNCTION: LEGO1 0x1000c7c0
-MxBool MxVideoPresenter::VTable0x7c()
-{
-	return (m_bitmap != NULL) || (m_alpha != NULL);
-}
-
-// FUNCTION: LEGO1 0x1000c7e0
-MxS32 MxVideoPresenter::GetWidth()
-{
-	return m_alpha ? m_alpha->m_width : m_bitmap->GetBmiWidth();
-}
-
-// FUNCTION: LEGO1 0x1000c800
-MxS32 MxVideoPresenter::GetHeight()
-{
-	return m_alpha ? m_alpha->m_height : m_bitmap->GetBmiHeightAbs();
-}
-
 // FUNCTION: LEGO1 0x100b24f0
 MxVideoPresenter::AlphaMask::AlphaMask(const MxBitmap& p_bitmap)
 {
@@ -242,8 +182,7 @@ void MxVideoPresenter::NextFrame()
 
 	if (chunk->GetFlags() & MxDSChunk::Flag_End) {
 		m_subscriber->DestroyChunk(chunk);
-		m_previousTickleStates |= 1 << (unsigned char) m_currentTickleState;
-		m_currentTickleState = TickleState_Repeating;
+		ProgressTickleState(TickleState_Repeating);
 	}
 	else {
 		LoadFrame(chunk);
@@ -460,8 +399,7 @@ void MxVideoPresenter::ReadyTickle()
 		LoadHeader(chunk);
 		m_subscriber->DestroyChunk(chunk);
 		ParseExtra();
-		m_previousTickleStates |= 1 << (unsigned char) m_currentTickleState;
-		m_currentTickleState = TickleState_Starting;
+		ProgressTickleState(TickleState_Starting);
 	}
 }
 
@@ -472,8 +410,7 @@ void MxVideoPresenter::StartingTickle()
 
 	if (chunk && m_action->GetElapsedTime() >= chunk->GetTime()) {
 		CreateBitmap();
-		m_previousTickleStates |= 1 << (unsigned char) m_currentTickleState;
-		m_currentTickleState = TickleState_Streaming;
+		ProgressTickleState(TickleState_Streaming);
 	}
 }
 
@@ -564,15 +501,11 @@ void MxVideoPresenter::Unk5Tickle()
 			if (m_unk0x60 == -1)
 				m_unk0x60 = m_action->GetElapsedTime();
 
-			if (m_action->GetElapsedTime() >= m_unk0x60 + ((MxDSMediaAction*) m_action)->GetSustainTime()) {
-				m_previousTickleStates |= 1 << (unsigned char) m_currentTickleState;
-				m_currentTickleState = TickleState_Done;
-			}
-		}
-		else {
-			m_previousTickleStates |= 1 << (unsigned char) m_currentTickleState;
-			m_currentTickleState = TickleState_Done;
+			if (m_action->GetElapsedTime() >= m_unk0x60 + ((MxDSMediaAction*) m_action)->GetSustainTime())
+				ProgressTickleState(TickleState_Done);
 		}
+		else
+			ProgressTickleState(TickleState_Done);
 	}
 }
 

From 99ee2122132645bb7e31e551a99adf13d7f90016 Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Thu, 11 Jan 2024 10:48:00 -0500
Subject: [PATCH 098/210] Fix inclusion of MxPresenter class in ISLE

---
 CMakeLists.txt                        | 2 ++
 LEGO1/omni/include/mxpresenter.h      | 6 +++++-
 LEGO1/omni/src/common/mxpresenter.cpp | 6 ------
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a3519ea9..7efecd09 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -291,6 +291,8 @@ if (ISLE_BUILD_APP)
     ISLE/define.cpp
   )
 
+  target_compile_definitions(isle PRIVATE ISLE_APP)
+
   target_include_directories(isle PRIVATE "${CMAKE_SOURCE_DIR}/util")
   target_include_directories(isle PRIVATE "${CMAKE_SOURCE_DIR}/LEGO1")
   target_include_directories(isle PRIVATE "${CMAKE_SOURCE_DIR}/LEGO1/omni/include")
diff --git a/LEGO1/omni/include/mxpresenter.h b/LEGO1/omni/include/mxpresenter.h
index 5659402b..27c40745 100644
--- a/LEGO1/omni/include/mxpresenter.h
+++ b/LEGO1/omni/include/mxpresenter.h
@@ -28,7 +28,7 @@ class MxPresenter : public MxCore {
 
 	MxPresenter() { Init(); }
 
-#ifdef COMPAT_MODE
+#ifdef ISLE_APP
 	__declspec(dllexport) virtual ~MxPresenter() override; // vtable+0x00
 #else
 	// FUNCTION: LEGO1 0x1000bf00
@@ -73,8 +73,12 @@ class MxPresenter : public MxCore {
 	virtual void Unk5Tickle() { ProgressTickleState(TickleState_Done); }; // vtable+0x28
 
 protected:
+#ifdef ISLE_APP
+	__declspec(dllexport) virtual void DoneTickle(); // vtable+0x2c
+#else
 	// FUNCTION: LEGO1 0x1000bee0
 	__declspec(dllexport) virtual void DoneTickle() { ProgressTickleState(TickleState_Idle); }; // vtable+0x2c
+#endif
 
 	__declspec(dllexport) virtual void ParseExtra(); // vtable+0x30
 
diff --git a/LEGO1/omni/src/common/mxpresenter.cpp b/LEGO1/omni/src/common/mxpresenter.cpp
index 6582d43c..f08b0f30 100644
--- a/LEGO1/omni/src/common/mxpresenter.cpp
+++ b/LEGO1/omni/src/common/mxpresenter.cpp
@@ -18,12 +18,6 @@
 
 DECOMP_SIZE_ASSERT(MxPresenter, 0x40);
 
-#ifdef COMPAT_MODE
-MxPresenter::~MxPresenter()
-{
-}
-#endif
-
 // FUNCTION: LEGO1 0x100b4d50
 void MxPresenter::Init()
 {

From 602ba30faebceb181b8b8778d96aea8b81cb9f70 Mon Sep 17 00:00:00 2001
From: Misha <106913236+MishaProductions@users.noreply.github.com>
Date: Fri, 12 Jan 2024 17:22:42 -0500
Subject: [PATCH 099/210] fix LegoPathPresenter vtable (#427)

* fix LegoPathPresenter vtbl

* Update legopathpresenter.cpp

* Update legopathpresenter.cpp

* fix override

* Update legopathpresenter.cpp
---
 .../lego/legoomni/include/legopathpresenter.h |  3 +++
 .../legoomni/src/paths/legopathpresenter.cpp  | 27 +++++++++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/LEGO1/lego/legoomni/include/legopathpresenter.h b/LEGO1/lego/legoomni/include/legopathpresenter.h
index de7b14d1..bc1bdcb5 100644
--- a/LEGO1/lego/legoomni/include/legopathpresenter.h
+++ b/LEGO1/lego/legoomni/include/legopathpresenter.h
@@ -8,6 +8,7 @@
 class LegoPathPresenter : public MxMediaPresenter {
 public:
 	LegoPathPresenter();
+	virtual ~LegoPathPresenter() override;
 
 	// FUNCTION: LEGO1 0x100449a0
 	inline const char* ClassName() const override // vtable+0xc
@@ -22,6 +23,8 @@ class LegoPathPresenter : public MxMediaPresenter {
 		return !strcmp(p_name, LegoPathPresenter::ClassName()) || MxMediaPresenter::IsA(p_name);
 	}
 
+	virtual void ReadyTickle() override;      // vtable+0x18
+	virtual void StreamingTickle() override;  // vtable+0x20
 	virtual void RepeatingTickle() override;  // vtable+0x24
 	virtual void ParseExtra() override;       // vtable+0x30
 	virtual MxResult AddToManager() override; // vtable+0x34
diff --git a/LEGO1/lego/legoomni/src/paths/legopathpresenter.cpp b/LEGO1/lego/legoomni/src/paths/legopathpresenter.cpp
index b8ab8faf..1c9b586f 100644
--- a/LEGO1/lego/legoomni/src/paths/legopathpresenter.cpp
+++ b/LEGO1/lego/legoomni/src/paths/legopathpresenter.cpp
@@ -17,6 +17,12 @@ void LegoPathPresenter::Init()
 {
 }
 
+// FUNCTION: LEGO1 0x10044ac0
+LegoPathPresenter::~LegoPathPresenter()
+{
+	Destroy(TRUE);
+}
+
 // FUNCTION: LEGO1 0x10044b40
 MxResult LegoPathPresenter::AddToManager()
 {
@@ -51,6 +57,27 @@ void LegoPathPresenter::Destroy()
 	Destroy(FALSE);
 }
 
+// STUB: LEGO1 0x10044c20
+void LegoPathPresenter::ReadyTickle()
+{
+	// TODO
+	ProgressTickleState(TickleState_Starting); // Allow initialization process to continue
+}
+
+// FUNCTION: LEGO1 0x10044d00
+void LegoPathPresenter::StreamingTickle()
+{
+	MxStreamChunk* chunk = m_subscriber->NextChunk();
+
+	if (chunk) {
+		if (chunk->GetFlags() & MxStreamChunk::Flag_End) {
+			ProgressTickleState(TickleState_Repeating);
+		}
+
+		m_subscriber->DestroyChunk(chunk);
+	}
+}
+
 // FUNCTION: LEGO1 0x10044d40
 void LegoPathPresenter::RepeatingTickle()
 {

From 3c0bf7191c846eddbd3286bbead169a4fd61bff9 Mon Sep 17 00:00:00 2001
From: Misha <106913236+MishaProductions@users.noreply.github.com>
Date: Fri, 12 Jan 2024 17:27:07 -0500
Subject: [PATCH 100/210] implement LegoWorldPresenter deconstructor (#425)

* Implement LegoWorldPresenter::~LegoWorldPresenter

* Rename incorrect function name

* fixes

* Rename functions

* fix format
---
 LEGO1/lego/legoomni/include/infocenter.h      |  2 +-
 LEGO1/lego/legoomni/include/isle.h            |  2 +-
 .../legoomni/include/legoanimationmanager.h   |  2 ++
 .../legoomni/include/legobuildingmanager.h    |  2 ++
 .../lego/legoomni/include/legoplantmanager.h  |  3 ++
 LEGO1/lego/legoomni/include/legoworld.h       |  9 ++++--
 LEGO1/lego/legoomni/include/score.h           |  2 +-
 .../src/build/legobuildingmanager.cpp         |  6 ++++
 .../legoomni/src/common/legoplantmanager.cpp  |  6 ++++
 LEGO1/lego/legoomni/src/entity/legoworld.cpp  | 12 +++----
 .../src/entity/legoworldpresenter.cpp         | 31 +++++++++++++++++--
 .../legoomni/src/infocenter/infocenter.cpp    |  2 +-
 LEGO1/lego/legoomni/src/infocenter/score.cpp  |  6 ++--
 LEGO1/lego/legoomni/src/isle/isle.cpp         |  4 +--
 .../src/video/legoanimationmanager.cpp        |  6 ++++
 15 files changed, 75 insertions(+), 20 deletions(-)

diff --git a/LEGO1/lego/legoomni/include/infocenter.h b/LEGO1/lego/legoomni/include/infocenter.h
index ec0be745..634d7b55 100644
--- a/LEGO1/lego/legoomni/include/infocenter.h
+++ b/LEGO1/lego/legoomni/include/infocenter.h
@@ -27,7 +27,7 @@ class Infocenter : public LegoWorld {
 	}
 
 	virtual MxResult Create(MxDSObject& p_dsObject) override; // vtable+0x18
-	virtual void Stop() override;                             // vtable+0x50
+	virtual void VTable0x50() override;                       // vtable+0x50
 	virtual MxBool VTable0x5c() override;                     // vtable+0x5c
 	virtual MxBool VTable0x64() override;                     // vtable+0x64
 	virtual void VTable0x68(MxBool p_add) override;           // vtable+0x68
diff --git a/LEGO1/lego/legoomni/include/isle.h b/LEGO1/lego/legoomni/include/isle.h
index c3579aec..a768d357 100644
--- a/LEGO1/lego/legoomni/include/isle.h
+++ b/LEGO1/lego/legoomni/include/isle.h
@@ -41,7 +41,7 @@ class Isle : public LegoWorld {
 	}
 
 	virtual MxResult Create(MxDSObject& p_dsObject) override; // vtable+0x18
-	virtual void Stop() override;                             // vtable+50
+	virtual void VTable0x50() override;                       // vtable+50
 	virtual void VTable0x58(MxCore* p_object) override;       // vtable+58
 	// FUNCTION: LEGO1 0x10030900
 	virtual MxBool VTable0x5c() override { return TRUE; } // vtable+5c
diff --git a/LEGO1/lego/legoomni/include/legoanimationmanager.h b/LEGO1/lego/legoomni/include/legoanimationmanager.h
index f943b062..5c13947f 100644
--- a/LEGO1/lego/legoomni/include/legoanimationmanager.h
+++ b/LEGO1/lego/legoomni/include/legoanimationmanager.h
@@ -1,6 +1,7 @@
 #ifndef LEGOANIMATIONMANAGER_H
 #define LEGOANIMATIONMANAGER_H
 
+#include "decomp.h"
 #include "mxcore.h"
 
 // VTABLE: LEGO1 0x100d8c18
@@ -27,6 +28,7 @@ class LegoAnimationManager : public MxCore {
 	}
 
 	void FUN_1005f6d0(MxBool);
+	void FUN_1005f720(undefined4);
 	void FUN_10064670(MxBool);
 
 	__declspec(dllexport) static void configureLegoAnimationManager(MxS32 p_legoAnimationManagerConfig);
diff --git a/LEGO1/lego/legoomni/include/legobuildingmanager.h b/LEGO1/lego/legoomni/include/legobuildingmanager.h
index bb9c96bb..03fb2eeb 100644
--- a/LEGO1/lego/legoomni/include/legobuildingmanager.h
+++ b/LEGO1/lego/legoomni/include/legobuildingmanager.h
@@ -19,6 +19,8 @@ class LegoBuildingManager : public MxCore {
 
 	__declspec(dllexport) static void configureLegoBuildingManager(MxS32);
 
+	void FUN_1002fa00();
+
 private:
 	void Init();
 };
diff --git a/LEGO1/lego/legoomni/include/legoplantmanager.h b/LEGO1/lego/legoomni/include/legoplantmanager.h
index 7fd20746..e509e17e 100644
--- a/LEGO1/lego/legoomni/include/legoplantmanager.h
+++ b/LEGO1/lego/legoomni/include/legoplantmanager.h
@@ -1,6 +1,7 @@
 #ifndef LEGOPLANTMANAGER_H
 #define LEGOPLANTMANAGER_H
 
+#include "decomp.h"
 #include "mxcore.h"
 
 // VTABLE: LEGO1 0x100d6758
@@ -19,6 +20,8 @@ class LegoPlantManager : public MxCore {
 		return "LegoPlantManager";
 	}
 
+	void FUN_10026360(undefined4 p_world);
+
 private:
 	void Init();
 };
diff --git a/LEGO1/lego/legoomni/include/legoworld.h b/LEGO1/lego/legoomni/include/legoworld.h
index c4f53913..f55043c3 100644
--- a/LEGO1/lego/legoomni/include/legoworld.h
+++ b/LEGO1/lego/legoomni/include/legoworld.h
@@ -33,7 +33,7 @@ class LegoWorld : public LegoEntity {
 		return !strcmp(p_name, LegoWorld::ClassName()) || LegoEntity::IsA(p_name);
 	}
 
-	virtual void Stop();                       // vtable+50
+	virtual void VTable0x50();                 // vtable+50
 	virtual void VTable0x54();                 // vtable+54
 	virtual void VTable0x58(MxCore* p_object); // vtable+58
 	virtual MxBool VTable0x5c();               // vtable+5c
@@ -43,6 +43,7 @@ class LegoWorld : public LegoEntity {
 	virtual void VTable0x68(MxBool p_add); // vtable+68
 
 	inline LegoCameraController* GetCamera() { return m_camera; }
+	inline undefined4 GetUnknown0xec() { return m_unk0xec; }
 
 	undefined FUN_100220e0();
 	MxResult SetAsCurrentWorld(MxDSObject& p_dsObject);
@@ -60,9 +61,11 @@ class LegoWorld : public LegoEntity {
 	LegoCameraController* m_camera;    // 0x98
 	undefined m_unk0x9c[0x1c];         // 0x9c
 	MxPresenterList m_list0xb8;        // 0xb8
-	undefined m_unk0xd0[0x24];         // 0xd0
+	undefined m_unk0xd0[0x1c];         // 0xd0
+	undefined4 m_unk0xec;              // 0xec
+	undefined4 m_unk0xf0;              // 0xf0
 	MxS16 m_unk0xf4;                   // 0xf4
-	MxBool m_unk0xf6;                  // 0xf6
+	MxBool m_worldStarted;             // 0xf6
 	undefined m_unk0xf7;               // 0xf7
 };
 
diff --git a/LEGO1/lego/legoomni/include/score.h b/LEGO1/lego/legoomni/include/score.h
index c927863f..f5950aa8 100644
--- a/LEGO1/lego/legoomni/include/score.h
+++ b/LEGO1/lego/legoomni/include/score.h
@@ -32,7 +32,7 @@ class Score : public LegoWorld {
 	// Score::`scalar deleting destructor'
 
 	virtual MxResult Create(MxDSObject& p_dsObject) override; // vtable+18
-	virtual void Stop() override;                             // vtable+50
+	virtual void VTable0x50() override;                       // vtable+50
 	virtual MxBool VTable0x5c() override;                     // vtable+5c
 	virtual MxBool VTable0x64() override;                     // vtable+64
 	virtual void VTable0x68(MxBool p_add) override;           // vtable+68
diff --git a/LEGO1/lego/legoomni/src/build/legobuildingmanager.cpp b/LEGO1/lego/legoomni/src/build/legobuildingmanager.cpp
index 34652509..3e6c4d7b 100644
--- a/LEGO1/lego/legoomni/src/build/legobuildingmanager.cpp
+++ b/LEGO1/lego/legoomni/src/build/legobuildingmanager.cpp
@@ -26,3 +26,9 @@ void LegoBuildingManager::Init()
 {
 	// TODO
 }
+
+// STUB: LEGO1 0x1002fa00
+void LegoBuildingManager::FUN_1002fa00()
+{
+	// TODO
+}
diff --git a/LEGO1/lego/legoomni/src/common/legoplantmanager.cpp b/LEGO1/lego/legoomni/src/common/legoplantmanager.cpp
index 4b93d8d7..193f5c8a 100644
--- a/LEGO1/lego/legoomni/src/common/legoplantmanager.cpp
+++ b/LEGO1/lego/legoomni/src/common/legoplantmanager.cpp
@@ -18,6 +18,12 @@ void LegoPlantManager::Init()
 	// TODO
 }
 
+// STUB: LEGO1 0x10026360
+void LegoPlantManager::FUN_10026360(undefined4 p_world)
+{
+	// TODO
+}
+
 // STUB: LEGO1 0x10026e00
 MxResult LegoPlantManager::Tickle()
 {
diff --git a/LEGO1/lego/legoomni/src/entity/legoworld.cpp b/LEGO1/lego/legoomni/src/entity/legoworld.cpp
index ff3969bd..b04543df 100644
--- a/LEGO1/lego/legoomni/src/entity/legoworld.cpp
+++ b/LEGO1/lego/legoomni/src/entity/legoworld.cpp
@@ -15,7 +15,7 @@ DECOMP_SIZE_ASSERT(LegoWorld, 0xf8);
 LegoWorld::LegoWorld() : m_list0x68(TRUE)
 {
 	// TODO
-	m_unk0xf6 = FALSE;
+	m_worldStarted = FALSE;
 	m_unk0xf4 = 4;
 	NotificationManager()->Register(this);
 }
@@ -101,12 +101,12 @@ void LegoWorld::VTable0x68(MxBool p_add)
 // FUNCTION: LEGO1 0x10022080
 MxResult LegoWorld::Tickle()
 {
-	if (!m_unk0xf6) {
+	if (!m_worldStarted) {
 		switch (m_unk0xf4) {
 		case 0:
-			m_unk0xf6 = TRUE;
+			m_worldStarted = TRUE;
 			SetAppCursor(0);
-			Stop();
+			VTable0x50();
 			return TRUE;
 		case 2:
 			if (FUN_100220e0() == 1)
@@ -121,11 +121,11 @@ MxResult LegoWorld::Tickle()
 // STUB: LEGO1 0x100220e0
 undefined LegoWorld::FUN_100220e0()
 {
-	return TRUE;
+	return 0;
 }
 
 // FUNCTION: LEGO1 0x10022340
-void LegoWorld::Stop()
+void LegoWorld::VTable0x50()
 {
 	TickleManager()->UnregisterClient(this);
 }
diff --git a/LEGO1/lego/legoomni/src/entity/legoworldpresenter.cpp b/LEGO1/lego/legoomni/src/entity/legoworldpresenter.cpp
index 9e5e930c..5be1baa8 100644
--- a/LEGO1/lego/legoomni/src/entity/legoworldpresenter.cpp
+++ b/LEGO1/lego/legoomni/src/entity/legoworldpresenter.cpp
@@ -1,12 +1,17 @@
 #include "legoworldpresenter.h"
 
+#include "legoanimationmanager.h"
+#include "legobuildingmanager.h"
 #include "legoentity.h"
 #include "legoomni.h"
+#include "legoplantmanager.h"
 #include "legovideomanager.h"
+#include "legoworld.h"
 #include "mxactionnotificationparam.h"
 #include "mxautolocker.h"
 #include "mxdsactionlist.h"
 #include "mxdsmultiaction.h"
+#include "mxnotificationmanager.h"
 #include "mxobjectfactory.h"
 #include "mxpresenter.h"
 #include "mxstl/stlcompat.h"
@@ -26,10 +31,32 @@ LegoWorldPresenter::LegoWorldPresenter()
 	m_unk0x50 = 50000;
 }
 
-// STUB: LEGO1 0x10066770
+// FUNCTION: LEGO1 0x10066770
 LegoWorldPresenter::~LegoWorldPresenter()
 {
-	// TODO
+	MxBool result = FALSE;
+	if (m_objectBackend) {
+		undefined4 world = ((LegoWorld*) m_objectBackend)->GetUnknown0xec();
+		PlantManager()->FUN_10026360(world);
+		AnimationManager()->FUN_1005f720(world);
+		BuildingManager()->FUN_1002fa00();
+		result = ((LegoWorld*) m_objectBackend)->VTable0x5c();
+	}
+
+	if (result == FALSE) {
+		FUN_10015820(0, 7);
+	}
+
+	if (m_objectBackend) {
+#ifdef COMPAT_MODE
+		{
+			MxNotificationParam param(c_notificationNewPresenter, NULL);
+			NotificationManager()->Send(m_objectBackend, &param);
+		}
+#else
+		NotificationManager()->Send(m_objectBackend, &MxNotificationParam(c_notificationNewPresenter, NULL));
+#endif
+	}
 }
 
 // FUNCTION: LEGO1 0x10066870
diff --git a/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp b/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp
index 8c6bcb8d..47d89ea5 100644
--- a/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp
+++ b/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp
@@ -26,7 +26,7 @@ MxLong Infocenter::Notify(MxParam& p_param)
 }
 
 // STUB: LEGO1 0x1006f4e0
-void Infocenter::Stop()
+void Infocenter::VTable0x50()
 {
 	// TODO
 }
diff --git a/LEGO1/lego/legoomni/src/infocenter/score.cpp b/LEGO1/lego/legoomni/src/infocenter/score.cpp
index dcc39f02..5e9ca19c 100644
--- a/LEGO1/lego/legoomni/src/infocenter/score.cpp
+++ b/LEGO1/lego/legoomni/src/infocenter/score.cpp
@@ -76,7 +76,7 @@ MxLong Score::Notify(MxParam& p_param)
 {
 	MxLong ret = 0;
 	LegoWorld::Notify(p_param);
-	if (m_unk0xf6) {
+	if (m_worldStarted) {
 		switch (((MxNotificationParam&) p_param).GetNotification()) {
 		case c_notificationStartAction:
 			ret = 1;
@@ -128,9 +128,9 @@ MxLong Score::FUN_10001510(MxEndActionNotificationParam& p_param)
 }
 
 // FUNCTION: LEGO1 0x10001580
-void Score::Stop()
+void Score::VTable0x50()
 {
-	LegoWorld::Stop();
+	LegoWorld::VTable0x50();
 
 	MxDSAction action;
 	action.SetObjectId(0x1f4);
diff --git a/LEGO1/lego/legoomni/src/isle/isle.cpp b/LEGO1/lego/legoomni/src/isle/isle.cpp
index 2d1d856a..f11497e6 100644
--- a/LEGO1/lego/legoomni/src/isle/isle.cpp
+++ b/LEGO1/lego/legoomni/src/isle/isle.cpp
@@ -99,7 +99,7 @@ MxLong Isle::Notify(MxParam& p_param)
 	MxLong result = 0;
 	LegoWorld::Notify(p_param);
 
-	if (m_unk0xf6) {
+	if (m_worldStarted) {
 		switch (((MxNotificationParam&) p_param).GetNotification()) {
 		case c_notificationEndAction:
 			result = StopAction(p_param);
@@ -153,7 +153,7 @@ MxLong Isle::StopAction(MxParam& p_param)
 }
 
 // STUB: LEGO1 0x10030fc0
-void Isle::Stop()
+void Isle::VTable0x50()
 {
 	// TODO
 }
diff --git a/LEGO1/lego/legoomni/src/video/legoanimationmanager.cpp b/LEGO1/lego/legoomni/src/video/legoanimationmanager.cpp
index 444eeccf..578cf55d 100644
--- a/LEGO1/lego/legoomni/src/video/legoanimationmanager.cpp
+++ b/LEGO1/lego/legoomni/src/video/legoanimationmanager.cpp
@@ -33,6 +33,12 @@ void LegoAnimationManager::FUN_1005f6d0(MxBool)
 	// TODO
 }
 
+// STUB: LEGO1 0x1005f720
+void LegoAnimationManager::FUN_1005f720(undefined4)
+{
+	// TODO
+}
+
 // STUB: LEGO1 0x100619f0
 MxLong LegoAnimationManager::Notify(MxParam& p_param)
 {

From eac096036ab398dbf06d7546521ca1c428059e72 Mon Sep 17 00:00:00 2001
From: Misha <106913236+MishaProductions@users.noreply.github.com>
Date: Fri, 12 Jan 2024 17:30:50 -0500
Subject: [PATCH 101/210] implement LegoModelPresenter::Destroy (#428)

* LegoModelPresenter::Destroy

* remove debug print

* Update legomodelpresenter.cpp
---
 LEGO1/lego/legoomni/include/legomodelpresenter.h     |  4 ++++
 LEGO1/lego/legoomni/src/video/legomodelpresenter.cpp | 11 +++++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/LEGO1/lego/legoomni/include/legomodelpresenter.h b/LEGO1/lego/legoomni/include/legomodelpresenter.h
index ca3e216f..fe2216d5 100644
--- a/LEGO1/lego/legoomni/include/legomodelpresenter.h
+++ b/LEGO1/lego/legoomni/include/legomodelpresenter.h
@@ -28,6 +28,10 @@ class LegoModelPresenter : public MxVideoPresenter {
 
 protected:
 	void Destroy(MxBool p_fromDestructor);
+
+private:
+	undefined4 m_unk0x64; // 0x64
+	MxBool m_addedToView; // 0x68
 };
 
 #endif // LEGOMODELPRESENTER_H
diff --git a/LEGO1/lego/legoomni/src/video/legomodelpresenter.cpp b/LEGO1/lego/legoomni/src/video/legomodelpresenter.cpp
index d9608461..c30ae848 100644
--- a/LEGO1/lego/legoomni/src/video/legomodelpresenter.cpp
+++ b/LEGO1/lego/legoomni/src/video/legomodelpresenter.cpp
@@ -15,16 +15,23 @@ void LegoModelPresenter::configureLegoModelPresenter(MxS32 p_modelPresenterConfi
 	g_modelPresenterConfig = p_modelPresenterConfig;
 }
 
-// STUB: LEGO1 0x1007f670
+// FUNCTION: LEGO1 0x1007f670
 void LegoModelPresenter::Destroy(MxBool p_fromDestructor)
 {
-	// TODO
+	m_criticalSection.Enter();
+	m_unk0x64 = 0;
+	m_addedToView = FALSE;
+	m_criticalSection.Leave();
+	if (!p_fromDestructor) {
+		MxVideoPresenter::Destroy(FALSE);
+	}
 }
 
 // STUB: LEGO1 0x10080050
 void LegoModelPresenter::ReadyTickle()
 {
 	// TODO
+	SetTickleState(TickleState_Starting);
 }
 
 // STUB: LEGO1 0x100801b0

From d24f5db42f161b4b4cff251ce85db8e628d7e02f Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Fri, 12 Jan 2024 19:34:38 -0500
Subject: [PATCH 102/210] Matrix/vector refactor (#426)

---
 CMakeLists.txt                                |   2 +
 LEGO1/lego/legoomni/include/helicopter.h      |  14 +-
 .../legoomni/include/legocameracontroller.h   |  18 +-
 LEGO1/lego/legoomni/include/legoentity.h      |  21 +-
 .../legoomni/include/legoentitypresenter.h    |   2 +-
 LEGO1/lego/legoomni/include/legopathactor.h   |   8 +-
 LEGO1/lego/legoomni/include/legoworld.h       |   4 +-
 LEGO1/lego/legoomni/src/build/helicopter.cpp  |  65 ++-
 .../src/entity/legocameracontroller.cpp       |  48 +-
 LEGO1/lego/legoomni/src/entity/legoentity.cpp |   4 +-
 .../src/entity/legoentitypresenter.cpp        |   6 +-
 .../legoomni/src/entity/legopathactor.cpp     |   2 +-
 LEGO1/lego/legoomni/src/entity/legoworld.cpp  |   4 +-
 .../legoomni/src/video/legovideomanager.cpp   |   8 +-
 LEGO1/lego/sources/3dmanager/legoview1.cpp    |  65 ++-
 LEGO1/lego/sources/roi/legoroi.cpp            |   6 +-
 LEGO1/lego/sources/roi/legoroi.h              |   6 +-
 LEGO1/mxgeometry/mxgeometry3d.cpp             |   6 +
 LEGO1/mxgeometry/mxgeometry3d.h               |  48 ++
 LEGO1/mxgeometry/mxmatrix.cpp                 |   5 +
 LEGO1/mxgeometry/mxmatrix.h                   |  22 +
 LEGO1/omni/include/mxdsaction.h               |  36 +-
 LEGO1/omni/include/mxvideopresenter.h         |   3 +-
 LEGO1/omni/src/common/mxpresenter.cpp         |   2 +-
 LEGO1/realtime/matrix.cpp                     | 177 +-----
 LEGO1/realtime/matrix.h                       | 208 ++++---
 LEGO1/realtime/orientableroi.cpp              |  36 +-
 LEGO1/realtime/orientableroi.h                |  58 +-
 LEGO1/realtime/realtime.cpp                   |  45 +-
 LEGO1/realtime/realtime.h                     |   7 +-
 LEGO1/realtime/roi.h                          |  30 +-
 LEGO1/realtime/vector.cpp                     | 456 +--------------
 LEGO1/realtime/vector.h                       | 523 ++++++++++++------
 LEGO1/tgl/d3drm/camera.cpp                    |   2 +-
 LEGO1/tgl/d3drm/group.cpp                     |   2 +-
 LEGO1/tgl/d3drm/impl.h                        |   8 +-
 LEGO1/tgl/d3drm/light.cpp                     |   2 +-
 LEGO1/tgl/tgl.h                               |   6 +-
 LEGO1/tgl/tglvector.h                         | 251 +--------
 LEGO1/viewmanager/viewroi.cpp                 |  12 +-
 LEGO1/viewmanager/viewroi.h                   |   2 +-
 41 files changed, 865 insertions(+), 1365 deletions(-)
 create mode 100644 LEGO1/mxgeometry/mxgeometry3d.cpp
 create mode 100644 LEGO1/mxgeometry/mxgeometry3d.h
 create mode 100644 LEGO1/mxgeometry/mxmatrix.cpp
 create mode 100644 LEGO1/mxgeometry/mxmatrix.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7efecd09..25422132 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -143,6 +143,8 @@ add_library(lego1 SHARED
   LEGO1/main.cpp
   LEGO1/mxdirectx/mxdirect3d.cpp
   LEGO1/mxdirectx/mxdirectdraw.cpp
+  LEGO1/mxgeometry/mxgeometry3d.cpp
+  LEGO1/mxgeometry/mxmatrix.cpp
   LEGO1/omni/src/action/mxdsaction.cpp
   LEGO1/omni/src/action/mxdsanim.cpp
   LEGO1/omni/src/action/mxdsevent.cpp
diff --git a/LEGO1/lego/legoomni/include/helicopter.h b/LEGO1/lego/legoomni/include/helicopter.h
index 7c5be4ea..ef932f30 100644
--- a/LEGO1/lego/legoomni/include/helicopter.h
+++ b/LEGO1/lego/legoomni/include/helicopter.h
@@ -9,12 +9,12 @@
 class HelicopterSubclass {
 public:
 	inline HelicopterSubclass() : m_unk0x30(0) {}
-	MxResult FUN_100040a0(Vector4Impl& p_v, float p_f);
+	MxResult FUN_100040a0(Vector4& p_v, float p_f);
 
 private:
-	Vector4Data m_unk0x0;  // 0x0
-	Vector4Data m_unk0x18; // 0x18
-	undefined4 m_unk0x30;  // 0x30
+	Mx4DPointFloat m_unk0x0;  // 0x0
+	Mx4DPointFloat m_unk0x18; // 0x18
+	undefined4 m_unk0x30;     // 0x30
 };
 
 // VTABLE: LEGO1 0x100d40f8
@@ -39,7 +39,7 @@ class Helicopter : public IslePathActor {
 
 	virtual MxResult Create(MxDSObject& p_dsObject) override;              // vtable+0x18
 	void VTable0x70(float p_float) override;                               // vtable+0x70
-	void VTable0x74(Matrix4Impl& p_transform) override;                    // vtable+0x74
+	void VTable0x74(Matrix4& p_transform) override;                        // vtable+0x74
 	virtual MxU32 VTable0xcc() override;                                   // vtable+0xcc
 	virtual MxU32 VTable0xd4(MxType17NotificationParam& p_param) override; // vtable+0xd4
 	virtual MxU32 VTable0xd8(MxType18NotificationParam& p_param) override; // vtable+0xd8
@@ -49,8 +49,8 @@ class Helicopter : public IslePathActor {
 	// Helicopter::`scalar deleting destructor'
 
 protected:
-	Matrix4Data m_unk0x160;        // 0x160
-	Matrix4Data m_unk0x1a8;        // 0x1a8
+	MxMatrix m_unk0x160;           // 0x160
+	MxMatrix m_unk0x1a8;           // 0x1a8
 	float m_unk0x1f0;              // 0x1f0
 	HelicopterSubclass m_unk0x1f4; // 0x1f4
 	HelicopterState* m_state;      // 0x228
diff --git a/LEGO1/lego/legoomni/include/legocameracontroller.h b/LEGO1/lego/legoomni/include/legocameracontroller.h
index ba66461a..48256789 100644
--- a/LEGO1/lego/legoomni/include/legocameracontroller.h
+++ b/LEGO1/lego/legoomni/include/legocameracontroller.h
@@ -3,9 +3,9 @@
 
 #include "legopointofviewcontroller.h"
 #include "mxcore.h"
+#include "mxgeometry/mxgeometry3d.h"
+#include "mxgeometry/mxmatrix.h"
 #include "mxpoint32.h"
-#include "realtime/matrix.h"
-#include "realtime/vector.h"
 
 // VTABLE: LEGO1 0x100d57b0
 // SIZE 0xc8
@@ -36,15 +36,15 @@ class LegoCameraController : public LegoPointOfViewController {
 	virtual void OnMouseMove(MxU8 p_modifier, MxPoint32 p_point); // vtable+0x40
 	virtual MxResult Create();                                    // vtable+0x44
 
-	void SetWorldTransform(const Vector3Impl& p_at, const Vector3Impl& p_dir, const Vector3Impl& p_up);
-	void FUN_100123e0(Matrix4Data& p_transform, MxU32);
-	Vector3Data& FUN_10012740();
-	Vector3Data& FUN_100127f0();
-	Vector3Data& FUN_100128a0();
+	void SetWorldTransform(const Vector3& p_at, const Vector3& p_dir, const Vector3& p_up);
+	void FUN_100123e0(MxMatrix& p_transform, MxU32);
+	Mx3DPointFloat GetWorldUp();
+	Mx3DPointFloat GetWorldLocation();
+	Mx3DPointFloat GetWorldDirection();
 
 private:
-	Matrix4Data m_matrix1; // 0x38
-	Matrix4Data m_matrix2; // 0x80
+	MxMatrix m_matrix1; // 0x38
+	MxMatrix m_matrix2; // 0x80
 };
 
 // SYNTHETIC: LEGO1 0x10011f50
diff --git a/LEGO1/lego/legoomni/include/legoentity.h b/LEGO1/lego/legoomni/include/legoentity.h
index d911457c..8ca966b1 100644
--- a/LEGO1/lego/legoomni/include/legoentity.h
+++ b/LEGO1/lego/legoomni/include/legoentity.h
@@ -36,11 +36,8 @@ class LegoEntity : public MxEntity {
 	virtual void Destroy(MxBool p_fromDestructor);                       // vtable+0x1c
 	virtual void ParseAction(char*);                                     // vtable+0x20
 	virtual void SetROI(LegoROI* p_roi, MxBool p_bool1, MxBool p_bool2); // vtable+0x24
-	virtual void SetWorldTransform(
-		const Vector3Impl& p_loc,
-		const Vector3Impl& p_dir,
-		const Vector3Impl& p_up
-	);                                                    // vtable+0x28
+	virtual void SetWorldTransform(const Vector3& p_loc, const Vector3& p_dir,
+								   const Vector3& p_up);  // vtable+0x28
 	virtual void ResetWorldTransform(MxBool p_inVehicle); // vtable+0x2c
 	// FUNCTION: LEGO1 0x10001090
 	virtual void SetWorldSpeed(MxFloat p_worldSpeed) { m_worldSpeed = p_worldSpeed; } // vtable+0x30
@@ -53,7 +50,7 @@ class LegoEntity : public MxEntity {
 	virtual void VTable0x4c();                                                        // vtable+0x4c
 
 	void FUN_10010c30();
-	void SetLocation(Vector3Data& p_location, Vector3Data& p_direction, Vector3Data& p_up, MxBool);
+	void SetLocation(Mx3DPointFloat& p_location, Mx3DPointFloat& p_direction, Mx3DPointFloat& p_up, MxBool);
 
 protected:
 	void Init();
@@ -61,12 +58,12 @@ class LegoEntity : public MxEntity {
 
 	undefined m_unk0x10;
 	undefined m_unk0x11;
-	Vector3Data m_worldLocation;  // 0x14
-	Vector3Data m_worldDirection; // 0x28
-	Vector3Data m_worldUp;        // 0x3c
-	MxFloat m_worldSpeed;         // 0x50
-	LegoROI* m_roi;               // 0x54
-	MxBool m_cameraFlag;          // 0x58
+	Mx3DPointFloat m_worldLocation;  // 0x14
+	Mx3DPointFloat m_worldDirection; // 0x28
+	Mx3DPointFloat m_worldUp;        // 0x3c
+	MxFloat m_worldSpeed;            // 0x50
+	LegoROI* m_roi;                  // 0x54
+	MxBool m_cameraFlag;             // 0x58
 	undefined m_unk0x59;
 	// For tokens from the extra string that look like this:
 	// "Action:openram;\lego\scripts\Race\CarRaceR;0"
diff --git a/LEGO1/lego/legoomni/include/legoentitypresenter.h b/LEGO1/lego/legoomni/include/legoentitypresenter.h
index 72af0498..de6690ec 100644
--- a/LEGO1/lego/legoomni/include/legoentitypresenter.h
+++ b/LEGO1/lego/legoomni/include/legoentitypresenter.h
@@ -33,7 +33,7 @@ class LegoEntityPresenter : public MxCompositePresenter {
 	virtual void Init();                                                                           // vtable+0x68
 	virtual undefined4 SetBackend(LegoEntity* p_unk0x4c);                                          // vtable+0x6c
 
-	void SetBackendLocation(Vector3Data& p_location, Vector3Data& p_direction, Vector3Data& p_up);
+	void SetBackendLocation(Mx3DPointFloat& p_location, Mx3DPointFloat& p_direction, Mx3DPointFloat& p_up);
 
 private:
 	void Destroy(MxBool p_fromDestructor);
diff --git a/LEGO1/lego/legoomni/include/legopathactor.h b/LEGO1/lego/legoomni/include/legopathactor.h
index a3f5756c..5f67af4f 100644
--- a/LEGO1/lego/legoomni/include/legopathactor.h
+++ b/LEGO1/lego/legoomni/include/legopathactor.h
@@ -25,10 +25,10 @@ class LegoPathActor : public LegoActor {
 		return !strcmp(p_name, LegoPathActor::ClassName()) || LegoActor::IsA(p_name);
 	}
 
-	virtual void VTable0x68();                         // vtable+0x68
-	virtual void VTable0x6c();                         // vtable+0x6c
-	virtual void VTable0x70(float p_float);            // vtable+0x70
-	virtual void VTable0x74(Matrix4Impl& p_transform); // vtable+0x74
+	virtual void VTable0x68();                     // vtable+0x68
+	virtual void VTable0x6c();                     // vtable+0x6c
+	virtual void VTable0x70(float p_float);        // vtable+0x70
+	virtual void VTable0x74(Matrix4& p_transform); // vtable+0x74
 	// FUNCTION: LEGO1 0x10002d20
 	virtual void VTable0x78(MxU8 p_unk0xea) { m_unk0xea = p_unk0xea; } // vtable+0x78
 	// FUNCTION: LEGO1 0x10002d30
diff --git a/LEGO1/lego/legoomni/include/legoworld.h b/LEGO1/lego/legoomni/include/legoworld.h
index f55043c3..385e0b07 100644
--- a/LEGO1/lego/legoomni/include/legoworld.h
+++ b/LEGO1/lego/legoomni/include/legoworld.h
@@ -49,8 +49,8 @@ class LegoWorld : public LegoEntity {
 	MxResult SetAsCurrentWorld(MxDSObject& p_dsObject);
 	void EndAction(MxCore* p_object);
 	void FUN_1001fc80(IslePathActor* p_actor);
-	MxBool FUN_100727e0(MxU32, Vector3Data& p_loc, Vector3Data& p_dir, Vector3Data& p_up);
-	MxBool FUN_10072980(MxU32, Vector3Data& p_loc, Vector3Data& p_dir, Vector3Data& p_up);
+	MxBool FUN_100727e0(MxU32, Mx3DPointFloat& p_loc, Mx3DPointFloat& p_dir, Mx3DPointFloat& p_up);
+	MxBool FUN_10072980(MxU32, Mx3DPointFloat& p_loc, Mx3DPointFloat& p_dir, Mx3DPointFloat& p_up);
 	void FUN_10073400();
 	void FUN_10073430();
 	MxS32 GetCurrPathInfo(LegoPathBoundary** p_path, MxS32& p_value);
diff --git a/LEGO1/lego/legoomni/src/build/helicopter.cpp b/LEGO1/lego/legoomni/src/build/helicopter.cpp
index f4220183..d661b4d7 100644
--- a/LEGO1/lego/legoomni/src/build/helicopter.cpp
+++ b/LEGO1/lego/legoomni/src/build/helicopter.cpp
@@ -181,15 +181,15 @@ MxU32 Helicopter::VTable0xd4(MxType17NotificationParam& p_param)
 			if (*g_act3Script != script)
 				break;
 			if (m_world && m_world->GetCamera()) {
-				Vector3Data loc, dir, lookat;
-				loc.CopyFrom(m_world->GetCamera()->FUN_100127f0());
-				dir.CopyFrom(m_world->GetCamera()->FUN_100128a0());
+				Mx3DPointFloat loc, dir, lookat;
+				loc.CopyFrom(m_world->GetCamera()->GetWorldLocation());
+				dir.CopyFrom(m_world->GetCamera()->GetWorldDirection());
 				lookat = dir;
 				float scale = 3;
 				lookat.Mul(scale);
 				lookat.Add(&loc);
-				Vector3Data v68, v7c, v90(0, 1, 0), va4;
-				v68.CopyFrom(m_world->GetCamera()->FUN_10012740());
+				Mx3DPointFloat v68, v7c, v90(0, 1, 0), va4;
+				v68.CopyFrom(m_world->GetCamera()->GetWorldUp());
 				va4.EqualsCross(v68, dir);
 				v7c.EqualsCross(va4, v90);
 				if (ret)
@@ -219,6 +219,8 @@ MxU32 Helicopter::VTable0xd4(MxType17NotificationParam& p_param)
 // FUNCTION: LEGO1 0x10003c20
 MxU32 Helicopter::VTable0xd8(MxType18NotificationParam& p_param)
 {
+	MxU32 ret = 0;
+
 	switch (m_state->GetUnkown8()) {
 	case 1: {
 		if (GameState()->GetUnknown10() == 0) {
@@ -227,44 +229,54 @@ MxU32 Helicopter::VTable0xd8(MxType18NotificationParam& p_param)
 		}
 		else
 			VTable0xe8(0x31, TRUE, 7);
+
 		m_state->SetUnknown8(2);
-		Matrix4Data mat;
-		mat.SetIdentity();
-		Matrix4 mat2 = mat.GetMatrix();
+
+		MxMatrix matrix;
+		matrix.SetIdentity();
+
 		float s = sin(0.5235987901687622); // PI / 6, 30 deg
 		float c = cos(0.5235987901687622); // PI / 6, 30 deg
+
+		float matrixCopy[4][4];
+		memcpy(matrixCopy, matrix.GetData(), sizeof(matrixCopy));
 		for (MxS32 i = 0; i < 4; i++) {
-			mat.GetMatrix()[i][1] = mat2[i][1] * c - mat2[i][2] * s;
-			mat.GetMatrix()[i][2] = mat2[i][2] * c + mat2[i][1] * s;
+			matrix.GetData()[i][1] = matrixCopy[i][1] * c - matrixCopy[i][2] * s;
+			matrix.GetData()[i][2] = matrixCopy[i][2] * c + matrixCopy[i][1] * s;
 		}
-		Vector3Impl at(mat.GetMatrix()[3]), dir(mat.GetMatrix()[2]), up(mat.GetMatrix()[1]);
+
+		Vector3 at(matrix[3]), dir(matrix[2]), up(matrix[1]);
 		m_world->GetCamera()->SetWorldTransform(at, dir, up);
 		FUN_10010c30();
+		ret = 1;
 		break;
 	}
 	case 3: {
-		Matrix4Data mat;
-		mat.SetIdentity();
-		Vector3Impl at(mat.GetMatrix()[3]), dir(mat.GetMatrix()[2]), up(mat.GetMatrix()[1]);
+		MxMatrix matrix;
+		matrix.SetIdentity();
+
+		Vector3 at(matrix[3]), dir(matrix[2]), up(matrix[1]);
 		at[1] = 1.25;
 		m_world->GetCamera()->SetWorldTransform(at, dir, up);
+
 		if (GameState()->GetUnknown10() == 0) {
 			((Act1State*) GameState()->GetState("Act1State"))->SetUnknown18(0);
 			VTable0xe8(0x29, TRUE, 7);
 		}
 		else
 			VTable0xe8(0x30, TRUE, 7);
+
 		m_state->SetUnknown8(0);
+		ret = 1;
 		break;
 	}
-	default:
-		return 0;
 	}
-	return 1;
+
+	return ret;
 }
 
 // FUNCTION: LEGO1 0x10003e90
-void Helicopter::VTable0x74(Matrix4Impl& p_transform)
+void Helicopter::VTable0x74(Matrix4& p_transform)
 {
 	if (m_unk0xea != 0) {
 		m_roi->FUN_100a46b0(p_transform);
@@ -295,13 +307,13 @@ void Helicopter::VTable0x70(float p_float)
 				f2 = 0;
 			if (1.0f < f2)
 				f2 = 1.0f;
-			Vector3Impl v(m_unk0x160.GetMatrix()[3]);
-			Matrix4Data mat;
-			Vector3Impl v2(m_unk0x1a8.GetMatrix()[3]);
-			float* loc = m_unk0x1a8.GetMatrix()[3];
+			Vector3 v(m_unk0x160[3]);
+			MxMatrix mat;
+			Vector3 v2(m_unk0x1a8[3]);
+			float* loc = m_unk0x1a8[3];
 			mat.SetIdentity();
 			float fa[4];
-			Vector4Impl v3(fa);
+			Vector4 v3(fa);
 			if (m_unk0x1f4.FUN_100040a0(v3, f2) == SUCCESS) {
 				mat.FromQuaternion(v3);
 			}
@@ -322,18 +334,17 @@ void Helicopter::VTable0x70(float p_float)
 }
 
 // FUNCTION: LEGO1 0x100040a0
-MxResult HelicopterSubclass::FUN_100040a0(Vector4Impl& p_v, float p_f)
+MxResult HelicopterSubclass::FUN_100040a0(Vector4& p_v, float p_f)
 {
 	MxU32 state = m_unk0x30;
 	if (state == 1) {
-		p_v.EqualsImpl(m_unk0x0.GetVector().elements);
+		p_v.EqualsImpl(m_unk0x0.GetData());
 		p_v[3] = acos(p_v[3]) * (1 - p_f) * 2.0;
 		return p_v.NormalizeQuaternion();
 	}
 	else if (state == 2) {
-		p_v.EqualsImpl(m_unk0x18.GetVector().elements);
+		p_v.EqualsImpl(m_unk0x18.GetData());
 		p_v[3] = acos(p_v[3]) * p_f * 2.0;
-		p_v.NormalizeQuaternion();
 		return p_v.NormalizeQuaternion();
 	}
 	else if (state == 3) {
diff --git a/LEGO1/lego/legoomni/src/entity/legocameracontroller.cpp b/LEGO1/lego/legoomni/src/entity/legocameracontroller.cpp
index d339b104..b30a78b8 100644
--- a/LEGO1/lego/legoomni/src/entity/legocameracontroller.cpp
+++ b/LEGO1/lego/legoomni/src/entity/legocameracontroller.cpp
@@ -10,7 +10,7 @@ DECOMP_SIZE_ASSERT(LegoCameraController, 0xc8);
 // FUNCTION: LEGO1 0x10011d50
 LegoCameraController::LegoCameraController()
 {
-	SetWorldTransform(Vector3Data(0, 0, 0), Vector3Data(0, 0, 1), Vector3Data(0, 1, 0));
+	SetWorldTransform(Mx3DPointFloat(0, 0, 0), Mx3DPointFloat(0, 0, 1), Mx3DPointFloat(0, 1, 0));
 }
 
 // FUNCTION: LEGO1 0x10011f70
@@ -71,37 +71,49 @@ void LegoCameraController::OnMouseMove(MxU8 p_modifier, MxPoint32 p_point)
 }
 
 // FUNCTION: LEGO1 0x10012260
-void LegoCameraController::SetWorldTransform(const Vector3Impl& p_at, const Vector3Impl& p_dir, const Vector3Impl& p_up)
+void LegoCameraController::SetWorldTransform(const Vector3& p_at, const Vector3& p_dir, const Vector3& p_up)
 {
 	CalcLocalTransform(p_at, p_dir, p_up, m_matrix1);
 	m_matrix2 = m_matrix1;
 }
 
 // STUB: LEGO1 0x100123e0
-void LegoCameraController::FUN_100123e0(Matrix4Data& p_transform, MxU32)
+void LegoCameraController::FUN_100123e0(MxMatrix& p_transform, MxU32)
 {
 }
 
-// STUB: LEGO1 0x10012740
-Vector3Data& LegoCameraController::FUN_10012740()
+// FUNCTION: LEGO1 0x10012740
+Mx3DPointFloat LegoCameraController::GetWorldUp()
 {
-	// Actually returns reference to a member
-	static Vector3Data g_v;
-	return g_v;
+	if (m_lego3DView && m_lego3DView->GetPointOfView()) {
+		Mx3DPointFloat vec;
+		vec = m_lego3DView->GetPointOfView()->GetWorldUp();
+		return Mx3DPointFloat(vec[0], vec[1], vec[2]);
+	}
+	else
+		return Mx3DPointFloat(0, 0, 0);
 }
 
-// STUB: LEGO1 0x100127f0
-Vector3Data& LegoCameraController::FUN_100127f0()
+// FUNCTION: LEGO1 0x100127f0
+Mx3DPointFloat LegoCameraController::GetWorldLocation()
 {
-	// Actually returns reference to a member
-	static Vector3Data g_v;
-	return g_v;
+	if (m_lego3DView && m_lego3DView->GetPointOfView()) {
+		Mx3DPointFloat vec;
+		vec = m_lego3DView->GetPointOfView()->GetWorldPosition();
+		return Mx3DPointFloat(vec[0], vec[1] - m_entityOffsetUp, vec[2]);
+	}
+	else
+		return Mx3DPointFloat(0, 0, 0);
 }
 
-// STUB: LEGO1 0x100128a0
-Vector3Data& LegoCameraController::FUN_100128a0()
+// FUNCTION: LEGO1 0x100128a0
+Mx3DPointFloat LegoCameraController::GetWorldDirection()
 {
-	// Actually returns reference to a member
-	static Vector3Data g_v;
-	return g_v;
+	if (m_lego3DView && m_lego3DView->GetPointOfView()) {
+		Mx3DPointFloat vec;
+		vec = m_lego3DView->GetPointOfView()->GetWorldDirection();
+		return Mx3DPointFloat(vec[0], vec[1], vec[2]);
+	}
+	else
+		return Mx3DPointFloat(0, 0, 0);
 }
diff --git a/LEGO1/lego/legoomni/src/entity/legoentity.cpp b/LEGO1/lego/legoomni/src/entity/legoentity.cpp
index b000da96..62058e50 100644
--- a/LEGO1/lego/legoomni/src/entity/legoentity.cpp
+++ b/LEGO1/lego/legoomni/src/entity/legoentity.cpp
@@ -36,7 +36,7 @@ void LegoEntity::ResetWorldTransform(MxBool p_inVehicle)
 }
 
 // STUB: LEGO1 0x10010790
-void LegoEntity::SetWorldTransform(const Vector3Impl& p_loc, const Vector3Impl& p_dir, const Vector3Impl& p_up)
+void LegoEntity::SetWorldTransform(const Vector3& p_loc, const Vector3& p_dir, const Vector3& p_up)
 {
 	// TODO
 }
@@ -77,7 +77,7 @@ void LegoEntity::SetROI(LegoROI* p_roi, MxBool p_bool1, MxBool p_bool2)
 }
 
 // STUB: LEGO1 0x100109b0
-void LegoEntity::SetLocation(Vector3Data& p_location, Vector3Data& p_direction, Vector3Data& p_up, MxBool)
+void LegoEntity::SetLocation(Mx3DPointFloat& p_location, Mx3DPointFloat& p_direction, Mx3DPointFloat& p_up, MxBool)
 {
 	// TODO
 }
diff --git a/LEGO1/lego/legoomni/src/entity/legoentitypresenter.cpp b/LEGO1/lego/legoomni/src/entity/legoentitypresenter.cpp
index 995705bd..b7638b75 100644
--- a/LEGO1/lego/legoomni/src/entity/legoentitypresenter.cpp
+++ b/LEGO1/lego/legoomni/src/entity/legoentitypresenter.cpp
@@ -82,7 +82,11 @@ void LegoEntityPresenter::RepeatingTickle()
 }
 
 // FUNCTION: LEGO1 0x10053730
-void LegoEntityPresenter::SetBackendLocation(Vector3Data& p_location, Vector3Data& p_direction, Vector3Data& p_up)
+void LegoEntityPresenter::SetBackendLocation(
+	Mx3DPointFloat& p_location,
+	Mx3DPointFloat& p_direction,
+	Mx3DPointFloat& p_up
+)
 {
 	if (m_objectBackend) {
 		m_objectBackend->SetLocation(p_location, p_direction, p_up, TRUE);
diff --git a/LEGO1/lego/legoomni/src/entity/legopathactor.cpp b/LEGO1/lego/legoomni/src/entity/legopathactor.cpp
index f6d0a10d..472f2e4b 100644
--- a/LEGO1/lego/legoomni/src/entity/legopathactor.cpp
+++ b/LEGO1/lego/legoomni/src/entity/legopathactor.cpp
@@ -39,7 +39,7 @@ void LegoPathActor::VTable0x8c()
 }
 
 // STUB: LEGO1 0x1002e740
-void LegoPathActor::VTable0x74(Matrix4Impl& p_transform)
+void LegoPathActor::VTable0x74(Matrix4& p_transform)
 {
 	// TODO
 }
diff --git a/LEGO1/lego/legoomni/src/entity/legoworld.cpp b/LEGO1/lego/legoomni/src/entity/legoworld.cpp
index b04543df..339360e7 100644
--- a/LEGO1/lego/legoomni/src/entity/legoworld.cpp
+++ b/LEGO1/lego/legoomni/src/entity/legoworld.cpp
@@ -131,13 +131,13 @@ void LegoWorld::VTable0x50()
 }
 
 // STUB: LEGO1 0x100727e0
-MxBool LegoWorld::FUN_100727e0(MxU32, Vector3Data& p_loc, Vector3Data& p_dir, Vector3Data& p_up)
+MxBool LegoWorld::FUN_100727e0(MxU32, Mx3DPointFloat& p_loc, Mx3DPointFloat& p_dir, Mx3DPointFloat& p_up)
 {
 	return FALSE;
 }
 
 // STUB: LEGO1 0x10072980
-MxBool LegoWorld::FUN_10072980(MxU32, Vector3Data& p_loc, Vector3Data& p_dir, Vector3Data& p_up)
+MxBool LegoWorld::FUN_10072980(MxU32, Mx3DPointFloat& p_loc, Mx3DPointFloat& p_dir, Mx3DPointFloat& p_up)
 {
 	return FALSE;
 }
diff --git a/LEGO1/lego/legoomni/src/video/legovideomanager.cpp b/LEGO1/lego/legoomni/src/video/legovideomanager.cpp
index 4d3dd304..33ebb53a 100644
--- a/LEGO1/lego/legoomni/src/video/legovideomanager.cpp
+++ b/LEGO1/lego/legoomni/src/video/legovideomanager.cpp
@@ -65,10 +65,10 @@ MxResult LegoVideoManager::Create(MxVideoParam& p_videoParam, MxU32 p_frequencyM
 	MxResult result = FAILURE;
 
 	MxDeviceEnumerate100d9cc8 deviceEnumerate;
-	Vector3Data posVec(0.0, 1.25, -50.0);
-	Vector3Data dirVec(0.0, 0.0, 1.0);
-	Vector3Data upVec(0.0, 1.0, 0.0);
-	Matrix4Data outMatrix;
+	Mx3DPointFloat posVec(0.0, 1.25, -50.0);
+	Mx3DPointFloat dirVec(0.0, 0.0, 1.0);
+	Mx3DPointFloat upVec(0.0, 1.0, 0.0);
+	MxMatrix outMatrix;
 	HWND hwnd = MxOmni::GetInstance()->GetWindowHandle();
 	MxS32 bits = p_videoParam.Flags().Get16Bit() ? 16 : 8;
 	MxS32 deviceNum = -1;
diff --git a/LEGO1/lego/sources/3dmanager/legoview1.cpp b/LEGO1/lego/sources/3dmanager/legoview1.cpp
index 3705eb33..97114469 100644
--- a/LEGO1/lego/sources/3dmanager/legoview1.cpp
+++ b/LEGO1/lego/sources/3dmanager/legoview1.cpp
@@ -4,13 +4,24 @@
 #include "legoview1.h"
 
 #include "decomp.h"
+#include "mxgeometry/mxgeometry3d.h"
+#include "mxgeometry/mxmatrix.h"
 #include "realtime/realtime.h"
 
-#include <vec.h> // SETMAT4
+#include <vec.h>
 
 DECOMP_SIZE_ASSERT(LegoView, 0x78);
 DECOMP_SIZE_ASSERT(LegoView1, 0x88);
 
+// GLOBAL: LEGO1 0x101013e4
+float g_sunLightRGB = 1.0;
+
+// GLOBAL: LEGO1 0x101013e8
+float g_directionalLightRGB = 1.0;
+
+// GLOBAL: LEGO1 0x101013ec
+float g_ambientLightRGB = 0.3;
+
 /////////////////////////////////////////////////////////////////////////////
 // LegoView
 
@@ -112,51 +123,39 @@ BOOL LegoView1::AddLightsToViewport()
 	return TRUE;
 }
 
-// STUB: LEGO1 0x100ab860
+// FUNCTION: LEGO1 0x100ab860
 BOOL LegoView1::Create(const TglSurface::CreateStruct& rCreateStruct, Tgl::Renderer* pRenderer)
 {
-	double position[3] = {0, 0, 0};
-	double direction[3];
-	double up[3] = {0, 1, 0};
-
 	if (!LegoView::Create(rCreateStruct, pRenderer)) {
 		return FALSE;
 	}
 
 	// lights
-	m_pSunLight = pRenderer->CreateLight(Tgl::Directional, .9, .9, .9);
-	m_pDirectionalLight = pRenderer->CreateLight(Tgl::Directional, .4, .4, .4);
-	m_pAmbientLight = pRenderer->CreateLight(Tgl::Ambient, .3, .3, .3);
+	m_pSunLight = pRenderer->CreateLight(Tgl::Point, g_sunLightRGB, g_sunLightRGB, g_sunLightRGB);
+	m_pDirectionalLight =
+		pRenderer->CreateLight(Tgl::Directional, g_directionalLightRGB, g_directionalLightRGB, g_directionalLightRGB);
+	m_pAmbientLight = pRenderer->CreateLight(Tgl::Ambient, g_ambientLightRGB, g_ambientLightRGB, g_ambientLightRGB);
 
-#if 0
-    direction[0] = 1, direction[1] = -1, direction[2] = 2;
-    m_pSunLight->SetOrientation(direction, up);
-    direction[0] = -1, direction[1] = -2, direction[2] = -1;
-    m_pDirectionalLight->SetOrientation(direction, up);
-#else
-	{
-		// Change everything to float and proper Matrix types
-		/*
-		Tgl::FloatMatrix4 transformation;
-		Matrix4Data transform;
+	Mx3DPointFloat direction(0.0, -1.0, 0.0);
+	Mx3DPointFloat position(0.0, 0.0, 0.0);
+	Mx3DPointFloat up(1.0, 0.0, 0.0);
 
-		direction[0] = 1, direction[1] = -1, direction[2] = 2;
-		CalcLocalTransform(position, direction, up, transform);
-		SETMAT4(transformation, transform);
-		m_pSunLight->SetTransformation(transformation);
+	Tgl::FloatMatrix4 matrix;
+	Matrix4 in(matrix);
+	MxMatrix transform;
 
-		direction[0] = -1, direction[1] = -2, direction[2] = -1;
-		CalcLocalTransform(position, direction, up, transform);
-		SETMAT4(transformation, transform);
-		m_pDirectionalLight->SetTransformation(transformation);
-		*/
-	}
-#endif
+	CalcLocalTransform(position, direction, up, transform);
+	SETMAT4(in, transform);
+	m_pDirectionalLight->SetTransformation(matrix);
+
+	direction[0] = 0, direction[1] = 150, direction[2] = -150;
+	CalcLocalTransform(position, direction, up, transform);
+	SETMAT4(in, transform);
+	m_pSunLight->SetTransformation(matrix);
 
 	assert(GetView());
-	AddLightsToViewport();
 
-	return TRUE;
+	return AddLightsToViewport();
 }
 
 // FUNCTION: LEGO1 0x100abad0
diff --git a/LEGO1/lego/sources/roi/legoroi.cpp b/LEGO1/lego/sources/roi/legoroi.cpp
index dab06a1a..9d530b16 100644
--- a/LEGO1/lego/sources/roi/legoroi.cpp
+++ b/LEGO1/lego/sources/roi/legoroi.cpp
@@ -38,18 +38,18 @@ MxS32 g_roiConfig = 100;
 ROIHandler g_someHandlerFunction = NULL;
 
 // FUNCTION: LEGO1 0x100a46a0
-void LegoROI::WrappedSetLocalTransform(Matrix4Impl& p_transform)
+void LegoROI::WrappedSetLocalTransform(Matrix4& p_transform)
 {
 	SetLocalTransform(p_transform);
 }
 
 // STUB: LEGO1 0x100a46b0
-void LegoROI::FUN_100a46b0(Matrix4Impl& p_transform)
+void LegoROI::FUN_100a46b0(Matrix4& p_transform)
 {
 }
 
 // STUB: LEGO1 0x100a58f0
-void LegoROI::FUN_100a58f0(Matrix4Impl& p_transform)
+void LegoROI::FUN_100a58f0(Matrix4& p_transform)
 {
 }
 
diff --git a/LEGO1/lego/sources/roi/legoroi.h b/LEGO1/lego/sources/roi/legoroi.h
index d84e8df4..17d66ef4 100644
--- a/LEGO1/lego/sources/roi/legoroi.h
+++ b/LEGO1/lego/sources/roi/legoroi.h
@@ -28,9 +28,9 @@ class LegoROI : public ViewROI {
 	);
 	static MxBool ColorAliasLookup(char* p_param, MxFloat& p_red, MxFloat& p_green, MxFloat& p_blue, MxFloat& p_other);
 
-	void WrappedSetLocalTransform(Matrix4Impl& p_transform);
-	void FUN_100a46b0(Matrix4Impl& p_transform);
-	void FUN_100a58f0(Matrix4Impl& p_transform);
+	void WrappedSetLocalTransform(Matrix4& p_transform);
+	void FUN_100a46b0(Matrix4& p_transform);
+	void FUN_100a58f0(Matrix4& p_transform);
 
 	// Note: Actually part of parent class (doesn't exist yet)
 	virtual void UpdateWorldBoundingVolumes() override; // vtable+0x18
diff --git a/LEGO1/mxgeometry/mxgeometry3d.cpp b/LEGO1/mxgeometry/mxgeometry3d.cpp
new file mode 100644
index 00000000..03ce60eb
--- /dev/null
+++ b/LEGO1/mxgeometry/mxgeometry3d.cpp
@@ -0,0 +1,6 @@
+#include "mxgeometry3d.h"
+
+#include "decomp.h"
+
+DECOMP_SIZE_ASSERT(Mx3DPointFloat, 0x14);
+DECOMP_SIZE_ASSERT(Mx4DPointFloat, 0x18);
diff --git a/LEGO1/mxgeometry/mxgeometry3d.h b/LEGO1/mxgeometry/mxgeometry3d.h
new file mode 100644
index 00000000..13781722
--- /dev/null
+++ b/LEGO1/mxgeometry/mxgeometry3d.h
@@ -0,0 +1,48 @@
+#ifndef MXGEOMETRY3D_H
+#define MXGEOMETRY3D_H
+
+#include "realtime/vector.h"
+
+// VTABLE: LEGO1 0x100d4488
+// SIZE 0x14
+class Mx3DPointFloat : public Vector3 {
+public:
+	inline Mx3DPointFloat() : Vector3(m_elements) {}
+	inline Mx3DPointFloat(float p_x, float p_y, float p_z) : Vector3(m_elements)
+	{
+		m_elements[0] = p_x;
+		m_elements[1] = p_y;
+		m_elements[2] = p_z;
+	}
+
+	// FUNCTION: LEGO1 0x10003c10
+	virtual void operator=(const Vector3& p_impl) { EqualsImpl(p_impl.m_data); } // vtable+0x88
+
+	inline void CopyFrom(const Mx3DPointFloat& p_other)
+	{
+		// ALPHA: 0x10010860, multiple indirections to this call
+		EqualsImpl(p_other.m_data);
+
+		float* dest = m_elements;
+		const float* src = p_other.m_elements;
+		for (size_t i = sizeof(m_elements) / sizeof(float); i > 0; --i)
+			*dest++ = *src++;
+	}
+
+	inline void EqualsCross(Mx3DPointFloat& p_a, Mx3DPointFloat& p_b) { EqualsCrossImpl(p_a.m_data, p_b.m_data); }
+
+private:
+	float m_elements[3];
+};
+
+// VTABLE: LEGO1 0x100d41e8
+// SIZE 0x18
+class Mx4DPointFloat : public Vector4 {
+public:
+	inline Mx4DPointFloat() : Vector4(m_elements) {}
+
+private:
+	float m_elements[4];
+};
+
+#endif // MXGEOMETRY3D_H
diff --git a/LEGO1/mxgeometry/mxmatrix.cpp b/LEGO1/mxgeometry/mxmatrix.cpp
new file mode 100644
index 00000000..fc768f38
--- /dev/null
+++ b/LEGO1/mxgeometry/mxmatrix.cpp
@@ -0,0 +1,5 @@
+#include "mxmatrix.h"
+
+#include "decomp.h"
+
+DECOMP_SIZE_ASSERT(MxMatrix, 0x48);
diff --git a/LEGO1/mxgeometry/mxmatrix.h b/LEGO1/mxgeometry/mxmatrix.h
new file mode 100644
index 00000000..2db07671
--- /dev/null
+++ b/LEGO1/mxgeometry/mxmatrix.h
@@ -0,0 +1,22 @@
+#ifndef MXMATRIX_H
+#define MXMATRIX_H
+
+#include "realtime/matrix.h"
+
+// VTABLE: LEGO1 0x100d4300
+// SIZE 0x48
+class MxMatrix : public Matrix4 {
+public:
+	inline MxMatrix() : Matrix4(m_elements) {}
+	inline MxMatrix(const MxMatrix& p_matrix) : Matrix4(m_elements) { Equals(p_matrix); }
+
+	// No idea why there's another equals. Maybe to some other type like the
+	// DirectX Retained Mode Matrix type which is also a float* alias?
+	// FUNCTION: LEGO1 0x10002860
+	virtual void operator=(const MxMatrix& p_matrix) { Equals(p_matrix); } // vtable+0x48
+
+private:
+	float m_elements[4][4];
+};
+
+#endif // MXMATRIX_H
diff --git a/LEGO1/omni/include/mxdsaction.h b/LEGO1/omni/include/mxdsaction.h
index c32dd4aa..b4d6192e 100644
--- a/LEGO1/omni/include/mxdsaction.h
+++ b/LEGO1/omni/include/mxdsaction.h
@@ -2,8 +2,8 @@
 #define MXDSACTION_H
 
 #include "mxdsobject.h"
+#include "mxgeometry/mxgeometry3d.h"
 #include "mxtypes.h"
-#include "realtime/vector.h"
 
 class MxOmni;
 
@@ -63,9 +63,9 @@ class MxDSAction : public MxDSObject {
 	inline MxLong GetStartTime() const { return m_startTime; }
 	inline MxS32 GetLoopCount() { return m_loopCount; }
 	inline void SetLoopCount(MxS32 p_loopCount) { m_loopCount = p_loopCount; }
-	inline Vector3Data& GetLocation() { return m_location; }
-	inline Vector3Data& GetDirection() { return m_direction; }
-	inline Vector3Data& GetUp() { return m_up; }
+	inline Mx3DPointFloat& GetLocation() { return m_location; }
+	inline Mx3DPointFloat& GetDirection() { return m_direction; }
+	inline Mx3DPointFloat& GetUp() { return m_up; }
 	inline MxCore* GetUnknown84() { return m_unk0x84; }
 	inline void SetUnknown84(MxCore* p_unk0x84) { m_unk0x84 = p_unk0x84; }
 	inline MxCore* GetOrigin() { return m_origin; }
@@ -83,20 +83,20 @@ class MxDSAction : public MxDSObject {
 	}
 
 protected:
-	MxU32 m_sizeOnDisk;      // 0x2c
-	MxU32 m_flags;           // 0x30
-	MxLong m_startTime;      // 0x34
-	MxLong m_duration;       // 0x38
-	MxS32 m_loopCount;       // 0x3c
-	Vector3Data m_location;  // 0x40
-	Vector3Data m_direction; // 0x54
-	Vector3Data m_up;        // 0x68
-	char* m_extraData;       // 0x7c
-	MxU16 m_extraLength;     // 0x80
-	MxCore* m_unk0x84;       // 0x84
-	undefined4 m_unk0x88;    // 0x88
-	MxCore* m_origin;        // 0x8c
-	MxLong m_unk0x90;        // 0x90
+	MxU32 m_sizeOnDisk;         // 0x2c
+	MxU32 m_flags;              // 0x30
+	MxLong m_startTime;         // 0x34
+	MxLong m_duration;          // 0x38
+	MxS32 m_loopCount;          // 0x3c
+	Mx3DPointFloat m_location;  // 0x40
+	Mx3DPointFloat m_direction; // 0x54
+	Mx3DPointFloat m_up;        // 0x68
+	char* m_extraData;          // 0x7c
+	MxU16 m_extraLength;        // 0x80
+	MxCore* m_unk0x84;          // 0x84
+	undefined4 m_unk0x88;       // 0x88
+	MxCore* m_origin;           // 0x8c
+	MxLong m_unk0x90;           // 0x90
 };
 
 #endif // MXDSACTION_H
diff --git a/LEGO1/omni/include/mxvideopresenter.h b/LEGO1/omni/include/mxvideopresenter.h
index 78c89f14..48389490 100644
--- a/LEGO1/omni/include/mxvideopresenter.h
+++ b/LEGO1/omni/include/mxvideopresenter.h
@@ -65,7 +65,8 @@ class MxVideoPresenter : public MxMediaPresenter {
 
 	// FUNCTION: LEGO1 0x1000c730
 	virtual void RealizePalette(){}; // vtable+0x70
-	virtual undefined VTable0x74();  // vtable+0x74
+
+	virtual undefined VTable0x74(); // vtable+0x74
 
 	// FUNCTION: LEGO1 0x1000c7b0
 	virtual LPDIRECTDRAWSURFACE VTable0x78() { return m_unk0x58; }; // vtable+0x78
diff --git a/LEGO1/omni/src/common/mxpresenter.cpp b/LEGO1/omni/src/common/mxpresenter.cpp
index f08b0f30..6d025394 100644
--- a/LEGO1/omni/src/common/mxpresenter.cpp
+++ b/LEGO1/omni/src/common/mxpresenter.cpp
@@ -36,7 +36,7 @@ MxResult MxPresenter::StartAction(MxStreamController*, MxDSAction* p_action)
 
 	this->m_action = p_action;
 
-	const Vector3Data& location = this->m_action->GetLocation();
+	const Mx3DPointFloat& location = this->m_action->GetLocation();
 	MxS32 previousTickleState = this->m_currentTickleState;
 
 	this->m_location = MxPoint32(this->m_action->GetLocation()[0], this->m_action->GetLocation()[1]);
diff --git a/LEGO1/realtime/matrix.cpp b/LEGO1/realtime/matrix.cpp
index 818650eb..806e6659 100644
--- a/LEGO1/realtime/matrix.cpp
+++ b/LEGO1/realtime/matrix.cpp
@@ -1,180 +1,5 @@
-
 #include "matrix.h"
 
 #include "decomp.h"
-#include "math.h"
 
-#include <memory.h>
-
-DECOMP_SIZE_ASSERT(Matrix4, 0x40);
-DECOMP_SIZE_ASSERT(Matrix4Impl, 0x8);
-DECOMP_SIZE_ASSERT(Matrix4Data, 0x48);
-
-// FUNCTION: LEGO1 0x10002320
-void Matrix4Impl::EqualsMatrixData(const Matrix4& p_matrix)
-{
-	*m_data = p_matrix;
-}
-
-// FUNCTION: LEGO1 0x10002340
-void Matrix4Impl::EqualsMatrixImpl(const Matrix4Impl* p_other)
-{
-	*m_data = *p_other->m_data;
-}
-
-// FUNCTION: LEGO1 0x10002360
-void Matrix4Impl::AnotherSetData(Matrix4& p_data)
-{
-	m_data = &p_data;
-}
-
-// FUNCTION: LEGO1 0x10002380
-const Matrix4* Matrix4Impl::GetData() const
-{
-	return m_data;
-}
-
-// FUNCTION: LEGO1 0x10002390
-Matrix4* Matrix4Impl::GetData()
-{
-	return m_data;
-}
-
-// FUNCTION: LEGO1 0x100023a0
-const float* Matrix4Impl::Element(int p_row, int p_col) const
-{
-	return &(*m_data)[p_row][p_col];
-}
-
-// FUNCTION: LEGO1 0x100023c0
-float* Matrix4Impl::Element(int p_row, int p_col)
-{
-	return &(*m_data)[p_row][p_col];
-}
-
-// FUNCTION: LEGO1 0x100023e0
-void Matrix4Impl::Clear()
-{
-	memset(m_data, 0, 16 * sizeof(float));
-}
-
-// FUNCTION: LEGO1 0x100023f0
-void Matrix4Impl::SetIdentity()
-{
-	Clear();
-	(*m_data)[0][0] = 1.0f;
-	(*m_data)[1][1] = 1.0f;
-	(*m_data)[2][2] = 1.0f;
-	(*m_data)[3][3] = 1.0f;
-}
-
-// FUNCTION: LEGO1 0x10002430
-Matrix4Impl* Matrix4Impl::operator+=(const Matrix4& p_matrix)
-{
-	for (int i = 0; i < 16; ++i)
-		((float*) m_data)[i] += ((float*) &p_matrix)[i];
-	return this;
-}
-
-// Matches but instructions are significantly out of order. Probably not wrong
-// code given that the very similar SetTranslation does match.
-// FUNCTION: LEGO1 0x10002460
-void Matrix4Impl::TranslateBy(const float* p_x, const float* p_y, const float* p_z)
-{
-	((float*) m_data)[12] += *p_x;
-	((float*) m_data)[13] += *p_y;
-	((float*) m_data)[14] += *p_z;
-}
-
-// FUNCTION: LEGO1 0x100024a0
-void Matrix4Impl::SetTranslation(const float* p_x, const float* p_y, const float* p_z)
-{
-	(*m_data)[3][0] = *p_x;
-	(*m_data)[3][1] = *p_y;
-	(*m_data)[3][2] = *p_z;
-}
-
-// FUNCTION: LEGO1 0x100024d0
-void Matrix4Impl::EqualsDataProduct(const Matrix4& p_a, const Matrix4& p_b)
-{
-	float* cur = (float*) m_data;
-	for (int row = 0; row < 4; ++row) {
-		for (int col = 0; col < 4; ++col) {
-			*cur = 0.0f;
-			for (int k = 0; k < 4; ++k) {
-				*cur += p_a[row][k] * p_b[k][col];
-			}
-			cur++;
-		}
-	}
-}
-
-// FUNCTION: LEGO1 0x10002530
-void Matrix4Impl::EqualsMxProduct(const Matrix4Impl* p_a, const Matrix4Impl* p_b)
-{
-	EqualsDataProduct(*p_a->m_data, *p_b->m_data);
-}
-
-// Not close, Ghidra struggles understinging this method so it will have to
-// be manually worked out. Included since I at least figured out what it was
-// doing with rotateIndex and what overall operation it's trying to do.
-// STUB: LEGO1 0x10002550
-void Matrix4Impl::ToQuaternion(Vector4Impl* p_outQuat)
-{
-	/*
-	float trace = m_data[0] + m_data[5] + m_data[10];
-	if (trace > 0) {
-		trace = sqrt(trace + 1.0);
-		p_outQuat->GetData()[3] = trace * 0.5f;
-		p_outQuat->GetData()[0] = (m_data[9] - m_data[6]) * trace;
-		p_outQuat->GetData()[1] = (m_data[2] - m_data[8]) * trace;
-		p_outQuat->GetData()[2] = (m_data[4] - m_data[1]) * trace;
-		return;
-	}
-
-	// ~GLOBAL: LEGO1 0x100d4090
-	static int rotateIndex[] = {1, 2, 0};
-
-	// Largest element along the trace
-	int largest = m_data[0] < m_data[5];
-	if (*Element(largest, largest) < m_data[10])
-		largest = 2;
-
-	int next = rotateIndex[largest];
-	int nextNext = rotateIndex[next];
-	float valueA = *Element(nextNext, nextNext);
-	float valueB = *Element(next, next);
-	float valueC = *Element(largest, largest);
-
-	// Above is somewhat decomped, below is pure speculation since the automatic
-	// decomp becomes very garbled.
-	float traceValue = sqrt(valueA - valueB - valueC + 1.0);
-
-	p_outQuat->GetData()[largest] = traceValue * 0.5f;
-	traceValue = 0.5f / traceValue;
-
-	p_outQuat->GetData()[3] = (m_data[next + 4 * nextNext] - m_data[nextNext + 4 * next]) * traceValue;
-	p_outQuat->GetData()[next] = (m_data[next + 4 * largest] + m_data[largest + 4 * next]) * traceValue;
-	p_outQuat->GetData()[nextNext] = (m_data[nextNext + 4 * largest] + m_data[largest + 4 * nextNext]) * traceValue;
-	*/
-}
-
-// No idea what this function is doing and it will be hard to tell until
-// we have a confirmed usage site.
-// STUB: LEGO1 0x10002710
-int Matrix4Impl::FromQuaternion(const Vector4Impl& p_vec)
-{
-	return -1;
-}
-
-// FUNCTION: LEGO1 0x10002850
-void Matrix4Impl::operator=(const Matrix4Impl& p_other)
-{
-	EqualsMatrixImpl(&p_other);
-}
-
-// FUNCTION: LEGO1 0x10002860
-void Matrix4Data::operator=(const Matrix4Data& p_other)
-{
-	EqualsMatrixImpl(&p_other);
-}
+DECOMP_SIZE_ASSERT(Matrix4, 0x8);
diff --git a/LEGO1/realtime/matrix.h b/LEGO1/realtime/matrix.h
index c087d331..4e661ddb 100644
--- a/LEGO1/realtime/matrix.h
+++ b/LEGO1/realtime/matrix.h
@@ -3,90 +3,166 @@
 
 #include "vector.h"
 
-/*
- * A simple array of four Vector4s that can be indexed into.
- */
-class Matrix4 {
-public:
-	float rows[4][4]; // storage is public for easy access
+#include <memory.h>
 
-	inline Matrix4() {}
-	/*
-	Matrix4(const Vector4& x_axis, const Vector4& y_axis, const Vector4& z_axis, const Vector4& position)
-	{
-		rows[0] = x_axis;
-		rows[1] = y_axis;
-		rows[2] = z_axis;
-		rows[3] = position;
-	}
-	Matrix4(const float m[4][4])
-	{
-		rows[0] = m[0];
-		rows[1] = m[1];
-		rows[2] = m[2];
-		rows[3] = m[3];
-	}
-	*/
-	const float* operator[](long i) const { return rows[i]; }
-	float* operator[](long i) { return rows[i]; }
+struct UnknownMatrixType {
+	float m_data[4][4];
 };
 
 // VTABLE: LEGO1 0x100d4350
 // SIZE 0x8
-class Matrix4Impl {
+class Matrix4 {
 public:
-	inline Matrix4Impl(Matrix4& p_data) { SetData(p_data); }
+	inline Matrix4(float (*p_data)[4]) { SetData(p_data); }
+
+	// Note: virtual function overloads appear in the virtual table
+	// in reverse order of appearance.
+
+	// FUNCTION: LEGO1 0x10002320
+	virtual void Equals(float (*p_data)[4]) { memcpy(m_data, p_data, sizeof(float) * 4 * 4); } // vtable+0x04
+
+	// FUNCTION: LEGO1 0x10002340
+	virtual void Equals(const Matrix4& p_matrix)
+	{
+		memcpy(m_data, p_matrix.m_data, sizeof(float) * 4 * 4);
+	}; // vtable+0x00
+
+	// FUNCTION: LEGO1 0x10002360
+	virtual void SetData(float (*p_data)[4]) { m_data = p_data; } // vtable+0x0c
 
-	// vtable + 0x00
-	virtual void EqualsMatrixImpl(const Matrix4Impl* p_other);
-	virtual void EqualsMatrixData(const Matrix4& p_matrix);
 	// FUNCTION: LEGO1 0x10002370
-	virtual void SetData(Matrix4& p_data) { m_data = &p_data; }
-	virtual void AnotherSetData(Matrix4& p_data);
+	virtual void SetData(UnknownMatrixType& p_matrix) { m_data = p_matrix.m_data; }; // vtable+0x08
 
-	// vtable + 0x10
-	virtual Matrix4* GetData();
-	virtual const Matrix4* GetData() const;
-	virtual float* Element(int p_row, int p_col);
-	virtual const float* Element(int p_row, int p_col) const;
+	// FUNCTION: LEGO1 0x10002380
+	virtual float (*GetData())[4] { return m_data; }; // vtable+0x14
 
-	// vtable + 0x20
-	virtual void Clear();
-	virtual void SetIdentity();
-	virtual void operator=(const Matrix4Impl& p_other);
-	virtual Matrix4Impl* operator+=(const Matrix4& p_matrix);
+	// FUNCTION: LEGO1 0x10002390
+	virtual float (*GetData() const)[4] { return m_data; }; // vtable+0x10
 
-	// vtable + 0x30
-	virtual void TranslateBy(const float* p_x, const float* p_y, const float* p_z);
-	virtual void SetTranslation(const float* p_x, const float* p_y, const float* p_z);
-	virtual void EqualsMxProduct(const Matrix4Impl* p_a, const Matrix4Impl* p_b);
-	virtual void EqualsDataProduct(const Matrix4& p_a, const Matrix4& p_b);
+	// FUNCTION: LEGO1 0x100023a0
+	virtual float* Element(int p_row, int p_col) { return &m_data[p_row][p_col]; } // vtable+0x1c
 
-	// vtable + 0x40
-	virtual void ToQuaternion(Vector4Impl* p_resultQuat);
-	virtual int FromQuaternion(const Vector4Impl& p_vec);
+	// FUNCTION: LEGO1 0x100023c0
+	virtual const float* Element(int p_row, int p_col) const { return &m_data[p_row][p_col]; }; // vtable+0x18
 
-	inline float& operator[](size_t idx) { return ((float*) m_data)[idx]; }
+	// FUNCTION: LEGO1 0x100023e0
+	virtual void Clear() { memset(m_data, 0, 16 * sizeof(float)); }; // vtable+0x20
+
+	// FUNCTION: LEGO1 0x100023f0
+	virtual void SetIdentity()
+	{
+		Clear();
+		m_data[0][0] = 1.0f;
+		m_data[1][1] = 1.0f;
+		m_data[2][2] = 1.0f;
+		m_data[3][3] = 1.0f;
+	} // vtable+0x24
+
+	// FUNCTION: LEGO1 0x10002850
+	virtual void operator=(const Matrix4& p_matrix) { Equals(p_matrix); } // vtable+0x28
+
+	// FUNCTION: LEGO1 0x10002430
+	virtual Matrix4& operator+=(float (*p_data)[4])
+	{
+		for (int i = 0; i < 16; i++)
+			((float*) m_data)[i] += ((float*) p_data)[i];
+		return *this;
+	} // vtable+0x2c
+
+	// FUNCTION: LEGO1 0x10002460
+	virtual void TranslateBy(const float* p_x, const float* p_y, const float* p_z)
+	{
+		m_data[3][0] += *p_x;
+		m_data[3][1] += *p_y;
+		m_data[3][2] += *p_z;
+	} // vtable+0x30
+
+	// FUNCTION: LEGO1 0x100024a0
+	virtual void SetTranslation(const float* p_x, const float* p_y, const float* p_z)
+	{
+		m_data[3][0] = *p_x;
+		m_data[3][1] = *p_y;
+		m_data[3][2] = *p_z;
+	} // vtable+0x34
+
+	// FUNCTION: LEGO1 0x100024d0
+	virtual void Product(float (*p_a)[4], float (*p_b)[4])
+	{
+		float* cur = (float*) m_data;
+		for (int row = 0; row < 4; row++) {
+			for (int col = 0; col < 4; col++) {
+				*cur = 0.0f;
+				for (int k = 0; k < 4; k++) {
+					*cur += p_a[row][k] * p_b[k][col];
+				}
+				cur++;
+			}
+		}
+	}; // vtable+0x3c
+
+	// FUNCTION: LEGO1 0x10002530
+	virtual void Product(const Matrix4& p_a, const Matrix4& p_b) { Product(p_a.m_data, p_b.m_data); } // vtable+0x38
+
+	inline virtual void ToQuaternion(Vector4& p_resultQuat); // vtable+0x40
+	inline virtual int FromQuaternion(const Vector4& p_vec); // vtable+0x44
+
+	float* operator[](size_t idx) { return m_data[idx]; }
+	const float* operator[](size_t idx) const { return m_data[idx]; }
 
 protected:
-	// TODO: Currently unclear whether this class contains a Matrix4* or float*.
-	Matrix4* m_data;
+	float (*m_data)[4];
 };
 
-// VTABLE: LEGO1 0x100d4300
-// SIZE 0x48
-class Matrix4Data : public Matrix4Impl {
-public:
-	inline Matrix4Data() : Matrix4Impl(m_matrix) {}
-	inline Matrix4Data(Matrix4Data& p_other) : Matrix4Impl(m_matrix) { m_matrix = *p_other.m_data; }
-	inline Matrix4& GetMatrix() { return *m_data; }
+// Not close, Ghidra struggles understinging this method so it will have to
+// be manually worked out. Included since I at least figured out what it was
+// doing with rotateIndex and what overall operation it's trying to do.
+// STUB: LEGO1 0x10002550
+inline void Matrix4::ToQuaternion(Vector4& p_outQuat)
+{
+	/*
+	float trace = m_data[0] + m_data[5] + m_data[10];
+	if (trace > 0) {
+		trace = sqrt(trace + 1.0);
+		p_outQuat->GetData()[3] = trace * 0.5f;
+		p_outQuat->GetData()[0] = (m_data[9] - m_data[6]) * trace;
+		p_outQuat->GetData()[1] = (m_data[2] - m_data[8]) * trace;
+		p_outQuat->GetData()[2] = (m_data[4] - m_data[1]) * trace;
+		return;
+	}
 
-	// No idea why there's another equals. Maybe to some other type like the
-	// DirectX Retained Mode Matrix type which is also a float* alias?
-	// vtable + 0x44
-	virtual void operator=(const Matrix4Data& p_other);
+	// ~GLOBAL: LEGO1 0x100d4090
+	static int rotateIndex[] = {1, 2, 0};
 
-	Matrix4 m_matrix;
-};
+	// Largest element along the trace
+	int largest = m_data[0] < m_data[5];
+	if (*Element(largest, largest) < m_data[10])
+		largest = 2;
+
+	int next = rotateIndex[largest];
+	int nextNext = rotateIndex[next];
+	float valueA = *Element(nextNext, nextNext);
+	float valueB = *Element(next, next);
+	float valueC = *Element(largest, largest);
+
+	// Above is somewhat decomped, below is pure speculation since the automatic
+	// decomp becomes very garbled.
+	float traceValue = sqrt(valueA - valueB - valueC + 1.0);
+
+	p_outQuat->GetData()[largest] = traceValue * 0.5f;
+	traceValue = 0.5f / traceValue;
+
+	p_outQuat->GetData()[3] = (m_data[next + 4 * nextNext] - m_data[nextNext + 4 * next]) * traceValue;
+	p_outQuat->GetData()[next] = (m_data[next + 4 * largest] + m_data[largest + 4 * next]) * traceValue;
+	p_outQuat->GetData()[nextNext] = (m_data[nextNext + 4 * largest] + m_data[largest + 4 * nextNext]) * traceValue;
+	*/
+}
+
+// No idea what this function is doing and it will be hard to tell until
+// we have a confirmed usage site.
+// STUB: LEGO1 0x10002710
+inline int Matrix4::FromQuaternion(const Vector4& p_vec)
+{
+	return -1;
+}
 
 #endif // MATRIX_H
diff --git a/LEGO1/realtime/orientableroi.cpp b/LEGO1/realtime/orientableroi.cpp
index e03b78cb..f73758b9 100644
--- a/LEGO1/realtime/orientableroi.cpp
+++ b/LEGO1/realtime/orientableroi.cpp
@@ -2,8 +2,24 @@
 
 #include "decomp.h"
 
+#include <vec.h>
+
 DECOMP_SIZE_ASSERT(OrientableROI, 0xdc)
 
+// FUNCTION: LEGO1 0x100a4420
+OrientableROI::OrientableROI()
+{
+	FILLVEC3(m_world_bounding_box.Min(), 888888.8);
+	FILLVEC3(m_world_bounding_box.Max(), -888888.8);
+	ZEROVEC3(m_world_bounding_sphere.Center());
+	m_world_bounding_sphere.Radius() = 0.0;
+	ZEROVEC3(m_world_velocity);
+	IDENTMAT4(m_local2world);
+
+	m_unk0xd4 = 0;
+	m_unk0xd8 |= Flag_Bit1 | Flag_Bit2;
+}
+
 // FUNCTION: LEGO1 0x100a5910
 void OrientableROI::VTable0x1c()
 {
@@ -12,27 +28,27 @@ void OrientableROI::VTable0x1c()
 }
 
 // FUNCTION: LEGO1 0x100a5930
-void OrientableROI::SetLocalTransform(const Matrix4Impl& p_transform)
+void OrientableROI::SetLocalTransform(const Matrix4& p_transform)
 {
-	reinterpret_cast<Matrix4Impl&>(m_local2world) = p_transform;
+	reinterpret_cast<Matrix4&>(m_local2world) = p_transform;
 	UpdateWorldBoundingVolumes();
 	UpdateWorldVelocity();
 }
 
 // FUNCTION: LEGO1 0x100a5960
-void OrientableROI::VTable0x24(const Matrix4Data& p_transform)
+void OrientableROI::VTable0x24(const MxMatrix& p_transform)
 {
-	Matrix4Data l_matrix(m_local2world);
-	m_local2world.EqualsMxProduct(&p_transform, &l_matrix);
+	MxMatrix l_matrix(m_local2world);
+	m_local2world.Product(p_transform, l_matrix);
 	UpdateWorldBoundingVolumes();
 	UpdateWorldVelocity();
 }
 
 // FUNCTION: LEGO1 0x100a59b0
-void OrientableROI::UpdateWorldData(const Matrix4Data& p_transform)
+void OrientableROI::UpdateWorldData(const MxMatrix& p_transform)
 {
-	Matrix4Data l_matrix(m_local2world);
-	m_local2world.EqualsMxProduct(&l_matrix, &p_transform);
+	MxMatrix l_matrix(m_local2world);
+	m_local2world.Product(l_matrix, p_transform);
 	UpdateWorldBoundingVolumes();
 	UpdateWorldVelocity();
 
@@ -50,9 +66,9 @@ void OrientableROI::UpdateWorldVelocity()
 }
 
 // FUNCTION: LEGO1 0x100a5d80
-const Vector3& OrientableROI::GetWorldVelocity() const
+const float* OrientableROI::GetWorldVelocity() const
 {
-	return (Vector3&) *m_world_velocity.GetData();
+	return m_world_velocity.GetData();
 }
 
 // FUNCTION: LEGO1 0x100a5d90
diff --git a/LEGO1/realtime/orientableroi.h b/LEGO1/realtime/orientableroi.h
index 82db8271..9b754b05 100644
--- a/LEGO1/realtime/orientableroi.h
+++ b/LEGO1/realtime/orientableroi.h
@@ -1,47 +1,55 @@
 #ifndef ORIENTABLEROI_H
 #define ORIENTABLEROI_H
 
-#include "matrix.h"
+#include "decomp.h"
+#include "mxgeometry/mxmatrix.h"
 #include "roi.h"
 
 // VTABLE: LEGO1 0x100dbc08
 // SIZE 0xdc
 class OrientableROI : public ROI {
 public:
-	// FUNCTION: LEGO1 0x100a4420
-	OrientableROI()
-	{
-		FILLVEC3(m_world_bounding_box.Min(), 888888.8);
-		FILLVEC3(m_world_bounding_box.Max(), -888888.8);
-		ZEROVEC3(m_world_bounding_sphere.Center());
-		m_world_bounding_sphere.Radius() = 0.0;
-		ZEROVEC3(m_world_velocity);
-		IDENTMAT4(m_local2world.GetMatrix());
-	}
+	enum {
+		Flag_Bit1 = 0x01,
+		Flag_Bit2 = 0x02
+	};
 
-	virtual const Vector3& GetWorldVelocity() const override;              // vtable+0x8
+	OrientableROI();
+
+	virtual const float* GetWorldVelocity() const override;                // vtable+0x8
 	virtual const BoundingBox& GetWorldBoundingBox() const override;       // vtable+0xc
 	virtual const BoundingSphere& GetWorldBoundingSphere() const override; // vtable+0x10
 	// FUNCTION: LEGO1 0x100a5db0
-	virtual void VTable0x14() { VTable0x1c(); }                     // vtable+0x14
-	virtual void UpdateWorldBoundingVolumes() = 0;                  // vtable+0x18
-	virtual void VTable0x1c();                                      // vtable+0x1c
-	virtual void SetLocalTransform(const Matrix4Impl& p_transform); // vtable+0x20
-	virtual void VTable0x24(const Matrix4Data& p_transform);        // vtable+0x24
-	virtual void UpdateWorldData(const Matrix4Data& p_transform);   // vtable+0x28
-	virtual void UpdateWorldVelocity();                             // vtable+0x2c
+	virtual void VTable0x14() { VTable0x1c(); }                 // vtable+0x14
+	virtual void UpdateWorldBoundingVolumes() = 0;              // vtable+0x18
+	virtual void VTable0x1c();                                  // vtable+0x1c
+	virtual void SetLocalTransform(const Matrix4& p_transform); // vtable+0x20
+	virtual void VTable0x24(const MxMatrix& p_transform);       // vtable+0x24
+	virtual void UpdateWorldData(const MxMatrix& p_transform);  // vtable+0x28
+	virtual void UpdateWorldVelocity();                         // vtable+0x2c
+
+	const float* GetWorldPosition() const { return m_local2world[3]; }
+	const float* GetWorldDirection() const { return m_local2world[2]; }
+	const float* GetWorldUp() const { return m_local2world[1]; }
 
 	// SYNTHETIC: LEGO1 0x100a4630
 	// OrientableROI::`scalar deleting destructor'
 
 protected:
-	char m_unk0xc;                          // 0xc
-	Matrix4Data m_local2world;              // 0x10
-	BoundingBox m_world_bounding_box;       // 0x58
+	MxMatrix m_local2world;           // 0x10
+	BoundingBox m_world_bounding_box; // 0x58
+
+	// Unclear whether the following vectors are:
+	// 1) Part of m_world_bounding_box;
+	// 2) A second BoundingBox;
+	// 3) Standalone vectors
+
+	Mx3DPointFloat m_unk0x80;               // 0x80
+	Mx3DPointFloat m_unk0x94;               // 0x94
 	BoundingSphere m_world_bounding_sphere; // 0xa8
-	Vector3Data m_world_velocity;           // 0xc0
-	unsigned int m_unk0xd4;                 // 0xd4
-	unsigned int m_unk0xd8;                 // 0xd8
+	Mx3DPointFloat m_world_velocity;        // 0xc0
+	undefined4 m_unk0xd4;                   // 0xd4
+	undefined4 m_unk0xd8;                   // 0xd8
 };
 
 #endif // ORIENTABLEROI_H
diff --git a/LEGO1/realtime/realtime.cpp b/LEGO1/realtime/realtime.cpp
index 750082ec..829b2271 100644
--- a/LEGO1/realtime/realtime.cpp
+++ b/LEGO1/realtime/realtime.cpp
@@ -1,45 +1,20 @@
 #include "realtime.h"
 
+#include <vec.h>
+
 // FUNCTION: LEGO1 0x100a5b40
-void CalcLocalTransform(
-	const Vector3Impl& p_posVec,
-	const Vector3Impl& p_dirVec,
-	const Vector3Impl& p_upVec,
-	Matrix4Impl& p_outMatrix
-)
+void CalcLocalTransform(const Vector3& p_posVec, const Vector3& p_dirVec, const Vector3& p_upVec, Matrix4& p_outMatrix)
 {
 	float x_axis[3], y_axis[3], z_axis[3];
 
-	// This is an unrolled version of the "NORMVEC3" macro,
-	// used here to apply a silly hack to get a 100% match
-	{
-		const float dirVec1Operation = (p_dirVec)[1] * (p_dirVec)[1];
-		double len = sqrt(((p_dirVec)[0] * (p_dirVec)[0] + dirVec1Operation + (p_dirVec)[2] * (p_dirVec)[2]));
-		((z_axis)[0] = (p_dirVec)[0] / (len), (z_axis)[1] = (p_dirVec)[1] / (len), (z_axis)[2] = (p_dirVec)[2] / (len));
-	}
-
+	NORMVEC3(z_axis, p_dirVec);
 	NORMVEC3(y_axis, p_upVec)
-
 	VXV3(x_axis, y_axis, z_axis);
-
-	// Exact same thing as pointed out by the above comment
-	{
-		const float axis2Operation = (x_axis)[2] * (x_axis)[2];
-		double len = sqrt(((x_axis)[0] * (x_axis)[0] + axis2Operation + (x_axis)[1] * (x_axis)[1]));
-		((x_axis)[0] = (x_axis)[0] / (len), (x_axis)[1] = (x_axis)[1] / (len), (x_axis)[2] = (x_axis)[2] / (len));
-	}
-
+	NORMVEC3(x_axis, x_axis);
 	VXV3(y_axis, z_axis, x_axis);
-
-	// Again, the same thing
-	{
-		const float axis2Operation = (y_axis)[2] * (y_axis)[2];
-		double len = sqrt(((y_axis)[0] * (y_axis)[0] + axis2Operation + (y_axis)[1] * (y_axis)[1]));
-		((y_axis)[0] = (y_axis)[0] / (len), (y_axis)[1] = (y_axis)[1] / (len), (y_axis)[2] = (y_axis)[2] / (len));
-	}
-
-	SET4from3(&p_outMatrix[0], x_axis, 0);
-	SET4from3(&p_outMatrix[4], y_axis, 0);
-	SET4from3(&p_outMatrix[8], z_axis, 0);
-	SET4from3(&p_outMatrix[12], p_posVec, 1);
+	NORMVEC3(y_axis, y_axis);
+	SET4from3(p_outMatrix[0], x_axis, 0);
+	SET4from3(p_outMatrix[1], y_axis, 0);
+	SET4from3(p_outMatrix[2], z_axis, 0);
+	SET4from3(p_outMatrix[3], p_posVec, 1);
 }
diff --git a/LEGO1/realtime/realtime.h b/LEGO1/realtime/realtime.h
index ae166dfa..cb8298a1 100644
--- a/LEGO1/realtime/realtime.h
+++ b/LEGO1/realtime/realtime.h
@@ -9,11 +9,6 @@
 		VDS3(dst, src, len);                                                                                           \
 	}
 
-void CalcLocalTransform(
-	const Vector3Impl& p_posVec,
-	const Vector3Impl& p_dirVec,
-	const Vector3Impl& p_upVec,
-	Matrix4Impl& p_outMatrix
-);
+void CalcLocalTransform(const Vector3& p_posVec, const Vector3& p_dirVec, const Vector3& p_upVec, Matrix4& p_outMatrix);
 
 #endif // REALTIME_H
diff --git a/LEGO1/realtime/roi.h b/LEGO1/realtime/roi.h
index c8458cd7..2a96d40b 100644
--- a/LEGO1/realtime/roi.h
+++ b/LEGO1/realtime/roi.h
@@ -5,39 +5,39 @@
 
 #include "compat.h"
 #include "lodlist.h"
+#include "mxgeometry/mxgeometry3d.h"
 #include "mxstl/stlcompat.h"
 #include "realtime/realtime.h"
-#include "vector.h"
 
 /*
  * A simple bounding box object with Min and Max accessor methods.
  */
+// SIZE 0x28
 class BoundingBox {
 public:
-	const Vector3Data& Min() const { return min; }
-	Vector3Data& Min() { return min; }
-	const Vector3Data& Max() const { return max; }
-	Vector3Data& Max() { return max; }
+	const Mx3DPointFloat& Min() const { return min; }
+	Mx3DPointFloat& Min() { return min; }
+	const Mx3DPointFloat& Max() const { return max; }
+	Mx3DPointFloat& Max() { return max; }
 
 private:
-	Vector3Data min;
-	Vector3Data max;
-	Vector3Data m_unk0x28;
-	Vector3Data m_unk0x3c;
+	Mx3DPointFloat min;
+	Mx3DPointFloat max;
 };
 
 /*
  * A simple bounding sphere object with center and radius accessor methods.
  */
+// SIZE 0x18
 class BoundingSphere {
 public:
-	const Vector3Data& Center() const { return center; }
-	Vector3Data& Center() { return center; }
+	const Mx3DPointFloat& Center() const { return center; }
+	Mx3DPointFloat& Center() { return center; }
 	const float& Radius() const { return radius; }
 	float& Radius() { return radius; }
 
 private:
-	Vector3Data center;
+	Mx3DPointFloat center;
 	float radius;
 };
 
@@ -74,13 +74,14 @@ typedef vector<const ROI*> ROIList;
 typedef vector<int> IntList;
 
 // VTABLE: LEGO1 0x100dbc38
-// SIZE 0xc
+// SIZE 0x10
 class ROI {
 public:
 	ROI()
 	{
 		m_comp = 0;
 		m_lods = 0;
+		m_unk0xc = 1;
 	}
 	virtual ~ROI()
 	{
@@ -89,7 +90,7 @@ class ROI {
 		assert(!m_lods);
 	}
 	virtual float IntrinsicImportance() const = 0;                    // vtable+0x4
-	virtual const Vector3& GetWorldVelocity() const = 0;              // vtable+0x8
+	virtual const float* GetWorldVelocity() const = 0;                // vtable+0x8
 	virtual const BoundingBox& GetWorldBoundingBox() const = 0;       // vtable+0xc
 	virtual const BoundingSphere& GetWorldBoundingSphere() const = 0; // vtable+0x10
 
@@ -105,5 +106,6 @@ class ROI {
 protected:
 	CompoundObject* m_comp; // 0x4
 	LODListBase* m_lods;    // 0x8
+	undefined m_unk0xc;     // 0xc
 };
 #endif // ROI_H
diff --git a/LEGO1/realtime/vector.cpp b/LEGO1/realtime/vector.cpp
index 390cfdd9..57c93e66 100644
--- a/LEGO1/realtime/vector.cpp
+++ b/LEGO1/realtime/vector.cpp
@@ -1,457 +1,7 @@
-
 #include "vector.h"
 
 #include "decomp.h"
 
-#include <math.h>
-#include <memory.h>
-
-DECOMP_SIZE_ASSERT(Vector2Impl, 0x8);
-DECOMP_SIZE_ASSERT(Vector3Impl, 0x8);
-DECOMP_SIZE_ASSERT(Vector4Impl, 0x8);
-DECOMP_SIZE_ASSERT(Vector3Data, 0x14);
-DECOMP_SIZE_ASSERT(Vector4Data, 0x18);
-
-// FUNCTION: LEGO1 0x10001f80
-void Vector2Impl::AddVectorImpl(float* p_value)
-{
-	m_data[0] += p_value[0];
-	m_data[1] += p_value[1];
-}
-
-// FUNCTION: LEGO1 0x10001fa0
-void Vector2Impl::AddScalarImpl(float p_value)
-{
-	m_data[0] += p_value;
-	m_data[1] += p_value;
-}
-
-// FUNCTION: LEGO1 0x10001fc0
-void Vector2Impl::SubVectorImpl(float* p_value)
-{
-	m_data[0] -= p_value[0];
-	m_data[1] -= p_value[1];
-}
-
-// FUNCTION: LEGO1 0x10001fe0
-void Vector2Impl::MullVectorImpl(float* p_value)
-{
-	m_data[0] *= p_value[0];
-	m_data[1] *= p_value[1];
-}
-
-// FUNCTION: LEGO1 0x10002000
-void Vector2Impl::MullScalarImpl(float* p_value)
-{
-	m_data[0] *= *p_value;
-	m_data[1] *= *p_value;
-}
-
-// FUNCTION: LEGO1 0x10002020
-void Vector2Impl::DivScalarImpl(float* p_value)
-{
-	m_data[0] /= *p_value;
-	m_data[1] /= *p_value;
-}
-
-// FUNCTION: LEGO1 0x10002040
-float Vector2Impl::DotImpl(float* p_a, float* p_b) const
-{
-	return p_b[0] * p_a[0] + p_b[1] * p_a[1];
-}
-
-// FUNCTION: LEGO1 0x10002070
-void Vector2Impl::EqualsImpl(float* p_data)
-{
-	float* vec = m_data;
-	vec[0] = p_data[0];
-	vec[1] = p_data[1];
-}
-
-// FUNCTION: LEGO1 0x10002090
-float* Vector2Impl::GetData()
-{
-	return m_data;
-}
-
-// FUNCTION: LEGO1 0x100020a0
-const float* Vector2Impl::GetData() const
-{
-	return m_data;
-}
-
-// FUNCTION: LEGO1 0x100020b0
-void Vector2Impl::Clear()
-{
-	float* vec = m_data;
-	vec[0] = 0.0f;
-	vec[1] = 0.0f;
-}
-
-// FUNCTION: LEGO1 0x100020d0
-float Vector2Impl::Dot(float* p_a, float* p_b) const
-{
-	return DotImpl(p_a, p_b);
-}
-
-// FUNCTION: LEGO1 0x100020f0
-float Vector2Impl::Dot(Vector2Impl* p_a, Vector2Impl* p_b) const
-{
-	return DotImpl(p_a->m_data, p_b->m_data);
-}
-
-// FUNCTION: LEGO1 0x10002110
-float Vector2Impl::Dot(float* p_a, Vector2Impl* p_b) const
-{
-	return DotImpl(p_a, p_b->m_data);
-}
-
-// FUNCTION: LEGO1 0x10002130
-float Vector2Impl::Dot(Vector2Impl* p_a, float* p_b) const
-{
-	return DotImpl(p_a->m_data, p_b);
-}
-
-// FUNCTION: LEGO1 0x10002150
-float Vector2Impl::LenSquared() const
-{
-	return m_data[0] * m_data[0] + m_data[1] * m_data[1];
-}
-
-// FUNCTION: LEGO1 0x10002160
-int Vector2Impl::Unitize()
-{
-	float sq = LenSquared();
-	if (sq > 0.0f) {
-		float root = sqrt(sq);
-		if (root > 0) {
-			DivScalarImpl(&root);
-			return 0;
-		}
-	}
-	return -1;
-}
-
-// FUNCTION: LEGO1 0x100021c0
-void Vector2Impl::Add(float p_value)
-{
-	AddScalarImpl(p_value);
-}
-
-// FUNCTION: LEGO1 0x100021d0
-void Vector2Impl::Add(float* p_other)
-{
-	AddVectorImpl(p_other);
-}
-
-// FUNCTION: LEGO1 0x100021e0
-void Vector2Impl::Add(Vector2Impl* p_other)
-{
-	AddVectorImpl(p_other->m_data);
-}
-
-// FUNCTION: LEGO1 0x100021f0
-void Vector2Impl::Sub(float* p_other)
-{
-	SubVectorImpl(p_other);
-}
-
-// FUNCTION: LEGO1 0x10002200
-void Vector2Impl::Sub(Vector2Impl* p_other)
-{
-	SubVectorImpl(p_other->m_data);
-}
-
-// FUNCTION: LEGO1 0x10002210
-void Vector2Impl::Mul(float* p_other)
-{
-	MullVectorImpl(p_other);
-}
-
-// FUNCTION: LEGO1 0x10002220
-void Vector2Impl::Mul(Vector2Impl* p_other)
-{
-	MullVectorImpl(p_other->m_data);
-}
-
-// FUNCTION: LEGO1 0x10002230
-void Vector2Impl::Mul(float& p_value)
-{
-	MullScalarImpl(&p_value);
-}
-
-// FUNCTION: LEGO1 0x10002240
-void Vector2Impl::Div(float& p_value)
-{
-	DivScalarImpl(&p_value);
-}
-
-// FUNCTION: LEGO1 0x10002250
-void Vector2Impl::SetVector(float* p_other)
-{
-	EqualsImpl(p_other);
-}
-
-// FUNCTION: LEGO1 0x10002260
-void Vector2Impl::SetVector(Vector2Impl* p_other)
-{
-	EqualsImpl(p_other->m_data);
-}
-
-// FUNCTION: LEGO1 0x10002270
-void Vector3Impl::EqualsCrossImpl(float* p_a, float* p_b)
-{
-	m_data[0] = p_a[1] * p_b[2] - p_a[2] * p_b[1];
-	m_data[1] = p_a[2] * p_b[0] - p_a[0] * p_b[2];
-	m_data[2] = p_a[0] * p_b[1] - p_a[1] * p_b[0];
-}
-
-// FUNCTION: LEGO1 0x100022c0
-void Vector3Impl::EqualsCross(Vector3Impl* p_a, Vector3Impl* p_b)
-{
-	EqualsCrossImpl(p_a->m_data, p_b->m_data);
-}
-
-// FUNCTION: LEGO1 0x100022e0
-void Vector3Impl::EqualsCross(Vector3Impl* p_a, float* p_b)
-{
-	EqualsCrossImpl(p_a->m_data, p_b);
-}
-
-// FUNCTION: LEGO1 0x10002300
-void Vector3Impl::EqualsCross(float* p_a, Vector3Impl* p_b)
-{
-	EqualsCrossImpl(p_a, p_b->m_data);
-}
-
-// FUNCTION: LEGO1 0x10002870
-void Vector4Impl::AddVectorImpl(float* p_value)
-{
-	m_data[0] += p_value[0];
-	m_data[1] += p_value[1];
-	m_data[2] += p_value[2];
-	m_data[3] += p_value[3];
-}
-
-// FUNCTION: LEGO1 0x100028b0
-void Vector4Impl::AddScalarImpl(float p_value)
-{
-	m_data[0] += p_value;
-	m_data[1] += p_value;
-	m_data[2] += p_value;
-	m_data[3] += p_value;
-}
-
-// FUNCTION: LEGO1 0x100028f0
-void Vector4Impl::SubVectorImpl(float* p_value)
-{
-	m_data[0] -= p_value[0];
-	m_data[1] -= p_value[1];
-	m_data[2] -= p_value[2];
-	m_data[3] -= p_value[3];
-}
-
-// FUNCTION: LEGO1 0x10002930
-void Vector4Impl::MullVectorImpl(float* p_value)
-{
-	m_data[0] *= p_value[0];
-	m_data[1] *= p_value[1];
-	m_data[2] *= p_value[2];
-	m_data[3] *= p_value[3];
-}
-
-// FUNCTION: LEGO1 0x10002970
-void Vector4Impl::MullScalarImpl(float* p_value)
-{
-	m_data[0] *= *p_value;
-	m_data[1] *= *p_value;
-	m_data[2] *= *p_value;
-	m_data[3] *= *p_value;
-}
-
-// FUNCTION: LEGO1 0x100029b0
-void Vector4Impl::DivScalarImpl(float* p_value)
-{
-	m_data[0] /= *p_value;
-	m_data[1] /= *p_value;
-	m_data[2] /= *p_value;
-	m_data[3] /= *p_value;
-}
-
-// FUNCTION: LEGO1 0x100029f0
-float Vector4Impl::DotImpl(float* p_a, float* p_b) const
-{
-	return p_a[0] * p_b[0] + p_a[2] * p_b[2] + (p_a[1] * p_b[1] + p_a[3] * p_b[3]);
-}
-
-// FUNCTION: LEGO1 0x10002a20
-void Vector4Impl::EqualsImpl(float* p_data)
-{
-	float* vec = m_data;
-	vec[0] = p_data[0];
-	vec[1] = p_data[1];
-	vec[2] = p_data[2];
-	vec[3] = p_data[3];
-}
-
-// FUNCTION: LEGO1 0x10002a40
-void Vector4Impl::SetMatrixProductImpl(float* p_vec, float* p_mat)
-{
-	m_data[0] = p_vec[0] * p_mat[0] + p_vec[1] * p_mat[4] + p_vec[2] * p_mat[8] + p_vec[3] * p_mat[12];
-	m_data[1] = p_vec[0] * p_mat[1] + p_vec[1] * p_mat[5] + p_vec[2] * p_mat[9] + p_vec[4] * p_mat[13];
-	m_data[2] = p_vec[0] * p_mat[2] + p_vec[1] * p_mat[6] + p_vec[2] * p_mat[10] + p_vec[4] * p_mat[14];
-	m_data[3] = p_vec[0] * p_mat[3] + p_vec[1] * p_mat[7] + p_vec[2] * p_mat[11] + p_vec[4] * p_mat[15];
-}
-
-// FUNCTION: LEGO1 0x10002ae0
-void Vector4Impl::SetMatrixProduct(Vector4Impl* p_a, float* p_b)
-{
-	SetMatrixProductImpl(p_a->m_data, p_b);
-}
-
-// FUNCTION: LEGO1 0x10002b00
-void Vector4Impl::Clear()
-{
-	float* vec = m_data;
-	vec[0] = 0.0f;
-	vec[1] = 0.0f;
-	vec[2] = 0.0f;
-	vec[3] = 0.0f;
-}
-
-// FUNCTION: LEGO1 0x10002b20
-float Vector4Impl::LenSquared() const
-{
-	return m_data[1] * m_data[1] + m_data[0] * m_data[0] + m_data[2] * m_data[2] + m_data[3] * m_data[3];
-}
-
-// FUNCTION: LEGO1 0x10002b40
-void Vector4Impl::EqualsScalar(float* p_value)
-{
-	m_data[0] = *p_value;
-	m_data[1] = *p_value;
-	m_data[2] = *p_value;
-	m_data[3] = *p_value;
-}
-
-// Note close yet, included because I'm at least confident I know what operation
-// it's trying to do.
-// STUB: LEGO1 0x10002b70
-int Vector4Impl::NormalizeQuaternion()
-{
-	float* v = m_data;
-	float magnitude = v[1] * v[1] + v[2] * v[2] + v[0] * v[0];
-	if (magnitude > 0.0f) {
-		float theta = v[3] * 0.5f;
-		v[3] = cos(theta);
-		float frac = sin(theta);
-		magnitude = frac / sqrt(magnitude);
-		v[0] *= magnitude;
-		v[1] *= magnitude;
-		v[2] *= magnitude;
-		return 0;
-	}
-	return -1;
-}
-
-// FUNCTION: LEGO1 0x10002bf0
-void Vector4Impl::UnknownQuaternionOp(Vector4Impl* p_a, Vector4Impl* p_b)
-{
-	float* bDat = p_b->m_data;
-	float* aDat = p_a->m_data;
-
-	this->m_data[3] = aDat[3] * bDat[3] - (bDat[0] * aDat[0] + aDat[2] * bDat[2] + aDat[1] * aDat[1]);
-	this->m_data[0] = bDat[2] * aDat[1] - bDat[1] * aDat[2];
-	this->m_data[1] = aDat[2] * bDat[0] - bDat[2] * aDat[0];
-	this->m_data[2] = bDat[1] * aDat[0] - aDat[1] * bDat[0];
-
-	m_data[0] = p_b->m_data[3] * p_a->m_data[0] + p_a->m_data[3] * p_b->m_data[0] + m_data[0];
-	m_data[1] = p_b->m_data[1] * p_a->m_data[3] + p_a->m_data[1] * p_b->m_data[3] + m_data[1];
-	m_data[2] = p_b->m_data[2] * p_a->m_data[3] + p_a->m_data[2] * p_b->m_data[3] + m_data[2];
-}
-
-// FUNCTION: LEGO1 0x10003a60
-void Vector3Impl::AddVectorImpl(float* p_value)
-{
-	m_data[0] += p_value[0];
-	m_data[1] += p_value[1];
-	m_data[2] += p_value[2];
-}
-
-// FUNCTION: LEGO1 0x10003a90
-void Vector3Impl::AddScalarImpl(float p_value)
-{
-	m_data[0] += p_value;
-	m_data[1] += p_value;
-	m_data[2] += p_value;
-}
-
-// FUNCTION: LEGO1 0x10003ac0
-void Vector3Impl::SubVectorImpl(float* p_value)
-{
-	m_data[0] -= p_value[0];
-	m_data[1] -= p_value[1];
-	m_data[2] -= p_value[2];
-}
-
-// FUNCTION: LEGO1 0x10003af0
-void Vector3Impl::MullVectorImpl(float* p_value)
-{
-	m_data[0] *= p_value[0];
-	m_data[1] *= p_value[1];
-	m_data[2] *= p_value[2];
-}
-
-// FUNCTION: LEGO1 0x10003b20
-void Vector3Impl::MullScalarImpl(float* p_value)
-{
-	m_data[0] *= *p_value;
-	m_data[1] *= *p_value;
-	m_data[2] *= *p_value;
-}
-
-// FUNCTION: LEGO1 0x10003b50
-void Vector3Impl::DivScalarImpl(float* p_value)
-{
-	m_data[0] /= *p_value;
-	m_data[1] /= *p_value;
-	m_data[2] /= *p_value;
-}
-
-// FUNCTION: LEGO1 0x10003b80
-float Vector3Impl::DotImpl(float* p_a, float* p_b) const
-{
-	return p_a[0] * p_b[0] + p_a[2] * p_b[2] + p_a[1] * p_b[1];
-}
-
-// FUNCTION: LEGO1 0x10003ba0
-void Vector3Impl::EqualsImpl(float* p_data)
-{
-	float* vec = m_data;
-	vec[0] = p_data[0];
-	vec[1] = p_data[1];
-	vec[2] = p_data[2];
-}
-
-// FUNCTION: LEGO1 0x10003bc0
-void Vector3Impl::Clear()
-{
-	float* vec = m_data;
-	vec[0] = 0.0f;
-	vec[1] = 0.0f;
-	vec[2] = 0.0f;
-}
-
-// FUNCTION: LEGO1 0x10003bd0
-float Vector3Impl::LenSquared() const
-{
-	return m_data[1] * m_data[1] + m_data[0] * m_data[0] + m_data[2] * m_data[2];
-}
-
-// FUNCTION: LEGO1 0x10003bf0
-void Vector3Impl::EqualsScalar(float* p_value)
-{
-	m_data[0] = *p_value;
-	m_data[1] = *p_value;
-	m_data[2] = *p_value;
-}
+DECOMP_SIZE_ASSERT(Vector2, 0x8);
+DECOMP_SIZE_ASSERT(Vector3, 0x8);
+DECOMP_SIZE_ASSERT(Vector4, 0x8);
diff --git a/LEGO1/realtime/vector.h b/LEGO1/realtime/vector.h
index 1af21c9a..eb03d29d 100644
--- a/LEGO1/realtime/vector.h
+++ b/LEGO1/realtime/vector.h
@@ -1,115 +1,145 @@
 #ifndef VECTOR_H
 #define VECTOR_H
 
-#include <vec.h>
+#include "compat.h"
 
-/*
- * A simple array of three floats that can be indexed into.
- */
-class Vector3 {
-public:
-	float elements[3]; // storage is public for easy access
-
-	Vector3() {}
-	Vector3(float x, float y, float z)
-	{
-		elements[0] = x;
-		elements[1] = y;
-		elements[2] = z;
-	}
-
-	Vector3(const float v[3])
-	{
-		elements[0] = v[0];
-		elements[1] = v[1];
-		elements[2] = v[2];
-	}
-
-	const float& operator[](long i) const { return elements[i]; }
-	float& operator[](long i) { return elements[i]; }
-};
-
-/*
- * A simple array of four floats that can be indexed into.
- */
-struct Vector4 {
-public:
-	float elements[4]; // storage is public for easy access
-
-	inline Vector4() {}
-	Vector4(float x, float y, float z, float w)
-	{
-		elements[0] = x;
-		elements[1] = y;
-		elements[2] = z;
-		elements[3] = w;
-	}
-	Vector4(const float v[4])
-	{
-		elements[0] = v[0];
-		elements[1] = v[1];
-		elements[2] = v[2];
-		elements[3] = v[3];
-	}
-
-	const float& operator[](long i) const { return elements[i]; }
-	float& operator[](long i) { return elements[i]; }
-};
+#include <math.h>
+#include <memory.h>
 
 // VTABLE: LEGO1 0x100d4288
-// SIZE 0x8
-class Vector2Impl {
+// SIZE 0x08
+class Vector2 {
 public:
 	// FUNCTION: LEGO1 0x1000c0f0
-	inline Vector2Impl(float* p_data) { SetData(p_data); }
+	inline Vector2(float* p_data) { SetData(p_data); }
 
-	// vtable + 0x00 (no virtual destructor)
-	virtual void AddScalarImpl(float p_value) = 0;
-	virtual void AddVectorImpl(float* p_value) = 0;
-	virtual void SubVectorImpl(float* p_value) = 0;
-	virtual void MullScalarImpl(float* p_value) = 0;
+	// Note: virtual function overloads appear in the virtual table
+	// in reverse order of appearance.
+
+	// FUNCTION: LEGO1 0x10001f80
+	virtual void AddImpl(float* p_value)
+	{
+		m_data[0] += p_value[0];
+		m_data[1] += p_value[1];
+	} // vtable+0x04
+
+	// FUNCTION: LEGO1 0x10001fa0
+	virtual void AddImpl(float p_value)
+	{
+		m_data[0] += p_value;
+		m_data[1] += p_value;
+	} // vtable+0x00
+
+	// FUNCTION: LEGO1 0x10001fc0
+	virtual void SubImpl(float* p_value)
+	{
+		m_data[0] -= p_value[0];
+		m_data[1] -= p_value[1];
+	} // vtable+0x08
+
+	// Those are also overloads in all likelihood,
+	// but we need a type to do that.
+
+	// FUNCTION: LEGO1 0x10002000
+	virtual void MulScalarImpl(float* p_value)
+	{
+		m_data[0] *= *p_value;
+		m_data[1] *= *p_value;
+	} // vtable+0x0c
+
+	// FUNCTION: LEGO1 0x10001fe0
+	virtual void MulVectorImpl(float* p_value)
+	{
+		m_data[0] *= p_value[0];
+		m_data[1] *= p_value[1];
+	} // vtable+0x10
+
+	// FUNCTION: LEGO1 0x10002020
+	virtual void DivScalarImpl(float* p_value)
+	{
+		m_data[0] /= *p_value;
+		m_data[1] /= *p_value;
+	} // vtable+0x14
+
+	// FUNCTION: LEGO1 0x10002040
+	virtual float DotImpl(float* p_a, float* p_b) const { return p_b[0] * p_a[0] + p_b[1] * p_a[1]; } // vtable+0x18
 
-	// vtable + 0x10
-	virtual void MullVectorImpl(float* p_value) = 0;
-	virtual void DivScalarImpl(float* p_value) = 0;
-	virtual float DotImpl(float* p_a, float* p_b) const = 0;
 	// FUNCTION: LEGO1 0x10002060
-	virtual void SetData(float* p_data) { m_data = p_data; }
+	virtual void SetData(float* p_data) { m_data = p_data; } // vtable+0x1c
 
-	// vtable + 0x20
-	virtual void EqualsImpl(float* p_data) = 0;
-	virtual float* GetData();
-	virtual const float* GetData() const;
-	virtual void Clear() = 0;
+	// FUNCTION: LEGO1 0x10002070
+	virtual void EqualsImpl(float* p_data) { memcpy(m_data, p_data, sizeof(float) * 2); } // vtable+0x20
 
-	// vtable + 0x30
-	virtual float Dot(Vector2Impl* p_a, float* p_b) const;
-	virtual float Dot(float* p_a, Vector2Impl* p_b) const;
-	virtual float Dot(Vector2Impl* p_a, Vector2Impl* p_b) const;
-	virtual float Dot(float* p_a, float* p_b) const;
+	// FUNCTION: LEGO1 0x10002090
+	virtual float* GetData() { return m_data; } // vtable+0x28
 
-	// vtable + 0x40
-	virtual float LenSquared() const = 0;
-	virtual int Unitize();
+	// FUNCTION: LEGO1 0x100020a0
+	virtual const float* GetData() const { return m_data; } // vtable+0x24
 
-	// vtable + 0x48
-	virtual void Add(Vector2Impl* p_other);
-	virtual void Add(float* p_other);
-	virtual void Add(float p_value);
+	// FUNCTION: LEGO1 0x100020b0
+	virtual void Clear() { memset(m_data, 0, sizeof(float) * 2); } // vtable+0x2c
 
-	// vtable + 0x54
-	virtual void Sub(Vector2Impl* p_other);
-	virtual void Sub(float* p_other);
+	// FUNCTION: LEGO1 0x100020d0
+	virtual float Dot(float* p_a, float* p_b) const { return DotImpl(p_a, p_b); } // vtable+0x3c
 
-	// vtable + 0x5C
-	virtual void Mul(float* p_value);
-	virtual void Mul(Vector2Impl* p_other);
-	virtual void Mul(float& p_other);
-	virtual void Div(float& p_value);
+	// FUNCTION: LEGO1 0x100020f0
+	virtual float Dot(Vector2* p_a, Vector2* p_b) const { return DotImpl(p_a->m_data, p_b->m_data); } // vtable+0x38
 
-	// vtable + 0x6C
-	virtual void SetVector(Vector2Impl* p_other);
-	virtual void SetVector(float* p_other);
+	// FUNCTION: LEGO1 0x10002110
+	virtual float Dot(float* p_a, Vector2* p_b) const { return DotImpl(p_a, p_b->m_data); } // vtable+0x34
+
+	// FUNCTION: LEGO1 0x10002130
+	virtual float Dot(Vector2* p_a, float* p_b) const { return DotImpl(p_a->m_data, p_b); } // vtable+0x30
+
+	// FUNCTION: LEGO1 0x10002150
+	virtual float LenSquared() const { return m_data[0] * m_data[0] + m_data[1] * m_data[1]; } // vtable+0x40
+
+	// FUNCTION: LEGO1 0x10002160
+	virtual int Unitize()
+	{
+		float sq = LenSquared();
+		if (sq > 0.0f) {
+			float root = sqrt(sq);
+			if (root > 0) {
+				DivScalarImpl(&root);
+				return 0;
+			}
+		}
+		return -1;
+	} // vtable+0x44
+
+	// FUNCTION: LEGO1 0x100021c0
+	virtual void Add(float p_value) { AddImpl(p_value); } // vtable+0x50
+
+	// FUNCTION: LEGO1 0x100021d0
+	virtual void Add(float* p_other) { AddImpl(p_other); } // vtable+0x4c
+
+	// FUNCTION: LEGO1 0x100021e0
+	virtual void Add(Vector2* p_other) { AddImpl(p_other->m_data); } // vtable+0x48
+
+	// FUNCTION: LEGO1 0x100021f0
+	virtual void Sub(float* p_other) { SubImpl(p_other); } // vtable+0x58
+
+	// FUNCTION: LEGO1 0x10002200
+	virtual void Sub(Vector2* p_other) { SubImpl(p_other->m_data); } // vtable+0x54
+
+	// FUNCTION: LEGO1 0x10002210
+	virtual void Mul(float* p_other) { MulVectorImpl(p_other); } // vtable+0x64
+
+	// FUNCTION: LEGO1 0x10002220
+	virtual void Mul(Vector2* p_other) { MulVectorImpl(p_other->m_data); } // vtable+0x60
+
+	// FUNCTION: LEGO1 0x10002230
+	virtual void Mul(float& p_value) { MulScalarImpl(&p_value); } // vtable+0x5c
+
+	// FUNCTION: LEGO1 0x10002240
+	virtual void Div(float& p_value) { DivScalarImpl(&p_value); } // vtable+0x68
+
+	// FUNCTION: LEGO1 0x10002250
+	virtual void SetVector(float* p_other) { EqualsImpl(p_other); } // vtable+0x70
+
+	// FUNCTION: LEGO1 0x10002260
+	virtual void SetVector(Vector2* p_other) { EqualsImpl(p_other->m_data); } // vtable+0x6c
 
 	inline float& operator[](size_t idx) { return m_data[idx]; }
 	inline const float& operator[](size_t idx) const { return m_data[idx]; }
@@ -119,100 +149,261 @@ class Vector2Impl {
 };
 
 // VTABLE: LEGO1 0x100d4518
-// SIZE 0x8
-class Vector3Impl : public Vector2Impl {
+// SIZE 0x08
+class Vector3 : public Vector2 {
 public:
-	inline Vector3Impl(float* p_data) : Vector2Impl(p_data) {}
+	// FUNCTION: LEGO1 0x1001d150
+	inline Vector3(float* p_data) : Vector2(p_data) {}
 
-	void AddScalarImpl(float p_value);
+	// Hack: Some code initializes a Vector3 from a (most likely) const float* source.
+	// Example: LegoCameraController::GetWorldUp
+	// Vector3 however is a class that can mutate its underlying source, making
+	// initialization with a const source fundamentally incompatible.
+	inline Vector3(const float* p_data) : Vector2((float*) p_data) {}
 
-	void AddVectorImpl(float* p_value);
+	// Note: virtual function overloads appear in the virtual table
+	// in reverse order of appearance.
 
-	void SubVectorImpl(float* p_value);
-	void MullScalarImpl(float* p_value);
-	void MullVectorImpl(float* p_value);
-	void DivScalarImpl(float* p_value);
-	float DotImpl(float* p_a, float* p_b) const;
+	// FUNCTION: LEGO1 0x10002270
+	virtual void EqualsCrossImpl(float* p_a, float* p_b)
+	{
+		m_data[0] = p_a[1] * p_b[2] - p_a[2] * p_b[1];
+		m_data[1] = p_a[2] * p_b[0] - p_a[0] * p_b[2];
+		m_data[2] = p_a[0] * p_b[1] - p_a[1] * p_b[0];
+	} // vtable+0x74
 
-	void EqualsImpl(float* p_data);
+	// FUNCTION: LEGO1 0x100022c0
+	virtual void EqualsCross(Vector3* p_a, Vector3* p_b) { EqualsCrossImpl(p_a->m_data, p_b->m_data); } // vtable+0x80
 
-	void Clear();
+	// FUNCTION: LEGO1 0x100022e0
+	virtual void EqualsCross(Vector3* p_a, float* p_b) { EqualsCrossImpl(p_a->m_data, p_b); } // vtable+0x7c
 
-	float LenSquared() const;
+	// FUNCTION: LEGO1 0x10002300
+	virtual void EqualsCross(float* p_a, Vector3* p_b) { EqualsCrossImpl(p_a, p_b->m_data); } // vtable+0x78
 
-	// vtable + 0x74
-	virtual void EqualsCrossImpl(float* p_a, float* p_b);
-	virtual void EqualsCross(float* p_a, Vector3Impl* p_b);
-	virtual void EqualsCross(Vector3Impl* p_a, float* p_b);
-	virtual void EqualsCross(Vector3Impl* p_a, Vector3Impl* p_b);
-	virtual void EqualsScalar(float* p_value);
+	// FUNCTION: LEGO1 0x10003bf0
+	virtual void EqualsScalar(float* p_value)
+	{
+		m_data[0] = *p_value;
+		m_data[1] = *p_value;
+		m_data[2] = *p_value;
+	} // vtable+0x84
+
+	// Vector2 overrides
+
+	// FUNCTION: LEGO1 0x10003a60
+	virtual void AddImpl(float* p_value) override
+	{
+		m_data[0] += p_value[0];
+		m_data[1] += p_value[1];
+		m_data[2] += p_value[2];
+	} // vtable+0x04
+
+	// FUNCTION: LEGO1 0x10003a90
+	virtual void AddImpl(float p_value) override
+	{
+		m_data[0] += p_value;
+		m_data[1] += p_value;
+		m_data[2] += p_value;
+	} // vtable+0x00
+
+	// FUNCTION: LEGO1 0x10003ac0
+	virtual void SubImpl(float* p_value) override
+	{
+		m_data[0] -= p_value[0];
+		m_data[1] -= p_value[1];
+		m_data[2] -= p_value[2];
+	} // vtable+0x08
+
+	// FUNCTION: LEGO1 0x10003b20
+	virtual void MulScalarImpl(float* p_value) override
+	{
+		m_data[0] *= *p_value;
+		m_data[1] *= *p_value;
+		m_data[2] *= *p_value;
+	} // vtable+0x0c
+
+	// FUNCTION: LEGO1 0x10003af0
+	virtual void MulVectorImpl(float* p_value) override
+	{
+		m_data[0] *= p_value[0];
+		m_data[1] *= p_value[1];
+		m_data[2] *= p_value[2];
+	} // vtable+0x10
+
+	// FUNCTION: LEGO1 0x10003b50
+	virtual void DivScalarImpl(float* p_value) override
+	{
+		m_data[0] /= *p_value;
+		m_data[1] /= *p_value;
+		m_data[2] /= *p_value;
+	} // vtable+0x14
+
+	// FUNCTION: LEGO1 0x10003b80
+	virtual float DotImpl(float* p_a, float* p_b) const override
+	{
+		return p_a[0] * p_b[0] + p_a[2] * p_b[2] + p_a[1] * p_b[1];
+	} // vtable+0x18
+
+	// FUNCTION: LEGO1 0x10003ba0
+	virtual void EqualsImpl(float* p_data) override { memcpy(m_data, p_data, sizeof(float) * 3); } // vtable+0x20
+
+	// FUNCTION: LEGO1 0x10003bc0
+	virtual void Clear() override { memset(m_data, 0, sizeof(float) * 3); } // vtable+0x2c
+
+	// FUNCTION: LEGO1 0x10003bd0
+	virtual float LenSquared() const override
+	{
+		return m_data[1] * m_data[1] + m_data[0] * m_data[0] + m_data[2] * m_data[2];
+	} // vtable+0x40
 
 	inline void Fill(float p_value) { EqualsScalar(&p_value); }
+
+	friend class Mx3DPointFloat;
 };
 
 // VTABLE: LEGO1 0x100d45a0
 // SIZE 0x8
-class Vector4Impl : public Vector3Impl {
+class Vector4 : public Vector3 {
 public:
-	inline Vector4Impl(float* p_data) : Vector3Impl(p_data) {}
+	inline Vector4(float* p_data) : Vector3(p_data) {}
 
-	void AddScalarImpl(float p_value);
+	// Note: virtual function overloads appear in the virtual table
+	// in reverse order of appearance.
 
-	void AddVectorImpl(float* p_value);
-
-	void SubVectorImpl(float* p_value);
-	void MullScalarImpl(float* p_value);
-	void MullVectorImpl(float* p_value);
-	void DivScalarImpl(float* p_value);
-	float DotImpl(float* p_a, float* p_b) const;
-
-	void EqualsImpl(float* p_data);
-
-	void Clear();
-
-	float LenSquared() const;
-
-	void EqualsScalar(float* p_value);
-
-	// vtable + 0x88
-	virtual void SetMatrixProduct(Vector4Impl* p_a, float* p_b);
-	virtual void SetMatrixProductImpl(float* p_vec, float* p_mat);
-	virtual int NormalizeQuaternion();
-	virtual void UnknownQuaternionOp(Vector4Impl* p_a, Vector4Impl* p_b);
-
-	inline Vector4& GetVector() { return *((Vector4*) m_data); }
-};
-
-// VTABLE: LEGO1 0x100d4488
-// SIZE 0x14
-class Vector3Data : public Vector3Impl {
-public:
-	inline Vector3Data() : Vector3Impl(m_vector.elements) {}
-	inline Vector3Data(float p_x, float p_y, float p_z) : Vector3Impl(m_vector.elements), m_vector(p_x, p_y, p_z) {}
-
-	void CopyFrom(Vector3Data& p_other)
+	// FUNCTION: LEGO1 0x10002a40
+	virtual void SetMatrixProduct(float* p_vec, float* p_mat)
 	{
-		EqualsImpl(p_other.m_data);
+		m_data[0] = p_vec[0] * p_mat[0] + p_vec[1] * p_mat[4] + p_vec[2] * p_mat[8] + p_vec[3] * p_mat[12];
+		m_data[1] = p_vec[0] * p_mat[1] + p_vec[1] * p_mat[5] + p_vec[2] * p_mat[9] + p_vec[4] * p_mat[13];
+		m_data[2] = p_vec[0] * p_mat[2] + p_vec[1] * p_mat[6] + p_vec[2] * p_mat[10] + p_vec[4] * p_mat[14];
+		m_data[3] = p_vec[0] * p_mat[3] + p_vec[1] * p_mat[7] + p_vec[2] * p_mat[11] + p_vec[4] * p_mat[15];
+	} // vtable+0x8c
 
-		float* dest = m_vector.elements;
-		float* src = p_other.m_vector.elements;
-		for (size_t i = sizeof(m_vector) / sizeof(float); i > 0; --i)
-			*dest++ = *src++;
+	// FUNCTION: LEGO1 0x10002ae0
+	virtual void SetMatrixProduct(Vector4* p_a, float* p_b) { SetMatrixProduct(p_a->m_data, p_b); } // vtable+0x88
+
+	inline virtual int NormalizeQuaternion();                            // vtable+90
+	inline virtual void UnknownQuaternionOp(Vector4* p_a, Vector4* p_b); // vtable+94
+
+	// Vector3 overrides
+
+	// FUNCTION: LEGO1 0x10002870
+	virtual void AddImpl(float* p_value) override
+	{
+		m_data[0] += p_value[0];
+		m_data[1] += p_value[1];
+		m_data[2] += p_value[2];
+		m_data[3] += p_value[3];
+	} // vtable+0x04
+
+	// FUNCTION: LEGO1 0x100028b0
+	virtual void AddImpl(float p_value) override
+	{
+		m_data[0] += p_value;
+		m_data[1] += p_value;
+		m_data[2] += p_value;
+		m_data[3] += p_value;
+	} // vtable+0x00
+
+	// FUNCTION: LEGO1 0x100028f0
+	virtual void SubImpl(float* p_value) override
+	{
+		m_data[0] -= p_value[0];
+		m_data[1] -= p_value[1];
+		m_data[2] -= p_value[2];
+		m_data[3] -= p_value[3];
+	} // vtable+0x08
+
+	// FUNCTION: LEGO1 0x10002970
+	virtual void MulScalarImpl(float* p_value) override
+	{
+		m_data[0] *= *p_value;
+		m_data[1] *= *p_value;
+		m_data[2] *= *p_value;
+		m_data[3] *= *p_value;
+	} // vtable+0x0c
+
+	// FUNCTION: LEGO1 0x10002930
+	virtual void MulVectorImpl(float* p_value) override
+	{
+		m_data[0] *= p_value[0];
+		m_data[1] *= p_value[1];
+		m_data[2] *= p_value[2];
+		m_data[3] *= p_value[3];
+	} // vtable+0x10
+
+	// FUNCTION: LEGO1 0x100029b0
+	virtual void DivScalarImpl(float* p_value) override
+	{
+		m_data[0] /= *p_value;
+		m_data[1] /= *p_value;
+		m_data[2] /= *p_value;
+		m_data[3] /= *p_value;
+	} // vtable+0x14
+
+	// FUNCTION: LEGO1 0x100029f0
+	virtual float DotImpl(float* p_a, float* p_b) const override
+	{
+		return p_a[0] * p_b[0] + p_a[2] * p_b[2] + (p_a[1] * p_b[1] + p_a[3] * p_b[3]);
+	} // vtable+0x18
+
+	// FUNCTION: LEGO1 0x10002a20
+	virtual void EqualsImpl(float* p_data) override { memcpy(m_data, p_data, sizeof(float) * 4); } // vtable+0x20
+
+	// FUNCTION: LEGO1 0x10002b00
+	virtual void Clear() override { memset(m_data, 0, sizeof(float) * 4); } // vtable+0x2c
+
+	// FUNCTION: LEGO1 0x10002b20
+	virtual float LenSquared() const override
+	{
+		return m_data[1] * m_data[1] + m_data[0] * m_data[0] + m_data[2] * m_data[2] + m_data[3] * m_data[3];
+	} // vtable+0x40
+
+	// FUNCTION: LEGO1 0x10002b40
+	virtual void EqualsScalar(float* p_value) override
+	{
+		m_data[0] = *p_value;
+		m_data[1] = *p_value;
+		m_data[2] = *p_value;
+		m_data[3] = *p_value;
+	} // vtable+0x84
+};
+
+// Note close yet, included because I'm at least confident I know what operation
+// it's trying to do.
+// STUB: LEGO1 0x10002b70
+inline int Vector4::NormalizeQuaternion()
+{
+	float* v = m_data;
+	float magnitude = v[1] * v[1] + v[2] * v[2] + v[0] * v[0];
+	if (magnitude > 0.0f) {
+		float theta = v[3] * 0.5f;
+		v[3] = cos(theta);
+		float frac = sin(theta);
+		magnitude = frac / sqrt(magnitude);
+		v[0] *= magnitude;
+		v[1] *= magnitude;
+		v[2] *= magnitude;
+		return 0;
 	}
-	inline void EqualsCross(Vector3Data& p_a, Vector3Data& p_b) { EqualsCrossImpl(p_a.m_data, p_b.m_data); }
+	return -1;
+}
 
-private:
-	Vector3 m_vector;
-};
+// FUNCTION: LEGO1 0x10002bf0
+inline void Vector4::UnknownQuaternionOp(Vector4* p_a, Vector4* p_b)
+{
+	float* bDat = p_b->m_data;
+	float* aDat = p_a->m_data;
 
-// VTABLE: LEGO1 0x100d41e8
-// SIZE 0x18
-class Vector4Data : public Vector4Impl {
-public:
-	inline Vector4Data() : Vector4Impl(m_vector.elements) {}
+	this->m_data[3] = aDat[3] * bDat[3] - (bDat[0] * aDat[0] + aDat[2] * bDat[2] + aDat[1] * aDat[1]);
+	this->m_data[0] = bDat[2] * aDat[1] - bDat[1] * aDat[2];
+	this->m_data[1] = aDat[2] * bDat[0] - bDat[2] * aDat[0];
+	this->m_data[2] = bDat[1] * aDat[0] - aDat[1] * bDat[0];
 
-private:
-	Vector4 m_vector;
-};
+	m_data[0] = p_b->m_data[3] * p_a->m_data[0] + p_a->m_data[3] * p_b->m_data[0] + m_data[0];
+	m_data[1] = p_b->m_data[1] * p_a->m_data[3] + p_a->m_data[1] * p_b->m_data[3] + m_data[1];
+	m_data[2] = p_b->m_data[2] * p_a->m_data[3] + p_a->m_data[2] * p_b->m_data[3] + m_data[2];
+}
 
 #endif // VECTOR_H
diff --git a/LEGO1/tgl/d3drm/camera.cpp b/LEGO1/tgl/d3drm/camera.cpp
index 5084c2ca..9e000ba8 100644
--- a/LEGO1/tgl/d3drm/camera.cpp
+++ b/LEGO1/tgl/d3drm/camera.cpp
@@ -12,7 +12,7 @@ void* CameraImpl::ImplementationDataPtr()
 }
 
 // FUNCTION: LEGO1 0x100a3700
-Result CameraImpl::SetTransformation(const FloatMatrix4& matrix)
+Result CameraImpl::SetTransformation(FloatMatrix4& matrix)
 {
 	D3DRMMATRIX4D helper;
 	D3DRMMATRIX4D* pTransformation = Translate(matrix, helper);
diff --git a/LEGO1/tgl/d3drm/group.cpp b/LEGO1/tgl/d3drm/group.cpp
index 022dc757..4b966cd2 100644
--- a/LEGO1/tgl/d3drm/group.cpp
+++ b/LEGO1/tgl/d3drm/group.cpp
@@ -9,7 +9,7 @@ void* GroupImpl::ImplementationDataPtr()
 }
 
 // FUNCTION: LEGO1 0x100a31e0
-Result GroupImpl::SetTransformation(const FloatMatrix4& matrix)
+Result GroupImpl::SetTransformation(FloatMatrix4& matrix)
 {
 	D3DRMMATRIX4D helper;
 	D3DRMMATRIX4D* d3dMatrix = Translate(matrix, helper);
diff --git a/LEGO1/tgl/d3drm/impl.h b/LEGO1/tgl/d3drm/impl.h
index 4c76a365..0c1e869d 100644
--- a/LEGO1/tgl/d3drm/impl.h
+++ b/LEGO1/tgl/d3drm/impl.h
@@ -209,7 +209,7 @@ class CameraImpl : public Camera {
 	virtual void* ImplementationDataPtr();
 
 	// vtable+0x08
-	virtual Result SetTransformation(const FloatMatrix4&);
+	virtual Result SetTransformation(FloatMatrix4&);
 
 	inline IDirect3DRMFrame2* ImplementationData() const { return m_data; }
 
@@ -234,7 +234,7 @@ class LightImpl : public Light {
 	virtual void* ImplementationDataPtr();
 
 	// vtable+0x08
-	virtual Result SetTransformation(const FloatMatrix4&);
+	virtual Result SetTransformation(FloatMatrix4&);
 	virtual Result SetColor(float r, float g, float b);
 
 	inline IDirect3DRMFrame2* ImplementationData() const { return m_data; }
@@ -300,7 +300,7 @@ class GroupImpl : public Group {
 	virtual void* ImplementationDataPtr();
 
 	// vtable+0x08
-	virtual Result SetTransformation(const FloatMatrix4&);
+	virtual Result SetTransformation(FloatMatrix4&);
 	virtual Result SetColor(float r, float g, float b, float a);
 
 	// vtable+0x10
@@ -474,7 +474,7 @@ inline D3DRMPROJECTIONTYPE Translate(ProjectionType tglProjectionType)
 // Yes this function serves no purpose, originally they intended it to
 // convert from doubles to floats but ended up using floats throughout
 // the software stack.
-inline D3DRMMATRIX4D* Translate(const FloatMatrix4& tglMatrix4x4, D3DRMMATRIX4D& rD3DRMMatrix4x4)
+inline D3DRMMATRIX4D* Translate(FloatMatrix4& tglMatrix4x4, D3DRMMATRIX4D& rD3DRMMatrix4x4)
 {
 	for (int i = 0; i < (sizeof(rD3DRMMatrix4x4) / sizeof(rD3DRMMatrix4x4[0])); i++) {
 		for (int j = 0; j < (sizeof(rD3DRMMatrix4x4[0]) / sizeof(rD3DRMMatrix4x4[0][0])); j++) {
diff --git a/LEGO1/tgl/d3drm/light.cpp b/LEGO1/tgl/d3drm/light.cpp
index 5ceafa4b..dfc23b44 100644
--- a/LEGO1/tgl/d3drm/light.cpp
+++ b/LEGO1/tgl/d3drm/light.cpp
@@ -12,7 +12,7 @@ void* LightImpl::ImplementationDataPtr()
 }
 
 // FUNCTION: LEGO1 0x100a3780
-Result LightImpl::SetTransformation(const FloatMatrix4& matrix)
+Result LightImpl::SetTransformation(FloatMatrix4& matrix)
 {
 	D3DRMMATRIX4D helper;
 	D3DRMMATRIX4D* d3dMatrix = Translate(matrix, helper);
diff --git a/LEGO1/tgl/tgl.h b/LEGO1/tgl/tgl.h
index dfc18f3f..3e09ad5a 100644
--- a/LEGO1/tgl/tgl.h
+++ b/LEGO1/tgl/tgl.h
@@ -222,13 +222,13 @@ class View : public Object {
 // VTABLE 0x100dbae8
 class Camera : public Object {
 public:
-	virtual Result SetTransformation(const FloatMatrix4&) = 0;
+	virtual Result SetTransformation(FloatMatrix4&) = 0;
 };
 
 // VTABLE 0x100dbb08
 class Light : public Object {
 public:
-	virtual Result SetTransformation(const FloatMatrix4&) = 0;
+	virtual Result SetTransformation(FloatMatrix4&) = 0;
 	virtual Result SetColor(float r, float g, float b) = 0;
 };
 
@@ -252,7 +252,7 @@ class Mesh : public Object {
 // VTABLE 0x100dbaa0
 class Group : public Object {
 public:
-	virtual Result SetTransformation(const FloatMatrix4&) = 0;
+	virtual Result SetTransformation(FloatMatrix4&) = 0;
 	virtual Result SetColor(float r, float g, float b, float a) = 0;
 	virtual Result SetTexture(const Texture*) = 0;
 	virtual Result GetTexture(Texture*&) = 0;
diff --git a/LEGO1/tgl/tglvector.h b/LEGO1/tgl/tglvector.h
index 78255937..8612724f 100644
--- a/LEGO1/tgl/tglvector.h
+++ b/LEGO1/tgl/tglvector.h
@@ -1,8 +1,5 @@
 #ifndef _tglVector_h
 #define _tglVector_h
-// Note: This file is almost an exact copy of the one from
-// the leak but using floats instead of doubles, hence the
-// strange formatting in some places.
 
 #include "math.h" // sin() in RotateAroundY()
 
@@ -26,253 +23,7 @@ inline float RadiansToDegrees(float radians)
 	return (radians / Constant::Pi) * 180.0;
 }
 
-//////////////////////////////////////////////////////////////////////////////
-//
-// Array<T, N>
-
-template <class T, int N>
-class Array {
-public:
-	Array() {}
-	Array(const Array& rArray) { *this = rArray; }
-	~Array() {}
-
-	const T& operator[](int i) const { return m_elements[i]; };
-	T& operator[](int i) { return m_elements[i]; };
-
-	Array<T, N>& operator=(const Array<T, N>&);
-	void operator+=(const Array<T, N>&);
-
-protected:
-	T m_elements[N];
-};
-
-//////////////////////////////////////////////////////////////////////////////
-//
-// Array<T, N> implementation
-
-template <class T, int N>
-inline Array<T, N>& Array<T, N>::operator=(const Array<T, N>& rArray)
-{
-	int i;
-
-	for (i = 0; i < N; i++) {
-		m_elements[i] = rArray.m_elements[i];
-	}
-
-	return *this;
-}
-
-template <class T, int N>
-inline void Array<T, N>::operator+=(const Array<T, N>& rArray)
-{
-	int i;
-
-	for (i = 0; i < N; i++) {
-		m_elements[i] += rArray.m_elements[i];
-	}
-}
-
-//////////////////////////////////////////////////////////////////////////////
-//
-// FloatMatrix4
-
-class FloatMatrix4 : public Array<Array<float, 4>, 4> {
-public:
-	FloatMatrix4() {}
-	FloatMatrix4(const FloatMatrix4& rMatrix) { *this = rMatrix; }
-	FloatMatrix4(const FloatMatrix4&, const FloatMatrix4&);
-
-	void operator*=(const FloatMatrix4&);
-};
-
-//////////////////////////////////////////////////////////////////////////////
-//
-// FloatMatrix4 implementation
-
-inline FloatMatrix4::FloatMatrix4(const FloatMatrix4& rMatrix1, const FloatMatrix4& rMatrix2)
-{
-	for (int row = 0; row < 4; row++) {
-		for (int column = 0; column < 4; column++) {
-			float element = 0;
-
-			for (int i = 0; i < 4; i++) {
-				element += rMatrix1[row][i] * rMatrix2[i][column];
-			}
-
-			m_elements[row][column] = element;
-		}
-	}
-}
-
-inline void FloatMatrix4::operator*=(const FloatMatrix4& rMatrix)
-{
-	FloatMatrix4 temp(*this, rMatrix);
-
-	// *this = FloatMatrix4(*this, rMatrix);
-	*this = temp;
-}
-
-//////////////////////////////////////////////////////////////////////////////
-//
-// Transformation matrices
-
-class Translation : public FloatMatrix4 {
-public:
-	Translation(const float[3]);
-	Translation(float x, float y, float z);
-
-protected:
-	void Init(float x, float y, float z);
-};
-
-class Scale : public FloatMatrix4 {
-public:
-	Scale(const float[3]);
-	Scale(float x, float y, float z);
-	Scale(float);
-
-protected:
-	void Init(float x, float y, float z);
-};
-
-class RotationX : public FloatMatrix4 {
-public:
-	RotationX(float radians);
-};
-
-class RotationY : public FloatMatrix4 {
-public:
-	RotationY(float radians);
-};
-//////////////////////////////////////////////////////////////////////////////
-//
-// Transformation matrices implementation
-
-inline Translation::Translation(const float vector[3])
-{
-	Init(vector[0], vector[1], vector[2]);
-}
-
-inline Translation::Translation(float x, float y, float z)
-{
-	Init(x, y, z);
-}
-
-inline void Translation::Init(float x, float y, float z)
-{
-	m_elements[0][0] = 1;
-	m_elements[0][1] = 0;
-	m_elements[0][2] = 0;
-	m_elements[0][3] = 0;
-
-	m_elements[1][0] = 0;
-	m_elements[1][1] = 1;
-	m_elements[1][2] = 0;
-	m_elements[1][3] = 0;
-
-	m_elements[2][0] = 0;
-	m_elements[2][1] = 0;
-	m_elements[2][2] = 1;
-	m_elements[2][3] = 0;
-
-	m_elements[3][0] = x;
-	m_elements[3][1] = y;
-	m_elements[3][2] = z;
-	m_elements[3][3] = 1;
-}
-
-inline Scale::Scale(const float vector[3])
-{
-	Init(vector[0], vector[1], vector[2]);
-}
-
-inline Scale::Scale(float x, float y, float z)
-{
-	Init(x, y, z);
-}
-
-inline Scale::Scale(float scale)
-{
-	Init(scale, scale, scale);
-}
-
-inline void Scale::Init(float x, float y, float z)
-{
-	m_elements[0][0] = x;
-	m_elements[0][1] = 0;
-	m_elements[0][2] = 0;
-	m_elements[0][3] = 0;
-
-	m_elements[1][0] = 0;
-	m_elements[1][1] = y;
-	m_elements[1][2] = 0;
-	m_elements[1][3] = 0;
-
-	m_elements[2][0] = 0;
-	m_elements[2][1] = 0;
-	m_elements[2][2] = z;
-	m_elements[2][3] = 0;
-
-	m_elements[3][0] = 0;
-	m_elements[3][1] = 0;
-	m_elements[3][2] = 0;
-	m_elements[3][3] = 1;
-}
-
-inline RotationX::RotationX(float radians)
-{
-	float cosRadians = cos(radians);
-	float sinRadians = sin(radians);
-
-	m_elements[0][0] = 1;
-	m_elements[0][1] = 0;
-	m_elements[0][2] = 0;
-	m_elements[0][3] = 0;
-
-	m_elements[1][0] = 0;
-	m_elements[1][1] = cosRadians;
-	m_elements[1][2] = -sinRadians;
-	m_elements[1][3] = 0;
-
-	m_elements[2][0] = 0;
-	m_elements[2][1] = sinRadians;
-	m_elements[2][2] = cosRadians;
-	m_elements[2][3] = 0;
-
-	m_elements[3][0] = 0;
-	m_elements[3][1] = 0;
-	m_elements[3][2] = 0;
-	m_elements[3][3] = 1;
-}
-
-inline RotationY::RotationY(float radians)
-{
-	float cosRadians = cos(radians);
-	float sinRadians = sin(radians);
-
-	m_elements[0][0] = cosRadians;
-	m_elements[0][1] = 0;
-	m_elements[0][2] = sinRadians;
-	m_elements[0][3] = 0;
-
-	m_elements[1][0] = 0;
-	m_elements[1][1] = 1;
-	m_elements[1][2] = 0;
-	m_elements[1][3] = 0;
-
-	m_elements[2][0] = -sinRadians;
-	m_elements[2][1] = 0;
-	m_elements[2][2] = cosRadians;
-	m_elements[2][3] = 0;
-
-	m_elements[3][0] = 0;
-	m_elements[3][1] = 0;
-	m_elements[3][2] = 0;
-	m_elements[3][3] = 1;
-}
-
-//////////////////////////////////////////////////////////////////////////////
+typedef float FloatMatrix4[4][4];
 
 } // namespace Tgl
 
diff --git a/LEGO1/viewmanager/viewroi.cpp b/LEGO1/viewmanager/viewroi.cpp
index 523814a2..ff846394 100644
--- a/LEGO1/viewmanager/viewroi.cpp
+++ b/LEGO1/viewmanager/viewroi.cpp
@@ -2,6 +2,8 @@
 
 #include "decomp.h"
 
+#include <vec.h>
+
 DECOMP_SIZE_ASSERT(ViewROI, 0xe0)
 
 // GLOBAL: LEGO1 0x101013d8
@@ -26,13 +28,15 @@ Tgl::Group* ViewROI::GetGeometry()
 }
 
 // FUNCTION: LEGO1 0x100a9ee0
-void ViewROI::UpdateWorldData(const Matrix4Data& parent2world)
+void ViewROI::UpdateWorldData(const MxMatrix& parent2world)
 {
 	OrientableROI::UpdateWorldData(parent2world);
+
 	if (geometry) {
-		Tgl::FloatMatrix4 mat;
-		SETMAT4(mat, m_local2world.GetMatrix());
-		Tgl::Result result = geometry->SetTransformation(mat);
+		Tgl::FloatMatrix4 matrix;
+		Matrix4 in(matrix);
+		SETMAT4(in, m_local2world);
+		Tgl::Result result = geometry->SetTransformation(matrix);
 		// assert(Tgl::Succeeded(result));
 	}
 }
diff --git a/LEGO1/viewmanager/viewroi.h b/LEGO1/viewmanager/viewroi.h
index 02d69ab5..7157033a 100644
--- a/LEGO1/viewmanager/viewroi.h
+++ b/LEGO1/viewmanager/viewroi.h
@@ -52,7 +52,7 @@ class ViewROI : public OrientableROI {
 
 protected:
 	Tgl::Group* geometry;
-	void UpdateWorldData(const Matrix4Data& parent2world);
+	void UpdateWorldData(const MxMatrix& parent2world);
 };
 
 // SYNTHETIC: LEGO1 0x100aa250

From d5d4a8b0ff117109c14ee0b40c84714784630460 Mon Sep 17 00:00:00 2001
From: Misha <106913236+MishaProductions@users.noreply.github.com>
Date: Sat, 13 Jan 2024 09:32:45 -0500
Subject: [PATCH 103/210] Update mxvideopresenter.cpp (#429)

---
 LEGO1/omni/src/video/mxvideopresenter.cpp | 46 +++++++++--------------
 1 file changed, 17 insertions(+), 29 deletions(-)

diff --git a/LEGO1/omni/src/video/mxvideopresenter.cpp b/LEGO1/omni/src/video/mxvideopresenter.cpp
index 765bb497..944a7fa5 100644
--- a/LEGO1/omni/src/video/mxvideopresenter.cpp
+++ b/LEGO1/omni/src/video/mxvideopresenter.cpp
@@ -20,7 +20,6 @@ MxVideoPresenter::AlphaMask::AlphaMask(const MxBitmap& p_bitmap)
 	m_bitmask = new MxU8[size];
 	memset(m_bitmask, 0, size);
 
-	MxU32 biCompression = p_bitmap.GetBmiHeader()->biCompression;
 	MxU32 rowsBeforeTop;
 	MxU8* bitmapSrcPtr;
 
@@ -32,36 +31,25 @@ MxVideoPresenter::AlphaMask::AlphaMask(const MxBitmap& p_bitmap)
 	// Reminder: Negative biHeight means this is a top-down DIB.
 	// Otherwise it is bottom-up.
 
-	if (biCompression == BI_RGB) {
-		// DECOMP: I think this must be an OR. If not, the check for
-		// biCompression == 16 gets optimized away.
-		if (biCompression == BI_RGB_TOPDOWN || p_bitmap.GetBmiHeight() < 0) {
+	switch (p_bitmap.GetBmiHeader()->biCompression) {
+	case BI_RGB: {
+		if (p_bitmap.GetBmiHeight() < 0)
 			rowsBeforeTop = 0;
-		}
-		else {
-			rowsBeforeTop = p_bitmap.GetBmiHeightAbs();
-			rowsBeforeTop--;
-		}
-
-		goto seek_to_last_row;
+		else
+			rowsBeforeTop = p_bitmap.GetBmiHeightAbs() - 1;
+		bitmapSrcPtr = p_bitmap.GetBitmapData() + (p_bitmap.GetBmiStride() * rowsBeforeTop);
+		break;
 	}
-	else if (biCompression == BI_RGB_TOPDOWN) {
-		// DECOMP: This is the only condition where we skip the
-		// calculation below.
+	case BI_RGB_TOPDOWN:
 		bitmapSrcPtr = p_bitmap.GetBitmapData();
-	}
-	else {
-		if (p_bitmap.GetBmiHeight() < 0) {
+		break;
+	default: {
+		if (p_bitmap.GetBmiHeight() < 0)
 			rowsBeforeTop = 0;
-		}
-		else {
-			rowsBeforeTop = p_bitmap.GetBmiHeightAbs();
-			rowsBeforeTop--;
-		}
-
-	// TODO: would prefer not to use goto if we can figure this structure out
-	seek_to_last_row:
-		bitmapSrcPtr = p_bitmap.GetBmiStride() * rowsBeforeTop + p_bitmap.GetBitmapData();
+		else
+			rowsBeforeTop = p_bitmap.GetBmiHeightAbs() - 1;
+		bitmapSrcPtr = p_bitmap.GetBitmapData() + (p_bitmap.GetBmiStride() * rowsBeforeTop);
+	}
 	}
 
 	// How many bytes are there for each row of the bitmap?
@@ -69,15 +57,15 @@ MxVideoPresenter::AlphaMask::AlphaMask(const MxBitmap& p_bitmap)
 	// If this is a bottom-up DIB, we will walk it in reverse.
 	// TODO: Same rounding trick as in MxBitmap
 	MxS32 rowSeek = ((m_width + 3) & -4);
-	if (p_bitmap.GetBmiHeight() < 0)
+	if (p_bitmap.GetBmiHeader()->biCompression != 16 && p_bitmap.GetBmiHeight() > 0)
 		rowSeek = -rowSeek;
 
 	// The actual offset into the m_bitmask array. The two for-loops
 	// are just for counting the pixels.
 	MxS32 offset = 0;
 
-	MxU8* tPtr = bitmapSrcPtr;
 	for (MxS32 j = 0; j < m_height; j++) {
+		MxU8* tPtr = bitmapSrcPtr;
 		for (MxS32 i = 0; i < m_width; i++) {
 			if (*tPtr) {
 				// TODO: Second CDQ instruction for abs() should not be there.

From 0edbd9dab9954c136cf94a565fb046f91529ab1f Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Sat, 13 Jan 2024 09:39:33 -0500
Subject: [PATCH 104/210] Update mxvideopresenter.cpp

---
 LEGO1/omni/src/video/mxvideopresenter.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LEGO1/omni/src/video/mxvideopresenter.cpp b/LEGO1/omni/src/video/mxvideopresenter.cpp
index 944a7fa5..c098449a 100644
--- a/LEGO1/omni/src/video/mxvideopresenter.cpp
+++ b/LEGO1/omni/src/video/mxvideopresenter.cpp
@@ -57,7 +57,7 @@ MxVideoPresenter::AlphaMask::AlphaMask(const MxBitmap& p_bitmap)
 	// If this is a bottom-up DIB, we will walk it in reverse.
 	// TODO: Same rounding trick as in MxBitmap
 	MxS32 rowSeek = ((m_width + 3) & -4);
-	if (p_bitmap.GetBmiHeader()->biCompression != 16 && p_bitmap.GetBmiHeight() > 0)
+	if (p_bitmap.GetBmiHeader()->biCompression != BI_RGB_TOPDOWN && p_bitmap.GetBmiHeight() > 0)
 		rowSeek = -rowSeek;
 
 	// The actual offset into the m_bitmask array. The two for-loops

From 7d2629318c796f4ac21db9061966b14c0e00b810 Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Sat, 13 Jan 2024 14:58:10 -0500
Subject: [PATCH 105/210] Match Lego3DView::Create (#431)

---
 LEGO1/lego/sources/3dmanager/lego3dview.cpp | 26 ++++++++++++---------
 LEGO1/omni/src/video/mxbitmap.cpp           |  2 +-
 LEGO1/viewmanager/viewmanager.cpp           | 12 +++++++++-
 LEGO1/viewmanager/viewmanager.h             |  7 +++++-
 4 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/LEGO1/lego/sources/3dmanager/lego3dview.cpp b/LEGO1/lego/sources/3dmanager/lego3dview.cpp
index 9225e2ea..37b8215e 100644
--- a/LEGO1/lego/sources/3dmanager/lego3dview.cpp
+++ b/LEGO1/lego/sources/3dmanager/lego3dview.cpp
@@ -25,27 +25,31 @@ Lego3DView::~Lego3DView()
 	Destroy();
 }
 
-// STUB: LEGO1 0x100aaf90
+// FUNCTION: LEGO1 0x100aaf90
 BOOL Lego3DView::Create(const TglSurface::CreateStruct& rCreateStruct, Tgl::Renderer* pRenderer)
 {
 	double viewAngle = 45;
-	double frontClippingDistance = 1;
-	double backClippingDistance = 5000;
+	if (rCreateStruct.m_isWideViewAngle)
+		viewAngle = 90;
+
+	float frontClippingDistance = 0.1;
+	float backClippingDistance = 500;
 
 	if (!LegoView1::Create(rCreateStruct, pRenderer)) {
 		return FALSE;
 	}
 
-	// assert(GetView());
-	// GetView()->SetFrustrum(frontClippingDistance, backClippingDistance, viewAngle);
+	assert(GetView());
+	GetView()->SetFrustrum(frontClippingDistance, backClippingDistance, viewAngle);
 
-	// assert(GetScene());
-	// assert(!m_pViewManager);
+	assert(GetScene());
+	assert(!m_pViewManager);
 
-	// m_pViewManager = new ViewManager(GetScene(), 0);
-	// m_pViewManager->SetResolution(GetWidth(), GetHeight());
-	// m_pViewManager->SetFrustrum(viewAngle, -frontClippingDistance, -backClippingDistance);
-	// m_previousRenderTime = 0;
+	m_pViewManager = new ViewManager(pRenderer, GetScene(), 0);
+	m_pViewManager->SetResolution(GetWidth(), GetHeight());
+	m_pViewManager->SetFrustrum(viewAngle, frontClippingDistance, backClippingDistance);
+	m_previousRenderTime = 0;
+	m_unk0x98 = 0;
 
 	// // NOTE: a derived class must inform view manager when it configures
 	// //       its (Tgl) view: calling Tgl::View::SetFrustrum() should be
diff --git a/LEGO1/omni/src/video/mxbitmap.cpp b/LEGO1/omni/src/video/mxbitmap.cpp
index ea93279b..9e21e449 100644
--- a/LEGO1/omni/src/video/mxbitmap.cpp
+++ b/LEGO1/omni/src/video/mxbitmap.cpp
@@ -103,7 +103,7 @@ MxResult MxBitmap::ImportBitmapInfo(MxBITMAPINFO* p_info)
 		}
 
 		if (this->m_data) {
-			delete this->m_data;
+			delete[] this->m_data;
 			this->m_data = NULL;
 		}
 	}
diff --git a/LEGO1/viewmanager/viewmanager.cpp b/LEGO1/viewmanager/viewmanager.cpp
index 71ab5fcc..7d412641 100644
--- a/LEGO1/viewmanager/viewmanager.cpp
+++ b/LEGO1/viewmanager/viewmanager.cpp
@@ -1,7 +1,7 @@
 #include "viewmanager.h"
 
 // STUB: LEGO1 0x100a5eb0
-ViewManager::ViewManager(Tgl::Group* scene, const OrientableROI* point_of_view)
+ViewManager::ViewManager(Tgl::Renderer* pRenderer, Tgl::Group* scene, const OrientableROI* point_of_view)
 {
 }
 
@@ -16,6 +16,16 @@ void ViewManager::RemoveAll(ViewROI*)
 	// TODO
 }
 
+// STUB: LEGO1 0x100a6d50
+void ViewManager::SetResolution(int width, int height)
+{
+}
+
+// STUB: LEGO1 0x100a6d70
+void ViewManager::SetFrustrum(float fov, float front, float back)
+{
+}
+
 // STUB: LEGO1 0x100a6da0
 void ViewManager::SetPOVSource(const OrientableROI* point_of_view)
 {
diff --git a/LEGO1/viewmanager/viewmanager.h b/LEGO1/viewmanager/viewmanager.h
index 41421b14..03b23366 100644
--- a/LEGO1/viewmanager/viewmanager.h
+++ b/LEGO1/viewmanager/viewmanager.h
@@ -7,12 +7,17 @@
 // SIZE 0x1bc
 class ViewManager {
 public:
-	ViewManager(Tgl::Group* scene, const OrientableROI* point_of_view);
+	ViewManager(Tgl::Renderer* pRenderer, Tgl::Group* scene, const OrientableROI* point_of_view);
 	virtual ~ViewManager();
 
 	__declspec(dllexport) void RemoveAll(ViewROI*);
 
 	void SetPOVSource(const OrientableROI* point_of_view);
+	void SetResolution(int width, int height);
+	void SetFrustrum(float fov, float front, float back);
+
+private:
+	undefined m_pad[0x1b8];
 };
 
 #endif // VIEWMANAGER_H

From c2da041f40f45aecd73099ef54f306a8f813fe9e Mon Sep 17 00:00:00 2001
From: Misha <106913236+MishaProductions@users.noreply.github.com>
Date: Sat, 13 Jan 2024 15:00:11 -0500
Subject: [PATCH 106/210] Implement a few legoworld methods (#430)

* Push changes

* Update legoworld.cpp

* Update legoworld.cpp

* Minor style fixes

---------

Co-authored-by: Christian Semmler <mail@csemmler.com>
---
 LEGO1/lego/legoomni/include/helicopter.h      |  2 +-
 LEGO1/lego/legoomni/include/infocenter.h      |  2 +-
 LEGO1/lego/legoomni/include/isle.h            |  2 +-
 LEGO1/lego/legoomni/include/islepathactor.h   |  2 +-
 .../legoomni/include/legocontrolmanager.h     |  2 +
 LEGO1/lego/legoomni/include/legoentity.h      |  2 +-
 LEGO1/lego/legoomni/include/legoomni.h        |  3 +-
 .../include/legopointofviewcontroller.h       |  1 +
 LEGO1/lego/legoomni/include/legorace.h        |  2 +-
 LEGO1/lego/legoomni/include/legoworld.h       | 40 ++++++-------
 LEGO1/lego/legoomni/include/score.h           |  2 +-
 LEGO1/lego/legoomni/src/build/helicopter.cpp  |  4 +-
 .../src/control/legocontrolmanager.cpp        |  6 ++
 LEGO1/lego/legoomni/src/entity/legoentity.cpp |  6 +-
 .../legoomni/src/entity/legopovcontroller.cpp |  6 ++
 LEGO1/lego/legoomni/src/entity/legorace.cpp   |  2 +-
 LEGO1/lego/legoomni/src/entity/legoworld.cpp  | 59 +++++++++++++++++--
 .../legoomni/src/infocenter/infocenter.cpp    |  2 +-
 LEGO1/lego/legoomni/src/infocenter/score.cpp  |  4 +-
 LEGO1/lego/legoomni/src/isle/isle.cpp         |  4 +-
 .../lego/legoomni/src/isle/islepathactor.cpp  |  4 +-
 LEGO1/lego/legoomni/src/main/legoomni.cpp     |  6 ++
 LEGO1/omni/include/mxentity.h                 |  8 +--
 23 files changed, 120 insertions(+), 51 deletions(-)

diff --git a/LEGO1/lego/legoomni/include/helicopter.h b/LEGO1/lego/legoomni/include/helicopter.h
index ef932f30..ec4faa59 100644
--- a/LEGO1/lego/legoomni/include/helicopter.h
+++ b/LEGO1/lego/legoomni/include/helicopter.h
@@ -37,7 +37,7 @@ class Helicopter : public IslePathActor {
 		return !strcmp(p_name, Helicopter::ClassName()) || IslePathActor::IsA(p_name);
 	}
 
-	virtual MxResult Create(MxDSObject& p_dsObject) override;              // vtable+0x18
+	virtual MxResult Create(MxDSAction& p_dsAction) override;              // vtable+0x18
 	void VTable0x70(float p_float) override;                               // vtable+0x70
 	void VTable0x74(Matrix4& p_transform) override;                        // vtable+0x74
 	virtual MxU32 VTable0xcc() override;                                   // vtable+0xcc
diff --git a/LEGO1/lego/legoomni/include/infocenter.h b/LEGO1/lego/legoomni/include/infocenter.h
index 634d7b55..d514d550 100644
--- a/LEGO1/lego/legoomni/include/infocenter.h
+++ b/LEGO1/lego/legoomni/include/infocenter.h
@@ -26,7 +26,7 @@ class Infocenter : public LegoWorld {
 		return !strcmp(p_name, Infocenter::ClassName()) || LegoWorld::IsA(p_name);
 	}
 
-	virtual MxResult Create(MxDSObject& p_dsObject) override; // vtable+0x18
+	virtual MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
 	virtual void VTable0x50() override;                       // vtable+0x50
 	virtual MxBool VTable0x5c() override;                     // vtable+0x5c
 	virtual MxBool VTable0x64() override;                     // vtable+0x64
diff --git a/LEGO1/lego/legoomni/include/isle.h b/LEGO1/lego/legoomni/include/isle.h
index a768d357..6bf1fd48 100644
--- a/LEGO1/lego/legoomni/include/isle.h
+++ b/LEGO1/lego/legoomni/include/isle.h
@@ -40,7 +40,7 @@ class Isle : public LegoWorld {
 		return !strcmp(p_name, Isle::ClassName()) || LegoWorld::IsA(p_name);
 	}
 
-	virtual MxResult Create(MxDSObject& p_dsObject) override; // vtable+0x18
+	virtual MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
 	virtual void VTable0x50() override;                       // vtable+50
 	virtual void VTable0x58(MxCore* p_object) override;       // vtable+58
 	// FUNCTION: LEGO1 0x10030900
diff --git a/LEGO1/lego/legoomni/include/islepathactor.h b/LEGO1/lego/legoomni/include/islepathactor.h
index d7a8ff60..559e4bca 100644
--- a/LEGO1/lego/legoomni/include/islepathactor.h
+++ b/LEGO1/lego/legoomni/include/islepathactor.h
@@ -28,7 +28,7 @@ class IslePathActor : public LegoPathActor {
 		return !strcmp(p_name, IslePathActor::ClassName()) || LegoPathActor::IsA(p_name);
 	}
 
-	virtual MxResult Create(MxDSObject& p_dsObject) override; // vtable+0x18
+	virtual MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
 	// FUNCTION: LEGO1 0x10002e70
 	virtual MxU32 VTable0xcc() { return 0; } // vtable+0xcc
 	// FUNCTION: LEGO1 0x10002df0
diff --git a/LEGO1/lego/legoomni/include/legocontrolmanager.h b/LEGO1/lego/legoomni/include/legocontrolmanager.h
index 7bc8dc0f..36bf6d48 100644
--- a/LEGO1/lego/legoomni/include/legocontrolmanager.h
+++ b/LEGO1/lego/legoomni/include/legocontrolmanager.h
@@ -2,6 +2,7 @@
 #define LEGOCONTROLMANAGER_H
 
 #include "mxcore.h"
+#include "mxpresenterlist.h"
 
 // VTABLE: LEGO1 0x100d6a80
 class LegoControlManager : public MxCore {
@@ -24,6 +25,7 @@ class LegoControlManager : public MxCore {
 		return !strcmp(p_name, LegoControlManager::ClassName()) || MxCore::IsA(p_name);
 	}
 
+	void FUN_10028df0(MxPresenterList* p_presenterList);
 	void Register(MxCore* p_listener);
 	void Unregister(MxCore* p_listener);
 };
diff --git a/LEGO1/lego/legoomni/include/legoentity.h b/LEGO1/lego/legoomni/include/legoentity.h
index 8ca966b1..21dd26a8 100644
--- a/LEGO1/lego/legoomni/include/legoentity.h
+++ b/LEGO1/lego/legoomni/include/legoentity.h
@@ -32,7 +32,7 @@ class LegoEntity : public MxEntity {
 		return !strcmp(p_name, LegoEntity::ClassName()) || MxEntity::IsA(p_name);
 	}
 
-	virtual MxResult Create(MxDSObject& p_dsObject);                     // vtable+0x18
+	virtual MxResult Create(MxDSAction& p_dsAction);                     // vtable+0x18
 	virtual void Destroy(MxBool p_fromDestructor);                       // vtable+0x1c
 	virtual void ParseAction(char*);                                     // vtable+0x20
 	virtual void SetROI(LegoROI* p_roi, MxBool p_bool1, MxBool p_bool2); // vtable+0x24
diff --git a/LEGO1/lego/legoomni/include/legoomni.h b/LEGO1/lego/legoomni/include/legoomni.h
index 21c84801..deab2d44 100644
--- a/LEGO1/lego/legoomni/include/legoomni.h
+++ b/LEGO1/lego/legoomni/include/legoomni.h
@@ -116,7 +116,7 @@ class LegoOmni : public MxOmni {
 	MxDSAction& GetCurrentAction() { return m_action; }
 
 	inline void SetNavController(LegoNavController* p_navController) { m_navController = p_navController; }
-
+	inline void SetWorld(LegoWorld* p_currentWorld) { m_currentWorld = p_currentWorld; }
 	inline void SetExit(MxBool p_exit) { m_exit = p_exit; };
 
 private:
@@ -167,5 +167,6 @@ void SetIsWorldActive(MxBool p_isWorldActive);
 void DeleteObjects(MxAtomId* p_id, MxS32 p_first, MxS32 p_last);
 void RegisterScripts();
 void UnregisterScripts();
+void SetCurrentWorld(LegoWorld* p_world);
 
 #endif // LEGOOMNI_H
diff --git a/LEGO1/lego/legoomni/include/legopointofviewcontroller.h b/LEGO1/lego/legoomni/include/legopointofviewcontroller.h
index 444a08ad..99c213e2 100644
--- a/LEGO1/lego/legoomni/include/legopointofviewcontroller.h
+++ b/LEGO1/lego/legoomni/include/legopointofviewcontroller.h
@@ -83,6 +83,7 @@ class LegoPointOfViewController : public LegoMouseController {
 	virtual void SetEntity(LegoEntity* p_entity); // vtable+0x2c
 
 	MxResult Create(Lego3DView* p_lego3DView);
+	void OnViewSize(int p_width, int p_height);
 
 	inline LegoEntity* GetEntity() { return m_entity; }
 
diff --git a/LEGO1/lego/legoomni/include/legorace.h b/LEGO1/lego/legoomni/include/legorace.h
index 530c289c..504b4cbb 100644
--- a/LEGO1/lego/legoomni/include/legorace.h
+++ b/LEGO1/lego/legoomni/include/legorace.h
@@ -28,7 +28,7 @@ class LegoRace : public LegoWorld {
 		return !strcmp(p_name, LegoRace::ClassName()) || LegoWorld::IsA(p_name);
 	}
 
-	virtual MxResult Create(MxDSObject& p_dsObject) override; // vtable+0x18
+	virtual MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
 	virtual MxBool VTable0x5c() override;                     // vtable+0x5c
 	virtual MxBool VTable0x64() override;                     // vtable+0x64
 	virtual void VTable0x68(MxBool p_add) override;           // vtable+0x68
diff --git a/LEGO1/lego/legoomni/include/legoworld.h b/LEGO1/lego/legoomni/include/legoworld.h
index 385e0b07..7cacf766 100644
--- a/LEGO1/lego/legoomni/include/legoworld.h
+++ b/LEGO1/lego/legoomni/include/legoworld.h
@@ -33,20 +33,20 @@ class LegoWorld : public LegoEntity {
 		return !strcmp(p_name, LegoWorld::ClassName()) || LegoEntity::IsA(p_name);
 	}
 
-	virtual void VTable0x50();                 // vtable+50
-	virtual void VTable0x54();                 // vtable+54
-	virtual void VTable0x58(MxCore* p_object); // vtable+58
-	virtual MxBool VTable0x5c();               // vtable+5c
+	virtual MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
+	virtual void VTable0x50();                                // vtable+0x50
+	virtual LegoCameraController* VTable0x54();               // vtable+0x54
+	virtual void VTable0x58(MxCore* p_object);                // vtable+0x58
+	virtual MxBool VTable0x5c();                              // vtable+0x5c
 	// FUNCTION: LEGO1 0x100010a0
-	virtual void VTable0x60() {}           // vtable+60
-	virtual MxBool VTable0x64();           // vtable+64
-	virtual void VTable0x68(MxBool p_add); // vtable+68
+	virtual void VTable0x60() {}           // vtable+0x60
+	virtual MxBool VTable0x64();           // vtable+0x64
+	virtual void VTable0x68(MxBool p_add); // vtable+0x68
 
-	inline LegoCameraController* GetCamera() { return m_camera; }
+	inline LegoCameraController* GetCamera() { return m_cameraController; }
 	inline undefined4 GetUnknown0xec() { return m_unk0xec; }
 
 	undefined FUN_100220e0();
-	MxResult SetAsCurrentWorld(MxDSObject& p_dsObject);
 	void EndAction(MxCore* p_object);
 	void FUN_1001fc80(IslePathActor* p_actor);
 	MxBool FUN_100727e0(MxU32, Mx3DPointFloat& p_loc, Mx3DPointFloat& p_dir, Mx3DPointFloat& p_up);
@@ -56,17 +56,17 @@ class LegoWorld : public LegoEntity {
 	MxS32 GetCurrPathInfo(LegoPathBoundary** p_path, MxS32& p_value);
 
 protected:
-	LegoPathControllerList m_list0x68; // 0x68
-	MxPresenterList m_list0x80;        // 0x80
-	LegoCameraController* m_camera;    // 0x98
-	undefined m_unk0x9c[0x1c];         // 0x9c
-	MxPresenterList m_list0xb8;        // 0xb8
-	undefined m_unk0xd0[0x1c];         // 0xd0
-	undefined4 m_unk0xec;              // 0xec
-	undefined4 m_unk0xf0;              // 0xf0
-	MxS16 m_unk0xf4;                   // 0xf4
-	MxBool m_worldStarted;             // 0xf6
-	undefined m_unk0xf7;               // 0xf7
+	LegoPathControllerList m_list0x68;        // 0x68
+	MxPresenterList m_list0x80;               // 0x80
+	LegoCameraController* m_cameraController; // 0x98
+	undefined m_unk0x9c[0x1c];                // 0x9c
+	MxPresenterList m_list0xb8;               // 0xb8
+	undefined m_unk0xd0[0x1c];                // 0xd0
+	undefined4 m_unk0xec;                     // 0xec
+	undefined4 m_unk0xf0;                     // 0xf0
+	MxS16 m_unk0xf4;                          // 0xf4
+	MxBool m_worldStarted;                    // 0xf6
+	undefined m_unk0xf7;                      // 0xf7
 };
 
 // SYNTHETIC: LEGO1 0x1001eed0
diff --git a/LEGO1/lego/legoomni/include/score.h b/LEGO1/lego/legoomni/include/score.h
index f5950aa8..1e801aa3 100644
--- a/LEGO1/lego/legoomni/include/score.h
+++ b/LEGO1/lego/legoomni/include/score.h
@@ -31,7 +31,7 @@ class Score : public LegoWorld {
 	// SYNTHETIC: LEGO1 0x100011e0
 	// Score::`scalar deleting destructor'
 
-	virtual MxResult Create(MxDSObject& p_dsObject) override; // vtable+18
+	virtual MxResult Create(MxDSAction& p_dsAction) override; // vtable+18
 	virtual void VTable0x50() override;                       // vtable+50
 	virtual MxBool VTable0x5c() override;                     // vtable+5c
 	virtual MxBool VTable0x64() override;                     // vtable+64
diff --git a/LEGO1/lego/legoomni/src/build/helicopter.cpp b/LEGO1/lego/legoomni/src/build/helicopter.cpp
index d661b4d7..823304e8 100644
--- a/LEGO1/lego/legoomni/src/build/helicopter.cpp
+++ b/LEGO1/lego/legoomni/src/build/helicopter.cpp
@@ -27,9 +27,9 @@ Helicopter::~Helicopter()
 }
 
 // FUNCTION: LEGO1 0x100032c0
-MxResult Helicopter::Create(MxDSObject& p_dsObject)
+MxResult Helicopter::Create(MxDSAction& p_dsAction)
 {
-	MxResult result = IslePathActor::Create(p_dsObject);
+	MxResult result = IslePathActor::Create(p_dsAction);
 	LegoWorld* world = GetCurrentWorld();
 	SetWorld(world);
 	if (world->IsA("Act3")) {
diff --git a/LEGO1/lego/legoomni/src/control/legocontrolmanager.cpp b/LEGO1/lego/legoomni/src/control/legocontrolmanager.cpp
index f3c70c50..24e3cb1b 100644
--- a/LEGO1/lego/legoomni/src/control/legocontrolmanager.cpp
+++ b/LEGO1/lego/legoomni/src/control/legocontrolmanager.cpp
@@ -12,6 +12,12 @@ LegoControlManager::~LegoControlManager()
 	// TODO
 }
 
+// STUB: LEGO1 0x10028df0
+void LegoControlManager::FUN_10028df0(MxPresenterList* p_presenterList)
+{
+	// TODO
+}
+
 // STUB: LEGO1 0x10028e10
 void LegoControlManager::Register(MxCore* p_listener)
 {
diff --git a/LEGO1/lego/legoomni/src/entity/legoentity.cpp b/LEGO1/lego/legoomni/src/entity/legoentity.cpp
index 62058e50..e1a8c6f4 100644
--- a/LEGO1/lego/legoomni/src/entity/legoentity.cpp
+++ b/LEGO1/lego/legoomni/src/entity/legoentity.cpp
@@ -42,10 +42,10 @@ void LegoEntity::SetWorldTransform(const Vector3& p_loc, const Vector3& p_dir, c
 }
 
 // FUNCTION: LEGO1 0x100107e0
-MxResult LegoEntity::Create(MxDSObject& p_dsObject)
+MxResult LegoEntity::Create(MxDSAction& p_dsAction)
 {
-	m_mxEntityId = p_dsObject.GetObjectId();
-	m_atom = p_dsObject.GetAtomId();
+	m_mxEntityId = p_dsAction.GetObjectId();
+	m_atom = p_dsAction.GetAtomId();
 	Init();
 	return SUCCESS;
 }
diff --git a/LEGO1/lego/legoomni/src/entity/legopovcontroller.cpp b/LEGO1/lego/legoomni/src/entity/legopovcontroller.cpp
index a2e1bb04..f656022d 100644
--- a/LEGO1/lego/legoomni/src/entity/legopovcontroller.cpp
+++ b/LEGO1/lego/legoomni/src/entity/legopovcontroller.cpp
@@ -100,6 +100,12 @@ MxResult LegoPointOfViewController::Create(Lego3DView* p_lego3DView)
 	return SUCCESS;
 }
 
+// FUNCTION: LEGO1 0x100658a0
+void LegoPointOfViewController::OnViewSize(int p_width, int p_height)
+{
+	m_nav->SetControlMax(p_width, p_height);
+}
+
 // FUNCTION: LEGO1 0x100658c0
 void LegoPointOfViewController::LeftDown(int p_x, int p_y)
 {
diff --git a/LEGO1/lego/legoomni/src/entity/legorace.cpp b/LEGO1/lego/legoomni/src/entity/legorace.cpp
index d5eefbd5..79565966 100644
--- a/LEGO1/lego/legoomni/src/entity/legorace.cpp
+++ b/LEGO1/lego/legoomni/src/entity/legorace.cpp
@@ -62,7 +62,7 @@ MxBool LegoRace::VTable0x64()
 }
 
 // STUB: LEGO1 0x10015ce0
-MxResult LegoRace::Create(MxDSObject& p_dsObject)
+MxResult LegoRace::Create(MxDSAction& p_dsAction)
 {
 	// TODO
 	return SUCCESS;
diff --git a/LEGO1/lego/legoomni/src/entity/legoworld.cpp b/LEGO1/lego/legoomni/src/entity/legoworld.cpp
index 339360e7..c7a2608a 100644
--- a/LEGO1/lego/legoomni/src/entity/legoworld.cpp
+++ b/LEGO1/lego/legoomni/src/entity/legoworld.cpp
@@ -1,8 +1,10 @@
 #include "legoworld.h"
 
+#include "legocontrolmanager.h"
 #include "legoinputmanager.h"
 #include "legoomni.h"
 #include "legoutil.h"
+#include "legovideomanager.h"
 #include "mxactionnotificationparam.h"
 #include "mxnotificationmanager.h"
 #include "mxnotificationparam.h"
@@ -39,10 +41,28 @@ LegoWorld::~LegoWorld()
 }
 
 // STUB: LEGO1 0x1001e0b0
-MxResult LegoWorld::SetAsCurrentWorld(MxDSObject& p_dsObject)
+MxResult LegoWorld::Create(MxDSAction& p_dsAction)
 {
-	// TODO
-	return SUCCESS;
+	MxEntity::Create(p_dsAction);
+
+	// TODO: Intitialize lists
+
+	if (VTable0x54()) {
+		if (p_dsAction.GetFlags() & MxDSAction::Flag_Enabled) {
+			if (GetCurrentWorld()) {
+				GetCurrentWorld()->VTable0x68(0);
+			}
+
+			SetCurrentWorld(this);
+			ControlManager()->FUN_10028df0(&m_list0xb8);
+		}
+
+		SetIsWorldActive(TRUE);
+		m_unk0xec = -1;
+
+		return SUCCESS;
+	}
+	return FAILURE;
 }
 
 // FUNCTION: LEGO1 0x1001f5e0
@@ -63,10 +83,37 @@ MxLong LegoWorld::Notify(MxParam& p_param)
 	return ret;
 }
 
-// STUB: LEGO1 0x1001f630
-void LegoWorld::VTable0x54()
+// FUNCTION: LEGO1 0x1001f630
+LegoCameraController* LegoWorld::VTable0x54()
 {
-	// TODO
+	MxBool success = FALSE;
+
+	if (!VideoManager()) {
+		goto done;
+	}
+	if (!(m_cameraController = new LegoCameraController())) {
+		goto done;
+	}
+	if (m_cameraController->Create() != SUCCESS) {
+		goto done;
+	}
+
+	m_cameraController->OnViewSize(
+		VideoManager()->GetVideoParam().GetRect().GetWidth(),
+		VideoManager()->GetVideoParam().GetRect().GetHeight()
+	);
+
+	success = TRUE;
+
+done:
+	if (!success) {
+		if (m_cameraController) {
+			delete m_cameraController;
+			m_cameraController = NULL;
+		}
+	}
+
+	return m_cameraController;
 }
 
 // STUB: LEGO1 0x1001fc80
diff --git a/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp b/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp
index 47d89ea5..9201adf9 100644
--- a/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp
+++ b/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp
@@ -13,7 +13,7 @@ Infocenter::~Infocenter()
 }
 
 // STUB: LEGO1 0x1006ed90
-MxResult Infocenter::Create(MxDSObject& p_dsObject)
+MxResult Infocenter::Create(MxDSAction& p_dsAction)
 {
 	return FAILURE;
 }
diff --git a/LEGO1/lego/legoomni/src/infocenter/score.cpp b/LEGO1/lego/legoomni/src/infocenter/score.cpp
index 5e9ca19c..91cfedd6 100644
--- a/LEGO1/lego/legoomni/src/infocenter/score.cpp
+++ b/LEGO1/lego/legoomni/src/infocenter/score.cpp
@@ -39,9 +39,9 @@ Score::~Score()
 }
 
 // FUNCTION: LEGO1 0x100012a0
-MxResult Score::Create(MxDSObject& p_dsObject)
+MxResult Score::Create(MxDSAction& p_dsAction)
 {
-	MxResult result = SetAsCurrentWorld(p_dsObject);
+	MxResult result = LegoWorld::Create(p_dsAction);
 
 	if (result == SUCCESS) {
 		InputManager()->SetWorld(this);
diff --git a/LEGO1/lego/legoomni/src/isle/isle.cpp b/LEGO1/lego/legoomni/src/isle/isle.cpp
index f11497e6..d10e18ad 100644
--- a/LEGO1/lego/legoomni/src/isle/isle.cpp
+++ b/LEGO1/lego/legoomni/src/isle/isle.cpp
@@ -54,11 +54,11 @@ Isle::~Isle()
 }
 
 // FUNCTION: LEGO1 0x10030b20
-MxResult Isle::Create(MxDSObject& p_dsObject)
+MxResult Isle::Create(MxDSAction& p_dsAction)
 {
 	GameState()->FUN_1003ceb0();
 
-	MxResult result = LegoWorld::SetAsCurrentWorld(p_dsObject);
+	MxResult result = LegoWorld::Create(p_dsAction);
 	if (result == SUCCESS) {
 		ControlManager()->Register(this);
 		InputManager()->SetWorld(this);
diff --git a/LEGO1/lego/legoomni/src/isle/islepathactor.cpp b/LEGO1/lego/legoomni/src/isle/islepathactor.cpp
index 528bbde8..036b3298 100644
--- a/LEGO1/lego/legoomni/src/isle/islepathactor.cpp
+++ b/LEGO1/lego/legoomni/src/isle/islepathactor.cpp
@@ -12,9 +12,9 @@ IslePathActor::IslePathActor()
 }
 
 // FUNCTION: LEGO1 0x1001a280
-MxResult IslePathActor::Create(MxDSObject& p_dsObject)
+MxResult IslePathActor::Create(MxDSAction& p_dsAction)
 {
-	return MxEntity::Create(p_dsObject);
+	return MxEntity::Create(p_dsAction);
 }
 
 // STUB: LEGO1 0x1001a350
diff --git a/LEGO1/lego/legoomni/src/main/legoomni.cpp b/LEGO1/lego/legoomni/src/main/legoomni.cpp
index cd0bc4a0..ef7cca9b 100644
--- a/LEGO1/lego/legoomni/src/main/legoomni.cpp
+++ b/LEGO1/lego/legoomni/src/main/legoomni.cpp
@@ -216,6 +216,12 @@ MxDSAction& GetCurrentAction()
 	return LegoOmni::GetInstance()->GetCurrentAction();
 }
 
+// FUNCTION: LEGO1 0x100158f0
+void SetCurrentWorld(LegoWorld* p_world)
+{
+	LegoOmni::GetInstance()->SetWorld(p_world);
+}
+
 // FUNCTION: LEGO1 0x10015900
 MxTransitionManager* TransitionManager()
 {
diff --git a/LEGO1/omni/include/mxentity.h b/LEGO1/omni/include/mxentity.h
index 2dd9ccf1..40742896 100644
--- a/LEGO1/omni/include/mxentity.h
+++ b/LEGO1/omni/include/mxentity.h
@@ -4,7 +4,7 @@
 #include "decomp.h"
 #include "mxatomid.h"
 #include "mxcore.h"
-#include "mxdsobject.h"
+#include "mxdsaction.h"
 #include "mxtypes.h"
 
 // VTABLE: LEGO1 0x100d5390
@@ -38,10 +38,10 @@ class MxEntity : public MxCore {
 		return SUCCESS;
 	}; // vtable+0x14
 
-	inline MxResult Create(MxDSObject& p_dsObject)
+	inline MxResult Create(MxDSAction& p_dsAction)
 	{
-		m_mxEntityId = p_dsObject.GetObjectId();
-		m_atom = p_dsObject.GetAtomId();
+		m_mxEntityId = p_dsAction.GetObjectId();
+		m_atom = p_dsAction.GetAtomId();
 		return SUCCESS;
 	}
 

From 5b8ea3575695aca84a75b175617031fd7f44467f Mon Sep 17 00:00:00 2001
From: Misha <106913236+MishaProductions@users.noreply.github.com>
Date: Sat, 13 Jan 2024 15:42:09 -0500
Subject: [PATCH 107/210] Implement Isle::VTable0x50 (#432)

* push changes

* fix formatting

* Fix structure

* Fix return

---------

Co-authored-by: Christian Semmler <mail@csemmler.com>
---
 LEGO1/lego/legoomni/include/act1state.h       | 11 +++++++
 LEGO1/lego/legoomni/include/isle.h            |  1 +
 .../legoomni/include/legoanimationmanager.h   |  1 +
 LEGO1/lego/legoomni/include/legoentity.h      |  2 +-
 LEGO1/lego/legoomni/include/legogamestate.h   |  2 +-
 .../lego/legoomni/include/legovideomanager.h  |  1 +
 LEGO1/lego/legoomni/src/act1/act1state.cpp    | 13 +++++++++
 .../legoomni/src/common/legogamestate.cpp     | 29 +++++++++++++++++--
 LEGO1/lego/legoomni/src/isle/isle.cpp         | 22 ++++++++++++--
 .../src/video/legoanimationmanager.cpp        |  5 ++++
 10 files changed, 81 insertions(+), 6 deletions(-)

diff --git a/LEGO1/lego/legoomni/include/act1state.h b/LEGO1/lego/legoomni/include/act1state.h
index d0daec7d..84537e88 100644
--- a/LEGO1/lego/legoomni/include/act1state.h
+++ b/LEGO1/lego/legoomni/include/act1state.h
@@ -24,10 +24,21 @@ class Act1State : public LegoState {
 
 	inline void SetUnknown18(MxU32 p_unk0x18) { m_unk0x18 = p_unk0x18; }
 	inline MxU32 GetUnknown18() { return m_unk0x18; }
+	inline void SetUnknown21(MxS16 p_unk0x21) { m_unk0x21 = p_unk0x21; }
+	inline MxS16 GetUnknown21() { return m_unk0x21; }
+
+	void FUN_10034d00();
 
 protected:
 	undefined m_unk0x8[0x10]; // 0x8
 	MxU32 m_unk0x18;          // 0x18
+	undefined2 m_unk0x1c;     // 0x1c
+	undefined m_unk0x1e;      // 0x1e
+	undefined m_unk0x1f;      // 0x1f
+	undefined m_unk0x20;      // 0x20
+	MxBool m_unk0x21;         // 0x21
+	undefined m_unk0x22;      // 0x22
+							  // TODO
 };
 
 #endif // ACT1STATE_H
diff --git a/LEGO1/lego/legoomni/include/isle.h b/LEGO1/lego/legoomni/include/isle.h
index 6bf1fd48..d5b7c57b 100644
--- a/LEGO1/lego/legoomni/include/isle.h
+++ b/LEGO1/lego/legoomni/include/isle.h
@@ -57,6 +57,7 @@ class Isle : public LegoWorld {
 	MxLong HandleType17Notification(MxParam& p_param);
 	MxLong HandleType19Notification(MxParam& p_param);
 	MxLong HandleTransitionEnd();
+	void FUN_10032620();
 
 protected:
 	Act1State* m_act1state;   // 0xf8
diff --git a/LEGO1/lego/legoomni/include/legoanimationmanager.h b/LEGO1/lego/legoomni/include/legoanimationmanager.h
index 5c13947f..a781128e 100644
--- a/LEGO1/lego/legoomni/include/legoanimationmanager.h
+++ b/LEGO1/lego/legoomni/include/legoanimationmanager.h
@@ -27,6 +27,7 @@ class LegoAnimationManager : public MxCore {
 		return !strcmp(p_name, ClassName()) || MxCore::IsA(p_name);
 	}
 
+	void FUN_1005ef10();
 	void FUN_1005f6d0(MxBool);
 	void FUN_1005f720(undefined4);
 	void FUN_10064670(MxBool);
diff --git a/LEGO1/lego/legoomni/include/legoentity.h b/LEGO1/lego/legoomni/include/legoentity.h
index 21dd26a8..d892168d 100644
--- a/LEGO1/lego/legoomni/include/legoentity.h
+++ b/LEGO1/lego/legoomni/include/legoentity.h
@@ -3,7 +3,7 @@
 
 #include "decomp.h"
 #include "extra.h"
-#include "mxdsobject.h"
+#include "mxdsaction.h"
 #include "mxentity.h"
 #include "realtime/vector.h"
 #include "roi/legoroi.h"
diff --git a/LEGO1/lego/legoomni/include/legogamestate.h b/LEGO1/lego/legoomni/include/legogamestate.h
index 5f62b107..00781094 100644
--- a/LEGO1/lego/legoomni/include/legogamestate.h
+++ b/LEGO1/lego/legoomni/include/legogamestate.h
@@ -72,7 +72,7 @@ class LegoGameState {
 	undefined m_unk0x41a[8];                    // 0x41a - might be part of the structure at 0xa6
 	MxBool m_isDirty;                           // 0x420
 	undefined4 m_unk0x424;                      // 0x424
-	undefined4 m_unk0x428;                      // 0x428
+	undefined4 m_prevArea;                      // 0x428
 	undefined4 m_unk0x42c;                      // 0x42c
 };
 
diff --git a/LEGO1/lego/legoomni/include/legovideomanager.h b/LEGO1/lego/legoomni/include/legovideomanager.h
index 898204da..6921e7d2 100644
--- a/LEGO1/lego/legoomni/include/legovideomanager.h
+++ b/LEGO1/lego/legoomni/include/legovideomanager.h
@@ -41,6 +41,7 @@ class LegoVideoManager : public MxVideoManager {
 	inline Lego3DManager* Get3DManager() { return this->m_3dManager; }
 	inline MxDirect3D* GetDirect3D() { return this->m_direct3d; }
 	inline void SetRender3D(MxBool p_render3d) { this->m_render3d = p_render3d; }
+	inline void SetUnk0x554(MxBool p_unk0x554) { this->m_unk0x554 = p_unk0x554; }
 
 private:
 	MxResult CreateDirect3D();
diff --git a/LEGO1/lego/legoomni/src/act1/act1state.cpp b/LEGO1/lego/legoomni/src/act1/act1state.cpp
index c013b502..17f09277 100644
--- a/LEGO1/lego/legoomni/src/act1/act1state.cpp
+++ b/LEGO1/lego/legoomni/src/act1/act1state.cpp
@@ -2,6 +2,19 @@
 
 // STUB: LEGO1 0x100334b0
 Act1State::Act1State()
+{
+	// TODO
+	m_unk0x1e = 0;
+	m_unk0x18 = 1;
+	m_unk0x20 = 0;
+	m_unk0x1f = 0;
+	m_unk0x21 = TRUE;
+	m_unk0x22 = 0;
+	m_unk0x1c = 1;
+}
+
+// STUB: LEGO1 0x10034d00
+void Act1State::FUN_10034d00()
 {
 	// TODO
 }
diff --git a/LEGO1/lego/legoomni/src/common/legogamestate.cpp b/LEGO1/lego/legoomni/src/common/legogamestate.cpp
index a081248c..4bf4ab82 100644
--- a/LEGO1/lego/legoomni/src/common/legogamestate.cpp
+++ b/LEGO1/lego/legoomni/src/common/legogamestate.cpp
@@ -1,9 +1,13 @@
 #include "legogamestate.h"
 
 #include "infocenterstate.h"
+#include "legoanimationmanager.h"
 #include "legoomni.h"
 #include "legostate.h"
 #include "legostream.h"
+#include "legoutil.h"
+#include "legovideomanager.h"
+#include "mxbackgroundaudiomanager.h"
 #include "mxobjectfactory.h"
 #include "mxstring.h"
 #include "mxvariabletable.h"
@@ -186,9 +190,30 @@ void LegoGameState::FUN_1003a720(MxU32)
 }
 
 // STUB: LEGO1 0x1003b060
-void LegoGameState::HandleAction(MxU32)
+void LegoGameState::HandleAction(MxU32 p_area)
 {
-	// TODO
+	m_prevArea = p_area;
+	BackgroundAudioManager()->Stop();
+	AnimationManager()->FUN_1005ef10();
+	VideoManager()->SetUnk0x554(0);
+
+	MxAtomId* script = g_isleScript;
+	switch (p_area) {
+	case 1:
+		break;
+	case 2:
+		VideoManager()->SetUnk0x554(1);
+		script = g_infomainScript;
+		break;
+	case 3:
+		VideoManager()->SetUnk0x554(1);
+		script = g_infodoorScript;
+		break;
+
+		// TODO: implement other cases
+	}
+
+	InvokeAction(ExtraActionType_opendisk, *script, 0, NULL);
 }
 
 // FUNCTION: LEGO1 0x1003bac0
diff --git a/LEGO1/lego/legoomni/src/isle/isle.cpp b/LEGO1/lego/legoomni/src/isle/isle.cpp
index d10e18ad..4fba4bb5 100644
--- a/LEGO1/lego/legoomni/src/isle/isle.cpp
+++ b/LEGO1/lego/legoomni/src/isle/isle.cpp
@@ -152,10 +152,22 @@ MxLong Isle::StopAction(MxParam& p_param)
 	return 0;
 }
 
-// STUB: LEGO1 0x10030fc0
+// FUNCTION: LEGO1 0x10030fc0
 void Isle::VTable0x50()
 {
-	// TODO
+	LegoWorld::VTable0x50();
+
+	if (m_act1state->GetUnknown21()) {
+		GameState()->HandleAction(2);
+		m_act1state->SetUnknown18(0);
+		m_act1state->SetUnknown21(0);
+	}
+	else if (GameState()->GetCurrentAct()) {
+		FUN_1003ef00(TRUE);
+		FUN_10032620();
+		m_act1state->FUN_10034d00();
+		FUN_10015820(0, 7);
+	}
 }
 
 // STUB: LGEO1 0x10031030
@@ -176,6 +188,12 @@ void Isle::VTable0x68(MxBool p_add)
 	// TODO
 }
 
+// STUB: LEGO1 0x10032620
+void Isle::FUN_10032620()
+{
+	// TODO
+}
+
 // STUB: LEGO1 0x100327a0
 MxLong Isle::HandleTransitionEnd()
 {
diff --git a/LEGO1/lego/legoomni/src/video/legoanimationmanager.cpp b/LEGO1/lego/legoomni/src/video/legoanimationmanager.cpp
index 578cf55d..476c6291 100644
--- a/LEGO1/lego/legoomni/src/video/legoanimationmanager.cpp
+++ b/LEGO1/lego/legoomni/src/video/legoanimationmanager.cpp
@@ -21,6 +21,11 @@ LegoAnimationManager::~LegoAnimationManager()
 	// TODO
 }
 
+// STUB: LEGO1 0x1005ef10
+void LegoAnimationManager::FUN_1005ef10()
+{
+}
+
 // STUB: LEGO1 0x1005f130
 void LegoAnimationManager::Init()
 {

From 8b34b38ac007c9135c1c2f90d76bc04af77b6458 Mon Sep 17 00:00:00 2001
From: Misha <106913236+MishaProductions@users.noreply.github.com>
Date: Sat, 13 Jan 2024 17:06:13 -0500
Subject: [PATCH 108/210] implement LegoActorPresenter (#434)

* LegoActorPresenter

* Add ddtor

---------

Co-authored-by: Christian Semmler <mail@csemmler.com>
---
 CMakeLists.txt                                |  1 +
 .../legoomni/include/legoactorpresenter.h     |  9 +++++
 LEGO1/lego/legoomni/include/legoentity.h      |  2 +
 .../src/entity/legoactorpresenter.cpp         | 39 +++++++++++++++++++
 4 files changed, 51 insertions(+)
 create mode 100644 LEGO1/lego/legoomni/src/entity/legoactorpresenter.cpp

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 25422132..d1ee7682 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -60,6 +60,7 @@ add_library(lego1 SHARED
   LEGO1/lego/legoomni/src/control/legocontrolmanager.cpp
   LEGO1/lego/legoomni/src/control/mxcontrolpresenter.cpp
   LEGO1/lego/legoomni/src/entity/legoactor.cpp
+  LEGO1/lego/legoomni/src/entity/legoactorpresenter.cpp
   LEGO1/lego/legoomni/src/entity/legoanimactor.cpp
   LEGO1/lego/legoomni/src/entity/legocameracontroller.cpp
   LEGO1/lego/legoomni/src/entity/legoentity.cpp
diff --git a/LEGO1/lego/legoomni/include/legoactorpresenter.h b/LEGO1/lego/legoomni/include/legoactorpresenter.h
index a9709686..a9b8ae7e 100644
--- a/LEGO1/lego/legoomni/include/legoactorpresenter.h
+++ b/LEGO1/lego/legoomni/include/legoactorpresenter.h
@@ -7,6 +7,8 @@
 // SIZE 0x50
 class LegoActorPresenter : public LegoEntityPresenter {
 public:
+	virtual ~LegoActorPresenter() override{};
+
 	// FUNCTION: LEGO1 0x1000cb10
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
@@ -19,6 +21,13 @@ class LegoActorPresenter : public LegoEntityPresenter {
 	{
 		return !strcmp(p_name, LegoActorPresenter::ClassName()) || LegoEntityPresenter::IsA(p_name);
 	}
+
+	virtual void ReadyTickle() override;    // vtable+0x18
+	virtual void StartingTickle() override; // vtable+0x1c
+	virtual void ParseExtra() override;     // vtable+0x30
 };
 
+// SYNTHETIC: LEGO1 0x1000cc30
+// LegoActorPresenter::`scalar deleting destructor'
+
 #endif // LEGOACTORPRESENTER_H
diff --git a/LEGO1/lego/legoomni/include/legoentity.h b/LEGO1/lego/legoomni/include/legoentity.h
index d892168d..56960110 100644
--- a/LEGO1/lego/legoomni/include/legoentity.h
+++ b/LEGO1/lego/legoomni/include/legoentity.h
@@ -52,6 +52,8 @@ class LegoEntity : public MxEntity {
 	void FUN_10010c30();
 	void SetLocation(Mx3DPointFloat& p_location, Mx3DPointFloat& p_direction, Mx3DPointFloat& p_up, MxBool);
 
+	inline LegoROI* GetROI() { return m_roi; }
+
 protected:
 	void Init();
 	void SetWorld();
diff --git a/LEGO1/lego/legoomni/src/entity/legoactorpresenter.cpp b/LEGO1/lego/legoomni/src/entity/legoactorpresenter.cpp
new file mode 100644
index 00000000..be5e86cc
--- /dev/null
+++ b/LEGO1/lego/legoomni/src/entity/legoactorpresenter.cpp
@@ -0,0 +1,39 @@
+#include "legoactorpresenter.h"
+
+#include "legoentity.h"
+#include "legoomni.h"
+
+// FUNCTION: LEGO1 0x10076c30
+void LegoActorPresenter::ReadyTickle()
+{
+	if (GetCurrentWorld()) {
+		m_objectBackend = (LegoEntity*) CreateEntityBackend("LegoActor");
+		if (m_objectBackend) {
+			SetBackendLocation(m_action->GetLocation(), m_action->GetDirection(), m_action->GetUp());
+			m_objectBackend->Create(*m_action);
+		}
+		ProgressTickleState(TickleState_Starting);
+	}
+}
+
+// FUNCTION: LEGO1 0x10076c90
+void LegoActorPresenter::StartingTickle()
+{
+	if (m_objectBackend->GetROI()) {
+		ProgressTickleState(TickleState_Streaming);
+		ParseExtra();
+	}
+}
+
+// FUNCTION: LEGO1 0x10076cc0
+void LegoActorPresenter::ParseExtra()
+{
+	char buffer[512];
+	char* extraData = m_action->GetExtraData();
+	if (m_action->GetExtraLength()) {
+		memcpy(buffer, extraData, m_action->GetExtraLength());
+		buffer[m_action->GetExtraLength()] = 0;
+
+		m_objectBackend->ParseAction(buffer);
+	}
+}

From 7f7e6e37dd73e85c70103332964977c5e330b042 Mon Sep 17 00:00:00 2001
From: Misha <106913236+MishaProductions@users.noreply.github.com>
Date: Sat, 13 Jan 2024 20:34:54 -0500
Subject: [PATCH 109/210] implement LegoOmni::FindByEntityIdOrAtomId (#435)

* push changes

* Match and add annotations

* Fix annotations

---------

Co-authored-by: Christian Semmler <mail@csemmler.com>
---
 LEGO1/lego/legoomni/include/legoworldlist.h | 25 +++++++++++++++++++++
 LEGO1/lego/legoomni/src/main/legoomni.cpp   | 15 +++++++++++--
 LEGO1/omni/include/mxdsactionlist.h         |  1 +
 LEGO1/omni/include/mxentity.h               |  3 +++
 LEGO1/omni/include/mxlist.h                 |  3 +++
 LEGO1/omni/include/mxstreamchunklist.h      |  1 +
 LEGO1/omni/include/mxstringlist.h           |  1 +
 LEGO1/omni/src/action/mxdsselectaction.cpp  |  2 ++
 8 files changed, 49 insertions(+), 2 deletions(-)

diff --git a/LEGO1/lego/legoomni/include/legoworldlist.h b/LEGO1/lego/legoomni/include/legoworldlist.h
index 22cf5838..e8acbb69 100644
--- a/LEGO1/lego/legoomni/include/legoworldlist.h
+++ b/LEGO1/lego/legoomni/include/legoworldlist.h
@@ -28,6 +28,19 @@ class LegoWorldList : public MxPtrList<LegoWorld> {
 	}; // vtable+0x14
 };
 
+// VTABLE: LEGO1 0x100d75b8
+// class MxListCursor<LegoWorld *>
+
+// VTABLE: LEGO1 0x100d7588
+// class MxPtrListCursor<LegoWorld>
+
+// VTABLE: LEGO1 0x100d75a0
+// SIZE 0x10
+class LegoWorldListCursor : public MxPtrListCursor<LegoWorld> {
+public:
+	LegoWorldListCursor(LegoWorldList* p_list) : MxPtrListCursor<LegoWorld>(p_list){};
+};
+
 // TEMPLATE: LEGO1 0x100598f0
 // MxCollection<LegoWorld *>::Compare
 
@@ -52,4 +65,16 @@ class LegoWorldList : public MxPtrList<LegoWorld> {
 // SYNTHETIC: LEGO1 0x10059be0
 // MxPtrList<LegoWorld>::`scalar deleting destructor'
 
+// SYNTHETIC: LEGO1 0x1003e870
+// LegoWorldListCursor::`scalar deleting destructor'
+
+// FUNCTION: LEGO1 0x1003e8e0
+// MxPtrListCursor<LegoWorld>::~MxPtrListCursor<LegoWorld>
+
+// FUNCTION: LEGO1 0x1003ea10
+// MxListCursor<LegoWorld *>::~MxListCursor<LegoWorld *>
+
+// FUNCTION: LEGO1 0x1003ea60
+// LegoWorldListCursor::~LegoWorldListCursor
+
 #endif // LEGOWORLDLIST_H
diff --git a/LEGO1/lego/legoomni/src/main/legoomni.cpp b/LEGO1/lego/legoomni/src/main/legoomni.cpp
index ef7cca9b..5bb47d0c 100644
--- a/LEGO1/lego/legoomni/src/main/legoomni.cpp
+++ b/LEGO1/lego/legoomni/src/main/legoomni.cpp
@@ -23,6 +23,7 @@
 #include "mxtransitionmanager.h"
 
 DECOMP_SIZE_ASSERT(LegoWorldList, 0x18);
+DECOMP_SIZE_ASSERT(LegoWorldListCursor, 0x10);
 
 // GLOBAL: LEGO1 0x100f451c
 MxAtomId* g_copterScript = NULL;
@@ -597,10 +598,20 @@ void LegoOmni::RemoveWorld(const MxAtomId&, MxLong)
 	// TODO
 }
 
-// STUB: LEGO1 0x1005b0c0
+// FUNCTION: LEGO1 0x1005b0c0
 LegoEntity* LegoOmni::FindByEntityIdOrAtomId(const MxAtomId& p_atom, MxS32 p_entityid)
 {
-	// TODO
+	if (m_worldList) {
+		LegoWorld* world;
+		LegoWorldListCursor cursor(m_worldList);
+
+		while (cursor.Next(world)) {
+			if ((p_entityid == -1 || world->GetEntityId() == p_entityid) &&
+				(!p_atom.GetInternal() || world->GetAtom() == p_atom))
+				return world;
+		}
+	}
+
 	return NULL;
 }
 
diff --git a/LEGO1/omni/include/mxdsactionlist.h b/LEGO1/omni/include/mxdsactionlist.h
index fbccd5cf..60c3db6d 100644
--- a/LEGO1/omni/include/mxdsactionlist.h
+++ b/LEGO1/omni/include/mxdsactionlist.h
@@ -35,6 +35,7 @@ class MxDSActionList : public MxList<MxDSAction*> {
 // class MxListCursor<MxDSAction *>
 
 // VTABLE: LEGO1 0x100d7e50
+// SIZE 0x10
 class MxDSActionListCursor : public MxListCursor<MxDSAction*> {
 public:
 	MxDSActionListCursor(MxDSActionList* p_list) : MxListCursor<MxDSAction*>(p_list){};
diff --git a/LEGO1/omni/include/mxentity.h b/LEGO1/omni/include/mxentity.h
index 40742896..cc77cea2 100644
--- a/LEGO1/omni/include/mxentity.h
+++ b/LEGO1/omni/include/mxentity.h
@@ -45,6 +45,9 @@ class MxEntity : public MxCore {
 		return SUCCESS;
 	}
 
+	inline MxS32 GetEntityId() { return m_mxEntityId; }
+	inline MxAtomId& GetAtom() { return m_atom; }
+
 protected:
 	MxS32 m_mxEntityId; // 0x8
 	MxAtomId m_atom;    // 0xc
diff --git a/LEGO1/omni/include/mxlist.h b/LEGO1/omni/include/mxlist.h
index 911d5a36..99330975 100644
--- a/LEGO1/omni/include/mxlist.h
+++ b/LEGO1/omni/include/mxlist.h
@@ -69,6 +69,7 @@ class MxList : protected MxCollection<T> {
 	MxListEntry<T>* InsertEntry(T, MxListEntry<T>*, MxListEntry<T>*);
 };
 
+// SIZE 0x18
 template <class T>
 class MxPtrList : public MxList<T*> {
 public:
@@ -82,6 +83,7 @@ class MxPtrList : public MxList<T*> {
 	}
 };
 
+// SIZE 0x10
 template <class T>
 class MxListCursor : public MxCore {
 public:
@@ -128,6 +130,7 @@ class MxListCursor : public MxCore {
 	MxListEntry<T>* m_match; // 0x0c
 };
 
+// SIZE 0x10
 template <class T>
 class MxPtrListCursor : public MxListCursor<T*> {
 public:
diff --git a/LEGO1/omni/include/mxstreamchunklist.h b/LEGO1/omni/include/mxstreamchunklist.h
index 02dcd2d9..12507961 100644
--- a/LEGO1/omni/include/mxstreamchunklist.h
+++ b/LEGO1/omni/include/mxstreamchunklist.h
@@ -29,6 +29,7 @@ class MxStreamChunkList : public MxList<MxStreamChunk*> {
 };
 
 // VTABLE: LEGO1 0x100dc510
+// SIZE 0x10
 class MxStreamChunkListCursor : public MxListCursor<MxStreamChunk*> {
 public:
 	MxStreamChunkListCursor(MxStreamChunkList* p_list) : MxListCursor<MxStreamChunk*>(p_list){};
diff --git a/LEGO1/omni/include/mxstringlist.h b/LEGO1/omni/include/mxstringlist.h
index 6e75683d..8651f4c4 100644
--- a/LEGO1/omni/include/mxstringlist.h
+++ b/LEGO1/omni/include/mxstringlist.h
@@ -9,6 +9,7 @@
 class MxStringList : public MxList<MxString> {};
 
 // VTABLE: LEGO1 0x100dd058
+// SIZE 0x10
 class MxStringListCursor : public MxListCursor<MxString> {
 public:
 	MxStringListCursor(MxStringList* p_list) : MxListCursor<MxString>(p_list){};
diff --git a/LEGO1/omni/src/action/mxdsselectaction.cpp b/LEGO1/omni/src/action/mxdsselectaction.cpp
index 27f3a9cf..e2db17e2 100644
--- a/LEGO1/omni/src/action/mxdsselectaction.cpp
+++ b/LEGO1/omni/src/action/mxdsselectaction.cpp
@@ -5,6 +5,8 @@
 #include "mxvariabletable.h"
 
 DECOMP_SIZE_ASSERT(MxDSSelectAction, 0xb0)
+DECOMP_SIZE_ASSERT(MxStringList, 0x18)
+DECOMP_SIZE_ASSERT(MxStringListCursor, 0x10)
 DECOMP_SIZE_ASSERT(MxListEntry<MxString>, 0x18)
 
 // FUNCTION: LEGO1 0x100cb2b0

From 7e9d3bde659c1307852e2c5d0d3d8731b43309f1 Mon Sep 17 00:00:00 2001
From: MS <disinvite@users.noreply.github.com>
Date: Sun, 14 Jan 2024 16:28:46 -0500
Subject: [PATCH 110/210] 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>
---
 LEGO1/define.cpp                              |  22 +-
 LEGO1/lego/legoomni/include/isleactor.h       |   6 +
 LEGO1/lego/legoomni/include/islepathactor.h   |   3 +
 LEGO1/lego/legoomni/include/legoactor.h       |   4 +
 .../lego/legoomni/include/legoanimpresenter.h |   4 +
 .../include/legoeventnotificationparam.h      |   8 +-
 .../legoomni/include/legohideanimpresenter.h  |   4 +
 .../lego/legoomni/include/legoinputmanager.h  |   6 +
 .../include/legoloopinganimpresenter.h        |   6 +
 LEGO1/lego/legoomni/include/legostream.h      |  18 +-
 .../legoomni/include/legounknown100d7c88.h    |   1 +
 .../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     |  14 +-
 LEGO1/lego/legoomni/src/entity/legoactor.cpp  |   6 +
 LEGO1/lego/legoomni/src/entity/legoentity.cpp |   2 +-
 .../lego/legoomni/src/isle/islepathactor.cpp  |   7 +
 LEGO1/lego/legoomni/src/main/legoomni.cpp     |   4 +-
 .../legoomni/src/video/legoanimpresenter.cpp  |   6 +
 .../src/video/legohideanimpresenter.cpp       |   6 +
 LEGO1/lego/sources/3dmanager/legoview1.h      |   2 +-
 LEGO1/library_msvc.h                          |  76 +++
 LEGO1/mxdirectx/mxdirect3d.h                  |  11 +-
 LEGO1/mxdirectx/mxstopwatch.h                 |   6 +
 .../omni/include/mxactionnotificationparam.h  |  12 +
 LEGO1/omni/include/mxatomidcounter.h          |  46 ++
 LEGO1/omni/include/mxaudiopresenter.h         |   6 +
 LEGO1/omni/include/mxdiskstreamcontroller.h   |   5 +-
 LEGO1/omni/include/mxdiskstreamprovider.h     |  15 +-
 LEGO1/omni/include/mxdsaction.h               |   1 +
 LEGO1/omni/include/mxdsactionlist.h           |   3 +
 LEGO1/omni/include/mxdsevent.h                |   1 +
 LEGO1/omni/include/mxdssource.h               |   6 +
 LEGO1/omni/include/mxnotificationmanager.h    |  30 ++
 LEGO1/omni/include/mxnotificationparam.h      |  13 +-
 LEGO1/omni/include/mxomnicreateparam.h        |   4 +
 LEGO1/omni/include/mxparam.h                  |   9 +
 LEGO1/omni/include/mxpresenterlist.h          |   3 +
 LEGO1/omni/include/mxrectlist.h               |   3 +
 LEGO1/omni/include/mxregionlist.h             |  18 +
 LEGO1/omni/include/mxsemaphore.h              |   3 +-
 LEGO1/omni/include/mxstreamchunklist.h        |   3 +
 LEGO1/omni/include/mxstreamer.h               |  18 +-
 LEGO1/omni/include/mxstreamprovider.h         |   3 +
 LEGO1/omni/include/mxstringlist.h             |  15 +
 LEGO1/omni/include/mxticklemanager.h          |   6 +
 LEGO1/omni/include/mxvariable.h               |   7 +-
 LEGO1/omni/include/mxvariabletable.h          |   6 +
 LEGO1/omni/include/mxvideopresenter.h         |   1 +
 LEGO1/omni/src/action/mxdsaction.cpp          |   6 +
 LEGO1/omni/src/event/mxeventpresenter.cpp     |   2 +-
 .../omni/src/stream/mxdiskstreamprovider.cpp  |   9 +-
 LEGO1/omni/src/stream/mxramstreamprovider.cpp |   4 +-
 LEGO1/omni/src/video/mxdisplaysurface.cpp     |   1 +
 LEGO1/omni/src/video/mxstillpresenter.cpp     |   4 +-
 LEGO1/realtime/orientableroi.h                |   9 +-
 LEGO1/realtime/realtimeview.cpp               |   3 +-
 LEGO1/realtime/roi.h                          |   4 +
 LEGO1/tgl/d3drm/impl.h                        |  18 +-
 LEGO1/tgl/tgl.h                               |  20 +-
 LEGO1/viewmanager/viewlodlist.h               |  16 +
 tools/isledecomp/isledecomp/bin.py            |  88 ++++
 .../isledecomp/compare/asm/__init__.py        |   2 +
 .../isledecomp/compare/asm/parse.py           | 152 ++++++
 .../isledecomp/isledecomp/compare/asm/swap.py |  80 +++
 tools/isledecomp/isledecomp/compare/core.py   | 144 +++++-
 tools/isledecomp/isledecomp/compare/db.py     |  66 ++-
 tools/isledecomp/isledecomp/cvdump/parser.py  |   2 +-
 tools/isledecomp/isledecomp/utils.py          |  14 -
 tools/isledecomp/tests/test_sanitize.py       | 179 +++++++
 tools/reccmp/reccmp.py                        | 486 ++++++------------
 73 files changed, 1357 insertions(+), 427 deletions(-)
 create mode 100644 tools/isledecomp/isledecomp/compare/asm/__init__.py
 create mode 100644 tools/isledecomp/isledecomp/compare/asm/parse.py
 create mode 100644 tools/isledecomp/isledecomp/compare/asm/swap.py
 create mode 100644 tools/isledecomp/tests/test_sanitize.py

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/isleactor.h b/LEGO1/lego/legoomni/include/isleactor.h
index 8fd7d039..1c2ddc5c 100644
--- a/LEGO1/lego/legoomni/include/isleactor.h
+++ b/LEGO1/lego/legoomni/include/isleactor.h
@@ -20,4 +20,10 @@ class IsleActor : public LegoActor {
 	}
 };
 
+// SYNTHETIC: LEGO1 0x1000e940
+// IsleActor::~IsleActor
+
+// SYNTHETIC: LEGO1 0x1000e990
+// IsleActor::`scalar deleting destructor'
+
 #endif // ISLEACTOR_H
diff --git a/LEGO1/lego/legoomni/include/islepathactor.h b/LEGO1/lego/legoomni/include/islepathactor.h
index 559e4bca..96a3dce7 100644
--- a/LEGO1/lego/legoomni/include/islepathactor.h
+++ b/LEGO1/lego/legoomni/include/islepathactor.h
@@ -13,6 +13,8 @@
 class IslePathActor : public LegoPathActor {
 public:
 	IslePathActor();
+
+	// FUNCTION: LEGO1 0x10002e10
 	inline virtual ~IslePathActor() override { IslePathActor::Destroy(TRUE); } // vtable+0x0
 
 	// FUNCTION: LEGO1 0x10002ea0
@@ -29,6 +31,7 @@ class IslePathActor : public LegoPathActor {
 	}
 
 	virtual MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
+	virtual void Destroy(MxBool p_fromDestructor) override;   // vtable+0x1c
 	// FUNCTION: LEGO1 0x10002e70
 	virtual MxU32 VTable0xcc() { return 0; } // vtable+0xcc
 	// FUNCTION: LEGO1 0x10002df0
diff --git a/LEGO1/lego/legoomni/include/legoactor.h b/LEGO1/lego/legoomni/include/legoactor.h
index 95c991df..a183a249 100644
--- a/LEGO1/lego/legoomni/include/legoactor.h
+++ b/LEGO1/lego/legoomni/include/legoactor.h
@@ -9,6 +9,7 @@
 class LegoActor : public LegoEntity {
 public:
 	LegoActor();
+	virtual ~LegoActor() override;
 
 	// FUNCTION: LEGO1 0x1002d210
 	inline virtual const char* ClassName() const override // vtable+0x0c
@@ -43,4 +44,7 @@ class LegoActor : public LegoEntity {
 	MxU8 m_unk0x74;       // 0x74
 };
 
+// SYNTHETIC: LEGO1 0x1002d300
+// LegoActor::`scalar deleting destructor'
+
 #endif // LEGOACTOR_H
diff --git a/LEGO1/lego/legoomni/include/legoanimpresenter.h b/LEGO1/lego/legoomni/include/legoanimpresenter.h
index de8e91d9..3d43dd9f 100644
--- a/LEGO1/lego/legoomni/include/legoanimpresenter.h
+++ b/LEGO1/lego/legoomni/include/legoanimpresenter.h
@@ -7,6 +7,7 @@
 class LegoAnimPresenter : public MxVideoPresenter {
 public:
 	LegoAnimPresenter();
+	virtual ~LegoAnimPresenter() override;
 
 	// FUNCTION: LEGO1 0x10068530
 	inline virtual const char* ClassName() const override // vtable+0x0c
@@ -25,4 +26,7 @@ class LegoAnimPresenter : public MxVideoPresenter {
 	void Init();
 };
 
+// SYNTHETIC: LEGO1 0x10068650
+// LegoAnimPresenter::`scalar deleting destructor'
+
 #endif // LEGOANIMPRESENTER_H
diff --git a/LEGO1/lego/legoomni/include/legoeventnotificationparam.h b/LEGO1/lego/legoomni/include/legoeventnotificationparam.h
index c9087909..8f752cce 100644
--- a/LEGO1/lego/legoomni/include/legoeventnotificationparam.h
+++ b/LEGO1/lego/legoomni/include/legoeventnotificationparam.h
@@ -7,6 +7,7 @@
 #include <stdlib.h>
 
 // VTABLE: LEGO1 0x100d6aa0
+// SIZE 0x20
 class LegoEventNotificationParam : public MxNotificationParam {
 public:
 	inline LegoEventNotificationParam() : MxNotificationParam(PARAM_NONE, NULL) {}
@@ -22,7 +23,6 @@ class LegoEventNotificationParam : public MxNotificationParam {
 	{
 	}
 
-	virtual ~LegoEventNotificationParam() override {} // vtable+0x0 (scalar deleting destructor)
 	inline MxU8 GetKey() const { return m_key; }
 
 protected:
@@ -33,4 +33,10 @@ class LegoEventNotificationParam : public MxNotificationParam {
 	MxU32 m_unk0x1c; // 0x1c
 };
 
+// SYNTHETIC: LEGO1 0x10028770
+// LegoEventNotificationParam::`scalar deleting destructor'
+
+// SYNTHETIC: LEGO1 0x100287e0
+// LegoEventNotificationParam::~LegoEventNotificationParam
+
 #endif // LEGOEVENTNOTIFICATIONPARAM_H
diff --git a/LEGO1/lego/legoomni/include/legohideanimpresenter.h b/LEGO1/lego/legoomni/include/legohideanimpresenter.h
index f6e86c2e..fda96c98 100644
--- a/LEGO1/lego/legoomni/include/legohideanimpresenter.h
+++ b/LEGO1/lego/legoomni/include/legohideanimpresenter.h
@@ -8,6 +8,7 @@
 class LegoHideAnimPresenter : public LegoLoopingAnimPresenter {
 public:
 	LegoHideAnimPresenter();
+	virtual ~LegoHideAnimPresenter() override;
 
 	// FUNCTION: LEGO1 0x1006d880
 	inline const char* ClassName() const override // vtable+0xc
@@ -26,4 +27,7 @@ class LegoHideAnimPresenter : public LegoLoopingAnimPresenter {
 	void Init();
 };
 
+// SYNTHETIC: LEGO1 0x1006d9d0
+// LegoHideAnimPresenter::`scalar deleting destructor'
+
 #endif // LEGOHIDEANIMPRESENTER_H
diff --git a/LEGO1/lego/legoomni/include/legoinputmanager.h b/LEGO1/lego/legoomni/include/legoinputmanager.h
index 961d8ffc..59e0a949 100644
--- a/LEGO1/lego/legoomni/include/legoinputmanager.h
+++ b/LEGO1/lego/legoomni/include/legoinputmanager.h
@@ -94,6 +94,9 @@ class LegoInputManager : public MxPresenter {
 // TEMPLATE: LEGO1 0x1005bb80
 // MxCollection<LegoEventNotificationParam>::Compare
 
+// TEMPLATE: LEGO1 0x1005bbe0
+// MxCollection<LegoEventNotificationParam>::~MxCollection<LegoEventNotificationParam>
+
 // TEMPLATE: LEGO1 0x1005bc30
 // MxCollection<LegoEventNotificationParam>::Destroy
 
@@ -109,6 +112,9 @@ class LegoInputManager : public MxPresenter {
 // SYNTHETIC: LEGO1 0x1005beb0
 // LegoEventQueue::`scalar deleting destructor'
 
+// TEMPLATE: LEGO1 0x1005bf20
+// MxQueue<LegoEventNotificationParam>::~MxQueue<LegoEventNotificationParam>
+
 // SYNTHETIC: LEGO1 0x1005bf70
 // MxQueue<LegoEventNotificationParam>::`scalar deleting destructor'
 
diff --git a/LEGO1/lego/legoomni/include/legoloopinganimpresenter.h b/LEGO1/lego/legoomni/include/legoloopinganimpresenter.h
index a17c671c..844d1586 100644
--- a/LEGO1/lego/legoomni/include/legoloopinganimpresenter.h
+++ b/LEGO1/lego/legoomni/include/legoloopinganimpresenter.h
@@ -21,4 +21,10 @@ class LegoLoopingAnimPresenter : public LegoAnimPresenter {
 	}
 };
 
+// SYNTHETIC: LEGO1 0x1006d000
+// LegoLoopingAnimPresenter::~LegoLoopingAnimPresenter
+
+// SYNTHETIC: LEGO1 0x1000f440
+// LegoLoopingAnimPresenter::`scalar deleting destructor'
+
 #endif // LEGOLOOPINGANIMPRESENTER_H
diff --git a/LEGO1/lego/legoomni/include/legostream.h b/LEGO1/lego/legoomni/include/legostream.h
index 8b0a57c1..fe21ddba 100644
--- a/LEGO1/lego/legoomni/include/legostream.h
+++ b/LEGO1/lego/legoomni/include/legostream.h
@@ -18,7 +18,8 @@ class MxVariableTable;
 class LegoStream {
 public:
 	LegoStream() : m_mode(0) {}
-	inline virtual ~LegoStream(){};
+	// FUNCTION: LEGO1 0x10045ad0
+	inline virtual ~LegoStream() {}
 
 	virtual MxResult Read(void* p_buffer, MxU32 p_size) = 0;
 	virtual MxResult Write(const void* p_buffer, MxU32 p_size) = 0;
@@ -41,11 +42,14 @@ class LegoStream {
 	MxU8 m_mode;
 };
 
+// SYNTHETIC: LEGO1 0x10045b00
+// LegoStream::`scalar deleting destructor'
+
 // VTABLE: LEGO1 0x100db730
 class LegoFileStream : public LegoStream {
 public:
 	LegoFileStream();
-	virtual ~LegoFileStream();
+	virtual ~LegoFileStream() override;
 
 	MxResult Read(void* p_buffer, MxU32 p_size) override;
 	MxResult Write(const void* p_buffer, MxU32 p_size) override;
@@ -60,11 +64,13 @@ class LegoFileStream : public LegoStream {
 	FILE* m_hFile;
 };
 
+// SYNTHETIC: LEGO1 0x10099230
+// LegoFileStream::`scalar deleting destructor'
+
 // VTABLE: LEGO1 0x100db710
 class LegoMemoryStream : public LegoStream {
 public:
 	LegoMemoryStream(char* p_buffer);
-	~LegoMemoryStream() {}
 
 	MxResult Read(void* p_buffer, MxU32 p_size) override;
 	MxResult Write(const void* p_buffer, MxU32 p_size) override;
@@ -76,4 +82,10 @@ class LegoMemoryStream : public LegoStream {
 	MxU32 m_offset;
 };
 
+// SYNTHETIC: LEGO1 0x10045a80
+// LegoMemoryStream::~LegoMemoryStream
+
+// SYNTHETIC: LEGO1 0x100990f0
+// LegoMemoryStream::`scalar deleting destructor'
+
 #endif // LEGOSTREAM_H
diff --git a/LEGO1/lego/legoomni/include/legounknown100d7c88.h b/LEGO1/lego/legoomni/include/legounknown100d7c88.h
index a6004053..2fa960c8 100644
--- a/LEGO1/lego/legoomni/include/legounknown100d7c88.h
+++ b/LEGO1/lego/legoomni/include/legounknown100d7c88.h
@@ -4,6 +4,7 @@
 #include "decomp.h"
 #include "mxstring.h"
 
+// VTABLE: LEGO1 0x100d7c88
 class LegoUnknown100d7c88 {
 public:
 	~LegoUnknown100d7c88();
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 4bf4ab82..2291b72c 100644
--- a/LEGO1/lego/legoomni/src/common/legogamestate.cpp
+++ b/LEGO1/lego/legoomni/src/common/legogamestate.cpp
@@ -19,15 +19,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"},
@@ -168,7 +168,7 @@ void LegoGameState::GetFileSavePath(MxString* p_outPath, MxULong p_slotn)
 		strcpy(path, m_savePath);
 
 	// Slot: "G0", "G1", ...
-	strcat(path, "G");
+	strcat(path, "\\G");
 	baseForSlot[0] += p_slotn;
 	strcat(path, baseForSlot);
 
diff --git a/LEGO1/lego/legoomni/src/entity/legoactor.cpp b/LEGO1/lego/legoomni/src/entity/legoactor.cpp
index 46f59a77..e9010ef4 100644
--- a/LEGO1/lego/legoomni/src/entity/legoactor.cpp
+++ b/LEGO1/lego/legoomni/src/entity/legoactor.cpp
@@ -11,3 +11,9 @@ LegoActor::LegoActor()
 	m_unk0x10 = 0;
 	m_unk0x74 = 0;
 }
+
+// STUB: LEGO1 0x1002d320
+LegoActor::~LegoActor()
+{
+	// TODO
+}
diff --git a/LEGO1/lego/legoomni/src/entity/legoentity.cpp b/LEGO1/lego/legoomni/src/entity/legoentity.cpp
index e1a8c6f4..7e377671 100644
--- a/LEGO1/lego/legoomni/src/entity/legoentity.cpp
+++ b/LEGO1/lego/legoomni/src/entity/legoentity.cpp
@@ -46,7 +46,7 @@ MxResult LegoEntity::Create(MxDSAction& p_dsAction)
 {
 	m_mxEntityId = p_dsAction.GetObjectId();
 	m_atom = p_dsAction.GetAtomId();
-	Init();
+	SetWorld();
 	return SUCCESS;
 }
 
diff --git a/LEGO1/lego/legoomni/src/isle/islepathactor.cpp b/LEGO1/lego/legoomni/src/isle/islepathactor.cpp
index 036b3298..76ec41bd 100644
--- a/LEGO1/lego/legoomni/src/isle/islepathactor.cpp
+++ b/LEGO1/lego/legoomni/src/isle/islepathactor.cpp
@@ -17,6 +17,13 @@ MxResult IslePathActor::Create(MxDSAction& p_dsAction)
 	return MxEntity::Create(p_dsAction);
 }
 
+// FUNCTION: LEGO1 0x1001a2a0
+void IslePathActor::Destroy(MxBool p_fromDestructor)
+{
+	if (!p_fromDestructor)
+		LegoPathActor::Destroy(FALSE);
+}
+
 // STUB: LEGO1 0x1001a350
 void IslePathActor::VTable0xe0()
 {
diff --git a/LEGO1/lego/legoomni/src/main/legoomni.cpp b/LEGO1/lego/legoomni/src/main/legoomni.cpp
index 5bb47d0c..9cb67852 100644
--- a/LEGO1/lego/legoomni/src/main/legoomni.cpp
+++ b/LEGO1/lego/legoomni/src/main/legoomni.cpp
@@ -100,7 +100,7 @@ MxAtomId* g_testScript = NULL;
 // GLOBAL: LEGO1 0x100f457c
 MxAtomId* g_jukeboxwScript = NULL;
 
-// GLOBAL: LEGO1 0x100f4580c
+// GLOBAL: LEGO1 0x100f4580
 MxAtomId* g_sndAnimScript = NULL;
 
 // GLOBAL: LEGO1 0x100f4584
@@ -118,7 +118,7 @@ MxBool g_isWorldActive = TRUE;
 // FUNCTION: LEGO1 0x10015700
 LegoOmni* Lego()
 {
-	return (LegoOmni*) MxOmni::GetInstance();
+	return LegoOmni::GetInstance();
 }
 
 // FUNCTION: LEGO1 0x10015710
diff --git a/LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp b/LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp
index 2bdd7475..3c0883d6 100644
--- a/LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp
+++ b/LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp
@@ -6,6 +6,12 @@ LegoAnimPresenter::LegoAnimPresenter()
 	// TODO
 }
 
+// STUB: LEGO1 0x10068670
+LegoAnimPresenter::~LegoAnimPresenter()
+{
+	// TODO
+}
+
 // STUB: LEGO1 0x100686f0
 void LegoAnimPresenter::Init()
 {
diff --git a/LEGO1/lego/legoomni/src/video/legohideanimpresenter.cpp b/LEGO1/lego/legoomni/src/video/legohideanimpresenter.cpp
index f13165cc..9aa9f2fe 100644
--- a/LEGO1/lego/legoomni/src/video/legohideanimpresenter.cpp
+++ b/LEGO1/lego/legoomni/src/video/legohideanimpresenter.cpp
@@ -6,6 +6,12 @@ LegoHideAnimPresenter::LegoHideAnimPresenter()
 	Init();
 }
 
+// STUB: LEGO1 0x1006d9f0
+LegoHideAnimPresenter::~LegoHideAnimPresenter()
+{
+	// TODO
+}
+
 // STUB: LEGO1 0x1006da50
 void LegoHideAnimPresenter::Init()
 {
diff --git a/LEGO1/lego/sources/3dmanager/legoview1.h b/LEGO1/lego/sources/3dmanager/legoview1.h
index bfee4e3d..4060e54f 100644
--- a/LEGO1/lego/sources/3dmanager/legoview1.h
+++ b/LEGO1/lego/sources/3dmanager/legoview1.h
@@ -13,7 +13,7 @@ class Camera;
 /////////////////////////////////////////////////////////////////////////////
 // LegoView
 
-// VTABLE: 0x100dc000
+// VTABLE: LEGO1 0x100dc000
 // SIZE 0x78
 class LegoView : public TglSurface {
 public:
diff --git a/LEGO1/library_msvc.h b/LEGO1/library_msvc.h
index 20ae06ef..28e29187 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
@@ -33,6 +37,60 @@
 // LIBRARY: LEGO1 0x1008b5a0
 // _sprintf
 
+// LIBRARY: LEGO1 0x1008b608
+// __ftol
+
+// LIBRARY: LEGO1 0x1008b630
+// _srand
+
+// LIBRARY: LEGO1 0x1008b680
+// _strncmp
+
+// LIBRARY: LEGO1 0x1008b730
+// _fprintf
+
+// LIBRARY: LEGO1 0x1008b780
+// _fwrite
+
+// LIBRARY: LEGO1 0x1008b950
+// _fread
+
+// LIBRARY: LEGO1 0x1008bbd0
+// _fclose
+
+// LIBRARY: LEGO1 0x1008bdd0
+// _ftell
+
+// LIBRARY: LEGO1 0x1008bff0
+// _fopen
+
+// LIBRARY: LEGO1 0x1008c010
+// _strncpy
+
+// LIBRARY: LEGO1 0x1008c110
+// __strcmpi
+
+// LIBRARY: LEGO1 0x1008c1e0
+// __spawnl
+
+// LIBRARY: LEGO1 0x1008c200
+// _sscanf
+
+// LIBRARY: LEGO1 0x1008c410
+// _strlwr
+
+// LIBRARY: LEGO1 0x1008c5c0
+// _fseek
+
+// LIBRARY: LEGO1 0x1008ca60
+// _abort
+
+// LIBRARY: LEGO1 0x100977c0
+// _itoa
+
+// LIBRARY: LEGO1 0x10097b10
+// _strchr
+
 // LIBRARY: ISLE 0x4081e0
 // _srand
 
@@ -46,4 +104,22 @@
 // LIBRARY: ISLE 0x409190
 // __getptd
 
+// LIBRARY: LEGO1 0x100d1ed0
+// _strnicmp
+
+// LIBRARY: LEGO1 0x100d1fd0
+// _strupr
+
+// LIBRARY: LEGO1 0x100d2130
+// _vsprintf
+
+// LIBRARY: LEGO1 0x100d21c2
+// __CIpow
+
+// LIBRARY: LEGO1 0x100d21f0
+// _strstr
+
+// LIBRARY: LEGO1 0x100d2270
+// __beginthreadex
+
 #endif
diff --git a/LEGO1/mxdirectx/mxdirect3d.h b/LEGO1/mxdirectx/mxdirect3d.h
index f0c87c69..ab572c54 100644
--- a/LEGO1/mxdirectx/mxdirect3d.h
+++ b/LEGO1/mxdirectx/mxdirect3d.h
@@ -158,11 +158,15 @@ struct MxDriver {
 // List<MxDriver>::~List<MxDriver>
 
 // Compiler-generated copy ctor
-// Part of this function are two more synthetic sub-routines,
-// LEGO1 0x1009c400 and LEGO1 0x1009c460
 // SYNTHETIC: LEGO1 0x1009c290
 // MxDriver::MxDriver
 
+// SYNTHETIC: LEGO1 0x1009c400
+// list<MxDevice,allocator<MxDevice> >::insert
+
+// SYNTHETIC: LEGO1 0x1009c460
+// list<MxDisplayMode,allocator<MxDisplayMode> >::insert
+
 // SYNTHETIC: LEGO1 0x1009d450
 // MxDriver::`scalar deleting destructor'
 
@@ -223,4 +227,7 @@ class MxDeviceEnumerate {
 // SIZE 0x14
 class MxDeviceEnumerate100d9cc8 : public MxDeviceEnumerate {};
 
+// SYNTHETIC: LEGO1 0x1007b590
+// MxDeviceEnumerate100d9cc8::~MxDeviceEnumerate100d9cc8
+
 #endif // MXDIRECT3D_H
diff --git a/LEGO1/mxdirectx/mxstopwatch.h b/LEGO1/mxdirectx/mxstopwatch.h
index 7e7fcc38..0630d2f6 100644
--- a/LEGO1/mxdirectx/mxstopwatch.h
+++ b/LEGO1/mxdirectx/mxstopwatch.h
@@ -97,6 +97,9 @@ inline double MxStopWatch::ElapsedSeconds() const
 	return m_elapsedSeconds;
 }
 
+// SYNTHETIC: LEGO1 0x100a6fc0
+// MxStopWatch::~MxStopWatch
+
 //////////////////////////////////////////////////////////////////////////////
 //
 // MxFrequencyMeter
@@ -182,4 +185,7 @@ inline double MxFrequencyMeter::ElapsedSeconds() const
 	return m_stopWatch.ElapsedSeconds();
 }
 
+// SYNTHETIC: LEGO1 0x100abd10
+// MxFrequencyMeter::~MxFrequencyMeter
+
 #endif /* _MxStopWatch_h */
diff --git a/LEGO1/omni/include/mxactionnotificationparam.h b/LEGO1/omni/include/mxactionnotificationparam.h
index 750abd6d..d4e02124 100644
--- a/LEGO1/omni/include/mxactionnotificationparam.h
+++ b/LEGO1/omni/include/mxactionnotificationparam.h
@@ -115,13 +115,25 @@ class MxType4NotificationParam : public MxActionNotificationParam {
 	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
diff --git a/LEGO1/omni/include/mxatomidcounter.h b/LEGO1/omni/include/mxatomidcounter.h
index f2c4fb3f..79a98f34 100644
--- 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
diff --git a/LEGO1/omni/include/mxaudiopresenter.h b/LEGO1/omni/include/mxaudiopresenter.h
index 4033f84d..82e4b48a 100644
--- a/LEGO1/omni/include/mxaudiopresenter.h
+++ b/LEGO1/omni/include/mxaudiopresenter.h
@@ -33,4 +33,10 @@ class MxAudioPresenter : public MxMediaPresenter {
 	MxS32 m_volume;
 };
 
+// SYNTHETIC: LEGO1 0x1000d370
+// MxAudioPresenter::`scalar deleting destructor'
+
+// SYNTHETIC: LEGO1 0x1000d3e0
+// MxAudioPresenter::~MxAudioPresenter
+
 #endif // MXAUDIOPRESENTER_H
diff --git a/LEGO1/omni/include/mxdiskstreamcontroller.h b/LEGO1/omni/include/mxdiskstreamcontroller.h
index 01ddc78a..9e476afc 100644
--- a/LEGO1/omni/include/mxdiskstreamcontroller.h
+++ b/LEGO1/omni/include/mxdiskstreamcontroller.h
@@ -46,6 +46,7 @@ class MxDiskStreamController : public MxStreamController {
 	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 @@ class MxDiskStreamController : public MxStreamController {
 	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 @@ class MxDiskStreamController : public MxStreamController {
 	void FUN_100c8720();
 };
 
+// TEMPLATE: LEGO1 0x100c14d0
+// list<MxDSAction *,allocator<MxDSAction *> >::erase
+
 // TEMPLATE: LEGO1 0x100c7330
 // list<MxDSAction *,allocator<MxDSAction *> >::_Buynode
 
diff --git a/LEGO1/omni/include/mxdiskstreamprovider.h b/LEGO1/omni/include/mxdiskstreamprovider.h
index 6df049da..517fa463 100644
--- a/LEGO1/omni/include/mxdiskstreamprovider.h
+++ b/LEGO1/omni/include/mxdiskstreamprovider.h
@@ -20,9 +20,6 @@ class MxDiskStreamProviderThread : public MxThread {
 
 	MxResult Run() override;
 	MxResult StartWithTarget(MxDiskStreamProvider* p_target);
-
-	// SYNTHETIC: LEGO1 0x100d10a0
-	// MxDiskStreamProviderThread::`scalar deleting destructor'
 };
 
 // VTABLE: LEGO1 0x100dd138
@@ -58,9 +55,6 @@ class MxDiskStreamProvider : public MxStreamProvider {
 	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 @@ class MxDiskStreamProvider : public MxStreamProvider {
 	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
diff --git a/LEGO1/omni/include/mxdsaction.h b/LEGO1/omni/include/mxdsaction.h
index b4d6192e..b51c75a2 100644
--- a/LEGO1/omni/include/mxdsaction.h
+++ b/LEGO1/omni/include/mxdsaction.h
@@ -43,6 +43,7 @@ class MxDSAction : public MxDSObject {
 		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;
diff --git a/LEGO1/omni/include/mxdsactionlist.h b/LEGO1/omni/include/mxdsactionlist.h
index 60c3db6d..7ae9ab56 100644
--- a/LEGO1/omni/include/mxdsactionlist.h
+++ b/LEGO1/omni/include/mxdsactionlist.h
@@ -44,6 +44,9 @@ class MxDSActionListCursor : public MxListCursor<MxDSAction*> {
 // TEMPLATE: LEGO1 0x100c9cc0
 // MxCollection<MxDSAction *>::Compare
 
+// TEMPLATE: LEGO1 0x100c9cd0
+// MxCollection<MxDSAction *>::~MxCollection<MxDSAction *>
+
 // TEMPLATE: LEGO1 0x100c9d20
 // MxCollection<MxDSAction *>::Destroy
 
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/mxdssource.h b/LEGO1/omni/include/mxdssource.h
index db009fb4..143b9c78 100644
--- 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 @@ class MxDSSource : public MxCore {
 	MxLong m_position;        // 0x10
 };
 
+// SYNTHETIC: LEGO1 0x100c00a0
+// MxDSSource::`scalar deleting destructor'
+
 #endif // MXDSSOURCE_H
diff --git a/LEGO1/omni/include/mxnotificationmanager.h b/LEGO1/omni/include/mxnotificationmanager.h
index 4a3d8726..b93cc7c8 100644
--- a/LEGO1/omni/include/mxnotificationmanager.h
+++ b/LEGO1/omni/include/mxnotificationmanager.h
@@ -52,4 +52,34 @@ class MxNotificationManager : public MxCore {
 	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
diff --git a/LEGO1/omni/include/mxnotificationparam.h b/LEGO1/omni/include/mxnotificationparam.h
index 256dd882..0a8b681c 100644
--- 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 @@ class MxNotificationParam : public MxParam {
 	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
diff --git a/LEGO1/omni/include/mxomnicreateparam.h b/LEGO1/omni/include/mxomnicreateparam.h
index 825b5053..5404f39a 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(
@@ -30,4 +31,7 @@ class MxOmniCreateParam : public MxParam {
 	MxOmniCreateFlags m_createFlags;
 };
 
+// SYNTHETIC: ISLE 0x4014b0
+// MxOmniCreateParam::~MxOmniCreateParam
+
 #endif // MXOMNICREATEPARAM_H
diff --git a/LEGO1/omni/include/mxparam.h b/LEGO1/omni/include/mxparam.h
index 19e92e0e..a266b12b 100644
--- 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
diff --git a/LEGO1/omni/include/mxpresenterlist.h b/LEGO1/omni/include/mxpresenterlist.h
index d8b74a3f..f346e645 100644
--- a/LEGO1/omni/include/mxpresenterlist.h
+++ b/LEGO1/omni/include/mxpresenterlist.h
@@ -53,6 +53,9 @@ class MxPresenterListCursor : public MxPtrListCursor<MxPresenter> {
 // TEMPLATE: LEGO1 0x1001ce20
 // MxList<MxPresenter *>::~MxList<MxPresenter *>
 
+// TEMPLATE: LEGO1 0x1001cf20
+// MxPtrList<MxPresenter>::~MxPtrList<MxPresenter>
+
 // SYNTHETIC: LEGO1 0x1001cf70
 // MxCollection<MxPresenter *>::`scalar deleting destructor'
 
diff --git a/LEGO1/omni/include/mxrectlist.h b/LEGO1/omni/include/mxrectlist.h
index e19c4994..c25c2483 100644
--- a/LEGO1/omni/include/mxrectlist.h
+++ b/LEGO1/omni/include/mxrectlist.h
@@ -53,6 +53,9 @@ class MxRectListCursor : public MxPtrListCursor<MxRect32> {
 // SYNTHETIC: LEGO1 0x100b3d80
 // MxRectList::`scalar deleting destructor'
 
+// TEMPLATE: LEGO1 0x100b3df0
+// MxPtrList<MxRect32>::~MxPtrList<MxRect32>
+
 // SYNTHETIC: LEGO1 0x100b3e40
 // MxCollection<MxRect32 *>::`scalar deleting destructor'
 
diff --git a/LEGO1/omni/include/mxregionlist.h b/LEGO1/omni/include/mxregionlist.h
index 7c6da5c2..679ccebc 100644
--- a/LEGO1/omni/include/mxregionlist.h
+++ b/LEGO1/omni/include/mxregionlist.h
@@ -116,12 +116,21 @@ class MxRegionTopBottomListCursor : public MxPtrListCursor<MxRegionTopBottom> {
 // 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 @@ class MxRegionTopBottomListCursor : public MxPtrListCursor<MxRegionTopBottom> {
 // 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'
 
diff --git a/LEGO1/omni/include/mxsemaphore.h b/LEGO1/omni/include/mxsemaphore.h
index ecb6509c..4e692395 100644
--- 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);
diff --git a/LEGO1/omni/include/mxstreamchunklist.h b/LEGO1/omni/include/mxstreamchunklist.h
index 12507961..2d1ce119 100644
--- a/LEGO1/omni/include/mxstreamchunklist.h
+++ b/LEGO1/omni/include/mxstreamchunklist.h
@@ -41,6 +41,9 @@ class MxStreamChunkListCursor : public MxListCursor<MxStreamChunk*> {
 // TEMPLATE: LEGO1 0x100b5930
 // MxCollection<MxStreamChunk *>::Compare
 
+// TEMPLATE: LEGO1 0x100b5940
+// MxCollection<MxStreamChunk *>::~MxCollection<MxStreamChunk *>
+
 // TEMPLATE: LEGO1 0x100b5990
 // MxCollection<MxStreamChunk *>::Destroy
 
diff --git a/LEGO1/omni/include/mxstreamer.h b/LEGO1/omni/include/mxstreamer.h
index 02f97d12..945f8934 100644
--- a/LEGO1/omni/include/mxstreamer.h
+++ b/LEGO1/omni/include/mxstreamer.h
@@ -24,6 +24,7 @@ class MxStreamerSubClass1 {
 		}
 	}
 
+	// FUNCTION: LEGO1 0x100b9110
 	~MxStreamerSubClass1() { delete[] m_buffer; }
 
 	undefined4 GetSize() const { return m_size; }
@@ -48,6 +49,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)
@@ -56,8 +58,6 @@ class MxStreamerNotification : public MxNotificationParam {
 		m_controller = p_ctrlr;
 	}
 
-	virtual ~MxStreamerNotification() override {}
-
 	virtual MxNotificationParam* Clone() override;
 
 	MxStreamController* GetController() { return m_controller; }
@@ -113,7 +113,21 @@ class MxStreamer : public MxCore {
 	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
diff --git a/LEGO1/omni/include/mxstreamprovider.h b/LEGO1/omni/include/mxstreamprovider.h
index 17bba38d..803038e3 100644
--- a/LEGO1/omni/include/mxstreamprovider.h
+++ b/LEGO1/omni/include/mxstreamprovider.h
@@ -41,4 +41,7 @@ class MxStreamProvider : public MxCore {
 // SYNTHETIC: LEGO1 0x100d0870
 // MxStreamProvider::`scalar deleting destructor'
 
+// SYNTHETIC: LEGO1 0x100d08e0
+// MxStreamProvider::~MxStreamProvider
+
 #endif // MXSTREAMPROVIDER_H
diff --git a/LEGO1/omni/include/mxstringlist.h b/LEGO1/omni/include/mxstringlist.h
index 8651f4c4..2a61f530 100644
--- a/LEGO1/omni/include/mxstringlist.h
+++ b/LEGO1/omni/include/mxstringlist.h
@@ -15,18 +15,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..0fdb648a 100644
--- a/LEGO1/omni/include/mxticklemanager.h
+++ b/LEGO1/omni/include/mxticklemanager.h
@@ -50,4 +50,10 @@ class MxTickleManager : public MxCore {
 
 #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
diff --git a/LEGO1/omni/include/mxvariable.h b/LEGO1/omni/include/mxvariable.h
index 52fc48bc..e09d449c 100644
--- a/LEGO1/omni/include/mxvariable.h
+++ b/LEGO1/omni/include/mxvariable.h
@@ -33,8 +33,11 @@ class MxVariable {
 	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
diff --git a/LEGO1/omni/include/mxvariabletable.h b/LEGO1/omni/include/mxvariabletable.h
index 7821311e..0d79570c 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
 
@@ -50,6 +53,9 @@ class MxVariableTable : public MxHashTable<MxVariable*> {
 // SYNTHETIC: LEGO1 0x100b0ca0
 // MxHashTable<MxVariable *>::`scalar deleting destructor'
 
+// TEMPLATE: LEGO1 0x100b7680
+// MxHashTableCursor<MxVariable *>::~MxHashTableCursor<MxVariable *>
+
 // TEMPLATE: LEGO1 0x100b7ab0
 // MxHashTable<MxVariable *>::Resize
 
diff --git a/LEGO1/omni/include/mxvideopresenter.h b/LEGO1/omni/include/mxvideopresenter.h
index 48389490..bcbcbf67 100644
--- a/LEGO1/omni/include/mxvideopresenter.h
+++ b/LEGO1/omni/include/mxvideopresenter.h
@@ -80,6 +80,7 @@ class MxVideoPresenter : public MxMediaPresenter {
 	// 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;
diff --git a/LEGO1/omni/src/action/mxdsaction.cpp b/LEGO1/omni/src/action/mxdsaction.cpp
index b24ff347..d4da16bf 100644
--- a/LEGO1/omni/src/action/mxdsaction.cpp
+++ b/LEGO1/omni/src/action/mxdsaction.cpp
@@ -88,6 +88,12 @@ void MxDSAction::CopyFrom(MxDSAction& p_dsAction)
 	this->m_unk0x90 = p_dsAction.m_unk0x90;
 }
 
+// FUNCTION: LEGO1 0x100adbd0
+undefined4 MxDSAction::VTable0x14()
+{
+	return MxDSObject::VTable0x14();
+}
+
 // FUNCTION: LEGO1 0x100adbe0
 MxU32 MxDSAction::GetSizeOnDisk()
 {
diff --git a/LEGO1/omni/src/event/mxeventpresenter.cpp b/LEGO1/omni/src/event/mxeventpresenter.cpp
index d934660a..213304ad 100644
--- a/LEGO1/omni/src/event/mxeventpresenter.cpp
+++ b/LEGO1/omni/src/event/mxeventpresenter.cpp
@@ -78,7 +78,7 @@ void MxEventPresenter::ReadyTickle()
 // FUNCTION: LEGO1 0x100c2eb0
 void MxEventPresenter::StartingTickle()
 {
-	MxStreamChunk* chunk = NextChunk();
+	MxStreamChunk* chunk = CurrentChunk();
 
 	if (chunk && m_action->GetElapsedTime() >= chunk->GetTime())
 		ProgressTickleState(TickleState_Streaming);
diff --git a/LEGO1/omni/src/stream/mxdiskstreamprovider.cpp b/LEGO1/omni/src/stream/mxdiskstreamprovider.cpp
index 08046ad4..647794dd 100644
--- a/LEGO1/omni/src/stream/mxdiskstreamprovider.cpp
+++ b/LEGO1/omni/src/stream/mxdiskstreamprovider.cpp
@@ -215,18 +215,20 @@ void MxDiskStreamProvider::PerformWork()
 		}
 	}
 
+	MxDSBuffer* buffer;
+
 	{
 		MxAutoLocker lock(&m_criticalSection);
 
 		if (!m_list.PopFrontStreamingAction(streamingAction))
-			return;
+			goto done;
 	}
 
 	if (streamingAction->GetUnknowna0()->GetWriteOffset() < 0x20000) {
 		g_unk0x10102878--;
 	}
 
-	MxDSBuffer* buffer = streamingAction->GetUnknowna0();
+	buffer = streamingAction->GetUnknowna0();
 
 	if (m_pFile->GetPosition() == streamingAction->GetBufferOffset() ||
 		m_pFile->Seek(streamingAction->GetBufferOffset(), 0) == 0) {
@@ -251,6 +253,7 @@ void MxDiskStreamProvider::PerformWork()
 		}
 	}
 
+done:
 	if (streamingAction) {
 		controller->FUN_100c8670(streamingAction);
 	}
@@ -349,6 +352,8 @@ MxResult MxDiskStreamProvider::FUN_100d1b20(MxDSStreamingAction* p_action)
 					p_action->SetUnknown94(unk0x14);
 					p_action->SetBufferOffset(p_action->GetUnknowna0()->GetUnknown14());
 					delete p_action->GetUnknowna0();
+					p_action->SetUnknowna0(NULL);
+					((MxDiskStreamController*) m_pLookup)->FUN_100c7890(p_action);
 					return SUCCESS;
 				}
 				else {
diff --git a/LEGO1/omni/src/stream/mxramstreamprovider.cpp b/LEGO1/omni/src/stream/mxramstreamprovider.cpp
index 232e347b..40a12c8a 100644
--- a/LEGO1/omni/src/stream/mxramstreamprovider.cpp
+++ b/LEGO1/omni/src/stream/mxramstreamprovider.cpp
@@ -47,12 +47,12 @@ MxRAMStreamProvider::~MxRAMStreamProvider()
 	m_bufferSize = 0;
 	m_fileSize = 0;
 
-	free(m_pBufferOfFileSize);
+	delete[] m_pBufferOfFileSize;
 	m_pBufferOfFileSize = NULL;
 
 	m_lengthInDWords = 0;
 
-	free(m_bufferForDWords);
+	delete[] m_bufferForDWords;
 	m_bufferForDWords = NULL;
 }
 
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..be0aa232 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
@@ -164,7 +164,7 @@ void MxStillPresenter::VTable0x88(MxS32 p_x, MxS32 p_y)
 // FUNCTION: LEGO1 0x100ba140
 void MxStillPresenter::Enable(MxBool p_enable)
 {
-	MxVideoPresenter::Enable(p_enable);
+	MxPresenter::Enable(p_enable);
 
 	if (MVideoManager() && (m_alpha || m_bitmap)) {
 		// MxRect32 rect(m_location, MxSize32(GetWidth(), GetHeight()));
diff --git a/LEGO1/realtime/orientableroi.h b/LEGO1/realtime/orientableroi.h
index 9b754b05..71e0fc71 100644
--- a/LEGO1/realtime/orientableroi.h
+++ b/LEGO1/realtime/orientableroi.h
@@ -32,9 +32,6 @@ class OrientableROI : public ROI {
 	const float* GetWorldDirection() const { return m_local2world[2]; }
 	const float* GetWorldUp() const { return m_local2world[1]; }
 
-	// SYNTHETIC: LEGO1 0x100a4630
-	// OrientableROI::`scalar deleting destructor'
-
 protected:
 	MxMatrix m_local2world;           // 0x10
 	BoundingBox m_world_bounding_box; // 0x58
@@ -52,4 +49,10 @@ class OrientableROI : public ROI {
 	undefined4 m_unk0xd8;                   // 0xd8
 };
 
+// SYNTHETIC: LEGO1 0x100a4630
+// OrientableROI::`scalar deleting destructor'
+
+// SYNTHETIC: LEGO1 0x100aa2f0
+// OrientableROI::~OrientableROI
+
 #endif // ORIENTABLEROI_H
diff --git a/LEGO1/realtime/realtimeview.cpp b/LEGO1/realtime/realtimeview.cpp
index 5d1fc1a6..9522d1c1 100644
--- a/LEGO1/realtime/realtimeview.cpp
+++ b/LEGO1/realtime/realtimeview.cpp
@@ -30,8 +30,7 @@ void RealtimeView::SetPartsThreshold(float p_threshold)
 // FUNCTION: LEGO1 0x100a5e00
 float RealtimeView::GetUserMaxLOD()
 {
-	// TODO
-	return 0;
+	return g_userMaxLod;
 }
 
 // FUNCTION: LEGO1 0x100a5e10
diff --git a/LEGO1/realtime/roi.h b/LEGO1/realtime/roi.h
index 2a96d40b..2cdf943a 100644
--- a/LEGO1/realtime/roi.h
+++ b/LEGO1/realtime/roi.h
@@ -108,4 +108,8 @@ class ROI {
 	LODListBase* m_lods;    // 0x8
 	undefined m_unk0xc;     // 0xc
 };
+
+// SYNTHETIC: LEGO1 0x100a5d50
+// ROI::~ROI
+
 #endif // ROI_H
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
diff --git a/LEGO1/viewmanager/viewlodlist.h b/LEGO1/viewmanager/viewlodlist.h
index 0fc35d07..1ecec3f8 100644
--- a/LEGO1/viewmanager/viewlodlist.h
+++ b/LEGO1/viewmanager/viewlodlist.h
@@ -93,6 +93,22 @@ class ViewLODListManager {
 	ViewLODListMap m_map;
 };
 
+// FUNCTION: LEGO1 0x1001dde0
+// _Lockit::~_Lockit
+
+// clang-format off
+// TEMPLATE: LEGO1 0x100a7890
+// _Tree<char const *,pair<char const * const,ViewLODList *>,map<char const *,ViewLODList *,ROINameComparator,allocator<ViewLODList *> >::_Kfn,ROINameComparator,allocator<ViewLODList *> >::~_Tree<char const *,pair<char const * const,ViewLODList *>,map<char c
+// clang-format on
+
+// clang-format off
+// TEMPLATE: LEGO1 0x100a80a0
+// map<char const *,ViewLODList *,ROINameComparator,allocator<ViewLODList *> >::~map<char const *,ViewLODList *,ROINameComparator,allocator<ViewLODList *> >
+// clang-format on
+
+// TEMPLATE: LEGO1 0x100a70e0
+// Map<char const *,ViewLODList *,ROINameComparator>::~Map<char const *,ViewLODList *,ROINameComparator>
+
 //////////////////////////////////////////////////////////////////////////////
 //
 // ViewLODList implementation
diff --git a/tools/isledecomp/isledecomp/bin.py b/tools/isledecomp/isledecomp/bin.py
index 26dd00f8..3b600af6 100644
--- a/tools/isledecomp/isledecomp/bin.py
+++ b/tools/isledecomp/isledecomp/bin.py
@@ -97,6 +97,8 @@ def __init__(self, filename: str, find_str: bool = False) -> None:
         self.find_str = find_str
         self._potential_strings = {}
         self._relocated_addrs = set()
+        self.imports = []
+        self.thunks = []
 
     def __enter__(self):
         logger.debug("Bin %s Enter", self.filename)
@@ -132,6 +134,8 @@ def __enter__(self):
             sect.virtual_address += self.imagebase
 
         self._populate_relocations()
+        self._populate_imports()
+        self._populate_thunks()
 
         # This is a (semi) expensive lookup that is not necesssary in every case.
         # We can find strings in the original if we have coverage using STRING markers.
@@ -238,6 +242,78 @@ def _populate_relocations(self):
             (relocated_addr,) = struct.unpack("<I", self.read(addr, 4))
             self._relocated_addrs.add(relocated_addr)
 
+    def _populate_imports(self):
+        """Parse .idata to find imported DLLs and their functions."""
+        idata_ofs = self.get_section_offset_by_name(".idata")
+
+        def iter_image_import():
+            ofs = idata_ofs
+            while True:
+                # Read 5 dwords until all are zero.
+                image_import_descriptor = struct.unpack("<5I", self.read(ofs, 20))
+                ofs += 20
+                if all(x == 0 for x in image_import_descriptor):
+                    break
+
+                (rva_ilt, _, __, dll_name, rva_iat) = image_import_descriptor
+                # Convert relative virtual addresses into absolute
+                yield (
+                    self.imagebase + rva_ilt,
+                    self.imagebase + dll_name,
+                    self.imagebase + rva_iat,
+                )
+
+        image_import_descriptors = list(iter_image_import())
+
+        def iter_imports():
+            # ILT = Import Lookup Table
+            # IAT = Import Address Table
+            # ILT gives us the symbol name of the import.
+            # IAT gives the address. The compiler generated a thunk function
+            # that jumps to the value of this address.
+            for start_ilt, dll_addr, start_iat in image_import_descriptors:
+                dll_name = self.read_string(dll_addr).decode("ascii")
+                ofs_ilt = start_ilt
+                # Address of "__imp__*" symbols.
+                ofs_iat = start_iat
+                while True:
+                    (lookup_addr,) = struct.unpack("<L", self.read(ofs_ilt, 4))
+                    (import_addr,) = struct.unpack("<L", self.read(ofs_iat, 4))
+                    if lookup_addr == 0 or import_addr == 0:
+                        break
+
+                    # Skip the "Hint" field, 2 bytes
+                    name_ofs = lookup_addr + self.imagebase + 2
+                    symbol_name = self.read_string(name_ofs).decode("ascii")
+                    yield (dll_name, symbol_name, ofs_iat)
+                    ofs_ilt += 4
+                    ofs_iat += 4
+
+        self.imports = list(iter_imports())
+
+    def _populate_thunks(self):
+        """For each imported function, we generate a thunk function. The only
+        instruction in the function is a jmp to the address in .idata.
+        Search .text to find these functions."""
+
+        text_sect = self._get_section_by_name(".text")
+        idata_sect = self._get_section_by_name(".idata")
+        start = text_sect.virtual_address
+        ofs = start
+
+        bs = self.read(ofs, text_sect.size_of_raw_data)
+
+        for shift in (0, 2, 4):
+            window = bs[shift:]
+            win_end = 6 * (len(window) // 6)
+            for i, (b0, b1, jmp_ofs) in enumerate(
+                struct.iter_unpack("<2BL", window[:win_end])
+            ):
+                if (b0, b1) == (0xFF, 0x25) and idata_sect.contains_vaddr(jmp_ofs):
+                    # Record the address of the jmp instruction and the destination in .idata
+                    thunk_ofs = ofs + shift + i * 6
+                    self.thunks.append((thunk_ofs, jmp_ofs))
+
     def _set_section_for_vaddr(self, vaddr: int):
         if self.last_section is not None and self.last_section.contains_vaddr(vaddr):
             return
@@ -319,6 +395,18 @@ def is_valid_vaddr(self, vaddr: int) -> bool:
 
         return section is not None
 
+    def read_string(self, offset: int, chunk_size: int = 1000) -> Optional[bytes]:
+        """Read until we find a zero byte."""
+        b = self.read(offset, chunk_size)
+        if b is None:
+            return None
+
+        try:
+            return b[: b.index(b"\x00")]
+        except ValueError:
+            # No terminator found, just return what we have
+            return b
+
     def read(self, offset: int, size: int) -> Optional[bytes]:
         """Read (at most) the given number of bytes at the given virtual address.
         If we return None, the given address points to uninitialized data."""
diff --git a/tools/isledecomp/isledecomp/compare/asm/__init__.py b/tools/isledecomp/isledecomp/compare/asm/__init__.py
new file mode 100644
index 00000000..3fd22f6e
--- /dev/null
+++ b/tools/isledecomp/isledecomp/compare/asm/__init__.py
@@ -0,0 +1,2 @@
+from .parse import ParseAsm
+from .swap import can_resolve_register_differences
diff --git a/tools/isledecomp/isledecomp/compare/asm/parse.py b/tools/isledecomp/isledecomp/compare/asm/parse.py
new file mode 100644
index 00000000..ee9c9154
--- /dev/null
+++ b/tools/isledecomp/isledecomp/compare/asm/parse.py
@@ -0,0 +1,152 @@
+"""Converts x86 machine code into text (i.e. assembly). The end goal is to
+compare the code in the original and recomp binaries, using longest common
+subsequence (LCS), i.e. difflib.SequenceMatcher.
+The capstone library takes the raw bytes and gives us the mnemnonic
+and operand(s) for each instruction. We need to "sanitize" the text further
+so that virtual addresses are replaced by symbol name or a generic
+placeholder string."""
+
+import re
+from typing import Callable, List, Optional, Tuple
+from collections import namedtuple
+from capstone import Cs, CS_ARCH_X86, CS_MODE_32
+
+disassembler = Cs(CS_ARCH_X86, CS_MODE_32)
+
+ptr_replace_regex = re.compile(r"ptr \[(0x[0-9a-fA-F]+)\]")
+
+DisasmLiteInst = namedtuple("DisasmLiteInst", "address, size, mnemonic, op_str")
+
+
+def from_hex(string: str) -> Optional[int]:
+    try:
+        return int(string, 16)
+    except ValueError:
+        pass
+
+    return None
+
+
+class ParseAsm:
+    def __init__(
+        self,
+        relocate_lookup: Optional[Callable[[int], bool]] = None,
+        name_lookup: Optional[Callable[[int], str]] = None,
+    ) -> None:
+        self.relocate_lookup = relocate_lookup
+        self.name_lookup = name_lookup
+        self.replacements = {}
+        self.number_placeholders = True
+
+    def reset(self):
+        self.replacements = {}
+
+    def is_relocated(self, addr: int) -> bool:
+        if callable(self.relocate_lookup):
+            return self.relocate_lookup(addr)
+
+        return False
+
+    def lookup(self, addr: int) -> Optional[str]:
+        """Return a replacement name for this address if we find one."""
+        if (cached := self.replacements.get(addr, None)) is not None:
+            return cached
+
+        if callable(self.name_lookup):
+            if (name := self.name_lookup(addr)) is not None:
+                self.replacements[addr] = name
+                return name
+
+        return None
+
+    def replace(self, addr: int) -> str:
+        """Same function as lookup above, but here we return a placeholder
+        if there is no better name to use."""
+        if (name := self.lookup(addr)) is not None:
+            return name
+
+        # The placeholder number corresponds to the number of addresses we have
+        # already replaced. This is so the number will be consistent across the diff
+        # if we can replace some symbols with actual names in recomp but not orig.
+        idx = len(self.replacements) + 1
+        placeholder = f"<OFFSET{idx}>" if self.number_placeholders else "<OFFSET>"
+        self.replacements[addr] = placeholder
+        return placeholder
+
+    def sanitize(self, inst: DisasmLiteInst) -> Tuple[str, str]:
+        if len(inst.op_str) == 0:
+            # Nothing to sanitize
+            return (inst.mnemonic, "")
+
+        # For jumps or calls, if the entire op_str is a hex number, the value
+        # is a relative offset.
+        # Otherwise (i.e. it looks like `dword ptr [address]`) it is an
+        # absolute indirect that we will handle below.
+        # Providing the starting address of the function to capstone.disasm has
+        # automatically resolved relative offsets to an absolute address.
+        # We will have to undo this for some of the jumps or they will not match.
+        op_str_address = from_hex(inst.op_str)
+
+        if op_str_address is not None:
+            if inst.mnemonic == "call":
+                return (inst.mnemonic, self.replace(op_str_address))
+
+            if inst.mnemonic == "jmp":
+                # The unwind section contains JMPs to other functions.
+                # If we have a name for this address, use it. If not,
+                # do not create a new placeholder. We will instead
+                # fall through to generic jump handling below.
+                potential_name = self.lookup(op_str_address)
+                if potential_name is not None:
+                    return (inst.mnemonic, potential_name)
+
+            if inst.mnemonic.startswith("j"):
+                # i.e. if this is any jump
+                # Show the jump offset rather than the absolute address
+                jump_displacement = op_str_address - (inst.address + inst.size)
+                return (inst.mnemonic, hex(jump_displacement))
+
+        def filter_out_ptr(match):
+            """Helper for re.sub, see below"""
+            offset = from_hex(match.group(1))
+
+            if offset is not None:
+                # We assume this is always an address to replace
+                placeholder = self.replace(offset)
+                return f"ptr [{placeholder}]"
+
+            # Strict regex should ensure we can read the hex number.
+            # But just in case: return the string with no changes
+            return match.group(0)
+
+        op_str = ptr_replace_regex.sub(filter_out_ptr, inst.op_str)
+
+        # Performance hack:
+        # Skip this step if there is nothing left to consider replacing.
+        if "0x" in op_str:
+            # Replace immediate values with name or placeholder (where appropriate)
+            words = op_str.split(", ")
+            for i, word in enumerate(words):
+                try:
+                    inttest = int(word, 16)
+                    # If this value is a virtual address, it is referenced absolutely,
+                    # which means it must be in the relocation table.
+                    if self.is_relocated(inttest):
+                        words[i] = self.replace(inttest)
+                except ValueError:
+                    pass
+            op_str = ", ".join(words)
+
+        return inst.mnemonic, op_str
+
+    def parse_asm(self, data: bytes, start_addr: Optional[int] = 0) -> List[str]:
+        asm = []
+
+        for inst in disassembler.disasm_lite(data, start_addr):
+            # Use heuristics to disregard some differences that aren't representative
+            # of the accuracy of a function (e.g. global offsets)
+            result = self.sanitize(DisasmLiteInst(*inst))
+            # mnemonic + " " + op_str
+            asm.append(" ".join(result))
+
+        return asm
diff --git a/tools/isledecomp/isledecomp/compare/asm/swap.py b/tools/isledecomp/isledecomp/compare/asm/swap.py
new file mode 100644
index 00000000..599444cf
--- /dev/null
+++ b/tools/isledecomp/isledecomp/compare/asm/swap.py
@@ -0,0 +1,80 @@
+import re
+
+REGISTER_LIST = set(
+    [
+        "ax",
+        "bp",
+        "bx",
+        "cx",
+        "di",
+        "dx",
+        "eax",
+        "ebp",
+        "ebx",
+        "ecx",
+        "edi",
+        "edx",
+        "esi",
+        "esp",
+        "si",
+        "sp",
+    ]
+)
+WORDS = re.compile(r"\w+")
+
+
+def get_registers(line: str):
+    to_replace = []
+    # use words regex to find all matching positions:
+    for match in WORDS.finditer(line):
+        reg = match.group(0)
+        if reg in REGISTER_LIST:
+            to_replace.append((reg, match.start()))
+    return to_replace
+
+
+def replace_register(
+    lines: list[str], start_line: int, reg: str, replacement: str
+) -> list[str]:
+    return [
+        line.replace(reg, replacement) if i >= start_line else line
+        for i, line in enumerate(lines)
+    ]
+
+
+# Is it possible to make new_asm the same as original_asm by swapping registers?
+def can_resolve_register_differences(original_asm, new_asm):
+    # Split the ASM on spaces to get more granularity, and so
+    # that we don't modify the original arrays passed in.
+    original_asm = [part for line in original_asm for part in line.split()]
+    new_asm = [part for line in new_asm for part in line.split()]
+
+    # Swapping ain't gonna help if the lengths are different
+    if len(original_asm) != len(new_asm):
+        return False
+
+    # Look for the mismatching lines
+    for i, original_line in enumerate(original_asm):
+        new_line = new_asm[i]
+        if new_line != original_line:
+            # Find all the registers to replace
+            to_replace = get_registers(original_line)
+
+            for replace in to_replace:
+                (reg, reg_index) = replace
+                replacing_reg = new_line[reg_index : reg_index + len(reg)]
+                if replacing_reg in REGISTER_LIST:
+                    if replacing_reg != reg:
+                        # Do a three-way swap replacing in all the subsequent lines
+                        temp_reg = "&" * len(reg)
+                        new_asm = replace_register(new_asm, i, replacing_reg, temp_reg)
+                        new_asm = replace_register(new_asm, i, reg, replacing_reg)
+                        new_asm = replace_register(new_asm, i, temp_reg, reg)
+                else:
+                    # No replacement to do, different code, bail out
+                    return False
+    # Check if the lines are now the same
+    for i, original_line in enumerate(original_asm):
+        if new_asm[i] != original_line:
+            return False
+    return True
diff --git a/tools/isledecomp/isledecomp/compare/core.py b/tools/isledecomp/isledecomp/compare/core.py
index 07860203..40b93bae 100644
--- a/tools/isledecomp/isledecomp/compare/core.py
+++ b/tools/isledecomp/isledecomp/compare/core.py
@@ -1,11 +1,14 @@
 import os
 import logging
-from typing import List, Optional
+import difflib
+from dataclasses import dataclass
+from typing import Iterable, List, Optional
 from isledecomp.cvdump.demangler import demangle_string_const
 from isledecomp.cvdump import Cvdump, CvdumpAnalysis
 from isledecomp.parser import DecompCodebase
 from isledecomp.dir import walk_source_dir
 from isledecomp.types import SymbolType
+from isledecomp.compare.asm import ParseAsm, can_resolve_register_differences
 from .db import CompareDb, MatchInfo
 from .lines import LinesDb
 
@@ -13,6 +16,24 @@
 logger = logging.getLogger(__name__)
 
 
+@dataclass
+class DiffReport:
+    orig_addr: int
+    recomp_addr: int
+    name: str
+    udiff: Optional[List[str]] = None
+    ratio: float = 0.0
+    is_effective_match: bool = False
+
+    @property
+    def effective_ratio(self) -> float:
+        return 1.0 if self.is_effective_match else self.ratio
+
+    def __str__(self) -> str:
+        """For debug purposes. Proper diff printing (with coloring) is in another module."""
+        return f"{self.name} (0x{self.orig_addr:x}) {self.ratio*100:.02f}%{'*' if self.is_effective_match else ''}"
+
+
 class Compare:
     # pylint: disable=too-many-instance-attributes
     def __init__(self, orig_bin, recomp_bin, pdb_file, code_dir):
@@ -27,6 +48,7 @@ def __init__(self, orig_bin, recomp_bin, pdb_file, code_dir):
         self._load_cvdump()
         self._load_markers()
         self._find_original_strings()
+        self._match_thunks()
 
     def _load_cvdump(self):
         logger.info("Parsing %s ...", self.pdb_file)
@@ -126,6 +148,46 @@ def _find_original_strings(self):
 
             self._db.match_string(addr, string)
 
+    def _match_thunks(self):
+        orig_byaddr = {
+            addr: (dll.upper(), name) for (dll, name, addr) in self.orig_bin.imports
+        }
+        recomp_byname = {
+            (dll.upper(), name): addr for (dll, name, addr) in self.recomp_bin.imports
+        }
+        # Combine these two dictionaries. We don't care about imports from recomp
+        # not found in orig because:
+        # 1. They shouldn't be there
+        # 2. They are already identified via cvdump
+        orig_to_recomp = {
+            addr: recomp_byname.get(pair, None) for addr, pair in orig_byaddr.items()
+        }
+
+        # Now: we have the IAT offset in each matched up, so we need to make
+        # the connection between the thunk functions.
+        # We already have the symbol name we need from the PDB.
+        orig_thunks = {
+            iat_ofs: func_ofs for (func_ofs, iat_ofs) in self.orig_bin.thunks
+        }
+        recomp_thunks = {
+            iat_ofs: func_ofs for (func_ofs, iat_ofs) in self.recomp_bin.thunks
+        }
+
+        for orig, recomp in orig_to_recomp.items():
+            self._db.set_pair(orig, recomp, SymbolType.POINTER)
+            thunk_from_orig = orig_thunks.get(orig, None)
+            thunk_from_recomp = recomp_thunks.get(recomp, None)
+
+            if thunk_from_orig is not None and thunk_from_recomp is not None:
+                self._db.set_function_pair(thunk_from_orig, thunk_from_recomp)
+                # Don't compare thunk functions for now. The comparison isn't
+                # "useful" in the usual sense. We are only looking at the 6
+                # bytes of the jmp instruction and not the larger context of
+                # where this function is. Also: these will always match 100%
+                # because we are searching for a match to register this as a
+                # function in the first place.
+                self._db.skip_compare(thunk_from_orig)
+
     def get_one_function(self, addr: int) -> Optional[MatchInfo]:
         """i.e. verbose mode for reccmp"""
         return self._db.get_one_function(addr)
@@ -133,8 +195,84 @@ def get_one_function(self, addr: int) -> Optional[MatchInfo]:
     def get_functions(self) -> List[MatchInfo]:
         return self._db.get_matches(SymbolType.FUNCTION)
 
-    def compare_functions(self):
-        pass
+    def _compare_function(self, match: MatchInfo) -> DiffReport:
+        if match.size == 0:
+            # Report a failed match to make the user aware of the empty function.
+            return DiffReport(
+                orig_addr=match.orig_addr,
+                recomp_addr=match.recomp_addr,
+                name=match.name,
+            )
+
+        orig_raw = self.orig_bin.read(match.orig_addr, match.size)
+        recomp_raw = self.recomp_bin.read(match.recomp_addr, match.size)
+
+        def orig_should_replace(addr: int) -> bool:
+            return addr > self.orig_bin.imagebase and self.orig_bin.is_relocated_addr(
+                addr
+            )
+
+        def recomp_should_replace(addr: int) -> bool:
+            return (
+                addr > self.recomp_bin.imagebase
+                and self.recomp_bin.is_relocated_addr(addr)
+            )
+
+        def orig_lookup(addr: int) -> Optional[str]:
+            m = self._db.get_by_orig(addr)
+            if m is None:
+                return None
+
+            return m.match_name()
+
+        def recomp_lookup(addr: int) -> Optional[str]:
+            m = self._db.get_by_recomp(addr)
+            if m is None:
+                return None
+
+            return m.match_name()
+
+        orig_parse = ParseAsm(
+            relocate_lookup=orig_should_replace, name_lookup=orig_lookup
+        )
+        recomp_parse = ParseAsm(
+            relocate_lookup=recomp_should_replace, name_lookup=recomp_lookup
+        )
+
+        orig_asm = orig_parse.parse_asm(orig_raw, match.orig_addr)
+        recomp_asm = recomp_parse.parse_asm(recomp_raw, match.recomp_addr)
+
+        diff = difflib.SequenceMatcher(None, orig_asm, recomp_asm)
+        ratio = diff.ratio()
+
+        if ratio != 1.0:
+            # Check whether we can resolve register swaps which are actually
+            # perfect matches modulo compiler entropy.
+            is_effective_match = can_resolve_register_differences(orig_asm, recomp_asm)
+            unified_diff = difflib.unified_diff(orig_asm, recomp_asm, n=10)
+        else:
+            is_effective_match = False
+            unified_diff = []
+
+        return DiffReport(
+            orig_addr=match.orig_addr,
+            recomp_addr=match.recomp_addr,
+            name=match.name,
+            udiff=unified_diff,
+            ratio=ratio,
+            is_effective_match=is_effective_match,
+        )
+
+    def compare_function(self, addr: int) -> Optional[DiffReport]:
+        match = self.get_one_function(addr)
+        if match is None:
+            return None
+
+        return self._compare_function(match)
+
+    def compare_functions(self) -> Iterable[DiffReport]:
+        for match in self.get_functions():
+            yield self._compare_function(match)
 
     def compare_variables(self):
         pass
diff --git a/tools/isledecomp/isledecomp/compare/db.py b/tools/isledecomp/isledecomp/compare/db.py
index 850f25fd..8cba0c03 100644
--- a/tools/isledecomp/isledecomp/compare/db.py
+++ b/tools/isledecomp/isledecomp/compare/db.py
@@ -2,7 +2,6 @@
 addresses/symbols that we want to compare between the original and recompiled binaries."""
 import sqlite3
 import logging
-from collections import namedtuple
 from typing import List, Optional
 from isledecomp.types import SymbolType
 
@@ -16,12 +15,35 @@
         size int,
         should_skip int default(FALSE)
     );
+    CREATE INDEX `symbols_or` ON `symbols` (orig_addr);
     CREATE INDEX `symbols_re` ON `symbols` (recomp_addr);
-    CREATE INDEX `symbols_na` ON `symbols` (compare_type, name);    
 """
 
 
-MatchInfo = namedtuple("MatchInfo", "orig_addr, recomp_addr, size, name")
+class MatchInfo:
+    def __init__(
+        self,
+        ctype: Optional[int],
+        orig: Optional[int],
+        recomp: Optional[int],
+        name: Optional[str],
+        size: Optional[int],
+    ) -> None:
+        self.compare_type = SymbolType(ctype) if ctype is not None else None
+        self.orig_addr = orig
+        self.recomp_addr = recomp
+        self.name = name
+        self.size = size
+
+    def match_name(self) -> str:
+        """Combination of the name and compare type.
+        Intended for name substitution in the diff. If there is a diff,
+        it will be more obvious what this symbol indicates."""
+        if self.name is None:
+            return None
+
+        ctype = self.compare_type.name if self.compare_type is not None else "UNK"
+        return f"{self.name} ({ctype})"
 
 
 def matchinfo_factory(_, row):
@@ -61,7 +83,7 @@ def get_unmatched_strings(self) -> List[str]:
 
     def get_one_function(self, addr: int) -> Optional[MatchInfo]:
         cur = self._db.execute(
-            """SELECT orig_addr, recomp_addr, size, name
+            """SELECT compare_type, orig_addr, recomp_addr, name, size
             FROM `symbols`
             WHERE compare_type = ?
             AND orig_addr = ?
@@ -74,9 +96,31 @@ def get_one_function(self, addr: int) -> Optional[MatchInfo]:
         cur.row_factory = matchinfo_factory
         return cur.fetchone()
 
+    def get_by_orig(self, addr: int) -> Optional[MatchInfo]:
+        cur = self._db.execute(
+            """SELECT compare_type, orig_addr, recomp_addr, name, size
+            FROM `symbols`
+            WHERE orig_addr = ?
+            """,
+            (addr,),
+        )
+        cur.row_factory = matchinfo_factory
+        return cur.fetchone()
+
+    def get_by_recomp(self, addr: int) -> Optional[MatchInfo]:
+        cur = self._db.execute(
+            """SELECT compare_type, orig_addr, recomp_addr, name, size
+            FROM `symbols`
+            WHERE recomp_addr = ?
+            """,
+            (addr,),
+        )
+        cur.row_factory = matchinfo_factory
+        return cur.fetchone()
+
     def get_matches(self, compare_type: SymbolType) -> List[MatchInfo]:
         cur = self._db.execute(
-            """SELECT orig_addr, recomp_addr, size, name
+            """SELECT compare_type, orig_addr, recomp_addr, name, size
             FROM `symbols`
             WHERE compare_type = ?
             AND orig_addr IS NOT NULL
@@ -90,14 +134,20 @@ def get_matches(self, compare_type: SymbolType) -> List[MatchInfo]:
 
         return cur.fetchall()
 
-    def set_function_pair(self, orig: int, recomp: int) -> bool:
-        """For lineref match or _entry"""
+    def set_pair(
+        self, orig: int, recomp: int, compare_type: Optional[SymbolType] = None
+    ) -> bool:
+        compare_value = compare_type.value if compare_type is not None else None
         cur = self._db.execute(
             "UPDATE `symbols` SET orig_addr = ?, compare_type = ? WHERE recomp_addr = ?",
-            (orig, SymbolType.FUNCTION.value, recomp),
+            (orig, compare_value, recomp),
         )
 
         return cur.rowcount > 0
+
+    def set_function_pair(self, orig: int, recomp: int) -> bool:
+        """For lineref match or _entry"""
+        self.set_pair(orig, recomp, SymbolType.FUNCTION)
         # TODO: Both ways required?
 
     def skip_compare(self, orig: int):
diff --git a/tools/isledecomp/isledecomp/cvdump/parser.py b/tools/isledecomp/isledecomp/cvdump/parser.py
index 613cd4a4..d14abe88 100644
--- a/tools/isledecomp/isledecomp/cvdump/parser.py
+++ b/tools/isledecomp/isledecomp/cvdump/parser.py
@@ -36,7 +36,7 @@
 
 # e.g. `S_GDATA32: [0003:000004A4], Type:   T_32PRCHAR(0470), g_set`
 _gdata32_regex = re.compile(
-    r"S_GDATA32: \[(?P<section>\w{4}):(?P<offset>\w{8})\], Type:\s*(?P<type>\S+), (?P<name>\S+)"
+    r"S_GDATA32: \[(?P<section>\w{4}):(?P<offset>\w{8})\], Type:\s*(?P<type>\S+), (?P<name>.+)"
 )
 
 
diff --git a/tools/isledecomp/isledecomp/utils.py b/tools/isledecomp/isledecomp/utils.py
index ce4896fd..637eee33 100644
--- a/tools/isledecomp/isledecomp/utils.py
+++ b/tools/isledecomp/isledecomp/utils.py
@@ -26,17 +26,3 @@ def print_diff(udiff, plain):
 
 def get_file_in_script_dir(fn):
     return os.path.join(os.path.dirname(os.path.abspath(sys.argv[0])), fn)
-
-
-class OffsetPlaceholderGenerator:
-    def __init__(self):
-        self.counter = 0
-        self.replacements = {}
-
-    def get(self, replace_addr):
-        if replace_addr in self.replacements:
-            return self.replacements[replace_addr]
-        self.counter += 1
-        replacement = f"<OFFSET{self.counter}>"
-        self.replacements[replace_addr] = replacement
-        return replacement
diff --git a/tools/isledecomp/tests/test_sanitize.py b/tools/isledecomp/tests/test_sanitize.py
new file mode 100644
index 00000000..67d95b4f
--- /dev/null
+++ b/tools/isledecomp/tests/test_sanitize.py
@@ -0,0 +1,179 @@
+from typing import Optional
+import pytest
+from isledecomp.compare.asm.parse import DisasmLiteInst, ParseAsm
+
+
+def mock_inst(mnemonic: str, op_str: str) -> DisasmLiteInst:
+    """Mock up the named tuple DisasmLite from just a mnemonic and op_str.
+    To be used for tests on sanitize that do not require the instruction address
+    or size. i.e. any non-jump instruction."""
+    return DisasmLiteInst(0, 0, mnemonic, op_str)
+
+
+identity_cases = [
+    ("", ""),
+    ("sti", ""),
+    ("push", "ebx"),
+    ("ret", ""),
+    ("ret", "4"),
+    ("mov", "eax, 0x1234"),
+]
+
+
+@pytest.mark.parametrize("mnemonic, op_str", identity_cases)
+def test_identity(mnemonic, op_str):
+    """Confirm that nothing is substituted."""
+    p = ParseAsm()
+    inst = mock_inst(mnemonic, op_str)
+    result = p.sanitize(inst)
+    assert result == (mnemonic, op_str)
+
+
+ptr_replace_cases = [
+    ("byte ptr [0x5555]", "byte ptr [<OFFSET1>]"),
+    ("word ptr [0x5555]", "word ptr [<OFFSET1>]"),
+    ("dword ptr [0x5555]", "dword ptr [<OFFSET1>]"),
+    ("qword ptr [0x5555]", "qword ptr [<OFFSET1>]"),
+    ("eax, dword ptr [0x5555]", "eax, dword ptr [<OFFSET1>]"),
+    ("dword ptr [0x5555], eax", "dword ptr [<OFFSET1>], eax"),
+    ("dword ptr [0x5555], 0", "dword ptr [<OFFSET1>], 0"),
+    ("dword ptr [0x5555], 8", "dword ptr [<OFFSET1>], 8"),
+    # Same value, assumed to be an addr in the first appearance
+    # because it is designated as 'ptr', but we have not provided the
+    # relocation table lookup method so we do not replace the second appearance.
+    ("dword ptr [0x5555], 0x5555", "dword ptr [<OFFSET1>], 0x5555"),
+]
+
+
+@pytest.mark.parametrize("start, end", ptr_replace_cases)
+def test_ptr_replace(start, end):
+    """Anything in square brackets (with the 'ptr' prefix) will always be replaced."""
+    p = ParseAsm()
+    inst = mock_inst("", start)
+    (_, op_str) = p.sanitize(inst)
+    assert op_str == end
+
+
+call_replace_cases = [
+    ("ebx", "ebx"),
+    ("0x1234", "<OFFSET1>"),
+    ("dword ptr [0x1234]", "dword ptr [<OFFSET1>]"),
+    ("dword ptr [ecx + 0x10]", "dword ptr [ecx + 0x10]"),
+]
+
+
+@pytest.mark.parametrize("start, end", call_replace_cases)
+def test_call_replace(start, end):
+    """Call with hex operand is always replaced.
+    Otherwise, ptr replacement rules apply, but skip `this` calls."""
+    p = ParseAsm()
+    inst = mock_inst("call", start)
+    (_, op_str) = p.sanitize(inst)
+    assert op_str == end
+
+
+def test_jump_displacement():
+    """Display jump displacement (offset from end of jump instruction)
+    instead of destination address."""
+    p = ParseAsm()
+    inst = DisasmLiteInst(0x1000, 2, "je", "0x1000")
+    (_, op_str) = p.sanitize(inst)
+    assert op_str == "-0x2"
+
+
+@pytest.mark.xfail(reason="Not implemented yet")
+def test_jmp_table():
+    """Should detect the characteristic jump table instruction
+    (for a switch statement) and use placeholder."""
+    p = ParseAsm()
+    inst = mock_inst("jmp", "dword ptr [eax*4 + 0x5555]")
+    (_, op_str) = p.sanitize(inst)
+    assert op_str == "dword ptr [eax*4 + <OFFSET1>]"
+
+
+name_replace_cases = [
+    ("byte ptr [0x5555]", "byte ptr [_substitute_]"),
+    ("word ptr [0x5555]", "word ptr [_substitute_]"),
+    ("dword ptr [0x5555]", "dword ptr [_substitute_]"),
+    ("qword ptr [0x5555]", "qword ptr [_substitute_]"),
+]
+
+
+@pytest.mark.parametrize("start, end", name_replace_cases)
+def test_name_replace(start, end):
+    """Make sure the name lookup function is called if present"""
+
+    def substitute(_: int) -> str:
+        return "_substitute_"
+
+    p = ParseAsm(name_lookup=substitute)
+    inst = mock_inst("mov", start)
+    (_, op_str) = p.sanitize(inst)
+    assert op_str == end
+
+
+def test_replacement_cache():
+    p = ParseAsm()
+    inst = mock_inst("inc", "dword ptr [0x1234]")
+
+    (_, op_str) = p.sanitize(inst)
+    assert op_str == "dword ptr [<OFFSET1>]"
+
+    (_, op_str) = p.sanitize(inst)
+    assert op_str == "dword ptr [<OFFSET1>]"
+
+
+def test_replacement_numbering():
+    """If we can use the name lookup for the first address but not the second,
+    the second replacement should be <OFFSET2> not <OFFSET1>."""
+
+    def substitute_1234(addr: int) -> Optional[str]:
+        return "_substitute_" if addr == 0x1234 else None
+
+    p = ParseAsm(name_lookup=substitute_1234)
+
+    (_, op_str) = p.sanitize(mock_inst("inc", "dword ptr [0x1234]"))
+    assert op_str == "dword ptr [_substitute_]"
+
+    (_, op_str) = p.sanitize(mock_inst("inc", "dword ptr [0x5555]"))
+    assert op_str == "dword ptr [<OFFSET2>]"
+
+
+def test_relocate_lookup():
+    """Immediate values would be relocated if they are actually addresses.
+    So we can use the relocation table to check whether a given value is an
+    address or just some number."""
+
+    def relocate_lookup(addr: int) -> bool:
+        return addr == 0x1234
+
+    p = ParseAsm(relocate_lookup=relocate_lookup)
+    (_, op_str) = p.sanitize(mock_inst("mov", "eax, 0x1234"))
+    assert op_str == "eax, <OFFSET1>"
+
+    (_, op_str) = p.sanitize(mock_inst("mov", "eax, 0x5555"))
+    assert op_str == "eax, 0x5555"
+
+
+def test_jump_to_function():
+    """A jmp instruction can lead us directly to a function. This can be found
+    in the unwind section at the end of a function. However: we do not want to
+    assume this is the case for all jumps. Only replace the jump with a name
+    if we can find it using our lookup."""
+
+    def substitute_1234(addr: int) -> Optional[str]:
+        return "_substitute_" if addr == 0x1234 else None
+
+    p = ParseAsm(name_lookup=substitute_1234)
+    inst = DisasmLiteInst(0x1000, 2, "jmp", "0x1234")
+    (_, op_str) = p.sanitize(inst)
+    assert op_str == "_substitute_"
+
+    # Should not replace this jump.
+    # 0x1000 (start addr)
+    # + 2 (size of jump instruction)
+    # + 0x5555 (displacement, the value we want)
+    # = 0x6557
+    inst = DisasmLiteInst(0x1000, 2, "jmp", "0x6557")
+    (_, op_str) = p.sanitize(inst)
+    assert op_str == "0x5555"
diff --git a/tools/reccmp/reccmp.py b/tools/reccmp/reccmp.py
index b7027435..66bb0f66 100755
--- a/tools/reccmp/reccmp.py
+++ b/tools/reccmp/reccmp.py
@@ -2,167 +2,20 @@
 
 import argparse
 import base64
-import difflib
 import json
 import logging
 import os
-import re
 
 from isledecomp import (
     Bin,
     get_file_in_script_dir,
-    OffsetPlaceholderGenerator,
     print_diff,
 )
 from isledecomp.compare import Compare as IsleCompare
-
-from capstone import Cs, CS_ARCH_X86, CS_MODE_32
-import colorama
 from pystache import Renderer
+import colorama
 
-
-REGISTER_LIST = set(
-    [
-        "ax",
-        "bp",
-        "bx",
-        "cx",
-        "di",
-        "dx",
-        "eax",
-        "ebp",
-        "ebx",
-        "ecx",
-        "edi",
-        "edx",
-        "esi",
-        "esp",
-        "si",
-        "sp",
-    ]
-)
-WORDS = re.compile(r"\w+")
-
-
-def sanitize(file, placeholder_generator, mnemonic, op_str):
-    op_str_is_number = False
-    try:
-        int(op_str, 16)
-        op_str_is_number = True
-    except ValueError:
-        pass
-
-    if (mnemonic in ["call", "jmp"]) and op_str_is_number:
-        # Filter out "calls" because the offsets we're not currently trying to
-        # match offsets. As long as there's a call in the right place, it's
-        # probably accurate.
-        op_str = placeholder_generator.get(int(op_str, 16))
-    else:
-
-        def filter_out_ptr(ptype, op_str):
-            try:
-                ptrstr = ptype + " ptr ["
-                start = op_str.index(ptrstr) + len(ptrstr)
-                end = op_str.index("]", start)
-
-                # This will throw ValueError if not hex
-                inttest = int(op_str[start:end], 16)
-
-                return (
-                    op_str[0:start] + placeholder_generator.get(inttest) + op_str[end:]
-                )
-            except ValueError:
-                return op_str
-
-        # Filter out dword ptrs where the pointer is to an offset
-        op_str = filter_out_ptr("dword", op_str)
-        op_str = filter_out_ptr("word", op_str)
-        op_str = filter_out_ptr("byte", op_str)
-
-        # Use heuristics to filter out any args that look like offsets
-        words = op_str.split(" ")
-        for i, word in enumerate(words):
-            try:
-                inttest = int(word, 16)
-                if file.is_relocated_addr(inttest):
-                    words[i] = placeholder_generator.get(inttest)
-            except ValueError:
-                pass
-        op_str = " ".join(words)
-
-    return mnemonic, op_str
-
-
-def parse_asm(disassembler, file, asm_addr, size):
-    asm = []
-    data = file.read(asm_addr, size)
-    placeholder_generator = OffsetPlaceholderGenerator()
-    for i in disassembler.disasm(data, 0):
-        # Use heuristics to disregard some differences that aren't representative
-        # of the accuracy of a function (e.g. global offsets)
-        mnemonic, op_str = sanitize(file, placeholder_generator, i.mnemonic, i.op_str)
-        if op_str is None:
-            asm.append(mnemonic)
-        else:
-            asm.append(f"{mnemonic} {op_str}")
-    return asm
-
-
-def get_registers(line: str):
-    to_replace = []
-    # use words regex to find all matching positions:
-    for match in WORDS.finditer(line):
-        reg = match.group(0)
-        if reg in REGISTER_LIST:
-            to_replace.append((reg, match.start()))
-    return to_replace
-
-
-def replace_register(
-    lines: list[str], start_line: int, reg: str, replacement: str
-) -> list[str]:
-    return [
-        line.replace(reg, replacement) if i >= start_line else line
-        for i, line in enumerate(lines)
-    ]
-
-
-# Is it possible to make new_asm the same as original_asm by swapping registers?
-def can_resolve_register_differences(original_asm, new_asm):
-    # Split the ASM on spaces to get more granularity, and so
-    # that we don't modify the original arrays passed in.
-    original_asm = [part for line in original_asm for part in line.split()]
-    new_asm = [part for line in new_asm for part in line.split()]
-
-    # Swapping ain't gonna help if the lengths are different
-    if len(original_asm) != len(new_asm):
-        return False
-
-    # Look for the mismatching lines
-    for i, original_line in enumerate(original_asm):
-        new_line = new_asm[i]
-        if new_line != original_line:
-            # Find all the registers to replace
-            to_replace = get_registers(original_line)
-
-            for replace in to_replace:
-                (reg, reg_index) = replace
-                replacing_reg = new_line[reg_index : reg_index + len(reg)]
-                if replacing_reg in REGISTER_LIST:
-                    if replacing_reg != reg:
-                        # Do a three-way swap replacing in all the subsequent lines
-                        temp_reg = "&" * len(reg)
-                        new_asm = replace_register(new_asm, i, replacing_reg, temp_reg)
-                        new_asm = replace_register(new_asm, i, reg, replacing_reg)
-                        new_asm = replace_register(new_asm, i, temp_reg, reg)
-                else:
-                    # No replacement to do, different code, bail out
-                    return False
-    # Check if the lines are now the same
-    for i, original_line in enumerate(original_asm):
-        if new_asm[i] != original_line:
-            return False
-    return True
+colorama.init()
 
 
 def gen_html(html_file, data):
@@ -197,9 +50,88 @@ def gen_svg(svg_file, name_svg, icon, svg_implemented_funcs, total_funcs, raw_ac
         svgfile.write(output_data)
 
 
-# Do the actual work
-def main():
-    # pylint: disable=too-many-locals, too-many-nested-blocks, too-many-branches, too-many-statements
+def get_percent_color(value: float) -> str:
+    """Return colorama ANSI escape character for the given decimal value."""
+    if value == 1.0:
+        return colorama.Fore.GREEN
+    if value > 0.8:
+        return colorama.Fore.YELLOW
+
+    return colorama.Fore.RED
+
+
+def percent_string(
+    ratio: float, is_effective: bool = False, is_plain: bool = False
+) -> str:
+    """Helper to construct a percentage string from the given ratio.
+    If is_effective (i.e. effective match), indicate that with the asterisk.
+    If is_plain, don't use colorama ANSI codes."""
+
+    percenttext = f"{(ratio * 100):.2f}%"
+    effective_star = "*" if is_effective else ""
+
+    if is_plain:
+        return percenttext + effective_star
+
+    return "".join(
+        [
+            get_percent_color(ratio),
+            percenttext,
+            colorama.Fore.RED if is_effective else "",
+            effective_star,
+            colorama.Style.RESET_ALL,
+        ]
+    )
+
+
+def print_match_verbose(match, show_both_addrs: bool = False, is_plain: bool = False):
+    percenttext = percent_string(
+        match.effective_ratio, match.is_effective_match, is_plain
+    )
+
+    if show_both_addrs:
+        addrs = f"0x{match.orig_addr:x} / 0x{match.recomp_addr:x}"
+    else:
+        addrs = hex(match.orig_addr)
+
+    if match.effective_ratio == 1.0:
+        ok_text = (
+            "OK!"
+            if is_plain
+            else (colorama.Fore.GREEN + "✨ OK! ✨" + colorama.Style.RESET_ALL)
+        )
+        if match.ratio == 1.0:
+            print(f"{addrs}: {match.name} 100% match.\n\n{ok_text}\n\n")
+        else:
+            print(
+                f"{addrs}: {match.name} Effective 100%% match. (Differs in register allocation only)\n\n{ok_text} (still differs in register allocation)\n\n"
+            )
+    else:
+        print_diff(match.udiff, is_plain)
+
+        print(
+            f"\n{match.name} is only {percenttext} similar to the original, diff above"
+        )
+
+
+def print_match_oneline(match, show_both_addrs: bool = False, is_plain: bool = False):
+    percenttext = percent_string(
+        match.effective_ratio, match.is_effective_match, is_plain
+    )
+
+    if show_both_addrs:
+        addrs = f"0x{match.orig_addr:x} / 0x{match.recomp_addr:x}"
+    else:
+        addrs = hex(match.orig_addr)
+
+    print(f"  {match.name} ({addrs}) is {percenttext} similar to the original")
+
+
+def parse_args() -> argparse.Namespace:
+    def virtual_address(value) -> int:
+        """Helper method for argparse, verbose parameter"""
+        return int(value, 16)
+
     parser = argparse.ArgumentParser(
         allow_abbrev=False,
         description="Recompilation Compare: compare an original EXE with a recompiled EXE + PDB.",
@@ -226,6 +158,7 @@ def main():
         "--verbose",
         "-v",
         metavar="<offset>",
+        type=virtual_address,
         help="Print assembly diff for specific function (original file's offset)",
     )
     parser.add_argument(
@@ -258,198 +191,103 @@ def main():
 
     args = parser.parse_args()
 
+    if not os.path.isfile(args.original):
+        parser.error(f"Original binary {args.original} does not exist")
+
+    if not os.path.isfile(args.recompiled):
+        parser.error(f"Recompiled binary {args.recompiled} does not exist")
+
+    if not os.path.isfile(args.pdb):
+        parser.error(f"Symbols PDB {args.pdb} does not exist")
+
+    if not os.path.isdir(args.decomp_dir):
+        parser.error(f"Source directory {args.decomp_dir} does not exist")
+
+    return args
+
+
+def main():
+    args = parse_args()
     logging.basicConfig(level=args.loglevel, format="[%(levelname)s] %(message)s")
 
-    colorama.init()
-
-    verbose = None
-    found_verbose_target = False
-    if args.verbose:
-        try:
-            verbose = int(args.verbose, 16)
-        except ValueError:
-            parser.error("invalid verbose argument")
-    html_path = args.html
-
-    plain = args.no_color
-
-    original = args.original
-    if not os.path.isfile(original):
-        parser.error(f"Original binary {original} does not exist")
-
-    recomp = args.recompiled
-    if not os.path.isfile(recomp):
-        parser.error(f"Recompiled binary {recomp} does not exist")
-
-    syms = args.pdb
-    if not os.path.isfile(syms):
-        parser.error(f"Symbols PDB {syms} does not exist")
-
-    source = args.decomp_dir
-    if not os.path.isdir(source):
-        parser.error(f"Source directory {source} does not exist")
-
-    svg = args.svg
-
-    with Bin(original, find_str=True) as origfile, Bin(recomp) as recompfile:
-        if verbose is not None:
+    with Bin(args.original, find_str=True) as origfile, Bin(
+        args.recompiled
+    ) as recompfile:
+        if args.verbose is not None:
             # Mute logger events from compare engine
             logging.getLogger("isledecomp.compare.db").setLevel(logging.CRITICAL)
             logging.getLogger("isledecomp.compare.lines").setLevel(logging.CRITICAL)
 
-        isle_compare = IsleCompare(origfile, recompfile, syms, source)
+        isle_compare = IsleCompare(origfile, recompfile, args.pdb, args.decomp_dir)
 
         print()
 
-        capstone_disassembler = Cs(CS_ARCH_X86, CS_MODE_32)
+        ### Compare one or none.
+
+        if args.verbose is not None:
+            match = isle_compare.compare_function(args.verbose)
+            if match is None:
+                print(f"Failed to find the function with address 0x{args.verbose:x}")
+                return
+
+            print_match_verbose(
+                match, show_both_addrs=args.print_rec_addr, is_plain=args.no_color
+            )
+            return
+
+        ### Compare everything.
 
         function_count = 0
         total_accuracy = 0
         total_effective_accuracy = 0
         htmlinsert = []
 
-        matches = []
-        if verbose is not None:
-            match = isle_compare.get_one_function(verbose)
-            if match is not None:
-                found_verbose_target = True
-                matches = [match]
-        else:
-            matches = isle_compare.get_functions()
-
-        for match in matches:
-            # The effective_ratio is the ratio when ignoring differing register
-            # allocation vs the ratio is the true ratio.
-            ratio = 0.0
-            effective_ratio = 0.0
-            if match.size:
-                origasm = parse_asm(
-                    capstone_disassembler,
-                    origfile,
-                    match.orig_addr,
-                    match.size,
-                )
-                recompasm = parse_asm(
-                    capstone_disassembler,
-                    recompfile,
-                    match.recomp_addr,
-                    match.size,
-                )
-
-                diff = difflib.SequenceMatcher(None, origasm, recompasm)
-                ratio = diff.ratio()
-                effective_ratio = ratio
-
-                if ratio != 1.0:
-                    # Check whether we can resolve register swaps which are actually
-                    # perfect matches modulo compiler entropy.
-                    if can_resolve_register_differences(origasm, recompasm):
-                        effective_ratio = 1.0
-            else:
-                ratio = 0
-
-            percenttext = f"{(effective_ratio * 100):.2f}%"
-            if not plain:
-                if effective_ratio == 1.0:
-                    percenttext = (
-                        colorama.Fore.GREEN + percenttext + colorama.Style.RESET_ALL
-                    )
-                elif effective_ratio > 0.8:
-                    percenttext = (
-                        colorama.Fore.YELLOW + percenttext + colorama.Style.RESET_ALL
-                    )
-                else:
-                    percenttext = (
-                        colorama.Fore.RED + percenttext + colorama.Style.RESET_ALL
-                    )
-
-            if effective_ratio == 1.0 and ratio != 1.0:
-                if plain:
-                    percenttext += "*"
-                else:
-                    percenttext += colorama.Fore.RED + "*" + colorama.Style.RESET_ALL
-
-            if args.print_rec_addr:
-                addrs = f"0x{match.orig_addr:x} / 0x{match.recomp_addr:x}"
-            else:
-                addrs = hex(match.orig_addr)
-
-            if not verbose:
-                print(
-                    f"  {match.name} ({addrs}) is {percenttext} similar to the original"
-                )
+        for match in isle_compare.compare_functions():
+            print_match_oneline(
+                match, show_both_addrs=args.print_rec_addr, is_plain=args.no_color
+            )
 
             function_count += 1
-            total_accuracy += ratio
-            total_effective_accuracy += effective_ratio
+            total_accuracy += match.ratio
+            total_effective_accuracy += match.effective_ratio
 
-            if match.size:
-                udiff = difflib.unified_diff(origasm, recompasm, n=10)
-
-                # If verbose, print the diff for that function to the output
-                if verbose:
-                    if effective_ratio == 1.0:
-                        ok_text = (
-                            "OK!"
-                            if plain
-                            else (
-                                colorama.Fore.GREEN
-                                + "✨ OK! ✨"
-                                + colorama.Style.RESET_ALL
-                            )
-                        )
-                        if ratio == 1.0:
-                            print(f"{addrs}: {match.name} 100% match.\n\n{ok_text}\n\n")
-                        else:
-                            print(
-                                f"{addrs}: {match.name} Effective 100%% match. (Differs in register allocation only)\n\n{ok_text} (still differs in register allocation)\n\n"
-                            )
-                    else:
-                        print_diff(udiff, plain)
-
-                        print(
-                            f"\n{match.name} is only {percenttext} similar to the original, diff above"
-                        )
-
-                # If html, record the diffs to an HTML file
-                if html_path:
-                    htmlinsert.append(
-                        {
-                            "address": f"0x{match.orig_addr:x}",
-                            "name": match.name,
-                            "matching": effective_ratio,
-                            "diff": "\n".join(udiff),
-                        }
-                    )
-
-        if html_path:
-            gen_html(html_path, json.dumps(htmlinsert))
-
-        if verbose:
-            if not found_verbose_target:
-                print(f"Failed to find the function with address 0x{verbose:x}")
-        else:
-            implemented_funcs = function_count
-
-            if args.total:
-                function_count = int(args.total)
-
-            if function_count > 0:
-                effective_accuracy = total_effective_accuracy / function_count * 100
-                actual_accuracy = total_accuracy / function_count * 100
-                print(
-                    f"\nTotal effective accuracy {effective_accuracy:.2f}% across {function_count} functions ({actual_accuracy:.2f}% actual accuracy)"
+            # If html, record the diffs to an HTML file
+            if args.html is not None:
+                htmlinsert.append(
+                    {
+                        "address": f"0x{match.orig_addr:x}",
+                        "name": match.name,
+                        "matching": match.effective_ratio,
+                        "diff": "\n".join(match.udiff),
+                    }
                 )
 
-                if svg:
-                    gen_svg(
-                        svg,
-                        os.path.basename(original),
-                        args.svg_icon,
-                        implemented_funcs,
-                        function_count,
-                        total_effective_accuracy,
-                    )
+        ## Generate files and show summary.
+
+        if args.html is not None:
+            gen_html(args.html, json.dumps(htmlinsert))
+
+        implemented_funcs = function_count
+
+        if args.total:
+            function_count = int(args.total)
+
+        if function_count > 0:
+            effective_accuracy = total_effective_accuracy / function_count * 100
+            actual_accuracy = total_accuracy / function_count * 100
+            print(
+                f"\nTotal effective accuracy {effective_accuracy:.2f}% across {function_count} functions ({actual_accuracy:.2f}% actual accuracy)"
+            )
+
+            if args.svg is not None:
+                gen_svg(
+                    args.svg,
+                    os.path.basename(args.original),
+                    args.svg_icon,
+                    implemented_funcs,
+                    function_count,
+                    total_effective_accuracy,
+                )
 
 
 if __name__ == "__main__":

From dd72bcc6666225e879d2e0c523c4f98efb86d4f0 Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Sun, 14 Jan 2024 16:49:11 -0500
Subject: [PATCH 111/210] Use names from 1996 sources (#437)

---
 .../legoomni/include/legoentitypresenter.h    | 10 +++----
 .../src/common/mxcompositemediapresenter.cpp  |  8 +++---
 .../src/entity/legoactorpresenter.cpp         | 12 ++++-----
 .../src/entity/legoentitypresenter.cpp        | 26 +++++++++----------
 .../src/entity/legoworldpresenter.cpp         | 24 ++++++++---------
 .../legoomni/src/paths/legopathpresenter.cpp  |  4 +--
 .../src/video/legotexturepresenter.cpp        |  4 +--
 .../src/video/mxtransitionmanager.cpp         |  2 +-
 LEGO1/omni/include/mxmediamanager.h           | 12 ++++-----
 LEGO1/omni/include/mxpresenter.h              |  2 +-
 LEGO1/omni/src/audio/mxmusicpresenter.cpp     |  4 +--
 LEGO1/omni/src/audio/mxsoundpresenter.cpp     |  4 +--
 LEGO1/omni/src/common/mxmediamanager.cpp      |  4 +--
 LEGO1/omni/src/common/mxpresenter.cpp         |  2 +-
 LEGO1/omni/src/event/mxeventpresenter.cpp     |  4 +--
 LEGO1/omni/src/video/mxvideopresenter.cpp     |  4 +--
 16 files changed, 63 insertions(+), 63 deletions(-)

diff --git a/LEGO1/lego/legoomni/include/legoentitypresenter.h b/LEGO1/lego/legoomni/include/legoentitypresenter.h
index de6690ec..e3055991 100644
--- a/LEGO1/lego/legoomni/include/legoentitypresenter.h
+++ b/LEGO1/lego/legoomni/include/legoentitypresenter.h
@@ -26,20 +26,20 @@ class LegoEntityPresenter : public MxCompositePresenter {
 	}
 
 	virtual void ReadyTickle() override;                                                           // vtable+0x18
-	virtual void RepeatingTickle();                                                                // vtable+0x24
-	virtual void ParseExtra();                                                                     // vtable+0x30
+	virtual void RepeatingTickle() override;                                                       // vtable+0x24
+	virtual void ParseExtra() override;                                                            // vtable+0x30
 	virtual void Destroy() override;                                                               // vtable+0x38
 	virtual MxResult StartAction(MxStreamController* p_controller, MxDSAction* p_action) override; // vtable+0x3c
 	virtual void Init();                                                                           // vtable+0x68
-	virtual undefined4 SetBackend(LegoEntity* p_unk0x4c);                                          // vtable+0x6c
+	virtual undefined4 SetEntity(LegoEntity* p_entity);                                            // vtable+0x6c
 
-	void SetBackendLocation(Mx3DPointFloat& p_location, Mx3DPointFloat& p_direction, Mx3DPointFloat& p_up);
+	void SetEntityLocation(Mx3DPointFloat& p_location, Mx3DPointFloat& p_direction, Mx3DPointFloat& p_up);
 
 private:
 	void Destroy(MxBool p_fromDestructor);
 
 protected:
-	LegoEntity* m_objectBackend; // 0x4c
+	LegoEntity* m_entity; // 0x4c
 };
 
 #endif // LEGOENTITYPRESENTER_H
diff --git a/LEGO1/lego/legoomni/src/common/mxcompositemediapresenter.cpp b/LEGO1/lego/legoomni/src/common/mxcompositemediapresenter.cpp
index 6b0a32ca..69c7dd70 100644
--- a/LEGO1/lego/legoomni/src/common/mxcompositemediapresenter.cpp
+++ b/LEGO1/lego/legoomni/src/common/mxcompositemediapresenter.cpp
@@ -16,13 +16,13 @@ MxCompositeMediaPresenter::MxCompositeMediaPresenter()
 {
 	m_unk0x4c = 0;
 	m_unk0x4e = FALSE;
-	VideoManager()->AddPresenter(*this);
+	VideoManager()->RegisterPresenter(*this);
 }
 
 // FUNCTION: LEGO1 0x10074020
 MxCompositeMediaPresenter::~MxCompositeMediaPresenter()
 {
-	VideoManager()->RemovePresenter(*this);
+	VideoManager()->UnregisterPresenter(*this);
 }
 
 // FUNCTION: LEGO1 0x10074090
@@ -58,9 +58,9 @@ MxResult MxCompositeMediaPresenter::StartAction(MxStreamController* p_controller
 					presenter->SetTickleState(TickleState_Idle);
 
 					if (presenter->IsA("MxVideoPresenter"))
-						VideoManager()->RemovePresenter(*presenter);
+						VideoManager()->UnregisterPresenter(*presenter);
 					else if (presenter->IsA("MxAudioPresenter"))
-						SoundManager()->RemovePresenter(*presenter);
+						SoundManager()->UnregisterPresenter(*presenter);
 
 					success = TRUE;
 				}
diff --git a/LEGO1/lego/legoomni/src/entity/legoactorpresenter.cpp b/LEGO1/lego/legoomni/src/entity/legoactorpresenter.cpp
index be5e86cc..f6b6be7f 100644
--- a/LEGO1/lego/legoomni/src/entity/legoactorpresenter.cpp
+++ b/LEGO1/lego/legoomni/src/entity/legoactorpresenter.cpp
@@ -7,10 +7,10 @@
 void LegoActorPresenter::ReadyTickle()
 {
 	if (GetCurrentWorld()) {
-		m_objectBackend = (LegoEntity*) CreateEntityBackend("LegoActor");
-		if (m_objectBackend) {
-			SetBackendLocation(m_action->GetLocation(), m_action->GetDirection(), m_action->GetUp());
-			m_objectBackend->Create(*m_action);
+		m_entity = (LegoEntity*) CreateEntity("LegoActor");
+		if (m_entity) {
+			SetEntityLocation(m_action->GetLocation(), m_action->GetDirection(), m_action->GetUp());
+			m_entity->Create(*m_action);
 		}
 		ProgressTickleState(TickleState_Starting);
 	}
@@ -19,7 +19,7 @@ void LegoActorPresenter::ReadyTickle()
 // FUNCTION: LEGO1 0x10076c90
 void LegoActorPresenter::StartingTickle()
 {
-	if (m_objectBackend->GetROI()) {
+	if (m_entity->GetROI()) {
 		ProgressTickleState(TickleState_Streaming);
 		ParseExtra();
 	}
@@ -34,6 +34,6 @@ void LegoActorPresenter::ParseExtra()
 		memcpy(buffer, extraData, m_action->GetExtraLength());
 		buffer[m_action->GetExtraLength()] = 0;
 
-		m_objectBackend->ParseAction(buffer);
+		m_entity->ParseAction(buffer);
 	}
 }
diff --git a/LEGO1/lego/legoomni/src/entity/legoentitypresenter.cpp b/LEGO1/lego/legoomni/src/entity/legoentitypresenter.cpp
index b7638b75..92554b35 100644
--- a/LEGO1/lego/legoomni/src/entity/legoentitypresenter.cpp
+++ b/LEGO1/lego/legoomni/src/entity/legoentitypresenter.cpp
@@ -15,7 +15,7 @@ LegoEntityPresenter::LegoEntityPresenter()
 // FUNCTION: LEGO1 0x100535c0
 void LegoEntityPresenter::Init()
 {
-	m_objectBackend = 0;
+	m_entity = NULL;
 }
 
 // FUNCTION: LEGO1 0x100535d0
@@ -25,9 +25,9 @@ LegoEntityPresenter::~LegoEntityPresenter()
 }
 
 // FUNCTION: LEGO1 0x10053630
-undefined4 LegoEntityPresenter::SetBackend(LegoEntity* p_backend)
+undefined4 LegoEntityPresenter::SetEntity(LegoEntity* p_entity)
 {
-	m_objectBackend = p_backend;
+	m_entity = p_entity;
 	return 0;
 }
 
@@ -35,7 +35,7 @@ undefined4 LegoEntityPresenter::SetBackend(LegoEntity* p_backend)
 void LegoEntityPresenter::Destroy(MxBool p_fromDestructor)
 {
 	if (VideoManager()) {
-		VideoManager()->RemovePresenter(*this);
+		VideoManager()->UnregisterPresenter(*this);
 	}
 
 	Init();
@@ -53,7 +53,7 @@ MxResult LegoEntityPresenter::StartAction(MxStreamController* p_controller, MxDS
 	MxResult result = MxCompositePresenter::StartAction(p_controller, p_action);
 
 	if (VideoManager()) {
-		VideoManager()->AddPresenter(*this);
+		VideoManager()->RegisterPresenter(*this);
 	}
 
 	return result;
@@ -63,10 +63,10 @@ MxResult LegoEntityPresenter::StartAction(MxStreamController* p_controller, MxDS
 void LegoEntityPresenter::ReadyTickle()
 {
 	if (GetCurrentWorld()) {
-		m_objectBackend = (LegoEntity*) MxPresenter::CreateEntityBackend("LegoEntity");
-		if (m_objectBackend) {
-			m_objectBackend->Create(*m_action);
-			m_objectBackend->SetLocation(m_action->GetLocation(), m_action->GetDirection(), m_action->GetUp(), TRUE);
+		m_entity = (LegoEntity*) MxPresenter::CreateEntity("LegoEntity");
+		if (m_entity) {
+			m_entity->Create(*m_action);
+			m_entity->SetLocation(m_action->GetLocation(), m_action->GetDirection(), m_action->GetUp(), TRUE);
 			ParseExtra();
 		}
 		ProgressTickleState(TickleState_Starting);
@@ -82,14 +82,14 @@ void LegoEntityPresenter::RepeatingTickle()
 }
 
 // FUNCTION: LEGO1 0x10053730
-void LegoEntityPresenter::SetBackendLocation(
+void LegoEntityPresenter::SetEntityLocation(
 	Mx3DPointFloat& p_location,
 	Mx3DPointFloat& p_direction,
 	Mx3DPointFloat& p_up
 )
 {
-	if (m_objectBackend) {
-		m_objectBackend->SetLocation(p_location, p_direction, p_up, TRUE);
+	if (m_entity) {
+		m_entity->SetLocation(p_location, p_direction, p_up, TRUE);
 	}
 }
 
@@ -103,6 +103,6 @@ void LegoEntityPresenter::ParseExtra()
 		data[len] = 0;
 
 		len &= MAXWORD;
-		m_objectBackend->ParseAction(data);
+		m_entity->ParseAction(data);
 	}
 }
diff --git a/LEGO1/lego/legoomni/src/entity/legoworldpresenter.cpp b/LEGO1/lego/legoomni/src/entity/legoworldpresenter.cpp
index 5be1baa8..1becbad4 100644
--- a/LEGO1/lego/legoomni/src/entity/legoworldpresenter.cpp
+++ b/LEGO1/lego/legoomni/src/entity/legoworldpresenter.cpp
@@ -35,26 +35,26 @@ LegoWorldPresenter::LegoWorldPresenter()
 LegoWorldPresenter::~LegoWorldPresenter()
 {
 	MxBool result = FALSE;
-	if (m_objectBackend) {
-		undefined4 world = ((LegoWorld*) m_objectBackend)->GetUnknown0xec();
+	if (m_entity) {
+		undefined4 world = ((LegoWorld*) m_entity)->GetUnknown0xec();
 		PlantManager()->FUN_10026360(world);
 		AnimationManager()->FUN_1005f720(world);
 		BuildingManager()->FUN_1002fa00();
-		result = ((LegoWorld*) m_objectBackend)->VTable0x5c();
+		result = ((LegoWorld*) m_entity)->VTable0x5c();
 	}
 
 	if (result == FALSE) {
 		FUN_10015820(0, 7);
 	}
 
-	if (m_objectBackend) {
+	if (m_entity) {
 #ifdef COMPAT_MODE
 		{
 			MxNotificationParam param(c_notificationNewPresenter, NULL);
-			NotificationManager()->Send(m_objectBackend, &param);
+			NotificationManager()->Send(m_entity, &param);
 		}
 #else
-		NotificationManager()->Send(m_objectBackend, &MxNotificationParam(c_notificationNewPresenter, NULL));
+		NotificationManager()->Send(m_entity, &MxNotificationParam(c_notificationNewPresenter, NULL));
 #endif
 	}
 }
@@ -103,7 +103,7 @@ MxResult LegoWorldPresenter::StartAction(MxStreamController* p_controller, MxDSA
 				delete presenter;
 		}
 
-		VideoManager()->AddPresenter(*this);
+		VideoManager()->RegisterPresenter(*this);
 
 		result = SUCCESS;
 	}
@@ -114,11 +114,11 @@ MxResult LegoWorldPresenter::StartAction(MxStreamController* p_controller, MxDSA
 // FUNCTION: LEGO1 0x10066a50
 void LegoWorldPresenter::ReadyTickle()
 {
-	m_objectBackend = (LegoEntity*) MxPresenter::CreateEntityBackend("LegoWorld");
-	if (m_objectBackend) {
-		m_objectBackend->Create(*m_action);
-		Lego()->AddWorld((LegoWorld*) m_objectBackend);
-		SetBackendLocation(m_action->GetLocation(), m_action->GetDirection(), m_action->GetUp());
+	m_entity = (LegoEntity*) MxPresenter::CreateEntity("LegoWorld");
+	if (m_entity) {
+		m_entity->Create(*m_action);
+		Lego()->AddWorld((LegoWorld*) m_entity);
+		SetEntityLocation(m_action->GetLocation(), m_action->GetDirection(), m_action->GetUp());
 	}
 
 	ParseExtra();
diff --git a/LEGO1/lego/legoomni/src/paths/legopathpresenter.cpp b/LEGO1/lego/legoomni/src/paths/legopathpresenter.cpp
index 1c9b586f..b77a832c 100644
--- a/LEGO1/lego/legoomni/src/paths/legopathpresenter.cpp
+++ b/LEGO1/lego/legoomni/src/paths/legopathpresenter.cpp
@@ -29,7 +29,7 @@ MxResult LegoPathPresenter::AddToManager()
 	MxResult status = FAILURE;
 
 	if (VideoManager()) {
-		VideoManager()->AddPresenter(*this);
+		VideoManager()->RegisterPresenter(*this);
 		status = SUCCESS;
 	}
 
@@ -40,7 +40,7 @@ MxResult LegoPathPresenter::AddToManager()
 void LegoPathPresenter::Destroy(MxBool p_fromDestructor)
 {
 	if (VideoManager())
-		VideoManager()->RemovePresenter(*this);
+		VideoManager()->UnregisterPresenter(*this);
 
 	{
 		MxAutoLocker lock(&this->m_criticalSection);
diff --git a/LEGO1/lego/legoomni/src/video/legotexturepresenter.cpp b/LEGO1/lego/legoomni/src/video/legotexturepresenter.cpp
index 6d0cbe8c..60a0e81d 100644
--- a/LEGO1/lego/legoomni/src/video/legotexturepresenter.cpp
+++ b/LEGO1/lego/legoomni/src/video/legotexturepresenter.cpp
@@ -7,13 +7,13 @@
 // FUNCTION: LEGO1 0x1004eb40
 LegoTexturePresenter::~LegoTexturePresenter()
 {
-	VideoManager()->RemovePresenter(*this);
+	VideoManager()->UnregisterPresenter(*this);
 }
 
 // FUNCTION: LEGO1 0x1004ebb0
 MxResult LegoTexturePresenter::AddToManager()
 {
-	VideoManager()->AddPresenter(*this);
+	VideoManager()->RegisterPresenter(*this);
 	return SUCCESS;
 }
 
diff --git a/LEGO1/lego/legoomni/src/video/mxtransitionmanager.cpp b/LEGO1/lego/legoomni/src/video/mxtransitionmanager.cpp
index 734b4eae..3cb088ca 100644
--- a/LEGO1/lego/legoomni/src/video/mxtransitionmanager.cpp
+++ b/LEGO1/lego/legoomni/src/video/mxtransitionmanager.cpp
@@ -486,7 +486,7 @@ void MxTransitionManager::SetWaitIndicator(MxVideoPresenter* p_waitIndicator)
 		m_waitIndicator = p_waitIndicator;
 
 		LegoVideoManager* videoManager = VideoManager();
-		videoManager->RemovePresenter(*m_waitIndicator);
+		videoManager->UnregisterPresenter(*m_waitIndicator);
 
 		if (m_waitIndicator->GetCurrentTickleState() < MxPresenter::TickleState_Streaming) {
 			m_waitIndicator->Tickle();
diff --git a/LEGO1/omni/include/mxmediamanager.h b/LEGO1/omni/include/mxmediamanager.h
index 47f7f0d1..1f2e31af 100644
--- a/LEGO1/omni/include/mxmediamanager.h
+++ b/LEGO1/omni/include/mxmediamanager.h
@@ -14,12 +14,12 @@ class MxMediaManager : public MxCore {
 	MxMediaManager();
 	virtual ~MxMediaManager() override;
 
-	virtual MxResult Tickle() override;                     // vtable+08
-	virtual MxResult InitPresenters();                      // vtable+14
-	virtual void Destroy();                                 // vtable+18
-	virtual void AddPresenter(MxPresenter& p_presenter);    // vtable+1c
-	virtual void RemovePresenter(MxPresenter& p_presenter); // vtable+20
-	virtual void StopPresenters();                          // vtable+24
+	virtual MxResult Tickle() override;                         // vtable+08
+	virtual MxResult InitPresenters();                          // vtable+14
+	virtual void Destroy();                                     // vtable+18
+	virtual void RegisterPresenter(MxPresenter& p_presenter);   // vtable+1c
+	virtual void UnregisterPresenter(MxPresenter& p_presenter); // vtable+20
+	virtual void StopPresenters();                              // vtable+24
 
 	MxResult Init();
 
diff --git a/LEGO1/omni/include/mxpresenter.h b/LEGO1/omni/include/mxpresenter.h
index 27c40745..55682f11 100644
--- a/LEGO1/omni/include/mxpresenter.h
+++ b/LEGO1/omni/include/mxpresenter.h
@@ -115,7 +115,7 @@ class MxPresenter : public MxCore {
 
 	__declspec(dllexport) virtual void Enable(MxBool p_enable); // vtable+0x54
 
-	MxEntity* CreateEntityBackend(const char* p_name);
+	MxEntity* CreateEntity(const char* p_name);
 	MxBool IsEnabled();
 
 	inline MxS32 GetCurrentTickleState() const { return this->m_currentTickleState; }
diff --git a/LEGO1/omni/src/audio/mxmusicpresenter.cpp b/LEGO1/omni/src/audio/mxmusicpresenter.cpp
index dc2f4b7f..437cd52d 100644
--- a/LEGO1/omni/src/audio/mxmusicpresenter.cpp
+++ b/LEGO1/omni/src/audio/mxmusicpresenter.cpp
@@ -27,7 +27,7 @@ void MxMusicPresenter::Init()
 void MxMusicPresenter::Destroy(MxBool p_fromDestructor)
 {
 	if (MusicManager()) {
-		MusicManager()->RemovePresenter(*this);
+		MusicManager()->UnregisterPresenter(*this);
 	}
 
 	m_criticalSection.Enter();
@@ -46,7 +46,7 @@ MxResult MxMusicPresenter::AddToManager()
 
 	if (MusicManager()) {
 		result = SUCCESS;
-		MusicManager()->AddPresenter(*this);
+		MusicManager()->RegisterPresenter(*this);
 	}
 
 	return result;
diff --git a/LEGO1/omni/src/audio/mxsoundpresenter.cpp b/LEGO1/omni/src/audio/mxsoundpresenter.cpp
index 07e4a022..b0376331 100644
--- a/LEGO1/omni/src/audio/mxsoundpresenter.cpp
+++ b/LEGO1/omni/src/audio/mxsoundpresenter.cpp
@@ -9,7 +9,7 @@ DECOMP_SIZE_ASSERT(MxSoundPresenter, 0x54)
 void MxSoundPresenter::Destroy(MxBool p_fromDestructor)
 {
 	if (MSoundManager())
-		MSoundManager()->RemovePresenter(*this);
+		MSoundManager()->UnregisterPresenter(*this);
 
 	this->m_criticalSection.Enter();
 	MxMediaPresenter::Init();
@@ -26,7 +26,7 @@ MxResult MxSoundPresenter::AddToManager()
 
 	if (MSoundManager()) {
 		ret = SUCCESS;
-		MSoundManager()->AddPresenter(*this);
+		MSoundManager()->RegisterPresenter(*this);
 	}
 
 	return ret;
diff --git a/LEGO1/omni/src/common/mxmediamanager.cpp b/LEGO1/omni/src/common/mxmediamanager.cpp
index e9b4fe6d..778d7f86 100644
--- a/LEGO1/omni/src/common/mxmediamanager.cpp
+++ b/LEGO1/omni/src/common/mxmediamanager.cpp
@@ -75,7 +75,7 @@ MxResult MxMediaManager::Tickle()
 }
 
 // FUNCTION: LEGO1 0x100b88c0
-void MxMediaManager::AddPresenter(MxPresenter& p_presenter)
+void MxMediaManager::RegisterPresenter(MxPresenter& p_presenter)
 {
 	MxAutoLocker lock(&this->m_criticalSection);
 
@@ -83,7 +83,7 @@ void MxMediaManager::AddPresenter(MxPresenter& p_presenter)
 }
 
 // FUNCTION: LEGO1 0x100b8980
-void MxMediaManager::RemovePresenter(MxPresenter& p_presenter)
+void MxMediaManager::UnregisterPresenter(MxPresenter& p_presenter)
 {
 	MxAutoLocker lock(&this->m_criticalSection);
 	MxPresenterListCursor cursor(this->m_presenters);
diff --git a/LEGO1/omni/src/common/mxpresenter.cpp b/LEGO1/omni/src/common/mxpresenter.cpp
index 6d025394..97641c91 100644
--- a/LEGO1/omni/src/common/mxpresenter.cpp
+++ b/LEGO1/omni/src/common/mxpresenter.cpp
@@ -229,7 +229,7 @@ const char* PresenterNameDispatch(const MxDSAction& p_action)
 }
 
 // FUNCTION: LEGO1 0x100b5410
-MxEntity* MxPresenter::CreateEntityBackend(const char* p_name)
+MxEntity* MxPresenter::CreateEntity(const char* p_name)
 {
 	char buffer[512];
 	char buffer2[512];
diff --git a/LEGO1/omni/src/event/mxeventpresenter.cpp b/LEGO1/omni/src/event/mxeventpresenter.cpp
index 213304ad..010ef589 100644
--- a/LEGO1/omni/src/event/mxeventpresenter.cpp
+++ b/LEGO1/omni/src/event/mxeventpresenter.cpp
@@ -33,7 +33,7 @@ MxResult MxEventPresenter::AddToManager()
 
 	if (EventManager()) {
 		ret = SUCCESS;
-		EventManager()->AddPresenter(*this);
+		EventManager()->RegisterPresenter(*this);
 	}
 
 	return ret;
@@ -43,7 +43,7 @@ MxResult MxEventPresenter::AddToManager()
 void MxEventPresenter::Destroy()
 {
 	if (EventManager())
-		EventManager()->RemovePresenter(*this);
+		EventManager()->UnregisterPresenter(*this);
 
 	m_criticalSection.Enter();
 
diff --git a/LEGO1/omni/src/video/mxvideopresenter.cpp b/LEGO1/omni/src/video/mxvideopresenter.cpp
index c098449a..84a59121 100644
--- a/LEGO1/omni/src/video/mxvideopresenter.cpp
+++ b/LEGO1/omni/src/video/mxvideopresenter.cpp
@@ -133,7 +133,7 @@ void MxVideoPresenter::Init()
 void MxVideoPresenter::Destroy(MxBool p_fromDestructor)
 {
 	if (MVideoManager() != NULL)
-		MVideoManager()->RemovePresenter(*this);
+		MVideoManager()->UnregisterPresenter(*this);
 
 	if (m_unk0x58) {
 		m_unk0x58->Release();
@@ -504,7 +504,7 @@ MxResult MxVideoPresenter::AddToManager()
 
 	if (MVideoManager()) {
 		result = SUCCESS;
-		MVideoManager()->AddPresenter(*this);
+		MVideoManager()->RegisterPresenter(*this);
 	}
 
 	return result;

From 763fcf89808237a7dca56ba7c588a5a4348c3c01 Mon Sep 17 00:00:00 2001
From: Joshua Peisach <itzswirlz2020@outlook.com>
Date: Sun, 14 Jan 2024 16:58:00 -0500
Subject: [PATCH 112/210] ElevatorBottom ctor/dtor (#436)

* ElevatorBottom ctor

* ElevatorBottom destructor

* Use setters

---------

Co-authored-by: Christian Semmler <mail@csemmler.com>
---
 ISLE/isleapp.cpp                              |  4 ++--
 LEGO1/lego/legoomni/include/elevatorbottom.h  |  5 +++++
 .../lego/legoomni/include/legoinputmanager.h  |  4 +++-
 .../src/infocenter/elevatorbottom.cpp         | 21 +++++++++++++++----
 .../src/video/mxtransitionmanager.cpp         |  4 ++--
 5 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/ISLE/isleapp.cpp b/ISLE/isleapp.cpp
index d6f9c293..4aeb633e 100644
--- a/ISLE/isleapp.cpp
+++ b/ISLE/isleapp.cpp
@@ -614,8 +614,8 @@ MxResult IsleApp::SetupWindow(HINSTANCE hInstance, LPSTR lpCmdLine)
 	LegoAnimationManager::configureLegoAnimationManager(m_islandQuality);
 	if (LegoOmni::GetInstance()) {
 		if (LegoOmni::GetInstance()->GetInputManager()) {
-			LegoOmni::GetInstance()->GetInputManager()->m_useJoystick = m_useJoystick;
-			LegoOmni::GetInstance()->GetInputManager()->m_joystickIndex = m_joystickIndex;
+			LegoOmni::GetInstance()->GetInputManager()->SetUseJoystick(m_useJoystick);
+			LegoOmni::GetInstance()->GetInputManager()->SetJoystickIndex(m_joystickIndex);
 		}
 	}
 	if (m_fullScreen) {
diff --git a/LEGO1/lego/legoomni/include/elevatorbottom.h b/LEGO1/lego/legoomni/include/elevatorbottom.h
index 64b3f221..e10b7727 100644
--- a/LEGO1/lego/legoomni/include/elevatorbottom.h
+++ b/LEGO1/lego/legoomni/include/elevatorbottom.h
@@ -1,9 +1,11 @@
 #ifndef ELEVATORBOTTOM_H
 #define ELEVATORBOTTOM_H
 
+#include "decomp.h"
 #include "legoworld.h"
 
 // VTABLE: LEGO1 0x100d5f20
+// SIZE: 0xfc (from inlined ctor at 0x1000a8aa)
 class ElevatorBottom : public LegoWorld {
 public:
 	ElevatorBottom();
@@ -23,6 +25,9 @@ class ElevatorBottom : public LegoWorld {
 	{
 		return !strcmp(p_name, ElevatorBottom::ClassName()) || LegoWorld::IsA(p_name);
 	}
+
+private:
+	undefined4 m_unk0xf8; // 0xf8
 };
 
 #endif // ELEVATORBOTTOM_H
diff --git a/LEGO1/lego/legoomni/include/legoinputmanager.h b/LEGO1/lego/legoomni/include/legoinputmanager.h
index 59e0a949..455c2f1a 100644
--- a/LEGO1/lego/legoomni/include/legoinputmanager.h
+++ b/LEGO1/lego/legoomni/include/legoinputmanager.h
@@ -53,6 +53,8 @@ class LegoInputManager : public MxPresenter {
 
 	inline void SetUnknown88(MxBool p_unk0x88) { m_unk0x88 = p_unk0x88; }
 	inline void SetUnknown336(MxBool p_unk0x336) { m_unk0x336 = p_unk0x336; }
+	inline void SetUseJoystick(MxBool p_useJoystick) { m_useJoystick = p_useJoystick; }
+	inline void SetJoystickIndex(MxS32 p_joystickIndex) { m_joystickIndex = p_joystickIndex; }
 
 	inline LegoControlManager* GetControlManager() { return m_controlManager; }
 	inline LegoWorld* GetWorld() { return m_world; }
@@ -61,7 +63,7 @@ class LegoInputManager : public MxPresenter {
 	void ProcessEvents();
 	MxBool ProcessOneEvent(LegoEventNotificationParam& p_param);
 
-	// private:
+private:
 	MxCriticalSection m_criticalSection;
 	MxList<undefined4>* m_unk0x5c; // list or hash table
 	LegoCameraController* m_camera;
diff --git a/LEGO1/lego/legoomni/src/infocenter/elevatorbottom.cpp b/LEGO1/lego/legoomni/src/infocenter/elevatorbottom.cpp
index 247defb0..1dbb8a67 100644
--- a/LEGO1/lego/legoomni/src/infocenter/elevatorbottom.cpp
+++ b/LEGO1/lego/legoomni/src/infocenter/elevatorbottom.cpp
@@ -1,15 +1,28 @@
 #include "elevatorbottom.h"
 
-// STUB: LEGO1 0x10017e90
+DECOMP_SIZE_ASSERT(ElevatorBottom, 0xfc)
+
+#include "legocontrolmanager.h"
+#include "legoinputmanager.h"
+#include "legoomni.h"
+#include "mxnotificationmanager.h"
+#include "mxomni.h"
+
+// FUNCTION: LEGO1 0x10017e90
 ElevatorBottom::ElevatorBottom()
 {
-	// TODO
+	NotificationManager()->Register(this);
+	this->m_unk0xf8 = 0;
 }
 
-// STUB: LEGO1 0x10018060
+// FUNCTION: LEGO1 0x10018060
 ElevatorBottom::~ElevatorBottom()
 {
-	// TODO
+	if (InputManager()->GetWorld() == this) {
+		InputManager()->ClearWorld();
+	}
+	ControlManager()->Unregister(this);
+	NotificationManager()->Unregister(this);
 }
 
 // STUB: LEGO1 0x10018150
diff --git a/LEGO1/lego/legoomni/src/video/mxtransitionmanager.cpp b/LEGO1/lego/legoomni/src/video/mxtransitionmanager.cpp
index 3cb088ca..cfbe925d 100644
--- a/LEGO1/lego/legoomni/src/video/mxtransitionmanager.cpp
+++ b/LEGO1/lego/legoomni/src/video/mxtransitionmanager.cpp
@@ -114,8 +114,8 @@ MxResult MxTransitionManager::StartTransition(
 		tickleManager->RegisterClient(this, p_speed);
 
 		LegoInputManager* inputManager = InputManager();
-		inputManager->m_unk0x88 = TRUE;
-		inputManager->m_unk0x336 = FALSE;
+		inputManager->SetUnknown88(TRUE);
+		inputManager->SetUnknown336(FALSE);
 
 		LegoVideoManager* videoManager = VideoManager();
 		videoManager->SetRender3D(FALSE);

From e9d8fde8bc0909e7d954de1a8cec5675760860af Mon Sep 17 00:00:00 2001
From: Misha <106913236+MishaProductions@users.noreply.github.com>
Date: Sun, 14 Jan 2024 17:00:03 -0500
Subject: [PATCH 113/210] Fix wrong class name (#438)

* push changes

* fix

* rename file
---
 CMakeLists.txt                                       |  2 +-
 LEGO1/lego/legoomni/include/isle.h                   |  4 ++--
 LEGO1/lego/legoomni/include/legoobjectfactory.h      |  2 +-
 .../legoomni/include/{motorcycle.h => motocycle.h}   | 12 ++++++------
 LEGO1/lego/legoomni/src/common/legoobjectfactory.cpp |  2 +-
 LEGO1/lego/legoomni/src/isle/isle.cpp                |  4 ++--
 .../src/isle/{motorcycle.cpp => motocycle.cpp}       |  6 +++---
 7 files changed, 16 insertions(+), 16 deletions(-)
 rename LEGO1/lego/legoomni/include/{motorcycle.h => motocycle.h} (69%)
 rename LEGO1/lego/legoomni/src/isle/{motorcycle.cpp => motocycle.cpp} (60%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d1ee7682..61a8d165 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -99,7 +99,7 @@ add_library(lego1 SHARED
   LEGO1/lego/legoomni/src/isle/jukebox.cpp
   LEGO1/lego/legoomni/src/isle/jukeboxentity.cpp
   LEGO1/lego/legoomni/src/isle/jukeboxstate.cpp
-  LEGO1/lego/legoomni/src/isle/motorcycle.cpp
+  LEGO1/lego/legoomni/src/isle/motocycle.cpp
   LEGO1/lego/legoomni/src/isle/radio.cpp
   LEGO1/lego/legoomni/src/isle/radiostate.cpp
   LEGO1/lego/legoomni/src/isle/skateboard.cpp
diff --git a/LEGO1/lego/legoomni/include/isle.h b/LEGO1/lego/legoomni/include/isle.h
index d5b7c57b..5ebc5fab 100644
--- a/LEGO1/lego/legoomni/include/isle.h
+++ b/LEGO1/lego/legoomni/include/isle.h
@@ -12,7 +12,7 @@ class JukeBoxEntity;
 class Helicopter;
 class Bike;
 class DuneBuggy;
-class Motorcycle;
+class Motocycle;
 class SkateBoard;
 class RaceCar;
 class Jetski;
@@ -69,7 +69,7 @@ class Isle : public LegoWorld {
 	Helicopter* m_helicopter; // 0x110
 	Bike* m_bike;             // 0x114
 	DuneBuggy* m_dunebuggy;   // 0x118
-	Motorcycle* m_motorcycle; // 0x11c
+	Motocycle* m_motocycle;   // 0x11c
 	SkateBoard* m_skateboard; // 0x120
 	RaceCar* m_racecar;       // 0x124
 	Jetski* m_jetski;         // 0x128
diff --git a/LEGO1/lego/legoomni/include/legoobjectfactory.h b/LEGO1/lego/legoomni/include/legoobjectfactory.h
index 3a575c52..552b3cf8 100644
--- a/LEGO1/lego/legoomni/include/legoobjectfactory.h
+++ b/LEGO1/lego/legoomni/include/legoobjectfactory.h
@@ -70,7 +70,7 @@
 	X(RaceCar)                                                                                                         \
 	X(Jetski)                                                                                                          \
 	X(Bike)                                                                                                            \
-	X(Motorcycle)                                                                                                      \
+	X(Motocycle)                                                                                                       \
 	X(Ambulance)                                                                                                       \
 	X(AmbulanceMissionState)                                                                                           \
 	X(TowTrack)                                                                                                        \
diff --git a/LEGO1/lego/legoomni/include/motorcycle.h b/LEGO1/lego/legoomni/include/motocycle.h
similarity index 69%
rename from LEGO1/lego/legoomni/include/motorcycle.h
rename to LEGO1/lego/legoomni/include/motocycle.h
index af04b4ad..0c784027 100644
--- a/LEGO1/lego/legoomni/include/motorcycle.h
+++ b/LEGO1/lego/legoomni/include/motocycle.h
@@ -1,14 +1,14 @@
-#ifndef MOTORCYCLE_H
-#define MOTORCYCLE_H
+#ifndef MOTOCYCLE_H
+#define MOTOCYCLE_H
 
 #include "decomp.h"
 #include "islepathactor.h"
 
 // VTABLE: LEGO1 0x100d7090
 // SIZE 0x16c
-class Motorcycle : public IslePathActor {
+class Motocycle : public IslePathActor {
 public:
-	Motorcycle();
+	Motocycle();
 
 	// FUNCTION: LEGO1 0x10035840
 	inline virtual const char* ClassName() const override // vtable+0x0c
@@ -20,7 +20,7 @@ class Motorcycle : public IslePathActor {
 	// FUNCTION: LEGO1 0x10035850
 	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
-		return !strcmp(p_name, Motorcycle::ClassName()) || IslePathActor::IsA(p_name);
+		return !strcmp(p_name, Motocycle::ClassName()) || IslePathActor::IsA(p_name);
 	}
 
 private:
@@ -29,4 +29,4 @@ class Motorcycle : public IslePathActor {
 	undefined m_unk0x168[4];
 };
 
-#endif // MOTORCYCLE_H
+#endif // MOTOCYCLE_H
diff --git a/LEGO1/lego/legoomni/src/common/legoobjectfactory.cpp b/LEGO1/lego/legoomni/src/common/legoobjectfactory.cpp
index ff52bad1..bb534169 100644
--- a/LEGO1/lego/legoomni/src/common/legoobjectfactory.cpp
+++ b/LEGO1/lego/legoomni/src/common/legoobjectfactory.cpp
@@ -68,7 +68,7 @@
 #include "doors.h"
 #include "jetski.h"
 #include "legoanimmmpresenter.h"
-#include "motorcycle.h"
+#include "motocycle.h"
 #include "racecar.h"
 #include "towtrack.h"
 #include "towtrackmissionstate.h"
diff --git a/LEGO1/lego/legoomni/src/isle/isle.cpp b/LEGO1/lego/legoomni/src/isle/isle.cpp
index 4fba4bb5..e2aca2cf 100644
--- a/LEGO1/lego/legoomni/src/isle/isle.cpp
+++ b/LEGO1/lego/legoomni/src/isle/isle.cpp
@@ -26,7 +26,7 @@ Isle::Isle()
 	m_helicopter = NULL;
 	m_bike = NULL;
 	m_dunebuggy = NULL;
-	m_motorcycle = NULL;
+	m_motocycle = NULL;
 	m_skateboard = NULL;
 	m_racecar = NULL;
 	m_jetski = NULL;
@@ -230,7 +230,7 @@ void Isle::VTable0x58(MxCore* p_object)
 		m_dunebuggy = (DuneBuggy*) p_object;
 	}
 	else if (p_object->IsA("Motorcycle")) {
-		m_motorcycle = (Motorcycle*) p_object;
+		m_motocycle = (Motocycle*) p_object;
 	}
 	else if (p_object->IsA("SkateBoard")) {
 		m_skateboard = (SkateBoard*) p_object;
diff --git a/LEGO1/lego/legoomni/src/isle/motorcycle.cpp b/LEGO1/lego/legoomni/src/isle/motocycle.cpp
similarity index 60%
rename from LEGO1/lego/legoomni/src/isle/motorcycle.cpp
rename to LEGO1/lego/legoomni/src/isle/motocycle.cpp
index 18fabd8a..2628d7ce 100644
--- a/LEGO1/lego/legoomni/src/isle/motorcycle.cpp
+++ b/LEGO1/lego/legoomni/src/isle/motocycle.cpp
@@ -1,9 +1,9 @@
-#include "motorcycle.h"
+#include "motocycle.h"
 
-DECOMP_SIZE_ASSERT(Motorcycle, 0x16c);
+DECOMP_SIZE_ASSERT(Motocycle, 0x16c);
 
 // FUNCTION: LEGO1 0x100357b0
-Motorcycle::Motorcycle()
+Motocycle::Motocycle()
 {
 	this->m_unk0x13c = 40.0;
 	this->m_unk0x150 = 1.75;

From 7f72a36462643ce890ba05ad017d03d1e8297c9c Mon Sep 17 00:00:00 2001
From: Misha <106913236+MishaProductions@users.noreply.github.com>
Date: Mon, 15 Jan 2024 10:26:52 -0500
Subject: [PATCH 114/210] Implement LegoMeterPresenter (#439)

* push changes

* Update legometerpresenter.h

* fix wrong offset

* fix deconstructor

* fix + improve accuracy

* Update legometerpresenter.cpp

* Match functions

---------

Co-authored-by: Christian Semmler <mail@csemmler.com>
---
 .../legoomni/include/legometerpresenter.h     |  23 ++++
 .../legoomni/src/video/legometerpresenter.cpp | 117 +++++++++++++++++-
 2 files changed, 138 insertions(+), 2 deletions(-)

diff --git a/LEGO1/lego/legoomni/include/legometerpresenter.h b/LEGO1/lego/legoomni/include/legometerpresenter.h
index 023a7bfa..33c7aa37 100644
--- a/LEGO1/lego/legoomni/include/legometerpresenter.h
+++ b/LEGO1/lego/legoomni/include/legometerpresenter.h
@@ -7,7 +7,30 @@
 // SIZE 0x94 (from 0x1000a163)
 class LegoMeterPresenter : public MxStillPresenter {
 public:
+	LegoMeterPresenter();
+	virtual ~LegoMeterPresenter() override;
+
 	// MxStillPresenter's `::ClassName` and `::IsA` are used.
+
+	virtual void StreamingTickle() override; // vtable+0x20
+	virtual void RepeatingTickle() override; // vtable+0x24
+	virtual void ParseExtra() override;      // vtable+0x30
+
+private:
+	void FUN_10043a50();
+
+	MxU8* m_unk0x6c;     // 0x6c
+	MxU16 m_type;        // 0x70
+	MxString m_variable; // 0x74
+	MxFloat m_unk0x84;   // 0x84
+	MxU16 m_unk0x88;     // 0x88
+	MxU16 m_unk0x8a;     // 0x8a
+	MxU16 m_unk0x8c;     // 0x8c
+	MxU16 m_unk0x8e;     // 0x8e
+	MxU16 m_layout;      // 0x90
 };
 
+// SYNTHETIC: LEGO1 0x10043760
+// LegoMeterPresenter::`scalar deleting destructor'
+
 #endif // LEGOMETERPRESENTER_H
diff --git a/LEGO1/lego/legoomni/src/video/legometerpresenter.cpp b/LEGO1/lego/legoomni/src/video/legometerpresenter.cpp
index 6314a4fd..db8c6055 100644
--- a/LEGO1/lego/legoomni/src/video/legometerpresenter.cpp
+++ b/LEGO1/lego/legoomni/src/video/legometerpresenter.cpp
@@ -1,6 +1,119 @@
 #include "legometerpresenter.h"
 
 #include "decomp.h"
+#include "mxbitmap.h"
+#include "mxutil.h"
 
-// Uncomment when member class variables are fleshed out.
-// DECOMP_SIZE_ASSERT(LegoMeterPresenter, 0x94); // 0x1000a163
+DECOMP_SIZE_ASSERT(LegoMeterPresenter, 0x94)
+
+// GLOBAL: LEGO1 0x1010207c
+const char* g_filterIndex = "FILTER_INDEX";
+
+// GLOBAL: LEGO1 0x10102094
+const char* g_type = "TYPE";
+
+// GLOBAL: LEGO1 0x10102088
+const char* g_leftToRight = "LEFT_TO_RIGHT";
+
+// GLOBAL: LEGO1 0x101020ac
+const char* g_rightToLeft = "RIGHT_TO_LEFT";
+
+// GLOBAL: LEGO1 0x1010205c
+const char* g_bottomToTop = "BOTTOM_TO_TOP";
+
+// GLOBAL: LEGO1 0x101020c0
+const char* g_topToBottom = "TOP_TO_BOTTOM";
+
+// GLOBAL: LEGO1 0x101020c8
+const char* g_variable = "VARIABLE";
+
+// FUNCTION: LEGO1 0x10043430
+LegoMeterPresenter::LegoMeterPresenter()
+{
+	m_layout = 0;
+	m_unk0x6c = 0;
+	m_unk0x84 = 0;
+	m_type = 1;
+	m_flags &= ~Flag_Bit2;
+}
+
+// FUNCTION: LEGO1 0x10043780
+LegoMeterPresenter::~LegoMeterPresenter()
+{
+	delete m_unk0x6c;
+}
+
+// FUNCTION: LEGO1 0x10043800
+void LegoMeterPresenter::ParseExtra()
+{
+	char buffer[256];
+
+	MxStillPresenter::ParseExtra();
+	*((MxU16*) &buffer[0]) = m_action->GetExtraLength();
+	char* extraData = m_action->GetExtraData();
+
+	if (*((MxU16*) &buffer[0])) {
+		MxU16 len = *((MxU16*) &buffer[0]);
+		memcpy(buffer, extraData, len);
+		buffer[len] = '\0';
+
+		char result[256];
+		if (KeyValueStringParse(buffer, g_type, result)) {
+			if (!strcmpi(result, g_leftToRight)) {
+				m_layout = 0;
+			}
+			else if (!strcmpi(result, g_rightToLeft)) {
+				m_layout = 1;
+			}
+			else if (!strcmpi(result, g_bottomToTop)) {
+				m_layout = 2;
+			}
+			else if (!strcmpi(result, g_topToBottom)) {
+				m_layout = 3;
+			}
+		}
+
+		if (KeyValueStringParse(buffer, g_filterIndex, result)) {
+			m_type = atoi(result);
+		}
+
+		if (KeyValueStringParse(buffer, g_variable, result)) {
+			m_variable = result;
+		}
+		else {
+			EndAction();
+		}
+	}
+	else {
+		EndAction();
+	}
+}
+
+// FUNCTION: LEGO1 0x10043990
+void LegoMeterPresenter::StreamingTickle()
+{
+	MxStillPresenter::StreamingTickle();
+	m_unk0x6c = new MxU8[m_bitmap->GetBmiStride() * m_bitmap->GetBmiHeightAbs()];
+	if (m_unk0x6c == NULL) {
+		EndAction();
+	}
+
+	memcpy(m_unk0x6c, m_bitmap->GetBitmapData(), m_bitmap->GetBmiStride() * m_bitmap->GetBmiHeightAbs());
+
+	m_unk0x88 = 0;
+	m_unk0x8a = 0;
+	m_unk0x8c = m_bitmap->GetBmiWidth() - 1;
+	m_unk0x8e = m_bitmap->GetBmiHeightAbs() - 1;
+}
+
+// FUNCTION: LEGO1 0x10043a30
+void LegoMeterPresenter::RepeatingTickle()
+{
+	FUN_10043a50();
+	MxStillPresenter::RepeatingTickle();
+}
+
+// STUB: LEGO1 0x10043a50
+void LegoMeterPresenter::FUN_10043a50()
+{
+}

From f116389373abffe615313bb7c0b7eb145f442d1b Mon Sep 17 00:00:00 2001
From: Misha <106913236+MishaProductions@users.noreply.github.com>
Date: Mon, 15 Jan 2024 14:08:28 -0500
Subject: [PATCH 115/210] implement a few MxControlPresenter functions (#440)

* MxControlPresenter

* Fixes

* Minor change

* Match MxControlPresenter::StartAction

* Use flags instead

---------

Co-authored-by: Christian Semmler <mail@csemmler.com>
---
 .../legoomni/include/mxcontrolpresenter.h     |  3 +-
 .../src/control/mxcontrolpresenter.cpp        | 61 +++++++++++++++----
 LEGO1/omni/include/mxutil.h                   |  2 +
 LEGO1/omni/src/common/mxutil.cpp              | 18 ++++++
 4 files changed, 71 insertions(+), 13 deletions(-)

diff --git a/LEGO1/lego/legoomni/include/mxcontrolpresenter.h b/LEGO1/lego/legoomni/include/mxcontrolpresenter.h
index 9779e45f..2db0a2e4 100644
--- a/LEGO1/lego/legoomni/include/mxcontrolpresenter.h
+++ b/LEGO1/lego/legoomni/include/mxcontrolpresenter.h
@@ -33,7 +33,8 @@ class MxControlPresenter : public MxCompositePresenter {
 	virtual MxBool HasTickleStatePassed(TickleState p_tickleState) override; // vtable+0x48
 	virtual void Enable(MxBool p_enable) override;                           // vtable+0x54
 	virtual MxBool VTable0x64(undefined4 p_undefined) override;              // vtable+0x64
-	virtual void VTable0x68(MxBool p_undefined);                             // vtable+0x68
+	virtual void VTable0x68(MxBool p_unk0x50);                               // vtable+0x68
+	virtual void VTable0x6c(undefined4);                                     // vtable+0x6c
 
 private:
 	MxBool FUN_10044270(undefined4, undefined4, undefined4*);
diff --git a/LEGO1/lego/legoomni/src/control/mxcontrolpresenter.cpp b/LEGO1/lego/legoomni/src/control/mxcontrolpresenter.cpp
index b7f8fa8e..9a5975cf 100644
--- a/LEGO1/lego/legoomni/src/control/mxcontrolpresenter.cpp
+++ b/LEGO1/lego/legoomni/src/control/mxcontrolpresenter.cpp
@@ -1,6 +1,7 @@
 #include "mxcontrolpresenter.h"
 
 #include "mxticklemanager.h"
+#include "mxutil.h"
 
 DECOMP_SIZE_ASSERT(MxControlPresenter, 0x5c)
 
@@ -28,9 +29,9 @@ MxBool MxControlPresenter::VTable0x64(undefined4 p_undefined)
 }
 
 // FUNCTION: LEGO1 0x10043ff0
-void MxControlPresenter::VTable0x68(MxBool p_undefined)
+void MxControlPresenter::VTable0x68(MxBool p_unk0x50)
 {
-	m_unk0x50 = p_undefined;
+	m_unk0x50 = p_unk0x50;
 }
 
 // FUNCTION: LEGO1 0x10044110
@@ -47,11 +48,28 @@ MxResult MxControlPresenter::AddToManager()
 	return SUCCESS;
 }
 
-// STUB: LEGO1 0x10044190
-MxResult MxControlPresenter::StartAction(MxStreamController*, MxDSAction*)
+// FUNCTION: LEGO1 0x10044190
+MxResult MxControlPresenter::StartAction(MxStreamController* p_controller, MxDSAction* p_action)
 {
-	// TODO
-	return SUCCESS;
+	MxResult result = MxCompositePresenter::StartAction(p_controller, p_action);
+
+	FUN_100b7220(m_action, MxDSAction::Flag_World | MxDSAction::Flag_Looping, TRUE);
+	ParseExtra();
+
+	MxS16 i = 0;
+	for (MxCompositePresenterList::iterator it = m_list.begin(); it != m_list.end(); it++) {
+		(*it)->Enable((m_unk0x4c != 3 || m_unk0x4e) && IsEnabled() ? m_unk0x4e == i : FALSE);
+		i++;
+	}
+
+	if (m_unk0x4c == 3) {
+		MxDSAction* action = (*m_list.begin())->GetAction();
+		action->SetFlags(action->GetFlags() | MxDSAction::Flag_Bit11);
+	}
+
+	TickleManager()->RegisterClient(this, 200);
+
+	return result;
 }
 
 // FUNCTION: LEGO1 0x10044260
@@ -78,7 +96,7 @@ MxBool MxControlPresenter::FUN_10044480(undefined4, undefined4*)
 }
 
 // STUB: LEGO1 0x10044540
-void MxControlPresenter::FUN_10044540(undefined2)
+void MxControlPresenter::VTable0x6c(undefined4)
 {
 	// TODO
 }
@@ -97,15 +115,34 @@ void MxControlPresenter::ParseExtra()
 	// TODO
 }
 
-// STUB: LEGO1 0x10044820
+// FUNCTION: LEGO1 0x10044820
 void MxControlPresenter::Enable(MxBool p_enable)
 {
-	// TODO
+	if (MxPresenter::IsEnabled() != p_enable) {
+		MxPresenter::Enable(p_enable);
+
+		MxS16 i = 0;
+		for (MxCompositePresenterList::iterator it = m_list.begin(); it != m_list.end(); it++) {
+			if (i == m_unk0x4e) {
+				(*it)->Enable((m_unk0x4c != 3 || i != 0) ? p_enable : 0);
+				break;
+			}
+
+			i++;
+		}
+
+		if (!p_enable) {
+			m_unk0x4e = 0;
+		}
+	}
 }
 
-// STUB: LEGO1 0x100448a0
+// FUNCTION: LEGO1 0x100448a0
 MxBool MxControlPresenter::HasTickleStatePassed(TickleState p_tickleState)
 {
-	// TODO
-	return TRUE;
+	MxCompositePresenterList::iterator it = m_list.begin();
+	for (MxS16 i = m_unk0x4e; i > 0; i--, it++)
+		;
+
+	return (*it)->HasTickleStatePassed(p_tickleState);
 }
diff --git a/LEGO1/omni/include/mxutil.h b/LEGO1/omni/include/mxutil.h
index ca2ab867..bd0247fd 100644
--- a/LEGO1/omni/include/mxutil.h
+++ b/LEGO1/omni/include/mxutil.h
@@ -7,6 +7,7 @@
 
 class MxDSFile;
 class MxDSObject;
+class MxDSAction;
 
 template <class T>
 inline T Abs(T p_t)
@@ -70,6 +71,7 @@ MxBool FUN_100b6e10(
 
 __declspec(dllexport) void MakeSourceName(char*, const char*);
 __declspec(dllexport) void SetOmniUserMessage(void (*)(const char*, int));
+void FUN_100b7220(MxDSAction* p_action, MxU32 p_newFlags, MxBool p_setFlags);
 __declspec(dllexport) MxDSObject* CreateStreamObject(MxDSFile*, MxS16);
 
 MxBool KeyValueStringParse(char*, const char*, const char*);
diff --git a/LEGO1/omni/src/common/mxutil.cpp b/LEGO1/omni/src/common/mxutil.cpp
index 538368d1..ababdc02 100644
--- a/LEGO1/omni/src/common/mxutil.cpp
+++ b/LEGO1/omni/src/common/mxutil.cpp
@@ -1,6 +1,9 @@
 #include "mxutil.h"
 
+#include "mxdsaction.h"
+#include "mxdsactionlist.h"
 #include "mxdsfile.h"
+#include "mxdsmultiaction.h"
 #include "mxdsobject.h"
 #include "mxrect32.h"
 
@@ -112,6 +115,21 @@ void SetOmniUserMessage(void (*p_userMsg)(const char*, int))
 	g_omniUserMessage = p_userMsg;
 }
 
+// FUNCTION: LEGO1 0x100b7220
+void FUN_100b7220(MxDSAction* p_action, MxU32 p_newFlags, MxBool p_setFlags)
+{
+	p_action->SetFlags(!p_setFlags ? p_action->GetFlags() & ~p_newFlags : p_action->GetFlags() | p_newFlags);
+
+	if (p_action->IsA("MxDSMultiAction")) {
+		MxDSActionListCursor cursor(((MxDSMultiAction*) p_action)->GetActionList());
+		MxDSAction* action;
+
+		while (cursor.Next(action)) {
+			FUN_100b7220(action, p_newFlags, p_setFlags);
+		}
+	}
+}
+
 // Should probably be somewhere else
 // FUNCTION: LEGO1 0x100c0280
 MxDSObject* CreateStreamObject(MxDSFile* p_file, MxS16 p_ofs)

From 5b7624c32a9b542c3be97656a15ccf7ac8b0cd3b Mon Sep 17 00:00:00 2001
From: Misha <106913236+MishaProductions@users.noreply.github.com>
Date: Mon, 15 Jan 2024 14:37:50 -0500
Subject: [PATCH 116/210] implement part of LegoAnimPresenter (#441)

* push changes

* implement + match a few functions

* Update legoanimpresenter.h

* reorder

* Update legoanimpresenter.cpp

* Update legoanimpresenter.cpp

* Update legoanimpresenter.cpp

* fix build

* Allow isle to start

* Match LegoAnimPresenter::VTable0x88

* Fixes

* use EndAction in StartingTickle stub

* Match StreamingTickle

* Fix override

* Comment about missing vtable functions

---------

Co-authored-by: Christian Semmler <mail@csemmler.com>
---
 .../lego/legoomni/include/legoanimpresenter.h |  79 ++++++
 .../legoomni/src/video/legoanimpresenter.cpp  | 234 +++++++++++++++++-
 LEGO1/omni/include/mxatomid.h                 |   3 +-
 3 files changed, 310 insertions(+), 6 deletions(-)

diff --git a/LEGO1/lego/legoomni/include/legoanimpresenter.h b/LEGO1/lego/legoomni/include/legoanimpresenter.h
index 3d43dd9f..5ff2f0c3 100644
--- a/LEGO1/lego/legoomni/include/legoanimpresenter.h
+++ b/LEGO1/lego/legoomni/include/legoanimpresenter.h
@@ -1,9 +1,15 @@
 #ifndef LEGOANIMPRESENTER_H
 #define LEGOANIMPRESENTER_H
 
+#include "mxgeometry/mxgeometry3d.h"
 #include "mxvideopresenter.h"
 
+class LegoWorld;
+class LegoMemoryStream;
+class LegoAnimClass;
+
 // VTABLE: LEGO1 0x100d90c8
+// SIZE 0xc0
 class LegoAnimPresenter : public MxVideoPresenter {
 public:
 	LegoAnimPresenter();
@@ -22,11 +28,84 @@ class LegoAnimPresenter : public MxVideoPresenter {
 		return !strcmp(p_name, LegoAnimPresenter::ClassName()) || MxVideoPresenter::IsA(p_name);
 	}
 
+	virtual void ReadyTickle() override;                                                           // vtable+0x18
+	virtual void StartingTickle() override;                                                        // vtable+0x1c
+	virtual void StreamingTickle() override;                                                       // vtable+0x20
+	virtual void ParseExtra() override;                                                            // vtable+0x30
+	virtual void Destroy() override;                                                               // vtable+0x38
+	virtual MxResult StartAction(MxStreamController* p_controller, MxDSAction* p_action) override; // vtable+0x3c
+	virtual void EndAction() override;                                                             // vtable+0x40
+	virtual void PutFrame() override;                                                              // vtable+0x6c
+	virtual MxResult VTable0x88(MxStreamChunk* p_chunk);                                           // vtable+0x88
+
+	// 6 more virtual functions here
+
 private:
 	void Init();
+	void Destroy(MxBool p_fromDestructor);
+
+	LegoAnimClass* m_unk0x64;  // 0x64
+	undefined4 m_unk0x68;      // 0x68
+	undefined4 m_unk0x6c;      // 0x6c
+	undefined4 m_unk0x70;      // 0x70
+	undefined4 m_unk0x74;      // 0x74
+	undefined4 m_unk0x78;      // 0x78
+	undefined4 m_unk0x7c;      // 0x7c
+	LegoWorld* m_currentWorld; // 0x80
+	MxAtomId m_animAtom;       // 0x84
+	undefined4 m_unk0x88;      // 0x88
+	undefined4 m_unk0x8c;      // 0x8c
+	undefined4 m_unk0x90;      // 0x90
+	undefined m_unk0x94;       // 0x94
+	undefined m_unk0x95;       // 0x95
+	undefined m_unk0x96;       // 0x96
+	undefined m_unk0x97;       // 0x97
+	undefined4 m_unk0x98;      // 0x98
+	MxS16 m_unk0x9c;           // 0x9c
+	undefined4 m_unk0xa0;      // 0xa0
+	undefined4 m_unk0xa4;      // 0xa4
+	Mx3DPointFloat m_unk0xa8;  // 0xa8
+	undefined4 m_unk0xbc;      // 0xbc
 };
 
 // SYNTHETIC: LEGO1 0x10068650
 // LegoAnimPresenter::`scalar deleting destructor'
 
+// VTABLE: LEGO1 0x100db768
+// SIZE 0x08
+class LegoAnimClassBase {
+public:
+	LegoAnimClassBase();
+	virtual ~LegoAnimClassBase();
+
+	virtual void VTable0x4(); // vtable+0x04
+	virtual void VTable0x8(); // vtable+0x08
+	virtual void VTable0xc(); // vtable+0x0c
+
+	undefined4 m_unk0x4; // 0x04
+};
+
+// SYNTHETIC: LEGO1 0x10099de0
+// LegoAnimClassBase::`scalar deleting destructor'
+
+// VTABLE: LEGO1 0x100db8d8
+// SIZE 0x18
+class LegoAnimClass : public LegoAnimClassBase {
+public:
+	LegoAnimClass();
+	virtual ~LegoAnimClass() override;
+
+	virtual void VTable0x8() override;                              // vtable+0x08
+	virtual void VTable0xc() override;                              // vtable+0x0c
+	virtual MxResult VTable0x10(LegoMemoryStream* p_stream, MxS32); // vtable+0x10
+
+	MxLong m_unk0x8;      // 0x08
+	undefined4 m_unk0xc;  // 0x0c
+	undefined4 m_unk0x10; // 0x10
+	undefined4 m_unk0x14; // 0x14
+};
+
+// SYNTHETIC: LEGO1 0x100a0ba0
+// LegoAnimClass::`scalar deleting destructor'
+
 #endif // LEGOANIMPRESENTER_H
diff --git a/LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp b/LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp
index 3c0883d6..38d23b52 100644
--- a/LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp
+++ b/LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp
@@ -1,19 +1,243 @@
 #include "legoanimpresenter.h"
 
-// STUB: LEGO1 0x10068420
+#include "legoomni.h"
+#include "legostream.h"
+#include "legoworld.h"
+#include "mxcompositepresenter.h"
+#include "mxdsanim.h"
+#include "mxstreamchunk.h"
+
+DECOMP_SIZE_ASSERT(LegoAnimPresenter, 0xc0)
+DECOMP_SIZE_ASSERT(LegoAnimClassBase, 0x08)
+DECOMP_SIZE_ASSERT(LegoAnimClass, 0x18)
+
+// FUNCTION: LEGO1 0x10068420
 LegoAnimPresenter::LegoAnimPresenter()
 {
-	// TODO
+	Init();
 }
 
-// STUB: LEGO1 0x10068670
+// FUNCTION: LEGO1 0x10068670
 LegoAnimPresenter::~LegoAnimPresenter()
 {
-	// TODO
+	Destroy(TRUE);
 }
 
-// STUB: LEGO1 0x100686f0
+// FUNCTION: LEGO1 0x100686f0
 void LegoAnimPresenter::Init()
+{
+	m_unk0x64 = NULL;
+	m_unk0x68 = 0;
+	m_unk0x6c = 0;
+	m_unk0x74 = 0;
+	m_unk0x70 = 0;
+	m_unk0x78 = 0;
+	m_unk0x7c = 0;
+	m_unk0xa8.Clear();
+	m_unk0xa4 = 0;
+	m_currentWorld = NULL;
+	m_unk0x95 = 0;
+	m_unk0x88 = -1;
+	m_unk0x98 = 0;
+	m_animAtom.Clear();
+	m_unk0x9c = 0;
+	m_unk0x8c = 0;
+	m_unk0x90 = 0;
+	m_unk0x94 = 0;
+	m_unk0x96 = 1;
+	m_unk0xa0 = 0;
+}
+
+// STUB: LEGO1 0x10068770
+void LegoAnimPresenter::Destroy(MxBool p_fromDestructor)
+{
+	// TODO
+	MxVideoPresenter::Destroy(p_fromDestructor);
+}
+
+// FUNCTION: LEGO1 0x10068fb0
+MxResult LegoAnimPresenter::VTable0x88(MxStreamChunk* p_chunk)
+{
+	MxResult result = FAILURE;
+	LegoMemoryStream stream((char*) p_chunk->GetData());
+
+	MxS32 magicSig;
+	MxS32 val2 = 0;
+	MxS32 val3;
+
+	if (stream.Read(&magicSig, sizeof(MxS32)) == SUCCESS && magicSig == 0x11) {
+		if (stream.Read(&m_unk0xa4, sizeof(MxU32)) == SUCCESS) {
+			if (stream.Read(&m_unk0xa8[0], sizeof(float)) == SUCCESS) {
+				if (stream.Read(&m_unk0xa8[1], sizeof(float)) == SUCCESS) {
+					if (stream.Read(&m_unk0xa8[2], sizeof(float)) == SUCCESS) {
+						if (stream.Read(&val2, sizeof(MxS32)) == SUCCESS) {
+							if (stream.Read(&val3, sizeof(MxS32)) == SUCCESS) {
+								m_unk0x64 = new LegoAnimClass();
+								if (m_unk0x64) {
+									if (m_unk0x64->VTable0x10(&stream, val2) == SUCCESS) {
+										result = SUCCESS;
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+
+	if (result != SUCCESS) {
+		delete m_unk0x64;
+		Init();
+	}
+
+	return result;
+}
+
+// STUB: LEGO1 0x1006ad30
+void LegoAnimPresenter::PutFrame()
+{
+	// TODO
+}
+
+// FUNCTION: LEGO1 0x1006b550
+void LegoAnimPresenter::ReadyTickle()
+{
+	m_currentWorld = GetCurrentWorld();
+
+	if (m_currentWorld) {
+		MxStreamChunk* chunk = m_subscriber->CurrentChunk();
+
+		if (chunk && chunk->GetTime() + m_action->GetStartTime() <= m_action->GetElapsedTime()) {
+			chunk = m_subscriber->NextChunk();
+			MxResult result = VTable0x88(chunk);
+			m_subscriber->DestroyChunk(chunk);
+
+			if (result == SUCCESS) {
+				ProgressTickleState(TickleState_Starting);
+				ParseExtra();
+			}
+			else {
+				EndAction();
+			}
+		}
+	}
+}
+
+// STUB: LEGO1 0x1006b5e0
+void LegoAnimPresenter::StartingTickle()
+{
+	// TODO
+	ProgressTickleState(TickleState_Streaming);
+	EndAction(); // Allow game to start
+}
+
+// FUNCTION: LEGO1 0x1006b840
+void LegoAnimPresenter::StreamingTickle()
+{
+	if (m_subscriber->CurrentChunk()) {
+		MxStreamChunk* chunk = m_subscriber->NextChunk();
+		m_subscriber->DestroyChunk(chunk);
+	}
+
+	if (m_unk0x95 == 0) {
+		if (m_unk0x64->m_unk0x8 + m_action->GetStartTime() < m_action->GetElapsedTime()) {
+			m_unk0x95 = 1;
+		}
+	}
+	else {
+		ProgressTickleState(TickleState_Done);
+		if (m_compositePresenter) {
+			if (m_compositePresenter->IsA("LegoAnimMMPresenter")) {
+				m_compositePresenter->VTable0x60(this);
+			}
+		}
+	}
+}
+
+// FUNCTION: LEGO1 0x1006b8e0
+void LegoAnimPresenter::Destroy()
+{
+	Destroy(FALSE);
+}
+
+// STUB: LEGO1 0x1006bac0
+void LegoAnimPresenter::ParseExtra()
+{
+	// TODO
+}
+
+// FUNCTION: LEGO1 0x1006c620
+MxResult LegoAnimPresenter::StartAction(MxStreamController* p_controller, MxDSAction* p_action)
+{
+	MxResult result = MxVideoPresenter::StartAction(p_controller, p_action);
+	m_displayZ = 0;
+	return result;
+}
+
+// STUB: LEGO1 0x1006c640
+void LegoAnimPresenter::EndAction()
+{
+	// TODO
+	MxVideoPresenter::EndAction();
+}
+
+// FUNCTION: LEGO1 0x10099dd0
+LegoAnimClassBase::LegoAnimClassBase()
+{
+	m_unk0x4 = 0;
+}
+
+// STUB: LEGO1 0x10099e00
+LegoAnimClassBase::~LegoAnimClassBase()
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x10099e20
+void LegoAnimClassBase::VTable0x4()
+{
+}
+
+// STUB: LEGO1 0x10099e40
+void LegoAnimClassBase::VTable0x8()
+{
+}
+
+// STUB: LEGO1 0x10099f70
+void LegoAnimClassBase::VTable0xc()
+{
+}
+
+// FUNCTION: LEGO1 0x100a0b30
+LegoAnimClass::LegoAnimClass()
+{
+	m_unk0x8 = 0;
+	m_unk0xc = 0;
+	m_unk0x10 = 0;
+	m_unk0x14 = 0;
+}
+
+// STUB: LEGO1 0x100a0bc0
+LegoAnimClass::~LegoAnimClass()
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x100a0c70
+MxResult LegoAnimClass::VTable0x10(LegoMemoryStream* p_stream, MxS32)
+{
+	return SUCCESS;
+}
+
+// STUB: LEGO1 0x100a0e30
+void LegoAnimClass::VTable0x8()
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x100a1040
+void LegoAnimClass::VTable0xc()
 {
 	// TODO
 }
diff --git a/LEGO1/omni/include/mxatomid.h b/LEGO1/omni/include/mxatomid.h
index 3abe6479..0573cc84 100644
--- a/LEGO1/omni/include/mxatomid.h
+++ b/LEGO1/omni/include/mxatomid.h
@@ -11,6 +11,7 @@ enum LookupMode {
 	LookupMode_LowerCase2 = 3
 };
 
+// SIZE 0x04
 class MxAtomId {
 public:
 	__declspec(dllexport) MxAtomId(const char*, LookupMode);
@@ -30,7 +31,7 @@ class MxAtomId {
 	MxAtomIdCounter* GetCounter(const char*, LookupMode);
 	void Destroy();
 
-	const char* m_internal;
+	const char* m_internal; // 0x00
 };
 
 #endif // MXATOMID_H

From 6df310bb66a4087e9e395f190a9d097668f424b4 Mon Sep 17 00:00:00 2001
From: Misha <106913236+MishaProductions@users.noreply.github.com>
Date: Mon, 15 Jan 2024 15:17:54 -0500
Subject: [PATCH 117/210] Implement LegoWorldPresenter::VTable0x60 (#442)

* LegoWorldPresenter::VTable0x60

* Update infocenter.cpp

* Minor adjustments

---------

Co-authored-by: Christian Semmler <mail@csemmler.com>
---
 .../src/entity/legoworldpresenter.cpp         | 21 ++++++++++++++++++-
 LEGO1/omni/include/mxpresenter.h              |  2 +-
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/LEGO1/lego/legoomni/src/entity/legoworldpresenter.cpp b/LEGO1/lego/legoomni/src/entity/legoworldpresenter.cpp
index 1becbad4..d501e191 100644
--- a/LEGO1/lego/legoomni/src/entity/legoworldpresenter.cpp
+++ b/LEGO1/lego/legoomni/src/entity/legoworldpresenter.cpp
@@ -10,6 +10,7 @@
 #include "mxactionnotificationparam.h"
 #include "mxautolocker.h"
 #include "mxdsactionlist.h"
+#include "mxdsmediaaction.h"
 #include "mxdsmultiaction.h"
 #include "mxnotificationmanager.h"
 #include "mxobjectfactory.h"
@@ -145,9 +146,27 @@ void LegoWorldPresenter::StartingTickle()
 	ProgressTickleState(TickleState_Streaming);
 }
 
-// STUB: LEGO1 0x10067a70
+// FUNCTION: LEGO1 0x10067a70
 void LegoWorldPresenter::VTable0x60(MxPresenter* p_presenter)
 {
+	MxCompositePresenter::VTable0x60(p_presenter);
+	MxDSAction* action = p_presenter->GetAction();
+
+	if (action->GetDuration() != -1 && (action->GetFlags() & MxDSAction::Flag_Looping) == 0) {
+		if (!action->IsA("MxDSMediaAction")) {
+			return;
+		}
+
+		if (((MxDSMediaAction*) action)->GetSustainTime() != -1) {
+			return;
+		}
+	}
+
+	if (!p_presenter->IsA("LegoAnimPresenter") && !p_presenter->IsA("MxControlPresenter") &&
+		!p_presenter->IsA("MxCompositePresenter")) {
+		p_presenter->SendToCompositePresenter(Lego());
+		((LegoWorld*) m_entity)->VTable0x58(p_presenter);
+	}
 }
 
 // STUB: LEGO1 0x10067b00
diff --git a/LEGO1/omni/include/mxpresenter.h b/LEGO1/omni/include/mxpresenter.h
index 55682f11..eddcc4f2 100644
--- a/LEGO1/omni/include/mxpresenter.h
+++ b/LEGO1/omni/include/mxpresenter.h
@@ -116,6 +116,7 @@ class MxPresenter : public MxCore {
 	__declspec(dllexport) virtual void Enable(MxBool p_enable); // vtable+0x54
 
 	MxEntity* CreateEntity(const char* p_name);
+	void SendToCompositePresenter(MxOmni*);
 	MxBool IsEnabled();
 
 	inline MxS32 GetCurrentTickleState() const { return this->m_currentTickleState; }
@@ -130,7 +131,6 @@ class MxPresenter : public MxCore {
 
 protected:
 	__declspec(dllexport) void Init();
-	void SendToCompositePresenter(MxOmni*);
 
 	TickleState m_currentTickleState;           // 0x8
 	MxU32 m_previousTickleStates;               // 0x0c

From a4c4ee656f14cbe270fc10d145c200c58e1f5031 Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Mon, 15 Jan 2024 15:44:04 -0500
Subject: [PATCH 118/210] Implement lists used in LegoWorld (#443)

* Add LegoEntityList

* Add MxCoreList, match LegoWorld::Create
---
 LEGO1/lego/legoomni/include/legoentitylist.h | 92 +++++++++++++++++++
 LEGO1/lego/legoomni/include/legoworld.h      | 10 ++-
 LEGO1/lego/legoomni/include/legoworldlist.h  | 24 ++---
 LEGO1/lego/legoomni/src/entity/legoworld.cpp | 36 +++++---
 LEGO1/omni/include/mxcorelist.h              | 95 ++++++++++++++++++++
 5 files changed, 229 insertions(+), 28 deletions(-)
 create mode 100644 LEGO1/lego/legoomni/include/legoentitylist.h
 create mode 100644 LEGO1/omni/include/mxcorelist.h

diff --git a/LEGO1/lego/legoomni/include/legoentitylist.h b/LEGO1/lego/legoomni/include/legoentitylist.h
new file mode 100644
index 00000000..1d29e65d
--- /dev/null
+++ b/LEGO1/lego/legoomni/include/legoentitylist.h
@@ -0,0 +1,92 @@
+#ifndef LEGOENTITYLIST_H
+#define LEGOENTITYLIST_H
+
+#include "mxlist.h"
+#include "mxtypes.h"
+
+class LegoEntity;
+
+// VTABLE: LEGO1 0x100d6410
+// class MxCollection<LegoEntity *>
+
+// VTABLE: LEGO1 0x100d6428
+// class MxList<LegoEntity *>
+
+// VTABLE: LEGO1 0x100d6440
+// class MxPtrList<LegoEntity>
+
+// VTABLE: LEGO1 0x100d6458
+// SIZE 0x18
+class LegoEntityList : public MxPtrList<LegoEntity> {
+public:
+	LegoEntityList(MxBool p_ownership = FALSE) : MxPtrList<LegoEntity>(p_ownership) {}
+
+	// FUNCTION: LEGO1 0x1001e2d0
+	virtual MxS8 Compare(LegoEntity* p_a, LegoEntity* p_b) override
+	{
+		return p_a == p_b ? 0 : p_a < p_b ? -1 : 1;
+	}; // vtable+0x14
+};
+
+// VTABLE: LEGO1 0x100d64e8
+// class MxListCursor<LegoEntity *>
+
+// VTABLE: LEGO1 0x100d64b8
+// class MxPtrListCursor<LegoEntity>
+
+// VTABLE: LEGO1 0x100d64d0
+// SIZE 0x10
+class LegoEntityListCursor : public MxPtrListCursor<LegoEntity> {
+public:
+	LegoEntityListCursor(LegoEntityList* p_list) : MxPtrListCursor<LegoEntity>(p_list){};
+};
+
+// TEMPLATE: LEGO1 0x1001e2f0
+// MxCollection<LegoEntity *>::Compare
+
+// TEMPLATE: LEGO1 0x1001e300
+// MxCollection<LegoEntity *>::~MxCollection<LegoEntity *>
+
+// TEMPLATE: LEGO1 0x1001e350
+// MxCollection<LegoEntity *>::Destroy
+
+// TEMPLATE: LEGO1 0x1001e360
+// MxList<LegoEntity *>::~MxList<LegoEntity *>
+
+// TEMPLATE: LEGO1 0x1001e3f0
+// MxPtrList<LegoEntity>::Destroy
+
+// SYNTHETIC: LEGO1 0x1001e400
+// LegoEntityList::`scalar deleting destructor'
+
+// TEMPLATE: LEGO1 0x1001e470
+// MxPtrList<LegoEntity>::~MxPtrList<LegoEntity>
+
+// SYNTHETIC: LEGO1 0x1001e4c0
+// MxCollection<LegoEntity *>::`scalar deleting destructor'
+
+// SYNTHETIC: LEGO1 0x1001e530
+// MxList<LegoEntity *>::`scalar deleting destructor'
+
+// SYNTHETIC: LEGO1 0x1001e5e0
+// MxPtrList<LegoEntity>::`scalar deleting destructor'
+
+// SYNTHETIC: LEGO1 0x1001f110
+// LegoEntityListCursor::`scalar deleting destructor'
+
+// FUNCTION: LEGO1 0x1001f180
+// MxPtrListCursor<LegoEntity>::~MxPtrListCursor<LegoEntity>
+
+// SYNTHETIC: LEGO1 0x1001f1d0
+// MxListCursor<LegoEntity *>::`scalar deleting destructor'
+
+// SYNTHETIC: LEGO1 0x1001f240
+// MxPtrListCursor<LegoEntity>::`scalar deleting destructor'
+
+// FUNCTION: LEGO1 0x1001f2b0
+// MxListCursor<LegoEntity *>::~MxListCursor<LegoEntity *>
+
+// FUNCTION: LEGO1 0x1001edc6
+// LegoEntityListCursor::~LegoEntityListCursor
+
+#endif // LEGOENTITYLIST_H
diff --git a/LEGO1/lego/legoomni/include/legoworld.h b/LEGO1/lego/legoomni/include/legoworld.h
index 7cacf766..4ac7ca37 100644
--- a/LEGO1/lego/legoomni/include/legoworld.h
+++ b/LEGO1/lego/legoomni/include/legoworld.h
@@ -3,7 +3,9 @@
 
 #include "legocameracontroller.h"
 #include "legoentity.h"
+#include "legoentitylist.h"
 #include "legopathcontrollerlist.h"
+#include "mxcorelist.h"
 #include "mxpresenter.h"
 #include "mxpresenterlist.h"
 
@@ -38,8 +40,10 @@ class LegoWorld : public LegoEntity {
 	virtual LegoCameraController* VTable0x54();               // vtable+0x54
 	virtual void VTable0x58(MxCore* p_object);                // vtable+0x58
 	virtual MxBool VTable0x5c();                              // vtable+0x5c
+
 	// FUNCTION: LEGO1 0x100010a0
-	virtual void VTable0x60() {}           // vtable+0x60
+	virtual void VTable0x60() {} // vtable+0x60
+
 	virtual MxBool VTable0x64();           // vtable+0x64
 	virtual void VTable0x68(MxBool p_add); // vtable+0x68
 
@@ -59,7 +63,9 @@ class LegoWorld : public LegoEntity {
 	LegoPathControllerList m_list0x68;        // 0x68
 	MxPresenterList m_list0x80;               // 0x80
 	LegoCameraController* m_cameraController; // 0x98
-	undefined m_unk0x9c[0x1c];                // 0x9c
+	LegoEntityList* m_entityList;             // 0x9c
+	MxCoreList* m_coreList;                   // 0xa0
+	undefined m_unk0xa4[0x14];                // 0xa4
 	MxPresenterList m_list0xb8;               // 0xb8
 	undefined m_unk0xd0[0x1c];                // 0xd0
 	undefined4 m_unk0xec;                     // 0xec
diff --git a/LEGO1/lego/legoomni/include/legoworldlist.h b/LEGO1/lego/legoomni/include/legoworldlist.h
index e8acbb69..2e52de47 100644
--- a/LEGO1/lego/legoomni/include/legoworldlist.h
+++ b/LEGO1/lego/legoomni/include/legoworldlist.h
@@ -41,6 +41,18 @@ class LegoWorldListCursor : public MxPtrListCursor<LegoWorld> {
 	LegoWorldListCursor(LegoWorldList* p_list) : MxPtrListCursor<LegoWorld>(p_list){};
 };
 
+// SYNTHETIC: LEGO1 0x1003e870
+// LegoWorldListCursor::`scalar deleting destructor'
+
+// FUNCTION: LEGO1 0x1003e8e0
+// MxPtrListCursor<LegoWorld>::~MxPtrListCursor<LegoWorld>
+
+// FUNCTION: LEGO1 0x1003ea10
+// MxListCursor<LegoWorld *>::~MxListCursor<LegoWorld *>
+
+// FUNCTION: LEGO1 0x1003ea60
+// LegoWorldListCursor::~LegoWorldListCursor
+
 // TEMPLATE: LEGO1 0x100598f0
 // MxCollection<LegoWorld *>::Compare
 
@@ -65,16 +77,4 @@ class LegoWorldListCursor : public MxPtrListCursor<LegoWorld> {
 // SYNTHETIC: LEGO1 0x10059be0
 // MxPtrList<LegoWorld>::`scalar deleting destructor'
 
-// SYNTHETIC: LEGO1 0x1003e870
-// LegoWorldListCursor::`scalar deleting destructor'
-
-// FUNCTION: LEGO1 0x1003e8e0
-// MxPtrListCursor<LegoWorld>::~MxPtrListCursor<LegoWorld>
-
-// FUNCTION: LEGO1 0x1003ea10
-// MxListCursor<LegoWorld *>::~MxListCursor<LegoWorld *>
-
-// FUNCTION: LEGO1 0x1003ea60
-// LegoWorldListCursor::~LegoWorldListCursor
-
 #endif // LEGOWORLDLIST_H
diff --git a/LEGO1/lego/legoomni/src/entity/legoworld.cpp b/LEGO1/lego/legoomni/src/entity/legoworld.cpp
index c7a2608a..c9e24038 100644
--- a/LEGO1/lego/legoomni/src/entity/legoworld.cpp
+++ b/LEGO1/lego/legoomni/src/entity/legoworld.cpp
@@ -40,29 +40,37 @@ LegoWorld::~LegoWorld()
 	// TODO
 }
 
-// STUB: LEGO1 0x1001e0b0
+// FUNCTION: LEGO1 0x1001e0b0
 MxResult LegoWorld::Create(MxDSAction& p_dsAction)
 {
 	MxEntity::Create(p_dsAction);
 
-	// TODO: Intitialize lists
+	m_entityList = new LegoEntityList(TRUE);
 
-	if (VTable0x54()) {
-		if (p_dsAction.GetFlags() & MxDSAction::Flag_Enabled) {
-			if (GetCurrentWorld()) {
-				GetCurrentWorld()->VTable0x68(0);
-			}
+	if (!m_entityList)
+		return FAILURE;
 
-			SetCurrentWorld(this);
-			ControlManager()->FUN_10028df0(&m_list0xb8);
+	m_coreList = new MxCoreList(TRUE);
+
+	if (!m_coreList)
+		return FAILURE;
+
+	if (!VTable0x54())
+		return FAILURE;
+
+	if (p_dsAction.GetFlags() & MxDSAction::Flag_Enabled) {
+		if (GetCurrentWorld()) {
+			GetCurrentWorld()->VTable0x68(0);
 		}
 
-		SetIsWorldActive(TRUE);
-		m_unk0xec = -1;
-
-		return SUCCESS;
+		SetCurrentWorld(this);
+		ControlManager()->FUN_10028df0(&m_list0xb8);
 	}
-	return FAILURE;
+
+	SetIsWorldActive(TRUE);
+	m_unk0xec = -1;
+
+	return SUCCESS;
 }
 
 // FUNCTION: LEGO1 0x1001f5e0
diff --git a/LEGO1/omni/include/mxcorelist.h b/LEGO1/omni/include/mxcorelist.h
new file mode 100644
index 00000000..15ae7c9b
--- /dev/null
+++ b/LEGO1/omni/include/mxcorelist.h
@@ -0,0 +1,95 @@
+#ifndef MXCORELIST_H
+#define MXCORELIST_H
+
+#include "mxlist.h"
+#include "mxtypes.h"
+
+class MxCore;
+
+// VTABLE: LEGO1 0x100d63b0
+// class MxCollection<MxCore *>
+
+// VTABLE: LEGO1 0x100d63c8
+// class MxList<MxCore *>
+
+// VTABLE: LEGO1 0x100d63e0
+// class MxPtrList<MxCore>
+
+// VTABLE: LEGO1 0x100d63f8
+// SIZE 0x18
+class MxCoreList : public MxPtrList<MxCore> {
+public:
+	MxCoreList(MxBool p_ownership = FALSE) : MxPtrList<MxCore>(p_ownership) {}
+
+	// FUNCTION: LEGO1 0x1001e650
+	virtual MxS8 Compare(MxCore* p_a, MxCore* p_b) override
+	{
+		return p_a == p_b ? 0 : p_a < p_b ? -1 : 1;
+	}; // vtable+0x14
+};
+
+// VTABLE: LEGO1 0x100d64a0
+// class MxListCursor<MxCore *>
+
+// VTABLE: LEGO1 0x100d6500
+// class MxPtrListCursor<MxCore>
+
+// VTABLE: LEGO1 0x100d6518
+// SIZE 0x10
+class MxCoreListCursor : public MxPtrListCursor<MxCore> {
+public:
+	MxCoreListCursor(MxCoreList* p_list) : MxPtrListCursor<MxCore>(p_list){};
+};
+
+// TEMPLATE: LEGO1 0x1001e670
+// MxCollection<MxCore *>::Compare
+
+// TEMPLATE: LEGO1 0x1001e680
+// MxCollection<MxCore *>::~MxCollection<MxCore *>
+
+// TEMPLATE: LEGO1 0x1001e6d0
+// MxCollection<MxCore *>::Destroy
+
+// TEMPLATE: LEGO1 0x1001e6e0
+// MxList<MxCore *>::~MxList<MxCore *>
+
+// TEMPLATE: LEGO1 0x1001e770
+// MxPtrList<MxCore>::Destroy
+
+// SYNTHETIC: LEGO1 0x1001e780
+// MxCoreList::`scalar deleting destructor'
+
+// TEMPLATE: LEGO1 0x1001e7f0
+// MxPtrList<MxCore>::~MxPtrList<MxCore>
+
+// SYNTHETIC: LEGO1 0x1001e840
+// MxCollection<MxCore *>::`scalar deleting destructor'
+
+// SYNTHETIC: LEGO1 0x1001e8b0
+// MxList<MxCore *>::`scalar deleting destructor'
+
+// SYNTHETIC: LEGO1 0x1001e960
+// MxPtrList<MxCore>::`scalar deleting destructor'
+
+// SYNTHETIC: LEGO1 0x1001f350
+// MxCoreListCursor::`scalar deleting destructor'
+
+// FUNCTION: LEGO1 0x1001f3c0
+// MxPtrListCursor<MxCore>::~MxPtrListCursor<MxCore>
+
+// SYNTHETIC: LEGO1 0x1001f410
+// MxListCursor<MxCore *>::`scalar deleting destructor'
+
+// SYNTHETIC: LEGO1 0x1001f480
+// MxPtrListCursor<MxCore>::`scalar deleting destructor'
+
+// FUNCTION: LEGO1 0x1001f4f0
+// MxListCursor<MxCore *>::~MxListCursor<MxCore *>
+
+// FUNCTION: LEGO1 0x1001f540
+// MxCoreListCursor::~MxCoreListCursor
+
+// TEMPLATE: LEGO1 0x10020840
+// MxListCursor<MxCore *>::MxListCursor<MxCore *>
+
+#endif // MXCORELIST_H

From b1fdb780de2fe50064bc0b5b15774d95fcf61b44 Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Mon, 15 Jan 2024 15:59:57 -0500
Subject: [PATCH 119/210] Add missing size asserts for lists

---
 LEGO1/lego/legoomni/src/entity/legoworld.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/LEGO1/lego/legoomni/src/entity/legoworld.cpp b/LEGO1/lego/legoomni/src/entity/legoworld.cpp
index c9e24038..dca2115f 100644
--- a/LEGO1/lego/legoomni/src/entity/legoworld.cpp
+++ b/LEGO1/lego/legoomni/src/entity/legoworld.cpp
@@ -11,7 +11,11 @@
 #include "mxomni.h"
 #include "mxticklemanager.h"
 
-DECOMP_SIZE_ASSERT(LegoWorld, 0xf8);
+DECOMP_SIZE_ASSERT(LegoWorld, 0xf8)
+DECOMP_SIZE_ASSERT(LegoEntityList, 0x18)
+DECOMP_SIZE_ASSERT(LegoEntityListCursor, 0x10)
+DECOMP_SIZE_ASSERT(MxCoreList, 0x18)
+DECOMP_SIZE_ASSERT(MxCoreListCursor, 0x10)
 
 // STUB: LEGO1 0x1001ca40
 LegoWorld::LegoWorld() : m_list0x68(TRUE)

From 6af0c6cb1a803b295e6349313b58ef73dba92e5d Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Tue, 16 Jan 2024 14:33:03 -0500
Subject: [PATCH 120/210] Implement/match a few LegoEntity functions (#445)

* Implement/match a few LegoEntity functions

* Add annotations
---
 .../legoomni/include/legocameracontroller.h   |  2 +-
 LEGO1/lego/legoomni/include/legoentity.h      | 20 ++++++++---
 LEGO1/lego/legoomni/include/legoomni.h        |  2 ++
 .../legoomni/include/legounksavedatawriter.h  |  3 ++
 .../src/common/legofullscreenmovie.cpp        |  1 -
 .../src/common/legounksavedatawriter.cpp      |  6 ++++
 .../src/entity/legocameracontroller.cpp       |  2 +-
 LEGO1/lego/legoomni/src/entity/legoentity.cpp | 33 ++++++++++++-------
 LEGO1/lego/legoomni/src/main/legoomni.cpp     |  6 ++++
 .../src/video/legopalettepresenter.cpp        |  9 ++---
 LEGO1/lego/sources/roi/legoroi.h              | 14 +++++---
 LEGO1/omni/include/mxmediamanager.h           |  2 +-
 LEGO1/realtime/orientableroi.h                |  1 +
 13 files changed, 74 insertions(+), 27 deletions(-)

diff --git a/LEGO1/lego/legoomni/include/legocameracontroller.h b/LEGO1/lego/legoomni/include/legocameracontroller.h
index 48256789..7d038d02 100644
--- a/LEGO1/lego/legoomni/include/legocameracontroller.h
+++ b/LEGO1/lego/legoomni/include/legocameracontroller.h
@@ -37,7 +37,7 @@ class LegoCameraController : public LegoPointOfViewController {
 	virtual MxResult Create();                                    // vtable+0x44
 
 	void SetWorldTransform(const Vector3& p_at, const Vector3& p_dir, const Vector3& p_up);
-	void FUN_100123e0(MxMatrix& p_transform, MxU32);
+	void FUN_100123e0(const MxMatrix& p_transform, MxU32);
 	Mx3DPointFloat GetWorldUp();
 	Mx3DPointFloat GetWorldLocation();
 	Mx3DPointFloat GetWorldDirection();
diff --git a/LEGO1/lego/legoomni/include/legoentity.h b/LEGO1/lego/legoomni/include/legoentity.h
index 56960110..c8e3df35 100644
--- a/LEGO1/lego/legoomni/include/legoentity.h
+++ b/LEGO1/lego/legoomni/include/legoentity.h
@@ -12,10 +12,19 @@
 // SIZE 0x68 (probably)
 class LegoEntity : public MxEntity {
 public:
+	enum {
+		Flag_Bit1 = 0x01
+	};
+
 	// Inlined at 0x100853f7
 	inline LegoEntity() { Init(); }
 
-	__declspec(dllexport) virtual ~LegoEntity() override; // vtable+0x0
+#ifdef ISLE_APP
+	__declspec(dllexport) virtual ~LegoEntity() override;
+#else
+	// FUNCTION: LEGO1 0x1000c290
+	__declspec(dllexport) virtual ~LegoEntity() override { Destroy(TRUE); }
+#endif
 
 	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x4
 
@@ -58,15 +67,15 @@ class LegoEntity : public MxEntity {
 	void Init();
 	void SetWorld();
 
-	undefined m_unk0x10;
-	undefined m_unk0x11;
+	undefined m_unk0x10;             // 0x10
+	MxU8 m_flags;                    // 0x11
 	Mx3DPointFloat m_worldLocation;  // 0x14
 	Mx3DPointFloat m_worldDirection; // 0x28
 	Mx3DPointFloat m_worldUp;        // 0x3c
 	MxFloat m_worldSpeed;            // 0x50
 	LegoROI* m_roi;                  // 0x54
 	MxBool m_cameraFlag;             // 0x58
-	undefined m_unk0x59;
+	undefined m_unk0x59;             // 0x59
 	// For tokens from the extra string that look like this:
 	// "Action:openram;\lego\scripts\Race\CarRaceR;0"
 	ExtraActionType m_actionType; // 0x5c
@@ -74,4 +83,7 @@ class LegoEntity : public MxEntity {
 	MxS32 m_actionArgNumber;      // 0x64
 };
 
+// SYNTHETIC: LEGO1 0x1000c3b0
+// LegoEntity::`scalar deleting destructor'
+
 #endif // LEGOENTITY_H
diff --git a/LEGO1/lego/legoomni/include/legoomni.h b/LEGO1/lego/legoomni/include/legoomni.h
index deab2d44..2199afdf 100644
--- a/LEGO1/lego/legoomni/include/legoomni.h
+++ b/LEGO1/lego/legoomni/include/legoomni.h
@@ -114,6 +114,7 @@ class LegoOmni : public MxOmni {
 	MxBackgroundAudioManager* GetBackgroundAudioManager() { return m_bkgAudioManager; }
 	MxTransitionManager* GetTransitionManager() { return m_transitionManager; }
 	MxDSAction& GetCurrentAction() { return m_action; }
+	LegoUnkSaveDataWriter* GetUnkSaveDataWriter() { return m_saveDataWriter; }
 
 	inline void SetNavController(LegoNavController* p_navController) { m_navController = p_navController; }
 	inline void SetWorld(LegoWorld* p_currentWorld) { m_currentWorld = p_currentWorld; }
@@ -157,6 +158,7 @@ LegoControlManager* ControlManager();
 IslePathActor* GetCurrentVehicle();
 LegoPlantManager* PlantManager();
 LegoWorld* GetCurrentWorld();
+LegoUnkSaveDataWriter* GetUnkSaveDataWriter();
 GifManager* GetGifManager();
 void FUN_10015820(MxU32, MxU32);
 LegoEntity* FindEntityByAtomIdOrEntityId(const MxAtomId& p_atom, MxS32 p_entityid);
diff --git a/LEGO1/lego/legoomni/include/legounksavedatawriter.h b/LEGO1/lego/legoomni/include/legounksavedatawriter.h
index 039058e6..240bef11 100644
--- a/LEGO1/lego/legoomni/include/legounksavedatawriter.h
+++ b/LEGO1/lego/legoomni/include/legounksavedatawriter.h
@@ -4,6 +4,7 @@
 #include "decomp.h"
 #include "mxtypes.h"
 
+class LegoROI;
 class LegoStream;
 
 struct LegoSaveDataEntry3 {
@@ -32,7 +33,9 @@ struct LegoSaveDataEntry3 {
 };
 
 class LegoUnkSaveDataWriter {
+public:
 	MxResult WriteSaveData3(LegoStream* p_stream);
+	void FUN_10083db0(LegoROI* p_roi);
 };
 
 #endif // LEGOUNKSAVEDATAWRITER_H
diff --git a/LEGO1/lego/legoomni/src/common/legofullscreenmovie.cpp b/LEGO1/lego/legoomni/src/common/legofullscreenmovie.cpp
index 7fcdce59..4a102fcf 100644
--- a/LEGO1/lego/legoomni/src/common/legofullscreenmovie.cpp
+++ b/LEGO1/lego/legoomni/src/common/legofullscreenmovie.cpp
@@ -29,7 +29,6 @@ void LegoFullScreenMovie::SetValue(const char* p_option)
 
 	LegoVideoManager* videomanager = VideoManager();
 	if (videomanager) {
-
 		if (!strcmp(m_value.GetData(), g_strEnable)) {
 			videomanager->EnableFullScreenMovie(TRUE);
 			return;
diff --git a/LEGO1/lego/legoomni/src/common/legounksavedatawriter.cpp b/LEGO1/lego/legoomni/src/common/legounksavedatawriter.cpp
index 2e4d1804..a6e7e135 100644
--- a/LEGO1/lego/legoomni/src/common/legounksavedatawriter.cpp
+++ b/LEGO1/lego/legoomni/src/common/legounksavedatawriter.cpp
@@ -47,3 +47,9 @@ MxResult LegoUnkSaveDataWriter::WriteSaveData3(LegoStream* p_stream)
 	}
 	return result;
 }
+
+// STUB: LEGO1 0x10083db0
+void LegoUnkSaveDataWriter::FUN_10083db0(LegoROI* p_roi)
+{
+	// TODO
+}
diff --git a/LEGO1/lego/legoomni/src/entity/legocameracontroller.cpp b/LEGO1/lego/legoomni/src/entity/legocameracontroller.cpp
index b30a78b8..d48d22ff 100644
--- a/LEGO1/lego/legoomni/src/entity/legocameracontroller.cpp
+++ b/LEGO1/lego/legoomni/src/entity/legocameracontroller.cpp
@@ -78,7 +78,7 @@ void LegoCameraController::SetWorldTransform(const Vector3& p_at, const Vector3&
 }
 
 // STUB: LEGO1 0x100123e0
-void LegoCameraController::FUN_100123e0(MxMatrix& p_transform, MxU32)
+void LegoCameraController::FUN_100123e0(const MxMatrix& p_transform, MxU32)
 {
 }
 
diff --git a/LEGO1/lego/legoomni/src/entity/legoentity.cpp b/LEGO1/lego/legoomni/src/entity/legoentity.cpp
index 7e377671..b4615704 100644
--- a/LEGO1/lego/legoomni/src/entity/legoentity.cpp
+++ b/LEGO1/lego/legoomni/src/entity/legoentity.cpp
@@ -2,17 +2,13 @@
 
 #include "define.h"
 #include "legoomni.h"
+#include "legounksavedatawriter.h"
 #include "legoutil.h"
+#include "legovideomanager.h"
 #include "legoworld.h"
 
 DECOMP_SIZE_ASSERT(LegoEntity, 0x68)
 
-// FUNCTION: LEGO1 0x1000c290
-LegoEntity::~LegoEntity()
-{
-	Destroy(TRUE);
-}
-
 // FUNCTION: LEGO1 0x100105f0
 void LegoEntity::Init()
 {
@@ -20,10 +16,10 @@ void LegoEntity::Init()
 	m_worldDirection.Fill(0);
 	m_worldSpeed = 0;
 	m_roi = NULL;
-	m_cameraFlag = 0;
+	m_cameraFlag = FALSE;
 	m_actionArgString = NULL;
 	m_unk0x10 = 0;
-	m_unk0x11 = 0;
+	m_flags = 0;
 	m_actionType = ExtraActionType_unknown;
 	m_actionArgNumber = -1;
 	m_unk0x59 = 4;
@@ -50,11 +46,22 @@ MxResult LegoEntity::Create(MxDSAction& p_dsAction)
 	return SUCCESS;
 }
 
-// STUB: LEGO1 0x10010810
+// FUNCTION: LEGO1 0x10010810
 void LegoEntity::Destroy(MxBool p_fromDestructor)
 {
 	if (m_roi) {
-		// TODO
+		if (m_flags & Flag_Bit1) {
+			if (m_roi->GetUnknown0x104() == this)
+				m_roi->SetUnknown0x104(NULL);
+
+			GetUnkSaveDataWriter()->FUN_10083db0(m_roi);
+		}
+		else {
+			VideoManager()->Get3DManager()->GetLego3DView()->Remove(*m_roi);
+
+			if (m_roi)
+				delete m_roi;
+		}
 	}
 
 	delete[] m_actionArgString;
@@ -82,9 +89,13 @@ void LegoEntity::SetLocation(Mx3DPointFloat& p_location, Mx3DPointFloat& p_direc
 	// TODO
 }
 
-// STUB: LEGO1 0x10010c30
+// FUNCTION: LEGO1 0x10010c30
 void LegoEntity::FUN_10010c30()
 {
+	LegoWorld* world = GetCurrentWorld();
+
+	if (m_cameraFlag && world && world->GetCamera() && m_roi)
+		world->GetCamera()->FUN_100123e0(m_roi->GetLocal2World(), 1);
 }
 
 // FUNCTION: LEGO1 0x10010e10
diff --git a/LEGO1/lego/legoomni/src/main/legoomni.cpp b/LEGO1/lego/legoomni/src/main/legoomni.cpp
index 9cb67852..e0d292b4 100644
--- a/LEGO1/lego/legoomni/src/main/legoomni.cpp
+++ b/LEGO1/lego/legoomni/src/main/legoomni.cpp
@@ -181,6 +181,12 @@ LegoWorld* GetCurrentWorld()
 	return LegoOmni::GetInstance()->GetCurrentOmniWorld();
 }
 
+// FUNCTION: LEGO1 0x100157b0
+LegoUnkSaveDataWriter* GetUnkSaveDataWriter()
+{
+	return LegoOmni::GetInstance()->GetUnkSaveDataWriter();
+}
+
 // FUNCTION: LEGO1 0x100157e0
 LegoPlantManager* PlantManager()
 {
diff --git a/LEGO1/lego/legoomni/src/video/legopalettepresenter.cpp b/LEGO1/lego/legoomni/src/video/legopalettepresenter.cpp
index 6fbc7803..53731a1a 100644
--- a/LEGO1/lego/legoomni/src/video/legopalettepresenter.cpp
+++ b/LEGO1/lego/legoomni/src/video/legopalettepresenter.cpp
@@ -49,12 +49,13 @@ void LegoPalettePresenter::Destroy()
 MxResult LegoPalettePresenter::ParsePalette(MxStreamChunk* p_chunk)
 {
 	MxU8 buffer[40];
-	RGBQUAD palleteData[256];
+	RGBQUAD palette[256];
 	MxResult result = FAILURE;
+
 	LegoMemoryStream stream((char*) p_chunk->GetData());
-	if (stream.Read(buffer, 40) == SUCCESS) {
-		if (stream.Read(palleteData, sizeof(RGBQUAD) * 256) == SUCCESS) {
-			m_palette = new MxPalette(palleteData);
+	if (stream.Read(buffer, sizeof(buffer)) == SUCCESS) {
+		if (stream.Read(palette, sizeof(palette)) == SUCCESS) {
+			m_palette = new MxPalette(palette);
 			if (m_palette) {
 				result = SUCCESS;
 			}
diff --git a/LEGO1/lego/sources/roi/legoroi.h b/LEGO1/lego/sources/roi/legoroi.h
index 17d66ef4..d257398e 100644
--- a/LEGO1/lego/sources/roi/legoroi.h
+++ b/LEGO1/lego/sources/roi/legoroi.h
@@ -6,6 +6,8 @@
 
 typedef MxBool (*ROIHandler)(char*, char*, MxU32);
 
+class LegoEntity;
+
 // Note: There is an extra class between LegoROI and ViewROI,
 // maybe called "AutoROI". VTABLE 0x100dbe38
 
@@ -15,6 +17,9 @@ class LegoROI : public ViewROI {
 public:
 	LegoROI(Tgl::Renderer* p_renderer, ViewLODList* p_lodList, MxTime p_time);
 
+	// Note: Actually part of parent class (doesn't exist yet)
+	virtual void UpdateWorldBoundingVolumes() override; // vtable+0x18
+
 	__declspec(dllexport) void SetDisplayBB(MxS32 p_displayBB);
 	__declspec(dllexport) static void configureLegoROI(MxS32 p_roi);
 
@@ -32,12 +37,13 @@ class LegoROI : public ViewROI {
 	void FUN_100a46b0(Matrix4& p_transform);
 	void FUN_100a58f0(Matrix4& p_transform);
 
-	// Note: Actually part of parent class (doesn't exist yet)
-	virtual void UpdateWorldBoundingVolumes() override; // vtable+0x18
+	inline LegoEntity* GetUnknown0x104() { return m_unk0x104; }
+	inline void SetUnknown0x104(LegoEntity* p_unk0x104) { m_unk0x104 = p_unk0x104; }
 
 private:
-	undefined m_pad[0x28]; // 0xe0
-	MxTime m_time;         // 0x108
+	undefined m_pad[0x24];  // 0xe0
+	LegoEntity* m_unk0x104; // 0x104
+	MxTime m_time;          // 0x108
 };
 
 #endif // LEGOROI_H
diff --git a/LEGO1/omni/include/mxmediamanager.h b/LEGO1/omni/include/mxmediamanager.h
index 1f2e31af..aefbd9f6 100644
--- a/LEGO1/omni/include/mxmediamanager.h
+++ b/LEGO1/omni/include/mxmediamanager.h
@@ -24,7 +24,7 @@ class MxMediaManager : public MxCore {
 	MxResult Init();
 
 protected:
-	MxPresenterList* m_presenters;
+	MxPresenterList* m_presenters;       // 0x8
 	MxThread* m_thread;                  // 0xc
 	MxCriticalSection m_criticalSection; // 0x10
 };
diff --git a/LEGO1/realtime/orientableroi.h b/LEGO1/realtime/orientableroi.h
index 71e0fc71..821a2978 100644
--- a/LEGO1/realtime/orientableroi.h
+++ b/LEGO1/realtime/orientableroi.h
@@ -28,6 +28,7 @@ class OrientableROI : public ROI {
 	virtual void UpdateWorldData(const MxMatrix& p_transform);  // vtable+0x28
 	virtual void UpdateWorldVelocity();                         // vtable+0x2c
 
+	const MxMatrix& GetLocal2World() const { return m_local2world; }
 	const float* GetWorldPosition() const { return m_local2world[3]; }
 	const float* GetWorldDirection() const { return m_local2world[2]; }
 	const float* GetWorldUp() const { return m_local2world[1]; }

From aaa18bc9e218d68e185b209ffb310e58bfd81dca Mon Sep 17 00:00:00 2001
From: MS <disinvite@users.noreply.github.com>
Date: Wed, 17 Jan 2024 06:56:34 -0500
Subject: [PATCH 121/210] Decomp parser: indirect globals and string markers
 (#446)

* Enable string annotations and indirect globals

* Adding some STRING annotations

* Library functions
---
 ISLE/library_msvc.h                           |  63 ++++
 ISLE/library_smartheap.h                      | 312 ++++++++++++++++++
 LEGO1/define.cpp                              |   6 +
 .../src/common/legobackgroundcolor.cpp        |   5 +-
 .../src/common/legofullscreenmovie.cpp        |   2 +
 .../legoomni/src/common/legogamestate.cpp     |   3 +
 LEGO1/lego/legoomni/src/common/legostream.cpp |   1 +
 LEGO1/lego/legoomni/src/main/legoomni.cpp     |   1 +
 .../legoomni/src/video/legometerpresenter.cpp |   7 +
 LEGO1/library_msvc.h                          |  25 +-
 LEGO1/omni/src/common/mxvariabletable.cpp     |   2 +
 LEGO1/omni/src/video/mxstillpresenter.cpp     |   1 +
 tools/isledecomp/isledecomp/compare/core.py   |  28 +-
 tools/isledecomp/isledecomp/compare/db.py     |   5 +-
 .../isledecomp/isledecomp/cvdump/analysis.py  |   6 +-
 .../isledecomp/isledecomp/cvdump/demangler.py |  11 +-
 .../isledecomp/isledecomp/parser/codebase.py  |   4 +
 tools/isledecomp/isledecomp/parser/error.py   |   4 +
 tools/isledecomp/isledecomp/parser/linter.py  |  33 +-
 tools/isledecomp/isledecomp/parser/marker.py  |  30 ++
 tools/isledecomp/isledecomp/parser/node.py    |   5 +
 tools/isledecomp/isledecomp/parser/parser.py  | 121 ++++---
 tools/isledecomp/isledecomp/parser/util.py    |  22 ++
 tools/isledecomp/tests/test_demangler.py      |   1 +
 tools/isledecomp/tests/test_linter.py         |  30 ++
 tools/isledecomp/tests/test_parser.py         |  79 +++++
 .../tests/test_parser_statechange.py          |   8 +-
 tools/isledecomp/tests/test_parser_util.py    |  16 +
 28 files changed, 738 insertions(+), 93 deletions(-)
 create mode 100644 ISLE/library_msvc.h
 create mode 100644 ISLE/library_smartheap.h

diff --git a/ISLE/library_msvc.h b/ISLE/library_msvc.h
new file mode 100644
index 00000000..a837fd3b
--- /dev/null
+++ b/ISLE/library_msvc.h
@@ -0,0 +1,63 @@
+#ifdef 0
+// For ISLE symbols only
+
+// aka `operator new`
+// LIBRARY: ISLE 0x402f80
+// ??2@YAPAXI@Z
+
+// aka `operator delete`
+// LIBRARY: ISLE 0x402fa0
+// ??3@YAXPAX@Z
+
+// LIBRARY: ISLE 0x406dd0
+// _malloc
+
+// LIBRARY: ISLE 0x406f00
+// _free
+
+// LIBRARY: ISLE 0x407ec0
+// ___CxxFrameHandler
+
+// LIBRARY: ISLE 0x4081e0
+// _srand
+
+// LIBRARY: ISLE 0x4081f0
+// _rand
+
+// LIBRARY: ISLE 0x408220
+// _atol
+
+// LIBRARY: ISLE 0x4082d0
+// _atoi
+
+// LIBRARY: ISLE 0x4084c0
+// ?_query_new_handler@@YAP6AHI@ZXZ
+
+// LIBRARY: ISLE 0x4084d0
+// ?_query_new_mode@@YAHXZ
+
+// LIBRARY: ISLE 0x4085c0
+// _sprintf
+
+// LIBRARY: ISLE 0x408630
+// _abort
+
+// LIBRARY: ISLE 0x409110
+// __mtinit
+
+// LIBRARY: ISLE 0x409190
+// __getptd
+
+// GLOBAL: ISLE 0x4108e8
+// __osver
+
+// GLOBAL: ISLE 0x4108f0
+// __winmajor
+
+// GLOBAL: ISLE 0x4108f4
+// __winminor
+
+// GLOBAL: ISLE 0x410d50
+// __newmode
+
+#endif
diff --git a/ISLE/library_smartheap.h b/ISLE/library_smartheap.h
new file mode 100644
index 00000000..53ef5f0d
--- /dev/null
+++ b/ISLE/library_smartheap.h
@@ -0,0 +1,312 @@
+#ifdef 0
+
+// LIBRARY: ISLE 0x402f10
+// ?shi_New@@YAPAXKIPAU_SHI_Pool@@@Z
+
+// LIBRARY: ISLE 0x402fb0
+// _MemInitDefaultPool@0
+
+// LIBRARY: ISLE 0x403020
+// _shi_call_new_handler_msc
+
+// LIBRARY: ISLE 0x403050
+// _MemPoolShrink@4
+
+// LIBRARY: ISLE 0x403180
+// _MemPoolPreAllocate@12
+
+// LIBRARY: ISLE 0x403300
+// @_shi_initPageHeaders@4
+
+// LIBRARY: ISLE 0x403570
+// @shi_allocPageHeader@4
+
+// LIBRARY: ISLE 0x4035a0
+// @shi_freePageHeader@8
+
+// LIBRARY: ISLE 0x403750
+// @_shi_deletePage@8
+
+// LIBRARY: ISLE 0x403830
+// @_shi_allocExternal@12
+
+// LIBRARY: ISLE 0x403a50
+// @_shi_initPageVariable@8
+
+// LIBRARY: ISLE 0x403b00
+// _MemAllocPtr@12
+
+// LIBRARY: ISLE 0x403d60
+// @_shi_allocVar@12
+
+// LIBRARY: ISLE 0x403ef0
+// @_shi_allocBlock@12
+
+// LIBRARY: ISLE 0x4040c0
+// _MemFreePtr@4
+
+// LIBRARY: ISLE 0x404170
+// @_shi_freeVar@4
+
+// LIBRARY: ISLE 0x404260
+// _MemReAllocPtr@12
+
+// LIBRARY: ISLE 0x4043b0
+// @_shi_resizeAny@16
+
+// LIBRARY: ISLE 0x404650
+// @_shi_resizeVar@8
+
+// LIBRARY: ISLE 0x404820
+// _MemSizePtr@4
+
+// LIBRARY: ISLE 0x4048d0
+// @shi_findAllocAddress@4
+
+// LIBRARY: ISLE 0x404910
+// @_shi_sysAlloc@8
+
+// LIBRARY: ISLE 0x4049a0
+// @_shi_sysFree@4
+
+// LIBRARY: ISLE 0x404a00
+// @_shi_sysRealloc@12
+
+// LIBRARY: ISLE 0x404ab0
+// @_shi_sysResize@12
+
+// LIBRARY: ISLE 0x404b90
+// @_shi_sysSize@4
+
+// LIBRARY: ISLE 0x404bd0
+// @_shi_sysAllocNear@4
+
+// LIBRARY: ISLE 0x404bf0
+// @_shi_sysFreeNear@4
+
+// LIBRARY: ISLE 0x404c10
+// @_shi_sysValidatePtr@12
+
+// LIBRARY: ISLE 0x404d10
+// @_shi_sysValidateFunction@4
+
+// LIBRARY: ISLE 0x405300
+// @_shi_sysAllocPool@12
+
+// LIBRARY: ISLE 0x405520
+// @_shi_sysResizePool@16
+
+// LIBRARY: ISLE 0x405690
+// @_shi_sysFreePage@4
+
+// LIBRARY: ISLE 0x4057b0
+// @_shi_sysSizePage@4
+
+// LIBRARY: ISLE 0x4057e0
+// @_shi_sysSizePool@8
+
+// LIBRARY: ISLE 0x405800
+// @_shi_registerShared@16
+
+// LIBRARY: ISLE 0x405a00
+// @_shi_unregisterShared@8
+
+// LIBRARY: ISLE 0x405b20
+// @_shi_getNextPool@4
+
+// LIBRARY: ISLE 0x405b30
+// @shi_delNextPool@4
+
+// LIBRARY: ISLE 0x405d30
+// @shi_createAndEnterMutexShr@12
+
+// LIBRARY: ISLE 0x405e20
+// @shi_termPoolMutexShr@4
+
+// LIBRARY: ISLE 0x405e40
+// @shi_enterPoolMutexShr@4
+
+// LIBRARY: ISLE 0x405e60
+// @shi_leavePoolMutexShr@4
+
+// LIBRARY: ISLE 0x405e80
+// __shi_enterCriticalSection@0
+
+// LIBRARY: ISLE 0x405ea0
+// __shi_leaveCriticalSection@0
+
+// LIBRARY: ISLE 0x405ec0
+// __shi_createAndEnterMutex
+
+// LIBRARY: ISLE 0x405ef0
+// _shi_enterPoolMutexSafely
+
+// LIBRARY: ISLE 0x405fd0
+// _shi_enterPoolInitMutexReader
+
+// LIBRARY: ISLE 0x406060
+// _shi_leavePoolInitMutexReader
+
+// LIBRARY: ISLE 0x406090
+// _shi_enterPoolInitMutexWriter
+
+// LIBRARY: ISLE 0x406160
+// _shi_leavePoolInitMutexWriter
+
+// LIBRARY: ISLE 0x406180
+// _shi_isNT
+
+// LIBRARY: ISLE 0x4061b0
+// _MemPoolInit@4
+
+// LIBRARY: ISLE 0x406520
+// _MemPoolSetPageSize@8
+
+// LIBRARY: ISLE 0x406630
+// _MemPoolSetBlockSizeFS@8
+
+// LIBRARY: ISLE 0x406710
+// @_shi_poolFree@8
+
+// LIBRARY: ISLE 0x4068c0
+// @_shi_invokeErrorHandler1@8
+
+// LIBRARY: ISLE 0x406be0
+// _MemErrorUnwind@0
+
+// LIBRARY: ISLE 0x406c30
+// _MemDefaultErrorHandler@4
+
+// LIBRARY: ISLE 0x406cb0
+// @_shi_taskRemovePool@4
+
+// LIBRARY: ISLE 0x406d50
+// @_shi_getCurrentThreadContext@8
+
+// LIBRARY: ISLE 0x406db0
+// @_shi_deleteThreadContext@8
+
+// LIBRARY: ISLE 0x406e40
+// _calloc
+
+// LIBRARY: ISLE 0x406ea0
+// _realloc
+
+// LIBRARY: ISLE 0x406f10
+// __expand
+
+// LIBRARY: ISLE 0x406f50
+// __heapadd
+
+// LIBRARY: ISLE 0x406f60
+// __heapwalk
+
+// LIBRARY: ISLE 0x406ff0
+// __heapused
+
+// LIBRARY: ISLE 0x407020
+// __heapmin
+
+// LIBRARY: ISLE 0x407040
+// __msize
+
+// LIBRARY: ISLE 0x407050
+// __heapchk
+
+// LIBRARY: ISLE 0x407080
+// __heapset
+
+// LIBRARY: ISLE 0x407090
+// @_shi_sysReportError@16
+
+// LIBRARY: ISLE 0x407110
+// _MemPoolSize@4
+
+// LIBRARY: ISLE 0x4071a0
+// _MemPoolWalk@8
+
+// LIBRARY: ISLE 0x407240
+// @_shi_walkPool@16
+
+// LIBRARY: ISLE 0x407540
+// @shi_isBlockInUseSmall@8
+
+// LIBRARY: ISLE 0x407800
+// @_shi_isBlockInUseFS@12
+
+// LIBRARY: ISLE 0x407880
+// _MemPoolCheck@4
+
+// LIBRARY: ISLE 0x407b20
+// _MemCheckPtr@8
+
+// LIBRARY: ISLE 0x4084e0
+// __except_handler3
+
+// GLOBAL: ISLE 0x40f0a0
+// _szLibName
+
+// GLOBAL: ISLE 0x4102f4
+// ?_new_handler@@3P6AXXZA
+
+// GLOBAL: ISLE 0x4102fc
+// _MemDefaultPool
+
+// GLOBAL: ISLE 0x41031c
+// __shi_compactPoolFn
+
+// GLOBAL: ISLE 0x410320
+// __shi_compactPageFn
+
+// GLOBAL: ISLE 0x410324
+// _MemDefaultPoolFlags
+
+// GLOBAL: ISLE 0x41032c
+// __shi_mutexGlobalInit
+
+// GLOBAL: ISLE 0x410330
+// __shi_mutexMovInit
+
+// GLOBAL: ISLE 0x410334
+// __shi_mutexMovLockCount
+
+// GLOBAL: ISLE 0x410338
+// _shi_initPoolReaders
+
+// GLOBAL: ISLE 0x41033c
+// _shi_eventInitPool
+
+// GLOBAL: ISLE 0x410340
+// _shi_mutexMovShr
+
+// GLOBAL: ISLE 0x410368
+// _shi_deferFreePools
+
+// GLOBAL: ISLE 0x410378
+// __shi_poolTerminating
+
+// GLOBAL: ISLE 0x41037c
+// _MemDefaultPoolBlockSizeFS
+
+// GLOBAL: ISLE 0x410380
+// _MemDefaultPoolPageSize
+
+// GLOBAL: ISLE 0x410384
+// _SmartHeap_malloc
+
+// GLOBAL: ISLE 0x4105b0
+// __shi_TaskRecord
+
+// GLOBAL: ISLE 0x4125f8
+// ?_pnhHeap@@3P6AHI@ZA
+
+// GLOBAL: ISLE 0x412830
+// __shi_mutexMov
+
+// GLOBAL: ISLE 0x412850
+// _shi_mutexPoolSynch
+
+// GLOBAL: ISLE 0x412870
+// __shi_mutexGlobal
+
+#endif
diff --git a/LEGO1/define.cpp b/LEGO1/define.cpp
index 884c8787..1e403a50 100644
--- a/LEGO1/define.cpp
+++ b/LEGO1/define.cpp
@@ -11,19 +11,25 @@ MxS32 g_mxcoreCount[101] = {0,     -6643, -5643, -5058, -4643, -4321, -4058, -38
 							-136,  -120,  -104,  -89,   -74,   -58,   -43,   -29,   -14,   0};
 
 // GLOBAL: LEGO1 0x10102048
+// STRING: LEGO1 0x10102040
 const char* g_strACTION = "ACTION";
 
 // GLOBAL: LEGO1 0x1010209c
+// STRING: LEGO1 0x10101f58
 const char* g_strOBJECT = "OBJECT";
 
 // GLOBAL: LEGO1 0x101020b0
+// STRING: LEGO1 0x10101f20
 const char* g_strSOUND = "SOUND";
 
 // GLOBAL: LEGO1 0x101020cc
+// STRING: LEGO1 0x100f3808
 const char* g_strVISIBILITY = "VISIBILITY";
 
 // GLOBAL: LEGO1 0x101020d0
+// STRING: LEGO1 0x10101edc
 const char* g_strWORLD = "WORLD";
 
 // GLOBAL: LEGO1 0x101020e4
+// STRING: LEGO1 0x10101eac
 const char* g_parseExtraTokens = ":;";
diff --git a/LEGO1/lego/legoomni/src/common/legobackgroundcolor.cpp b/LEGO1/lego/legoomni/src/common/legobackgroundcolor.cpp
index 117bc0cc..5d594eaa 100644
--- a/LEGO1/lego/legoomni/src/common/legobackgroundcolor.cpp
+++ b/LEGO1/lego/legoomni/src/common/legobackgroundcolor.cpp
@@ -8,12 +8,15 @@
 DECOMP_SIZE_ASSERT(LegoBackgroundColor, 0x30)
 
 // GLOBAL: LEGO1 0x100f3fb0
-const char* g_delimiter = "\t";
+// STRING: LEGO1 0x100f3a18
+const char* g_delimiter = " \t";
 
 // GLOBAL: LEGO1 0x100f3fb4
+// STRING: LEGO1 0x100f3bf0
 const char* g_set = "set";
 
 // GLOBAL: LEGO1 0x100f3fb8
+// STRING: LEGO1 0x100f0cdc
 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 4a102fcf..b10b285f 100644
--- a/LEGO1/lego/legoomni/src/common/legofullscreenmovie.cpp
+++ b/LEGO1/lego/legoomni/src/common/legofullscreenmovie.cpp
@@ -8,9 +8,11 @@
 DECOMP_SIZE_ASSERT(LegoFullScreenMovie, 0x24)
 
 // GLOBAL: LEGO1 0x100f3fbc
+// STRING: LEGO1 0x100f3be8
 const char* g_strEnable = "enable";
 
 // GLOBAL: LEGO1 0x100f3fc0
+// STRING: LEGO1 0x100f3bf4
 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 2291b72c..5a3518a9 100644
--- a/LEGO1/lego/legoomni/src/common/legogamestate.cpp
+++ b/LEGO1/lego/legoomni/src/common/legogamestate.cpp
@@ -20,12 +20,15 @@
 DECOMP_SIZE_ASSERT(LegoGameState, 0x430)
 
 // GLOBAL: LEGO1 0x100f3e40
+// STRING: LEGO1 0x100f3e3c
 const char* g_fileExtensionGS = ".GS";
 
 // GLOBAL: LEGO1 0x100f3e44
+// STRING: LEGO1 0x100f3e30
 const char* g_playersGSI = "Players.gsi";
 
 // GLOBAL: LEGO1 0x100f3e48
+// STRING: LEGO1 0x100f3e24
 const char* g_historyGSI = "History.gsi";
 
 // GLOBAL: LEGO1 0x100f3e58
diff --git a/LEGO1/lego/legoomni/src/common/legostream.cpp b/LEGO1/lego/legoomni/src/common/legostream.cpp
index 0cfe0a51..97b5053f 100644
--- a/LEGO1/lego/legoomni/src/common/legostream.cpp
+++ b/LEGO1/lego/legoomni/src/common/legostream.cpp
@@ -10,6 +10,7 @@
 // the text "END_OF_VARIABLES" in it.
 // TODO: make g_endOfVariables reference the actual end of the variable array.
 // GLOBAL: LEGO1 0x100f3e50
+// STRING: LEGO1 0x100f3e00
 const char* g_endOfVariables = "END_OF_VARIABLES";
 
 // Very likely but not certain sizes.
diff --git a/LEGO1/lego/legoomni/src/main/legoomni.cpp b/LEGO1/lego/legoomni/src/main/legoomni.cpp
index e0d292b4..dfc42bb4 100644
--- a/LEGO1/lego/legoomni/src/main/legoomni.cpp
+++ b/LEGO1/lego/legoomni/src/main/legoomni.cpp
@@ -110,6 +110,7 @@ MxAtomId* g_creditsScript = NULL;
 MxAtomId* g_nocdSourceName = NULL;
 
 // GLOBAL: LEGO1 0x100f6718
+// STRING: LEGO1 0x100f6710
 const char* g_current = "current";
 
 // GLOBAL: LEGO1 0x100f4c58
diff --git a/LEGO1/lego/legoomni/src/video/legometerpresenter.cpp b/LEGO1/lego/legoomni/src/video/legometerpresenter.cpp
index db8c6055..ad9615d8 100644
--- a/LEGO1/lego/legoomni/src/video/legometerpresenter.cpp
+++ b/LEGO1/lego/legoomni/src/video/legometerpresenter.cpp
@@ -7,24 +7,31 @@
 DECOMP_SIZE_ASSERT(LegoMeterPresenter, 0x94)
 
 // GLOBAL: LEGO1 0x1010207c
+// STRING: LEGO1 0x10101fb4
 const char* g_filterIndex = "FILTER_INDEX";
 
 // GLOBAL: LEGO1 0x10102094
+// STRING: LEGO1 0x10101f70
 const char* g_type = "TYPE";
 
 // GLOBAL: LEGO1 0x10102088
+// STRING: LEGO1 0x10101f94
 const char* g_leftToRight = "LEFT_TO_RIGHT";
 
 // GLOBAL: LEGO1 0x101020ac
+// STRING: LEGO1 0x10101f28
 const char* g_rightToLeft = "RIGHT_TO_LEFT";
 
 // GLOBAL: LEGO1 0x1010205c
+// STRING: LEGO1 0x10102000
 const char* g_bottomToTop = "BOTTOM_TO_TOP";
 
 // GLOBAL: LEGO1 0x101020c0
+// STRING: LEGO1 0x10101f00
 const char* g_topToBottom = "TOP_TO_BOTTOM";
 
 // GLOBAL: LEGO1 0x101020c8
+// STRING: LEGO1 0x10101ee4
 const char* g_variable = "VARIABLE";
 
 // FUNCTION: LEGO1 0x10043430
diff --git a/LEGO1/library_msvc.h b/LEGO1/library_msvc.h
index 28e29187..30cb9dcd 100644
--- a/LEGO1/library_msvc.h
+++ b/LEGO1/library_msvc.h
@@ -1,39 +1,32 @@
 #ifdef 0
+// For LEGO1 symbols only
 
 // aka `operator new`
-// LIBRARY: ISLE 0x402f80
 // LIBRARY: LEGO1 0x10086240
 // ??2@YAPAXI@Z
 
 // aka `operator delete`
-// LIBRARY: ISLE 0x402fa0
 // LIBRARY: LEGO1 0x10086260
 // ??3@YAXPAX@Z
 
-// LIBRARY: ISLE 0x406dd0
 // LIBRARY: LEGO1 0x1008a090
 // _malloc
 
-// LIBRARY: ISLE 0x406f00
 // LIBRARY: LEGO1 0x1008a1c0
 // _free
 
-// LIBRARY: ISLE 0x407ec0
 // LIBRARY: LEGO1 0x1008b020
 // ___CxxFrameHandler
 
-// LIBRARY: ISLE 0x408220
 // LIBRARY: LEGO1 0x1008b400
 // _atol
 
-// LIBRARY: ISLE 0x4082d0
 // LIBRARY: LEGO1 0x1008b4b0
 // _atoi
 
 // LIBRARY: LEGO1 0x1008b4c0
 // _strtok
 
-// LIBRARY: ISLE 0x4085c0
 // LIBRARY: LEGO1 0x1008b5a0
 // _sprintf
 
@@ -43,6 +36,9 @@
 // LIBRARY: LEGO1 0x1008b630
 // _srand
 
+// LIBRARY: LEGO1 0x1008b640
+// _rand
+
 // LIBRARY: LEGO1 0x1008b680
 // _strncmp
 
@@ -91,19 +87,6 @@
 // LIBRARY: LEGO1 0x10097b10
 // _strchr
 
-// LIBRARY: ISLE 0x4081e0
-// _srand
-
-// LIBRARY: ISLE 0x4081f0
-// LIBRARY: LEGO1 0x1008b640
-// _rand
-
-// LIBRARY: ISLE 0x409110
-// __mtinit
-
-// LIBRARY: ISLE 0x409190
-// __getptd
-
 // LIBRARY: LEGO1 0x100d1ed0
 // _strnicmp
 
diff --git a/LEGO1/omni/src/common/mxvariabletable.cpp b/LEGO1/omni/src/common/mxvariabletable.cpp
index d7c6f54f..9503ee5e 100644
--- a/LEGO1/omni/src/common/mxvariabletable.cpp
+++ b/LEGO1/omni/src/common/mxvariabletable.cpp
@@ -50,6 +50,8 @@ void MxVariableTable::SetVariable(MxVariable* p_var)
 // FUNCTION: LEGO1 0x100b78f0
 const char* MxVariableTable::GetVariable(const char* p_key)
 {
+	// STRING: ISLE 0x41008c
+	// STRING: LEGO1 0x100f01d4
 	const char* value = "";
 	MxHashTableCursor<MxVariable*> cursor(this);
 	MxVariable* var = new MxVariable(p_key);
diff --git a/LEGO1/omni/src/video/mxstillpresenter.cpp b/LEGO1/omni/src/video/mxstillpresenter.cpp
index be0aa232..8d50f021 100644
--- a/LEGO1/omni/src/video/mxstillpresenter.cpp
+++ b/LEGO1/omni/src/video/mxstillpresenter.cpp
@@ -11,6 +11,7 @@
 DECOMP_SIZE_ASSERT(MxStillPresenter, 0x6c);
 
 // GLOBAL: LEGO1 0x101020e0
+// STRING: LEGO1 0x10101eb0
 const char* g_strBmpIsmap = "BMP_ISMAP";
 
 // FUNCTION: LEGO1 0x100b9c70
diff --git a/tools/isledecomp/isledecomp/compare/core.py b/tools/isledecomp/isledecomp/compare/core.py
index 40b93bae..c8ae7809 100644
--- a/tools/isledecomp/isledecomp/compare/core.py
+++ b/tools/isledecomp/isledecomp/compare/core.py
@@ -85,13 +85,19 @@ def _load_cvdump(self):
 
             if sym.node_type == SymbolType.STRING:
                 string_info = demangle_string_const(sym.decorated_name)
+                if string_info is None:
+                    logger.debug(
+                        "Could not demangle string symbol: %s", sym.decorated_name
+                    )
+                    continue
+
                 # TODO: skip unicode for now. will need to handle these differently.
                 if string_info.is_utf16:
                     continue
 
                 raw = self.recomp_bin.read(addr, sym.size())
                 try:
-                    sym.friendly_name = raw.decode("latin1")
+                    sym.friendly_name = raw.decode("latin1").rstrip("\x00")
                 except UnicodeDecodeError:
                     pass
 
@@ -134,6 +140,26 @@ def _load_markers(self):
         for tbl in codebase.iter_vtables():
             self._db.match_vtable(tbl.offset, tbl.name)
 
+        for string in codebase.iter_strings():
+            # Not that we don't trust you, but we're checking the string
+            # annotation to make sure it is accurate.
+            try:
+                # TODO: would presumably fail for wchar_t strings
+                orig = self.orig_bin.read_string(string.offset).decode("latin1")
+                string_correct = string.name == orig
+            except UnicodeDecodeError:
+                string_correct = False
+
+            if not string_correct:
+                logger.error(
+                    "Data at 0x%x does not match string %s",
+                    string.offset,
+                    repr(string.name),
+                )
+                continue
+
+            self._db.match_string(string.offset, string.name)
+
     def _find_original_strings(self):
         """Go to the original binary and look for the specified string constants
         to find a match. This is a (relatively) expensive operation so we only
diff --git a/tools/isledecomp/isledecomp/compare/db.py b/tools/isledecomp/isledecomp/compare/db.py
index 8cba0c03..d2c2cbf9 100644
--- a/tools/isledecomp/isledecomp/compare/db.py
+++ b/tools/isledecomp/isledecomp/compare/db.py
@@ -43,7 +43,8 @@ def match_name(self) -> str:
             return None
 
         ctype = self.compare_type.name if self.compare_type is not None else "UNK"
-        return f"{self.name} ({ctype})"
+        name = repr(self.name) if ctype == "STRING" else self.name
+        return f"{name} ({ctype})"
 
 
 def matchinfo_factory(_, row):
@@ -197,3 +198,5 @@ def match_string(self, addr: int, value: str) -> bool:
         if not did_match:
             escaped = repr(value)
             logger.error("Failed to find string: %s", escaped)
+
+        return did_match
diff --git a/tools/isledecomp/isledecomp/cvdump/analysis.py b/tools/isledecomp/isledecomp/cvdump/analysis.py
index 720593be..330429dd 100644
--- a/tools/isledecomp/isledecomp/cvdump/analysis.py
+++ b/tools/isledecomp/isledecomp/cvdump/analysis.py
@@ -94,7 +94,11 @@ def set_decorated(self, name: str):
     def name(self) -> Optional[str]:
         """Prefer "friendly" name if we have it.
         This is what we have been using to match functions."""
-        return self.friendly_name or self.decorated_name
+        return (
+            self.friendly_name
+            if self.friendly_name is not None
+            else self.decorated_name
+        )
 
     def size(self) -> Optional[int]:
         if self.confirmed_size is not None:
diff --git a/tools/isledecomp/isledecomp/cvdump/demangler.py b/tools/isledecomp/isledecomp/cvdump/demangler.py
index 340f19a3..07fca42f 100644
--- a/tools/isledecomp/isledecomp/cvdump/demangler.py
+++ b/tools/isledecomp/isledecomp/cvdump/demangler.py
@@ -4,6 +4,7 @@
 """
 import re
 from collections import namedtuple
+from typing import Optional
 
 
 class InvalidEncodedNumberError(Exception):
@@ -30,13 +31,12 @@ def parse_encoded_number(string: str) -> int:
 StringConstInfo = namedtuple("StringConstInfo", "len is_utf16")
 
 
-def demangle_string_const(symbol: str) -> StringConstInfo:
+def demangle_string_const(symbol: str) -> Optional[StringConstInfo]:
     """Don't bother to decode the string text from the symbol.
     We can just read it from the binary once we have the length."""
     match = string_const_regex.match(symbol)
     if match is None:
-        # See below
-        return StringConstInfo(0, False)
+        return None
 
     try:
         strlen = (
@@ -45,10 +45,7 @@ def demangle_string_const(symbol: str) -> StringConstInfo:
             else int(match.group("len"))
         )
     except (ValueError, InvalidEncodedNumberError):
-        # This would be an annoying error to fail on if we get a bad symbol.
-        # For now, just assume a zero length string because this will probably
-        # raise some eyebrows during the comparison.
-        strlen = 0
+        return None
 
     is_utf16 = match.group("is_utf16") == "1"
     return StringConstInfo(len=strlen, is_utf16=is_utf16)
diff --git a/tools/isledecomp/isledecomp/parser/codebase.py b/tools/isledecomp/isledecomp/parser/codebase.py
index 54ab4035..184b1256 100644
--- a/tools/isledecomp/isledecomp/parser/codebase.py
+++ b/tools/isledecomp/isledecomp/parser/codebase.py
@@ -6,6 +6,7 @@
     ParserFunction,
     ParserVtable,
     ParserVariable,
+    ParserString,
 )
 
 
@@ -42,3 +43,6 @@ def iter_vtables(self) -> Iterator[ParserVtable]:
 
     def iter_variables(self) -> Iterator[ParserVariable]:
         return filter(lambda s: isinstance(s, ParserVariable), self._symbols)
+
+    def iter_strings(self) -> Iterator[ParserString]:
+        return filter(lambda s: isinstance(s, ParserString), self._symbols)
diff --git a/tools/isledecomp/isledecomp/parser/error.py b/tools/isledecomp/isledecomp/parser/error.py
index eb1aa7b8..81123381 100644
--- a/tools/isledecomp/isledecomp/parser/error.py
+++ b/tools/isledecomp/isledecomp/parser/error.py
@@ -70,6 +70,10 @@ class ParserError(Enum):
     # a comment -- i.e. VTABLE or GLOBAL -- could not extract the name
     NO_SUITABLE_NAME = 204
 
+    # ERROR: Two STRING markers have the same module and offset, but the strings
+    # they annotate are different.
+    WRONG_STRING = 205
+
 
 @dataclass
 class ParserAlert:
diff --git a/tools/isledecomp/isledecomp/parser/linter.py b/tools/isledecomp/isledecomp/parser/linter.py
index 54406ce9..b44487df 100644
--- a/tools/isledecomp/isledecomp/parser/linter.py
+++ b/tools/isledecomp/isledecomp/parser/linter.py
@@ -1,7 +1,7 @@
 from typing import List, Optional
 from .parser import DecompParser
 from .error import ParserAlert, ParserError
-from .node import ParserSymbol
+from .node import ParserSymbol, ParserString
 
 
 def get_checkorder_filter(module):
@@ -19,6 +19,9 @@ def __init__(self) -> None:
         # This is _not_ reset between files and is intended to report offset reuse
         # when scanning the entire directory.
         self._offsets_used = set()
+        # Keep track of strings we have seen. Persists across files.
+        # Module/offset can be repeated for string markers but the strings must match.
+        self._strings = {}
 
     def reset(self, full_reset: bool = False):
         self.alerts = []
@@ -28,6 +31,7 @@ def reset(self, full_reset: bool = False):
 
         if full_reset:
             self._offsets_used.clear()
+            self._strings = {}
 
     def file_is_header(self):
         return self._filename.lower().endswith(".h")
@@ -36,17 +40,31 @@ def _load_offsets_from_list(self, marker_list: List[ParserSymbol]):
         """Helper for loading (module, offset) tuples while the DecompParser
         has them broken up into three different lists."""
         for marker in marker_list:
+            is_string = isinstance(marker, ParserString)
+
             value = (marker.module, marker.offset)
             if value in self._offsets_used:
-                self.alerts.append(
-                    ParserAlert(
-                        code=ParserError.DUPLICATE_OFFSET,
-                        line_number=marker.line_number,
-                        line=f"0x{marker.offset:08x}",
+                if is_string:
+                    if self._strings[value] != marker.name:
+                        self.alerts.append(
+                            ParserAlert(
+                                code=ParserError.WRONG_STRING,
+                                line_number=marker.line_number,
+                                line=f"0x{marker.offset:08x}, {repr(self._strings[value])} vs. {repr(marker.name)}",
+                            )
+                        )
+                else:
+                    self.alerts.append(
+                        ParserAlert(
+                            code=ParserError.DUPLICATE_OFFSET,
+                            line_number=marker.line_number,
+                            line=f"0x{marker.offset:08x}",
+                        )
                     )
-                )
             else:
                 self._offsets_used.add(value)
+                if is_string:
+                    self._strings[value] = marker.name
 
     def _check_function_order(self):
         """Rules:
@@ -82,6 +100,7 @@ def _check_offset_uniqueness(self):
         self._load_offsets_from_list(self._parser.functions)
         self._load_offsets_from_list(self._parser.vtables)
         self._load_offsets_from_list(self._parser.variables)
+        self._load_offsets_from_list(self._parser.strings)
 
     def _check_byname_allowed(self):
         if self.file_is_header():
diff --git a/tools/isledecomp/isledecomp/parser/marker.py b/tools/isledecomp/isledecomp/parser/marker.py
index d2e181dd..de8c6f05 100644
--- a/tools/isledecomp/isledecomp/parser/marker.py
+++ b/tools/isledecomp/isledecomp/parser/marker.py
@@ -3,6 +3,19 @@
 from enum import Enum
 
 
+class MarkerCategory(Enum):
+    """For the purposes of grouping multiple different DecompMarkers together,
+    assign a rough "category" for the MarkerType values below.
+    It's really only the function types that have to get folded down, but
+    we'll do that in a structured way to permit future expansion."""
+
+    FUNCTION = 1
+    VARIABLE = 2
+    STRING = 3
+    VTABLE = 4
+    ADDRESS = 100  # i.e. no comparison required or possible
+
+
 class MarkerType(Enum):
     UNKNOWN = -100
     FUNCTION = 1
@@ -51,6 +64,23 @@ def module(self) -> str:
     def offset(self) -> int:
         return self._offset
 
+    @property
+    def category(self) -> MarkerCategory:
+        if self.is_vtable():
+            return MarkerCategory.VTABLE
+
+        if self.is_variable():
+            return MarkerCategory.VARIABLE
+
+        if self.is_string():
+            return MarkerCategory.STRING
+
+        # TODO: worth another look if we add more types, but this covers it
+        if self.is_regular_function() or self.is_explicit_byname():
+            return MarkerCategory.FUNCTION
+
+        return MarkerCategory.ADDRESS
+
     def is_regular_function(self) -> bool:
         """Regular function, meaning: not an explicit byname lookup. FUNCTION
         markers can be _implicit_ byname.
diff --git a/tools/isledecomp/isledecomp/parser/node.py b/tools/isledecomp/isledecomp/parser/node.py
index b6561fd6..71d4ebdd 100644
--- a/tools/isledecomp/isledecomp/parser/node.py
+++ b/tools/isledecomp/isledecomp/parser/node.py
@@ -55,3 +55,8 @@ class ParserVariable(ParserSymbol):
 @dataclass
 class ParserVtable(ParserSymbol):
     pass
+
+
+@dataclass
+class ParserString(ParserSymbol):
+    pass
diff --git a/tools/isledecomp/isledecomp/parser/parser.py b/tools/isledecomp/isledecomp/parser/parser.py
index d4153b3c..3c955fc3 100644
--- a/tools/isledecomp/isledecomp/parser/parser.py
+++ b/tools/isledecomp/isledecomp/parser/parser.py
@@ -3,11 +3,11 @@
 from typing import List, Iterable, Iterator, Optional
 from enum import Enum
 from .util import (
-    is_blank_or_comment,
     get_class_name,
     get_variable_name,
     get_synthetic_name,
     remove_trailing_comment,
+    get_string_contents,
 )
 from .marker import (
     DecompMarker,
@@ -19,6 +19,7 @@
     ParserFunction,
     ParserVariable,
     ParserVtable,
+    ParserString,
 )
 from .error import ParserAlert, ParserError
 
@@ -43,17 +44,16 @@ def __init__(self) -> None:
 
     def insert(self, marker: DecompMarker) -> bool:
         """Return True if this insert would overwrite"""
-        module = marker.module
-        if module in self.markers:
+        key = (marker.category, marker.module)
+        if key in self.markers:
             return True
 
-        # TODO: type converted back to string version here instead of using enum
-        self.markers[module] = (marker.type.name, marker.offset)
+        self.markers[key] = marker
         return False
 
     def iter(self) -> Iterator[DecompMarker]:
-        for module, (marker_type, offset) in self.markers.items():
-            yield DecompMarker(marker_type, module, offset)
+        for _, marker in self.markers.items():
+            yield marker
 
     def empty(self):
         self.markers = {}
@@ -111,17 +111,21 @@ def reset(self):
         self.function_sig = ""
 
     @property
-    def functions(self) -> List[ParserSymbol]:
+    def functions(self) -> List[ParserFunction]:
         return [s for s in self._symbols if isinstance(s, ParserFunction)]
 
     @property
-    def vtables(self) -> List[ParserSymbol]:
+    def vtables(self) -> List[ParserVtable]:
         return [s for s in self._symbols if isinstance(s, ParserVtable)]
 
     @property
-    def variables(self) -> List[ParserSymbol]:
+    def variables(self) -> List[ParserVariable]:
         return [s for s in self._symbols if isinstance(s, ParserVariable)]
 
+    @property
+    def strings(self) -> List[ParserString]:
+        return [s for s in self._symbols if isinstance(s, ParserString)]
+
     def iter_symbols(self, module: Optional[str] = None) -> Iterator[ParserSymbol]:
         for s in self._symbols:
             if module is None or s.module == module:
@@ -225,21 +229,35 @@ def _variable_marker(self, marker: DecompMarker):
         else:
             self.state = ReaderState.IN_GLOBAL
 
-    def _variable_done(self, name: str):
-        if not name.startswith("g_"):
-            self._syntax_warning(ParserError.GLOBAL_MISSING_PREFIX)
+    def _variable_done(
+        self, variable_name: Optional[str] = None, string_value: Optional[str] = None
+    ):
+        if variable_name is None and string_value is None:
+            self._syntax_error(ParserError.NO_SUITABLE_NAME)
+            return
 
         for marker in self.var_markers.iter():
-            self._symbols.append(
-                ParserVariable(
-                    type=marker.type,
-                    line_number=self.line_number,
-                    module=marker.module,
-                    offset=marker.offset,
-                    name=name,
-                    is_static=self.state == ReaderState.IN_FUNC_GLOBAL,
+            if marker.is_string():
+                self._symbols.append(
+                    ParserString(
+                        type=marker.type,
+                        line_number=self.line_number,
+                        module=marker.module,
+                        offset=marker.offset,
+                        name=string_value,
+                    )
+                )
+            else:
+                self._symbols.append(
+                    ParserVariable(
+                        type=marker.type,
+                        line_number=self.line_number,
+                        module=marker.module,
+                        offset=marker.offset,
+                        name=variable_name,
+                        is_static=self.state == ReaderState.IN_FUNC_GLOBAL,
+                    )
                 )
-            )
 
         self.var_markers.empty()
         if self.state == ReaderState.IN_FUNC_GLOBAL:
@@ -298,20 +316,8 @@ def _handle_marker(self, marker: DecompMarker):
             else:
                 self._syntax_error(ParserError.INCOMPATIBLE_MARKER)
 
-        elif marker.is_string():
-            # TODO: We are ignoring string markers for the moment.
-            # We already have a lot of them in the codebase, though, so we'll
-            # hang onto them for now in case we can use them later.
-            # To match up string constants, the strategy will be:
-            # 1. Use cvdump to find all string constants in the recomp
-            # 2. In the original binary, look at relocated vaddrs from .rdata
-            # 3. Try to match up string data from #1 with locations in #2
-
-            # Throw the syntax error we would throw if we were parsing these
-            if self.state not in (ReaderState.SEARCH, ReaderState.IN_FUNC):
-                self._syntax_error(ParserError.INCOMPATIBLE_MARKER)
-
-        elif marker.is_variable():
+        # Strings and variables are almost the same thing
+        elif marker.is_string() or marker.is_variable():
             if self.state in (
                 ReaderState.SEARCH,
                 ReaderState.IN_GLOBAL,
@@ -418,24 +424,39 @@ def read_line(self, line: str):
             # function we have already parsed if state == IN_FUNC_GLOBAL.
             # However, we are not tolerant of _any_ syntax problems in our
             # CI actions, so the solution is to just fix the invalid marker.
-            if is_blank_or_comment(line):
-                self._syntax_error(ParserError.NO_SUITABLE_NAME)
+            variable_name = None
+
+            global_markers_queued = any(
+                m.is_variable() for m in self.var_markers.iter()
+            )
+
+            if len(line_strip) == 0:
+                self._syntax_warning(ParserError.UNEXPECTED_BLANK_LINE)
                 return
 
-            # We don't have a foolproof mechanism to tell what is and is not a variable.
-            # If the GLOBAL is being declared on a `return` statement, though, this is
-            # not correct. It is either a string literal (which will be handled differently)
-            # or it is not the variable declaration, which is incorrect decomp syntax.
-            if line.strip().startswith("return"):
-                self._syntax_error(ParserError.GLOBAL_NOT_VARIABLE)
-                return
+            if global_markers_queued:
+                # Not the greatest solution, but a consequence of combining GLOBAL and
+                # STRING markers together. If the marker precedes a return statement, it is
+                # valid for a STRING marker to be here, but not a GLOBAL. We need to look
+                # ahead and tell whether this *would* fail.
+                if line_strip.startswith("return"):
+                    self._syntax_error(ParserError.GLOBAL_NOT_VARIABLE)
+                    return
+                if line_strip.startswith("//"):
+                    # If we found a comment, assume implicit lookup-by-name
+                    # function and end here. We know this is not a decomp marker
+                    # because it would have been handled already.
+                    variable_name = get_synthetic_name(line)
+                else:
+                    variable_name = get_variable_name(line)
+                    # This is out of our control for library variables, but all of our
+                    # variables should start with "g_".
+                    if variable_name is not None and not variable_name.startswith("g_"):
+                        self._syntax_warning(ParserError.GLOBAL_MISSING_PREFIX)
 
-            name = get_variable_name(line)
-            if name is None:
-                self._syntax_error(ParserError.NO_SUITABLE_NAME)
-                return
+            string_name = get_string_contents(line)
 
-            self._variable_done(name)
+            self._variable_done(variable_name, string_name)
 
         elif self.state == ReaderState.IN_VTABLE:
             vtable_class = get_class_name(line)
diff --git a/tools/isledecomp/isledecomp/parser/util.py b/tools/isledecomp/isledecomp/parser/util.py
index a106d841..dd90fd03 100644
--- a/tools/isledecomp/isledecomp/parser/util.py
+++ b/tools/isledecomp/isledecomp/parser/util.py
@@ -1,6 +1,7 @@
 # C++ Parser utility functions and data structures
 import re
 from typing import Optional
+from ast import literal_eval
 
 # The goal here is to just read whatever is on the next line, so some
 # flexibility in the formatting seems OK
@@ -12,6 +13,10 @@
 trailingCommentRegex = re.compile(r"(\s*(?://|/\*).*)$")
 
 
+# Get string contents, ignore escape characters that might interfere
+doubleQuoteRegex = re.compile(r"(\"(?:[^\"\\]|\\.)*\")")
+
+
 def get_synthetic_name(line: str) -> Optional[str]:
     """Synthetic names appear on a single line comment on the line after the marker.
     If that's not what we have, return None"""
@@ -86,3 +91,20 @@ def get_variable_name(line: str) -> Optional[str]:
         return match.group("name")
 
     return None
+
+
+def get_string_contents(line: str) -> Optional[str]:
+    """Return the first C string seen on this line.
+    We have to unescape the string, and a simple way to do that is to use
+    python's ast.literal_eval. I'm sure there are many pitfalls to doing
+    it this way, but hopefully the regex will ensure reasonably sane input."""
+
+    try:
+        if (match := doubleQuoteRegex.search(line)) is not None:
+            return literal_eval(match.group(1))
+    # pylint: disable=broad-exception-caught
+    # No way to predict what kind of exception could occur.
+    except Exception:
+        pass
+
+    return None
diff --git a/tools/isledecomp/tests/test_demangler.py b/tools/isledecomp/tests/test_demangler.py
index 5343bdcc..32cac502 100644
--- a/tools/isledecomp/tests/test_demangler.py
+++ b/tools/isledecomp/tests/test_demangler.py
@@ -14,6 +14,7 @@
         14,
         True,
     ),
+    ("??_C@_00A@?$AA@", 0, False),
 ]
 
 
diff --git a/tools/isledecomp/tests/test_linter.py b/tools/isledecomp/tests/test_linter.py
index 84ce6495..95d19515 100644
--- a/tools/isledecomp/tests/test_linter.py
+++ b/tools/isledecomp/tests/test_linter.py
@@ -112,3 +112,33 @@ def test_duplicate_offsets(linter):
     # Full reset will forget seen offsets.
     linter.reset(True)
     assert linter.check_lines(lines, "test.h", "TEST") is True
+
+
+def test_duplicate_strings(linter):
+    """Duplicate string markers are okay if the string value is the same."""
+    string_lines = [
+        "// STRING: TEST 0x1000",
+        'return "hello world";',
+    ]
+
+    # No problem to use this marker twice.
+    assert linter.check_lines(string_lines, "test.h", "TEST") is True
+    assert linter.check_lines(string_lines, "test.h", "TEST") is True
+
+    different_string = [
+        "// STRING: TEST 0x1000",
+        'return "hi there";',
+    ]
+
+    # Same address but the string is different
+    assert linter.check_lines(different_string, "greeting.h", "TEST") is False
+    assert len(linter.alerts) == 1
+    assert linter.alerts[0].code == ParserError.WRONG_STRING
+
+    same_addr_reused = [
+        "// GLOBAL:TEXT 0x1000",
+        "int g_test = 123;",
+    ]
+
+    # This will fail like any other offset reuse.
+    assert linter.check_lines(same_addr_reused, "other.h", "TEST") is False
diff --git a/tools/isledecomp/tests/test_parser.py b/tools/isledecomp/tests/test_parser.py
index 853e773d..6d8b72b1 100644
--- a/tools/isledecomp/tests/test_parser.py
+++ b/tools/isledecomp/tests/test_parser.py
@@ -442,3 +442,82 @@ def test_static_variable(parser):
     )
     assert len(parser.variables) == 2
     assert parser.variables[1].is_static is True
+
+
+def test_reject_global_return(parser):
+    """Previously we had annotated strings with the GLOBAL marker.
+    For example: if a function returned a string. We now want these to be
+    annotated with the STRING marker."""
+
+    parser.read_lines(
+        [
+            "// FUNCTION: TEST 0x5555",
+            "void test_function() {",
+            "  // GLOBAL: TEST 0x8888",
+            '  return "test";',
+            "}",
+        ]
+    )
+    assert len(parser.variables) == 0
+    assert len(parser.alerts) == 1
+    assert parser.alerts[0].code == ParserError.GLOBAL_NOT_VARIABLE
+
+
+def test_global_string(parser):
+    """We now allow GLOBAL and STRING markers for the same item."""
+
+    parser.read_lines(
+        [
+            "// GLOBAL: TEST 0x1234",
+            "// STRING: TEXT 0x5555",
+            'char* g_test = "hello";',
+        ]
+    )
+    assert len(parser.variables) == 1
+    assert len(parser.strings) == 1
+    assert len(parser.alerts) == 0
+
+    assert parser.variables[0].name == "g_test"
+    assert parser.strings[0].name == "hello"
+
+
+def test_comment_variables(parser):
+    """Match on hidden variables from libraries."""
+
+    parser.read_lines(
+        [
+            "// GLOBAL: TEST 0x1234",
+            "// g_test",
+        ]
+    )
+    assert len(parser.variables) == 1
+    assert parser.variables[0].name == "g_test"
+
+
+def test_flexible_variable_prefix(parser):
+    """Don't alert to library variables that lack the g_ prefix.
+    This is out of our control."""
+
+    parser.read_lines(
+        [
+            "// GLOBAL: TEST 0x1234",
+            "// some_other_variable",
+        ]
+    )
+    assert len(parser.variables) == 1
+    assert len(parser.alerts) == 0
+    assert parser.variables[0].name == "some_other_variable"
+
+
+def test_string_ignore_g_prefix(parser):
+    """String annotations above a regular variable should not alert to
+    the missing g_ prefix. This is only required for GLOBAL markers."""
+
+    parser.read_lines(
+        [
+            "// STRING: TEST 0x1234",
+            'const char* value = "";',
+        ]
+    )
+    assert len(parser.strings) == 1
+    assert len(parser.alerts) == 0
diff --git a/tools/isledecomp/tests/test_parser_statechange.py b/tools/isledecomp/tests/test_parser_statechange.py
index cb54cf0a..be37e3c8 100644
--- a/tools/isledecomp/tests/test_parser_statechange.py
+++ b/tools/isledecomp/tests/test_parser_statechange.py
@@ -15,7 +15,7 @@
     (_rs.SEARCH,          "TEMPLATE",   _rs.IN_TEMPLATE,     None),
     (_rs.SEARCH,          "VTABLE",     _rs.IN_VTABLE,       None),
     (_rs.SEARCH,          "LIBRARY",    _rs.IN_LIBRARY,      None),
-    (_rs.SEARCH,          "STRING",     _rs.SEARCH,          None),
+    (_rs.SEARCH,          "STRING",     _rs.IN_GLOBAL,       None),
 
     (_rs.WANT_SIG,        "FUNCTION",   _rs.WANT_SIG,        None),
     (_rs.WANT_SIG,        "GLOBAL",     _rs.SEARCH,          _pe.INCOMPATIBLE_MARKER),
@@ -33,7 +33,7 @@
     (_rs.IN_FUNC,         "TEMPLATE",   _rs.IN_TEMPLATE,     _pe.MISSED_END_OF_FUNCTION),
     (_rs.IN_FUNC,         "VTABLE",     _rs.IN_VTABLE,       _pe.MISSED_END_OF_FUNCTION),
     (_rs.IN_FUNC,         "LIBRARY",    _rs.IN_LIBRARY,      _pe.MISSED_END_OF_FUNCTION),
-    (_rs.IN_FUNC,         "STRING",     _rs.IN_FUNC,         None),
+    (_rs.IN_FUNC,         "STRING",     _rs.IN_FUNC_GLOBAL,  None),
 
     (_rs.IN_TEMPLATE,     "FUNCTION",   _rs.SEARCH,          _pe.INCOMPATIBLE_MARKER),
     (_rs.IN_TEMPLATE,     "GLOBAL",     _rs.SEARCH,          _pe.INCOMPATIBLE_MARKER),
@@ -60,7 +60,7 @@
     (_rs.IN_GLOBAL,       "TEMPLATE",   _rs.SEARCH,          _pe.INCOMPATIBLE_MARKER),
     (_rs.IN_GLOBAL,       "VTABLE",     _rs.SEARCH,          _pe.INCOMPATIBLE_MARKER),
     (_rs.IN_GLOBAL,       "LIBRARY",    _rs.SEARCH,          _pe.INCOMPATIBLE_MARKER),
-    (_rs.IN_GLOBAL,       "STRING",     _rs.SEARCH,          _pe.INCOMPATIBLE_MARKER),
+    (_rs.IN_GLOBAL,       "STRING",     _rs.IN_GLOBAL,       None),
 
     (_rs.IN_FUNC_GLOBAL,  "FUNCTION",   _rs.SEARCH,          _pe.INCOMPATIBLE_MARKER),
     (_rs.IN_FUNC_GLOBAL,  "GLOBAL",     _rs.IN_FUNC_GLOBAL,  None),
@@ -69,7 +69,7 @@
     (_rs.IN_FUNC_GLOBAL,  "TEMPLATE",   _rs.SEARCH,          _pe.INCOMPATIBLE_MARKER),
     (_rs.IN_FUNC_GLOBAL,  "VTABLE",     _rs.SEARCH,          _pe.INCOMPATIBLE_MARKER),
     (_rs.IN_FUNC_GLOBAL,  "LIBRARY",    _rs.SEARCH,          _pe.INCOMPATIBLE_MARKER),
-    (_rs.IN_FUNC_GLOBAL,  "STRING",     _rs.SEARCH,          _pe.INCOMPATIBLE_MARKER),
+    (_rs.IN_FUNC_GLOBAL,  "STRING",     _rs.IN_FUNC_GLOBAL,  None),
 
     (_rs.IN_VTABLE,       "FUNCTION",   _rs.SEARCH,          _pe.INCOMPATIBLE_MARKER),
     (_rs.IN_VTABLE,       "GLOBAL",     _rs.SEARCH,          _pe.INCOMPATIBLE_MARKER),
diff --git a/tools/isledecomp/tests/test_parser_util.py b/tools/isledecomp/tests/test_parser_util.py
index af102fc2..8a403710 100644
--- a/tools/isledecomp/tests/test_parser_util.py
+++ b/tools/isledecomp/tests/test_parser_util.py
@@ -10,6 +10,7 @@
     is_blank_or_comment,
     get_class_name,
     get_variable_name,
+    get_string_contents,
 )
 
 
@@ -158,3 +159,18 @@ def test_get_class_name_none(line: str):
 @pytest.mark.parametrize("line,name", variable_name_cases)
 def test_get_variable_name(line: str, name: str):
     assert get_variable_name(line) == name
+
+
+string_match_cases = [
+    ('return "hello world";', "hello world"),
+    ('"hello\\\\"', "hello\\"),
+    ('"hello \\"world\\""', 'hello "world"'),
+    ('"hello\\nworld"', "hello\nworld"),
+    # Only match first string if there are multiple options
+    ('Method("hello", "world");', "hello"),
+]
+
+
+@pytest.mark.parametrize("line, string", string_match_cases)
+def test_get_string_contents(line: str, string: str):
+    assert get_string_contents(line) == string

From f50b771fff2dd3e2844c4c6cd52962e31eedb788 Mon Sep 17 00:00:00 2001
From: Misha <106913236+MishaProductions@users.noreply.github.com>
Date: Wed, 17 Jan 2024 11:53:53 -0500
Subject: [PATCH 122/210] begin implementation of InfoCenter class (#444)

* Push changes

* fixes

* Implement Infocenter::HandleEndAction

* match Infocenter::StopCutScene

* implement Infocenter::HandleKeyPress

* fixes

* Update infocenter.cpp

* Update legoworld.cpp

* use enums

* WIP Fixes

* Fix

* Fix

* Fix

* Rename function

* Change enum

* Update enums

* Refactor another enum

* Refactor MxDSType

* Refactor HashTableOpt

* Fixes

* Refactor tickle enum

* Update other enums

* Add EnumConstantName to ncc

* Move enum to global namespace

* Rename enum

---------

Co-authored-by: Christian Semmler <mail@csemmler.com>
---
 ISLE/isleapp.cpp                              |   4 +-
 LEGO1/lego/legoomni/include/extra.h           |  28 +-
 LEGO1/lego/legoomni/include/infocenter.h      |  81 +++
 LEGO1/lego/legoomni/include/infocenterstate.h |   6 +-
 .../include/legoactioncontrolpresenter.h      |   8 +-
 .../legoomni/include/legocontrolmanager.h     |   1 +
 LEGO1/lego/legoomni/include/legoentity.h      |   8 +-
 .../include/legoeventnotificationparam.h      |   4 +-
 LEGO1/lego/legoomni/include/legogamestate.h   |   1 +
 .../lego/legoomni/include/legoinputmanager.h  |   1 +
 LEGO1/lego/legoomni/include/legoomni.h        |   3 +
 LEGO1/lego/legoomni/include/legostream.h      |   6 +-
 LEGO1/lego/legoomni/include/legoutil.h        |   4 +-
 LEGO1/lego/legoomni/include/legoworld.h       |   1 +
 .../legoomni/include/mxtransitionmanager.h    |  14 +-
 .../src/audio/mxbackgroundaudiomanager.cpp    |   6 +-
 LEGO1/lego/legoomni/src/build/helicopter.cpp  |  12 +-
 .../src/common/legoactioncontrolpresenter.cpp |  12 +-
 .../legoomni/src/common/legogamestate.cpp     |  13 +-
 .../legoomni/src/common/legoobjectfactory.cpp |   4 +-
 LEGO1/lego/legoomni/src/common/legostream.cpp |   6 +-
 LEGO1/lego/legoomni/src/common/legoutil.cpp   |  51 +-
 .../src/common/mxcompositemediapresenter.cpp  |  30 +-
 .../src/control/legocontrolmanager.cpp        |   5 +
 .../src/control/mxcontrolpresenter.cpp        |   6 +-
 .../src/entity/legoactorpresenter.cpp         |   4 +-
 LEGO1/lego/legoomni/src/entity/legoentity.cpp |   8 +-
 .../src/entity/legoentitypresenter.cpp        |   2 +-
 LEGO1/lego/legoomni/src/entity/legoworld.cpp  |   8 +-
 .../src/entity/legoworldpresenter.cpp         |  16 +-
 .../legoomni/src/infocenter/infocenter.cpp    | 519 +++++++++++++++++-
 .../src/infocenter/infocenterstate.cpp        |   1 +
 LEGO1/lego/legoomni/src/infocenter/score.cpp  |  10 +-
 LEGO1/lego/legoomni/src/isle/isle.cpp         |  10 +-
 LEGO1/lego/legoomni/src/main/legoomni.cpp     |  66 ++-
 .../legoomni/src/paths/legopathpresenter.cpp  |   6 +-
 .../legoomni/src/video/legoanimpresenter.cpp  |   6 +-
 .../legoomni/src/video/legometerpresenter.cpp |   2 +-
 .../legoomni/src/video/legomodelpresenter.cpp |   2 +-
 .../src/video/legopalettepresenter.cpp        |   2 +-
 .../src/video/legotexturepresenter.cpp        |   2 +-
 .../legoomni/src/video/legovideomanager.cpp   |   6 +-
 .../src/video/mxtransitionmanager.cpp         |  36 +-
 LEGO1/mxdirectx/mxdirect3d.cpp                |   6 +-
 LEGO1/mxdirectx/mxdirect3d.h                  |   4 +-
 .../omni/include/mxactionnotificationparam.h  |   2 +-
 LEGO1/omni/include/mxatomid.h                 |   8 +-
 LEGO1/omni/include/mxdisplaysurface.h         |   2 +-
 LEGO1/omni/include/mxdsaction.h               |  32 +-
 LEGO1/omni/include/mxdsbuffer.h               |  22 +-
 LEGO1/omni/include/mxdschunk.h                |  10 +-
 LEGO1/omni/include/mxdsobject.h               |  20 +-
 LEGO1/omni/include/mxdstypes.h                |  19 -
 LEGO1/omni/include/mxhashtable.h              |  16 +-
 LEGO1/omni/include/mxnotificationparam.h      |  24 +-
 LEGO1/omni/include/mxomnicreateflags.h        |  68 +--
 LEGO1/omni/include/mxpresenter.h              |  26 +-
 LEGO1/omni/include/mxstreamer.h               |   2 +-
 LEGO1/omni/include/mxvideopresenter.h         |  10 +-
 LEGO1/omni/src/action/mxdsaction.cpp          |   4 +-
 LEGO1/omni/src/action/mxdsanim.cpp            |   2 +-
 LEGO1/omni/src/action/mxdsevent.cpp           |   2 +-
 LEGO1/omni/src/action/mxdsmediaaction.cpp     |   2 +-
 LEGO1/omni/src/action/mxdsmultiaction.cpp     |   2 +-
 LEGO1/omni/src/action/mxdsobject.cpp          |  27 +-
 LEGO1/omni/src/action/mxdsobjectaction.cpp    |   2 +-
 LEGO1/omni/src/action/mxdsparallelaction.cpp  |   2 +-
 LEGO1/omni/src/action/mxdsselectaction.cpp    |   2 +-
 LEGO1/omni/src/action/mxdsserialaction.cpp    |   2 +-
 LEGO1/omni/src/action/mxdssound.cpp           |   2 +-
 LEGO1/omni/src/action/mxdsstill.cpp           |   2 +-
 .../omni/src/audio/mxloopingmidipresenter.cpp |   4 +-
 LEGO1/omni/src/audio/mxmidipresenter.cpp      |   8 +-
 LEGO1/omni/src/audio/mxwavepresenter.cpp      |  30 +-
 LEGO1/omni/src/common/mxatomid.cpp            |   8 +-
 .../omni/src/common/mxcompositepresenter.cpp  |  20 +-
 LEGO1/omni/src/common/mxmediapresenter.cpp    |  35 +-
 LEGO1/omni/src/common/mxobjectfactory.cpp     |   4 +-
 LEGO1/omni/src/common/mxpresenter.cpp         |  54 +-
 LEGO1/omni/src/event/mxeventpresenter.cpp     |  10 +-
 .../src/stream/mxdiskstreamcontroller.cpp     |   8 +-
 .../omni/src/stream/mxdiskstreamprovider.cpp  |  10 +-
 LEGO1/omni/src/stream/mxdsbuffer.cpp          |  30 +-
 LEGO1/omni/src/stream/mxdschunk.cpp           |   2 +-
 LEGO1/omni/src/stream/mxdssubscriber.cpp      |   2 +-
 LEGO1/omni/src/stream/mxramstreamprovider.cpp |  10 +-
 LEGO1/omni/src/stream/mxstreamchunk.cpp       |   2 +-
 LEGO1/omni/src/stream/mxstreamcontroller.cpp  |   4 +-
 LEGO1/omni/src/stream/mxstreamer.cpp          |  12 +-
 LEGO1/omni/src/video/mxdisplaysurface.cpp     |   2 +-
 LEGO1/omni/src/video/mxflcpresenter.cpp       |   4 +-
 .../omni/src/video/mxloopingflcpresenter.cpp  |   8 +-
 .../omni/src/video/mxloopingsmkpresenter.cpp  |  12 +-
 LEGO1/omni/src/video/mxsmkpresenter.cpp       |   4 +-
 LEGO1/omni/src/video/mxstillpresenter.cpp     |  26 +-
 LEGO1/omni/src/video/mxvideopresenter.cpp     |  52 +-
 LEGO1/realtime/orientableroi.cpp              |   2 +-
 LEGO1/realtime/orientableroi.h                |   4 +-
 tools/ncc/ncc.style                           |   2 +-
 tools/ncc/skip.yml                            |   3 +-
 100 files changed, 1160 insertions(+), 555 deletions(-)
 delete mode 100644 LEGO1/omni/include/mxdstypes.h

diff --git a/ISLE/isleapp.cpp b/ISLE/isleapp.cpp
index 4aeb633e..4a2a840b 100644
--- a/ISLE/isleapp.cpp
+++ b/ISLE/isleapp.cpp
@@ -792,11 +792,11 @@ inline void IsleApp::Tick(BOOL sleepIfNotNextFrame)
 		LegoOmni::GetInstance()->CreateBackgroundAudio();
 		BackgroundAudioManager()->Enable(this->m_useMusic);
 
-		MxStreamController* stream = Streamer()->Open("\\lego\\scripts\\isle\\isle", MxStreamer::e_DiskStream);
+		MxStreamController* stream = Streamer()->Open("\\lego\\scripts\\isle\\isle", MxStreamer::e_diskStream);
 		MxDSAction ds;
 
 		if (!stream) {
-			stream = Streamer()->Open("\\lego\\scripts\\nocd", MxStreamer::e_DiskStream);
+			stream = Streamer()->Open("\\lego\\scripts\\nocd", MxStreamer::e_diskStream);
 			if (!stream) {
 				return;
 			}
diff --git a/LEGO1/lego/legoomni/include/extra.h b/LEGO1/lego/legoomni/include/extra.h
index e8aed106..35f08033 100644
--- a/LEGO1/lego/legoomni/include/extra.h
+++ b/LEGO1/lego/legoomni/include/extra.h
@@ -3,19 +3,21 @@
 
 // Items related to the Extra string of key-value pairs found in MxOb
 
-enum ExtraActionType {
-	ExtraActionType_none = 0,
-	ExtraActionType_opendisk = 1,
-	ExtraActionType_openram = 2,
-	ExtraActionType_close = 3,
-	ExtraActionType_start = 4,
-	ExtraActionType_stop = 5,
-	ExtraActionType_run = 6,
-	ExtraActionType_exit = 7,
-	ExtraActionType_enable = 8,
-	ExtraActionType_disable = 9,
-	ExtraActionType_notify = 10,
-	ExtraActionType_unknown = 11,
+struct Extra {
+	enum ActionType {
+		e_none = 0,
+		e_opendisk,
+		e_openram,
+		e_close,
+		e_start,
+		e_stop,
+		e_run,
+		e_exit,
+		e_enable,
+		e_disable,
+		e_notify,
+		e_unknown,
+	};
 };
 
 #endif // EXTRA_H
diff --git a/LEGO1/lego/legoomni/include/infocenter.h b/LEGO1/lego/legoomni/include/infocenter.h
index d514d550..f47799b3 100644
--- a/LEGO1/lego/legoomni/include/infocenter.h
+++ b/LEGO1/lego/legoomni/include/infocenter.h
@@ -2,11 +2,52 @@
 #define INFOCENTER_H
 
 #include "legoworld.h"
+#include "radio.h"
+
+class InfocenterState;
+
+// SIZE 0x18
+struct InfocenterUnkDataEntry {
+	// FUNCTION: LEGO1 0x1006ec80
+	InfocenterUnkDataEntry() {}
+
+	undefined m_pad[0x18];
+};
 
 // VTABLE: LEGO1 0x100d9338
 // SIZE 0x1d8
 class Infocenter : public LegoWorld {
 public:
+	enum IntroScript {
+		e_noIntro = -1,
+		e_legoMovie,
+		e_mindscapeMovie,
+		e_introMovie,
+		e_outroMovie,
+		e_badEndMovie,
+		e_goodEndMovie
+	};
+
+	enum InfomainScript {
+		c_noInfomain = -1,
+		c_welcomeDialogue = 500,
+		c_randomDialogue1 = 502,
+		c_letsGetStarted = 504,
+		c_returnBack = 514,
+		c_exitConfirmation = 522,
+		c_goodEndingDialogue = 539,
+		c_badEndingDialogue = 540,
+		c_pepperCharacterSelect = 541,
+		c_mamaCharacterSelect = 542,
+		c_papaCharacterSelect = 543,
+		c_officierCharacterSelect = 544,
+		c_loraCharacterSelect = 545,
+	};
+
+	enum SndAmimScript {
+		c_bookWig = 400
+	};
+
 	Infocenter();
 	virtual ~Infocenter() override;
 
@@ -31,6 +72,46 @@ class Infocenter : public LegoWorld {
 	virtual MxBool VTable0x5c() override;                     // vtable+0x5c
 	virtual MxBool VTable0x64() override;                     // vtable+0x64
 	virtual void VTable0x68(MxBool p_add) override;           // vtable+0x68
+
+private:
+	void InitializeBitmaps();
+
+	MxLong HandleKeyPress(MxS8 p_key);
+	MxU8 HandleMouseMove(MxS32 p_x, MxS32 p_y);
+	MxU8 HandleButtonUp(MxS32 p_x, MxS32 p_y);
+	MxU8 HandleNotification17(MxParam&);
+	MxLong HandleEndAction(MxParam& p_param);
+	MxLong HandleNotification0(MxParam&);
+
+	void FUN_10070dc0(MxBool);
+	void FUN_10070e90();
+
+	void PlayCutscene(IntroScript p_entityId, MxBool p_scale);
+	void StopCutscene();
+
+	void StartCredits();
+	void StopCredits();
+
+	void PlayDialogue(InfomainScript p_objectId);
+	void StopCurrentDialogue();
+
+	void PlayBookAnimation();
+	void StopBookAnimation();
+
+	InfomainScript m_currentInfomainScript; // 0xf8
+	MxS16 m_unk0xfc;                        // 0xfc
+	InfocenterState* m_infocenterState;     // 0x100
+	undefined4 m_unk0x104;                  // 0x104
+	IntroScript m_currentIntroScript;       // 0x108
+	Radio m_radio;                          // 0x10c
+	undefined4 m_unk0x11c;                  // 0x11c
+	InfocenterUnkDataEntry m_entries[7];    // 0x120
+	MxS16 m_unk0x1c8;                       // 0x1c8
+	undefined4 m_unk0x1cc;                  // 0x1cc
+	MxU16 m_unk0x1d0;                       // 0x1d0
+	MxU16 m_unk0x1d2;                       // 0x1d2
+	MxU16 m_unk0x1d4;                       // 0x1d4
+	MxU16 m_unk0x1d6;                       // 0x1d6
 };
 
 #endif // INFOCENTER_H
diff --git a/LEGO1/lego/legoomni/include/infocenterstate.h b/LEGO1/lego/legoomni/include/infocenterstate.h
index b1bce306..51dbac72 100644
--- a/LEGO1/lego/legoomni/include/infocenterstate.h
+++ b/LEGO1/lego/legoomni/include/infocenterstate.h
@@ -25,6 +25,9 @@ class InfocenterState : public LegoState {
 	}
 
 	inline MxU32 GetInfocenterBufferElement(MxS32 p_index) { return m_buffer[p_index]; }
+	inline MxU32 GetUnknown0x74() { return m_unk0x74; }
+
+	inline void SetUnknown0x74(MxU32 p_unk0x74) { m_unk0x74 = p_unk0x74; }
 
 private:
 	// Members should be renamed with their offsets before use
@@ -55,7 +58,8 @@ class InfocenterState : public LegoState {
 	  undefined4 unk13;
 	*/
 
-	undefined m_pad[0x70];
+	undefined m_pad[0x6c];
+	MxU32 m_unk0x74;   // 0x74
 	MxU32 m_buffer[7]; // 0x78
 };
 
diff --git a/LEGO1/lego/legoomni/include/legoactioncontrolpresenter.h b/LEGO1/lego/legoomni/include/legoactioncontrolpresenter.h
index 746300a6..0cc18935 100644
--- a/LEGO1/lego/legoomni/include/legoactioncontrolpresenter.h
+++ b/LEGO1/lego/legoomni/include/legoactioncontrolpresenter.h
@@ -9,7 +9,7 @@
 // SIZE 0x68
 class LegoActionControlPresenter : public MxMediaPresenter {
 public:
-	inline LegoActionControlPresenter() { m_unk0x50 = ExtraActionType_none; }
+	inline LegoActionControlPresenter() { m_unk0x50 = Extra::ActionType::e_none; }
 	virtual ~LegoActionControlPresenter() override { Destroy(TRUE); }; // vtable+0x00
 
 	// FUNCTION: LEGO1 0x1000d0e0
@@ -32,9 +32,9 @@ class LegoActionControlPresenter : public MxMediaPresenter {
 	virtual void Destroy(MxBool p_fromDestructor); // vtable+0x5c
 
 private:
-	ExtraActionType m_unk0x50; // 0x50
-	MxString m_unk0x54;        // 0x54
-	undefined4 m_unk0x64;      // 0x64
+	Extra::ActionType m_unk0x50; // 0x50
+	MxString m_unk0x54;          // 0x54
+	undefined4 m_unk0x64;        // 0x64
 };
 
 // SYNTHETIC: LEGO1 0x1000d1d0
diff --git a/LEGO1/lego/legoomni/include/legocontrolmanager.h b/LEGO1/lego/legoomni/include/legocontrolmanager.h
index 36bf6d48..f81ab6d2 100644
--- a/LEGO1/lego/legoomni/include/legocontrolmanager.h
+++ b/LEGO1/lego/legoomni/include/legocontrolmanager.h
@@ -28,6 +28,7 @@ class LegoControlManager : public MxCore {
 	void FUN_10028df0(MxPresenterList* p_presenterList);
 	void Register(MxCore* p_listener);
 	void Unregister(MxCore* p_listener);
+	void FUN_100293c0(undefined4, const MxAtomId&, undefined2);
 };
 
 #endif // LEGOCONTROLMANAGER_H
diff --git a/LEGO1/lego/legoomni/include/legoentity.h b/LEGO1/lego/legoomni/include/legoentity.h
index c8e3df35..b775f840 100644
--- a/LEGO1/lego/legoomni/include/legoentity.h
+++ b/LEGO1/lego/legoomni/include/legoentity.h
@@ -13,7 +13,7 @@
 class LegoEntity : public MxEntity {
 public:
 	enum {
-		Flag_Bit1 = 0x01
+		c_bit1 = 0x01
 	};
 
 	// Inlined at 0x100853f7
@@ -78,9 +78,9 @@ class LegoEntity : public MxEntity {
 	undefined m_unk0x59;             // 0x59
 	// For tokens from the extra string that look like this:
 	// "Action:openram;\lego\scripts\Race\CarRaceR;0"
-	ExtraActionType m_actionType; // 0x5c
-	char* m_actionArgString;      // 0x60
-	MxS32 m_actionArgNumber;      // 0x64
+	Extra::ActionType m_actionType; // 0x5c
+	char* m_actionArgString;        // 0x60
+	MxS32 m_actionArgNumber;        // 0x64
 };
 
 // SYNTHETIC: LEGO1 0x1000c3b0
diff --git a/LEGO1/lego/legoomni/include/legoeventnotificationparam.h b/LEGO1/lego/legoomni/include/legoeventnotificationparam.h
index 8f752cce..8805d9cd 100644
--- a/LEGO1/lego/legoomni/include/legoeventnotificationparam.h
+++ b/LEGO1/lego/legoomni/include/legoeventnotificationparam.h
@@ -10,7 +10,7 @@
 // SIZE 0x20
 class LegoEventNotificationParam : public MxNotificationParam {
 public:
-	inline LegoEventNotificationParam() : MxNotificationParam(PARAM_NONE, NULL) {}
+	inline LegoEventNotificationParam() : MxNotificationParam(c_notificationType0, NULL) {}
 	inline LegoEventNotificationParam(
 		NotificationId p_type,
 		MxCore* p_sender,
@@ -24,6 +24,8 @@ class LegoEventNotificationParam : public MxNotificationParam {
 	}
 
 	inline MxU8 GetKey() const { return m_key; }
+	inline MxS32 GetX() const { return m_x; }
+	inline MxS32 GetY() const { return m_y; }
 
 protected:
 	MxU8 m_modifier; // 0x0c
diff --git a/LEGO1/lego/legoomni/include/legogamestate.h b/LEGO1/lego/legoomni/include/legogamestate.h
index 00781094..ae39654c 100644
--- a/LEGO1/lego/legoomni/include/legogamestate.h
+++ b/LEGO1/lego/legoomni/include/legogamestate.h
@@ -43,6 +43,7 @@ class LegoGameState {
 
 	void SetSomeEnumState(undefined4 p_state);
 	void FUN_1003ceb0();
+	void FUN_10039780(MxU8);
 
 	struct ScoreStruct {
 		void WriteScoreHistory();
diff --git a/LEGO1/lego/legoomni/include/legoinputmanager.h b/LEGO1/lego/legoomni/include/legoinputmanager.h
index 455c2f1a..7a546702 100644
--- a/LEGO1/lego/legoomni/include/legoinputmanager.h
+++ b/LEGO1/lego/legoomni/include/legoinputmanager.h
@@ -52,6 +52,7 @@ class LegoInputManager : public MxPresenter {
 	void ClearWorld();
 
 	inline void SetUnknown88(MxBool p_unk0x88) { m_unk0x88 = p_unk0x88; }
+	inline void SetUnknown335(MxBool p_unk0x335) { m_unk0x335 = p_unk0x335; }
 	inline void SetUnknown336(MxBool p_unk0x336) { m_unk0x336 = p_unk0x336; }
 	inline void SetUseJoystick(MxBool p_useJoystick) { m_useJoystick = p_useJoystick; }
 	inline void SetJoystickIndex(MxS32 p_joystickIndex) { m_joystickIndex = p_joystickIndex; }
diff --git a/LEGO1/lego/legoomni/include/legoomni.h b/LEGO1/lego/legoomni/include/legoomni.h
index 2199afdf..aad0b43f 100644
--- a/LEGO1/lego/legoomni/include/legoomni.h
+++ b/LEGO1/lego/legoomni/include/legoomni.h
@@ -120,6 +120,8 @@ class LegoOmni : public MxOmni {
 	inline void SetWorld(LegoWorld* p_currentWorld) { m_currentWorld = p_currentWorld; }
 	inline void SetExit(MxBool p_exit) { m_exit = p_exit; };
 
+	inline void CloseMainWindow() { PostMessageA(m_windowHandle, WM_CLOSE, 0, 0); }
+
 private:
 	undefined4* m_unk0x68;                       // 0x68
 	ViewLODListManager* m_viewLODListManager;    // 0x6c
@@ -161,6 +163,7 @@ LegoWorld* GetCurrentWorld();
 LegoUnkSaveDataWriter* GetUnkSaveDataWriter();
 GifManager* GetGifManager();
 void FUN_10015820(MxU32, MxU32);
+void FUN_10015860(const char*, MxU8);
 LegoEntity* FindEntityByAtomIdOrEntityId(const MxAtomId& p_atom, MxS32 p_entityid);
 MxDSAction& GetCurrentAction();
 
diff --git a/LEGO1/lego/legoomni/include/legostream.h b/LEGO1/lego/legoomni/include/legostream.h
index fe21ddba..601e94e2 100644
--- a/LEGO1/lego/legoomni/include/legostream.h
+++ b/LEGO1/lego/legoomni/include/legostream.h
@@ -30,9 +30,9 @@ class LegoStream {
 	virtual MxBool IsReadMode();
 
 	enum OpenFlags {
-		ReadBit = 1,
-		WriteBit = 2,
-		BinaryBit = 4,
+		c_readBit = 1,
+		c_writeBit = 2,
+		c_binaryBit = 4,
 	};
 
 	static MxResult __stdcall WriteVariable(LegoStream* p_stream, MxVariableTable* p_from, const char* p_variableName);
diff --git a/LEGO1/lego/legoomni/include/legoutil.h b/LEGO1/lego/legoomni/include/legoutil.h
index 1539f28f..6e9bb5ee 100644
--- a/LEGO1/lego/legoomni/include/legoutil.h
+++ b/LEGO1/lego/legoomni/include/legoutil.h
@@ -10,8 +10,8 @@
 class MxAtomId;
 class LegoEntity;
 
-ExtraActionType MatchActionString(const char*);
-void InvokeAction(ExtraActionType p_actionId, MxAtomId& p_pAtom, int p_targetEntityId, LegoEntity* p_sender);
+Extra::ActionType MatchActionString(const char*);
+void InvokeAction(Extra::ActionType p_actionId, MxAtomId& p_pAtom, int p_targetEntityId, LegoEntity* p_sender);
 void ConvertHSVToRGB(float p_h, float p_s, float p_v, float* p_rOut, float* p_bOut, float* p_gOut);
 MxBool FUN_1003ee00(MxAtomId& p_atomId, MxS32 p_id);
 void FUN_1003ef00(MxBool);
diff --git a/LEGO1/lego/legoomni/include/legoworld.h b/LEGO1/lego/legoomni/include/legoworld.h
index 4ac7ca37..a423ec09 100644
--- a/LEGO1/lego/legoomni/include/legoworld.h
+++ b/LEGO1/lego/legoomni/include/legoworld.h
@@ -58,6 +58,7 @@ class LegoWorld : public LegoEntity {
 	void FUN_10073400();
 	void FUN_10073430();
 	MxS32 GetCurrPathInfo(LegoPathBoundary** p_path, MxS32& p_value);
+	MxPresenter* FindPresenter(const char* p_presenter, const char* p_name);
 
 protected:
 	LegoPathControllerList m_list0x68;        // 0x68
diff --git a/LEGO1/lego/legoomni/include/mxtransitionmanager.h b/LEGO1/lego/legoomni/include/mxtransitionmanager.h
index ac87ffcc..b169f3bf 100644
--- a/LEGO1/lego/legoomni/include/mxtransitionmanager.h
+++ b/LEGO1/lego/legoomni/include/mxtransitionmanager.h
@@ -32,13 +32,13 @@ class MxTransitionManager : public MxCore {
 	virtual MxResult GetDDrawSurfaceFromVideoManager(); // vtable+0x14
 
 	enum TransitionType {
-		NOT_TRANSITIONING,
-		NO_ANIMATION,
-		DISSOLVE,
-		PIXELATION,
-		SCREEN_WIPE,
-		WINDOWS,
-		BROKEN // Unknown what this is supposed to be, it locks the game up
+		e_notTransitioning = 0,
+		e_noAnimation,
+		e_dissolve,
+		e_pixelation,
+		e_screenWipe,
+		e_windows,
+		e_broken // Unknown what this is supposed to be, it locks the game up
 	};
 
 	MxResult StartTransition(TransitionType p_animationType, MxS32 p_speed, MxBool p_doCopy, MxBool p_playMusicInAnim);
diff --git a/LEGO1/lego/legoomni/src/audio/mxbackgroundaudiomanager.cpp b/LEGO1/lego/legoomni/src/audio/mxbackgroundaudiomanager.cpp
index 9fe20941..74f8c146 100644
--- a/LEGO1/lego/legoomni/src/audio/mxbackgroundaudiomanager.cpp
+++ b/LEGO1/lego/legoomni/src/audio/mxbackgroundaudiomanager.cpp
@@ -77,13 +77,13 @@ void MxBackgroundAudioManager::DestroyMusic()
 MxResult MxBackgroundAudioManager::Tickle()
 {
 	switch (m_unk0x13c) {
-	case MxPresenter::TickleState_Starting:
+	case MxPresenter::e_starting:
 		FadeInOrFadeOut();
 		return SUCCESS;
-	case MxPresenter::TickleState_Streaming:
+	case MxPresenter::e_streaming:
 		FUN_1007ee70();
 		return SUCCESS;
-	case MxPresenter::TickleState_Repeating:
+	case MxPresenter::e_repeating:
 		FUN_1007ef40();
 		return SUCCESS;
 	default:
diff --git a/LEGO1/lego/legoomni/src/build/helicopter.cpp b/LEGO1/lego/legoomni/src/build/helicopter.cpp
index 823304e8..d44abb15 100644
--- a/LEGO1/lego/legoomni/src/build/helicopter.cpp
+++ b/LEGO1/lego/legoomni/src/build/helicopter.cpp
@@ -100,7 +100,7 @@ MxU32 Helicopter::VTable0xcc()
 		VTable0xe8(0x29, TRUE, 7);
 		((Isle*) GetCurrentWorld())->SetUnknown13c(0x3c);
 		FUN_10015820(1, 0);
-		TransitionManager()->StartTransition(MxTransitionManager::PIXELATION, 50, FALSE, TRUE);
+		TransitionManager()->StartTransition(MxTransitionManager::e_pixelation, 50, FALSE, TRUE);
 		SetUnknownDC(4);
 		PlayMusic(9);
 		break;
@@ -112,7 +112,7 @@ MxU32 Helicopter::VTable0xcc()
 		break;
 	}
 	VTable0xe0();
-	InvokeAction(ExtraActionType_start, m_script, 0x15, NULL);
+	InvokeAction(Extra::ActionType::e_start, m_script, 0x15, NULL);
 	GetCurrentAction().SetObjectId(-1);
 	ControlManager()->Register(this);
 	return 1;
@@ -139,7 +139,7 @@ MxU32 Helicopter::VTable0xd4(MxType17NotificationParam& p_param)
 		case 0x17:
 			if (*g_act3Script == script) {
 				((Act3*) GetCurrentWorld())->SetUnkown4270(2);
-				TransitionManager()->StartTransition(MxTransitionManager::PIXELATION, 50, FALSE, FALSE);
+				TransitionManager()->StartTransition(MxTransitionManager::e_pixelation, 50, FALSE, FALSE);
 			}
 			else if (m_state->GetUnkown8() != 0)
 				break;
@@ -155,7 +155,7 @@ MxU32 Helicopter::VTable0xd4(MxType17NotificationParam& p_param)
 				state->SetUnknown18(4);
 				m_state->SetUnknown8(1);
 				m_world->FUN_1001fc80(this);
-				InvokeAction(ExtraActionType_start, script, 0x20, NULL);
+				InvokeAction(Extra::ActionType::e_start, script, 0x20, NULL);
 				SetUnknownDC(0);
 			}
 			ret = 1;
@@ -167,7 +167,7 @@ MxU32 Helicopter::VTable0xd4(MxType17NotificationParam& p_param)
 			if (m_state->GetUnkown8() == 2) {
 				m_state->SetUnknown8(3);
 				m_world->FUN_1001fc80(this);
-				InvokeAction(ExtraActionType_start, script, 0x21, NULL);
+				InvokeAction(Extra::ActionType::e_start, script, 0x21, NULL);
 				SetUnknownDC(4);
 			}
 			ret = 1;
@@ -203,7 +203,7 @@ MxU32 Helicopter::VTable0xd4(MxType17NotificationParam& p_param)
 		case 0x1c:
 			if (GameState()->GetUnknown10() == 0) {
 				((Isle*) GetCurrentWorld())->SetUnknown13c(2);
-				TransitionManager()->StartTransition(MxTransitionManager::PIXELATION, 50, FALSE, FALSE);
+				TransitionManager()->StartTransition(MxTransitionManager::e_pixelation, 50, FALSE, FALSE);
 				VTable0xe4();
 			}
 			ret = 1;
diff --git a/LEGO1/lego/legoomni/src/common/legoactioncontrolpresenter.cpp b/LEGO1/lego/legoomni/src/common/legoactioncontrolpresenter.cpp
index 75890bec..1407de1b 100644
--- a/LEGO1/lego/legoomni/src/common/legoactioncontrolpresenter.cpp
+++ b/LEGO1/lego/legoomni/src/common/legoactioncontrolpresenter.cpp
@@ -19,7 +19,7 @@ void LegoActionControlPresenter::ReadyTickle()
 
 	if (chunk) {
 		ParseExtra();
-		ProgressTickleState(TickleState_Starting);
+		ProgressTickleState(e_starting);
 
 		m_subscriber->DestroyChunk(chunk);
 		if (m_compositePresenter) {
@@ -40,13 +40,13 @@ void LegoActionControlPresenter::RepeatingTickle()
 
 #ifdef COMPAT_MODE
 		{
-			MxAtomId atom(m_unk0x54.GetData(), LookupMode_LowerCase2);
+			MxAtomId atom(m_unk0x54.GetData(), e_lowerCase2);
 			InvokeAction(m_unk0x50, atom, m_unk0x64, NULL);
 		}
 #else
-		InvokeAction(m_unk0x50, MxAtomId(m_unk0x54.GetData(), LookupMode_LowerCase2), m_unk0x64, NULL);
+		InvokeAction(m_unk0x50, MxAtomId(m_unk0x54.GetData(), e_lowerCase2), m_unk0x64, NULL);
 #endif
-		ProgressTickleState(TickleState_Done);
+		ProgressTickleState(e_done);
 	}
 }
 
@@ -92,11 +92,11 @@ void LegoActionControlPresenter::ParseExtra()
 	char output[1024];
 	if (KeyValueStringParse(output, g_strACTION, buf)) {
 		m_unk0x50 = MatchActionString(strtok(output, g_parseExtraTokens));
-		if (m_unk0x50 != ExtraActionType_exit) {
+		if (m_unk0x50 != Extra::ActionType::e_exit) {
 			MakeSourceName(buf, strtok(NULL, g_parseExtraTokens));
 			m_unk0x54 = buf;
 			m_unk0x54.ToLowerCase();
-			if (m_unk0x50 != ExtraActionType_run) {
+			if (m_unk0x50 != Extra::ActionType::e_run) {
 				m_unk0x64 = atoi(strtok(NULL, g_parseExtraTokens));
 			}
 		}
diff --git a/LEGO1/lego/legoomni/src/common/legogamestate.cpp b/LEGO1/lego/legoomni/src/common/legogamestate.cpp
index 5a3518a9..a470732e 100644
--- a/LEGO1/lego/legoomni/src/common/legogamestate.cpp
+++ b/LEGO1/lego/legoomni/src/common/legogamestate.cpp
@@ -92,11 +92,18 @@ LegoGameState::~LegoGameState()
 	delete[] m_savePath;
 }
 
+// STUB: LEGO1 0x10039780
+void LegoGameState::FUN_10039780(MxU8)
+{
+	// TODO
+}
+
 // FUNCTION: LEGO1 0x10039980
 MxResult LegoGameState::Save(MxULong p_slot)
 {
 	MxResult result;
 	InfocenterState* infocenterState = (InfocenterState*) GameState()->GetState("InfocenterState");
+
 	if (!infocenterState || infocenterState->GetInfocenterBufferElement(0) == 0)
 		result = SUCCESS;
 	else {
@@ -105,7 +112,7 @@ MxResult LegoGameState::Save(MxULong p_slot)
 		MxString savePath;
 		GetFileSavePath(&savePath, p_slot);
 		LegoFileStream fileStream;
-		if (fileStream.Open(savePath.GetData(), LegoStream::WriteBit) != FAILURE) {
+		if (fileStream.Open(savePath.GetData(), LegoStream::c_writeBit) != FAILURE) {
 			MxU32 maybeVersion = 0x1000C;
 			fileStream.Write(&maybeVersion, 4);
 			fileStream.Write(&m_unk0x24, 2);
@@ -216,7 +223,7 @@ void LegoGameState::HandleAction(MxU32 p_area)
 		// TODO: implement other cases
 	}
 
-	InvokeAction(ExtraActionType_opendisk, *script, 0, NULL);
+	InvokeAction(Extra::ActionType::e_opendisk, *script, 0, NULL);
 }
 
 // FUNCTION: LEGO1 0x1003bac0
@@ -310,7 +317,7 @@ void LegoGameState::SerializeScoreHistory(MxS16 p_flags)
 	savePath += "\\";
 	savePath += g_historyGSI;
 
-	if (p_flags == LegoStream::WriteBit) {
+	if (p_flags == LegoStream::c_writeBit) {
 		m_unk0xa6.WriteScoreHistory();
 	}
 
diff --git a/LEGO1/lego/legoomni/src/common/legoobjectfactory.cpp b/LEGO1/lego/legoomni/src/common/legoobjectfactory.cpp
index bb534169..8e3d7526 100644
--- a/LEGO1/lego/legoomni/src/common/legoobjectfactory.cpp
+++ b/LEGO1/lego/legoomni/src/common/legoobjectfactory.cpp
@@ -106,7 +106,7 @@
 // FUNCTION: LEGO1 0x10006e40
 LegoObjectFactory::LegoObjectFactory()
 {
-#define X(V) this->m_id##V = MxAtomId(#V, LookupMode_Exact);
+#define X(V) this->m_id##V = MxAtomId(#V, e_exact);
 	FOR_LEGOOBJECTFACTORY_OBJECTS(X)
 #undef X
 }
@@ -114,7 +114,7 @@ LegoObjectFactory::LegoObjectFactory()
 // FUNCTION: LEGO1 0x10009a90
 MxCore* LegoObjectFactory::Create(const char* p_name)
 {
-	MxAtomId atom(p_name, LookupMode_Exact);
+	MxAtomId atom(p_name, e_exact);
 
 #define X(V)                                                                                                           \
 	if (this->m_id##V == atom) {                                                                                       \
diff --git a/LEGO1/lego/legoomni/src/common/legostream.cpp b/LEGO1/lego/legoomni/src/common/legostream.cpp
index 97b5053f..f54d5982 100644
--- a/LEGO1/lego/legoomni/src/common/legostream.cpp
+++ b/LEGO1/lego/legoomni/src/common/legostream.cpp
@@ -167,18 +167,18 @@ MxResult LegoFileStream::Open(const char* p_filename, OpenFlags p_mode)
 		fclose(m_hFile);
 
 	modeString[0] = '\0';
-	if (p_mode & ReadBit) {
+	if (p_mode & c_readBit) {
 		m_mode = LEGOSTREAM_MODE_READ;
 		strcat(modeString, "r");
 	}
 
-	if (p_mode & WriteBit) {
+	if (p_mode & c_writeBit) {
 		if (m_mode != LEGOSTREAM_MODE_READ)
 			m_mode = LEGOSTREAM_MODE_WRITE;
 		strcat(modeString, "w");
 	}
 
-	if ((p_mode & 4) != 0)
+	if ((p_mode & c_binaryBit) != 0)
 		strcat(modeString, "b");
 	else
 		strcat(modeString, "t");
diff --git a/LEGO1/lego/legoomni/src/common/legoutil.cpp b/LEGO1/lego/legoomni/src/common/legoutil.cpp
index 4941d968..fb207f50 100644
--- a/LEGO1/lego/legoomni/src/common/legoutil.cpp
+++ b/LEGO1/lego/legoomni/src/common/legoutil.cpp
@@ -11,30 +11,30 @@
 #include <string.h>
 
 // FUNCTION: LEGO1 0x1003e300
-ExtraActionType MatchActionString(const char* p_str)
+Extra::ActionType MatchActionString(const char* p_str)
 {
-	ExtraActionType result = ExtraActionType_unknown;
+	Extra::ActionType result = Extra::ActionType::e_unknown;
 
 	if (!strcmpi("openram", p_str))
-		result = ExtraActionType_openram;
+		result = Extra::ActionType::e_openram;
 	else if (!strcmpi("opendisk", p_str))
-		result = ExtraActionType_opendisk;
+		result = Extra::ActionType::e_opendisk;
 	else if (!strcmpi("close", p_str))
-		result = ExtraActionType_close;
+		result = Extra::ActionType::e_close;
 	else if (!strcmpi("start", p_str))
-		result = ExtraActionType_start;
+		result = Extra::ActionType::e_start;
 	else if (!strcmpi("stop", p_str))
-		result = ExtraActionType_stop;
+		result = Extra::ActionType::e_stop;
 	else if (!strcmpi("run", p_str))
-		result = ExtraActionType_run;
+		result = Extra::ActionType::e_run;
 	else if (!strcmpi("exit", p_str))
-		result = ExtraActionType_exit;
+		result = Extra::ActionType::e_exit;
 	else if (!strcmpi("enable", p_str))
-		result = ExtraActionType_enable;
+		result = Extra::ActionType::e_enable;
 	else if (!strcmpi("disable", p_str))
-		result = ExtraActionType_disable;
+		result = Extra::ActionType::e_disable;
 	else if (!strcmpi("notify", p_str))
-		result = ExtraActionType_notify;
+		result = Extra::ActionType::e_notify;
 
 	return result;
 }
@@ -43,54 +43,54 @@ MxBool CheckIfEntityExists(MxBool p_enable, const char* p_filename, MxS32 p_enti
 void NotifyEntity(const char* p_filename, MxS32 p_entityId, LegoEntity* p_sender);
 
 // FUNCTION: LEGO1 0x1003e430
-void InvokeAction(ExtraActionType p_actionId, MxAtomId& p_pAtom, int p_targetEntityId, LegoEntity* p_sender)
+void InvokeAction(Extra::ActionType p_actionId, MxAtomId& p_pAtom, int p_targetEntityId, LegoEntity* p_sender)
 {
 	MxDSAction action;
 	action.SetAtomId(p_pAtom);
 	action.SetObjectId(p_targetEntityId);
 
 	switch (p_actionId) {
-	case ExtraActionType_opendisk:
+	case Extra::ActionType::e_opendisk:
 		if (!CheckIfEntityExists(TRUE, p_pAtom.GetInternal(), p_targetEntityId)) {
-			Streamer()->Open(p_pAtom.GetInternal(), MxStreamer::e_DiskStream);
+			Streamer()->Open(p_pAtom.GetInternal(), MxStreamer::e_diskStream);
 			Start(&action);
 		}
 		break;
-	case ExtraActionType_openram:
+	case Extra::ActionType::e_openram:
 		if (!CheckIfEntityExists(TRUE, p_pAtom.GetInternal(), p_targetEntityId)) {
 			Streamer()->Open(p_pAtom.GetInternal(), MxStreamer::e_RAMStream);
 			Start(&action);
 		}
 		break;
-	case ExtraActionType_close:
+	case Extra::ActionType::e_close:
 		action.SetUnknown24(-2);
 		DeleteObject(action);
 		Streamer()->Close(p_pAtom.GetInternal());
 		break;
-	case ExtraActionType_start:
+	case Extra::ActionType::e_start:
 		if (!CheckIfEntityExists(TRUE, p_pAtom.GetInternal(), p_targetEntityId)) {
 			Start(&action);
 		}
 		break;
-	case ExtraActionType_stop:
+	case Extra::ActionType::e_stop:
 		action.SetUnknown24(-2);
 		if (!FUN_1003ee00(p_pAtom, p_targetEntityId)) {
 			DeleteObject(action);
 		}
 		break;
-	case ExtraActionType_run:
+	case Extra::ActionType::e_run:
 		_spawnl(0, "\\lego\\sources\\main\\main.exe", "\\lego\\sources\\main\\main.exe", "/script", &p_pAtom, 0);
 		break;
-	case ExtraActionType_exit:
+	case Extra::ActionType::e_exit:
 		Lego()->SetExit(TRUE);
 		break;
-	case ExtraActionType_enable:
+	case Extra::ActionType::e_enable:
 		CheckIfEntityExists(TRUE, p_pAtom.GetInternal(), p_targetEntityId);
 		break;
-	case ExtraActionType_disable:
+	case Extra::ActionType::e_disable:
 		CheckIfEntityExists(FALSE, p_pAtom.GetInternal(), p_targetEntityId);
 		break;
-	case ExtraActionType_notify:
+	case Extra::ActionType::e_notify:
 		NotifyEntity(p_pAtom.GetInternal(), p_targetEntityId, p_sender);
 		break;
 	}
@@ -99,8 +99,7 @@ void InvokeAction(ExtraActionType p_actionId, MxAtomId& p_pAtom, int p_targetEnt
 // FUNCTION: LEGO1 0x1003e670
 MxBool CheckIfEntityExists(MxBool p_enable, const char* p_filename, MxS32 p_entityId)
 {
-	LegoWorld* world =
-		(LegoWorld*) FindEntityByAtomIdOrEntityId(MxAtomId(p_filename, LookupMode_LowerCase2), p_entityId);
+	LegoWorld* world = (LegoWorld*) FindEntityByAtomIdOrEntityId(MxAtomId(p_filename, e_lowerCase2), p_entityId);
 	if (world) {
 		world->VTable0x68(p_enable);
 		return TRUE;
diff --git a/LEGO1/lego/legoomni/src/common/mxcompositemediapresenter.cpp b/LEGO1/lego/legoomni/src/common/mxcompositemediapresenter.cpp
index 69c7dd70..d3971150 100644
--- a/LEGO1/lego/legoomni/src/common/mxcompositemediapresenter.cpp
+++ b/LEGO1/lego/legoomni/src/common/mxcompositemediapresenter.cpp
@@ -55,7 +55,7 @@ MxResult MxCompositeMediaPresenter::StartAction(MxStreamController* p_controller
 			if (presenter && presenter->AddToManager() == SUCCESS) {
 				presenter->SetCompositePresenter(this);
 				if (presenter->StartAction(p_controller, action) == SUCCESS) {
-					presenter->SetTickleState(TickleState_Idle);
+					presenter->SetTickleState(e_idle);
 
 					if (presenter->IsA("MxVideoPresenter"))
 						VideoManager()->UnregisterPresenter(*presenter);
@@ -75,7 +75,7 @@ MxResult MxCompositeMediaPresenter::StartAction(MxStreamController* p_controller
 		}
 
 		if (!m_compositePresenter) {
-			SetTickleState(TickleState_Ready);
+			SetTickleState(e_ready);
 			MxLong time = Timer()->GetTime();
 			m_action->SetUnknown90(time);
 		}
@@ -93,10 +93,10 @@ void MxCompositeMediaPresenter::StartingTickle()
 
 	if (!m_unk0x4e) {
 		for (MxCompositePresenterList::iterator it = m_list.begin(); it != m_list.end(); it++) {
-			if ((*it)->GetCurrentTickleState() < TickleState_Streaming) {
+			if ((*it)->GetCurrentTickleState() < e_streaming) {
 				(*it)->Tickle();
 
-				if ((*it)->GetCurrentTickleState() == TickleState_Streaming ||
+				if ((*it)->GetCurrentTickleState() == e_streaming ||
 					((*it)->GetAction() && (*it)->GetAction()->GetStartTime()))
 					m_unk0x4c++;
 			}
@@ -115,15 +115,15 @@ void MxCompositeMediaPresenter::StartingTickle()
 	else {
 		for (MxCompositePresenterList::iterator it = m_list.begin(); it != m_list.end(); it++) {
 			if (!(*it)->GetAction()->GetStartTime() && ((MxMediaPresenter*) *it)->CurrentChunk() &&
-				!((*it)->GetAction()->GetFlags() & MxDSAction::Flag_Bit9)) {
+				!((*it)->GetAction()->GetFlags() & MxDSAction::c_bit9)) {
 				(*it)->Tickle();
-				(*it)->GetAction()->SetFlags((*it)->GetAction()->GetFlags() | MxDSAction::Flag_Bit9);
+				(*it)->GetAction()->SetFlags((*it)->GetAction()->GetFlags() | MxDSAction::c_bit9);
 				m_unk0x4c--;
 			}
 		}
 
 		if (!m_unk0x4c) {
-			ProgressTickleState(TickleState_Streaming);
+			ProgressTickleState(e_streaming);
 			MxLong time = Timer()->GetTime();
 			m_action->SetUnknown90(time);
 		}
@@ -136,15 +136,15 @@ MxResult MxCompositeMediaPresenter::Tickle()
 	MxAutoLocker lock(&m_criticalSection);
 
 	switch (m_currentTickleState) {
-	case TickleState_Ready:
-		ProgressTickleState(TickleState_Starting);
-	case TickleState_Starting:
+	case e_ready:
+		ProgressTickleState(e_starting);
+	case e_starting:
 		StartingTickle();
 		break;
-	case TickleState_Streaming:
-	case TickleState_Repeating:
-	case TickleState_unk5:
-	case TickleState_Done: {
+	case e_streaming:
+	case e_repeating:
+	case e_unk5:
+	case e_done: {
 		for (MxCompositePresenterList::iterator it = m_list.begin(); it != m_list.end(); it++)
 			(*it)->Tickle();
 		break;
@@ -161,7 +161,7 @@ MxResult MxCompositeMediaPresenter::PutData()
 {
 	MxAutoLocker lock(&m_criticalSection);
 
-	if (m_currentTickleState >= TickleState_Streaming && m_currentTickleState <= TickleState_Done) {
+	if (m_currentTickleState >= e_streaming && m_currentTickleState <= e_done) {
 		for (MxCompositePresenterList::iterator it = m_list.begin(); it != m_list.end(); it++)
 			(*it)->PutData();
 	}
diff --git a/LEGO1/lego/legoomni/src/control/legocontrolmanager.cpp b/LEGO1/lego/legoomni/src/control/legocontrolmanager.cpp
index 24e3cb1b..64c19cd5 100644
--- a/LEGO1/lego/legoomni/src/control/legocontrolmanager.cpp
+++ b/LEGO1/lego/legoomni/src/control/legocontrolmanager.cpp
@@ -30,6 +30,11 @@ void LegoControlManager::Unregister(MxCore* p_listener)
 	// TODO
 }
 
+// STUB: LEGO1 0x100293c0
+void LegoControlManager::FUN_100293c0(undefined4, const MxAtomId&, undefined2)
+{
+}
+
 // STUB: LEGO1 0x10029600
 MxResult LegoControlManager::Tickle()
 {
diff --git a/LEGO1/lego/legoomni/src/control/mxcontrolpresenter.cpp b/LEGO1/lego/legoomni/src/control/mxcontrolpresenter.cpp
index 9a5975cf..7a204a78 100644
--- a/LEGO1/lego/legoomni/src/control/mxcontrolpresenter.cpp
+++ b/LEGO1/lego/legoomni/src/control/mxcontrolpresenter.cpp
@@ -53,7 +53,7 @@ MxResult MxControlPresenter::StartAction(MxStreamController* p_controller, MxDSA
 {
 	MxResult result = MxCompositePresenter::StartAction(p_controller, p_action);
 
-	FUN_100b7220(m_action, MxDSAction::Flag_World | MxDSAction::Flag_Looping, TRUE);
+	FUN_100b7220(m_action, MxDSAction::c_world | MxDSAction::c_looping, TRUE);
 	ParseExtra();
 
 	MxS16 i = 0;
@@ -64,7 +64,7 @@ MxResult MxControlPresenter::StartAction(MxStreamController* p_controller, MxDSA
 
 	if (m_unk0x4c == 3) {
 		MxDSAction* action = (*m_list.begin())->GetAction();
-		action->SetFlags(action->GetFlags() | MxDSAction::Flag_Bit11);
+		action->SetFlags(action->GetFlags() | MxDSAction::c_bit11);
 	}
 
 	TickleManager()->RegisterClient(this, 200);
@@ -106,7 +106,7 @@ void MxControlPresenter::ReadyTickle()
 {
 	MxPresenter::ParseExtra();
 	TickleManager()->UnregisterClient(this);
-	ProgressTickleState(TickleState_Repeating);
+	ProgressTickleState(e_repeating);
 }
 
 // STUB: LEGO1 0x10044640
diff --git a/LEGO1/lego/legoomni/src/entity/legoactorpresenter.cpp b/LEGO1/lego/legoomni/src/entity/legoactorpresenter.cpp
index f6b6be7f..927677fe 100644
--- a/LEGO1/lego/legoomni/src/entity/legoactorpresenter.cpp
+++ b/LEGO1/lego/legoomni/src/entity/legoactorpresenter.cpp
@@ -12,7 +12,7 @@ void LegoActorPresenter::ReadyTickle()
 			SetEntityLocation(m_action->GetLocation(), m_action->GetDirection(), m_action->GetUp());
 			m_entity->Create(*m_action);
 		}
-		ProgressTickleState(TickleState_Starting);
+		ProgressTickleState(e_starting);
 	}
 }
 
@@ -20,7 +20,7 @@ void LegoActorPresenter::ReadyTickle()
 void LegoActorPresenter::StartingTickle()
 {
 	if (m_entity->GetROI()) {
-		ProgressTickleState(TickleState_Streaming);
+		ProgressTickleState(e_streaming);
 		ParseExtra();
 	}
 }
diff --git a/LEGO1/lego/legoomni/src/entity/legoentity.cpp b/LEGO1/lego/legoomni/src/entity/legoentity.cpp
index b4615704..f581389d 100644
--- a/LEGO1/lego/legoomni/src/entity/legoentity.cpp
+++ b/LEGO1/lego/legoomni/src/entity/legoentity.cpp
@@ -20,7 +20,7 @@ void LegoEntity::Init()
 	m_actionArgString = NULL;
 	m_unk0x10 = 0;
 	m_flags = 0;
-	m_actionType = ExtraActionType_unknown;
+	m_actionType = Extra::ActionType::e_unknown;
 	m_actionArgNumber = -1;
 	m_unk0x59 = 4;
 }
@@ -50,7 +50,7 @@ MxResult LegoEntity::Create(MxDSAction& p_dsAction)
 void LegoEntity::Destroy(MxBool p_fromDestructor)
 {
 	if (m_roi) {
-		if (m_flags & Flag_Bit1) {
+		if (m_flags & c_bit1) {
 			if (m_roi->GetUnknown0x104() == this)
 				m_roi->SetUnknown0x104(NULL);
 
@@ -108,13 +108,13 @@ void LegoEntity::ParseAction(char* p_extra)
 	if (KeyValueStringParse(actionValue, g_strACTION, copy)) {
 		m_actionType = MatchActionString(strtok(actionValue, g_parseExtraTokens));
 
-		if (m_actionType != ExtraActionType_exit) {
+		if (m_actionType != Extra::ActionType::e_exit) {
 			char* token = strtok(NULL, g_parseExtraTokens);
 
 			m_actionArgString = new char[strlen(token) + 1];
 			strcpy(m_actionArgString, token);
 
-			if (m_actionType != ExtraActionType_run) {
+			if (m_actionType != Extra::ActionType::e_run) {
 				m_actionArgNumber = atoi(strtok(NULL, g_parseExtraTokens));
 			}
 		}
diff --git a/LEGO1/lego/legoomni/src/entity/legoentitypresenter.cpp b/LEGO1/lego/legoomni/src/entity/legoentitypresenter.cpp
index 92554b35..0da082cd 100644
--- a/LEGO1/lego/legoomni/src/entity/legoentitypresenter.cpp
+++ b/LEGO1/lego/legoomni/src/entity/legoentitypresenter.cpp
@@ -69,7 +69,7 @@ void LegoEntityPresenter::ReadyTickle()
 			m_entity->SetLocation(m_action->GetLocation(), m_action->GetDirection(), m_action->GetUp(), TRUE);
 			ParseExtra();
 		}
-		ProgressTickleState(TickleState_Starting);
+		ProgressTickleState(e_starting);
 	}
 }
 
diff --git a/LEGO1/lego/legoomni/src/entity/legoworld.cpp b/LEGO1/lego/legoomni/src/entity/legoworld.cpp
index dca2115f..9611713c 100644
--- a/LEGO1/lego/legoomni/src/entity/legoworld.cpp
+++ b/LEGO1/lego/legoomni/src/entity/legoworld.cpp
@@ -62,7 +62,7 @@ MxResult LegoWorld::Create(MxDSAction& p_dsAction)
 	if (!VTable0x54())
 		return FAILURE;
 
-	if (p_dsAction.GetFlags() & MxDSAction::Flag_Enabled) {
+	if (p_dsAction.GetFlags() & MxDSAction::c_enabled) {
 		if (GetCurrentWorld()) {
 			GetCurrentWorld()->VTable0x68(0);
 		}
@@ -151,6 +151,12 @@ void LegoWorld::EndAction(MxCore* p_object)
 {
 }
 
+// STUB: LEGO1 0x100213a0
+MxPresenter* LegoWorld::FindPresenter(const char* p_presenter, const char* p_name)
+{
+	return NULL;
+}
+
 // STUB: LEGO1 0x10021a70
 void LegoWorld::VTable0x68(MxBool p_add)
 {
diff --git a/LEGO1/lego/legoomni/src/entity/legoworldpresenter.cpp b/LEGO1/lego/legoomni/src/entity/legoworldpresenter.cpp
index d501e191..180c86e8 100644
--- a/LEGO1/lego/legoomni/src/entity/legoworldpresenter.cpp
+++ b/LEGO1/lego/legoomni/src/entity/legoworldpresenter.cpp
@@ -91,7 +91,7 @@ MxResult LegoWorldPresenter::StartAction(MxStreamController* p_controller, MxDSA
 			if (presenter && presenter->AddToManager() == SUCCESS) {
 				presenter->SetCompositePresenter(this);
 				if (presenter->StartAction(p_controller, action) == SUCCESS) {
-					presenter->SetTickleState(TickleState_Idle);
+					presenter->SetTickleState(e_idle);
 					success = TRUE;
 				}
 			}
@@ -123,7 +123,7 @@ void LegoWorldPresenter::ReadyTickle()
 	}
 
 	ParseExtra();
-	ProgressTickleState(TickleState_Starting);
+	ProgressTickleState(e_starting);
 }
 
 // FUNCTION: LEGO1 0x10066ac0
@@ -131,19 +131,19 @@ void LegoWorldPresenter::StartingTickle()
 {
 	if (m_action->IsA("MxDSSerialAction")) {
 		MxPresenter* presenter = *m_list.begin();
-		if (presenter->GetCurrentTickleState() == TickleState_Idle) {
-			presenter->SetTickleState(TickleState_Ready);
+		if (presenter->GetCurrentTickleState() == e_idle) {
+			presenter->SetTickleState(e_ready);
 		}
 	}
 	else {
 		for (MxCompositePresenterList::iterator it = m_list.begin(); it != m_list.end(); it++) {
-			if ((*it)->GetCurrentTickleState() == TickleState_Idle) {
-				(*it)->SetTickleState(TickleState_Ready);
+			if ((*it)->GetCurrentTickleState() == e_idle) {
+				(*it)->SetTickleState(e_ready);
 			}
 		}
 	}
 
-	ProgressTickleState(TickleState_Streaming);
+	ProgressTickleState(e_streaming);
 }
 
 // FUNCTION: LEGO1 0x10067a70
@@ -152,7 +152,7 @@ void LegoWorldPresenter::VTable0x60(MxPresenter* p_presenter)
 	MxCompositePresenter::VTable0x60(p_presenter);
 	MxDSAction* action = p_presenter->GetAction();
 
-	if (action->GetDuration() != -1 && (action->GetFlags() & MxDSAction::Flag_Looping) == 0) {
+	if (action->GetDuration() != -1 && (action->GetFlags() & MxDSAction::c_looping) == 0) {
 		if (!action->IsA("MxDSMediaAction")) {
 			return;
 		}
diff --git a/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp b/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp
index 9201adf9..e64d40df 100644
--- a/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp
+++ b/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp
@@ -1,9 +1,49 @@
 #include "infocenter.h"
 
-// STUB: LEGO1 0x1006ea20
+#include "infocenterstate.h"
+#include "legocontrolmanager.h"
+#include "legogamestate.h"
+#include "legoinputmanager.h"
+#include "legoomni.h"
+#include "legoutil.h"
+#include "legovideomanager.h"
+#include "mxactionnotificationparam.h"
+#include "mxbackgroundaudiomanager.h"
+#include "mxnotificationmanager.h"
+#include "mxstillpresenter.h"
+#include "mxtransitionmanager.h"
+
+DECOMP_SIZE_ASSERT(Infocenter, 0x1d8)
+DECOMP_SIZE_ASSERT(InfocenterUnkDataEntry, 0x18)
+
+// GLOBAL: LEGO1 0x100f76a0
+const char* g_object2x4red = "2x4red";
+
+// GLOBAL: LEGO1 0x100f76a4
+const char* g_object2x4grn = "2x4grn";
+
+// FUNCTION: LEGO1 0x1006ea20
 Infocenter::Infocenter()
 {
-	// TODO
+	m_unk0xfc = 0;
+	m_unk0x11c = 0;
+	m_infocenterState = NULL;
+	m_unk0x1cc = 0;
+	m_unk0x11c = 0;
+	m_unk0x104 = 0;
+	m_currentInfomainScript = c_noInfomain;
+	m_currentIntroScript = e_noIntro;
+
+	memset(&m_entries, 0, sizeof(InfocenterUnkDataEntry) * 7);
+
+	m_unk0x1c8 = -1;
+	SetAppCursor(1);
+	NotificationManager()->Register(this);
+
+	m_unk0x1d0 = 0;
+	m_unk0x1d2 = 0;
+	m_unk0x1d4 = 0;
+	m_unk0x1d6 = 0;
 }
 
 // STUB: LEGO1 0x1006ec90
@@ -15,33 +55,421 @@ Infocenter::~Infocenter()
 // STUB: LEGO1 0x1006ed90
 MxResult Infocenter::Create(MxDSAction& p_dsAction)
 {
-	return FAILURE;
+	if (LegoWorld::Create(p_dsAction) == SUCCESS) {
+		InputManager()->SetWorld(this);
+		ControlManager()->Register(this);
+	}
+
+	LegoGameState* gs = GameState();
+	m_infocenterState = (InfocenterState*) gs->GetState("InfocenterState");
+	if (!m_infocenterState) {
+		m_infocenterState = (InfocenterState*) gs->CreateState("InfocenterState");
+		m_infocenterState->SetUnknown0x74(3);
+	}
+	else {
+		// TODO
+	}
+
+	// TODO
+	InputManager()->Register(this);
+	SetIsWorldActive(FALSE);
+	return SUCCESS;
 }
 
-// STUB: LEGO1 0x1006ef10
+// FUNCTION: LEGO1 0x1006ef10
 MxLong Infocenter::Notify(MxParam& p_param)
 {
-	// TODO
-	return 0;
+	MxLong result = 0;
+	LegoWorld::Notify(p_param);
+
+	if (m_worldStarted) {
+		switch (((MxNotificationParam&) p_param).GetNotification()) {
+		case c_notificationType0:
+			result = HandleNotification0(p_param);
+			break;
+		case c_notificationEndAction:
+			result = HandleEndAction(p_param);
+			break;
+		case c_notificationKeyPress:
+			result = HandleKeyPress(((LegoEventNotificationParam&) p_param).GetKey());
+			break;
+		case c_notificationButtonUp:
+			result = HandleButtonUp(
+				((LegoEventNotificationParam&) p_param).GetX(),
+				((LegoEventNotificationParam&) p_param).GetY()
+			);
+			break;
+		case c_notificationMouseMove:
+			result = HandleMouseMove(
+				((LegoEventNotificationParam&) p_param).GetX(),
+				((LegoEventNotificationParam&) p_param).GetY()
+			);
+			break;
+		case c_notificationType17:
+			result = HandleNotification17(p_param);
+			break;
+		case c_notificationTransitioned:
+			StopBookAnimation();
+			m_unk0x1d2 = 0;
+
+			if (m_infocenterState->GetUnknown0x74() == 0xc) {
+				StartCredits();
+				m_infocenterState->SetUnknown0x74(0xd);
+			}
+			else if (m_unk0x104 != 0) {
+				BackgroundAudioManager()->RaiseVolume();
+				GameState()->HandleAction(m_unk0x104);
+				m_unk0x104 = 0;
+			}
+			break;
+		}
+	}
+
+	return result;
+}
+
+// FUNCTION: LEGO1 0x1006f080
+MxLong Infocenter::HandleEndAction(MxParam& p_param)
+{
+	MxDSAction* action = ((MxEndActionNotificationParam&) p_param).GetAction();
+	if (action->GetAtomId() == *g_creditsScript && action->GetObjectId() == 499) {
+		Lego()->CloseMainWindow();
+		return 1;
+	}
+
+	if (action->GetAtomId() == m_atom &&
+		(action->GetObjectId() == 40 || action->GetObjectId() == 41 || action->GetObjectId() == 42 ||
+		 action->GetObjectId() == 43 || action->GetObjectId() == 44)) {
+		if (m_unk0x1d4) {
+			m_unk0x1d4--;
+		}
+
+		if (!m_unk0x1d4) {
+			PlayMusic(11);
+			GameState()->FUN_10039780(m_unk0xfc);
+
+			switch (m_unk0xfc) {
+			case 1:
+				PlayDialogue(c_pepperCharacterSelect);
+				break;
+			case 2:
+				PlayDialogue(c_mamaCharacterSelect);
+				break;
+			case 3:
+				PlayDialogue(c_papaCharacterSelect);
+				break;
+			case 4:
+				PlayDialogue(c_officierCharacterSelect);
+				break;
+			case 5:
+				PlayDialogue(c_loraCharacterSelect);
+				break;
+			default:
+				break;
+			}
+
+			FUN_10070dc0(TRUE);
+		}
+	}
+
+	MxLong result = m_radio.Notify(p_param);
+
+	if (result || (action->GetAtomId() != m_atom && action->GetAtomId() != *g_introScript))
+		return result;
+
+	if (action->GetObjectId() == c_returnBack) {
+		ControlManager()->FUN_100293c0(0x10, action->GetAtomId(), 0);
+		m_unk0x1d6 = 0;
+	}
+
+	switch (m_infocenterState->GetUnknown0x74()) {
+	case 0:
+		switch (m_currentIntroScript) {
+		case e_legoMovie:
+			PlayCutscene(e_mindscapeMovie, FALSE);
+			return 1;
+		case e_mindscapeMovie:
+			PlayCutscene(e_introMovie, TRUE);
+			return 1;
+		case e_badEndMovie:
+			StopCutscene();
+			m_infocenterState->SetUnknown0x74(11);
+			PlayDialogue(c_badEndingDialogue);
+			m_currentIntroScript = e_noIntro;
+			return 1;
+		case e_goodEndMovie:
+			StopCutscene();
+			m_infocenterState->SetUnknown0x74(11);
+			PlayDialogue(c_goodEndingDialogue);
+			m_currentIntroScript = e_noIntro;
+			return 1;
+		}
+
+		// default / 2nd case probably?
+		StopCutscene();
+		m_infocenterState->SetUnknown0x74(11);
+		PlayDialogue(c_welcomeDialogue);
+		m_currentIntroScript = e_noIntro;
+
+		if (m_infocenterState->GetInfocenterBufferElement(0) == 0) {
+			m_unk0x1d2 = 1;
+			return 1;
+		}
+		break;
+	case 1:
+		m_infocenterState->SetUnknown0x74(11);
+
+		switch (m_currentIntroScript) {
+		case e_badEndMovie:
+			PlayDialogue(c_badEndingDialogue);
+			break;
+		case e_goodEndMovie:
+			PlayDialogue(c_goodEndingDialogue);
+			break;
+		default:
+			PlayDialogue(c_welcomeDialogue);
+		}
+
+		m_currentIntroScript = e_noIntro;
+		return 1;
+	case 2:
+		FUN_10015860(g_object2x4red, 0);
+		FUN_10015860(g_object2x4grn, 0);
+		BackgroundAudioManager()->RaiseVolume();
+		return 1;
+	case 4:
+		if (action->GetObjectId() == 70 || action->GetObjectId() == 71) {
+			TransitionManager()->StartTransition(MxTransitionManager::e_pixelation, 50, FALSE, FALSE);
+			m_infocenterState->SetUnknown0x74(14);
+			return 1;
+		}
+		break;
+	case 5:
+		if (action->GetObjectId() == m_currentInfomainScript) {
+			if (GameState()->GetUnknown10() != 2 && m_unk0xfc != 0) {
+				GameState()->FUN_10039780(m_unk0xfc);
+			}
+			TransitionManager()->StartTransition(MxTransitionManager::e_pixelation, 50, FALSE, FALSE);
+			m_infocenterState->SetUnknown0x74(14);
+			return 1;
+		}
+		break;
+	case 11:
+		if (m_infocenterState->GetInfocenterBufferElement(0) == 0 && m_currentInfomainScript != 40 &&
+			m_currentInfomainScript != 41 && m_currentInfomainScript != 42 && m_currentInfomainScript != 43 &&
+			m_currentInfomainScript != 44) {
+			m_unk0x1d0 = 1;
+			PlayMusic(11);
+		}
+
+		m_infocenterState->SetUnknown0x74(2);
+		FUN_10015860("infoman", 1);
+		return 1;
+	case 12:
+		if (action->GetObjectId() == m_currentInfomainScript) {
+			TransitionManager()->StartTransition(MxTransitionManager::e_pixelation, 50, FALSE, FALSE);
+		}
+	}
+
+	result = 1;
+
+	return result;
 }
 
 // STUB: LEGO1 0x1006f4e0
 void Infocenter::VTable0x50()
 {
-	// TODO
+	m_unk0x1d0 = 0;
+	m_unk0x1d2 = 0;
+	m_unk0x1d4 = 0;
+	m_unk0x1d6 = 0;
+
+	MxStillPresenter* bg = (MxStillPresenter*) FindPresenter("MxStillPresenter", "Background_Bitmap");
+	MxStillPresenter* bgRed = (MxStillPresenter*) FindPresenter("MxStillPresenter", "BackgroundRed_Bitmap");
+
+	switch (GameState()->GetUnknown10()) {
+	case 0:
+		// bg->Enable(1); // TODO: Uncomment once LegoWorld::FindPresenter and LegoWorld::VTable0x58 are implemented.
+		InitializeBitmaps();
+		switch (m_infocenterState->GetUnknown0x74()) {
+		case 3:
+			PlayCutscene(e_legoMovie, TRUE);
+			m_infocenterState->SetUnknown0x74(0);
+			return;
+		case 4:
+			m_infocenterState->SetUnknown0x74(2);
+			if (m_infocenterState->GetInfocenterBufferElement(0) == 0) {
+				m_unk0x1d2 = 1;
+			}
+
+			PlayDialogue(c_letsGetStarted);
+			PlayMusic(11);
+			FUN_10015820(0, 7);
+			return;
+		default:
+			PlayMusic(11);
+			// TODO
+			break;
+		case 8:
+			PlayMusic(11);
+			PlayDialogue(c_exitConfirmation);
+			FUN_10015820(0, 7);
+			return;
+		case 0xf:
+			if (m_infocenterState->GetInfocenterBufferElement(0) == 0) {
+				m_unk0x1d2 = 1;
+			}
+
+			PlayDialogue(c_randomDialogue1);
+			PlayMusic(11);
+			FUN_10015820(0, 7);
+			return;
+		}
+		break;
+	case 1:
+		// TODO
+		break;
+	case 2:
+		// TODO
+		break;
+	default:
+		m_infocenterState->SetUnknown0x74(11);
+		FUN_10015820(0, 7);
+		return;
+	}
 }
 
-// STUB: LEGO1 0x10070aa0
+// STUB: LEGO1 0x1006f9a0
+void Infocenter::InitializeBitmaps()
+{
+	// TODO: Infocenter class size is wrong
+}
+
+// STUB: LEGO1 0x1006fd00
+MxU8 Infocenter::HandleMouseMove(MxS32 p_x, MxS32 p_y)
+{
+	return 1;
+}
+
+// FUNCTION: LEGO1 0x1006fda0
+MxLong Infocenter::HandleKeyPress(MxS8 p_key)
+{
+	MxLong result = 0;
+
+	if (p_key == ' ' && m_worldStarted) {
+		switch (m_infocenterState->GetUnknown0x74()) {
+		case 0:
+			StopCutscene();
+			m_infocenterState->SetUnknown0x74(1);
+
+			if (m_infocenterState->GetInfocenterBufferElement(0) == 0) {
+				m_unk0x1d2 = 1;
+				return 1;
+			}
+			break;
+		case 1:
+		case 4:
+			break;
+		default: {
+			InfomainScript script = m_currentInfomainScript;
+			StopCurrentDialogue();
+
+			switch (m_infocenterState->GetUnknown0x74()) {
+			case 5:
+			case 12:
+				m_currentInfomainScript = script;
+				return 1;
+			default:
+				m_infocenterState->SetUnknown0x74(2);
+				return 1;
+			case 8:
+			case 11:
+				break;
+			}
+		}
+		case 13:
+			StopCredits();
+			break;
+		}
+
+		result = 1;
+	}
+
+	return result;
+}
+
+// STUB: LEGO1 0x1006feb0
+MxU8 Infocenter::HandleButtonUp(MxS32 p_x, MxS32 p_y)
+{
+	return 1;
+}
+
+// STUB: LEGO1 0x10070370
+MxU8 Infocenter::HandleNotification17(MxParam&)
+{
+	return 1;
+}
+
+// STUB: LEGO1 0x10070870
+MxLong Infocenter::HandleNotification0(MxParam&)
+{
+	return 1;
+}
+
+// FUNCTION: LEGO1 0x10070aa0
 void Infocenter::VTable0x68(MxBool p_add)
 {
-	// TODO
+	LegoWorld::VTable0x68(p_add);
+
+	if (p_add) {
+		InputManager()->SetWorld(this);
+		SetIsWorldActive(FALSE);
+	}
+	else {
+		if (InputManager()->GetWorld() == this) {
+			InputManager()->ClearWorld();
+		}
+	}
 }
 
 // STUB: LEGO1 0x10070af0
 MxResult Infocenter::Tickle()
 {
 	// TODO
-	return 0;
+	return LegoWorld::Tickle();
+}
+
+// FUNCTION: LEGO1 0x10070c20
+void Infocenter::PlayCutscene(IntroScript p_entityId, MxBool p_scale)
+{
+	m_currentIntroScript = p_entityId;
+
+	VideoManager()->EnableFullScreenMovie(TRUE, p_scale);
+	InputManager()->SetUnknown336(TRUE);
+	InputManager()->SetUnknown335(TRUE);
+	SetAppCursor(0xb); // Hide cursor
+	VideoManager()->GetDisplaySurface()->ClearScreen();
+
+	if (m_currentIntroScript != e_noIntro) {
+		// check if the cutscene is not an ending
+		if (m_currentIntroScript >= e_badEndMovie && m_currentIntroScript <= e_goodEndMovie) {
+			FUN_10070e90();
+		}
+		InvokeAction(Extra::ActionType::e_opendisk, *g_introScript, m_currentIntroScript, NULL);
+	}
+}
+
+// FUNCTION: LEGO1 0x10070cb0
+void Infocenter::StopCutscene()
+{
+	if (m_currentIntroScript != e_noIntro) {
+		InvokeAction(Extra::ActionType::e_close, *g_introScript, m_currentIntroScript, NULL);
+	}
+
+	VideoManager()->EnableFullScreenMovie(FALSE);
+	InputManager()->SetUnknown335(FALSE);
+	SetAppCursor(0); // Restore cursor to arrow
+	FUN_10015820(0, 7);
 }
 
 // FUNCTION: LEGO1 0x10070d00
@@ -50,8 +478,79 @@ MxBool Infocenter::VTable0x5c()
 	return TRUE;
 }
 
+// STUB: LEGO1 0x10070dc0
+void Infocenter::FUN_10070dc0(MxBool)
+{
+}
+
+// STUB: LEGO1 0x10070e90
+void Infocenter::FUN_10070e90()
+{
+}
+
 // STUB: LEGO1 0x10070f60
 MxBool Infocenter::VTable0x64()
 {
 	return FALSE;
 }
+
+// STUB: LEGO1 0x10071030
+void Infocenter::StartCredits()
+{
+	// TODO
+}
+
+// FUNCTION: LEGO1 0x10071250
+void Infocenter::StopCredits()
+{
+	MxDSAction action;
+	action.SetObjectId(499);
+	action.SetAtomId(*g_creditsScript);
+	action.SetUnknown24(-2);
+	DeleteObject(action);
+}
+
+// FUNCTION: LEGO1 0x10071300
+void Infocenter::PlayDialogue(InfomainScript p_objectId)
+{
+	MxDSAction action;
+	action.SetObjectId(p_objectId);
+	action.SetAtomId(*g_infomainScript);
+	StopCurrentDialogue();
+
+	m_currentInfomainScript = p_objectId;
+	BackgroundAudioManager()->LowerVolume();
+	Start(&action);
+}
+
+// FUNCTION: LEGO1 0x100713d0
+void Infocenter::StopCurrentDialogue()
+{
+	if (m_currentInfomainScript != c_noInfomain) {
+		MxDSAction action;
+		action.SetObjectId(m_currentInfomainScript);
+		action.SetAtomId(*g_infomainScript);
+		action.SetUnknown24(-2);
+		DeleteObject(action);
+		m_currentInfomainScript = c_noInfomain;
+	}
+}
+
+// FUNCTION: LEGO1 0x100714a0
+void Infocenter::PlayBookAnimation()
+{
+	MxDSAction action;
+	action.SetObjectId(c_bookWig);
+	action.SetAtomId(*g_sndAnimScript);
+	Start(&action);
+}
+
+// FUNCTION: LEGO1 0x10071550
+void Infocenter::StopBookAnimation()
+{
+	MxDSAction action;
+	action.SetObjectId(c_bookWig);
+	action.SetAtomId(*g_sndAnimScript);
+	action.SetUnknown24(-2);
+	DeleteObject(action);
+}
diff --git a/LEGO1/lego/legoomni/src/infocenter/infocenterstate.cpp b/LEGO1/lego/legoomni/src/infocenter/infocenterstate.cpp
index 47a31fbb..96e47c55 100644
--- a/LEGO1/lego/legoomni/src/infocenter/infocenterstate.cpp
+++ b/LEGO1/lego/legoomni/src/infocenter/infocenterstate.cpp
@@ -6,6 +6,7 @@ DECOMP_SIZE_ASSERT(InfocenterState, 0x94);
 InfocenterState::InfocenterState()
 {
 	// TODO
+	memset(m_buffer, 0, sizeof(m_buffer));
 }
 
 // STUB: LEGO1 0x10071920
diff --git a/LEGO1/lego/legoomni/src/infocenter/score.cpp b/LEGO1/lego/legoomni/src/infocenter/score.cpp
index 91cfedd6..ce593ac1 100644
--- a/LEGO1/lego/legoomni/src/infocenter/score.cpp
+++ b/LEGO1/lego/legoomni/src/infocenter/score.cpp
@@ -90,10 +90,10 @@ MxLong Score::Notify(MxParam& p_param)
 				DeleteScript(); // Shutting down
 			ret = 1;
 			break;
-		case TYPE17:
+		case c_notificationType17:
 			ret = FUN_100016d0((MxType17NotificationParam&) p_param);
 			break;
-		case MXTRANSITIONMANAGER_TRANSITIONENDED:
+		case c_notificationTransitioned:
 			DeleteObjects(g_infoscorScript, 7, 9);
 			if (m_unk0xf8)
 				GameState()->HandleAction(m_unk0xf8);
@@ -116,7 +116,7 @@ MxLong Score::FUN_10001510(MxEndActionNotificationParam& p_param)
 		switch (action->GetObjectId()) {
 		case 10:
 			m_unk0xf8 = 0x38;
-			TransitionManager()->StartTransition(MxTransitionManager::PIXELATION, 0x32, 0, 0);
+			TransitionManager()->StartTransition(MxTransitionManager::e_pixelation, 0x32, 0, 0);
 			break;
 		case 0x1f5:
 			PlayMusic(11);
@@ -160,12 +160,12 @@ MxLong Score::FUN_100016d0(MxType17NotificationParam& p_param)
 		case 1:
 			m_unk0xf8 = 2;
 			DeleteScript();
-			TransitionManager()->StartTransition(MxTransitionManager::PIXELATION, 0x32, 0, 0);
+			TransitionManager()->StartTransition(MxTransitionManager::e_pixelation, 0x32, 0, 0);
 			break;
 		case 2:
 			m_unk0xf8 = 3;
 			DeleteScript();
-			TransitionManager()->StartTransition(MxTransitionManager::PIXELATION, 0x32, 0, 0);
+			TransitionManager()->StartTransition(MxTransitionManager::e_pixelation, 0x32, 0, 0);
 			break;
 		case 3: {
 			LegoInputManager* im = InputManager();
diff --git a/LEGO1/lego/legoomni/src/isle/isle.cpp b/LEGO1/lego/legoomni/src/isle/isle.cpp
index e2aca2cf..0da6189f 100644
--- a/LEGO1/lego/legoomni/src/isle/isle.cpp
+++ b/LEGO1/lego/legoomni/src/isle/isle.cpp
@@ -115,10 +115,10 @@ MxLong Isle::Notify(MxParam& p_param)
 				break;
 			}
 			break;
-		case TYPE17:
+		case c_notificationType17:
 			result = HandleType17Notification(p_param);
 			break;
-		case TYPE18:
+		case c_notificationType18:
 			switch (m_act1state->GetUnknown18()) {
 			case 4:
 				result = GetCurrentVehicle()->Notify(p_param);
@@ -131,13 +131,13 @@ MxLong Isle::Notify(MxParam& p_param)
 				break;
 			}
 			break;
-		case TYPE19:
+		case c_notificationType19:
 			result = HandleType19Notification(p_param);
 			break;
-		case TYPE20:
+		case c_notificationType20:
 			VTable0x68(TRUE);
 			break;
-		case MXTRANSITIONMANAGER_TRANSITIONENDED:
+		case c_notificationTransitioned:
 			result = HandleTransitionEnd();
 			break;
 		}
diff --git a/LEGO1/lego/legoomni/src/main/legoomni.cpp b/LEGO1/lego/legoomni/src/main/legoomni.cpp
index dfc42bb4..a14e3cec 100644
--- a/LEGO1/lego/legoomni/src/main/legoomni.cpp
+++ b/LEGO1/lego/legoomni/src/main/legoomni.cpp
@@ -212,6 +212,12 @@ void FUN_10015820(MxU32, MxU32)
 	// TODO
 }
 
+// STUB: LEGO1 0x10015860
+void FUN_10015860(const char*, MxU8)
+{
+	// TODO
+}
+
 // FUNCTION: LEGO1 0x100158c0
 LegoEntity* FindEntityByAtomIdOrEntityId(const MxAtomId& p_atom, MxS32 p_entityid)
 {
@@ -293,34 +299,34 @@ LegoEntity* PickEntity(MxLong, MxLong)
 // FUNCTION: LEGO1 0x100528e0
 void RegisterScripts()
 {
-	g_copterScript = new MxAtomId("\\lego\\scripts\\build\\copter", LookupMode_LowerCase2);
-	g_dunecarScript = new MxAtomId("\\lego\\scripts\\build\\dunecar", LookupMode_LowerCase2);
-	g_jetskiScript = new MxAtomId("\\lego\\scripts\\build\\jetski", LookupMode_LowerCase2);
-	g_racecarScript = new MxAtomId("\\lego\\scripts\\build\\racecar", LookupMode_LowerCase2);
-	g_carraceScript = new MxAtomId("\\lego\\scripts\\race\\carrace", LookupMode_LowerCase2);
-	g_carracerScript = new MxAtomId("\\lego\\scripts\\race\\carracer", LookupMode_LowerCase2);
-	g_jetraceScript = new MxAtomId("\\lego\\scripts\\race\\jetrace", LookupMode_LowerCase2);
-	g_jetracerScript = new MxAtomId("\\lego\\scripts\\race\\jetracer", LookupMode_LowerCase2);
-	g_isleScript = new MxAtomId("\\lego\\scripts\\isle\\isle", LookupMode_LowerCase2);
-	g_elevbottScript = new MxAtomId("\\lego\\scripts\\infocntr\\elevbott", LookupMode_LowerCase2);
-	g_infodoorScript = new MxAtomId("\\lego\\scripts\\infocntr\\infodoor", LookupMode_LowerCase2);
-	g_infomainScript = new MxAtomId("\\lego\\scripts\\infocntr\\infomain", LookupMode_LowerCase2);
-	g_infoscorScript = new MxAtomId("\\lego\\scripts\\infocntr\\infoscor", LookupMode_LowerCase2);
-	g_regbookScript = new MxAtomId("\\lego\\scripts\\infocntr\\regbook", LookupMode_LowerCase2);
-	g_histbookScript = new MxAtomId("\\lego\\scripts\\infocntr\\histbook", LookupMode_LowerCase2);
-	g_hospitalScript = new MxAtomId("\\lego\\scripts\\hospital\\hospital", LookupMode_LowerCase2);
-	g_policeScript = new MxAtomId("\\lego\\scripts\\police\\police", LookupMode_LowerCase2);
-	g_garageScript = new MxAtomId("\\lego\\scripts\\garage\\garage", LookupMode_LowerCase2);
-	g_act2mainScript = new MxAtomId("\\lego\\scripts\\act2\\act2main", LookupMode_LowerCase2);
-	g_act3Script = new MxAtomId("\\lego\\scripts\\act3\\act3", LookupMode_LowerCase2);
-	g_jukeboxScript = new MxAtomId("\\lego\\scripts\\isle\\jukebox", LookupMode_LowerCase2);
-	g_pz5Script = new MxAtomId("\\lego\\scripts\\isle\\pz5", LookupMode_LowerCase2);
-	g_introScript = new MxAtomId("\\lego\\scripts\\intro", LookupMode_LowerCase2);
-	g_testScript = new MxAtomId("\\lego\\scripts\\test\\test", LookupMode_LowerCase2);
-	g_jukeboxwScript = new MxAtomId("\\lego\\scripts\\isle\\jukeboxw", LookupMode_LowerCase2);
-	g_sndAnimScript = new MxAtomId("\\lego\\scripts\\sndanim", LookupMode_LowerCase2);
-	g_creditsScript = new MxAtomId("\\lego\\scripts\\credits", LookupMode_LowerCase2);
-	g_nocdSourceName = new MxAtomId("\\lego\\scripts\\nocd", LookupMode_LowerCase2);
+	g_copterScript = new MxAtomId("\\lego\\scripts\\build\\copter", e_lowerCase2);
+	g_dunecarScript = new MxAtomId("\\lego\\scripts\\build\\dunecar", e_lowerCase2);
+	g_jetskiScript = new MxAtomId("\\lego\\scripts\\build\\jetski", e_lowerCase2);
+	g_racecarScript = new MxAtomId("\\lego\\scripts\\build\\racecar", e_lowerCase2);
+	g_carraceScript = new MxAtomId("\\lego\\scripts\\race\\carrace", e_lowerCase2);
+	g_carracerScript = new MxAtomId("\\lego\\scripts\\race\\carracer", e_lowerCase2);
+	g_jetraceScript = new MxAtomId("\\lego\\scripts\\race\\jetrace", e_lowerCase2);
+	g_jetracerScript = new MxAtomId("\\lego\\scripts\\race\\jetracer", e_lowerCase2);
+	g_isleScript = new MxAtomId("\\lego\\scripts\\isle\\isle", e_lowerCase2);
+	g_elevbottScript = new MxAtomId("\\lego\\scripts\\infocntr\\elevbott", e_lowerCase2);
+	g_infodoorScript = new MxAtomId("\\lego\\scripts\\infocntr\\infodoor", e_lowerCase2);
+	g_infomainScript = new MxAtomId("\\lego\\scripts\\infocntr\\infomain", e_lowerCase2);
+	g_infoscorScript = new MxAtomId("\\lego\\scripts\\infocntr\\infoscor", e_lowerCase2);
+	g_regbookScript = new MxAtomId("\\lego\\scripts\\infocntr\\regbook", e_lowerCase2);
+	g_histbookScript = new MxAtomId("\\lego\\scripts\\infocntr\\histbook", e_lowerCase2);
+	g_hospitalScript = new MxAtomId("\\lego\\scripts\\hospital\\hospital", e_lowerCase2);
+	g_policeScript = new MxAtomId("\\lego\\scripts\\police\\police", e_lowerCase2);
+	g_garageScript = new MxAtomId("\\lego\\scripts\\garage\\garage", e_lowerCase2);
+	g_act2mainScript = new MxAtomId("\\lego\\scripts\\act2\\act2main", e_lowerCase2);
+	g_act3Script = new MxAtomId("\\lego\\scripts\\act3\\act3", e_lowerCase2);
+	g_jukeboxScript = new MxAtomId("\\lego\\scripts\\isle\\jukebox", e_lowerCase2);
+	g_pz5Script = new MxAtomId("\\lego\\scripts\\isle\\pz5", e_lowerCase2);
+	g_introScript = new MxAtomId("\\lego\\scripts\\intro", e_lowerCase2);
+	g_testScript = new MxAtomId("\\lego\\scripts\\test\\test", e_lowerCase2);
+	g_jukeboxwScript = new MxAtomId("\\lego\\scripts\\isle\\jukeboxw", e_lowerCase2);
+	g_sndAnimScript = new MxAtomId("\\lego\\scripts\\sndanim", e_lowerCase2);
+	g_creditsScript = new MxAtomId("\\lego\\scripts\\credits", e_lowerCase2);
+	g_nocdSourceName = new MxAtomId("\\lego\\scripts\\nocd", e_lowerCase2);
 }
 
 // FUNCTION: LEGO1 0x100530c0
@@ -633,7 +639,7 @@ MxEntity* LegoOmni::FindWorld(const char* p_id, MxS32 p_entityId, MxPresenter* p
 {
 	LegoWorld* foundEntity = NULL;
 	if (strcmpi(p_id, g_current)) {
-		foundEntity = (LegoWorld*) FindByEntityIdOrAtomId(MxAtomId(p_id, LookupMode_LowerCase2), p_entityId);
+		foundEntity = (LegoWorld*) FindByEntityIdOrAtomId(MxAtomId(p_id, e_lowerCase2), p_entityId);
 	}
 	else {
 		foundEntity = this->m_currentWorld;
@@ -704,7 +710,7 @@ MxLong LegoOmni::Notify(MxParam& p_param)
 	MxLong result = MxOmni::Notify(p_param);
 	if (isCD) {
 		// Exit the game if nocd.si ended
-		PostMessageA(m_windowHandle, WM_CLOSE, 0, 0);
+		CloseMainWindow();
 	}
 
 	return result;
diff --git a/LEGO1/lego/legoomni/src/paths/legopathpresenter.cpp b/LEGO1/lego/legoomni/src/paths/legopathpresenter.cpp
index b77a832c..48d592a3 100644
--- a/LEGO1/lego/legoomni/src/paths/legopathpresenter.cpp
+++ b/LEGO1/lego/legoomni/src/paths/legopathpresenter.cpp
@@ -61,7 +61,7 @@ void LegoPathPresenter::Destroy()
 void LegoPathPresenter::ReadyTickle()
 {
 	// TODO
-	ProgressTickleState(TickleState_Starting); // Allow initialization process to continue
+	ProgressTickleState(e_starting); // Allow initialization process to continue
 }
 
 // FUNCTION: LEGO1 0x10044d00
@@ -70,8 +70,8 @@ void LegoPathPresenter::StreamingTickle()
 	MxStreamChunk* chunk = m_subscriber->NextChunk();
 
 	if (chunk) {
-		if (chunk->GetFlags() & MxStreamChunk::Flag_End) {
-			ProgressTickleState(TickleState_Repeating);
+		if (chunk->GetFlags() & MxStreamChunk::c_end) {
+			ProgressTickleState(e_repeating);
 		}
 
 		m_subscriber->DestroyChunk(chunk);
diff --git a/LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp b/LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp
index 38d23b52..31fe68b3 100644
--- a/LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp
+++ b/LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp
@@ -114,7 +114,7 @@ void LegoAnimPresenter::ReadyTickle()
 			m_subscriber->DestroyChunk(chunk);
 
 			if (result == SUCCESS) {
-				ProgressTickleState(TickleState_Starting);
+				ProgressTickleState(e_starting);
 				ParseExtra();
 			}
 			else {
@@ -128,7 +128,7 @@ void LegoAnimPresenter::ReadyTickle()
 void LegoAnimPresenter::StartingTickle()
 {
 	// TODO
-	ProgressTickleState(TickleState_Streaming);
+	ProgressTickleState(e_streaming);
 	EndAction(); // Allow game to start
 }
 
@@ -146,7 +146,7 @@ void LegoAnimPresenter::StreamingTickle()
 		}
 	}
 	else {
-		ProgressTickleState(TickleState_Done);
+		ProgressTickleState(e_done);
 		if (m_compositePresenter) {
 			if (m_compositePresenter->IsA("LegoAnimMMPresenter")) {
 				m_compositePresenter->VTable0x60(this);
diff --git a/LEGO1/lego/legoomni/src/video/legometerpresenter.cpp b/LEGO1/lego/legoomni/src/video/legometerpresenter.cpp
index ad9615d8..5be9d0d6 100644
--- a/LEGO1/lego/legoomni/src/video/legometerpresenter.cpp
+++ b/LEGO1/lego/legoomni/src/video/legometerpresenter.cpp
@@ -41,7 +41,7 @@ LegoMeterPresenter::LegoMeterPresenter()
 	m_unk0x6c = 0;
 	m_unk0x84 = 0;
 	m_type = 1;
-	m_flags &= ~Flag_Bit2;
+	m_flags &= ~c_bit2;
 }
 
 // FUNCTION: LEGO1 0x10043780
diff --git a/LEGO1/lego/legoomni/src/video/legomodelpresenter.cpp b/LEGO1/lego/legoomni/src/video/legomodelpresenter.cpp
index c30ae848..4f835212 100644
--- a/LEGO1/lego/legoomni/src/video/legomodelpresenter.cpp
+++ b/LEGO1/lego/legoomni/src/video/legomodelpresenter.cpp
@@ -31,7 +31,7 @@ void LegoModelPresenter::Destroy(MxBool p_fromDestructor)
 void LegoModelPresenter::ReadyTickle()
 {
 	// TODO
-	SetTickleState(TickleState_Starting);
+	SetTickleState(e_starting);
 }
 
 // STUB: LEGO1 0x100801b0
diff --git a/LEGO1/lego/legoomni/src/video/legopalettepresenter.cpp b/LEGO1/lego/legoomni/src/video/legopalettepresenter.cpp
index 53731a1a..ce352f7e 100644
--- a/LEGO1/lego/legoomni/src/video/legopalettepresenter.cpp
+++ b/LEGO1/lego/legoomni/src/video/legopalettepresenter.cpp
@@ -77,7 +77,7 @@ void LegoPalettePresenter::ReadyTickle()
 	if (chunk) {
 		if (chunk->GetTime() <= m_action->GetElapsedTime()) {
 			ParseExtra();
-			ProgressTickleState(TickleState_Starting);
+			ProgressTickleState(e_starting);
 
 			chunk = m_subscriber->NextChunk();
 			MxResult result = ParsePalette(chunk);
diff --git a/LEGO1/lego/legoomni/src/video/legotexturepresenter.cpp b/LEGO1/lego/legoomni/src/video/legotexturepresenter.cpp
index 60a0e81d..e376966f 100644
--- a/LEGO1/lego/legoomni/src/video/legotexturepresenter.cpp
+++ b/LEGO1/lego/legoomni/src/video/legotexturepresenter.cpp
@@ -28,7 +28,7 @@ MxResult LegoTexturePresenter::PutData()
 void LegoTexturePresenter::DoneTickle()
 {
 	if (this->m_compositePresenter && !this->m_compositePresenter->VTable0x64(2)) {
-		SetTickleState(TickleState_Idle);
+		SetTickleState(e_idle);
 		return;
 	}
 
diff --git a/LEGO1/lego/legoomni/src/video/legovideomanager.cpp b/LEGO1/lego/legoomni/src/video/legovideomanager.cpp
index 33ebb53a..eba51d79 100644
--- a/LEGO1/lego/legoomni/src/video/legovideomanager.cpp
+++ b/LEGO1/lego/legoomni/src/video/legovideomanager.cpp
@@ -230,7 +230,7 @@ void LegoVideoManager::MoveCursor(MxS32 p_cursorX, MxS32 p_cursorY)
 MxResult LegoVideoManager::Tickle()
 {
 	if (m_unk0x554 && !m_videoParam.Flags().GetFlipSurfaces() &&
-		TransitionManager()->GetTransitionType() == MxTransitionManager::NOT_TRANSITIONING)
+		TransitionManager()->GetTransitionType() == MxTransitionManager::e_notTransitioning)
 		Sleep(30);
 
 	m_stopWatch->Stop();
@@ -369,7 +369,7 @@ void LegoVideoManager::EnableFullScreenMovie(MxBool p_enable, MxBool p_scale)
 			m_fullScreenMovie = TRUE;
 		}
 		else {
-			m_displaySurface->FUN_100ba640();
+			m_displaySurface->ClearScreen();
 			m_displaySurface->GetVideoParam().Flags().SetF1bit3(FALSE);
 
 			// restore previous pallete
@@ -462,7 +462,7 @@ MxResult LegoVideoManager::ConfigureD3DRM()
 
 	MxAssignedDevice* assignedDevice = m_direct3d->GetAssignedDevice();
 
-	if (assignedDevice && assignedDevice->GetFlags() & MxAssignedDevice::Flag_HardwareMode) {
+	if (assignedDevice && assignedDevice->GetFlags() & MxAssignedDevice::c_hardwareMode) {
 		if (assignedDevice->GetDesc().dpcTriCaps.dwTextureFilterCaps & D3DPTFILTERCAPS_LINEAR)
 			d3drm->SetTextureQuality(D3DRMTEXTURE_LINEAR);
 
diff --git a/LEGO1/lego/legoomni/src/video/mxtransitionmanager.cpp b/LEGO1/lego/legoomni/src/video/mxtransitionmanager.cpp
index cfbe925d..677837bf 100644
--- a/LEGO1/lego/legoomni/src/video/mxtransitionmanager.cpp
+++ b/LEGO1/lego/legoomni/src/video/mxtransitionmanager.cpp
@@ -17,7 +17,7 @@ RECT g_fullScreenRect = {0, 0, 640, 480};
 MxTransitionManager::MxTransitionManager()
 {
 	m_animationTimer = 0;
-	m_transitionType = NOT_TRANSITIONING;
+	m_transitionType = e_notTransitioning;
 	m_ddSurface = NULL;
 	m_waitIndicator = NULL;
 	m_copyBuffer = NULL;
@@ -57,22 +57,22 @@ MxResult MxTransitionManager::Tickle()
 	this->m_systemTime = timeGetTime();
 
 	switch (this->m_transitionType) {
-	case NO_ANIMATION:
+	case e_noAnimation:
 		TransitionNone();
 		break;
-	case DISSOLVE:
+	case e_dissolve:
 		TransitionDissolve();
 		break;
-	case PIXELATION:
+	case e_pixelation:
 		TransitionPixelation();
 		break;
-	case SCREEN_WIPE:
+	case e_screenWipe:
 		TransitionWipe();
 		break;
-	case WINDOWS:
+	case e_windows:
 		TransitionWindows();
 		break;
-	case BROKEN:
+	case e_broken:
 		TransitionBroken();
 		break;
 	}
@@ -87,7 +87,7 @@ MxResult MxTransitionManager::StartTransition(
 	MxBool p_playMusicInAnim
 )
 {
-	if (this->m_transitionType == NOT_TRANSITIONING) {
+	if (this->m_transitionType == e_notTransitioning) {
 		if (!p_playMusicInAnim) {
 			MxBackgroundAudioManager* backgroundAudioManager = BackgroundAudioManager();
 			backgroundAudioManager->Stop();
@@ -102,7 +102,7 @@ MxResult MxTransitionManager::StartTransition(
 
 			MxDSAction* action = m_waitIndicator->GetAction();
 			action->SetLoopCount(10000);
-			action->SetFlags(action->GetFlags() | MxDSAction::Flag_Bit10);
+			action->SetFlags(action->GetFlags() | MxDSAction::c_bit10);
 		}
 
 		MxU32 time = timeGetTime();
@@ -129,8 +129,8 @@ MxResult MxTransitionManager::StartTransition(
 // FUNCTION: LEGO1 0x1004bc30
 void MxTransitionManager::EndTransition(MxBool p_notifyWorld)
 {
-	if (m_transitionType != NOT_TRANSITIONING) {
-		m_transitionType = NOT_TRANSITIONING;
+	if (m_transitionType != e_notTransitioning) {
+		m_transitionType = e_notTransitioning;
 
 		m_copyFlags.m_bit0 = FALSE;
 
@@ -142,11 +142,11 @@ void MxTransitionManager::EndTransition(MxBool p_notifyWorld)
 			if (world) {
 #ifdef COMPAT_MODE
 				{
-					MxNotificationParam param(MXTRANSITIONMANAGER_TRANSITIONENDED, this);
+					MxNotificationParam param(c_notificationTransitioned, this);
 					world->Notify(param);
 				}
 #else
-				world->Notify(MxNotificationParam(MXTRANSITIONMANAGER_TRANSITIONENDED, this));
+				world->Notify(MxNotificationParam(c_notificationTransitioned, this));
 #endif
 			}
 		}
@@ -157,7 +157,7 @@ void MxTransitionManager::EndTransition(MxBool p_notifyWorld)
 void MxTransitionManager::TransitionNone()
 {
 	LegoVideoManager* videoManager = VideoManager();
-	videoManager->GetDisplaySurface()->FUN_100ba640();
+	videoManager->GetDisplaySurface()->ClearScreen();
 	EndTransition(TRUE);
 }
 
@@ -475,7 +475,7 @@ void MxTransitionManager::SetWaitIndicator(MxVideoPresenter* p_waitIndicator)
 {
 	// End current wait indicator
 	if (m_waitIndicator != NULL) {
-		m_waitIndicator->GetAction()->SetFlags(m_waitIndicator->GetAction()->GetFlags() & ~MxDSAction::Flag_World);
+		m_waitIndicator->GetAction()->SetFlags(m_waitIndicator->GetAction()->GetFlags() & ~MxDSAction::c_world);
 		m_waitIndicator->EndAction();
 		m_waitIndicator = NULL;
 	}
@@ -488,7 +488,7 @@ void MxTransitionManager::SetWaitIndicator(MxVideoPresenter* p_waitIndicator)
 		LegoVideoManager* videoManager = VideoManager();
 		videoManager->UnregisterPresenter(*m_waitIndicator);
 
-		if (m_waitIndicator->GetCurrentTickleState() < MxPresenter::TickleState_Streaming) {
+		if (m_waitIndicator->GetCurrentTickleState() < MxPresenter::e_streaming) {
 			m_waitIndicator->Tickle();
 		}
 	}
@@ -542,7 +542,7 @@ void MxTransitionManager::SetupCopyRect(LPDDSURFACEDESC p_ddsc)
 	m_waitIndicator->Tickle();
 
 	// Check if wait indicator has started
-	if (m_waitIndicator->GetCurrentTickleState() >= MxPresenter::TickleState_Streaming) {
+	if (m_waitIndicator->GetCurrentTickleState() >= MxPresenter::e_streaming) {
 		// Setup the copy rect
 		MxU32 copyPitch = (p_ddsc->ddpfPixelFormat.dwRGBBitCount / 8) *
 						  (m_copyRect.right - m_copyRect.left + 1); // This uses m_copyRect, seemingly erroneously
@@ -576,7 +576,7 @@ void MxTransitionManager::SetupCopyRect(LPDDSURFACEDESC p_ddsc)
 	}
 
 	// Setup display surface
-	if ((m_waitIndicator->GetAction()->GetFlags() & MxDSAction::Flag_Bit5) != 0) {
+	if ((m_waitIndicator->GetAction()->GetFlags() & MxDSAction::c_bit5) != 0) {
 		MxDisplaySurface* displaySurface = VideoManager()->GetDisplaySurface();
 		MxBool und = FALSE;
 		displaySurface->VTable0x2c(
diff --git a/LEGO1/mxdirectx/mxdirect3d.cpp b/LEGO1/mxdirectx/mxdirect3d.cpp
index c97ad0a9..b2166ca1 100644
--- a/LEGO1/mxdirectx/mxdirect3d.cpp
+++ b/LEGO1/mxdirectx/mxdirect3d.cpp
@@ -113,7 +113,7 @@ BOOL MxDirect3D::CreateIDirect3D()
 // FUNCTION: LEGO1 0x1009b310
 BOOL MxDirect3D::D3DSetMode()
 {
-	if (m_assignedDevice->m_flags & MxAssignedDevice::Flag_HardwareMode) {
+	if (m_assignedDevice->m_flags & MxAssignedDevice::c_hardwareMode) {
 		if (m_bOnlySoftRender) {
 			Error("Failed to place vital surfaces in video memory for hardware driver", DDERR_GENERIC);
 			return FALSE;
@@ -265,7 +265,7 @@ BOOL MxDirect3D::SetDevice(MxDeviceEnumerate& p_deviceEnumerate, MxDriver* p_dri
 			);
 
 			if (i == 0)
-				assignedDevice->m_flags |= MxAssignedDevice::Flag_PrimaryDevice;
+				assignedDevice->m_flags |= MxAssignedDevice::c_primaryDevice;
 
 			for (list<MxDevice>::iterator it2 = driver.m_devices.begin(); it2 != driver.m_devices.end(); it2++) {
 				MxDevice& device = *it2;
@@ -276,7 +276,7 @@ BOOL MxDirect3D::SetDevice(MxDeviceEnumerate& p_deviceEnumerate, MxDriver* p_dri
 
 				D3DDEVICEDESC* desc;
 				if (device.m_HWDesc.dcmColorModel) {
-					assignedDevice->m_flags |= MxAssignedDevice::Flag_HardwareMode;
+					assignedDevice->m_flags |= MxAssignedDevice::c_hardwareMode;
 					desc = &device.m_HWDesc;
 				}
 				else
diff --git a/LEGO1/mxdirectx/mxdirect3d.h b/LEGO1/mxdirectx/mxdirect3d.h
index ab572c54..09047f0a 100644
--- a/LEGO1/mxdirectx/mxdirect3d.h
+++ b/LEGO1/mxdirectx/mxdirect3d.h
@@ -13,8 +13,8 @@ class MxDirect3D;
 class MxAssignedDevice {
 public:
 	enum {
-		Flag_HardwareMode = 0x01,
-		Flag_PrimaryDevice = 0x02
+		c_hardwareMode = 0x01,
+		c_primaryDevice = 0x02
 	};
 
 	MxAssignedDevice();
diff --git a/LEGO1/omni/include/mxactionnotificationparam.h b/LEGO1/omni/include/mxactionnotificationparam.h
index d4e02124..5628cf7b 100644
--- a/LEGO1/omni/include/mxactionnotificationparam.h
+++ b/LEGO1/omni/include/mxactionnotificationparam.h
@@ -104,7 +104,7 @@ class MxEndActionNotificationParam : public MxActionNotificationParam {
 class MxType4NotificationParam : public MxActionNotificationParam {
 public:
 	inline MxType4NotificationParam(MxCore* p_sender, MxDSAction* p_action, MxPresenter* p_unk0x14)
-		: MxActionNotificationParam(TYPE4, p_sender, p_action, FALSE)
+		: MxActionNotificationParam(c_notificationType4, p_sender, p_action, FALSE)
 	{
 		m_unk0x14 = p_unk0x14;
 	}
diff --git a/LEGO1/omni/include/mxatomid.h b/LEGO1/omni/include/mxatomid.h
index 0573cc84..388ffce3 100644
--- a/LEGO1/omni/include/mxatomid.h
+++ b/LEGO1/omni/include/mxatomid.h
@@ -5,10 +5,10 @@
 #include "mxtypes.h"
 
 enum LookupMode {
-	LookupMode_Exact = 0,
-	LookupMode_LowerCase = 1,
-	LookupMode_UpperCase = 2,
-	LookupMode_LowerCase2 = 3
+	e_exact = 0,
+	e_lowerCase,
+	e_upperCase,
+	e_lowerCase2,
 };
 
 // SIZE 0x04
diff --git a/LEGO1/omni/include/mxdisplaysurface.h b/LEGO1/omni/include/mxdisplaysurface.h
index 25fe95aa..c841fccc 100644
--- a/LEGO1/omni/include/mxdisplaysurface.h
+++ b/LEGO1/omni/include/mxdisplaysurface.h
@@ -85,7 +85,7 @@ class MxDisplaySurface : public MxCore {
 	virtual void ReleaseDC(HDC p_hdc);                                                      // vtable+0x40
 	virtual LPDIRECTDRAWSURFACE VTable0x44(MxBitmap*, undefined4*, undefined4, undefined4); // vtable+0x44
 
-	void FUN_100ba640();
+	void ClearScreen();
 	static LPDIRECTDRAWSURFACE FUN_100bc070();
 
 	inline LPDIRECTDRAWSURFACE GetDirectDrawSurface1() { return this->m_ddSurface1; }
diff --git a/LEGO1/omni/include/mxdsaction.h b/LEGO1/omni/include/mxdsaction.h
index b51c75a2..35abcb81 100644
--- a/LEGO1/omni/include/mxdsaction.h
+++ b/LEGO1/omni/include/mxdsaction.h
@@ -12,16 +12,16 @@ class MxOmni;
 class MxDSAction : public MxDSObject {
 public:
 	enum {
-		Flag_Looping = 0x01,
-		Flag_Bit3 = 0x04,
-		Flag_Bit4 = 0x08,
-		Flag_Bit5 = 0x10,
-		Flag_Enabled = 0x20,
-		Flag_Bit7 = 0x40,
-		Flag_World = 0x80,
-		Flag_Bit9 = 0x100,
-		Flag_Bit10 = 0x200,
-		Flag_Bit11 = 0x400,
+		c_looping = 0x01,
+		c_bit3 = 0x04,
+		c_bit4 = 0x08,
+		c_bit5 = 0x10,
+		c_enabled = 0x20,
+		c_bit7 = 0x40,
+		c_world = 0x80,
+		c_bit9 = 0x100,
+		c_bit10 = 0x200,
+		c_bit11 = 0x400,
 	};
 
 	__declspec(dllexport) MxDSAction();
@@ -72,15 +72,15 @@ class MxDSAction : public MxDSObject {
 	inline MxCore* GetOrigin() { return m_origin; }
 	inline void SetOrigin(MxCore* p_origin) { m_origin = p_origin; }
 
-	inline MxBool IsLooping() const { return m_flags & Flag_Looping; }
-	inline MxBool IsBit3() const { return m_flags & Flag_Bit3; }
+	inline MxBool IsLooping() const { return m_flags & c_looping; }
+	inline MxBool IsBit3() const { return m_flags & c_bit3; }
 
 	inline void CopyFlags(MxU32 p_flags)
 	{
-		if (p_flags & MxDSAction::Flag_Looping)
-			SetFlags(GetFlags() | MxDSAction::Flag_Looping);
-		else if (p_flags & MxDSAction::Flag_Bit3)
-			SetFlags(GetFlags() | MxDSAction::Flag_Bit3);
+		if (p_flags & MxDSAction::c_looping)
+			SetFlags(GetFlags() | MxDSAction::c_looping);
+		else if (p_flags & MxDSAction::c_bit3)
+			SetFlags(GetFlags() | MxDSAction::c_bit3);
 	}
 
 protected:
diff --git a/LEGO1/omni/include/mxdsbuffer.h b/LEGO1/omni/include/mxdsbuffer.h
index 3a336af7..27770f5f 100644
--- a/LEGO1/omni/include/mxdsbuffer.h
+++ b/LEGO1/omni/include/mxdsbuffer.h
@@ -10,17 +10,17 @@ class MxDSStreamingAction;
 class MxStreamChunk;
 class MxDSChunk;
 
-enum MxDSBufferType {
-	MxDSBufferType_Chunk = 0,
-	MxDSBufferType_Allocate = 1,
-	MxDSBufferType_Preallocated = 2,
-	MxDSBufferType_Unknown = 3,
-};
-
 // VTABLE: LEGO1 0x100dcca0
 // SIZE 0x34
 class MxDSBuffer : public MxCore {
 public:
+	enum Type {
+		e_chunk = 0,
+		e_allocate = 1,
+		e_preallocated = 2,
+		e_unknown = 3,
+	};
+
 	MxDSBuffer();
 	virtual ~MxDSBuffer() override;
 
@@ -31,7 +31,7 @@ class MxDSBuffer : public MxCore {
 		return "MxDSBuffer";
 	}
 
-	MxResult AllocateBuffer(MxU32 p_bufferSize, MxDSBufferType p_mode);
+	MxResult AllocateBuffer(MxU32 p_bufferSize, Type p_mode);
 	MxResult SetBufferPointer(MxU8* p_buffer, MxU32 p_size);
 	MxResult FUN_100c67b0(
 		MxStreamController* p_controller,
@@ -67,12 +67,12 @@ class MxDSBuffer : public MxCore {
 	inline MxU8** GetBufferRef() { return &m_pBuffer; }
 	inline undefined4 GetUnknown14() { return m_unk0x14; }
 	inline MxU16 GetRefCount() { return m_refcount; }
-	inline MxDSBufferType GetMode() { return m_mode; }
+	inline Type GetMode() { return m_mode; }
 	inline MxU32 GetWriteOffset() { return m_writeOffset; }
 	inline MxU32 GetBytesRemaining() { return m_bytesRemaining; }
 	inline void SetUnknown14(undefined4 p_unk0x14) { m_unk0x14 = p_unk0x14; }
 	inline void SetUnknown1c(undefined4 p_unk0x1c) { m_unk0x1c = p_unk0x1c; }
-	inline void SetMode(MxDSBufferType p_mode) { m_mode = p_mode; }
+	inline void SetMode(Type p_mode) { m_mode = p_mode; }
 	inline void SetUnk30(MxDSStreamingAction* p_unk0x30) { m_unk0x30 = p_unk0x30; }
 
 private:
@@ -83,7 +83,7 @@ class MxDSBuffer : public MxCore {
 	undefined4 m_unk0x18;           // 0x18
 	undefined4 m_unk0x1c;           // 0x1c
 	MxU16 m_refcount;               // 0x20
-	MxDSBufferType m_mode;          // 0x24
+	Type m_mode;                    // 0x24
 	MxU32 m_writeOffset;            // 0x28
 	MxU32 m_bytesRemaining;         // 0x2c
 	MxDSStreamingAction* m_unk0x30; // 0x30
diff --git a/LEGO1/omni/include/mxdschunk.h b/LEGO1/omni/include/mxdschunk.h
index 3cd60b27..cd0816a0 100644
--- a/LEGO1/omni/include/mxdschunk.h
+++ b/LEGO1/omni/include/mxdschunk.h
@@ -10,11 +10,11 @@
 class MxDSChunk : public MxCore {
 public:
 	enum {
-		Flag_Bit1 = 0x01,
-		Flag_End = 0x02,
-		Flag_Bit3 = 0x04,
-		Flag_Split = 0x10,
-		Flag_Bit16 = 0x8000
+		c_bit1 = 0x01,
+		c_end = 0x02,
+		c_bit3 = 0x04,
+		c_split = 0x10,
+		c_bit16 = 0x8000
 	};
 
 	MxDSChunk();
diff --git a/LEGO1/omni/include/mxdsobject.h b/LEGO1/omni/include/mxdsobject.h
index a05d319b..b5bfd470 100644
--- a/LEGO1/omni/include/mxdsobject.h
+++ b/LEGO1/omni/include/mxdsobject.h
@@ -4,7 +4,6 @@
 #include "decomp.h"
 #include "mxatomid.h"
 #include "mxcore.h"
-#include "mxdstypes.h"
 
 class MxPresenter;
 
@@ -12,6 +11,21 @@ class MxPresenter;
 // SIZE 0x2c
 class MxDSObject : public MxCore {
 public:
+	enum Type {
+		e_object = 0,
+		e_action,
+		e_mediaAction,
+		e_anim,
+		e_sound,
+		e_multiAction,
+		e_serialAction,
+		e_parallelAction,
+		e_event,
+		e_selectAction,
+		e_still,
+		e_objectAction,
+	};
+
 	MxDSObject();
 	virtual ~MxDSObject() override;
 
@@ -35,14 +49,14 @@ class MxDSObject : public MxCore {
 	virtual void Deserialize(MxU8** p_source, MxS16 p_unk0x24);                     // vtable+1c;
 	inline virtual void SetAtomId(MxAtomId p_atomId) { this->m_atomId = p_atomId; } // vtable+20;
 
-	inline MxDSType GetType() const { return (MxDSType) this->m_type; }
+	inline Type GetType() const { return (Type) this->m_type; }
 	inline const char* GetSourceName() const { return this->m_sourceName; }
 	inline MxU32 GetObjectId() { return this->m_objectId; }
 	inline const MxAtomId& GetAtomId() { return this->m_atomId; }
 	inline MxS16 GetUnknown24() { return this->m_unk0x24; }
 	inline MxPresenter* GetUnknown28() { return this->m_unk0x28; }
 
-	inline void SetType(MxDSType p_type) { this->m_type = p_type; }
+	inline void SetType(Type p_type) { this->m_type = p_type; }
 	inline void SetObjectId(MxU32 p_objectId) { this->m_objectId = p_objectId; }
 	inline void SetUnknown24(MxS16 p_unk0x24) { this->m_unk0x24 = p_unk0x24; }
 	inline void SetUnknown28(MxPresenter* p_unk0x28) { this->m_unk0x28 = p_unk0x28; }
diff --git a/LEGO1/omni/include/mxdstypes.h b/LEGO1/omni/include/mxdstypes.h
deleted file mode 100644
index f43742b9..00000000
--- a/LEGO1/omni/include/mxdstypes.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef MXDSTYPES_H
-#define MXDSTYPES_H
-
-enum MxDSType {
-	MxDSType_Object = 0,
-	MxDSType_Action = 1,
-	MxDSType_MediaAction = 2,
-	MxDSType_Anim = 3,
-	MxDSType_Sound = 4,
-	MxDSType_MultiAction = 5,
-	MxDSType_SerialAction = 6,
-	MxDSType_ParallelAction = 7,
-	MxDSType_Event = 8,
-	MxDSType_SelectAction = 9,
-	MxDSType_Still = 10,
-	MxDSType_ObjectAction = 11,
-};
-
-#endif // MXDSTYPES_H
diff --git a/LEGO1/omni/include/mxhashtable.h b/LEGO1/omni/include/mxhashtable.h
index 8d6be0cf..056ff402 100644
--- a/LEGO1/omni/include/mxhashtable.h
+++ b/LEGO1/omni/include/mxhashtable.h
@@ -32,10 +32,10 @@ class MxHashTableNode {
 template <class T>
 class MxHashTable : protected MxCollection<T> {
 public:
-	enum HashTableOpt {
-		HashTableOpt_NoExpand = 0,
-		HashTableOpt_ExpandAdd = 1,
-		HashTableOpt_ExpandMultiply = 2,
+	enum Option {
+		e_noExpand = 0,
+		e_expandAll,
+		e_expandMultiply,
 	};
 
 	MxHashTable()
@@ -43,7 +43,7 @@ class MxHashTable : protected MxCollection<T> {
 		m_numSlots = HASH_TABLE_INIT_SIZE;
 		m_slots = new MxHashTableNode<T>*[HASH_TABLE_INIT_SIZE];
 		memset(m_slots, 0, sizeof(MxHashTableNode<T>*) * m_numSlots);
-		m_resizeOption = HashTableOpt_NoExpand;
+		m_resizeOption = e_noExpand;
 	}
 
 	virtual ~MxHashTable() override;
@@ -62,7 +62,7 @@ class MxHashTable : protected MxCollection<T> {
 	MxHashTableNode<T>** m_slots; // 0x10
 	MxU32 m_numSlots;             // 0x14
 	MxU32 m_autoResizeRatio;      // 0x18
-	HashTableOpt m_resizeOption;  // 0x1c
+	Option m_resizeOption;        // 0x1c
 	// FIXME: or FIXME? This qword is used as an integer or double depending
 	// on the value of m_resizeOption. Hard to say whether this is how the devs
 	// did it, but a simple cast in either direction doesn't match.
@@ -177,10 +177,10 @@ inline void MxHashTable<T>::Resize()
 	MxHashTableNode<T>** oldTable = m_slots;
 
 	switch (m_resizeOption) {
-	case HashTableOpt_ExpandAdd:
+	case e_expandAll:
 		m_numSlots += m_increaseAmount;
 		break;
-	case HashTableOpt_ExpandMultiply:
+	case e_expandMultiply:
 		m_numSlots *= m_increaseFactor;
 		break;
 	}
diff --git a/LEGO1/omni/include/mxnotificationparam.h b/LEGO1/omni/include/mxnotificationparam.h
index 0a8b681c..e990abe6 100644
--- a/LEGO1/omni/include/mxnotificationparam.h
+++ b/LEGO1/omni/include/mxnotificationparam.h
@@ -8,29 +8,29 @@
 class MxCore;
 
 enum NotificationId {
-	PARAM_NONE = 0,
+	c_notificationType0 = 0,
 	c_notificationStartAction = 1, // 100dc210:100d8350
 	c_notificationEndAction = 2,   // 100d8358:100d8350
-	TYPE4 = 4,                     // 100dc208:100d8350
-	MXPRESENTER_NOTIFICATION = 5,
-	MXSTREAMER_DELETE_NOTIFY = 6, // 100dc760
+	c_notificationType4 = 4,       // 100dc208:100d8350
+	c_notificationPresenter = 5,
+	c_notificationStreamer = 6,   // 100dc760
 	c_notificationKeyPress = 7,   // 100d6aa0
 	c_notificationButtonUp = 8,   // 100d6aa0
 	c_notificationButtonDown = 9, // 100d6aa0
 	c_notificationMouseMove = 10, // 100d6aa0
-	TYPE11 = 11,                  // 100d6aa0
+	c_notificationType11 = 11,    // 100d6aa0
 	c_notificationDragEnd = 12,
 	c_notificationDragStart = 13,
 	c_notificationDrag = 14,
 	c_notificationTimer = 15, // 100d6aa0
-	TYPE17 = 17,
-	TYPE18 = 18, // 100d7e80
-	TYPE19 = 19, // 100d6230
-	TYPE20 = 20,
+	c_notificationType17 = 17,
+	c_notificationType18 = 18, // 100d7e80
+	c_notificationType19 = 19, // 100d6230
+	c_notificationType20 = 20,
 	c_notificationNewPresenter = 21,
-	TYPE22 = 22,
-	TYPE23 = 23,
-	MXTRANSITIONMANAGER_TRANSITIONENDED = 24
+	c_notificationType22 = 22,
+	c_notificationType23 = 23,
+	c_notificationTransitioned = 24
 };
 
 // VTABLE: LEGO1 0x100d56e0
diff --git a/LEGO1/omni/include/mxomnicreateflags.h b/LEGO1/omni/include/mxomnicreateflags.h
index a94ed45a..24b1e942 100644
--- a/LEGO1/omni/include/mxomnicreateflags.h
+++ b/LEGO1/omni/include/mxomnicreateflags.h
@@ -6,84 +6,76 @@
 class MxOmniCreateFlags {
 public:
 	enum LowFlags {
-		Flag_CreateObjectFactory = 0x01,
-		Flag_CreateVariableTable = 0x02,
-		Flag_CreateTickleManager = 0x04,
-		Flag_CreateNotificationManager = 0x08,
-		Flag_CreateVideoManager = 0x10,
-		Flag_CreateSoundManager = 0x20,
-		Flag_CreateMusicManager = 0x40,
-		Flag_CreateEventManager = 0x80
+		c_createObjectFactory = 0x01,
+		c_createVariableTable = 0x02,
+		c_createTickleManager = 0x04,
+		c_createNotificationManager = 0x08,
+		c_createVideoManager = 0x10,
+		c_createSoundManager = 0x20,
+		c_createMusicManager = 0x40,
+		c_createEventManager = 0x80
 	};
 
 	enum HighFlags {
-		Flag_CreateTimer = 0x02,
-		Flag_CreateStreamer = 0x04
+		c_createTimer = 0x02,
+		c_createStreamer = 0x04
 	};
 
 	__declspec(dllexport) MxOmniCreateFlags();
 
-	inline const MxBool CreateObjectFactory() const { return this->m_flags1 & Flag_CreateObjectFactory; }
-	inline const MxBool CreateVariableTable() const { return this->m_flags1 & Flag_CreateVariableTable; }
-	inline const MxBool CreateTickleManager() const { return this->m_flags1 & Flag_CreateTickleManager; }
-	inline const MxBool CreateNotificationManager() const { return this->m_flags1 & Flag_CreateNotificationManager; }
-	inline const MxBool CreateVideoManager() const { return this->m_flags1 & Flag_CreateVideoManager; }
-	inline const MxBool CreateSoundManager() const { return this->m_flags1 & Flag_CreateSoundManager; }
-	inline const MxBool CreateMusicManager() const { return this->m_flags1 & Flag_CreateMusicManager; }
-	inline const MxBool CreateEventManager() const { return this->m_flags1 & Flag_CreateEventManager; }
+	inline const MxBool CreateObjectFactory() const { return this->m_flags1 & c_createObjectFactory; }
+	inline const MxBool CreateVariableTable() const { return this->m_flags1 & c_createVariableTable; }
+	inline const MxBool CreateTickleManager() const { return this->m_flags1 & c_createTickleManager; }
+	inline const MxBool CreateNotificationManager() const { return this->m_flags1 & c_createNotificationManager; }
+	inline const MxBool CreateVideoManager() const { return this->m_flags1 & c_createVideoManager; }
+	inline const MxBool CreateSoundManager() const { return this->m_flags1 & c_createSoundManager; }
+	inline const MxBool CreateMusicManager() const { return this->m_flags1 & c_createMusicManager; }
+	inline const MxBool CreateEventManager() const { return this->m_flags1 & c_createEventManager; }
 
-	inline const MxBool CreateTimer() const { return this->m_flags2 & Flag_CreateTimer; }
-	inline const MxBool CreateStreamer() const { return this->m_flags2 & Flag_CreateStreamer; }
+	inline const MxBool CreateTimer() const { return this->m_flags2 & c_createTimer; }
+	inline const MxBool CreateStreamer() const { return this->m_flags2 & c_createStreamer; }
 
 	inline void CreateObjectFactory(MxBool p_enable)
 	{
-		this->m_flags1 =
-			(p_enable ? this->m_flags1 | Flag_CreateObjectFactory : this->m_flags1 & ~Flag_CreateObjectFactory);
+		this->m_flags1 = (p_enable ? this->m_flags1 | c_createObjectFactory : this->m_flags1 & ~c_createObjectFactory);
 	}
 	inline void CreateVariableTable(MxBool p_enable)
 	{
-		this->m_flags1 =
-			(p_enable ? this->m_flags1 | Flag_CreateVariableTable : this->m_flags1 & ~Flag_CreateVariableTable);
+		this->m_flags1 = (p_enable ? this->m_flags1 | c_createVariableTable : this->m_flags1 & ~c_createVariableTable);
 	}
 	inline void CreateTickleManager(MxBool p_enable)
 	{
-		this->m_flags1 =
-			(p_enable ? this->m_flags1 | Flag_CreateTickleManager : this->m_flags1 & ~Flag_CreateTickleManager);
+		this->m_flags1 = (p_enable ? this->m_flags1 | c_createTickleManager : this->m_flags1 & ~c_createTickleManager);
 	}
 	inline void CreateNotificationManager(MxBool p_enable)
 	{
 		this->m_flags1 =
-			(p_enable ? this->m_flags1 | Flag_CreateNotificationManager
-					  : this->m_flags1 & ~Flag_CreateNotificationManager);
+			(p_enable ? this->m_flags1 | c_createNotificationManager : this->m_flags1 & ~c_createNotificationManager);
 	}
 	inline void CreateVideoManager(MxBool p_enable)
 	{
-		this->m_flags1 =
-			(p_enable ? this->m_flags1 | Flag_CreateVideoManager : this->m_flags1 & ~Flag_CreateVideoManager);
+		this->m_flags1 = (p_enable ? this->m_flags1 | c_createVideoManager : this->m_flags1 & ~c_createVideoManager);
 	}
 	inline void CreateSoundManager(MxBool p_enable)
 	{
-		this->m_flags1 =
-			(p_enable ? this->m_flags1 | Flag_CreateSoundManager : this->m_flags1 & ~Flag_CreateSoundManager);
+		this->m_flags1 = (p_enable ? this->m_flags1 | c_createSoundManager : this->m_flags1 & ~c_createSoundManager);
 	}
 	inline void CreateMusicManager(MxBool p_enable)
 	{
-		this->m_flags1 =
-			(p_enable ? this->m_flags1 | Flag_CreateMusicManager : this->m_flags1 & ~Flag_CreateMusicManager);
+		this->m_flags1 = (p_enable ? this->m_flags1 | c_createMusicManager : this->m_flags1 & ~c_createMusicManager);
 	}
 	inline void CreateEventManager(MxBool p_enable)
 	{
-		this->m_flags1 =
-			(p_enable ? this->m_flags1 | Flag_CreateEventManager : this->m_flags1 & ~Flag_CreateEventManager);
+		this->m_flags1 = (p_enable ? this->m_flags1 | c_createEventManager : this->m_flags1 & ~c_createEventManager);
 	}
 
 	inline void CreateTimer(MxBool p_enable)
 	{
-		this->m_flags2 = (p_enable ? this->m_flags2 | Flag_CreateTimer : this->m_flags2 & ~Flag_CreateTimer);
+		this->m_flags2 = (p_enable ? this->m_flags2 | c_createTimer : this->m_flags2 & ~c_createTimer);
 	}
 	inline void CreateStreamer(MxBool p_enable)
 	{
-		this->m_flags2 = (p_enable ? this->m_flags2 | Flag_CreateStreamer : this->m_flags2 & ~Flag_CreateStreamer);
+		this->m_flags2 = (p_enable ? this->m_flags2 | c_createStreamer : this->m_flags2 & ~c_createStreamer);
 	}
 
 private:
diff --git a/LEGO1/omni/include/mxpresenter.h b/LEGO1/omni/include/mxpresenter.h
index eddcc4f2..d50e9818 100644
--- a/LEGO1/omni/include/mxpresenter.h
+++ b/LEGO1/omni/include/mxpresenter.h
@@ -17,13 +17,13 @@ class MxEntity;
 class MxPresenter : public MxCore {
 public:
 	enum TickleState {
-		TickleState_Idle = 0,
-		TickleState_Ready,
-		TickleState_Starting,
-		TickleState_Streaming,
-		TickleState_Repeating,
-		TickleState_unk5,
-		TickleState_Done,
+		e_idle = 0,
+		e_ready,
+		e_starting,
+		e_streaming,
+		e_repeating,
+		e_unk5,
+		e_done,
 	};
 
 	MxPresenter() { Init(); }
@@ -57,27 +57,27 @@ class MxPresenter : public MxCore {
 	virtual void ReadyTickle()
 	{
 		ParseExtra();
-		ProgressTickleState(TickleState_Starting);
+		ProgressTickleState(e_starting);
 	} // vtable+0x18
 
 	// FUNCTION: LEGO1 0x1000be60
-	virtual void StartingTickle() { ProgressTickleState(TickleState_Streaming); } // vtable+0x1c
+	virtual void StartingTickle() { ProgressTickleState(e_streaming); } // vtable+0x1c
 
 	// FUNCTION: LEGO1 0x1000be80
-	virtual void StreamingTickle() { ProgressTickleState(TickleState_Repeating); }; // vtable+0x20
+	virtual void StreamingTickle() { ProgressTickleState(e_repeating); }; // vtable+0x20
 
 	// FUNCTION: LEGO1 0x1000bea0
-	virtual void RepeatingTickle() { ProgressTickleState(TickleState_unk5); }; // vtable+0x24
+	virtual void RepeatingTickle() { ProgressTickleState(e_unk5); }; // vtable+0x24
 
 	// FUNCTION: LEGO1 0x1000bec0
-	virtual void Unk5Tickle() { ProgressTickleState(TickleState_Done); }; // vtable+0x28
+	virtual void Unk5Tickle() { ProgressTickleState(e_done); }; // vtable+0x28
 
 protected:
 #ifdef ISLE_APP
 	__declspec(dllexport) virtual void DoneTickle(); // vtable+0x2c
 #else
 	// FUNCTION: LEGO1 0x1000bee0
-	__declspec(dllexport) virtual void DoneTickle() { ProgressTickleState(TickleState_Idle); }; // vtable+0x2c
+	__declspec(dllexport) virtual void DoneTickle() { ProgressTickleState(e_idle); }; // vtable+0x2c
 #endif
 
 	__declspec(dllexport) virtual void ParseExtra(); // vtable+0x30
diff --git a/LEGO1/omni/include/mxstreamer.h b/LEGO1/omni/include/mxstreamer.h
index 945f8934..673db644 100644
--- a/LEGO1/omni/include/mxstreamer.h
+++ b/LEGO1/omni/include/mxstreamer.h
@@ -71,7 +71,7 @@ class MxStreamerNotification : public MxNotificationParam {
 class MxStreamer : public MxCore {
 public:
 	enum OpenMode {
-		e_DiskStream,
+		e_diskStream = 0,
 		e_RAMStream
 	};
 
diff --git a/LEGO1/omni/include/mxvideopresenter.h b/LEGO1/omni/include/mxvideopresenter.h
index bcbcbf67..f91f2eb7 100644
--- a/LEGO1/omni/include/mxvideopresenter.h
+++ b/LEGO1/omni/include/mxvideopresenter.h
@@ -11,11 +11,11 @@
 class MxVideoPresenter : public MxMediaPresenter {
 public:
 	enum {
-		Flag_Bit1 = 0x01,
-		Flag_Bit2 = 0x02,
-		Flag_Bit3 = 0x04,
-		Flag_Bit4 = 0x08,
-		Flag_Bit5 = 0x10,
+		c_bit1 = 0x01,
+		c_bit2 = 0x02,
+		c_bit3 = 0x04,
+		c_bit4 = 0x08,
+		c_bit5 = 0x10,
 	};
 
 	MxVideoPresenter() { Init(); }
diff --git a/LEGO1/omni/src/action/mxdsaction.cpp b/LEGO1/omni/src/action/mxdsaction.cpp
index d4da16bf..cea02696 100644
--- a/LEGO1/omni/src/action/mxdsaction.cpp
+++ b/LEGO1/omni/src/action/mxdsaction.cpp
@@ -15,14 +15,14 @@ MxU16 g_sep = TWOCC(',', ' ');
 // FUNCTION: LEGO1 0x100ad810
 MxDSAction::MxDSAction()
 {
-	this->m_flags = MxDSAction::Flag_Enabled;
+	this->m_flags = MxDSAction::c_enabled;
 	this->m_startTime = INT_MIN;
 	this->m_extraData = NULL;
 	this->m_extraLength = 0;
 	this->m_duration = INT_MIN;
 	this->m_loopCount = -1;
 
-	this->SetType(MxDSType_Action);
+	this->SetType(e_action);
 	this->m_location.Fill(FLT_MAX);
 	this->m_direction.Fill(FLT_MAX);
 	this->m_up.Fill(FLT_MAX);
diff --git a/LEGO1/omni/src/action/mxdsanim.cpp b/LEGO1/omni/src/action/mxdsanim.cpp
index c62be34c..cef2321c 100644
--- a/LEGO1/omni/src/action/mxdsanim.cpp
+++ b/LEGO1/omni/src/action/mxdsanim.cpp
@@ -5,7 +5,7 @@ DECOMP_SIZE_ASSERT(MxDSAnim, 0xb8)
 // FUNCTION: LEGO1 0x100c8ff0
 MxDSAnim::MxDSAnim()
 {
-	this->SetType(MxDSType_Anim);
+	this->SetType(e_anim);
 }
 
 // FUNCTION: LEGO1 0x100c91a0
diff --git a/LEGO1/omni/src/action/mxdsevent.cpp b/LEGO1/omni/src/action/mxdsevent.cpp
index 198c9ca0..bc925369 100644
--- a/LEGO1/omni/src/action/mxdsevent.cpp
+++ b/LEGO1/omni/src/action/mxdsevent.cpp
@@ -5,7 +5,7 @@ DECOMP_SIZE_ASSERT(MxDSEvent, 0xb8)
 // FUNCTION: LEGO1 0x100c95f0
 MxDSEvent::MxDSEvent()
 {
-	this->SetType(MxDSType_Event);
+	this->SetType(e_event);
 }
 
 // FUNCTION: LEGO1 0x100c97a0
diff --git a/LEGO1/omni/src/action/mxdsmediaaction.cpp b/LEGO1/omni/src/action/mxdsmediaaction.cpp
index c631dec8..580c22bc 100644
--- a/LEGO1/omni/src/action/mxdsmediaaction.cpp
+++ b/LEGO1/omni/src/action/mxdsmediaaction.cpp
@@ -15,7 +15,7 @@ MxDSMediaAction::MxDSMediaAction()
 	this->m_paletteManagement = 1;
 	this->m_unk0xb4 = -1;
 	this->m_sustainTime = 0;
-	this->SetType(MxDSType_MediaAction);
+	this->SetType(e_mediaAction);
 }
 
 // FUNCTION: LEGO1 0x100c8cf0
diff --git a/LEGO1/omni/src/action/mxdsmultiaction.cpp b/LEGO1/omni/src/action/mxdsmultiaction.cpp
index b986c23d..64e20a55 100644
--- a/LEGO1/omni/src/action/mxdsmultiaction.cpp
+++ b/LEGO1/omni/src/action/mxdsmultiaction.cpp
@@ -7,7 +7,7 @@ DECOMP_SIZE_ASSERT(MxDSActionListCursor, 0x10);
 // FUNCTION: LEGO1 0x100c9b90
 MxDSMultiAction::MxDSMultiAction()
 {
-	this->SetType(MxDSType_MultiAction);
+	this->SetType(e_multiAction);
 	this->m_actions = new MxDSActionList;
 	this->m_actions->SetDestroy(MxDSActionList::Destroy);
 }
diff --git a/LEGO1/omni/src/action/mxdsobject.cpp b/LEGO1/omni/src/action/mxdsobject.cpp
index 7ee92937..6d11476d 100644
--- a/LEGO1/omni/src/action/mxdsobject.cpp
+++ b/LEGO1/omni/src/action/mxdsobject.cpp
@@ -11,7 +11,6 @@
 #include "mxdsserialaction.h"
 #include "mxdssound.h"
 #include "mxdsstill.h"
-#include "mxdstypes.h"
 #include "mxutil.h"
 
 #include <stdlib.h>
@@ -22,7 +21,7 @@ DECOMP_SIZE_ASSERT(MxDSObject, 0x2c);
 // FUNCTION: LEGO1 0x100bf6a0
 MxDSObject::MxDSObject()
 {
-	this->SetType(MxDSType_Object);
+	this->SetType(e_object);
 	this->m_sourceName = NULL;
 	this->m_unk0x14 = 0;
 	this->m_objectName = NULL;
@@ -148,40 +147,40 @@ MxDSObject* DeserializeDSObjectDispatch(MxU8** p_source, MxS16 p_flags)
 	switch (type) {
 	default:
 		return NULL;
-	case MxDSType_Object:
+	case MxDSObject::e_object:
 		obj = new MxDSObject();
 		break;
-	case MxDSType_Action:
+	case MxDSObject::e_action:
 		obj = new MxDSAction();
 		break;
-	case MxDSType_MediaAction:
+	case MxDSObject::e_mediaAction:
 		obj = new MxDSMediaAction();
 		break;
-	case MxDSType_Anim:
+	case MxDSObject::e_anim:
 		obj = new MxDSAnim();
 		break;
-	case MxDSType_Sound:
+	case MxDSObject::e_sound:
 		obj = new MxDSSound();
 		break;
-	case MxDSType_MultiAction:
+	case MxDSObject::e_multiAction:
 		obj = new MxDSMultiAction();
 		break;
-	case MxDSType_SerialAction:
+	case MxDSObject::e_serialAction:
 		obj = new MxDSSerialAction();
 		break;
-	case MxDSType_ParallelAction:
+	case MxDSObject::e_parallelAction:
 		obj = new MxDSParallelAction();
 		break;
-	case MxDSType_Event:
+	case MxDSObject::e_event:
 		obj = new MxDSEvent();
 		break;
-	case MxDSType_SelectAction:
+	case MxDSObject::e_selectAction:
 		obj = new MxDSSelectAction();
 		break;
-	case MxDSType_Still:
+	case MxDSObject::e_still:
 		obj = new MxDSStill();
 		break;
-	case MxDSType_ObjectAction:
+	case MxDSObject::e_objectAction:
 		obj = new MxDSObjectAction();
 		break;
 	}
diff --git a/LEGO1/omni/src/action/mxdsobjectaction.cpp b/LEGO1/omni/src/action/mxdsobjectaction.cpp
index 1155d3a5..db8b149f 100644
--- a/LEGO1/omni/src/action/mxdsobjectaction.cpp
+++ b/LEGO1/omni/src/action/mxdsobjectaction.cpp
@@ -5,7 +5,7 @@ DECOMP_SIZE_ASSERT(MxDSObjectAction, 0xb8)
 // FUNCTION: LEGO1 0x100c8870
 MxDSObjectAction::MxDSObjectAction()
 {
-	this->SetType(MxDSType_ObjectAction);
+	this->SetType(e_objectAction);
 }
 
 // FUNCTION: LEGO1 0x100c8a20
diff --git a/LEGO1/omni/src/action/mxdsparallelaction.cpp b/LEGO1/omni/src/action/mxdsparallelaction.cpp
index 07b0fef2..a14a326f 100644
--- a/LEGO1/omni/src/action/mxdsparallelaction.cpp
+++ b/LEGO1/omni/src/action/mxdsparallelaction.cpp
@@ -7,7 +7,7 @@ DECOMP_SIZE_ASSERT(MxDSParallelAction, 0x9c)
 // FUNCTION: LEGO1 0x100cae80
 MxDSParallelAction::MxDSParallelAction()
 {
-	this->SetType(MxDSType_ParallelAction);
+	this->SetType(e_parallelAction);
 }
 
 // FUNCTION: LEGO1 0x100cb040
diff --git a/LEGO1/omni/src/action/mxdsselectaction.cpp b/LEGO1/omni/src/action/mxdsselectaction.cpp
index e2db17e2..ddadde84 100644
--- a/LEGO1/omni/src/action/mxdsselectaction.cpp
+++ b/LEGO1/omni/src/action/mxdsselectaction.cpp
@@ -12,7 +12,7 @@ DECOMP_SIZE_ASSERT(MxListEntry<MxString>, 0x18)
 // FUNCTION: LEGO1 0x100cb2b0
 MxDSSelectAction::MxDSSelectAction()
 {
-	this->SetType(MxDSType_SelectAction);
+	this->SetType(e_selectAction);
 	this->m_unk0xac = new MxStringList;
 }
 
diff --git a/LEGO1/omni/src/action/mxdsserialaction.cpp b/LEGO1/omni/src/action/mxdsserialaction.cpp
index 59cda938..24513f48 100644
--- a/LEGO1/omni/src/action/mxdsserialaction.cpp
+++ b/LEGO1/omni/src/action/mxdsserialaction.cpp
@@ -7,7 +7,7 @@ DECOMP_SIZE_ASSERT(MxDSSerialAction, 0xa8)
 // FUNCTION: LEGO1 0x100ca9d0
 MxDSSerialAction::MxDSSerialAction()
 {
-	this->SetType(MxDSType_SerialAction);
+	this->SetType(e_serialAction);
 	this->m_cursor = new MxDSActionListCursor(this->m_actions);
 	this->m_unk0xa0 = 0;
 }
diff --git a/LEGO1/omni/src/action/mxdssound.cpp b/LEGO1/omni/src/action/mxdssound.cpp
index 49806ce0..61022cab 100644
--- a/LEGO1/omni/src/action/mxdssound.cpp
+++ b/LEGO1/omni/src/action/mxdssound.cpp
@@ -8,7 +8,7 @@ DECOMP_SIZE_ASSERT(MxDSSound, 0xc0)
 MxDSSound::MxDSSound()
 {
 	this->m_volume = 0x4f;
-	this->SetType(MxDSType_Sound);
+	this->SetType(e_sound);
 }
 
 // FUNCTION: LEGO1 0x100c9470
diff --git a/LEGO1/omni/src/action/mxdsstill.cpp b/LEGO1/omni/src/action/mxdsstill.cpp
index 6ee1ede3..59a78ffc 100644
--- a/LEGO1/omni/src/action/mxdsstill.cpp
+++ b/LEGO1/omni/src/action/mxdsstill.cpp
@@ -5,7 +5,7 @@ DECOMP_SIZE_ASSERT(MxDSStill, 0xb8)
 // FUNCTION: LEGO1 0x100c98c0
 MxDSStill::MxDSStill()
 {
-	this->SetType(MxDSType_Still);
+	this->SetType(e_still);
 }
 
 // FUNCTION: LEGO1 0x100c9a70
diff --git a/LEGO1/omni/src/audio/mxloopingmidipresenter.cpp b/LEGO1/omni/src/audio/mxloopingmidipresenter.cpp
index 921bc607..2ad286e1 100644
--- a/LEGO1/omni/src/audio/mxloopingmidipresenter.cpp
+++ b/LEGO1/omni/src/audio/mxloopingmidipresenter.cpp
@@ -21,7 +21,7 @@ void MxLoopingMIDIPresenter::StreamingTickle()
 	}
 
 	if (m_chunk->GetTime() + m_action->GetDuration() <= m_action->GetElapsedTime())
-		ProgressTickleState(TickleState_Done);
+		ProgressTickleState(e_done);
 }
 
 // FUNCTION: LEGO1 0x100c2ae0
@@ -38,7 +38,7 @@ MxResult MxLoopingMIDIPresenter::PutData()
 {
 	m_criticalSection.Enter();
 
-	if (m_currentTickleState == TickleState_Streaming && m_chunk && !MusicManager()->GetMIDIInitialized()) {
+	if (m_currentTickleState == e_streaming && m_chunk && !MusicManager()->GetMIDIInitialized()) {
 		SetVolume(((MxDSSound*) m_action)->GetVolume());
 		MusicManager()->FUN_100c09c0(m_chunk->GetData(), !m_action->GetLoopCount() ? -1 : m_action->GetLoopCount());
 	}
diff --git a/LEGO1/omni/src/audio/mxmidipresenter.cpp b/LEGO1/omni/src/audio/mxmidipresenter.cpp
index b6d22d81..8757e6af 100644
--- a/LEGO1/omni/src/audio/mxmidipresenter.cpp
+++ b/LEGO1/omni/src/audio/mxmidipresenter.cpp
@@ -52,7 +52,7 @@ void MxMIDIPresenter::ReadyTickle()
 	if (chunk) {
 		m_subscriber->DestroyChunk(chunk);
 		ParseExtra();
-		ProgressTickleState(TickleState_Starting);
+		ProgressTickleState(e_starting);
 	}
 }
 
@@ -62,14 +62,14 @@ void MxMIDIPresenter::StartingTickle()
 	MxStreamChunk* chunk = CurrentChunk();
 
 	if (chunk && m_action->GetElapsedTime() >= chunk->GetTime())
-		ProgressTickleState(TickleState_Streaming);
+		ProgressTickleState(e_streaming);
 }
 
 // FUNCTION: LEGO1 0x100c2910
 void MxMIDIPresenter::StreamingTickle()
 {
 	if (m_chunk)
-		ProgressTickleState(TickleState_Done);
+		ProgressTickleState(e_done);
 	else
 		m_chunk = NextChunk();
 }
@@ -92,7 +92,7 @@ MxResult MxMIDIPresenter::PutData()
 {
 	m_criticalSection.Enter();
 
-	if (m_currentTickleState == TickleState_Streaming && m_chunk && !MusicManager()->GetMIDIInitialized()) {
+	if (m_currentTickleState == e_streaming && m_chunk && !MusicManager()->GetMIDIInitialized()) {
 		SetVolume(((MxDSSound*) m_action)->GetVolume());
 
 		if (MusicManager()->FUN_100c09c0(m_chunk->GetData(), 1))
diff --git a/LEGO1/omni/src/audio/mxwavepresenter.cpp b/LEGO1/omni/src/audio/mxwavepresenter.cpp
index e47a2630..831e0043 100644
--- a/LEGO1/omni/src/audio/mxwavepresenter.cpp
+++ b/LEGO1/omni/src/audio/mxwavepresenter.cpp
@@ -86,7 +86,7 @@ void MxWavePresenter::WriteToSoundBuffer(void* p_audioPtr, MxU32 p_length)
 	}
 
 	if (dwStatus != DSBSTATUS_BUFFERLOST) {
-		if (m_action->GetFlags() & MxDSAction::Flag_Looping) {
+		if (m_action->GetFlags() & MxDSAction::c_looping) {
 			m_writtenChunks++;
 			m_lockSize = p_length;
 		}
@@ -99,7 +99,7 @@ void MxWavePresenter::WriteToSoundBuffer(void* p_audioPtr, MxU32 p_length)
 			DS_OK) {
 			memcpy(pvAudioPtr1, p_audioPtr, p_length);
 
-			if (m_lockSize > p_length && !(m_action->GetFlags() & MxDSAction::Flag_Looping)) {
+			if (m_lockSize > p_length && !(m_action->GetFlags() & MxDSAction::c_looping)) {
 				memset((MxU8*) pvAudioPtr1 + p_length, m_silenceData, m_lockSize - p_length);
 			}
 
@@ -118,7 +118,7 @@ void MxWavePresenter::ReadyTickle()
 		memcpy(m_waveFormat, chunk->GetData(), chunk->GetLength());
 		m_subscriber->DestroyChunk(chunk);
 		ParseExtra();
-		ProgressTickleState(TickleState_Starting);
+		ProgressTickleState(e_starting);
 	}
 }
 
@@ -156,7 +156,7 @@ void MxWavePresenter::StartingTickle()
 		else
 			desc.dwFlags = DSBCAPS_CTRLFREQUENCY | DSBCAPS_CTRLPAN | DSBCAPS_CTRLVOLUME;
 
-		if (m_action->GetFlags() & MxDSAction::Flag_Looping)
+		if (m_action->GetFlags() & MxDSAction::c_looping)
 			desc.dwBufferBytes = m_waveFormat->m_waveFormatEx.nAvgBytesPerSec *
 								 (m_action->GetDuration() / m_action->GetLoopCount()) / 1000;
 		else
@@ -169,7 +169,7 @@ void MxWavePresenter::StartingTickle()
 		}
 		else {
 			SetVolume(((MxDSSound*) m_action)->GetVolume());
-			ProgressTickleState(TickleState_Streaming);
+			ProgressTickleState(e_streaming);
 		}
 	}
 }
@@ -178,11 +178,11 @@ void MxWavePresenter::StartingTickle()
 void MxWavePresenter::StreamingTickle()
 {
 	if (!m_currentChunk) {
-		if (!(m_action->GetFlags() & MxDSAction::Flag_Looping)) {
+		if (!(m_action->GetFlags() & MxDSAction::c_looping)) {
 			MxStreamChunk* chunk = CurrentChunk();
 
-			if (chunk && chunk->GetFlags() & MxDSChunk::Flag_End && !(chunk->GetFlags() & MxDSChunk::Flag_Bit16)) {
-				chunk->SetFlags(chunk->GetFlags() | MxDSChunk::Flag_Bit16);
+			if (chunk && chunk->GetFlags() & MxDSChunk::c_end && !(chunk->GetFlags() & MxDSChunk::c_bit16)) {
+				chunk->SetFlags(chunk->GetFlags() | MxDSChunk::c_bit16);
 
 				m_currentChunk = new MxStreamChunk;
 				MxU8* data = new MxU8[m_chunkLength];
@@ -192,7 +192,7 @@ void MxWavePresenter::StreamingTickle()
 				m_currentChunk->SetLength(m_chunkLength);
 				m_currentChunk->SetData(data);
 				m_currentChunk->SetTime(chunk->GetTime() + 1000);
-				m_currentChunk->SetFlags(MxDSChunk::Flag_Bit1);
+				m_currentChunk->SetFlags(MxDSChunk::c_bit1);
 			}
 		}
 
@@ -208,7 +208,7 @@ void MxWavePresenter::DoneTickle()
 		m_dsBuffer->GetCurrentPosition(&dwCurrentPlayCursor, &dwCurrentWriteCursor);
 
 		MxS8 playedChunks = dwCurrentPlayCursor / m_chunkLength;
-		if (m_action->GetFlags() & MxDSAction::Flag_Bit7 || m_action->GetFlags() & MxDSAction::Flag_Looping ||
+		if (m_action->GetFlags() & MxDSAction::c_bit7 || m_action->GetFlags() & MxDSAction::c_looping ||
 			m_writtenChunks != playedChunks || m_lockSize + (m_chunkLength * playedChunks) <= dwCurrentPlayCursor)
 			MxMediaPresenter::DoneTickle();
 	}
@@ -231,7 +231,7 @@ MxResult MxWavePresenter::PutData()
 
 	if (IsEnabled()) {
 		switch (m_currentTickleState) {
-		case TickleState_Streaming:
+		case e_streaming:
 			if (m_currentChunk && FUN_100b1ba0()) {
 				WriteToSoundBuffer(m_currentChunk->GetData(), m_currentChunk->GetLength());
 				m_subscriber->DestroyChunk(m_currentChunk);
@@ -245,7 +245,7 @@ MxResult MxWavePresenter::PutData()
 					m_started = TRUE;
 			}
 			break;
-		case TickleState_Repeating:
+		case e_repeating:
 			if (m_started)
 				break;
 
@@ -339,13 +339,13 @@ void MxWavePresenter::Resume()
 	if (m_paused) {
 		if (m_dsBuffer && m_started) {
 			switch (m_currentTickleState) {
-			case TickleState_Streaming:
+			case e_streaming:
 				m_dsBuffer->Play(0, 0, DSBPLAY_LOOPING);
 				break;
-			case TickleState_Repeating:
+			case e_repeating:
 				m_dsBuffer->Play(0, 0, m_action->GetLoopCount() > 1);
 				break;
-			case TickleState_Done:
+			case e_done:
 				m_dsBuffer->Play(0, 0, 0);
 			}
 		}
diff --git a/LEGO1/omni/src/common/mxatomid.cpp b/LEGO1/omni/src/common/mxatomid.cpp
index ae57c820..6c400eed 100644
--- a/LEGO1/omni/src/common/mxatomid.cpp
+++ b/LEGO1/omni/src/common/mxatomid.cpp
@@ -55,7 +55,7 @@ MxAtomId& MxAtomId::operator=(const MxAtomId& p_atomId)
 		Destroy();
 
 	if (p_atomId.m_internal && MxOmni::GetInstance() && AtomIdCounterSet()) {
-		MxAtomIdCounter* counter = GetCounter(p_atomId.m_internal, LookupMode_Exact);
+		MxAtomIdCounter* counter = GetCounter(p_atomId.m_internal, e_exact);
 		counter->Inc();
 	}
 
@@ -71,11 +71,11 @@ MxAtomIdCounter* MxAtomId::GetCounter(const char* p_str, LookupMode p_mode)
 	MxAtomIdCounter* counter = new MxAtomIdCounter(p_str);
 
 	switch (p_mode) {
-	case LookupMode_LowerCase:
-	case LookupMode_LowerCase2:
+	case e_lowerCase:
+	case e_lowerCase2:
 		counter->GetKey()->ToLowerCase();
 		break;
-	case LookupMode_UpperCase:
+	case e_upperCase:
 		counter->GetKey()->ToUpperCase();
 		break;
 	}
diff --git a/LEGO1/omni/src/common/mxcompositepresenter.cpp b/LEGO1/omni/src/common/mxcompositepresenter.cpp
index 0b787a42..5c5b612e 100644
--- a/LEGO1/omni/src/common/mxcompositepresenter.cpp
+++ b/LEGO1/omni/src/common/mxcompositepresenter.cpp
@@ -112,7 +112,7 @@ MxLong MxCompositePresenter::Notify(MxParam& p_param)
 	case c_notificationEndAction:
 		VTable0x58((MxEndActionNotificationParam&) p_param);
 		break;
-	case MXPRESENTER_NOTIFICATION:
+	case c_notificationPresenter:
 		VTable0x5c((MxNotificationParam&) p_param);
 	}
 
@@ -155,8 +155,8 @@ void MxCompositePresenter::VTable0x58(MxEndActionNotificationParam& p_param)
 	else {
 		if (m_action->IsA("MxDSSerialAction") && it != m_list.end()) {
 			MxPresenter* presenter = *it;
-			if (presenter->GetCurrentTickleState() == TickleState_Idle)
-				presenter->SetTickleState(TickleState_Ready);
+			if (presenter->GetCurrentTickleState() == e_idle)
+				presenter->SetTickleState(e_ready);
 		}
 	}
 }
@@ -171,8 +171,8 @@ void MxCompositePresenter::VTable0x5c(MxNotificationParam& p_param)
 			if (*it == presenter) {
 				m_list.erase(it++);
 
-				if (presenter->GetCurrentTickleState() == TickleState_Idle)
-					presenter->SetTickleState(TickleState_Ready);
+				if (presenter->GetCurrentTickleState() == e_idle)
+					presenter->SetTickleState(e_ready);
 
 				MxDSActionList* actions = ((MxDSMultiAction*) m_action)->GetActionList();
 				MxDSActionListCursor cursor(actions);
@@ -186,8 +186,8 @@ void MxCompositePresenter::VTable0x5c(MxNotificationParam& p_param)
 				else {
 					if (m_action->IsA("MxDSSerialAction")) {
 						MxPresenter* presenter = *it;
-						if (presenter->GetCurrentTickleState() == TickleState_Idle)
-							presenter->SetTickleState(TickleState_Ready);
+						if (presenter->GetCurrentTickleState() == e_idle)
+							presenter->SetTickleState(e_ready);
 					}
 				}
 
@@ -210,8 +210,8 @@ void MxCompositePresenter::VTable0x60(MxPresenter* p_presenter)
 			}
 			else if (m_action->IsA("MxDSSerialAction")) {
 				MxPresenter* presenter = *it;
-				if (presenter->GetCurrentTickleState() == TickleState_Idle)
-					presenter->SetTickleState(TickleState_Ready);
+				if (presenter->GetCurrentTickleState() == e_idle)
+					presenter->SetTickleState(e_ready);
 			}
 			return;
 		}
@@ -227,7 +227,7 @@ void MxCompositePresenter::SetTickleState(TickleState p_tickleState)
 		MxPresenter* presenter = *it;
 		presenter->SetTickleState(p_tickleState);
 
-		if (m_action->IsA("MxDSSerialAction") && p_tickleState == TickleState_Ready)
+		if (m_action->IsA("MxDSSerialAction") && p_tickleState == e_ready)
 			return;
 	}
 }
diff --git a/LEGO1/omni/src/common/mxmediapresenter.cpp b/LEGO1/omni/src/common/mxmediapresenter.cpp
index 56297f53..2abc5007 100644
--- a/LEGO1/omni/src/common/mxmediapresenter.cpp
+++ b/LEGO1/omni/src/common/mxmediapresenter.cpp
@@ -60,12 +60,12 @@ MxStreamChunk* MxMediaPresenter::CurrentChunk()
 	if (m_subscriber) {
 		chunk = m_subscriber->CurrentChunk();
 
-		if (chunk && chunk->GetFlags() & MxDSChunk::Flag_Bit3) {
-			m_action->SetFlags(m_action->GetFlags() | MxDSAction::Flag_Bit7);
+		if (chunk && chunk->GetFlags() & MxDSChunk::c_bit3) {
+			m_action->SetFlags(m_action->GetFlags() | MxDSAction::c_bit7);
 			m_subscriber->NextChunk();
 			m_subscriber->DestroyChunk(chunk);
 			chunk = NULL;
-			ProgressTickleState(TickleState_Done);
+			ProgressTickleState(e_done);
 		}
 	}
 
@@ -80,11 +80,11 @@ MxStreamChunk* MxMediaPresenter::NextChunk()
 	if (m_subscriber) {
 		chunk = m_subscriber->NextChunk();
 
-		if (chunk && chunk->GetFlags() & MxDSChunk::Flag_Bit3) {
-			m_action->SetFlags(m_action->GetFlags() | MxDSAction::Flag_Bit7);
+		if (chunk && chunk->GetFlags() & MxDSChunk::c_bit3) {
+			m_action->SetFlags(m_action->GetFlags() | MxDSAction::c_bit7);
 			m_subscriber->DestroyChunk(chunk);
 			chunk = NULL;
-			ProgressTickleState(TickleState_Done);
+			ProgressTickleState(e_done);
 		}
 	}
 
@@ -98,7 +98,7 @@ MxResult MxMediaPresenter::StartAction(MxStreamController* p_controller, MxDSAct
 	MxAutoLocker lock(&m_criticalSection);
 
 	if (MxPresenter::StartAction(p_controller, p_action) == SUCCESS) {
-		if (m_action->GetFlags() & MxDSAction::Flag_Looping) {
+		if (m_action->GetFlags() & MxDSAction::c_looping) {
 			m_loopingChunks = new MxStreamChunkList;
 			m_loopingChunkCursor = new MxStreamChunkListCursor(m_loopingChunks);
 
@@ -131,10 +131,9 @@ void MxMediaPresenter::EndAction()
 
 	m_currentChunk = NULL;
 
-	if (m_action->GetFlags() & MxDSAction::Flag_World &&
-		(!m_compositePresenter || !m_compositePresenter->VTable0x64(2))) {
+	if (m_action->GetFlags() & MxDSAction::c_world && (!m_compositePresenter || !m_compositePresenter->VTable0x64(2))) {
 		MxPresenter::Enable(FALSE);
-		SetTickleState(TickleState_Idle);
+		SetTickleState(e_idle);
 	}
 	else {
 		MxDSAction* action = m_action;
@@ -178,12 +177,12 @@ void MxMediaPresenter::StreamingTickle()
 		m_currentChunk = NextChunk();
 
 		if (m_currentChunk) {
-			if (m_currentChunk->GetFlags() & MxDSChunk::Flag_End) {
+			if (m_currentChunk->GetFlags() & MxDSChunk::c_end) {
 				m_subscriber->DestroyChunk(m_currentChunk);
 				m_currentChunk = NULL;
-				ProgressTickleState(TickleState_Repeating);
+				ProgressTickleState(e_repeating);
 			}
-			else if (m_action->GetFlags() & MxDSAction::Flag_Looping) {
+			else if (m_action->GetFlags() & MxDSAction::c_looping) {
 				LoopChunk(m_currentChunk);
 
 				if (!IsEnabled()) {
@@ -206,11 +205,11 @@ void MxMediaPresenter::RepeatingTickle()
 		if (m_currentChunk) {
 			MxLong time = m_currentChunk->GetTime();
 			if (time <= m_action->GetElapsedTime() % m_action->GetLoopCount())
-				ProgressTickleState(TickleState_unk5);
+				ProgressTickleState(e_unk5);
 		}
 		else {
 			if (m_action->GetElapsedTime() >= m_action->GetStartTime() + m_action->GetDuration())
-				ProgressTickleState(TickleState_unk5);
+				ProgressTickleState(e_unk5);
 		}
 	}
 }
@@ -219,7 +218,7 @@ void MxMediaPresenter::RepeatingTickle()
 void MxMediaPresenter::DoneTickle()
 {
 	m_previousTickleStates |= 1 << m_currentTickleState;
-	m_currentTickleState = TickleState_Idle;
+	m_currentTickleState = e_idle;
 	EndAction();
 }
 
@@ -246,13 +245,13 @@ void MxMediaPresenter::Enable(MxBool p_enable)
 		if (p_enable) {
 			MxLong time = Timer()->GetTime();
 			m_action->SetUnknown90(time);
-			SetTickleState(TickleState_Repeating);
+			SetTickleState(e_repeating);
 		}
 		else {
 			if (m_loopingChunkCursor)
 				m_loopingChunkCursor->Reset();
 			m_currentChunk = NULL;
-			SetTickleState(TickleState_Done);
+			SetTickleState(e_done);
 		}
 	}
 }
diff --git a/LEGO1/omni/src/common/mxobjectfactory.cpp b/LEGO1/omni/src/common/mxobjectfactory.cpp
index a4e5efd1..93f2e0a0 100644
--- a/LEGO1/omni/src/common/mxobjectfactory.cpp
+++ b/LEGO1/omni/src/common/mxobjectfactory.cpp
@@ -19,7 +19,7 @@ DECOMP_SIZE_ASSERT(MxObjectFactory, 0x38); // 100af1db
 // FUNCTION: LEGO1 0x100b0d80
 MxObjectFactory::MxObjectFactory()
 {
-#define X(V) this->m_id##V = MxAtomId(#V, LookupMode_Exact);
+#define X(V) this->m_id##V = MxAtomId(#V, e_exact);
 	FOR_MXOBJECTFACTORY_OBJECTS(X)
 #undef X
 }
@@ -28,7 +28,7 @@ MxObjectFactory::MxObjectFactory()
 MxCore* MxObjectFactory::Create(const char* p_name)
 {
 	MxCore* object = NULL;
-	MxAtomId atom(p_name, LookupMode_Exact);
+	MxAtomId atom(p_name, e_exact);
 
 	if (0) {
 	}
diff --git a/LEGO1/omni/src/common/mxpresenter.cpp b/LEGO1/omni/src/common/mxpresenter.cpp
index 97641c91..9d074278 100644
--- a/LEGO1/omni/src/common/mxpresenter.cpp
+++ b/LEGO1/omni/src/common/mxpresenter.cpp
@@ -21,7 +21,7 @@ DECOMP_SIZE_ASSERT(MxPresenter, 0x40);
 // FUNCTION: LEGO1 0x100b4d50
 void MxPresenter::Init()
 {
-	m_currentTickleState = TickleState_Idle;
+	m_currentTickleState = e_idle;
 	m_action = NULL;
 	m_location = MxPoint32(0, 0);
 	m_displayZ = 0;
@@ -41,7 +41,7 @@ MxResult MxPresenter::StartAction(MxStreamController*, MxDSAction* p_action)
 
 	this->m_location = MxPoint32(this->m_action->GetLocation()[0], this->m_action->GetLocation()[1]);
 	this->m_displayZ = this->m_action->GetLocation()[2];
-	ProgressTickleState(TickleState_Ready);
+	ProgressTickleState(e_ready);
 
 	return SUCCESS;
 }
@@ -70,7 +70,7 @@ void MxPresenter::EndAction()
 	this->m_action = NULL;
 	MxS32 previousTickleState = 1 << m_currentTickleState;
 	this->m_previousTickleStates |= previousTickleState;
-	this->m_currentTickleState = TickleState_Idle;
+	this->m_currentTickleState = e_idle;
 }
 
 // FUNCTION: LEGO1 0x100b4fc0
@@ -96,7 +96,7 @@ void MxPresenter::ParseExtra()
 			MxS32 val = token ? atoi(token) : 0;
 			MxEntity* result = MxOmni::GetInstance()->FindWorld(buf, val, this);
 
-			m_action->SetFlags(m_action->GetFlags() | MxDSAction::Flag_World);
+			m_action->SetFlags(m_action->GetFlags() | MxDSAction::c_world);
 
 			if (result)
 				SendToCompositePresenter(MxOmni::GetInstance());
@@ -112,11 +112,11 @@ void MxPresenter::SendToCompositePresenter(MxOmni* p_omni)
 
 #ifdef COMPAT_MODE
 		{
-			MxNotificationParam param(MXPRESENTER_NOTIFICATION, this);
+			MxNotificationParam param(c_notificationPresenter, this);
 			NotificationManager()->Send(m_compositePresenter, &param);
 		}
 #else
-		NotificationManager()->Send(m_compositePresenter, &MxNotificationParam(MXPRESENTER_NOTIFICATION, this));
+		NotificationManager()->Send(m_compositePresenter, &MxNotificationParam(c_notificationPresenter, this));
 #endif
 
 		m_action->SetOrigin(p_omni ? p_omni : MxOmni::GetInstance());
@@ -130,32 +130,32 @@ MxResult MxPresenter::Tickle()
 	MxAutoLocker lock(&this->m_criticalSection);
 
 	switch (this->m_currentTickleState) {
-	case TickleState_Ready:
+	case e_ready:
 		this->ReadyTickle();
 
-		if (m_currentTickleState != TickleState_Starting)
+		if (m_currentTickleState != e_starting)
 			break;
-	case TickleState_Starting:
+	case e_starting:
 		this->StartingTickle();
 
-		if (m_currentTickleState != TickleState_Streaming)
+		if (m_currentTickleState != e_streaming)
 			break;
-	case TickleState_Streaming:
+	case e_streaming:
 		this->StreamingTickle();
 
-		if (m_currentTickleState != TickleState_Repeating)
+		if (m_currentTickleState != e_repeating)
 			break;
-	case TickleState_Repeating:
+	case e_repeating:
 		this->RepeatingTickle();
 
-		if (m_currentTickleState != TickleState_unk5)
+		if (m_currentTickleState != e_unk5)
 			break;
-	case TickleState_unk5:
+	case e_unk5:
 		this->Unk5Tickle();
 
-		if (m_currentTickleState != TickleState_Done)
+		if (m_currentTickleState != e_done)
 			break;
-	case TickleState_Done:
+	case e_done:
 		this->DoneTickle();
 	default:
 		break;
@@ -171,9 +171,9 @@ void MxPresenter::Enable(MxBool p_enable)
 		MxU32 flags = this->m_action->GetFlags();
 
 		if (p_enable)
-			this->m_action->SetFlags(flags | MxDSAction::Flag_Enabled);
+			this->m_action->SetFlags(flags | MxDSAction::c_enabled);
 		else
-			this->m_action->SetFlags(flags & ~MxDSAction::Flag_Enabled);
+			this->m_action->SetFlags(flags & ~MxDSAction::c_enabled);
 	}
 }
 
@@ -185,7 +185,7 @@ const char* PresenterNameDispatch(const MxDSAction& p_action)
 
 	if (!name || strlen(name) == 0) {
 		switch (p_action.GetType()) {
-		case MxDSType_Anim:
+		case MxDSObject::e_anim:
 			format = ((MxDSAnim&) p_action).GetMediaFormat();
 			switch (format) {
 			case FOURCC(' ', 'F', 'L', 'C'):
@@ -197,7 +197,7 @@ const char* PresenterNameDispatch(const MxDSAction& p_action)
 			}
 			break;
 
-		case MxDSType_Sound:
+		case MxDSObject::e_sound:
 			format = ((MxDSSound&) p_action).GetMediaFormat();
 			switch (format) {
 			case FOURCC(' ', 'M', 'I', 'D'):
@@ -209,17 +209,17 @@ const char* PresenterNameDispatch(const MxDSAction& p_action)
 			}
 			break;
 
-		case MxDSType_SerialAction:
-		case MxDSType_ParallelAction:
-		case MxDSType_SelectAction:
+		case MxDSObject::e_serialAction:
+		case MxDSObject::e_parallelAction:
+		case MxDSObject::e_selectAction:
 			name = "MxCompositePresenter";
 			break;
 
-		case MxDSType_Event:
+		case MxDSObject::e_event:
 			name = "MxEventPresenter";
 			break;
 
-		case MxDSType_Still:
+		case MxDSObject::e_still:
 			name = "MxStillPresenter";
 			break;
 		}
@@ -252,5 +252,5 @@ MxEntity* MxPresenter::CreateEntity(const char* p_name)
 // FUNCTION: LEGO1 0x100b54c0
 MxBool MxPresenter::IsEnabled()
 {
-	return this->m_action && this->m_action->GetFlags() & MxDSAction::Flag_Enabled;
+	return this->m_action && this->m_action->GetFlags() & MxDSAction::c_enabled;
 }
diff --git a/LEGO1/omni/src/event/mxeventpresenter.cpp b/LEGO1/omni/src/event/mxeventpresenter.cpp
index 010ef589..03b0de14 100644
--- a/LEGO1/omni/src/event/mxeventpresenter.cpp
+++ b/LEGO1/omni/src/event/mxeventpresenter.cpp
@@ -71,7 +71,7 @@ void MxEventPresenter::ReadyTickle()
 		CopyData(chunk);
 		m_subscriber->DestroyChunk(chunk);
 		ParseExtra();
-		ProgressTickleState(TickleState_Starting);
+		ProgressTickleState(e_starting);
 	}
 }
 
@@ -81,7 +81,7 @@ void MxEventPresenter::StartingTickle()
 	MxStreamChunk* chunk = CurrentChunk();
 
 	if (chunk && m_action->GetElapsedTime() >= chunk->GetTime())
-		ProgressTickleState(TickleState_Streaming);
+		ProgressTickleState(e_streaming);
 }
 
 // FUNCTION: LEGO1 0x100c2ef0
@@ -90,8 +90,8 @@ MxResult MxEventPresenter::PutData()
 	MxAutoLocker lock(&m_criticalSection);
 
 	if (IsEnabled()) {
-		if (m_currentTickleState >= TickleState_Streaming &&
-			(m_currentTickleState <= TickleState_Repeating || m_currentTickleState == TickleState_Done)) {
+		if (m_currentTickleState >= e_streaming &&
+			(m_currentTickleState <= e_repeating || m_currentTickleState == e_done)) {
 			if (m_currentChunk && m_currentChunk->GetLength()) {
 				if (m_data[12] == 2) {
 					const char* data = (const char*) m_currentChunk->GetData();
@@ -103,7 +103,7 @@ MxResult MxEventPresenter::PutData()
 					variableTable->SetVariable(key, value);
 				}
 
-				if (m_currentTickleState == TickleState_Streaming)
+				if (m_currentTickleState == e_streaming)
 					m_subscriber->DestroyChunk(m_currentChunk);
 				m_currentChunk = NULL;
 			}
diff --git a/LEGO1/omni/src/stream/mxdiskstreamcontroller.cpp b/LEGO1/omni/src/stream/mxdiskstreamcontroller.cpp
index c0708acc..0b0ee1c2 100644
--- a/LEGO1/omni/src/stream/mxdiskstreamcontroller.cpp
+++ b/LEGO1/omni/src/stream/mxdiskstreamcontroller.cpp
@@ -129,7 +129,7 @@ void MxDiskStreamController::FUN_100c7980()
 		if (m_unk0x3c.size() && m_unk0x8c < m_provider->GetStreamBuffersNum()) {
 			buffer = new MxDSBuffer();
 
-			if (buffer->AllocateBuffer(m_provider->GetFileSize(), MxDSBufferType_Chunk) != SUCCESS) {
+			if (buffer->AllocateBuffer(m_provider->GetFileSize(), MxDSBuffer::e_chunk) != SUCCESS) {
 				if (buffer)
 					delete buffer;
 				return;
@@ -213,10 +213,10 @@ void MxDiskStreamController::FUN_100c7cb0(MxDSStreamingAction* p_action)
 void MxDiskStreamController::FUN_100c7ce0(MxDSBuffer* p_buffer)
 {
 	switch (p_buffer->GetMode()) {
-	case MxDSBufferType_Chunk:
+	case MxDSBuffer::e_chunk:
 		m_unk0x8c--;
-	case MxDSBufferType_Allocate:
-	case MxDSBufferType_Unknown:
+	case MxDSBuffer::e_allocate:
+	case MxDSBuffer::e_unknown:
 		delete p_buffer;
 		break;
 	}
diff --git a/LEGO1/omni/src/stream/mxdiskstreamprovider.cpp b/LEGO1/omni/src/stream/mxdiskstreamprovider.cpp
index 647794dd..7b4b6ef5 100644
--- a/LEGO1/omni/src/stream/mxdiskstreamprovider.cpp
+++ b/LEGO1/omni/src/stream/mxdiskstreamprovider.cpp
@@ -174,7 +174,7 @@ MxResult MxDiskStreamProvider::FUN_100d1780(MxDSStreamingAction* p_action)
 		if (!buffer)
 			return FAILURE;
 
-		if (buffer->AllocateBuffer(GetFileSize(), MxDSBufferType_Allocate) != SUCCESS) {
+		if (buffer->AllocateBuffer(GetFileSize(), MxDSBuffer::e_allocate) != SUCCESS) {
 			delete buffer;
 			return FAILURE;
 		}
@@ -282,7 +282,7 @@ MxResult MxDiskStreamProvider::FUN_100d1b20(MxDSStreamingAction* p_action)
 	MxU32 size = p_action->GetUnknowna0()->GetWriteOffset() - p_action->GetUnknown94() + p_action->GetBufferOffset() +
 				 (p_action->GetUnknowna4() ? p_action->GetUnknowna4()->GetWriteOffset() : 0);
 
-	if (buffer->AllocateBuffer(size, MxDSBufferType_Allocate) != SUCCESS) {
+	if (buffer->AllocateBuffer(size, MxDSBuffer::e_allocate) != SUCCESS) {
 		if (!buffer)
 			return FAILURE;
 
@@ -330,12 +330,12 @@ MxResult MxDiskStreamProvider::FUN_100d1b20(MxDSStreamingAction* p_action)
 				if (!buffer3)
 					return FAILURE;
 
-				if (buffer3->AllocateBuffer(size, MxDSBufferType_Allocate) == SUCCESS) {
+				if (buffer3->AllocateBuffer(size, MxDSBuffer::e_allocate) == SUCCESS) {
 					memcpy(buffer3->GetBuffer(), p_action->GetUnknowna4()->GetBuffer(), size);
-					p_action->GetUnknowna4()->SetMode(MxDSBufferType_Allocate);
+					p_action->GetUnknowna4()->SetMode(MxDSBuffer::e_allocate);
 					delete p_action->GetUnknowna4();
 
-					buffer3->SetMode(MxDSBufferType_Unknown);
+					buffer3->SetMode(MxDSBuffer::e_unknown);
 					p_action->SetUnknowna4(buffer3);
 					MxDSBuffer* buffer4 = p_action->GetUnknowna0();
 					MxU32 unk0x14 = buffer4->GetUnknown14();
diff --git a/LEGO1/omni/src/stream/mxdsbuffer.cpp b/LEGO1/omni/src/stream/mxdsbuffer.cpp
index 54ed0ca2..380cc1e0 100644
--- a/LEGO1/omni/src/stream/mxdsbuffer.cpp
+++ b/LEGO1/omni/src/stream/mxdsbuffer.cpp
@@ -22,7 +22,7 @@ MxDSBuffer::MxDSBuffer()
 	m_unk0x1c = 0;
 	m_writeOffset = 0;
 	m_bytesRemaining = 0;
-	m_mode = MxDSBufferType_Preallocated;
+	m_mode = e_preallocated;
 	m_unk0x30 = 0;
 }
 
@@ -31,12 +31,12 @@ MxDSBuffer::~MxDSBuffer()
 {
 	if (m_pBuffer != NULL) {
 		switch (m_mode) {
-		case MxDSBufferType_Allocate:
-		case MxDSBufferType_Unknown:
+		case e_allocate:
+		case e_unknown:
 			delete[] m_pBuffer;
 			break;
 
-		case MxDSBufferType_Chunk: {
+		case e_chunk: {
 			MxU32 offset = m_writeOffset / 1024;
 			MxStreamer* streamer = Streamer();
 
@@ -77,16 +77,16 @@ MxDSBuffer::~MxDSBuffer()
 }
 
 // FUNCTION: LEGO1 0x100c6640
-MxResult MxDSBuffer::AllocateBuffer(MxU32 p_bufferSize, MxDSBufferType p_mode)
+MxResult MxDSBuffer::AllocateBuffer(MxU32 p_bufferSize, Type p_mode)
 {
 	MxResult result = FAILURE;
 
 	switch (p_mode) {
-	case MxDSBufferType_Allocate:
+	case e_allocate:
 		m_pBuffer = new MxU8[p_bufferSize];
 		break;
 
-	case MxDSBufferType_Chunk: {
+	case e_chunk: {
 		MxStreamer* streamer = Streamer();
 
 		switch (p_bufferSize / 1024) {
@@ -150,7 +150,7 @@ MxResult MxDSBuffer::SetBufferPointer(MxU8* p_buffer, MxU32 p_size)
 	m_pIntoBuffer2 = p_buffer;
 	m_bytesRemaining = p_size;
 	m_writeOffset = p_size;
-	m_mode = MxDSBufferType_Preallocated;
+	m_mode = e_preallocated;
 	return SUCCESS;
 }
 
@@ -291,24 +291,24 @@ MxResult MxDSBuffer::ParseChunk(
 {
 	MxResult result = SUCCESS;
 
-	if (m_unk0x30->GetFlags() & MxDSAction::Flag_Bit3 && m_unk0x30->GetUnknowna8() && p_header->GetTime() < 0) {
+	if (m_unk0x30->GetFlags() & MxDSAction::c_bit3 && m_unk0x30->GetUnknowna8() && p_header->GetTime() < 0) {
 		delete p_header;
 		return SUCCESS;
 	}
 
 	p_header->SetTime(p_header->GetTime() + m_unk0x30->GetUnknowna8());
 
-	if (p_header->GetFlags() & MxDSChunk::Flag_Split) {
+	if (p_header->GetFlags() & MxDSChunk::c_split) {
 		MxU32 length = p_header->GetLength() + MxDSChunk::GetHeaderSize() + 8;
 		MxDSBuffer* buffer = new MxDSBuffer();
 
-		if (buffer && buffer->AllocateBuffer(length, MxDSBufferType_Allocate) == SUCCESS &&
+		if (buffer && buffer->AllocateBuffer(length, e_allocate) == SUCCESS &&
 			buffer->CalcBytesRemaining((MxU8*) p_data) == SUCCESS) {
 			*p_streamingAction = new MxDSStreamingAction((MxDSStreamingAction&) *p_action);
 
 			if (*p_streamingAction) {
 				MxU16* flags = MxStreamChunk::IntoFlags(buffer->GetBuffer());
-				*flags = p_header->GetFlags() & ~MxDSChunk::Flag_Split;
+				*flags = p_header->GetFlags() & ~MxDSChunk::c_split;
 
 				delete p_header;
 				(*p_streamingAction)->SetUnknowna0(buffer);
@@ -323,9 +323,9 @@ MxResult MxDSBuffer::ParseChunk(
 		return FAILURE;
 	}
 	else {
-		if (p_header->GetFlags() & MxDSChunk::Flag_End) {
+		if (p_header->GetFlags() & MxDSChunk::c_end) {
 			if (m_unk0x30->HasId(p_header->GetObjectId())) {
-				if (m_unk0x30->GetFlags() & MxDSAction::Flag_Bit3 &&
+				if (m_unk0x30->GetFlags() & MxDSAction::c_bit3 &&
 					(m_unk0x30->GetLoopCount() > 1 || m_unk0x30->GetDuration() == -1)) {
 
 					if (p_action->GetObjectId() == p_header->GetObjectId()) {
@@ -456,7 +456,7 @@ MxResult MxDSBuffer::CalcBytesRemaining(MxU8* p_data)
 {
 	MxResult result = FAILURE;
 
-	if (m_mode == MxDSBufferType_Allocate && m_bytesRemaining != 0) {
+	if (m_mode == e_allocate && m_bytesRemaining != 0) {
 		MxU32 bytesRead;
 		MxU8* ptr;
 
diff --git a/LEGO1/omni/src/stream/mxdschunk.cpp b/LEGO1/omni/src/stream/mxdschunk.cpp
index 79b9fea1..61d794cc 100644
--- a/LEGO1/omni/src/stream/mxdschunk.cpp
+++ b/LEGO1/omni/src/stream/mxdschunk.cpp
@@ -15,7 +15,7 @@ MxDSChunk::MxDSChunk()
 // FUNCTION: LEGO1 0x100be170
 MxDSChunk::~MxDSChunk()
 {
-	if (m_flags & Flag_Bit1)
+	if (m_flags & c_bit1)
 		delete[] m_data;
 }
 
diff --git a/LEGO1/omni/src/stream/mxdssubscriber.cpp b/LEGO1/omni/src/stream/mxdssubscriber.cpp
index f93969e1..82ca1730 100644
--- a/LEGO1/omni/src/stream/mxdssubscriber.cpp
+++ b/LEGO1/omni/src/stream/mxdssubscriber.cpp
@@ -119,7 +119,7 @@ void MxDSSubscriber::DestroyChunk(MxStreamChunk* p_chunk)
 			if (p_chunk)
 				delete p_chunk;
 		}
-		else if (p_chunk->GetFlags() & MxDSChunk::Flag_Bit1 && p_chunk)
+		else if (p_chunk->GetFlags() & MxDSChunk::c_bit1 && p_chunk)
 			delete p_chunk;
 	}
 }
diff --git a/LEGO1/omni/src/stream/mxramstreamprovider.cpp b/LEGO1/omni/src/stream/mxramstreamprovider.cpp
index 40a12c8a..ca091d12 100644
--- a/LEGO1/omni/src/stream/mxramstreamprovider.cpp
+++ b/LEGO1/omni/src/stream/mxramstreamprovider.cpp
@@ -124,22 +124,22 @@ MxU32 ReadData(MxU8* p_buffer, MxU32 p_size)
 						data += MxDSChunk::Size(*psize);
 
 						if ((*MxDSChunk::IntoType(data2) == FOURCC('M', 'x', 'C', 'h')) &&
-							(*MxStreamChunk::IntoFlags(data2) & MxDSChunk::Flag_Split)) {
+							(*MxStreamChunk::IntoFlags(data2) & MxDSChunk::c_split)) {
 							if (*MxStreamChunk::IntoObjectId(data2) == *MxStreamChunk::IntoObjectId(data3) &&
-								(*MxStreamChunk::IntoFlags(data3) & MxDSChunk::Flag_Split) &&
+								(*MxStreamChunk::IntoFlags(data3) & MxDSChunk::c_split) &&
 								*MxStreamChunk::IntoTime(data2) == *MxStreamChunk::IntoTime(data3)) {
 								MxDSBuffer::Append(data2, data3);
 								continue;
 							}
 							else
-								*MxStreamChunk::IntoFlags(data2) &= ~MxDSChunk::Flag_Split;
+								*MxStreamChunk::IntoFlags(data2) &= ~MxDSChunk::c_split;
 						}
 
 						data2 += MxDSChunk::Size(*MxDSChunk::IntoLength(data2));
 						memcpy(data2, data3, MxDSChunk::Size(*psize));
 
 						if (*MxStreamChunk::IntoObjectId(data2) == id &&
-							(*MxStreamChunk::IntoFlags(data2) & MxDSChunk::Flag_End))
+							(*MxStreamChunk::IntoFlags(data2) & MxDSChunk::c_end))
 							break;
 					}
 					else
@@ -151,6 +151,6 @@ MxU32 ReadData(MxU8* p_buffer, MxU32 p_size)
 		} while (data < end);
 	}
 
-	*MxStreamChunk::IntoFlags(data2) &= ~MxDSChunk::Flag_Split;
+	*MxStreamChunk::IntoFlags(data2) &= ~MxDSChunk::c_split;
 	return MxDSChunk::End(data2) - p_buffer;
 }
diff --git a/LEGO1/omni/src/stream/mxstreamchunk.cpp b/LEGO1/omni/src/stream/mxstreamchunk.cpp
index 4dceabec..ba833186 100644
--- a/LEGO1/omni/src/stream/mxstreamchunk.cpp
+++ b/LEGO1/omni/src/stream/mxstreamchunk.cpp
@@ -54,7 +54,7 @@ MxResult MxStreamChunk::SendChunk(MxStreamListMxDSSubscriber& p_subscriberList,
 {
 	for (MxStreamListMxDSSubscriber::iterator it = p_subscriberList.begin(); it != p_subscriberList.end(); it++) {
 		if ((*it)->GetObjectId() == m_objectId && (*it)->GetUnknown48() == p_obj24val) {
-			if (m_flags & MxDSChunk::Flag_End && m_buffer) {
+			if (m_flags & MxDSChunk::c_end && m_buffer) {
 				m_buffer->ReleaseRef(this);
 				m_buffer = NULL;
 			}
diff --git a/LEGO1/omni/src/stream/mxstreamcontroller.cpp b/LEGO1/omni/src/stream/mxstreamcontroller.cpp
index caacbb5f..204bdab8 100644
--- a/LEGO1/omni/src/stream/mxstreamcontroller.cpp
+++ b/LEGO1/omni/src/stream/mxstreamcontroller.cpp
@@ -82,7 +82,7 @@ MxResult MxStreamController::Open(const char* p_filename)
 	MxAutoLocker lock(&m_criticalSection);
 
 	MakeSourceName(sourceName, p_filename);
-	this->m_atom = MxAtomId(sourceName, LookupMode_LowerCase2);
+	this->m_atom = MxAtomId(sourceName, e_lowerCase2);
 	return SUCCESS;
 }
 
@@ -271,7 +271,7 @@ MxResult MxStreamController::FUN_100c1f00(MxDSAction* p_action)
 	if (!chunk)
 		return FAILURE;
 
-	chunk->SetFlags(MxDSChunk::Flag_Bit3);
+	chunk->SetFlags(MxDSChunk::c_bit3);
 	chunk->SetObjectId(objectId);
 
 	if (chunk->SendChunk(m_subscriberList, FALSE, p_action->GetUnknown24()) != SUCCESS)
diff --git a/LEGO1/omni/src/stream/mxstreamer.cpp b/LEGO1/omni/src/stream/mxstreamer.cpp
index 245a757f..6ab4e47d 100644
--- a/LEGO1/omni/src/stream/mxstreamer.cpp
+++ b/LEGO1/omni/src/stream/mxstreamer.cpp
@@ -50,7 +50,7 @@ MxStreamController* MxStreamer::Open(const char* p_name, MxU16 p_lookupType)
 
 	if (!GetOpenStream(p_name)) {
 		switch (p_lookupType) {
-		case e_DiskStream:
+		case e_diskStream:
 			stream = new MxDiskStreamController();
 			break;
 		case e_RAMStream:
@@ -84,11 +84,11 @@ MxLong MxStreamer::Close(const char* p_name)
 			else {
 #ifdef COMPAT_MODE
 				{
-					MxStreamerNotification notification(MXSTREAMER_DELETE_NOTIFY, NULL, c);
+					MxStreamerNotification notification(c_notificationStreamer, NULL, c);
 					NotificationManager()->Send(this, &notification);
 				}
 #else
-				NotificationManager()->Send(this, &MxStreamerNotification(MXSTREAMER_DELETE_NOTIFY, NULL, c));
+				NotificationManager()->Send(this, &MxStreamerNotification(c_notificationStreamer, NULL, c));
 #endif
 			}
 
@@ -184,7 +184,7 @@ MxBool MxStreamer::FUN_100b9b30(MxDSObject& p_dsObject)
 // FUNCTION: LEGO1 0x100b9b60
 MxLong MxStreamer::Notify(MxParam& p_param)
 {
-	if (((MxNotificationParam&) p_param).GetNotification() == MXSTREAMER_DELETE_NOTIFY) {
+	if (((MxNotificationParam&) p_param).GetNotification() == c_notificationStreamer) {
 		MxDSAction ds;
 
 		ds.SetUnknown24(-2);
@@ -196,11 +196,11 @@ MxLong MxStreamer::Notify(MxParam& p_param)
 		else {
 #ifdef COMPAT_MODE
 			{
-				MxStreamerNotification notification(MXSTREAMER_DELETE_NOTIFY, NULL, c);
+				MxStreamerNotification notification(c_notificationStreamer, NULL, c);
 				NotificationManager()->Send(this, &notification);
 			}
 #else
-			NotificationManager()->Send(this, &MxStreamerNotification(MXSTREAMER_DELETE_NOTIFY, NULL, c));
+			NotificationManager()->Send(this, &MxStreamerNotification(c_notificationStreamer, NULL, c));
 #endif
 		}
 	}
diff --git a/LEGO1/omni/src/video/mxdisplaysurface.cpp b/LEGO1/omni/src/video/mxdisplaysurface.cpp
index 8761cc02..d744accd 100644
--- a/LEGO1/omni/src/video/mxdisplaysurface.cpp
+++ b/LEGO1/omni/src/video/mxdisplaysurface.cpp
@@ -34,7 +34,7 @@ void MxDisplaySurface::Init()
 }
 
 // FUNCTION: LEGO1 0x100ba640
-void MxDisplaySurface::FUN_100ba640()
+void MxDisplaySurface::ClearScreen()
 {
 	MxS32 backBuffers;
 	DDSURFACEDESC desc;
diff --git a/LEGO1/omni/src/video/mxflcpresenter.cpp b/LEGO1/omni/src/video/mxflcpresenter.cpp
index 76cc7efe..de334852 100644
--- a/LEGO1/omni/src/video/mxflcpresenter.cpp
+++ b/LEGO1/omni/src/video/mxflcpresenter.cpp
@@ -12,8 +12,8 @@ DECOMP_SIZE_ASSERT(MxFlcPresenter, 0x68);
 MxFlcPresenter::MxFlcPresenter()
 {
 	this->m_flicHeader = NULL;
-	this->m_flags &= ~Flag_Bit2;
-	this->m_flags &= ~Flag_Bit3;
+	this->m_flags &= ~c_bit2;
+	this->m_flags &= ~c_bit3;
 }
 
 // FUNCTION: LEGO1 0x100b3420
diff --git a/LEGO1/omni/src/video/mxloopingflcpresenter.cpp b/LEGO1/omni/src/video/mxloopingflcpresenter.cpp
index 07af2513..dcdeba96 100644
--- a/LEGO1/omni/src/video/mxloopingflcpresenter.cpp
+++ b/LEGO1/omni/src/video/mxloopingflcpresenter.cpp
@@ -20,8 +20,8 @@ MxLoopingFlcPresenter::~MxLoopingFlcPresenter()
 void MxLoopingFlcPresenter::Init()
 {
 	this->m_unk0x68 = 0;
-	this->m_flags &= ~Flag_Bit2;
-	this->m_flags &= ~Flag_Bit3;
+	this->m_flags &= ~c_bit2;
+	this->m_flags &= ~c_bit3;
 }
 
 // FUNCTION: LEGO1 0x100b4430
@@ -40,8 +40,8 @@ void MxLoopingFlcPresenter::NextFrame()
 {
 	MxStreamChunk* chunk = NextChunk();
 
-	if (chunk->GetFlags() & MxDSChunk::Flag_End)
-		ProgressTickleState(TickleState_Repeating);
+	if (chunk->GetFlags() & MxDSChunk::c_end)
+		ProgressTickleState(e_repeating);
 	else {
 		LoadFrame(chunk);
 		LoopChunk(chunk);
diff --git a/LEGO1/omni/src/video/mxloopingsmkpresenter.cpp b/LEGO1/omni/src/video/mxloopingsmkpresenter.cpp
index 29ee1747..51ed74c8 100644
--- a/LEGO1/omni/src/video/mxloopingsmkpresenter.cpp
+++ b/LEGO1/omni/src/video/mxloopingsmkpresenter.cpp
@@ -21,8 +21,8 @@ MxLoopingSmkPresenter::~MxLoopingSmkPresenter()
 void MxLoopingSmkPresenter::Init()
 {
 	this->m_elapsedDuration = 0;
-	this->m_flags &= ~Flag_Bit2;
-	this->m_flags &= ~Flag_Bit3;
+	this->m_flags &= ~c_bit2;
+	this->m_flags &= ~c_bit3;
 }
 
 // FUNCTION: LEGO1 0x100b49d0
@@ -51,8 +51,8 @@ void MxLoopingSmkPresenter::NextFrame()
 {
 	MxStreamChunk* chunk = NextChunk();
 
-	if (chunk->GetFlags() & MxDSChunk::Flag_End)
-		ProgressTickleState(TickleState_Repeating);
+	if (chunk->GetFlags() & MxDSChunk::c_end)
+		ProgressTickleState(e_repeating);
 	else {
 		LoadFrame(chunk);
 		LoopChunk(chunk);
@@ -66,7 +66,7 @@ void MxLoopingSmkPresenter::NextFrame()
 void MxLoopingSmkPresenter::VTable0x8c()
 {
 	if (m_action->GetDuration() < m_elapsedDuration)
-		ProgressTickleState(TickleState_unk5);
+		ProgressTickleState(e_unk5);
 	else {
 		MxStreamChunk* chunk;
 		m_loopingChunkCursor->Current(chunk);
@@ -108,7 +108,7 @@ void MxLoopingSmkPresenter::RepeatingTickle()
 
 		m_loopingChunkCursor->Next(chunk);
 
-		if (m_currentTickleState != TickleState_Repeating)
+		if (m_currentTickleState != e_repeating)
 			break;
 	}
 }
diff --git a/LEGO1/omni/src/video/mxsmkpresenter.cpp b/LEGO1/omni/src/video/mxsmkpresenter.cpp
index 17985fdd..b8001623 100644
--- a/LEGO1/omni/src/video/mxsmkpresenter.cpp
+++ b/LEGO1/omni/src/video/mxsmkpresenter.cpp
@@ -23,8 +23,8 @@ void MxSmkPresenter::Init()
 {
 	m_currentFrame = 0;
 	memset(&m_mxSmack, 0, sizeof(m_mxSmack));
-	m_flags &= ~Flag_Bit2;
-	m_flags &= ~Flag_Bit3;
+	m_flags &= ~c_bit2;
+	m_flags &= ~c_bit3;
 }
 
 // FUNCTION: LEGO1 0x100b3900
diff --git a/LEGO1/omni/src/video/mxstillpresenter.cpp b/LEGO1/omni/src/video/mxstillpresenter.cpp
index 8d50f021..f3d0ef67 100644
--- a/LEGO1/omni/src/video/mxstillpresenter.cpp
+++ b/LEGO1/omni/src/video/mxstillpresenter.cpp
@@ -75,13 +75,13 @@ void MxStillPresenter::LoadFrame(MxStreamChunk* p_chunk)
 	MxRect32 rect(x, y, width + x, height + y);
 	MVideoManager()->InvalidateRect(rect);
 
-	if (m_flags & Flag_Bit2) {
+	if (m_flags & c_bit2) {
 		undefined4 und = 0;
 		m_unk0x58 = MxOmni::GetInstance()->GetVideoManager()->GetDisplaySurface()->VTable0x44(
 			m_bitmap,
 			&und,
-			(m_flags & Flag_Bit4) / 8,
-			m_action->GetFlags() & MxDSAction::Flag_Bit4
+			(m_flags & c_bit4) / 8,
+			m_action->GetFlags() & MxDSAction::c_bit4
 		);
 
 		delete m_alpha;
@@ -91,9 +91,9 @@ void MxStillPresenter::LoadFrame(MxStreamChunk* p_chunk)
 		m_bitmap = NULL;
 
 		if (m_unk0x58 && und)
-			m_flags |= Flag_Bit3;
+			m_flags |= c_bit3;
 		else
-			m_flags &= ~Flag_Bit3;
+			m_flags &= ~c_bit3;
 	}
 }
 
@@ -110,7 +110,7 @@ void MxStillPresenter::StartingTickle()
 {
 	MxVideoPresenter::StartingTickle();
 
-	if (m_currentTickleState == TickleState_Streaming && ((MxDSMediaAction*) m_action)->GetPaletteManagement())
+	if (m_currentTickleState == e_streaming && ((MxDSMediaAction*) m_action)->GetPaletteManagement())
 		RealizePalette();
 }
 
@@ -122,7 +122,7 @@ void MxStillPresenter::StreamingTickle()
 	if (chunk && m_action->GetElapsedTime() >= chunk->GetTime()) {
 		m_chunkTime = chunk->GetTime();
 		NextFrame();
-		ProgressTickleState(TickleState_Repeating);
+		ProgressTickleState(e_repeating);
 
 		if (m_action->GetDuration() == -1 && m_compositePresenter)
 			m_compositePresenter->VTable0x60(this);
@@ -134,7 +134,7 @@ void MxStillPresenter::RepeatingTickle()
 {
 	if (m_action->GetDuration() != -1) {
 		if (m_action->GetElapsedTime() >= m_action->GetStartTime() + m_action->GetDuration())
-			ProgressTickleState(TickleState_unk5);
+			ProgressTickleState(e_unk5);
 	}
 }
 
@@ -185,8 +185,8 @@ void MxStillPresenter::ParseExtra()
 {
 	MxPresenter::ParseExtra();
 
-	if (m_action->GetFlags() & MxDSAction::Flag_Bit5)
-		m_flags |= Flag_Bit4;
+	if (m_action->GetFlags() & MxDSAction::c_bit5)
+		m_flags |= c_bit4;
 
 	MxU32 len = m_action->GetExtraLength();
 
@@ -207,9 +207,9 @@ void MxStillPresenter::ParseExtra()
 	}
 
 	if (KeyValueStringParse(output, g_strBmpIsmap, buf)) {
-		m_flags |= Flag_Bit5;
-		m_flags &= ~Flag_Bit2;
-		m_flags &= ~Flag_Bit3;
+		m_flags |= c_bit5;
+		m_flags &= ~c_bit2;
+		m_flags &= ~c_bit3;
 	}
 }
 
diff --git a/LEGO1/omni/src/video/mxvideopresenter.cpp b/LEGO1/omni/src/video/mxvideopresenter.cpp
index 84a59121..9fbf2cee 100644
--- a/LEGO1/omni/src/video/mxvideopresenter.cpp
+++ b/LEGO1/omni/src/video/mxvideopresenter.cpp
@@ -117,16 +117,16 @@ void MxVideoPresenter::Init()
 	m_unk0x5c = 1;
 	m_unk0x58 = NULL;
 	m_unk0x60 = -1;
-	m_flags &= ~Flag_Bit1;
+	m_flags &= ~c_bit1;
 
 	if (MVideoManager() != NULL) {
 		MVideoManager();
-		m_flags |= Flag_Bit2;
-		m_flags &= ~Flag_Bit3;
+		m_flags |= c_bit2;
+		m_flags &= ~c_bit3;
 	}
 
-	m_flags &= ~Flag_Bit4;
-	m_flags &= ~Flag_Bit5;
+	m_flags &= ~c_bit4;
+	m_flags &= ~c_bit5;
 }
 
 // FUNCTION: LEGO1 0x100b27b0
@@ -138,8 +138,8 @@ void MxVideoPresenter::Destroy(MxBool p_fromDestructor)
 	if (m_unk0x58) {
 		m_unk0x58->Release();
 		m_unk0x58 = NULL;
-		m_flags &= ~Flag_Bit2;
-		m_flags &= ~Flag_Bit3;
+		m_flags &= ~c_bit2;
+		m_flags &= ~c_bit3;
 	}
 
 	if (MVideoManager() && (m_alpha || m_bitmap)) {
@@ -168,9 +168,9 @@ void MxVideoPresenter::NextFrame()
 {
 	MxStreamChunk* chunk = NextChunk();
 
-	if (chunk->GetFlags() & MxDSChunk::Flag_End) {
+	if (chunk->GetFlags() & MxDSChunk::c_end) {
 		m_subscriber->DestroyChunk(chunk);
-		ProgressTickleState(TickleState_Repeating);
+		ProgressTickleState(e_repeating);
 	}
 	else {
 		LoadFrame(chunk);
@@ -182,7 +182,7 @@ void MxVideoPresenter::NextFrame()
 MxBool MxVideoPresenter::IsHit(MxS32 p_x, MxS32 p_y)
 {
 	MxDSAction* action = GetAction();
-	if ((action == NULL) || (((action->GetFlags() & MxDSAction::Flag_Bit11) == 0) && !IsEnabled()) ||
+	if ((action == NULL) || (((action->GetFlags() & MxDSAction::c_bit11) == 0) && !IsEnabled()) ||
 		(!m_bitmap && !m_alpha))
 		return FALSE;
 
@@ -234,7 +234,7 @@ MxBool MxVideoPresenter::IsHit(MxS32 p_x, MxS32 p_y)
 	if (m_flags & 0x10)
 		return (MxBool) *pixel;
 
-	if ((GetAction()->GetFlags() & MxDSAction::Flag_Bit4) && *pixel == 0)
+	if ((GetAction()->GetFlags() & MxDSAction::c_bit4) && *pixel == 0)
 		return FALSE;
 
 	return TRUE;
@@ -284,7 +284,7 @@ void MxVideoPresenter::PutFrame()
 	LPDIRECTDRAWSURFACE ddSurface = displaySurface->GetDirectDrawSurface2();
 
 	MxRect32 rectSrc, rectDest;
-	if (m_action->GetFlags() & MxDSAction::Flag_Bit5) {
+	if (m_action->GetFlags() & MxDSAction::c_bit5) {
 		if (m_unk0x58) {
 			// TODO: Match
 			rectSrc.SetPoint(MxPoint32(0, 0));
@@ -340,7 +340,7 @@ void MxVideoPresenter::PutFrame()
 					rectDest.SetBottom(rectDest.GetTop() + regionRect->GetHeight());
 				}
 
-				if (m_action->GetFlags() & MxDSAction::Flag_Bit4) {
+				if (m_action->GetFlags() & MxDSAction::c_bit4) {
 					if (m_unk0x58) {
 						if (PrepareRects(rectDest, rectSrc) >= 0)
 							ddSurface->Blt((LPRECT) &rectDest, m_unk0x58, (LPRECT) &rectSrc, DDBLT_KEYSRC, NULL);
@@ -387,7 +387,7 @@ void MxVideoPresenter::ReadyTickle()
 		LoadHeader(chunk);
 		m_subscriber->DestroyChunk(chunk);
 		ParseExtra();
-		ProgressTickleState(TickleState_Starting);
+		ProgressTickleState(e_starting);
 	}
 }
 
@@ -398,14 +398,14 @@ void MxVideoPresenter::StartingTickle()
 
 	if (chunk && m_action->GetElapsedTime() >= chunk->GetTime()) {
 		CreateBitmap();
-		ProgressTickleState(TickleState_Streaming);
+		ProgressTickleState(e_streaming);
 	}
 }
 
 // FUNCTION: LEGO1 0x100b2fe0
 void MxVideoPresenter::StreamingTickle()
 {
-	if (m_action->GetFlags() & MxDSAction::Flag_Bit10) {
+	if (m_action->GetFlags() & MxDSAction::c_bit10) {
 		if (!m_currentChunk)
 			MxMediaPresenter::StreamingTickle();
 
@@ -429,13 +429,13 @@ void MxVideoPresenter::StreamingTickle()
 			LoadFrame(m_currentChunk);
 			m_subscriber->DestroyChunk(m_currentChunk);
 			m_currentChunk = NULL;
-			m_flags |= Flag_Bit1;
+			m_flags |= c_bit1;
 
-			if (m_currentTickleState != TickleState_Streaming)
+			if (m_currentTickleState != e_streaming)
 				break;
 		}
 
-		if (m_flags & Flag_Bit1)
+		if (m_flags & c_bit1)
 			m_unk0x5c = 5;
 	}
 }
@@ -444,7 +444,7 @@ void MxVideoPresenter::StreamingTickle()
 void MxVideoPresenter::RepeatingTickle()
 {
 	if (IsEnabled()) {
-		if (m_action->GetFlags() & MxDSAction::Flag_Bit10) {
+		if (m_action->GetFlags() & MxDSAction::c_bit10) {
 			if (!m_currentChunk)
 				MxMediaPresenter::RepeatingTickle();
 
@@ -467,13 +467,13 @@ void MxVideoPresenter::RepeatingTickle()
 
 				LoadFrame(m_currentChunk);
 				m_currentChunk = NULL;
-				m_flags |= Flag_Bit1;
+				m_flags |= c_bit1;
 
-				if (m_currentTickleState != TickleState_Repeating)
+				if (m_currentTickleState != e_repeating)
 					break;
 			}
 
-			if (m_flags & Flag_Bit1)
+			if (m_flags & c_bit1)
 				m_unk0x5c = 5;
 		}
 	}
@@ -490,10 +490,10 @@ void MxVideoPresenter::Unk5Tickle()
 				m_unk0x60 = m_action->GetElapsedTime();
 
 			if (m_action->GetElapsedTime() >= m_unk0x60 + ((MxDSMediaAction*) m_action)->GetSustainTime())
-				ProgressTickleState(TickleState_Done);
+				ProgressTickleState(e_done);
 		}
 		else
-			ProgressTickleState(TickleState_Done);
+			ProgressTickleState(e_done);
 	}
 }
 
@@ -535,7 +535,7 @@ MxResult MxVideoPresenter::PutData()
 {
 	MxAutoLocker lock(&m_criticalSection);
 
-	if (IsEnabled() && m_currentTickleState >= TickleState_Streaming && m_currentTickleState <= TickleState_unk5)
+	if (IsEnabled() && m_currentTickleState >= e_streaming && m_currentTickleState <= e_unk5)
 		PutFrame();
 
 	return SUCCESS;
diff --git a/LEGO1/realtime/orientableroi.cpp b/LEGO1/realtime/orientableroi.cpp
index f73758b9..4f48c333 100644
--- a/LEGO1/realtime/orientableroi.cpp
+++ b/LEGO1/realtime/orientableroi.cpp
@@ -17,7 +17,7 @@ OrientableROI::OrientableROI()
 	IDENTMAT4(m_local2world);
 
 	m_unk0xd4 = 0;
-	m_unk0xd8 |= Flag_Bit1 | Flag_Bit2;
+	m_unk0xd8 |= c_bit1 | c_bit2;
 }
 
 // FUNCTION: LEGO1 0x100a5910
diff --git a/LEGO1/realtime/orientableroi.h b/LEGO1/realtime/orientableroi.h
index 821a2978..36b8ae50 100644
--- a/LEGO1/realtime/orientableroi.h
+++ b/LEGO1/realtime/orientableroi.h
@@ -10,8 +10,8 @@
 class OrientableROI : public ROI {
 public:
 	enum {
-		Flag_Bit1 = 0x01,
-		Flag_Bit2 = 0x02
+		c_bit1 = 0x01,
+		c_bit2 = 0x02
 	};
 
 	OrientableROI();
diff --git a/tools/ncc/ncc.style b/tools/ncc/ncc.style
index 57bc8dd7..8dc0091b 100644
--- a/tools/ncc/ncc.style
+++ b/tools/ncc/ncc.style
@@ -1,7 +1,7 @@
 ClassName: '^[A-Z][a-zA-Z0-9]+$'
 CppMethod: '^operator|^FUN_[a-f0-9]{8}$|^VTable0x[a-f0-9]{1,8}$|^(?!VTable)[A-Z][a-zA-Z0-9]+$'
-# EnumConstantName
 EnumName: '^\(unnamed|^[A-Z][a-zA-Z0-9]+$'
+EnumConstantName: '^(c_|e_)[a-z][a-zA-Z0-9]+$'
 FunctionName: '^operator|^FUN_[a-f0-9]{8}$|^VTable0x[a-f0-9]{1,8}$|^(?!VTable)[A-Z][a-zA-Z0-9]+$'
 ParameterName: '^p_(unk0x[a-f0-9]{1,8}$|(?!unk)[a-z][a-zA-Z0-9]*)$|^$'
 StructName: '^\(anon|^\(unnamed|^[A-Z][a-zA-Z0-9]+$'
diff --git a/tools/ncc/skip.yml b/tools/ncc/skip.yml
index fa8546d9..ec7f46a0 100644
--- a/tools/ncc/skip.yml
+++ b/tools/ncc/skip.yml
@@ -12,6 +12,7 @@ m_HWDesc: 'Allow this variable name'
 m_HELDesc: 'Allow this variable name'
 p_HWDesc: 'Allow this variable name'
 p_HELDesc: 'Allow this variable name'
+e_RAMStream: 'Allow this enum constant'
 p_milliseconds: 'Probably a bug with function call'
 m_increaseAmount: "Can't currently detect member in union"
-m_increaseFactor: "Can't currently detect member in union"
+m_increaseFactor: "Can't currently detect member in union"
\ No newline at end of file

From 240ca5570dc9280331a3597244899c1c1c298f45 Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Wed, 17 Jan 2024 11:56:41 -0500
Subject: [PATCH 123/210] Rename enum

---
 LEGO1/lego/legoomni/include/infocenter.h      |  6 ++--
 .../legoomni/src/infocenter/infocenter.cpp    | 28 +++++++++----------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/LEGO1/lego/legoomni/include/infocenter.h b/LEGO1/lego/legoomni/include/infocenter.h
index f47799b3..fc7a55b3 100644
--- a/LEGO1/lego/legoomni/include/infocenter.h
+++ b/LEGO1/lego/legoomni/include/infocenter.h
@@ -18,7 +18,7 @@ struct InfocenterUnkDataEntry {
 // SIZE 0x1d8
 class Infocenter : public LegoWorld {
 public:
-	enum IntroScript {
+	enum Cutscene {
 		e_noIntro = -1,
 		e_legoMovie,
 		e_mindscapeMovie,
@@ -86,7 +86,7 @@ class Infocenter : public LegoWorld {
 	void FUN_10070dc0(MxBool);
 	void FUN_10070e90();
 
-	void PlayCutscene(IntroScript p_entityId, MxBool p_scale);
+	void PlayCutscene(Cutscene p_entityId, MxBool p_scale);
 	void StopCutscene();
 
 	void StartCredits();
@@ -102,7 +102,7 @@ class Infocenter : public LegoWorld {
 	MxS16 m_unk0xfc;                        // 0xfc
 	InfocenterState* m_infocenterState;     // 0x100
 	undefined4 m_unk0x104;                  // 0x104
-	IntroScript m_currentIntroScript;       // 0x108
+	Cutscene m_currentCutscene;             // 0x108
 	Radio m_radio;                          // 0x10c
 	undefined4 m_unk0x11c;                  // 0x11c
 	InfocenterUnkDataEntry m_entries[7];    // 0x120
diff --git a/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp b/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp
index e64d40df..935f0ad8 100644
--- a/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp
+++ b/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp
@@ -32,7 +32,7 @@ Infocenter::Infocenter()
 	m_unk0x11c = 0;
 	m_unk0x104 = 0;
 	m_currentInfomainScript = c_noInfomain;
-	m_currentIntroScript = e_noIntro;
+	m_currentCutscene = e_noIntro;
 
 	memset(&m_entries, 0, sizeof(InfocenterUnkDataEntry) * 7);
 
@@ -184,7 +184,7 @@ MxLong Infocenter::HandleEndAction(MxParam& p_param)
 
 	switch (m_infocenterState->GetUnknown0x74()) {
 	case 0:
-		switch (m_currentIntroScript) {
+		switch (m_currentCutscene) {
 		case e_legoMovie:
 			PlayCutscene(e_mindscapeMovie, FALSE);
 			return 1;
@@ -195,13 +195,13 @@ MxLong Infocenter::HandleEndAction(MxParam& p_param)
 			StopCutscene();
 			m_infocenterState->SetUnknown0x74(11);
 			PlayDialogue(c_badEndingDialogue);
-			m_currentIntroScript = e_noIntro;
+			m_currentCutscene = e_noIntro;
 			return 1;
 		case e_goodEndMovie:
 			StopCutscene();
 			m_infocenterState->SetUnknown0x74(11);
 			PlayDialogue(c_goodEndingDialogue);
-			m_currentIntroScript = e_noIntro;
+			m_currentCutscene = e_noIntro;
 			return 1;
 		}
 
@@ -209,7 +209,7 @@ MxLong Infocenter::HandleEndAction(MxParam& p_param)
 		StopCutscene();
 		m_infocenterState->SetUnknown0x74(11);
 		PlayDialogue(c_welcomeDialogue);
-		m_currentIntroScript = e_noIntro;
+		m_currentCutscene = e_noIntro;
 
 		if (m_infocenterState->GetInfocenterBufferElement(0) == 0) {
 			m_unk0x1d2 = 1;
@@ -219,7 +219,7 @@ MxLong Infocenter::HandleEndAction(MxParam& p_param)
 	case 1:
 		m_infocenterState->SetUnknown0x74(11);
 
-		switch (m_currentIntroScript) {
+		switch (m_currentCutscene) {
 		case e_badEndMovie:
 			PlayDialogue(c_badEndingDialogue);
 			break;
@@ -230,7 +230,7 @@ MxLong Infocenter::HandleEndAction(MxParam& p_param)
 			PlayDialogue(c_welcomeDialogue);
 		}
 
-		m_currentIntroScript = e_noIntro;
+		m_currentCutscene = e_noIntro;
 		return 1;
 	case 2:
 		FUN_10015860(g_object2x4red, 0);
@@ -440,9 +440,9 @@ MxResult Infocenter::Tickle()
 }
 
 // FUNCTION: LEGO1 0x10070c20
-void Infocenter::PlayCutscene(IntroScript p_entityId, MxBool p_scale)
+void Infocenter::PlayCutscene(Cutscene p_entityId, MxBool p_scale)
 {
-	m_currentIntroScript = p_entityId;
+	m_currentCutscene = p_entityId;
 
 	VideoManager()->EnableFullScreenMovie(TRUE, p_scale);
 	InputManager()->SetUnknown336(TRUE);
@@ -450,20 +450,20 @@ void Infocenter::PlayCutscene(IntroScript p_entityId, MxBool p_scale)
 	SetAppCursor(0xb); // Hide cursor
 	VideoManager()->GetDisplaySurface()->ClearScreen();
 
-	if (m_currentIntroScript != e_noIntro) {
+	if (m_currentCutscene != e_noIntro) {
 		// check if the cutscene is not an ending
-		if (m_currentIntroScript >= e_badEndMovie && m_currentIntroScript <= e_goodEndMovie) {
+		if (m_currentCutscene >= e_badEndMovie && m_currentCutscene <= e_goodEndMovie) {
 			FUN_10070e90();
 		}
-		InvokeAction(Extra::ActionType::e_opendisk, *g_introScript, m_currentIntroScript, NULL);
+		InvokeAction(Extra::ActionType::e_opendisk, *g_introScript, m_currentCutscene, NULL);
 	}
 }
 
 // FUNCTION: LEGO1 0x10070cb0
 void Infocenter::StopCutscene()
 {
-	if (m_currentIntroScript != e_noIntro) {
-		InvokeAction(Extra::ActionType::e_close, *g_introScript, m_currentIntroScript, NULL);
+	if (m_currentCutscene != e_noIntro) {
+		InvokeAction(Extra::ActionType::e_close, *g_introScript, m_currentCutscene, NULL);
 	}
 
 	VideoManager()->EnableFullScreenMovie(FALSE);

From b25239f22dc57a8fd95127e6076208fcffc4a84e Mon Sep 17 00:00:00 2001
From: Nathan M Gilbert <tahgtahv@gmail.com>
Date: Wed, 17 Jan 2024 12:08:48 -0500
Subject: [PATCH 124/210] Finish some missing methods (#448)

* Finish some missing methods

* Minor style updates/fixes

---------

Co-authored-by: Christian Semmler <mail@csemmler.com>
---
 LEGO1/lego/legoomni/src/entity/legoentity.cpp   |  4 +---
 LEGO1/omni/include/mxdiskstreamcontroller.h     | 12 ++++++++----
 LEGO1/omni/include/mxdsmediaaction.h            |  5 +++++
 LEGO1/omni/include/mxdsparallelaction.h         |  9 ++++++++-
 LEGO1/omni/include/mxstreamer.h                 |  1 +
 LEGO1/omni/src/action/mxdsmediaaction.cpp       | 17 +++++++++++++++++
 .../omni/src/stream/mxdiskstreamcontroller.cpp  | 17 +++++++++++++++++
 LEGO1/omni/src/stream/mxstreamer.cpp            |  9 +++++++++
 8 files changed, 66 insertions(+), 8 deletions(-)

diff --git a/LEGO1/lego/legoomni/src/entity/legoentity.cpp b/LEGO1/lego/legoomni/src/entity/legoentity.cpp
index f581389d..2c482715 100644
--- a/LEGO1/lego/legoomni/src/entity/legoentity.cpp
+++ b/LEGO1/lego/legoomni/src/entity/legoentity.cpp
@@ -58,9 +58,7 @@ void LegoEntity::Destroy(MxBool p_fromDestructor)
 		}
 		else {
 			VideoManager()->Get3DManager()->GetLego3DView()->Remove(*m_roi);
-
-			if (m_roi)
-				delete m_roi;
+			delete m_roi;
 		}
 	}
 
diff --git a/LEGO1/omni/include/mxdiskstreamcontroller.h b/LEGO1/omni/include/mxdiskstreamcontroller.h
index 9e476afc..52c0d8b4 100644
--- a/LEGO1/omni/include/mxdiskstreamcontroller.h
+++ b/LEGO1/omni/include/mxdiskstreamcontroller.h
@@ -42,11 +42,12 @@ class MxDiskStreamController : public MxStreamController {
 
 	inline MxBool GetUnk0xc4() const { return m_unk0xc4; }
 
-	void FUN_100c7f40(MxDSStreamingAction* p_streamingaction);
-	void FUN_100c8670(MxDSStreamingAction* p_streamingAction);
-	void InsertToList74(MxDSBuffer* p_buffer);
-	void FUN_100c7cb0(MxDSStreamingAction* p_action);
 	MxResult FUN_100c7890(MxDSStreamingAction* p_action);
+	void FUN_100c7cb0(MxDSStreamingAction* p_action);
+	void FUN_100c7f40(MxDSStreamingAction* p_streamingaction);
+	void FUN_100c8120(MxDSAction* p_action);
+	void InsertToList74(MxDSBuffer* p_buffer);
+	void FUN_100c8670(MxDSStreamingAction* p_streamingAction);
 
 private:
 	MxStreamListMxDSAction m_list0x64; // 0x64
@@ -87,4 +88,7 @@ class MxDiskStreamController : public MxStreamController {
 // TEMPLATE: LEGO1 0x100c74e0
 // List<MxDSBuffer *>::~List<MxDSBuffer *>
 
+// TEMPLATE: LEGO1 0x100c7ef0
+// list<MxNextActionDataStart *>::insert
+
 #endif // MXDISKSTREAMCONTROLLER_H
diff --git a/LEGO1/omni/include/mxdsmediaaction.h b/LEGO1/omni/include/mxdsmediaaction.h
index 1f1b97d5..7422ec2d 100644
--- a/LEGO1/omni/include/mxdsmediaaction.h
+++ b/LEGO1/omni/include/mxdsmediaaction.h
@@ -28,8 +28,13 @@ class MxDSMediaAction : public MxDSAction {
 		return !strcmp(p_name, MxDSMediaAction::ClassName()) || MxDSAction::IsA(p_name);
 	}
 
+	// SYNTHETIC: LEGO1 0x100c8cd0
+	// MxDSMediaAction::`scalar deleting destructor'
+
+	virtual undefined4 VTable0x14();                                     // vtable+14;
 	virtual MxU32 GetSizeOnDisk() override;                              // vtable+18;
 	virtual void Deserialize(MxU8** p_source, MxS16 p_unk0x24) override; // vtable+1c;
+	virtual MxDSAction* Clone() override;                                // vtable+2c;
 
 	void CopyMediaSrcPath(const char* p_mediaSrcPath);
 
diff --git a/LEGO1/omni/include/mxdsparallelaction.h b/LEGO1/omni/include/mxdsparallelaction.h
index 89fc1df0..0386de7f 100644
--- a/LEGO1/omni/include/mxdsparallelaction.h
+++ b/LEGO1/omni/include/mxdsparallelaction.h
@@ -26,8 +26,15 @@ class MxDSParallelAction : public MxDSMultiAction {
 		return !strcmp(p_name, MxDSParallelAction::ClassName()) || MxDSMultiAction::IsA(p_name);
 	}
 
+	// SYNTHETIC: LEGO1 0x100cb020
+	// MxDSParallelAction::`scalar deleting destructor'
+
 	virtual MxLong GetDuration() override; // vtable+24;
-	virtual MxDSAction* Clone() override;  // vtable+2c;
+
+	// FUNCTION: LEGO1 0x100caef0
+	virtual void SetDuration(MxLong p_duration) override { m_duration = p_duration; } // vtable+0x28
+
+	virtual MxDSAction* Clone() override; // vtable+2c;
 };
 
 #endif // MXDSPARALLELACTION_H
diff --git a/LEGO1/omni/include/mxstreamer.h b/LEGO1/omni/include/mxstreamer.h
index 673db644..f22e343f 100644
--- a/LEGO1/omni/include/mxstreamer.h
+++ b/LEGO1/omni/include/mxstreamer.h
@@ -100,6 +100,7 @@ class MxStreamer : public MxCore {
 
 	MxBool FUN_100b9b30(MxDSObject& p_dsObject);
 	MxStreamController* GetOpenStream(const char* p_name);
+	void FUN_100b98f0(MxDSAction* p_action);
 	MxResult AddStreamControllerToOpenList(MxStreamController* p_stream);
 	MxResult FUN_100b99b0(MxDSAction* p_action);
 	MxResult DeleteObject(MxDSAction* p_dsAction);
diff --git a/LEGO1/omni/src/action/mxdsmediaaction.cpp b/LEGO1/omni/src/action/mxdsmediaaction.cpp
index 580c22bc..fda2721a 100644
--- a/LEGO1/omni/src/action/mxdsmediaaction.cpp
+++ b/LEGO1/omni/src/action/mxdsmediaaction.cpp
@@ -47,6 +47,17 @@ MxDSMediaAction& MxDSMediaAction::operator=(MxDSMediaAction& p_dsMediaAction)
 	return *this;
 }
 
+// FUNCTION: LEGO1 0x100c8df0
+MxDSAction* MxDSMediaAction::Clone()
+{
+	MxDSMediaAction* clone = new MxDSMediaAction();
+
+	if (clone)
+		*clone = *this;
+
+	return clone;
+}
+
 // FUNCTION: LEGO1 0x100c8e80
 void MxDSMediaAction::CopyMediaSrcPath(const char* p_mediaSrcPath)
 {
@@ -64,6 +75,12 @@ void MxDSMediaAction::CopyMediaSrcPath(const char* p_mediaSrcPath)
 		this->m_mediaSrcPath = NULL;
 }
 
+// FUNCTION: LEGO1 0x100c8f00
+undefined4 MxDSMediaAction::VTable0x14()
+{
+	return MxDSAction::VTable0x14();
+}
+
 // FUNCTION: LEGO1 0x100c8f10
 MxU32 MxDSMediaAction::GetSizeOnDisk()
 {
diff --git a/LEGO1/omni/src/stream/mxdiskstreamcontroller.cpp b/LEGO1/omni/src/stream/mxdiskstreamcontroller.cpp
index 0b0ee1c2..5833d18f 100644
--- a/LEGO1/omni/src/stream/mxdiskstreamcontroller.cpp
+++ b/LEGO1/omni/src/stream/mxdiskstreamcontroller.cpp
@@ -301,6 +301,23 @@ MxResult MxDiskStreamController::VTable0x20(MxDSAction* p_action)
 	return SUCCESS;
 }
 
+// FUNCTION: LEGO1 0x100c8120
+void MxDiskStreamController::FUN_100c8120(MxDSAction* p_action)
+{
+	VTable0x30(p_action);
+
+	if (m_provider) {
+		m_provider->VTable0x20(p_action);
+	}
+
+	while (TRUE) {
+		MxDSAction* found = m_unk0x54.Find(p_action, TRUE);
+		if (!found)
+			break;
+		delete found;
+	}
+}
+
 // FUNCTION: LEGO1 0x100c8160
 MxResult MxDiskStreamController::VTable0x24(MxDSAction* p_action)
 {
diff --git a/LEGO1/omni/src/stream/mxstreamer.cpp b/LEGO1/omni/src/stream/mxstreamer.cpp
index 6ab4e47d..d8d64fb5 100644
--- a/LEGO1/omni/src/stream/mxstreamer.cpp
+++ b/LEGO1/omni/src/stream/mxstreamer.cpp
@@ -121,6 +121,15 @@ MxStreamController* MxStreamer::GetOpenStream(const char* p_name)
 	return NULL;
 }
 
+// FUNCTION: LEGO1 0x100b98f0
+void MxStreamer::FUN_100b98f0(MxDSAction* p_action)
+{
+	MxStreamController* controller = GetOpenStream(p_action->GetAtomId().GetInternal());
+	if (controller && controller->IsA("MxDiskStreamController")) {
+		((MxDiskStreamController*) controller)->FUN_100c8120(p_action);
+	}
+}
+
 // FUNCTION: LEGO1 0x100b9930
 MxResult MxStreamer::AddStreamControllerToOpenList(MxStreamController* p_stream)
 {

From d369429e98625f8dfd07ea0806671187fa3340a5 Mon Sep 17 00:00:00 2001
From: Joshua Peisach <itzswirlz2020@outlook.com>
Date: Wed, 17 Jan 2024 12:24:05 -0500
Subject: [PATCH 125/210] video/legohideanimpresenter: Init, dtor, most of
 destroy function (#447)

* video/legohideanimpresenter: Init, dtor, most of destroy function

* Format

* Finish Destroy

---------

Co-authored-by: Christian Semmler <mail@csemmler.com>
---
 .../legoomni/include/legohideanimpresenter.h  |  6 ++++
 .../src/video/legohideanimpresenter.cpp       | 31 +++++++++++++++++--
 2 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/LEGO1/lego/legoomni/include/legohideanimpresenter.h b/LEGO1/lego/legoomni/include/legohideanimpresenter.h
index fda96c98..59449283 100644
--- a/LEGO1/lego/legoomni/include/legohideanimpresenter.h
+++ b/LEGO1/lego/legoomni/include/legohideanimpresenter.h
@@ -1,6 +1,7 @@
 #ifndef LEGOHIDEANIMPRESENTER_H
 #define LEGOHIDEANIMPRESENTER_H
 
+#include "decomp.h"
 #include "legoloopinganimpresenter.h"
 
 // VTABLE: LEGO1 0x100d9278
@@ -23,8 +24,13 @@ class LegoHideAnimPresenter : public LegoLoopingAnimPresenter {
 		return !strcmp(p_name, ClassName()) || LegoAnimPresenter::IsA(p_name);
 	}
 
+	virtual void Destroy() override; // vtable+0x38
+
 private:
 	void Init();
+	void Destroy(MxBool p_fromDestructor);
+
+	undefined4* m_unk0xc0; // 0xc0
 };
 
 // SYNTHETIC: LEGO1 0x1006d9d0
diff --git a/LEGO1/lego/legoomni/src/video/legohideanimpresenter.cpp b/LEGO1/lego/legoomni/src/video/legohideanimpresenter.cpp
index 9aa9f2fe..00718629 100644
--- a/LEGO1/lego/legoomni/src/video/legohideanimpresenter.cpp
+++ b/LEGO1/lego/legoomni/src/video/legohideanimpresenter.cpp
@@ -1,18 +1,43 @@
 #include "legohideanimpresenter.h"
 
+DECOMP_SIZE_ASSERT(LegoHideAnimPresenter, 0xc4)
+
 // FUNCTION: LEGO1 0x1006d7e0
 LegoHideAnimPresenter::LegoHideAnimPresenter()
 {
 	Init();
 }
 
-// STUB: LEGO1 0x1006d9f0
+// FUNCTION: LEGO1 0x1006d9f0
 LegoHideAnimPresenter::~LegoHideAnimPresenter()
 {
-	// TODO
+	Destroy(TRUE);
 }
 
-// STUB: LEGO1 0x1006da50
+// FUNCTION: LEGO1 0x1006da50
 void LegoHideAnimPresenter::Init()
 {
+	m_unk0xc0 = NULL;
+}
+
+// FUNCTION: LEGO1 0x1006da60
+void LegoHideAnimPresenter::Destroy(MxBool p_fromDestructor)
+{
+	m_criticalSection.Enter();
+
+	if (m_unk0xc0)
+		delete m_unk0xc0;
+	Init();
+
+	m_criticalSection.Leave();
+
+	// This appears to be a bug, since it results in an endless loop
+	if (!p_fromDestructor)
+		LegoHideAnimPresenter::Destroy();
+}
+
+// FUNCTION: LEGO1 0x1006dac0
+void LegoHideAnimPresenter::Destroy()
+{
+	Destroy(FALSE);
 }

From 6032c1bb27f6482fab8c08eae2a0226d7374b2ae Mon Sep 17 00:00:00 2001
From: Daniel Hejduk <156322098+danielhejduk@users.noreply.github.com>
Date: Wed, 17 Jan 2024 18:24:42 +0100
Subject: [PATCH 126/210] Implement GasStation:GasStation() function (#424)

* Implementing GasStation:GasStation() function

* Update gasstation.cpp

* Update gasstation.cpp

* Adding m_unk variables to gasstation.h

* Update gasstation.h

* Update gasstation.h

* fixes + match gasstation ctor

* formatting fixes

* add offset markers to members

* formatting fix

---------

Co-authored-by: Ramen2X <64166386+Ramen2X@users.noreply.github.com>
---
 LEGO1/lego/legoomni/include/gasstation.h        | 16 ++++++++++++++++
 .../lego/legoomni/src/gasstation/gasstation.cpp | 17 +++++++++++++++--
 2 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/LEGO1/lego/legoomni/include/gasstation.h b/LEGO1/lego/legoomni/include/gasstation.h
index 0617e161..11ff175a 100644
--- a/LEGO1/lego/legoomni/include/gasstation.h
+++ b/LEGO1/lego/legoomni/include/gasstation.h
@@ -1,7 +1,9 @@
 #ifndef GASSTATION_H
 #define GASSTATION_H
 
+#include "decomp.h"
 #include "legoworld.h"
+#include "radio.h"
 
 // VTABLE: LEGO1 0x100d4650
 // SIZE 0x128
@@ -26,6 +28,20 @@ class GasStation : public LegoWorld {
 	{
 		return !strcmp(p_name, GasStation::ClassName()) || LegoWorld::IsA(p_name);
 	}
+
+private:
+	undefined2 m_unk0xf8;  // 0xf8
+	undefined2 m_unk0xfa;  // 0xfa
+	undefined4 m_unk0xfc;  // 0xfc
+	undefined4 m_unk0x100; // 0x100
+	undefined2 m_unk0x104; // 0x104
+	undefined2 m_unk0x106; // 0x106
+	undefined4 m_unk0x108; // 0x108
+	undefined4 m_unk0x10c; // 0x10c
+	undefined4 m_unk0x110; // 0x110
+	undefined m_unk0x114;  // 0x114
+	undefined m_unk0x115;  // 0x115
+	Radio m_radio;         // 0x118
 };
 
 #endif // GASSTATION_H
diff --git a/LEGO1/lego/legoomni/src/gasstation/gasstation.cpp b/LEGO1/lego/legoomni/src/gasstation/gasstation.cpp
index 24325511..7f7aff11 100644
--- a/LEGO1/lego/legoomni/src/gasstation/gasstation.cpp
+++ b/LEGO1/lego/legoomni/src/gasstation/gasstation.cpp
@@ -1,9 +1,22 @@
 #include "gasstation.h"
 
-// STUB: LEGO1 0x100046a0
+#include "mxnotificationmanager.h"
+
+// FUNCTION: LEGO1 0x100046a0
 GasStation::GasStation()
 {
-	// TODO
+	this->m_unk0xf8 = 0;
+	this->m_unk0x100 = 0;
+	this->m_unk0xfc = 0;
+	this->m_unk0x108 = 0;
+	this->m_unk0x104 = 0;
+	this->m_unk0x114 = 0;
+	this->m_unk0x106 = 0;
+	this->m_unk0x10c = 0;
+	this->m_unk0x115 = 0;
+	this->m_unk0x110 = 0;
+
+	NotificationManager()->Register(this);
 }
 
 // STUB: LEGO1 0x100048c0

From cf7466f9016cfdf72f25a81fb8330608751cd322 Mon Sep 17 00:00:00 2001
From: Ramen2X <64166386+Ramen2X@users.noreply.github.com>
Date: Wed, 17 Jan 2024 14:08:05 -0500
Subject: [PATCH 127/210] name nearly every infomain action (#449)

* name nearly every infomain action

* label two more unused actions
---
 LEGO1/lego/legoomni/include/infocenter.h      | 71 +++++++++++++++++--
 .../legoomni/src/infocenter/infocenter.cpp    | 12 ++--
 2 files changed, 71 insertions(+), 12 deletions(-)

diff --git a/LEGO1/lego/legoomni/include/infocenter.h b/LEGO1/lego/legoomni/include/infocenter.h
index fc7a55b3..da17941b 100644
--- a/LEGO1/lego/legoomni/include/infocenter.h
+++ b/LEGO1/lego/legoomni/include/infocenter.h
@@ -30,18 +30,77 @@ class Infocenter : public LegoWorld {
 
 	enum InfomainScript {
 		c_noInfomain = -1,
+
 		c_welcomeDialogue = 500,
-		c_randomDialogue1 = 502,
-		c_letsGetStarted = 504,
-		c_returnBack = 514,
-		c_exitConfirmation = 522,
+		c_goodJobDialogue = 501,
+
+		c_clickOnInfomanDialogue = 502,
+		c_tickleInfomanDialogue = 503,
+
+		c_letsGetStartedDialogue = 504,
+
+		c_clickOnObjectsGuidanceDialogue = 505,
+		c_arrowNavigationGuidanceDialogue = 506,
+		c_elevatorGuidanceDialogue = 507,
+		c_radioGuidanceDialogue = 508,
+		c_exitGuidanceDialogue1 = 509,
+		c_exitGuidanceDialogue2 = 510,
+		c_goOutsideGuidanceDialogue = 511,
+		c_experimentGuidanceDialogue = 512,
+		c_returnBackGuidanceDialogue1 = 513,
+		c_returnBackGuidanceDialogue2 = 514,
+		c_bricksterWarningDialogue = 515,
+		c_newGameGuidanceDialogue = 516,
+		c_returnBackGuidanceDialogue3 = 517,
+
+		c_reenterInfoCenterDialogue1 = 518,
+		c_reenterInfoCenterDialogue2 = 519,
+		c_reenterInfoCenterDialogue3 = 520,
+		c_reenterInfoCenterDialogue4 = 521,
+
+		c_exitConfirmationDialogue = 522,
+		c_saveGameOptionsDialogueUnused = 523,
+		c_exitGameDialogue = 524,
+
+		c_bricksterEscapedDialogue1 = 525,
+		c_bricksterEscapedDialogue2 = 526,
+		c_bricksterEscapedDialogue3 = 527,
+		c_bricksterEscapedDialogue4 = 528,
+		c_bricksterEscapedDialogue5 = 529,
+		c_bricksterEscapedDialogue6 = 530,
+		c_bricksterEscapedDialogue7 = 531,
+
+		c_infomanHiccup = 532,
+		c_infomanWalkOffScreenLeftUnused = 533,
+		c_infomanSneeze = 534,
+		c_infomanWalkOffScreenRightUnused = 535,
+		c_infomanLaughs = 536,
+		c_infomanLooksBehindAtScreenUnused = 537,
+		c_infomanReturnsFromScreenUnused = 538,
+
 		c_goodEndingDialogue = 539,
 		c_badEndingDialogue = 540,
+
 		c_pepperCharacterSelect = 541,
 		c_mamaCharacterSelect = 542,
 		c_papaCharacterSelect = 543,
-		c_officierCharacterSelect = 544,
-		c_loraCharacterSelect = 545,
+		c_nickCharacterSelect = 544,
+		c_lauraCharacterSelect = 545,
+
+		c_creditsDialogue = 551,
+
+		c_noCDDialogueUnused1 = 552,
+		c_noCDDialogueUnused2 = 553,
+
+		c_leaveInfoCenterDialogue1 = 562,
+		c_leaveInfoCenterDialogue2 = 563,
+		c_leaveInfoCenterDialogue3 = 564,
+		c_leaveInfoCenterDialogue4 = 565,
+
+		c_registerToContinueDialogue = 573,
+
+		c_bricksterDialogue = 574,
+		c_bricksterLaughs = 575,
 	};
 
 	enum SndAmimScript {
diff --git a/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp b/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp
index 935f0ad8..0cba8908 100644
--- a/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp
+++ b/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp
@@ -159,10 +159,10 @@ MxLong Infocenter::HandleEndAction(MxParam& p_param)
 				PlayDialogue(c_papaCharacterSelect);
 				break;
 			case 4:
-				PlayDialogue(c_officierCharacterSelect);
+				PlayDialogue(c_nickCharacterSelect);
 				break;
 			case 5:
-				PlayDialogue(c_loraCharacterSelect);
+				PlayDialogue(c_lauraCharacterSelect);
 				break;
 			default:
 				break;
@@ -177,7 +177,7 @@ MxLong Infocenter::HandleEndAction(MxParam& p_param)
 	if (result || (action->GetAtomId() != m_atom && action->GetAtomId() != *g_introScript))
 		return result;
 
-	if (action->GetObjectId() == c_returnBack) {
+	if (action->GetObjectId() == c_returnBackGuidanceDialogue2) {
 		ControlManager()->FUN_100293c0(0x10, action->GetAtomId(), 0);
 		m_unk0x1d6 = 0;
 	}
@@ -302,7 +302,7 @@ void Infocenter::VTable0x50()
 				m_unk0x1d2 = 1;
 			}
 
-			PlayDialogue(c_letsGetStarted);
+			PlayDialogue(c_letsGetStartedDialogue);
 			PlayMusic(11);
 			FUN_10015820(0, 7);
 			return;
@@ -312,7 +312,7 @@ void Infocenter::VTable0x50()
 			break;
 		case 8:
 			PlayMusic(11);
-			PlayDialogue(c_exitConfirmation);
+			PlayDialogue(c_exitConfirmationDialogue);
 			FUN_10015820(0, 7);
 			return;
 		case 0xf:
@@ -320,7 +320,7 @@ void Infocenter::VTable0x50()
 				m_unk0x1d2 = 1;
 			}
 
-			PlayDialogue(c_randomDialogue1);
+			PlayDialogue(c_clickOnInfomanDialogue);
 			PlayMusic(11);
 			FUN_10015820(0, 7);
 			return;

From c0af1dbac4e5b6445cab5d6fad7366402946f9ed Mon Sep 17 00:00:00 2001
From: Misha <106913236+MishaProductions@users.noreply.github.com>
Date: Wed, 17 Jan 2024 15:48:48 -0500
Subject: [PATCH 128/210] implement LegoOmni::FUN_1005b4f0 (#450)

* push changes

* push changes

* fixes

* Changes

* Use proper values

* Name vtable function

---------

Co-authored-by: Christian Semmler <mail@csemmler.com>
---
 .../lego/legoomni/include/legoinputmanager.h  |  7 +++++
 LEGO1/lego/legoomni/include/legoomni.h        |  9 +++++-
 .../lego/legoomni/include/legovideomanager.h  |  2 +-
 LEGO1/lego/legoomni/src/build/helicopter.cpp  |  2 +-
 .../src/entity/legoworldpresenter.cpp         |  2 +-
 .../legoomni/src/infocenter/infocenter.cpp    | 10 +++----
 LEGO1/lego/legoomni/src/infocenter/score.cpp  |  2 +-
 .../legoomni/src/input/legoinputmanager.cpp   | 14 +++++++++
 LEGO1/lego/legoomni/src/isle/isle.cpp         |  2 +-
 LEGO1/lego/legoomni/src/main/legoomni.cpp     | 29 +++++++++++++++++--
 .../legoomni/src/video/legovideomanager.cpp   |  2 +-
 LEGO1/omni/include/mxvideomanager.h           |  2 +-
 LEGO1/omni/src/video/mxstillpresenter.cpp     |  6 ++--
 LEGO1/omni/src/video/mxvideomanager.cpp       |  2 +-
 LEGO1/omni/src/video/mxvideopresenter.cpp     |  2 +-
 15 files changed, 72 insertions(+), 21 deletions(-)

diff --git a/LEGO1/lego/legoomni/include/legoinputmanager.h b/LEGO1/lego/legoomni/include/legoinputmanager.h
index 7a546702..251c52b5 100644
--- a/LEGO1/lego/legoomni/include/legoinputmanager.h
+++ b/LEGO1/lego/legoomni/include/legoinputmanager.h
@@ -46,6 +46,7 @@ class LegoInputManager : public MxPresenter {
 	MxResult GetJoystickState(MxU32* p_joystickX, MxU32* p_joystickY, DWORD* p_buttonsState, MxU32* p_povPosition);
 	void SetTimer();
 	void KillTimer();
+	void EnableInputProcessing();
 	void SetCamera(LegoCameraController* p_camera);
 	void ClearCamera();
 	void SetWorld(LegoWorld* p_world);
@@ -57,6 +58,12 @@ class LegoInputManager : public MxPresenter {
 	inline void SetUseJoystick(MxBool p_useJoystick) { m_useJoystick = p_useJoystick; }
 	inline void SetJoystickIndex(MxS32 p_joystickIndex) { m_joystickIndex = p_joystickIndex; }
 
+	inline void DisableInputProcessing()
+	{
+		m_unk0x88 = TRUE;
+		m_unk0x336 = FALSE;
+	}
+
 	inline LegoControlManager* GetControlManager() { return m_controlManager; }
 	inline LegoWorld* GetWorld() { return m_world; }
 	inline LegoCameraController* GetCamera() { return m_camera; }
diff --git a/LEGO1/lego/legoomni/include/legoomni.h b/LEGO1/lego/legoomni/include/legoomni.h
index aad0b43f..55166b37 100644
--- a/LEGO1/lego/legoomni/include/legoomni.h
+++ b/LEGO1/lego/legoomni/include/legoomni.h
@@ -62,6 +62,12 @@ extern MxAtomId* g_nocdSourceName;
 // SIZE 0x140
 class LegoOmni : public MxOmni {
 public:
+	enum {
+		c_disableInput = 0x01,
+		c_disable3d = 0x02,
+		c_clearScreen = 0x04
+	};
+
 	__declspec(dllexport) void CreateBackgroundAudio();
 	__declspec(dllexport) void RemoveWorld(const MxAtomId&, MxLong);
 	__declspec(dllexport) static int GetCurrPathInfo(LegoPathBoundary**, MxS32&);
@@ -99,6 +105,7 @@ class LegoOmni : public MxOmni {
 
 	LegoEntity* FindByEntityIdOrAtomId(const MxAtomId& p_atom, MxS32 p_entityid);
 	void AddWorld(LegoWorld* p_world);
+	void FUN_1005b4f0(MxBool p_disable, MxU16 p_flags);
 
 	LegoVideoManager* GetVideoManager() { return (LegoVideoManager*) m_videoManager; }
 	LegoSoundManager* GetSoundManager() { return (LegoSoundManager*) m_soundManager; }
@@ -162,7 +169,7 @@ LegoPlantManager* PlantManager();
 LegoWorld* GetCurrentWorld();
 LegoUnkSaveDataWriter* GetUnkSaveDataWriter();
 GifManager* GetGifManager();
-void FUN_10015820(MxU32, MxU32);
+void FUN_10015820(MxBool p_disable, MxU16 p_flags);
 void FUN_10015860(const char*, MxU8);
 LegoEntity* FindEntityByAtomIdOrEntityId(const MxAtomId& p_atom, MxS32 p_entityid);
 MxDSAction& GetCurrentAction();
diff --git a/LEGO1/lego/legoomni/include/legovideomanager.h b/LEGO1/lego/legoomni/include/legovideomanager.h
index 6921e7d2..a9532e87 100644
--- a/LEGO1/lego/legoomni/include/legovideomanager.h
+++ b/LEGO1/lego/legoomni/include/legovideomanager.h
@@ -30,7 +30,7 @@ class LegoVideoManager : public MxVideoManager {
 	virtual MxResult Create(MxVideoParam& p_videoParam, MxU32 p_frequencyMS, MxBool p_createThread)
 		override;                                                                          // vtable+0x2c
 	virtual MxResult RealizePalette(MxPalette*) override;                                  // vtable+0x30
-	virtual void VTable0x34(MxU32 p_x, MxU32 p_y, MxU32 p_width, MxU32 p_height) override; // vtable+0x34
+	virtual void UpdateView(MxU32 p_x, MxU32 p_y, MxU32 p_width, MxU32 p_height) override; // vtable+0x34
 	virtual void VTable0x38(undefined4, undefined4);                                       // vtable+0x38
 	// FUNCTION: LGEO1 0x1007ab10
 	virtual LegoUnknown100d9d00* VTable0x3c() { return m_unk0x100d9d00; } // vtable+0x3c
diff --git a/LEGO1/lego/legoomni/src/build/helicopter.cpp b/LEGO1/lego/legoomni/src/build/helicopter.cpp
index d44abb15..7cb41b67 100644
--- a/LEGO1/lego/legoomni/src/build/helicopter.cpp
+++ b/LEGO1/lego/legoomni/src/build/helicopter.cpp
@@ -99,7 +99,7 @@ MxU32 Helicopter::VTable0xcc()
 		AnimationManager()->FUN_10064670(FALSE);
 		VTable0xe8(0x29, TRUE, 7);
 		((Isle*) GetCurrentWorld())->SetUnknown13c(0x3c);
-		FUN_10015820(1, 0);
+		FUN_10015820(TRUE, 0);
 		TransitionManager()->StartTransition(MxTransitionManager::e_pixelation, 50, FALSE, TRUE);
 		SetUnknownDC(4);
 		PlayMusic(9);
diff --git a/LEGO1/lego/legoomni/src/entity/legoworldpresenter.cpp b/LEGO1/lego/legoomni/src/entity/legoworldpresenter.cpp
index 180c86e8..55f908bd 100644
--- a/LEGO1/lego/legoomni/src/entity/legoworldpresenter.cpp
+++ b/LEGO1/lego/legoomni/src/entity/legoworldpresenter.cpp
@@ -45,7 +45,7 @@ LegoWorldPresenter::~LegoWorldPresenter()
 	}
 
 	if (result == FALSE) {
-		FUN_10015820(0, 7);
+		FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
 	}
 
 	if (m_entity) {
diff --git a/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp b/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp
index 0cba8908..27ce0cd5 100644
--- a/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp
+++ b/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp
@@ -304,7 +304,7 @@ void Infocenter::VTable0x50()
 
 			PlayDialogue(c_letsGetStartedDialogue);
 			PlayMusic(11);
-			FUN_10015820(0, 7);
+			FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
 			return;
 		default:
 			PlayMusic(11);
@@ -313,7 +313,7 @@ void Infocenter::VTable0x50()
 		case 8:
 			PlayMusic(11);
 			PlayDialogue(c_exitConfirmationDialogue);
-			FUN_10015820(0, 7);
+			FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
 			return;
 		case 0xf:
 			if (m_infocenterState->GetInfocenterBufferElement(0) == 0) {
@@ -322,7 +322,7 @@ void Infocenter::VTable0x50()
 
 			PlayDialogue(c_clickOnInfomanDialogue);
 			PlayMusic(11);
-			FUN_10015820(0, 7);
+			FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
 			return;
 		}
 		break;
@@ -334,7 +334,7 @@ void Infocenter::VTable0x50()
 		break;
 	default:
 		m_infocenterState->SetUnknown0x74(11);
-		FUN_10015820(0, 7);
+		FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
 		return;
 	}
 }
@@ -469,7 +469,7 @@ void Infocenter::StopCutscene()
 	VideoManager()->EnableFullScreenMovie(FALSE);
 	InputManager()->SetUnknown335(FALSE);
 	SetAppCursor(0); // Restore cursor to arrow
-	FUN_10015820(0, 7);
+	FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
 }
 
 // FUNCTION: LEGO1 0x10070d00
diff --git a/LEGO1/lego/legoomni/src/infocenter/score.cpp b/LEGO1/lego/legoomni/src/infocenter/score.cpp
index ce593ac1..c1bba3e6 100644
--- a/LEGO1/lego/legoomni/src/infocenter/score.cpp
+++ b/LEGO1/lego/legoomni/src/infocenter/score.cpp
@@ -147,7 +147,7 @@ void Score::VTable0x50()
 	else
 		PlayMusic(11);
 
-	FUN_10015820(0, 7);
+	FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
 }
 
 // FUNCTION: LEGO1 0x100016d0
diff --git a/LEGO1/lego/legoomni/src/input/legoinputmanager.cpp b/LEGO1/lego/legoomni/src/input/legoinputmanager.cpp
index cdfd4bb3..87c72a63 100644
--- a/LEGO1/lego/legoomni/src/input/legoinputmanager.cpp
+++ b/LEGO1/lego/legoomni/src/input/legoinputmanager.cpp
@@ -7,6 +7,12 @@
 DECOMP_SIZE_ASSERT(LegoInputManager, 0x338);
 DECOMP_SIZE_ASSERT(LegoEventQueue, 0x18);
 
+// GLOBAL: LEGO1 0x100f31b0
+MxS32 g_unk0x100f31b0 = -1;
+
+// GLOBAL: LEGO1 0x100f31b4
+MxS32 g_unk0x100f31b4 = 0;
+
 // FUNCTION: LEGO1 0x1005b790
 LegoInputManager::LegoInputManager()
 {
@@ -271,3 +277,11 @@ void LegoInputManager::KillTimer()
 		::KillTimer(omni->GetWindowHandle(), m_timer);
 	}
 }
+
+// FUNCTION: LEGO1 0x1005cff0
+void LegoInputManager::EnableInputProcessing()
+{
+	m_unk0x88 = FALSE;
+	g_unk0x100f31b0 = -1;
+	g_unk0x100f31b4 = 0;
+}
diff --git a/LEGO1/lego/legoomni/src/isle/isle.cpp b/LEGO1/lego/legoomni/src/isle/isle.cpp
index 0da6189f..7172a7a6 100644
--- a/LEGO1/lego/legoomni/src/isle/isle.cpp
+++ b/LEGO1/lego/legoomni/src/isle/isle.cpp
@@ -166,7 +166,7 @@ void Isle::VTable0x50()
 		FUN_1003ef00(TRUE);
 		FUN_10032620();
 		m_act1state->FUN_10034d00();
-		FUN_10015820(0, 7);
+		FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
 	}
 }
 
diff --git a/LEGO1/lego/legoomni/src/main/legoomni.cpp b/LEGO1/lego/legoomni/src/main/legoomni.cpp
index a14e3cec..a8d06b89 100644
--- a/LEGO1/lego/legoomni/src/main/legoomni.cpp
+++ b/LEGO1/lego/legoomni/src/main/legoomni.cpp
@@ -206,10 +206,10 @@ GifManager* GetGifManager()
 	return LegoOmni::GetInstance()->GetGifManager();
 }
 
-// STUB: LEGO1 0x10015820
-void FUN_10015820(MxU32, MxU32)
+// FUNCTION: LEGO1 0x10015820
+void FUN_10015820(MxBool p_disable, MxU16 p_flags)
 {
-	// TODO
+	LegoOmni::GetInstance()->FUN_1005b4f0(p_disable, p_flags);
 }
 
 // STUB: LEGO1 0x10015860
@@ -680,6 +680,29 @@ MxS32 LegoOmni::GetCurrPathInfo(LegoPathBoundary** p_path, MxS32& p_value)
 	return GetCurrentWorld()->GetCurrPathInfo(p_path, p_value);
 }
 
+// FUNCTION: LEGO1 0x1005b4f0
+void LegoOmni::FUN_1005b4f0(MxBool p_disable, MxU16 p_flags)
+{
+	if (p_disable) {
+		if (p_flags & c_disableInput) {
+			m_inputMgr->DisableInputProcessing();
+		}
+
+		if (p_flags & c_disable3d) {
+			((LegoVideoManager*) m_videoManager)->SetRender3D(FALSE);
+		}
+
+		if (p_flags & c_clearScreen) {
+			m_videoManager->GetDisplaySurface()->ClearScreen();
+		}
+	}
+	else {
+		m_inputMgr->EnableInputProcessing();
+		((LegoVideoManager*) m_videoManager)->SetRender3D(TRUE);
+		((LegoVideoManager*) m_videoManager)->UpdateView(0, 0, 0, 0);
+	}
+}
+
 // FUNCTION: LEGO1 0x1005b560
 void LegoOmni::CreateBackgroundAudio()
 {
diff --git a/LEGO1/lego/legoomni/src/video/legovideomanager.cpp b/LEGO1/lego/legoomni/src/video/legovideomanager.cpp
index eba51d79..2a5d1643 100644
--- a/LEGO1/lego/legoomni/src/video/legovideomanager.cpp
+++ b/LEGO1/lego/legoomni/src/video/legovideomanager.cpp
@@ -423,7 +423,7 @@ void LegoVideoManager::OverrideSkyColor(MxBool p_shouldOverride)
 }
 
 // FUNCTION: LEGO1 0x1007c4d0
-void LegoVideoManager::VTable0x34(MxU32 p_x, MxU32 p_y, MxU32 p_width, MxU32 p_height)
+void LegoVideoManager::UpdateView(MxU32 p_x, MxU32 p_y, MxU32 p_width, MxU32 p_height)
 {
 	if (p_width == 0) {
 		p_width = m_videoParam.GetRect().GetWidth();
diff --git a/LEGO1/omni/include/mxvideomanager.h b/LEGO1/omni/include/mxvideomanager.h
index 41a7ce93..4befdb9c 100644
--- a/LEGO1/omni/include/mxvideomanager.h
+++ b/LEGO1/omni/include/mxvideomanager.h
@@ -32,7 +32,7 @@ class MxVideoManager : public MxMediaManager {
 
 	__declspec(dllexport) void InvalidateRect(MxRect32&);
 	__declspec(dllexport) virtual MxResult RealizePalette(MxPalette*);            // vtable+0x30
-	virtual void VTable0x34(MxU32 p_x, MxU32 p_y, MxU32 p_width, MxU32 p_height); // vtable+0x34
+	virtual void UpdateView(MxU32 p_x, MxU32 p_y, MxU32 p_width, MxU32 p_height); // vtable+0x34
 
 	MxResult Init();
 	void Destroy(MxBool p_fromDestructor);
diff --git a/LEGO1/omni/src/video/mxstillpresenter.cpp b/LEGO1/omni/src/video/mxstillpresenter.cpp
index f3d0ef67..4b81d6f1 100644
--- a/LEGO1/omni/src/video/mxstillpresenter.cpp
+++ b/LEGO1/omni/src/video/mxstillpresenter.cpp
@@ -155,10 +155,10 @@ void MxStillPresenter::VTable0x88(MxS32 p_x, MxS32 p_y)
 		MxRect32 rectB(m_location.GetX(), m_location.GetY(), width + m_location.GetX(), height + m_location.GetY());
 
 		MVideoManager()->InvalidateRect(rectA);
-		MVideoManager()->VTable0x34(rectA.GetLeft(), rectA.GetTop(), rectA.GetWidth(), rectA.GetHeight());
+		MVideoManager()->UpdateView(rectA.GetLeft(), rectA.GetTop(), rectA.GetWidth(), rectA.GetHeight());
 
 		MVideoManager()->InvalidateRect(rectB);
-		MVideoManager()->VTable0x34(rectB.GetLeft(), rectB.GetTop(), rectB.GetWidth(), rectB.GetHeight());
+		MVideoManager()->UpdateView(rectB.GetLeft(), rectB.GetTop(), rectB.GetWidth(), rectB.GetHeight());
 	}
 }
 
@@ -176,7 +176,7 @@ void MxStillPresenter::Enable(MxBool p_enable)
 
 		MxRect32 rect(x, y, width + x, height + y);
 		MVideoManager()->InvalidateRect(rect);
-		MVideoManager()->VTable0x34(rect.GetLeft(), rect.GetTop(), rect.GetWidth(), rect.GetHeight());
+		MVideoManager()->UpdateView(rect.GetLeft(), rect.GetTop(), rect.GetWidth(), rect.GetHeight());
 	}
 }
 
diff --git a/LEGO1/omni/src/video/mxvideomanager.cpp b/LEGO1/omni/src/video/mxvideomanager.cpp
index f58ff13f..9a2a6cee 100644
--- a/LEGO1/omni/src/video/mxvideomanager.cpp
+++ b/LEGO1/omni/src/video/mxvideomanager.cpp
@@ -13,7 +13,7 @@ MxVideoManager::MxVideoManager()
 }
 
 // FUNCTION: LEGO1 0x100be270
-void MxVideoManager::VTable0x34(MxU32 p_x, MxU32 p_y, MxU32 p_width, MxU32 p_height)
+void MxVideoManager::UpdateView(MxU32 p_x, MxU32 p_y, MxU32 p_width, MxU32 p_height)
 {
 }
 
diff --git a/LEGO1/omni/src/video/mxvideopresenter.cpp b/LEGO1/omni/src/video/mxvideopresenter.cpp
index 9fbf2cee..ebc08487 100644
--- a/LEGO1/omni/src/video/mxvideopresenter.cpp
+++ b/LEGO1/omni/src/video/mxvideopresenter.cpp
@@ -151,7 +151,7 @@ void MxVideoPresenter::Destroy(MxBool p_fromDestructor)
 
 		MxRect32 rect(x, y, x + width, y + height);
 		MVideoManager()->InvalidateRect(rect);
-		MVideoManager()->VTable0x34(rect.GetLeft(), rect.GetTop(), rect.GetWidth(), rect.GetHeight());
+		MVideoManager()->UpdateView(rect.GetLeft(), rect.GetTop(), rect.GetWidth(), rect.GetHeight());
 	}
 
 	delete m_bitmap;

From 99917ca765ea21507f857265ef0c911d7eebcadc Mon Sep 17 00:00:00 2001
From: Ramen2X <64166386+Ramen2X@users.noreply.github.com>
Date: Wed, 17 Jan 2024 16:24:22 -0500
Subject: [PATCH 129/210] initialize more members in LegoGameState (#451)

---
 LEGO1/lego/legoomni/src/common/legogamestate.cpp | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/LEGO1/lego/legoomni/src/common/legogamestate.cpp b/LEGO1/lego/legoomni/src/common/legogamestate.cpp
index a470732e..22ad48d0 100644
--- a/LEGO1/lego/legoomni/src/common/legogamestate.cpp
+++ b/LEGO1/lego/legoomni/src/common/legogamestate.cpp
@@ -60,7 +60,15 @@ LegoGameState::LegoGameState()
 	// TODO
 	SetROIHandlerFunction();
 
-	m_stateCount = 0;
+	this->m_stateCount = 0;
+	this->m_unk0xc = 0;
+	this->m_savePath = NULL;
+	this->m_unk0x424 = 0;
+	this->m_prevArea = 0;
+	this->m_unk0x42c = 0;
+	this->m_isDirty = FALSE;
+	this->m_currentAct = -1;
+
 	m_backgroundColor = new LegoBackgroundColor("backgroundcolor", "set 56 54 68");
 	VariableTable()->SetVariable(m_backgroundColor);
 

From 909c44b6796284b2e86608fa82b99751b18a9285 Mon Sep 17 00:00:00 2001
From: MS <disinvite@users.noreply.github.com>
Date: Thu, 18 Jan 2024 08:34:14 -0500
Subject: [PATCH 130/210] reccmp: vtable comparison (#452)

* Add vtable comparison to reccmp

* Add missing scalar deleting destructors

* Fix some vtables

---------

Co-authored-by: Christian Semmler <mail@csemmler.com>
---
 LEGO1/lego/legoomni/include/act1state.h       |   3 +
 LEGO1/lego/legoomni/include/act2brick.h       |   3 +
 .../lego/legoomni/include/act2policestation.h |   3 +
 LEGO1/lego/legoomni/include/act3.h            |   3 +
 LEGO1/lego/legoomni/include/act3shark.h       |   3 +
 LEGO1/lego/legoomni/include/act3state.h       |   3 +
 LEGO1/lego/legoomni/include/ambulance.h       |   3 +
 .../legoomni/include/ambulancemissionstate.h  |   3 +
 LEGO1/lego/legoomni/include/animstate.h       |   3 +
 .../lego/legoomni/include/beachhouseentity.h  |   3 +
 LEGO1/lego/legoomni/include/bike.h            |   3 +
 LEGO1/lego/legoomni/include/buildingentity.h  |   3 +
 LEGO1/lego/legoomni/include/bumpbouy.h        |   3 +
 LEGO1/lego/legoomni/include/carrace.h         |   3 +
 LEGO1/lego/legoomni/include/carracestate.h    |   3 +
 LEGO1/lego/legoomni/include/doors.h           |   3 +
 LEGO1/lego/legoomni/include/dunebuggy.h       |   3 +
 LEGO1/lego/legoomni/include/elevatorbottom.h  |   3 +
 LEGO1/lego/legoomni/include/gasstation.h      |   3 +
 .../lego/legoomni/include/gasstationentity.h  |   3 +
 LEGO1/lego/legoomni/include/gasstationstate.h |   3 +
 LEGO1/lego/legoomni/include/gifmanager.h      |  14 +-
 LEGO1/lego/legoomni/include/helicopterstate.h |   3 +
 LEGO1/lego/legoomni/include/historybook.h     |   3 +
 LEGO1/lego/legoomni/include/hospital.h        |   3 +
 LEGO1/lego/legoomni/include/hospitalentity.h  |   3 +
 LEGO1/lego/legoomni/include/hospitalstate.h   |   3 +
 LEGO1/lego/legoomni/include/infocenter.h      |   3 +
 LEGO1/lego/legoomni/include/infocenterdoor.h  |   3 +
 .../lego/legoomni/include/infocenterentity.h  |   3 +
 LEGO1/lego/legoomni/include/infocenterstate.h |   3 +
 LEGO1/lego/legoomni/include/isle.h            |   3 +
 LEGO1/lego/legoomni/include/jetski.h          |   3 +
 LEGO1/lego/legoomni/include/jetskiracestate.h |   3 +
 LEGO1/lego/legoomni/include/jukebox.h         |   3 +
 LEGO1/lego/legoomni/include/jukeboxentity.h   |   3 +
 LEGO1/lego/legoomni/include/jukeboxstate.h    |   3 +
 .../legoomni/include/lego3dwavepresenter.h    |   3 +
 LEGO1/lego/legoomni/include/legoact2.h        |   5 +-
 LEGO1/lego/legoomni/include/legoact2state.h   |   3 +
 .../legoomni/include/legoanimationmanager.h   |   3 +
 .../legoomni/include/legoanimmmpresenter.h    |   3 +
 .../legoomni/include/legobuildingmanager.h    |   3 +
 LEGO1/lego/legoomni/include/legocachesound.h  |   3 +
 LEGO1/lego/legoomni/include/legocarbuild.h    |   3 +
 .../include/legocarbuildanimpresenter.h       |   3 +
 .../lego/legoomni/include/legocarraceactor.h  |   3 +
 .../legoomni/include/legocontrolmanager.h     |   3 +
 .../legoomni/include/legoentitypresenter.h    |   3 +
 .../include/legoflctexturepresenter.h         |   3 +
 .../lego/legoomni/include/legoinputmanager.h  |   3 +
 LEGO1/lego/legoomni/include/legojetski.h      |   3 +
 .../legoomni/include/legojetskiraceactor.h    |   3 +
 .../include/legolocomotionanimpresenter.h     |   3 +
 .../legoomni/include/legomodelpresenter.h     |   3 +
 .../lego/legoomni/include/legonavcontroller.h |   3 +
 .../lego/legoomni/include/legoobjectfactory.h |   3 +
 LEGO1/lego/legoomni/include/legoomni.h        |   3 +
 .../legoomni/include/legopalettepresenter.h   |   3 +
 .../lego/legoomni/include/legopartpresenter.h |   3 +
 LEGO1/lego/legoomni/include/legopathactor.h   |   3 +
 .../legoomni/include/legopathcontroller.h     |   8 +-
 .../legoomni/include/legopathcontrollerlist.h |   3 +
 .../lego/legoomni/include/legopathpresenter.h |   3 +
 .../legoomni/include/legophonemepresenter.h   |   3 +
 .../lego/legoomni/include/legoplantmanager.h  |   3 +
 LEGO1/lego/legoomni/include/legorace.h        |   3 +
 LEGO1/lego/legoomni/include/legoraceactor.h   |   3 +
 LEGO1/lego/legoomni/include/legoracecar.h     |   3 +
 .../lego/legoomni/include/legosoundmanager.h  |   3 +
 LEGO1/lego/legoomni/include/legostate.h       |   3 +
 .../legoomni/include/legotexturepresenter.h   |   3 +
 .../legoomni/include/legovehiclebuildstate.h  |   3 +
 LEGO1/lego/legoomni/include/legoworld.h       |   3 +
 LEGO1/lego/legoomni/include/legoworldlist.h   |   9 ++
 .../legoomni/include/legoworldpresenter.h     |   3 +
 LEGO1/lego/legoomni/include/motocycle.h       |   3 +
 .../include/mxbackgroundaudiomanager.h        |   3 +
 .../legoomni/include/mxtransitionmanager.h    |   3 +
 LEGO1/lego/legoomni/include/pizza.h           |   3 +
 .../lego/legoomni/include/pizzamissionstate.h |   3 +
 LEGO1/lego/legoomni/include/pizzeria.h        |   3 +
 LEGO1/lego/legoomni/include/pizzeriastate.h   |   3 +
 LEGO1/lego/legoomni/include/police.h          |   3 +
 LEGO1/lego/legoomni/include/policeentity.h    |   3 +
 LEGO1/lego/legoomni/include/policestate.h     |   3 +
 LEGO1/lego/legoomni/include/racecar.h         |   3 +
 .../lego/legoomni/include/racestandsentity.h  |   5 +-
 LEGO1/lego/legoomni/include/racestate.h       |   3 +
 LEGO1/lego/legoomni/include/radio.h           |   3 +
 LEGO1/lego/legoomni/include/radiostate.h      |   3 +
 .../lego/legoomni/include/registrationbook.h  |   3 +
 LEGO1/lego/legoomni/include/scorestate.h      |   3 +
 LEGO1/lego/legoomni/include/skateboard.h      |   3 +
 LEGO1/lego/legoomni/include/towtrack.h        |   3 +
 .../legoomni/include/towtrackmissionstate.h   |   3 +
 LEGO1/lego/legoomni/src/common/gifmanager.cpp |   6 +
 .../legoomni/src/paths/legopathcontroller.cpp |  10 +-
 LEGO1/lego/sources/3dmanager/lego3dmanager.h  |   3 +
 LEGO1/lego/sources/roi/legoroi.h              |   3 +
 LEGO1/library_msvc.h                          |   3 +
 LEGO1/mxdirectx/mxdirect3d.h                  |   3 +
 LEGO1/mxdirectx/mxdirectdraw.h                |   3 +
 LEGO1/omni/include/mxaudiomanager.h           |   3 +
 LEGO1/omni/include/mxbitmap.h                 |   3 +
 LEGO1/omni/include/mxcore.h                   |   3 +
 LEGO1/omni/include/mxdsaction.h               |   3 +
 LEGO1/omni/include/mxdsactionlist.h           |   3 +
 LEGO1/omni/include/mxdsanim.h                 |   3 +
 LEGO1/omni/include/mxdsbuffer.h               |   3 +
 LEGO1/omni/include/mxdschunk.h                |   3 +
 LEGO1/omni/include/mxdsevent.h                |   3 +
 LEGO1/omni/include/mxdsfile.h                 |   3 +
 LEGO1/omni/include/mxdsmultiaction.h          |   3 +
 LEGO1/omni/include/mxdsobject.h               |   3 +
 LEGO1/omni/include/mxdsobjectaction.h         |   3 +
 LEGO1/omni/include/mxdsselectaction.h         |   3 +
 LEGO1/omni/include/mxdsserialaction.h         |   3 +
 LEGO1/omni/include/mxdssound.h                |   3 +
 LEGO1/omni/include/mxdsstill.h                |   3 +
 LEGO1/omni/include/mxdsstreamingaction.h      |   3 +
 LEGO1/omni/include/mxentity.h                 |   3 +
 LEGO1/omni/include/mxeventmanager.h           |   3 +
 LEGO1/omni/include/mxeventpresenter.h         |   3 +
 LEGO1/omni/include/mxflcpresenter.h           |   3 +
 LEGO1/omni/include/mxloopingflcpresenter.h    |   3 +
 LEGO1/omni/include/mxmediamanager.h           |   3 +
 LEGO1/omni/include/mxmediapresenter.h         |   3 +
 LEGO1/omni/include/mxmidipresenter.h          |   3 +
 LEGO1/omni/include/mxmusicmanager.h           |   3 +
 LEGO1/omni/include/mxmusicpresenter.h         |   3 +
 LEGO1/omni/include/mxnextactiondatastart.h    |   3 +
 LEGO1/omni/include/mxnotificationmanager.h    |   3 +
 LEGO1/omni/include/mxobjectfactory.h          |   3 +
 LEGO1/omni/include/mxomni.h                   |   3 +
 LEGO1/omni/include/mxomnicreateparam.h        |   3 +
 LEGO1/omni/include/mxpalette.h                |   3 +
 LEGO1/omni/include/mxpresenter.h              |   3 +
 LEGO1/omni/include/mxpresenterlist.h          |   3 +
 LEGO1/omni/include/mxregion.h                 |   3 +
 LEGO1/omni/include/mxregionlist.h             |   6 +
 LEGO1/omni/include/mxsmkpresenter.h           |   3 +
 LEGO1/omni/include/mxsoundpresenter.h         |   3 +
 LEGO1/omni/include/mxstreamchunklist.h        |   3 +
 LEGO1/omni/include/mxstring.h                 |   3 +
 LEGO1/omni/include/mxstringlist.h             |   3 +
 LEGO1/omni/include/mxthread.h                 |   6 +
 LEGO1/omni/include/mxticklemanager.h          |   3 +
 LEGO1/omni/include/mxtimer.h                  |   3 +
 LEGO1/omni/include/mxvariabletable.h          |   6 +
 LEGO1/omni/include/mxvideomanager.h           |   3 +
 LEGO1/omni/include/mxvideopresenter.h         |   6 +
 LEGO1/omni/include/mxwavepresenter.h          |   3 +
 LEGO1/realtime/matrix.h                       |   2 +-
 LEGO1/realtime/roi.h                          |   3 +
 LEGO1/tgl/tgl.h                               |  30 ++++
 LEGO1/viewmanager/viewlodlist.h               |   3 +
 LEGO1/viewmanager/viewmanager.h               |   3 +
 tools/isledecomp/isledecomp/compare/core.py   | 129 ++++++++++++++++--
 tools/isledecomp/isledecomp/compare/db.py     |  22 ++-
 tools/reccmp/reccmp.py                        |  14 +-
 161 files changed, 679 insertions(+), 34 deletions(-)

diff --git a/LEGO1/lego/legoomni/include/act1state.h b/LEGO1/lego/legoomni/include/act1state.h
index 84537e88..82e95f63 100644
--- a/LEGO1/lego/legoomni/include/act1state.h
+++ b/LEGO1/lego/legoomni/include/act1state.h
@@ -29,6 +29,9 @@ class Act1State : public LegoState {
 
 	void FUN_10034d00();
 
+	// SYNTHETIC: LEGO1 0x10033960
+	// Act1State::`scalar deleting destructor'
+
 protected:
 	undefined m_unk0x8[0x10]; // 0x8
 	MxU32 m_unk0x18;          // 0x18
diff --git a/LEGO1/lego/legoomni/include/act2brick.h b/LEGO1/lego/legoomni/include/act2brick.h
index 10665c40..5eb697ed 100644
--- a/LEGO1/lego/legoomni/include/act2brick.h
+++ b/LEGO1/lego/legoomni/include/act2brick.h
@@ -25,6 +25,9 @@ class Act2Brick : public LegoPathActor {
 	{
 		return !strcmp(p_name, Act2Brick::ClassName()) || LegoEntity::IsA(p_name);
 	}
+
+	// SYNTHETIC: LEGO1 0x1007a450
+	// Act2Brick::`scalar deleting destructor'
 };
 
 #endif // ACT2BRICK_H
diff --git a/LEGO1/lego/legoomni/include/act2policestation.h b/LEGO1/lego/legoomni/include/act2policestation.h
index 887ab542..4746236f 100644
--- a/LEGO1/lego/legoomni/include/act2policestation.h
+++ b/LEGO1/lego/legoomni/include/act2policestation.h
@@ -21,6 +21,9 @@ class Act2PoliceStation : public LegoEntity {
 	{
 		return !strcmp(p_name, Act2PoliceStation::ClassName()) || LegoEntity::IsA(p_name);
 	}
+
+	// SYNTHETIC: LEGO1 0x1000f610
+	// Act2PoliceStation::`scalar deleting destructor'
 };
 
 #endif // ACT2POLICESTATION_H
diff --git a/LEGO1/lego/legoomni/include/act3.h b/LEGO1/lego/legoomni/include/act3.h
index 76c9722b..053bde82 100644
--- a/LEGO1/lego/legoomni/include/act3.h
+++ b/LEGO1/lego/legoomni/include/act3.h
@@ -27,6 +27,9 @@ class Act3 : public LegoWorld {
 	inline void SetUnkown420c(MxEntity* p_entity) { m_unk0x420c = p_entity; }
 	inline void SetUnkown4270(MxU32 p_unk0x4270) { m_unk0x4270 = p_unk0x4270; }
 
+	// SYNTHETIC: LEGO1 0x10072630
+	// Act3::`scalar deleting destructor'
+
 protected:
 	undefined m_unk0xf8[0x4114]; // 0xf8
 	MxEntity* m_unk0x420c;       // 0x420c
diff --git a/LEGO1/lego/legoomni/include/act3shark.h b/LEGO1/lego/legoomni/include/act3shark.h
index 611cbc38..e6910cdb 100644
--- a/LEGO1/lego/legoomni/include/act3shark.h
+++ b/LEGO1/lego/legoomni/include/act3shark.h
@@ -12,6 +12,9 @@ class Act3Shark : public LegoAnimActor {
 		// STRING: LEGO1 0x100f03a0
 		return "Act3Shark";
 	}
+
+	// SYNTHETIC: LEGO1 0x10043020
+	// Act3Shark::`scalar deleting destructor'
 };
 
 #endif // ACT3SHARK_H
diff --git a/LEGO1/lego/legoomni/include/act3state.h b/LEGO1/lego/legoomni/include/act3state.h
index dca6c3ea..c88c4620 100644
--- a/LEGO1/lego/legoomni/include/act3state.h
+++ b/LEGO1/lego/legoomni/include/act3state.h
@@ -24,6 +24,9 @@ class Act3State : public LegoState {
 
 	virtual MxBool VTable0x14() override;
 
+	// SYNTHETIC: LEGO1 0x1000e3c0
+	// Act3State::`scalar deleting destructor'
+
 private:
 	// FIXME: May be part of LegoState? Uncertain...
 	MxU32 m_unk0x08;
diff --git a/LEGO1/lego/legoomni/include/ambulance.h b/LEGO1/lego/legoomni/include/ambulance.h
index 3bc80212..7c54561a 100644
--- a/LEGO1/lego/legoomni/include/ambulance.h
+++ b/LEGO1/lego/legoomni/include/ambulance.h
@@ -22,6 +22,9 @@ class Ambulance : public IslePathActor {
 		return !strcmp(p_name, Ambulance::ClassName()) || IslePathActor::IsA(p_name);
 	}
 
+	// SYNTHETIC: LEGO1 0x10036130
+	// Ambulance::`scalar deleting destructor'
+
 private:
 	// TODO: Ambulance fields
 	undefined m_unk0x160[4];
diff --git a/LEGO1/lego/legoomni/include/ambulancemissionstate.h b/LEGO1/lego/legoomni/include/ambulancemissionstate.h
index a09bf117..cdfa608b 100644
--- a/LEGO1/lego/legoomni/include/ambulancemissionstate.h
+++ b/LEGO1/lego/legoomni/include/ambulancemissionstate.h
@@ -40,6 +40,9 @@ class AmbulanceMissionState : public LegoState {
 		}
 	}
 
+	// SYNTHETIC: LEGO1 0x100376c0
+	// AmbulanceMissionState::`scalar deleting destructor'
+
 protected:
 	undefined4 m_unk0x8; // 0x08
 	undefined4 m_unk0xc; // 0x0c
diff --git a/LEGO1/lego/legoomni/include/animstate.h b/LEGO1/lego/legoomni/include/animstate.h
index c1098b6a..fe39ccc7 100644
--- a/LEGO1/lego/legoomni/include/animstate.h
+++ b/LEGO1/lego/legoomni/include/animstate.h
@@ -26,6 +26,9 @@ class AnimState : public LegoState {
 	virtual MxBool SetFlag() override;                                      // vtable+0x18
 	virtual MxResult VTable0x1c(LegoFileStream* p_legoFileStream) override; // vtable+0x1C
 
+	// SYNTHETIC: LEGO1 0x10065130
+	// AnimState::`scalar deleting destructor'
+
 private:
 	undefined4 m_unk0x8;
 	undefined4 m_unk0xc;
diff --git a/LEGO1/lego/legoomni/include/beachhouseentity.h b/LEGO1/lego/legoomni/include/beachhouseentity.h
index 58aa3c68..df8cf288 100644
--- a/LEGO1/lego/legoomni/include/beachhouseentity.h
+++ b/LEGO1/lego/legoomni/include/beachhouseentity.h
@@ -21,6 +21,9 @@ class BeachHouseEntity : public BuildingEntity {
 	{
 		return !strcmp(p_name, BeachHouseEntity::ClassName()) || BuildingEntity::IsA(p_name);
 	}
+
+	// SYNTHETIC: LEGO1 0x1000f970
+	// BeachHouseEntity::`scalar deleting destructor'
 };
 
 #endif // BEACHHOUSEENTITY_H
diff --git a/LEGO1/lego/legoomni/include/bike.h b/LEGO1/lego/legoomni/include/bike.h
index 899cfd21..29aa6063 100644
--- a/LEGO1/lego/legoomni/include/bike.h
+++ b/LEGO1/lego/legoomni/include/bike.h
@@ -23,6 +23,9 @@ class Bike : public IslePathActor {
 		return !strcmp(p_name, Bike::ClassName()) || IslePathActor::IsA(p_name);
 	}
 
+	// SYNTHETIC: LEGO1 0x10076880
+	// Bike::`scalar deleting destructor'
+
 private:
 	// TODO: Bike fields
 	undefined m_unk0x160[4];
diff --git a/LEGO1/lego/legoomni/include/buildingentity.h b/LEGO1/lego/legoomni/include/buildingentity.h
index 7f2abe07..bd136438 100644
--- a/LEGO1/lego/legoomni/include/buildingentity.h
+++ b/LEGO1/lego/legoomni/include/buildingentity.h
@@ -22,6 +22,9 @@ class BuildingEntity : public LegoEntity {
 	{
 		return !strcmp(p_name, BuildingEntity::ClassName()) || LegoEntity::IsA(p_name);
 	}
+
+	// SYNTHETIC: LEGO1 0x10015010
+	// BuildingEntity::`scalar deleting destructor'
 };
 
 #endif // BUILDINGENTITY_H
diff --git a/LEGO1/lego/legoomni/include/bumpbouy.h b/LEGO1/lego/legoomni/include/bumpbouy.h
index a56526e4..a423ca3e 100644
--- a/LEGO1/lego/legoomni/include/bumpbouy.h
+++ b/LEGO1/lego/legoomni/include/bumpbouy.h
@@ -19,6 +19,9 @@ class BumpBouy : public LegoAnimActor {
 	{
 		return !strcmp(p_name, BumpBouy::ClassName()) || LegoAnimActor::IsA(p_name);
 	}
+
+	// SYNTHETIC: LEGO1 0x10027490
+	// BumpBouy::`scalar deleting destructor'
 };
 
 #endif // BUMPBOUY_H
diff --git a/LEGO1/lego/legoomni/include/carrace.h b/LEGO1/lego/legoomni/include/carrace.h
index 767fa567..3a3b238a 100644
--- a/LEGO1/lego/legoomni/include/carrace.h
+++ b/LEGO1/lego/legoomni/include/carrace.h
@@ -23,6 +23,9 @@ class CarRace : public LegoRace {
 		return !strcmp(p_name, CarRace::ClassName()) || LegoRace::IsA(p_name);
 	}
 
+	// SYNTHETIC: LEGO1 0x10016c70
+	// CarRace::`scalar deleting destructor'
+
 private:
 	undefined m_unk0x144[12]; // 0x144
 	undefined4 m_unk0x150;    // 0x150
diff --git a/LEGO1/lego/legoomni/include/carracestate.h b/LEGO1/lego/legoomni/include/carracestate.h
index 561f277b..490900dd 100644
--- a/LEGO1/lego/legoomni/include/carracestate.h
+++ b/LEGO1/lego/legoomni/include/carracestate.h
@@ -19,6 +19,9 @@ class CarRaceState : public RaceState {
 	{
 		return !strcmp(p_name, CarRaceState::ClassName()) || RaceState::IsA(p_name);
 	}
+
+	// SYNTHETIC: LEGO1 0x1000f740
+	// CarRaceState::`scalar deleting destructor'
 };
 
 #endif // CARRACESTATE_H
diff --git a/LEGO1/lego/legoomni/include/doors.h b/LEGO1/lego/legoomni/include/doors.h
index feea0460..321fdf61 100644
--- a/LEGO1/lego/legoomni/include/doors.h
+++ b/LEGO1/lego/legoomni/include/doors.h
@@ -19,6 +19,9 @@ class Doors : public LegoPathActor {
 	{
 		return !strcmp(p_name, Doors::ClassName()) || LegoPathActor::IsA(p_name);
 	}
+
+	// SYNTHETIC: LEGO1 0x1000e580
+	// Doors::`scalar deleting destructor'
 };
 
 #endif // DOORS_H
diff --git a/LEGO1/lego/legoomni/include/dunebuggy.h b/LEGO1/lego/legoomni/include/dunebuggy.h
index e45fe8fe..918a8b1a 100644
--- a/LEGO1/lego/legoomni/include/dunebuggy.h
+++ b/LEGO1/lego/legoomni/include/dunebuggy.h
@@ -23,6 +23,9 @@ class DuneBuggy : public IslePathActor {
 		return !strcmp(p_name, DuneBuggy::ClassName()) || IslePathActor::IsA(p_name);
 	}
 
+	// SYNTHETIC: LEGO1 0x10067dc0
+	// DuneBuggy::`scalar deleting destructor'
+
 private:
 	// TODO: Double check DuneBuggy field types
 	undefined4 m_unk0x160;
diff --git a/LEGO1/lego/legoomni/include/elevatorbottom.h b/LEGO1/lego/legoomni/include/elevatorbottom.h
index e10b7727..9c5b18e3 100644
--- a/LEGO1/lego/legoomni/include/elevatorbottom.h
+++ b/LEGO1/lego/legoomni/include/elevatorbottom.h
@@ -26,6 +26,9 @@ class ElevatorBottom : public LegoWorld {
 		return !strcmp(p_name, ElevatorBottom::ClassName()) || LegoWorld::IsA(p_name);
 	}
 
+	// SYNTHETIC: LEGO1 0x10018040
+	// ElevatorBottom::`scalar deleting destructor'
+
 private:
 	undefined4 m_unk0xf8; // 0xf8
 };
diff --git a/LEGO1/lego/legoomni/include/gasstation.h b/LEGO1/lego/legoomni/include/gasstation.h
index 11ff175a..2c979d72 100644
--- a/LEGO1/lego/legoomni/include/gasstation.h
+++ b/LEGO1/lego/legoomni/include/gasstation.h
@@ -29,6 +29,9 @@ class GasStation : public LegoWorld {
 		return !strcmp(p_name, GasStation::ClassName()) || LegoWorld::IsA(p_name);
 	}
 
+	// SYNTHETIC: LEGO1 0x100048a0
+	// GasStation::`scalar deleting destructor'
+
 private:
 	undefined2 m_unk0xf8;  // 0xf8
 	undefined2 m_unk0xfa;  // 0xfa
diff --git a/LEGO1/lego/legoomni/include/gasstationentity.h b/LEGO1/lego/legoomni/include/gasstationentity.h
index b4a27942..7ab807cd 100644
--- a/LEGO1/lego/legoomni/include/gasstationentity.h
+++ b/LEGO1/lego/legoomni/include/gasstationentity.h
@@ -19,6 +19,9 @@ class GasStationEntity : public BuildingEntity {
 	{
 		return !strcmp(p_name, GasStationEntity::ClassName()) || BuildingEntity::IsA(p_name);
 	}
+
+	// SYNTHETIC: LEGO1 0x1000f890
+	// GasStationEntity::`scalar deleting destructor'
 };
 
 #endif // GASSTATIONENTITY_H
diff --git a/LEGO1/lego/legoomni/include/gasstationstate.h b/LEGO1/lego/legoomni/include/gasstationstate.h
index e2768a98..0cdf7bf1 100644
--- a/LEGO1/lego/legoomni/include/gasstationstate.h
+++ b/LEGO1/lego/legoomni/include/gasstationstate.h
@@ -22,6 +22,9 @@ class GasStationState : public LegoState {
 		return !strcmp(p_name, GasStationState::ClassName()) || LegoState::IsA(p_name);
 	}
 
+	// SYNTHETIC: LEGO1 0x10006290
+	// GasStationState::`scalar deleting destructor'
+
 private:
 	undefined4 m_unk0x08[3];
 	undefined4 m_unk0x14;
diff --git a/LEGO1/lego/legoomni/include/gifmanager.h b/LEGO1/lego/legoomni/include/gifmanager.h
index 3226b4b0..aa6d2d80 100644
--- a/LEGO1/lego/legoomni/include/gifmanager.h
+++ b/LEGO1/lego/legoomni/include/gifmanager.h
@@ -1,6 +1,7 @@
 #ifndef GIFMANAGER_H
 #define GIFMANAGER_H
 
+#include "compat.h"
 #include "decomp.h"
 #include "mxtypes.h"
 
@@ -45,8 +46,11 @@ class GifMap {
 // VTABLE: LEGO1 0x100d86d4
 class GifManagerBase {
 public:
-	// STUB: LEGO1 0x1005a310
-	virtual ~GifManagerBase() {} // vtable+00
+	// STUB: LEGO1 0x1005b660
+	virtual ~GifManagerBase() {}
+
+	// SYNTHETIC: LEGO1 0x1005a310
+	// GifManagerBase::`scalar deleting destructor'
 
 	inline GifData* Get(const char* p_name) { return m_unk0x8.Get(p_name); }
 
@@ -59,8 +63,10 @@ class GifManagerBase {
 // VTABLE: LEGO1 0x100d86fc
 class GifManager : public GifManagerBase {
 public:
-	// STUB: LEGO1 0x1005a580
-	virtual ~GifManager() {} // vtable+00
+	virtual ~GifManager() override;
+
+	// SYNTHETIC: LEGO1 0x1005a580
+	// GifManager::`scalar deleting destructor'
 
 protected:
 	undefined m_unk0x14[0x1c];
diff --git a/LEGO1/lego/legoomni/include/helicopterstate.h b/LEGO1/lego/legoomni/include/helicopterstate.h
index 2cb3b747..41dcf84b 100644
--- a/LEGO1/lego/legoomni/include/helicopterstate.h
+++ b/LEGO1/lego/legoomni/include/helicopterstate.h
@@ -24,6 +24,9 @@ class HelicopterState : public LegoState {
 	inline void SetUnknown8(MxU32 p_unk0x8) { m_unk0x8 = p_unk0x8; }
 	inline MxU32 GetUnkown8() { return m_unk0x8; }
 
+	// SYNTHETIC: LEGO1 0x1000e190
+	// HelicopterState::`scalar deleting destructor'
+
 protected:
 	MxU32 m_unk0x8; // 0x8
 };
diff --git a/LEGO1/lego/legoomni/include/historybook.h b/LEGO1/lego/legoomni/include/historybook.h
index 80cc78b5..101e45a6 100644
--- a/LEGO1/lego/legoomni/include/historybook.h
+++ b/LEGO1/lego/legoomni/include/historybook.h
@@ -24,6 +24,9 @@ class HistoryBook : public LegoWorld {
 	{
 		return !strcmp(p_name, HistoryBook::ClassName()) || LegoWorld::IsA(p_name);
 	}
+
+	// SYNTHETIC: LEGO1 0x100824b0
+	// HistoryBook::`scalar deleting destructor'
 };
 
 #endif // HISTORYBOOK_H
diff --git a/LEGO1/lego/legoomni/include/hospital.h b/LEGO1/lego/legoomni/include/hospital.h
index 29ff1177..bbaa3e74 100644
--- a/LEGO1/lego/legoomni/include/hospital.h
+++ b/LEGO1/lego/legoomni/include/hospital.h
@@ -26,6 +26,9 @@ class Hospital : public LegoWorld {
 		return !strcmp(p_name, Hospital::ClassName()) || LegoWorld::IsA(p_name);
 	}
 
+	// SYNTHETIC: LEGO1 0x100747d0
+	// Hospital::`scalar deleting destructor'
+
 private:
 	undefined2 m_unk0xf8;    // 0xf8
 	undefined4 m_unk0xfc;    // 0xfc
diff --git a/LEGO1/lego/legoomni/include/hospitalentity.h b/LEGO1/lego/legoomni/include/hospitalentity.h
index f4f14b70..fea461d8 100644
--- a/LEGO1/lego/legoomni/include/hospitalentity.h
+++ b/LEGO1/lego/legoomni/include/hospitalentity.h
@@ -19,6 +19,9 @@ class HospitalEntity : public BuildingEntity {
 	{
 		return !strcmp(p_name, HospitalEntity::ClassName()) || BuildingEntity::IsA(p_name);
 	}
+
+	// SYNTHETIC: LEGO1 0x1000f820
+	// HospitalEntity::`scalar deleting destructor'
 };
 
 #endif // HOSPITALENTITY_H
diff --git a/LEGO1/lego/legoomni/include/hospitalstate.h b/LEGO1/lego/legoomni/include/hospitalstate.h
index 25c23d96..7fabe10a 100644
--- a/LEGO1/lego/legoomni/include/hospitalstate.h
+++ b/LEGO1/lego/legoomni/include/hospitalstate.h
@@ -23,6 +23,9 @@ class HospitalState : public LegoState {
 		return !strcmp(p_name, HospitalState::ClassName()) || LegoState::IsA(p_name);
 	}
 
+	// SYNTHETIC: LEGO1 0x100764c0
+	// HospitalState::`scalar deleting destructor'
+
 private:
 	undefined m_unk0x8[4]; // 0x8
 	undefined2 m_unk0xc;   // 0xc
diff --git a/LEGO1/lego/legoomni/include/infocenter.h b/LEGO1/lego/legoomni/include/infocenter.h
index da17941b..c0ef31b0 100644
--- a/LEGO1/lego/legoomni/include/infocenter.h
+++ b/LEGO1/lego/legoomni/include/infocenter.h
@@ -132,6 +132,9 @@ class Infocenter : public LegoWorld {
 	virtual MxBool VTable0x64() override;                     // vtable+0x64
 	virtual void VTable0x68(MxBool p_add) override;           // vtable+0x68
 
+	// SYNTHETIC: LEGO1 0x1006ec60
+	// Infocenter::`scalar deleting destructor'
+
 private:
 	void InitializeBitmaps();
 
diff --git a/LEGO1/lego/legoomni/include/infocenterdoor.h b/LEGO1/lego/legoomni/include/infocenterdoor.h
index 5bc5e407..4bdf2884 100644
--- a/LEGO1/lego/legoomni/include/infocenterdoor.h
+++ b/LEGO1/lego/legoomni/include/infocenterdoor.h
@@ -24,6 +24,9 @@ class InfocenterDoor : public LegoWorld {
 	{
 		return !strcmp(p_name, InfocenterDoor::ClassName()) || LegoWorld::IsA(p_name);
 	}
+
+	// SYNTHETIC: LEGO1 0x100378d0
+	// InfocenterDoor::`scalar deleting destructor'
 };
 
 #endif // INFOCENTERDOOR_H
diff --git a/LEGO1/lego/legoomni/include/infocenterentity.h b/LEGO1/lego/legoomni/include/infocenterentity.h
index e011aeb8..91fe03ff 100644
--- a/LEGO1/lego/legoomni/include/infocenterentity.h
+++ b/LEGO1/lego/legoomni/include/infocenterentity.h
@@ -19,6 +19,9 @@ class InfoCenterEntity : public BuildingEntity {
 	{
 		return !strcmp(p_name, InfoCenterEntity::ClassName()) || BuildingEntity::IsA(p_name);
 	}
+
+	// SYNTHETIC: LEGO1 0x1000f7b0
+	// InfoCenterEntity::`scalar deleting destructor'
 };
 
 #endif // INFOCENTERENTITY_H
diff --git a/LEGO1/lego/legoomni/include/infocenterstate.h b/LEGO1/lego/legoomni/include/infocenterstate.h
index 51dbac72..c926b97c 100644
--- a/LEGO1/lego/legoomni/include/infocenterstate.h
+++ b/LEGO1/lego/legoomni/include/infocenterstate.h
@@ -29,6 +29,9 @@ class InfocenterState : public LegoState {
 
 	inline void SetUnknown0x74(MxU32 p_unk0x74) { m_unk0x74 = p_unk0x74; }
 
+	// SYNTHETIC: LEGO1 0x10071900
+	// InfocenterState::`scalar deleting destructor'
+
 private:
 	// Members should be renamed with their offsets before use
 	/*
diff --git a/LEGO1/lego/legoomni/include/isle.h b/LEGO1/lego/legoomni/include/isle.h
index 5ebc5fab..681e0337 100644
--- a/LEGO1/lego/legoomni/include/isle.h
+++ b/LEGO1/lego/legoomni/include/isle.h
@@ -59,6 +59,9 @@ class Isle : public LegoWorld {
 	MxLong HandleTransitionEnd();
 	void FUN_10032620();
 
+	// SYNTHETIC: LEGO1 0x10030a30
+	// Isle::`scalar deleting destructor'
+
 protected:
 	Act1State* m_act1state;   // 0xf8
 	Pizza* m_pizza;           // 0xfc
diff --git a/LEGO1/lego/legoomni/include/jetski.h b/LEGO1/lego/legoomni/include/jetski.h
index 1a64a4b6..c0129dbd 100644
--- a/LEGO1/lego/legoomni/include/jetski.h
+++ b/LEGO1/lego/legoomni/include/jetski.h
@@ -23,6 +23,9 @@ class Jetski : public IslePathActor {
 		return !strcmp(p_name, Jetski::ClassName()) || IslePathActor::IsA(p_name);
 	}
 
+	// SYNTHETIC: LEGO1 0x1007e5c0
+	// Jetski::`scalar deleting destructor'
+
 private:
 	// TODO: Jetski fields
 	undefined m_unk0x160[4];
diff --git a/LEGO1/lego/legoomni/include/jetskiracestate.h b/LEGO1/lego/legoomni/include/jetskiracestate.h
index 5610ac32..ccb60112 100644
--- a/LEGO1/lego/legoomni/include/jetskiracestate.h
+++ b/LEGO1/lego/legoomni/include/jetskiracestate.h
@@ -19,6 +19,9 @@ class JetskiRaceState : public RaceState {
 	{
 		return !strcmp(p_name, JetskiRaceState::ClassName()) || RaceState::IsA(p_name);
 	}
+
+	// SYNTHETIC: LEGO1 0x1000f680
+	// JetskiRaceState::`scalar deleting destructor'
 };
 
 #endif // JETSKIRACESTATE_H
diff --git a/LEGO1/lego/legoomni/include/jukebox.h b/LEGO1/lego/legoomni/include/jukebox.h
index 59aee194..de351ad9 100644
--- a/LEGO1/lego/legoomni/include/jukebox.h
+++ b/LEGO1/lego/legoomni/include/jukebox.h
@@ -23,6 +23,9 @@ class JukeBox : public LegoWorld {
 		return !strcmp(p_name, JukeBox::ClassName()) || LegoWorld::IsA(p_name);
 	}
 
+	// SYNTHETIC: LEGO1 0x1005d810
+	// JukeBox::`scalar deleting destructor'
+
 private:
 	undefined m_unk0xf8[4]; // 0xf8
 	undefined4 m_unk0xfc;   // 0xfc
diff --git a/LEGO1/lego/legoomni/include/jukeboxentity.h b/LEGO1/lego/legoomni/include/jukeboxentity.h
index c451787d..81a47ef9 100644
--- a/LEGO1/lego/legoomni/include/jukeboxentity.h
+++ b/LEGO1/lego/legoomni/include/jukeboxentity.h
@@ -22,6 +22,9 @@ class JukeBoxEntity : public LegoEntity {
 	{
 		return !strcmp(p_name, JukeBoxEntity::ClassName()) || LegoEntity::IsA(p_name);
 	}
+
+	// SYNTHETIC: LEGO1 0x10085db0
+	// JukeBoxEntity::`scalar deleting destructor'
 };
 
 #endif // JUKEBOXENTITY_H
diff --git a/LEGO1/lego/legoomni/include/jukeboxstate.h b/LEGO1/lego/legoomni/include/jukeboxstate.h
index 7a517bb0..8263e97c 100644
--- a/LEGO1/lego/legoomni/include/jukeboxstate.h
+++ b/LEGO1/lego/legoomni/include/jukeboxstate.h
@@ -21,6 +21,9 @@ class JukeBoxState : public LegoState {
 	}
 
 	virtual MxBool VTable0x14() override; // vtable+0x14
+
+	// SYNTHETIC: LEGO1 0x1000f3d0
+	// JukeBoxState::`scalar deleting destructor'
 };
 
 #endif // JUKEBOXSTATE_H
diff --git a/LEGO1/lego/legoomni/include/lego3dwavepresenter.h b/LEGO1/lego/legoomni/include/lego3dwavepresenter.h
index ed1942da..c08e777f 100644
--- a/LEGO1/lego/legoomni/include/lego3dwavepresenter.h
+++ b/LEGO1/lego/legoomni/include/lego3dwavepresenter.h
@@ -19,6 +19,9 @@ class Lego3DWavePresenter : public MxWavePresenter {
 	{
 		return !strcmp(p_name, Lego3DWavePresenter::ClassName()) || MxWavePresenter::IsA(p_name);
 	}
+
+	// SYNTHETIC: LEGO1 0x1000f4b0
+	// Lego3DWavePresenter::`scalar deleting destructor'
 };
 
 #endif // LEGO3DWAVEPRESENTER_H
diff --git a/LEGO1/lego/legoomni/include/legoact2.h b/LEGO1/lego/legoomni/include/legoact2.h
index 79983416..1f0138ce 100644
--- a/LEGO1/lego/legoomni/include/legoact2.h
+++ b/LEGO1/lego/legoomni/include/legoact2.h
@@ -6,6 +6,9 @@
 
 // VTABLE: LEGO1 0x100d82e0
 // SIZE 0x1154
-class LegoAct2 : public LegoWorld {};
+class LegoAct2 : public LegoWorld {
+	// SYNTHETIC: LEGO1 0x1004fe20
+	// LegoAct2::`scalar deleting destructor'
+};
 
 #endif // LEGOACT2_H
diff --git a/LEGO1/lego/legoomni/include/legoact2state.h b/LEGO1/lego/legoomni/include/legoact2state.h
index 38584769..2f8a2e79 100644
--- a/LEGO1/lego/legoomni/include/legoact2state.h
+++ b/LEGO1/lego/legoomni/include/legoact2state.h
@@ -19,6 +19,9 @@ class LegoAct2State : public LegoState {
 	{
 		return !strcmp(p_name, LegoAct2State::ClassName()) || LegoState::IsA(p_name);
 	}
+
+	// SYNTHETIC: LEGO1 0x1000e040
+	// LegoAct2State::`scalar deleting destructor'
 };
 
 #endif // LEGOACT2STATE_H
diff --git a/LEGO1/lego/legoomni/include/legoanimationmanager.h b/LEGO1/lego/legoomni/include/legoanimationmanager.h
index a781128e..b81f2c72 100644
--- a/LEGO1/lego/legoomni/include/legoanimationmanager.h
+++ b/LEGO1/lego/legoomni/include/legoanimationmanager.h
@@ -34,6 +34,9 @@ class LegoAnimationManager : public MxCore {
 
 	__declspec(dllexport) static void configureLegoAnimationManager(MxS32 p_legoAnimationManagerConfig);
 
+	// SYNTHETIC: LEGO1 0x1005ed10
+	// LegoAnimationManager::`scalar deleting destructor'
+
 private:
 	void Init();
 };
diff --git a/LEGO1/lego/legoomni/include/legoanimmmpresenter.h b/LEGO1/lego/legoomni/include/legoanimmmpresenter.h
index 2e1ab918..520f3c09 100644
--- a/LEGO1/lego/legoomni/include/legoanimmmpresenter.h
+++ b/LEGO1/lego/legoomni/include/legoanimmmpresenter.h
@@ -21,6 +21,9 @@ class LegoAnimMMPresenter : public MxCompositePresenter {
 	{
 		return !strcmp(p_name, LegoAnimMMPresenter::ClassName()) || MxCompositePresenter::IsA(p_name);
 	}
+
+	// SYNTHETIC: LEGO1 0x1004aa40
+	// LegoAnimMMPresenter::`scalar deleting destructor'
 };
 
 #endif // LEGOANIMMMPRESENTER_H
diff --git a/LEGO1/lego/legoomni/include/legobuildingmanager.h b/LEGO1/lego/legoomni/include/legobuildingmanager.h
index 03fb2eeb..5c0061d3 100644
--- a/LEGO1/lego/legoomni/include/legobuildingmanager.h
+++ b/LEGO1/lego/legoomni/include/legobuildingmanager.h
@@ -21,6 +21,9 @@ class LegoBuildingManager : public MxCore {
 
 	void FUN_1002fa00();
 
+	// SYNTHETIC: LEGO1 0x1002f940
+	// LegoBuildingManager::`scalar deleting destructor'
+
 private:
 	void Init();
 };
diff --git a/LEGO1/lego/legoomni/include/legocachesound.h b/LEGO1/lego/legoomni/include/legocachesound.h
index 6398c04e..5d587835 100644
--- a/LEGO1/lego/legoomni/include/legocachesound.h
+++ b/LEGO1/lego/legoomni/include/legocachesound.h
@@ -23,6 +23,9 @@ class LegoCacheSound : public MxCore {
 		return !strcmp(p_name, LegoCacheSound::ClassName()) || MxCore::IsA(p_name);
 	}
 
+	// SYNTHETIC: LEGO1 0x10006610
+	// LegoCacheSound::`scalar deleting destructor'
+
 private:
 	void Init();
 };
diff --git a/LEGO1/lego/legoomni/include/legocarbuild.h b/LEGO1/lego/legoomni/include/legocarbuild.h
index 74d850d4..c3b1b1f6 100644
--- a/LEGO1/lego/legoomni/include/legocarbuild.h
+++ b/LEGO1/lego/legoomni/include/legocarbuild.h
@@ -25,6 +25,9 @@ class LegoCarBuild : public LegoWorld {
 	{
 		return !strcmp(p_name, LegoCarBuild::ClassName()) || LegoWorld::IsA(p_name);
 	}
+
+	// SYNTHETIC: LEGO1 0x10022a60
+	// LegoCarBuild::`scalar deleting destructor'
 };
 
 #endif // LEGOCARBUILD_H
diff --git a/LEGO1/lego/legoomni/include/legocarbuildanimpresenter.h b/LEGO1/lego/legoomni/include/legocarbuildanimpresenter.h
index 0440a0f3..8bd5ba75 100644
--- a/LEGO1/lego/legoomni/include/legocarbuildanimpresenter.h
+++ b/LEGO1/lego/legoomni/include/legocarbuildanimpresenter.h
@@ -22,6 +22,9 @@ class LegoCarBuildAnimPresenter : public LegoAnimPresenter {
 	{
 		return !strcmp(p_name, LegoCarBuildAnimPresenter::ClassName()) || LegoAnimPresenter::IsA(p_name);
 	}
+
+	// SYNTHETIC: LEGO1 0x10078660
+	// LegoCarBuildAnimPresenter::`scalar deleting destructor'
 };
 
 #endif // LEGOCARBUILDANIMPRESENTER_H
diff --git a/LEGO1/lego/legoomni/include/legocarraceactor.h b/LEGO1/lego/legoomni/include/legocarraceactor.h
index f00d900e..d88da3f7 100644
--- a/LEGO1/lego/legoomni/include/legocarraceactor.h
+++ b/LEGO1/lego/legoomni/include/legocarraceactor.h
@@ -18,6 +18,9 @@ class LegoCarRaceActor : public LegoRaceActor {
 	{
 		return !strcmp(p_name, LegoCarRaceActor::ClassName()) || LegoRaceActor::IsA(p_name);
 	}
+
+	// SYNTHETIC: LEGO1 0x10081610
+	// LegoCarRaceActor::`scalar deleting destructor'
 };
 
 #endif // LEGOCARRACEACTOR_H
diff --git a/LEGO1/lego/legoomni/include/legocontrolmanager.h b/LEGO1/lego/legoomni/include/legocontrolmanager.h
index f81ab6d2..df003f06 100644
--- a/LEGO1/lego/legoomni/include/legocontrolmanager.h
+++ b/LEGO1/lego/legoomni/include/legocontrolmanager.h
@@ -29,6 +29,9 @@ class LegoControlManager : public MxCore {
 	void Register(MxCore* p_listener);
 	void Unregister(MxCore* p_listener);
 	void FUN_100293c0(undefined4, const MxAtomId&, undefined2);
+
+	// SYNTHETIC: LEGO1 0x10028d40
+	// LegoControlManager::`scalar deleting destructor'
 };
 
 #endif // LEGOCONTROLMANAGER_H
diff --git a/LEGO1/lego/legoomni/include/legoentitypresenter.h b/LEGO1/lego/legoomni/include/legoentitypresenter.h
index e3055991..249e8b5c 100644
--- a/LEGO1/lego/legoomni/include/legoentitypresenter.h
+++ b/LEGO1/lego/legoomni/include/legoentitypresenter.h
@@ -35,6 +35,9 @@ class LegoEntityPresenter : public MxCompositePresenter {
 
 	void SetEntityLocation(Mx3DPointFloat& p_location, Mx3DPointFloat& p_direction, Mx3DPointFloat& p_up);
 
+	// SYNTHETIC: LEGO1 0x100535a0
+	// LegoEntityPresenter::`scalar deleting destructor'
+
 private:
 	void Destroy(MxBool p_fromDestructor);
 
diff --git a/LEGO1/lego/legoomni/include/legoflctexturepresenter.h b/LEGO1/lego/legoomni/include/legoflctexturepresenter.h
index 36d1fefc..f5ea7420 100644
--- a/LEGO1/lego/legoomni/include/legoflctexturepresenter.h
+++ b/LEGO1/lego/legoomni/include/legoflctexturepresenter.h
@@ -17,6 +17,9 @@ class LegoFlcTexturePresenter : public MxFlcPresenter {
 		return "LegoFlcTexturePresenter";
 	}
 
+	// SYNTHETIC: LEGO1 0x1005df00
+	// LegoFlcTexturePresenter::`scalar deleting destructor'
+
 private:
 	void Init();
 
diff --git a/LEGO1/lego/legoomni/include/legoinputmanager.h b/LEGO1/lego/legoomni/include/legoinputmanager.h
index 251c52b5..0f068a90 100644
--- a/LEGO1/lego/legoomni/include/legoinputmanager.h
+++ b/LEGO1/lego/legoomni/include/legoinputmanager.h
@@ -71,6 +71,9 @@ class LegoInputManager : public MxPresenter {
 	void ProcessEvents();
 	MxBool ProcessOneEvent(LegoEventNotificationParam& p_param);
 
+	// SYNTHETIC: LEGO1 0x1005b8d0
+	// LegoInputManager::`scalar deleting destructor'
+
 private:
 	MxCriticalSection m_criticalSection;
 	MxList<undefined4>* m_unk0x5c; // list or hash table
diff --git a/LEGO1/lego/legoomni/include/legojetski.h b/LEGO1/lego/legoomni/include/legojetski.h
index 09a9f8d1..e4f876a3 100644
--- a/LEGO1/lego/legoomni/include/legojetski.h
+++ b/LEGO1/lego/legoomni/include/legojetski.h
@@ -18,6 +18,9 @@ class LegoJetski : public LegoJetskiRaceActor {
 	{
 		return !strcmp(p_name, LegoJetski::ClassName()) || LegoJetskiRaceActor::IsA(p_name);
 	}
+
+	// SYNTHETIC: LEGO1 0x10013e20
+	// LegoJetski::`scalar deleting destructor'
 };
 
 #endif // LEGOJETSKI_H
diff --git a/LEGO1/lego/legoomni/include/legojetskiraceactor.h b/LEGO1/lego/legoomni/include/legojetskiraceactor.h
index 28d151e8..cd497525 100644
--- a/LEGO1/lego/legoomni/include/legojetskiraceactor.h
+++ b/LEGO1/lego/legoomni/include/legojetskiraceactor.h
@@ -18,6 +18,9 @@ class LegoJetskiRaceActor : public LegoCarRaceActor {
 	{
 		return !strcmp(p_name, LegoJetskiRaceActor::ClassName()) || LegoCarRaceActor::IsA(p_name);
 	}
+
+	// SYNTHETIC: LEGO1 0x10081d40
+	// LegoJetskiRaceActor::`scalar deleting destructor'
 };
 
 #endif // LEGOJETSKIRACEACTOR_H
diff --git a/LEGO1/lego/legoomni/include/legolocomotionanimpresenter.h b/LEGO1/lego/legoomni/include/legolocomotionanimpresenter.h
index 36facd1d..09370d0f 100644
--- a/LEGO1/lego/legoomni/include/legolocomotionanimpresenter.h
+++ b/LEGO1/lego/legoomni/include/legolocomotionanimpresenter.h
@@ -21,6 +21,9 @@ class LegoLocomotionAnimPresenter : public LegoLoopingAnimPresenter {
 		return !strcmp(p_name, ClassName()) || LegoLoopingAnimPresenter::IsA(p_name);
 	}
 
+	// SYNTHETIC: LEGO1 0x1006cfe0
+	// LegoLocomotionAnimPresenter::`scalar deleting destructor'
+
 private:
 	void Init();
 };
diff --git a/LEGO1/lego/legoomni/include/legomodelpresenter.h b/LEGO1/lego/legoomni/include/legomodelpresenter.h
index fe2216d5..7803187a 100644
--- a/LEGO1/lego/legoomni/include/legomodelpresenter.h
+++ b/LEGO1/lego/legoomni/include/legomodelpresenter.h
@@ -26,6 +26,9 @@ class LegoModelPresenter : public MxVideoPresenter {
 	virtual void ParseExtra() override;  // vtable+0x30
 	virtual void Destroy() override;     // vtable+0x38
 
+	// SYNTHETIC: LEGO1 0x1000cdd0
+	// LegoModelPresenter::`scalar deleting destructor'
+
 protected:
 	void Destroy(MxBool p_fromDestructor);
 
diff --git a/LEGO1/lego/legoomni/include/legonavcontroller.h b/LEGO1/lego/legoomni/include/legonavcontroller.h
index 97882566..2ae35245 100644
--- a/LEGO1/lego/legoomni/include/legonavcontroller.h
+++ b/LEGO1/lego/legoomni/include/legonavcontroller.h
@@ -61,6 +61,9 @@ class LegoNavController : public MxCore {
 
 	inline void SetTrackDefaultParams(MxBool p_trackDefault) { m_trackDefault = p_trackDefault; }
 
+	// SYNTHETIC: LEGO1 0x10054c10
+	// LegoNavController::`scalar deleting destructor'
+
 private:
 	int m_hMax;
 	int m_vMax;
diff --git a/LEGO1/lego/legoomni/include/legoobjectfactory.h b/LEGO1/lego/legoomni/include/legoobjectfactory.h
index 552b3cf8..9357ce34 100644
--- a/LEGO1/lego/legoomni/include/legoobjectfactory.h
+++ b/LEGO1/lego/legoomni/include/legoobjectfactory.h
@@ -108,6 +108,9 @@ class LegoObjectFactory : public MxObjectFactory {
 	virtual MxCore* Create(const char* p_name) override; // vtable 0x14
 	virtual void Destroy(MxCore* p_object) override;     // vtable 0x18
 
+	// SYNTHETIC: LEGO1 0x10009000
+	// LegoObjectFactory::`scalar deleting destructor'
+
 private:
 #define X(V) MxAtomId m_id##V;
 	FOR_LEGOOBJECTFACTORY_OBJECTS(X)
diff --git a/LEGO1/lego/legoomni/include/legoomni.h b/LEGO1/lego/legoomni/include/legoomni.h
index 55166b37..d7d9a2d4 100644
--- a/LEGO1/lego/legoomni/include/legoomni.h
+++ b/LEGO1/lego/legoomni/include/legoomni.h
@@ -129,6 +129,9 @@ class LegoOmni : public MxOmni {
 
 	inline void CloseMainWindow() { PostMessageA(m_windowHandle, WM_CLOSE, 0, 0); }
 
+	// SYNTHETIC: LEGO1 0x10058b30
+	// LegoOmni::`scalar deleting destructor'
+
 private:
 	undefined4* m_unk0x68;                       // 0x68
 	ViewLODListManager* m_viewLODListManager;    // 0x6c
diff --git a/LEGO1/lego/legoomni/include/legopalettepresenter.h b/LEGO1/lego/legoomni/include/legopalettepresenter.h
index 858e1097..242c7bc0 100644
--- a/LEGO1/lego/legoomni/include/legopalettepresenter.h
+++ b/LEGO1/lego/legoomni/include/legopalettepresenter.h
@@ -30,6 +30,9 @@ class LegoPalettePresenter : public MxVideoPresenter {
 
 	MxResult ParsePalette(MxStreamChunk* p_chunk);
 
+	// SYNTHETIC: LEGO1 0x1007a050
+	// LegoPalettePresenter::`scalar deleting destructor'
+
 private:
 	void Init();
 	void Destroy(MxBool p_fromDestructor);
diff --git a/LEGO1/lego/legoomni/include/legopartpresenter.h b/LEGO1/lego/legoomni/include/legopartpresenter.h
index 6695a70b..e847d39b 100644
--- a/LEGO1/lego/legoomni/include/legopartpresenter.h
+++ b/LEGO1/lego/legoomni/include/legopartpresenter.h
@@ -21,6 +21,9 @@ class LegoPartPresenter : public MxMediaPresenter {
 	}
 
 	__declspec(dllexport) static void configureLegoPartPresenter(MxS32, MxS32);
+
+	// SYNTHETIC: LEGO1 0x1000d060
+	// LegoPartPresenter::`scalar deleting destructor'
 };
 
 #endif // LEGOPARTPRESENTER_H
diff --git a/LEGO1/lego/legoomni/include/legopathactor.h b/LEGO1/lego/legoomni/include/legopathactor.h
index 5f67af4f..be2c87e3 100644
--- a/LEGO1/lego/legoomni/include/legopathactor.h
+++ b/LEGO1/lego/legoomni/include/legopathactor.h
@@ -66,6 +66,9 @@ class LegoPathActor : public LegoActor {
 
 	inline void SetUnknownDC(MxU32 p_unk0xdc) { m_unk0xdc = p_unk0xdc; }
 
+	// SYNTHETIC: LEGO1 0x1002d800
+	// LegoPathActor::`scalar deleting destructor'
+
 protected:
 	undefined m_unk0x78[0x64]; // 0x78
 	MxU32 m_unk0xdc;           // 0xdc
diff --git a/LEGO1/lego/legoomni/include/legopathcontroller.h b/LEGO1/lego/legoomni/include/legopathcontroller.h
index f7278ca8..ada96e7e 100644
--- a/LEGO1/lego/legoomni/include/legopathcontroller.h
+++ b/LEGO1/lego/legoomni/include/legopathcontroller.h
@@ -8,7 +8,7 @@
 class LegoPathController : public MxCore {
 public:
 	LegoPathController();
-	virtual ~LegoPathController() override;
+	virtual ~LegoPathController() override { Destroy(); };
 
 	virtual MxResult Tickle() override; // vtable+08
 
@@ -24,6 +24,12 @@ class LegoPathController : public MxCore {
 	{
 		return !strcmp(p_name, LegoPathController::ClassName()) || MxCore::IsA(p_name);
 	}
+
+	// SYNTHETIC: LEGO1 0x10045740
+	// LegoPathController::`scalar deleting destructor'
+
+	virtual void VTable0x14(); // vtable+0x14
+	virtual void Destroy();    // vtable+0x18
 };
 
 #endif // LEGOPATHCONTROLLER_H
diff --git a/LEGO1/lego/legoomni/include/legopathcontrollerlist.h b/LEGO1/lego/legoomni/include/legopathcontrollerlist.h
index db31c2c4..ead40f48 100644
--- a/LEGO1/lego/legoomni/include/legopathcontrollerlist.h
+++ b/LEGO1/lego/legoomni/include/legopathcontrollerlist.h
@@ -19,6 +19,9 @@ class LegoPathControllerList : public MxPtrList<LegoPathController> {
 	{
 		return p_a == p_b ? 0 : p_a < p_b ? -1 : 1;
 	} // vtable+0x14
+
+	// SYNTHETIC: LEGO1 0x1001d3d0
+	// LegoPathControllerList::`scalar deleting destructor'
 };
 
 // VTABLE: LEGO1 0x100d6380
diff --git a/LEGO1/lego/legoomni/include/legopathpresenter.h b/LEGO1/lego/legoomni/include/legopathpresenter.h
index bc1bdcb5..792b99eb 100644
--- a/LEGO1/lego/legoomni/include/legopathpresenter.h
+++ b/LEGO1/lego/legoomni/include/legopathpresenter.h
@@ -30,6 +30,9 @@ class LegoPathPresenter : public MxMediaPresenter {
 	virtual MxResult AddToManager() override; // vtable+0x34
 	virtual void Destroy() override;          // vtable+0x38
 
+	// SYNTHETIC: LEGO1 0x10044a90
+	// LegoPathPresenter::`scalar deleting destructor'
+
 private:
 	void Init();
 
diff --git a/LEGO1/lego/legoomni/include/legophonemepresenter.h b/LEGO1/lego/legoomni/include/legophonemepresenter.h
index 330b1c7a..c643f261 100644
--- a/LEGO1/lego/legoomni/include/legophonemepresenter.h
+++ b/LEGO1/lego/legoomni/include/legophonemepresenter.h
@@ -20,6 +20,9 @@ class LegoPhonemePresenter : public MxFlcPresenter {
 		return "LegoPhonemePresenter";
 	}
 
+	// SYNTHETIC: LEGO1 0x1004e320
+	// LegoPhonemePresenter::`scalar deleting destructor'
+
 private:
 	void Init();
 	int m_unk0x68;
diff --git a/LEGO1/lego/legoomni/include/legoplantmanager.h b/LEGO1/lego/legoomni/include/legoplantmanager.h
index e509e17e..e199f11b 100644
--- a/LEGO1/lego/legoomni/include/legoplantmanager.h
+++ b/LEGO1/lego/legoomni/include/legoplantmanager.h
@@ -22,6 +22,9 @@ class LegoPlantManager : public MxCore {
 
 	void FUN_10026360(undefined4 p_world);
 
+	// SYNTHETIC: LEGO1 0x100262a0
+	// LegoPlantManager::`scalar deleting destructor'
+
 private:
 	void Init();
 };
diff --git a/LEGO1/lego/legoomni/include/legorace.h b/LEGO1/lego/legoomni/include/legorace.h
index 504b4cbb..e3f9df88 100644
--- a/LEGO1/lego/legoomni/include/legorace.h
+++ b/LEGO1/lego/legoomni/include/legorace.h
@@ -38,6 +38,9 @@ class LegoRace : public LegoWorld {
 	virtual undefined4 VTable0x78(undefined4);                // vtable+0x78
 	virtual void VTable0x7c(undefined4, undefined4);          // vtable+0x7c
 
+	// SYNTHETIC: LEGO1 0x10015cc0
+	// LegoRace::`scalar deleting destructor'
+
 private:
 	undefined4 m_unk0xf8;  // 0xf8
 	undefined4 m_unk0xfc;  // 0xfc
diff --git a/LEGO1/lego/legoomni/include/legoraceactor.h b/LEGO1/lego/legoomni/include/legoraceactor.h
index eb459e81..6df40e43 100644
--- a/LEGO1/lego/legoomni/include/legoraceactor.h
+++ b/LEGO1/lego/legoomni/include/legoraceactor.h
@@ -18,6 +18,9 @@ class LegoRaceActor : public LegoAnimActor {
 	{
 		return !strcmp(p_name, LegoRaceActor::ClassName()) || LegoAnimActor::IsA(p_name);
 	}
+
+	// SYNTHETIC: LEGO1 0x10014ab0
+	// LegoRaceActor::`scalar deleting destructor'
 };
 
 #endif // LEGORACEACTOR_H
diff --git a/LEGO1/lego/legoomni/include/legoracecar.h b/LEGO1/lego/legoomni/include/legoracecar.h
index a2a54afb..7e200ff6 100644
--- a/LEGO1/lego/legoomni/include/legoracecar.h
+++ b/LEGO1/lego/legoomni/include/legoracecar.h
@@ -20,6 +20,9 @@ class LegoRaceCar : public LegoCarRaceActor {
 	{
 		return !strcmp(p_name, LegoCarRaceActor::ClassName()) || LegoCarRaceActor::IsA(p_name);
 	}
+
+	// SYNTHETIC: LEGO1 0x10014230
+	// LegoRaceCar::`scalar deleting destructor'
 };
 
 #endif // LEGOCARRACE_H
diff --git a/LEGO1/lego/legoomni/include/legosoundmanager.h b/LEGO1/lego/legoomni/include/legosoundmanager.h
index 2caef869..0e4bbbbd 100644
--- a/LEGO1/lego/legoomni/include/legosoundmanager.h
+++ b/LEGO1/lego/legoomni/include/legosoundmanager.h
@@ -14,6 +14,9 @@ class LegoSoundManager : public MxSoundManager {
 	virtual void Destroy() override;                                              // vtable+18
 	virtual MxResult Create(MxU32 p_frequencyMS, MxBool p_createThread) override; // vtable+0x30
 
+	// SYNTHETIC: LEGO1 0x10029920
+	// LegoSoundManager::`scalar deleting destructor'
+
 private:
 	void Init();
 	void Destroy(MxBool p_fromDestructor);
diff --git a/LEGO1/lego/legoomni/include/legostate.h b/LEGO1/lego/legoomni/include/legostate.h
index ba4403de..215d64d4 100644
--- a/LEGO1/lego/legoomni/include/legostate.h
+++ b/LEGO1/lego/legoomni/include/legostate.h
@@ -27,6 +27,9 @@ class LegoState : public MxCore {
 	virtual MxBool VTable0x14();                                   // vtable+0x14
 	virtual MxBool SetFlag();                                      // vtable+0x18
 	virtual MxResult VTable0x1c(LegoFileStream* p_legoFileStream); // vtable+0x1C
+
+	// SYNTHETIC: LEGO1 0x10006160
+	// LegoState::`scalar deleting destructor'
 };
 
 #endif // LEGOSTATE_H
diff --git a/LEGO1/lego/legoomni/include/legotexturepresenter.h b/LEGO1/lego/legoomni/include/legotexturepresenter.h
index 0ac13926..ca6541df 100644
--- a/LEGO1/lego/legoomni/include/legotexturepresenter.h
+++ b/LEGO1/lego/legoomni/include/legotexturepresenter.h
@@ -25,6 +25,9 @@ class LegoTexturePresenter : public MxMediaPresenter {
 	virtual void DoneTickle() override;       // vtable+0x2c
 	virtual MxResult AddToManager() override; // vtable+0x34
 	virtual MxResult PutData() override;      // vtable+0x4c
+
+	// SYNTHETIC: LEGO1 0x1000cf40
+	// LegoTexturePresenter::`scalar deleting destructor'
 };
 
 #endif // LEGOTEXTUREPRESENTER_H
diff --git a/LEGO1/lego/legoomni/include/legovehiclebuildstate.h b/LEGO1/lego/legoomni/include/legovehiclebuildstate.h
index a39740bb..f441dfad 100644
--- a/LEGO1/lego/legoomni/include/legovehiclebuildstate.h
+++ b/LEGO1/lego/legoomni/include/legovehiclebuildstate.h
@@ -23,6 +23,9 @@ class LegoVehicleBuildState : public LegoState {
 		return !strcmp(p_name, this->m_className.GetData()) || LegoState::IsA(p_name);
 	}
 
+	// SYNTHETIC: LEGO1 0x100260a0
+	// LegoVehicleBuildState::`scalar deleting destructor'
+
 public:
 	struct UnkStruct {
 		undefined4 m_unk0x00;
diff --git a/LEGO1/lego/legoomni/include/legoworld.h b/LEGO1/lego/legoomni/include/legoworld.h
index a423ec09..dfc51e70 100644
--- a/LEGO1/lego/legoomni/include/legoworld.h
+++ b/LEGO1/lego/legoomni/include/legoworld.h
@@ -60,6 +60,9 @@ class LegoWorld : public LegoEntity {
 	MxS32 GetCurrPathInfo(LegoPathBoundary** p_path, MxS32& p_value);
 	MxPresenter* FindPresenter(const char* p_presenter, const char* p_name);
 
+	// SYNTHETIC: LEGO1 0x1001dee0
+	// LegoWorld::`scalar deleting destructor'
+
 protected:
 	LegoPathControllerList m_list0x68;        // 0x68
 	MxPresenterList m_list0x80;               // 0x80
diff --git a/LEGO1/lego/legoomni/include/legoworldlist.h b/LEGO1/lego/legoomni/include/legoworldlist.h
index 2e52de47..339f5393 100644
--- a/LEGO1/lego/legoomni/include/legoworldlist.h
+++ b/LEGO1/lego/legoomni/include/legoworldlist.h
@@ -26,6 +26,9 @@ class LegoWorldList : public MxPtrList<LegoWorld> {
 	{
 		return p_a == p_b ? 0 : p_a < p_b ? -1 : 1;
 	}; // vtable+0x14
+
+	// SYNTHETIC: LEGO1 0x10059a00
+	// LegoWorldList::`scalar deleting destructor'
 };
 
 // VTABLE: LEGO1 0x100d75b8
@@ -47,6 +50,12 @@ class LegoWorldListCursor : public MxPtrListCursor<LegoWorld> {
 // FUNCTION: LEGO1 0x1003e8e0
 // MxPtrListCursor<LegoWorld>::~MxPtrListCursor<LegoWorld>
 
+// SYNTHETIC: LEGO1 0x1003e930
+// MxListCursor<LegoWorld *>::`scalar deleting destructor'
+
+// SYNTHETIC: LEGO1 0x1003e9a0
+// MxPtrListCursor<LegoWorld>::`scalar deleting destructor'
+
 // FUNCTION: LEGO1 0x1003ea10
 // MxListCursor<LegoWorld *>::~MxListCursor<LegoWorld *>
 
diff --git a/LEGO1/lego/legoomni/include/legoworldpresenter.h b/LEGO1/lego/legoomni/include/legoworldpresenter.h
index be18baca..f3dbba30 100644
--- a/LEGO1/lego/legoomni/include/legoworldpresenter.h
+++ b/LEGO1/lego/legoomni/include/legoworldpresenter.h
@@ -31,6 +31,9 @@ class LegoWorldPresenter : public LegoEntityPresenter {
 	virtual MxResult StartAction(MxStreamController* p_controller, MxDSAction* p_action) override; // vtable+0x3c
 	virtual void VTable0x60(MxPresenter* p_presenter) override;                                    // vtable+0x60
 
+	// SYNTHETIC: LEGO1 0x10066750
+	// LegoWorldPresenter::`scalar deleting destructor'
+
 private:
 	undefined4 m_unk0x50;
 };
diff --git a/LEGO1/lego/legoomni/include/motocycle.h b/LEGO1/lego/legoomni/include/motocycle.h
index 0c784027..b4ccafd3 100644
--- a/LEGO1/lego/legoomni/include/motocycle.h
+++ b/LEGO1/lego/legoomni/include/motocycle.h
@@ -23,6 +23,9 @@ class Motocycle : public IslePathActor {
 		return !strcmp(p_name, Motocycle::ClassName()) || IslePathActor::IsA(p_name);
 	}
 
+	// SYNTHETIC: LEGO1 0x100359d0
+	// Motocycle::`scalar deleting destructor'
+
 private:
 	undefined m_unk0x160[4];
 	MxFloat m_unk0x164;
diff --git a/LEGO1/lego/legoomni/include/mxbackgroundaudiomanager.h b/LEGO1/lego/legoomni/include/mxbackgroundaudiomanager.h
index 9d47947f..e0e64ae9 100644
--- a/LEGO1/lego/legoomni/include/mxbackgroundaudiomanager.h
+++ b/LEGO1/lego/legoomni/include/mxbackgroundaudiomanager.h
@@ -46,6 +46,9 @@ class MxBackgroundAudioManager : public MxCore {
 	void LowerVolume();
 	void RaiseVolume();
 
+	// SYNTHETIC: LEGO1 0x1007ec00
+	// MxBackgroundAudioManager::`scalar deleting destructor'
+
 private:
 	void Init();
 	MxResult OpenMusic(MxAtomId& p_script);
diff --git a/LEGO1/lego/legoomni/include/mxtransitionmanager.h b/LEGO1/lego/legoomni/include/mxtransitionmanager.h
index b169f3bf..fdfbf674 100644
--- a/LEGO1/lego/legoomni/include/mxtransitionmanager.h
+++ b/LEGO1/lego/legoomni/include/mxtransitionmanager.h
@@ -45,6 +45,9 @@ class MxTransitionManager : public MxCore {
 
 	inline TransitionType GetTransitionType() { return m_transitionType; }
 
+	// SYNTHETIC: LEGO1 0x1004b9e0
+	// MxTransitionManager::`scalar deleting destructor'
+
 private:
 	void EndTransition(MxBool p_notifyWorld);
 	void TransitionNone();
diff --git a/LEGO1/lego/legoomni/include/pizza.h b/LEGO1/lego/legoomni/include/pizza.h
index 11bf6814..835a5b2e 100644
--- a/LEGO1/lego/legoomni/include/pizza.h
+++ b/LEGO1/lego/legoomni/include/pizza.h
@@ -30,6 +30,9 @@ class Pizza : public IsleActor {
 		return !strcmp(p_name, Pizza::ClassName()) || IsleActor::IsA(p_name);
 	}
 
+	// SYNTHETIC: LEGO1 0x100380e0
+	// Pizza::`scalar deleting destructor'
+
 private:
 	undefined4 m_unk0x78;
 	undefined4 m_unk0x7c;
diff --git a/LEGO1/lego/legoomni/include/pizzamissionstate.h b/LEGO1/lego/legoomni/include/pizzamissionstate.h
index 85b8e4bb..76690a99 100644
--- a/LEGO1/lego/legoomni/include/pizzamissionstate.h
+++ b/LEGO1/lego/legoomni/include/pizzamissionstate.h
@@ -30,6 +30,9 @@ class PizzaMissionState : public LegoState {
 
 	inline MxU16 GetColor(MxU8 p_id) { return GetState(p_id)->m_color; }
 
+	// SYNTHETIC: LEGO1 0x10039350
+	// PizzaMissionState::`scalar deleting destructor'
+
 private:
 	PizzaMissionStateEntry* GetState(MxU8 p_id);
 
diff --git a/LEGO1/lego/legoomni/include/pizzeria.h b/LEGO1/lego/legoomni/include/pizzeria.h
index 0196d616..1c73ca58 100644
--- a/LEGO1/lego/legoomni/include/pizzeria.h
+++ b/LEGO1/lego/legoomni/include/pizzeria.h
@@ -19,6 +19,9 @@ class Pizzeria : public IsleActor {
 	{
 		return !strcmp(p_name, Pizzeria::ClassName()) || IsleActor::IsA(p_name);
 	}
+
+	// SYNTHETIC: LEGO1 0x1000e8d0
+	// Pizzeria::`scalar deleting destructor'
 };
 
 #endif // PIZZERIA_H
diff --git a/LEGO1/lego/legoomni/include/pizzeriastate.h b/LEGO1/lego/legoomni/include/pizzeriastate.h
index c27fcef0..188ee624 100644
--- a/LEGO1/lego/legoomni/include/pizzeriastate.h
+++ b/LEGO1/lego/legoomni/include/pizzeriastate.h
@@ -21,6 +21,9 @@ class PizzeriaState : public LegoState {
 	{
 		return !strcmp(p_name, PizzeriaState::ClassName()) || LegoState::IsA(p_name);
 	}
+
+	// SYNTHETIC: LEGO1 0x10017ce0
+	// PizzeriaState::`scalar deleting destructor'
 };
 
 #endif // PIZZERIASTATE_H
diff --git a/LEGO1/lego/legoomni/include/police.h b/LEGO1/lego/legoomni/include/police.h
index 829c7e66..9d6bc1c7 100644
--- a/LEGO1/lego/legoomni/include/police.h
+++ b/LEGO1/lego/legoomni/include/police.h
@@ -25,6 +25,9 @@ class Police : public LegoWorld {
 	{
 		return !strcmp(p_name, Police::ClassName()) || LegoWorld::IsA(p_name);
 	}
+
+	// SYNTHETIC: LEGO1 0x1005e300
+	// Police::`scalar deleting destructor'
 };
 
 #endif // POLICE_H
diff --git a/LEGO1/lego/legoomni/include/policeentity.h b/LEGO1/lego/legoomni/include/policeentity.h
index 735cf0bc..cdb89af6 100644
--- a/LEGO1/lego/legoomni/include/policeentity.h
+++ b/LEGO1/lego/legoomni/include/policeentity.h
@@ -19,6 +19,9 @@ class PoliceEntity : public BuildingEntity {
 	{
 		return !strcmp(p_name, PoliceEntity::ClassName()) || BuildingEntity::IsA(p_name);
 	}
+
+	// SYNTHETIC: LEGO1 0x1000f900
+	// PoliceEntity::`scalar deleting destructor'
 };
 
 #endif // POLICEENTITY_H
diff --git a/LEGO1/lego/legoomni/include/policestate.h b/LEGO1/lego/legoomni/include/policestate.h
index 2638a393..611ced07 100644
--- a/LEGO1/lego/legoomni/include/policestate.h
+++ b/LEGO1/lego/legoomni/include/policestate.h
@@ -21,6 +21,9 @@ class PoliceState : public LegoState {
 	{
 		return !strcmp(p_name, PoliceState::ClassName()) || LegoState::IsA(p_name);
 	}
+
+	// SYNTHETIC: LEGO1 0x1005e920
+	// PoliceState::`scalar deleting destructor'
 };
 
 #endif // POLICESTATE_H
diff --git a/LEGO1/lego/legoomni/include/racecar.h b/LEGO1/lego/legoomni/include/racecar.h
index b4a210e6..39005831 100644
--- a/LEGO1/lego/legoomni/include/racecar.h
+++ b/LEGO1/lego/legoomni/include/racecar.h
@@ -24,6 +24,9 @@ class RaceCar : public IslePathActor {
 		return !strcmp(p_name, RaceCar::ClassName()) || IslePathActor::IsA(p_name);
 	}
 
+	// SYNTHETIC: LEGO1 0x10028400
+	// RaceCar::`scalar deleting destructor'
+
 private:
 	// TODO: RaceCar fields
 	undefined m_unk0x160[4];
diff --git a/LEGO1/lego/legoomni/include/racestandsentity.h b/LEGO1/lego/legoomni/include/racestandsentity.h
index a7359df8..20b1b4a6 100644
--- a/LEGO1/lego/legoomni/include/racestandsentity.h
+++ b/LEGO1/lego/legoomni/include/racestandsentity.h
@@ -5,6 +5,9 @@
 
 // VTABLE: LEGO1 0x100d48a8
 // SIZE 0x68
-class RaceStandsEntity : public BuildingEntity {};
+class RaceStandsEntity : public BuildingEntity {
+	// SYNTHETIC: LEGO1 0x1000f9e0
+	// RaceStandsEntity::`scalar deleting destructor'
+};
 
 #endif // RACESTANDSENTITY_H
diff --git a/LEGO1/lego/legoomni/include/racestate.h b/LEGO1/lego/legoomni/include/racestate.h
index ef3cfa63..05760e32 100644
--- a/LEGO1/lego/legoomni/include/racestate.h
+++ b/LEGO1/lego/legoomni/include/racestate.h
@@ -32,6 +32,9 @@ class RaceState : public LegoState {
 
 	inline MxU16 GetColor(MxU8 p_id) { return GetState(p_id)->m_color; }
 
+	// SYNTHETIC: LEGO1 0x100160d0
+	// RaceState::`scalar deleting destructor'
+
 private:
 	RaceStateEntry* GetState(MxU8 p_id);
 
diff --git a/LEGO1/lego/legoomni/include/radio.h b/LEGO1/lego/legoomni/include/radio.h
index 54aef25b..3d8da44b 100644
--- a/LEGO1/lego/legoomni/include/radio.h
+++ b/LEGO1/lego/legoomni/include/radio.h
@@ -23,6 +23,9 @@ class Radio : public MxCore {
 		return !strcmp(p_name, Radio::ClassName()) || MxCore::IsA(p_name);
 	}
 
+	// SYNTHETIC: LEGO1 0x1002c970
+	// Radio::`scalar deleting destructor'
+
 private:
 	RadioState* m_state; // 0x08
 	MxBool m_unk0xc;     // 0x0c
diff --git a/LEGO1/lego/legoomni/include/radiostate.h b/LEGO1/lego/legoomni/include/radiostate.h
index a5ea6035..1035a659 100644
--- a/LEGO1/lego/legoomni/include/radiostate.h
+++ b/LEGO1/lego/legoomni/include/radiostate.h
@@ -21,6 +21,9 @@ class RadioState : public LegoState {
 	{
 		return !strcmp(p_name, RadioState::ClassName()) || LegoState::IsA(p_name);
 	}
+
+	// SYNTHETIC: LEGO1 0x1002d020
+	// RadioState::`scalar deleting destructor'
 };
 
 #endif // RADIOSTATE_H
diff --git a/LEGO1/lego/legoomni/include/registrationbook.h b/LEGO1/lego/legoomni/include/registrationbook.h
index 3ae904c9..7c605865 100644
--- a/LEGO1/lego/legoomni/include/registrationbook.h
+++ b/LEGO1/lego/legoomni/include/registrationbook.h
@@ -24,6 +24,9 @@ class RegistrationBook : public LegoWorld {
 	{
 		return !strcmp(p_name, RegistrationBook::ClassName()) || LegoWorld::IsA(p_name);
 	}
+
+	// SYNTHETIC: LEGO1 0x10076f30
+	// RegistrationBook::`scalar deleting destructor'
 };
 
 #endif // REGISTRATIONBOOK_H
diff --git a/LEGO1/lego/legoomni/include/scorestate.h b/LEGO1/lego/legoomni/include/scorestate.h
index 21be3493..fde33e1a 100644
--- a/LEGO1/lego/legoomni/include/scorestate.h
+++ b/LEGO1/lego/legoomni/include/scorestate.h
@@ -26,6 +26,9 @@ class ScoreState : public LegoState {
 	inline MxBool GetTutorialFlag() { return m_playCubeTutorial; }
 	inline void SetTutorialFlag(MxBool p_playCubeTutorial) { m_playCubeTutorial = p_playCubeTutorial; }
 
+	// SYNTHETIC: LEGO1 0x1000df00
+	// ScoreState::`scalar deleting destructor'
+
 private:
 	MxBool m_playCubeTutorial;
 };
diff --git a/LEGO1/lego/legoomni/include/skateboard.h b/LEGO1/lego/legoomni/include/skateboard.h
index 171705c4..06adc8cb 100644
--- a/LEGO1/lego/legoomni/include/skateboard.h
+++ b/LEGO1/lego/legoomni/include/skateboard.h
@@ -23,6 +23,9 @@ class SkateBoard : public IslePathActor {
 		return !strcmp(p_name, SkateBoard::ClassName()) || IslePathActor::IsA(p_name);
 	}
 
+	// SYNTHETIC: LEGO1 0x1000ff60
+	// SkateBoard::`scalar deleting destructor'
+
 private:
 	// TODO: SkateBoard types
 	undefined m_unk0x160;
diff --git a/LEGO1/lego/legoomni/include/towtrack.h b/LEGO1/lego/legoomni/include/towtrack.h
index 1cc7e6af..39c4f630 100644
--- a/LEGO1/lego/legoomni/include/towtrack.h
+++ b/LEGO1/lego/legoomni/include/towtrack.h
@@ -23,6 +23,9 @@ class TowTrack : public IslePathActor {
 		return !strcmp(p_name, TowTrack::ClassName()) || IslePathActor::IsA(p_name);
 	}
 
+	// SYNTHETIC: LEGO1 0x1004c950
+	// TowTrack::`scalar deleting destructor'
+
 private:
 	// TODO: TowTrack field types
 	undefined m_unk0x154[4];
diff --git a/LEGO1/lego/legoomni/include/towtrackmissionstate.h b/LEGO1/lego/legoomni/include/towtrackmissionstate.h
index c0ad3145..be2e2689 100644
--- a/LEGO1/lego/legoomni/include/towtrackmissionstate.h
+++ b/LEGO1/lego/legoomni/include/towtrackmissionstate.h
@@ -41,6 +41,9 @@ class TowTrackMissionState : public LegoState {
 		}
 	}
 
+	// SYNTHETIC: LEGO1 0x1004e060
+	// TowTrackMissionState::`scalar deleting destructor'
+
 protected:
 	undefined4 m_unk0x08; // 0x08
 	undefined4 m_unk0x0c; // 0x0c
diff --git a/LEGO1/lego/legoomni/src/common/gifmanager.cpp b/LEGO1/lego/legoomni/src/common/gifmanager.cpp
index e9b10d49..c83714d4 100644
--- a/LEGO1/lego/legoomni/src/common/gifmanager.cpp
+++ b/LEGO1/lego/legoomni/src/common/gifmanager.cpp
@@ -24,3 +24,9 @@ GifMapEntry* GifMap::FindNode(const char*& p_string)
 	}
 	return ret;
 }
+
+// STUB: LEGO1 0x10099870
+GifManager::~GifManager()
+{
+	// TODO
+}
diff --git a/LEGO1/lego/legoomni/src/paths/legopathcontroller.cpp b/LEGO1/lego/legoomni/src/paths/legopathcontroller.cpp
index a636253a..c187344c 100644
--- a/LEGO1/lego/legoomni/src/paths/legopathcontroller.cpp
+++ b/LEGO1/lego/legoomni/src/paths/legopathcontroller.cpp
@@ -6,8 +6,14 @@ LegoPathController::LegoPathController()
 	// TODO
 }
 
-// STUB: LEGO1 0x10045740
-LegoPathController::~LegoPathController()
+// STUB: LEGO1 0x10045880
+void LegoPathController::VTable0x14()
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x10045b20
+void LegoPathController::Destroy()
 {
 	// TODO
 }
diff --git a/LEGO1/lego/sources/3dmanager/lego3dmanager.h b/LEGO1/lego/sources/3dmanager/lego3dmanager.h
index ab2bdefc..9d993f26 100644
--- a/LEGO1/lego/sources/3dmanager/lego3dmanager.h
+++ b/LEGO1/lego/sources/3dmanager/lego3dmanager.h
@@ -57,6 +57,9 @@ class Lego3DManager {
 	// ??? for now
 	ViewLODListManager* GetViewLODListManager();
 
+	// SYNTHETIC: LEGO1 0x100ab340
+	// Lego3DManager::`scalar deleting destructor'
+
 private:
 	Tgl::Renderer* m_pRenderer; // 0x04
 
diff --git a/LEGO1/lego/sources/roi/legoroi.h b/LEGO1/lego/sources/roi/legoroi.h
index d257398e..302a0bd8 100644
--- a/LEGO1/lego/sources/roi/legoroi.h
+++ b/LEGO1/lego/sources/roi/legoroi.h
@@ -40,6 +40,9 @@ class LegoROI : public ViewROI {
 	inline LegoEntity* GetUnknown0x104() { return m_unk0x104; }
 	inline void SetUnknown0x104(LegoEntity* p_unk0x104) { m_unk0x104 = p_unk0x104; }
 
+	// SYNTHETIC: LEGO1 0x100a9ad0
+	// LegoROI::`scalar deleting destructor'
+
 private:
 	undefined m_pad[0x24];  // 0xe0
 	LegoEntity* m_unk0x104; // 0x104
diff --git a/LEGO1/library_msvc.h b/LEGO1/library_msvc.h
index 30cb9dcd..259ed919 100644
--- a/LEGO1/library_msvc.h
+++ b/LEGO1/library_msvc.h
@@ -45,6 +45,9 @@
 // LIBRARY: LEGO1 0x1008b730
 // _fprintf
 
+// LIBRARY: LEGO1 0x1008b670
+// __purecall
+
 // LIBRARY: LEGO1 0x1008b780
 // _fwrite
 
diff --git a/LEGO1/mxdirectx/mxdirect3d.h b/LEGO1/mxdirectx/mxdirect3d.h
index 09047f0a..2d89ad39 100644
--- a/LEGO1/mxdirectx/mxdirect3d.h
+++ b/LEGO1/mxdirectx/mxdirect3d.h
@@ -66,6 +66,9 @@ class MxDirect3D : public MxDirectDraw {
 	inline IDirect3D2* GetDirect3D() { return this->m_pDirect3d; }
 	inline IDirect3DDevice2* GetDirect3DDevice() { return this->m_pDirect3dDevice; }
 
+	// SYNTHETIC: LEGO1 0x1009b120
+	// MxDirect3D::`scalar deleting destructor'
+
 private:
 	MxAssignedDevice* m_assignedDevice;  // 0x880
 	IDirect3D2* m_pDirect3d;             // 0x884
diff --git a/LEGO1/mxdirectx/mxdirectdraw.h b/LEGO1/mxdirectx/mxdirectdraw.h
index 490233b5..b8f5f551 100644
--- a/LEGO1/mxdirectx/mxdirectdraw.h
+++ b/LEGO1/mxdirectx/mxdirectdraw.h
@@ -83,6 +83,9 @@ class MxDirectDraw {
 	inline IDirectDrawSurface* GetBackBuffer() { return m_pBackBuffer; }
 	inline IDirectDrawClipper* GetClipper() { return m_pClipper; }
 
+	// SYNTHETIC: LEGO1 0x1009d510
+	// MxDirectDraw::`scalar deleting destructor'
+
 protected:
 	BOOL m_bOnlySoftRender;                     // 0x04
 	BOOL m_bFlipSurfaces;                       // 0x08
diff --git a/LEGO1/omni/include/mxaudiomanager.h b/LEGO1/omni/include/mxaudiomanager.h
index a7b58fd0..94b5c4c9 100644
--- a/LEGO1/omni/include/mxaudiomanager.h
+++ b/LEGO1/omni/include/mxaudiomanager.h
@@ -19,6 +19,9 @@ class MxAudioManager : public MxMediaManager {
 
 	virtual void SetVolume(MxS32 p_volume); // vtable+2c
 
+	// SYNTHETIC: LEGO1 0x100b8d70
+	// MxAudioManager::`scalar deleting destructor'
+
 private:
 	void Destroy(MxBool p_fromDestructor);
 
diff --git a/LEGO1/omni/include/mxbitmap.h b/LEGO1/omni/include/mxbitmap.h
index d756b865..b88a1976 100644
--- a/LEGO1/omni/include/mxbitmap.h
+++ b/LEGO1/omni/include/mxbitmap.h
@@ -92,6 +92,9 @@ class MxBitmap : public MxCore {
 			return -GetBmiStride();
 	}
 
+	// SYNTHETIC: LEGO1 0x100bc9f0
+	// MxBitmap::`scalar deleting destructor'
+
 private:
 	MxResult ImportColorsToPalette(RGBQUAD*, MxPalette*);
 
diff --git a/LEGO1/omni/include/mxcore.h b/LEGO1/omni/include/mxcore.h
index 22c06d32..cae7020e 100644
--- a/LEGO1/omni/include/mxcore.h
+++ b/LEGO1/omni/include/mxcore.h
@@ -34,6 +34,9 @@ class MxCore {
 
 	inline MxU32 GetId() { return m_id; }
 
+	// SYNTHETIC: LEGO1 0x100ae1c0
+	// MxCore::`scalar deleting destructor'
+
 private:
 	MxU32 m_id; // 0x04
 };
diff --git a/LEGO1/omni/include/mxdsaction.h b/LEGO1/omni/include/mxdsaction.h
index 35abcb81..67449868 100644
--- a/LEGO1/omni/include/mxdsaction.h
+++ b/LEGO1/omni/include/mxdsaction.h
@@ -83,6 +83,9 @@ class MxDSAction : public MxDSObject {
 			SetFlags(GetFlags() | MxDSAction::c_bit3);
 	}
 
+	// SYNTHETIC: LEGO1 0x100ada60
+	// MxDSAction::`scalar deleting destructor'
+
 protected:
 	MxU32 m_sizeOnDisk;         // 0x2c
 	MxU32 m_flags;              // 0x30
diff --git a/LEGO1/omni/include/mxdsactionlist.h b/LEGO1/omni/include/mxdsactionlist.h
index 7ae9ab56..75d96842 100644
--- a/LEGO1/omni/include/mxdsactionlist.h
+++ b/LEGO1/omni/include/mxdsactionlist.h
@@ -27,6 +27,9 @@ class MxDSActionList : public MxList<MxDSAction*> {
 	// FUNCTION: LEGO1 0x100c9cb0
 	static void Destroy(MxDSAction* p_action) { delete p_action; }
 
+	// SYNTHETIC: LEGO1 0x100c9dc0
+	// MxDSActionList::`scalar deleting destructor'
+
 private:
 	undefined m_unk0x18;
 };
diff --git a/LEGO1/omni/include/mxdsanim.h b/LEGO1/omni/include/mxdsanim.h
index 213fcf87..0e5b9a0c 100644
--- a/LEGO1/omni/include/mxdsanim.h
+++ b/LEGO1/omni/include/mxdsanim.h
@@ -27,6 +27,9 @@ class MxDSAnim : public MxDSMediaAction {
 	}
 
 	virtual MxDSAction* Clone() override; // vtable+2c;
+
+	// SYNTHETIC: LEGO1 0x100c9180
+	// MxDSAnim::`scalar deleting destructor'
 };
 
 #endif // MXDSANIM_H
diff --git a/LEGO1/omni/include/mxdsbuffer.h b/LEGO1/omni/include/mxdsbuffer.h
index 27770f5f..01696471 100644
--- a/LEGO1/omni/include/mxdsbuffer.h
+++ b/LEGO1/omni/include/mxdsbuffer.h
@@ -75,6 +75,9 @@ class MxDSBuffer : public MxCore {
 	inline void SetMode(Type p_mode) { m_mode = p_mode; }
 	inline void SetUnk30(MxDSStreamingAction* p_unk0x30) { m_unk0x30 = p_unk0x30; }
 
+	// SYNTHETIC: LEGO1 0x100c6510
+	// MxDSBuffer::`scalar deleting destructor'
+
 private:
 	MxU8* m_pBuffer;                // 0x08
 	MxU8* m_pIntoBuffer;            // 0x0c
diff --git a/LEGO1/omni/include/mxdschunk.h b/LEGO1/omni/include/mxdschunk.h
index cd0816a0..52806580 100644
--- a/LEGO1/omni/include/mxdschunk.h
+++ b/LEGO1/omni/include/mxdschunk.h
@@ -57,6 +57,9 @@ class MxDSChunk : public MxCore {
 			delete[] m_data;
 	}
 
+	// SYNTHETIC: LEGO1 0x100be150
+	// MxDSChunk::`scalar deleting destructor'
+
 protected:
 	MxU16 m_flags;    // 0x8
 	MxU32 m_objectId; // 0xc
diff --git a/LEGO1/omni/include/mxdsevent.h b/LEGO1/omni/include/mxdsevent.h
index 5d002a88..1a197496 100644
--- a/LEGO1/omni/include/mxdsevent.h
+++ b/LEGO1/omni/include/mxdsevent.h
@@ -26,6 +26,9 @@ class MxDSEvent : public MxDSMediaAction {
 	}
 
 	virtual MxDSAction* Clone() override; // vtable+2c;
+
+	// SYNTHETIC: LEGO1 0x100c9780
+	// MxDSEvent::`scalar deleting destructor'
 };
 
 #endif // MXDSEVENT_H
diff --git a/LEGO1/omni/include/mxdsfile.h b/LEGO1/omni/include/mxdsfile.h
index 34afeccb..473b9741 100644
--- a/LEGO1/omni/include/mxdsfile.h
+++ b/LEGO1/omni/include/mxdsfile.h
@@ -38,6 +38,9 @@ class MxDSFile : public MxDSSource {
 
 	inline MxS32 CalcFileSize() { return GetFileSize(m_io.m_info.hmmio, NULL); }
 
+	// SYNTHETIC: LEGO1 0x100c01e0
+	// MxDSFile::`scalar deleting destructor'
+
 private:
 	MxLong ReadChunks();
 	struct ChunkHeader {
diff --git a/LEGO1/omni/include/mxdsmultiaction.h b/LEGO1/omni/include/mxdsmultiaction.h
index a600b787..efc1a11d 100644
--- a/LEGO1/omni/include/mxdsmultiaction.h
+++ b/LEGO1/omni/include/mxdsmultiaction.h
@@ -38,6 +38,9 @@ class MxDSMultiAction : public MxDSAction {
 
 	inline MxDSActionList* GetActionList() const { return m_actions; };
 
+	// SYNTHETIC: LEGO1 0x100ca040
+	// MxDSMultiAction::`scalar deleting destructor'
+
 protected:
 	MxU32 m_sizeOnDisk;        // 0x94
 	MxDSActionList* m_actions; // 0x98
diff --git a/LEGO1/omni/include/mxdsobject.h b/LEGO1/omni/include/mxdsobject.h
index b5bfd470..ad1cae40 100644
--- a/LEGO1/omni/include/mxdsobject.h
+++ b/LEGO1/omni/include/mxdsobject.h
@@ -63,6 +63,9 @@ class MxDSObject : public MxCore {
 
 	inline void ClearAtom() { m_atomId.Clear(); }
 
+	// SYNTHETIC: LEGO1 0x100bf7c0
+	// MxDSObject::`scalar deleting destructor'
+
 private:
 	MxU32 m_sizeOnDisk;     // 0x8
 	MxU16 m_type;           // 0xc
diff --git a/LEGO1/omni/include/mxdsobjectaction.h b/LEGO1/omni/include/mxdsobjectaction.h
index a31f6d6b..77480452 100644
--- a/LEGO1/omni/include/mxdsobjectaction.h
+++ b/LEGO1/omni/include/mxdsobjectaction.h
@@ -27,6 +27,9 @@ class MxDSObjectAction : public MxDSMediaAction {
 
 	virtual MxDSAction* Clone() override;                      // vtable+2c;
 	virtual void CopyFrom(MxDSObjectAction& p_dsObjectAction); // vtable+44;
+
+	// SYNTHETIC: LEGO1 0x100c8a00
+	// MxDSObjectAction::`scalar deleting destructor'
 };
 
 #endif // MXDSOBJECTACTION_H
diff --git a/LEGO1/omni/include/mxdsselectaction.h b/LEGO1/omni/include/mxdsselectaction.h
index 6b68bfc9..f7c6a148 100644
--- a/LEGO1/omni/include/mxdsselectaction.h
+++ b/LEGO1/omni/include/mxdsselectaction.h
@@ -32,6 +32,9 @@ class MxDSSelectAction : public MxDSParallelAction {
 	virtual void Deserialize(MxU8** p_source, MxS16 p_unk0x24) override; // vtable+1c;
 	virtual MxDSAction* Clone() override;                                // vtable+2c;
 
+	// SYNTHETIC: LEGO1 0x100cb840
+	// MxDSSelectAction::`scalar deleting destructor'
+
 private:
 	MxString m_unk0x9c;
 	MxStringList* m_unk0xac;
diff --git a/LEGO1/omni/include/mxdsserialaction.h b/LEGO1/omni/include/mxdsserialaction.h
index c4fa18b3..694c9afa 100644
--- a/LEGO1/omni/include/mxdsserialaction.h
+++ b/LEGO1/omni/include/mxdsserialaction.h
@@ -31,6 +31,9 @@ class MxDSSerialAction : public MxDSMultiAction {
 	virtual void SetDuration(MxLong p_duration) override; // vtable+28;
 	virtual MxDSAction* Clone() override;                 // vtable+2c;
 
+	// SYNTHETIC: LEGO1 0x100cabf0
+	// MxDSSerialAction::`scalar deleting destructor'
+
 private:
 	MxDSActionListCursor* m_cursor;
 	undefined4 m_unk0xa0;
diff --git a/LEGO1/omni/include/mxdssound.h b/LEGO1/omni/include/mxdssound.h
index 5dc6bbd7..3d1fa31d 100644
--- a/LEGO1/omni/include/mxdssound.h
+++ b/LEGO1/omni/include/mxdssound.h
@@ -32,6 +32,9 @@ class MxDSSound : public MxDSMediaAction {
 
 	inline MxS32 GetVolume() const { return m_volume; }
 
+	// SYNTHETIC: LEGO1 0x100c9450
+	// MxDSSound::`scalar deleting destructor'
+
 private:
 	MxU32 m_sizeOnDisk;
 	MxS32 m_volume; // 0xbc
diff --git a/LEGO1/omni/include/mxdsstill.h b/LEGO1/omni/include/mxdsstill.h
index 268fe79f..4de69475 100644
--- a/LEGO1/omni/include/mxdsstill.h
+++ b/LEGO1/omni/include/mxdsstill.h
@@ -27,6 +27,9 @@ class MxDSStill : public MxDSMediaAction {
 	}
 
 	virtual MxDSAction* Clone() override; // vtable+2c;
+
+	// SYNTHETIC: LEGO1 0x100c9a50
+	// MxDSStill::`scalar deleting destructor'
 };
 
 #endif // MXDSSTILL_H
diff --git a/LEGO1/omni/include/mxdsstreamingaction.h b/LEGO1/omni/include/mxdsstreamingaction.h
index ab21bac2..074bd5ed 100644
--- a/LEGO1/omni/include/mxdsstreamingaction.h
+++ b/LEGO1/omni/include/mxdsstreamingaction.h
@@ -44,6 +44,9 @@ class MxDSStreamingAction : public MxDSAction {
 	inline void SetUnknowna4(MxDSBuffer* p_unk0xa4) { m_unk0xa4 = p_unk0xa4; }
 	inline void SetBufferOffset(MxU32 p_bufferOffset) { m_bufferOffset = p_bufferOffset; }
 
+	// SYNTHETIC: LEGO1 0x100cd0b0
+	// MxDSStreamingAction::`scalar deleting destructor'
+
 private:
 	MxU32 m_unk0x94;              // 0x94
 	MxU32 m_bufferOffset;         // 0x98
diff --git a/LEGO1/omni/include/mxentity.h b/LEGO1/omni/include/mxentity.h
index cc77cea2..e78d3b2b 100644
--- a/LEGO1/omni/include/mxentity.h
+++ b/LEGO1/omni/include/mxentity.h
@@ -48,6 +48,9 @@ class MxEntity : public MxCore {
 	inline MxS32 GetEntityId() { return m_mxEntityId; }
 	inline MxAtomId& GetAtom() { return m_atom; }
 
+	// SYNTHETIC: LEGO1 0x1000c210
+	// MxEntity::`scalar deleting destructor'
+
 protected:
 	MxS32 m_mxEntityId; // 0x8
 	MxAtomId m_atom;    // 0xc
diff --git a/LEGO1/omni/include/mxeventmanager.h b/LEGO1/omni/include/mxeventmanager.h
index e7f41a6d..c21e92bc 100644
--- a/LEGO1/omni/include/mxeventmanager.h
+++ b/LEGO1/omni/include/mxeventmanager.h
@@ -14,6 +14,9 @@ class MxEventManager : public MxMediaManager {
 	virtual void Destroy() override;                                     // vtable+18
 	virtual MxResult Create(MxU32 p_frequencyMS, MxBool p_createThread); // vtable+28
 
+	// SYNTHETIC: LEGO1 0x100c03d0
+	// MxEventManager::`scalar deleting destructor'
+
 private:
 	void Init();
 	void Destroy(MxBool p_fromDestructor);
diff --git a/LEGO1/omni/include/mxeventpresenter.h b/LEGO1/omni/include/mxeventpresenter.h
index 201b15e5..52d503df 100644
--- a/LEGO1/omni/include/mxeventpresenter.h
+++ b/LEGO1/omni/include/mxeventpresenter.h
@@ -31,6 +31,9 @@ class MxEventPresenter : public MxMediaPresenter {
 	virtual MxResult PutData() override;           // vtable+0x4c
 	virtual void CopyData(MxStreamChunk* p_chunk); // vtable+0x5c
 
+	// SYNTHETIC: LEGO1 0x100c2d20
+	// MxEventPresenter::`scalar deleting destructor'
+
 private:
 	void Init();
 
diff --git a/LEGO1/omni/include/mxflcpresenter.h b/LEGO1/omni/include/mxflcpresenter.h
index 0ad44de3..d883d106 100644
--- a/LEGO1/omni/include/mxflcpresenter.h
+++ b/LEGO1/omni/include/mxflcpresenter.h
@@ -30,6 +30,9 @@ class MxFlcPresenter : public MxVideoPresenter {
 	virtual void CreateBitmap() override;                     // vtable+0x60
 	virtual void RealizePalette() override;                   // vtable+0x70
 
+	// SYNTHETIC: LEGO1 0x100b3400
+	// MxFlcPresenter::`scalar deleting destructor'
+
 protected:
 	FLIC_HEADER* m_flicHeader;
 };
diff --git a/LEGO1/omni/include/mxloopingflcpresenter.h b/LEGO1/omni/include/mxloopingflcpresenter.h
index c05c3657..9e035afc 100644
--- a/LEGO1/omni/include/mxloopingflcpresenter.h
+++ b/LEGO1/omni/include/mxloopingflcpresenter.h
@@ -20,6 +20,9 @@ class MxLoopingFlcPresenter : public MxFlcPresenter {
 
 	virtual void NextFrame() override; // vtable+0x64
 
+	// SYNTHETIC: LEGO1 0x100b4390
+	// MxLoopingFlcPresenter::`scalar deleting destructor'
+
 private:
 	void Init();
 	void Destroy(MxBool p_fromDestructor);
diff --git a/LEGO1/omni/include/mxmediamanager.h b/LEGO1/omni/include/mxmediamanager.h
index aefbd9f6..25853adf 100644
--- a/LEGO1/omni/include/mxmediamanager.h
+++ b/LEGO1/omni/include/mxmediamanager.h
@@ -23,6 +23,9 @@ class MxMediaManager : public MxCore {
 
 	MxResult Init();
 
+	// SYNTHETIC: LEGO1 0x100b8540
+	// MxMediaManager::`scalar deleting destructor'
+
 protected:
 	MxPresenterList* m_presenters;       // 0x8
 	MxThread* m_thread;                  // 0xc
diff --git a/LEGO1/omni/include/mxmediapresenter.h b/LEGO1/omni/include/mxmediapresenter.h
index 360e978e..954a2dcc 100644
--- a/LEGO1/omni/include/mxmediapresenter.h
+++ b/LEGO1/omni/include/mxmediapresenter.h
@@ -42,6 +42,9 @@ class MxMediaPresenter : public MxPresenter {
 	virtual void Enable(MxBool p_enable) override;                           // vtable+0x54
 	virtual void LoopChunk(MxStreamChunk* p_chunk);                          // vtable+0x58
 
+	// SYNTHETIC: LEGO1 0x1000c680
+	// MxMediaPresenter::`scalar deleting destructor'
+
 protected:
 	MxDSSubscriber* m_subscriber;                  // 0x40
 	MxStreamChunkList* m_loopingChunks;            // 0x44
diff --git a/LEGO1/omni/include/mxmidipresenter.h b/LEGO1/omni/include/mxmidipresenter.h
index 2ec11b0b..0bde447c 100644
--- a/LEGO1/omni/include/mxmidipresenter.h
+++ b/LEGO1/omni/include/mxmidipresenter.h
@@ -33,6 +33,9 @@ class MxMIDIPresenter : public MxMusicPresenter {
 	virtual MxResult PutData() override;             // vtable+0x4c
 	virtual void SetVolume(MxS32 p_volume) override; // vtable+0x60
 
+	// SYNTHETIC: LEGO1 0x100c27a0
+	// MxMIDIPresenter::`scalar deleting destructor'
+
 private:
 	void Init();
 	void Destroy(MxBool p_fromDestructor);
diff --git a/LEGO1/omni/include/mxmusicmanager.h b/LEGO1/omni/include/mxmusicmanager.h
index d9f6d46d..f2afe437 100644
--- a/LEGO1/omni/include/mxmusicmanager.h
+++ b/LEGO1/omni/include/mxmusicmanager.h
@@ -38,6 +38,9 @@ class MxMusicManager : public MxAudioManager {
 	MxS32 m_multiplier;       // 0x50
 	DWORD m_midiVolume;       // 0x54
 
+	// SYNTHETIC: LEGO1 0x100c0610
+	// MxMusicManager::`scalar deleting destructor'
+
 protected:
 	void Init();
 	void InitData();
diff --git a/LEGO1/omni/include/mxmusicpresenter.h b/LEGO1/omni/include/mxmusicpresenter.h
index bba2afb0..88be5c7f 100644
--- a/LEGO1/omni/include/mxmusicpresenter.h
+++ b/LEGO1/omni/include/mxmusicpresenter.h
@@ -26,6 +26,9 @@ class MxMusicPresenter : public MxAudioPresenter {
 	virtual MxResult AddToManager() override; // vtable+0x34
 	virtual void Destroy() override;          // vtable+0x38
 
+	// SYNTHETIC: LEGO1 0x100c24c0
+	// MxMusicPresenter::`scalar deleting destructor'
+
 private:
 	void Init();
 	void Destroy(MxBool p_fromDestructor);
diff --git a/LEGO1/omni/include/mxnextactiondatastart.h b/LEGO1/omni/include/mxnextactiondatastart.h
index 15e35b00..3b58a338 100644
--- a/LEGO1/omni/include/mxnextactiondatastart.h
+++ b/LEGO1/omni/include/mxnextactiondatastart.h
@@ -33,6 +33,9 @@ class MxNextActionDataStart : public MxCore {
 	inline MxU32 GetData() const { return m_data; }
 	inline void SetData(MxU32 p_data) { m_data = p_data; }
 
+	// SYNTHETIC: LEGO1 0x100c1990
+	// MxNextActionDataStart::`scalar deleting destructor'
+
 private:
 	MxU32 m_objectId; // 0x08
 	MxS16 m_unk0x24;  // 0x0c
diff --git a/LEGO1/omni/include/mxnotificationmanager.h b/LEGO1/omni/include/mxnotificationmanager.h
index b93cc7c8..4ed58f62 100644
--- a/LEGO1/omni/include/mxnotificationmanager.h
+++ b/LEGO1/omni/include/mxnotificationmanager.h
@@ -48,6 +48,9 @@ class MxNotificationManager : public MxCore {
 	inline MxNotificationPtrList* GetQueue() { return m_queue; }
 	inline void SetActive(MxBool p_active) { m_active = p_active; }
 
+	// SYNTHETIC: LEGO1 0x100ac390
+	// MxNotificationManager::`scalar deleting destructor'
+
 private:
 	void FlushPending(MxCore* p_listener);
 };
diff --git a/LEGO1/omni/include/mxobjectfactory.h b/LEGO1/omni/include/mxobjectfactory.h
index 3741bfa3..4ae3e348 100644
--- a/LEGO1/omni/include/mxobjectfactory.h
+++ b/LEGO1/omni/include/mxobjectfactory.h
@@ -39,6 +39,9 @@ class MxObjectFactory : public MxCore {
 	virtual MxCore* Create(const char* p_name); // vtable 0x14
 	virtual void Destroy(MxCore* p_object);     // vtable 0x18
 
+	// SYNTHETIC: LEGO1 0x100b1160
+	// MxObjectFactory::`scalar deleting destructor'
+
 private:
 #define X(V) MxAtomId m_id##V;
 	FOR_MXOBJECTFACTORY_OBJECTS(X)
diff --git a/LEGO1/omni/include/mxomni.h b/LEGO1/omni/include/mxomni.h
index 9f448c26..52faf709 100644
--- a/LEGO1/omni/include/mxomni.h
+++ b/LEGO1/omni/include/mxomni.h
@@ -73,6 +73,9 @@ class MxOmni : public MxCore {
 	MxAtomIdCounterSet* GetAtomIdCounterSet() const { return this->m_atomIdCounterSet; }
 	MxLong HandleActionEnd(MxParam& p_param);
 
+	// SYNTHETIC: LEGO1 0x100aefd0
+	// MxOmni::`scalar deleting destructor'
+
 protected:
 	static MxOmni* g_instance;
 
diff --git a/LEGO1/omni/include/mxomnicreateparam.h b/LEGO1/omni/include/mxomnicreateparam.h
index 5404f39a..53539bc6 100644
--- a/LEGO1/omni/include/mxomnicreateparam.h
+++ b/LEGO1/omni/include/mxomnicreateparam.h
@@ -24,6 +24,9 @@ class MxOmniCreateParam : public MxParam {
 	MxVideoParam& GetVideoParam() { return m_videoParam; }
 	const MxVideoParam& GetVideoParam() const { return m_videoParam; }
 
+	// SYNTHETIC: LEGO1 0x100b0a70
+	// MxOmniCreateParam::`scalar deleting destructor'
+
 private:
 	MxString m_mediaPath;
 	HWND m_windowHandle;
diff --git a/LEGO1/omni/include/mxpalette.h b/LEGO1/omni/include/mxpalette.h
index 90ffa605..5ed5e80f 100644
--- a/LEGO1/omni/include/mxpalette.h
+++ b/LEGO1/omni/include/mxpalette.h
@@ -28,6 +28,9 @@ class MxPalette : public MxCore {
 
 	inline void SetOverrideSkyColor(MxBool p_value) { this->m_overrideSkyColor = p_value; }
 
+	// SYNTHETIC: LEGO1 0x100beeb0
+	// MxPalette::`scalar deleting destructor'
+
 private:
 	LPDIRECTDRAWPALETTE m_palette;
 	PALETTEENTRY m_entries[256]; // 0xc
diff --git a/LEGO1/omni/include/mxpresenter.h b/LEGO1/omni/include/mxpresenter.h
index d50e9818..a6b3eca8 100644
--- a/LEGO1/omni/include/mxpresenter.h
+++ b/LEGO1/omni/include/mxpresenter.h
@@ -129,6 +129,9 @@ class MxPresenter : public MxCore {
 		m_compositePresenter = p_compositePresenter;
 	}
 
+	// SYNTHETIC: LEGO1 0x1000c070
+	// MxPresenter::`scalar deleting destructor'
+
 protected:
 	__declspec(dllexport) void Init();
 
diff --git a/LEGO1/omni/include/mxpresenterlist.h b/LEGO1/omni/include/mxpresenterlist.h
index f346e645..257d0996 100644
--- a/LEGO1/omni/include/mxpresenterlist.h
+++ b/LEGO1/omni/include/mxpresenterlist.h
@@ -18,6 +18,9 @@ class MxPresenterList : public MxPtrList<MxPresenter> {
 	{
 		return p_a == p_b ? 0 : p_a < p_b ? -1 : 1;
 	}; // vtable+0x14
+
+	// SYNTHETIC: LEGO1 0x1001ceb0
+	// MxPresenterList::`scalar deleting destructor'
 };
 
 // VTABLE: LEGO1 0x100d6488
diff --git a/LEGO1/omni/include/mxregion.h b/LEGO1/omni/include/mxregion.h
index 646866a6..5659ba81 100644
--- a/LEGO1/omni/include/mxregion.h
+++ b/LEGO1/omni/include/mxregion.h
@@ -23,6 +23,9 @@ class MxRegion : public MxCore {
 
 	friend class MxRegionCursor;
 
+	// SYNTHETIC: LEGO1 0x100c3670
+	// MxRegion::`scalar deleting destructor'
+
 private:
 	MxRegionTopBottomList* m_list; // 0x08
 	MxRect32 m_rect;               // 0x0c
diff --git a/LEGO1/omni/include/mxregionlist.h b/LEGO1/omni/include/mxregionlist.h
index 679ccebc..9dfd78bd 100644
--- a/LEGO1/omni/include/mxregionlist.h
+++ b/LEGO1/omni/include/mxregionlist.h
@@ -40,6 +40,9 @@ struct MxRegionLeftRight {
 class MxRegionLeftRightList : public MxPtrList<MxRegionLeftRight> {
 public:
 	MxRegionLeftRightList() : MxPtrList<MxRegionLeftRight>(TRUE) {}
+
+	// SYNTHETIC: LEGO1 0x100c4e90
+	// MxRegionLeftRightList::`scalar deleting destructor'
 };
 
 // VTABLE: LEGO1 0x100dcbf8
@@ -95,6 +98,9 @@ struct MxRegionTopBottom {
 class MxRegionTopBottomList : public MxPtrList<MxRegionTopBottom> {
 public:
 	MxRegionTopBottomList() : MxPtrList<MxRegionTopBottom>(TRUE) {}
+
+	// SYNTHETIC: LEGO1 0x100c3410
+	// MxRegionTopBottomList::`scalar deleting destructor'
 };
 
 // VTABLE: LEGO1 0x100dcb70
diff --git a/LEGO1/omni/include/mxsmkpresenter.h b/LEGO1/omni/include/mxsmkpresenter.h
index 4c3913cc..eeb12945 100644
--- a/LEGO1/omni/include/mxsmkpresenter.h
+++ b/LEGO1/omni/include/mxsmkpresenter.h
@@ -33,6 +33,9 @@ class MxSmkPresenter : public MxVideoPresenter {
 	virtual void RealizePalette() override;                   // vtable+0x70
 	virtual void VTable0x88();                                // vtable+0x88
 
+	// SYNTHETIC: LEGO1 0x100b3850
+	// MxSmkPresenter::`scalar deleting destructor'
+
 private:
 	void Init();
 	void Destroy(MxBool p_fromDestructor);
diff --git a/LEGO1/omni/include/mxsoundpresenter.h b/LEGO1/omni/include/mxsoundpresenter.h
index 1d49204a..1949617f 100644
--- a/LEGO1/omni/include/mxsoundpresenter.h
+++ b/LEGO1/omni/include/mxsoundpresenter.h
@@ -29,6 +29,9 @@ class MxSoundPresenter : public MxAudioPresenter {
 	// FUNCTION: LEGO1 0x1000d490
 	virtual void Destroy() override { Destroy(FALSE); }; // vtable+0x38
 
+	// SYNTHETIC: LEGO1 0x1000d5c0
+	// MxSoundPresenter::`scalar deleting destructor'
+
 protected:
 	void Destroy(MxBool p_fromDestructor);
 };
diff --git a/LEGO1/omni/include/mxstreamchunklist.h b/LEGO1/omni/include/mxstreamchunklist.h
index 2d1ce119..9d8aec0e 100644
--- a/LEGO1/omni/include/mxstreamchunklist.h
+++ b/LEGO1/omni/include/mxstreamchunklist.h
@@ -26,6 +26,9 @@ class MxStreamChunkList : public MxList<MxStreamChunk*> {
 
 	// FUNCTION: LEGO1 0x100b5920
 	static void Destroy(MxStreamChunk* p_chunk) { delete p_chunk; }
+
+	// SYNTHETIC: LEGO1 0x100b5a30
+	// MxStreamChunkList::`scalar deleting destructor'
 };
 
 // VTABLE: LEGO1 0x100dc510
diff --git a/LEGO1/omni/include/mxstring.h b/LEGO1/omni/include/mxstring.h
index 6d8a9936..65c15d3e 100644
--- a/LEGO1/omni/include/mxstring.h
+++ b/LEGO1/omni/include/mxstring.h
@@ -22,6 +22,9 @@ class MxString : public MxCore {
 	inline MxS8 Compare(const MxString& p_str) const { return strcmp(m_data, p_str.m_data); }
 	inline const char* GetData() const { return m_data; }
 
+	// SYNTHETIC: LEGO1 0x100ae280
+	// MxString::`scalar deleting destructor'
+
 private:
 	char* m_data;   // 0x08
 	MxU16 m_length; // 0x0c
diff --git a/LEGO1/omni/include/mxstringlist.h b/LEGO1/omni/include/mxstringlist.h
index 2a61f530..6d07584f 100644
--- a/LEGO1/omni/include/mxstringlist.h
+++ b/LEGO1/omni/include/mxstringlist.h
@@ -13,6 +13,9 @@ class MxStringList : public MxList<MxString> {};
 class MxStringListCursor : public MxListCursor<MxString> {
 public:
 	MxStringListCursor(MxStringList* p_list) : MxListCursor<MxString>(p_list){};
+
+	// SYNTHETIC: LEGO1 0x100cb860
+	// MxStringList::`scalar deleting destructor'
 };
 
 // VTABLE: LEGO1 0x100dd010
diff --git a/LEGO1/omni/include/mxthread.h b/LEGO1/omni/include/mxthread.h
index e3af186d..5ab80041 100644
--- a/LEGO1/omni/include/mxthread.h
+++ b/LEGO1/omni/include/mxthread.h
@@ -21,6 +21,9 @@ class MxThread {
 
 	inline MxBool IsRunning() { return m_running; }
 
+	// SYNTHETIC: LEGO1 0x100bf580
+	// MxThread::`scalar deleting destructor'
+
 protected:
 	MxThread();
 
@@ -48,6 +51,9 @@ class MxTickleThread : public MxThread {
 
 	MxResult Run() override;
 
+	// SYNTHETIC: LEGO1 0x100b8c20
+	// MxTickleThread::`scalar deleting destructor'
+
 private:
 	MxS32 m_frequencyMS; // 0x1c
 };
diff --git a/LEGO1/omni/include/mxticklemanager.h b/LEGO1/omni/include/mxticklemanager.h
index 0fdb648a..6ebd655b 100644
--- a/LEGO1/omni/include/mxticklemanager.h
+++ b/LEGO1/omni/include/mxticklemanager.h
@@ -44,6 +44,9 @@ class MxTickleManager : public MxCore {
 	virtual void SetClientTickleInterval(MxCore* p_client, MxTime p_interval); // vtable+0x1c
 	virtual MxTime GetClientTickleInterval(MxCore* p_client);                  // vtable+0x20
 
+	// SYNTHETIC: LEGO1 0x1005a510
+	// MxTickleManager::`scalar deleting destructor'
+
 private:
 	MxTickleClientPtrList m_clients; // 0x8
 };
diff --git a/LEGO1/omni/include/mxtimer.h b/LEGO1/omni/include/mxtimer.h
index 70d52d79..63b597ac 100644
--- a/LEGO1/omni/include/mxtimer.h
+++ b/LEGO1/omni/include/mxtimer.h
@@ -22,6 +22,9 @@ class MxTimer : public MxCore {
 			return g_lastTimeCalculated - this->m_startTime;
 	}
 
+	// SYNTHETIC: LEGO1 0x100ae0d0
+	// MxTimer::`scalar deleting destructor'
+
 private:
 	MxLong m_startTime;
 	MxBool m_isRunning;
diff --git a/LEGO1/omni/include/mxvariabletable.h b/LEGO1/omni/include/mxvariabletable.h
index 0d79570c..fd5cdea2 100644
--- a/LEGO1/omni/include/mxvariabletable.h
+++ b/LEGO1/omni/include/mxvariabletable.h
@@ -18,6 +18,9 @@ class MxVariableTable : public MxHashTable<MxVariable*> {
 
 	virtual MxS8 Compare(MxVariable*, MxVariable*) override; // vtable+0x14
 	virtual MxU32 Hash(MxVariable*) override;                // vtable+0x18
+
+	// SYNTHETIC: LEGO1 0x100afdd0
+	// MxVariableTable::`scalar deleting destructor'
 };
 
 // VTABLE: LEGO1 0x100dc1b0
@@ -56,6 +59,9 @@ class MxVariableTable : public MxHashTable<MxVariable*> {
 // TEMPLATE: LEGO1 0x100b7680
 // MxHashTableCursor<MxVariable *>::~MxHashTableCursor<MxVariable *>
 
+// SYNTHETIC: LEGO1 0x100b76d0
+// MxHashTableCursor<MxVariable *>::`scalar deleting destructor'
+
 // TEMPLATE: LEGO1 0x100b7ab0
 // MxHashTable<MxVariable *>::Resize
 
diff --git a/LEGO1/omni/include/mxvideomanager.h b/LEGO1/omni/include/mxvideomanager.h
index 4befdb9c..57919da3 100644
--- a/LEGO1/omni/include/mxvideomanager.h
+++ b/LEGO1/omni/include/mxvideomanager.h
@@ -44,6 +44,9 @@ class MxVideoManager : public MxMediaManager {
 	inline MxDisplaySurface* GetDisplaySurface() { return this->m_displaySurface; }
 	inline MxRegion* GetRegion() { return this->m_region; }
 
+	// SYNTHETIC: LEGO1 0x100be280
+	// MxVideoManager::`scalar deleting destructor'
+
 protected:
 	MxVideoParam m_videoParam;          // 0x2c
 	LPDIRECTDRAW m_pDirectDraw;         // 0x50
diff --git a/LEGO1/omni/include/mxvideopresenter.h b/LEGO1/omni/include/mxvideopresenter.h
index f91f2eb7..f338b972 100644
--- a/LEGO1/omni/include/mxvideopresenter.h
+++ b/LEGO1/omni/include/mxvideopresenter.h
@@ -92,11 +92,17 @@ class MxVideoPresenter : public MxMediaPresenter {
 		virtual ~AlphaMask();
 
 		MxS32 IsHit(MxU32 p_x, MxU32 p_y);
+
+		// SYNTHETIC: LEGO1 0x100b2650
+		// MxVideoPresenter::AlphaMask::`scalar deleting destructor'
 	};
 
 	inline MxS32 PrepareRects(MxRect32& p_rectDest, MxRect32& p_rectSrc);
 	inline MxBitmap* GetBitmap() { return m_bitmap; }
 
+	// SYNTHETIC: LEGO1 0x1000c910
+	// MxVideoPresenter::`scalar deleting destructor'
+
 private:
 	void Init();
 
diff --git a/LEGO1/omni/include/mxwavepresenter.h b/LEGO1/omni/include/mxwavepresenter.h
index 3bdf734f..bffefe15 100644
--- a/LEGO1/omni/include/mxwavepresenter.h
+++ b/LEGO1/omni/include/mxwavepresenter.h
@@ -57,6 +57,9 @@ class MxWavePresenter : public MxSoundPresenter {
 		MxU32 m_flags;
 	};
 
+	// SYNTHETIC: LEGO1 0x1000d810
+	// MxWavePresenter::`scalar deleting destructor'
+
 protected:
 	void Destroy(MxBool p_fromDestructor);
 
diff --git a/LEGO1/realtime/matrix.h b/LEGO1/realtime/matrix.h
index 4e661ddb..9a301a01 100644
--- a/LEGO1/realtime/matrix.h
+++ b/LEGO1/realtime/matrix.h
@@ -58,7 +58,7 @@ class Matrix4 {
 		m_data[3][3] = 1.0f;
 	} // vtable+0x24
 
-	// FUNCTION: LEGO1 0x10002850
+	// FUNCTION: LEGO1 0x10002420
 	virtual void operator=(const Matrix4& p_matrix) { Equals(p_matrix); } // vtable+0x28
 
 	// FUNCTION: LEGO1 0x10002430
diff --git a/LEGO1/realtime/roi.h b/LEGO1/realtime/roi.h
index 2cdf943a..08db5080 100644
--- a/LEGO1/realtime/roi.h
+++ b/LEGO1/realtime/roi.h
@@ -103,6 +103,9 @@ class ROI {
 	int GetLODCount() const { return m_lods ? m_lods->Size() : 0; }
 	const CompoundObject* GetComp() const { return m_comp; }
 
+	// SYNTHETIC: LEGO1 0x100a5d60
+	// ROI::`scalar deleting destructor'
+
 protected:
 	CompoundObject* m_comp; // 0x4
 	LODListBase* m_lods;    // 0x8
diff --git a/LEGO1/tgl/tgl.h b/LEGO1/tgl/tgl.h
index 137a78ff..b8a09c3e 100644
--- a/LEGO1/tgl/tgl.h
+++ b/LEGO1/tgl/tgl.h
@@ -104,6 +104,9 @@ class Object {
 	virtual ~Object() {}
 
 	virtual void* ImplementationDataPtr() = 0;
+
+	// SYNTHETIC: LEGO1 0x100a2250
+	// Tgl::Object::`scalar deleting destructor'
 };
 
 // VTABLE: LEGO1 0x100db948
@@ -142,6 +145,9 @@ class Renderer : public Object {
 
 	// vtable+0x30
 	virtual Result SetTextureDefaultColorCount(unsigned long) = 0;
+
+	// SYNTHETIC: LEGO1 0x100a17c0
+	// Tgl::Renderer::`scalar deleting destructor'
 };
 
 Renderer* CreateRenderer();
@@ -163,6 +169,9 @@ class Device : public Object {
 	virtual Result Update() = 0;
 	virtual void InitFromD3DDevice(Device*) = 0;
 	virtual void InitFromWindowsDevice(Device*) = 0;
+
+	// SYNTHETIC: LEGO1 0x100a28e0
+	// Tgl::Device::`scalar deleting destructor'
 };
 
 // VTABLE: LEGO1 0x100dba28
@@ -217,12 +226,18 @@ class View : public Object {
 		const Group**& rppPickedGroups,
 		int& rPickedGroupCount
 	) = 0;
+
+	// SYNTHETIC: LEGO1 0x100a2950
+	// Tgl::View::`scalar deleting destructor'
 };
 
 // VTABLE: LEGO1 0x100dbae8
 class Camera : public Object {
 public:
 	virtual Result SetTransformation(FloatMatrix4&) = 0;
+
+	// SYNTHETIC: LEGO1 0x100a2a30
+	// Tgl::Camera::`scalar deleting destructor'
 };
 
 // VTABLE: LEGO1 0x100dbb08
@@ -230,6 +245,9 @@ class Light : public Object {
 public:
 	virtual Result SetTransformation(FloatMatrix4&) = 0;
 	virtual Result SetColor(float r, float g, float b) = 0;
+
+	// SYNTHETIC: LEGO1 0x100a2aa0
+	// Tgl::Light::`scalar deleting destructor'
 };
 
 // VTABLE: LEGO1 0x100dbbb0
@@ -247,6 +265,9 @@ class Mesh : public Object {
 
 	// Just get another Group pointing to the same underlying data
 	virtual Mesh* ShallowClone(Unk*) = 0;
+
+	// SYNTHETIC: LEGO1 0x100a3e60
+	// Tgl::Mesh::`scalar deleting destructor'
 };
 
 // VTABLE: LEGO1 0x100dbaa0
@@ -266,6 +287,9 @@ class Group : public Object {
 	// This is TransformLocalToWorld in the leak, however it seems
 	// to have been replaced by something else in the shipped code.
 	virtual Result Unknown() = 0;
+
+	// SYNTHETIC: LEGO1 0x100a29c0
+	// Tgl::Group::`scalar deleting destructor'
 };
 
 // Don't know what this is. Seems like another Tgl object which
@@ -285,6 +309,9 @@ class Unk : public Object {
 	) = 0;
 	virtual Result GetBoundingBox(float min[3], float max[3]) = 0;
 	virtual Unk* Clone() = 0;
+
+	// SYNTHETIC: LEGO1 0x100a2b10
+	// Tgl::Unk::`scalar deleting destructor'
 };
 
 // VTABLE: LEGO1 0x100dbb68
@@ -305,6 +332,9 @@ class Texture : public Object {
 		PaletteEntry** ppPalette
 	) = 0;
 	virtual Result SetPalette(int entryCount, PaletteEntry* pEntries) = 0;
+
+	// SYNTHETIC: LEGO1 0x100a2b80
+	// Tgl::Texture::`scalar deleting destructor'
 };
 
 } // namespace Tgl
diff --git a/LEGO1/viewmanager/viewlodlist.h b/LEGO1/viewmanager/viewlodlist.h
index 1ecec3f8..df918350 100644
--- a/LEGO1/viewmanager/viewlodlist.h
+++ b/LEGO1/viewmanager/viewlodlist.h
@@ -89,6 +89,9 @@ class ViewLODListManager {
 	void Dump(void (*pTracer)(const char*, ...)) const;
 #endif
 
+	// SYNTHETIC: LEGO1 0x100a70c0
+	// ViewLODListManager::`scalar deleting destructor'
+
 private:
 	ViewLODListMap m_map;
 };
diff --git a/LEGO1/viewmanager/viewmanager.h b/LEGO1/viewmanager/viewmanager.h
index 03b23366..f2ccc6c6 100644
--- a/LEGO1/viewmanager/viewmanager.h
+++ b/LEGO1/viewmanager/viewmanager.h
@@ -16,6 +16,9 @@ class ViewManager {
 	void SetResolution(int width, int height);
 	void SetFrustrum(float fov, float front, float back);
 
+	// SYNTHETIC: LEGO1 0x100a6000
+	// ViewManager::`scalar deleting destructor'
+
 private:
 	undefined m_pad[0x1b8];
 };
diff --git a/tools/isledecomp/isledecomp/compare/core.py b/tools/isledecomp/isledecomp/compare/core.py
index c8ae7809..58f99d32 100644
--- a/tools/isledecomp/isledecomp/compare/core.py
+++ b/tools/isledecomp/isledecomp/compare/core.py
@@ -1,6 +1,7 @@
 import os
 import logging
 import difflib
+import struct
 from dataclasses import dataclass
 from typing import Iterable, List, Optional
 from isledecomp.cvdump.demangler import demangle_string_const
@@ -18,6 +19,7 @@
 
 @dataclass
 class DiffReport:
+    match_type: SymbolType
     orig_addr: int
     recomp_addr: int
     name: str
@@ -214,17 +216,11 @@ def _match_thunks(self):
                 # function in the first place.
                 self._db.skip_compare(thunk_from_orig)
 
-    def get_one_function(self, addr: int) -> Optional[MatchInfo]:
-        """i.e. verbose mode for reccmp"""
-        return self._db.get_one_function(addr)
-
-    def get_functions(self) -> List[MatchInfo]:
-        return self._db.get_matches(SymbolType.FUNCTION)
-
     def _compare_function(self, match: MatchInfo) -> DiffReport:
         if match.size == 0:
             # Report a failed match to make the user aware of the empty function.
             return DiffReport(
+                match_type=SymbolType.FUNCTION,
                 orig_addr=match.orig_addr,
                 recomp_addr=match.recomp_addr,
                 name=match.name,
@@ -281,6 +277,7 @@ def recomp_lookup(addr: int) -> Optional[str]:
             unified_diff = []
 
         return DiffReport(
+            match_type=SymbolType.FUNCTION,
             orig_addr=match.orig_addr,
             recomp_addr=match.recomp_addr,
             name=match.name,
@@ -289,16 +286,121 @@ def recomp_lookup(addr: int) -> Optional[str]:
             is_effective_match=is_effective_match,
         )
 
-    def compare_function(self, addr: int) -> Optional[DiffReport]:
-        match = self.get_one_function(addr)
+    def _compare_vtable(self, match: MatchInfo) -> DiffReport:
+        vtable_size = match.size
+
+        # The vtable size should always be a multiple of 4 because that
+        # is the pointer size. If it is not (for whatever reason)
+        # it would cause iter_unpack to blow up so let's just fix it.
+        if vtable_size % 4 != 0:
+            logger.warning(
+                "Vtable for class %s has irregular size %d", match.name, vtable_size
+            )
+            vtable_size = 4 * (vtable_size // 4)
+
+        orig_table = self.orig_bin.read(match.orig_addr, vtable_size)
+        recomp_table = self.recomp_bin.read(match.recomp_addr, vtable_size)
+
+        raw_addrs = zip(
+            [t for (t,) in struct.iter_unpack("<L", orig_table)],
+            [t for (t,) in struct.iter_unpack("<L", recomp_table)],
+        )
+
+        def match_text(
+            i: int, m: Optional[MatchInfo], raw_addr: Optional[int] = None
+        ) -> str:
+            """Format the function reference at this vtable index as text.
+            If we have not identified this function, we have the option to
+            display the raw address. This is only worth doing for the original addr
+            because we should always be able to identify the recomp function.
+            If the original function is missing then this probably means that the class
+            should override the given function from the superclass, but we have not
+            implemented this yet.
+            """
+            index = f"vtable0x{i*4:02x}"
+
+            if m is not None:
+                orig = hex(m.orig_addr) if m.orig_addr is not None else "no orig"
+                recomp = (
+                    hex(m.recomp_addr) if m.recomp_addr is not None else "no recomp"
+                )
+                return f"{index:>12}  :  ({orig:10} / {recomp:10})  :  {m.name}"
+
+            if raw_addr is not None:
+                return f"{index:>12}  :  0x{raw_addr:x} from orig not annotated."
+
+            return f"{index:>12}  :  (no match)"
+
+        orig_text = []
+        recomp_text = []
+        ratio = 0
+        n_entries = 0
+
+        # Now compare each pointer from the two vtables.
+        for i, (raw_orig, raw_recomp) in enumerate(raw_addrs):
+            orig = self._db.get_by_orig(raw_orig)
+            recomp = self._db.get_by_recomp(raw_recomp)
+
+            if (
+                orig is not None
+                and recomp is not None
+                and orig.recomp_addr == recomp.recomp_addr
+            ):
+                ratio += 1
+
+            n_entries += 1
+            orig_text.append(match_text(i, orig, raw_orig))
+            recomp_text.append(match_text(i, recomp))
+
+        ratio = ratio / float(n_entries) if n_entries > 0 else 0
+
+        # n=100: Show the entire table if there is a diff to display.
+        # Otherwise it would be confusing if the table got cut off.
+        unified_diff = difflib.unified_diff(orig_text, recomp_text, n=100)
+
+        return DiffReport(
+            match_type=SymbolType.VTABLE,
+            orig_addr=match.orig_addr,
+            recomp_addr=match.recomp_addr,
+            name=f"{match.name}::`vftable'",
+            udiff=unified_diff,
+            ratio=ratio,
+        )
+
+    def _compare_match(self, match: MatchInfo) -> Optional[DiffReport]:
+        """Router for comparison type"""
+        if match.compare_type == SymbolType.FUNCTION:
+            return self._compare_function(match)
+
+        if match.compare_type == SymbolType.VTABLE:
+            return self._compare_vtable(match)
+
+        return None
+
+    ## Public API
+
+    def get_functions(self) -> List[MatchInfo]:
+        return self._db.get_matches_by_type(SymbolType.FUNCTION)
+
+    def get_vtables(self) -> List[MatchInfo]:
+        return self._db.get_matches_by_type(SymbolType.VTABLE)
+
+    def compare_address(self, addr: int) -> Optional[DiffReport]:
+        match = self._db.get_one_match(addr)
         if match is None:
             return None
 
-        return self._compare_function(match)
+        return self._compare_match(match)
+
+    def compare_all(self) -> Iterable[DiffReport]:
+        for match in self._db.get_matches():
+            diff = self._compare_match(match)
+            if diff is not None:
+                yield diff
 
     def compare_functions(self) -> Iterable[DiffReport]:
         for match in self.get_functions():
-            yield self._compare_function(match)
+            yield self._compare_match(match)
 
     def compare_variables(self):
         pass
@@ -309,5 +411,6 @@ def compare_pointers(self):
     def compare_strings(self):
         pass
 
-    def compare_vtables(self):
-        pass
+    def compare_vtables(self) -> Iterable[DiffReport]:
+        for match in self.get_vtables():
+            yield self._compare_match(match)
diff --git a/tools/isledecomp/isledecomp/compare/db.py b/tools/isledecomp/isledecomp/compare/db.py
index d2c2cbf9..dea2b590 100644
--- a/tools/isledecomp/isledecomp/compare/db.py
+++ b/tools/isledecomp/isledecomp/compare/db.py
@@ -82,17 +82,29 @@ def get_unmatched_strings(self) -> List[str]:
 
         return [string for (string,) in cur.fetchall()]
 
-    def get_one_function(self, addr: int) -> Optional[MatchInfo]:
+    def get_matches(self) -> Optional[MatchInfo]:
         cur = self._db.execute(
             """SELECT compare_type, orig_addr, recomp_addr, name, size
             FROM `symbols`
-            WHERE compare_type = ?
-            AND orig_addr = ?
+            WHERE orig_addr IS NOT NULL
             AND recomp_addr IS NOT NULL
             AND should_skip IS FALSE
             ORDER BY orig_addr
             """,
-            (SymbolType.FUNCTION.value, addr),
+        )
+        cur.row_factory = matchinfo_factory
+
+        return cur.fetchall()
+
+    def get_one_match(self, addr: int) -> Optional[MatchInfo]:
+        cur = self._db.execute(
+            """SELECT compare_type, orig_addr, recomp_addr, name, size
+            FROM `symbols`
+            WHERE orig_addr = ?
+            AND recomp_addr IS NOT NULL
+            AND should_skip IS FALSE
+            """,
+            (addr,),
         )
         cur.row_factory = matchinfo_factory
         return cur.fetchone()
@@ -119,7 +131,7 @@ def get_by_recomp(self, addr: int) -> Optional[MatchInfo]:
         cur.row_factory = matchinfo_factory
         return cur.fetchone()
 
-    def get_matches(self, compare_type: SymbolType) -> List[MatchInfo]:
+    def get_matches_by_type(self, compare_type: SymbolType) -> List[MatchInfo]:
         cur = self._db.execute(
             """SELECT compare_type, orig_addr, recomp_addr, name, size
             FROM `symbols`
diff --git a/tools/reccmp/reccmp.py b/tools/reccmp/reccmp.py
index 66bb0f66..69783cb2 100755
--- a/tools/reccmp/reccmp.py
+++ b/tools/reccmp/reccmp.py
@@ -12,6 +12,7 @@
     print_diff,
 )
 from isledecomp.compare import Compare as IsleCompare
+from isledecomp.types import SymbolType
 from pystache import Renderer
 import colorama
 
@@ -225,9 +226,9 @@ def main():
         ### Compare one or none.
 
         if args.verbose is not None:
-            match = isle_compare.compare_function(args.verbose)
+            match = isle_compare.compare_address(args.verbose)
             if match is None:
-                print(f"Failed to find the function with address 0x{args.verbose:x}")
+                print(f"Failed to find a match at address 0x{args.verbose:x}")
                 return
 
             print_match_verbose(
@@ -242,14 +243,15 @@ def main():
         total_effective_accuracy = 0
         htmlinsert = []
 
-        for match in isle_compare.compare_functions():
+        for match in isle_compare.compare_all():
             print_match_oneline(
                 match, show_both_addrs=args.print_rec_addr, is_plain=args.no_color
             )
 
-            function_count += 1
-            total_accuracy += match.ratio
-            total_effective_accuracy += match.effective_ratio
+            if match.match_type == SymbolType.FUNCTION:
+                function_count += 1
+                total_accuracy += match.ratio
+                total_effective_accuracy += match.effective_ratio
 
             # If html, record the diffs to an HTML file
             if args.html is not None:

From 30b35981d3209f9d2949a55eb603664d51b0d3f4 Mon Sep 17 00:00:00 2001
From: Nathan M Gilbert <tahgtahv@gmail.com>
Date: Thu, 18 Jan 2024 13:23:13 -0500
Subject: [PATCH 131/210] finish MusicManager (#453)

* finish MusicManager

* Fixes/improvements

---------

Co-authored-by: Christian Semmler <mail@csemmler.com>
---
 .../legoomni/src/video/legometerpresenter.cpp |   2 +-
 LEGO1/omni/include/mxmusicmanager.h           |  35 +++--
 LEGO1/omni/include/mxstreamcontroller.h       |   3 +
 .../omni/src/audio/mxloopingmidipresenter.cpp |   2 +-
 LEGO1/omni/src/audio/mxmidipresenter.cpp      |   2 +-
 LEGO1/omni/src/audio/mxmusicmanager.cpp       | 142 ++++++++++++++++--
 util/compat.h                                 |   5 +
 7 files changed, 168 insertions(+), 23 deletions(-)

diff --git a/LEGO1/lego/legoomni/src/video/legometerpresenter.cpp b/LEGO1/lego/legoomni/src/video/legometerpresenter.cpp
index 5be9d0d6..f347545d 100644
--- a/LEGO1/lego/legoomni/src/video/legometerpresenter.cpp
+++ b/LEGO1/lego/legoomni/src/video/legometerpresenter.cpp
@@ -8,7 +8,7 @@ DECOMP_SIZE_ASSERT(LegoMeterPresenter, 0x94)
 
 // GLOBAL: LEGO1 0x1010207c
 // STRING: LEGO1 0x10101fb4
-const char* g_filterIndex = "FILTER_INDEX";
+const char* g_filterIndex = "FILLER_INDEX";
 
 // GLOBAL: LEGO1 0x10102094
 // STRING: LEGO1 0x10101f70
diff --git a/LEGO1/omni/include/mxmusicmanager.h b/LEGO1/omni/include/mxmusicmanager.h
index f2afe437..48c2df69 100644
--- a/LEGO1/omni/include/mxmusicmanager.h
+++ b/LEGO1/omni/include/mxmusicmanager.h
@@ -4,6 +4,8 @@
 #include "decomp.h"
 #include "mxaudiomanager.h"
 
+#include <windows.h>
+
 // VTABLE: LEGO1 0x100dc930
 // SIZE 0x58
 class MxMusicManager : public MxAudioManager {
@@ -16,9 +18,17 @@ class MxMusicManager : public MxAudioManager {
 	virtual MxResult Create(MxU32 p_frequencyMS, MxBool p_createThread); // vtable+30
 
 	inline MxBool GetMIDIInitialized() { return m_midiInitialized; }
+	inline void GetMIDIVolume(DWORD& p_volume)
+	{
+		if (midiOutGetVolume((HMIDIOUT) m_midiStreamH, &p_volume)) {
+			p_volume = CalculateVolume(100);
+		}
+	}
 
+	MxResult ResetStream();
+	void ResetBuffer();
+	undefined4 InitializeMIDI(MxU8* p_data, MxS32 p_loopCount);
 	void DeinitializeMIDI();
-	undefined4 FUN_100c09c0(MxU8* p_data, MxS32 p_loopCount);
 	void SetMultiplier(MxS32 p_multiplier);
 
 private:
@@ -27,16 +37,19 @@ class MxMusicManager : public MxAudioManager {
 	MxS32 CalculateVolume(MxS32 p_volume);
 	void SetMIDIVolume();
 
-	HMIDISTRM m_midiStreamH;  // 0x30
-	MxBool m_midiInitialized; // 0x34
-	undefined4 m_unk0x38;     // 0x38
-	undefined4 m_unk0x3c;     // 0x3c
-	undefined4 m_unk0x40;     // 0x40
-	undefined4 m_unk0x44;     // 0x44
-	undefined4 m_unk0x48;     // 0x48
-	MIDIHDR* m_midiHdrP;      // 0x4c
-	MxS32 m_multiplier;       // 0x50
-	DWORD m_midiVolume;       // 0x54
+	static void CALLBACK
+	MidiCallbackProc(HMIDIOUT p_hmo, UINT p_wMsg, DWORD_PTR p_dwInstance, DWORD_PTR p_dwParam1, DWORD_PTR p_dwParam2);
+
+	HMIDISTRM m_midiStreamH;     // 0x30
+	MxBool m_midiInitialized;    // 0x34
+	MxU32 m_bufferSize;          // 0x38
+	MxU32 m_bufferCurrentSize;   // 0x3c
+	MxU8* m_bufferOffset;        // 0x40
+	MxU8* m_bufferCurrentOffset; // 0x44
+	MxU32 m_loopCount;           // 0x48
+	MIDIHDR* m_midiHdrP;         // 0x4c
+	MxS32 m_multiplier;          // 0x50
+	DWORD m_midiVolume;          // 0x54
 
 	// SYNTHETIC: LEGO1 0x100c0610
 	// MxMusicManager::`scalar deleting destructor'
diff --git a/LEGO1/omni/include/mxstreamcontroller.h b/LEGO1/omni/include/mxstreamcontroller.h
index 790856c1..57caae8e 100644
--- a/LEGO1/omni/include/mxstreamcontroller.h
+++ b/LEGO1/omni/include/mxstreamcontroller.h
@@ -118,4 +118,7 @@ class MxStreamController : public MxCore {
 // TEMPLATE: LEGO1 0x100c1240
 // List<MxNextActionDataStart *>::~List<MxNextActionDataStart *>
 
+// TEMPLATE: LEGO1 0x100c1bc0
+// list<MxDSAction *,allocator<MxDSAction *> >::insert
+
 #endif // MXSTREAMCONTROLLER_H
diff --git a/LEGO1/omni/src/audio/mxloopingmidipresenter.cpp b/LEGO1/omni/src/audio/mxloopingmidipresenter.cpp
index 2ad286e1..77b32506 100644
--- a/LEGO1/omni/src/audio/mxloopingmidipresenter.cpp
+++ b/LEGO1/omni/src/audio/mxloopingmidipresenter.cpp
@@ -40,7 +40,7 @@ MxResult MxLoopingMIDIPresenter::PutData()
 
 	if (m_currentTickleState == e_streaming && m_chunk && !MusicManager()->GetMIDIInitialized()) {
 		SetVolume(((MxDSSound*) m_action)->GetVolume());
-		MusicManager()->FUN_100c09c0(m_chunk->GetData(), !m_action->GetLoopCount() ? -1 : m_action->GetLoopCount());
+		MusicManager()->InitializeMIDI(m_chunk->GetData(), !m_action->GetLoopCount() ? -1 : m_action->GetLoopCount());
 	}
 
 	m_criticalSection.Leave();
diff --git a/LEGO1/omni/src/audio/mxmidipresenter.cpp b/LEGO1/omni/src/audio/mxmidipresenter.cpp
index 8757e6af..db65574a 100644
--- a/LEGO1/omni/src/audio/mxmidipresenter.cpp
+++ b/LEGO1/omni/src/audio/mxmidipresenter.cpp
@@ -95,7 +95,7 @@ MxResult MxMIDIPresenter::PutData()
 	if (m_currentTickleState == e_streaming && m_chunk && !MusicManager()->GetMIDIInitialized()) {
 		SetVolume(((MxDSSound*) m_action)->GetVolume());
 
-		if (MusicManager()->FUN_100c09c0(m_chunk->GetData(), 1))
+		if (MusicManager()->InitializeMIDI(m_chunk->GetData(), 1))
 			EndAction();
 	}
 
diff --git a/LEGO1/omni/src/audio/mxmusicmanager.cpp b/LEGO1/omni/src/audio/mxmusicmanager.cpp
index 244e3861..b936ac30 100644
--- a/LEGO1/omni/src/audio/mxmusicmanager.cpp
+++ b/LEGO1/omni/src/audio/mxmusicmanager.cpp
@@ -31,11 +31,11 @@ void MxMusicManager::InitData()
 {
 	m_midiStreamH = 0;
 	m_midiInitialized = FALSE;
-	m_unk0x38 = 0;
-	m_unk0x3c = 0;
-	m_unk0x40 = 0;
-	m_unk0x44 = 0;
-	m_unk0x48 = 0;
+	m_bufferSize = 0;
+	m_bufferCurrentSize = 0;
+	m_bufferOffset = 0;
+	m_bufferCurrentOffset = 0;
+	m_loopCount = 0;
 	m_midiHdrP = NULL;
 }
 
@@ -62,6 +62,60 @@ void MxMusicManager::Destroy(MxBool p_fromDestructor)
 	}
 }
 
+// FUNCTION: LEGO1 0x100c0720
+MxResult MxMusicManager::ResetStream()
+{
+	MxResult result = FAILURE;
+
+	if (m_midiInitialized) {
+		if (m_bufferCurrentSize == 0) {
+			if (m_loopCount != -1) {
+				m_loopCount += -1;
+
+				if (!m_loopCount) {
+					DeinitializeMIDI();
+					goto done;
+				}
+			}
+
+			ResetBuffer();
+		}
+
+		if (m_midiHdrP->dwFlags & (MHDR_DONE | MHDR_PREPARED)) {
+			if (midiOutUnprepareHeader((HMIDIOUT) m_midiStreamH, m_midiHdrP, sizeof(MIDIHDR)) != MMSYSERR_NOERROR)
+				goto done;
+
+			memset(m_midiHdrP, 0, sizeof(MIDIHDR));
+		}
+
+		m_bufferCurrentOffset += 4;
+		DWORD length = *((DWORD*) m_bufferCurrentOffset);
+		m_bufferCurrentOffset += sizeof(DWORD);
+
+		m_midiHdrP->lpData = (LPSTR) m_bufferCurrentOffset;
+		m_midiHdrP->dwBufferLength = length;
+		m_midiHdrP->dwBytesRecorded = length;
+
+		if (!midiOutPrepareHeader((HMIDIOUT) m_midiStreamH, m_midiHdrP, sizeof(MIDIHDR))) {
+			if (!midiStreamOut(m_midiStreamH, m_midiHdrP, sizeof(MIDIHDR))) {
+				result = SUCCESS;
+				m_bufferCurrentOffset += length;
+				m_bufferCurrentSize--;
+			}
+		}
+	}
+
+done:
+	return result;
+}
+
+// FUNCTION: LEGO1 0x100c07e0
+void MxMusicManager::ResetBuffer()
+{
+	m_bufferCurrentOffset = m_bufferOffset;
+	m_bufferCurrentSize = m_bufferSize;
+}
+
 // FUNCTION: LEGO1 0x100c07f0
 void MxMusicManager::SetMIDIVolume()
 {
@@ -74,6 +128,19 @@ void MxMusicManager::SetMIDIVolume()
 	}
 }
 
+// FUNCTION: LEGO1 0x100c0820
+void CALLBACK MxMusicManager::MidiCallbackProc(
+	HMIDIOUT p_hmo,
+	UINT p_wMsg,
+	DWORD_PTR p_dwInstance,
+	DWORD_PTR p_dwParam1,
+	DWORD_PTR p_dwParam2
+)
+{
+	if (p_wMsg == MOM_DONE)
+		((MxMusicManager*) p_dwInstance)->ResetStream();
+}
+
 // FUNCTION: LEGO1 0x100c0840
 MxResult MxMusicManager::Create(MxU32 p_frequencyMS, MxBool p_createThread)
 {
@@ -136,11 +203,68 @@ MxS32 MxMusicManager::CalculateVolume(MxS32 p_volume)
 	return (result << 0x10) | result;
 }
 
-// STUB: LEGO1 0x100c09c0
-undefined4 MxMusicManager::FUN_100c09c0(MxU8* p_data, MxS32 p_loopCount)
+// FUNCTION: LEGO1 0x100c09c0
+undefined4 MxMusicManager::InitializeMIDI(MxU8* p_data, MxS32 p_loopCount)
 {
-	// TODO
-	return 0;
+	MxResult result = FAILURE;
+
+	m_criticalSection.Enter();
+
+	if (!m_midiInitialized) {
+		MxU32 total = midiOutGetNumDevs();
+		MxU32 device = 0;
+
+		for (; device < total; device++) {
+			MIDIOUTCAPSA caps;
+			midiOutGetDevCapsA(device, &caps, sizeof(MIDIOUTCAPSA));
+			if (caps.wTechnology == MOD_FMSYNTH)
+				break;
+		}
+
+		if (device >= total)
+			device = -1;
+
+		if (midiStreamOpen(&m_midiStreamH, &device, 1, (DWORD) MidiCallbackProc, (DWORD) this, CALLBACK_FUNCTION) !=
+			MMSYSERR_NOERROR)
+			goto done;
+
+		GetMIDIVolume(m_midiVolume);
+
+		m_midiHdrP = new MIDIHDR();
+		if (!m_midiHdrP)
+			goto done;
+
+		memset(m_midiHdrP, 0, sizeof(MIDIHDR));
+
+		MIDIPROPTIMEDIV timediv;
+		timediv.cbStruct = 8;
+		m_bufferOffset = p_data;
+		m_bufferOffset += 0x14;
+		timediv.dwTimeDiv = *((DWORD*) m_bufferOffset);
+
+		if (midiStreamProperty(m_midiStreamH, (LPBYTE) &timediv, MIDIPROP_SET | MIDIPROP_TIMEDIV) != MMSYSERR_NOERROR)
+			goto done;
+
+		m_bufferOffset += 0x14;
+		m_bufferSize = *((MxU32*) m_bufferOffset);
+		m_bufferOffset += sizeof(MxU32);
+		m_loopCount = p_loopCount;
+		m_midiInitialized = TRUE;
+
+		ResetBuffer();
+		if (ResetStream() != SUCCESS)
+			goto done;
+
+		SetMIDIVolume();
+		if (midiStreamRestart(m_midiStreamH) != MMSYSERR_NOERROR)
+			goto done;
+
+		result = SUCCESS;
+	}
+
+done:
+	m_criticalSection.Leave();
+	return result;
 }
 
 // FUNCTION: LEGO1 0x100c0b20
diff --git a/util/compat.h b/util/compat.h
index b38a1c7c..a5b7a487 100644
--- a/util/compat.h
+++ b/util/compat.h
@@ -15,6 +15,11 @@
 #define COMPAT_CONST
 #endif
 
+// DWORD_PTR didn't exist in older Windows SDKs
+#if (defined(_MSC_VER) && _MSC_VER < 1100)
+typedef unsigned long DWORD_PTR, *PDWORD_PTR;
+#endif
+
 // Disable "identifier was truncated to '255' characters" warning.
 // Impossible to avoid this if using STL map or set.
 // This removes most (but not all) occurrences of the warning.

From 5d79ac94363d94394f2738d29f8b7d6a72c57e5e Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Thu, 18 Jan 2024 13:26:51 -0500
Subject: [PATCH 132/210] Fix MxMusicManager::InitializeMIDI return type

---
 LEGO1/omni/include/mxmusicmanager.h     | 2 +-
 LEGO1/omni/src/audio/mxmusicmanager.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/LEGO1/omni/include/mxmusicmanager.h b/LEGO1/omni/include/mxmusicmanager.h
index 48c2df69..6deb88b3 100644
--- a/LEGO1/omni/include/mxmusicmanager.h
+++ b/LEGO1/omni/include/mxmusicmanager.h
@@ -27,7 +27,7 @@ class MxMusicManager : public MxAudioManager {
 
 	MxResult ResetStream();
 	void ResetBuffer();
-	undefined4 InitializeMIDI(MxU8* p_data, MxS32 p_loopCount);
+	MxResult InitializeMIDI(MxU8* p_data, MxS32 p_loopCount);
 	void DeinitializeMIDI();
 	void SetMultiplier(MxS32 p_multiplier);
 
diff --git a/LEGO1/omni/src/audio/mxmusicmanager.cpp b/LEGO1/omni/src/audio/mxmusicmanager.cpp
index b936ac30..3f2a4dd5 100644
--- a/LEGO1/omni/src/audio/mxmusicmanager.cpp
+++ b/LEGO1/omni/src/audio/mxmusicmanager.cpp
@@ -204,7 +204,7 @@ MxS32 MxMusicManager::CalculateVolume(MxS32 p_volume)
 }
 
 // FUNCTION: LEGO1 0x100c09c0
-undefined4 MxMusicManager::InitializeMIDI(MxU8* p_data, MxS32 p_loopCount)
+MxResult MxMusicManager::InitializeMIDI(MxU8* p_data, MxS32 p_loopCount)
 {
 	MxResult result = FAILURE;
 

From be045514ed048a2e29c2398725d5ce80949bfd6e Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Thu, 18 Jan 2024 13:29:00 -0500
Subject: [PATCH 133/210] Add test for SUCCESS

---
 LEGO1/omni/src/audio/mxmidipresenter.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LEGO1/omni/src/audio/mxmidipresenter.cpp b/LEGO1/omni/src/audio/mxmidipresenter.cpp
index db65574a..5796fb67 100644
--- a/LEGO1/omni/src/audio/mxmidipresenter.cpp
+++ b/LEGO1/omni/src/audio/mxmidipresenter.cpp
@@ -95,7 +95,7 @@ MxResult MxMIDIPresenter::PutData()
 	if (m_currentTickleState == e_streaming && m_chunk && !MusicManager()->GetMIDIInitialized()) {
 		SetVolume(((MxDSSound*) m_action)->GetVolume());
 
-		if (MusicManager()->InitializeMIDI(m_chunk->GetData(), 1))
+		if (MusicManager()->InitializeMIDI(m_chunk->GetData(), 1) != SUCCESS)
 			EndAction();
 	}
 

From ea9d92e1e37f76e7d16e5bcb9bda897c6f181890 Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Thu, 18 Jan 2024 13:39:26 -0500
Subject: [PATCH 134/210] Use MSVC 4.20 definition of MIDICALLBACK

---
 LEGO1/omni/include/mxmusicmanager.h     |  2 +-
 LEGO1/omni/src/audio/mxmusicmanager.cpp | 12 +++---------
 util/compat.h                           |  5 -----
 3 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/LEGO1/omni/include/mxmusicmanager.h b/LEGO1/omni/include/mxmusicmanager.h
index 6deb88b3..7470c640 100644
--- a/LEGO1/omni/include/mxmusicmanager.h
+++ b/LEGO1/omni/include/mxmusicmanager.h
@@ -38,7 +38,7 @@ class MxMusicManager : public MxAudioManager {
 	void SetMIDIVolume();
 
 	static void CALLBACK
-	MidiCallbackProc(HMIDIOUT p_hmo, UINT p_wMsg, DWORD_PTR p_dwInstance, DWORD_PTR p_dwParam1, DWORD_PTR p_dwParam2);
+	MxMusicManager::MidiCallbackProc(HDRVR p_hdrvr, UINT p_uMsg, DWORD p_dwUser, DWORD p_dw1, DWORD p_dw2);
 
 	HMIDISTRM m_midiStreamH;     // 0x30
 	MxBool m_midiInitialized;    // 0x34
diff --git a/LEGO1/omni/src/audio/mxmusicmanager.cpp b/LEGO1/omni/src/audio/mxmusicmanager.cpp
index 3f2a4dd5..09fbc861 100644
--- a/LEGO1/omni/src/audio/mxmusicmanager.cpp
+++ b/LEGO1/omni/src/audio/mxmusicmanager.cpp
@@ -129,16 +129,10 @@ void MxMusicManager::SetMIDIVolume()
 }
 
 // FUNCTION: LEGO1 0x100c0820
-void CALLBACK MxMusicManager::MidiCallbackProc(
-	HMIDIOUT p_hmo,
-	UINT p_wMsg,
-	DWORD_PTR p_dwInstance,
-	DWORD_PTR p_dwParam1,
-	DWORD_PTR p_dwParam2
-)
+void CALLBACK MxMusicManager::MidiCallbackProc(HDRVR p_hdrvr, UINT p_uMsg, DWORD p_dwUser, DWORD p_dw1, DWORD p_dw2)
 {
-	if (p_wMsg == MOM_DONE)
-		((MxMusicManager*) p_dwInstance)->ResetStream();
+	if (p_uMsg == MOM_DONE)
+		((MxMusicManager*) p_dwUser)->ResetStream();
 }
 
 // FUNCTION: LEGO1 0x100c0840
diff --git a/util/compat.h b/util/compat.h
index a5b7a487..b38a1c7c 100644
--- a/util/compat.h
+++ b/util/compat.h
@@ -15,11 +15,6 @@
 #define COMPAT_CONST
 #endif
 
-// DWORD_PTR didn't exist in older Windows SDKs
-#if (defined(_MSC_VER) && _MSC_VER < 1100)
-typedef unsigned long DWORD_PTR, *PDWORD_PTR;
-#endif
-
 // Disable "identifier was truncated to '255' characters" warning.
 // Impossible to avoid this if using STL map or set.
 // This removes most (but not all) occurrences of the warning.

From 62e584b024fb7fc1cbd19f55f75b764f3c017127 Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Thu, 18 Jan 2024 13:49:08 -0500
Subject: [PATCH 135/210] Fix build

---
 LEGO1/omni/include/mxmusicmanager.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/LEGO1/omni/include/mxmusicmanager.h b/LEGO1/omni/include/mxmusicmanager.h
index 7470c640..2a8b30e5 100644
--- a/LEGO1/omni/include/mxmusicmanager.h
+++ b/LEGO1/omni/include/mxmusicmanager.h
@@ -37,8 +37,7 @@ class MxMusicManager : public MxAudioManager {
 	MxS32 CalculateVolume(MxS32 p_volume);
 	void SetMIDIVolume();
 
-	static void CALLBACK
-	MxMusicManager::MidiCallbackProc(HDRVR p_hdrvr, UINT p_uMsg, DWORD p_dwUser, DWORD p_dw1, DWORD p_dw2);
+	static void CALLBACK MidiCallbackProc(HDRVR p_hdrvr, UINT p_uMsg, DWORD p_dwUser, DWORD p_dw1, DWORD p_dw2);
 
 	HMIDISTRM m_midiStreamH;     // 0x30
 	MxBool m_midiInitialized;    // 0x34

From ffee6a4e5be3a8ce2d8fe51261b1a79764c50824 Mon Sep 17 00:00:00 2001
From: Ramen2X <64166386+Ramen2X@users.noreply.github.com>
Date: Thu, 18 Jan 2024 14:04:50 -0500
Subject: [PATCH 136/210] rename dialogue to action in methods (#454)

---
 LEGO1/lego/legoomni/include/infocenter.h      |  4 +--
 .../legoomni/src/infocenter/infocenter.cpp    | 36 +++++++++----------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/LEGO1/lego/legoomni/include/infocenter.h b/LEGO1/lego/legoomni/include/infocenter.h
index c0ef31b0..4d8ed408 100644
--- a/LEGO1/lego/legoomni/include/infocenter.h
+++ b/LEGO1/lego/legoomni/include/infocenter.h
@@ -154,8 +154,8 @@ class Infocenter : public LegoWorld {
 	void StartCredits();
 	void StopCredits();
 
-	void PlayDialogue(InfomainScript p_objectId);
-	void StopCurrentDialogue();
+	void PlayAction(InfomainScript p_objectId);
+	void StopCurrentAction();
 
 	void PlayBookAnimation();
 	void StopBookAnimation();
diff --git a/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp b/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp
index 27ce0cd5..16d1e507 100644
--- a/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp
+++ b/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp
@@ -150,19 +150,19 @@ MxLong Infocenter::HandleEndAction(MxParam& p_param)
 
 			switch (m_unk0xfc) {
 			case 1:
-				PlayDialogue(c_pepperCharacterSelect);
+				PlayAction(c_pepperCharacterSelect);
 				break;
 			case 2:
-				PlayDialogue(c_mamaCharacterSelect);
+				PlayAction(c_mamaCharacterSelect);
 				break;
 			case 3:
-				PlayDialogue(c_papaCharacterSelect);
+				PlayAction(c_papaCharacterSelect);
 				break;
 			case 4:
-				PlayDialogue(c_nickCharacterSelect);
+				PlayAction(c_nickCharacterSelect);
 				break;
 			case 5:
-				PlayDialogue(c_lauraCharacterSelect);
+				PlayAction(c_lauraCharacterSelect);
 				break;
 			default:
 				break;
@@ -194,13 +194,13 @@ MxLong Infocenter::HandleEndAction(MxParam& p_param)
 		case e_badEndMovie:
 			StopCutscene();
 			m_infocenterState->SetUnknown0x74(11);
-			PlayDialogue(c_badEndingDialogue);
+			PlayAction(c_badEndingDialogue);
 			m_currentCutscene = e_noIntro;
 			return 1;
 		case e_goodEndMovie:
 			StopCutscene();
 			m_infocenterState->SetUnknown0x74(11);
-			PlayDialogue(c_goodEndingDialogue);
+			PlayAction(c_goodEndingDialogue);
 			m_currentCutscene = e_noIntro;
 			return 1;
 		}
@@ -208,7 +208,7 @@ MxLong Infocenter::HandleEndAction(MxParam& p_param)
 		// default / 2nd case probably?
 		StopCutscene();
 		m_infocenterState->SetUnknown0x74(11);
-		PlayDialogue(c_welcomeDialogue);
+		PlayAction(c_welcomeDialogue);
 		m_currentCutscene = e_noIntro;
 
 		if (m_infocenterState->GetInfocenterBufferElement(0) == 0) {
@@ -221,13 +221,13 @@ MxLong Infocenter::HandleEndAction(MxParam& p_param)
 
 		switch (m_currentCutscene) {
 		case e_badEndMovie:
-			PlayDialogue(c_badEndingDialogue);
+			PlayAction(c_badEndingDialogue);
 			break;
 		case e_goodEndMovie:
-			PlayDialogue(c_goodEndingDialogue);
+			PlayAction(c_goodEndingDialogue);
 			break;
 		default:
-			PlayDialogue(c_welcomeDialogue);
+			PlayAction(c_welcomeDialogue);
 		}
 
 		m_currentCutscene = e_noIntro;
@@ -302,7 +302,7 @@ void Infocenter::VTable0x50()
 				m_unk0x1d2 = 1;
 			}
 
-			PlayDialogue(c_letsGetStartedDialogue);
+			PlayAction(c_letsGetStartedDialogue);
 			PlayMusic(11);
 			FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
 			return;
@@ -312,7 +312,7 @@ void Infocenter::VTable0x50()
 			break;
 		case 8:
 			PlayMusic(11);
-			PlayDialogue(c_exitConfirmationDialogue);
+			PlayAction(c_exitConfirmationDialogue);
 			FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
 			return;
 		case 0xf:
@@ -320,7 +320,7 @@ void Infocenter::VTable0x50()
 				m_unk0x1d2 = 1;
 			}
 
-			PlayDialogue(c_clickOnInfomanDialogue);
+			PlayAction(c_clickOnInfomanDialogue);
 			PlayMusic(11);
 			FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
 			return;
@@ -372,7 +372,7 @@ MxLong Infocenter::HandleKeyPress(MxS8 p_key)
 			break;
 		default: {
 			InfomainScript script = m_currentInfomainScript;
-			StopCurrentDialogue();
+			StopCurrentAction();
 
 			switch (m_infocenterState->GetUnknown0x74()) {
 			case 5:
@@ -511,12 +511,12 @@ void Infocenter::StopCredits()
 }
 
 // FUNCTION: LEGO1 0x10071300
-void Infocenter::PlayDialogue(InfomainScript p_objectId)
+void Infocenter::PlayAction(InfomainScript p_objectId)
 {
 	MxDSAction action;
 	action.SetObjectId(p_objectId);
 	action.SetAtomId(*g_infomainScript);
-	StopCurrentDialogue();
+	StopCurrentAction();
 
 	m_currentInfomainScript = p_objectId;
 	BackgroundAudioManager()->LowerVolume();
@@ -524,7 +524,7 @@ void Infocenter::PlayDialogue(InfomainScript p_objectId)
 }
 
 // FUNCTION: LEGO1 0x100713d0
-void Infocenter::StopCurrentDialogue()
+void Infocenter::StopCurrentAction()
 {
 	if (m_currentInfomainScript != c_noInfomain) {
 		MxDSAction action;

From f1300d9de586e3f4ef943bd403c4c49d89c85d10 Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Thu, 18 Jan 2024 14:42:37 -0500
Subject: [PATCH 137/210] Match MxMusicManager::ResetStream

---
 LEGO1/omni/src/audio/mxmusicmanager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LEGO1/omni/src/audio/mxmusicmanager.cpp b/LEGO1/omni/src/audio/mxmusicmanager.cpp
index 09fbc861..7a0684f8 100644
--- a/LEGO1/omni/src/audio/mxmusicmanager.cpp
+++ b/LEGO1/omni/src/audio/mxmusicmanager.cpp
@@ -81,7 +81,7 @@ MxResult MxMusicManager::ResetStream()
 			ResetBuffer();
 		}
 
-		if (m_midiHdrP->dwFlags & (MHDR_DONE | MHDR_PREPARED)) {
+		if (m_midiHdrP->dwFlags & MHDR_DONE || m_midiHdrP->dwFlags & MHDR_PREPARED) {
 			if (midiOutUnprepareHeader((HMIDIOUT) m_midiStreamH, m_midiHdrP, sizeof(MIDIHDR)) != MMSYSERR_NOERROR)
 				goto done;
 

From 61dd687f535cca88b96b14458c75a1864fc41272 Mon Sep 17 00:00:00 2001
From: Misha <106913236+MishaProductions@users.noreply.github.com>
Date: Thu, 18 Jan 2024 20:24:15 -0500
Subject: [PATCH 138/210] Implement InfoCenter folder vtable stubs (#456)

* Implement InfoCenter vtable stubs

* fix build

* Update infocenterdoor.cpp

* Update infocenterdoor.cpp

* Update legoworld.h

* Update elevatorbottom.h

---------

Co-authored-by: Christian Semmler <mail@csemmler.com>
---
 .../lego/legoomni/include/beachhouseentity.h  |  2 -
 LEGO1/lego/legoomni/include/buildingentity.h  |  2 +
 LEGO1/lego/legoomni/include/elevatorbottom.h  |  9 ++++
 LEGO1/lego/legoomni/include/infocenterdoor.h  |  9 ++++
 LEGO1/lego/legoomni/include/infocenterstate.h |  3 ++
 LEGO1/lego/legoomni/include/legoworld.h       |  1 +
 .../lego/legoomni/include/registrationbook.h  |  6 +++
 .../legoomni/src/build/buildingentity.cpp     |  8 +++
 LEGO1/lego/legoomni/src/entity/legoworld.cpp  |  6 +++
 .../src/infocenter/elevatorbottom.cpp         | 53 ++++++++++++++++++-
 .../src/infocenter/infocenterdoor.cpp         | 42 ++++++++++++++-
 .../src/infocenter/registrationbook.cpp       | 34 ++++++++++++
 .../legoomni/src/isle/beachhouseentity.cpp    |  8 ---
 13 files changed, 169 insertions(+), 14 deletions(-)

diff --git a/LEGO1/lego/legoomni/include/beachhouseentity.h b/LEGO1/lego/legoomni/include/beachhouseentity.h
index df8cf288..1c92fc17 100644
--- a/LEGO1/lego/legoomni/include/beachhouseentity.h
+++ b/LEGO1/lego/legoomni/include/beachhouseentity.h
@@ -7,8 +7,6 @@
 // SIZE 0x68
 class BeachHouseEntity : public BuildingEntity {
 public:
-	virtual MxLong Notify(MxParam& p_param) override; // vtable+04
-
 	// FUNCTION: LEGO1 0x1000ee80
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
diff --git a/LEGO1/lego/legoomni/include/buildingentity.h b/LEGO1/lego/legoomni/include/buildingentity.h
index bd136438..0e9a9d45 100644
--- a/LEGO1/lego/legoomni/include/buildingentity.h
+++ b/LEGO1/lego/legoomni/include/buildingentity.h
@@ -10,6 +10,8 @@ class BuildingEntity : public LegoEntity {
 	BuildingEntity();
 	virtual ~BuildingEntity() override; // vtable+0x0
 
+	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x4
+
 	// FUNCTION: LEGO1 0x10014f20
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
diff --git a/LEGO1/lego/legoomni/include/elevatorbottom.h b/LEGO1/lego/legoomni/include/elevatorbottom.h
index 9c5b18e3..ed424efd 100644
--- a/LEGO1/lego/legoomni/include/elevatorbottom.h
+++ b/LEGO1/lego/legoomni/include/elevatorbottom.h
@@ -26,6 +26,15 @@ class ElevatorBottom : public LegoWorld {
 		return !strcmp(p_name, ElevatorBottom::ClassName()) || LegoWorld::IsA(p_name);
 	}
 
+	virtual MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
+	virtual void VTable0x50() override;                       // vtable+0x50
+
+	// FUNCTION: LEGO1 0x10017f10
+	virtual MxBool VTable0x5c() override { return TRUE; } // vtable+0x5c
+
+	virtual MxBool VTable0x64() override;           // vtable+0x64
+	virtual void VTable0x68(MxBool p_add) override; // vtable+0x68
+
 	// SYNTHETIC: LEGO1 0x10018040
 	// ElevatorBottom::`scalar deleting destructor'
 
diff --git a/LEGO1/lego/legoomni/include/infocenterdoor.h b/LEGO1/lego/legoomni/include/infocenterdoor.h
index 4bdf2884..effb22cf 100644
--- a/LEGO1/lego/legoomni/include/infocenterdoor.h
+++ b/LEGO1/lego/legoomni/include/infocenterdoor.h
@@ -25,6 +25,15 @@ class InfocenterDoor : public LegoWorld {
 		return !strcmp(p_name, InfocenterDoor::ClassName()) || LegoWorld::IsA(p_name);
 	}
 
+	virtual MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
+	virtual void VTable0x50() override;                       // vtable+0x50
+
+	// FUNCTION: LEGO1 0x100377a0
+	virtual MxBool VTable0x5c() override { return TRUE; } // vtable+0x5c
+
+	virtual MxBool VTable0x64() override;           // vtable+0x64
+	virtual void VTable0x68(MxBool p_add) override; // vtable+0x68
+
 	// SYNTHETIC: LEGO1 0x100378d0
 	// InfocenterDoor::`scalar deleting destructor'
 };
diff --git a/LEGO1/lego/legoomni/include/infocenterstate.h b/LEGO1/lego/legoomni/include/infocenterstate.h
index c926b97c..aaa45f56 100644
--- a/LEGO1/lego/legoomni/include/infocenterstate.h
+++ b/LEGO1/lego/legoomni/include/infocenterstate.h
@@ -24,6 +24,9 @@ class InfocenterState : public LegoState {
 		return !strcmp(p_name, InfocenterState::ClassName()) || LegoState::IsA(p_name);
 	}
 
+	// FUNCTION: LEGO1 0x10071830
+	virtual MxBool VTable0x14() override { return FALSE; } // vtable+0x14
+
 	inline MxU32 GetInfocenterBufferElement(MxS32 p_index) { return m_buffer[p_index]; }
 	inline MxU32 GetUnknown0x74() { return m_unk0x74; }
 
diff --git a/LEGO1/lego/legoomni/include/legoworld.h b/LEGO1/lego/legoomni/include/legoworld.h
index dfc51e70..31b60f84 100644
--- a/LEGO1/lego/legoomni/include/legoworld.h
+++ b/LEGO1/lego/legoomni/include/legoworld.h
@@ -36,6 +36,7 @@ class LegoWorld : public LegoEntity {
 	}
 
 	virtual MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
+	virtual void Destroy(MxBool p_fromDestructor) override;   // vtable+0x1c
 	virtual void VTable0x50();                                // vtable+0x50
 	virtual LegoCameraController* VTable0x54();               // vtable+0x54
 	virtual void VTable0x58(MxCore* p_object);                // vtable+0x58
diff --git a/LEGO1/lego/legoomni/include/registrationbook.h b/LEGO1/lego/legoomni/include/registrationbook.h
index 7c605865..25e4b2d8 100644
--- a/LEGO1/lego/legoomni/include/registrationbook.h
+++ b/LEGO1/lego/legoomni/include/registrationbook.h
@@ -11,6 +11,7 @@ class RegistrationBook : public LegoWorld {
 	virtual ~RegistrationBook() override; // vtable+0x0
 
 	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x4
+	virtual MxResult Tickle() override;               // vtable+0x8
 
 	// FUNCTION: LEGO1 0x10076e10
 	inline virtual const char* ClassName() const override // vtable+0x0c
@@ -25,6 +26,11 @@ class RegistrationBook : public LegoWorld {
 		return !strcmp(p_name, RegistrationBook::ClassName()) || LegoWorld::IsA(p_name);
 	}
 
+	virtual MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
+	virtual void VTable0x50() override;                       // vtable+0x50
+	virtual MxBool VTable0x64() override;                     // vtable+0x64
+	virtual void VTable0x68(MxBool p_add) override;           // vtable+0x68
+
 	// SYNTHETIC: LEGO1 0x10076f30
 	// RegistrationBook::`scalar deleting destructor'
 };
diff --git a/LEGO1/lego/legoomni/src/build/buildingentity.cpp b/LEGO1/lego/legoomni/src/build/buildingentity.cpp
index 37a09f2f..37b0a8d9 100644
--- a/LEGO1/lego/legoomni/src/build/buildingentity.cpp
+++ b/LEGO1/lego/legoomni/src/build/buildingentity.cpp
@@ -11,3 +11,11 @@ BuildingEntity::~BuildingEntity()
 {
 	// TODO
 }
+
+// STUB: LEGO1 0x100150a0
+MxLong BuildingEntity::Notify(MxParam& p_param)
+{
+	// TODO
+
+	return 0;
+}
diff --git a/LEGO1/lego/legoomni/src/entity/legoworld.cpp b/LEGO1/lego/legoomni/src/entity/legoworld.cpp
index 9611713c..8e5c7465 100644
--- a/LEGO1/lego/legoomni/src/entity/legoworld.cpp
+++ b/LEGO1/lego/legoomni/src/entity/legoworld.cpp
@@ -77,6 +77,12 @@ MxResult LegoWorld::Create(MxDSAction& p_dsAction)
 	return SUCCESS;
 }
 
+// STUB: LEGO1 0x1001e9d0
+void LegoWorld::Destroy(MxBool p_fromDestructor)
+{
+	// TODO
+}
+
 // FUNCTION: LEGO1 0x1001f5e0
 MxLong LegoWorld::Notify(MxParam& p_param)
 {
diff --git a/LEGO1/lego/legoomni/src/infocenter/elevatorbottom.cpp b/LEGO1/lego/legoomni/src/infocenter/elevatorbottom.cpp
index 1dbb8a67..ad199882 100644
--- a/LEGO1/lego/legoomni/src/infocenter/elevatorbottom.cpp
+++ b/LEGO1/lego/legoomni/src/infocenter/elevatorbottom.cpp
@@ -3,6 +3,7 @@
 DECOMP_SIZE_ASSERT(ElevatorBottom, 0xfc)
 
 #include "legocontrolmanager.h"
+#include "legogamestate.h"
 #include "legoinputmanager.h"
 #include "legoomni.h"
 #include "mxnotificationmanager.h"
@@ -25,10 +26,58 @@ ElevatorBottom::~ElevatorBottom()
 	NotificationManager()->Unregister(this);
 }
 
+// FUNCTION: LEGO1 0x100180f0
+MxResult ElevatorBottom::Create(MxDSAction& p_dsAction)
+{
+	MxResult result = LegoWorld::Create(p_dsAction);
+	if (result == SUCCESS) {
+		InputManager()->SetWorld(this);
+		ControlManager()->Register(this);
+	}
+
+	SetIsWorldActive(FALSE);
+
+	GameState()->SetUnknown424(5);
+	GameState()->FUN_1003a720(0);
+
+	return result;
+}
+
 // STUB: LEGO1 0x10018150
 MxLong ElevatorBottom::Notify(MxParam& p_param)
 {
 	// TODO
-
-	return 0;
+	return LegoWorld::Notify(p_param);
+}
+
+// FUNCTION: LEGO1 0x100181b0
+void ElevatorBottom::VTable0x50()
+{
+	LegoWorld::VTable0x50();
+	PlayMusic(11);
+	FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
+}
+
+// FUNCTION: LEGO1 0x100182c0
+void ElevatorBottom::VTable0x68(MxBool p_add)
+{
+	LegoWorld::VTable0x68(p_add);
+
+	if (p_add) {
+		InputManager()->SetWorld(this);
+		SetIsWorldActive(FALSE);
+	}
+	else {
+		if (InputManager()->GetWorld() == this) {
+			InputManager()->ClearWorld();
+		}
+	}
+}
+
+// FUNCTION: LEGO1 0x10018310
+MxBool ElevatorBottom::VTable0x64()
+{
+	DeleteObjects(&m_atom, 500, 999);
+	m_unk0xf8 = 2;
+	return TRUE;
 }
diff --git a/LEGO1/lego/legoomni/src/infocenter/infocenterdoor.cpp b/LEGO1/lego/legoomni/src/infocenter/infocenterdoor.cpp
index c6d85394..4c50a321 100644
--- a/LEGO1/lego/legoomni/src/infocenter/infocenterdoor.cpp
+++ b/LEGO1/lego/legoomni/src/infocenter/infocenterdoor.cpp
@@ -1,5 +1,8 @@
 #include "infocenterdoor.h"
 
+#include "legoinputmanager.h"
+#include "legoomni.h"
+
 // STUB: LEGO1 0x10037730
 InfocenterDoor::InfocenterDoor()
 {
@@ -12,10 +15,45 @@ InfocenterDoor::~InfocenterDoor()
 	// TODO
 }
 
+// STUB: LEGO1 0x10037980
+MxResult InfocenterDoor::Create(MxDSAction& p_dsAction)
+{
+	return SUCCESS;
+}
+
 // STUB: LEGO1 0x100379e0
 MxLong InfocenterDoor::Notify(MxParam& p_param)
 {
 	// TODO
-
-	return 0;
+	return LegoWorld::Notify(p_param);
+}
+
+// FUNCTION: LEGO1 0x10037a70
+void InfocenterDoor::VTable0x50()
+{
+	LegoWorld::VTable0x50();
+	PlayMusic(11);
+	FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
+}
+
+// FUNCTION: LEGO1 0x10037c80
+void InfocenterDoor::VTable0x68(MxBool p_add)
+{
+	LegoWorld::VTable0x68(p_add);
+
+	if (p_add) {
+		InputManager()->SetWorld(this);
+		SetIsWorldActive(FALSE);
+	}
+	else {
+		if (InputManager()->GetWorld() == this) {
+			InputManager()->ClearWorld();
+		}
+	}
+}
+
+// STUB: LEGO1 0x10037cd0
+MxBool InfocenterDoor::VTable0x64()
+{
+	return TRUE;
 }
diff --git a/LEGO1/lego/legoomni/src/infocenter/registrationbook.cpp b/LEGO1/lego/legoomni/src/infocenter/registrationbook.cpp
index eb7e099a..f68bc29e 100644
--- a/LEGO1/lego/legoomni/src/infocenter/registrationbook.cpp
+++ b/LEGO1/lego/legoomni/src/infocenter/registrationbook.cpp
@@ -1,5 +1,7 @@
 #include "registrationbook.h"
 
+#include "legoomni.h"
+
 // STUB: LEGO1 0x10076d20
 RegistrationBook::RegistrationBook()
 {
@@ -12,6 +14,12 @@ RegistrationBook::~RegistrationBook()
 	// TODO
 }
 
+// STUB: LEGO1 0x10077060
+MxResult RegistrationBook::Create(MxDSAction& p_dsAction)
+{
+	return SUCCESS;
+}
+
 // STUB: LEGO1 0x100770e0
 MxLong RegistrationBook::Notify(MxParam& p_param)
 {
@@ -19,3 +27,29 @@ MxLong RegistrationBook::Notify(MxParam& p_param)
 
 	return 0;
 }
+
+// STUB: LEGO1 0x10077cc0
+void RegistrationBook::VTable0x50()
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x10077fd0
+MxResult RegistrationBook::Tickle()
+{
+	// TODO
+	return SUCCESS;
+}
+
+// STUB: LEGO1 0x10078180
+void RegistrationBook::VTable0x68(MxBool p_add)
+{
+	// TODO
+}
+
+// FUNCTION: LEGO1 0x100783e0
+MxBool RegistrationBook::VTable0x64()
+{
+	DeleteObjects(&m_atom, 500, 506);
+	return TRUE;
+}
diff --git a/LEGO1/lego/legoomni/src/isle/beachhouseentity.cpp b/LEGO1/lego/legoomni/src/isle/beachhouseentity.cpp
index 66b07f60..f243b92a 100644
--- a/LEGO1/lego/legoomni/src/isle/beachhouseentity.cpp
+++ b/LEGO1/lego/legoomni/src/isle/beachhouseentity.cpp
@@ -1,9 +1 @@
 #include "beachhouseentity.h"
-
-// STUB: LEGO1 0x100150a0
-MxLong BeachHouseEntity::Notify(MxParam& p_param)
-{
-	// TODO
-
-	return 0;
-}

From 578e48ce52f5e54c9d8d81c0e20fd119b9fe98db Mon Sep 17 00:00:00 2001
From: Ramen2X <64166386+Ramen2X@users.noreply.github.com>
Date: Thu, 18 Jan 2024 21:00:55 -0500
Subject: [PATCH 139/210] implement/match InfoCenter::~InfoCenter() (#457)

---
 LEGO1/lego/legoomni/include/infocenterstate.h |  8 ++++---
 .../legoomni/src/common/legogamestate.cpp     |  2 +-
 .../legoomni/src/infocenter/infocenter.cpp    | 24 +++++++++++++++++--
 3 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/LEGO1/lego/legoomni/include/infocenterstate.h b/LEGO1/lego/legoomni/include/infocenterstate.h
index aaa45f56..4f92b508 100644
--- a/LEGO1/lego/legoomni/include/infocenterstate.h
+++ b/LEGO1/lego/legoomni/include/infocenterstate.h
@@ -3,6 +3,7 @@
 
 #include "decomp.h"
 #include "legostate.h"
+#include "mxstillpresenter.h";
 
 // VTABLE: LEGO1 0x100d93a8
 // SIZE 0x94
@@ -27,7 +28,8 @@ class InfocenterState : public LegoState {
 	// FUNCTION: LEGO1 0x10071830
 	virtual MxBool VTable0x14() override { return FALSE; } // vtable+0x14
 
-	inline MxU32 GetInfocenterBufferElement(MxS32 p_index) { return m_buffer[p_index]; }
+	inline MxS16 GetInfocenterBufferSize() { return sizeof(m_buffer) / sizeof(m_buffer[0]); }
+	inline MxStillPresenter* GetInfocenterBufferElement(MxS32 p_index) { return m_buffer[p_index]; }
 	inline MxU32 GetUnknown0x74() { return m_unk0x74; }
 
 	inline void SetUnknown0x74(MxU32 p_unk0x74) { m_unk0x74 = p_unk0x74; }
@@ -65,8 +67,8 @@ class InfocenterState : public LegoState {
 	*/
 
 	undefined m_pad[0x6c];
-	MxU32 m_unk0x74;   // 0x74
-	MxU32 m_buffer[7]; // 0x78
+	MxU32 m_unk0x74;               // 0x74
+	MxStillPresenter* m_buffer[7]; // 0x78
 };
 
 #endif // INFOCENTERSTATE_H
diff --git a/LEGO1/lego/legoomni/src/common/legogamestate.cpp b/LEGO1/lego/legoomni/src/common/legogamestate.cpp
index 22ad48d0..0bb0b066 100644
--- a/LEGO1/lego/legoomni/src/common/legogamestate.cpp
+++ b/LEGO1/lego/legoomni/src/common/legogamestate.cpp
@@ -112,7 +112,7 @@ MxResult LegoGameState::Save(MxULong p_slot)
 	MxResult result;
 	InfocenterState* infocenterState = (InfocenterState*) GameState()->GetState("InfocenterState");
 
-	if (!infocenterState || infocenterState->GetInfocenterBufferElement(0) == 0)
+	if (!infocenterState || infocenterState->GetInfocenterBufferElement(0) == NULL)
 		result = SUCCESS;
 	else {
 		result = FAILURE;
diff --git a/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp b/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp
index 16d1e507..68090a69 100644
--- a/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp
+++ b/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp
@@ -11,6 +11,7 @@
 #include "mxbackgroundaudiomanager.h"
 #include "mxnotificationmanager.h"
 #include "mxstillpresenter.h"
+#include "mxticklemanager.h"
 #include "mxtransitionmanager.h"
 
 DECOMP_SIZE_ASSERT(Infocenter, 0x1d8)
@@ -46,10 +47,29 @@ Infocenter::Infocenter()
 	m_unk0x1d6 = 0;
 }
 
-// STUB: LEGO1 0x1006ec90
+// FUNCTION: LEGO1 0x1006ec90
 Infocenter::~Infocenter()
 {
-	// TODO
+	BackgroundAudioManager()->Stop();
+
+	MxS16 i = 0;
+	do {
+		if (m_infocenterState->GetInfocenterBufferElement(i) != NULL) {
+			m_infocenterState->GetInfocenterBufferElement(i)->Enable(FALSE);
+		}
+		i++;
+	} while (i < m_infocenterState->GetInfocenterBufferSize());
+
+	ControlManager()->Unregister(this);
+
+	InputManager()->UnRegister(this);
+	if (InputManager()->GetWorld() == this) {
+		InputManager()->ClearWorld();
+	}
+
+	NotificationManager()->Unregister(this);
+
+	TickleManager()->UnregisterClient(this);
 }
 
 // STUB: LEGO1 0x1006ed90

From cecaced79775dedb9e3c2d6cd65be3d69ec34d99 Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Fri, 19 Jan 2024 09:01:57 -0500
Subject: [PATCH 140/210] Implement MxFlcPresenter::LoadFrame, add `flic`
 library (#455)

* WIP

* Match

* Fix flic.lib

* Add source assembly

* Rename variable
---
 3rdparty/flic/flic.asm                        | 868 ++++++++++++++++++
 3rdparty/flic/flic.h                          |  61 +-
 3rdparty/flic/flic.lib                        | Bin 0 -> 2876 bytes
 CMakeLists.txt                                |   3 +-
 LEGO1/omni/include/mxflcpresenter.h           |   3 +-
 LEGO1/omni/src/video/mxflcpresenter.cpp       |  41 +-
 .../omni/src/video/mxloopingflcpresenter.cpp  |   2 +-
 7 files changed, 944 insertions(+), 34 deletions(-)
 create mode 100644 3rdparty/flic/flic.asm
 create mode 100644 3rdparty/flic/flic.lib

diff --git a/3rdparty/flic/flic.asm b/3rdparty/flic/flic.asm
new file mode 100644
index 00000000..ef402a14
--- /dev/null
+++ b/3rdparty/flic/flic.asm
@@ -0,0 +1,868 @@
+.486
+.387
+option dotname
+.model flat, c
+assume fs:nothing
+
+public DecodeFLCFrame
+
+.text SEGMENT PARA PUBLIC 'CODE'
+
+?_25162 LABEL NEAR
+        mov     ax, word ptr [esp+0CH]                  ; 100BD530 _ 66: 8B. 44 24, 0C
+        push    esi                                     ; 100BD535 _ 56
+        test    ax, ax                                  ; 100BD536 _ 66: 85. C0
+        push    edi                                     ; 100BD539 _ 57
+        jl      ?_25163                                 ; 100BD53A _ 7C, 34
+        mov     cx, word ptr [esp+18H]                  ; 100BD53C _ 66: 8B. 4C 24, 18
+        test    cx, cx                                  ; 100BD541 _ 66: 85. C9
+        jl      ?_25163                                 ; 100BD544 _ 7C, 2A
+        mov     edx, dword ptr [esp+0CH]                ; 100BD546 _ 8B. 54 24, 0C
+        movsx   edi, ax                                 ; 100BD54A _ 0F BF. F8
+        mov     esi, dword ptr [edx+4H]                 ; 100BD54D _ 8B. 72, 04
+        cmp     esi, edi                                ; 100BD550 _ 3B. F7
+        jle     ?_25163                                 ; 100BD552 _ 7E, 1C
+        movsx   eax, cx                                 ; 100BD554 _ 0F BF. C1
+        cmp     dword ptr [edx+8H], eax                 ; 100BD557 _ 39. 42, 08
+        jle     ?_25163                                 ; 100BD55A _ 7E, 14
+        add     esi, 3                                  ; 100BD55C _ 83. C6, 03
+        mov     cl, byte ptr [esp+1CH]                  ; 100BD55F _ 8A. 4C 24, 1C
+        and     esi, 0FFFFFFFCH                         ; 100BD563 _ 83. E6, FC
+        imul    esi, eax                                ; 100BD566 _ 0F AF. F0
+        add     esi, dword ptr [esp+10H]                ; 100BD569 _ 03. 74 24, 10
+        mov     byte ptr [esi+edi], cl                  ; 100BD56D _ 88. 0C 3E
+?_25163:pop     edi                                     ; 100BD570 _ 5F
+        pop     esi                                     ; 100BD571 _ 5E
+        ret                                             ; 100BD572 _ C3
+
+; Filling space: 0DH
+; Filler type: INT 3 Debug breakpoint
+;       db 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH
+;       db 0CCH, 0CCH, 0CCH, 0CCH, 0CCH
+
+ALIGN   16
+
+?_25164 LABEL NEAR
+        lea     eax, [esp+18H]                          ; 100BD580 _ 8D. 44 24, 18
+        push    esi                                     ; 100BD584 _ 56
+        mov     si, word ptr [esp+10H]                  ; 100BD585 _ 66: 8B. 74 24, 10
+        push    edi                                     ; 100BD58A _ 57
+        lea     ecx, [esp+18H]                          ; 100BD58B _ 8D. 4C 24, 18
+        push    eax                                     ; 100BD58F _ 50
+        lea     edx, [esp+18H]                          ; 100BD590 _ 8D. 54 24, 18
+        push    ecx                                     ; 100BD594 _ 51
+        mov     edi, dword ptr [esp+14H]                ; 100BD595 _ 8B. 7C 24, 14
+        push    edx                                     ; 100BD599 _ 52
+        push    edi                                     ; 100BD59A _ 57
+        call    ?_25168                                 ; 100BD59B _ E8, 00000060
+        add     esp, 16                                 ; 100BD5A0 _ 83. C4, 10
+        test    eax, eax                                ; 100BD5A3 _ 85. C0
+        jz      ?_25167                                 ; 100BD5A5 _ 74, 4A
+        mov     ax, word ptr [esp+14H]                  ; 100BD5A7 _ 66: 8B. 44 24, 14
+        sub     ax, si                                  ; 100BD5AC _ 66: 2B. C6
+        jz      ?_25165                                 ; 100BD5AF _ 74, 0B
+        movsx   eax, ax                                 ; 100BD5B1 _ 0F BF. C0
+        mov     esi, dword ptr [esp+1CH]                ; 100BD5B4 _ 8B. 74 24, 1C
+        add     esi, eax                                ; 100BD5B8 _ 03. F0
+        jmp     ?_25166                                 ; 100BD5BA _ EB, 04
+
+?_25165:mov     esi, dword ptr [esp+1CH]                ; 100BD5BC _ 8B. 74 24, 1C
+?_25166:movsx   edx, word ptr [esp+20H]                 ; 100BD5C0 _ 0F BF. 54 24, 20
+        mov     ecx, dword ptr [edi+4H]                 ; 100BD5C5 _ 8B. 4F, 04
+        movsx   eax, word ptr [esp+18H]                 ; 100BD5C8 _ 0F BF. 44 24, 18
+        add     ecx, 3                                  ; 100BD5CD _ 83. C1, 03
+        and     ecx, 0FFFFFFFCH                         ; 100BD5D0 _ 83. E1, FC
+        movsx   edi, word ptr [esp+14H]                 ; 100BD5D3 _ 0F BF. 7C 24, 14
+        imul    ecx, eax                                ; 100BD5D8 _ 0F AF. C8
+        add     ecx, edi                                ; 100BD5DB _ 03. CF
+        mov     edi, dword ptr [esp+10H]                ; 100BD5DD _ 8B. 7C 24, 10
+        add     edi, ecx                                ; 100BD5E1 _ 03. F9
+        mov     ecx, edx                                ; 100BD5E3 _ 8B. CA
+        shr     ecx, 2                                  ; 100BD5E5 _ C1. E9, 02
+        rep movsd                                       ; 100BD5E8 _ F3: A5
+        mov     ecx, edx                                ; 100BD5EA _ 8B. CA
+        and     ecx, 03H                                ; 100BD5EC _ 83. E1, 03
+        rep movsb                                       ; 100BD5EF _ F3: A4
+?_25167:pop     edi                                     ; 100BD5F1 _ 5F
+        pop     esi                                     ; 100BD5F2 _ 5E
+        ret                                             ; 100BD5F3 _ C3
+
+; Filling space: 0CH
+; Filler type: INT 3 Debug breakpoint
+;       db 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH
+;       db 0CCH, 0CCH, 0CCH, 0CCH
+
+ALIGN   16
+
+?_25168 LABEL NEAR
+        mov     ecx, dword ptr [esp+8H]                 ; 100BD600 _ 8B. 4C 24, 08
+        push    ebx                                     ; 100BD604 _ 53
+        mov     bx, word ptr [ecx]                      ; 100BD605 _ 66: 8B. 19
+        push    esi                                     ; 100BD608 _ 56
+        mov     eax, dword ptr [esp+14H]                ; 100BD609 _ 8B. 44 24, 14
+        push    edi                                     ; 100BD60D _ 57
+        mov     ax, word ptr [eax]                      ; 100BD60E _ 66: 8B. 00
+        push    ebp                                     ; 100BD611 _ 55
+        test    ax, ax                                  ; 100BD612 _ 66: 85. C0
+        mov     edx, dword ptr [esp+20H]                ; 100BD615 _ 8B. 54 24, 20
+        mov     si, word ptr [edx]                      ; 100BD619 _ 66: 8B. 32
+        lea     edi, [ebx+esi]                          ; 100BD61C _ 8D. 3C 33
+        jl      ?_25171                                 ; 100BD61F _ 7C, 50
+        movsx   ebp, ax                                 ; 100BD621 _ 0F BF. E8
+        mov     eax, dword ptr [esp+14H]                ; 100BD624 _ 8B. 44 24, 14
+        cmp     dword ptr [eax+8H], ebp                 ; 100BD628 _ 39. 68, 08
+        jle     ?_25171                                 ; 100BD62B _ 7E, 44
+        test    di, di                                  ; 100BD62D _ 66: 85. FF
+        jl      ?_25171                                 ; 100BD630 _ 7C, 3F
+        movsx   ebp, bx                                 ; 100BD632 _ 0F BF. EB
+        cmp     ebp, dword ptr [eax+4H]                 ; 100BD635 _ 3B. 68, 04
+        jge     ?_25171                                 ; 100BD638 _ 7D, 37
+        test    bx, bx                                  ; 100BD63A _ 66: 85. DB
+        jge     ?_25169                                 ; 100BD63D _ 7D, 0B
+        mov     si, di                                  ; 100BD63F _ 66: 8B. F7
+        mov     word ptr [edx], di                      ; 100BD642 _ 66: 89. 3A
+; Note: Length-changing prefix causes delay on Intel processors
+        mov     word ptr [ecx], 0                       ; 100BD645 _ 66: C7. 01, 0000
+?_25169:movsx   ecx, di                                 ; 100BD64A _ 0F BF. CF
+        mov     eax, dword ptr [eax+4H]                 ; 100BD64D _ 8B. 40, 04
+        cmp     ecx, eax                                ; 100BD650 _ 3B. C8
+        jle     ?_25170                                 ; 100BD652 _ 7E, 09
+        sub     si, di                                  ; 100BD654 _ 66: 2B. F7
+        add     si, ax                                  ; 100BD657 _ 66: 03. F0
+        mov     word ptr [edx], si                      ; 100BD65A _ 66: 89. 32
+?_25170:test    si, si                                  ; 100BD65D _ 66: 85. F6
+        mov     eax, 0                                  ; 100BD660 _ B8, 00000000
+        jl      ?_25172                                 ; 100BD665 _ 7C, 0C
+        pop     ebp                                     ; 100BD667 _ 5D
+        mov     eax, 1                                  ; 100BD668 _ B8, 00000001
+        pop     edi                                     ; 100BD66D _ 5F
+        pop     esi                                     ; 100BD66E _ 5E
+        pop     ebx                                     ; 100BD66F _ 5B
+        ret                                             ; 100BD670 _ C3
+
+?_25171:xor     eax, eax                                ; 100BD671 _ 33. C0
+?_25172:pop     ebp                                     ; 100BD673 _ 5D
+        pop     edi                                     ; 100BD674 _ 5F
+        pop     esi                                     ; 100BD675 _ 5E
+        pop     ebx                                     ; 100BD676 _ 5B
+        ret                                             ; 100BD677 _ C3
+
+; Filling space: 8H
+; Filler type: INT 3 Debug breakpoint
+;       db 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH
+
+ALIGN   16
+
+?_25173 LABEL NEAR
+        lea     eax, [esp+18H]                          ; 100BD680 _ 8D. 44 24, 18
+        push    esi                                     ; 100BD684 _ 56
+        lea     ecx, [esp+14H]                          ; 100BD685 _ 8D. 4C 24, 14
+        push    eax                                     ; 100BD689 _ 50
+        lea     edx, [esp+14H]                          ; 100BD68A _ 8D. 54 24, 14
+        push    ecx                                     ; 100BD68E _ 51
+        mov     esi, dword ptr [esp+10H]                ; 100BD68F _ 8B. 74 24, 10
+        push    edx                                     ; 100BD693 _ 52
+        push    esi                                     ; 100BD694 _ 56
+        call    ?_25168                                 ; 100BD695 _ E8, FFFFFF66
+        add     esp, 16                                 ; 100BD69A _ 83. C4, 10
+        test    eax, eax                                ; 100BD69D _ 85. C0
+        jz      ?_25175                                 ; 100BD69F _ 74, 33
+        movsx   eax, word ptr [esp+14H]                 ; 100BD6A1 _ 0F BF. 44 24, 14
+        mov     ecx, dword ptr [esi+4H]                 ; 100BD6A6 _ 8B. 4E, 04
+        add     ecx, 3                                  ; 100BD6A9 _ 83. C1, 03
+        and     ecx, 0FFFFFFFCH                         ; 100BD6AC _ 83. E1, FC
+        movsx   edx, word ptr [esp+10H]                 ; 100BD6AF _ 0F BF. 54 24, 10
+        imul    ecx, eax                                ; 100BD6B4 _ 0F AF. C8
+        add     ecx, edx                                ; 100BD6B7 _ 03. CA
+        mov     eax, dword ptr [esp+0CH]                ; 100BD6B9 _ 8B. 44 24, 0C
+        add     eax, ecx                                ; 100BD6BD _ 03. C1
+        dec     word ptr [esp+1CH]                      ; 100BD6BF _ 66: FF. 4C 24, 1C
+        js      ?_25175                                 ; 100BD6C4 _ 78, 0E
+        mov     cl, byte ptr [esp+18H]                  ; 100BD6C6 _ 8A. 4C 24, 18
+?_25174:mov     byte ptr [eax], cl                      ; 100BD6CA _ 88. 08
+        inc     eax                                     ; 100BD6CC _ 40
+        dec     word ptr [esp+1CH]                      ; 100BD6CD _ 66: FF. 4C 24, 1C
+        jns     ?_25174                                 ; 100BD6D2 _ 79, F6
+?_25175:pop     esi                                     ; 100BD6D4 _ 5E
+        ret                                             ; 100BD6D5 _ C3
+
+; Filling space: 0AH
+; Filler type: INT 3 Debug breakpoint
+;       db 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH
+;       db 0CCH, 0CCH
+
+ALIGN   16
+
+?_25176 LABEL NEAR
+        lea     eax, [esp+18H]                          ; 100BD6E0 _ 8D. 44 24, 18
+        push    ebx                                     ; 100BD6E4 _ 53
+        lea     ecx, [esp+14H]                          ; 100BD6E5 _ 8D. 4C 24, 14
+        push    esi                                     ; 100BD6E9 _ 56
+        lea     edx, [esp+14H]                          ; 100BD6EA _ 8D. 54 24, 14
+        push    eax                                     ; 100BD6EE _ 50
+        mov     esi, dword ptr [esp+10H]                ; 100BD6EF _ 8B. 74 24, 10
+        push    ecx                                     ; 100BD6F3 _ 51
+        shl     word ptr [esp+28H], 1                   ; 100BD6F4 _ 66: C1. 64 24, 28, 01
+        push    edx                                     ; 100BD6FA _ 52
+        push    esi                                     ; 100BD6FB _ 56
+        call    ?_25168                                 ; 100BD6FC _ E8, FFFFFEFF
+        add     esp, 16                                 ; 100BD701 _ 83. C4, 10
+        test    eax, eax                                ; 100BD704 _ 85. C0
+        jz      ?_25179                                 ; 100BD706 _ 74, 52
+        mov     dx, word ptr [esp+20H]                  ; 100BD708 _ 66: 8B. 54 24, 20
+        mov     ecx, dword ptr [esi+4H]                 ; 100BD70D _ 8B. 4E, 04
+        and     dx, 01H                                 ; 100BD710 _ 66: 83. E2, 01
+        add     ecx, 3                                  ; 100BD714 _ 83. C1, 03
+        movsx   eax, word ptr [esp+18H]                 ; 100BD717 _ 0F BF. 44 24, 18
+        movsx   ebx, word ptr [esp+14H]                 ; 100BD71C _ 0F BF. 5C 24, 14
+        and     ecx, 0FFFFFFFCH                         ; 100BD721 _ 83. E1, FC
+        sar     word ptr [esp+20H], 1                   ; 100BD724 _ 66: C1. 7C 24, 20, 01
+        imul    ecx, eax                                ; 100BD72A _ 0F AF. C8
+        add     ecx, ebx                                ; 100BD72D _ 03. CB
+        mov     eax, dword ptr [esp+10H]                ; 100BD72F _ 8B. 44 24, 10
+        add     eax, ecx                                ; 100BD733 _ 03. C1
+        mov     bl, byte ptr [esp+1CH]                  ; 100BD735 _ 8A. 5C 24, 1C
+        dec     word ptr [esp+20H]                      ; 100BD739 _ 66: FF. 4C 24, 20
+        js      ?_25178                                 ; 100BD73E _ 78, 13
+?_25177:mov     cx, word ptr [esp+1CH]                  ; 100BD740 _ 66: 8B. 4C 24, 1C
+        add     eax, 2                                  ; 100BD745 _ 83. C0, 02
+        mov     word ptr [eax-2H], cx                   ; 100BD748 _ 66: 89. 48, FE
+        dec     word ptr [esp+20H]                      ; 100BD74C _ 66: FF. 4C 24, 20
+        jns     ?_25177                                 ; 100BD751 _ 79, ED
+?_25178:test    dx, dx                                  ; 100BD753 _ 66: 85. D2
+        jz      ?_25179                                 ; 100BD756 _ 74, 02
+        mov     byte ptr [eax], bl                      ; 100BD758 _ 88. 18
+?_25179:pop     esi                                     ; 100BD75A _ 5E
+        pop     ebx                                     ; 100BD75B _ 5B
+        ret                                             ; 100BD75C _ C3
+
+; Filling space: 3H
+; Filler type: INT 3 Debug breakpoint
+;       db 0CCH, 0CCH, 0CCH
+
+ALIGN   8
+
+?_25180 LABEL NEAR
+        mov     eax, dword ptr [esp+18H]                ; 100BD760 _ 8B. 44 24, 18
+        sub     esp, 4                                  ; 100BD764 _ 83. EC, 04
+; Note: Length-changing prefix causes delay on Intel processors
+        mov     word ptr [esp+2H], 0                    ; 100BD767 _ 66: C7. 44 24, 02, 0000
+        mov     ecx, dword ptr [esp+14H]                ; 100BD76E _ 8B. 4C 24, 14
+        push    ebx                                     ; 100BD772 _ 53
+        push    esi                                     ; 100BD773 _ 56
+        mov     byte ptr [eax], 0                       ; 100BD774 _ C6. 00, 00
+        cmp     word ptr [ecx+6H], 0                    ; 100BD777 _ 66: 83. 79, 06, 00
+        push    edi                                     ; 100BD77C _ 57
+        push    ebp                                     ; 100BD77D _ 55
+        jle     ?_25191                                 ; 100BD77E _ 0F 8E, 000000C1
+        mov     esi, dword ptr [esp+18H]                ; 100BD784 _ 8B. 74 24, 18
+        mov     edi, dword ptr [esp+1CH]                ; 100BD788 _ 8B. 7C 24, 1C
+        mov     ebx, dword ptr [esp+20H]                ; 100BD78C _ 8B. 5C 24, 20
+        mov     ebp, dword ptr [esp+28H]                ; 100BD790 _ 8B. 6C 24, 28
+?_25181:mov     ecx, ebp                                ; 100BD794 _ 8B. CD
+        xor     edx, edx                                ; 100BD796 _ 33. D2
+        mov     dx, word ptr [ecx+4H]                   ; 100BD798 _ 66: 8B. 51, 04
+        add     ebp, dword ptr [ebp]                    ; 100BD79C _ 03. 6D, 00
+        sub     edx, 4                                  ; 100BD79F _ 83. EA, 04
+        cmp     edx, 12                                 ; 100BD7A2 _ 83. FA, 0C
+        ja      ?_25190                                 ; 100BD7A5 _ 0F 87, 00000082
+        xor     eax, eax                                ; 100BD7AB _ 33. C0
+        mov     al, byte ptr [?_25193+edx]              ; 100BD7AD _ 8A. 82, 100BD870(d)
+        jmp     dword ptr [?_25192+eax*4]               ; 100BD7B3 _ FF. 24 85, 100BD850(d)
+
+?_25182 LABEL NEAR
+        add     ecx, 6                                  ; 100BD7BA _ 83. C1, 06
+        push    ecx                                     ; 100BD7BD _ 51
+        push    esi                                     ; 100BD7BE _ 56
+        call    ?_25194                                 ; 100BD7BF _ E8, 000000BC
+        mov     eax, dword ptr [esp+34H]                ; 100BD7C4 _ 8B. 44 24, 34
+        add     esp, 8                                  ; 100BD7C8 _ 83. C4, 08
+        mov     byte ptr [eax], 1                       ; 100BD7CB _ C6. 00, 01
+        jmp     ?_25190                                 ; 100BD7CE _ EB, 5D
+
+?_25183 LABEL NEAR
+        push    ebx                                     ; 100BD7D0 _ 53
+        add     ecx, 6                                  ; 100BD7D1 _ 83. C1, 06
+        push    ecx                                     ; 100BD7D4 _ 51
+        push    edi                                     ; 100BD7D5 _ 57
+        push    esi                                     ; 100BD7D6 _ 56
+        call    ?_25220                                 ; 100BD7D7 _ E8, 000002E4
+        jmp     ?_25189                                 ; 100BD7DC _ EB, 4C
+
+?_25184 LABEL NEAR
+        add     ecx, 6                                  ; 100BD7DE _ 83. C1, 06
+        push    ecx                                     ; 100BD7E1 _ 51
+        push    esi                                     ; 100BD7E2 _ 56
+        call    ?_25202                                 ; 100BD7E3 _ E8, 00000158
+        mov     eax, dword ptr [esp+34H]                ; 100BD7E8 _ 8B. 44 24, 34
+        add     esp, 8                                  ; 100BD7EC _ 83. C4, 08
+        mov     byte ptr [eax], 1                       ; 100BD7EF _ C6. 00, 01
+        jmp     ?_25190                                 ; 100BD7F2 _ EB, 39
+
+?_25185 LABEL NEAR
+        push    ebx                                     ; 100BD7F4 _ 53
+        add     ecx, 6                                  ; 100BD7F5 _ 83. C1, 06
+        push    ecx                                     ; 100BD7F8 _ 51
+        push    edi                                     ; 100BD7F9 _ 57
+        push    esi                                     ; 100BD7FA _ 56
+        call    ?_25213                                 ; 100BD7FB _ E8, 00000210
+        jmp     ?_25189                                 ; 100BD800 _ EB, 28
+
+?_25186 LABEL NEAR
+        push    ebx                                     ; 100BD802 _ 53
+        add     ecx, 6                                  ; 100BD803 _ 83. C1, 06
+        push    ecx                                     ; 100BD806 _ 51
+        push    edi                                     ; 100BD807 _ 57
+        push    esi                                     ; 100BD808 _ 56
+        call    ?_25227                                 ; 100BD809 _ E8, 000003F2
+        jmp     ?_25189                                 ; 100BD80E _ EB, 1A
+
+?_25187 LABEL NEAR
+        push    ebx                                     ; 100BD810 _ 53
+        add     ecx, 6                                  ; 100BD811 _ 83. C1, 06
+        push    ecx                                     ; 100BD814 _ 51
+        push    edi                                     ; 100BD815 _ 57
+        push    esi                                     ; 100BD816 _ 56
+        call    ?_25203                                 ; 100BD817 _ E8, 00000144
+        jmp     ?_25189                                 ; 100BD81C _ EB, 0C
+
+?_25188 LABEL NEAR
+        push    ebx                                     ; 100BD81E _ 53
+        add     ecx, 6                                  ; 100BD81F _ 83. C1, 06
+        push    ecx                                     ; 100BD822 _ 51
+        push    edi                                     ; 100BD823 _ 57
+        push    esi                                     ; 100BD824 _ 56
+        call    ?_25231                                 ; 100BD825 _ E8, 00000466
+?_25189:add     esp, 16                                 ; 100BD82A _ 83. C4, 10
+
+?_25190 LABEL NEAR
+        inc     word ptr [esp+12H]                      ; 100BD82D _ 66: FF. 44 24, 12
+        mov     eax, dword ptr [esp+24H]                ; 100BD832 _ 8B. 44 24, 24
+        mov     cx, word ptr [esp+12H]                  ; 100BD836 _ 66: 8B. 4C 24, 12
+        cmp     word ptr [eax+6H], cx                   ; 100BD83B _ 66: 39. 48, 06
+        jg      ?_25181                                 ; 100BD83F _ 0F 8F, FFFFFF4F
+?_25191:xor     ax, ax                                  ; 100BD845 _ 66: 33. C0
+        pop     ebp                                     ; 100BD848 _ 5D
+        pop     edi                                     ; 100BD849 _ 5F
+        pop     esi                                     ; 100BD84A _ 5E
+        pop     ebx                                     ; 100BD84B _ 5B
+        add     esp, 4                                  ; 100BD84C _ 83. C4, 04
+        ret                                             ; 100BD84F _ C3
+
+?_25192 label dword                                     ; switch/case jump table
+        dd ?_25182                                      ; 100BD850 _ 100BD7BA (d)
+        dd ?_25183                                      ; 100BD854 _ 100BD7D0 (d)
+        dd ?_25184                                      ; 100BD858 _ 100BD7DE (d)
+        dd ?_25185                                      ; 100BD85C _ 100BD7F4 (d)
+        dd ?_25186                                      ; 100BD860 _ 100BD802 (d)
+        dd ?_25187                                      ; 100BD864 _ 100BD810 (d)
+        dd ?_25188                                      ; 100BD868 _ 100BD81E (d)
+        dd ?_25190                                      ; 100BD86C _ 100BD82D (d)
+
+?_25193 db 00H, 07H, 07H, 01H, 07H, 07H, 07H, 02H       ; 100BD870 _ ........
+        db 03H, 04H, 07H, 05H, 06H, 0CCH, 0CCH, 0CCH    ; 100BD878 _ ........
+
+?_25194 LABEL NEAR
+        mov     eax, dword ptr [esp+8H]                 ; 100BD880 _ 8B. 44 24, 08
+        mov     ecx, dword ptr [esp+4H]                 ; 100BD884 _ 8B. 4C 24, 04
+        push    eax                                     ; 100BD888 _ 50
+        push    ecx                                     ; 100BD889 _ 51
+        call    ?_25195                                 ; 100BD88A _ E8, 00000011
+        add     esp, 8                                  ; 100BD88F _ 83. C4, 08
+        ret                                             ; 100BD892 _ C3
+
+; Filling space: 0DH
+; Filler type: INT 3 Debug breakpoint
+;       db 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH
+;       db 0CCH, 0CCH, 0CCH, 0CCH, 0CCH
+
+ALIGN   16
+
+?_25195 LABEL NEAR
+        mov     eax, dword ptr [esp+8H]                 ; 100BD8A0 _ 8B. 44 24, 08
+        push    ebx                                     ; 100BD8A4 _ 53
+        mov     bx, word ptr [eax]                      ; 100BD8A5 _ 66: 8B. 18
+        push    esi                                     ; 100BD8A8 _ 56
+        xor     si, si                                  ; 100BD8A9 _ 66: 33. F6
+        push    edi                                     ; 100BD8AC _ 57
+        dec     bx                                      ; 100BD8AD _ 66: 4B
+        push    ebp                                     ; 100BD8AF _ 55
+        lea     edi, [eax+2H]                           ; 100BD8B0 _ 8D. 78, 02
+        js      ?_25198                                 ; 100BD8B3 _ 78, 36
+?_25196:movzx   ax, byte ptr [edi]                      ; 100BD8B5 _ 66: 0F B6. 07
+        movzx   bp, byte ptr [edi+1H]                   ; 100BD8B9 _ 66: 0F B6. 6F, 01
+        add     si, ax                                  ; 100BD8BE _ 66: 03. F0
+        inc     edi                                     ; 100BD8C1 _ 47
+        inc     edi                                     ; 100BD8C2 _ 47
+        test    bp, bp                                  ; 100BD8C3 _ 66: 85. ED
+        jnz     ?_25197                                 ; 100BD8C6 _ 75, 04
+; Note: Length-changing prefix causes delay on Intel processors
+        mov     bp, 256                                 ; 100BD8C8 _ 66: BD, 0100
+?_25197:mov     eax, dword ptr [esp+14H]                ; 100BD8CC _ 8B. 44 24, 14
+        push    ebp                                     ; 100BD8D0 _ 55
+        push    esi                                     ; 100BD8D1 _ 56
+        push    edi                                     ; 100BD8D2 _ 57
+        add     si, bp                                  ; 100BD8D3 _ 66: 03. F5
+        push    eax                                     ; 100BD8D6 _ 50
+        call    ?_25199                                 ; 100BD8D7 _ E8, 00000014
+        movsx   eax, bp                                 ; 100BD8DC _ 0F BF. C5
+        add     esp, 16                                 ; 100BD8DF _ 83. C4, 10
+        lea     ecx, [eax+eax*2]                        ; 100BD8E2 _ 8D. 0C 40
+        add     edi, ecx                                ; 100BD8E5 _ 03. F9
+        dec     bx                                      ; 100BD8E7 _ 66: 4B
+        jns     ?_25196                                 ; 100BD8E9 _ 79, CA
+?_25198:pop     ebp                                     ; 100BD8EB _ 5D
+        pop     edi                                     ; 100BD8EC _ 5F
+        pop     esi                                     ; 100BD8ED _ 5E
+        pop     ebx                                     ; 100BD8EE _ 5B
+        ret                                             ; 100BD8EF _ C3
+
+?_25199 LABEL NEAR
+        mov     dx, word ptr [esp+10H]                  ; 100BD8F0 _ 66: 8B. 54 24, 10
+        push    esi                                     ; 100BD8F5 _ 56
+        movsx   ecx, word ptr [esp+10H]                 ; 100BD8F6 _ 0F BF. 4C 24, 10
+        shl     ecx, 2                                  ; 100BD8FB _ C1. E1, 02
+        mov     eax, dword ptr [esp+8H]                 ; 100BD8FE _ 8B. 44 24, 08
+        add     ecx, dword ptr [eax]                    ; 100BD902 _ 03. 08
+        lea     esi, [ecx+eax]                          ; 100BD904 _ 8D. 34 01
+        mov     ax, dx                                  ; 100BD907 _ 66: 8B. C2
+        dec     dx                                      ; 100BD90A _ 66: 4A
+        test    ax, ax                                  ; 100BD90C _ 66: 85. C0
+        jz      ?_25201                                 ; 100BD90F _ 74, 25
+        mov     eax, dword ptr [esp+0CH]                ; 100BD911 _ 8B. 44 24, 0C
+?_25200:mov     cl, byte ptr [eax]                      ; 100BD915 _ 8A. 08
+        add     esi, 4                                  ; 100BD917 _ 83. C6, 04
+        add     eax, 3                                  ; 100BD91A _ 83. C0, 03
+        mov     byte ptr [esi-2H], cl                   ; 100BD91D _ 88. 4E, FE
+        mov     cl, byte ptr [eax-2H]                   ; 100BD920 _ 8A. 48, FE
+        mov     byte ptr [esi-3H], cl                   ; 100BD923 _ 88. 4E, FD
+        mov     cl, byte ptr [eax-1H]                   ; 100BD926 _ 8A. 48, FF
+        mov     byte ptr [esi-4H], cl                   ; 100BD929 _ 88. 4E, FC
+        mov     cx, dx                                  ; 100BD92C _ 66: 8B. CA
+        dec     dx                                      ; 100BD92F _ 66: 4A
+        test    cx, cx                                  ; 100BD931 _ 66: 85. C9
+        jnz     ?_25200                                 ; 100BD934 _ 75, DF
+?_25201:pop     esi                                     ; 100BD936 _ 5E
+        ret                                             ; 100BD937 _ C3
+
+; Filling space: 8H
+; Filler type: INT 3 Debug breakpoint
+;       db 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH
+
+ALIGN   16
+
+?_25202 LABEL NEAR
+        mov     eax, dword ptr [esp+8H]                 ; 100BD940 _ 8B. 44 24, 08
+        mov     ecx, dword ptr [esp+4H]                 ; 100BD944 _ 8B. 4C 24, 04
+        push    eax                                     ; 100BD948 _ 50
+        push    ecx                                     ; 100BD949 _ 51
+        call    ?_25195                                 ; 100BD94A _ E8, FFFFFF51
+        add     esp, 8                                  ; 100BD94F _ 83. C4, 08
+        ret                                             ; 100BD952 _ C3
+
+; Filling space: 0DH
+; Filler type: INT 3 Debug breakpoint
+;       db 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH
+;       db 0CCH, 0CCH, 0CCH, 0CCH, 0CCH
+
+ALIGN   16
+
+?_25203 LABEL NEAR
+        mov     eax, dword ptr [esp+10H]                ; 100BD960 _ 8B. 44 24, 10
+        sub     esp, 8                                  ; 100BD964 _ 83. EC, 08
+        mov     dx, word ptr [eax+8H]                   ; 100BD967 _ 66: 8B. 50, 08
+        push    ebx                                     ; 100BD96B _ 53
+        mov     ecx, dword ptr [esp+18H]                ; 100BD96C _ 8B. 4C 24, 18
+        push    esi                                     ; 100BD970 _ 56
+        push    edi                                     ; 100BD971 _ 57
+        push    ebp                                     ; 100BD972 _ 55
+        mov     di, word ptr [eax+0AH]                  ; 100BD973 _ 66: 8B. 78, 0A
+        mov     eax, dword ptr [esp+1CH]                ; 100BD977 _ 8B. 44 24, 1C
+        mov     esi, dword ptr [eax+4H]                 ; 100BD97B _ 8B. 70, 04
+        movsx   eax, di                                 ; 100BD97E _ 0F BF. C7
+        add     esi, 3                                  ; 100BD981 _ 83. C6, 03
+        dec     eax                                     ; 100BD984 _ 48
+        and     esi, 0FFFFFFFCH                         ; 100BD985 _ 83. E6, FC
+        imul    esi, eax                                ; 100BD988 _ 0F AF. F0
+        add     esi, dword ptr [esp+20H]                ; 100BD98B _ 03. 74 24, 20
+        dec     di                                      ; 100BD98F _ 66: 4F
+        mov     word ptr [esp+12H], di                  ; 100BD991 _ 66: 89. 7C 24, 12
+        js      ?_25212                                 ; 100BD996 _ 78, 64
+        movsx   eax, dx                                 ; 100BD998 _ 0F BF. C2
+        mov     dword ptr [esp+14H], eax                ; 100BD99B _ 89. 44 24, 14
+?_25204:xor     di, di                                  ; 100BD99F _ 66: 33. FF
+        inc     ecx                                     ; 100BD9A2 _ 41
+        test    dx, dx                                  ; 100BD9A3 _ 66: 85. D2
+        jle     ?_25211                                 ; 100BD9A6 _ 7E, 3A
+?_25205:mov     al, byte ptr [ecx]                      ; 100BD9A8 _ 8A. 01
+        inc     ecx                                     ; 100BD9AA _ 41
+        test    al, al                                  ; 100BD9AB _ 84. C0
+        jl      ?_25208                                 ; 100BD9AD _ 7C, 13
+        jle     ?_25207                                 ; 100BD9AF _ 7E, 0E
+        movsx   bp, al                                  ; 100BD9B1 _ 66: 0F BE. E8
+?_25206:mov     bl, byte ptr [ecx]                      ; 100BD9B5 _ 8A. 19
+        inc     esi                                     ; 100BD9B7 _ 46
+        dec     bp                                      ; 100BD9B8 _ 66: 4D
+        mov     byte ptr [esi-1H], bl                   ; 100BD9BA _ 88. 5E, FF
+        jnz     ?_25206                                 ; 100BD9BD _ 75, F6
+?_25207:inc     ecx                                     ; 100BD9BF _ 41
+        jmp     ?_25210                                 ; 100BD9C0 _ EB, 14
+
+?_25208:neg     al                                      ; 100BD9C2 _ F6. D8
+        test    al, al                                  ; 100BD9C4 _ 84. C0
+        jle     ?_25210                                 ; 100BD9C6 _ 7E, 0E
+        movsx   bp, al                                  ; 100BD9C8 _ 66: 0F BE. E8
+?_25209:mov     bl, byte ptr [ecx]                      ; 100BD9CC _ 8A. 19
+        inc     ecx                                     ; 100BD9CE _ 41
+        mov     byte ptr [esi], bl                      ; 100BD9CF _ 88. 1E
+        inc     esi                                     ; 100BD9D1 _ 46
+        dec     bp                                      ; 100BD9D2 _ 66: 4D
+        jnz     ?_25209                                 ; 100BD9D4 _ 75, F6
+?_25210:movsx   ax, al                                  ; 100BD9D6 _ 66: 0F BE. C0
+        add     di, ax                                  ; 100BD9DA _ 66: 03. F8
+        cmp     dx, di                                  ; 100BD9DD _ 66: 3B. D7
+        jg      ?_25205                                 ; 100BD9E0 _ 7F, C6
+?_25211:mov     eax, dword ptr [esp+1CH]                ; 100BD9E2 _ 8B. 44 24, 1C
+        mov     eax, dword ptr [eax+4H]                 ; 100BD9E6 _ 8B. 40, 04
+        add     eax, 3                                  ; 100BD9E9 _ 83. C0, 03
+        and     eax, 0FFFFFFFCH                         ; 100BD9EC _ 83. E0, FC
+        add     eax, dword ptr [esp+14H]                ; 100BD9EF _ 03. 44 24, 14
+        sub     esi, eax                                ; 100BD9F3 _ 2B. F0
+        dec     word ptr [esp+12H]                      ; 100BD9F5 _ 66: FF. 4C 24, 12
+        jns     ?_25204                                 ; 100BD9FA _ 79, A3
+?_25212:pop     ebp                                     ; 100BD9FC _ 5D
+        pop     edi                                     ; 100BD9FD _ 5F
+        pop     esi                                     ; 100BD9FE _ 5E
+        pop     ebx                                     ; 100BD9FF _ 5B
+        add     esp, 8                                  ; 100BDA00 _ 83. C4, 08
+        ret                                             ; 100BDA03 _ C3
+
+; Filling space: 0CH
+; Filler type: INT 3 Debug breakpoint
+;       db 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH
+;       db 0CCH, 0CCH, 0CCH, 0CCH
+
+ALIGN   16
+
+?_25213 LABEL NEAR
+        mov     ecx, dword ptr [esp+0CH]                ; 100BDA10 _ 8B. 4C 24, 0C
+        sub     esp, 4                                  ; 100BDA14 _ 83. EC, 04
+        mov     eax, dword ptr [esp+14H]                ; 100BDA17 _ 8B. 44 24, 14
+        push    ebx                                     ; 100BDA1B _ 53
+        mov     ax, word ptr [eax+0AH]                  ; 100BDA1C _ 66: 8B. 40, 0A
+        push    esi                                     ; 100BDA20 _ 56
+        sub     ax, word ptr [ecx]                      ; 100BDA21 _ 66: 2B. 01
+        push    edi                                     ; 100BDA24 _ 57
+        dec     ax                                      ; 100BDA25 _ 66: 48
+        push    ebp                                     ; 100BDA27 _ 55
+        mov     word ptr [esp+12H], ax                  ; 100BDA28 _ 66: 89. 44 24, 12
+        lea     esi, [ecx+4H]                           ; 100BDA2D _ 8D. 71, 04
+        mov     ax, word ptr [ecx+2H]                   ; 100BDA30 _ 66: 8B. 41, 02
+        dec     ax                                      ; 100BDA34 _ 66: 48
+        mov     word ptr [esp+10H], ax                  ; 100BDA36 _ 66: 89. 44 24, 10
+        js      ?_25219                                 ; 100BDA3B _ 78, 78
+?_25214:xor     di, di                                  ; 100BDA3D _ 66: 33. FF
+        mov     bl, byte ptr [esi]                      ; 100BDA40 _ 8A. 1E
+        inc     esi                                     ; 100BDA42 _ 46
+        test    bl, bl                                  ; 100BDA43 _ 84. DB
+        jz      ?_25218                                 ; 100BDA45 _ 74, 62
+?_25215:movzx   ax, byte ptr [esi]                      ; 100BDA47 _ 66: 0F B6. 06
+        add     di, ax                                  ; 100BDA4B _ 66: 03. F8
+        inc     esi                                     ; 100BDA4E _ 46
+        mov     al, byte ptr [esi]                      ; 100BDA4F _ 8A. 06
+        inc     esi                                     ; 100BDA51 _ 46
+        test    al, al                                  ; 100BDA52 _ 84. C0
+        jge     ?_25216                                 ; 100BDA54 _ 7D, 27
+        mov     ecx, esi                                ; 100BDA56 _ 8B. CE
+        mov     edx, dword ptr [esp+1CH]                ; 100BDA58 _ 8B. 54 24, 1C
+        neg     al                                      ; 100BDA5C _ F6. D8
+        movsx   bp, al                                  ; 100BDA5E _ 66: 0F BE. E8
+        inc     esi                                     ; 100BDA62 _ 46
+        push    ebp                                     ; 100BDA63 _ 55
+        mov     al, byte ptr [ecx]                      ; 100BDA64 _ 8A. 01
+        mov     ecx, dword ptr [esp+16H]                ; 100BDA66 _ 8B. 4C 24, 16
+        push    eax                                     ; 100BDA6A _ 50
+        push    ecx                                     ; 100BDA6B _ 51
+        mov     eax, dword ptr [esp+24H]                ; 100BDA6C _ 8B. 44 24, 24
+        push    edi                                     ; 100BDA70 _ 57
+        push    edx                                     ; 100BDA71 _ 52
+        push    eax                                     ; 100BDA72 _ 50
+        call    ?_25173                                 ; 100BDA73 _ E8, FFFFFC08
+        add     esp, 24                                 ; 100BDA78 _ 83. C4, 18
+        jmp     ?_25217                                 ; 100BDA7B _ EB, 23
+
+?_25216:mov     ecx, dword ptr [esp+1CH]                ; 100BDA7D _ 8B. 4C 24, 1C
+        mov     edx, dword ptr [esp+18H]                ; 100BDA81 _ 8B. 54 24, 18
+        movsx   bp, al                                  ; 100BDA85 _ 66: 0F BE. E8
+        mov     eax, dword ptr [esp+12H]                ; 100BDA89 _ 8B. 44 24, 12
+        push    ebp                                     ; 100BDA8D _ 55
+        push    esi                                     ; 100BDA8E _ 56
+        push    eax                                     ; 100BDA8F _ 50
+        push    edi                                     ; 100BDA90 _ 57
+        push    ecx                                     ; 100BDA91 _ 51
+        push    edx                                     ; 100BDA92 _ 52
+        call    ?_25164                                 ; 100BDA93 _ E8, FFFFFAE8
+        movsx   ecx, bp                                 ; 100BDA98 _ 0F BF. CD
+        add     esp, 24                                 ; 100BDA9B _ 83. C4, 18
+        add     esi, ecx                                ; 100BDA9E _ 03. F1
+?_25217:add     di, bp                                  ; 100BDAA0 _ 66: 03. FD
+        dec     bl                                      ; 100BDAA3 _ FE. CB
+        test    bl, bl                                  ; 100BDAA5 _ 84. DB
+        jnz     ?_25215                                 ; 100BDAA7 _ 75, 9E
+?_25218:dec     word ptr [esp+12H]                      ; 100BDAA9 _ 66: FF. 4C 24, 12
+        dec     word ptr [esp+10H]                      ; 100BDAAE _ 66: FF. 4C 24, 10
+        jns     ?_25214                                 ; 100BDAB3 _ 79, 88
+?_25219:pop     ebp                                     ; 100BDAB5 _ 5D
+        pop     edi                                     ; 100BDAB6 _ 5F
+        pop     esi                                     ; 100BDAB7 _ 5E
+        pop     ebx                                     ; 100BDAB8 _ 5B
+        add     esp, 4                                  ; 100BDAB9 _ 83. C4, 04
+        ret                                             ; 100BDABC _ C3
+
+; Filling space: 3H
+; Filler type: INT 3 Debug breakpoint
+;       db 0CCH, 0CCH, 0CCH
+
+ALIGN   8
+
+?_25220 LABEL NEAR
+        mov     edx, dword ptr [esp+10H]                ; 100BDAC0 _ 8B. 54 24, 10
+        sub     esp, 8                                  ; 100BDAC4 _ 83. EC, 08
+        mov     ax, word ptr [edx+8H]                   ; 100BDAC7 _ 66: 8B. 42, 08
+        push    ebx                                     ; 100BDACB _ 53
+        dec     ax                                      ; 100BDACC _ 66: 48
+        push    esi                                     ; 100BDACE _ 56
+        mov     word ptr [esp+8H], ax                   ; 100BDACF _ 66: 89. 44 24, 08
+        push    edi                                     ; 100BDAD4 _ 57
+        mov     si, word ptr [edx+0AH]                  ; 100BDAD5 _ 66: 8B. 72, 0A
+        push    ebp                                     ; 100BDAD9 _ 55
+        dec     si                                      ; 100BDADA _ 66: 4E
+        mov     ecx, dword ptr [esp+24H]                ; 100BDADC _ 8B. 4C 24, 24
+        mov     bx, word ptr [ecx]                      ; 100BDAE0 _ 66: 8B. 19
+        add     ecx, 2                                  ; 100BDAE3 _ 83. C1, 02
+        mov     word ptr [esp+12H], bx                  ; 100BDAE6 _ 66: 89. 5C 24, 12
+        mov     dword ptr [esp+14H], ecx                ; 100BDAEB _ 89. 4C 24, 14
+?_25221:mov     eax, dword ptr [esp+14H]                ; 100BDAEF _ 8B. 44 24, 14
+        mov     bx, word ptr [eax]                      ; 100BDAF3 _ 66: 8B. 18
+        add     dword ptr [esp+14H], 2                  ; 100BDAF6 _ 83. 44 24, 14, 02
+        test    bx, bx                                  ; 100BDAFB _ 66: 85. DB
+        jge     ?_25223                                 ; 100BDAFE _ 7D, 49
+        test    bh, 40H                                 ; 100BDB00 _ F6. C7, 40
+        jz      ?_25222                                 ; 100BDB03 _ 74, 05
+        add     si, bx                                  ; 100BDB05 _ 66: 03. F3
+        jmp     ?_25221                                 ; 100BDB08 _ EB, E5
+
+?_25222:mov     eax, dword ptr [esp+10H]                ; 100BDB0A _ 8B. 44 24, 10
+        push    ebx                                     ; 100BDB0E _ 53
+        mov     ecx, dword ptr [esp+24H]                ; 100BDB0F _ 8B. 4C 24, 24
+        push    esi                                     ; 100BDB13 _ 56
+        mov     edx, dword ptr [esp+24H]                ; 100BDB14 _ 8B. 54 24, 24
+        push    eax                                     ; 100BDB18 _ 50
+        push    ecx                                     ; 100BDB19 _ 51
+        push    edx                                     ; 100BDB1A _ 52
+        call    ?_25162                                 ; 100BDB1B _ E8, FFFFFA10
+        mov     ecx, dword ptr [esp+28H]                ; 100BDB20 _ 8B. 4C 24, 28
+        add     esp, 20                                 ; 100BDB24 _ 83. C4, 14
+        mov     bx, word ptr [ecx]                      ; 100BDB27 _ 66: 8B. 19
+        add     dword ptr [esp+14H], 2                  ; 100BDB2A _ 83. 44 24, 14, 02
+        test    bx, bx                                  ; 100BDB2F _ 66: 85. DB
+        jnz     ?_25223                                 ; 100BDB32 _ 75, 15
+        dec     si                                      ; 100BDB34 _ 66: 4E
+        dec     word ptr [esp+12H]                      ; 100BDB36 _ 66: FF. 4C 24, 12
+        cmp     word ptr [esp+12H], 0                   ; 100BDB3B _ 66: 83. 7C 24, 12, 00
+        jle     ?_25226                                 ; 100BDB41 _ 0F 8E, 000000AE
+        jmp     ?_25221                                 ; 100BDB47 _ EB, A6
+
+?_25223:xor     di, di                                  ; 100BDB49 _ 66: 33. FF
+?_25224:mov     ecx, dword ptr [esp+14H]                ; 100BDB4C _ 8B. 4C 24, 14
+        movzx   ax, byte ptr [ecx]                      ; 100BDB50 _ 66: 0F B6. 01
+        add     di, ax                                  ; 100BDB54 _ 66: 03. F8
+        inc     dword ptr [esp+14H]                     ; 100BDB57 _ FF. 44 24, 14
+        mov     ecx, dword ptr [esp+14H]                ; 100BDB5B _ 8B. 4C 24, 14
+        movsx   bp, byte ptr [ecx]                      ; 100BDB5F _ 66: 0F BE. 29
+        add     bp, bp                                  ; 100BDB63 _ 66: 03. ED
+        inc     dword ptr [esp+14H]                     ; 100BDB66 _ FF. 44 24, 14
+        test    bp, bp                                  ; 100BDB6A _ 66: 85. ED
+        jl      ?_25225                                 ; 100BDB6D _ 7C, 3C
+        mov     eax, dword ptr [esp+14H]                ; 100BDB6F _ 8B. 44 24, 14
+        push    ebp                                     ; 100BDB73 _ 55
+        mov     ecx, dword ptr [esp+24H]                ; 100BDB74 _ 8B. 4C 24, 24
+        push    eax                                     ; 100BDB78 _ 50
+        mov     edx, dword ptr [esp+24H]                ; 100BDB79 _ 8B. 54 24, 24
+        push    esi                                     ; 100BDB7D _ 56
+        push    edi                                     ; 100BDB7E _ 57
+        push    ecx                                     ; 100BDB7F _ 51
+        add     di, bp                                  ; 100BDB80 _ 66: 03. FD
+        push    edx                                     ; 100BDB83 _ 52
+        call    ?_25164                                 ; 100BDB84 _ E8, FFFFF9F7
+        movsx   ecx, bp                                 ; 100BDB89 _ 0F BF. CD
+        add     dword ptr [esp+2CH], ecx                ; 100BDB8C _ 01. 4C 24, 2C
+        add     esp, 24                                 ; 100BDB90 _ 83. C4, 18
+        dec     bx                                      ; 100BDB93 _ 66: 4B
+        jnz     ?_25224                                 ; 100BDB95 _ 75, B5
+        dec     si                                      ; 100BDB97 _ 66: 4E
+        dec     word ptr [esp+12H]                      ; 100BDB99 _ 66: FF. 4C 24, 12
+        cmp     word ptr [esp+12H], 0                   ; 100BDB9E _ 66: 83. 7C 24, 12, 00
+        jle     ?_25226                                 ; 100BDBA4 _ 7E, 4F
+        jmp     ?_25221                                 ; 100BDBA6 _ E9, FFFFFF44
+
+?_25225:mov     eax, dword ptr [esp+14H]                ; 100BDBAB _ 8B. 44 24, 14
+        mov     edx, dword ptr [esp+20H]                ; 100BDBAF _ 8B. 54 24, 20
+        neg     bp                                      ; 100BDBB3 _ 66: F7. DD
+        add     dword ptr [esp+14H], 2                  ; 100BDBB6 _ 83. 44 24, 14, 02
+        mov     cx, bp                                  ; 100BDBBB _ 66: 8B. CD
+        sar     cx, 1                                   ; 100BDBBE _ 66: C1. F9, 01
+        mov     ax, word ptr [eax]                      ; 100BDBC2 _ 66: 8B. 00
+        push    ecx                                     ; 100BDBC5 _ 51
+        mov     ecx, dword ptr [esp+20H]                ; 100BDBC6 _ 8B. 4C 24, 20
+        push    eax                                     ; 100BDBCA _ 50
+        push    esi                                     ; 100BDBCB _ 56
+        push    edi                                     ; 100BDBCC _ 57
+        add     di, bp                                  ; 100BDBCD _ 66: 03. FD
+        push    edx                                     ; 100BDBD0 _ 52
+        push    ecx                                     ; 100BDBD1 _ 51
+        call    ?_25176                                 ; 100BDBD2 _ E8, FFFFFB09
+        add     esp, 24                                 ; 100BDBD7 _ 83. C4, 18
+        dec     bx                                      ; 100BDBDA _ 66: 4B
+        jne     ?_25224                                 ; 100BDBDC _ 0F 85, FFFFFF6A
+        dec     si                                      ; 100BDBE2 _ 66: 4E
+        dec     word ptr [esp+12H]                      ; 100BDBE4 _ 66: FF. 4C 24, 12
+        cmp     word ptr [esp+12H], 0                   ; 100BDBE9 _ 66: 83. 7C 24, 12, 00
+        jg      ?_25221                                 ; 100BDBEF _ 0F 8F, FFFFFEFA
+?_25226:pop     ebp                                     ; 100BDBF5 _ 5D
+        pop     edi                                     ; 100BDBF6 _ 5F
+        pop     esi                                     ; 100BDBF7 _ 5E
+        pop     ebx                                     ; 100BDBF8 _ 5B
+        add     esp, 8                                  ; 100BDBF9 _ 83. C4, 08
+        ret                                             ; 100BDBFC _ C3
+
+; Filling space: 3H
+; Filler type: INT 3 Debug breakpoint
+;       db 0CCH, 0CCH, 0CCH
+
+ALIGN   8
+
+?_25227 LABEL NEAR
+        mov     eax, dword ptr [esp+10H]                ; 100BDC00 _ 8B. 44 24, 10
+        sub     esp, 8                                  ; 100BDC04 _ 83. EC, 08
+        mov     cx, word ptr [eax+8H]                   ; 100BDC07 _ 66: 8B. 48, 08
+        push    ebx                                     ; 100BDC0B _ 53
+        mov     word ptr [esp+6H], cx                   ; 100BDC0C _ 66: 89. 4C 24, 06
+        push    esi                                     ; 100BDC11 _ 56
+        push    edi                                     ; 100BDC12 _ 57
+        xor     ecx, ecx                                ; 100BDC13 _ 33. C9
+        mov     byte ptr [esp+0DH], cl                  ; 100BDC15 _ 88. 4C 24, 0D
+        push    ebp                                     ; 100BDC19 _ 55
+        mov     bp, word ptr [eax+0AH]                  ; 100BDC1A _ 66: 8B. 68, 0A
+        mov     byte ptr [esp+10H], cl                  ; 100BDC1E _ 88. 4C 24, 10
+        dec     bp                                      ; 100BDC22 _ 66: 4D
+        js      ?_25230                                 ; 100BDC24 _ 78, 56
+        movsx   eax, word ptr [esp+12H]                 ; 100BDC26 _ 0F BF. 44 24, 12
+        mov     si, word ptr [esp+12H]                  ; 100BDC2B _ 66: 8B. 74 24, 12
+        mov     edi, dword ptr [esp+1CH]                ; 100BDC30 _ 8B. 7C 24, 1C
+        cdq                                             ; 100BDC34 _ 99
+        and     si, 01H                                 ; 100BDC35 _ 66: 83. E6, 01
+        sub     eax, edx                                ; 100BDC39 _ 2B. C2
+        sar     eax, 1                                  ; 100BDC3B _ C1. F8, 01
+        mov     ebx, dword ptr [esp+20H]                ; 100BDC3E _ 8B. 5C 24, 20
+        mov     word ptr [esp+14H], ax                  ; 100BDC42 _ 66: 89. 44 24, 14
+?_25228:mov     eax, dword ptr [esp+14H]                ; 100BDC47 _ 8B. 44 24, 14
+        mov     ecx, dword ptr [esp+10H]                ; 100BDC4B _ 8B. 4C 24, 10
+        push    eax                                     ; 100BDC4F _ 50
+        push    ecx                                     ; 100BDC50 _ 51
+        push    ebp                                     ; 100BDC51 _ 55
+        push    0                                       ; 100BDC52 _ 6A, 00
+        push    ebx                                     ; 100BDC54 _ 53
+        push    edi                                     ; 100BDC55 _ 57
+        call    ?_25176                                 ; 100BDC56 _ E8, FFFFFA85
+        add     esp, 24                                 ; 100BDC5B _ 83. C4, 18
+        test    si, si                                  ; 100BDC5E _ 66: 85. F6
+        jz      ?_25229                                 ; 100BDC61 _ 74, 15
+        mov     ax, word ptr [esp+12H]                  ; 100BDC63 _ 66: 8B. 44 24, 12
+        push    0                                       ; 100BDC68 _ 6A, 00
+        dec     ax                                      ; 100BDC6A _ 66: 48
+        push    ebp                                     ; 100BDC6C _ 55
+        push    eax                                     ; 100BDC6D _ 50
+        push    ebx                                     ; 100BDC6E _ 53
+        push    edi                                     ; 100BDC6F _ 57
+        call    ?_25162                                 ; 100BDC70 _ E8, FFFFF8BB
+        add     esp, 20                                 ; 100BDC75 _ 83. C4, 14
+?_25229:dec     bp                                      ; 100BDC78 _ 66: 4D
+        jns     ?_25228                                 ; 100BDC7A _ 79, CB
+?_25230:pop     ebp                                     ; 100BDC7C _ 5D
+        pop     edi                                     ; 100BDC7D _ 5F
+        pop     esi                                     ; 100BDC7E _ 5E
+        pop     ebx                                     ; 100BDC7F _ 5B
+        add     esp, 8                                  ; 100BDC80 _ 83. C4, 08
+        ret                                             ; 100BDC83 _ C3
+
+; Filling space: 0CH
+; Filler type: INT 3 Debug breakpoint
+;       db 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH
+;       db 0CCH, 0CCH, 0CCH, 0CCH
+
+ALIGN   16
+
+?_25231 LABEL NEAR
+        mov     eax, dword ptr [esp+10H]                ; 100BDC90 _ 8B. 44 24, 10
+        sub     esp, 4                                  ; 100BDC94 _ 83. EC, 04
+        push    ebx                                     ; 100BDC97 _ 53
+        push    esi                                     ; 100BDC98 _ 56
+        mov     bx, word ptr [eax+0AH]                  ; 100BDC99 _ 66: 8B. 58, 0A
+        push    edi                                     ; 100BDC9D _ 57
+        mov     di, word ptr [eax+8H]                   ; 100BDC9E _ 66: 8B. 78, 08
+        push    ebp                                     ; 100BDCA2 _ 55
+        dec     bx                                      ; 100BDCA3 _ 66: 4B
+        js      ?_25233                                 ; 100BDCA5 _ 78, 2A
+        mov     esi, dword ptr [esp+18H]                ; 100BDCA7 _ 8B. 74 24, 18
+        mov     ebp, dword ptr [esp+20H]                ; 100BDCAB _ 8B. 6C 24, 20
+        movsx   eax, di                                 ; 100BDCAF _ 0F BF. C7
+        mov     dword ptr [esp+10H], eax                ; 100BDCB2 _ 89. 44 24, 10
+?_25232:mov     eax, dword ptr [esp+1CH]                ; 100BDCB6 _ 8B. 44 24, 1C
+        push    edi                                     ; 100BDCBA _ 57
+        push    ebp                                     ; 100BDCBB _ 55
+        push    ebx                                     ; 100BDCBC _ 53
+        push    0                                       ; 100BDCBD _ 6A, 00
+        push    eax                                     ; 100BDCBF _ 50
+        push    esi                                     ; 100BDCC0 _ 56
+        call    ?_25164                                 ; 100BDCC1 _ E8, FFFFF8BA
+        add     ebp, dword ptr [esp+28H]                ; 100BDCC6 _ 03. 6C 24, 28
+        add     esp, 24                                 ; 100BDCCA _ 83. C4, 18
+        dec     bx                                      ; 100BDCCD _ 66: 4B
+        jns     ?_25232                                 ; 100BDCCF _ 79, E5
+?_25233:pop     ebp                                     ; 100BDCD1 _ 5D
+        pop     edi                                     ; 100BDCD2 _ 5F
+        pop     esi                                     ; 100BDCD3 _ 5E
+        pop     ebx                                     ; 100BDCD4 _ 5B
+        add     esp, 4                                  ; 100BDCD5 _ 83. C4, 04
+        ret                                             ; 100BDCD8 _ C3
+
+; Filling space: 7H
+; Filler type: INT 3 Debug breakpoint
+;       db 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH
+
+ALIGN   8
+
+DecodeFLCFrame LABEL NEAR
+        mov     ecx, dword ptr [esp+10H]                ; 100BDCE0 _ 8B. 4C 24, 10
+; Note: Length-changing prefix causes delay on Intel processors
+        cmp     word ptr [ecx+4H], -3590                ; 100BDCE4 _ 66: 81. 79, 04, F1FA
+        jnz     ?_25235                                 ; 100BDCEA _ 75, 21
+        mov     eax, dword ptr [esp+14H]                ; 100BDCEC _ 8B. 44 24, 14
+        lea     edx, [ecx+10H]                          ; 100BDCF0 _ 8D. 51, 10
+        push    eax                                     ; 100BDCF3 _ 50
+        push    edx                                     ; 100BDCF4 _ 52
+        mov     eax, dword ptr [esp+10H]                ; 100BDCF5 _ 8B. 44 24, 10
+        push    ecx                                     ; 100BDCF9 _ 51
+        mov     ecx, dword ptr [esp+18H]                ; 100BDCFA _ 8B. 4C 24, 18
+        mov     edx, dword ptr [esp+10H]                ; 100BDCFE _ 8B. 54 24, 10
+        push    ecx                                     ; 100BDD02 _ 51
+        push    eax                                     ; 100BDD03 _ 50
+        push    edx                                     ; 100BDD04 _ 52
+        call    ?_25180                                 ; 100BDD05 _ E8, FFFFFA56
+        add     esp, 24                                 ; 100BDD0A _ 83. C4, 18
+?_25235:ret                                             ; 100BDD0D _ C3
+
+.text ENDS
+
+END
diff --git a/3rdparty/flic/flic.h b/3rdparty/flic/flic.h
index 42969e5c..c828b2f4 100644
--- a/3rdparty/flic/flic.h
+++ b/3rdparty/flic/flic.h
@@ -6,31 +6,42 @@
 // A basic FLIC header structure from the "EGI" documentation. Source: https://www.compuphase.com/flic.htm#FLICHEADER
 // This also goes over the FLIC structures: https://github.com/thinkbeforecoding/nomemalloc.handson/blob/master/flic.txt
 typedef struct {
-  DWORD size;          /* Size of FLIC including this header */
-  WORD  type;          /* File type 0xAF11, 0xAF12, 0xAF30, 0xAF44, ... */
-  WORD  frames;        /* Number of frames in first segment */
-  WORD  width;         /* FLIC width in pixels */
-  WORD  height;        /* FLIC height in pixels */
-  WORD  depth;         /* Bits per pixel (usually 8) */
-  WORD  flags;         /* Set to zero or to three */
-  DWORD speed;         /* Delay between frames */
-  WORD  reserved1;     /* Set to zero */
-  DWORD created;       /* Date of FLIC creation (FLC only) */
-  DWORD creator;       /* Serial number or compiler id (FLC only) */
-  DWORD updated;       /* Date of FLIC update (FLC only) */
-  DWORD updater;       /* Serial number (FLC only), see creator */
-  WORD  aspect_dx;     /* Width of square rectangle (FLC only) */
-  WORD  aspect_dy;     /* Height of square rectangle (FLC only) */
-  WORD  ext_flags;     /* EGI: flags for specific EGI extensions */
-  WORD  keyframes;     /* EGI: key-image frequency */
-  WORD  totalframes;   /* EGI: total number of frames (segments) */
-  DWORD req_memory;    /* EGI: maximum chunk size (uncompressed) */
-  WORD  max_regions;   /* EGI: max. number of regions in a CHK_REGION chunk */
-  WORD  transp_num;    /* EGI: number of transparent levels */
-  BYTE  reserved2[24]; /* Set to zero */
-  DWORD oframe1;       /* Offset to frame 1 (FLC only) */
-  DWORD oframe2;       /* Offset to frame 2 (FLC only) */
-  BYTE  reserved3[40]; /* Set to zero */
+	DWORD size;         /* Size of FLIC including this header */
+	WORD type;          /* File type 0xAF11, 0xAF12, 0xAF30, 0xAF44, ... */
+	WORD frames;        /* Number of frames in first segment */
+	WORD width;         /* FLIC width in pixels */
+	WORD height;        /* FLIC height in pixels */
+	WORD depth;         /* Bits per pixel (usually 8) */
+	WORD flags;         /* Set to zero or to three */
+	DWORD speed;        /* Delay between frames */
+	WORD reserved1;     /* Set to zero */
+	DWORD created;      /* Date of FLIC creation (FLC only) */
+	DWORD creator;      /* Serial number or compiler id (FLC only) */
+	DWORD updated;      /* Date of FLIC update (FLC only) */
+	DWORD updater;      /* Serial number (FLC only), see creator */
+	WORD aspect_dx;     /* Width of square rectangle (FLC only) */
+	WORD aspect_dy;     /* Height of square rectangle (FLC only) */
+	WORD ext_flags;     /* EGI: flags for specific EGI extensions */
+	WORD keyframes;     /* EGI: key-image frequency */
+	WORD totalframes;   /* EGI: total number of frames (segments) */
+	DWORD req_memory;   /* EGI: maximum chunk size (uncompressed) */
+	WORD max_regions;   /* EGI: max. number of regions in a CHK_REGION chunk */
+	WORD transp_num;    /* EGI: number of transparent levels */
+	BYTE reserved2[24]; /* Set to zero */
+	DWORD oframe1;      /* Offset to frame 1 (FLC only) */
+	DWORD oframe2;      /* Offset to frame 2 (FLC only) */
+	BYTE reserved3[40]; /* Set to zero */
 } FLIC_HEADER;
 
+extern "C"
+{
+	void DecodeFLCFrame(
+		LPBITMAPINFOHEADER bitmapHeader,
+		void* pixelData,
+		FLIC_HEADER* flcHeader,
+		void* flcFrame,
+		unsigned char* decodedColorMap
+	);
+}
+
 #endif // FLIC_H
diff --git a/3rdparty/flic/flic.lib b/3rdparty/flic/flic.lib
new file mode 100644
index 0000000000000000000000000000000000000000..8e297be87d487a9654384afd9f8f2123866a7f60
GIT binary patch
literal 2876
zcmb7GeQZ-z6u<3zbhT98vs6<|Lu!1+$;=$>7z~JZI!AG1yl(3&iF|CZ9brO1?2<Mq
zBl=eD`mFG;F)=27B>v&YKN@0?wrp-PKm-41LR2tnsuhD0y8&bMocGqUO)>E%@4a)+
zJ@<V4&bjBl`_}gy+_n2r+asR&W990)RSjOB&sRU6UpG7TR`}gE#+V78Pj)o-?b_el
z*V6Vx%fX&~eeD10^p%x+x^23`S;Z!{P&4e^v#WOh&i=B6vbWwf^SxbJSJ%+c;PH4H
z%5ikt+DshtWZvuh(#n_<Ezqcq^hF~EdE2*#$=$WRJ&~T<N*D`%CTDBAp4`$kNA9~S
z#$LgBKiZ^0kdZ#nnkBmeiEKDt4_ce#g2bu#3av}B3z;eHAir*M&@E(gjgMOgo$45u
zYLndR&(p$(SGb5IChe<tY#&L#Es@6b>-xJ{aw(wUVmOW3<aC$h3Tko5*%8inqkuXp
zCbE&I$gC4;#v+S_Octfx+?4`PUm?>ad9=;EkU>Rij#Dp93mM!leE0?T73vYWYuZHa
z7xUG3v<dYRclGUC4lE-37=pDEv}Fnz2!qB#7#oJ;0nM9UzdSArnLI5u?zRp#L!uOa
zOvn`0?dA`yhQx(Ki$R-&;k7W1$rmzTX?}j)7lU^|%_MMFVAu<Z;xRH3w{JT}<*{S?
z(<8p@Hu}tha5PQvW8_YX+!-VwI+Q$=N+lz59|h*r+WB&9U6M$#O;8@V9F!2?=n{n4
zm9+ZxS*&;q;*E^-canaE^vk3_2<LjGYP7;CR)RnwqZLqpFrg(KO(C;Yaw48^E-rb<
z=4rGka=Fx2$xW6#(WO)YZZ&I$;lPZ}id}}p`G`5`!VnF7DJ{S8Fy1Vgb+nzG${1sy
z#w;ux5?;+w4kD5ZQ{~pSq7QqeYVEA=JZM3l+sD*jdG)$oc=<&X^JP=?VI?U+A2nwQ
zD*59`p<DIpsCA5)3fnq~9ai!`qP0SsA+rUspCi*)mJvy&x;*=n!`Z#%Su^e_*vm8E
z^-6?Nv*bWc62<L+#(+gQvKc`HBdO{rKSG}U=cuYORaI4)IlgL<<;<BgsLhJXcsZEA
z3-@6d<<c<D2d!g$;u-N3!_XQ^N6pa&5I(8GXTJ%{Y{LdfTpr-zGiE|rXGjSH_m`Zf
zJ|Sd2$0ADG{oFNZjZNrvM~M~{A=4&_xl3l!&RNs-R?tquQ&{<t2ash?S=BLK&2q{1
znN(mV*?uz>C?(scL7O0<Qv=^uD(om}nDsxXm(xG}7uDZTzijP9IhPU+fflvlHn(;F
zPwhB1i9n@8cwjRO$0bL!SIC?k#&Ez_YQl;dT$?gA4Q1m?2bX|wBA;5;0-KWCO9REG
zg0uL|P`1o&N-oEhfg%cJft!MLUmqURP5CJt_2M*#I%}>_sXAhB5g>B_FZTmG)+=su
zBJ6&f0yU;E1VVt`IMUDYpf#BxKr=BKMekC}TZS$~c49UxXs{(^X&K5MdQkfkVRje4
zA!l1cDHBG1j~qm$Qn*9TTc_!Cy9)Os+l_)Q62nDDNRh+Aj(q-lsU&31q6qf~a5ra8
z4_z2|L-(0pVk~Jm&X1%wGD@e8@8eh|0fij1VjDYX3qd=o$4XtM=J0%Ol^ny^1t>18
zCKW$sYG50S<NnAZ;I0;a!X=SXBq^v<lF<(l{Xj;wI*NOimG=zX4ef?ADrSlaufC6^
zR(Kb&Kv^dOfmJz$2gPYjPdo(NWtw7{#@Cbm5E+rlh!PHBd>#48YkI(@HtAsu8d?WF
zo@ZjP{g-B}E!vB_JTUpK;fr<_&RxTn9Ylp5nF{}AM=)=@p`#0}LgHCEoAaDKa$}}c
zs^q;_qP}3@7eM?FA&V0Bol3SzcVe0Dwjm+Hrf7)zp@VKI2lc7fK>gWNbMo92H7r70
zhZUU=<zT3vb%ygVA#xN+q8PcGt}aJE!y1xt<@gk>IAK%lbj6Li_o3kr--&nP78@oq
zY7IeabcNm`_hK8)j8o~Mlsg>i>}Rr){}eTH*fn+JVn0=C!_Z1z!3#0|`X2-L;Vx%7
zD9RmVgg|pq^#tXPykht}au_=z-Sigr5>j{Qln48wU8f|Z?$oJjq?YK^!$=7_Rfm+Q
zQ}swuGqbQYNI7(BJyJ_`suuR_?L&&jOo_2)O!~i3&-42X9=-j$_U}7TyQg>B<G@Rb
zF>c=f4qc@jy%vnQ|2pXYzst<|&q0?^hW>OY=3C>j9o|(d8@-Go*JYT&@iBjeL(+ID
zu#a#z{+%(iA+yHIQfQhu+$_h(-dw<`XCEx!tYV`JI1TLl0?ul7aRFxy`+YvAv5wuW
LaOehD_!s&&Nf1|C

literal 0
HcmV?d00001

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 61a8d165..34b67e0c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -278,9 +278,10 @@ if (ISLE_USE_DX5)
 endif()
 
 target_link_directories(lego1 PRIVATE "${CMAKE_SOURCE_DIR}/3rdparty/smacker")
+target_link_directories(lego1 PRIVATE "${CMAKE_SOURCE_DIR}/3rdparty/flic")
 
 # Link libraries
-target_link_libraries(lego1 PRIVATE ddraw dsound dinput dxguid winmm d3drm smack)
+target_link_libraries(lego1 PRIVATE ddraw dsound dinput dxguid winmm d3drm smack flic)
 
 # Make sure filenames are ALL CAPS
 set_property(TARGET lego1 PROPERTY OUTPUT_NAME LEGO1)
diff --git a/LEGO1/omni/include/mxflcpresenter.h b/LEGO1/omni/include/mxflcpresenter.h
index d883d106..c8f9854d 100644
--- a/LEGO1/omni/include/mxflcpresenter.h
+++ b/LEGO1/omni/include/mxflcpresenter.h
@@ -28,13 +28,14 @@ class MxFlcPresenter : public MxVideoPresenter {
 
 	virtual void LoadHeader(MxStreamChunk* p_chunk) override; // vtable+0x5c
 	virtual void CreateBitmap() override;                     // vtable+0x60
+	virtual void LoadFrame(MxStreamChunk* p_chunk) override;  // vtable+0x68
 	virtual void RealizePalette() override;                   // vtable+0x70
 
 	// SYNTHETIC: LEGO1 0x100b3400
 	// MxFlcPresenter::`scalar deleting destructor'
 
 protected:
-	FLIC_HEADER* m_flicHeader;
+	FLIC_HEADER* m_flcHeader; // 0x64
 };
 
 #endif // MXFLCPRESENTER_H
diff --git a/LEGO1/omni/src/video/mxflcpresenter.cpp b/LEGO1/omni/src/video/mxflcpresenter.cpp
index de334852..fa6d3cac 100644
--- a/LEGO1/omni/src/video/mxflcpresenter.cpp
+++ b/LEGO1/omni/src/video/mxflcpresenter.cpp
@@ -2,6 +2,7 @@
 
 #include "decomp.h"
 #include "mxbitmap.h"
+#include "mxdsmediaaction.h"
 #include "mxomni.h"
 #include "mxpalette.h"
 #include "mxvideomanager.h"
@@ -11,7 +12,7 @@ DECOMP_SIZE_ASSERT(MxFlcPresenter, 0x68);
 // FUNCTION: LEGO1 0x100b3310
 MxFlcPresenter::MxFlcPresenter()
 {
-	this->m_flicHeader = NULL;
+	this->m_flcHeader = NULL;
 	this->m_flags &= ~c_bit2;
 	this->m_flags &= ~c_bit3;
 }
@@ -19,16 +20,16 @@ MxFlcPresenter::MxFlcPresenter()
 // FUNCTION: LEGO1 0x100b3420
 MxFlcPresenter::~MxFlcPresenter()
 {
-	if (this->m_flicHeader) {
-		delete this->m_flicHeader;
+	if (this->m_flcHeader) {
+		delete this->m_flcHeader;
 	}
 }
 
 // FUNCTION: LEGO1 0x100b3490
 void MxFlcPresenter::LoadHeader(MxStreamChunk* p_chunk)
 {
-	m_flicHeader = (FLIC_HEADER*) new MxU8[p_chunk->GetLength()];
-	memcpy(m_flicHeader, p_chunk->GetData(), p_chunk->GetLength());
+	m_flcHeader = (FLIC_HEADER*) new MxU8[p_chunk->GetLength()];
+	memcpy(m_flcHeader, p_chunk->GetData(), p_chunk->GetLength());
 }
 
 // FUNCTION: LEGO1 0x100b34d0
@@ -38,7 +39,35 @@ void MxFlcPresenter::CreateBitmap()
 		delete m_bitmap;
 
 	m_bitmap = new MxBitmap;
-	m_bitmap->SetSize(m_flicHeader->width, m_flicHeader->height, NULL, FALSE);
+	m_bitmap->SetSize(m_flcHeader->width, m_flcHeader->height, NULL, FALSE);
+}
+
+// FUNCTION: LEGO1 0x100b3570
+void MxFlcPresenter::LoadFrame(MxStreamChunk* p_chunk)
+{
+	MxU32* data = (MxU32*) p_chunk->GetData();
+	MxS32 rectCount = *data;
+	data++;
+
+	MxRect32* rects = (MxRect32*) data;
+	MxBool decodedColorMap;
+
+	DecodeFLCFrame(
+		&m_bitmap->GetBitmapInfo()->m_bmiHeader,
+		m_bitmap->GetBitmapData(),
+		m_flcHeader,
+		&rects[rectCount],
+		&decodedColorMap
+	);
+
+	if (((MxDSMediaAction*) m_action)->GetPaletteManagement() && decodedColorMap)
+		RealizePalette();
+
+	for (MxS32 i = 0; i < rectCount; i++) {
+		MxRect32 rect(rects[i]);
+		rect.AddPoint(m_location);
+		MVideoManager()->InvalidateRect(rect);
+	}
 }
 
 // FUNCTION: LEGO1 0x100b3620
diff --git a/LEGO1/omni/src/video/mxloopingflcpresenter.cpp b/LEGO1/omni/src/video/mxloopingflcpresenter.cpp
index dcdeba96..b8d9bd45 100644
--- a/LEGO1/omni/src/video/mxloopingflcpresenter.cpp
+++ b/LEGO1/omni/src/video/mxloopingflcpresenter.cpp
@@ -45,7 +45,7 @@ void MxLoopingFlcPresenter::NextFrame()
 	else {
 		LoadFrame(chunk);
 		LoopChunk(chunk);
-		m_unk0x68 += m_flicHeader->speed;
+		m_unk0x68 += m_flcHeader->speed;
 	}
 
 	m_subscriber->DestroyChunk(chunk);

From d5658efe02c3ddf9e39beb5e61603a5c1b50b4d7 Mon Sep 17 00:00:00 2001
From: Nathan M Gilbert <tahgtahv@gmail.com>
Date: Fri, 19 Jan 2024 09:38:06 -0500
Subject: [PATCH 141/210] Finish Bitmap (#458)

* Finish Bitmap

* Add missing vtable annotations

* Fixes

---------

Co-authored-by: Christian Semmler <mail@csemmler.com>
---
 LEGO1/lego/legoomni/include/infocenterstate.h |  2 +-
 LEGO1/omni/include/mxbitmap.h                 | 42 +++++++++-
 LEGO1/omni/include/mxutil.h                   | 18 ++--
 LEGO1/omni/src/common/mxutil.cpp              | 50 +++++------
 LEGO1/omni/src/video/mxbitmap.cpp             | 83 ++++++++++++++++++-
 LEGO1/omni/src/video/mxdisplaysurface.cpp     |  2 +-
 6 files changed, 154 insertions(+), 43 deletions(-)

diff --git a/LEGO1/lego/legoomni/include/infocenterstate.h b/LEGO1/lego/legoomni/include/infocenterstate.h
index 4f92b508..8314529f 100644
--- a/LEGO1/lego/legoomni/include/infocenterstate.h
+++ b/LEGO1/lego/legoomni/include/infocenterstate.h
@@ -3,7 +3,7 @@
 
 #include "decomp.h"
 #include "legostate.h"
-#include "mxstillpresenter.h";
+#include "mxstillpresenter.h"
 
 // VTABLE: LEGO1 0x100d93a8
 // SIZE 0x94
diff --git a/LEGO1/omni/include/mxbitmap.h b/LEGO1/omni/include/mxbitmap.h
index b88a1976..f17ddb4b 100644
--- a/LEGO1/omni/include/mxbitmap.h
+++ b/LEGO1/omni/include/mxbitmap.h
@@ -44,10 +44,26 @@ class MxBitmap : public MxCore {
 	__declspec(dllexport) virtual MxLong Read(const char* p_filename);                     // vtable+24
 
 	// FUNCTION: LEGO1 0x1004e0d0
-	virtual int VTable0x28(int) { return -1; };
+	virtual int VTable0x28(int) { return -1; }; // vtable+28
 
-	virtual void VTable0x2c(int, int, int, int, int, int, int);
-	virtual void VTable0x30(int, int, int, int, int, int, int);
+	virtual void BitBlt(
+		MxBitmap* p_src,
+		MxS32 p_left,
+		MxS32 p_top,
+		MxS32 p_right,
+		MxS32 p_bottom,
+		MxS32 p_width,
+		MxS32 p_height
+	); // vtable+2c
+	virtual void BitBltTransparent(
+		MxBitmap* p_src,
+		MxS32 p_left,
+		MxS32 p_top,
+		MxS32 p_right,
+		MxS32 p_bottom,
+		MxS32 p_width,
+		MxS32 p_height
+	);                                                        // vtable+30
 	__declspec(dllexport) virtual MxPalette* CreatePalette(); // vtable+34
 	virtual void ImportPalette(MxPalette* p_palette);         // vtable+38
 	virtual MxResult SetBitDepth(MxBool);                     // vtable+3c
@@ -92,6 +108,26 @@ class MxBitmap : public MxCore {
 			return -GetBmiStride();
 	}
 
+	inline MxLong GetLine(MxS32 p_top)
+	{
+		MxS32 height;
+		if (m_bmiHeader->biCompression == BI_RGB_TOPDOWN || m_bmiHeader->biHeight < 0)
+			height = p_top;
+		else
+			height = GetBmiHeightAbs() - p_top - 1;
+		return GetBmiStride() * height;
+	}
+
+	inline MxU8* GetStart(MxS32 p_left, MxS32 p_top)
+	{
+		if (m_bmiHeader->biCompression == BI_RGB)
+			return GetLine(p_top) + m_data + p_left;
+		else if (m_bmiHeader->biCompression == BI_RGB_TOPDOWN)
+			return m_data;
+		else
+			return GetLine(0) + m_data;
+	}
+
 	// SYNTHETIC: LEGO1 0x100bc9f0
 	// MxBitmap::`scalar deleting destructor'
 
diff --git a/LEGO1/omni/include/mxutil.h b/LEGO1/omni/include/mxutil.h
index bd0247fd..5eb0a984 100644
--- a/LEGO1/omni/include/mxutil.h
+++ b/LEGO1/omni/include/mxutil.h
@@ -56,15 +56,15 @@ inline void GetString(MxU8** p_source, char** p_dest, T* p_obj, void (T::*p_sett
 	*p_source += strlen(*p_dest) + 1;
 }
 
-MxBool FUN_100b6e10(
-	MxS32 p_bitmapWidth,
-	MxS32 p_bitmapHeight,
-	MxS32 p_videoParamWidth,
-	MxS32 p_videoParamHeight,
-	MxS32* p_left,
-	MxS32* p_top,
-	MxS32* p_right,
-	MxS32* p_bottom,
+MxBool GetRectIntersection(
+	MxS32 p_rect1Width,
+	MxS32 p_rect1Height,
+	MxS32 p_rect2Width,
+	MxS32 p_rect2Height,
+	MxS32* p_rect1Left,
+	MxS32* p_rect1Top,
+	MxS32* p_rect2Left,
+	MxS32* p_rect2Top,
 	MxS32* p_width,
 	MxS32* p_height
 );
diff --git a/LEGO1/omni/src/common/mxutil.cpp b/LEGO1/omni/src/common/mxutil.cpp
index ababdc02..29b71863 100644
--- a/LEGO1/omni/src/common/mxutil.cpp
+++ b/LEGO1/omni/src/common/mxutil.cpp
@@ -11,45 +11,45 @@
 void (*g_omniUserMessage)(const char*, int);
 
 // FUNCTION: LEGO1 0x100b6e10
-MxBool FUN_100b6e10(
-	MxS32 p_bitmapWidth,
-	MxS32 p_bitmapHeight,
-	MxS32 p_videoParamWidth,
-	MxS32 p_videoParamHeight,
-	MxS32* p_left,
-	MxS32* p_top,
-	MxS32* p_right,
-	MxS32* p_bottom,
+MxBool GetRectIntersection(
+	MxS32 p_rect1Width,
+	MxS32 p_rect1Height,
+	MxS32 p_rect2Width,
+	MxS32 p_rect2Height,
+	MxS32* p_rect1Left,
+	MxS32* p_rect1Top,
+	MxS32* p_rect2Left,
+	MxS32* p_rect2Top,
 	MxS32* p_width,
 	MxS32* p_height
 )
 {
-	MxPoint32 topLeft(*p_left, *p_top);
-	MxRect32 bitmapRect(MxPoint32(0, 0), MxSize32(p_bitmapWidth, p_bitmapHeight));
+	MxPoint32 rect1Origin(*p_rect1Left, *p_rect1Top);
+	MxRect32 rect1(MxPoint32(0, 0), MxSize32(p_rect1Width, p_rect1Height));
 
-	MxPoint32 bottomRight(*p_right, *p_bottom);
-	MxRect32 videoParamRect(MxPoint32(0, 0), MxSize32(p_videoParamWidth, p_videoParamHeight));
+	MxPoint32 rect2Origin(*p_rect2Left, *p_rect2Top);
+	MxRect32 rect2(MxPoint32(0, 0), MxSize32(p_rect2Width, p_rect2Height));
 
 	MxRect32 rect(0, 0, *p_width, *p_height);
-	rect.AddPoint(topLeft);
+	rect.AddPoint(rect1Origin);
 
-	if (!rect.IntersectsWith(bitmapRect))
+	if (!rect.IntersectsWith(rect1))
 		return FALSE;
 
-	rect.Intersect(bitmapRect);
-	rect.SubtractPoint(topLeft);
-	rect.AddPoint(bottomRight);
+	rect.Intersect(rect1);
+	rect.SubtractPoint(rect1Origin);
+	rect.AddPoint(rect2Origin);
 
-	if (!rect.IntersectsWith(videoParamRect))
+	if (!rect.IntersectsWith(rect2))
 		return FALSE;
 
-	rect.Intersect(videoParamRect);
-	rect.SubtractPoint(bottomRight);
+	rect.Intersect(rect2);
+	rect.SubtractPoint(rect2Origin);
 
-	*p_left += rect.GetLeft();
-	*p_top += rect.GetTop();
-	*p_right += rect.GetLeft();
-	*p_bottom += rect.GetTop();
+	*p_rect1Left += rect.GetLeft();
+	*p_rect1Top += rect.GetTop();
+	*p_rect2Left += rect.GetLeft();
+	*p_rect2Top += rect.GetTop();
 	*p_width = rect.GetWidth();
 	*p_height = rect.GetHeight();
 	return TRUE;
diff --git a/LEGO1/omni/src/video/mxbitmap.cpp b/LEGO1/omni/src/video/mxbitmap.cpp
index 9e21e449..0d83bba2 100644
--- a/LEGO1/omni/src/video/mxbitmap.cpp
+++ b/LEGO1/omni/src/video/mxbitmap.cpp
@@ -1,6 +1,7 @@
 #include "mxbitmap.h"
 
 #include "decomp.h"
+#include "mxutil.h"
 
 DECOMP_SIZE_ASSERT(MxBitmap, 0x20);
 DECOMP_SIZE_ASSERT(MxBITMAPINFO, 0x428);
@@ -207,14 +208,88 @@ MxResult MxBitmap::LoadFile(HANDLE p_handle)
 	return result;
 }
 
-// STUB: LEGO1 0x100bce70
-void MxBitmap::VTable0x2c(int, int, int, int, int, int, int)
+// FUNCTION: LEGO1 0x100bce70
+void MxBitmap::BitBlt(
+	MxBitmap* p_src,
+	MxS32 p_srcLeft,
+	MxS32 p_srcTop,
+	MxS32 p_dstLeft,
+	MxS32 p_dstTop,
+	MxS32 p_width,
+	MxS32 p_height
+)
 {
+	MxLong dstHeight = GetBmiHeightAbs();
+	MxLong srcHeight = p_src->GetBmiHeightAbs();
+
+	if (GetRectIntersection(
+			p_src->GetBmiWidth(),
+			srcHeight,
+			GetBmiWidth(),
+			dstHeight,
+			&p_srcLeft,
+			&p_srcTop,
+			&p_dstLeft,
+			&p_dstTop,
+			&p_width,
+			&p_height
+		)) {
+		MxU8* srcStart = p_src->GetStart(p_srcLeft, p_srcTop);
+		MxU8* dstStart = GetStart(p_dstLeft, p_dstTop);
+		MxLong srcStride = p_src->GetAdjustedStride();
+		MxLong dstStride = GetAdjustedStride();
+
+		while (p_height--) {
+			memcpy(dstStart, srcStart, p_width);
+			dstStart += dstStride;
+			srcStart += srcStride;
+		}
+	}
 }
 
-// STUB: LEGO1 0x100bd020
-void MxBitmap::VTable0x30(int, int, int, int, int, int, int)
+// FUNCTION: LEGO1 0x100bd020
+void MxBitmap::BitBltTransparent(
+	MxBitmap* p_src,
+	MxS32 p_srcLeft,
+	MxS32 p_srcTop,
+	MxS32 p_dstLeft,
+	MxS32 p_dstTop,
+	MxS32 p_width,
+	MxS32 p_height
+)
 {
+	MxLong dstHeight = GetBmiHeightAbs();
+	MxLong srcHeight = p_src->GetBmiHeightAbs();
+
+	if (GetRectIntersection(
+			p_src->GetBmiWidth(),
+			srcHeight,
+			GetBmiWidth(),
+			dstHeight,
+			&p_srcLeft,
+			&p_srcTop,
+			&p_dstLeft,
+			&p_dstTop,
+			&p_width,
+			&p_height
+		)) {
+		MxU8* srcStart = p_src->GetStart(p_srcLeft, p_srcTop);
+		MxU8* dstStart = GetStart(p_dstLeft, p_dstTop);
+		MxLong srcStride = p_src->GetAdjustedStride() - p_width;
+		MxLong dstStride = GetAdjustedStride() - p_width;
+
+		for (MxS32 h = 0; h < p_height; h++) {
+			for (MxS32 w = 0; w < p_width; w++) {
+				if (*srcStart)
+					*dstStart = *srcStart;
+				srcStart++;
+				dstStart++;
+			}
+
+			srcStart += srcStride;
+			dstStart += dstStride;
+		}
+	}
 }
 
 // FUNCTION: LEGO1 0x100bd1c0
diff --git a/LEGO1/omni/src/video/mxdisplaysurface.cpp b/LEGO1/omni/src/video/mxdisplaysurface.cpp
index d744accd..c1b45963 100644
--- a/LEGO1/omni/src/video/mxdisplaysurface.cpp
+++ b/LEGO1/omni/src/video/mxdisplaysurface.cpp
@@ -305,7 +305,7 @@ void MxDisplaySurface::VTable0x28(
 	MxS32 p_height
 )
 {
-	if (FUN_100b6e10(
+	if (GetRectIntersection(
 			p_bitmap->GetBmiWidth(),
 			p_bitmap->GetBmiHeightAbs(),
 			m_videoParam.GetRect().GetWidth(),

From 8007c5e483c6bb11d8fff7f120eb89d11a614fac Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Thu, 18 Jan 2024 21:23:07 -0500
Subject: [PATCH 142/210] Match MxFlcPresenter::LoadFrame to 100%

---
 LEGO1/omni/src/video/mxflcpresenter.cpp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/LEGO1/omni/src/video/mxflcpresenter.cpp b/LEGO1/omni/src/video/mxflcpresenter.cpp
index fa6d3cac..5e1019a1 100644
--- a/LEGO1/omni/src/video/mxflcpresenter.cpp
+++ b/LEGO1/omni/src/video/mxflcpresenter.cpp
@@ -45,18 +45,20 @@ void MxFlcPresenter::CreateBitmap()
 // FUNCTION: LEGO1 0x100b3570
 void MxFlcPresenter::LoadFrame(MxStreamChunk* p_chunk)
 {
-	MxU32* data = (MxU32*) p_chunk->GetData();
-	MxS32 rectCount = *data;
-	data++;
+	MxU8* data = p_chunk->GetData();
+
+	MxS32 rectCount = *(MxU32*) data;
+	data += sizeof(MxU32);
 
 	MxRect32* rects = (MxRect32*) data;
-	MxBool decodedColorMap;
+	data += rectCount * sizeof(MxRect32);
 
+	MxBool decodedColorMap;
 	DecodeFLCFrame(
 		&m_bitmap->GetBitmapInfo()->m_bmiHeader,
 		m_bitmap->GetBitmapData(),
 		m_flcHeader,
-		&rects[rectCount],
+		data,
 		&decodedColorMap
 	);
 

From dbfe28db518d4e2c53aeea1deab8926f32b2bf40 Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Thu, 18 Jan 2024 21:24:12 -0500
Subject: [PATCH 143/210] Fix type

---
 LEGO1/omni/src/video/mxflcpresenter.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/LEGO1/omni/src/video/mxflcpresenter.cpp b/LEGO1/omni/src/video/mxflcpresenter.cpp
index 5e1019a1..2fc22265 100644
--- a/LEGO1/omni/src/video/mxflcpresenter.cpp
+++ b/LEGO1/omni/src/video/mxflcpresenter.cpp
@@ -47,8 +47,8 @@ void MxFlcPresenter::LoadFrame(MxStreamChunk* p_chunk)
 {
 	MxU8* data = p_chunk->GetData();
 
-	MxS32 rectCount = *(MxU32*) data;
-	data += sizeof(MxU32);
+	MxS32 rectCount = *(MxS32*) data;
+	data += sizeof(MxS32);
 
 	MxRect32* rects = (MxRect32*) data;
 	data += rectCount * sizeof(MxRect32);

From 35e5a62ff747e83459ece70a5ded139c2c42685b Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Fri, 19 Jan 2024 10:33:04 -0500
Subject: [PATCH 144/210] Implement/match MxLoopingFlcPresenter remaining
 functions (#459)

* Implement/match MxLoopingFlcPresenter remaining functions

* Remove include

* Change to long
---
 LEGO1/omni/include/mxloopingflcpresenter.h    |  8 +-
 .../omni/src/video/mxloopingflcpresenter.cpp  | 79 ++++++++++++++++++-
 2 files changed, 83 insertions(+), 4 deletions(-)

diff --git a/LEGO1/omni/include/mxloopingflcpresenter.h b/LEGO1/omni/include/mxloopingflcpresenter.h
index 9e035afc..7075332d 100644
--- a/LEGO1/omni/include/mxloopingflcpresenter.h
+++ b/LEGO1/omni/include/mxloopingflcpresenter.h
@@ -18,7 +18,11 @@ class MxLoopingFlcPresenter : public MxFlcPresenter {
 		return "MxLoopingFlcPresenter";
 	}
 
-	virtual void NextFrame() override; // vtable+0x64
+	virtual void RepeatingTickle() override;  // vtable+0x24
+	virtual MxResult AddToManager() override; // vtable+0x34
+	virtual void Destroy() override;          // vtable+0x38
+	virtual void NextFrame() override;        // vtable+0x64
+	virtual void VTable0x88();                // vtable+0x88
 
 	// SYNTHETIC: LEGO1 0x100b4390
 	// MxLoopingFlcPresenter::`scalar deleting destructor'
@@ -27,7 +31,7 @@ class MxLoopingFlcPresenter : public MxFlcPresenter {
 	void Init();
 	void Destroy(MxBool p_fromDestructor);
 
-	undefined4 m_unk0x68;
+	MxLong m_elapsedDuration; // 0x68
 };
 
 #endif // MXLOOPINGFLCPRESENTER_H
diff --git a/LEGO1/omni/src/video/mxloopingflcpresenter.cpp b/LEGO1/omni/src/video/mxloopingflcpresenter.cpp
index b8d9bd45..59540cb3 100644
--- a/LEGO1/omni/src/video/mxloopingflcpresenter.cpp
+++ b/LEGO1/omni/src/video/mxloopingflcpresenter.cpp
@@ -19,7 +19,7 @@ MxLoopingFlcPresenter::~MxLoopingFlcPresenter()
 // FUNCTION: LEGO1 0x100b4410
 void MxLoopingFlcPresenter::Init()
 {
-	this->m_unk0x68 = 0;
+	this->m_elapsedDuration = 0;
 	this->m_flags &= ~c_bit2;
 	this->m_flags &= ~c_bit3;
 }
@@ -45,8 +45,83 @@ void MxLoopingFlcPresenter::NextFrame()
 	else {
 		LoadFrame(chunk);
 		LoopChunk(chunk);
-		m_unk0x68 += m_flcHeader->speed;
+		m_elapsedDuration += m_flcHeader->speed;
 	}
 
 	m_subscriber->DestroyChunk(chunk);
 }
+
+// FUNCTION: LEGO1 0x100b44c0
+void MxLoopingFlcPresenter::VTable0x88()
+{
+	if (m_action->GetDuration() < m_elapsedDuration)
+		ProgressTickleState(e_unk5);
+	else {
+		MxStreamChunk* chunk;
+		m_loopingChunkCursor->Current(chunk);
+		LoadFrame(chunk);
+		m_elapsedDuration += m_flcHeader->speed;
+	}
+}
+
+// FUNCTION: LEGO1 0x100b4520
+void MxLoopingFlcPresenter::RepeatingTickle()
+{
+	for (MxS16 i = 0; i < m_unk0x5c; i++) {
+		if (!m_loopingChunkCursor->HasMatch()) {
+			MxStreamChunk* chunk;
+			MxStreamChunkListCursor cursor(m_loopingChunks);
+
+			cursor.Last(chunk);
+			MxLong time = chunk->GetTime();
+
+			cursor.First(chunk);
+
+			time -= chunk->GetTime();
+			time += m_flcHeader->speed;
+
+			cursor.Reset();
+			while (cursor.Next(chunk))
+				chunk->SetTime(chunk->GetTime() + time);
+
+			m_loopingChunkCursor->Next();
+		}
+
+		MxStreamChunk* chunk;
+		m_loopingChunkCursor->Current(chunk);
+
+		if (m_action->GetElapsedTime() < chunk->GetTime())
+			break;
+
+		VTable0x88();
+
+		m_loopingChunkCursor->Next(chunk);
+
+		if (m_currentTickleState != e_repeating)
+			break;
+	}
+}
+
+// FUNCTION: LEGO1 0x100b4860
+MxResult MxLoopingFlcPresenter::AddToManager()
+{
+	MxResult result = FAILURE;
+	MxBool locked = FALSE;
+
+	if (MxFlcPresenter::AddToManager() == SUCCESS) {
+		m_criticalSection.Enter();
+		locked = TRUE;
+		result = SUCCESS;
+	}
+
+	if (locked)
+		m_criticalSection.Leave();
+
+	return result;
+}
+
+// FUNCTION: LEGO1 0x100b48a0
+void MxLoopingFlcPresenter::Destroy()
+{
+	Destroy(FALSE);
+}

From ee7241f73de4e1ab0d34be5c22918fc7d73addfe Mon Sep 17 00:00:00 2001
From: MS <disinvite@users.noreply.github.com>
Date: Fri, 19 Jan 2024 15:23:12 -0500
Subject: [PATCH 145/210] GifManager: use STL members (#460)

* Truncate symbol names to 255 characters when matching

* GifManager refactor

* Refactor, annotations

---------

Co-authored-by: Christian Semmler <mail@csemmler.com>
---
 LEGO1/lego/legoomni/include/gifmanager.h      | 136 +++++++++++++-----
 LEGO1/lego/legoomni/src/common/gifmanager.cpp |  71 ++++++---
 LEGO1/lego/legoomni/src/infocenter/score.cpp  |   3 +-
 tools/isledecomp/isledecomp/compare/db.py     |   6 +
 4 files changed, 158 insertions(+), 58 deletions(-)

diff --git a/LEGO1/lego/legoomni/include/gifmanager.h b/LEGO1/lego/legoomni/include/gifmanager.h
index aa6d2d80..898ab1fb 100644
--- a/LEGO1/lego/legoomni/include/gifmanager.h
+++ b/LEGO1/lego/legoomni/include/gifmanager.h
@@ -3,73 +3,139 @@
 
 #include "compat.h"
 #include "decomp.h"
+#include "mxstl/stlcompat.h"
 #include "mxtypes.h"
 
 #include <d3drmobj.h>
 #include <ddraw.h>
 
+#pragma warning(disable : 4237)
+
+// SIZE 0x14
 struct GifData {
 public:
-	const char* m_name;
-	LPDIRECTDRAWSURFACE m_surface;
-	LPDIRECTDRAWPALETTE m_palette;
-	LPDIRECT3DRMTEXTURE2 m_texture;
-	MxU8* m_data;
+	char* m_name;                   // 0x00
+	LPDIRECTDRAWSURFACE m_surface;  // 0x04
+	LPDIRECTDRAWPALETTE m_palette;  // 0x08
+	LPDIRECT3DRMTEXTURE2 m_texture; // 0x0c
+	MxU8* m_data;                   // 0x10
+
+	~GifData();
 };
 
-struct GifMapEntry {
-public:
-	GifMapEntry* m_right;
-	GifMapEntry* m_parent;
-	GifMapEntry* m_left;
-	const char* m_key;
-	GifData* m_value;
+struct GifMapComparator {
+	bool operator()(const char* const& p_key0, const char* const& p_key1) const { return strcmp(p_key0, p_key1) > 0; }
 };
 
-class GifMap {
-public:
-	GifMapEntry* FindNode(const char*& p_string);
-
-	inline GifData* Get(const char* p_string)
-	{
-		GifData* ret = NULL;
-		GifMapEntry* entry = FindNode(p_string);
-		if (((m_unk0x4 == entry || strcmp(p_string, entry->m_key) > 0) ? m_unk0x4 : entry) != entry)
-			ret = entry->m_value;
-		return ret;
-	}
-
-	undefined4 m_unk0x0;
-	GifMapEntry* m_unk0x4;
+// SIZE 0x10
+class GifMap : public map<const char*, GifData*, GifMapComparator> {
+	// SYNTHETIC: LEGO1 0x1005a400
+	// GifMap::~GifMap
 };
 
+typedef list<GifData*> GifList;
+
 // VTABLE: LEGO1 0x100d86d4
+// SIZE 0x18
 class GifManagerBase {
 public:
-	// STUB: LEGO1 0x1005b660
-	virtual ~GifManagerBase() {}
+	// FUNCTION: LEGO1 0x1005b660
+	virtual ~GifManagerBase()
+	{
+		GifMap::iterator it;
+		for (it = m_map.begin(); it != m_map.end(); it++) {
+			// DECOMP: Use of const_cast here matches ~ViewLODListManager from 96 source.
+			const char* const& key = (*it).first;
+			delete[] const_cast<char*>(key);
+
+			if (m_ownership) {
+				delete (*it).second; // GifData*
+			}
+		}
+	}
+
+	inline GifData* Get(const char* p_name)
+	{
+		GifMap::iterator it = m_map.find(p_name);
+		if (it != m_map.end()) {
+			return (*it).second;
+		}
+
+		return NULL;
+	}
 
 	// SYNTHETIC: LEGO1 0x1005a310
 	// GifManagerBase::`scalar deleting destructor'
 
-	inline GifData* Get(const char* p_name) { return m_unk0x8.Get(p_name); }
-
 protected:
-	undefined4 m_unk0x0;
-	undefined4 m_unk0x4;
-	GifMap m_unk0x8;
+	MxBool m_ownership; // 0x04
+	GifMap m_map;       // 0x08
 };
 
 // VTABLE: LEGO1 0x100d86fc
+// SIZE 0x24
 class GifManager : public GifManagerBase {
 public:
+	GifManager() { m_ownership = TRUE; };
 	virtual ~GifManager() override;
 
 	// SYNTHETIC: LEGO1 0x1005a580
 	// GifManager::`scalar deleting destructor'
 
+	void FUN_10099cc0(GifData* p_data);
+
 protected:
-	undefined m_unk0x14[0x1c];
+	GifList m_list; // 0x18
 };
 
+// TEMPLATE: LEGO1 0x10059c50
+// allocator<GifData *>::_Charalloc
+
+// clang-format off
+// TEMPLATE: LEGO1 0x10001cc0
+// _Tree<char const *,pair<char const * const,GifData *>,map<char const *,GifData *,GifMapComparator,allocator<GifData *> >::_Kfn,GifMapComparator,allocator<GifData *> >::_Lbound
+
+// TEMPLATE: LEGO1 0x1004f9b0
+// _Tree<char const *,pair<char const * const,GifData *>,map<char const *,GifData *,GifMapComparator,allocator<GifData *> >::_Kfn,GifMapComparator,allocator<GifData *> >::_Insert
+
+// TEMPLATE: LEGO1 0x10059c70
+// _Tree<char const *,pair<char const * const,GifData *>,map<char const *,GifData *,GifMapComparator,allocator<GifData *> >::_Kfn,GifMapComparator,allocator<GifData *> >::_Color
+
+// TEMPLATE: LEGO1 0x10059c80
+// _Tree<char const *,pair<char const * const,GifData *>,map<char const *,GifData *,GifMapComparator,allocator<GifData *> >::_Kfn,GifMapComparator,allocator<GifData *> >::_Left
+
+// TEMPLATE: LEGO1 0x10059c90
+// _Tree<char const *,pair<char const * const,GifData *>,map<char const *,GifData *,GifMapComparator,allocator<GifData *> >::_Kfn,GifMapComparator,allocator<GifData *> >::_Parent
+
+// TEMPLATE: LEGO1 0x10059ca0
+// _Tree<char const *,pair<char const * const,GifData *>,map<char const *,GifData *,GifMapComparator,allocator<GifData *> >::_Kfn,GifMapComparator,allocator<GifData *> >::_Right
+
+// TEMPLATE: LEGO1 0x10059cb0
+// _Tree<char const *,pair<char const * const,GifData *>,map<char const *,GifData *,GifMapComparator,allocator<GifData *> >::_Kfn,GifMapComparator,allocator<GifData *> >::~_Tree<char const *,pair<char const * const,GifData *>,map<char const *,GifData *,GifMapComparator,allocator<GifData *> >::_Kfn,GifMapComparator,allocator<GifData *> >
+
+// TEMPLATE: LEGO1 0x10059d80
+// _Tree<char const *,pair<char const * const,GifData *>,map<char const *,GifData *,GifMapComparator,allocator<GifData *> >::_Kfn,GifMapComparator,allocator<GifData *> >::iterator::_Inc
+
+// TEMPLATE: LEGO1 0x10059dc0
+// _Tree<char const *,pair<char const * const,GifData *>,map<char const *,GifData *,GifMapComparator,allocator<GifData *> >::_Kfn,GifMapComparator,allocator<GifData *> >::erase
+
+// TEMPLATE: LEGO1 0x1005a210
+// _Tree<char const *,pair<char const * const,GifData *>,map<char const *,GifData *,GifMapComparator,allocator<GifData *> >::_Kfn,GifMapComparator,allocator<GifData *> >::_Erase
+
+// TEMPLATE: LEGO1 0x1005a250
+// list<GifData *,allocator<GifData *> >::~list<GifData *,allocator<GifData *> >
+
+// TEMPLATE: LEGO1 0x1005a2c0
+// map<char const *,GifData *,GifMapComparator,allocator<GifData *> >::~map<char const *,GifData *,GifMapComparator,allocator<GifData *> >
+
+// TEMPLATE: LEGO1 0x1005a450
+// Map<char const *,GifData *,GifMapComparator>::~Map<char const *,GifData *,GifMapComparator>
+
+// TEMPLATE: LEGO1 0x1005a5a0
+// List<GifData *>::~List<GifData *>
+
+// GLOBAL: LEGO1 0x100f0100
+// _Tree<char const *,pair<char const * const,GifData *>,map<char const *,GifData *,GifMapComparator,allocator<GifData *> >::_Kfn,GifMapComparator,allocator<GifData *> >::_Nil
+// clang-format on
+
 #endif // GIFMANAGER_H
diff --git a/LEGO1/lego/legoomni/src/common/gifmanager.cpp b/LEGO1/lego/legoomni/src/common/gifmanager.cpp
index c83714d4..cd485b11 100644
--- a/LEGO1/lego/legoomni/src/common/gifmanager.cpp
+++ b/LEGO1/lego/legoomni/src/common/gifmanager.cpp
@@ -1,32 +1,61 @@
 #include "gifmanager.h"
 
 DECOMP_SIZE_ASSERT(GifData, 0x14);
-DECOMP_SIZE_ASSERT(GifMapEntry, 0x14);
-DECOMP_SIZE_ASSERT(GifMap, 0x08);
-DECOMP_SIZE_ASSERT(GifManagerBase, 0x14);
-DECOMP_SIZE_ASSERT(GifManager, 0x30);
+DECOMP_SIZE_ASSERT(GifMap, 0x10);
+DECOMP_SIZE_ASSERT(GifManagerBase, 0x18);
+DECOMP_SIZE_ASSERT(GifManager, 0x24);
 
-// GLOBAL: LEGO1 0x100f0100
-GifMapEntry* g_unk0x100f0100;
-
-// FUNCTION: LEGO1 0x10001cc0
-GifMapEntry* GifMap::FindNode(const char*& p_string)
+// FUNCTION: LEGO1 0x10065c00
+GifData::~GifData()
 {
-	GifMapEntry* ret = m_unk0x4;
-	GifMapEntry* current = ret->m_parent;
-	while (current != g_unk0x100f0100) {
-		if (strcmp(current->m_key, p_string) <= 0) {
-			ret = current;
-			current = current->m_right;
-		}
-		else
-			current = current->m_left;
+	if (m_name) {
+		delete[] m_name;
+		m_name = NULL;
+	}
+
+	if (m_palette) {
+		m_palette->Release();
+		m_palette = NULL;
+	}
+
+	if (m_surface) {
+		m_surface->Release();
+		m_surface = NULL;
+	}
+
+	if (m_texture) {
+		m_texture->Release();
+		m_texture = NULL;
 	}
-	return ret;
 }
 
-// STUB: LEGO1 0x10099870
+// FUNCTION: LEGO1 0x10099870
 GifManager::~GifManager()
 {
-	// TODO
+}
+
+// FUNCTION: LEGO1 0x10099cc0
+void GifManager::FUN_10099cc0(GifData* p_data)
+{
+	if (p_data == NULL)
+		return;
+
+#ifdef COMPAT_MODE
+	GifList::iterator it;
+	for (it = m_list.begin(); it != m_list.end(); it++) {
+#else
+	for (GifList::iterator it = m_list.begin(); it != m_list.end(); it++) {
+#endif
+		if (*it == p_data) {
+			// TODO: This is wrong, but what is at +0xc on the iterator?
+			*it = NULL;
+
+			if (p_data->m_texture->Release() == TRUE) {
+				delete p_data;
+				m_list.erase(it);
+			}
+
+			return;
+		}
+	}
 }
diff --git a/LEGO1/lego/legoomni/src/infocenter/score.cpp b/LEGO1/lego/legoomni/src/infocenter/score.cpp
index c1bba3e6..5a7a95a3 100644
--- a/LEGO1/lego/legoomni/src/infocenter/score.cpp
+++ b/LEGO1/lego/legoomni/src/infocenter/score.cpp
@@ -227,8 +227,7 @@ void Score::VTable0x68(MxBool p_add)
 // FUNCTION: LEGO1 0x100019d0
 void Score::Paint()
 {
-	GifManager* gm = GetGifManager();
-	GifData* gd = gm->Get("bigcube.gif");
+	GifData* gd = GetGifManager()->Get("bigcube.gif");
 
 	if (gd) {
 		RaceState* l78 = (RaceState*) GameState()->GetState("JetskiRaceState");
diff --git a/tools/isledecomp/isledecomp/compare/db.py b/tools/isledecomp/isledecomp/compare/db.py
index dea2b590..43d6811b 100644
--- a/tools/isledecomp/isledecomp/compare/db.py
+++ b/tools/isledecomp/isledecomp/compare/db.py
@@ -170,6 +170,12 @@ def skip_compare(self, orig: int):
 
     def _match_on(self, compare_type: SymbolType, addr: int, name: str) -> bool:
         # Update the compare_type here too since the marker tells us what we should do
+
+        # Truncate the name to 255 characters. It will not be possible to match a name
+        # longer than that because MSVC truncates the debug symbols to this length.
+        # See also: warning C4786.
+        name = name[:255]
+
         logger.debug("Looking for %s %s", compare_type.name.lower(), name)
         cur = self._db.execute(
             """UPDATE `symbols`

From 1c4f772a82feedf36505eb11f4e3df72e8175de8 Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Fri, 19 Jan 2024 17:06:39 -0500
Subject: [PATCH 146/210] Implement/match MxOmni::ActionSourceEquals (#462)

---
 LEGO1/omni/include/mxomni.h    |  2 +-
 LEGO1/omni/src/main/mxomni.cpp | 23 ++++++++++++++++++-----
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/LEGO1/omni/include/mxomni.h b/LEGO1/omni/include/mxomni.h
index 52faf709..9ade97b3 100644
--- a/LEGO1/omni/include/mxomni.h
+++ b/LEGO1/omni/include/mxomni.h
@@ -57,7 +57,7 @@ class MxOmni : public MxCore {
 	virtual MxBool IsTimerRunning() { return m_timerRunning; }; // vtable+40
 
 	static void SetInstance(MxOmni* p_instance);
-	static MxBool FUN_100b06b0(MxDSAction* p_action, const char* p_name);
+	static MxBool ActionSourceEquals(MxDSAction* p_action, const char* p_name);
 
 	HWND GetWindowHandle() const { return this->m_windowHandle; }
 	MxObjectFactory* GetObjectFactory() const { return this->m_objectFactory; }
diff --git a/LEGO1/omni/src/main/mxomni.cpp b/LEGO1/omni/src/main/mxomni.cpp
index 6df6d009..f9fa5733 100644
--- a/LEGO1/omni/src/main/mxomni.cpp
+++ b/LEGO1/omni/src/main/mxomni.cpp
@@ -3,6 +3,7 @@
 #include "mxactionnotificationparam.h"
 #include "mxatomidcounter.h"
 #include "mxautolocker.h"
+#include "mxdsmultiaction.h"
 #include "mxeventmanager.h"
 #include "mxmusicmanager.h"
 #include "mxnotificationmanager.h"
@@ -377,11 +378,23 @@ void MxOmni::DestroyInstance()
 	}
 }
 
-// STUB: LEGO1 0x100b06b0
-MxBool MxOmni::FUN_100b06b0(MxDSAction* p_action, const char* p_name)
+// FUNCTION: LEGO1 0x100b06b0
+MxBool MxOmni::ActionSourceEquals(MxDSAction* p_action, const char* p_name)
 {
-	// TODO
-	return FAILURE;
+	if (!strcmp(p_action->GetSourceName(), p_name))
+		return TRUE;
+
+	if (p_action->IsA("MxDSMultiAction")) {
+		MxDSActionListCursor cursor(((MxDSMultiAction*) p_action)->GetActionList());
+		MxDSAction* action;
+
+		while (cursor.Next(action)) {
+			if (ActionSourceEquals(action, p_name))
+				return TRUE;
+		}
+	}
+
+	return FALSE;
 }
 
 // FUNCTION: LEGO1 0x100b07f0
@@ -404,7 +417,7 @@ MxLong MxOmni::HandleActionEnd(MxParam& p_param)
 	if (controller != NULL) {
 		action = controller->GetUnk0x54().Find(action, FALSE);
 		if (action) {
-			if (FUN_100b06b0(action, "LegoLoopingAnimPresenter") == FALSE) {
+			if (ActionSourceEquals(action, "LegoLoopingAnimPresenter") == FALSE) {
 				delete controller->GetUnk0x54().Find(action, TRUE);
 			}
 		}

From 701c700d69973b90dab089e8e97b883ac0a31f1c Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Fri, 19 Jan 2024 17:11:51 -0500
Subject: [PATCH 147/210] Add library symbols for flic and smack (#461)

---
 3rdparty/flic/flic.asm       |  77 ++++++++++++++---------------------
 3rdparty/flic/flic.lib       | Bin 2876 -> 2940 bytes
 LEGO1/library_flic.h         |   6 +++
 LEGO1/library_smack.h        |  18 ++++++++
 LEGO1/omni/include/mxsmack.h |   9 ----
 5 files changed, 54 insertions(+), 56 deletions(-)
 create mode 100644 LEGO1/library_flic.h
 create mode 100644 LEGO1/library_smack.h

diff --git a/3rdparty/flic/flic.asm b/3rdparty/flic/flic.asm
index ef402a14..44f42086 100644
--- a/3rdparty/flic/flic.asm
+++ b/3rdparty/flic/flic.asm
@@ -6,7 +6,10 @@ assume fs:nothing
 
 public DecodeFLCFrame
 
-.text SEGMENT PARA PUBLIC 'CODE'
+; This is so reccmp can detect the end of DecodeFLCFrame
+public EndOfSection
+
+.text SEGMENT BYTE PUBLIC 'CODE'
 
 ?_25162 LABEL NEAR
         mov     ax, word ptr [esp+0CH]                  ; 100BD530 _ 66: 8B. 44 24, 0C
@@ -37,10 +40,8 @@ public DecodeFLCFrame
 
 ; Filling space: 0DH
 ; Filler type: INT 3 Debug breakpoint
-;       db 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH
-;       db 0CCH, 0CCH, 0CCH, 0CCH, 0CCH
-
-ALIGN   16
+        db 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH
+        db 0CCH, 0CCH, 0CCH, 0CCH, 0CCH
 
 ?_25164 LABEL NEAR
         lea     eax, [esp+18H]                          ; 100BD580 _ 8D. 44 24, 18
@@ -89,10 +90,8 @@ ALIGN   16
 
 ; Filling space: 0CH
 ; Filler type: INT 3 Debug breakpoint
-;       db 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH
-;       db 0CCH, 0CCH, 0CCH, 0CCH
-
-ALIGN   16
+        db 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH
+        db 0CCH, 0CCH, 0CCH, 0CCH
 
 ?_25168 LABEL NEAR
         mov     ecx, dword ptr [esp+8H]                 ; 100BD600 _ 8B. 4C 24, 08
@@ -149,9 +148,7 @@ ALIGN   16
 
 ; Filling space: 8H
 ; Filler type: INT 3 Debug breakpoint
-;       db 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH
-
-ALIGN   16
+        db 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH
 
 ?_25173 LABEL NEAR
         lea     eax, [esp+18H]                          ; 100BD680 _ 8D. 44 24, 18
@@ -188,10 +185,8 @@ ALIGN   16
 
 ; Filling space: 0AH
 ; Filler type: INT 3 Debug breakpoint
-;       db 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH
-;       db 0CCH, 0CCH
-
-ALIGN   16
+        db 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH
+        db 0CCH, 0CCH
 
 ?_25176 LABEL NEAR
         lea     eax, [esp+18H]                          ; 100BD6E0 _ 8D. 44 24, 18
@@ -238,9 +233,7 @@ ALIGN   16
 
 ; Filling space: 3H
 ; Filler type: INT 3 Debug breakpoint
-;       db 0CCH, 0CCH, 0CCH
-
-ALIGN   8
+        db 0CCH, 0CCH, 0CCH
 
 ?_25180 LABEL NEAR
         mov     eax, dword ptr [esp+18H]                ; 100BD760 _ 8B. 44 24, 18
@@ -373,10 +366,8 @@ ALIGN   8
 
 ; Filling space: 0DH
 ; Filler type: INT 3 Debug breakpoint
-;       db 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH
-;       db 0CCH, 0CCH, 0CCH, 0CCH, 0CCH
-
-ALIGN   16
+        db 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH
+        db 0CCH, 0CCH, 0CCH, 0CCH, 0CCH
 
 ?_25195 LABEL NEAR
         mov     eax, dword ptr [esp+8H]                 ; 100BD8A0 _ 8B. 44 24, 08
@@ -447,9 +438,7 @@ ALIGN   16
 
 ; Filling space: 8H
 ; Filler type: INT 3 Debug breakpoint
-;       db 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH
-
-ALIGN   16
+        db 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH
 
 ?_25202 LABEL NEAR
         mov     eax, dword ptr [esp+8H]                 ; 100BD940 _ 8B. 44 24, 08
@@ -462,10 +451,8 @@ ALIGN   16
 
 ; Filling space: 0DH
 ; Filler type: INT 3 Debug breakpoint
-;       db 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH
-;       db 0CCH, 0CCH, 0CCH, 0CCH, 0CCH
-
-ALIGN   16
+        db 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH
+        db 0CCH, 0CCH, 0CCH, 0CCH, 0CCH
 
 ?_25203 LABEL NEAR
         mov     eax, dword ptr [esp+10H]                ; 100BD960 _ 8B. 44 24, 10
@@ -539,10 +526,8 @@ ALIGN   16
 
 ; Filling space: 0CH
 ; Filler type: INT 3 Debug breakpoint
-;       db 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH
-;       db 0CCH, 0CCH, 0CCH, 0CCH
-
-ALIGN   16
+        db 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH
+        db 0CCH, 0CCH, 0CCH, 0CCH
 
 ?_25213 LABEL NEAR
         mov     ecx, dword ptr [esp+0CH]                ; 100BDA10 _ 8B. 4C 24, 0C
@@ -621,9 +606,7 @@ ALIGN   16
 
 ; Filling space: 3H
 ; Filler type: INT 3 Debug breakpoint
-;       db 0CCH, 0CCH, 0CCH
-
-ALIGN   8
+        db 0CCH, 0CCH, 0CCH
 
 ?_25220 LABEL NEAR
         mov     edx, dword ptr [esp+10H]                ; 100BDAC0 _ 8B. 54 24, 10
@@ -738,9 +721,7 @@ ALIGN   8
 
 ; Filling space: 3H
 ; Filler type: INT 3 Debug breakpoint
-;       db 0CCH, 0CCH, 0CCH
-
-ALIGN   8
+        db 0CCH, 0CCH, 0CCH
 
 ?_25227 LABEL NEAR
         mov     eax, dword ptr [esp+10H]                ; 100BDC00 _ 8B. 44 24, 10
@@ -798,10 +779,8 @@ ALIGN   8
 
 ; Filling space: 0CH
 ; Filler type: INT 3 Debug breakpoint
-;       db 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH
-;       db 0CCH, 0CCH, 0CCH, 0CCH
-
-ALIGN   16
+        db 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH
+        db 0CCH, 0CCH, 0CCH, 0CCH
 
 ?_25231 LABEL NEAR
         mov     eax, dword ptr [esp+10H]                ; 100BDC90 _ 8B. 44 24, 10
@@ -839,9 +818,7 @@ ALIGN   16
 
 ; Filling space: 7H
 ; Filler type: INT 3 Debug breakpoint
-;       db 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH
-
-ALIGN   8
+        db 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH
 
 DecodeFLCFrame LABEL NEAR
         mov     ecx, dword ptr [esp+10H]                ; 100BDCE0 _ 8B. 4C 24, 10
@@ -863,6 +840,12 @@ DecodeFLCFrame LABEL NEAR
         add     esp, 24                                 ; 100BDD0A _ 83. C4, 18
 ?_25235:ret                                             ; 100BDD0D _ C3
 
+; Filling space: 2H
+; Filler type: INT 3 Debug breakpoint
+        db 0CCH, 0CCH
+
+EndOfSection LABEL NEAR
+
 .text ENDS
 
 END
diff --git a/3rdparty/flic/flic.lib b/3rdparty/flic/flic.lib
index 8e297be87d487a9654384afd9f8f2123866a7f60..fea46a2524205492607347c02caac50e1c15f37b 100644
GIT binary patch
delta 975
zcmdlZ_D5`jY`vv{xv7x?3NV23OyJ@PTnr2hOh9}CgyUUOlk-zj-F%$giV|~E8RA{@
zQvB0`Q<F<F^Ya+=QOr_MFf=zXHN$C3n1X_d8B9k47bDaTkX?*Gh~KKToXljs{G=?H
zl?baQUXTzsGl7_!z~#fp%+PRbRq7cI1_sfI|I@|quro090IkRX3V;B}dkPE!lWQ4W
zc+Vh%$>$hLcu)lVm?}760+Y`%g>k_+XU<I4W3FZfawo52Ud8xvawLm1W6I=GmK-!A
z-?7ZlfNAP>QQ_$JQDF%Pd=dEn|NrJA9EV|2V0!X8)+Id1B9r6TQWUxVfRswSRt9R7
z=?+nmNaNr40%(*_XjnjaV9<+KlOMBbfL+4J9>XX!Ih#F$@#o|#>^_V<lNC8M!7_dv
zVV0f0z~-d2ek&181L@CVNb?8{2o8U-{|87$B+a+-bZmTFG`hPc-{UZ1+&5W}Q;Z$z
zxXF5)YMBub^MGEc1x6q@Fi_bTT7WE2@Uk(;F*7jmf>}yH79W_U24wMrSz17r0GOo*
zWC?;<MnIMjm}LfJ34>WyK$ghl-JDbFL6HbD85OVqxgZ&4V1zO;*vA{08d@5G?FMQD
zib6z;8SH>uhzLkO$d)yzx-5(sI)H8mnFG~jVazZOAyN-A+QNik4MGSkV#;s`O~j1h
j0-A_9!#y++3x+qSB9;aWzu_WEK<A<6vUnFh)JzBfgAy57

delta 931
zcmew(wnuD&Y`u}Ov9XB)3NV23jNsx4Tnr2hj6l3C-X%3TKPA=8$JwnYF*lV#A4R8v
zf}y#AsTm$KjbVl>ByfQYOx^}HnUMkA=(L>7WWD^PESMEAqm3+3?KCtnFf%h#P%tus
zc_e|$hmn~<VgJh1a~uo|B9j#v)5Y(xGcfc3?aBg*fB?ux3Jd|0=QFzS_AXHY3H8nf
zk&{0#mheDDSiu4XOcfkZfeDj8Foki!)O#{a4q&ckg{V5myo&MD<VqH4#<a;(S#r<}
z<zt<p0W+i9MTMi=M};LI@I~PN|Nonha2$r22ywwV)+MMesAEe}<oE+pD)Cwws8yyr
zL`5Qvf8PtBQ9_|%0pWo`FJ4S$X4hcu1-eO(J%&+WayNSh<M+v5*nJqeCOdLyvh=2?
zFig(n2(xPY1vV(H^;?N(8pwbwhBS}RfZ*^KdwzgqMACdKPshf`MPoYb4~G%suF3kG
zV(d@{Pxj$dOAmt>c(|Sk60B?tZ9o<$FznbE6qp$pc)%<bAd45w(g3pfz$_ggiyzD~
z0I~$YEE6D05X`awvV_1a8z4(~@@>wk^`K}3MI8dz#~Ya%S{i|E0xDx*W`KwoGdKXb
z5D}1S79idL)D27+3``I;7DfzRK$n6<pt>xK85W?4m@uqEh~$DSvoK{if)E0Wm@!;J
c6ESCafF@$W@D5eP(tzPFTto!uJoFp@0QOJ7qW}N^

diff --git a/LEGO1/library_flic.h b/LEGO1/library_flic.h
new file mode 100644
index 00000000..1c6a6d8b
--- /dev/null
+++ b/LEGO1/library_flic.h
@@ -0,0 +1,6 @@
+#ifdef 0
+
+// LIBRARY: LEGO1 0x100bdce0
+// _DecodeFLCFrame
+
+#endif
diff --git a/LEGO1/library_smack.h b/LEGO1/library_smack.h
new file mode 100644
index 00000000..2909ebd3
--- /dev/null
+++ b/LEGO1/library_smack.h
@@ -0,0 +1,18 @@
+#ifdef 0
+
+// LIBRARY: LEGO1 0x100cd782
+// _SmackGetSizeTables
+
+// LIBRARY: LEGO1 0x100cd7e8
+// _SmackDoTables
+
+// LIBRARY: LEGO1 0x100cda83
+// _SmackDoFrameToBuffer
+
+// LIBRARY: LEGO1 0x100d052c
+// _SmackGetSizeDeltas
+
+// LIBRARY: LEGO1 0x100d0543
+// _SmackGetRect
+
+#endif
diff --git a/LEGO1/omni/include/mxsmack.h b/LEGO1/omni/include/mxsmack.h
index e0f8c76e..227dbd6d 100644
--- a/LEGO1/omni/include/mxsmack.h
+++ b/LEGO1/omni/include/mxsmack.h
@@ -12,10 +12,7 @@
 // but present in SMACK.LIB and used directly by Mindscape.
 extern "C"
 {
-	// (SMACK.LIB) FUNCTION: LEGO1 0x100cd782
 	u32 SmackGetSizeTables();
-
-	// (SMACK.LIB) FUNCTION: LEGO1 0x100cd7e8
 	void SmackDoTables(
 		u8* p_huffmanTrees,
 		u8* p_huffmanTables,
@@ -24,14 +21,8 @@ extern "C"
 		u32 p_detailSize,
 		u32 p_typeSize
 	);
-
-	// (SMACK.LIB) FUNCTION: LEGO1 0x100cda83
 	void SmackDoFrameToBuffer(u8* p_source, u8* p_huffmanTables, u8* p_unk0x6b4);
-
-	// (SMACK.LIB) FUNCTION: LEGO1 0x100d052c
 	u32 SmackGetSizeDeltas(u32 p_width, u32 p_height);
-
-	// (SMACK.LIB) FUNCTION: LEGO1 0x100d0543
 	u8 SmackGetRect(u8* p_unk0x6b4, u32* p_rect);
 }
 

From 9c0843e69bb495d93de2a2fc03106b8cc24ca11d Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Fri, 19 Jan 2024 23:18:39 +0100
Subject: [PATCH 148/210] Update README.md [skip ci]

---
 tools/README.md | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/tools/README.md b/tools/README.md
index da23d84c..75a25668 100644
--- a/tools/README.md
+++ b/tools/README.md
@@ -71,7 +71,7 @@ Synthetic functions should be annotated with `SYNTHETIC`. A synthetic function i
 // MxList<MxRegionLeftRight *>::`scalar deleting destructor'
 ```
 
-## Virtual tables (**WIP**)
+## Virtual tables
 
 Classes with a virtual table should be annotated using the `VTABLE` marker, which includes the module name and address of the virtual table. Additionally, virtual function declarations should be annotated with a comment indicating their relative offset. Please use the following example as a reference.
 
@@ -86,7 +86,7 @@ public:
 	virtual MxResult Create(MxU32 p_frequencyMS, MxBool p_createThread); // vtable+0x28
 ```
 
-## Class size (**WIP**)
+## Class size
 
 Classes should be annotated using the `SIZE` marker to indicate their size. If you are unsure about the class size in the original binary, please use the currently available information (known member variables) and detail the circumstances in an extra comment if necessary.
 
@@ -112,7 +112,7 @@ private:
 	undefined4 m_unk0x14; // 0x14
 ```
 
-## Global variables (**WIP**)
+## Global variables
 
 Global variables should be annotated using the `GLOBAL` marker, which includes the module name and address of the variable.
 
@@ -127,6 +127,18 @@ MxAtomId* g_pz5Script = NULL;
 MxAtomId* g_introScript = NULL;
 ```
 
+## Strings
+
+String values should be annotated using the `STRING` marker, which includes the module name and address of the string.
+
+```
+inline virtual const char* ClassName() const override // vtable+0x0c
+{
+	// STRING: LEGO1 0x100f03fc
+	return "Act2PoliceStation";
+}
+```
+
 # Tooling
 
 Use `pip` to install the required packages to be able to use the Python tools found in this folder:

From 837fc4b7cc7a84990352003f36009f8f0feed825 Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Fri, 19 Jan 2024 23:19:36 +0100
Subject: [PATCH 149/210] Update README.md [skip ci]

---
 tools/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/README.md b/tools/README.md
index 75a25668..6d8ec1a7 100644
--- a/tools/README.md
+++ b/tools/README.md
@@ -86,7 +86,7 @@ public:
 	virtual MxResult Create(MxU32 p_frequencyMS, MxBool p_createThread); // vtable+0x28
 ```
 
-## Class size
+## Class size (**WIP**)
 
 Classes should be annotated using the `SIZE` marker to indicate their size. If you are unsure about the class size in the original binary, please use the currently available information (known member variables) and detail the circumstances in an extra comment if necessary.
 

From a2aa99485f44022921aeba9a9f00c799e6c7c974 Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Fri, 19 Jan 2024 23:24:03 +0100
Subject: [PATCH 150/210] Update README.md [skip ci]

---
 tools/README.md | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/tools/README.md b/tools/README.md
index 6d8ec1a7..5d810ee2 100644
--- a/tools/README.md
+++ b/tools/README.md
@@ -71,6 +71,21 @@ Synthetic functions should be annotated with `SYNTHETIC`. A synthetic function i
 // MxList<MxRegionLeftRight *>::`scalar deleting destructor'
 ```
 
+### `LIBRARY`
+
+Functions located in 3rd party libraries should be annotated with `LIBRARY`. Since the goal is to eventually have a full accounting of all the functions present in the binaries, please make an effort to find and annotate every function of every statically linked library, including the MSVC standard libraries.
+
+```
+// LIBRARY: ISLE 0x4061b0
+// _MemPoolInit@4
+
+// LIBRARY: ISLE 0x406520
+// _MemPoolSetPageSize@8
+
+// LIBRARY: ISLE 0x406630
+// _MemPoolSetBlockSizeFS@8
+```
+
 ## Virtual tables
 
 Classes with a virtual table should be annotated using the `VTABLE` marker, which includes the module name and address of the virtual table. Additionally, virtual function declarations should be annotated with a comment indicating their relative offset. Please use the following example as a reference.

From b19807cb146260a4e32c603a8dfaf2bd7b216f50 Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Fri, 19 Jan 2024 23:27:11 +0100
Subject: [PATCH 151/210] Update README.md [skip ci]

---
 tools/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/README.md b/tools/README.md
index 5d810ee2..b24a8f50 100644
--- a/tools/README.md
+++ b/tools/README.md
@@ -58,7 +58,7 @@ Templated functions should be annotated with `TEMPLATE`. Since the goal is to ev
 
 ### `SYNTHETIC`
 
-Synthetic functions should be annotated with `SYNTHETIC`. A synthetic function is generated by the compiler; for the time being, the only case is the "scalar deleting destructor" found in virtual tables. Note: `SYNTHETIC` takes precedence over `TEMPLATE`.
+Synthetic functions should be annotated with `SYNTHETIC`. A synthetic function is generated by the compiler; most common is the "scalar deleting destructor" found in virtual tables. Other cases include default destructors and assignment operators. Note: `SYNTHETIC` takes precedence over `TEMPLATE`.
 
 ```
 // SYNTHETIC: LEGO1 0x10003210

From 9000f731ac8f073c3891ebd768c9af12526c3c5c Mon Sep 17 00:00:00 2001
From: Joshua Peisach <itzswirlz2020@outlook.com>
Date: Sat, 20 Jan 2024 09:22:33 -0500
Subject: [PATCH 152/210] PoliceState constructor (#463)

* PoliceState constructor

* Changes

---------

Co-authored-by: Christian Semmler <mail@csemmler.com>
---
 LEGO1/lego/legoomni/include/policestate.h      | 5 +++++
 LEGO1/lego/legoomni/src/police/policestate.cpp | 9 +++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/LEGO1/lego/legoomni/include/policestate.h b/LEGO1/lego/legoomni/include/policestate.h
index 611ced07..be55ecae 100644
--- a/LEGO1/lego/legoomni/include/policestate.h
+++ b/LEGO1/lego/legoomni/include/policestate.h
@@ -1,6 +1,7 @@
 #ifndef POLICESTATE_H
 #define POLICESTATE_H
 
+#include "decomp.h"
 #include "legostate.h"
 
 // VTABLE: LEGO1 0x100d8af0
@@ -24,6 +25,10 @@ class PoliceState : public LegoState {
 
 	// SYNTHETIC: LEGO1 0x1005e920
 	// PoliceState::`scalar deleting destructor'
+
+private:
+	undefined4 m_unk0x8; // 0x8
+	undefined4 m_unk0xc; // 0xc
 };
 
 #endif // POLICESTATE_H
diff --git a/LEGO1/lego/legoomni/src/police/policestate.cpp b/LEGO1/lego/legoomni/src/police/policestate.cpp
index a2c66a45..4965a36f 100644
--- a/LEGO1/lego/legoomni/src/police/policestate.cpp
+++ b/LEGO1/lego/legoomni/src/police/policestate.cpp
@@ -1,7 +1,12 @@
 #include "policestate.h"
 
-// STUB: LEGO1 0x1005e7c0
+#include <stdlib.h>
+
+DECOMP_SIZE_ASSERT(PoliceState, 0x10)
+
+// FUNCTION: LEGO1 0x1005e7c0
 PoliceState::PoliceState()
 {
-	// TODO
+	m_unk0xc = 0;
+	m_unk0x8 = (rand() % 2 == 0) ? 501 : 500;
 }

From 9a3df8d9f8e4d4a814b21e16bbd04d412db79cdc Mon Sep 17 00:00:00 2001
From: Misha <106913236+MishaProductions@users.noreply.github.com>
Date: Sat, 20 Jan 2024 09:24:54 -0500
Subject: [PATCH 153/210] Implement various methods in InfoCenter folder (#465)

* push changes

* Fix return type of Infocenter::Tickle

* Fixes/matches

* Code clarity

* Move assert

---------

Co-authored-by: Christian Semmler <mail@csemmler.com>
---
 LEGO1/lego/legoomni/include/elevatorbottom.h  |  2 +
 LEGO1/lego/legoomni/include/infocenter.h      |  6 +-
 LEGO1/lego/legoomni/include/infocenterdoor.h  |  3 +
 .../legoomni/include/legocontrolmanager.h     |  2 +-
 .../src/control/legocontrolmanager.cpp        |  2 +-
 .../src/infocenter/elevatorbottom.cpp         | 29 +++++++--
 .../legoomni/src/infocenter/infocenter.cpp    | 62 ++++++++++++++-----
 .../src/infocenter/infocenterdoor.cpp         | 39 +++++++++---
 .../src/infocenter/infocenterstate.cpp        | 13 +++-
 9 files changed, 123 insertions(+), 35 deletions(-)

diff --git a/LEGO1/lego/legoomni/include/elevatorbottom.h b/LEGO1/lego/legoomni/include/elevatorbottom.h
index ed424efd..1f02d28f 100644
--- a/LEGO1/lego/legoomni/include/elevatorbottom.h
+++ b/LEGO1/lego/legoomni/include/elevatorbottom.h
@@ -40,6 +40,8 @@ class ElevatorBottom : public LegoWorld {
 
 private:
 	undefined4 m_unk0xf8; // 0xf8
+
+	MxLong HandleNotification17(MxParam& p_param);
 };
 
 #endif // ELEVATORBOTTOM_H
diff --git a/LEGO1/lego/legoomni/include/infocenter.h b/LEGO1/lego/legoomni/include/infocenter.h
index 4d8ed408..7de6ec45 100644
--- a/LEGO1/lego/legoomni/include/infocenter.h
+++ b/LEGO1/lego/legoomni/include/infocenter.h
@@ -170,10 +170,10 @@ class Infocenter : public LegoWorld {
 	InfocenterUnkDataEntry m_entries[7];    // 0x120
 	MxS16 m_unk0x1c8;                       // 0x1c8
 	undefined4 m_unk0x1cc;                  // 0x1cc
-	MxU16 m_unk0x1d0;                       // 0x1d0
-	MxU16 m_unk0x1d2;                       // 0x1d2
+	MxS16 m_infoManDialogueTimer;           // 0x1d0
+	MxS16 m_bookAnimationTimer;             // 0x1d2
 	MxU16 m_unk0x1d4;                       // 0x1d4
-	MxU16 m_unk0x1d6;                       // 0x1d6
+	MxS16 m_unk0x1d6;                       // 0x1d6
 };
 
 #endif // INFOCENTER_H
diff --git a/LEGO1/lego/legoomni/include/infocenterdoor.h b/LEGO1/lego/legoomni/include/infocenterdoor.h
index effb22cf..1890f0b1 100644
--- a/LEGO1/lego/legoomni/include/infocenterdoor.h
+++ b/LEGO1/lego/legoomni/include/infocenterdoor.h
@@ -36,6 +36,9 @@ class InfocenterDoor : public LegoWorld {
 
 	// SYNTHETIC: LEGO1 0x100378d0
 	// InfocenterDoor::`scalar deleting destructor'
+
+private:
+	MxS32 m_unk0xf8; // 0xf8
 };
 
 #endif // INFOCENTERDOOR_H
diff --git a/LEGO1/lego/legoomni/include/legocontrolmanager.h b/LEGO1/lego/legoomni/include/legocontrolmanager.h
index df003f06..385ee92b 100644
--- a/LEGO1/lego/legoomni/include/legocontrolmanager.h
+++ b/LEGO1/lego/legoomni/include/legocontrolmanager.h
@@ -28,7 +28,7 @@ class LegoControlManager : public MxCore {
 	void FUN_10028df0(MxPresenterList* p_presenterList);
 	void Register(MxCore* p_listener);
 	void Unregister(MxCore* p_listener);
-	void FUN_100293c0(undefined4, const MxAtomId&, undefined2);
+	void FUN_100293c0(undefined4, const char*, undefined2);
 
 	// SYNTHETIC: LEGO1 0x10028d40
 	// LegoControlManager::`scalar deleting destructor'
diff --git a/LEGO1/lego/legoomni/src/control/legocontrolmanager.cpp b/LEGO1/lego/legoomni/src/control/legocontrolmanager.cpp
index 64c19cd5..481bd9c5 100644
--- a/LEGO1/lego/legoomni/src/control/legocontrolmanager.cpp
+++ b/LEGO1/lego/legoomni/src/control/legocontrolmanager.cpp
@@ -31,7 +31,7 @@ void LegoControlManager::Unregister(MxCore* p_listener)
 }
 
 // STUB: LEGO1 0x100293c0
-void LegoControlManager::FUN_100293c0(undefined4, const MxAtomId&, undefined2)
+void LegoControlManager::FUN_100293c0(undefined4, const char*, undefined2)
 {
 }
 
diff --git a/LEGO1/lego/legoomni/src/infocenter/elevatorbottom.cpp b/LEGO1/lego/legoomni/src/infocenter/elevatorbottom.cpp
index ad199882..c3d6a7a2 100644
--- a/LEGO1/lego/legoomni/src/infocenter/elevatorbottom.cpp
+++ b/LEGO1/lego/legoomni/src/infocenter/elevatorbottom.cpp
@@ -1,7 +1,5 @@
 #include "elevatorbottom.h"
 
-DECOMP_SIZE_ASSERT(ElevatorBottom, 0xfc)
-
 #include "legocontrolmanager.h"
 #include "legogamestate.h"
 #include "legoinputmanager.h"
@@ -9,6 +7,8 @@ DECOMP_SIZE_ASSERT(ElevatorBottom, 0xfc)
 #include "mxnotificationmanager.h"
 #include "mxomni.h"
 
+DECOMP_SIZE_ASSERT(ElevatorBottom, 0xfc)
+
 // FUNCTION: LEGO1 0x10017e90
 ElevatorBottom::ElevatorBottom()
 {
@@ -43,11 +43,24 @@ MxResult ElevatorBottom::Create(MxDSAction& p_dsAction)
 	return result;
 }
 
-// STUB: LEGO1 0x10018150
+// FUNCTION: LEGO1 0x10018150
 MxLong ElevatorBottom::Notify(MxParam& p_param)
 {
-	// TODO
-	return LegoWorld::Notify(p_param);
+	MxLong ret = 0;
+	LegoWorld::Notify(p_param);
+
+	if (m_worldStarted) {
+		switch (((MxNotificationParam&) p_param).GetType()) {
+		case c_notificationType17:
+			ret = HandleNotification17(p_param);
+			break;
+		case c_notificationTransitioned:
+			GameState()->HandleAction(m_unk0xf8);
+			break;
+		}
+	}
+
+	return ret;
 }
 
 // FUNCTION: LEGO1 0x100181b0
@@ -58,6 +71,12 @@ void ElevatorBottom::VTable0x50()
 	FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
 }
 
+// STUB: LEGO1 0x100181d0
+MxLong ElevatorBottom::HandleNotification17(MxParam& p_param)
+{
+	return 0;
+}
+
 // FUNCTION: LEGO1 0x100182c0
 void ElevatorBottom::VTable0x68(MxBool p_add)
 {
diff --git a/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp b/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp
index 68090a69..5ffa3676 100644
--- a/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp
+++ b/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp
@@ -35,14 +35,14 @@ Infocenter::Infocenter()
 	m_currentInfomainScript = c_noInfomain;
 	m_currentCutscene = e_noIntro;
 
-	memset(&m_entries, 0, sizeof(InfocenterUnkDataEntry) * 7);
+	memset(&m_entries, 0, sizeof(m_entries));
 
 	m_unk0x1c8 = -1;
 	SetAppCursor(1);
 	NotificationManager()->Register(this);
 
-	m_unk0x1d0 = 0;
-	m_unk0x1d2 = 0;
+	m_infoManDialogueTimer = 0;
+	m_bookAnimationTimer = 0;
 	m_unk0x1d4 = 0;
 	m_unk0x1d6 = 0;
 }
@@ -130,7 +130,7 @@ MxLong Infocenter::Notify(MxParam& p_param)
 			break;
 		case c_notificationTransitioned:
 			StopBookAnimation();
-			m_unk0x1d2 = 0;
+			m_bookAnimationTimer = 0;
 
 			if (m_infocenterState->GetUnknown0x74() == 0xc) {
 				StartCredits();
@@ -198,7 +198,7 @@ MxLong Infocenter::HandleEndAction(MxParam& p_param)
 		return result;
 
 	if (action->GetObjectId() == c_returnBackGuidanceDialogue2) {
-		ControlManager()->FUN_100293c0(0x10, action->GetAtomId(), 0);
+		ControlManager()->FUN_100293c0(0x10, action->GetAtomId().GetInternal(), 0);
 		m_unk0x1d6 = 0;
 	}
 
@@ -232,7 +232,7 @@ MxLong Infocenter::HandleEndAction(MxParam& p_param)
 		m_currentCutscene = e_noIntro;
 
 		if (m_infocenterState->GetInfocenterBufferElement(0) == 0) {
-			m_unk0x1d2 = 1;
+			m_bookAnimationTimer = 1;
 			return 1;
 		}
 		break;
@@ -278,7 +278,7 @@ MxLong Infocenter::HandleEndAction(MxParam& p_param)
 		if (m_infocenterState->GetInfocenterBufferElement(0) == 0 && m_currentInfomainScript != 40 &&
 			m_currentInfomainScript != 41 && m_currentInfomainScript != 42 && m_currentInfomainScript != 43 &&
 			m_currentInfomainScript != 44) {
-			m_unk0x1d0 = 1;
+			m_infoManDialogueTimer = 1;
 			PlayMusic(11);
 		}
 
@@ -299,8 +299,8 @@ MxLong Infocenter::HandleEndAction(MxParam& p_param)
 // STUB: LEGO1 0x1006f4e0
 void Infocenter::VTable0x50()
 {
-	m_unk0x1d0 = 0;
-	m_unk0x1d2 = 0;
+	m_infoManDialogueTimer = 0;
+	m_bookAnimationTimer = 0;
 	m_unk0x1d4 = 0;
 	m_unk0x1d6 = 0;
 
@@ -319,7 +319,7 @@ void Infocenter::VTable0x50()
 		case 4:
 			m_infocenterState->SetUnknown0x74(2);
 			if (m_infocenterState->GetInfocenterBufferElement(0) == 0) {
-				m_unk0x1d2 = 1;
+				m_bookAnimationTimer = 1;
 			}
 
 			PlayAction(c_letsGetStartedDialogue);
@@ -337,7 +337,7 @@ void Infocenter::VTable0x50()
 			return;
 		case 0xf:
 			if (m_infocenterState->GetInfocenterBufferElement(0) == 0) {
-				m_unk0x1d2 = 1;
+				m_bookAnimationTimer = 1;
 			}
 
 			PlayAction(c_clickOnInfomanDialogue);
@@ -383,7 +383,7 @@ MxLong Infocenter::HandleKeyPress(MxS8 p_key)
 			m_infocenterState->SetUnknown0x74(1);
 
 			if (m_infocenterState->GetInfocenterBufferElement(0) == 0) {
-				m_unk0x1d2 = 1;
+				m_bookAnimationTimer = 1;
 				return 1;
 			}
 			break;
@@ -452,11 +452,43 @@ void Infocenter::VTable0x68(MxBool p_add)
 	}
 }
 
-// STUB: LEGO1 0x10070af0
+// FUNCTION: LEGO1 0x10070af0
 MxResult Infocenter::Tickle()
 {
-	// TODO
-	return LegoWorld::Tickle();
+	if (m_worldStarted == FALSE) {
+		LegoWorld::Tickle();
+		return SUCCESS;
+	}
+
+	if (m_infoManDialogueTimer != 0 && (m_infoManDialogueTimer += 100) > 25000) {
+		PlayAction(c_clickOnInfomanDialogue);
+		m_infoManDialogueTimer = 0;
+	}
+
+	if (m_bookAnimationTimer != 0 && (m_bookAnimationTimer += 100) > 3000) {
+		PlayBookAnimation();
+		m_bookAnimationTimer = 1;
+	}
+
+	if (m_unk0x1d6 != 0) {
+		m_unk0x1d6 += 100;
+
+		if (m_unk0x1d6 > 3400 && m_unk0x1d6 < 3650) {
+			ControlManager()->FUN_100293c0(0x10, m_atom.GetInternal(), 1);
+		}
+		else if (m_unk0x1d6 > 3650 && m_unk0x1d6 < 3900) {
+			ControlManager()->FUN_100293c0(0x10, m_atom.GetInternal(), 0);
+		}
+		else if (m_unk0x1d6 > 3900 && m_unk0x1d6 < 4150) {
+			ControlManager()->FUN_100293c0(0x10, m_atom.GetInternal(), 1);
+		}
+		else if (m_unk0x1d6 > 4400) {
+			ControlManager()->FUN_100293c0(0x10, m_atom.GetInternal(), 0);
+			m_unk0x1d6 = 0;
+		}
+	}
+
+	return SUCCESS;
 }
 
 // FUNCTION: LEGO1 0x10070c20
diff --git a/LEGO1/lego/legoomni/src/infocenter/infocenterdoor.cpp b/LEGO1/lego/legoomni/src/infocenter/infocenterdoor.cpp
index 4c50a321..7ba892b4 100644
--- a/LEGO1/lego/legoomni/src/infocenter/infocenterdoor.cpp
+++ b/LEGO1/lego/legoomni/src/infocenter/infocenterdoor.cpp
@@ -1,24 +1,47 @@
 #include "infocenterdoor.h"
 
+#include "legocontrolmanager.h"
+#include "legogamestate.h"
 #include "legoinputmanager.h"
 #include "legoomni.h"
+#include "mxnotificationmanager.h"
 
-// STUB: LEGO1 0x10037730
+DECOMP_SIZE_ASSERT(InfocenterDoor, 0xfc)
+
+// FUNCTION: LEGO1 0x10037730
 InfocenterDoor::InfocenterDoor()
 {
-	// TODO
+	m_unk0xf8 = 0;
+
+	NotificationManager()->Register(this);
 }
 
-// STUB: LEGO1 0x100378f0
+// FUNCTION: LEGO1 0x100378f0
 InfocenterDoor::~InfocenterDoor()
 {
-	// TODO
+	if (InputManager()->GetWorld() == this) {
+		InputManager()->ClearWorld();
+	}
+
+	ControlManager()->Unregister(this);
+	NotificationManager()->Unregister(this);
 }
 
-// STUB: LEGO1 0x10037980
+// FUNCTION: LEGO1 0x10037980
 MxResult InfocenterDoor::Create(MxDSAction& p_dsAction)
 {
-	return SUCCESS;
+	MxResult result = LegoWorld::Create(p_dsAction);
+	if (result == SUCCESS) {
+		InputManager()->SetWorld(this);
+		ControlManager()->Register(this);
+	}
+
+	SetIsWorldActive(FALSE);
+
+	GameState()->SetUnknown424(3);
+	GameState()->FUN_1003a720(0);
+
+	return result;
 }
 
 // STUB: LEGO1 0x100379e0
@@ -52,8 +75,10 @@ void InfocenterDoor::VTable0x68(MxBool p_add)
 	}
 }
 
-// STUB: LEGO1 0x10037cd0
+// FUNCTION: LEGO1 0x10037cd0
 MxBool InfocenterDoor::VTable0x64()
 {
+	DeleteObjects(&m_atom, 500, 510);
+	m_unk0xf8 = 2;
 	return TRUE;
 }
diff --git a/LEGO1/lego/legoomni/src/infocenter/infocenterstate.cpp b/LEGO1/lego/legoomni/src/infocenter/infocenterstate.cpp
index 96e47c55..76ffd3ea 100644
--- a/LEGO1/lego/legoomni/src/infocenter/infocenterstate.cpp
+++ b/LEGO1/lego/legoomni/src/infocenter/infocenterstate.cpp
@@ -2,15 +2,22 @@
 
 DECOMP_SIZE_ASSERT(InfocenterState, 0x94);
 
-// STUB: LEGO1 0x10071600
+// FUNCTION: LEGO1 0x10071600
 InfocenterState::InfocenterState()
 {
 	// TODO
 	memset(m_buffer, 0, sizeof(m_buffer));
 }
 
-// STUB: LEGO1 0x10071920
+// FUNCTION: LEGO1 0x10071920
 InfocenterState::~InfocenterState()
 {
-	// TODO
+	MxS16 i = 0;
+	do {
+		if (GetInfocenterBufferElement(i) != NULL) {
+			delete GetInfocenterBufferElement(i)->GetAction();
+			delete GetInfocenterBufferElement(i);
+		}
+		i++;
+	} while (i < GetInfocenterBufferSize());
 }

From 961282e3c6dd46833c4988a7161cfeab70d47761 Mon Sep 17 00:00:00 2001
From: Ramen2X <64166386+Ramen2X@users.noreply.github.com>
Date: Sat, 20 Jan 2024 12:41:22 -0500
Subject: [PATCH 154/210] add jukeboxscript enum (#466)

---
 LEGO1/lego/legoomni/include/jukebox.h         | 83 +++++++++++++++++++
 LEGO1/lego/legoomni/src/build/helicopter.cpp  |  3 +-
 .../src/infocenter/elevatorbottom.cpp         |  3 +-
 .../legoomni/src/infocenter/infocenter.cpp    | 13 +--
 .../src/infocenter/infocenterdoor.cpp         |  3 +-
 LEGO1/lego/legoomni/src/infocenter/score.cpp  |  5 +-
 6 files changed, 99 insertions(+), 11 deletions(-)

diff --git a/LEGO1/lego/legoomni/include/jukebox.h b/LEGO1/lego/legoomni/include/jukebox.h
index de351ad9..0bef74fa 100644
--- a/LEGO1/lego/legoomni/include/jukebox.h
+++ b/LEGO1/lego/legoomni/include/jukebox.h
@@ -25,6 +25,89 @@ class JukeBox : public LegoWorld {
 
 	// SYNTHETIC: LEGO1 0x1005d810
 	// JukeBox::`scalar deleting destructor'
+	enum JukeBoxScript {
+		e_mamaPapaBrickolini,
+		e_jailUnused,
+		e_act2Cave,
+		e_bricksterChase,
+		e_brickHunt,
+		e_residentialArea,
+		e_beachBlvd,
+		e_cave,
+		e_centralRoads,
+		e_jail,
+		e_hospital,
+		e_informationCenter,
+		e_policeStation,
+		e_park,
+		e_centralNorthRoad,
+		e_garageArea,
+		e_raceTrack,
+		e_beach,
+		e_quietChirping,
+		e_jetskiRace,
+		e_act3Pursuit,
+
+		e_legoRadioReminder1,
+		e_legoRadioJingle1,
+		e_legoRadioJingle2,
+		e_legoRadioJingle3,
+		e_legoRadioJingle4,
+		e_legoRadioReminder2,
+
+		e_legoRadioRacingAd,
+
+		e_legoRadioNews1,
+		e_legoRadioNews2,
+
+		e_legoRadioPizzaAd1,
+
+		e_legoRadioBricksterPSA,
+
+		e_legoRadioSports1,
+
+		e_legoRadioIntermission1,
+		e_legoRadioIntermission2,
+
+		e_legoRadioPizzaAd2,
+
+		e_legoRadioWeatherReport,
+
+		e_legoRadioSports2,
+
+		e_legoRadioPizzaAd3,
+
+		e_legoRadioIntermission3,
+
+		e_legoRadioSuperStoreAd,
+
+		e_legoRadioLuckyYou,
+		e_legoRadioJazzInterlude,
+		e_legoRadioPianoInterlude1,
+		e_legoRadioPoliceStation,
+		e_legoRadioPianoInterlude2,
+		e_legoRadioCredits,
+
+		e_helicopterBuild,
+		e_padding1,
+		e_duneBuggyBuild,
+		e_padding2,
+		e_jetskiBuild,
+		e_padding3,
+		e_raceCarBuild,
+		e_padding4,
+
+		e_jukeBoxMamaPapaBrickolini,
+		e_jukeBoxBrickByBrick,
+		e_jukeBoxTheBrickster,
+		e_jukeBoxBuildMeABridgeToday,
+		e_jukeBoxBaroqueInBrick,
+		e_jukeBoxMantaRay,
+
+		e_observationDeck,
+		e_elevator,
+		e_pizzaMission,
+	};
 
 private:
 	undefined m_unk0xf8[4]; // 0xf8
diff --git a/LEGO1/lego/legoomni/src/build/helicopter.cpp b/LEGO1/lego/legoomni/src/build/helicopter.cpp
index 7cb41b67..9f5cc843 100644
--- a/LEGO1/lego/legoomni/src/build/helicopter.cpp
+++ b/LEGO1/lego/legoomni/src/build/helicopter.cpp
@@ -3,6 +3,7 @@
 #include "act1state.h"
 #include "act3.h"
 #include "isle.h"
+#include "jukebox.h"
 #include "legoanimationmanager.h"
 #include "legocontrolmanager.h"
 #include "legogamestate.h"
@@ -102,7 +103,7 @@ MxU32 Helicopter::VTable0xcc()
 		FUN_10015820(TRUE, 0);
 		TransitionManager()->StartTransition(MxTransitionManager::e_pixelation, 50, FALSE, TRUE);
 		SetUnknownDC(4);
-		PlayMusic(9);
+		PlayMusic(JukeBox::e_jail);
 		break;
 	case 1:
 		m_script = *g_act2mainScript;
diff --git a/LEGO1/lego/legoomni/src/infocenter/elevatorbottom.cpp b/LEGO1/lego/legoomni/src/infocenter/elevatorbottom.cpp
index c3d6a7a2..ab4d3cff 100644
--- a/LEGO1/lego/legoomni/src/infocenter/elevatorbottom.cpp
+++ b/LEGO1/lego/legoomni/src/infocenter/elevatorbottom.cpp
@@ -1,5 +1,6 @@
 #include "elevatorbottom.h"
 
+#include "jukebox.h"
 #include "legocontrolmanager.h"
 #include "legogamestate.h"
 #include "legoinputmanager.h"
@@ -67,7 +68,7 @@ MxLong ElevatorBottom::Notify(MxParam& p_param)
 void ElevatorBottom::VTable0x50()
 {
 	LegoWorld::VTable0x50();
-	PlayMusic(11);
+	PlayMusic(JukeBox::e_informationCenter);
 	FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
 }
 
diff --git a/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp b/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp
index 5ffa3676..170147d0 100644
--- a/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp
+++ b/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp
@@ -1,6 +1,7 @@
 #include "infocenter.h"
 
 #include "infocenterstate.h"
+#include "jukebox.h"
 #include "legocontrolmanager.h"
 #include "legogamestate.h"
 #include "legoinputmanager.h"
@@ -165,7 +166,7 @@ MxLong Infocenter::HandleEndAction(MxParam& p_param)
 		}
 
 		if (!m_unk0x1d4) {
-			PlayMusic(11);
+			PlayMusic(JukeBox::e_informationCenter);
 			GameState()->FUN_10039780(m_unk0xfc);
 
 			switch (m_unk0xfc) {
@@ -279,7 +280,7 @@ MxLong Infocenter::HandleEndAction(MxParam& p_param)
 			m_currentInfomainScript != 41 && m_currentInfomainScript != 42 && m_currentInfomainScript != 43 &&
 			m_currentInfomainScript != 44) {
 			m_infoManDialogueTimer = 1;
-			PlayMusic(11);
+			PlayMusic(JukeBox::e_informationCenter);
 		}
 
 		m_infocenterState->SetUnknown0x74(2);
@@ -323,15 +324,15 @@ void Infocenter::VTable0x50()
 			}
 
 			PlayAction(c_letsGetStartedDialogue);
-			PlayMusic(11);
+			PlayMusic(JukeBox::e_informationCenter);
 			FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
 			return;
 		default:
-			PlayMusic(11);
+			PlayMusic(JukeBox::e_informationCenter);
 			// TODO
 			break;
 		case 8:
-			PlayMusic(11);
+			PlayMusic(JukeBox::e_informationCenter);
 			PlayAction(c_exitConfirmationDialogue);
 			FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
 			return;
@@ -341,7 +342,7 @@ void Infocenter::VTable0x50()
 			}
 
 			PlayAction(c_clickOnInfomanDialogue);
-			PlayMusic(11);
+			PlayMusic(JukeBox::e_informationCenter);
 			FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
 			return;
 		}
diff --git a/LEGO1/lego/legoomni/src/infocenter/infocenterdoor.cpp b/LEGO1/lego/legoomni/src/infocenter/infocenterdoor.cpp
index 7ba892b4..79e88a99 100644
--- a/LEGO1/lego/legoomni/src/infocenter/infocenterdoor.cpp
+++ b/LEGO1/lego/legoomni/src/infocenter/infocenterdoor.cpp
@@ -1,5 +1,6 @@
 #include "infocenterdoor.h"
 
+#include "jukebox.h"
 #include "legocontrolmanager.h"
 #include "legogamestate.h"
 #include "legoinputmanager.h"
@@ -55,7 +56,7 @@ MxLong InfocenterDoor::Notify(MxParam& p_param)
 void InfocenterDoor::VTable0x50()
 {
 	LegoWorld::VTable0x50();
-	PlayMusic(11);
+	PlayMusic(JukeBox::e_informationCenter);
 	FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
 }
 
diff --git a/LEGO1/lego/legoomni/src/infocenter/score.cpp b/LEGO1/lego/legoomni/src/infocenter/score.cpp
index 5a7a95a3..2d7d8c05 100644
--- a/LEGO1/lego/legoomni/src/infocenter/score.cpp
+++ b/LEGO1/lego/legoomni/src/infocenter/score.cpp
@@ -2,6 +2,7 @@
 
 #include "ambulancemissionstate.h"
 #include "gifmanager.h"
+#include "jukebox.h"
 #include "legocontrolmanager.h"
 #include "legogamestate.h"
 #include "legoinputmanager.h"
@@ -119,7 +120,7 @@ MxLong Score::FUN_10001510(MxEndActionNotificationParam& p_param)
 			TransitionManager()->StartTransition(MxTransitionManager::e_pixelation, 0x32, 0, 0);
 			break;
 		case 0x1f5:
-			PlayMusic(11);
+			PlayMusic(JukeBox::e_informationCenter);
 			m_state->SetTutorialFlag(FALSE);
 		}
 	}
@@ -145,7 +146,7 @@ void Score::VTable0x50()
 		Start(&action);
 	}
 	else
-		PlayMusic(11);
+		PlayMusic(JukeBox::e_informationCenter);
 
 	FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
 }

From ea5f9b48863631df46039aa7c96c929e31c1a6eb Mon Sep 17 00:00:00 2001
From: Misha <106913236+MishaProductions@users.noreply.github.com>
Date: Sat, 20 Jan 2024 14:31:07 -0500
Subject: [PATCH 155/210] Implement MxDisplaySurface::VTable0x44 (#467)

* Update mxdisplaysurface.cpp

* add arguments to header

* Fix glitched bitmaps

* WIP fixes

* Match

* Fix

* Changes

* Fixes

---------

Co-authored-by: Christian Semmler <mail@csemmler.com>
---
 LEGO1/omni/include/mxdisplaysurface.h     |  13 +-
 LEGO1/omni/src/video/mxdisplaysurface.cpp | 163 ++++++++++++++++++----
 2 files changed, 145 insertions(+), 31 deletions(-)

diff --git a/LEGO1/omni/include/mxdisplaysurface.h b/LEGO1/omni/include/mxdisplaysurface.h
index c841fccc..dde3d086 100644
--- a/LEGO1/omni/include/mxdisplaysurface.h
+++ b/LEGO1/omni/include/mxdisplaysurface.h
@@ -80,10 +80,15 @@ class MxDisplaySurface : public MxCore {
 		MxS32 p_top2,
 		MxS32 p_width,
 		MxS32 p_height
-	);                                                                                      // vtable+0x38
-	virtual void GetDC(HDC* p_hdc);                                                         // vtable+0x3c
-	virtual void ReleaseDC(HDC p_hdc);                                                      // vtable+0x40
-	virtual LPDIRECTDRAWSURFACE VTable0x44(MxBitmap*, undefined4*, undefined4, undefined4); // vtable+0x44
+	);                                 // vtable+0x38
+	virtual void GetDC(HDC* p_hdc);    // vtable+0x3c
+	virtual void ReleaseDC(HDC p_hdc); // vtable+0x40
+	virtual LPDIRECTDRAWSURFACE VTable0x44(
+		MxBitmap* p_bitmap,
+		undefined4* p_ret,
+		undefined4 p_doNotWriteToSurface,
+		undefined4 p_transparent
+	); // vtable+0x44
 
 	void ClearScreen();
 	static LPDIRECTDRAWSURFACE FUN_100bc070();
diff --git a/LEGO1/omni/src/video/mxdisplaysurface.cpp b/LEGO1/omni/src/video/mxdisplaysurface.cpp
index c1b45963..fe67aebb 100644
--- a/LEGO1/omni/src/video/mxdisplaysurface.cpp
+++ b/LEGO1/omni/src/video/mxdisplaysurface.cpp
@@ -328,30 +328,7 @@ void MxDisplaySurface::VTable0x28(
 		}
 
 		if (hr == DD_OK) {
-			MxU8* data;
-
-			switch (p_bitmap->GetBmiHeader()->biCompression) {
-			case BI_RGB: {
-				MxS32 rowsBeforeTop;
-				if (p_bitmap->GetBmiHeight() < 0)
-					rowsBeforeTop = p_top;
-				else
-					rowsBeforeTop = p_bitmap->GetBmiHeightAbs() - p_top - 1;
-				data = p_bitmap->GetBitmapData() + p_left + (p_bitmap->GetBmiStride() * rowsBeforeTop);
-				break;
-			}
-			case BI_RGB_TOPDOWN:
-				data = p_bitmap->GetBitmapData();
-				break;
-			default: {
-				MxS32 rowsBeforeTop;
-				if (p_bitmap->GetBmiHeight() < 0)
-					rowsBeforeTop = 0;
-				else
-					rowsBeforeTop = p_bitmap->GetBmiHeightAbs() - 1;
-				data = p_bitmap->GetBitmapData() + (p_bitmap->GetBmiStride() * rowsBeforeTop);
-			}
-			}
+			MxU8* data = p_bitmap->GetStart(p_left, p_top);
 
 			if (m_videoParam.Flags().GetF1bit3()) {
 				p_bottom *= 2;
@@ -564,10 +541,142 @@ void MxDisplaySurface::ReleaseDC(HDC p_hdc)
 		this->m_ddSurface2->ReleaseDC(p_hdc);
 }
 
-// STUB: LEGO1 0x100bbc60
-LPDIRECTDRAWSURFACE MxDisplaySurface::VTable0x44(MxBitmap*, undefined4*, undefined4, undefined4)
+// FUNCTION: LEGO1 0x100bbc60
+LPDIRECTDRAWSURFACE MxDisplaySurface::VTable0x44(
+	MxBitmap* p_bitmap,
+	undefined4* p_ret,
+	undefined4 p_doNotWriteToSurface,
+	undefined4 p_transparent
+)
 {
-	return NULL;
+	LPDIRECTDRAWSURFACE surface = NULL;
+	LPDIRECTDRAW draw = MVideoManager()->GetDirectDraw();
+	MVideoManager();
+
+	DDSURFACEDESC ddsd;
+	memset(&ddsd, 0, sizeof(ddsd));
+	ddsd.dwSize = sizeof(ddsd);
+
+	if (draw->GetDisplayMode(&ddsd))
+		return NULL;
+
+	ddsd.dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH | DDSD_PIXELFORMAT;
+	ddsd.dwWidth = p_bitmap->GetBmiWidth();
+	ddsd.dwHeight = p_bitmap->GetBmiHeightAbs();
+
+	*p_ret = 0;
+	ddsd.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY | DDSCAPS_OFFSCREENPLAIN;
+
+	if (draw->CreateSurface(&ddsd, &surface, NULL) != S_OK) {
+		if (*p_ret) {
+			*p_ret = 0;
+
+			// Try creating bitmap surface in vram if system ram ran out
+			ddsd.ddsCaps.dwCaps &= ~DDSCAPS_VIDEOMEMORY;
+			ddsd.ddsCaps.dwCaps |= DDSCAPS_SYSTEMMEMORY;
+
+			if (draw->CreateSurface(&ddsd, &surface, NULL) != S_OK) {
+				surface = NULL;
+			}
+		}
+		else
+			surface = NULL;
+	}
+
+	if (surface) {
+		memset(&ddsd, 0, sizeof(ddsd));
+		ddsd.dwSize = sizeof(ddsd);
+
+		if (surface->Lock(NULL, &ddsd, DDLOCK_WAIT, 0) != S_OK) {
+			surface->Release();
+			surface = NULL;
+			goto done;
+		}
+
+		if (p_doNotWriteToSurface) {
+			goto done;
+		}
+
+		MxU8* bitmapSrcPtr = p_bitmap->GetStart(0, 0);
+		MxU16* surfaceData = (MxU16*) ddsd.lpSurface;
+		MxLong widthNormal = p_bitmap->GetBmiWidth();
+		MxLong heightAbs = p_bitmap->GetBmiHeightAbs();
+
+		// TODO: Probably p_bitmap->GetAdjustedStride()
+		MxS32 rowSeek = p_bitmap->GetBmiStride();
+		if (p_bitmap->GetBmiHeader()->biCompression != BI_RGB_TOPDOWN && p_bitmap->GetBmiHeight() >= 0)
+			rowSeek = -rowSeek;
+
+		MxLong newPitch = ddsd.lPitch;
+		switch (ddsd.ddpfPixelFormat.dwRGBBitCount) {
+		case 8: {
+			for (MxS32 y = heightAbs; y > 0; y--) {
+				memcpy(surfaceData, bitmapSrcPtr, p_bitmap->GetBmiHeight());
+				bitmapSrcPtr += rowSeek;
+				surfaceData = (MxU16*) ((MxU8*) surfaceData + newPitch);
+			}
+
+			surface->Unlock(ddsd.lpSurface);
+
+			if (p_transparent && surface) {
+				DDCOLORKEY key;
+				key.dwColorSpaceHighValue = 0;
+				key.dwColorSpaceLowValue = 0;
+				surface->SetColorKey(DDCKEY_SRCBLT, &key);
+			}
+			break;
+		}
+		case 16:
+			if (m_16bitPal == NULL) {
+				if (surface) {
+					surface->Release();
+				}
+				return NULL;
+			}
+			else {
+				rowSeek -= p_bitmap->GetBmiWidth();
+				newPitch -= 2 * p_bitmap->GetBmiWidth();
+
+				if (p_transparent) {
+					for (MxS32 y = heightAbs; y > 0; y--) {
+						for (MxS32 x = widthNormal; x > 0; x--) {
+							if (*bitmapSrcPtr) {
+								*surfaceData = m_16bitPal[*bitmapSrcPtr];
+							}
+							else {
+								*surfaceData = 31775;
+							}
+							bitmapSrcPtr++;
+							surfaceData++;
+						}
+
+						bitmapSrcPtr += rowSeek;
+						surfaceData = (MxU16*) ((MxU8*) surfaceData + newPitch);
+					}
+
+					DDCOLORKEY key;
+					key.dwColorSpaceHighValue = 31775;
+					key.dwColorSpaceLowValue = 31775;
+					surface->SetColorKey(DDCKEY_SRCBLT, &key);
+				}
+				else {
+					for (MxS32 y = heightAbs; y > 0; y--) {
+						for (MxS32 x = widthNormal; x > 0; x--) {
+							*surfaceData++ = m_16bitPal[*bitmapSrcPtr++];
+						}
+
+						bitmapSrcPtr += rowSeek;
+						surfaceData = (MxU16*) ((MxU8*) surfaceData + newPitch);
+					}
+				}
+
+				surface->Unlock(ddsd.lpSurface);
+			}
+		}
+	}
+
+done:
+	return surface;
 }
 
 // STUB: LEGO1 0x100bc070

From 46ad56776030805802d3e8fc1845085fac04781f Mon Sep 17 00:00:00 2001
From: Joshua Peisach <itzswirlz2020@outlook.com>
Date: Sat, 20 Jan 2024 15:40:00 -0500
Subject: [PATCH 156/210] Implmement PoliceState::VTable0x1c (#468)

* Implmement PoliceState::VTable0x1c

* Fixes

---------

Co-authored-by: Christian Semmler <mail@csemmler.com>
---
 LEGO1/lego/legoomni/include/policestate.h     |  2 +
 .../lego/legoomni/src/police/policestate.cpp  | 18 ++++++++
 .../src/towtrack/towtrackmissionstate.cpp     | 43 +++++++++++++------
 3 files changed, 51 insertions(+), 12 deletions(-)

diff --git a/LEGO1/lego/legoomni/include/policestate.h b/LEGO1/lego/legoomni/include/policestate.h
index be55ecae..517710ab 100644
--- a/LEGO1/lego/legoomni/include/policestate.h
+++ b/LEGO1/lego/legoomni/include/policestate.h
@@ -26,6 +26,8 @@ class PoliceState : public LegoState {
 	// SYNTHETIC: LEGO1 0x1005e920
 	// PoliceState::`scalar deleting destructor'
 
+	virtual MxResult VTable0x1c(LegoFileStream* p_legoFileStream) override; // vtable+0x1C
+
 private:
 	undefined4 m_unk0x8; // 0x8
 	undefined4 m_unk0xc; // 0xc
diff --git a/LEGO1/lego/legoomni/src/police/policestate.cpp b/LEGO1/lego/legoomni/src/police/policestate.cpp
index 4965a36f..b0011ccb 100644
--- a/LEGO1/lego/legoomni/src/police/policestate.cpp
+++ b/LEGO1/lego/legoomni/src/police/policestate.cpp
@@ -10,3 +10,21 @@ PoliceState::PoliceState()
 	m_unk0xc = 0;
 	m_unk0x8 = (rand() % 2 == 0) ? 501 : 500;
 }
+
+// FUNCTION: LEGO1 0x1005e990
+MxResult PoliceState::VTable0x1c(LegoFileStream* p_legoFileStream)
+{
+	if (p_legoFileStream->IsWriteMode()) {
+		p_legoFileStream->FUN_10006030(ClassName());
+	}
+
+	if (p_legoFileStream->IsReadMode()) {
+		p_legoFileStream->Read(&m_unk0x8, sizeof(m_unk0x8));
+	}
+	else {
+		undefined4 unk0x8 = m_unk0x8;
+		p_legoFileStream->Write(&unk0x8, sizeof(m_unk0x8));
+	}
+
+	return SUCCESS;
+}
diff --git a/LEGO1/lego/legoomni/src/towtrack/towtrackmissionstate.cpp b/LEGO1/lego/legoomni/src/towtrack/towtrackmissionstate.cpp
index 8d3d56b9..a5719da5 100644
--- a/LEGO1/lego/legoomni/src/towtrack/towtrackmissionstate.cpp
+++ b/LEGO1/lego/legoomni/src/towtrack/towtrackmissionstate.cpp
@@ -28,18 +28,6 @@ MxResult TowTrackMissionState::VTable0x1c(LegoFileStream* p_legoFileStream)
 	}
 
 	if (p_legoFileStream->IsReadMode()) {
-		p_legoFileStream->Write(&m_unk0x12, sizeof(MxU16));
-		p_legoFileStream->Write(&m_unk0x14, sizeof(MxU16));
-		p_legoFileStream->Write(&m_unk0x16, sizeof(MxU16));
-		p_legoFileStream->Write(&m_unk0x18, sizeof(MxU16));
-		p_legoFileStream->Write(&m_unk0x1a, sizeof(MxU16));
-		p_legoFileStream->Write(&m_unk0x1c, sizeof(MxU16));
-		p_legoFileStream->Write(&m_color1, sizeof(MxU16));
-		p_legoFileStream->Write(&m_color2, sizeof(MxU16));
-		p_legoFileStream->Write(&m_color3, sizeof(MxU16));
-		p_legoFileStream->Write(&m_color4, sizeof(MxU16));
-	}
-	else if (p_legoFileStream->IsWriteMode()) {
 		p_legoFileStream->Read(&m_unk0x12, sizeof(MxU16));
 		p_legoFileStream->Read(&m_unk0x14, sizeof(MxU16));
 		p_legoFileStream->Read(&m_unk0x16, sizeof(MxU16));
@@ -51,6 +39,37 @@ MxResult TowTrackMissionState::VTable0x1c(LegoFileStream* p_legoFileStream)
 		p_legoFileStream->Read(&m_color3, sizeof(MxU16));
 		p_legoFileStream->Read(&m_color4, sizeof(MxU16));
 	}
+	else if (p_legoFileStream->IsWriteMode()) {
+		MxU16 write = m_unk0x12;
+		p_legoFileStream->Write(&write, sizeof(MxU16));
+
+		write = m_unk0x14;
+		p_legoFileStream->Write(&write, sizeof(MxU16));
+
+		write = m_unk0x16;
+		p_legoFileStream->Write(&write, sizeof(MxU16));
+
+		write = m_unk0x18;
+		p_legoFileStream->Write(&write, sizeof(MxU16));
+
+		write = m_unk0x1a;
+		p_legoFileStream->Write(&write, sizeof(MxU16));
+
+		write = m_unk0x1c;
+		p_legoFileStream->Write(&write, sizeof(MxU16));
+
+		write = m_color1;
+		p_legoFileStream->Write(&write, sizeof(MxU16));
+
+		write = m_color2;
+		p_legoFileStream->Write(&write, sizeof(MxU16));
+
+		write = m_color3;
+		p_legoFileStream->Write(&write, sizeof(MxU16));
+
+		write = m_color4;
+		p_legoFileStream->Write(&write, sizeof(MxU16));
+	}
 
 	return SUCCESS;
 }

From 1c612a2d2596733159394abaab025974c1d34383 Mon Sep 17 00:00:00 2001
From: Misha <106913236+MishaProductions@users.noreply.github.com>
Date: Sat, 20 Jan 2024 15:43:53 -0500
Subject: [PATCH 157/210] Implement Lego3DView::Render (#470)

* Implement Lego3DView::Render

* use MxDouble

* Revert "use MxDouble"

This reverts commit a006b60e2066b79ded3e15e143a302d8fd707deb.
---
 LEGO1/lego/sources/3dmanager/lego3dview.cpp | 11 ++++-------
 LEGO1/viewmanager/viewmanager.cpp           |  5 +++++
 LEGO1/viewmanager/viewmanager.h             |  1 +
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/LEGO1/lego/sources/3dmanager/lego3dview.cpp b/LEGO1/lego/sources/3dmanager/lego3dview.cpp
index 37b8215e..cfa274f6 100644
--- a/LEGO1/lego/sources/3dmanager/lego3dview.cpp
+++ b/LEGO1/lego/sources/3dmanager/lego3dview.cpp
@@ -138,15 +138,12 @@ BOOL Lego3DView::Moved(ViewROI& rROI)
 	return TRUE;
 }
 
-// STUB: LEGO1 0x100ab270
+// FUNCTION: LEGO1 0x100ab270
 double Lego3DView::Render(double p_und)
 {
-	// assert(m_pViewManager);
-
-	// m_pViewManager->Update(m_previousRenderTime);
-
-	// m_previousRenderTime = LegoView1::Render();
-
+	assert(m_pViewManager);
+	m_pViewManager->Update(m_previousRenderTime, p_und);
+	m_previousRenderTime = TglSurface::Render();
 	return m_previousRenderTime;
 }
 
diff --git a/LEGO1/viewmanager/viewmanager.cpp b/LEGO1/viewmanager/viewmanager.cpp
index 7d412641..3e7344d2 100644
--- a/LEGO1/viewmanager/viewmanager.cpp
+++ b/LEGO1/viewmanager/viewmanager.cpp
@@ -16,6 +16,11 @@ void ViewManager::RemoveAll(ViewROI*)
 	// TODO
 }
 
+// STUB: LEGO1 0x100a6930
+void ViewManager::Update(float p_previousRenderTime, float p_und2)
+{
+}
+
 // STUB: LEGO1 0x100a6d50
 void ViewManager::SetResolution(int width, int height)
 {
diff --git a/LEGO1/viewmanager/viewmanager.h b/LEGO1/viewmanager/viewmanager.h
index f2ccc6c6..8185c572 100644
--- a/LEGO1/viewmanager/viewmanager.h
+++ b/LEGO1/viewmanager/viewmanager.h
@@ -15,6 +15,7 @@ class ViewManager {
 	void SetPOVSource(const OrientableROI* point_of_view);
 	void SetResolution(int width, int height);
 	void SetFrustrum(float fov, float front, float back);
+	void Update(float p_previousRenderTime, float p_und2);
 
 	// SYNTHETIC: LEGO1 0x100a6000
 	// ViewManager::`scalar deleting destructor'

From 67fa5e7cca43277bab5613030921902f185fcf38 Mon Sep 17 00:00:00 2001
From: Joshua Peisach <itzswirlz2020@outlook.com>
Date: Sat, 20 Jan 2024 15:49:56 -0500
Subject: [PATCH 158/210] Begin work on Police class (#469)

* Begin work on Police class

* Use JukeBox::e_policeStation value

* Fixes

---------

Co-authored-by: Christian Semmler <mail@csemmler.com>
---
 LEGO1/lego/legoomni/include/police.h      | 12 +++++
 LEGO1/lego/legoomni/src/police/police.cpp | 57 +++++++++++++++++++++--
 2 files changed, 65 insertions(+), 4 deletions(-)

diff --git a/LEGO1/lego/legoomni/include/police.h b/LEGO1/lego/legoomni/include/police.h
index 9d6bc1c7..92e19b42 100644
--- a/LEGO1/lego/legoomni/include/police.h
+++ b/LEGO1/lego/legoomni/include/police.h
@@ -1,7 +1,11 @@
 #ifndef POLICE_H
 #define POLICE_H
 
+#include "decomp.h"
 #include "legoworld.h"
+#include "mxdsaction.h"
+#include "policestate.h"
+#include "radio.h"
 
 // VTABLE: LEGO1 0x100d8a80
 // SIZE 0x110
@@ -28,6 +32,14 @@ class Police : public LegoWorld {
 
 	// SYNTHETIC: LEGO1 0x1005e300
 	// Police::`scalar deleting destructor'
+
+	virtual MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
+	virtual void VTable0x50() override;                       // vtable+0x50
+
+private:
+	Radio m_radio;              // 0xf8
+	PoliceState* m_policeState; // 0x108
+	undefined4 m_unk0x10c;      // 0x10c
 };
 
 #endif // POLICE_H
diff --git a/LEGO1/lego/legoomni/src/police/police.cpp b/LEGO1/lego/legoomni/src/police/police.cpp
index 67577ecc..89874e00 100644
--- a/LEGO1/lego/legoomni/src/police/police.cpp
+++ b/LEGO1/lego/legoomni/src/police/police.cpp
@@ -1,15 +1,56 @@
 #include "police.h"
 
-// STUB: LEGO1 0x1005e130
+#include "jukebox.h"
+#include "legocontrolmanager.h"
+#include "legogamestate.h"
+#include "legoinputmanager.h"
+#include "legoomni.h"
+#include "mxnotificationmanager.h"
+
+DECOMP_SIZE_ASSERT(Police, 0x110)
+
+// FUNCTION: LEGO1 0x1005e130
 Police::Police()
 {
-	// TODO
+	m_policeState = NULL;
+	m_unk0x10c = 0;
+	NotificationManager()->Register(this);
 }
 
-// STUB: LEGO1 0x1005e320
+// FUNCTION: LEGO1 0x1005e320
 Police::~Police()
 {
-	// TODO
+	if (InputManager()->GetWorld() == this) {
+		InputManager()->ClearWorld();
+	}
+
+	ControlManager()->Unregister(this);
+	InputManager()->UnRegister(this);
+	NotificationManager()->Unregister(this);
+}
+
+// FUNCTION: LEGO1 0x1005e3e0
+MxResult Police::Create(MxDSAction& p_dsAction)
+{
+	MxResult ret = LegoWorld::Create(p_dsAction);
+	if (ret == SUCCESS) {
+		InputManager()->SetWorld(this);
+		ControlManager()->Register(this);
+	}
+
+	SetIsWorldActive(FALSE);
+	InputManager()->Register(this);
+
+	LegoGameState* gameState = GameState();
+	PoliceState* policeState = (PoliceState*) gameState->GetState("PoliceState");
+	if (!policeState) {
+		policeState = (PoliceState*) gameState->CreateState("PoliceState");
+	}
+
+	m_policeState = policeState;
+	GameState()->SetUnknown424(0x22);
+	GameState()->FUN_1003a720(0);
+	return ret;
 }
 
 // STUB: LEGO1 0x1005e480
@@ -19,3 +60,11 @@ MxLong Police::Notify(MxParam& p_param)
 
 	return 0;
 }
+
+// FUNCTION: LEGO1 0x1005e530
+void Police::VTable0x50()
+{
+	LegoWorld::VTable0x50();
+	PlayMusic(JukeBox::e_policeStation);
+	FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
+}

From 93012b62f491c322891976ccf60c4a5500cc32b5 Mon Sep 17 00:00:00 2001
From: Misha <106913236+MishaProductions@users.noreply.github.com>
Date: Sat, 20 Jan 2024 16:12:35 -0500
Subject: [PATCH 159/210] Implement MxDisplaySurface::CreateCursorSurface
 (#471)

* Update mxdisplaysurface.cpp

* Fixes

* Update legovideomanager.cpp

* Match to 100%

---------

Co-authored-by: Christian Semmler <mail@csemmler.com>
---
 .../lego/legoomni/include/legovideomanager.h  |  4 +-
 .../legoomni/src/video/legovideomanager.cpp   | 19 ++---
 LEGO1/omni/include/mxdisplaysurface.h         |  2 +-
 LEGO1/omni/src/video/mxdisplaysurface.cpp     | 74 ++++++++++++++++++-
 4 files changed, 85 insertions(+), 14 deletions(-)

diff --git a/LEGO1/lego/legoomni/include/legovideomanager.h b/LEGO1/lego/legoomni/include/legovideomanager.h
index a9532e87..67a7805c 100644
--- a/LEGO1/lego/legoomni/include/legovideomanager.h
+++ b/LEGO1/lego/legoomni/include/legovideomanager.h
@@ -72,8 +72,8 @@ class LegoVideoManager : public MxVideoManager {
 	MxS32 m_cursorYCopy;                  // 0x508
 	MxS32 m_cursorX;                      // 0x50c
 	MxS32 m_cursorY;                      // 0x510
-	LPDIRECTDRAWSURFACE m_unk0x514;       // 0x514
-	RECT m_unk0x518;                      // 0x518
+	LPDIRECTDRAWSURFACE m_cursorSurface;  // 0x514
+	RECT m_cursorRect;                    // 0x518
 	undefined4 m_unk0x528;                // 0x528
 	MxBool m_drawFPS;                     // 0x52c
 	RECT m_fpsRect;                       // 0x530
diff --git a/LEGO1/lego/legoomni/src/video/legovideomanager.cpp b/LEGO1/lego/legoomni/src/video/legovideomanager.cpp
index 2a5d1643..f31879b3 100644
--- a/LEGO1/lego/legoomni/src/video/legovideomanager.cpp
+++ b/LEGO1/lego/legoomni/src/video/legovideomanager.cpp
@@ -30,7 +30,7 @@ LegoVideoManager::LegoVideoManager()
 	m_cursorX = m_cursorY;
 	m_cursorYCopy = m_cursorY;
 	m_cursorXCopy = m_cursorY;
-	m_unk0x514 = NULL;
+	m_cursorSurface = NULL;
 	m_fullScreenMovie = FALSE;
 	m_drawFPS = FALSE;
 	m_unk0x528 = 0;
@@ -309,18 +309,19 @@ inline void LegoVideoManager::DrawCursor()
 
 	LPDIRECTDRAWSURFACE ddSurface2 = m_displaySurface->GetDirectDrawSurface2();
 
-	if (!m_unk0x514) {
-		m_unk0x518.top = 0;
-		m_unk0x518.left = 0;
-		m_unk0x518.bottom = 16;
-		m_unk0x518.right = 16;
-		m_unk0x514 = MxDisplaySurface::FUN_100bc070();
+	if (!m_cursorSurface) {
+		m_cursorRect.top = 0;
+		m_cursorRect.left = 0;
+		m_cursorRect.bottom = 16;
+		m_cursorRect.right = 16;
+		m_cursorSurface = MxDisplaySurface::CreateCursorSurface();
 
-		if (!m_unk0x514)
+		if (!m_cursorSurface)
 			m_drawCursor = FALSE;
 	}
 
-	ddSurface2->BltFast(m_cursorXCopy, m_cursorYCopy, m_unk0x514, &m_unk0x518, DDBLTFAST_WAIT | DDBLTFAST_SRCCOLORKEY);
+	ddSurface2
+		->BltFast(m_cursorXCopy, m_cursorYCopy, m_cursorSurface, &m_cursorRect, DDBLTFAST_WAIT | DDBLTFAST_SRCCOLORKEY);
 }
 
 // STUB: LEGO1 0x1007bbc0
diff --git a/LEGO1/omni/include/mxdisplaysurface.h b/LEGO1/omni/include/mxdisplaysurface.h
index dde3d086..1d26264c 100644
--- a/LEGO1/omni/include/mxdisplaysurface.h
+++ b/LEGO1/omni/include/mxdisplaysurface.h
@@ -91,7 +91,7 @@ class MxDisplaySurface : public MxCore {
 	); // vtable+0x44
 
 	void ClearScreen();
-	static LPDIRECTDRAWSURFACE FUN_100bc070();
+	static LPDIRECTDRAWSURFACE CreateCursorSurface();
 
 	inline LPDIRECTDRAWSURFACE GetDirectDrawSurface1() { return this->m_ddSurface1; }
 	inline LPDIRECTDRAWSURFACE GetDirectDrawSurface2() { return this->m_ddSurface2; }
diff --git a/LEGO1/omni/src/video/mxdisplaysurface.cpp b/LEGO1/omni/src/video/mxdisplaysurface.cpp
index fe67aebb..a9dc2608 100644
--- a/LEGO1/omni/src/video/mxdisplaysurface.cpp
+++ b/LEGO1/omni/src/video/mxdisplaysurface.cpp
@@ -679,9 +679,79 @@ LPDIRECTDRAWSURFACE MxDisplaySurface::VTable0x44(
 	return surface;
 }
 
-// STUB: LEGO1 0x100bc070
-LPDIRECTDRAWSURFACE MxDisplaySurface::FUN_100bc070()
+// FUNCTION: LEGO1 0x100bc070
+LPDIRECTDRAWSURFACE MxDisplaySurface::CreateCursorSurface()
 {
+	LPDIRECTDRAWSURFACE newSurface = NULL;
+	IDirectDraw* draw = MVideoManager()->GetDirectDraw();
+	MVideoManager();
+
+	DDSURFACEDESC ddsd;
+	memset(&ddsd, 0, sizeof(ddsd));
+	ddsd.dwSize = sizeof(ddsd);
+
+	if (draw->GetDisplayMode(&ddsd) != S_OK) {
+		return NULL;
+	}
+
+	if (ddsd.ddpfPixelFormat.dwRGBBitCount != 16) {
+		return NULL;
+	}
+
+	ddsd.dwWidth = 16;
+	ddsd.dwHeight = 16;
+	ddsd.dwFlags = DDSD_PIXELFORMAT | DDSD_WIDTH | DDSD_HEIGHT | DDSD_CAPS;
+	ddsd.ddsCaps.dwCaps = DDSCAPS_VIDEOMEMORY | DDSCAPS_OFFSCREENPLAIN;
+
+	if (draw->CreateSurface(&ddsd, &newSurface, NULL) != S_OK) {
+		ddsd.ddsCaps.dwCaps &= ~DDSCAPS_VIDEOMEMORY;
+		ddsd.ddsCaps.dwCaps |= DDSCAPS_SYSTEMMEMORY;
+
+		if (draw->CreateSurface(&ddsd, &newSurface, NULL) != S_OK)
+			goto done;
+	}
+
+	memset(&ddsd, 0, sizeof(ddsd));
+	ddsd.dwSize = sizeof(ddsd);
+
+	if (newSurface->Lock(NULL, &ddsd, DDLOCK_WAIT, NULL) != S_OK)
+		goto done;
+	else {
+		MxU16* surface = (MxU16*) ddsd.lpSurface;
+		MxLong pitch = ddsd.lPitch;
+
+		// draw a simple cursor to the surface
+		for (MxS32 x = 0; x < 16; x++) {
+			MxU16* surface2 = surface;
+			for (MxS32 y = 0; y < 16; y++) {
+				if ((y > 10 || x) && (x > 10 || y) && x + y != 10) {
+					if (x + y > 10)
+						*surface2 = 31775;
+					else
+						*surface2 = -1;
+				}
+				else {
+					*surface2 = 0;
+				}
+				surface2++;
+			}
+			surface = (MxU16*) ((MxU8*) surface + pitch);
+		}
+
+		newSurface->Unlock(ddsd.lpSurface);
+		DDCOLORKEY colorkey;
+		colorkey.dwColorSpaceHighValue = 31775;
+		colorkey.dwColorSpaceLowValue = 31775;
+		newSurface->SetColorKey(DDCKEY_SRCBLT, &colorkey);
+
+		return newSurface;
+	}
+
+done:
+	if (newSurface) {
+		newSurface->Release();
+	}
+
 	return NULL;
 }
 

From b5a3c5feea0a7ab2c7d42c32dc985e9485851975 Mon Sep 17 00:00:00 2001
From: MS <disinvite@users.noreply.github.com>
Date: Sat, 20 Jan 2024 18:04:46 -0500
Subject: [PATCH 160/210] Enforce vtable match (#464)

* vtable enforce

* Vtable progress

* IslePathActor subclasses

* LegoState subclasses

* LegoWorld subclasses

* Presenter progress

* Remaining presenters

* All but two that need new files

* Merge into vtable branch (#3)

* Implement MxDisplaySurface::VTable0x44 (#467)

* Update mxdisplaysurface.cpp

* add arguments to header

* Fix glitched bitmaps

* WIP fixes

* Match

* Fix

* Changes

* Fixes

---------

Co-authored-by: Christian Semmler <mail@csemmler.com>

* Implmement PoliceState::VTable0x1c (#468)

* Implmement PoliceState::VTable0x1c

* Fixes

---------

Co-authored-by: Christian Semmler <mail@csemmler.com>

* Implement Lego3DView::Render (#470)

* Implement Lego3DView::Render

* use MxDouble

* Revert "use MxDouble"

This reverts commit a006b60e2066b79ded3e15e143a302d8fd707deb.

* Begin work on Police class (#469)

* Begin work on Police class

* Use JukeBox::e_policeStation value

* Fixes

---------

Co-authored-by: Christian Semmler <mail@csemmler.com>

* Implement MxDisplaySurface::CreateCursorSurface (#471)

* Update mxdisplaysurface.cpp

* Fixes

* Update legovideomanager.cpp

* Match to 100%

---------

Co-authored-by: Christian Semmler <mail@csemmler.com>

---------

Co-authored-by: Misha <106913236+MishaProductions@users.noreply.github.com>
Co-authored-by: Christian Semmler <mail@csemmler.com>
Co-authored-by: Joshua Peisach <itzswirlz2020@outlook.com>

* Police fix

* Finish

* motocycle lower case

* Update historybook.h

* Update hospitalstate.h

* Update jetski.h

* Update legoinputmanager.h

* Update legolocomotionanimpresenter.h

* Update pizza.h

* Update act3shark.h

* Update ambulancemissionstate.h

* Update bumpbouy.h

* Update doors.h

---------

Co-authored-by: Misha <106913236+MishaProductions@users.noreply.github.com>
Co-authored-by: Christian Semmler <mail@csemmler.com>
Co-authored-by: Joshua Peisach <itzswirlz2020@outlook.com>
---
 .github/workflows/build.yml                   |  6 ++
 CMakeLists.txt                                |  8 ++
 LEGO1/lego/legoomni/include/act1state.h       |  3 +
 LEGO1/lego/legoomni/include/act2brick.h       |  2 +
 LEGO1/lego/legoomni/include/act3.h            | 11 +++
 LEGO1/lego/legoomni/include/act3shark.h       | 13 ++-
 LEGO1/lego/legoomni/include/ambulance.h       | 11 +++
 .../legoomni/include/ambulancemissionstate.h  |  2 +
 LEGO1/lego/legoomni/include/bike.h            |  5 +
 LEGO1/lego/legoomni/include/bumpbouy.h        |  7 ++
 LEGO1/lego/legoomni/include/carrace.h         |  8 ++
 LEGO1/lego/legoomni/include/doors.h           |  4 +
 LEGO1/lego/legoomni/include/dunebuggy.h       |  7 ++
 LEGO1/lego/legoomni/include/gasstation.h      |  6 ++
 LEGO1/lego/legoomni/include/gasstationstate.h |  2 +
 LEGO1/lego/legoomni/include/helicopter.h      |  4 +-
 LEGO1/lego/legoomni/include/helicopterstate.h |  3 +
 LEGO1/lego/legoomni/include/historybook.h     |  4 +
 LEGO1/lego/legoomni/include/hospital.h        |  7 ++
 LEGO1/lego/legoomni/include/hospitalstate.h   |  2 +
 LEGO1/lego/legoomni/include/isleactor.h       |  4 +
 LEGO1/lego/legoomni/include/islepathactor.h   |  2 +
 LEGO1/lego/legoomni/include/jetski.h          |  7 ++
 LEGO1/lego/legoomni/include/jukebox.h         |  9 ++
 LEGO1/lego/legoomni/include/jukeboxentity.h   |  2 +
 .../legoomni/include/lego3dwavepresenter.h    |  5 +
 LEGO1/lego/legoomni/include/legoact2.h        | 11 +++
 LEGO1/lego/legoomni/include/legoact2state.h   |  2 +
 LEGO1/lego/legoomni/include/legoactor.h       |  3 +
 .../legoomni/include/legoanimmmpresenter.h    | 12 +++
 .../lego/legoomni/include/legoanimpresenter.h |  2 +
 .../legoomni/include/legobuildingmanager.h    |  2 +
 LEGO1/lego/legoomni/include/legocarbuild.h    |  6 ++
 .../include/legocarbuildanimpresenter.h       |  6 ++
 .../lego/legoomni/include/legocarraceactor.h  |  8 ++
 .../include/legoeventnotificationparam.h      |  2 +
 .../include/legoflctexturepresenter.h         |  4 +
 .../legoomni/include/legohideanimpresenter.h  |  7 +-
 .../lego/legoomni/include/legoinputmanager.h  |  3 +
 LEGO1/lego/legoomni/include/legojetski.h      | 10 ++
 .../legoomni/include/legojetskiraceactor.h    |  5 +
 .../include/legoloadcachesoundpresenter.h     |  5 +
 .../include/legolocomotionanimpresenter.h     |  9 ++
 .../include/legoloopinganimpresenter.h        |  3 +
 .../lego/legoomni/include/legonavcontroller.h |  3 +-
 .../lego/legoomni/include/legopartpresenter.h |  4 +
 LEGO1/lego/legoomni/include/legopathactor.h   |  1 +
 .../legoomni/include/legophonemepresenter.h   |  5 +
 LEGO1/lego/legoomni/include/legoraceactor.h   |  9 ++
 LEGO1/lego/legoomni/include/legoracecar.h     | 10 ++
 .../legoomni/include/legovehiclebuildstate.h  |  2 +
 .../lego/legoomni/include/legovideomanager.h  |  2 +-
 LEGO1/lego/legoomni/include/motocycle.h       |  7 ++
 LEGO1/lego/legoomni/include/pizza.h           |  8 +-
 .../lego/legoomni/include/pizzamissionstate.h |  2 +
 LEGO1/lego/legoomni/include/pizzeria.h        |  2 +
 LEGO1/lego/legoomni/include/pizzeriastate.h   |  2 +
 LEGO1/lego/legoomni/include/police.h          |  9 +-
 LEGO1/lego/legoomni/include/policestate.h     |  4 +-
 LEGO1/lego/legoomni/include/racecar.h         |  3 +
 .../lego/legoomni/include/racestandsentity.h  | 13 +++
 LEGO1/lego/legoomni/include/racestate.h       |  2 +
 LEGO1/lego/legoomni/include/radio.h           |  2 +
 LEGO1/lego/legoomni/include/radiostate.h      |  2 +
 LEGO1/lego/legoomni/include/skateboard.h      |  6 ++
 LEGO1/lego/legoomni/include/towtrack.h        |  9 ++
 LEGO1/lego/legoomni/src/act1/act1state.cpp    | 14 +++
 LEGO1/lego/legoomni/src/act2/act2brick.cpp    |  7 ++
 LEGO1/lego/legoomni/src/act2/legoact2.cpp     | 54 ++++++++++
 .../lego/legoomni/src/act2/legoact2state.cpp  |  7 ++
 LEGO1/lego/legoomni/src/act3/act3.cpp         | 59 +++++++++++
 LEGO1/lego/legoomni/src/act3/act3shark.cpp    | 24 +++++
 .../src/audio/lego3dwavepresenter.cpp         | 26 +++++
 .../src/audio/legoloadcachesoundpresenter.cpp | 25 +++++
 LEGO1/lego/legoomni/src/build/dunebuggy.cpp   | 40 ++++++++
 .../legoomni/src/build/helicopterstate.cpp    | 14 +++
 LEGO1/lego/legoomni/src/build/jetski.cpp      | 33 +++++++
 .../src/build/legobuildingmanager.cpp         |  7 ++
 .../lego/legoomni/src/build/legocarbuild.cpp  | 33 +++++++
 .../src/build/legovehiclebuildstate.cpp       |  7 ++
 LEGO1/lego/legoomni/src/build/racecar.cpp     | 14 +++
 LEGO1/lego/legoomni/src/entity/legoactor.cpp  | 12 +++
 .../legoomni/src/entity/legocarraceactor.cpp  | 45 +++++++++
 LEGO1/lego/legoomni/src/entity/legojetski.cpp | 50 ++++++++++
 .../src/entity/legojetskiraceactor.cpp        | 25 +++++
 .../legoomni/src/entity/legonavcontroller.cpp |  7 ++
 .../legoomni/src/entity/legopathactor.cpp     |  6 ++
 .../legoomni/src/entity/legoraceactor.cpp     | 45 +++++++++
 .../lego/legoomni/src/entity/legoracecar.cpp  | 51 ++++++++++
 .../legoomni/src/gasstation/gasstation.cpp    | 33 +++++++
 .../src/gasstation/gasstationstate.cpp        |  7 ++
 .../lego/legoomni/src/hospital/ambulance.cpp  | 60 +++++++++++
 .../src/hospital/ambulancemissionstate.cpp    |  7 ++
 LEGO1/lego/legoomni/src/hospital/hospital.cpp | 40 ++++++++
 .../legoomni/src/hospital/hospitalstate.cpp   |  7 ++
 LEGO1/lego/legoomni/src/isle/bike.cpp         | 27 +++++
 LEGO1/lego/legoomni/src/isle/bumpbouy.cpp     | 31 ++++++
 LEGO1/lego/legoomni/src/isle/doors.cpp        | 20 ++++
 LEGO1/lego/legoomni/src/isle/historybook.cpp  | 20 ++++
 LEGO1/lego/legoomni/src/isle/isleactor.cpp    | 14 +++
 .../lego/legoomni/src/isle/islepathactor.cpp  |  7 ++
 LEGO1/lego/legoomni/src/isle/jukebox.cpp      | 47 +++++++++
 .../lego/legoomni/src/isle/jukeboxentity.cpp  |  7 ++
 LEGO1/lego/legoomni/src/isle/motocycle.cpp    | 40 ++++++++
 LEGO1/lego/legoomni/src/isle/radio.cpp        |  7 ++
 LEGO1/lego/legoomni/src/isle/radiostate.cpp   |  7 ++
 LEGO1/lego/legoomni/src/isle/skateboard.cpp   | 36 ++++++-
 .../src/notify/legoeventnotificationparam.cpp |  7 ++
 LEGO1/lego/legoomni/src/pizzeria/pizza.cpp    |  7 ++
 .../src/pizzeria/pizzamissionstate.cpp        |  7 ++
 LEGO1/lego/legoomni/src/pizzeria/pizzeria.cpp |  7 ++
 .../legoomni/src/pizzeria/pizzeriastate.cpp   |  7 ++
 LEGO1/lego/legoomni/src/police/police.cpp     | 20 ++++
 LEGO1/lego/legoomni/src/race/carrace.cpp      | 48 +++++++++
 LEGO1/lego/legoomni/src/race/racestate.cpp    |  7 ++
 LEGO1/lego/legoomni/src/towtrack/towtrack.cpp | 54 ++++++++++
 .../src/video/legoanimmmpresenter.cpp         | 62 ++++++++++++
 .../legoomni/src/video/legoanimpresenter.cpp  | 13 +++
 .../src/video/legocarbuildanimpresenter.cpp   | 30 ++++++
 .../src/video/legoflctexturepresenter.cpp     | 18 ++++
 .../src/video/legohideanimpresenter.cpp       | 31 ++++++
 .../src/video/legolocomotionanimpresenter.cpp | 50 ++++++++++
 .../src/video/legoloopinganimpresenter.cpp    | 13 +++
 .../legoomni/src/video/legopartpresenter.cpp  | 19 ++++
 .../src/video/legophonemepresenter.cpp        | 24 +++++
 LEGO1/lego/sources/roi/legoroi.cpp            |  6 ++
 LEGO1/lego/sources/roi/legoroi.h              |  1 +
 LEGO1/mxgeometry/mxmatrix.h                   |  3 +
 LEGO1/tgl/d3drm/group.cpp                     |  2 +-
 LEGO1/tgl/d3drm/impl.h                        |  9 +-
 LEGO1/tgl/d3drm/renderer.cpp                  |  2 +-
 LEGO1/tgl/d3drm/texture.cpp                   |  2 +-
 LEGO1/tgl/tgl.h                               |  6 +-
 LEGO1/viewmanager/viewroi.cpp                 | 18 ++++
 LEGO1/viewmanager/viewroi.h                   |  9 +-
 tools/vtable/vtable.py                        | 99 +++++++++++++++++++
 136 files changed, 1926 insertions(+), 28 deletions(-)
 create mode 100644 LEGO1/lego/legoomni/src/act2/legoact2.cpp
 create mode 100644 LEGO1/lego/legoomni/src/audio/lego3dwavepresenter.cpp
 create mode 100644 LEGO1/lego/legoomni/src/entity/legocarraceactor.cpp
 create mode 100644 LEGO1/lego/legoomni/src/entity/legojetskiraceactor.cpp
 create mode 100644 LEGO1/lego/legoomni/src/entity/legoraceactor.cpp
 create mode 100644 LEGO1/lego/legoomni/src/entity/legoracecar.cpp
 create mode 100644 LEGO1/lego/legoomni/src/isle/doors.cpp
 create mode 100644 LEGO1/lego/legoomni/src/video/legoloopinganimpresenter.cpp
 create mode 100644 tools/vtable/vtable.py

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 419033cc..51b0759f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -145,6 +145,12 @@ jobs:
       run: |
         python3 tools/verexp/verexp.py legobin/LEGO1.DLL build/LEGO1.DLL
 
+    - name: Check Vtables
+      shell: bash
+      run: |
+        python3 tools/vtable/vtable.py legobin/ISLE.EXE build/ISLE.EXE build/ISLE.PDB .
+        python3 tools/vtable/vtable.py legobin/LEGO1.DLL build/LEGO1.DLL build/LEGO1.PDB .
+
     - name: Upload Artifact
       uses: actions/upload-artifact@master
       with:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 34b67e0c..04ca97a9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,10 +27,12 @@ add_library(lego1 SHARED
   LEGO1/lego/legoomni/src/act1/act1state.cpp
   LEGO1/lego/legoomni/src/act2/act2brick.cpp
   LEGO1/lego/legoomni/src/act2/act2policestation.cpp
+  LEGO1/lego/legoomni/src/act2/legoact2.cpp
   LEGO1/lego/legoomni/src/act2/legoact2state.cpp
   LEGO1/lego/legoomni/src/act3/act3.cpp
   LEGO1/lego/legoomni/src/act3/act3shark.cpp
   LEGO1/lego/legoomni/src/act3/act3state.cpp
+  LEGO1/lego/legoomni/src/audio/lego3dwavepresenter.cpp
   LEGO1/lego/legoomni/src/audio/legocachesound.cpp
   LEGO1/lego/legoomni/src/audio/legoloadcachesoundpresenter.cpp
   LEGO1/lego/legoomni/src/audio/legosoundmanager.cpp
@@ -63,13 +65,17 @@ add_library(lego1 SHARED
   LEGO1/lego/legoomni/src/entity/legoactorpresenter.cpp
   LEGO1/lego/legoomni/src/entity/legoanimactor.cpp
   LEGO1/lego/legoomni/src/entity/legocameracontroller.cpp
+  LEGO1/lego/legoomni/src/entity/legocarraceactor.cpp
   LEGO1/lego/legoomni/src/entity/legoentity.cpp
   LEGO1/lego/legoomni/src/entity/legoentitypresenter.cpp
   LEGO1/lego/legoomni/src/entity/legojetski.cpp
+  LEGO1/lego/legoomni/src/entity/legojetskiraceactor.cpp
   LEGO1/lego/legoomni/src/entity/legonavcontroller.cpp
   LEGO1/lego/legoomni/src/entity/legopathactor.cpp
   LEGO1/lego/legoomni/src/entity/legopovcontroller.cpp
   LEGO1/lego/legoomni/src/entity/legorace.cpp
+  LEGO1/lego/legoomni/src/entity/legoraceactor.cpp
+  LEGO1/lego/legoomni/src/entity/legoracecar.cpp
   LEGO1/lego/legoomni/src/entity/legoworld.cpp
   LEGO1/lego/legoomni/src/entity/legoworldpresenter.cpp
   LEGO1/lego/legoomni/src/gasstation/gasstation.cpp
@@ -92,6 +98,7 @@ add_library(lego1 SHARED
   LEGO1/lego/legoomni/src/isle/beachhouseentity.cpp
   LEGO1/lego/legoomni/src/isle/bike.cpp
   LEGO1/lego/legoomni/src/isle/bumpbouy.cpp
+  LEGO1/lego/legoomni/src/isle/doors.cpp
   LEGO1/lego/legoomni/src/isle/historybook.cpp
   LEGO1/lego/legoomni/src/isle/isleactor.cpp
   LEGO1/lego/legoomni/src/isle/isle.cpp
@@ -128,6 +135,7 @@ add_library(lego1 SHARED
   LEGO1/lego/legoomni/src/video/legoflctexturepresenter.cpp
   LEGO1/lego/legoomni/src/video/legohideanimpresenter.cpp
   LEGO1/lego/legoomni/src/video/legolocomotionanimpresenter.cpp
+  LEGO1/lego/legoomni/src/video/legoloopinganimpresenter.cpp
   LEGO1/lego/legoomni/src/video/legometerpresenter.cpp
   LEGO1/lego/legoomni/src/video/legomodelpresenter.cpp
   LEGO1/lego/legoomni/src/video/legopalettepresenter.cpp
diff --git a/LEGO1/lego/legoomni/include/act1state.h b/LEGO1/lego/legoomni/include/act1state.h
index 82e95f63..4babf08a 100644
--- a/LEGO1/lego/legoomni/include/act1state.h
+++ b/LEGO1/lego/legoomni/include/act1state.h
@@ -22,6 +22,9 @@ class Act1State : public LegoState {
 		return !strcmp(p_name, Act1State::ClassName()) || LegoState::IsA(p_name);
 	};
 
+	virtual MxBool SetFlag() override;                                      // vtable+0x18
+	virtual MxResult VTable0x1c(LegoFileStream* p_legoFileStream) override; // vtable+0x1c
+
 	inline void SetUnknown18(MxU32 p_unk0x18) { m_unk0x18 = p_unk0x18; }
 	inline MxU32 GetUnknown18() { return m_unk0x18; }
 	inline void SetUnknown21(MxS16 p_unk0x21) { m_unk0x21 = p_unk0x21; }
diff --git a/LEGO1/lego/legoomni/include/act2brick.h b/LEGO1/lego/legoomni/include/act2brick.h
index 5eb697ed..e9f771ad 100644
--- a/LEGO1/lego/legoomni/include/act2brick.h
+++ b/LEGO1/lego/legoomni/include/act2brick.h
@@ -26,6 +26,8 @@ class Act2Brick : public LegoPathActor {
 		return !strcmp(p_name, Act2Brick::ClassName()) || LegoEntity::IsA(p_name);
 	}
 
+	virtual MxS32 VTable0x94() override; // vtable+0x94
+
 	// SYNTHETIC: LEGO1 0x1007a450
 	// Act2Brick::`scalar deleting destructor'
 };
diff --git a/LEGO1/lego/legoomni/include/act3.h b/LEGO1/lego/legoomni/include/act3.h
index 053bde82..b693663f 100644
--- a/LEGO1/lego/legoomni/include/act3.h
+++ b/LEGO1/lego/legoomni/include/act3.h
@@ -11,6 +11,9 @@ class Act3 : public LegoWorld {
 
 	virtual ~Act3() override; // vtable+00
 
+	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x4
+	virtual MxResult Tickle() override;               // vtable+0x8
+
 	// FUNCTION: LEGO1 0x10072510
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
@@ -24,6 +27,14 @@ class Act3 : public LegoWorld {
 		return !strcmp(p_name, Act3::ClassName()) || LegoWorld::IsA(p_name);
 	}
 
+	virtual MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
+	virtual void Destroy(MxBool p_fromDestructor) override;   // vtable+0x1c
+	virtual void VTable0x50() override;                       // vtable+0x50
+	virtual MxBool VTable0x5c() override;                     // vtable+0x5c
+	virtual void VTable0x60() override;                       // vtable+0x60
+	virtual MxBool VTable0x64() override;                     // vtable+0x64
+	virtual void VTable0x68(MxBool p_add) override;           // vtable+0x68
+
 	inline void SetUnkown420c(MxEntity* p_entity) { m_unk0x420c = p_entity; }
 	inline void SetUnkown4270(MxU32 p_unk0x4270) { m_unk0x4270 = p_unk0x4270; }
 
diff --git a/LEGO1/lego/legoomni/include/act3shark.h b/LEGO1/lego/legoomni/include/act3shark.h
index e6910cdb..5ba5a6f2 100644
--- a/LEGO1/lego/legoomni/include/act3shark.h
+++ b/LEGO1/lego/legoomni/include/act3shark.h
@@ -7,12 +7,23 @@
 class Act3Shark : public LegoAnimActor {
 public:
 	// FUNCTION: LEGO1 0x100430c0
-	inline virtual const char* ClassName() const override
+	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f03a0
 		return "Act3Shark";
 	}
 
+	// FUNCTION: LEGO1 0x1001a130
+	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	{
+		return !strcmp(p_name, Act3Shark::ClassName()) || LegoAnimActor::IsA(p_name);
+	}
+
+	virtual void ParseAction(char*) override;                  // vtable+0x20
+	virtual void SetWorldSpeed(MxFloat p_worldSpeed) override; // vtable+0x30
+	virtual void VTable0x70(float p_float) override;           // vtable+0x70
+	virtual void VTable0x74(Matrix4& p_transform) override;    // vtable+0x74
+
 	// SYNTHETIC: LEGO1 0x10043020
 	// Act3Shark::`scalar deleting destructor'
 };
diff --git a/LEGO1/lego/legoomni/include/ambulance.h b/LEGO1/lego/legoomni/include/ambulance.h
index 7c54561a..88fd57d8 100644
--- a/LEGO1/lego/legoomni/include/ambulance.h
+++ b/LEGO1/lego/legoomni/include/ambulance.h
@@ -9,6 +9,9 @@ class Ambulance : public IslePathActor {
 public:
 	Ambulance();
 
+	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x04
+	virtual MxResult Tickle() override;               // vtable+0x08
+
 	// FUNCTION: LEGO1 0x10035fa0
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
@@ -22,6 +25,14 @@ class Ambulance : public IslePathActor {
 		return !strcmp(p_name, Ambulance::ClassName()) || IslePathActor::IsA(p_name);
 	}
 
+	virtual MxResult Create(MxDSAction& p_dsAction) override;              // vtable+0x18
+	virtual void Destroy(MxBool p_fromDestructor) override;                // vtable+0x1c
+	virtual void VTable0x70(float p_float) override;                       // vtable+0x70
+	virtual MxU32 VTable0xcc() override;                                   // vtable+0xcc
+	virtual MxU32 VTable0xd4(MxType17NotificationParam& p_param) override; // vtable+0xd4
+	virtual MxU32 VTable0xdc(MxType19NotificationParam&) override;         // vtable+0xdc
+	virtual void VTable0xe4() override;                                    // vtable+0xe4
+
 	// SYNTHETIC: LEGO1 0x10036130
 	// Ambulance::`scalar deleting destructor'
 
diff --git a/LEGO1/lego/legoomni/include/ambulancemissionstate.h b/LEGO1/lego/legoomni/include/ambulancemissionstate.h
index cdfa608b..ea5cfb3e 100644
--- a/LEGO1/lego/legoomni/include/ambulancemissionstate.h
+++ b/LEGO1/lego/legoomni/include/ambulancemissionstate.h
@@ -22,6 +22,8 @@ class AmbulanceMissionState : public LegoState {
 		return !strcmp(p_name, AmbulanceMissionState::ClassName()) || LegoState::IsA(p_name);
 	}
 
+	virtual MxResult VTable0x1c(LegoFileStream* p_legoFileStream) override; // vtable+0x1c
+
 	inline MxU16 GetColor(MxU8 p_id)
 	{
 		switch (p_id) {
diff --git a/LEGO1/lego/legoomni/include/bike.h b/LEGO1/lego/legoomni/include/bike.h
index 29aa6063..02265604 100644
--- a/LEGO1/lego/legoomni/include/bike.h
+++ b/LEGO1/lego/legoomni/include/bike.h
@@ -23,6 +23,11 @@ class Bike : public IslePathActor {
 		return !strcmp(p_name, Bike::ClassName()) || IslePathActor::IsA(p_name);
 	}
 
+	virtual MxResult Create(MxDSAction& p_dsAction) override;              // vtable+0x18
+	virtual MxU32 VTable0xcc() override;                                   // vtable+0xcc
+	virtual MxU32 VTable0xd4(MxType17NotificationParam& p_param) override; // vtable+0xd4
+	virtual void VTable0xe4() override;                                    // vtable+0xe4
+
 	// SYNTHETIC: LEGO1 0x10076880
 	// Bike::`scalar deleting destructor'
 
diff --git a/LEGO1/lego/legoomni/include/bumpbouy.h b/LEGO1/lego/legoomni/include/bumpbouy.h
index a423ca3e..112801b2 100644
--- a/LEGO1/lego/legoomni/include/bumpbouy.h
+++ b/LEGO1/lego/legoomni/include/bumpbouy.h
@@ -7,6 +7,8 @@
 // VTABLE: LEGO1 0x100d6790
 class BumpBouy : public LegoAnimActor {
 public:
+	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x4
+
 	// FUNCTION: LEGO1 0x100274e0
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
@@ -20,6 +22,11 @@ class BumpBouy : public LegoAnimActor {
 		return !strcmp(p_name, BumpBouy::ClassName()) || LegoAnimActor::IsA(p_name);
 	}
 
+	virtual void ParseAction(char*) override;                  // vtable+0x20
+	virtual void SetWorldSpeed(MxFloat p_worldSpeed) override; // vtable+0x30
+	virtual void VTable0x70(float p_float) override;           // vtable+0x70
+	virtual void VTable0x74(Matrix4& p_transform) override;    // vtable+0x74
+
 	// SYNTHETIC: LEGO1 0x10027490
 	// BumpBouy::`scalar deleting destructor'
 };
diff --git a/LEGO1/lego/legoomni/include/carrace.h b/LEGO1/lego/legoomni/include/carrace.h
index 3a3b238a..776662db 100644
--- a/LEGO1/lego/legoomni/include/carrace.h
+++ b/LEGO1/lego/legoomni/include/carrace.h
@@ -23,6 +23,14 @@ class CarRace : public LegoRace {
 		return !strcmp(p_name, CarRace::ClassName()) || LegoRace::IsA(p_name);
 	}
 
+	virtual MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
+	virtual void VTable0x50() override;                       // vtable+0x50
+	virtual MxBool VTable0x64() override;                     // vtable+0x64
+	virtual undefined4 VTable0x6c(undefined4) override;       // vtable+0x6c
+	virtual undefined4 VTable0x70(undefined4) override;       // vtable+0x70
+	virtual undefined4 VTable0x74(undefined4) override;       // vtable+0x74
+	virtual undefined4 VTable0x78(undefined4) override;       // vtable+0x78
+
 	// SYNTHETIC: LEGO1 0x10016c70
 	// CarRace::`scalar deleting destructor'
 
diff --git a/LEGO1/lego/legoomni/include/doors.h b/LEGO1/lego/legoomni/include/doors.h
index 321fdf61..dc98a866 100644
--- a/LEGO1/lego/legoomni/include/doors.h
+++ b/LEGO1/lego/legoomni/include/doors.h
@@ -20,6 +20,10 @@ class Doors : public LegoPathActor {
 		return !strcmp(p_name, Doors::ClassName()) || LegoPathActor::IsA(p_name);
 	}
 
+	virtual void ParseAction(char*) override;        // vtable+0x20
+	virtual void VTable0x70(float p_float) override; // vtable+0x70
+	virtual MxS32 VTable0x94() override;             // vtable+0x94
+
 	// SYNTHETIC: LEGO1 0x1000e580
 	// Doors::`scalar deleting destructor'
 };
diff --git a/LEGO1/lego/legoomni/include/dunebuggy.h b/LEGO1/lego/legoomni/include/dunebuggy.h
index 918a8b1a..ca671955 100644
--- a/LEGO1/lego/legoomni/include/dunebuggy.h
+++ b/LEGO1/lego/legoomni/include/dunebuggy.h
@@ -23,6 +23,13 @@ class DuneBuggy : public IslePathActor {
 		return !strcmp(p_name, DuneBuggy::ClassName()) || IslePathActor::IsA(p_name);
 	}
 
+	virtual MxResult Create(MxDSAction& p_dsAction) override;              // vtable+0x18
+	virtual void VTable0x70(float p_float) override;                       // vtable+0x70
+	virtual MxU32 VTable0xcc() override;                                   // vtable+0xcc
+	virtual MxU32 VTable0xd4(MxType17NotificationParam& p_param) override; // vtable+0xd4
+	virtual MxU32 VTable0xdc(MxType19NotificationParam& p_param) override; // vtable+0xdc
+	virtual void VTable0xe4() override;                                    // vtable+0xe4
+
 	// SYNTHETIC: LEGO1 0x10067dc0
 	// DuneBuggy::`scalar deleting destructor'
 
diff --git a/LEGO1/lego/legoomni/include/gasstation.h b/LEGO1/lego/legoomni/include/gasstation.h
index 2c979d72..5f6c64f1 100644
--- a/LEGO1/lego/legoomni/include/gasstation.h
+++ b/LEGO1/lego/legoomni/include/gasstation.h
@@ -29,6 +29,12 @@ class GasStation : public LegoWorld {
 		return !strcmp(p_name, GasStation::ClassName()) || LegoWorld::IsA(p_name);
 	}
 
+	virtual MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
+	virtual void VTable0x50() override;                       // vtable+0x50
+	virtual MxBool VTable0x5c() override;                     // vtable+0x5c
+	virtual MxBool VTable0x64() override;                     // vtable+0x64
+	virtual void VTable0x68(MxBool p_add) override;           // vtable+0x68
+
 	// SYNTHETIC: LEGO1 0x100048a0
 	// GasStation::`scalar deleting destructor'
 
diff --git a/LEGO1/lego/legoomni/include/gasstationstate.h b/LEGO1/lego/legoomni/include/gasstationstate.h
index 0cdf7bf1..4f77e307 100644
--- a/LEGO1/lego/legoomni/include/gasstationstate.h
+++ b/LEGO1/lego/legoomni/include/gasstationstate.h
@@ -22,6 +22,8 @@ class GasStationState : public LegoState {
 		return !strcmp(p_name, GasStationState::ClassName()) || LegoState::IsA(p_name);
 	}
 
+	virtual MxResult VTable0x1c(LegoFileStream* p_legoFileStream) override; // vtable+0x1c
+
 	// SYNTHETIC: LEGO1 0x10006290
 	// GasStationState::`scalar deleting destructor'
 
diff --git a/LEGO1/lego/legoomni/include/helicopter.h b/LEGO1/lego/legoomni/include/helicopter.h
index ec4faa59..e730fee4 100644
--- a/LEGO1/lego/legoomni/include/helicopter.h
+++ b/LEGO1/lego/legoomni/include/helicopter.h
@@ -38,8 +38,8 @@ class Helicopter : public IslePathActor {
 	}
 
 	virtual MxResult Create(MxDSAction& p_dsAction) override;              // vtable+0x18
-	void VTable0x70(float p_float) override;                               // vtable+0x70
-	void VTable0x74(Matrix4& p_transform) override;                        // vtable+0x74
+	virtual void VTable0x70(float p_float) override;                       // vtable+0x70
+	virtual void VTable0x74(Matrix4& p_transform) override;                // vtable+0x74
 	virtual MxU32 VTable0xcc() override;                                   // vtable+0xcc
 	virtual MxU32 VTable0xd4(MxType17NotificationParam& p_param) override; // vtable+0xd4
 	virtual MxU32 VTable0xd8(MxType18NotificationParam& p_param) override; // vtable+0xd8
diff --git a/LEGO1/lego/legoomni/include/helicopterstate.h b/LEGO1/lego/legoomni/include/helicopterstate.h
index 41dcf84b..eb104c93 100644
--- a/LEGO1/lego/legoomni/include/helicopterstate.h
+++ b/LEGO1/lego/legoomni/include/helicopterstate.h
@@ -21,6 +21,9 @@ class HelicopterState : public LegoState {
 		return !strcmp(p_name, HelicopterState::ClassName()) || LegoState::IsA(p_name);
 	}
 
+	virtual MxBool VTable0x14() override; // vtable+0x14
+	virtual MxBool SetFlag() override;    // vtable+0x18
+
 	inline void SetUnknown8(MxU32 p_unk0x8) { m_unk0x8 = p_unk0x8; }
 	inline MxU32 GetUnkown8() { return m_unk0x8; }
 
diff --git a/LEGO1/lego/legoomni/include/historybook.h b/LEGO1/lego/legoomni/include/historybook.h
index 101e45a6..172dde98 100644
--- a/LEGO1/lego/legoomni/include/historybook.h
+++ b/LEGO1/lego/legoomni/include/historybook.h
@@ -25,6 +25,10 @@ class HistoryBook : public LegoWorld {
 		return !strcmp(p_name, HistoryBook::ClassName()) || LegoWorld::IsA(p_name);
 	}
 
+	virtual MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
+	virtual void VTable0x50() override;                       // vtable+0x50
+	virtual MxBool VTable0x64() override;                     // vtable+0x64
+
 	// SYNTHETIC: LEGO1 0x100824b0
 	// HistoryBook::`scalar deleting destructor'
 };
diff --git a/LEGO1/lego/legoomni/include/hospital.h b/LEGO1/lego/legoomni/include/hospital.h
index bbaa3e74..3e88a58a 100644
--- a/LEGO1/lego/legoomni/include/hospital.h
+++ b/LEGO1/lego/legoomni/include/hospital.h
@@ -12,6 +12,7 @@ class Hospital : public LegoWorld {
 	virtual ~Hospital() override; // vtable+0x0
 
 	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x04
+	virtual MxResult Tickle() override;               // vtable+0x08
 
 	// FUNCTION: LEGO1 0x100746b0
 	inline virtual const char* ClassName() const override // vtable+0x0c
@@ -26,6 +27,12 @@ class Hospital : public LegoWorld {
 		return !strcmp(p_name, Hospital::ClassName()) || LegoWorld::IsA(p_name);
 	}
 
+	virtual MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
+	virtual void VTable0x50() override;                       // vtable+0x50
+	virtual MxBool VTable0x5c() override;                     // vtable+0x5c
+	virtual MxBool VTable0x64() override;                     // vtable+0x64
+	virtual void VTable0x68(MxBool p_add) override;           // vtable+0x68
+
 	// SYNTHETIC: LEGO1 0x100747d0
 	// Hospital::`scalar deleting destructor'
 
diff --git a/LEGO1/lego/legoomni/include/hospitalstate.h b/LEGO1/lego/legoomni/include/hospitalstate.h
index 7fabe10a..af876f89 100644
--- a/LEGO1/lego/legoomni/include/hospitalstate.h
+++ b/LEGO1/lego/legoomni/include/hospitalstate.h
@@ -23,6 +23,8 @@ class HospitalState : public LegoState {
 		return !strcmp(p_name, HospitalState::ClassName()) || LegoState::IsA(p_name);
 	}
 
+	virtual MxResult VTable0x1c(LegoFileStream* p_legoFileStream) override; // vtable+0x1c
+
 	// SYNTHETIC: LEGO1 0x100764c0
 	// HospitalState::`scalar deleting destructor'
 
diff --git a/LEGO1/lego/legoomni/include/isleactor.h b/LEGO1/lego/legoomni/include/isleactor.h
index 1c2ddc5c..f9092363 100644
--- a/LEGO1/lego/legoomni/include/isleactor.h
+++ b/LEGO1/lego/legoomni/include/isleactor.h
@@ -6,6 +6,8 @@
 // VTABLE: LEGO1 0x100d5178
 class IsleActor : public LegoActor {
 public:
+	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x4
+
 	// FUNCTION: LEGO1 0x1000e660
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
@@ -18,6 +20,8 @@ class IsleActor : public LegoActor {
 	{
 		return !strcmp(p_name, IsleActor::ClassName()) || LegoActor::IsA(p_name);
 	}
+
+	virtual MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
 };
 
 // SYNTHETIC: LEGO1 0x1000e940
diff --git a/LEGO1/lego/legoomni/include/islepathactor.h b/LEGO1/lego/legoomni/include/islepathactor.h
index 96a3dce7..e2944876 100644
--- a/LEGO1/lego/legoomni/include/islepathactor.h
+++ b/LEGO1/lego/legoomni/include/islepathactor.h
@@ -17,6 +17,8 @@ class IslePathActor : public LegoPathActor {
 	// FUNCTION: LEGO1 0x10002e10
 	inline virtual ~IslePathActor() override { IslePathActor::Destroy(TRUE); } // vtable+0x0
 
+	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x4
+
 	// FUNCTION: LEGO1 0x10002ea0
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
diff --git a/LEGO1/lego/legoomni/include/jetski.h b/LEGO1/lego/legoomni/include/jetski.h
index c0129dbd..c3136d80 100644
--- a/LEGO1/lego/legoomni/include/jetski.h
+++ b/LEGO1/lego/legoomni/include/jetski.h
@@ -3,6 +3,7 @@
 
 #include "decomp.h"
 #include "islepathactor.h"
+#include "mxtype17notificationparam.h"
 
 // VTABLE: LEGO1 0x100d9ec8
 // SIZE 0x164
@@ -23,6 +24,12 @@ class Jetski : public IslePathActor {
 		return !strcmp(p_name, Jetski::ClassName()) || IslePathActor::IsA(p_name);
 	}
 
+	virtual MxResult Create(MxDSAction& p_dsAction) override;      // vtable+0x18
+	virtual void VTable0x70(float p_float) override;               // vtable+0x70
+	virtual MxU32 VTable0xcc() override;                           // vtable+0xcc
+	virtual MxU32 VTable0xd4(MxType17NotificationParam&) override; // vtable+0xd4
+	virtual void VTable0xe4() override;                            // vtable+0xe4
+
 	// SYNTHETIC: LEGO1 0x1007e5c0
 	// Jetski::`scalar deleting destructor'
 
diff --git a/LEGO1/lego/legoomni/include/jukebox.h b/LEGO1/lego/legoomni/include/jukebox.h
index 0bef74fa..7ee46589 100644
--- a/LEGO1/lego/legoomni/include/jukebox.h
+++ b/LEGO1/lego/legoomni/include/jukebox.h
@@ -10,6 +10,9 @@ class JukeBox : public LegoWorld {
 public:
 	JukeBox();
 
+	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x4
+	virtual MxResult Tickle() override;               // vtable+0x8
+
 	// FUNCTION: LEGO1 0x1005d6f0
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
@@ -23,6 +26,12 @@ class JukeBox : public LegoWorld {
 		return !strcmp(p_name, JukeBox::ClassName()) || LegoWorld::IsA(p_name);
 	}
 
+	virtual MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
+	virtual void VTable0x50() override;                       // vtable+0x50
+	virtual MxBool VTable0x5c() override;                     // vtable+0x5c
+	virtual MxBool VTable0x64() override;                     // vtable+0x64
+	virtual void VTable0x68(MxBool p_add) override;           // vtable+0x68
+
 	// SYNTHETIC: LEGO1 0x1005d810
 	// JukeBox::`scalar deleting destructor'
 	enum JukeBoxScript {
diff --git a/LEGO1/lego/legoomni/include/jukeboxentity.h b/LEGO1/lego/legoomni/include/jukeboxentity.h
index 81a47ef9..a0121eed 100644
--- a/LEGO1/lego/legoomni/include/jukeboxentity.h
+++ b/LEGO1/lego/legoomni/include/jukeboxentity.h
@@ -10,6 +10,8 @@ class JukeBoxEntity : public LegoEntity {
 	JukeBoxEntity();
 	virtual ~JukeBoxEntity() override; // vtable+0x0
 
+	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x4
+
 	// FUNCTION: LEGO1 0x10085cc0
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
diff --git a/LEGO1/lego/legoomni/include/lego3dwavepresenter.h b/LEGO1/lego/legoomni/include/lego3dwavepresenter.h
index c08e777f..bf771d45 100644
--- a/LEGO1/lego/legoomni/include/lego3dwavepresenter.h
+++ b/LEGO1/lego/legoomni/include/lego3dwavepresenter.h
@@ -20,6 +20,11 @@ class Lego3DWavePresenter : public MxWavePresenter {
 		return !strcmp(p_name, Lego3DWavePresenter::ClassName()) || MxWavePresenter::IsA(p_name);
 	}
 
+	virtual void StartingTickle() override;   // vtable+0x1c
+	virtual void StreamingTickle() override;  // vtable+0x20
+	virtual MxResult AddToManager() override; // vtable+0x34
+	virtual void Destroy() override;          // vtable+0x38
+
 	// SYNTHETIC: LEGO1 0x1000f4b0
 	// Lego3DWavePresenter::`scalar deleting destructor'
 };
diff --git a/LEGO1/lego/legoomni/include/legoact2.h b/LEGO1/lego/legoomni/include/legoact2.h
index 1f0138ce..4918fa76 100644
--- a/LEGO1/lego/legoomni/include/legoact2.h
+++ b/LEGO1/lego/legoomni/include/legoact2.h
@@ -3,10 +3,21 @@
 
 #include "legocarraceactor.h"
 #include "legopathactor.h"
+#include "legoworld.h"
 
 // VTABLE: LEGO1 0x100d82e0
 // SIZE 0x1154
 class LegoAct2 : public LegoWorld {
+
+	virtual MxLong Notify(MxParam& p_param) override;         // vtable+0x04
+	virtual MxResult Tickle() override;                       // vtable+0x08
+	virtual MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
+	virtual void VTable0x50() override;                       // vtable+0x50
+	virtual MxBool VTable0x5c() override;                     // vtable+0x5c
+	virtual void VTable0x60() override;                       // vtable+0x60
+	virtual MxBool VTable0x64() override;                     // vtable+0x64
+	virtual void VTable0x68(MxBool p_add) override;           // vtable+0x68
+
 	// SYNTHETIC: LEGO1 0x1004fe20
 	// LegoAct2::`scalar deleting destructor'
 };
diff --git a/LEGO1/lego/legoomni/include/legoact2state.h b/LEGO1/lego/legoomni/include/legoact2state.h
index 2f8a2e79..b2ae4b7e 100644
--- a/LEGO1/lego/legoomni/include/legoact2state.h
+++ b/LEGO1/lego/legoomni/include/legoact2state.h
@@ -20,6 +20,8 @@ class LegoAct2State : public LegoState {
 		return !strcmp(p_name, LegoAct2State::ClassName()) || LegoState::IsA(p_name);
 	}
 
+	virtual MxBool VTable0x14() override; // vtable+0x14
+
 	// SYNTHETIC: LEGO1 0x1000e040
 	// LegoAct2State::`scalar deleting destructor'
 };
diff --git a/LEGO1/lego/legoomni/include/legoactor.h b/LEGO1/lego/legoomni/include/legoactor.h
index a183a249..76beb249 100644
--- a/LEGO1/lego/legoomni/include/legoactor.h
+++ b/LEGO1/lego/legoomni/include/legoactor.h
@@ -24,6 +24,9 @@ class LegoActor : public LegoEntity {
 		return !strcmp(p_name, LegoActor::ClassName()) || LegoEntity::IsA(p_name);
 	}
 
+	virtual void ParseAction(char*) override;                                     // vtable+0x20
+	virtual void SetROI(LegoROI* p_roi, MxBool p_bool1, MxBool p_bool2) override; // vtable+0x24
+
 	// FUNCTION: LEGO1 0x10002cc0
 	virtual MxFloat VTable0x50() { return m_unk0x68; } // vtable+0x50
 	// FUNCTION: LEGO1 0x10002cd0
diff --git a/LEGO1/lego/legoomni/include/legoanimmmpresenter.h b/LEGO1/lego/legoomni/include/legoanimmmpresenter.h
index 520f3c09..790ee92c 100644
--- a/LEGO1/lego/legoomni/include/legoanimmmpresenter.h
+++ b/LEGO1/lego/legoomni/include/legoanimmmpresenter.h
@@ -9,6 +9,8 @@ class LegoAnimMMPresenter : public MxCompositePresenter {
 public:
 	LegoAnimMMPresenter();
 
+	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x04
+
 	// FUNCTION: LEGO1 0x1004a950
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
@@ -22,6 +24,16 @@ class LegoAnimMMPresenter : public MxCompositePresenter {
 		return !strcmp(p_name, LegoAnimMMPresenter::ClassName()) || MxCompositePresenter::IsA(p_name);
 	}
 
+	virtual void ReadyTickle() override;                                                           // vtable+0x18
+	virtual void StartingTickle() override;                                                        // vtable+0x1c
+	virtual void StreamingTickle() override;                                                       // vtable+0x20
+	virtual void RepeatingTickle() override;                                                       // vtable+0x24
+	virtual void DoneTickle() override;                                                            // vtable+0x2c
+	virtual void ParseExtra() override;                                                            // vtable+0x30
+	virtual MxResult StartAction(MxStreamController* p_controller, MxDSAction* p_action) override; // vtable+0x3c
+	virtual void EndAction() override;                                                             // vtable+0x40
+	virtual void VTable0x60(MxPresenter* p_presenter) override;                                    // vtable+0x60
+
 	// SYNTHETIC: LEGO1 0x1004aa40
 	// LegoAnimMMPresenter::`scalar deleting destructor'
 };
diff --git a/LEGO1/lego/legoomni/include/legoanimpresenter.h b/LEGO1/lego/legoomni/include/legoanimpresenter.h
index 5ff2f0c3..a5aa2df3 100644
--- a/LEGO1/lego/legoomni/include/legoanimpresenter.h
+++ b/LEGO1/lego/legoomni/include/legoanimpresenter.h
@@ -31,7 +31,9 @@ class LegoAnimPresenter : public MxVideoPresenter {
 	virtual void ReadyTickle() override;                                                           // vtable+0x18
 	virtual void StartingTickle() override;                                                        // vtable+0x1c
 	virtual void StreamingTickle() override;                                                       // vtable+0x20
+	virtual void DoneTickle() override;                                                            // vtable+0x2c
 	virtual void ParseExtra() override;                                                            // vtable+0x30
+	virtual MxResult AddToManager() override;                                                      // vtable+0x34
 	virtual void Destroy() override;                                                               // vtable+0x38
 	virtual MxResult StartAction(MxStreamController* p_controller, MxDSAction* p_action) override; // vtable+0x3c
 	virtual void EndAction() override;                                                             // vtable+0x40
diff --git a/LEGO1/lego/legoomni/include/legobuildingmanager.h b/LEGO1/lego/legoomni/include/legobuildingmanager.h
index 5c0061d3..969657ca 100644
--- a/LEGO1/lego/legoomni/include/legobuildingmanager.h
+++ b/LEGO1/lego/legoomni/include/legobuildingmanager.h
@@ -10,6 +10,8 @@ class LegoBuildingManager : public MxCore {
 	LegoBuildingManager();
 	virtual ~LegoBuildingManager() override;
 
+	virtual MxResult Tickle() override; // vtable+0x08
+
 	// FUNCTION: LEGO1 0x1002f930
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
diff --git a/LEGO1/lego/legoomni/include/legocarbuild.h b/LEGO1/lego/legoomni/include/legocarbuild.h
index c3b1b1f6..70db5856 100644
--- a/LEGO1/lego/legoomni/include/legocarbuild.h
+++ b/LEGO1/lego/legoomni/include/legocarbuild.h
@@ -26,6 +26,12 @@ class LegoCarBuild : public LegoWorld {
 		return !strcmp(p_name, LegoCarBuild::ClassName()) || LegoWorld::IsA(p_name);
 	}
 
+	virtual MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
+	virtual void VTable0x50() override;                       // vtable+0x50
+	virtual MxBool VTable0x5c() override;                     // vtable+0x5c
+	virtual MxBool VTable0x64() override;                     // vtable+0x64
+	virtual void VTable0x68(MxBool p_add) override;           // vtable+0x68
+
 	// SYNTHETIC: LEGO1 0x10022a60
 	// LegoCarBuild::`scalar deleting destructor'
 };
diff --git a/LEGO1/lego/legoomni/include/legocarbuildanimpresenter.h b/LEGO1/lego/legoomni/include/legocarbuildanimpresenter.h
index 8bd5ba75..fb2d254d 100644
--- a/LEGO1/lego/legoomni/include/legocarbuildanimpresenter.h
+++ b/LEGO1/lego/legoomni/include/legocarbuildanimpresenter.h
@@ -23,6 +23,12 @@ class LegoCarBuildAnimPresenter : public LegoAnimPresenter {
 		return !strcmp(p_name, LegoCarBuildAnimPresenter::ClassName()) || LegoAnimPresenter::IsA(p_name);
 	}
 
+	virtual void ReadyTickle() override;     // vtable+0x18
+	virtual void StreamingTickle() override; // vtable+0x20
+	virtual void RepeatingTickle() override; // vtable+0x24
+	virtual void EndAction() override;       // vtable+0x40
+	virtual void PutFrame() override;        // vtable+0x6c
+
 	// SYNTHETIC: LEGO1 0x10078660
 	// LegoCarBuildAnimPresenter::`scalar deleting destructor'
 };
diff --git a/LEGO1/lego/legoomni/include/legocarraceactor.h b/LEGO1/lego/legoomni/include/legocarraceactor.h
index d88da3f7..5f2756a3 100644
--- a/LEGO1/lego/legoomni/include/legocarraceactor.h
+++ b/LEGO1/lego/legoomni/include/legocarraceactor.h
@@ -19,6 +19,14 @@ class LegoCarRaceActor : public LegoRaceActor {
 		return !strcmp(p_name, LegoCarRaceActor::ClassName()) || LegoRaceActor::IsA(p_name);
 	}
 
+	virtual void VTable0x68() override;              // vtable+0x68
+	virtual void VTable0x6c() override;              // vtable+0x6c
+	virtual void VTable0x70(float p_float) override; // vtable+0x70
+	virtual MxS32 VTable0x90() override;             // vtable+0x90
+	virtual MxS32 VTable0x94() override;             // vtable+0x94
+	virtual void VTable0x98() override;              // vtable+0x98
+	virtual void VTable0x9c() override;              // vtable+0x9c
+
 	// SYNTHETIC: LEGO1 0x10081610
 	// LegoCarRaceActor::`scalar deleting destructor'
 };
diff --git a/LEGO1/lego/legoomni/include/legoeventnotificationparam.h b/LEGO1/lego/legoomni/include/legoeventnotificationparam.h
index 8805d9cd..f5ec9205 100644
--- a/LEGO1/lego/legoomni/include/legoeventnotificationparam.h
+++ b/LEGO1/lego/legoomni/include/legoeventnotificationparam.h
@@ -10,6 +10,8 @@
 // SIZE 0x20
 class LegoEventNotificationParam : public MxNotificationParam {
 public:
+	virtual MxNotificationParam* Clone() override; // vtable+0x4
+
 	inline LegoEventNotificationParam() : MxNotificationParam(c_notificationType0, NULL) {}
 	inline LegoEventNotificationParam(
 		NotificationId p_type,
diff --git a/LEGO1/lego/legoomni/include/legoflctexturepresenter.h b/LEGO1/lego/legoomni/include/legoflctexturepresenter.h
index f5ea7420..9b136074 100644
--- a/LEGO1/lego/legoomni/include/legoflctexturepresenter.h
+++ b/LEGO1/lego/legoomni/include/legoflctexturepresenter.h
@@ -17,6 +17,10 @@ class LegoFlcTexturePresenter : public MxFlcPresenter {
 		return "LegoFlcTexturePresenter";
 	}
 
+	virtual void StartingTickle() override;                  // vtable+0x1c
+	virtual void LoadFrame(MxStreamChunk* p_chunk) override; // vtable+0x68
+	virtual void PutFrame() override;                        // vtable+0x6c
+
 	// SYNTHETIC: LEGO1 0x1005df00
 	// LegoFlcTexturePresenter::`scalar deleting destructor'
 
diff --git a/LEGO1/lego/legoomni/include/legohideanimpresenter.h b/LEGO1/lego/legoomni/include/legohideanimpresenter.h
index 59449283..06e8af33 100644
--- a/LEGO1/lego/legoomni/include/legohideanimpresenter.h
+++ b/LEGO1/lego/legoomni/include/legohideanimpresenter.h
@@ -24,7 +24,12 @@ class LegoHideAnimPresenter : public LegoLoopingAnimPresenter {
 		return !strcmp(p_name, ClassName()) || LegoAnimPresenter::IsA(p_name);
 	}
 
-	virtual void Destroy() override; // vtable+0x38
+	virtual void ReadyTickle() override;      // vtable+0x18
+	virtual void StartingTickle() override;   // vtable+0x18
+	virtual MxResult AddToManager() override; // vtable+0x34
+	virtual void Destroy() override;          // vtable+0x38
+	virtual void EndAction() override;        // vtable+0x40
+	virtual void PutFrame() override;         // vtable+0x6c
 
 private:
 	void Init();
diff --git a/LEGO1/lego/legoomni/include/legoinputmanager.h b/LEGO1/lego/legoomni/include/legoinputmanager.h
index 0f068a90..5198f71e 100644
--- a/LEGO1/lego/legoomni/include/legoinputmanager.h
+++ b/LEGO1/lego/legoomni/include/legoinputmanager.h
@@ -38,6 +38,9 @@ class LegoInputManager : public MxPresenter {
 
 	virtual MxResult Tickle() override; // vtable+0x8
 
+	// FUNCTION: LEGO1 0x1005b8c0
+	virtual MxResult PutData() override { return SUCCESS; }; // vtable+0x4c
+
 	MxResult Create(HWND p_hwnd);
 	void Destroy();
 	void CreateAndAcquireKeyboard(HWND p_hwnd);
diff --git a/LEGO1/lego/legoomni/include/legojetski.h b/LEGO1/lego/legoomni/include/legojetski.h
index e4f876a3..ac376ab1 100644
--- a/LEGO1/lego/legoomni/include/legojetski.h
+++ b/LEGO1/lego/legoomni/include/legojetski.h
@@ -6,6 +6,8 @@
 // VTABLE: LEGO1 0x100d5a40
 class LegoJetski : public LegoJetskiRaceActor {
 public:
+	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x04
+
 	// FUNCTION: LEGO1 0x10013e80
 	inline const char* ClassName() const override // vtable+0xc
 	{
@@ -19,6 +21,14 @@ class LegoJetski : public LegoJetskiRaceActor {
 		return !strcmp(p_name, LegoJetski::ClassName()) || LegoJetskiRaceActor::IsA(p_name);
 	}
 
+	virtual void ParseAction(char*) override;                  // vtable+0x20
+	virtual void SetWorldSpeed(MxFloat p_worldSpeed) override; // vtable+0x30
+	virtual void VTable0x6c() override;                        // vtable+0x6c
+	virtual void VTable0x70(float p_float) override;           // vtable+0x70
+	virtual MxS32 VTable0x94() override;                       // vtable+0x94
+	virtual void VTable0x98() override;                        // vtable+0x98
+	virtual void VTable0x9c() override;                        // vtable+0x9c
+
 	// SYNTHETIC: LEGO1 0x10013e20
 	// LegoJetski::`scalar deleting destructor'
 };
diff --git a/LEGO1/lego/legoomni/include/legojetskiraceactor.h b/LEGO1/lego/legoomni/include/legojetskiraceactor.h
index cd497525..8b3a38c7 100644
--- a/LEGO1/lego/legoomni/include/legojetskiraceactor.h
+++ b/LEGO1/lego/legoomni/include/legojetskiraceactor.h
@@ -19,6 +19,11 @@ class LegoJetskiRaceActor : public LegoCarRaceActor {
 		return !strcmp(p_name, LegoJetskiRaceActor::ClassName()) || LegoCarRaceActor::IsA(p_name);
 	}
 
+	virtual void VTable0x6c() override;              // vtable+0x6c
+	virtual void VTable0x70(float p_float) override; // vtable+0x70
+	virtual void VTable0x98() override;              // vtable+0x98
+	virtual void VTable0x9c() override;              // vtable+0x9c
+
 	// SYNTHETIC: LEGO1 0x10081d40
 	// LegoJetskiRaceActor::`scalar deleting destructor'
 };
diff --git a/LEGO1/lego/legoomni/include/legoloadcachesoundpresenter.h b/LEGO1/lego/legoomni/include/legoloadcachesoundpresenter.h
index 1c26cdec..dbfd478e 100644
--- a/LEGO1/lego/legoomni/include/legoloadcachesoundpresenter.h
+++ b/LEGO1/lego/legoomni/include/legoloadcachesoundpresenter.h
@@ -18,6 +18,11 @@ class LegoLoadCacheSoundPresenter : public MxWavePresenter {
 		return "LegoLoadCacheSoundPresenter";
 	}
 
+	virtual void ReadyTickle() override;     // vtable+0x18
+	virtual void StreamingTickle() override; // vtable+0x20
+	virtual void DoneTickle() override;      // vtable+0x2c
+	virtual MxResult PutData() override;     // vtable+0x4c
+
 private:
 	void Init();
 	void Destroy(MxBool p_fromDestructor);
diff --git a/LEGO1/lego/legoomni/include/legolocomotionanimpresenter.h b/LEGO1/lego/legoomni/include/legolocomotionanimpresenter.h
index 09370d0f..d6785fa2 100644
--- a/LEGO1/lego/legoomni/include/legolocomotionanimpresenter.h
+++ b/LEGO1/lego/legoomni/include/legolocomotionanimpresenter.h
@@ -21,6 +21,15 @@ class LegoLocomotionAnimPresenter : public LegoLoopingAnimPresenter {
 		return !strcmp(p_name, ClassName()) || LegoLoopingAnimPresenter::IsA(p_name);
 	}
 
+	virtual void ReadyTickle() override;                          // vtable+0x18
+	virtual void StartingTickle() override;                       // vtable+0x1c
+	virtual void StreamingTickle() override;                      // vtable+0x20
+	virtual MxResult AddToManager() override;                     // vtable+0x34
+	virtual void Destroy() override;                              // vtable+0x38
+	virtual void EndAction() override;                            // vtable+0x40
+	virtual void PutFrame() override;                             // vtable+0x6c
+	virtual MxResult VTable0x88(MxStreamChunk* p_chunk) override; // vtable+0x88
+
 	// SYNTHETIC: LEGO1 0x1006cfe0
 	// LegoLocomotionAnimPresenter::`scalar deleting destructor'
 
diff --git a/LEGO1/lego/legoomni/include/legoloopinganimpresenter.h b/LEGO1/lego/legoomni/include/legoloopinganimpresenter.h
index 844d1586..d4f47d7e 100644
--- a/LEGO1/lego/legoomni/include/legoloopinganimpresenter.h
+++ b/LEGO1/lego/legoomni/include/legoloopinganimpresenter.h
@@ -19,6 +19,9 @@ class LegoLoopingAnimPresenter : public LegoAnimPresenter {
 	{
 		return !strcmp(p_name, ClassName()) || LegoAnimPresenter::IsA(p_name);
 	}
+
+	virtual void StreamingTickle() override; // vtable+0x20
+	virtual void PutFrame() override;        // vtable+0x6c
 };
 
 // SYNTHETIC: LEGO1 0x1006d000
diff --git a/LEGO1/lego/legoomni/include/legonavcontroller.h b/LEGO1/lego/legoomni/include/legonavcontroller.h
index 2ae35245..dd2a46ad 100644
--- a/LEGO1/lego/legoomni/include/legonavcontroller.h
+++ b/LEGO1/lego/legoomni/include/legonavcontroller.h
@@ -37,7 +37,8 @@ class LegoNavController : public MxCore {
 	);
 
 	LegoNavController();
-	virtual ~LegoNavController() override; // vtable+0x0
+	virtual ~LegoNavController() override;            // vtable+0x0
+	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x4
 
 	// FUNCTION: LEGO1 0x10054b80
 	inline const char* ClassName() const override // vtable+0xc
diff --git a/LEGO1/lego/legoomni/include/legopartpresenter.h b/LEGO1/lego/legoomni/include/legopartpresenter.h
index e847d39b..5a422684 100644
--- a/LEGO1/lego/legoomni/include/legopartpresenter.h
+++ b/LEGO1/lego/legoomni/include/legopartpresenter.h
@@ -20,6 +20,10 @@ class LegoPartPresenter : public MxMediaPresenter {
 		return !strcmp(p_name, LegoPartPresenter::ClassName()) || MxMediaPresenter::IsA(p_name);
 	}
 
+	virtual void ReadyTickle() override;      // vtable+0x18
+	virtual MxResult AddToManager() override; // vtable+0x34
+	virtual void Destroy() override;          // vtable+0x38
+
 	__declspec(dllexport) static void configureLegoPartPresenter(MxS32, MxS32);
 
 	// SYNTHETIC: LEGO1 0x1000d060
diff --git a/LEGO1/lego/legoomni/include/legopathactor.h b/LEGO1/lego/legoomni/include/legopathactor.h
index be2c87e3..2f0ce280 100644
--- a/LEGO1/lego/legoomni/include/legopathactor.h
+++ b/LEGO1/lego/legoomni/include/legopathactor.h
@@ -25,6 +25,7 @@ class LegoPathActor : public LegoActor {
 		return !strcmp(p_name, LegoPathActor::ClassName()) || LegoActor::IsA(p_name);
 	}
 
+	virtual void ParseAction(char*) override;      // vtable+0x20
 	virtual void VTable0x68();                     // vtable+0x68
 	virtual void VTable0x6c();                     // vtable+0x6c
 	virtual void VTable0x70(float p_float);        // vtable+0x70
diff --git a/LEGO1/lego/legoomni/include/legophonemepresenter.h b/LEGO1/lego/legoomni/include/legophonemepresenter.h
index c643f261..b5aa3616 100644
--- a/LEGO1/lego/legoomni/include/legophonemepresenter.h
+++ b/LEGO1/lego/legoomni/include/legophonemepresenter.h
@@ -20,6 +20,11 @@ class LegoPhonemePresenter : public MxFlcPresenter {
 		return "LegoPhonemePresenter";
 	}
 
+	virtual void StartingTickle() override;                  // vtable+0x1c
+	virtual void EndAction() override;                       // vtable+0x40
+	virtual void LoadFrame(MxStreamChunk* p_chunk) override; // vtable+0x68
+	virtual void PutFrame() override;                        // vtable+0x6c
+
 	// SYNTHETIC: LEGO1 0x1004e320
 	// LegoPhonemePresenter::`scalar deleting destructor'
 
diff --git a/LEGO1/lego/legoomni/include/legoraceactor.h b/LEGO1/lego/legoomni/include/legoraceactor.h
index 6df40e43..fc6c6a2d 100644
--- a/LEGO1/lego/legoomni/include/legoraceactor.h
+++ b/LEGO1/lego/legoomni/include/legoraceactor.h
@@ -2,6 +2,7 @@
 #define LEGORACEACTOR_H
 
 #include "legoanimactor.h"
+#include "realtime/matrix.h"
 
 // VTABLE: LEGO1 0x100d5b88
 class LegoRaceActor : public LegoAnimActor {
@@ -19,6 +20,14 @@ class LegoRaceActor : public LegoAnimActor {
 		return !strcmp(p_name, LegoRaceActor::ClassName()) || LegoAnimActor::IsA(p_name);
 	}
 
+	virtual void ParseAction(char*) override;                  // vtable+0x20
+	virtual void SetWorldSpeed(MxFloat p_worldSpeed) override; // vtable+0x30
+	virtual void VTable0x68() override;                        // vtable+0x68
+	virtual void VTable0x70(float p_float) override;           // vtable+0x70
+	virtual void VTable0x74(Matrix4& p_transform) override;    // vtable+0x74
+	virtual MxS32 VTable0x90() override;                       // vtable+0x90
+	virtual MxS32 VTable0x94() override;                       // vtable+0x94
+
 	// SYNTHETIC: LEGO1 0x10014ab0
 	// LegoRaceActor::`scalar deleting destructor'
 };
diff --git a/LEGO1/lego/legoomni/include/legoracecar.h b/LEGO1/lego/legoomni/include/legoracecar.h
index 7e200ff6..f080ba46 100644
--- a/LEGO1/lego/legoomni/include/legoracecar.h
+++ b/LEGO1/lego/legoomni/include/legoracecar.h
@@ -8,6 +8,8 @@
 // SIZE 0x200
 class LegoRaceCar : public LegoCarRaceActor {
 public:
+	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x04
+
 	// FUNCTION: LEGO1 0x10014290
 	inline const char* ClassName() const override // vtable+0xc
 	{
@@ -21,6 +23,14 @@ class LegoRaceCar : public LegoCarRaceActor {
 		return !strcmp(p_name, LegoCarRaceActor::ClassName()) || LegoCarRaceActor::IsA(p_name);
 	}
 
+	virtual void ParseAction(char*) override;                  // vtable+0x20
+	virtual void SetWorldSpeed(MxFloat p_worldSpeed) override; // vtable+0x30
+	virtual void VTable0x6c() override;                        // vtable+0x6c
+	virtual void VTable0x70(float p_float) override;           // vtable+0x70
+	virtual MxS32 VTable0x94() override;                       // vtable+0x94
+	virtual void VTable0x98() override;                        // vtable+0x98
+	virtual void VTable0x9c() override;                        // vtable+0x9c
+
 	// SYNTHETIC: LEGO1 0x10014230
 	// LegoRaceCar::`scalar deleting destructor'
 };
diff --git a/LEGO1/lego/legoomni/include/legovehiclebuildstate.h b/LEGO1/lego/legoomni/include/legovehiclebuildstate.h
index f441dfad..8deed7a5 100644
--- a/LEGO1/lego/legoomni/include/legovehiclebuildstate.h
+++ b/LEGO1/lego/legoomni/include/legovehiclebuildstate.h
@@ -23,6 +23,8 @@ class LegoVehicleBuildState : public LegoState {
 		return !strcmp(p_name, this->m_className.GetData()) || LegoState::IsA(p_name);
 	}
 
+	virtual MxResult VTable0x1c(LegoFileStream* p_legoFileStream) override; // vtable+0x1c
+
 	// SYNTHETIC: LEGO1 0x100260a0
 	// LegoVehicleBuildState::`scalar deleting destructor'
 
diff --git a/LEGO1/lego/legoomni/include/legovideomanager.h b/LEGO1/lego/legoomni/include/legovideomanager.h
index 67a7805c..2fe7d7a4 100644
--- a/LEGO1/lego/legoomni/include/legovideomanager.h
+++ b/LEGO1/lego/legoomni/include/legovideomanager.h
@@ -32,7 +32,7 @@ class LegoVideoManager : public MxVideoManager {
 	virtual MxResult RealizePalette(MxPalette*) override;                                  // vtable+0x30
 	virtual void UpdateView(MxU32 p_x, MxU32 p_y, MxU32 p_width, MxU32 p_height) override; // vtable+0x34
 	virtual void VTable0x38(undefined4, undefined4);                                       // vtable+0x38
-	// FUNCTION: LGEO1 0x1007ab10
+	// FUNCTION: LEGO1 0x1007ab10
 	virtual LegoUnknown100d9d00* VTable0x3c() { return m_unk0x100d9d00; } // vtable+0x3c
 
 	void SetSkyColor(float p_red, float p_green, float p_blue);
diff --git a/LEGO1/lego/legoomni/include/motocycle.h b/LEGO1/lego/legoomni/include/motocycle.h
index b4ccafd3..e7716a33 100644
--- a/LEGO1/lego/legoomni/include/motocycle.h
+++ b/LEGO1/lego/legoomni/include/motocycle.h
@@ -23,6 +23,13 @@ class Motocycle : public IslePathActor {
 		return !strcmp(p_name, Motocycle::ClassName()) || IslePathActor::IsA(p_name);
 	}
 
+	virtual MxResult Create(MxDSAction& p_dsAction) override;              // vtable+0x18
+	virtual void VTable0x70(float p_float) override;                       // vtable+0x70
+	virtual MxU32 VTable0xcc() override;                                   // vtable+0xcc
+	virtual MxU32 VTable0xd4(MxType17NotificationParam& p_param) override; // vtable+0xd4
+	virtual MxU32 VTable0xdc(MxType19NotificationParam&) override;         // vtable+0xdc
+	virtual void VTable0xe4() override;                                    // vtable+0xe4
+
 	// SYNTHETIC: LEGO1 0x100359d0
 	// Motocycle::`scalar deleting destructor'
 
diff --git a/LEGO1/lego/legoomni/include/pizza.h b/LEGO1/lego/legoomni/include/pizza.h
index 835a5b2e..78eb4f75 100644
--- a/LEGO1/lego/legoomni/include/pizza.h
+++ b/LEGO1/lego/legoomni/include/pizza.h
@@ -15,21 +15,23 @@ class Pizza : public IsleActor {
 	Pizza();
 	virtual ~Pizza() override;
 
-	virtual MxResult Tickle() override; // vtable+08
+	virtual MxResult Tickle() override; // vtable+0x8
 
 	// FUNCTION: LEGO1 0x10037f90
-	inline const char* ClassName() const // vtable+0c
+	inline const char* ClassName() const // vtable+0xc
 	{
 		// STRING: LEGO1 0x100f038c
 		return "Pizza";
 	}
 
 	// FUNCTION: LEGO1 0x10037fa0
-	inline MxBool IsA(const char* p_name) const override // vtable+10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, Pizza::ClassName()) || IsleActor::IsA(p_name);
 	}
 
+	virtual MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
+
 	// SYNTHETIC: LEGO1 0x100380e0
 	// Pizza::`scalar deleting destructor'
 
diff --git a/LEGO1/lego/legoomni/include/pizzamissionstate.h b/LEGO1/lego/legoomni/include/pizzamissionstate.h
index 76690a99..e3867728 100644
--- a/LEGO1/lego/legoomni/include/pizzamissionstate.h
+++ b/LEGO1/lego/legoomni/include/pizzamissionstate.h
@@ -28,6 +28,8 @@ class PizzaMissionState : public LegoState {
 		return !strcmp(p_name, PizzaMissionState::ClassName()) || LegoState::IsA(p_name);
 	}
 
+	virtual MxResult VTable0x1c(LegoFileStream* p_legoFileStream) override; // vtable+0x1c
+
 	inline MxU16 GetColor(MxU8 p_id) { return GetState(p_id)->m_color; }
 
 	// SYNTHETIC: LEGO1 0x10039350
diff --git a/LEGO1/lego/legoomni/include/pizzeria.h b/LEGO1/lego/legoomni/include/pizzeria.h
index 1c73ca58..f75cf0a7 100644
--- a/LEGO1/lego/legoomni/include/pizzeria.h
+++ b/LEGO1/lego/legoomni/include/pizzeria.h
@@ -20,6 +20,8 @@ class Pizzeria : public IsleActor {
 		return !strcmp(p_name, Pizzeria::ClassName()) || IsleActor::IsA(p_name);
 	}
 
+	virtual MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
+
 	// SYNTHETIC: LEGO1 0x1000e8d0
 	// Pizzeria::`scalar deleting destructor'
 };
diff --git a/LEGO1/lego/legoomni/include/pizzeriastate.h b/LEGO1/lego/legoomni/include/pizzeriastate.h
index 188ee624..402981ff 100644
--- a/LEGO1/lego/legoomni/include/pizzeriastate.h
+++ b/LEGO1/lego/legoomni/include/pizzeriastate.h
@@ -22,6 +22,8 @@ class PizzeriaState : public LegoState {
 		return !strcmp(p_name, PizzeriaState::ClassName()) || LegoState::IsA(p_name);
 	}
 
+	virtual MxResult VTable0x1c(LegoFileStream* p_legoFileStream) override; // vtable+0x1c
+
 	// SYNTHETIC: LEGO1 0x10017ce0
 	// PizzeriaState::`scalar deleting destructor'
 };
diff --git a/LEGO1/lego/legoomni/include/police.h b/LEGO1/lego/legoomni/include/police.h
index 92e19b42..999ae4aa 100644
--- a/LEGO1/lego/legoomni/include/police.h
+++ b/LEGO1/lego/legoomni/include/police.h
@@ -30,11 +30,14 @@ class Police : public LegoWorld {
 		return !strcmp(p_name, Police::ClassName()) || LegoWorld::IsA(p_name);
 	}
 
-	// SYNTHETIC: LEGO1 0x1005e300
-	// Police::`scalar deleting destructor'
-
 	virtual MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
 	virtual void VTable0x50() override;                       // vtable+0x50
+	virtual MxBool VTable0x5c() override;                     // vtable+0x5c
+	virtual MxBool VTable0x64() override;                     // vtable+0x64
+	virtual void VTable0x68(MxBool p_add) override;           // vtable+0x68
+
+	// SYNTHETIC: LEGO1 0x1005e300
+	// Police::`scalar deleting destructor'
 
 private:
 	Radio m_radio;              // 0xf8
diff --git a/LEGO1/lego/legoomni/include/policestate.h b/LEGO1/lego/legoomni/include/policestate.h
index 517710ab..976588a3 100644
--- a/LEGO1/lego/legoomni/include/policestate.h
+++ b/LEGO1/lego/legoomni/include/policestate.h
@@ -23,11 +23,11 @@ class PoliceState : public LegoState {
 		return !strcmp(p_name, PoliceState::ClassName()) || LegoState::IsA(p_name);
 	}
 
+	virtual MxResult VTable0x1c(LegoFileStream* p_legoFileStream) override; // vtable+0x1c
+
 	// SYNTHETIC: LEGO1 0x1005e920
 	// PoliceState::`scalar deleting destructor'
 
-	virtual MxResult VTable0x1c(LegoFileStream* p_legoFileStream) override; // vtable+0x1C
-
 private:
 	undefined4 m_unk0x8; // 0x8
 	undefined4 m_unk0xc; // 0xc
diff --git a/LEGO1/lego/legoomni/include/racecar.h b/LEGO1/lego/legoomni/include/racecar.h
index 39005831..ddd4a9ac 100644
--- a/LEGO1/lego/legoomni/include/racecar.h
+++ b/LEGO1/lego/legoomni/include/racecar.h
@@ -24,6 +24,9 @@ class RaceCar : public IslePathActor {
 		return !strcmp(p_name, RaceCar::ClassName()) || IslePathActor::IsA(p_name);
 	}
 
+	virtual MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
+	virtual MxU32 VTable0xcc() override;                      // vtable+0xcc
+
 	// SYNTHETIC: LEGO1 0x10028400
 	// RaceCar::`scalar deleting destructor'
 
diff --git a/LEGO1/lego/legoomni/include/racestandsentity.h b/LEGO1/lego/legoomni/include/racestandsentity.h
index 20b1b4a6..b2ca8ef3 100644
--- a/LEGO1/lego/legoomni/include/racestandsentity.h
+++ b/LEGO1/lego/legoomni/include/racestandsentity.h
@@ -6,6 +6,19 @@
 // VTABLE: LEGO1 0x100d48a8
 // SIZE 0x68
 class RaceStandsEntity : public BuildingEntity {
+	// FUNCTION: LEGO1 0x1000efa0
+	inline virtual const char* ClassName() const override // vtable+0x0c
+	{
+		// STRING: LEGO1 0x100f0300
+		return "RaceStandsEntity";
+	}
+
+	// FUNCTION: LEGO1 0x1000efb0
+	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	{
+		return !strcmp(p_name, RaceStandsEntity::ClassName()) || BuildingEntity::IsA(p_name);
+	}
+
 	// SYNTHETIC: LEGO1 0x1000f9e0
 	// RaceStandsEntity::`scalar deleting destructor'
 };
diff --git a/LEGO1/lego/legoomni/include/racestate.h b/LEGO1/lego/legoomni/include/racestate.h
index 05760e32..bfae3525 100644
--- a/LEGO1/lego/legoomni/include/racestate.h
+++ b/LEGO1/lego/legoomni/include/racestate.h
@@ -30,6 +30,8 @@ class RaceState : public LegoState {
 		return !strcmp(p_name, RaceState::ClassName()) || LegoState::IsA(p_name);
 	}
 
+	virtual MxResult VTable0x1c(LegoFileStream* p_legoFileStream) override; // vtable+0x1c
+
 	inline MxU16 GetColor(MxU8 p_id) { return GetState(p_id)->m_color; }
 
 	// SYNTHETIC: LEGO1 0x100160d0
diff --git a/LEGO1/lego/legoomni/include/radio.h b/LEGO1/lego/legoomni/include/radio.h
index 3d8da44b..3afb44cb 100644
--- a/LEGO1/lego/legoomni/include/radio.h
+++ b/LEGO1/lego/legoomni/include/radio.h
@@ -10,6 +10,8 @@ class Radio : public MxCore {
 	Radio();
 	virtual ~Radio() override;
 
+	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x04
+
 	// FUNCTION: LEGO1 0x1002c8e0
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
diff --git a/LEGO1/lego/legoomni/include/radiostate.h b/LEGO1/lego/legoomni/include/radiostate.h
index 1035a659..68dc154a 100644
--- a/LEGO1/lego/legoomni/include/radiostate.h
+++ b/LEGO1/lego/legoomni/include/radiostate.h
@@ -22,6 +22,8 @@ class RadioState : public LegoState {
 		return !strcmp(p_name, RadioState::ClassName()) || LegoState::IsA(p_name);
 	}
 
+	virtual MxBool VTable0x14() override; // vtable+0x14
+
 	// SYNTHETIC: LEGO1 0x1002d020
 	// RadioState::`scalar deleting destructor'
 };
diff --git a/LEGO1/lego/legoomni/include/skateboard.h b/LEGO1/lego/legoomni/include/skateboard.h
index 06adc8cb..f4154b8d 100644
--- a/LEGO1/lego/legoomni/include/skateboard.h
+++ b/LEGO1/lego/legoomni/include/skateboard.h
@@ -23,6 +23,12 @@ class SkateBoard : public IslePathActor {
 		return !strcmp(p_name, SkateBoard::ClassName()) || IslePathActor::IsA(p_name);
 	}
 
+	virtual MxResult Create(MxDSAction& p_dsAction) override;              // vtable+0x18
+	virtual MxU32 VTable0xcc() override;                                   // vtable+0xcc
+	virtual MxU32 VTable0xd0() override;                                   // vtable+0xd0
+	virtual MxU32 VTable0xd4(MxType17NotificationParam& p_param) override; // vtable+0xd4
+	virtual void VTable0xe4() override;                                    // vtable+0xe4
+
 	// SYNTHETIC: LEGO1 0x1000ff60
 	// SkateBoard::`scalar deleting destructor'
 
diff --git a/LEGO1/lego/legoomni/include/towtrack.h b/LEGO1/lego/legoomni/include/towtrack.h
index 39c4f630..8fb6b818 100644
--- a/LEGO1/lego/legoomni/include/towtrack.h
+++ b/LEGO1/lego/legoomni/include/towtrack.h
@@ -23,6 +23,15 @@ class TowTrack : public IslePathActor {
 		return !strcmp(p_name, TowTrack::ClassName()) || IslePathActor::IsA(p_name);
 	}
 
+	virtual MxLong Notify(MxParam& p_param) override;                      // vtable+0x04
+	virtual MxResult Create(MxDSAction& p_dsAction) override;              // vtable+0x18
+	virtual void VTable0x70(float p_float) override;                       // vtable+0x70
+	virtual MxU32 VTable0xcc() override;                                   // vtable+0xcc
+	virtual MxU32 VTable0xd4(MxType17NotificationParam& p_param) override; // vtable+0xd4
+	virtual MxU32 VTable0xd8(MxType18NotificationParam& p_param) override; // vtable+0xd8
+	virtual MxU32 VTable0xdc(MxType19NotificationParam& p_param) override; // vtable+0xdc
+	virtual void VTable0xe4() override;                                    // vtable+0xe4
+
 	// SYNTHETIC: LEGO1 0x1004c950
 	// TowTrack::`scalar deleting destructor'
 
diff --git a/LEGO1/lego/legoomni/src/act1/act1state.cpp b/LEGO1/lego/legoomni/src/act1/act1state.cpp
index 17f09277..6a36e3c3 100644
--- a/LEGO1/lego/legoomni/src/act1/act1state.cpp
+++ b/LEGO1/lego/legoomni/src/act1/act1state.cpp
@@ -13,6 +13,20 @@ Act1State::Act1State()
 	m_unk0x1c = 1;
 }
 
+// STUB: LEGO1 0x10033ac0
+MxResult Act1State::VTable0x1c(LegoFileStream* p_legoFileStream)
+{
+	// TODO
+	return SUCCESS;
+}
+
+// STUB: LEGO1 0x100346d0
+MxBool Act1State::SetFlag()
+{
+	// TODO
+	return FALSE;
+}
+
 // STUB: LEGO1 0x10034d00
 void Act1State::FUN_10034d00()
 {
diff --git a/LEGO1/lego/legoomni/src/act2/act2brick.cpp b/LEGO1/lego/legoomni/src/act2/act2brick.cpp
index 77e46622..338d2ae9 100644
--- a/LEGO1/lego/legoomni/src/act2/act2brick.cpp
+++ b/LEGO1/lego/legoomni/src/act2/act2brick.cpp
@@ -12,6 +12,13 @@ Act2Brick::~Act2Brick()
 	// TODO
 }
 
+// STUB: LEGO1 0x1007a750
+MxS32 Act2Brick::VTable0x94()
+{
+	// TODO
+	return 0;
+}
+
 // STUB: LEGO1 0x1007a7f0
 MxResult Act2Brick::Tickle()
 {
diff --git a/LEGO1/lego/legoomni/src/act2/legoact2.cpp b/LEGO1/lego/legoomni/src/act2/legoact2.cpp
new file mode 100644
index 00000000..c487e9a4
--- /dev/null
+++ b/LEGO1/lego/legoomni/src/act2/legoact2.cpp
@@ -0,0 +1,54 @@
+#include "legoact2.h"
+
+// STUB: LEGO1 0x1004fe10
+MxBool LegoAct2::VTable0x5c()
+{
+	// TODO
+	return FALSE;
+}
+
+// STUB: LEGO1 0x1004ff20
+MxResult LegoAct2::Create(MxDSAction& p_dsAction)
+{
+	// TODO
+	return SUCCESS;
+}
+
+// STUB: LEGO1 0x10050040
+MxResult LegoAct2::Tickle()
+{
+	// TODO
+	return SUCCESS;
+}
+
+// STUB: LEGO1 0x10050380
+MxLong LegoAct2::Notify(MxParam& p_param)
+{
+	// TODO
+	return 0;
+}
+
+// STUB: LEGO1 0x10050a80
+void LegoAct2::VTable0x50()
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x10050cf0
+void LegoAct2::VTable0x68(MxBool p_add)
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x100519c0
+void LegoAct2::VTable0x60()
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x100519d0
+MxBool LegoAct2::VTable0x64()
+{
+	// TODO
+	return FALSE;
+}
diff --git a/LEGO1/lego/legoomni/src/act2/legoact2state.cpp b/LEGO1/lego/legoomni/src/act2/legoact2state.cpp
index 1ca6a144..46b09a93 100644
--- a/LEGO1/lego/legoomni/src/act2/legoact2state.cpp
+++ b/LEGO1/lego/legoomni/src/act2/legoact2state.cpp
@@ -1 +1,8 @@
 #include "legoact2state.h"
+
+// STUB: LEGO1 0x1000df70
+MxBool LegoAct2State::VTable0x14()
+{
+	// TODO
+	return FALSE;
+}
diff --git a/LEGO1/lego/legoomni/src/act3/act3.cpp b/LEGO1/lego/legoomni/src/act3/act3.cpp
index 149e19a7..e17db3dc 100644
--- a/LEGO1/lego/legoomni/src/act3/act3.cpp
+++ b/LEGO1/lego/legoomni/src/act3/act3.cpp
@@ -8,8 +8,67 @@ Act3::Act3()
 	// TODO
 }
 
+// STUB: LEGO1 0x10072500
+MxBool Act3::VTable0x5c()
+{
+	// TODO
+	return FALSE;
+}
+
 // STUB: LEGO1 0x100726a0
 Act3::~Act3()
 {
 	// TODO
 }
+
+// STUB: LEGO1 0x10072c30
+MxResult Act3::Create(MxDSAction& p_dsAction)
+{
+	// TODO
+	return SUCCESS;
+}
+
+// STUB: LEGO1 0x10072d50
+void Act3::Destroy(MxBool p_fromDestructor)
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x10072de0
+MxLong Act3::Notify(MxParam& p_param)
+{
+	// TODO
+	return 0;
+}
+
+// STUB: LEGO1 0x10073270
+void Act3::VTable0x50()
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x10073300
+MxResult Act3::Tickle()
+{
+	// TODO
+	return SUCCESS;
+}
+
+// STUB: LEGO1 0x10073a90
+void Act3::VTable0x68(MxBool p_add)
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x10073e40
+void Act3::VTable0x60()
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x10073e50
+MxBool Act3::VTable0x64()
+{
+	// TODO
+	return FALSE;
+}
diff --git a/LEGO1/lego/legoomni/src/act3/act3shark.cpp b/LEGO1/lego/legoomni/src/act3/act3shark.cpp
index 95e5a0e0..f695234d 100644
--- a/LEGO1/lego/legoomni/src/act3/act3shark.cpp
+++ b/LEGO1/lego/legoomni/src/act3/act3shark.cpp
@@ -1 +1,25 @@
 #include "act3shark.h"
+
+// STUB: LEGO1 0x1001a1c0
+void Act3Shark::VTable0x74(Matrix4& p_transform)
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x100430e0
+void Act3Shark::ParseAction(char*)
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x100430f0
+void Act3Shark::SetWorldSpeed(MxFloat p_worldSpeed)
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x10043100
+void Act3Shark::VTable0x70(float p_float)
+{
+	// TODO
+}
diff --git a/LEGO1/lego/legoomni/src/audio/lego3dwavepresenter.cpp b/LEGO1/lego/legoomni/src/audio/lego3dwavepresenter.cpp
new file mode 100644
index 00000000..580f3405
--- /dev/null
+++ b/LEGO1/lego/legoomni/src/audio/lego3dwavepresenter.cpp
@@ -0,0 +1,26 @@
+#include "lego3dwavepresenter.h"
+
+// STUB: LEGO1 0x1004a7c0
+MxResult Lego3DWavePresenter::AddToManager()
+{
+	// TODO
+	return SUCCESS;
+}
+
+// STUB: LEGO1 0x1004a7f0
+void Lego3DWavePresenter::Destroy()
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x1004a810
+void Lego3DWavePresenter::StartingTickle()
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x1004a8b0
+void Lego3DWavePresenter::StreamingTickle()
+{
+	// TODO
+}
diff --git a/LEGO1/lego/legoomni/src/audio/legoloadcachesoundpresenter.cpp b/LEGO1/lego/legoomni/src/audio/legoloadcachesoundpresenter.cpp
index 41445182..9aeac8ba 100644
--- a/LEGO1/lego/legoomni/src/audio/legoloadcachesoundpresenter.cpp
+++ b/LEGO1/lego/legoomni/src/audio/legoloadcachesoundpresenter.cpp
@@ -28,3 +28,28 @@ void LegoLoadCacheSoundPresenter::Destroy(MxBool p_fromDestructor)
 	delete this->m_unk0x70;
 	MxWavePresenter::Destroy(p_fromDestructor);
 }
+
+// STUB: LEGO1 0x10018510
+void LegoLoadCacheSoundPresenter::ReadyTickle()
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x100185f0
+void LegoLoadCacheSoundPresenter::StreamingTickle()
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x100186f0
+void LegoLoadCacheSoundPresenter::DoneTickle()
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x10018700
+MxResult LegoLoadCacheSoundPresenter::PutData()
+{
+	// TODO
+	return SUCCESS;
+}
diff --git a/LEGO1/lego/legoomni/src/build/dunebuggy.cpp b/LEGO1/lego/legoomni/src/build/dunebuggy.cpp
index a32b612d..857a316c 100644
--- a/LEGO1/lego/legoomni/src/build/dunebuggy.cpp
+++ b/LEGO1/lego/legoomni/src/build/dunebuggy.cpp
@@ -10,3 +10,43 @@ DuneBuggy::DuneBuggy()
 	this->m_unk0x13c = 25.0;
 	this->m_unk0x164 = 1.0;
 }
+
+// STUB: LEGO1 0x10067e30
+MxResult DuneBuggy::Create(MxDSAction& p_dsAction)
+{
+	// TODO
+	return SUCCESS;
+}
+
+// STUB: LEGO1 0x10067ec0
+void DuneBuggy::VTable0x70(float p_float)
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x10067fa0
+void DuneBuggy::VTable0xe4()
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x10068060
+MxU32 DuneBuggy::VTable0xcc()
+{
+	// TODO
+	return 0;
+}
+
+// STUB: LEGO1 0x100681b0
+MxU32 DuneBuggy::VTable0xd4(MxType17NotificationParam& p_param)
+{
+	// TODO
+	return 0;
+}
+
+// STUB: LEGO1 0x10068270
+MxU32 DuneBuggy::VTable0xdc(MxType19NotificationParam& p_param)
+{
+	// TODO
+	return 0;
+}
diff --git a/LEGO1/lego/legoomni/src/build/helicopterstate.cpp b/LEGO1/lego/legoomni/src/build/helicopterstate.cpp
index 70d71a0c..368edfad 100644
--- a/LEGO1/lego/legoomni/src/build/helicopterstate.cpp
+++ b/LEGO1/lego/legoomni/src/build/helicopterstate.cpp
@@ -1 +1,15 @@
 #include "helicopterstate.h"
+
+// STUB: LEGO1 0x1000e0b0
+MxBool HelicopterState::VTable0x14()
+{
+	// TODO
+	return FALSE;
+}
+
+// STUB: LEGO1 0x1000e0c0
+MxBool HelicopterState::SetFlag()
+{
+	// TODO
+	return FALSE;
+}
diff --git a/LEGO1/lego/legoomni/src/build/jetski.cpp b/LEGO1/lego/legoomni/src/build/jetski.cpp
index 8bdf3fff..4676ea91 100644
--- a/LEGO1/lego/legoomni/src/build/jetski.cpp
+++ b/LEGO1/lego/legoomni/src/build/jetski.cpp
@@ -9,3 +9,36 @@ Jetski::Jetski()
 	this->m_unk0x150 = 2.0;
 	this->m_unk0x148 = 1;
 }
+
+// STUB: LEGO1 0x1007e630
+MxResult Jetski::Create(MxDSAction& p_dsAction)
+{
+	// TODO
+	return SUCCESS;
+}
+
+// STUB: LEGO1 0x1007e680
+void Jetski::VTable0x70(float p_float)
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x1007e6f0
+void Jetski::VTable0xe4()
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x1007e750
+MxU32 Jetski::VTable0xcc()
+{
+	// TODO
+	return 0;
+}
+
+// STUB: LEGO1 0x1007e8e0
+MxU32 Jetski::VTable0xd4(MxType17NotificationParam& p_param)
+{
+	// TODO
+	return 0;
+}
diff --git a/LEGO1/lego/legoomni/src/build/legobuildingmanager.cpp b/LEGO1/lego/legoomni/src/build/legobuildingmanager.cpp
index 3e6c4d7b..ed890166 100644
--- a/LEGO1/lego/legoomni/src/build/legobuildingmanager.cpp
+++ b/LEGO1/lego/legoomni/src/build/legobuildingmanager.cpp
@@ -32,3 +32,10 @@ void LegoBuildingManager::FUN_1002fa00()
 {
 	// TODO
 }
+
+// STUB: LEGO1 0x10030220
+MxResult LegoBuildingManager::Tickle()
+{
+	// TODO
+	return SUCCESS;
+}
diff --git a/LEGO1/lego/legoomni/src/build/legocarbuild.cpp b/LEGO1/lego/legoomni/src/build/legocarbuild.cpp
index f75e4653..61576ece 100644
--- a/LEGO1/lego/legoomni/src/build/legocarbuild.cpp
+++ b/LEGO1/lego/legoomni/src/build/legocarbuild.cpp
@@ -6,12 +6,26 @@ LegoCarBuild::LegoCarBuild()
 	// TODO
 }
 
+// STUB: LEGO1 0x10022930
+MxBool LegoCarBuild::VTable0x5c()
+{
+	// TODO
+	return FALSE;
+}
+
 // STUB: LEGO1 0x10022a80
 LegoCarBuild::~LegoCarBuild()
 {
 	// TODO
 }
 
+// STUB: LEGO1 0x10022b70
+MxResult LegoCarBuild::Create(MxDSAction& p_dsAction)
+{
+	// TODO
+	return SUCCESS;
+}
+
 // STUB: LEGO1 0x100238b0
 MxResult LegoCarBuild::Tickle()
 {
@@ -27,3 +41,22 @@ MxLong LegoCarBuild::Notify(MxParam& p_param)
 
 	return 0;
 }
+
+// STUB: LEGO1 0x100242c0
+void LegoCarBuild::VTable0x50()
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x100256c0
+void LegoCarBuild::VTable0x68(MxBool p_add)
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x10025e70
+MxBool LegoCarBuild::VTable0x64()
+{
+	// TODO
+	return FALSE;
+}
diff --git a/LEGO1/lego/legoomni/src/build/legovehiclebuildstate.cpp b/LEGO1/lego/legoomni/src/build/legovehiclebuildstate.cpp
index b0dccde2..df9a0de6 100644
--- a/LEGO1/lego/legoomni/src/build/legovehiclebuildstate.cpp
+++ b/LEGO1/lego/legoomni/src/build/legovehiclebuildstate.cpp
@@ -23,3 +23,10 @@ LegoVehicleBuildState::LegoVehicleBuildState(char* p_classType)
 	this->m_unk0x4e = 0;
 	this->m_placedPartCount = 0;
 }
+
+// STUB: LEGO1 0x10026120
+MxResult LegoVehicleBuildState::VTable0x1c(LegoFileStream* p_legoFileStream)
+{
+	// TODO
+	return SUCCESS;
+}
diff --git a/LEGO1/lego/legoomni/src/build/racecar.cpp b/LEGO1/lego/legoomni/src/build/racecar.cpp
index 0fbc97b9..02f3a09d 100644
--- a/LEGO1/lego/legoomni/src/build/racecar.cpp
+++ b/LEGO1/lego/legoomni/src/build/racecar.cpp
@@ -13,3 +13,17 @@ RaceCar::~RaceCar()
 {
 	// TODO
 }
+
+// STUB: LEGO1 0x10028490
+MxResult RaceCar::Create(MxDSAction& p_dsAction)
+{
+	// TODO
+	return SUCCESS;
+}
+
+// STUB: LEGO1 0x100284d0
+MxU32 RaceCar::VTable0xcc()
+{
+	// TODO
+	return 0;
+}
diff --git a/LEGO1/lego/legoomni/src/entity/legoactor.cpp b/LEGO1/lego/legoomni/src/entity/legoactor.cpp
index e9010ef4..5c18b9d3 100644
--- a/LEGO1/lego/legoomni/src/entity/legoactor.cpp
+++ b/LEGO1/lego/legoomni/src/entity/legoactor.cpp
@@ -17,3 +17,15 @@ LegoActor::~LegoActor()
 {
 	// TODO
 }
+
+// STUB: LEGO1 0x1002d390
+void LegoActor::ParseAction(char*)
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x1002d670
+void LegoActor::SetROI(LegoROI* p_roi, MxBool p_bool1, MxBool p_bool2)
+{
+	// TODO
+}
diff --git a/LEGO1/lego/legoomni/src/entity/legocarraceactor.cpp b/LEGO1/lego/legoomni/src/entity/legocarraceactor.cpp
new file mode 100644
index 00000000..6e967472
--- /dev/null
+++ b/LEGO1/lego/legoomni/src/entity/legocarraceactor.cpp
@@ -0,0 +1,45 @@
+#include "legocarraceactor.h"
+
+// STUB: LEGO1 0x10014130
+void LegoCarRaceActor::VTable0x68()
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x100141a0
+MxS32 LegoCarRaceActor::VTable0x90()
+{
+	// TODO
+	return 0;
+}
+
+// STUB: LEGO1 0x1005d650
+MxS32 LegoCarRaceActor::VTable0x94()
+{
+	// TODO
+	return 0;
+}
+
+// STUB: LEGO1 0x10081830
+void LegoCarRaceActor::VTable0x6c()
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x10081d10
+void LegoCarRaceActor::VTable0x70(float p_float)
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x10081d20
+void LegoCarRaceActor::VTable0x98()
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x10081d30
+void LegoCarRaceActor::VTable0x9c()
+{
+	// TODO
+}
diff --git a/LEGO1/lego/legoomni/src/entity/legojetski.cpp b/LEGO1/lego/legoomni/src/entity/legojetski.cpp
index d0fffd85..828b4f5b 100644
--- a/LEGO1/lego/legoomni/src/entity/legojetski.cpp
+++ b/LEGO1/lego/legoomni/src/entity/legojetski.cpp
@@ -1 +1,51 @@
 #include "legojetski.h"
+
+// STUB: LEGO1 0x10013e70
+MxLong LegoJetski::Notify(MxParam& p_param)
+{
+	// TODO
+	return 0;
+}
+
+// STUB: LEGO1 0x10014110
+void LegoJetski::ParseAction(char*)
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x10014120
+void LegoJetski::SetWorldSpeed(MxFloat p_worldSpeed)
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x10014140
+void LegoJetski::VTable0x6c()
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x10014180
+void LegoJetski::VTable0x70(float p_float)
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x100141b0
+MxS32 LegoJetski::VTable0x94()
+{
+	// TODO
+	return 0;
+}
+
+// STUB: LEGO1 0x100141c0
+void LegoJetski::VTable0x98()
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x10014200
+void LegoJetski::VTable0x9c()
+{
+	// TODO
+}
diff --git a/LEGO1/lego/legoomni/src/entity/legojetskiraceactor.cpp b/LEGO1/lego/legoomni/src/entity/legojetskiraceactor.cpp
new file mode 100644
index 00000000..e8c7801f
--- /dev/null
+++ b/LEGO1/lego/legoomni/src/entity/legojetskiraceactor.cpp
@@ -0,0 +1,25 @@
+#include "legojetskiraceactor.h"
+
+// STUB: LEGO1 0x10081fc0
+void LegoJetskiRaceActor::VTable0x6c()
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x100822c0
+void LegoJetskiRaceActor::VTable0x70(float p_float)
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x100822d0
+void LegoJetskiRaceActor::VTable0x98()
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x100822e0
+void LegoJetskiRaceActor::VTable0x9c()
+{
+	// TODO
+}
diff --git a/LEGO1/lego/legoomni/src/entity/legonavcontroller.cpp b/LEGO1/lego/legoomni/src/entity/legonavcontroller.cpp
index a806edd0..6a6a035c 100644
--- a/LEGO1/lego/legoomni/src/entity/legonavcontroller.cpp
+++ b/LEGO1/lego/legoomni/src/entity/legonavcontroller.cpp
@@ -222,3 +222,10 @@ float LegoNavController::CalculateNewVel(float p_targetVel, float p_currentVel,
 
 	return newVel;
 }
+
+// STUB: LEGO1 0x10055a60
+MxLong LegoNavController::Notify(MxParam& p_param)
+{
+	// TODO
+	return 0;
+}
diff --git a/LEGO1/lego/legoomni/src/entity/legopathactor.cpp b/LEGO1/lego/legoomni/src/entity/legopathactor.cpp
index 472f2e4b..b3174f83 100644
--- a/LEGO1/lego/legoomni/src/entity/legopathactor.cpp
+++ b/LEGO1/lego/legoomni/src/entity/legopathactor.cpp
@@ -68,6 +68,12 @@ void LegoPathActor::VTable0x68()
 	// TODO
 }
 
+// STUB: LEGO1 0x1002f020
+void LegoPathActor::ParseAction(char*)
+{
+	// TODO
+}
+
 // STUB: LEGO1 0x1002f1b0
 void LegoPathActor::VTable0x9c()
 {
diff --git a/LEGO1/lego/legoomni/src/entity/legoraceactor.cpp b/LEGO1/lego/legoomni/src/entity/legoraceactor.cpp
new file mode 100644
index 00000000..84022005
--- /dev/null
+++ b/LEGO1/lego/legoomni/src/entity/legoraceactor.cpp
@@ -0,0 +1,45 @@
+#include "legoraceactor.h"
+
+// STUB: LEGO1 0x10014190
+void LegoRaceActor::VTable0x74(Matrix4& p_transform)
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x10014ca0
+void LegoRaceActor::ParseAction(char*)
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x10014cb0
+void LegoRaceActor::SetWorldSpeed(MxFloat p_worldSpeed)
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x10014cc0
+void LegoRaceActor::VTable0x68()
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x10014cd0
+void LegoRaceActor::VTable0x70(float p_float)
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x10014ce0
+MxS32 LegoRaceActor::VTable0x90()
+{
+	// TODO
+	return 0;
+}
+
+// STUB: LEGO1 0x10014cf0
+MxS32 LegoRaceActor::VTable0x94()
+{
+	// TODO
+	return 0;
+}
diff --git a/LEGO1/lego/legoomni/src/entity/legoracecar.cpp b/LEGO1/lego/legoomni/src/entity/legoracecar.cpp
new file mode 100644
index 00000000..8728783a
--- /dev/null
+++ b/LEGO1/lego/legoomni/src/entity/legoracecar.cpp
@@ -0,0 +1,51 @@
+#include "legoracecar.h"
+
+// STUB: LEGO1 0x10014280
+MxLong LegoRaceCar::Notify(MxParam& p_param)
+{
+	// TODO
+	return 0;
+}
+
+// STUB: LEGO1 0x100144d0
+void LegoRaceCar::ParseAction(char*)
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x100144e0
+void LegoRaceCar::SetWorldSpeed(MxFloat p_worldSpeed)
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x100144f0
+void LegoRaceCar::VTable0x6c()
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x10014530
+void LegoRaceCar::VTable0x70(float p_float)
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x10014540
+MxS32 LegoRaceCar::VTable0x94()
+{
+	// TODO
+	return 0;
+}
+
+// STUB: LEGO1 0x10014550
+void LegoRaceCar::VTable0x98()
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x10014580
+void LegoRaceCar::VTable0x9c()
+{
+	// TODO
+}
diff --git a/LEGO1/lego/legoomni/src/gasstation/gasstation.cpp b/LEGO1/lego/legoomni/src/gasstation/gasstation.cpp
index 7f7aff11..8bedf0cf 100644
--- a/LEGO1/lego/legoomni/src/gasstation/gasstation.cpp
+++ b/LEGO1/lego/legoomni/src/gasstation/gasstation.cpp
@@ -19,12 +19,26 @@ GasStation::GasStation()
 	NotificationManager()->Register(this);
 }
 
+// STUB: LEGO1 0x10004770
+MxBool GasStation::VTable0x5c()
+{
+	// TODO
+	return FALSE;
+}
+
 // STUB: LEGO1 0x100048c0
 GasStation::~GasStation()
 {
 	// TODO
 }
 
+// STUB: LEGO1 0x10004990
+MxResult GasStation::Create(MxDSAction& p_dsAction)
+{
+	// TODO
+	return SUCCESS;
+}
+
 // STUB: LEGO1 0x10004a60
 MxLong GasStation::Notify(MxParam& p_param)
 {
@@ -33,6 +47,18 @@ MxLong GasStation::Notify(MxParam& p_param)
 	return 0;
 }
 
+// STUB: LEGO1 0x10004b30
+void GasStation::VTable0x50()
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x10005c40
+void GasStation::VTable0x68(MxBool p_add)
+{
+	// TODO
+}
+
 // STUB: LEGO1 0x10005c90
 MxResult GasStation::Tickle()
 {
@@ -40,3 +66,10 @@ MxResult GasStation::Tickle()
 
 	return 0;
 }
+
+// STUB: LEGO1 0x10005e70
+MxBool GasStation::VTable0x64()
+{
+	// TODO
+	return FALSE;
+}
diff --git a/LEGO1/lego/legoomni/src/gasstation/gasstationstate.cpp b/LEGO1/lego/legoomni/src/gasstation/gasstationstate.cpp
index b4ec4dfd..5bbcdde6 100644
--- a/LEGO1/lego/legoomni/src/gasstation/gasstationstate.cpp
+++ b/LEGO1/lego/legoomni/src/gasstation/gasstationstate.cpp
@@ -16,3 +16,10 @@ GasStationState::GasStationState()
 	unk0x08[1] = -1;
 	unk0x08[2] = -1;
 }
+
+// STUB: LEGO1 0x10006300
+MxResult GasStationState::VTable0x1c(LegoFileStream* p_legoFileStream)
+{
+	// TODO
+	return SUCCESS;
+}
diff --git a/LEGO1/lego/legoomni/src/hospital/ambulance.cpp b/LEGO1/lego/legoomni/src/hospital/ambulance.cpp
index 1d9ca918..a7bd2689 100644
--- a/LEGO1/lego/legoomni/src/hospital/ambulance.cpp
+++ b/LEGO1/lego/legoomni/src/hospital/ambulance.cpp
@@ -19,3 +19,63 @@ Ambulance::Ambulance()
 	this->m_unk0x13c = 40.0;
 	this->m_unk0x17c = 1.0;
 }
+
+// STUB: LEGO1 0x10035f90
+void Ambulance::Destroy(MxBool p_fromDestructor)
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x100361d0
+MxResult Ambulance::Create(MxDSAction& p_dsAction)
+{
+	// TODO
+	return SUCCESS;
+}
+
+// STUB: LEGO1 0x10036300
+void Ambulance::VTable0x70(float p_float)
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x10036420
+MxLong Ambulance::Notify(MxParam& p_param)
+{
+	// TODO
+	return 0;
+}
+
+// STUB: LEGO1 0x10036860
+MxU32 Ambulance::VTable0xdc(MxType19NotificationParam& p_param)
+{
+	// TODO
+	return 0;
+}
+
+// STUB: LEGO1 0x10036ce0
+MxU32 Ambulance::VTable0xcc()
+{
+	// TODO
+	return 0;
+}
+
+// STUB: LEGO1 0x10036e90
+void Ambulance::VTable0xe4()
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x10036f90
+MxU32 Ambulance::VTable0xd4(MxType17NotificationParam& p_param)
+{
+	// TODO
+	return 0;
+}
+
+// STUB: LEGO1 0x10037160
+MxResult Ambulance::Tickle()
+{
+	// TODO
+	return SUCCESS;
+}
diff --git a/LEGO1/lego/legoomni/src/hospital/ambulancemissionstate.cpp b/LEGO1/lego/legoomni/src/hospital/ambulancemissionstate.cpp
index 4213a587..601f1ccd 100644
--- a/LEGO1/lego/legoomni/src/hospital/ambulancemissionstate.cpp
+++ b/LEGO1/lego/legoomni/src/hospital/ambulancemissionstate.cpp
@@ -18,3 +18,10 @@ AmbulanceMissionState::AmbulanceMissionState()
 	m_color4 = 0;
 	m_color5 = 0;
 }
+
+// STUB: LEGO1 0x10037440
+MxResult AmbulanceMissionState::VTable0x1c(LegoFileStream* p_legoFileStream)
+{
+	// TODO
+	return 0;
+}
diff --git a/LEGO1/lego/legoomni/src/hospital/hospital.cpp b/LEGO1/lego/legoomni/src/hospital/hospital.cpp
index e8de5495..8ede37e2 100644
--- a/LEGO1/lego/legoomni/src/hospital/hospital.cpp
+++ b/LEGO1/lego/legoomni/src/hospital/hospital.cpp
@@ -23,12 +23,26 @@ Hospital::Hospital()
 	NotificationManager()->Register(this);
 }
 
+// STUB: LEGO1 0x100746a0
+MxBool Hospital::VTable0x5c()
+{
+	// TODO
+	return FALSE;
+}
+
 // STUB: LEGO1 0x100747f0
 Hospital::~Hospital()
 {
 	// TODO
 }
 
+// STUB: LEGO1 0x100748c0
+MxResult Hospital::Create(MxDSAction& p_dsAction)
+{
+	// TODO
+	return SUCCESS;
+}
+
 // STUB: LEGO1 0x10074990
 MxLong Hospital::Notify(MxParam& p_param)
 {
@@ -36,3 +50,29 @@ MxLong Hospital::Notify(MxParam& p_param)
 
 	return 0;
 }
+
+// STUB: LEGO1 0x10074a60
+void Hospital::VTable0x50()
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x10076220
+void Hospital::VTable0x68(MxBool p_add)
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x10076270
+MxResult Hospital::Tickle()
+{
+	// TODO
+	return SUCCESS;
+}
+
+// STUB: LEGO1 0x10076330
+MxBool Hospital::VTable0x64()
+{
+	// TODO
+	return FALSE;
+}
diff --git a/LEGO1/lego/legoomni/src/hospital/hospitalstate.cpp b/LEGO1/lego/legoomni/src/hospital/hospitalstate.cpp
index 4f865128..5921cd0c 100644
--- a/LEGO1/lego/legoomni/src/hospital/hospitalstate.cpp
+++ b/LEGO1/lego/legoomni/src/hospital/hospitalstate.cpp
@@ -12,3 +12,10 @@ HospitalState::HospitalState()
 	this->m_unk0x14 = 0;
 	this->m_unk0x16 = 0;
 }
+
+// STUB: LEGO1 0x10076530
+MxResult HospitalState::VTable0x1c(LegoFileStream* p_legoFileStream)
+{
+	// TODO
+	return 0;
+}
diff --git a/LEGO1/lego/legoomni/src/isle/bike.cpp b/LEGO1/lego/legoomni/src/isle/bike.cpp
index 3c27ebc5..1c71b299 100644
--- a/LEGO1/lego/legoomni/src/isle/bike.cpp
+++ b/LEGO1/lego/legoomni/src/isle/bike.cpp
@@ -9,3 +9,30 @@ Bike::Bike()
 	this->m_unk0x150 = 3.0;
 	this->m_unk0x148 = 1;
 }
+
+// STUB: LEGO1 0x100768f0
+MxResult Bike::Create(MxDSAction& p_dsAction)
+{
+	// TODO
+	return SUCCESS;
+}
+
+// STUB: LEGO1 0x10076920
+void Bike::VTable0xe4()
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x100769a0
+MxU32 Bike::VTable0xcc()
+{
+	// TODO
+	return 0;
+}
+
+// STUB: LEGO1 0x10076aa0
+MxU32 Bike::VTable0xd4(MxType17NotificationParam& p_param)
+{
+	// TODO
+	return 0;
+}
diff --git a/LEGO1/lego/legoomni/src/isle/bumpbouy.cpp b/LEGO1/lego/legoomni/src/isle/bumpbouy.cpp
index c4c8069d..6ae105ff 100644
--- a/LEGO1/lego/legoomni/src/isle/bumpbouy.cpp
+++ b/LEGO1/lego/legoomni/src/isle/bumpbouy.cpp
@@ -1 +1,32 @@
 #include "bumpbouy.h"
+
+// STUB: LEGO1 0x1000fd00
+void BumpBouy::ParseAction(char*)
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x1000fd10
+void BumpBouy::SetWorldSpeed(MxFloat p_worldSpeed)
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x1000fd20
+void BumpBouy::VTable0x70(float p_float)
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x1000fd30
+void BumpBouy::VTable0x74(Matrix4& p_transform)
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x100274d0
+MxLong BumpBouy::Notify(MxParam& p_param)
+{
+	// TODO
+	return 0;
+}
diff --git a/LEGO1/lego/legoomni/src/isle/doors.cpp b/LEGO1/lego/legoomni/src/isle/doors.cpp
new file mode 100644
index 00000000..aa7e2031
--- /dev/null
+++ b/LEGO1/lego/legoomni/src/isle/doors.cpp
@@ -0,0 +1,20 @@
+#include "doors.h"
+
+// STUB: LEGO1 0x10066100
+MxS32 Doors::VTable0x94()
+{
+	// TODO
+	return 0;
+}
+
+// STUB: LEGO1 0x10066250
+void Doors::VTable0x70(float p_float)
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x100664e0
+void Doors::ParseAction(char*)
+{
+	// TODO
+}
diff --git a/LEGO1/lego/legoomni/src/isle/historybook.cpp b/LEGO1/lego/legoomni/src/isle/historybook.cpp
index d00e8acd..f5a970b3 100644
--- a/LEGO1/lego/legoomni/src/isle/historybook.cpp
+++ b/LEGO1/lego/legoomni/src/isle/historybook.cpp
@@ -12,6 +12,13 @@ HistoryBook::~HistoryBook()
 	// TODO
 }
 
+// STUB: LEGO1 0x10082610
+MxResult HistoryBook::Create(MxDSAction& p_dsAction)
+{
+	// TODO
+	return SUCCESS;
+}
+
 // STUB: LEGO1 0x10082680
 MxLong HistoryBook::Notify(MxParam& p_param)
 {
@@ -19,3 +26,16 @@ MxLong HistoryBook::Notify(MxParam& p_param)
 
 	return 0;
 }
+
+// STUB: LEGO1 0x100826f0
+void HistoryBook::VTable0x50()
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x10082a10
+MxBool HistoryBook::VTable0x64()
+{
+	// TODO
+	return FALSE;
+}
diff --git a/LEGO1/lego/legoomni/src/isle/isleactor.cpp b/LEGO1/lego/legoomni/src/isle/isleactor.cpp
index a28afc6b..b6ac3556 100644
--- a/LEGO1/lego/legoomni/src/isle/isleactor.cpp
+++ b/LEGO1/lego/legoomni/src/isle/isleactor.cpp
@@ -2,3 +2,17 @@
 
 // NOTE: This is copied from base class LegoActor. IsleActor may in fact be larger but we don't know yet.
 DECOMP_SIZE_ASSERT(IsleActor, 0x78)
+
+// STUB: LEGO1 0x1002c780
+MxResult IsleActor::Create(MxDSAction& p_dsAction)
+{
+	// TODO
+	return SUCCESS;
+}
+
+// STUB: LEGO1 0x1002c7b0
+MxLong IsleActor::Notify(MxParam& p_param)
+{
+	// TODO
+	return 0;
+}
diff --git a/LEGO1/lego/legoomni/src/isle/islepathactor.cpp b/LEGO1/lego/legoomni/src/isle/islepathactor.cpp
index 76ec41bd..b93535f6 100644
--- a/LEGO1/lego/legoomni/src/isle/islepathactor.cpp
+++ b/LEGO1/lego/legoomni/src/isle/islepathactor.cpp
@@ -24,6 +24,13 @@ void IslePathActor::Destroy(MxBool p_fromDestructor)
 		LegoPathActor::Destroy(FALSE);
 }
 
+// STUB: LEGO1 0x1001a2c0
+MxLong IslePathActor::Notify(MxParam& p_param)
+{
+	// TODO
+	return 0;
+}
+
 // STUB: LEGO1 0x1001a350
 void IslePathActor::VTable0xe0()
 {
diff --git a/LEGO1/lego/legoomni/src/isle/jukebox.cpp b/LEGO1/lego/legoomni/src/isle/jukebox.cpp
index d5ded948..687c0a79 100644
--- a/LEGO1/lego/legoomni/src/isle/jukebox.cpp
+++ b/LEGO1/lego/legoomni/src/isle/jukebox.cpp
@@ -12,3 +12,50 @@ JukeBox::JukeBox()
 	m_unk0xfc = 0;
 	NotificationManager()->Register(this);
 }
+
+// STUB: LEGO1 0x1005d6e0
+MxBool JukeBox::VTable0x5c()
+{
+	// TODO
+	return FALSE;
+}
+
+// STUB: LEGO1 0x1005d8d0
+MxResult JukeBox::Create(MxDSAction& p_dsAction)
+{
+	// TODO
+	return SUCCESS;
+}
+
+// STUB: LEGO1 0x1005d980
+MxLong JukeBox::Notify(MxParam& p_param)
+{
+	// TODO
+	return 0;
+}
+
+// STUB: LEGO1 0x1005d9f0
+void JukeBox::VTable0x50()
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x1005dde0
+void JukeBox::VTable0x68(MxBool p_add)
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x1005de30
+MxResult JukeBox::Tickle()
+{
+	// TODO
+	return SUCCESS;
+}
+
+// STUB: LEGO1 0x1005de70
+MxBool JukeBox::VTable0x64()
+{
+	// TODO
+	return FALSE;
+}
diff --git a/LEGO1/lego/legoomni/src/isle/jukeboxentity.cpp b/LEGO1/lego/legoomni/src/isle/jukeboxentity.cpp
index 73071896..026772c0 100644
--- a/LEGO1/lego/legoomni/src/isle/jukeboxentity.cpp
+++ b/LEGO1/lego/legoomni/src/isle/jukeboxentity.cpp
@@ -11,3 +11,10 @@ JukeBoxEntity::~JukeBoxEntity()
 {
 	// TODO
 }
+
+// STUB: LEGO1 0x10085e40
+MxLong JukeBoxEntity::Notify(MxParam& p_param)
+{
+	// TODO
+	return 0;
+}
diff --git a/LEGO1/lego/legoomni/src/isle/motocycle.cpp b/LEGO1/lego/legoomni/src/isle/motocycle.cpp
index 2628d7ce..c54bd841 100644
--- a/LEGO1/lego/legoomni/src/isle/motocycle.cpp
+++ b/LEGO1/lego/legoomni/src/isle/motocycle.cpp
@@ -10,3 +10,43 @@ Motocycle::Motocycle()
 	this->m_unk0x148 = 1;
 	this->m_unk0x164 = 1.0;
 }
+
+// STUB: LEGO1 0x10035a40
+MxResult Motocycle::Create(MxDSAction& p_dsAction)
+{
+	// TODO
+	return SUCCESS;
+}
+
+// STUB: LEGO1 0x10035ad0
+void Motocycle::VTable0x70(float p_float)
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x10035bc0
+void Motocycle::VTable0xe4()
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x10035c50
+MxU32 Motocycle::VTable0xcc()
+{
+	// TODO
+	return 0;
+}
+
+// STUB: LEGO1 0x10035d70
+MxU32 Motocycle::VTable0xd4(MxType17NotificationParam& p_param)
+{
+	// TODO
+	return 0;
+}
+
+// STUB: LEGO1 0x10035df0
+MxU32 Motocycle::VTable0xdc(MxType19NotificationParam& p_param)
+{
+	// TODO
+	return 0;
+}
diff --git a/LEGO1/lego/legoomni/src/isle/radio.cpp b/LEGO1/lego/legoomni/src/isle/radio.cpp
index f1befefd..c87ac04e 100644
--- a/LEGO1/lego/legoomni/src/isle/radio.cpp
+++ b/LEGO1/lego/legoomni/src/isle/radio.cpp
@@ -23,6 +23,13 @@ Radio::~Radio()
 	// TODO
 }
 
+// STUB: LEGO1 0x1002ca30
+MxLong Radio::Notify(MxParam& p_param)
+{
+	// TODO
+	return 0;
+}
+
 // FUNCTION: LEGO1 0x1002cde0
 void Radio::CreateRadioState()
 {
diff --git a/LEGO1/lego/legoomni/src/isle/radiostate.cpp b/LEGO1/lego/legoomni/src/isle/radiostate.cpp
index 012eea68..08aa91fa 100644
--- a/LEGO1/lego/legoomni/src/isle/radiostate.cpp
+++ b/LEGO1/lego/legoomni/src/isle/radiostate.cpp
@@ -5,3 +5,10 @@ RadioState::RadioState()
 {
 	// TODO
 }
+
+// STUB: LEGO1 0x1002cf50
+MxBool RadioState::VTable0x14()
+{
+	// TODO
+	return FALSE;
+}
diff --git a/LEGO1/lego/legoomni/src/isle/skateboard.cpp b/LEGO1/lego/legoomni/src/isle/skateboard.cpp
index 96a26bcd..2863ec40 100644
--- a/LEGO1/lego/legoomni/src/isle/skateboard.cpp
+++ b/LEGO1/lego/legoomni/src/isle/skateboard.cpp
@@ -1,4 +1,4 @@
-#include "skateboard.h"
+#include "SkateBoard.h"
 
 #include "decomp.h"
 #include "mxnotificationmanager.h"
@@ -16,3 +16,37 @@ SkateBoard::SkateBoard()
 
 	NotificationManager()->Register(this);
 }
+
+// STUB: LEGO1 0x10010000
+MxResult SkateBoard::Create(MxDSAction& p_dsAction)
+{
+	// TODO
+	return SUCCESS;
+}
+
+// STUB: LEGO1 0x10010050
+void SkateBoard::VTable0xe4()
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x100100e0
+MxU32 SkateBoard::VTable0xcc()
+{
+	// TODO
+	return 0;
+}
+
+// STUB: LEGO1 0x10010230
+MxU32 SkateBoard::VTable0xd4(MxType17NotificationParam& p_param)
+{
+	// TODO
+	return 0;
+}
+
+// STUB: LEGO1 0x100104f0
+MxU32 SkateBoard::VTable0xd0()
+{
+	// TODO
+	return 0;
+}
diff --git a/LEGO1/lego/legoomni/src/notify/legoeventnotificationparam.cpp b/LEGO1/lego/legoomni/src/notify/legoeventnotificationparam.cpp
index b6abd2c4..299bbe33 100644
--- a/LEGO1/lego/legoomni/src/notify/legoeventnotificationparam.cpp
+++ b/LEGO1/lego/legoomni/src/notify/legoeventnotificationparam.cpp
@@ -3,3 +3,10 @@
 #include "decomp.h"
 
 DECOMP_SIZE_ASSERT(LegoEventNotificationParam, 0x20);
+
+// STUB: LEGO1 0x10028690
+MxNotificationParam* LegoEventNotificationParam::Clone()
+{
+	// TODO
+	return NULL;
+}
diff --git a/LEGO1/lego/legoomni/src/pizzeria/pizza.cpp b/LEGO1/lego/legoomni/src/pizzeria/pizza.cpp
index 3b0201f6..8b7efe78 100644
--- a/LEGO1/lego/legoomni/src/pizzeria/pizza.cpp
+++ b/LEGO1/lego/legoomni/src/pizzeria/pizza.cpp
@@ -20,6 +20,13 @@ Pizza::~Pizza()
 	TickleManager()->UnregisterClient(this);
 }
 
+// STUB: LEGO1 0x10038170
+MxResult Pizza::Create(MxDSAction& p_dsAction)
+{
+	// TODO
+	return SUCCESS;
+}
+
 // STUB: LEGO1 0x100388a0
 MxResult Pizza::Tickle()
 {
diff --git a/LEGO1/lego/legoomni/src/pizzeria/pizzamissionstate.cpp b/LEGO1/lego/legoomni/src/pizzeria/pizzamissionstate.cpp
index a7aa59b4..6fb460a1 100644
--- a/LEGO1/lego/legoomni/src/pizzeria/pizzamissionstate.cpp
+++ b/LEGO1/lego/legoomni/src/pizzeria/pizzamissionstate.cpp
@@ -3,6 +3,13 @@
 DECOMP_SIZE_ASSERT(PizzaMissionStateEntry, 0x20)
 DECOMP_SIZE_ASSERT(PizzaMissionState, 0xb0)
 
+// STUB: LEGO1 0x100393c0
+MxResult PizzaMissionState::VTable0x1c(LegoFileStream* p_legoFileStream)
+{
+	// TODO
+	return SUCCESS;
+}
+
 // FUNCTION: LEGO1 0x10039510
 PizzaMissionStateEntry* PizzaMissionState::GetState(MxU8 p_id)
 {
diff --git a/LEGO1/lego/legoomni/src/pizzeria/pizzeria.cpp b/LEGO1/lego/legoomni/src/pizzeria/pizzeria.cpp
index 3b6e8d41..84404f01 100644
--- a/LEGO1/lego/legoomni/src/pizzeria/pizzeria.cpp
+++ b/LEGO1/lego/legoomni/src/pizzeria/pizzeria.cpp
@@ -1 +1,8 @@
 #include "pizzeria.h"
+
+// STUB: LEGO1 0x100179c0
+MxResult Pizzeria::Create(MxDSAction& p_dsAction)
+{
+	// TODO
+	return SUCCESS;
+}
diff --git a/LEGO1/lego/legoomni/src/pizzeria/pizzeriastate.cpp b/LEGO1/lego/legoomni/src/pizzeria/pizzeriastate.cpp
index ea54a028..3422c68d 100644
--- a/LEGO1/lego/legoomni/src/pizzeria/pizzeriastate.cpp
+++ b/LEGO1/lego/legoomni/src/pizzeria/pizzeriastate.cpp
@@ -5,3 +5,10 @@ PizzeriaState::PizzeriaState()
 {
 	// TODO
 }
+
+// STUB: LEGO1 0x10017da0
+MxResult PizzeriaState::VTable0x1c(LegoFileStream* p_legoFileStream)
+{
+	// TODO
+	return SUCCESS;
+}
diff --git a/LEGO1/lego/legoomni/src/police/police.cpp b/LEGO1/lego/legoomni/src/police/police.cpp
index 89874e00..42456814 100644
--- a/LEGO1/lego/legoomni/src/police/police.cpp
+++ b/LEGO1/lego/legoomni/src/police/police.cpp
@@ -17,6 +17,13 @@ Police::Police()
 	NotificationManager()->Register(this);
 }
 
+// STUB: LEGO1 0x1005e1d0
+MxBool Police::VTable0x5c()
+{
+	// TODO
+	return FALSE;
+}
+
 // FUNCTION: LEGO1 0x1005e320
 Police::~Police()
 {
@@ -68,3 +75,16 @@ void Police::VTable0x50()
 	PlayMusic(JukeBox::e_policeStation);
 	FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
 }
+
+// STUB: LEGO1 0x1005e740
+void Police::VTable0x68(MxBool p_add)
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x1005e790
+MxBool Police::VTable0x64()
+{
+	// TODO
+	return FALSE;
+}
diff --git a/LEGO1/lego/legoomni/src/race/carrace.cpp b/LEGO1/lego/legoomni/src/race/carrace.cpp
index 9fdb353f..2e5c3b11 100644
--- a/LEGO1/lego/legoomni/src/race/carrace.cpp
+++ b/LEGO1/lego/legoomni/src/race/carrace.cpp
@@ -8,3 +8,51 @@ CarRace::CarRace()
 	this->m_unk0x150 = 0;
 	this->m_unk0x130 = MxRect32(0x16c, 0x154, 0x1ec, 0x15e);
 }
+
+// STUB: LEGO1 0x10016ce0
+MxResult CarRace::Create(MxDSAction& p_dsAction)
+{
+	// TODO
+	return SUCCESS;
+}
+
+// STUB: LEGO1 0x10016dd0
+void CarRace::VTable0x50()
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x10016f60
+undefined4 CarRace::VTable0x74(undefined4)
+{
+	// TODO
+	return 0;
+}
+
+// STUB: LEGO1 0x100170e0
+undefined4 CarRace::VTable0x70(undefined4)
+{
+	// TODO
+	return 0;
+}
+
+// STUB: LEGO1 0x10017650
+undefined4 CarRace::VTable0x6c(undefined4)
+{
+	// TODO
+	return 0;
+}
+
+// STUB: LEGO1 0x100177e0
+undefined4 CarRace::VTable0x78(undefined4)
+{
+	// TODO
+	return 0;
+}
+
+// STUB: LEGO1 0x10017900
+MxBool CarRace::VTable0x64()
+{
+	// TODO
+	return FALSE;
+}
diff --git a/LEGO1/lego/legoomni/src/race/racestate.cpp b/LEGO1/lego/legoomni/src/race/racestate.cpp
index 4776f97c..bdc003f0 100644
--- a/LEGO1/lego/legoomni/src/race/racestate.cpp
+++ b/LEGO1/lego/legoomni/src/race/racestate.cpp
@@ -11,6 +11,13 @@ RaceState::RaceState()
 	// TODO
 }
 
+// STUB: LEGO1 0x10016140
+MxResult RaceState::VTable0x1c(LegoFileStream* p_legoFileStream)
+{
+	// TODO
+	return SUCCESS;
+}
+
 // FUNCTION: LEGO1 0x10016280
 RaceStateEntry* RaceState::GetState(MxU8 p_id)
 {
diff --git a/LEGO1/lego/legoomni/src/towtrack/towtrack.cpp b/LEGO1/lego/legoomni/src/towtrack/towtrack.cpp
index 3fd0d84d..eb05e57b 100644
--- a/LEGO1/lego/legoomni/src/towtrack/towtrack.cpp
+++ b/LEGO1/lego/legoomni/src/towtrack/towtrack.cpp
@@ -15,3 +15,57 @@ TowTrack::TowTrack()
 	this->m_unk0x13c = 40.0;
 	this->m_unk0x178 = 1.0;
 }
+
+// STUB: LEGO1 0x1004c9e0
+MxResult TowTrack::Create(MxDSAction& p_dsAction)
+{
+	// TODO
+	return SUCCESS;
+}
+
+// STUB: LEGO1 0x1004cb10
+void TowTrack::VTable0x70(float p_float)
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x1004cc80
+MxLong TowTrack::Notify(MxParam& p_param)
+{
+	// TODO
+	return 0;
+}
+
+// STUB: LEGO1 0x1004cd30
+MxU32 TowTrack::VTable0xd8(MxType18NotificationParam& p_param)
+{
+	// TODO
+	return 0;
+}
+
+// STUB: LEGO1 0x1004d330
+MxU32 TowTrack::VTable0xdc(MxType19NotificationParam& p_param)
+{
+	// TODO
+	return 0;
+}
+
+// STUB: LEGO1 0x1004d690
+MxU32 TowTrack::VTable0xcc()
+{
+	// TODO
+	return 0;
+}
+
+// STUB: LEGO1 0x1004d8f0
+void TowTrack::VTable0xe4()
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x1004d9e0
+MxU32 TowTrack::VTable0xd4(MxType17NotificationParam& p_param)
+{
+	// TODO
+	return 0;
+}
diff --git a/LEGO1/lego/legoomni/src/video/legoanimmmpresenter.cpp b/LEGO1/lego/legoomni/src/video/legoanimmmpresenter.cpp
index a6e20919..6b5a6040 100644
--- a/LEGO1/lego/legoomni/src/video/legoanimmmpresenter.cpp
+++ b/LEGO1/lego/legoomni/src/video/legoanimmmpresenter.cpp
@@ -5,3 +5,65 @@ LegoAnimMMPresenter::LegoAnimMMPresenter()
 {
 	// TODO
 }
+
+// STUB: LEGO1 0x1004aaf0
+MxResult LegoAnimMMPresenter::StartAction(MxStreamController* p_controller, MxDSAction* p_action)
+{
+	// TODO
+	return SUCCESS;
+}
+
+// STUB: LEGO1 0x1004aec0
+void LegoAnimMMPresenter::EndAction()
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x1004b140
+void LegoAnimMMPresenter::ReadyTickle()
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x1004b1c0
+void LegoAnimMMPresenter::StartingTickle()
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x1004b220
+void LegoAnimMMPresenter::StreamingTickle()
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x1004b250
+void LegoAnimMMPresenter::RepeatingTickle()
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x1004b2c0
+void LegoAnimMMPresenter::DoneTickle()
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x1004b2d0
+MxLong LegoAnimMMPresenter::Notify(MxParam& p_param)
+{
+	// TODO
+	return 0;
+}
+
+// STUB: LEGO1 0x1004b360
+void LegoAnimMMPresenter::VTable0x60(MxPresenter* p_presenter)
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x1004b390
+void LegoAnimMMPresenter::ParseExtra()
+{
+	// TODO
+}
diff --git a/LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp b/LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp
index 31fe68b3..d5f50654 100644
--- a/LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp
+++ b/LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp
@@ -155,6 +155,19 @@ void LegoAnimPresenter::StreamingTickle()
 	}
 }
 
+// STUB: LEGO1 0x1006b8c0
+void LegoAnimPresenter::DoneTickle()
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x1006b8d0
+MxResult LegoAnimPresenter::AddToManager()
+{
+	// TODO
+	return SUCCESS;
+}
+
 // FUNCTION: LEGO1 0x1006b8e0
 void LegoAnimPresenter::Destroy()
 {
diff --git a/LEGO1/lego/legoomni/src/video/legocarbuildanimpresenter.cpp b/LEGO1/lego/legoomni/src/video/legocarbuildanimpresenter.cpp
index 0b5ba549..24bb175b 100644
--- a/LEGO1/lego/legoomni/src/video/legocarbuildanimpresenter.cpp
+++ b/LEGO1/lego/legoomni/src/video/legocarbuildanimpresenter.cpp
@@ -6,8 +6,38 @@ LegoCarBuildAnimPresenter::LegoCarBuildAnimPresenter()
 	// TODO
 }
 
+// STUB: LEGO1 0x10078500
+void LegoCarBuildAnimPresenter::RepeatingTickle()
+{
+	// TODO
+}
+
 // STUB: LEGO1 0x10078680
 LegoCarBuildAnimPresenter::~LegoCarBuildAnimPresenter()
 {
 	// TODO
 }
+
+// STUB: LEGO1 0x10078790
+void LegoCarBuildAnimPresenter::PutFrame()
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x100788c0
+void LegoCarBuildAnimPresenter::ReadyTickle()
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x100789e0
+void LegoCarBuildAnimPresenter::StreamingTickle()
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x10078db0
+void LegoCarBuildAnimPresenter::EndAction()
+{
+	// TODO
+}
diff --git a/LEGO1/lego/legoomni/src/video/legoflctexturepresenter.cpp b/LEGO1/lego/legoomni/src/video/legoflctexturepresenter.cpp
index f96d2b47..8d77a1eb 100644
--- a/LEGO1/lego/legoomni/src/video/legoflctexturepresenter.cpp
+++ b/LEGO1/lego/legoomni/src/video/legoflctexturepresenter.cpp
@@ -14,3 +14,21 @@ void LegoFlcTexturePresenter::Init()
 	this->m_unk0x68 = 0;
 	this->m_unk0x6c = 0;
 }
+
+// STUB: LEGO1 0x1005df80
+void LegoFlcTexturePresenter::StartingTickle()
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x1005e0c0
+void LegoFlcTexturePresenter::LoadFrame(MxStreamChunk* p_chunk)
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x1005e100
+void LegoFlcTexturePresenter::PutFrame()
+{
+	// TODO
+}
diff --git a/LEGO1/lego/legoomni/src/video/legohideanimpresenter.cpp b/LEGO1/lego/legoomni/src/video/legohideanimpresenter.cpp
index 00718629..07035332 100644
--- a/LEGO1/lego/legoomni/src/video/legohideanimpresenter.cpp
+++ b/LEGO1/lego/legoomni/src/video/legohideanimpresenter.cpp
@@ -36,8 +36,39 @@ void LegoHideAnimPresenter::Destroy(MxBool p_fromDestructor)
 		LegoHideAnimPresenter::Destroy();
 }
 
+// STUB: LEGO1 0x1006dab0
+MxResult LegoHideAnimPresenter::AddToManager()
+{
+	// TODO
+	return SUCCESS;
+}
+
 // FUNCTION: LEGO1 0x1006dac0
 void LegoHideAnimPresenter::Destroy()
 {
 	Destroy(FALSE);
 }
+
+// STUB: LEGO1 0x1006dad0
+void LegoHideAnimPresenter::PutFrame()
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x1006dae0
+void LegoHideAnimPresenter::ReadyTickle()
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x1006db20
+void LegoHideAnimPresenter::StartingTickle()
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x1006e9e0
+void LegoHideAnimPresenter::EndAction()
+{
+	// TODO
+}
diff --git a/LEGO1/lego/legoomni/src/video/legolocomotionanimpresenter.cpp b/LEGO1/lego/legoomni/src/video/legolocomotionanimpresenter.cpp
index 27d6e421..debe6659 100644
--- a/LEGO1/lego/legoomni/src/video/legolocomotionanimpresenter.cpp
+++ b/LEGO1/lego/legoomni/src/video/legolocomotionanimpresenter.cpp
@@ -11,3 +11,53 @@ void LegoLocomotionAnimPresenter::Init()
 {
 	// TODO
 }
+
+// STUB: LEGO1 0x1006d140
+MxResult LegoLocomotionAnimPresenter::VTable0x88(MxStreamChunk* p_chunk)
+{
+	// TODO
+	return SUCCESS;
+}
+
+// STUB: LEGO1 0x1006d160
+MxResult LegoLocomotionAnimPresenter::AddToManager()
+{
+	// TODO
+	return SUCCESS;
+}
+
+// STUB: LEGO1 0x1006d5b0
+void LegoLocomotionAnimPresenter::Destroy()
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x1006d5c0
+void LegoLocomotionAnimPresenter::PutFrame()
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x1006d5d0
+void LegoLocomotionAnimPresenter::ReadyTickle()
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x1006d610
+void LegoLocomotionAnimPresenter::StartingTickle()
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x1006d660
+void LegoLocomotionAnimPresenter::StreamingTickle()
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x1006d670
+void LegoLocomotionAnimPresenter::EndAction()
+{
+	// TODO
+}
diff --git a/LEGO1/lego/legoomni/src/video/legoloopinganimpresenter.cpp b/LEGO1/lego/legoomni/src/video/legoloopinganimpresenter.cpp
new file mode 100644
index 00000000..8cfb3499
--- /dev/null
+++ b/LEGO1/lego/legoomni/src/video/legoloopinganimpresenter.cpp
@@ -0,0 +1,13 @@
+#include "legoloopinganimpresenter.h"
+
+// STUB: LEGO1 0x1006caa0
+void LegoLoopingAnimPresenter::StreamingTickle()
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x1006cb40
+void LegoLoopingAnimPresenter::PutFrame()
+{
+	// TODO
+}
diff --git a/LEGO1/lego/legoomni/src/video/legopartpresenter.cpp b/LEGO1/lego/legoomni/src/video/legopartpresenter.cpp
index 1ae834f9..545d2f65 100644
--- a/LEGO1/lego/legoomni/src/video/legopartpresenter.cpp
+++ b/LEGO1/lego/legoomni/src/video/legopartpresenter.cpp
@@ -6,9 +6,28 @@ int g_partPresenterConfig1 = 1;
 // GLOBAL: LEGO1 0x100f7aa4
 int g_partPresenterConfig2 = 100;
 
+// STUB: LEGO1 0x1000cf60
+void LegoPartPresenter::Destroy()
+{
+	// TODO
+}
+
 // FUNCTION: LEGO1 0x1007c990
 void LegoPartPresenter::configureLegoPartPresenter(MxS32 p_partPresenterConfig1, MxS32 p_partPresenterConfig2)
 {
 	g_partPresenterConfig1 = p_partPresenterConfig1;
 	g_partPresenterConfig2 = p_partPresenterConfig2;
 }
+
+// STUB: LEGO1 0x1007c9b0
+MxResult LegoPartPresenter::AddToManager()
+{
+	// TODO
+	return SUCCESS;
+}
+
+// STUB: LEGO1 0x1007deb0
+void LegoPartPresenter::ReadyTickle()
+{
+	// TODO
+}
diff --git a/LEGO1/lego/legoomni/src/video/legophonemepresenter.cpp b/LEGO1/lego/legoomni/src/video/legophonemepresenter.cpp
index 31948367..4d128531 100644
--- a/LEGO1/lego/legoomni/src/video/legophonemepresenter.cpp
+++ b/LEGO1/lego/legoomni/src/video/legophonemepresenter.cpp
@@ -21,3 +21,27 @@ void LegoPhonemePresenter::Init()
 	m_unk0x70 = 0;
 	m_unk0x84 = 0;
 }
+
+// STUB: LEGO1 0x1004e3d0
+void LegoPhonemePresenter::StartingTickle()
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x1004e800
+void LegoPhonemePresenter::LoadFrame(MxStreamChunk* p_chunk)
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x1004e840
+void LegoPhonemePresenter::PutFrame()
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x1004e870
+void LegoPhonemePresenter::EndAction()
+{
+	// TODO
+}
diff --git a/LEGO1/lego/sources/roi/legoroi.cpp b/LEGO1/lego/sources/roi/legoroi.cpp
index 9d530b16..0f262a51 100644
--- a/LEGO1/lego/sources/roi/legoroi.cpp
+++ b/LEGO1/lego/sources/roi/legoroi.cpp
@@ -119,6 +119,12 @@ void LegoROI::SetDisplayBB(MxS32 p_displayBB)
 	// Intentionally empty function
 }
 
+// FUNCTION: LEGO1 0x100aa340
+float LegoROI::IntrinsicImportance() const
+{
+	return .5;
+}
+
 // Note: Actually part of parent class (doesn't exist yet)
 // STUB: LEGO1 0x100aa350
 void LegoROI::UpdateWorldBoundingVolumes()
diff --git a/LEGO1/lego/sources/roi/legoroi.h b/LEGO1/lego/sources/roi/legoroi.h
index 302a0bd8..5dfac62f 100644
--- a/LEGO1/lego/sources/roi/legoroi.h
+++ b/LEGO1/lego/sources/roi/legoroi.h
@@ -17,6 +17,7 @@ class LegoROI : public ViewROI {
 public:
 	LegoROI(Tgl::Renderer* p_renderer, ViewLODList* p_lodList, MxTime p_time);
 
+	virtual float IntrinsicImportance() const override; // vtable+0x4
 	// Note: Actually part of parent class (doesn't exist yet)
 	virtual void UpdateWorldBoundingVolumes() override; // vtable+0x18
 
diff --git a/LEGO1/mxgeometry/mxmatrix.h b/LEGO1/mxgeometry/mxmatrix.h
index 2db07671..3ae03404 100644
--- a/LEGO1/mxgeometry/mxmatrix.h
+++ b/LEGO1/mxgeometry/mxmatrix.h
@@ -10,6 +10,9 @@ class MxMatrix : public Matrix4 {
 	inline MxMatrix() : Matrix4(m_elements) {}
 	inline MxMatrix(const MxMatrix& p_matrix) : Matrix4(m_elements) { Equals(p_matrix); }
 
+	// FUNCTION: LEGO1 0x10002850
+	virtual void operator=(const Matrix4& p_matrix) { Equals(p_matrix); } // vtable+0x28
+
 	// No idea why there's another equals. Maybe to some other type like the
 	// DirectX Retained Mode Matrix type which is also a float* alias?
 	// FUNCTION: LEGO1 0x10002860
diff --git a/LEGO1/tgl/d3drm/group.cpp b/LEGO1/tgl/d3drm/group.cpp
index 4b966cd2..bc7da727 100644
--- a/LEGO1/tgl/d3drm/group.cpp
+++ b/LEGO1/tgl/d3drm/group.cpp
@@ -112,7 +112,7 @@ Result GroupImpl::RemoveAll()
 	return Error;
 }
 
-// STUB: LEGO1 0x100a34c0
+// STUB: LEGO1 0x100a3540
 Result GroupImpl::Unknown()
 {
 	return Error;
diff --git a/LEGO1/tgl/d3drm/impl.h b/LEGO1/tgl/d3drm/impl.h
index 1e017cf2..614b5f60 100644
--- a/LEGO1/tgl/d3drm/impl.h
+++ b/LEGO1/tgl/d3drm/impl.h
@@ -63,7 +63,6 @@ class RendererImpl : public Renderer {
 
 	// vtable+0x20
 	virtual Unk* CreateUnk() override;
-	virtual Texture* CreateTexture() override;
 	virtual Texture* CreateTexture(
 		int width,
 		int height,
@@ -73,6 +72,8 @@ class RendererImpl : public Renderer {
 		int paletteEntryCount,
 		const PaletteEntry* pEntries
 	) override;
+	virtual Texture* CreateTexture() override;
+
 	virtual Result SetTextureDefaultShadeCount(unsigned long) override;
 
 	// vtable+0x30
@@ -307,12 +308,12 @@ class GroupImpl : public Group {
 	virtual Result SetTexture(const Texture*);
 	virtual Result GetTexture(Texture*&);
 	virtual Result SetMaterialMode(MaterialMode);
-	virtual Result Add(const Group*);
+	virtual Result Add(const Mesh*);
 
 	// vtable+0x20
-	virtual Result Add(const Mesh*);
-	virtual Result Remove(const Group*);
+	virtual Result Add(const Group*);
 	virtual Result Remove(const Mesh*);
+	virtual Result Remove(const Group*);
 	virtual Result RemoveAll();
 
 	// vtable+0x30
diff --git a/LEGO1/tgl/d3drm/renderer.cpp b/LEGO1/tgl/d3drm/renderer.cpp
index 4a8ca6c7..c3669e05 100644
--- a/LEGO1/tgl/d3drm/renderer.cpp
+++ b/LEGO1/tgl/d3drm/renderer.cpp
@@ -34,7 +34,7 @@ Result RendererImpl::Create()
 	return (m_data != NULL) ? Success : Error;
 }
 
-// FUNCTION: LEGO1 0x100a1894
+// FUNCTION: LEGO1 0x100a1830
 Device* RendererImpl::CreateDevice(const DeviceDirect3DCreateData& data)
 {
 	DeviceImpl* device = new DeviceImpl();
diff --git a/LEGO1/tgl/d3drm/texture.cpp b/LEGO1/tgl/d3drm/texture.cpp
index 2b2c3eb0..b0ee3813 100644
--- a/LEGO1/tgl/d3drm/texture.cpp
+++ b/LEGO1/tgl/d3drm/texture.cpp
@@ -150,7 +150,7 @@ Result TextureImpl::Changed(int texelsChanged, int paletteChanged)
 	return ResultVal(m_data->Changed(texelsChanged, paletteChanged));
 }
 
-// FUNCTION: LEGO1 0x100a3d00
+// FUNCTION: LEGO1 0x100a3cc0
 Result TextureImpl::GetBufferAndPalette(
 	int* width,
 	int* height,
diff --git a/LEGO1/tgl/tgl.h b/LEGO1/tgl/tgl.h
index b8a09c3e..630510b9 100644
--- a/LEGO1/tgl/tgl.h
+++ b/LEGO1/tgl/tgl.h
@@ -131,7 +131,6 @@ class Renderer : public Object {
 
 	// vtable+0x20
 	virtual Unk* CreateUnk() = 0;
-	virtual Texture* CreateTexture() = 0;
 	virtual Texture* CreateTexture(
 		int width,
 		int height,
@@ -141,6 +140,7 @@ class Renderer : public Object {
 		int paletteEntryCount,
 		const PaletteEntry* pEntries
 	) = 0;
+	virtual Texture* CreateTexture() = 0;
 	virtual Result SetTextureDefaultShadeCount(unsigned long) = 0;
 
 	// vtable+0x30
@@ -278,10 +278,10 @@ class Group : public Object {
 	virtual Result SetTexture(const Texture*) = 0;
 	virtual Result GetTexture(Texture*&) = 0;
 	virtual Result SetMaterialMode(MaterialMode) = 0;
-	virtual Result Add(const Group*) = 0;
 	virtual Result Add(const Mesh*) = 0;
-	virtual Result Remove(const Group*) = 0;
+	virtual Result Add(const Group*) = 0;
 	virtual Result Remove(const Mesh*) = 0;
+	virtual Result Remove(const Group*) = 0;
 	virtual Result RemoveAll() = 0;
 
 	// This is TransformLocalToWorld in the leak, however it seems
diff --git a/LEGO1/viewmanager/viewroi.cpp b/LEGO1/viewmanager/viewroi.cpp
index ff846394..37b299b5 100644
--- a/LEGO1/viewmanager/viewroi.cpp
+++ b/LEGO1/viewmanager/viewroi.cpp
@@ -41,6 +41,24 @@ void ViewROI::UpdateWorldData(const MxMatrix& parent2world)
 	}
 }
 
+// STUB: LEGO1 0x100a9fc0
+void ViewROI::VTable0x24(const MxMatrix& p_transform)
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x100aa0a0
+void ViewROI::SetLocalTransform(const Matrix4& p_transform)
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x100aa180
+void ViewROI::VTable0x1c()
+{
+	// TODO
+}
+
 // FUNCTION: LEGO1 0x100aa500
 undefined ViewROI::SetUnk101013d8(undefined p_flag)
 {
diff --git a/LEGO1/viewmanager/viewroi.h b/LEGO1/viewmanager/viewroi.h
index 7157033a..8e6d78a9 100644
--- a/LEGO1/viewmanager/viewroi.h
+++ b/LEGO1/viewmanager/viewroi.h
@@ -44,9 +44,12 @@ class ViewROI : public OrientableROI {
 			reinterpret_cast<ViewLODList*>(m_lods)->AddRef();
 		}
 	}
-	virtual float IntrinsicImportance() const;
-	virtual Tgl::Group* GetGeometry();
-	virtual const Tgl::Group* GetGeometry() const;
+	virtual float IntrinsicImportance() const override;                  // vtable+0x04
+	virtual void VTable0x1c() override;                                  // vtable+0x1c
+	virtual void SetLocalTransform(const Matrix4& p_transform) override; // vtable+0x20
+	virtual void VTable0x24(const MxMatrix& p_transform) override;       // vtable+0x24
+	virtual const Tgl::Group* GetGeometry() const;                       // vtable+0x34
+	virtual Tgl::Group* GetGeometry();                                   // vtable+0x30
 
 	static undefined SetUnk101013d8(undefined p_flag);
 
diff --git a/tools/vtable/vtable.py b/tools/vtable/vtable.py
new file mode 100644
index 00000000..bdee080b
--- /dev/null
+++ b/tools/vtable/vtable.py
@@ -0,0 +1,99 @@
+import os
+import argparse
+import logging
+from typing import List
+import colorama
+from isledecomp.bin import Bin as IsleBin
+from isledecomp.compare import Compare as IsleCompare
+from isledecomp.utils import print_diff
+
+# Ignore all compare-db messages.
+logging.getLogger("isledecomp.compare").addHandler(logging.NullHandler())
+
+colorama.init()
+
+
+def parse_args() -> argparse.Namespace:
+    parser = argparse.ArgumentParser(description="Comparing vtables.")
+    parser.add_argument(
+        "original", metavar="original-binary", help="The original binary"
+    )
+    parser.add_argument(
+        "recompiled", metavar="recompiled-binary", help="The recompiled binary"
+    )
+    parser.add_argument(
+        "pdb", metavar="recompiled-pdb", help="The PDB of the recompiled binary"
+    )
+    parser.add_argument(
+        "decomp_dir", metavar="decomp-dir", help="The decompiled source tree"
+    )
+    parser.add_argument(
+        "--verbose", "-v", action="store_true", help="Show more detailed information"
+    )
+    parser.add_argument(
+        "--no-color", "-n", action="store_true", help="Do not color the output"
+    )
+
+    (args, _) = parser.parse_known_args()
+
+    if not os.path.isfile(args.original):
+        parser.error(f"Original binary {args.original} does not exist")
+
+    if not os.path.isfile(args.recompiled):
+        parser.error(f"Recompiled binary {args.recompiled} does not exist")
+
+    if not os.path.isfile(args.pdb):
+        parser.error(f"Symbols PDB {args.pdb} does not exist")
+
+    if not os.path.isdir(args.decomp_dir):
+        parser.error(f"Source directory {args.decomp_dir} does not exist")
+
+    return args
+
+
+def show_vtable_diff(udiff: List[str], verbose: bool = False, plain: bool = False):
+    lines = [
+        line
+        for line in udiff
+        if verbose or line.startswith("+") or line.startswith("-")
+    ]
+    print_diff(lines, plain)
+
+
+def print_summary(vtable_count: int, problem_count: int):
+    if problem_count == 0:
+        print(f"Vtables found: {vtable_count}.\n100% match.")
+        return
+
+    print(f"Vtables found: {vtable_count}.\nVtables not matching: {problem_count}.")
+
+
+def main():
+    args = parse_args()
+    vtable_count = 0
+    problem_count = 0
+
+    with IsleBin(args.original) as orig_bin, IsleBin(args.recompiled) as recomp_bin:
+        engine = IsleCompare(orig_bin, recomp_bin, args.pdb, args.decomp_dir)
+
+        for tbl_match in engine.compare_vtables():
+            vtable_count += 1
+            if tbl_match.ratio < 1:
+                problem_count += 1
+
+                udiff = list(tbl_match.udiff)
+
+                print(
+                    tbl_match.name,
+                    f": orig 0x{tbl_match.orig_addr:x}, recomp 0x{tbl_match.recomp_addr:x}",
+                )
+                show_vtable_diff(udiff, args.verbose, args.no_color)
+                print()
+
+        print_summary(vtable_count, problem_count)
+
+    return 1 if problem_count > 0 else 0
+
+
+if __name__ == "__main__":
+    raise SystemExit(main())

From 6ed3e89ed25092c84a51a6f789fbe131328cb42c Mon Sep 17 00:00:00 2001
From: MS <disinvite@users.noreply.github.com>
Date: Sat, 20 Jan 2024 20:19:49 -0500
Subject: [PATCH 161/210] reccmp: Show float constants (#473)

---
 .../isledecomp/compare/asm/parse.py           | 49 +++++++++++++--
 tools/isledecomp/isledecomp/compare/core.py   | 60 ++++++++++++++-----
 tools/isledecomp/tests/test_sanitize.py       | 34 +++++++++++
 3 files changed, 124 insertions(+), 19 deletions(-)

diff --git a/tools/isledecomp/isledecomp/compare/asm/parse.py b/tools/isledecomp/isledecomp/compare/asm/parse.py
index ee9c9154..ef1ad2c2 100644
--- a/tools/isledecomp/isledecomp/compare/asm/parse.py
+++ b/tools/isledecomp/isledecomp/compare/asm/parse.py
@@ -13,7 +13,7 @@
 
 disassembler = Cs(CS_ARCH_X86, CS_MODE_32)
 
-ptr_replace_regex = re.compile(r"ptr \[(0x[0-9a-fA-F]+)\]")
+ptr_replace_regex = re.compile(r"(?P<data_size>\w+) ptr \[(?P<addr>0x[0-9a-fA-F]+)\]")
 
 DisasmLiteInst = namedtuple("DisasmLiteInst", "address, size, mnemonic, op_str")
 
@@ -27,14 +27,20 @@ def from_hex(string: str) -> Optional[int]:
     return None
 
 
+def get_float_size(size_str: str) -> int:
+    return 8 if size_str == "qword" else 4
+
+
 class ParseAsm:
     def __init__(
         self,
         relocate_lookup: Optional[Callable[[int], bool]] = None,
         name_lookup: Optional[Callable[[int], str]] = None,
+        float_lookup: Optional[Callable[[int, int], Optional[str]]] = None,
     ) -> None:
         self.relocate_lookup = relocate_lookup
         self.name_lookup = name_lookup
+        self.float_lookup = float_lookup
         self.replacements = {}
         self.number_placeholders = True
 
@@ -47,6 +53,14 @@ def is_relocated(self, addr: int) -> bool:
 
         return False
 
+    def float_replace(self, addr: int, data_size: int) -> Optional[str]:
+        if callable(self.float_lookup):
+            float_str = self.float_lookup(addr, data_size)
+            if float_str is not None:
+                return f"{float_str} (FLOAT)"
+
+        return None
+
     def lookup(self, addr: int) -> Optional[str]:
         """Return a replacement name for this address if we find one."""
         if (cached := self.replacements.get(addr, None)) is not None:
@@ -108,18 +122,45 @@ def sanitize(self, inst: DisasmLiteInst) -> Tuple[str, str]:
 
         def filter_out_ptr(match):
             """Helper for re.sub, see below"""
-            offset = from_hex(match.group(1))
+            offset = from_hex(match.group("addr"))
 
             if offset is not None:
                 # We assume this is always an address to replace
                 placeholder = self.replace(offset)
-                return f"ptr [{placeholder}]"
+                return f'{match.group("data_size")} ptr [{placeholder}]'
 
             # Strict regex should ensure we can read the hex number.
             # But just in case: return the string with no changes
             return match.group(0)
 
-        op_str = ptr_replace_regex.sub(filter_out_ptr, inst.op_str)
+        def float_ptr_replace(match):
+            offset = from_hex(match.group("addr"))
+
+            if offset is not None:
+                # If we can find a variable name for this pointer, use it.
+                placeholder = self.lookup(offset)
+
+                # Read what's under the pointer and show the decimal value.
+                if placeholder is None:
+                    placeholder = self.float_replace(
+                        offset, get_float_size(match.group("data_size"))
+                    )
+
+                # If we can't read the float, use a regular placeholder.
+                if placeholder is None:
+                    placeholder = self.replace(offset)
+
+                return f'{match.group("data_size")} ptr [{placeholder}]'
+
+            # Strict regex should ensure we can read the hex number.
+            # But just in case: return the string with no changes
+            return match.group(0)
+
+        if inst.mnemonic.startswith("f"):
+            # If floating point instruction
+            op_str = ptr_replace_regex.sub(float_ptr_replace, inst.op_str)
+        else:
+            op_str = ptr_replace_regex.sub(filter_out_ptr, inst.op_str)
 
         # Performance hack:
         # Skip this step if there is nothing left to consider replacing.
diff --git a/tools/isledecomp/isledecomp/compare/core.py b/tools/isledecomp/isledecomp/compare/core.py
index 58f99d32..84f9131f 100644
--- a/tools/isledecomp/isledecomp/compare/core.py
+++ b/tools/isledecomp/isledecomp/compare/core.py
@@ -3,7 +3,8 @@
 import difflib
 import struct
 from dataclasses import dataclass
-from typing import Iterable, List, Optional
+from typing import Callable, Iterable, List, Optional
+from isledecomp.bin import Bin as IsleBin
 from isledecomp.cvdump.demangler import demangle_string_const
 from isledecomp.cvdump import Cvdump, CvdumpAnalysis
 from isledecomp.parser import DecompCodebase
@@ -36,9 +37,39 @@ def __str__(self) -> str:
         return f"{self.name} (0x{self.orig_addr:x}) {self.ratio*100:.02f}%{'*' if self.is_effective_match else ''}"
 
 
+def create_reloc_lookup(bin_file: IsleBin) -> Callable[[int], bool]:
+    """Function generator for relocation table lookup"""
+
+    def lookup(addr: int) -> bool:
+        return addr > bin_file.imagebase and bin_file.is_relocated_addr(addr)
+
+    return lookup
+
+
+def create_float_lookup(bin_file: IsleBin) -> Callable[[int, int], Optional[str]]:
+    """Function generator for floating point lookup"""
+
+    def lookup(addr: int, size: int) -> Optional[str]:
+        data = bin_file.read(addr, size)
+        # If this is a float constant, it should be initialized data.
+        if data is None:
+            return None
+
+        struct_str = "<f" if size == 4 else "<d"
+        try:
+            (float_value,) = struct.unpack(struct_str, data)
+            return str(float_value)
+        except struct.error:
+            return None
+
+    return lookup
+
+
 class Compare:
     # pylint: disable=too-many-instance-attributes
-    def __init__(self, orig_bin, recomp_bin, pdb_file, code_dir):
+    def __init__(
+        self, orig_bin: IsleBin, recomp_bin: IsleBin, pdb_file: str, code_dir: str
+    ):
         self.orig_bin = orig_bin
         self.recomp_bin = recomp_bin
         self.pdb_file = pdb_file
@@ -229,17 +260,6 @@ def _compare_function(self, match: MatchInfo) -> DiffReport:
         orig_raw = self.orig_bin.read(match.orig_addr, match.size)
         recomp_raw = self.recomp_bin.read(match.recomp_addr, match.size)
 
-        def orig_should_replace(addr: int) -> bool:
-            return addr > self.orig_bin.imagebase and self.orig_bin.is_relocated_addr(
-                addr
-            )
-
-        def recomp_should_replace(addr: int) -> bool:
-            return (
-                addr > self.recomp_bin.imagebase
-                and self.recomp_bin.is_relocated_addr(addr)
-            )
-
         def orig_lookup(addr: int) -> Optional[str]:
             m = self._db.get_by_orig(addr)
             if m is None:
@@ -254,11 +274,21 @@ def recomp_lookup(addr: int) -> Optional[str]:
 
             return m.match_name()
 
+        orig_should_replace = create_reloc_lookup(self.orig_bin)
+        recomp_should_replace = create_reloc_lookup(self.recomp_bin)
+
+        orig_float = create_float_lookup(self.orig_bin)
+        recomp_float = create_float_lookup(self.recomp_bin)
+
         orig_parse = ParseAsm(
-            relocate_lookup=orig_should_replace, name_lookup=orig_lookup
+            relocate_lookup=orig_should_replace,
+            name_lookup=orig_lookup,
+            float_lookup=orig_float,
         )
         recomp_parse = ParseAsm(
-            relocate_lookup=recomp_should_replace, name_lookup=recomp_lookup
+            relocate_lookup=recomp_should_replace,
+            name_lookup=recomp_lookup,
+            float_lookup=recomp_float,
         )
 
         orig_asm = orig_parse.parse_asm(orig_raw, match.orig_addr)
diff --git a/tools/isledecomp/tests/test_sanitize.py b/tools/isledecomp/tests/test_sanitize.py
index 67d95b4f..be0da30f 100644
--- a/tools/isledecomp/tests/test_sanitize.py
+++ b/tools/isledecomp/tests/test_sanitize.py
@@ -177,3 +177,37 @@ def substitute_1234(addr: int) -> Optional[str]:
     inst = DisasmLiteInst(0x1000, 2, "jmp", "0x6557")
     (_, op_str) = p.sanitize(inst)
     assert op_str == "0x5555"
+
+
+def test_float_replacement():
+    """Floating point constants often appear as pointers to data.
+    A good example is ViewROI::IntrinsicImportance and the subclass override
+    LegoROI::IntrinsicImportance. Both return 0.5, but this is done via the
+    FLD instruction and a dword value at 0x100dbdec. In this case it is more
+    valuable to just read the constant value rather than use a placeholder.
+    The float constants don't appear to be deduplicated (like strings are)
+    because there is another 0.5 at 0x100d40b0."""
+
+    def substitute_float(addr: int, _: int) -> str:
+        return "zero-point-five" if addr == 0x1234 else None
+
+    p = ParseAsm(float_lookup=substitute_float)
+    inst = DisasmLiteInst(0x1000, 6, "fld", "dword ptr [0x1234]")
+    (_, op_str) = p.sanitize(inst)
+    assert op_str == "dword ptr [zero-point-five (FLOAT)]"
+
+
+def test_float_variable():
+    """If there is a variable at the address referenced by a float instruction,
+    use the name instead of calling into the float replacement handler."""
+
+    def name_lookup(addr: int) -> Optional[str]:
+        return "g_myFloatVariable" if addr == 0x1234 else None
+
+    def substitute_float(_: int, __: int) -> str:
+        return ""
+
+    p = ParseAsm(name_lookup=name_lookup, float_lookup=substitute_float)
+    inst = DisasmLiteInst(0x1000, 6, "fld", "dword ptr [0x1234]")
+    (_, op_str) = p.sanitize(inst)
+    assert op_str == "dword ptr [g_myFloatVariable]"

From b4bc0e51c90fdb1112972c9b45e693c7ad2e93af Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Sat, 20 Jan 2024 20:23:23 -0500
Subject: [PATCH 162/210] Make all functions public symbols in FLIC library
 (#472)

---
 3rdparty/flic/flic.asm |  89 ++++++++++++++++++++++++-----------------
 3rdparty/flic/flic.lib | Bin 2940 -> 3930 bytes
 LEGO1/library_flic.h   |  45 +++++++++++++++++++++
 3 files changed, 97 insertions(+), 37 deletions(-)

diff --git a/3rdparty/flic/flic.asm b/3rdparty/flic/flic.asm
index 44f42086..e7a5f028 100644
--- a/3rdparty/flic/flic.asm
+++ b/3rdparty/flic/flic.asm
@@ -4,6 +4,21 @@ option dotname
 .model flat, c
 assume fs:nothing
 
+public FUN_100bd530
+public FUN_100bd580
+public FUN_100bd600
+public FUN_100bd680
+public FUN_100bd6e0
+public FUN_100bd760
+public FUN_100bd880
+public FUN_100bd8a0
+public FUN_100bd8f0
+public FUN_100bd940
+public FUN_100bd960
+public FUN_100bda10
+public FUN_100bdac0
+public FUN_100bdc00
+public FUN_100bdc90
 public DecodeFLCFrame
 
 ; This is so reccmp can detect the end of DecodeFLCFrame
@@ -11,7 +26,7 @@ public EndOfSection
 
 .text SEGMENT BYTE PUBLIC 'CODE'
 
-?_25162 LABEL NEAR
+FUN_100bd530 LABEL NEAR
         mov     ax, word ptr [esp+0CH]                  ; 100BD530 _ 66: 8B. 44 24, 0C
         push    esi                                     ; 100BD535 _ 56
         test    ax, ax                                  ; 100BD536 _ 66: 85. C0
@@ -43,7 +58,7 @@ public EndOfSection
         db 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH
         db 0CCH, 0CCH, 0CCH, 0CCH, 0CCH
 
-?_25164 LABEL NEAR
+FUN_100bd580 LABEL NEAR
         lea     eax, [esp+18H]                          ; 100BD580 _ 8D. 44 24, 18
         push    esi                                     ; 100BD584 _ 56
         mov     si, word ptr [esp+10H]                  ; 100BD585 _ 66: 8B. 74 24, 10
@@ -55,7 +70,7 @@ public EndOfSection
         mov     edi, dword ptr [esp+14H]                ; 100BD595 _ 8B. 7C 24, 14
         push    edx                                     ; 100BD599 _ 52
         push    edi                                     ; 100BD59A _ 57
-        call    ?_25168                                 ; 100BD59B _ E8, 00000060
+        call    FUN_100bd600                            ; 100BD59B _ E8, 00000060
         add     esp, 16                                 ; 100BD5A0 _ 83. C4, 10
         test    eax, eax                                ; 100BD5A3 _ 85. C0
         jz      ?_25167                                 ; 100BD5A5 _ 74, 4A
@@ -93,7 +108,7 @@ public EndOfSection
         db 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH
         db 0CCH, 0CCH, 0CCH, 0CCH
 
-?_25168 LABEL NEAR
+FUN_100bd600 LABEL NEAR
         mov     ecx, dword ptr [esp+8H]                 ; 100BD600 _ 8B. 4C 24, 08
         push    ebx                                     ; 100BD604 _ 53
         mov     bx, word ptr [ecx]                      ; 100BD605 _ 66: 8B. 19
@@ -150,7 +165,7 @@ public EndOfSection
 ; Filler type: INT 3 Debug breakpoint
         db 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH
 
-?_25173 LABEL NEAR
+FUN_100bd680 LABEL NEAR
         lea     eax, [esp+18H]                          ; 100BD680 _ 8D. 44 24, 18
         push    esi                                     ; 100BD684 _ 56
         lea     ecx, [esp+14H]                          ; 100BD685 _ 8D. 4C 24, 14
@@ -160,7 +175,7 @@ public EndOfSection
         mov     esi, dword ptr [esp+10H]                ; 100BD68F _ 8B. 74 24, 10
         push    edx                                     ; 100BD693 _ 52
         push    esi                                     ; 100BD694 _ 56
-        call    ?_25168                                 ; 100BD695 _ E8, FFFFFF66
+        call    FUN_100bd600                            ; 100BD695 _ E8, FFFFFF66
         add     esp, 16                                 ; 100BD69A _ 83. C4, 10
         test    eax, eax                                ; 100BD69D _ 85. C0
         jz      ?_25175                                 ; 100BD69F _ 74, 33
@@ -188,7 +203,7 @@ public EndOfSection
         db 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH
         db 0CCH, 0CCH
 
-?_25176 LABEL NEAR
+FUN_100bd6e0 LABEL NEAR
         lea     eax, [esp+18H]                          ; 100BD6E0 _ 8D. 44 24, 18
         push    ebx                                     ; 100BD6E4 _ 53
         lea     ecx, [esp+14H]                          ; 100BD6E5 _ 8D. 4C 24, 14
@@ -200,7 +215,7 @@ public EndOfSection
         shl     word ptr [esp+28H], 1                   ; 100BD6F4 _ 66: C1. 64 24, 28, 01
         push    edx                                     ; 100BD6FA _ 52
         push    esi                                     ; 100BD6FB _ 56
-        call    ?_25168                                 ; 100BD6FC _ E8, FFFFFEFF
+        call    FUN_100bd600                            ; 100BD6FC _ E8, FFFFFEFF
         add     esp, 16                                 ; 100BD701 _ 83. C4, 10
         test    eax, eax                                ; 100BD704 _ 85. C0
         jz      ?_25179                                 ; 100BD706 _ 74, 52
@@ -235,7 +250,7 @@ public EndOfSection
 ; Filler type: INT 3 Debug breakpoint
         db 0CCH, 0CCH, 0CCH
 
-?_25180 LABEL NEAR
+FUN_100bd760 LABEL NEAR
         mov     eax, dword ptr [esp+18H]                ; 100BD760 _ 8B. 44 24, 18
         sub     esp, 4                                  ; 100BD764 _ 83. EC, 04
 ; Note: Length-changing prefix causes delay on Intel processors
@@ -267,7 +282,7 @@ public EndOfSection
         add     ecx, 6                                  ; 100BD7BA _ 83. C1, 06
         push    ecx                                     ; 100BD7BD _ 51
         push    esi                                     ; 100BD7BE _ 56
-        call    ?_25194                                 ; 100BD7BF _ E8, 000000BC
+        call    FUN_100bd880                            ; 100BD7BF _ E8, 000000BC
         mov     eax, dword ptr [esp+34H]                ; 100BD7C4 _ 8B. 44 24, 34
         add     esp, 8                                  ; 100BD7C8 _ 83. C4, 08
         mov     byte ptr [eax], 1                       ; 100BD7CB _ C6. 00, 01
@@ -279,14 +294,14 @@ public EndOfSection
         push    ecx                                     ; 100BD7D4 _ 51
         push    edi                                     ; 100BD7D5 _ 57
         push    esi                                     ; 100BD7D6 _ 56
-        call    ?_25220                                 ; 100BD7D7 _ E8, 000002E4
+        call    FUN_100bdac0                            ; 100BD7D7 _ E8, 000002E4
         jmp     ?_25189                                 ; 100BD7DC _ EB, 4C
 
 ?_25184 LABEL NEAR
         add     ecx, 6                                  ; 100BD7DE _ 83. C1, 06
         push    ecx                                     ; 100BD7E1 _ 51
         push    esi                                     ; 100BD7E2 _ 56
-        call    ?_25202                                 ; 100BD7E3 _ E8, 00000158
+        call    FUN_100bd940                            ; 100BD7E3 _ E8, 00000158
         mov     eax, dword ptr [esp+34H]                ; 100BD7E8 _ 8B. 44 24, 34
         add     esp, 8                                  ; 100BD7EC _ 83. C4, 08
         mov     byte ptr [eax], 1                       ; 100BD7EF _ C6. 00, 01
@@ -298,7 +313,7 @@ public EndOfSection
         push    ecx                                     ; 100BD7F8 _ 51
         push    edi                                     ; 100BD7F9 _ 57
         push    esi                                     ; 100BD7FA _ 56
-        call    ?_25213                                 ; 100BD7FB _ E8, 00000210
+        call    FUN_100bda10                            ; 100BD7FB _ E8, 00000210
         jmp     ?_25189                                 ; 100BD800 _ EB, 28
 
 ?_25186 LABEL NEAR
@@ -307,7 +322,7 @@ public EndOfSection
         push    ecx                                     ; 100BD806 _ 51
         push    edi                                     ; 100BD807 _ 57
         push    esi                                     ; 100BD808 _ 56
-        call    ?_25227                                 ; 100BD809 _ E8, 000003F2
+        call    FUN_100bdc00                            ; 100BD809 _ E8, 000003F2
         jmp     ?_25189                                 ; 100BD80E _ EB, 1A
 
 ?_25187 LABEL NEAR
@@ -316,7 +331,7 @@ public EndOfSection
         push    ecx                                     ; 100BD814 _ 51
         push    edi                                     ; 100BD815 _ 57
         push    esi                                     ; 100BD816 _ 56
-        call    ?_25203                                 ; 100BD817 _ E8, 00000144
+        call    FUN_100bd960                            ; 100BD817 _ E8, 00000144
         jmp     ?_25189                                 ; 100BD81C _ EB, 0C
 
 ?_25188 LABEL NEAR
@@ -325,7 +340,7 @@ public EndOfSection
         push    ecx                                     ; 100BD822 _ 51
         push    edi                                     ; 100BD823 _ 57
         push    esi                                     ; 100BD824 _ 56
-        call    ?_25231                                 ; 100BD825 _ E8, 00000466
+        call    FUN_100bdc90                            ; 100BD825 _ E8, 00000466
 ?_25189:add     esp, 16                                 ; 100BD82A _ 83. C4, 10
 
 ?_25190 LABEL NEAR
@@ -355,12 +370,12 @@ public EndOfSection
 ?_25193 db 00H, 07H, 07H, 01H, 07H, 07H, 07H, 02H       ; 100BD870 _ ........
         db 03H, 04H, 07H, 05H, 06H, 0CCH, 0CCH, 0CCH    ; 100BD878 _ ........
 
-?_25194 LABEL NEAR
+FUN_100bd880 LABEL NEAR
         mov     eax, dword ptr [esp+8H]                 ; 100BD880 _ 8B. 44 24, 08
         mov     ecx, dword ptr [esp+4H]                 ; 100BD884 _ 8B. 4C 24, 04
         push    eax                                     ; 100BD888 _ 50
         push    ecx                                     ; 100BD889 _ 51
-        call    ?_25195                                 ; 100BD88A _ E8, 00000011
+        call    FUN_100bd8a0                            ; 100BD88A _ E8, 00000011
         add     esp, 8                                  ; 100BD88F _ 83. C4, 08
         ret                                             ; 100BD892 _ C3
 
@@ -369,7 +384,7 @@ public EndOfSection
         db 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH
         db 0CCH, 0CCH, 0CCH, 0CCH, 0CCH
 
-?_25195 LABEL NEAR
+FUN_100bd8a0 LABEL NEAR
         mov     eax, dword ptr [esp+8H]                 ; 100BD8A0 _ 8B. 44 24, 08
         push    ebx                                     ; 100BD8A4 _ 53
         mov     bx, word ptr [eax]                      ; 100BD8A5 _ 66: 8B. 18
@@ -395,7 +410,7 @@ public EndOfSection
         push    edi                                     ; 100BD8D2 _ 57
         add     si, bp                                  ; 100BD8D3 _ 66: 03. F5
         push    eax                                     ; 100BD8D6 _ 50
-        call    ?_25199                                 ; 100BD8D7 _ E8, 00000014
+        call    FUN_100bd8f0                            ; 100BD8D7 _ E8, 00000014
         movsx   eax, bp                                 ; 100BD8DC _ 0F BF. C5
         add     esp, 16                                 ; 100BD8DF _ 83. C4, 10
         lea     ecx, [eax+eax*2]                        ; 100BD8E2 _ 8D. 0C 40
@@ -408,7 +423,7 @@ public EndOfSection
         pop     ebx                                     ; 100BD8EE _ 5B
         ret                                             ; 100BD8EF _ C3
 
-?_25199 LABEL NEAR
+FUN_100bd8f0 LABEL NEAR
         mov     dx, word ptr [esp+10H]                  ; 100BD8F0 _ 66: 8B. 54 24, 10
         push    esi                                     ; 100BD8F5 _ 56
         movsx   ecx, word ptr [esp+10H]                 ; 100BD8F6 _ 0F BF. 4C 24, 10
@@ -440,12 +455,12 @@ public EndOfSection
 ; Filler type: INT 3 Debug breakpoint
         db 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH
 
-?_25202 LABEL NEAR
+FUN_100bd940 LABEL NEAR
         mov     eax, dword ptr [esp+8H]                 ; 100BD940 _ 8B. 44 24, 08
         mov     ecx, dword ptr [esp+4H]                 ; 100BD944 _ 8B. 4C 24, 04
         push    eax                                     ; 100BD948 _ 50
         push    ecx                                     ; 100BD949 _ 51
-        call    ?_25195                                 ; 100BD94A _ E8, FFFFFF51
+        call    FUN_100bd8a0                            ; 100BD94A _ E8, FFFFFF51
         add     esp, 8                                  ; 100BD94F _ 83. C4, 08
         ret                                             ; 100BD952 _ C3
 
@@ -454,7 +469,7 @@ public EndOfSection
         db 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH
         db 0CCH, 0CCH, 0CCH, 0CCH, 0CCH
 
-?_25203 LABEL NEAR
+FUN_100bd960 LABEL NEAR
         mov     eax, dword ptr [esp+10H]                ; 100BD960 _ 8B. 44 24, 10
         sub     esp, 8                                  ; 100BD964 _ 83. EC, 08
         mov     dx, word ptr [eax+8H]                   ; 100BD967 _ 66: 8B. 50, 08
@@ -529,7 +544,7 @@ public EndOfSection
         db 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH
         db 0CCH, 0CCH, 0CCH, 0CCH
 
-?_25213 LABEL NEAR
+FUN_100bda10 LABEL NEAR
         mov     ecx, dword ptr [esp+0CH]                ; 100BDA10 _ 8B. 4C 24, 0C
         sub     esp, 4                                  ; 100BDA14 _ 83. EC, 04
         mov     eax, dword ptr [esp+14H]                ; 100BDA17 _ 8B. 44 24, 14
@@ -572,7 +587,7 @@ public EndOfSection
         push    edi                                     ; 100BDA70 _ 57
         push    edx                                     ; 100BDA71 _ 52
         push    eax                                     ; 100BDA72 _ 50
-        call    ?_25173                                 ; 100BDA73 _ E8, FFFFFC08
+        call    FUN_100bd680                            ; 100BDA73 _ E8, FFFFFC08
         add     esp, 24                                 ; 100BDA78 _ 83. C4, 18
         jmp     ?_25217                                 ; 100BDA7B _ EB, 23
 
@@ -586,7 +601,7 @@ public EndOfSection
         push    edi                                     ; 100BDA90 _ 57
         push    ecx                                     ; 100BDA91 _ 51
         push    edx                                     ; 100BDA92 _ 52
-        call    ?_25164                                 ; 100BDA93 _ E8, FFFFFAE8
+        call    FUN_100bd580                            ; 100BDA93 _ E8, FFFFFAE8
         movsx   ecx, bp                                 ; 100BDA98 _ 0F BF. CD
         add     esp, 24                                 ; 100BDA9B _ 83. C4, 18
         add     esi, ecx                                ; 100BDA9E _ 03. F1
@@ -608,7 +623,7 @@ public EndOfSection
 ; Filler type: INT 3 Debug breakpoint
         db 0CCH, 0CCH, 0CCH
 
-?_25220 LABEL NEAR
+FUN_100bdac0 LABEL NEAR
         mov     edx, dword ptr [esp+10H]                ; 100BDAC0 _ 8B. 54 24, 10
         sub     esp, 8                                  ; 100BDAC4 _ 83. EC, 08
         mov     ax, word ptr [edx+8H]                   ; 100BDAC7 _ 66: 8B. 42, 08
@@ -643,7 +658,7 @@ public EndOfSection
         push    eax                                     ; 100BDB18 _ 50
         push    ecx                                     ; 100BDB19 _ 51
         push    edx                                     ; 100BDB1A _ 52
-        call    ?_25162                                 ; 100BDB1B _ E8, FFFFFA10
+        call    FUN_100bd530                            ; 100BDB1B _ E8, FFFFFA10
         mov     ecx, dword ptr [esp+28H]                ; 100BDB20 _ 8B. 4C 24, 28
         add     esp, 20                                 ; 100BDB24 _ 83. C4, 14
         mov     bx, word ptr [ecx]                      ; 100BDB27 _ 66: 8B. 19
@@ -677,7 +692,7 @@ public EndOfSection
         push    ecx                                     ; 100BDB7F _ 51
         add     di, bp                                  ; 100BDB80 _ 66: 03. FD
         push    edx                                     ; 100BDB83 _ 52
-        call    ?_25164                                 ; 100BDB84 _ E8, FFFFF9F7
+        call    FUN_100bd580                            ; 100BDB84 _ E8, FFFFF9F7
         movsx   ecx, bp                                 ; 100BDB89 _ 0F BF. CD
         add     dword ptr [esp+2CH], ecx                ; 100BDB8C _ 01. 4C 24, 2C
         add     esp, 24                                 ; 100BDB90 _ 83. C4, 18
@@ -704,7 +719,7 @@ public EndOfSection
         add     di, bp                                  ; 100BDBCD _ 66: 03. FD
         push    edx                                     ; 100BDBD0 _ 52
         push    ecx                                     ; 100BDBD1 _ 51
-        call    ?_25176                                 ; 100BDBD2 _ E8, FFFFFB09
+        call    FUN_100bd6e0                            ; 100BDBD2 _ E8, FFFFFB09
         add     esp, 24                                 ; 100BDBD7 _ 83. C4, 18
         dec     bx                                      ; 100BDBDA _ 66: 4B
         jne     ?_25224                                 ; 100BDBDC _ 0F 85, FFFFFF6A
@@ -723,7 +738,7 @@ public EndOfSection
 ; Filler type: INT 3 Debug breakpoint
         db 0CCH, 0CCH, 0CCH
 
-?_25227 LABEL NEAR
+FUN_100bdc00 LABEL NEAR
         mov     eax, dword ptr [esp+10H]                ; 100BDC00 _ 8B. 44 24, 10
         sub     esp, 8                                  ; 100BDC04 _ 83. EC, 08
         mov     cx, word ptr [eax+8H]                   ; 100BDC07 _ 66: 8B. 48, 08
@@ -755,7 +770,7 @@ public EndOfSection
         push    0                                       ; 100BDC52 _ 6A, 00
         push    ebx                                     ; 100BDC54 _ 53
         push    edi                                     ; 100BDC55 _ 57
-        call    ?_25176                                 ; 100BDC56 _ E8, FFFFFA85
+        call    FUN_100bd6e0                            ; 100BDC56 _ E8, FFFFFA85
         add     esp, 24                                 ; 100BDC5B _ 83. C4, 18
         test    si, si                                  ; 100BDC5E _ 66: 85. F6
         jz      ?_25229                                 ; 100BDC61 _ 74, 15
@@ -766,7 +781,7 @@ public EndOfSection
         push    eax                                     ; 100BDC6D _ 50
         push    ebx                                     ; 100BDC6E _ 53
         push    edi                                     ; 100BDC6F _ 57
-        call    ?_25162                                 ; 100BDC70 _ E8, FFFFF8BB
+        call    FUN_100bd530                            ; 100BDC70 _ E8, FFFFF8BB
         add     esp, 20                                 ; 100BDC75 _ 83. C4, 14
 ?_25229:dec     bp                                      ; 100BDC78 _ 66: 4D
         jns     ?_25228                                 ; 100BDC7A _ 79, CB
@@ -782,7 +797,7 @@ public EndOfSection
         db 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH, 0CCH
         db 0CCH, 0CCH, 0CCH, 0CCH
 
-?_25231 LABEL NEAR
+FUN_100bdc90 LABEL NEAR
         mov     eax, dword ptr [esp+10H]                ; 100BDC90 _ 8B. 44 24, 10
         sub     esp, 4                                  ; 100BDC94 _ 83. EC, 04
         push    ebx                                     ; 100BDC97 _ 53
@@ -804,7 +819,7 @@ public EndOfSection
         push    0                                       ; 100BDCBD _ 6A, 00
         push    eax                                     ; 100BDCBF _ 50
         push    esi                                     ; 100BDCC0 _ 56
-        call    ?_25164                                 ; 100BDCC1 _ E8, FFFFF8BA
+        call    FUN_100bd580                            ; 100BDCC1 _ E8, FFFFF8BA
         add     ebp, dword ptr [esp+28H]                ; 100BDCC6 _ 03. 6C 24, 28
         add     esp, 24                                 ; 100BDCCA _ 83. C4, 18
         dec     bx                                      ; 100BDCCD _ 66: 4B
@@ -836,7 +851,7 @@ DecodeFLCFrame LABEL NEAR
         push    ecx                                     ; 100BDD02 _ 51
         push    eax                                     ; 100BDD03 _ 50
         push    edx                                     ; 100BDD04 _ 52
-        call    ?_25180                                 ; 100BDD05 _ E8, FFFFFA56
+        call    FUN_100bd760                            ; 100BDD05 _ E8, FFFFFA56
         add     esp, 24                                 ; 100BDD0A _ 83. C4, 18
 ?_25235:ret                                             ; 100BDD0D _ C3
 
diff --git a/3rdparty/flic/flic.lib b/3rdparty/flic/flic.lib
index fea46a2524205492607347c02caac50e1c15f37b..8c27655057c43651eb3323934565af93e68347af 100644
GIT binary patch
delta 1376
zcmds1Jxjw-6ut4=4vG$fqBT`<aHvU}rm2XF+CiiiL=Y5WO;f073sUERxCx?k)?Xkf
zxCuHtC^&Ucaq=fPI(Yi5=3SwPxS5c0&bjZs8%}!eThBxAu-}VYmSI>byR;gM>X8~+
z3lLEkQA6dgk3Hi$#jKm0pH6OPw%jAT)3cLHDO=aH^=vGvk;E*SnHpof=E}9WDKm?$
zv@)!g1M|MxCk(lmV8>*1xt4Kc=CD_D5*m#&KUGzaYq5GxPgU1OEc4511zuMggx{q6
zcps&M|IxwRX5I-G*Ec?$tmh#9H|Br|^P;+8d|0>^m{%G}ojG-H+lWRkLW<qC(g#yp
zXb-mb3KVQ4>KAATXh5J*prAlwK!XB>fmDGaKp}xlpdo=KfQHMD?Pp#Z98C!gaCM7c
zSy7?f<MG#o!P5BFzA_2roGEiqo?7KK%TU5-;_u2qDR_7hUn)ULF=ZFZHB%0&2Q|sN
zPM~x!<rK;@Q!b$#G|Rhgpxm`!Hu&u^Bxtp~AJCPT@>Ss2dj+o-YaaO@Lq1!`F60(n
hr<5-iq%*%oo`-ygPk?IX{m8SB^8xU?$bTDb^bU+@2+RNg

delta 343
zcmca5_eX4kjER}0fw`%X0tzsI@=W0330w>e3`{_L1B55`$hqsI=ul8FG&eBCYnB;I
zLjo5g)F7aNlOHlFOQq#xChO%VWx>oum^JwWlbEEDnVAVha{`wSBQrz8u~n&OI2ag2
zH_J1}b3}6kO=Dwd0U8E!BpZVqGXn!Jn56_{@qt-tKo&okr3GXOfLVG#mLQmA1Y`+;
zS!O_%FqmZpWQk0^$-SQO&gAL5hKxd!Px8)HQUc1wyXK|%rv;}bmt^MWF~qy1Cg-Q5
Oy7@S}6(#1TG5`Q<^ExvC

diff --git a/LEGO1/library_flic.h b/LEGO1/library_flic.h
index 1c6a6d8b..ece2d6f9 100644
--- a/LEGO1/library_flic.h
+++ b/LEGO1/library_flic.h
@@ -1,5 +1,50 @@
 #ifdef 0
 
+// LIBRARY: LEGO1 0x100bd530
+// _FUN_100bd530
+
+// LIBRARY: LEGO1 0x100bd580
+// _FUN_100bd580
+
+// LIBRARY: LEGO1 0x100bd600
+// _FUN_100bd600
+
+// LIBRARY: LEGO1 0x100bd680
+// _FUN_100bd680
+
+// LIBRARY: LEGO1 0x100bd6e0
+// _FUN_100bd6e0
+
+// LIBRARY: LEGO1 0x100bd760
+// _FUN_100bd760
+
+// LIBRARY: LEGO1 0x100bd880
+// _FUN_100bd880
+
+// LIBRARY: LEGO1 0x100bd8a0
+// _FUN_100bd8a0
+
+// LIBRARY: LEGO1 0x100bd8f0
+// _FUN_100bd8f0
+
+// LIBRARY: LEGO1 0x100bd940
+// _FUN_100bd940
+
+// LIBRARY: LEGO1 0x100bd960
+// _FUN_100bd960
+
+// LIBRARY: LEGO1 0x100bda10
+// _FUN_100bda10
+
+// LIBRARY: LEGO1 0x100bdac0
+// _FUN_100bdac0
+
+// LIBRARY: LEGO1 0x100bdc00
+// _FUN_100bdc00
+
+// LIBRARY: LEGO1 0x100bdc90
+// _FUN_100bdc90
+
 // LIBRARY: LEGO1 0x100bdce0
 // _DecodeFLCFrame
 

From 3f35302e7654d3d0b0e17c8c61b6e028f73373e8 Mon Sep 17 00:00:00 2001
From: Misha <106913236+MishaProductions@users.noreply.github.com>
Date: Sun, 21 Jan 2024 09:58:15 -0500
Subject: [PATCH 163/210] begin LegoLocomotionAnimPresenter (#474)

* LegoLocomotionAnimPresenter

* Fix game startup

* Fixes

* Add size assert

---------

Co-authored-by: Christian Semmler <mail@csemmler.com>
---
 .../lego/legoomni/include/legoanimpresenter.h |  2 +-
 .../include/legolocomotionanimpresenter.h     | 10 +++
 .../legoomni/src/video/legoanimpresenter.cpp  |  6 +-
 .../src/video/legolocomotionanimpresenter.cpp | 88 +++++++++++++++----
 4 files changed, 84 insertions(+), 22 deletions(-)

diff --git a/LEGO1/lego/legoomni/include/legoanimpresenter.h b/LEGO1/lego/legoomni/include/legoanimpresenter.h
index a5aa2df3..3eeea936 100644
--- a/LEGO1/lego/legoomni/include/legoanimpresenter.h
+++ b/LEGO1/lego/legoomni/include/legoanimpresenter.h
@@ -42,7 +42,7 @@ class LegoAnimPresenter : public MxVideoPresenter {
 
 	// 6 more virtual functions here
 
-private:
+protected:
 	void Init();
 	void Destroy(MxBool p_fromDestructor);
 
diff --git a/LEGO1/lego/legoomni/include/legolocomotionanimpresenter.h b/LEGO1/lego/legoomni/include/legolocomotionanimpresenter.h
index d6785fa2..cb7e3334 100644
--- a/LEGO1/lego/legoomni/include/legolocomotionanimpresenter.h
+++ b/LEGO1/lego/legoomni/include/legolocomotionanimpresenter.h
@@ -4,9 +4,11 @@
 #include "legoloopinganimpresenter.h"
 
 // VTABLE: LEGO1 0x100d9170
+// SIZE 0xd8
 class LegoLocomotionAnimPresenter : public LegoLoopingAnimPresenter {
 public:
 	LegoLocomotionAnimPresenter();
+	virtual ~LegoLocomotionAnimPresenter() override;
 
 	// FUNCTION: LEGO1 0x1006ce50
 	inline const char* ClassName() const override // vtable+0xc
@@ -35,6 +37,14 @@ class LegoLocomotionAnimPresenter : public LegoLoopingAnimPresenter {
 
 private:
 	void Init();
+	void Destroy(MxBool p_fromDestructor);
+
+	undefined4 m_unk0xc0;  // 0xc0
+	undefined4* m_unk0xc4; // 0xc4
+	MxCore* m_unk0xc8;     // 0xc8
+	MxS32 m_unk0xcc;       // 0xcc
+	MxS32 m_unk0xd0;       // 0xd0
+	undefined2 m_unk0xd4;  // 0xd4
 };
 
 #endif // LEGOLOCOMOTIONANIMPRESENTER_H
diff --git a/LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp b/LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp
index d5f50654..027a3b83 100644
--- a/LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp
+++ b/LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp
@@ -6,6 +6,7 @@
 #include "mxcompositepresenter.h"
 #include "mxdsanim.h"
 #include "mxstreamchunk.h"
+#include "mxvideomanager.h"
 
 DECOMP_SIZE_ASSERT(LegoAnimPresenter, 0xc0)
 DECOMP_SIZE_ASSERT(LegoAnimClassBase, 0x08)
@@ -161,11 +162,10 @@ void LegoAnimPresenter::DoneTickle()
 	// TODO
 }
 
-// STUB: LEGO1 0x1006b8d0
+// FUNCTION: LEGO1 0x1006b8d0
 MxResult LegoAnimPresenter::AddToManager()
 {
-	// TODO
-	return SUCCESS;
+	return MxVideoPresenter::AddToManager();
 }
 
 // FUNCTION: LEGO1 0x1006b8e0
diff --git a/LEGO1/lego/legoomni/src/video/legolocomotionanimpresenter.cpp b/LEGO1/lego/legoomni/src/video/legolocomotionanimpresenter.cpp
index debe6659..db6e6a79 100644
--- a/LEGO1/lego/legoomni/src/video/legolocomotionanimpresenter.cpp
+++ b/LEGO1/lego/legoomni/src/video/legolocomotionanimpresenter.cpp
@@ -1,63 +1,115 @@
 #include "legolocomotionanimpresenter.h"
 
+#include "legoomni.h"
+#include "legoworld.h"
+
+DECOMP_SIZE_ASSERT(LegoLocomotionAnimPresenter, 0xd8)
+
 // FUNCTION: LEGO1 0x1006cdd0
 LegoLocomotionAnimPresenter::LegoLocomotionAnimPresenter()
 {
 	Init();
 }
 
-// STUB: LEGO1 0x1006d0b0
-void LegoLocomotionAnimPresenter::Init()
+// FUNCTION: LEGO1 0x1006d050
+LegoLocomotionAnimPresenter::~LegoLocomotionAnimPresenter()
 {
-	// TODO
+	Destroy(TRUE);
 }
 
-// STUB: LEGO1 0x1006d140
+// FUNCTION: LEGO1 0x1006d0b0
+void LegoLocomotionAnimPresenter::Init()
+{
+	m_unk0xc0 = 0;
+	m_unk0xc4 = 0;
+	m_unk0xcc = -1;
+	m_unk0xd0 = -1;
+	m_unk0xc8 = 0;
+	m_unk0xd4 = 0;
+}
+
+// FUNCTION: LEGO1 0x1006d0e0
+void LegoLocomotionAnimPresenter::Destroy(MxBool p_fromDestructor)
+{
+	m_criticalSection.Enter();
+
+	if (m_unk0xc4) {
+		delete[] m_unk0xc4;
+	}
+
+	if (m_unk0xc8) {
+		delete m_unk0xc8;
+	}
+
+	m_unk0x68 = 0;
+	Init();
+
+	m_criticalSection.Leave();
+
+	if (!p_fromDestructor) {
+		LegoAnimPresenter::Destroy();
+	}
+}
+
+// FUNCTION: LEGO1 0x1006d140
 MxResult LegoLocomotionAnimPresenter::VTable0x88(MxStreamChunk* p_chunk)
 {
-	// TODO
-	return SUCCESS;
+	MxResult result = LegoAnimPresenter::VTable0x88(p_chunk);
+	return result == SUCCESS ? SUCCESS : result;
 }
 
 // STUB: LEGO1 0x1006d160
 MxResult LegoLocomotionAnimPresenter::AddToManager()
 {
-	// TODO
-	return SUCCESS;
+	return MxVideoPresenter::AddToManager();
 }
 
-// STUB: LEGO1 0x1006d5b0
+// FUNCTION: LEGO1 0x1006d5b0
 void LegoLocomotionAnimPresenter::Destroy()
 {
-	// TODO
+	Destroy(FALSE);
 }
 
-// STUB: LEGO1 0x1006d5c0
+// FUNCTION: LEGO1 0x1006d5c0
 void LegoLocomotionAnimPresenter::PutFrame()
 {
-	// TODO
+	// Empty
 }
 
-// STUB: LEGO1 0x1006d5d0
+// FUNCTION: LEGO1 0x1006d5d0
 void LegoLocomotionAnimPresenter::ReadyTickle()
 {
-	// TODO
+	LegoAnimPresenter::ReadyTickle();
+
+	if (m_currentWorld != NULL && m_currentTickleState == e_starting) {
+		m_currentWorld->VTable0x58(this);
+		if (m_compositePresenter != NULL) {
+			SendToCompositePresenter(Lego());
+		}
+
+		m_unk0xd4++;
+	}
 }
 
 // STUB: LEGO1 0x1006d610
 void LegoLocomotionAnimPresenter::StartingTickle()
 {
 	// TODO
+	EndAction();
 }
 
-// STUB: LEGO1 0x1006d660
+// FUNCTION: LEGO1 0x1006d660
 void LegoLocomotionAnimPresenter::StreamingTickle()
 {
-	// TODO
+	if (m_unk0xd4 == 0) {
+		EndAction();
+	}
 }
 
-// STUB: LEGO1 0x1006d670
+// FUNCTION: LEGO1 0x1006d670
 void LegoLocomotionAnimPresenter::EndAction()
 {
-	// TODO
+	if (m_action) {
+		MxVideoPresenter::EndAction();
+	}
 }

From 8e1197d14ce921b0c936b2a9d77dbd3610594565 Mon Sep 17 00:00:00 2001
From: Misha <106913236+MishaProductions@users.noreply.github.com>
Date: Sun, 21 Jan 2024 10:30:19 -0500
Subject: [PATCH 164/210] implement LegoLoadCacheSoundPresenter (#475)

* fix

* fixes

* Fix WaveFormat, match LegoLoadCacheSoundPresenter

---------

Co-authored-by: Christian Semmler <mail@csemmler.com>
---
 LEGO1/lego/legoomni/include/legocachesound.h  |  3 ++
 .../include/legoloadcachesoundpresenter.h     | 14 ++++----
 .../legoomni/src/audio/legocachesound.cpp     |  2 ++
 .../src/audio/legoloadcachesoundpresenter.cpp | 32 ++++++++++++++++---
 LEGO1/omni/include/mxwavepresenter.h          |  9 +++---
 LEGO1/omni/src/audio/mxwavepresenter.cpp      | 16 +++++-----
 6 files changed, 52 insertions(+), 24 deletions(-)

diff --git a/LEGO1/lego/legoomni/include/legocachesound.h b/LEGO1/lego/legoomni/include/legocachesound.h
index 5d587835..1c3dfcc4 100644
--- a/LEGO1/lego/legoomni/include/legocachesound.h
+++ b/LEGO1/lego/legoomni/include/legocachesound.h
@@ -1,6 +1,7 @@
 #ifndef LEGOCACHESOUND_H
 #define LEGOCACHESOUND_H
 
+#include "decomp.h"
 #include "mxcore.h"
 
 // VTABLE: LEGO1 0x100d4718
@@ -28,6 +29,8 @@ class LegoCacheSound : public MxCore {
 
 private:
 	void Init();
+
+	undefined m_padding0x08[0x80]; // 0x08
 };
 
 #endif // LEGOCACHESOUND_H
diff --git a/LEGO1/lego/legoomni/include/legoloadcachesoundpresenter.h b/LEGO1/lego/legoomni/include/legoloadcachesoundpresenter.h
index dbfd478e..47dc4e1f 100644
--- a/LEGO1/lego/legoomni/include/legoloadcachesoundpresenter.h
+++ b/LEGO1/lego/legoomni/include/legoloadcachesoundpresenter.h
@@ -4,6 +4,8 @@
 #include "decomp.h"
 #include "mxwavepresenter.h"
 
+class LegoCacheSound;
+
 // VTABLE: LEGO1 0x100d5fa8
 // SIZE 0x90
 class LegoLoadCacheSoundPresenter : public MxWavePresenter {
@@ -27,12 +29,12 @@ class LegoLoadCacheSoundPresenter : public MxWavePresenter {
 	void Init();
 	void Destroy(MxBool p_fromDestructor);
 
-	undefined4* m_unk0x6c;   // 0x6c
-	undefined4* m_unk0x70;   // 0x70
-	undefined4 m_unk0x74;    // 0x74
-	undefined4 m_unk0x78;    // 0x78
-	undefined m_unk0x7c;     // 0x7c
-	undefined4 m_unk0x80[4]; // 0x80
+	LegoCacheSound* m_cacheSound;  // 0x6c
+	undefined* m_unk0x70;          // 0x70
+	undefined* m_unk0x74;          // 0x74
+	undefined4 m_unk0x78;          // 0x78
+	undefined m_unk0x7c;           // 0x7c
+	PCMWAVEFORMAT m_pcmWaveFormat; // 0x7d
 };
 
 // SYNTHETIC: LEGO1 0x10018460
diff --git a/LEGO1/lego/legoomni/src/audio/legocachesound.cpp b/LEGO1/lego/legoomni/src/audio/legocachesound.cpp
index eb58278c..a3855e88 100644
--- a/LEGO1/lego/legoomni/src/audio/legocachesound.cpp
+++ b/LEGO1/lego/legoomni/src/audio/legocachesound.cpp
@@ -1,5 +1,7 @@
 #include "legocachesound.h"
 
+DECOMP_SIZE_ASSERT(LegoCacheSound, 0x88)
+
 // FUNCTION: LEGO1 0x100064d0
 LegoCacheSound::LegoCacheSound()
 {
diff --git a/LEGO1/lego/legoomni/src/audio/legoloadcachesoundpresenter.cpp b/LEGO1/lego/legoomni/src/audio/legoloadcachesoundpresenter.cpp
index 9aeac8ba..753bf234 100644
--- a/LEGO1/lego/legoomni/src/audio/legoloadcachesoundpresenter.cpp
+++ b/LEGO1/lego/legoomni/src/audio/legoloadcachesoundpresenter.cpp
@@ -1,5 +1,9 @@
 #include "legoloadcachesoundpresenter.h"
 
+#include "legocachesound.h"
+#include "mxstreamchunk.h"
+#include "mxwavepresenter.h"
+
 DECOMP_SIZE_ASSERT(LegoLoadCacheSoundPresenter, 0x90)
 
 // FUNCTION: LEGO1 0x10018340
@@ -25,26 +29,44 @@ void LegoLoadCacheSoundPresenter::Init()
 // FUNCTION: LEGO1 0x100184f0
 void LegoLoadCacheSoundPresenter::Destroy(MxBool p_fromDestructor)
 {
-	delete this->m_unk0x70;
+	delete[] this->m_unk0x70;
 	MxWavePresenter::Destroy(p_fromDestructor);
 }
 
-// STUB: LEGO1 0x10018510
+// FUNCTION: LEGO1 0x10018510
 void LegoLoadCacheSoundPresenter::ReadyTickle()
 {
-	// TODO
+	MxStreamChunk* chunk = NextChunk();
+
+	if (chunk) {
+		WaveFormat* header = (WaveFormat*) chunk->GetData();
+		m_unk0x78 = 0;
+
+		MxU8* data = new MxU8[header->m_dataSize];
+		m_unk0x70 = data;
+		m_unk0x74 = data;
+
+		m_cacheSound = new LegoCacheSound;
+		memcpy(&m_pcmWaveFormat, &header->m_pcmWaveFormat.wf, sizeof(m_pcmWaveFormat));
+
+		m_subscriber->DestroyChunk(chunk);
+		ProgressTickleState(e_streaming);
+	}
 }
 
 // STUB: LEGO1 0x100185f0
 void LegoLoadCacheSoundPresenter::StreamingTickle()
 {
 	// TODO
+	EndAction();
 }
 
-// STUB: LEGO1 0x100186f0
+// FUNCTION: LEGO1 0x100186f0
 void LegoLoadCacheSoundPresenter::DoneTickle()
 {
-	// TODO
+	if (m_unk0x7c != 0) {
+		EndAction();
+	}
 }
 
 // STUB: LEGO1 0x10018700
diff --git a/LEGO1/omni/include/mxwavepresenter.h b/LEGO1/omni/include/mxwavepresenter.h
index bffefe15..289fa879 100644
--- a/LEGO1/omni/include/mxwavepresenter.h
+++ b/LEGO1/omni/include/mxwavepresenter.h
@@ -49,12 +49,11 @@ class MxWavePresenter : public MxSoundPresenter {
 	// FUNCTION: LEGO1 0x1000d6b0
 	virtual MxBool IsPaused() { return m_paused; }; // vtable+0x6c
 
-	// Reference: https://github.com/itsmattkc/SIEdit/blob/master/lib/othertypes.h
-	// SIZE 0x1c
+	// SIZE 0x18
 	struct WaveFormat {
-		WAVEFORMATEX m_waveFormatEx;
-		MxU32 m_dataSize;
-		MxU32 m_flags;
+		PCMWAVEFORMAT m_pcmWaveFormat; // 0x00
+		MxU32 m_dataSize;              // 0x10
+		MxU32 m_flags;                 // 0x14
 	};
 
 	// SYNTHETIC: LEGO1 0x1000d810
diff --git a/LEGO1/omni/src/audio/mxwavepresenter.cpp b/LEGO1/omni/src/audio/mxwavepresenter.cpp
index 831e0043..c0aaca7c 100644
--- a/LEGO1/omni/src/audio/mxwavepresenter.cpp
+++ b/LEGO1/omni/src/audio/mxwavepresenter.cpp
@@ -9,7 +9,7 @@
 #include "mxutil.h"
 
 DECOMP_SIZE_ASSERT(MxWavePresenter, 0x6c);
-DECOMP_SIZE_ASSERT(MxWavePresenter::WaveFormat, 0x1c);
+DECOMP_SIZE_ASSERT(MxWavePresenter::WaveFormat, 0x18);
 
 // FUNCTION: LEGO1 0x100b1ad0
 void MxWavePresenter::Init()
@@ -134,12 +134,12 @@ void MxWavePresenter::StartingTickle()
 		m_chunkLength = length;
 		memset(&waveFormatEx, 0, sizeof(waveFormatEx));
 
-		waveFormatEx.wFormatTag = m_waveFormat->m_waveFormatEx.wFormatTag;
-		waveFormatEx.nChannels = m_waveFormat->m_waveFormatEx.nChannels;
-		waveFormatEx.nSamplesPerSec = m_waveFormat->m_waveFormatEx.nSamplesPerSec;
-		waveFormatEx.nAvgBytesPerSec = m_waveFormat->m_waveFormatEx.nAvgBytesPerSec;
-		waveFormatEx.nBlockAlign = m_waveFormat->m_waveFormatEx.nBlockAlign;
-		waveFormatEx.wBitsPerSample = m_waveFormat->m_waveFormatEx.wBitsPerSample;
+		waveFormatEx.wFormatTag = m_waveFormat->m_pcmWaveFormat.wf.wFormatTag;
+		waveFormatEx.nChannels = m_waveFormat->m_pcmWaveFormat.wf.nChannels;
+		waveFormatEx.nSamplesPerSec = m_waveFormat->m_pcmWaveFormat.wf.nSamplesPerSec;
+		waveFormatEx.nAvgBytesPerSec = m_waveFormat->m_pcmWaveFormat.wf.nAvgBytesPerSec;
+		waveFormatEx.nBlockAlign = m_waveFormat->m_pcmWaveFormat.wf.nBlockAlign;
+		waveFormatEx.wBitsPerSample = m_waveFormat->m_pcmWaveFormat.wBitsPerSample;
 
 		if (waveFormatEx.wBitsPerSample == 8)
 			m_silenceData = 0x7F;
@@ -157,7 +157,7 @@ void MxWavePresenter::StartingTickle()
 			desc.dwFlags = DSBCAPS_CTRLFREQUENCY | DSBCAPS_CTRLPAN | DSBCAPS_CTRLVOLUME;
 
 		if (m_action->GetFlags() & MxDSAction::c_looping)
-			desc.dwBufferBytes = m_waveFormat->m_waveFormatEx.nAvgBytesPerSec *
+			desc.dwBufferBytes = m_waveFormat->m_pcmWaveFormat.wf.nAvgBytesPerSec *
 								 (m_action->GetDuration() / m_action->GetLoopCount()) / 1000;
 		else
 			desc.dwBufferBytes = 2 * length;

From 43c692c9d732b7ef0d3d29182016bcad7f8dab73 Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Sat, 20 Jan 2024 10:46:49 -0500
Subject: [PATCH 165/210] Minor fixes

---
 .../src/audio/legoloadcachesoundpresenter.cpp    |  2 +-
 LEGO1/omni/src/video/mxdisplaysurface.cpp        | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/LEGO1/lego/legoomni/src/audio/legoloadcachesoundpresenter.cpp b/LEGO1/lego/legoomni/src/audio/legoloadcachesoundpresenter.cpp
index 753bf234..e9dec128 100644
--- a/LEGO1/lego/legoomni/src/audio/legoloadcachesoundpresenter.cpp
+++ b/LEGO1/lego/legoomni/src/audio/legoloadcachesoundpresenter.cpp
@@ -47,7 +47,7 @@ void LegoLoadCacheSoundPresenter::ReadyTickle()
 		m_unk0x74 = data;
 
 		m_cacheSound = new LegoCacheSound;
-		memcpy(&m_pcmWaveFormat, &header->m_pcmWaveFormat.wf, sizeof(m_pcmWaveFormat));
+		memcpy(&m_pcmWaveFormat, &header->m_pcmWaveFormat, sizeof(m_pcmWaveFormat));
 
 		m_subscriber->DestroyChunk(chunk);
 		ProgressTickleState(e_streaming);
diff --git a/LEGO1/omni/src/video/mxdisplaysurface.cpp b/LEGO1/omni/src/video/mxdisplaysurface.cpp
index a9dc2608..3a43ff3f 100644
--- a/LEGO1/omni/src/video/mxdisplaysurface.cpp
+++ b/LEGO1/omni/src/video/mxdisplaysurface.cpp
@@ -238,7 +238,7 @@ void MxDisplaySurface::Destroy()
 	}
 
 	if (this->m_16bitPal)
-		delete this->m_16bitPal;
+		delete[] this->m_16bitPal;
 
 	this->Init();
 }
@@ -567,7 +567,7 @@ LPDIRECTDRAWSURFACE MxDisplaySurface::VTable0x44(
 	*p_ret = 0;
 	ddsd.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY | DDSCAPS_OFFSCREENPLAIN;
 
-	if (draw->CreateSurface(&ddsd, &surface, NULL) != S_OK) {
+	if (draw->CreateSurface(&ddsd, &surface, NULL) != DD_OK) {
 		if (*p_ret) {
 			*p_ret = 0;
 
@@ -575,7 +575,7 @@ LPDIRECTDRAWSURFACE MxDisplaySurface::VTable0x44(
 			ddsd.ddsCaps.dwCaps &= ~DDSCAPS_VIDEOMEMORY;
 			ddsd.ddsCaps.dwCaps |= DDSCAPS_SYSTEMMEMORY;
 
-			if (draw->CreateSurface(&ddsd, &surface, NULL) != S_OK) {
+			if (draw->CreateSurface(&ddsd, &surface, NULL) != DD_OK) {
 				surface = NULL;
 			}
 		}
@@ -587,7 +587,7 @@ LPDIRECTDRAWSURFACE MxDisplaySurface::VTable0x44(
 		memset(&ddsd, 0, sizeof(ddsd));
 		ddsd.dwSize = sizeof(ddsd);
 
-		if (surface->Lock(NULL, &ddsd, DDLOCK_WAIT, 0) != S_OK) {
+		if (surface->Lock(NULL, &ddsd, DDLOCK_WAIT, 0) != DD_OK) {
 			surface->Release();
 			surface = NULL;
 			goto done;
@@ -690,7 +690,7 @@ LPDIRECTDRAWSURFACE MxDisplaySurface::CreateCursorSurface()
 	memset(&ddsd, 0, sizeof(ddsd));
 	ddsd.dwSize = sizeof(ddsd);
 
-	if (draw->GetDisplayMode(&ddsd) != S_OK) {
+	if (draw->GetDisplayMode(&ddsd) != DD_OK) {
 		return NULL;
 	}
 
@@ -703,18 +703,18 @@ LPDIRECTDRAWSURFACE MxDisplaySurface::CreateCursorSurface()
 	ddsd.dwFlags = DDSD_PIXELFORMAT | DDSD_WIDTH | DDSD_HEIGHT | DDSD_CAPS;
 	ddsd.ddsCaps.dwCaps = DDSCAPS_VIDEOMEMORY | DDSCAPS_OFFSCREENPLAIN;
 
-	if (draw->CreateSurface(&ddsd, &newSurface, NULL) != S_OK) {
+	if (draw->CreateSurface(&ddsd, &newSurface, NULL) != DD_OK) {
 		ddsd.ddsCaps.dwCaps &= ~DDSCAPS_VIDEOMEMORY;
 		ddsd.ddsCaps.dwCaps |= DDSCAPS_SYSTEMMEMORY;
 
-		if (draw->CreateSurface(&ddsd, &newSurface, NULL) != S_OK)
+		if (draw->CreateSurface(&ddsd, &newSurface, NULL) != DD_OK)
 			goto done;
 	}
 
 	memset(&ddsd, 0, sizeof(ddsd));
 	ddsd.dwSize = sizeof(ddsd);
 
-	if (newSurface->Lock(NULL, &ddsd, DDLOCK_WAIT, NULL) != S_OK)
+	if (newSurface->Lock(NULL, &ddsd, DDLOCK_WAIT, NULL) != DD_OK)
 		goto done;
 	else {
 		MxU16* surface = (MxU16*) ddsd.lpSurface;

From e61530d5a08c95bf7fc313c944f3e5a605baf5fe Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Sun, 21 Jan 2024 11:02:17 -0500
Subject: [PATCH 166/210] Remove unused functions from ISLE.EXE (#476)

---
 CMakeLists.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 04ca97a9..de976bde 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -358,7 +358,9 @@ if (MSVC_FOR_DECOMP)
   # They ensure a recompilation that can be byte/instruction accurate to the original binaries.
   if (ISLE_BUILD_APP)
     target_compile_options(isle PRIVATE "/MT$<$<CONFIG:Debug>:d>")
+    target_link_options(isle PRIVATE "/OPT:REF")
   endif()
+
   target_compile_options(lego1 PRIVATE "/MT$<$<CONFIG:Debug>:d>")
 
   set(CMAKE_CXX_FLAGS "/W3 /GX /D \"WIN32\" /D \"_WINDOWS\"")

From 7b0d4dd502e527d07f807b10ed4b33feb8ea6cc7 Mon Sep 17 00:00:00 2001
From: Misha <106913236+MishaProductions@users.noreply.github.com>
Date: Sun, 21 Jan 2024 12:38:22 -0500
Subject: [PATCH 167/210] Implement Infocenter::InitializeBitmaps (#478)

---
 LEGO1/lego/legoomni/include/infocenter.h      | 32 ++++++--
 LEGO1/lego/legoomni/include/legoworld.h       |  1 +
 LEGO1/lego/legoomni/include/radio.h           |  2 +
 LEGO1/lego/legoomni/src/entity/legoworld.cpp  |  6 ++
 .../legoomni/src/infocenter/infocenter.cpp    | 82 +++++++++++++++++--
 LEGO1/lego/legoomni/src/isle/radio.cpp        |  9 ++
 6 files changed, 121 insertions(+), 11 deletions(-)

diff --git a/LEGO1/lego/legoomni/include/infocenter.h b/LEGO1/lego/legoomni/include/infocenter.h
index 7de6ec45..5de2f745 100644
--- a/LEGO1/lego/legoomni/include/infocenter.h
+++ b/LEGO1/lego/legoomni/include/infocenter.h
@@ -5,13 +5,19 @@
 #include "radio.h"
 
 class InfocenterState;
+class MxStillPresenter;
 
 // SIZE 0x18
-struct InfocenterUnkDataEntry {
+struct InfocenterMapEntry {
 	// FUNCTION: LEGO1 0x1006ec80
-	InfocenterUnkDataEntry() {}
+	InfocenterMapEntry() {}
 
-	undefined m_pad[0x18];
+	MxStillPresenter* m_presenter; // 0x00
+	undefined4 m_unk0x04;          // 0x04
+	undefined4 m_unk0x08;          // 0x08
+	undefined4 m_unk0x0c;          // 0x0c
+	undefined4 m_unk0x10;          // 0x10
+	undefined4 m_unk0x14;          // 0x14
 };
 
 // VTABLE: LEGO1 0x100d9338
@@ -31,6 +37,22 @@ class Infocenter : public LegoWorld {
 	enum InfomainScript {
 		c_noInfomain = -1,
 
+		c_leftArrowCtl = 1,
+		c_rightArrowCtl = 2,
+		c_infoCtl = 3,
+		c_boatCtl = 10,
+		c_raceCtl = 11,
+		c_pizzaCtl = 12,
+		c_gasCtl = 13,
+		c_medCtl = 14,
+		c_copCtl = 15,
+		c_radioCtl = 18,
+		c_mamaCtl = 21,
+		c_papaCtl = 22,
+		c_pepperCtl = 23,
+		c_nickCtl = 24,
+		c_lauraCtl = 25,
+
 		c_welcomeDialogue = 500,
 		c_goodJobDialogue = 501,
 
@@ -167,9 +189,9 @@ class Infocenter : public LegoWorld {
 	Cutscene m_currentCutscene;             // 0x108
 	Radio m_radio;                          // 0x10c
 	undefined4 m_unk0x11c;                  // 0x11c
-	InfocenterUnkDataEntry m_entries[7];    // 0x120
+	InfocenterMapEntry m_mapAreas[7];       // 0x120
 	MxS16 m_unk0x1c8;                       // 0x1c8
-	undefined4 m_unk0x1cc;                  // 0x1cc
+	MxStillPresenter* m_frameHotBitmap;     // 0x1cc
 	MxS16 m_infoManDialogueTimer;           // 0x1d0
 	MxS16 m_bookAnimationTimer;             // 0x1d2
 	MxU16 m_unk0x1d4;                       // 0x1d4
diff --git a/LEGO1/lego/legoomni/include/legoworld.h b/LEGO1/lego/legoomni/include/legoworld.h
index 31b60f84..382edd9a 100644
--- a/LEGO1/lego/legoomni/include/legoworld.h
+++ b/LEGO1/lego/legoomni/include/legoworld.h
@@ -60,6 +60,7 @@ class LegoWorld : public LegoEntity {
 	void FUN_10073430();
 	MxS32 GetCurrPathInfo(LegoPathBoundary** p_path, MxS32& p_value);
 	MxPresenter* FindPresenter(const char* p_presenter, const char* p_name);
+	MxPresenter* FUN_10021790(MxAtomId& p_atom, MxS32 p_entityId);
 
 	// SYNTHETIC: LEGO1 0x1001dee0
 	// LegoWorld::`scalar deleting destructor'
diff --git a/LEGO1/lego/legoomni/include/radio.h b/LEGO1/lego/legoomni/include/radio.h
index 3afb44cb..536b9a7b 100644
--- a/LEGO1/lego/legoomni/include/radio.h
+++ b/LEGO1/lego/legoomni/include/radio.h
@@ -25,6 +25,8 @@ class Radio : public MxCore {
 		return !strcmp(p_name, Radio::ClassName()) || MxCore::IsA(p_name);
 	}
 
+	void Initialize(MxBool p_und);
+
 	// SYNTHETIC: LEGO1 0x1002c970
 	// Radio::`scalar deleting destructor'
 
diff --git a/LEGO1/lego/legoomni/src/entity/legoworld.cpp b/LEGO1/lego/legoomni/src/entity/legoworld.cpp
index 8e5c7465..3fc3e277 100644
--- a/LEGO1/lego/legoomni/src/entity/legoworld.cpp
+++ b/LEGO1/lego/legoomni/src/entity/legoworld.cpp
@@ -163,6 +163,12 @@ MxPresenter* LegoWorld::FindPresenter(const char* p_presenter, const char* p_nam
 	return NULL;
 }
 
+// STUB: LEGO1 0x10021790
+MxPresenter* LegoWorld::FUN_10021790(MxAtomId& p_atom, MxS32 p_entityId)
+{
+	return NULL;
+}
+
 // STUB: LEGO1 0x10021a70
 void LegoWorld::VTable0x68(MxBool p_add)
 {
diff --git a/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp b/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp
index 170147d0..5d3722c1 100644
--- a/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp
+++ b/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp
@@ -16,7 +16,7 @@
 #include "mxtransitionmanager.h"
 
 DECOMP_SIZE_ASSERT(Infocenter, 0x1d8)
-DECOMP_SIZE_ASSERT(InfocenterUnkDataEntry, 0x18)
+DECOMP_SIZE_ASSERT(InfocenterMapEntry, 0x18)
 
 // GLOBAL: LEGO1 0x100f76a0
 const char* g_object2x4red = "2x4red";
@@ -30,13 +30,13 @@ Infocenter::Infocenter()
 	m_unk0xfc = 0;
 	m_unk0x11c = 0;
 	m_infocenterState = NULL;
-	m_unk0x1cc = 0;
+	m_frameHotBitmap = 0;
 	m_unk0x11c = 0;
 	m_unk0x104 = 0;
 	m_currentInfomainScript = c_noInfomain;
 	m_currentCutscene = e_noIntro;
 
-	memset(&m_entries, 0, sizeof(m_entries));
+	memset(&m_mapAreas, 0, sizeof(m_mapAreas));
 
 	m_unk0x1c8 = -1;
 	SetAppCursor(1);
@@ -310,7 +310,7 @@ void Infocenter::VTable0x50()
 
 	switch (GameState()->GetUnknown10()) {
 	case 0:
-		// bg->Enable(1); // TODO: Uncomment once LegoWorld::FindPresenter and LegoWorld::VTable0x58 are implemented.
+		bg->Enable(1);
 		InitializeBitmaps();
 		switch (m_infocenterState->GetUnknown0x74()) {
 		case 3:
@@ -360,10 +360,80 @@ void Infocenter::VTable0x50()
 	}
 }
 
-// STUB: LEGO1 0x1006f9a0
+// FUNCTION: LEGO1 0x1006f9a0
 void Infocenter::InitializeBitmaps()
 {
-	// TODO: Infocenter class size is wrong
+	m_radio.Initialize(TRUE);
+
+	FUN_10021790(m_atom, c_leftArrowCtl)->Enable(TRUE);
+	FUN_10021790(m_atom, c_rightArrowCtl)->Enable(TRUE);
+	FUN_10021790(m_atom, c_infoCtl)->Enable(TRUE);
+	FUN_10021790(m_atom, c_boatCtl)->Enable(TRUE);
+	FUN_10021790(m_atom, c_raceCtl)->Enable(TRUE);
+	FUN_10021790(m_atom, c_pizzaCtl)->Enable(TRUE);
+	FUN_10021790(m_atom, c_gasCtl)->Enable(TRUE);
+	FUN_10021790(m_atom, c_medCtl)->Enable(TRUE);
+	FUN_10021790(m_atom, c_copCtl)->Enable(TRUE);
+
+	FUN_10021790(m_atom, c_mamaCtl)->Enable(TRUE);
+	FUN_10021790(m_atom, c_papaCtl)->Enable(TRUE);
+	FUN_10021790(m_atom, c_pepperCtl)->Enable(TRUE);
+	FUN_10021790(m_atom, c_nickCtl)->Enable(TRUE);
+	FUN_10021790(m_atom, c_lauraCtl)->Enable(TRUE);
+	FUN_10021790(m_atom, c_radioCtl)->Enable(TRUE);
+
+	m_mapAreas[0].m_presenter = (MxStillPresenter*) FindPresenter("MxStillPresenter", "Info_A_Bitmap");
+	m_mapAreas[0].m_unk0x08 = 391;
+	m_mapAreas[0].m_unk0x0c = 182;
+	m_mapAreas[0].m_unk0x10 = 427;
+	m_mapAreas[0].m_unk0x14 = 230;
+	m_mapAreas[0].m_unk0x04 = 3;
+
+	m_mapAreas[1].m_presenter = (MxStillPresenter*) FindPresenter("MxStillPresenter", "Boat_A_Bitmap");
+	m_mapAreas[1].m_unk0x08 = 304;
+	m_mapAreas[1].m_unk0x0c = 225;
+	m_mapAreas[1].m_unk0x10 = 350;
+	m_mapAreas[1].m_unk0x14 = 268;
+	m_mapAreas[1].m_unk0x04 = 10;
+
+	m_mapAreas[2].m_presenter = (MxStillPresenter*) FindPresenter("MxStillPresenter", "Race_A_Bitmap");
+	m_mapAreas[2].m_unk0x08 = 301;
+	m_mapAreas[2].m_unk0x0c = 133;
+	m_mapAreas[2].m_unk0x10 = 347;
+	m_mapAreas[2].m_unk0x14 = 181;
+	m_mapAreas[2].m_unk0x04 = 11;
+
+	m_mapAreas[3].m_presenter = (MxStillPresenter*) FindPresenter("MxStillPresenter", "Pizza_A_Bitmap");
+	m_mapAreas[3].m_unk0x08 = 289;
+	m_mapAreas[3].m_unk0x0c = 182;
+	m_mapAreas[3].m_unk0x10 = 335;
+	m_mapAreas[3].m_unk0x14 = 225;
+	m_mapAreas[3].m_unk0x04 = 12;
+
+	m_mapAreas[4].m_presenter = (MxStillPresenter*) FindPresenter("MxStillPresenter", "Gas_A_Bitmap");
+	m_mapAreas[4].m_unk0x10 = 391;
+	m_mapAreas[4].m_unk0x08 = 350;
+	m_mapAreas[4].m_unk0x0c = 161;
+	m_mapAreas[4].m_unk0x14 = 209;
+	m_mapAreas[4].m_unk0x04 = 13;
+
+	m_mapAreas[5].m_presenter = (MxStillPresenter*) FindPresenter("MxStillPresenter", "Med_A_Bitmap");
+	m_mapAreas[5].m_unk0x08 = 392;
+	m_mapAreas[5].m_unk0x0c = 130;
+	m_mapAreas[5].m_unk0x10 = 438;
+	m_mapAreas[5].m_unk0x14 = 176;
+	m_mapAreas[5].m_unk0x04 = 14;
+
+	m_mapAreas[6].m_presenter = (MxStillPresenter*) FindPresenter("MxStillPresenter", "Cop_A_Bitmap");
+	m_mapAreas[6].m_unk0x08 = 396;
+	m_mapAreas[6].m_unk0x0c = 229;
+	m_mapAreas[6].m_unk0x10 = 442;
+	m_mapAreas[6].m_unk0x14 = 272;
+	m_mapAreas[6].m_unk0x04 = 15;
+
+	m_frameHotBitmap = (MxStillPresenter*) FindPresenter("MxStillPresenter", "FrameHot_Bitmap");
+
+	FUN_10070dc0(TRUE);
 }
 
 // STUB: LEGO1 0x1006fd00
diff --git a/LEGO1/lego/legoomni/src/isle/radio.cpp b/LEGO1/lego/legoomni/src/isle/radio.cpp
index c87ac04e..993a12f0 100644
--- a/LEGO1/lego/legoomni/src/isle/radio.cpp
+++ b/LEGO1/lego/legoomni/src/isle/radio.cpp
@@ -30,6 +30,15 @@ MxLong Radio::Notify(MxParam& p_param)
 	return 0;
 }
 
+// FUNCTION: LEGO1 0x1002cdc0
+void Radio::Initialize(MxBool p_und)
+{
+	if (m_unk0xc != p_und) {
+		m_unk0xc = p_und;
+		CreateRadioState();
+	}
+}
+
 // FUNCTION: LEGO1 0x1002cde0
 void Radio::CreateRadioState()
 {

From 05bc94f0307401c2e46f5190c75049b50d110517 Mon Sep 17 00:00:00 2001
From: Misha <106913236+MishaProductions@users.noreply.github.com>
Date: Sun, 21 Jan 2024 12:45:40 -0500
Subject: [PATCH 168/210] implement MxControlPresenter::ParseExtra (#477)

* MxControlPresenter::ParseExtra

* Update mxcontrolpresenter.h

* fix loop

---------

Co-authored-by: Christian Semmler <mail@csemmler.com>
---
 .../legoomni/include/mxcontrolpresenter.h     | 12 ++--
 .../src/control/mxcontrolpresenter.cpp        | 60 ++++++++++++++++++-
 2 files changed, 64 insertions(+), 8 deletions(-)

diff --git a/LEGO1/lego/legoomni/include/mxcontrolpresenter.h b/LEGO1/lego/legoomni/include/mxcontrolpresenter.h
index 2db0a2e4..b4c8950e 100644
--- a/LEGO1/lego/legoomni/include/mxcontrolpresenter.h
+++ b/LEGO1/lego/legoomni/include/mxcontrolpresenter.h
@@ -41,12 +41,12 @@ class MxControlPresenter : public MxCompositePresenter {
 	MxBool FUN_10044480(undefined4, undefined4*);
 	void FUN_10044540(undefined2);
 
-	undefined2 m_unk0x4c;  // 0x4c
-	MxS16 m_unk0x4e;       // 0x4e
-	MxBool m_unk0x50;      // 0x50
-	undefined2 m_unk0x52;  // 0x52
-	undefined2 m_unk0x54;  // 0x54
-	undefined4* m_unk0x58; // 0x58
+	undefined2 m_unk0x4c; // 0x4c
+	MxS16 m_unk0x4e;      // 0x4e
+	MxBool m_unk0x50;     // 0x50
+	undefined2 m_unk0x52; // 0x52
+	undefined2 m_unk0x54; // 0x54
+	MxS16* m_unk0x58;     // 0x58
 };
 
 // SYNTHETIC: LEGO1 0x100440f0
diff --git a/LEGO1/lego/legoomni/src/control/mxcontrolpresenter.cpp b/LEGO1/lego/legoomni/src/control/mxcontrolpresenter.cpp
index 7a204a78..b578f107 100644
--- a/LEGO1/lego/legoomni/src/control/mxcontrolpresenter.cpp
+++ b/LEGO1/lego/legoomni/src/control/mxcontrolpresenter.cpp
@@ -1,10 +1,27 @@
 #include "mxcontrolpresenter.h"
 
+#include "define.h"
 #include "mxticklemanager.h"
 #include "mxutil.h"
 
 DECOMP_SIZE_ASSERT(MxControlPresenter, 0x5c)
 
+// GLOBAL: LEGO1 0x10102064
+// STRING: LEGO1 0x10101fec
+const char* g_style = "STYLE";
+
+// GLOBAL: LEGO1 0x10102068
+// STRING: LEGO1 0x10101fe4
+const char* g_grid = "GRID";
+
+// GLOBAL: LEGO1 0x1010206c
+// STRING: LEGO1 0x10101fe0
+const char* g_map = "MAP";
+
+// GLOBAL: LEGO1 0x10102074
+// STRING: LEGO1 0x10101fd0
+const char* g_toggle = "TOGGLE";
+
 // FUNCTION: LEGO1 0x10043f50
 MxControlPresenter::MxControlPresenter()
 {
@@ -109,10 +126,49 @@ void MxControlPresenter::ReadyTickle()
 	ProgressTickleState(e_repeating);
 }
 
-// STUB: LEGO1 0x10044640
+// FUNCTION: LEGO1 0x10044640
 void MxControlPresenter::ParseExtra()
 {
-	// TODO
+	char result[256];
+	MxU16 len = m_action->GetExtraLength();
+	if (len) {
+		char buffer[256];
+		memcpy(buffer, m_action->GetExtraData(), m_action->GetExtraLength());
+		buffer[len] = 0;
+
+		if (KeyValueStringParse(result, g_style, buffer)) {
+			char* str = strtok(result, g_parseExtraTokens);
+			if (!strcmpi(str, g_toggle)) {
+				m_unk0x4c = 1;
+			}
+			else if (!strcmpi(str, g_grid)) {
+				m_unk0x4c = 2;
+				m_unk0x52 = atoi(strtok(NULL, g_parseExtraTokens));
+				m_unk0x54 = atoi(strtok(NULL, g_parseExtraTokens));
+			}
+			else if (!strcmpi(str, g_map)) {
+				m_unk0x4c = 3;
+				str = strtok(NULL, g_parseExtraTokens);
+				if (str) {
+					MxS16 count = atoi(str);
+					m_unk0x58 = new MxS16[count + 1];
+					*m_unk0x58 = count;
+					for (MxS16 i = 1; i <= count; i++) {
+						m_unk0x58[i] = atoi(strtok(NULL, g_parseExtraTokens));
+					}
+				}
+			}
+			else {
+				m_unk0x4c = 0;
+			}
+		}
+
+		if (KeyValueStringParse(result, g_strVISIBILITY, buffer)) {
+			if (!strcmpi(result, "FALSE")) {
+				Enable(FALSE);
+			}
+		}
+	}
 }
 
 // FUNCTION: LEGO1 0x10044820

From a65eb9a4e056e99082a869b34c790997af65b86d Mon Sep 17 00:00:00 2001
From: MS <disinvite@users.noreply.github.com>
Date: Mon, 22 Jan 2024 10:15:12 -0500
Subject: [PATCH 169/210] Roadmap tool to compare binary structure (#479)

---
 CMakeLists.txt                               |   2 +-
 tools/isledecomp/isledecomp/bin.py           |  10 +-
 tools/isledecomp/isledecomp/compare/core.py  |   3 +
 tools/isledecomp/isledecomp/compare/db.py    |  11 +
 tools/isledecomp/isledecomp/cvdump/parser.py |  26 +-
 tools/isledecomp/isledecomp/cvdump/runner.py |   6 +
 tools/roadmap/roadmap.py                     | 265 +++++++++++++++++++
 7 files changed, 320 insertions(+), 3 deletions(-)
 create mode 100644 tools/roadmap/roadmap.py

diff --git a/CMakeLists.txt b/CMakeLists.txt
index de976bde..b7c93768 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -299,8 +299,8 @@ set_property(TARGET lego1 PROPERTY SUFFIX ".DLL")
 if (ISLE_BUILD_APP)
   add_executable(isle WIN32
     ISLE/res/isle.rc
-    ISLE/isleapp.cpp
     ISLE/define.cpp
+    ISLE/isleapp.cpp
   )
 
   target_compile_definitions(isle PRIVATE ISLE_APP)
diff --git a/tools/isledecomp/isledecomp/bin.py b/tools/isledecomp/isledecomp/bin.py
index 3b600af6..dc04bb53 100644
--- a/tools/isledecomp/isledecomp/bin.py
+++ b/tools/isledecomp/isledecomp/bin.py
@@ -1,6 +1,6 @@
 import logging
 import struct
-from typing import List, Optional
+from typing import List, Optional, Tuple
 from dataclasses import dataclass
 from collections import namedtuple
 
@@ -365,6 +365,14 @@ def get_abs_addr(self, section: int, offset: int) -> int:
         into an absolute vaddr."""
         return self.get_section_offset_by_index(section) + offset
 
+    def get_relative_addr(self, addr: int) -> Tuple[int, int]:
+        """Convert an absolute address back into a (section, offset) pair."""
+        for i, section in enumerate(self.sections):
+            if section.contains_vaddr(addr):
+                return (i + 1, addr - section.virtual_address)
+
+        return (0, 0)
+
     def get_raw_addr(self, vaddr: int) -> int:
         """Returns the raw offset in the PE binary for the given virtual address."""
         self._set_section_for_vaddr(vaddr)
diff --git a/tools/isledecomp/isledecomp/compare/core.py b/tools/isledecomp/isledecomp/compare/core.py
index 84f9131f..4e1a1f70 100644
--- a/tools/isledecomp/isledecomp/compare/core.py
+++ b/tools/isledecomp/isledecomp/compare/core.py
@@ -409,6 +409,9 @@ def _compare_match(self, match: MatchInfo) -> Optional[DiffReport]:
 
     ## Public API
 
+    def get_all(self) -> List[MatchInfo]:
+        return self._db.get_all()
+
     def get_functions(self) -> List[MatchInfo]:
         return self._db.get_matches_by_type(SymbolType.FUNCTION)
 
diff --git a/tools/isledecomp/isledecomp/compare/db.py b/tools/isledecomp/isledecomp/compare/db.py
index 43d6811b..96ab3e10 100644
--- a/tools/isledecomp/isledecomp/compare/db.py
+++ b/tools/isledecomp/isledecomp/compare/db.py
@@ -82,6 +82,17 @@ def get_unmatched_strings(self) -> List[str]:
 
         return [string for (string,) in cur.fetchall()]
 
+    def get_all(self) -> List[MatchInfo]:
+        cur = self._db.execute(
+            """SELECT compare_type, orig_addr, recomp_addr, name, size
+            FROM `symbols`
+            ORDER BY orig_addr NULLS LAST
+            """,
+        )
+        cur.row_factory = matchinfo_factory
+
+        return cur.fetchall()
+
     def get_matches(self) -> Optional[MatchInfo]:
         cur = self._db.execute(
             """SELECT compare_type, orig_addr, recomp_addr, name, size
diff --git a/tools/isledecomp/isledecomp/cvdump/parser.py b/tools/isledecomp/isledecomp/cvdump/parser.py
index d14abe88..8d1c71bb 100644
--- a/tools/isledecomp/isledecomp/cvdump/parser.py
+++ b/tools/isledecomp/isledecomp/cvdump/parser.py
@@ -39,6 +39,9 @@
     r"S_GDATA32: \[(?P<section>\w{4}):(?P<offset>\w{8})\], Type:\s*(?P<type>\S+), (?P<name>.+)"
 )
 
+# e.g. 0003 "CMakeFiles/isle.dir/ISLE/res/isle.rc.res"
+# e.g. 0004 "C:\work\lego-island\isle\3rdparty\smartheap\SHLW32MT.LIB" "check.obj"
+_module_regex = re.compile(r"(?P<id>\w{4})(?: \"(?P<lib>.+?)\")?(?: \"(?P<obj>.+?)\")")
 
 # User functions only
 LinesEntry = namedtuple("LinesEntry", "filename line_no section offset")
@@ -52,13 +55,16 @@
 SymbolsEntry = namedtuple("SymbolsEntry", "type section offset size name")
 
 # (Estimated) size of any symbol
-SizeRefEntry = namedtuple("SizeRefEntry", "section offset size")
+SizeRefEntry = namedtuple("SizeRefEntry", "module section offset size")
 
 # global variables
 GdataEntry = namedtuple("GdataEntry", "section offset type name")
 
+ModuleEntry = namedtuple("ModuleEntry", "id lib obj")
+
 
 class CvdumpParser:
+    # pylint: disable=too-many-instance-attributes
     def __init__(self) -> None:
         self._section: str = ""
         self._lines_function: Tuple[str, int] = ("", 0)
@@ -68,6 +74,7 @@ def __init__(self) -> None:
         self.symbols = []
         self.sizerefs = []
         self.globals = []
+        self.modules = []
 
     def _lines_section(self, line: str):
         """Parsing entries from the LINES section. We only care about the pairs of
@@ -144,12 +151,26 @@ def _section_contributions(self, line: str):
         if (match := _section_contrib_regex.match(line)) is not None:
             self.sizerefs.append(
                 SizeRefEntry(
+                    module=int(match.group("module"), 16),
                     section=int(match.group("section"), 16),
                     offset=int(match.group("offset"), 16),
                     size=int(match.group("size"), 16),
                 )
             )
 
+    def _modules_section(self, line: str):
+        """Record the object file (and lib file, if used) linked into the binary.
+        The auto-incrementing id is cross-referenced in SECTION CONTRIBUTIONS
+        (and perhaps other locations)"""
+        if (match := _module_regex.match(line)) is not None:
+            self.modules.append(
+                ModuleEntry(
+                    id=int(match.group("id"), 16),
+                    lib=match.group("lib"),
+                    obj=match.group("obj"),
+                )
+            )
+
     def read_line(self, line: str):
         # Blank lines are there to help the reader; they have no context significance
         if line.strip() == "":
@@ -174,6 +195,9 @@ def read_line(self, line: str):
         elif self._section == "GLOBALS":
             self._globals_section(line)
 
+        elif self._section == "MODULES":
+            self._modules_section(line)
+
     def read_lines(self, lines: Iterable[str]):
         for line in lines:
             self.read_line(line)
diff --git a/tools/isledecomp/isledecomp/cvdump/runner.py b/tools/isledecomp/isledecomp/cvdump/runner.py
index f1c163b5..6b2c2ff4 100644
--- a/tools/isledecomp/isledecomp/cvdump/runner.py
+++ b/tools/isledecomp/isledecomp/cvdump/runner.py
@@ -13,6 +13,7 @@ class DumpOpt(Enum):
     GLOBALS = 2
     PUBLICS = 3
     SECTION_CONTRIB = 4
+    MODULES = 5
 
 
 cvdump_opt_map = {
@@ -21,6 +22,7 @@ class DumpOpt(Enum):
     DumpOpt.GLOBALS: "-g",
     DumpOpt.PUBLICS: "-p",
     DumpOpt.SECTION_CONTRIB: "-seccontrib",
+    DumpOpt.MODULES: "-m",
 }
 
 
@@ -49,6 +51,10 @@ def section_contributions(self):
         self._options.add(DumpOpt.SECTION_CONTRIB)
         return self
 
+    def modules(self):
+        self._options.add(DumpOpt.MODULES)
+        return self
+
     def cmd_line(self) -> List[str]:
         cvdump_exe = lib_path_join("cvdump.exe")
         flags = [cvdump_opt_map[opt] for opt in self._options]
diff --git a/tools/roadmap/roadmap.py b/tools/roadmap/roadmap.py
new file mode 100644
index 00000000..e8023c1d
--- /dev/null
+++ b/tools/roadmap/roadmap.py
@@ -0,0 +1,265 @@
+"""For all addresses matched by code annotations or recomp pdb,
+report how "far off" the recomp symbol is from its proper place
+in the original binary."""
+
+import os
+import argparse
+import logging
+from typing import List, Optional
+from collections import namedtuple
+from isledecomp import Bin as IsleBin
+from isledecomp.cvdump import Cvdump
+from isledecomp.compare import Compare as IsleCompare
+from isledecomp.types import SymbolType
+
+# Ignore all compare-db messages.
+logging.getLogger("isledecomp.compare").addHandler(logging.NullHandler())
+
+
+def or_blank(value) -> str:
+    """Helper for dealing with potential None values in text output."""
+    return "" if value is None else str(value)
+
+
+class ModuleMap:
+    """Load a subset of sections from the pdb to allow you to look up the
+    module number based on the recomp address."""
+
+    def __init__(self, pdb, binfile) -> None:
+        cvdump = Cvdump(pdb).section_contributions().modules().run()
+        self.module_lookup = {m.id: (m.lib, m.obj) for m in cvdump.modules}
+        self.section_contrib = [
+            (
+                binfile.get_abs_addr(sizeref.section, sizeref.offset),
+                sizeref.size,
+                sizeref.module,
+            )
+            for sizeref in cvdump.sizerefs
+            if binfile.is_valid_section(sizeref.section)
+        ]
+
+    def get_module(self, addr: int) -> Optional[str]:
+        for start, size, module_id in self.section_contrib:
+            if start <= addr < start + size:
+                if (module := self.module_lookup.get(module_id)) is not None:
+                    return module
+
+        return None
+
+
+def print_sections(sections):
+    print("    name |    start |   v.size | raw size")
+    print("---------|----------|----------|----------")
+    for sect in sections:
+        name = sect.name.decode("ascii").rstrip("\x00")
+        print(
+            f"{name:>8} | {sect.virtual_address:8x} | {sect.virtual_size:8x} | {sect.size_of_raw_data:8x}"
+        )
+    print()
+
+
+def match_type_abbreviation(mtype: Optional[SymbolType]) -> str:
+    """Return abbreviation of the given SymbolType name"""
+    if mtype is None:
+        return ""
+
+    return mtype.name.lower()[:3]
+
+
+RoadmapRow = namedtuple(
+    "RoadmapRow",
+    [
+        "orig_sect_ofs",
+        "recomp_sect_ofs",
+        "orig_addr",
+        "recomp_addr",
+        "displacement",
+        "sym_type",
+        "size",
+        "name",
+        "module",
+    ],
+)
+
+
+def print_text_report(results: List[RoadmapRow]):
+    """Print the result with original and recomp addresses."""
+    for row in results:
+        print(
+            "  ".join(
+                [
+                    f"{or_blank(row.orig_sect_ofs):14}",
+                    f"{or_blank(row.recomp_sect_ofs):14}",
+                    f"{or_blank(row.displacement):>8}",
+                    f"{row.sym_type:3}",
+                    f"{or_blank(row.size):6}",
+                    or_blank(row.name),
+                ]
+            )
+        )
+
+
+def print_diff_report(results: List[RoadmapRow]):
+    """Print only entries where we have the recomp address.
+    This is intended for generating a file to diff against.
+    The recomp addresses are always changing so we hide those."""
+    for row in results:
+        if row.orig_addr is None or row.recomp_addr is None:
+            continue
+
+        print(
+            "  ".join(
+                [
+                    f"{or_blank(row.orig_sect_ofs):14}",
+                    f"{or_blank(row.displacement):>8}",
+                    f"{row.sym_type:3}",
+                    f"{or_blank(row.size):6}",
+                    or_blank(row.name),
+                ]
+            )
+        )
+
+
+def export_to_csv(csv_file: str, results: List[RoadmapRow]):
+    with open(csv_file, "w+", encoding="utf-8") as f:
+        f.write(
+            "orig_sect_ofs,recomp_sect_ofs,orig_addr,recomp_addr,displacement,row_type,size,name,module\n"
+        )
+        for row in results:
+            f.write(",".join(map(or_blank, row)))
+            f.write("\n")
+
+
+def parse_args() -> argparse.Namespace:
+    parser = argparse.ArgumentParser(
+        description="Show all addresses from original and recomp."
+    )
+    parser.add_argument(
+        "original", metavar="original-binary", help="The original binary"
+    )
+    parser.add_argument(
+        "recompiled", metavar="recompiled-binary", help="The recompiled binary"
+    )
+    parser.add_argument(
+        "pdb", metavar="recompiled-pdb", help="The PDB of the recompiled binary"
+    )
+    parser.add_argument(
+        "decomp_dir", metavar="decomp-dir", help="The decompiled source tree"
+    )
+    parser.add_argument("--csv", metavar="<file>", help="If set, export to CSV")
+    parser.add_argument(
+        "--verbose", "-v", action="store_true", help="Show recomp addresses in output"
+    )
+
+    (args, _) = parser.parse_known_args()
+
+    if not os.path.isfile(args.original):
+        parser.error(f"Original binary {args.original} does not exist")
+
+    if not os.path.isfile(args.recompiled):
+        parser.error(f"Recompiled binary {args.recompiled} does not exist")
+
+    if not os.path.isfile(args.pdb):
+        parser.error(f"Symbols PDB {args.pdb} does not exist")
+
+    if not os.path.isdir(args.decomp_dir):
+        parser.error(f"Source directory {args.decomp_dir} does not exist")
+
+    return args
+
+
+def main():
+    args = parse_args()
+
+    with IsleBin(args.original, find_str=True) as orig_bin, IsleBin(
+        args.recompiled
+    ) as recomp_bin:
+        engine = IsleCompare(orig_bin, recomp_bin, args.pdb, args.decomp_dir)
+
+        module_map = ModuleMap(args.pdb, recomp_bin)
+
+        def is_same_section(orig: int, recomp: int) -> bool:
+            """Compare the section name instead of the index.
+            LEGO1.dll adds extra sections for some reason. (Smacker library?)"""
+
+            try:
+                orig_name = orig_bin.sections[orig - 1].name
+                recomp_name = recomp_bin.sections[recomp - 1].name
+                return orig_name == recomp_name
+            except IndexError:
+                return False
+
+        def to_roadmap_row(match):
+            orig_sect = None
+            orig_ofs = None
+            orig_sect_ofs = None
+            recomp_sect = None
+            recomp_ofs = None
+            recomp_sect_ofs = None
+            orig_addr = None
+            recomp_addr = None
+            displacement = None
+            module_name = None
+
+            if match.recomp_addr is not None:
+                if (module_ref := module_map.get_module(match.recomp_addr)) is not None:
+                    (_, module_name) = module_ref
+
+            row_type = match_type_abbreviation(match.compare_type)
+            name = (
+                repr(match.name)
+                if match.compare_type == SymbolType.STRING
+                else match.name
+            )
+
+            if match.orig_addr is not None:
+                orig_addr = match.orig_addr
+                (orig_sect, orig_ofs) = orig_bin.get_relative_addr(match.orig_addr)
+                orig_sect_ofs = f"{orig_sect:04}:{orig_ofs:08x}"
+
+            if match.recomp_addr is not None:
+                recomp_addr = match.recomp_addr
+                (recomp_sect, recomp_ofs) = recomp_bin.get_relative_addr(
+                    match.recomp_addr
+                )
+                recomp_sect_ofs = f"{recomp_sect:04}:{recomp_ofs:08x}"
+
+            if (
+                orig_sect is not None
+                and recomp_sect is not None
+                and is_same_section(orig_sect, recomp_sect)
+            ):
+                displacement = recomp_ofs - orig_ofs
+
+            return RoadmapRow(
+                orig_sect_ofs,
+                recomp_sect_ofs,
+                orig_addr,
+                recomp_addr,
+                displacement,
+                row_type,
+                match.size,
+                name,
+                module_name,
+            )
+
+        results = list(map(to_roadmap_row, engine.get_all()))
+
+        if args.csv is None:
+            if args.verbose:
+                print("ORIG sections:")
+                print_sections(orig_bin.sections)
+
+                print("RECOMP sections:")
+                print_sections(recomp_bin.sections)
+
+                print_text_report(results)
+            else:
+                print_diff_report(results)
+
+        if args.csv is not None:
+            export_to_csv(args.csv, results)
+
+
+if __name__ == "__main__":
+    main()

From a19165a749b4404bf97227a8568b93443063059a Mon Sep 17 00:00:00 2001
From: MS <disinvite@users.noreply.github.com>
Date: Mon, 22 Jan 2024 10:18:46 -0500
Subject: [PATCH 170/210] LegoWorld::LegoWorld to 100% (#480)

---
 .../legoomni/include/legomodelpresenter.h     |  4 +-
 .../legoomni/include/legopathcontrollerlist.h |  6 +++
 .../legoomni/include/legounksavedatawriter.h  |  2 +
 LEGO1/lego/legoomni/include/legoworld.h       | 47 ++++++++++++++++++-
 .../src/common/legounksavedatawriter.cpp      | 10 +++-
 LEGO1/lego/legoomni/src/entity/legoworld.cpp  | 11 +++--
 LEGO1/lego/sources/roi/legoroi.h              |  3 ++
 LEGO1/mxgeometry/mxgeometry3d.h               |  3 ++
 LEGO1/omni/include/mxpresenterlist.h          |  3 ++
 9 files changed, 82 insertions(+), 7 deletions(-)

diff --git a/LEGO1/lego/legoomni/include/legomodelpresenter.h b/LEGO1/lego/legoomni/include/legomodelpresenter.h
index 7803187a..393ea818 100644
--- a/LEGO1/lego/legoomni/include/legomodelpresenter.h
+++ b/LEGO1/lego/legoomni/include/legomodelpresenter.h
@@ -3,6 +3,8 @@
 
 #include "mxvideopresenter.h"
 
+class AutoROI;
+
 // VTABLE: LEGO1 0x100d4e50
 // SIZE 0x6c (discovered through inline constructor at 0x10009ae6)
 class LegoModelPresenter : public MxVideoPresenter {
@@ -33,7 +35,7 @@ class LegoModelPresenter : public MxVideoPresenter {
 	void Destroy(MxBool p_fromDestructor);
 
 private:
-	undefined4 m_unk0x64; // 0x64
+	AutoROI* m_unk0x64;   // 0x64
 	MxBool m_addedToView; // 0x68
 };
 
diff --git a/LEGO1/lego/legoomni/include/legopathcontrollerlist.h b/LEGO1/lego/legoomni/include/legopathcontrollerlist.h
index ead40f48..a13557b8 100644
--- a/LEGO1/lego/legoomni/include/legopathcontrollerlist.h
+++ b/LEGO1/lego/legoomni/include/legopathcontrollerlist.h
@@ -48,6 +48,9 @@ class LegoPathControllerList : public MxPtrList<LegoPathController> {
 // TEMPLATE: LEGO1 0x1001d3c0
 // MxPtrList<LegoPathController>::Destroy
 
+// TEMPLATE: LEGO1 0x1001d440
+// MxPtrList<LegoPathController>::~MxPtrList<LegoPathController>
+
 // SYNTHETIC: LEGO1 0x1001d490
 // MxCollection<LegoPathController *>::`scalar deleting destructor'
 
@@ -57,4 +60,7 @@ class LegoPathControllerList : public MxPtrList<LegoPathController> {
 // SYNTHETIC: LEGO1 0x1001d5b0
 // MxPtrList<LegoPathController>::`scalar deleting destructor'
 
+// SYNTHETIC: LEGO1 0x1001d620
+// LegoPathControllerList::~LegoPathControllerList
+
 #endif // LEGOPATHCONTROLLERLIST_H
diff --git a/LEGO1/lego/legoomni/include/legounksavedatawriter.h b/LEGO1/lego/legoomni/include/legounksavedatawriter.h
index 240bef11..4623ec7a 100644
--- a/LEGO1/lego/legoomni/include/legounksavedatawriter.h
+++ b/LEGO1/lego/legoomni/include/legounksavedatawriter.h
@@ -4,6 +4,7 @@
 #include "decomp.h"
 #include "mxtypes.h"
 
+class AutoROI;
 class LegoROI;
 class LegoStream;
 
@@ -35,6 +36,7 @@ struct LegoSaveDataEntry3 {
 class LegoUnkSaveDataWriter {
 public:
 	MxResult WriteSaveData3(LegoStream* p_stream);
+	AutoROI* FUN_10083500(undefined4, undefined4);
 	void FUN_10083db0(LegoROI* p_roi);
 };
 
diff --git a/LEGO1/lego/legoomni/include/legoworld.h b/LEGO1/lego/legoomni/include/legoworld.h
index 382edd9a..13ca9737 100644
--- a/LEGO1/lego/legoomni/include/legoworld.h
+++ b/LEGO1/lego/legoomni/include/legoworld.h
@@ -12,6 +12,12 @@
 class IslePathActor;
 class LegoPathBoundary;
 
+struct PresenterSetCompare {
+	int operator()(MxPresenter* const& p_a, MxPresenter* const& p_b) const { return p_a > p_b; }
+};
+
+typedef set<MxPresenter*, PresenterSetCompare> MxPresenterSet;
+
 // VTABLE: LEGO1 0x100d6280
 // SIZE 0xf8
 class LegoWorld : public LegoEntity {
@@ -71,9 +77,11 @@ class LegoWorld : public LegoEntity {
 	LegoCameraController* m_cameraController; // 0x98
 	LegoEntityList* m_entityList;             // 0x9c
 	MxCoreList* m_coreList;                   // 0xa0
-	undefined m_unk0xa4[0x14];                // 0xa4
+	undefined m_unk0xa4;                      // 0xa4
+	MxPresenterSet m_set0xa8;                 // 0xa8
 	MxPresenterList m_list0xb8;               // 0xb8
-	undefined m_unk0xd0[0x1c];                // 0xd0
+	MxPresenterSet m_set0xd0;                 // 0xd0
+	list<AutoROI*> m_list0xe0;                // 0xe0
 	undefined4 m_unk0xec;                     // 0xec
 	undefined4 m_unk0xf0;                     // 0xf0
 	MxS16 m_unk0xf4;                          // 0xf4
@@ -81,6 +89,38 @@ class LegoWorld : public LegoEntity {
 	undefined m_unk0xf7;                      // 0xf7
 };
 
+// clang-format off
+// TEMPLATE: LEGO1 0x1001d780
+// _Tree<MxPresenter *,MxPresenter *,set<MxPresenter *,PresenterSetCompare,allocator<MxPresenter *> >::_Kfn,PresenterSetCompare,allocator<MxPresenter *> >::~_Tree<MxPresenter *,MxPresenter *,set<MxPresenter *,PresenterSetCompare,allocator<MxPresenter *> >::_Kfn,PresenterSetCompare,allocator<MxPresenter *> >
+
+// TEMPLATE: LEGO1 0x1001d850
+// _Tree<MxPresenter *,MxPresenter *,set<MxPresenter *,PresenterSetCompare,allocator<MxPresenter *> >::_Kfn,PresenterSetCompare,allocator<MxPresenter *> >::iterator::_Inc
+
+// TEMPLATE: LEGO1 0x1001d890
+// _Tree<MxPresenter *,MxPresenter *,set<MxPresenter *,PresenterSetCompare,allocator<MxPresenter *> >::_Kfn,PresenterSetCompare,allocator<MxPresenter *> >::erase
+
+// TEMPLATE: LEGO1 0x1001dcf0
+// _Tree<MxPresenter *,MxPresenter *,set<MxPresenter *,PresenterSetCompare,allocator<MxPresenter *> >::_Kfn,PresenterSetCompare,allocator<MxPresenter *> >::_Erase
+
+// TEMPLATE: LEGO1 0x1001dd30
+// _Tree<MxPresenter *,MxPresenter *,set<MxPresenter *,PresenterSetCompare,allocator<MxPresenter *> >::_Kfn,PresenterSetCompare,allocator<MxPresenter *> >::_Init
+
+// TEMPLATE: LEGO1 0x1001ddf0
+// list<AutoROI *,allocator<AutoROI *> >::~list<AutoROI *,allocator<AutoROI *> >
+
+// TEMPLATE: LEGO1 0x1001df50
+// List<AutoROI *>::~List<AutoROI *>
+
+// TEMPLATE: LEGO1 0x1001de60
+// list<AutoROI *,allocator<AutoROI *> >::_Buynode
+
+// TEMPLATE: LEGO1 0x1001de90
+// set<MxPresenter *,PresenterSetCompare,allocator<MxPresenter *> >::~set<MxPresenter *,PresenterSetCompare,allocator<MxPresenter *> >
+
+// TEMPLATE: LEGO1 0x1001df00
+// Set<MxPresenter *,PresenterSetCompare>::~Set<MxPresenter *,PresenterSetCompare>
+// clang-format om
+
 // SYNTHETIC: LEGO1 0x1001eed0
 // MxPresenterListCursor::`scalar deleting destructor'
 
@@ -102,4 +142,7 @@ class LegoWorld : public LegoEntity {
 // TEMPLATE: LEGO1 0x10020760
 // MxListCursor<MxPresenter *>::MxListCursor<MxPresenter *>
 
+// GLOBAL: LEGO1 0x100f11a0
+// _Tree<MxPresenter *,MxPresenter *,set<MxPresenter *,PresenterSetCompare,allocator<MxPresenter *> >::_Kfn,PresenterSetCompare,allocator<MxPresenter *> >::_Nil
+
 #endif // LEGOWORLD_H
diff --git a/LEGO1/lego/legoomni/src/common/legounksavedatawriter.cpp b/LEGO1/lego/legoomni/src/common/legounksavedatawriter.cpp
index a6e7e135..c06ebb7e 100644
--- a/LEGO1/lego/legoomni/src/common/legounksavedatawriter.cpp
+++ b/LEGO1/lego/legoomni/src/common/legounksavedatawriter.cpp
@@ -1,8 +1,8 @@
-
 #include "legounksavedatawriter.h"
 
 #include "legogamestate.h"
 #include "legostream.h"
+#include "roi/legoroi.h"
 
 DECOMP_SIZE_ASSERT(LegoSaveDataEntry3, 0x108);
 
@@ -48,6 +48,14 @@ MxResult LegoUnkSaveDataWriter::WriteSaveData3(LegoStream* p_stream)
 	return result;
 }
 
+// STUB: LEGO1 0x10083500
+AutoROI* LegoUnkSaveDataWriter::FUN_10083500(undefined4, undefined4)
+{
+	// TODO
+	// involves an STL map with a _Nil node at 0x100fc508
+	return NULL;
+}
+
 // STUB: LEGO1 0x10083db0
 void LegoUnkSaveDataWriter::FUN_10083db0(LegoROI* p_roi)
 {
diff --git a/LEGO1/lego/legoomni/src/entity/legoworld.cpp b/LEGO1/lego/legoomni/src/entity/legoworld.cpp
index 3fc3e277..60cb941d 100644
--- a/LEGO1/lego/legoomni/src/entity/legoworld.cpp
+++ b/LEGO1/lego/legoomni/src/entity/legoworld.cpp
@@ -17,12 +17,17 @@ DECOMP_SIZE_ASSERT(LegoEntityListCursor, 0x10)
 DECOMP_SIZE_ASSERT(MxCoreList, 0x18)
 DECOMP_SIZE_ASSERT(MxCoreListCursor, 0x10)
 
-// STUB: LEGO1 0x1001ca40
+// FUNCTION: LEGO1 0x1001ca40
 LegoWorld::LegoWorld() : m_list0x68(TRUE)
 {
-	// TODO
-	m_worldStarted = FALSE;
 	m_unk0xf4 = 4;
+	m_cameraController = NULL;
+	m_entityList = NULL;
+	m_coreList = NULL;
+	m_unk0xa4 = 0; // MxBool?
+	m_unk0xf0 = 0;
+	m_worldStarted = FALSE;
+
 	NotificationManager()->Register(this);
 }
 
diff --git a/LEGO1/lego/sources/roi/legoroi.h b/LEGO1/lego/sources/roi/legoroi.h
index 5dfac62f..4bf0ff18 100644
--- a/LEGO1/lego/sources/roi/legoroi.h
+++ b/LEGO1/lego/sources/roi/legoroi.h
@@ -11,6 +11,9 @@ class LegoEntity;
 // Note: There is an extra class between LegoROI and ViewROI,
 // maybe called "AutoROI". VTABLE 0x100dbe38
 
+// TODO: Set as superclass of LegoROI
+class AutoROI : public ViewROI {};
+
 // VTABLE: LEGO1 0x100dbea8
 // SIZE 0x10c
 class LegoROI : public ViewROI {
diff --git a/LEGO1/mxgeometry/mxgeometry3d.h b/LEGO1/mxgeometry/mxgeometry3d.h
index 13781722..d96d302a 100644
--- a/LEGO1/mxgeometry/mxgeometry3d.h
+++ b/LEGO1/mxgeometry/mxgeometry3d.h
@@ -15,6 +15,9 @@ class Mx3DPointFloat : public Vector3 {
 		m_elements[2] = p_z;
 	}
 
+	// SYNTHETIC: LEGO1 0x1001d170
+	// Mx3DPointFloat::Mx3DPointFloat
+
 	// FUNCTION: LEGO1 0x10003c10
 	virtual void operator=(const Vector3& p_impl) { EqualsImpl(p_impl.m_data); } // vtable+0x88
 
diff --git a/LEGO1/omni/include/mxpresenterlist.h b/LEGO1/omni/include/mxpresenterlist.h
index 257d0996..a029a4cf 100644
--- a/LEGO1/omni/include/mxpresenterlist.h
+++ b/LEGO1/omni/include/mxpresenterlist.h
@@ -68,4 +68,7 @@ class MxPresenterListCursor : public MxPtrListCursor<MxPresenter> {
 // SYNTHETIC: LEGO1 0x1001d090
 // MxPtrList<MxPresenter>::`scalar deleting destructor'
 
+// SYNTHETIC: LEGO1 0x1001d100
+// MxPresenterList::~MxPresenterList
+
 #endif // MXPRESENTERLIST_H

From 2bebc09da3ac73733b3b12c0a6654fdded9e46b4 Mon Sep 17 00:00:00 2001
From: Nathan M Gilbert <tahgtahv@gmail.com>
Date: Wed, 24 Jan 2024 12:12:57 -0500
Subject: [PATCH 171/210] Implement misc.lib (#483)

* Implement misc.lib

* Lowercase files

* Minor changes

* Fix file cases

* Fixes

* Fix missing dtor

* Add override

* Match LegoImage::Read

* Fix delete call

---------

Co-authored-by: Christian Semmler <mail@csemmler.com>
---
 CMakeLists.txt                                |   4 +-
 LEGO1/lego/legoomni/include/act1state.h       |   4 +-
 .../legoomni/include/ambulancemissionstate.h  |   2 +-
 LEGO1/lego/legoomni/include/animstate.h       |   4 +-
 LEGO1/lego/legoomni/include/gasstationstate.h |   2 +-
 LEGO1/lego/legoomni/include/hospitalstate.h   |   2 +-
 .../lego/legoomni/include/legoanimpresenter.h |   8 +-
 LEGO1/lego/legoomni/include/legogamestate.h   |   9 +-
 LEGO1/lego/legoomni/include/legostate.h       |   8 +-
 LEGO1/lego/legoomni/include/legostream.h      |  91 --------
 .../legoomni/include/legounksavedatawriter.h  |   4 +-
 .../legoomni/include/legovehiclebuildstate.h  |   2 +-
 LEGO1/lego/legoomni/include/legoworld.h       |   8 +-
 .../lego/legoomni/include/pizzamissionstate.h |   2 +-
 LEGO1/lego/legoomni/include/pizzeriastate.h   |   2 +-
 LEGO1/lego/legoomni/include/policestate.h     |   2 +-
 LEGO1/lego/legoomni/include/racestate.h       |   2 +-
 .../legoomni/include/towtrackmissionstate.h   |   2 +-
 LEGO1/lego/legoomni/src/act1/act1state.cpp    |   2 +-
 .../src/build/legovehiclebuildstate.cpp       |   2 +-
 LEGO1/lego/legoomni/src/common/animstate.cpp  |   2 +-
 .../legoomni/src/common/legogamestate.cpp     |  77 ++++++-
 LEGO1/lego/legoomni/src/common/legostate.cpp  |  19 +-
 LEGO1/lego/legoomni/src/common/legostream.cpp | 201 ------------------
 .../src/common/legounksavedatawriter.cpp      |   3 +-
 .../src/gasstation/gasstationstate.cpp        |   2 +-
 .../src/hospital/ambulancemissionstate.cpp    |   2 +-
 .../legoomni/src/hospital/hospitalstate.cpp   |   2 +-
 .../src/pizzeria/pizzamissionstate.cpp        |   2 +-
 .../legoomni/src/pizzeria/pizzeriastate.cpp   |   2 +-
 .../lego/legoomni/src/police/policestate.cpp  |  12 +-
 LEGO1/lego/legoomni/src/race/racestate.cpp    |   2 +-
 .../src/towtrack/towtrackmissionstate.cpp     |  50 ++---
 .../legoomni/src/video/legoanimpresenter.cpp  |   5 +-
 .../src/video/legopalettepresenter.cpp        |   4 +-
 LEGO1/lego/sources/misc/legoimage.cpp         | 176 +++++++++++++++
 LEGO1/lego/sources/misc/legoimage.h           |  54 +++++
 LEGO1/lego/sources/misc/legostorage.cpp       | 139 ++++++++++++
 LEGO1/lego/sources/misc/legostorage.h         |  95 +++++++++
 LEGO1/lego/sources/misc/legotexture.cpp       |  31 +++
 LEGO1/lego/sources/misc/legotexture.h         |  23 ++
 LEGO1/lego/sources/misc/legotypes.h           |  44 ++++
 LEGO1/lego/sources/misc/legoutil.h            |  54 +++++
 LEGO1/lego/sources/misc/version.h             |   6 +
 44 files changed, 772 insertions(+), 397 deletions(-)
 delete mode 100644 LEGO1/lego/legoomni/include/legostream.h
 delete mode 100644 LEGO1/lego/legoomni/src/common/legostream.cpp
 create mode 100644 LEGO1/lego/sources/misc/legoimage.cpp
 create mode 100644 LEGO1/lego/sources/misc/legoimage.h
 create mode 100644 LEGO1/lego/sources/misc/legostorage.cpp
 create mode 100644 LEGO1/lego/sources/misc/legostorage.h
 create mode 100644 LEGO1/lego/sources/misc/legotexture.cpp
 create mode 100644 LEGO1/lego/sources/misc/legotexture.h
 create mode 100644 LEGO1/lego/sources/misc/legotypes.h
 create mode 100644 LEGO1/lego/sources/misc/legoutil.h
 create mode 100644 LEGO1/lego/sources/misc/version.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b7c93768..9192c542 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -55,7 +55,6 @@ add_library(lego1 SHARED
   LEGO1/lego/legoomni/src/common/legoobjectfactory.cpp
   LEGO1/lego/legoomni/src/common/legoplantmanager.cpp
   LEGO1/lego/legoomni/src/common/legostate.cpp
-  LEGO1/lego/legoomni/src/common/legostream.cpp
   LEGO1/lego/legoomni/src/common/legounksavedatawriter.cpp
   LEGO1/lego/legoomni/src/common/legoutil.cpp
   LEGO1/lego/legoomni/src/common/mxcompositemediapresenter.cpp
@@ -148,6 +147,9 @@ add_library(lego1 SHARED
   LEGO1/lego/sources/3dmanager/lego3dview.cpp
   LEGO1/lego/sources/3dmanager/legoview1.cpp
   LEGO1/lego/sources/3dmanager/tglsurface.cpp
+  LEGO1/lego/sources/misc/legoimage.cpp
+  LEGO1/lego/sources/misc/legostorage.cpp
+  LEGO1/lego/sources/misc/legotexture.cpp
   LEGO1/lego/sources/roi/legoroi.cpp
   LEGO1/main.cpp
   LEGO1/mxdirectx/mxdirect3d.cpp
diff --git a/LEGO1/lego/legoomni/include/act1state.h b/LEGO1/lego/legoomni/include/act1state.h
index 4babf08a..3bc28a0d 100644
--- a/LEGO1/lego/legoomni/include/act1state.h
+++ b/LEGO1/lego/legoomni/include/act1state.h
@@ -22,8 +22,8 @@ class Act1State : public LegoState {
 		return !strcmp(p_name, Act1State::ClassName()) || LegoState::IsA(p_name);
 	};
 
-	virtual MxBool SetFlag() override;                                      // vtable+0x18
-	virtual MxResult VTable0x1c(LegoFileStream* p_legoFileStream) override; // vtable+0x1c
+	virtual MxBool SetFlag() override;                          // vtable+0x18
+	virtual MxResult VTable0x1c(LegoFile* p_legoFile) override; // vtable+0x1c
 
 	inline void SetUnknown18(MxU32 p_unk0x18) { m_unk0x18 = p_unk0x18; }
 	inline MxU32 GetUnknown18() { return m_unk0x18; }
diff --git a/LEGO1/lego/legoomni/include/ambulancemissionstate.h b/LEGO1/lego/legoomni/include/ambulancemissionstate.h
index ea5cfb3e..923a0cc3 100644
--- a/LEGO1/lego/legoomni/include/ambulancemissionstate.h
+++ b/LEGO1/lego/legoomni/include/ambulancemissionstate.h
@@ -22,7 +22,7 @@ class AmbulanceMissionState : public LegoState {
 		return !strcmp(p_name, AmbulanceMissionState::ClassName()) || LegoState::IsA(p_name);
 	}
 
-	virtual MxResult VTable0x1c(LegoFileStream* p_legoFileStream) override; // vtable+0x1c
+	virtual MxResult VTable0x1c(LegoFile* p_legoFile) override; // vtable+0x1c
 
 	inline MxU16 GetColor(MxU8 p_id)
 	{
diff --git a/LEGO1/lego/legoomni/include/animstate.h b/LEGO1/lego/legoomni/include/animstate.h
index fe39ccc7..9ac03a4c 100644
--- a/LEGO1/lego/legoomni/include/animstate.h
+++ b/LEGO1/lego/legoomni/include/animstate.h
@@ -23,8 +23,8 @@ class AnimState : public LegoState {
 		return !strcmp(p_name, AnimState::ClassName()) || LegoState::IsA(p_name);
 	}
 
-	virtual MxBool SetFlag() override;                                      // vtable+0x18
-	virtual MxResult VTable0x1c(LegoFileStream* p_legoFileStream) override; // vtable+0x1C
+	virtual MxBool SetFlag() override;                          // vtable+0x18
+	virtual MxResult VTable0x1c(LegoFile* p_legoFile) override; // vtable+0x1C
 
 	// SYNTHETIC: LEGO1 0x10065130
 	// AnimState::`scalar deleting destructor'
diff --git a/LEGO1/lego/legoomni/include/gasstationstate.h b/LEGO1/lego/legoomni/include/gasstationstate.h
index 4f77e307..57fd0d39 100644
--- a/LEGO1/lego/legoomni/include/gasstationstate.h
+++ b/LEGO1/lego/legoomni/include/gasstationstate.h
@@ -22,7 +22,7 @@ class GasStationState : public LegoState {
 		return !strcmp(p_name, GasStationState::ClassName()) || LegoState::IsA(p_name);
 	}
 
-	virtual MxResult VTable0x1c(LegoFileStream* p_legoFileStream) override; // vtable+0x1c
+	virtual MxResult VTable0x1c(LegoFile* p_legoFile) override; // vtable+0x1c
 
 	// SYNTHETIC: LEGO1 0x10006290
 	// GasStationState::`scalar deleting destructor'
diff --git a/LEGO1/lego/legoomni/include/hospitalstate.h b/LEGO1/lego/legoomni/include/hospitalstate.h
index af876f89..a38cfd2e 100644
--- a/LEGO1/lego/legoomni/include/hospitalstate.h
+++ b/LEGO1/lego/legoomni/include/hospitalstate.h
@@ -23,7 +23,7 @@ class HospitalState : public LegoState {
 		return !strcmp(p_name, HospitalState::ClassName()) || LegoState::IsA(p_name);
 	}
 
-	virtual MxResult VTable0x1c(LegoFileStream* p_legoFileStream) override; // vtable+0x1c
+	virtual MxResult VTable0x1c(LegoFile* p_legoFile) override; // vtable+0x1c
 
 	// SYNTHETIC: LEGO1 0x100764c0
 	// HospitalState::`scalar deleting destructor'
diff --git a/LEGO1/lego/legoomni/include/legoanimpresenter.h b/LEGO1/lego/legoomni/include/legoanimpresenter.h
index 3eeea936..94832a61 100644
--- a/LEGO1/lego/legoomni/include/legoanimpresenter.h
+++ b/LEGO1/lego/legoomni/include/legoanimpresenter.h
@@ -1,11 +1,11 @@
 #ifndef LEGOANIMPRESENTER_H
 #define LEGOANIMPRESENTER_H
 
+#include "lego/sources/misc/legostorage.h"
 #include "mxgeometry/mxgeometry3d.h"
 #include "mxvideopresenter.h"
 
 class LegoWorld;
-class LegoMemoryStream;
 class LegoAnimClass;
 
 // VTABLE: LEGO1 0x100d90c8
@@ -97,9 +97,9 @@ class LegoAnimClass : public LegoAnimClassBase {
 	LegoAnimClass();
 	virtual ~LegoAnimClass() override;
 
-	virtual void VTable0x8() override;                              // vtable+0x08
-	virtual void VTable0xc() override;                              // vtable+0x0c
-	virtual MxResult VTable0x10(LegoMemoryStream* p_stream, MxS32); // vtable+0x10
+	virtual void VTable0x8() override;                        // vtable+0x08
+	virtual void VTable0xc() override;                        // vtable+0x0c
+	virtual MxResult VTable0x10(LegoMemory* p_stream, MxS32); // vtable+0x10
 
 	MxLong m_unk0x8;      // 0x08
 	undefined4 m_unk0xc;  // 0x0c
diff --git a/LEGO1/lego/legoomni/include/legogamestate.h b/LEGO1/lego/legoomni/include/legogamestate.h
index ae39654c..534ac5b9 100644
--- a/LEGO1/lego/legoomni/include/legogamestate.h
+++ b/LEGO1/lego/legoomni/include/legogamestate.h
@@ -2,10 +2,11 @@
 #define LEGOGAMESTATE_H
 
 #include "decomp.h"
+#include "lego/sources/misc/legostorage.h"
 #include "legobackgroundcolor.h"
 #include "legofullscreenmovie.h"
-#include "legostream.h"
 #include "mxtypes.h"
+#include "mxvariabletable.h"
 
 class LegoState;
 class MxVariable;
@@ -47,7 +48,7 @@ class LegoGameState {
 
 	struct ScoreStruct {
 		void WriteScoreHistory();
-		void FUN_1003ccf0(LegoFileStream&);
+		void FUN_1003ccf0(LegoFile&);
 
 		MxU16 m_unk0x00;
 		undefined m_unk0x02[0x2c][20];
@@ -55,7 +56,9 @@ class LegoGameState {
 
 private:
 	void RegisterState(LegoState* p_state);
-	MxResult WriteEndOfVariables(LegoStream* p_stream);
+	MxResult WriteVariable(LegoStorage* p_stream, MxVariableTable* p_from, const char* p_variableName);
+	MxResult WriteEndOfVariables(LegoStorage* p_stream);
+	MxS32 ReadVariable(LegoStorage* p_stream, MxVariableTable* p_to);
 	void SetROIHandlerFunction();
 
 	char* m_savePath;                           // 0x0
diff --git a/LEGO1/lego/legoomni/include/legostate.h b/LEGO1/lego/legoomni/include/legostate.h
index 215d64d4..e6d11bd1 100644
--- a/LEGO1/lego/legoomni/include/legostate.h
+++ b/LEGO1/lego/legoomni/include/legostate.h
@@ -2,7 +2,7 @@
 #define LEGOSTATE_H
 
 #include "decomp.h"
-#include "legostream.h"
+#include "lego/sources/misc/legostorage.h"
 #include "mxcore.h"
 #include "mxstring.h"
 
@@ -24,9 +24,9 @@ class LegoState : public MxCore {
 		return !strcmp(p_name, LegoState::ClassName()) || MxCore::IsA(p_name);
 	}
 
-	virtual MxBool VTable0x14();                                   // vtable+0x14
-	virtual MxBool SetFlag();                                      // vtable+0x18
-	virtual MxResult VTable0x1c(LegoFileStream* p_legoFileStream); // vtable+0x1C
+	virtual MxBool VTable0x14();                       // vtable+0x14
+	virtual MxBool SetFlag();                          // vtable+0x18
+	virtual MxResult VTable0x1c(LegoFile* p_legoFile); // vtable+0x1C
 
 	// SYNTHETIC: LEGO1 0x10006160
 	// LegoState::`scalar deleting destructor'
diff --git a/LEGO1/lego/legoomni/include/legostream.h b/LEGO1/lego/legoomni/include/legostream.h
deleted file mode 100644
index 601e94e2..00000000
--- a/LEGO1/lego/legoomni/include/legostream.h
+++ /dev/null
@@ -1,91 +0,0 @@
-#ifndef LEGOSTREAM_H
-#define LEGOSTREAM_H
-
-#include "compat.h"
-#include "decomp.h"
-#include "mxstring.h"
-#include "mxtypes.h"
-
-#pragma warning(disable : 4237)
-#include <iosfwd>
-
-#define LEGOSTREAM_MODE_READ 1
-#define LEGOSTREAM_MODE_WRITE 2
-
-class MxVariableTable;
-
-// VTABLE: LEGO1 0x100d7d80
-class LegoStream {
-public:
-	LegoStream() : m_mode(0) {}
-	// FUNCTION: LEGO1 0x10045ad0
-	inline virtual ~LegoStream() {}
-
-	virtual MxResult Read(void* p_buffer, MxU32 p_size) = 0;
-	virtual MxResult Write(const void* p_buffer, MxU32 p_size) = 0;
-	virtual MxResult Tell(MxU32* p_offset) = 0;
-	virtual MxResult Seek(MxU32 p_offset) = 0;
-
-	virtual MxBool IsWriteMode();
-	virtual MxBool IsReadMode();
-
-	enum OpenFlags {
-		c_readBit = 1,
-		c_writeBit = 2,
-		c_binaryBit = 4,
-	};
-
-	static MxResult __stdcall WriteVariable(LegoStream* p_stream, MxVariableTable* p_from, const char* p_variableName);
-	static MxS32 __stdcall ReadVariable(LegoStream* p_stream, MxVariableTable* p_to);
-
-protected:
-	MxU8 m_mode;
-};
-
-// SYNTHETIC: LEGO1 0x10045b00
-// LegoStream::`scalar deleting destructor'
-
-// VTABLE: LEGO1 0x100db730
-class LegoFileStream : public LegoStream {
-public:
-	LegoFileStream();
-	virtual ~LegoFileStream() override;
-
-	MxResult Read(void* p_buffer, MxU32 p_size) override;
-	MxResult Write(const void* p_buffer, MxU32 p_size) override;
-	MxResult Tell(MxU32* p_offset) override;
-	MxResult Seek(MxU32 p_offset) override;
-
-	MxResult Open(const char* p_filename, OpenFlags p_mode);
-
-	LegoFileStream* FUN_10006030(MxString p_str);
-
-private:
-	FILE* m_hFile;
-};
-
-// SYNTHETIC: LEGO1 0x10099230
-// LegoFileStream::`scalar deleting destructor'
-
-// VTABLE: LEGO1 0x100db710
-class LegoMemoryStream : public LegoStream {
-public:
-	LegoMemoryStream(char* p_buffer);
-
-	MxResult Read(void* p_buffer, MxU32 p_size) override;
-	MxResult Write(const void* p_buffer, MxU32 p_size) override;
-	MxResult Tell(MxU32* p_offset) override;
-	MxResult Seek(MxU32 p_offset) override;
-
-private:
-	char* m_buffer;
-	MxU32 m_offset;
-};
-
-// SYNTHETIC: LEGO1 0x10045a80
-// LegoMemoryStream::~LegoMemoryStream
-
-// SYNTHETIC: LEGO1 0x100990f0
-// LegoMemoryStream::`scalar deleting destructor'
-
-#endif // LEGOSTREAM_H
diff --git a/LEGO1/lego/legoomni/include/legounksavedatawriter.h b/LEGO1/lego/legoomni/include/legounksavedatawriter.h
index 4623ec7a..d33cfc56 100644
--- a/LEGO1/lego/legoomni/include/legounksavedatawriter.h
+++ b/LEGO1/lego/legoomni/include/legounksavedatawriter.h
@@ -2,11 +2,11 @@
 #define LEGOUNKSAVEDATAWRITER_H
 
 #include "decomp.h"
+#include "lego/sources/misc/legostorage.h"
 #include "mxtypes.h"
 
 class AutoROI;
 class LegoROI;
-class LegoStream;
 
 struct LegoSaveDataEntry3 {
 	char* m_name;
@@ -35,7 +35,7 @@ struct LegoSaveDataEntry3 {
 
 class LegoUnkSaveDataWriter {
 public:
-	MxResult WriteSaveData3(LegoStream* p_stream);
+	MxResult WriteSaveData3(LegoStorage* p_stream);
 	AutoROI* FUN_10083500(undefined4, undefined4);
 	void FUN_10083db0(LegoROI* p_roi);
 };
diff --git a/LEGO1/lego/legoomni/include/legovehiclebuildstate.h b/LEGO1/lego/legoomni/include/legovehiclebuildstate.h
index 8deed7a5..a155595e 100644
--- a/LEGO1/lego/legoomni/include/legovehiclebuildstate.h
+++ b/LEGO1/lego/legoomni/include/legovehiclebuildstate.h
@@ -23,7 +23,7 @@ class LegoVehicleBuildState : public LegoState {
 		return !strcmp(p_name, this->m_className.GetData()) || LegoState::IsA(p_name);
 	}
 
-	virtual MxResult VTable0x1c(LegoFileStream* p_legoFileStream) override; // vtable+0x1c
+	virtual MxResult VTable0x1c(LegoFile* p_legoFile) override; // vtable+0x1c
 
 	// SYNTHETIC: LEGO1 0x100260a0
 	// LegoVehicleBuildState::`scalar deleting destructor'
diff --git a/LEGO1/lego/legoomni/include/legoworld.h b/LEGO1/lego/legoomni/include/legoworld.h
index 13ca9737..4fea4672 100644
--- a/LEGO1/lego/legoomni/include/legoworld.h
+++ b/LEGO1/lego/legoomni/include/legoworld.h
@@ -13,7 +13,7 @@ class IslePathActor;
 class LegoPathBoundary;
 
 struct PresenterSetCompare {
-	int operator()(MxPresenter* const& p_a, MxPresenter* const& p_b) const { return p_a > p_b; }
+	MxS32 operator()(MxPresenter* const& p_a, MxPresenter* const& p_b) const { return p_a > p_b; }
 };
 
 typedef set<MxPresenter*, PresenterSetCompare> MxPresenterSet;
@@ -23,7 +23,7 @@ typedef set<MxPresenter*, PresenterSetCompare> MxPresenterSet;
 class LegoWorld : public LegoEntity {
 public:
 	__declspec(dllexport) LegoWorld();
-	__declspec(dllexport) virtual ~LegoWorld(); // vtable+0x0
+	__declspec(dllexport) virtual ~LegoWorld() override; // vtable+0x0
 
 	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x4
 	virtual MxResult Tickle() override;               // vtable+0x8
@@ -119,7 +119,6 @@ class LegoWorld : public LegoEntity {
 
 // TEMPLATE: LEGO1 0x1001df00
 // Set<MxPresenter *,PresenterSetCompare>::~Set<MxPresenter *,PresenterSetCompare>
-// clang-format om
 
 // SYNTHETIC: LEGO1 0x1001eed0
 // MxPresenterListCursor::`scalar deleting destructor'
@@ -143,6 +142,7 @@ class LegoWorld : public LegoEntity {
 // MxListCursor<MxPresenter *>::MxListCursor<MxPresenter *>
 
 // GLOBAL: LEGO1 0x100f11a0
-// _Tree<MxPresenter *,MxPresenter *,set<MxPresenter *,PresenterSetCompare,allocator<MxPresenter *> >::_Kfn,PresenterSetCompare,allocator<MxPresenter *> >::_Nil
+// _Tree<MxPresenter *,MxPresenter *,set<MxPresenter *,PresenterSetCompare,allocator<MxPresenter *>>::_Kfn,PresenterSetCompare,allocator<MxPresenter *> >::_Nil
+// clang-format on
 
 #endif // LEGOWORLD_H
diff --git a/LEGO1/lego/legoomni/include/pizzamissionstate.h b/LEGO1/lego/legoomni/include/pizzamissionstate.h
index e3867728..7c792ed4 100644
--- a/LEGO1/lego/legoomni/include/pizzamissionstate.h
+++ b/LEGO1/lego/legoomni/include/pizzamissionstate.h
@@ -28,7 +28,7 @@ class PizzaMissionState : public LegoState {
 		return !strcmp(p_name, PizzaMissionState::ClassName()) || LegoState::IsA(p_name);
 	}
 
-	virtual MxResult VTable0x1c(LegoFileStream* p_legoFileStream) override; // vtable+0x1c
+	virtual MxResult VTable0x1c(LegoFile* p_legoFile) override; // vtable+0x1c
 
 	inline MxU16 GetColor(MxU8 p_id) { return GetState(p_id)->m_color; }
 
diff --git a/LEGO1/lego/legoomni/include/pizzeriastate.h b/LEGO1/lego/legoomni/include/pizzeriastate.h
index 402981ff..1e9da6d3 100644
--- a/LEGO1/lego/legoomni/include/pizzeriastate.h
+++ b/LEGO1/lego/legoomni/include/pizzeriastate.h
@@ -22,7 +22,7 @@ class PizzeriaState : public LegoState {
 		return !strcmp(p_name, PizzeriaState::ClassName()) || LegoState::IsA(p_name);
 	}
 
-	virtual MxResult VTable0x1c(LegoFileStream* p_legoFileStream) override; // vtable+0x1c
+	virtual MxResult VTable0x1c(LegoFile* p_legoFile) override; // vtable+0x1c
 
 	// SYNTHETIC: LEGO1 0x10017ce0
 	// PizzeriaState::`scalar deleting destructor'
diff --git a/LEGO1/lego/legoomni/include/policestate.h b/LEGO1/lego/legoomni/include/policestate.h
index 976588a3..77005cef 100644
--- a/LEGO1/lego/legoomni/include/policestate.h
+++ b/LEGO1/lego/legoomni/include/policestate.h
@@ -23,7 +23,7 @@ class PoliceState : public LegoState {
 		return !strcmp(p_name, PoliceState::ClassName()) || LegoState::IsA(p_name);
 	}
 
-	virtual MxResult VTable0x1c(LegoFileStream* p_legoFileStream) override; // vtable+0x1c
+	virtual MxResult VTable0x1c(LegoFile* p_legoFile) override; // vtable+0x1c
 
 	// SYNTHETIC: LEGO1 0x1005e920
 	// PoliceState::`scalar deleting destructor'
diff --git a/LEGO1/lego/legoomni/include/racestate.h b/LEGO1/lego/legoomni/include/racestate.h
index bfae3525..7d2de4f6 100644
--- a/LEGO1/lego/legoomni/include/racestate.h
+++ b/LEGO1/lego/legoomni/include/racestate.h
@@ -30,7 +30,7 @@ class RaceState : public LegoState {
 		return !strcmp(p_name, RaceState::ClassName()) || LegoState::IsA(p_name);
 	}
 
-	virtual MxResult VTable0x1c(LegoFileStream* p_legoFileStream) override; // vtable+0x1c
+	virtual MxResult VTable0x1c(LegoFile* p_legoFile) override; // vtable+0x1c
 
 	inline MxU16 GetColor(MxU8 p_id) { return GetState(p_id)->m_color; }
 
diff --git a/LEGO1/lego/legoomni/include/towtrackmissionstate.h b/LEGO1/lego/legoomni/include/towtrackmissionstate.h
index be2e2689..ef5bacda 100644
--- a/LEGO1/lego/legoomni/include/towtrackmissionstate.h
+++ b/LEGO1/lego/legoomni/include/towtrackmissionstate.h
@@ -21,7 +21,7 @@ class TowTrackMissionState : public LegoState {
 	{
 		return !strcmp(p_name, TowTrackMissionState::ClassName()) || LegoState::IsA(p_name);
 	}
-	virtual MxResult VTable0x1c(LegoFileStream* p_legoFileStream) override; // vtable+0x1C
+	virtual MxResult VTable0x1c(LegoFile* p_legoFile) override; // vtable+0x1C
 
 	inline MxU16 GetColor(MxU8 p_id)
 	{
diff --git a/LEGO1/lego/legoomni/src/act1/act1state.cpp b/LEGO1/lego/legoomni/src/act1/act1state.cpp
index 6a36e3c3..cd39f1e2 100644
--- a/LEGO1/lego/legoomni/src/act1/act1state.cpp
+++ b/LEGO1/lego/legoomni/src/act1/act1state.cpp
@@ -14,7 +14,7 @@ Act1State::Act1State()
 }
 
 // STUB: LEGO1 0x10033ac0
-MxResult Act1State::VTable0x1c(LegoFileStream* p_legoFileStream)
+MxResult Act1State::VTable0x1c(LegoFile* p_legoFile)
 {
 	// TODO
 	return SUCCESS;
diff --git a/LEGO1/lego/legoomni/src/build/legovehiclebuildstate.cpp b/LEGO1/lego/legoomni/src/build/legovehiclebuildstate.cpp
index df9a0de6..a7b68529 100644
--- a/LEGO1/lego/legoomni/src/build/legovehiclebuildstate.cpp
+++ b/LEGO1/lego/legoomni/src/build/legovehiclebuildstate.cpp
@@ -25,7 +25,7 @@ LegoVehicleBuildState::LegoVehicleBuildState(char* p_classType)
 }
 
 // STUB: LEGO1 0x10026120
-MxResult LegoVehicleBuildState::VTable0x1c(LegoFileStream* p_legoFileStream)
+MxResult LegoVehicleBuildState::VTable0x1c(LegoFile* p_legoFile)
 {
 	// TODO
 	return SUCCESS;
diff --git a/LEGO1/lego/legoomni/src/common/animstate.cpp b/LEGO1/lego/legoomni/src/common/animstate.cpp
index 1a08890b..c20841b7 100644
--- a/LEGO1/lego/legoomni/src/common/animstate.cpp
+++ b/LEGO1/lego/legoomni/src/common/animstate.cpp
@@ -18,7 +18,7 @@ AnimState::~AnimState()
 }
 
 // STUB: LEGO1 0x100652d0
-MxResult AnimState::VTable0x1c(LegoFileStream* p_legoFileStream)
+MxResult AnimState::VTable0x1c(LegoFile* p_legoFile)
 {
 	// TODO
 	return FAILURE;
diff --git a/LEGO1/lego/legoomni/src/common/legogamestate.cpp b/LEGO1/lego/legoomni/src/common/legogamestate.cpp
index 0bb0b066..93a9544b 100644
--- a/LEGO1/lego/legoomni/src/common/legogamestate.cpp
+++ b/LEGO1/lego/legoomni/src/common/legogamestate.cpp
@@ -4,7 +4,6 @@
 #include "legoanimationmanager.h"
 #include "legoomni.h"
 #include "legostate.h"
-#include "legostream.h"
 #include "legoutil.h"
 #include "legovideomanager.h"
 #include "mxbackgroundaudiomanager.h"
@@ -31,6 +30,13 @@ const char* g_playersGSI = "Players.gsi";
 // STRING: LEGO1 0x100f3e24
 const char* g_historyGSI = "History.gsi";
 
+// This is a pointer to the end of the global variable name table, which has
+// the text "END_OF_VARIABLES" in it.
+// TODO: make g_endOfVariables reference the actual end of the variable array.
+// GLOBAL: LEGO1 0x100f3e50
+// STRING: LEGO1 0x100f3e00
+const char* g_endOfVariables = "END_OF_VARIABLES";
+
 // GLOBAL: LEGO1 0x100f3e58
 ColorStringStruct g_colorSaveData[43] = {
 	{"c_dbbkfny0", "lego red"},    {"c_dbbkxly0", "lego white"},  {"c_chbasey0", "lego black"},
@@ -119,8 +125,8 @@ MxResult LegoGameState::Save(MxULong p_slot)
 		MxVariableTable* variableTable = VariableTable();
 		MxString savePath;
 		GetFileSavePath(&savePath, p_slot);
-		LegoFileStream fileStream;
-		if (fileStream.Open(savePath.GetData(), LegoStream::c_writeBit) != FAILURE) {
+		LegoFile fileStream;
+		if (fileStream.Open(savePath.GetData(), LegoFile::c_write) != FAILURE) {
 			MxU32 maybeVersion = 0x1000C;
 			fileStream.Write(&maybeVersion, 4);
 			fileStream.Write(&m_unk0x24, 2);
@@ -128,12 +134,12 @@ MxResult LegoGameState::Save(MxULong p_slot)
 			fileStream.Write(&m_unk0xc, 1);
 
 			for (MxS32 i = 0; i < sizeof(g_colorSaveData) / sizeof(g_colorSaveData[0]); ++i) {
-				if (LegoStream::WriteVariable(&fileStream, variableTable, g_colorSaveData[i].m_targetName) == FAILURE)
+				if (WriteVariable(&fileStream, variableTable, g_colorSaveData[i].m_targetName) == FAILURE)
 					return result;
 			}
 
-			if (LegoStream::WriteVariable(&fileStream, variableTable, "backgroundcolor") != FAILURE) {
-				if (LegoStream::WriteVariable(&fileStream, variableTable, "lightposition") != FAILURE) {
+			if (WriteVariable(&fileStream, variableTable, "backgroundcolor") != FAILURE) {
+				if (WriteVariable(&fileStream, variableTable, "lightposition") != FAILURE) {
 					WriteEndOfVariables(&fileStream);
 
 					// TODO: Calls down to more aggregate writing functions
@@ -166,8 +172,27 @@ void LegoGameState::SetSavePath(char* p_savePath)
 		m_savePath = NULL;
 }
 
+// FUNCTION: LEGO1 0x10039f70
+MxResult LegoGameState::WriteVariable(LegoStorage* p_stream, MxVariableTable* p_from, const char* p_variableName)
+{
+	MxResult result = FAILURE;
+	const char* variableValue = p_from->GetVariable(p_variableName);
+
+	if (variableValue) {
+		MxU8 length = strlen(p_variableName);
+		if (p_stream->Write((char*) &length, 1) == SUCCESS) {
+			if (p_stream->Write(p_variableName, length) == SUCCESS) {
+				length = strlen(variableValue);
+				if (p_stream->Write((char*) &length, 1) == SUCCESS)
+					result = p_stream->Write((char*) variableValue, length);
+			}
+		}
+	}
+	return result;
+}
+
 // FUNCTION: LEGO1 0x1003a020
-MxResult LegoGameState::WriteEndOfVariables(LegoStream* p_stream)
+MxResult LegoGameState::WriteEndOfVariables(LegoStorage* p_stream)
 {
 	MxU8 len = strlen(g_endOfVariables);
 	if (p_stream->Write(&len, 1) == SUCCESS)
@@ -175,6 +200,36 @@ MxResult LegoGameState::WriteEndOfVariables(LegoStream* p_stream)
 	return FAILURE;
 }
 
+// 95% match, just some instruction ordering differences on the call to
+// MxVariableTable::SetVariable at the end.
+// FUNCTION: LEGO1 0x1003a080
+MxS32 LegoGameState::ReadVariable(LegoStorage* p_stream, MxVariableTable* p_to)
+{
+	MxS32 result = 1;
+	MxU8 length;
+
+	if (p_stream->Read((char*) &length, 1) == SUCCESS) {
+		char nameBuffer[256];
+		if (p_stream->Read(nameBuffer, length) == SUCCESS) {
+			nameBuffer[length] = '\0';
+			if (strcmp(nameBuffer, g_endOfVariables) == 0)
+				// 2 -> "This was the last entry, done reading."
+				result = 2;
+			else {
+				if (p_stream->Read((char*) &length, 1) == SUCCESS) {
+					char valueBuffer[256];
+					if (p_stream->Read(valueBuffer, length) == SUCCESS) {
+						result = 0;
+						valueBuffer[length] = '\0';
+						p_to->SetVariable(nameBuffer, valueBuffer);
+					}
+				}
+			}
+		}
+	}
+	return result;
+}
+
 // FUNCTION: LEGO1 0x1003a170
 void LegoGameState::GetFileSavePath(MxString* p_outPath, MxULong p_slotn)
 {
@@ -312,7 +367,7 @@ void LegoGameState::ScoreStruct::WriteScoreHistory()
 }
 
 // STUB: LEGO1 0x1003ccf0
-void LegoGameState::ScoreStruct::FUN_1003ccf0(LegoFileStream&)
+void LegoGameState::ScoreStruct::FUN_1003ccf0(LegoFile&)
 {
 	// TODO
 }
@@ -320,16 +375,16 @@ void LegoGameState::ScoreStruct::FUN_1003ccf0(LegoFileStream&)
 // FUNCTION: LEGO1 0x1003cdd0
 void LegoGameState::SerializeScoreHistory(MxS16 p_flags)
 {
-	LegoFileStream stream;
+	LegoFile stream;
 	MxString savePath(m_savePath);
 	savePath += "\\";
 	savePath += g_historyGSI;
 
-	if (p_flags == LegoStream::c_writeBit) {
+	if (p_flags == LegoFile::c_write) {
 		m_unk0xa6.WriteScoreHistory();
 	}
 
-	if (stream.Open(savePath.GetData(), (LegoStream::OpenFlags) p_flags) == SUCCESS) {
+	if (stream.Open(savePath.GetData(), p_flags) == SUCCESS) {
 		m_unk0xa6.FUN_1003ccf0(stream);
 	}
 }
diff --git a/LEGO1/lego/legoomni/src/common/legostate.cpp b/LEGO1/lego/legoomni/src/common/legostate.cpp
index c99fb708..16beb159 100644
--- a/LEGO1/lego/legoomni/src/common/legostate.cpp
+++ b/LEGO1/lego/legoomni/src/common/legostate.cpp
@@ -20,23 +20,10 @@ MxBool LegoState::SetFlag()
 }
 
 // FUNCTION: LEGO1 0x10005fb0
-MxResult LegoState::VTable0x1c(LegoFileStream* p_legoFileStream)
+MxResult LegoState::VTable0x1c(LegoFile* p_legoFile)
 {
-	if (p_legoFileStream->IsWriteMode()) {
-		p_legoFileStream->FUN_10006030(this->ClassName());
+	if (p_legoFile->IsWriteMode()) {
+		p_legoFile->FUN_10006030(this->ClassName());
 	}
 	return SUCCESS;
 }
-
-// FUNCTION: LEGO1 0x10006030
-LegoFileStream* LegoFileStream::FUN_10006030(MxString p_str)
-{
-	const char* data = p_str.GetData();
-	MxU32 fullLength = strlen(data);
-
-	MxU16 limitedLength = fullLength;
-	Write(&limitedLength, sizeof(limitedLength));
-	Write(data, (MxS16) fullLength);
-
-	return this;
-}
diff --git a/LEGO1/lego/legoomni/src/common/legostream.cpp b/LEGO1/lego/legoomni/src/common/legostream.cpp
deleted file mode 100644
index f54d5982..00000000
--- a/LEGO1/lego/legoomni/src/common/legostream.cpp
+++ /dev/null
@@ -1,201 +0,0 @@
-
-#include "legostream.h"
-
-#include "mxvariabletable.h"
-
-#include <cstdio>
-#include <string>
-
-// This is a pointer to the end of the global variable name table, which has
-// the text "END_OF_VARIABLES" in it.
-// TODO: make g_endOfVariables reference the actual end of the variable array.
-// GLOBAL: LEGO1 0x100f3e50
-// STRING: LEGO1 0x100f3e00
-const char* g_endOfVariables = "END_OF_VARIABLES";
-
-// Very likely but not certain sizes.
-// The classes are only used on the stack in functions we have not 100% matched
-// yet, we can confirm the size once we have.
-DECOMP_SIZE_ASSERT(LegoStream, 0x8);
-DECOMP_SIZE_ASSERT(LegoFileStream, 0xC);
-DECOMP_SIZE_ASSERT(LegoMemoryStream, 0x10);
-
-// FUNCTION: LEGO1 0x10039f70
-MxResult LegoStream::WriteVariable(LegoStream* p_stream, MxVariableTable* p_from, const char* p_variableName)
-{
-	MxResult result = FAILURE;
-	const char* variableValue = p_from->GetVariable(p_variableName);
-
-	if (variableValue) {
-		MxU8 length = strlen(p_variableName);
-		if (p_stream->Write((char*) &length, 1) == SUCCESS) {
-			if (p_stream->Write(p_variableName, length) == SUCCESS) {
-				length = strlen(variableValue);
-				if (p_stream->Write((char*) &length, 1) == SUCCESS)
-					result = p_stream->Write((char*) variableValue, length);
-			}
-		}
-	}
-	return result;
-}
-
-// 95% match, just some instruction ordering differences on the call to
-// MxVariableTable::SetVariable at the end.
-// FUNCTION: LEGO1 0x1003a080
-MxS32 LegoStream::ReadVariable(LegoStream* p_stream, MxVariableTable* p_to)
-{
-	MxS32 result = 1;
-	MxU8 length;
-
-	if (p_stream->Read((char*) &length, 1) == SUCCESS) {
-		char nameBuffer[256];
-		if (p_stream->Read(nameBuffer, length) == SUCCESS) {
-			nameBuffer[length] = '\0';
-			if (strcmp(nameBuffer, g_endOfVariables) == 0)
-				// 2 -> "This was the last entry, done reading."
-				result = 2;
-			else {
-				if (p_stream->Read((char*) &length, 1) == SUCCESS) {
-					char valueBuffer[256];
-					if (p_stream->Read(valueBuffer, length) == SUCCESS) {
-						result = 0;
-						valueBuffer[length] = '\0';
-						p_to->SetVariable(nameBuffer, valueBuffer);
-					}
-				}
-			}
-		}
-	}
-	return result;
-}
-
-// FUNCTION: LEGO1 0x10045ae0
-MxBool LegoStream::IsWriteMode()
-{
-	return m_mode == LEGOSTREAM_MODE_WRITE;
-}
-
-// FUNCTION: LEGO1 0x10045af0
-MxBool LegoStream::IsReadMode()
-{
-	return m_mode == LEGOSTREAM_MODE_READ;
-}
-
-// FUNCTION: LEGO1 0x10099080
-LegoMemoryStream::LegoMemoryStream(char* p_buffer) : LegoStream()
-{
-	m_buffer = p_buffer;
-	m_offset = 0;
-}
-
-// FUNCTION: LEGO1 0x10099160
-MxResult LegoMemoryStream::Read(void* p_buffer, MxU32 p_size)
-{
-	memcpy(p_buffer, m_buffer + m_offset, p_size);
-	m_offset += p_size;
-	return SUCCESS;
-}
-
-// FUNCTION: LEGO1 0x10099190
-MxResult LegoMemoryStream::Write(const void* p_buffer, MxU32 p_size)
-{
-	memcpy(m_buffer + m_offset, p_buffer, p_size);
-	m_offset += p_size;
-	return SUCCESS;
-}
-
-// FUNCTION: LEGO1 0x100991c0
-LegoFileStream::LegoFileStream() : LegoStream()
-{
-	m_hFile = NULL;
-}
-
-// FUNCTION: LEGO1 0x10099250
-LegoFileStream::~LegoFileStream()
-{
-	if (m_hFile != NULL)
-		fclose(m_hFile);
-}
-
-// FUNCTION: LEGO1 0x100992c0
-MxResult LegoFileStream::Read(void* p_buffer, MxU32 p_size)
-{
-	if (m_hFile == NULL)
-		return FAILURE;
-
-	return (fread(p_buffer, 1, p_size, m_hFile) == p_size) ? SUCCESS : FAILURE;
-}
-
-// FUNCTION: LEGO1 0x10099300
-MxResult LegoFileStream::Write(const void* p_buffer, MxU32 p_size)
-{
-	if (m_hFile == NULL)
-		return FAILURE;
-
-	return (fwrite(p_buffer, 1, p_size, m_hFile) == p_size) ? SUCCESS : FAILURE;
-}
-
-// FUNCTION: LEGO1 0x10099340
-MxResult LegoFileStream::Tell(MxU32* p_offset)
-{
-	if (m_hFile == NULL)
-		return FAILURE;
-
-	int got = ftell(m_hFile);
-	if (got == -1)
-		return FAILURE;
-
-	*p_offset = got;
-	return SUCCESS;
-}
-
-// FUNCTION: LEGO1 0x10099370
-MxResult LegoFileStream::Seek(MxU32 p_offset)
-{
-	if (m_hFile == NULL)
-		return FAILURE;
-
-	return (fseek(m_hFile, p_offset, 0) == 0) ? SUCCESS : FAILURE;
-}
-
-// FUNCTION: LEGO1 0x100993a0
-MxResult LegoFileStream::Open(const char* p_filename, OpenFlags p_mode)
-{
-	char modeString[4];
-
-	if (m_hFile != NULL)
-		fclose(m_hFile);
-
-	modeString[0] = '\0';
-	if (p_mode & c_readBit) {
-		m_mode = LEGOSTREAM_MODE_READ;
-		strcat(modeString, "r");
-	}
-
-	if (p_mode & c_writeBit) {
-		if (m_mode != LEGOSTREAM_MODE_READ)
-			m_mode = LEGOSTREAM_MODE_WRITE;
-		strcat(modeString, "w");
-	}
-
-	if ((p_mode & c_binaryBit) != 0)
-		strcat(modeString, "b");
-	else
-		strcat(modeString, "t");
-
-	return (m_hFile = fopen(p_filename, modeString)) ? SUCCESS : FAILURE;
-}
-
-// FUNCTION: LEGO1 0x100994a0
-MxResult LegoMemoryStream::Tell(MxU32* p_offset)
-{
-	*p_offset = m_offset;
-	return SUCCESS;
-}
-
-// FUNCTION: LEGO1 0x100994b0
-MxResult LegoMemoryStream::Seek(MxU32 p_offset)
-{
-	m_offset = p_offset;
-	return SUCCESS;
-}
diff --git a/LEGO1/lego/legoomni/src/common/legounksavedatawriter.cpp b/LEGO1/lego/legoomni/src/common/legounksavedatawriter.cpp
index c06ebb7e..551dea32 100644
--- a/LEGO1/lego/legoomni/src/common/legounksavedatawriter.cpp
+++ b/LEGO1/lego/legoomni/src/common/legounksavedatawriter.cpp
@@ -1,7 +1,6 @@
 #include "legounksavedatawriter.h"
 
 #include "legogamestate.h"
-#include "legostream.h"
 #include "roi/legoroi.h"
 
 DECOMP_SIZE_ASSERT(LegoSaveDataEntry3, 0x108);
@@ -10,7 +9,7 @@ DECOMP_SIZE_ASSERT(LegoSaveDataEntry3, 0x108);
 LegoSaveDataEntry3 g_saveData3[66];
 
 // FUNCTION: LEGO1 0x10083310
-MxResult LegoUnkSaveDataWriter::WriteSaveData3(LegoStream* p_stream)
+MxResult LegoUnkSaveDataWriter::WriteSaveData3(LegoStorage* p_stream)
 {
 	MxResult result = FAILURE;
 
diff --git a/LEGO1/lego/legoomni/src/gasstation/gasstationstate.cpp b/LEGO1/lego/legoomni/src/gasstation/gasstationstate.cpp
index 5bbcdde6..b4b242ac 100644
--- a/LEGO1/lego/legoomni/src/gasstation/gasstationstate.cpp
+++ b/LEGO1/lego/legoomni/src/gasstation/gasstationstate.cpp
@@ -18,7 +18,7 @@ GasStationState::GasStationState()
 }
 
 // STUB: LEGO1 0x10006300
-MxResult GasStationState::VTable0x1c(LegoFileStream* p_legoFileStream)
+MxResult GasStationState::VTable0x1c(LegoFile* p_legoFile)
 {
 	// TODO
 	return SUCCESS;
diff --git a/LEGO1/lego/legoomni/src/hospital/ambulancemissionstate.cpp b/LEGO1/lego/legoomni/src/hospital/ambulancemissionstate.cpp
index 601f1ccd..eb74f64c 100644
--- a/LEGO1/lego/legoomni/src/hospital/ambulancemissionstate.cpp
+++ b/LEGO1/lego/legoomni/src/hospital/ambulancemissionstate.cpp
@@ -20,7 +20,7 @@ AmbulanceMissionState::AmbulanceMissionState()
 }
 
 // STUB: LEGO1 0x10037440
-MxResult AmbulanceMissionState::VTable0x1c(LegoFileStream* p_legoFileStream)
+MxResult AmbulanceMissionState::VTable0x1c(LegoFile* p_legoFile)
 {
 	// TODO
 	return 0;
diff --git a/LEGO1/lego/legoomni/src/hospital/hospitalstate.cpp b/LEGO1/lego/legoomni/src/hospital/hospitalstate.cpp
index 5921cd0c..012d9c4a 100644
--- a/LEGO1/lego/legoomni/src/hospital/hospitalstate.cpp
+++ b/LEGO1/lego/legoomni/src/hospital/hospitalstate.cpp
@@ -14,7 +14,7 @@ HospitalState::HospitalState()
 }
 
 // STUB: LEGO1 0x10076530
-MxResult HospitalState::VTable0x1c(LegoFileStream* p_legoFileStream)
+MxResult HospitalState::VTable0x1c(LegoFile* p_legoFile)
 {
 	// TODO
 	return 0;
diff --git a/LEGO1/lego/legoomni/src/pizzeria/pizzamissionstate.cpp b/LEGO1/lego/legoomni/src/pizzeria/pizzamissionstate.cpp
index 6fb460a1..6d1cac49 100644
--- a/LEGO1/lego/legoomni/src/pizzeria/pizzamissionstate.cpp
+++ b/LEGO1/lego/legoomni/src/pizzeria/pizzamissionstate.cpp
@@ -4,7 +4,7 @@ DECOMP_SIZE_ASSERT(PizzaMissionStateEntry, 0x20)
 DECOMP_SIZE_ASSERT(PizzaMissionState, 0xb0)
 
 // STUB: LEGO1 0x100393c0
-MxResult PizzaMissionState::VTable0x1c(LegoFileStream* p_legoFileStream)
+MxResult PizzaMissionState::VTable0x1c(LegoFile* p_legoFile)
 {
 	// TODO
 	return SUCCESS;
diff --git a/LEGO1/lego/legoomni/src/pizzeria/pizzeriastate.cpp b/LEGO1/lego/legoomni/src/pizzeria/pizzeriastate.cpp
index 3422c68d..6694e4d8 100644
--- a/LEGO1/lego/legoomni/src/pizzeria/pizzeriastate.cpp
+++ b/LEGO1/lego/legoomni/src/pizzeria/pizzeriastate.cpp
@@ -7,7 +7,7 @@ PizzeriaState::PizzeriaState()
 }
 
 // STUB: LEGO1 0x10017da0
-MxResult PizzeriaState::VTable0x1c(LegoFileStream* p_legoFileStream)
+MxResult PizzeriaState::VTable0x1c(LegoFile* p_legoFile)
 {
 	// TODO
 	return SUCCESS;
diff --git a/LEGO1/lego/legoomni/src/police/policestate.cpp b/LEGO1/lego/legoomni/src/police/policestate.cpp
index b0011ccb..6e026c79 100644
--- a/LEGO1/lego/legoomni/src/police/policestate.cpp
+++ b/LEGO1/lego/legoomni/src/police/policestate.cpp
@@ -12,18 +12,18 @@ PoliceState::PoliceState()
 }
 
 // FUNCTION: LEGO1 0x1005e990
-MxResult PoliceState::VTable0x1c(LegoFileStream* p_legoFileStream)
+MxResult PoliceState::VTable0x1c(LegoFile* p_legoFile)
 {
-	if (p_legoFileStream->IsWriteMode()) {
-		p_legoFileStream->FUN_10006030(ClassName());
+	if (p_legoFile->IsWriteMode()) {
+		p_legoFile->FUN_10006030(ClassName());
 	}
 
-	if (p_legoFileStream->IsReadMode()) {
-		p_legoFileStream->Read(&m_unk0x8, sizeof(m_unk0x8));
+	if (p_legoFile->IsReadMode()) {
+		p_legoFile->Read(&m_unk0x8, sizeof(m_unk0x8));
 	}
 	else {
 		undefined4 unk0x8 = m_unk0x8;
-		p_legoFileStream->Write(&unk0x8, sizeof(m_unk0x8));
+		p_legoFile->Write(&unk0x8, sizeof(m_unk0x8));
 	}
 
 	return SUCCESS;
diff --git a/LEGO1/lego/legoomni/src/race/racestate.cpp b/LEGO1/lego/legoomni/src/race/racestate.cpp
index bdc003f0..db6d96dc 100644
--- a/LEGO1/lego/legoomni/src/race/racestate.cpp
+++ b/LEGO1/lego/legoomni/src/race/racestate.cpp
@@ -12,7 +12,7 @@ RaceState::RaceState()
 }
 
 // STUB: LEGO1 0x10016140
-MxResult RaceState::VTable0x1c(LegoFileStream* p_legoFileStream)
+MxResult RaceState::VTable0x1c(LegoFile* p_legoFile)
 {
 	// TODO
 	return SUCCESS;
diff --git a/LEGO1/lego/legoomni/src/towtrack/towtrackmissionstate.cpp b/LEGO1/lego/legoomni/src/towtrack/towtrackmissionstate.cpp
index a5719da5..9a85e0b6 100644
--- a/LEGO1/lego/legoomni/src/towtrack/towtrackmissionstate.cpp
+++ b/LEGO1/lego/legoomni/src/towtrack/towtrackmissionstate.cpp
@@ -21,54 +21,54 @@ TowTrackMissionState::TowTrackMissionState()
 }
 
 // FUNCTION: LEGO1 0x1004dde0
-MxResult TowTrackMissionState::VTable0x1c(LegoFileStream* p_legoFileStream)
+MxResult TowTrackMissionState::VTable0x1c(LegoFile* p_legoFile)
 {
-	if (p_legoFileStream->IsWriteMode()) {
-		p_legoFileStream->FUN_10006030(this->ClassName());
+	if (p_legoFile->IsWriteMode()) {
+		p_legoFile->FUN_10006030(this->ClassName());
 	}
 
-	if (p_legoFileStream->IsReadMode()) {
-		p_legoFileStream->Read(&m_unk0x12, sizeof(MxU16));
-		p_legoFileStream->Read(&m_unk0x14, sizeof(MxU16));
-		p_legoFileStream->Read(&m_unk0x16, sizeof(MxU16));
-		p_legoFileStream->Read(&m_unk0x18, sizeof(MxU16));
-		p_legoFileStream->Read(&m_unk0x1a, sizeof(MxU16));
-		p_legoFileStream->Read(&m_unk0x1c, sizeof(MxU16));
-		p_legoFileStream->Read(&m_color1, sizeof(MxU16));
-		p_legoFileStream->Read(&m_color2, sizeof(MxU16));
-		p_legoFileStream->Read(&m_color3, sizeof(MxU16));
-		p_legoFileStream->Read(&m_color4, sizeof(MxU16));
+	if (p_legoFile->IsReadMode()) {
+		p_legoFile->Read(&m_unk0x12, sizeof(MxU16));
+		p_legoFile->Read(&m_unk0x14, sizeof(MxU16));
+		p_legoFile->Read(&m_unk0x16, sizeof(MxU16));
+		p_legoFile->Read(&m_unk0x18, sizeof(MxU16));
+		p_legoFile->Read(&m_unk0x1a, sizeof(MxU16));
+		p_legoFile->Read(&m_unk0x1c, sizeof(MxU16));
+		p_legoFile->Read(&m_color1, sizeof(MxU16));
+		p_legoFile->Read(&m_color2, sizeof(MxU16));
+		p_legoFile->Read(&m_color3, sizeof(MxU16));
+		p_legoFile->Read(&m_color4, sizeof(MxU16));
 	}
-	else if (p_legoFileStream->IsWriteMode()) {
+	else if (p_legoFile->IsWriteMode()) {
 		MxU16 write = m_unk0x12;
-		p_legoFileStream->Write(&write, sizeof(MxU16));
+		p_legoFile->Write(&write, sizeof(MxU16));
 
 		write = m_unk0x14;
-		p_legoFileStream->Write(&write, sizeof(MxU16));
+		p_legoFile->Write(&write, sizeof(MxU16));
 
 		write = m_unk0x16;
-		p_legoFileStream->Write(&write, sizeof(MxU16));
+		p_legoFile->Write(&write, sizeof(MxU16));
 
 		write = m_unk0x18;
-		p_legoFileStream->Write(&write, sizeof(MxU16));
+		p_legoFile->Write(&write, sizeof(MxU16));
 
 		write = m_unk0x1a;
-		p_legoFileStream->Write(&write, sizeof(MxU16));
+		p_legoFile->Write(&write, sizeof(MxU16));
 
 		write = m_unk0x1c;
-		p_legoFileStream->Write(&write, sizeof(MxU16));
+		p_legoFile->Write(&write, sizeof(MxU16));
 
 		write = m_color1;
-		p_legoFileStream->Write(&write, sizeof(MxU16));
+		p_legoFile->Write(&write, sizeof(MxU16));
 
 		write = m_color2;
-		p_legoFileStream->Write(&write, sizeof(MxU16));
+		p_legoFile->Write(&write, sizeof(MxU16));
 
 		write = m_color3;
-		p_legoFileStream->Write(&write, sizeof(MxU16));
+		p_legoFile->Write(&write, sizeof(MxU16));
 
 		write = m_color4;
-		p_legoFileStream->Write(&write, sizeof(MxU16));
+		p_legoFile->Write(&write, sizeof(MxU16));
 	}
 
 	return SUCCESS;
diff --git a/LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp b/LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp
index 027a3b83..0167833d 100644
--- a/LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp
+++ b/LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp
@@ -1,7 +1,6 @@
 #include "legoanimpresenter.h"
 
 #include "legoomni.h"
-#include "legostream.h"
 #include "legoworld.h"
 #include "mxcompositepresenter.h"
 #include "mxdsanim.h"
@@ -60,7 +59,7 @@ void LegoAnimPresenter::Destroy(MxBool p_fromDestructor)
 MxResult LegoAnimPresenter::VTable0x88(MxStreamChunk* p_chunk)
 {
 	MxResult result = FAILURE;
-	LegoMemoryStream stream((char*) p_chunk->GetData());
+	LegoMemory stream((char*) p_chunk->GetData());
 
 	MxS32 magicSig;
 	MxS32 val2 = 0;
@@ -238,7 +237,7 @@ LegoAnimClass::~LegoAnimClass()
 }
 
 // STUB: LEGO1 0x100a0c70
-MxResult LegoAnimClass::VTable0x10(LegoMemoryStream* p_stream, MxS32)
+MxResult LegoAnimClass::VTable0x10(LegoMemory* p_stream, MxS32)
 {
 	return SUCCESS;
 }
diff --git a/LEGO1/lego/legoomni/src/video/legopalettepresenter.cpp b/LEGO1/lego/legoomni/src/video/legopalettepresenter.cpp
index ce352f7e..7fff790f 100644
--- a/LEGO1/lego/legoomni/src/video/legopalettepresenter.cpp
+++ b/LEGO1/lego/legoomni/src/video/legopalettepresenter.cpp
@@ -1,7 +1,7 @@
 #include "legopalettepresenter.h"
 
+#include "lego/sources/misc/legostorage.h"
 #include "legoomni.h"
-#include "legostream.h"
 #include "legovideomanager.h"
 #include "mxstreamchunk.h"
 
@@ -52,7 +52,7 @@ MxResult LegoPalettePresenter::ParsePalette(MxStreamChunk* p_chunk)
 	RGBQUAD palette[256];
 	MxResult result = FAILURE;
 
-	LegoMemoryStream stream((char*) p_chunk->GetData());
+	LegoMemory stream((char*) p_chunk->GetData());
 	if (stream.Read(buffer, sizeof(buffer)) == SUCCESS) {
 		if (stream.Read(palette, sizeof(palette)) == SUCCESS) {
 			m_palette = new MxPalette(palette);
diff --git a/LEGO1/lego/sources/misc/legoimage.cpp b/LEGO1/lego/sources/misc/legoimage.cpp
new file mode 100644
index 00000000..34d4978f
--- /dev/null
+++ b/LEGO1/lego/sources/misc/legoimage.cpp
@@ -0,0 +1,176 @@
+#include "legoimage.h"
+
+#include "decomp.h"
+#include "legostorage.h"
+#include "memory.h"
+
+DECOMP_SIZE_ASSERT(LegoPaletteEntry, 0x3);
+DECOMP_SIZE_ASSERT(LegoImage, 0x310);
+
+// FUNCTION: LEGO1 0x100994c0
+LegoPaletteEntry::LegoPaletteEntry()
+{
+	m_red = 0;
+	m_green = 0;
+	m_blue = 0;
+}
+
+// FUNCTION: LEGO1 0x100994d0
+LegoResult LegoPaletteEntry::Read(LegoStorage* p_storage)
+{
+	LegoResult result;
+	if ((result = p_storage->Read(&m_red, sizeof(m_red))) != SUCCESS) {
+		return result;
+	}
+	if ((result = p_storage->Read(&m_green, sizeof(m_green))) != SUCCESS) {
+		return result;
+	}
+	if ((result = p_storage->Read(&m_blue, sizeof(m_blue))) != SUCCESS) {
+		return result;
+	}
+	return SUCCESS;
+}
+
+// FUNCTION: LEGO1 0x10099520
+LegoResult LegoPaletteEntry::Write(LegoStorage* p_storage)
+{
+	LegoResult result;
+	if ((result = p_storage->Write(&m_red, sizeof(m_red))) != SUCCESS) {
+		return result;
+	}
+	if ((result = p_storage->Write(&m_green, sizeof(m_green))) != SUCCESS) {
+		return result;
+	}
+	if ((result = p_storage->Write(&m_blue, sizeof(m_blue))) != SUCCESS) {
+		return result;
+	}
+	return SUCCESS;
+}
+
+// FUNCTION: LEGO1 0x10099570
+LegoImage::LegoImage()
+{
+	m_width = 0;
+	m_height = 0;
+	m_count = 0;
+	m_bits = NULL;
+}
+
+// FUNCTION: LEGO1 0x100995a0
+LegoImage::LegoImage(LegoU32 p_width, LegoU32 p_height)
+{
+	m_width = p_width;
+	m_height = p_height;
+	m_count = 0;
+	m_bits = new LegoU8[m_width * m_height];
+}
+
+// FUNCTION: LEGO1 0x100995f0
+LegoImage::~LegoImage()
+{
+	if (m_bits) {
+		delete[] m_bits;
+	}
+}
+
+// FUNCTION: LEGO1 0x10099610
+LegoResult LegoImage::Read(LegoStorage* p_storage, LegoU32 p_square)
+{
+	LegoResult result;
+	if ((result = p_storage->Read(&m_width, sizeof(m_width))) != SUCCESS) {
+		return result;
+	}
+	if ((result = p_storage->Read(&m_height, sizeof(m_height))) != SUCCESS) {
+		return result;
+	}
+	if ((result = p_storage->Read(&m_count, sizeof(m_height))) != SUCCESS) {
+		return result;
+	}
+	for (LegoU32 i = 0; i < m_count; i++) {
+		if ((result = m_palette[i].Read(p_storage)) != SUCCESS) {
+			return result;
+		}
+	}
+	if (m_bits) {
+		delete[] m_bits;
+	}
+	m_bits = new LegoU8[m_width * m_height];
+	if ((result = p_storage->Read(m_bits, m_width * m_height)) != SUCCESS) {
+		return result;
+	}
+
+	if (p_square && m_width != m_height) {
+		LegoU8* newBits;
+
+		if (m_height < m_width) {
+			LegoU32 aspect = m_width / m_height;
+			newBits = new LegoU8[m_width * m_width];
+			LegoU8* src = m_bits;
+			LegoU8* dst = newBits;
+
+			for (LegoU32 row = 0; row < m_height; row++) {
+				if (aspect) {
+					for (LegoU32 dup = aspect; dup; dup--) {
+						memcpy(dst, src, m_width);
+						dst += m_width;
+					}
+				}
+				src += m_width;
+			}
+
+			m_height = m_width;
+		}
+		else {
+			LegoU32 aspect = m_height / m_width;
+			newBits = new LegoU8[m_height * m_height];
+			LegoU8* src = m_bits;
+			LegoU8* dst = newBits;
+
+			for (LegoU32 row = 0; row < m_height; row++) {
+				for (LegoU32 col = 0; col < m_width; col++) {
+					if (aspect) {
+						for (LegoU32 dup = aspect; dup; dup--) {
+							*dst = *src;
+							dst++;
+						}
+					}
+
+					src++;
+				}
+			}
+
+			m_width = m_height;
+		}
+
+		delete[] m_bits;
+		m_bits = newBits;
+	}
+
+	return SUCCESS;
+}
+
+// FUNCTION: LEGO1 0x100997e0
+LegoResult LegoImage::Write(LegoStorage* p_storage)
+{
+	LegoResult result;
+	if ((result = p_storage->Write(&m_width, sizeof(m_width))) != SUCCESS) {
+		return result;
+	}
+	if ((result = p_storage->Write(&m_height, sizeof(m_height))) != SUCCESS) {
+		return result;
+	}
+	if ((result = p_storage->Write(&m_count, sizeof(m_height))) != SUCCESS) {
+		return result;
+	}
+	for (LegoU32 i = 0; i < m_count; i++) {
+		if ((result = m_palette[i].Write(p_storage)) != SUCCESS) {
+			return result;
+		}
+	}
+	if (m_bits) {
+		if ((result = p_storage->Write(m_bits, m_width * m_height)) != SUCCESS) {
+			return result;
+		}
+	}
+	return SUCCESS;
+}
diff --git a/LEGO1/lego/sources/misc/legoimage.h b/LEGO1/lego/sources/misc/legoimage.h
new file mode 100644
index 00000000..7990277e
--- /dev/null
+++ b/LEGO1/lego/sources/misc/legoimage.h
@@ -0,0 +1,54 @@
+#ifndef __LEGOIMAGE_H
+#define __LEGOIMAGE_H
+
+#include "legotypes.h"
+
+class LegoStorage;
+
+// SIZE 0x3
+class LegoPaletteEntry {
+public:
+	LegoPaletteEntry();
+	// LegoPaletteEntry(LegoU8 p_red, LegoU8 p_green, LegoU8 p_blue);
+	LegoU8 GetRed() { return m_red; }
+	void SetRed(LegoU8 p_red) { m_red = p_red; }
+	LegoU8 GetGreen() { return m_green; }
+	void SetGreen(LegoU8 p_green) { m_green = p_green; }
+	LegoU8 GetBlue() { return m_blue; }
+	void SetBlue(LegoU8 p_blue) { m_blue = p_blue; }
+	LegoResult Read(LegoStorage* p_storage);
+	LegoResult Write(LegoStorage* p_storage);
+
+protected:
+	LegoU8 m_red;   // 0x00
+	LegoU8 m_green; // 0x01
+	LegoU8 m_blue;  // 0x02
+};
+
+// 0x310
+class LegoImage {
+public:
+	LegoImage();
+	LegoImage(LegoU32 p_width, LegoU32 p_height);
+	~LegoImage();
+	LegoU32 GetWidth() { return m_width; }
+	void SetWidth(LegoU32 p_width) { m_width = p_width; }
+	LegoU32 GetHeight() { return m_height; }
+	void SetHeight(LegoU32 p_height) { m_height = p_height; }
+	LegoPaletteEntry* GetPalette() { return m_palette; }
+	LegoPaletteEntry& GetPaletteEntry(LegoU32 p_i) { return m_palette[p_i]; }
+	void SetPaletteEntry(LegoU32 p_i, LegoPaletteEntry& p_paletteEntry) { m_palette[p_i] = p_paletteEntry; }
+	LegoU8* GetBits() { return m_bits; }
+	void SetBits(LegoU8* p_bits) { m_bits = p_bits; }
+	LegoResult Read(LegoStorage* p_storage, LegoU32 p_square);
+	LegoResult Write(LegoStorage* p_storage);
+
+protected:
+	LegoU32 m_width;                 // 0x00
+	LegoU32 m_height;                // 0x04
+	LegoU32 m_count;                 // 0x08
+	LegoPaletteEntry m_palette[256]; // 0x0c
+	LegoU8* m_bits;                  // 0x30c
+};
+
+#endif // __LEGOIMAGE_H
diff --git a/LEGO1/lego/sources/misc/legostorage.cpp b/LEGO1/lego/sources/misc/legostorage.cpp
new file mode 100644
index 00000000..50621f73
--- /dev/null
+++ b/LEGO1/lego/sources/misc/legostorage.cpp
@@ -0,0 +1,139 @@
+#include "legostorage.h"
+
+#include "decomp.h"
+
+#include <memory.h>
+#include <string.h>
+
+DECOMP_SIZE_ASSERT(LegoStorage, 0x8);
+DECOMP_SIZE_ASSERT(LegoMemory, 0x10);
+DECOMP_SIZE_ASSERT(LegoFile, 0xc);
+
+// FUNCTION: LEGO1 0x10099080
+LegoMemory::LegoMemory(void* p_buffer) : LegoStorage()
+{
+	m_buffer = (LegoU8*) p_buffer;
+	m_position = 0;
+}
+
+// FUNCTION: LEGO1 0x10099160
+LegoResult LegoMemory::Read(void* p_buffer, LegoU32 p_size)
+{
+	memcpy(p_buffer, m_buffer + m_position, p_size);
+	m_position += p_size;
+	return SUCCESS;
+}
+
+// FUNCTION: LEGO1 0x10099190
+LegoResult LegoMemory::Write(const void* p_buffer, LegoU32 p_size)
+{
+	memcpy(m_buffer + m_position, p_buffer, p_size);
+	m_position += p_size;
+	return SUCCESS;
+}
+
+// FUNCTION: LEGO1 0x100991c0
+LegoFile::LegoFile()
+{
+	m_file = NULL;
+}
+
+// FUNCTION: LEGO1 0x10099250
+LegoFile::~LegoFile()
+{
+	if (m_file) {
+		fclose(m_file);
+	}
+}
+
+// FUNCTION: LEGO1 0x100992c0
+LegoResult LegoFile::Read(void* p_buffer, LegoU32 p_size)
+{
+	if (!m_file) {
+		return FAILURE;
+	}
+	if (fread(p_buffer, 1, p_size, m_file) != p_size) {
+		return FAILURE;
+	}
+	return SUCCESS;
+}
+
+// FUNCTION: LEGO1 0x10099300
+LegoResult LegoFile::Write(const void* p_buffer, LegoU32 p_size)
+{
+	if (!m_file) {
+		return FAILURE;
+	}
+	if (fwrite(p_buffer, 1, p_size, m_file) != p_size) {
+		return FAILURE;
+	}
+	return SUCCESS;
+}
+
+// FUNCTION: LEGO1 0x10099340
+LegoResult LegoFile::GetPosition(LegoU32& p_position)
+{
+	if (!m_file) {
+		return FAILURE;
+	}
+	LegoU32 position = ftell(m_file);
+	if (position == -1) {
+		return FAILURE;
+	}
+	p_position = position;
+	return SUCCESS;
+}
+
+// FUNCTION: LEGO1 0x10099370
+LegoResult LegoFile::SetPosition(LegoU32 p_position)
+{
+	if (!m_file) {
+		return FAILURE;
+	}
+	if (fseek(m_file, p_position, SEEK_SET) != 0) {
+		return FAILURE;
+	}
+	return SUCCESS;
+}
+
+// FUNCTION: LEGO1 0x100993a0
+LegoResult LegoFile::Open(const char* p_name, LegoU32 p_mode)
+{
+	if (m_file) {
+		fclose(m_file);
+	}
+	char mode[4];
+	mode[0] = '\0';
+	if (p_mode & c_read) {
+		m_mode = c_read;
+		strcat(mode, "r");
+	}
+	if (p_mode & c_write) {
+		if (m_mode != c_read)
+			m_mode = c_write;
+		strcat(mode, "w");
+	}
+	if ((p_mode & c_text) != 0)
+		strcat(mode, "t");
+	else
+		strcat(mode, "b");
+
+	if (!(m_file = fopen(p_name, mode))) {
+		return FAILURE;
+	}
+	return SUCCESS;
+}
+
+// FUNCTION: LEGO1 0x100994a0
+LegoResult LegoMemory::GetPosition(LegoU32& p_position)
+{
+	p_position = m_position;
+	return SUCCESS;
+}
+
+// FUNCTION: LEGO1 0x100994b0
+LegoResult LegoMemory::SetPosition(LegoU32 p_position)
+{
+	m_position = p_position;
+	return SUCCESS;
+}
diff --git a/LEGO1/lego/sources/misc/legostorage.h b/LEGO1/lego/sources/misc/legostorage.h
new file mode 100644
index 00000000..5bd6ea67
--- /dev/null
+++ b/LEGO1/lego/sources/misc/legostorage.h
@@ -0,0 +1,95 @@
+#ifndef __LEGOSTORAGE_H
+#define __LEGOSTORAGE_H
+
+#include "legotypes.h"
+#include "mxstring.h"
+
+#include <stdio.h>
+
+// VTABLE: LEGO1 0x100d7d80
+// SIZE 0x08
+class LegoStorage {
+public:
+	enum OpenFlags {
+		c_read = 1,
+		c_write = 2,
+		c_text = 4
+	};
+
+	LegoStorage() : m_mode(0) {}
+
+	// FUNCTION: LEGO1 0x10045ad0
+	virtual ~LegoStorage(){};
+
+	virtual LegoResult Read(void* p_buffer, LegoU32 p_size) = 0;
+	virtual LegoResult Write(const void* p_buffer, LegoU32 p_size) = 0;
+	virtual LegoResult GetPosition(LegoU32& p_position) = 0;
+	virtual LegoResult SetPosition(LegoU32 p_position) = 0;
+
+	// FUNCTION: LEGO1 0x10045ae0
+	virtual LegoBool IsWriteMode() { return m_mode == c_write; }
+
+	// FUNCTION: LEGO1 0x10045af0
+	virtual LegoBool IsReadMode() { return m_mode == c_read; }
+
+	// SYNTHETIC: LEGO1 0x10045b00
+	// LegoStorage::`scalar deleting destructor'
+
+protected:
+	LegoU8 m_mode; // 0x04
+};
+
+// VTABLE: LEGO1 0x100db710
+// SIZE 0x10
+class LegoMemory : public LegoStorage {
+public:
+	LegoMemory(void* p_buffer);
+	virtual LegoResult Read(void* p_buffer, LegoU32 p_size);
+	virtual LegoResult Write(const void* p_buffer, LegoU32 p_size);
+	virtual LegoResult GetPosition(LegoU32& p_position);
+	virtual LegoResult SetPosition(LegoU32 p_position);
+
+	// SYNTHETIC: LEGO1 0x10045a80
+	// LegoMemory::~LegoMemory
+
+	// SYNTHETIC: LEGO1 0x100990f0
+	// LegoMemory::`scalar deleting destructor'
+
+protected:
+	LegoU8* m_buffer;   // 0x04
+	LegoU32 m_position; // 0x08
+};
+
+// VTABLE: LEGO1 0x100db730
+// SIZE 0x0c
+class LegoFile : public LegoStorage {
+public:
+	LegoFile();
+	virtual ~LegoFile() override;
+	virtual LegoResult Read(void* p_buffer, LegoU32 p_size);
+	virtual LegoResult Write(const void* p_buffer, LegoU32 p_size);
+	virtual LegoResult GetPosition(LegoU32& p_position);
+	virtual LegoResult SetPosition(LegoU32 p_position);
+	LegoResult Open(const char* p_name, LegoU32 p_mode);
+
+	// FUNCTION: LEGO1 0x10006030
+	LegoStorage* FUN_10006030(MxString p_str)
+	{
+		const char* data = p_str.GetData();
+		LegoU32 fullLength = strlen(data);
+
+		LegoU16 limitedLength = fullLength;
+		Write(&limitedLength, sizeof(limitedLength));
+		Write((char*) data, (LegoS16) fullLength);
+
+		return this;
+	}
+
+	// SYNTHETIC: LEGO1 0x10099230
+	// LegoFile::`scalar deleting destructor'
+
+protected:
+	FILE* m_file; // 0x08
+};
+
+#endif // __LEGOSTORAGE_H
diff --git a/LEGO1/lego/sources/misc/legotexture.cpp b/LEGO1/lego/sources/misc/legotexture.cpp
new file mode 100644
index 00000000..8eb74bfe
--- /dev/null
+++ b/LEGO1/lego/sources/misc/legotexture.cpp
@@ -0,0 +1,31 @@
+#include "legotexture.h"
+
+#include "decomp.h"
+#include "legoimage.h"
+#include "legostorage.h"
+
+DECOMP_SIZE_ASSERT(LegoTexture, 0x4);
+
+// FUNCTION: LEGO1 0x10098fb0
+LegoTexture::LegoTexture()
+{
+	m_image = new LegoImage();
+}
+
+// FUNCTION: LEGO1 0x10099030
+LegoTexture::~LegoTexture()
+{
+	delete m_image;
+}
+
+// FUNCTION: LEGO1 0x10099050
+LegoResult LegoTexture::Read(LegoStorage* p_storage, LegoU32 p_square)
+{
+	return m_image->Read(p_storage, p_square);
+}
+
+// FUNCTION: LEGO1 0x10099070
+LegoResult LegoTexture::Write(LegoStorage* p_storage)
+{
+	return m_image->Write(p_storage);
+}
diff --git a/LEGO1/lego/sources/misc/legotexture.h b/LEGO1/lego/sources/misc/legotexture.h
new file mode 100644
index 00000000..1e279660
--- /dev/null
+++ b/LEGO1/lego/sources/misc/legotexture.h
@@ -0,0 +1,23 @@
+#ifndef __LEGOTEXTURE_H
+#define __LEGOTEXTURE_H
+
+#include "legotypes.h"
+
+class LegoImage;
+class LegoStorage;
+
+// SIZE 0x04
+class LegoTexture {
+public:
+	LegoTexture();
+	~LegoTexture();
+	LegoImage* GetImage() { return m_image; }
+	void SetImage(LegoImage* p_image) { m_image = p_image; }
+	LegoResult Read(LegoStorage* p_storage, LegoU32 p_square);
+	LegoResult Write(LegoStorage* p_storage);
+
+protected:
+	LegoImage* m_image; // 0x00
+};
+
+#endif // __LEGOTEXTURE_H
diff --git a/LEGO1/lego/sources/misc/legotypes.h b/LEGO1/lego/sources/misc/legotypes.h
new file mode 100644
index 00000000..7ba6ada1
--- /dev/null
+++ b/LEGO1/lego/sources/misc/legotypes.h
@@ -0,0 +1,44 @@
+/*
+	This unpublished source code contains trade secrets and
+	copyrighted materials which are the property of Mindscape, Inc.
+	Unauthorized use, copying or distribution is a violation of U.S.
+	and international laws and is strictly prohibited.
+*/
+
+#ifndef __LEGOTYPES_H
+#define __LEGOTYPES_H
+
+#ifndef TRUE
+#define TRUE 1
+#endif
+
+#ifndef FALSE
+#define FALSE 0
+#endif
+
+#ifndef NULL
+#define NULL 0
+#endif
+
+#ifndef SUCCESS
+#define SUCCESS 0
+#endif
+
+#ifndef FAILURE
+#define FAILURE -1
+#endif
+
+typedef char LegoS8;
+typedef unsigned char LegoU8;
+typedef short LegoS16;
+typedef unsigned short LegoU16;
+typedef long LegoS32;
+typedef unsigned long LegoU32;
+typedef float LegoFloat;
+typedef char LegoChar;
+
+typedef LegoU8 LegoBool;
+typedef LegoS32 LegoTime;
+typedef LegoS32 LegoResult;
+
+#endif // __LEGOTYPES_H
diff --git a/LEGO1/lego/sources/misc/legoutil.h b/LEGO1/lego/sources/misc/legoutil.h
new file mode 100644
index 00000000..92bb84c2
--- /dev/null
+++ b/LEGO1/lego/sources/misc/legoutil.h
@@ -0,0 +1,54 @@
+#ifndef __LEGOUTIL_H
+#define __LEGOUTIL_H
+
+template <class T>
+inline T Min(T p_t1, T p_t2)
+{
+	return p_t1 < p_t2 ? p_t1 : p_t2;
+}
+
+template <class T>
+inline T Min(T p_t1, T p_t2, T p_t3)
+{
+	return Min(p_t1, Min(p_t2, p_t3));
+}
+
+template <class T>
+inline T Max(T p_t1, T p_t2)
+{
+	return p_t1 > p_t2 ? p_t1 : p_t2;
+}
+
+template <class T>
+inline T Max(T p_t1, T p_t2, T p_t3)
+{
+	return Max(p_t1, Max(p_t2, p_t3));
+}
+
+template <class T>
+inline T Abs(T p_t)
+{
+	return p_t < 0 ? -p_t : p_t;
+}
+
+template <class T>
+inline void Swap(T& p_t1, T& p_t2)
+{
+	T t = p_t1;
+	p_t1 = p_t2;
+	p_t2 = t;
+}
+
+template <class T>
+inline T DToR(T p_d)
+{
+	return p_d * 3.1416F / 180.0F;
+}
+
+template <class T>
+inline T RToD(T p_r)
+{
+	return p_r * 180.0F / 3.1416F;
+}
+
+#endif // __LEGOUTIL_H
diff --git a/LEGO1/lego/sources/misc/version.h b/LEGO1/lego/sources/misc/version.h
new file mode 100644
index 00000000..1eaa84af
--- /dev/null
+++ b/LEGO1/lego/sources/misc/version.h
@@ -0,0 +1,6 @@
+#ifndef __VERSION_H
+#define __VERSION_H
+
+#define MODEL_VERSION 3
+
+#endif // __VERSION_H

From 5f413165ccbcb2b8148e2c2c5a2f34dc043c69a8 Mon Sep 17 00:00:00 2001
From: Anonymous Maarten <madebr@users.noreply.github.com>
Date: Thu, 25 Jan 2024 03:16:29 +0100
Subject: [PATCH 172/210] Spinoff some sources to static libraries (#484)

* cmake: use imported targets for 3rd party libs

* Fix casing of skateboard.h include

* cmake: tglrl realtime viewmanager mxgeometry

* cmake: spin off some source in static libraries

* dx5 for everyone

* ci: bump actions/checkout to v4

* move LEGO1/realtime/realtimeview.cpp to lego1 because it exports symbols

* add misc library

* Add omni library

* Return of the .def's

* Remove COMPAT_CONST in MxVideoParam::MxVideoParam

* Run clang-format

* move LEGO1/realtime/realtimeview.cpp to realtime lib

* Add 3dmanager library

* Rename .def files

* Remove incorrect deps to Omni

* Remove DLL expor decls

* Remove unnecessary library dep from ROI

* Remove COMPAT_CONST

* Move 3dmanager lib before Omni

* Remove mxgeometry lib (`geom` is actually `lego/sources/geom`, which we don't have in our decomp yet)

* viewmanager has a dependency on realtime + fix mingw's def

* Remove Smacker::Smacker from lego1 link libraries

---------

Co-authored-by: Christian Semmler <mail@csemmler.com>
---
 .github/workflows/analyze.yml                 |   4 +-
 .github/workflows/build.yml                   |   8 +-
 .github/workflows/format.yml                  |   4 +-
 .github/workflows/naming.yml                  |   2 +-
 .github/workflows/unittest.yml                |   4 +-
 CMakeLists.txt                                | 396 +++++++++++-------
 ISLE/isleapp.cpp                              |   8 +
 LEGO1/LegoOmni.def                            | 138 ++++++
 LEGO1/LegoOmni.mingw.def                      | 170 ++++++++
 .../legoomni/include/legoanimationmanager.h   |   2 +-
 .../legoomni/include/legobackgroundcolor.h    |   2 +-
 .../legoomni/include/legobuildingmanager.h    |   2 +-
 LEGO1/lego/legoomni/include/legoentity.h      |   6 +-
 LEGO1/lego/legoomni/include/legogamestate.h   |  14 +-
 .../lego/legoomni/include/legoinputmanager.h  |   6 +-
 .../legoomni/include/legomodelpresenter.h     |   2 +-
 .../lego/legoomni/include/legonavcontroller.h |   4 +-
 LEGO1/lego/legoomni/include/legoomni.h        |  30 +-
 .../lego/legoomni/include/legopartpresenter.h |   2 +-
 .../lego/legoomni/include/legovideomanager.h  |   8 +-
 LEGO1/lego/legoomni/include/legoworld.h       |   4 +-
 .../legoomni/include/legoworldpresenter.h     |   2 +-
 .../include/mxbackgroundaudiomanager.h        |   2 +-
 .../legoomni/include/mxtransitionmanager.h    |   2 +-
 LEGO1/lego/legoomni/src/build/helicopter.cpp  |   3 +
 LEGO1/lego/legoomni/src/isle/skateboard.cpp   |   2 +-
 LEGO1/lego/sources/roi/legoroi.cpp            |  32 +-
 LEGO1/lego/sources/roi/legoroi.h              |  23 +-
 LEGO1/main.cpp                                |   2 +-
 LEGO1/mxdirectx/mxdirectdraw.h                |   6 +-
 LEGO1/mxgeometry/mxgeometry3d.cpp             |   6 -
 LEGO1/mxgeometry/mxmatrix.cpp                 |   5 -
 LEGO1/omni/include/mxatomid.h                 |   6 +-
 LEGO1/omni/include/mxbitmap.h                 |  14 +-
 LEGO1/omni/include/mxcore.h                   |   6 +-
 LEGO1/omni/include/mxcriticalsection.h        |   6 +-
 LEGO1/omni/include/mxdsaction.h               |   4 +-
 LEGO1/omni/include/mxdsfile.h                 |  16 +-
 LEGO1/omni/include/mxdsobject.h               |   2 +-
 LEGO1/omni/include/mxioinfo.h                 |   2 +-
 LEGO1/omni/include/mxomni.h                   |  34 +-
 LEGO1/omni/include/mxomnicreateflags.h        |   2 +-
 LEGO1/omni/include/mxomnicreateparam.h        |   2 +-
 LEGO1/omni/include/mxpalette.h                |   4 +-
 LEGO1/omni/include/mxpresenter.h              |  24 +-
 LEGO1/omni/include/mxscheduler.h              |   4 +-
 LEGO1/omni/include/mxstreamer.h               |   4 +-
 LEGO1/omni/include/mxstring.h                 |   6 +-
 LEGO1/omni/include/mxtimer.h                  |   2 +-
 LEGO1/omni/include/mxutil.h                   |   6 +-
 LEGO1/omni/include/mxvariabletable.h          |   6 +-
 LEGO1/omni/include/mxvideomanager.h           |   4 +-
 LEGO1/omni/include/mxvideoparam.h             |  18 +-
 LEGO1/omni/include/mxvideoparamflags.h        |   2 +-
 LEGO1/omni/src/system/mxthread.cpp            |   1 -
 LEGO1/omni/src/video/mxvideoparam.cpp         |   7 +-
 LEGO1/realtime/realtimeview.h                 |   8 +-
 LEGO1/viewmanager/viewmanager.h               |   2 +-
 tools/README.md                               |   6 +-
 tools/ncc/skip.yml                            |   2 +-
 util/compat.h                                 |   8 -
 61 files changed, 730 insertions(+), 379 deletions(-)
 create mode 100644 LEGO1/LegoOmni.def
 create mode 100644 LEGO1/LegoOmni.mingw.def
 delete mode 100644 LEGO1/mxgeometry/mxgeometry3d.cpp
 delete mode 100644 LEGO1/mxgeometry/mxmatrix.cpp

diff --git a/.github/workflows/analyze.yml b/.github/workflows/analyze.yml
index 01b85f47..dec8b191 100644
--- a/.github/workflows/analyze.yml
+++ b/.github/workflows/analyze.yml
@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Install python libraries
       run: |
@@ -23,7 +23,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Install python libraries
       run: |
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 51b0759f..a3f81642 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -41,7 +41,7 @@ jobs:
         with:
           arch: amd64_x86  # Use the 64-bit x64-native cross tools to build 32-bit x86 code
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Build
         run: |
@@ -53,9 +53,9 @@ jobs:
     runs-on: windows-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         repository: 'itsmattkc/msvc420'
         path: msvc420
@@ -165,7 +165,7 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' && github.repository == 'isledecomp/isle' }}
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         repository: 'probonopd/uploadtool'
 
diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml
index ccec2b50..6e4e724e 100644
--- a/.github/workflows/format.yml
+++ b/.github/workflows/format.yml
@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Run clang-format
       run: |
@@ -24,7 +24,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Install python libraries
       shell: bash
diff --git a/.github/workflows/naming.yml b/.github/workflows/naming.yml
index a23275e1..b010e69f 100644
--- a/.github/workflows/naming.yml
+++ b/.github/workflows/naming.yml
@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Install LLVM and Clang
       uses: KyleMayes/install-llvm-action@v1
diff --git a/.github/workflows/unittest.yml b/.github/workflows/unittest.yml
index 612ae3ae..3e1b12d8 100644
--- a/.github/workflows/unittest.yml
+++ b/.github/workflows/unittest.yml
@@ -8,7 +8,7 @@ jobs:
     runs-on: windows-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Install python libraries
       shell: bash
@@ -25,7 +25,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Install python libraries
       shell: bash
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9192c542..da1c41f6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,12 +16,201 @@ if (MSVC)
     endif()
 endif()
 
+set(lego1_targets)
+macro(register_lego1_target __target)
+  list(APPEND lego1_targets ${__target})
+endmacro()
+
 message(STATUS "MSVC for decompilation: ${MSVC_FOR_DECOMP}")
 
 option(ISLE_BUILD_APP "Build ISLE.EXE application" ON)
 option(ISLE_USE_SMARTHEAP "Build with SmartHeap" ${MSVC_FOR_DECOMP})
 option(ISLE_USE_DX5 "Build with internal DirectX 5 SDK" ON)
 
+add_library(DirectX5::DirectX5 INTERFACE IMPORTED)
+target_include_directories(DirectX5::DirectX5 INTERFACE "${CMAKE_SOURCE_DIR}/3rdparty/dx5/inc")
+target_link_directories(DirectX5::DirectX5 INTERFACE "${CMAKE_SOURCE_DIR}/3rdparty/dx5/lib")
+
+add_library(Smacker::Smacker STATIC IMPORTED)
+set_property(TARGET Smacker::Smacker PROPERTY IMPORTED_LOCATION "${CMAKE_SOURCE_DIR}/3rdparty/smacker/smack.lib")
+set_property(TARGET Smacker::Smacker PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_SOURCE_DIR}/3rdparty/smacker")
+
+add_library(FLIC::FLIC STATIC IMPORTED)
+set_property(TARGET FLIC::FLIC PROPERTY IMPORTED_LOCATION "${CMAKE_SOURCE_DIR}/3rdparty/flic/flic.lib")
+set_property(TARGET FLIC::FLIC PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_SOURCE_DIR}/3rdparty/flic")
+
+add_library(Vec::Vec INTERFACE IMPORTED)
+target_include_directories(Vec::Vec INTERFACE "${CMAKE_SOURCE_DIR}/3rdparty/vec")
+
+add_library(SmartHeap::SmartHeap STATIC IMPORTED)
+set_property(TARGET SmartHeap::SmartHeap PROPERTY IMPORTED_LOCATION "${CMAKE_SOURCE_DIR}/3rdparty/smartheap/SHLW32MT.LIB")
+set_property(TARGET SmartHeap::SmartHeap PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_SOURCE_DIR}/3rdparty/smartheap")
+set_property(TARGET SmartHeap::SmartHeap PROPERTY INTERFACE_COMPILE_OPTIONS "/FI${CMAKE_SOURCE_DIR}/3rdparty/smartheap/SMRTHEAP.HPP")
+
+add_library(tglrl STATIC
+  LEGO1/tgl/d3drm/camera.cpp
+  LEGO1/tgl/d3drm/device.cpp
+  LEGO1/tgl/d3drm/group.cpp
+  LEGO1/tgl/d3drm/light.cpp
+  LEGO1/tgl/d3drm/mesh.cpp
+  LEGO1/tgl/d3drm/renderer.cpp
+  LEGO1/tgl/d3drm/texture.cpp
+  LEGO1/tgl/d3drm/unk.cpp
+  LEGO1/tgl/d3drm/view.cpp
+)
+register_lego1_target(tglrl)
+set_property(TARGET tglrl PROPERTY ARCHIVE_OUTPUT_NAME "tglrl40$<$<CONFIG:Debug>:d>")
+target_include_directories(tglrl PRIVATE "${CMAKE_SOURCE_DIR}/LEGO1" "${CMAKE_SOURCE_DIR}/util")
+target_link_libraries(tglrl PRIVATE d3drm)
+
+add_library(realtime STATIC
+  LEGO1/realtime/matrix.cpp
+  LEGO1/realtime/orientableroi.cpp
+  LEGO1/realtime/realtime.cpp
+  LEGO1/realtime/realtimeview.cpp
+  LEGO1/realtime/vector.cpp
+)
+register_lego1_target(realtime)
+set_property(TARGET realtime PROPERTY ARCHIVE_OUTPUT_NAME "realtime$<$<CONFIG:Debug>:d>")
+target_include_directories(realtime PRIVATE "${CMAKE_SOURCE_DIR}/LEGO1" "${CMAKE_SOURCE_DIR}/util")
+target_link_libraries(realtime PRIVATE Vec::Vec)
+
+add_library(viewmanager STATIC
+  LEGO1/viewmanager/viewlodlist.cpp
+  LEGO1/viewmanager/viewmanager.cpp
+  LEGO1/viewmanager/viewroi.cpp
+)
+register_lego1_target(viewmanager)
+set_property(TARGET viewmanager PROPERTY ARCHIVE_OUTPUT_NAME "viewmanager$<$<CONFIG:Debug>:d>")
+target_include_directories(viewmanager PRIVATE "${CMAKE_SOURCE_DIR}/LEGO1" "${CMAKE_SOURCE_DIR}/util")
+target_link_libraries(viewmanager PRIVATE Vec::Vec)
+
+add_library(mxdirectx STATIC
+  LEGO1/mxdirectx/mxdirect3d.cpp
+  LEGO1/mxdirectx/mxdirectdraw.cpp
+)
+register_lego1_target(mxdirectx)
+set_property(TARGET mxdirectx PROPERTY ARCHIVE_OUTPUT_NAME "MxDirectX$<$<CONFIG:Debug>:d>")
+target_include_directories(mxdirectx PRIVATE "${CMAKE_SOURCE_DIR}/LEGO1" "${CMAKE_SOURCE_DIR}/util")
+target_link_libraries(mxdirectx PRIVATE ddraw)
+
+add_library(roi STATIC
+  LEGO1/lego/sources/roi/legoroi.cpp
+)
+register_lego1_target(roi)
+set_property(TARGET roi PROPERTY ARCHIVE_OUTPUT_NAME "roi$<$<CONFIG:Debug>:d>")
+target_include_directories(roi PRIVATE "${CMAKE_SOURCE_DIR}/LEGO1" "${CMAKE_SOURCE_DIR}/util")
+target_link_libraries(roi PRIVATE)
+
+add_library(misc STATIC
+  LEGO1/lego/sources/misc/legoimage.cpp
+  LEGO1/lego/sources/misc/legostorage.cpp
+  LEGO1/lego/sources/misc/legotexture.cpp
+)
+register_lego1_target(misc)
+set_property(TARGET misc PROPERTY ARCHIVE_OUTPUT_NAME "misc$<$<CONFIG:Debug>:d>")
+target_include_directories(misc PRIVATE "${CMAKE_SOURCE_DIR}/LEGO1/omni/include" "${CMAKE_SOURCE_DIR}/util")
+target_link_libraries(misc PRIVATE)
+
+add_library(3dmanager STATIC
+  LEGO1/lego/sources/3dmanager/lego3dmanager.cpp
+  LEGO1/lego/sources/3dmanager/lego3dview.cpp
+  LEGO1/lego/sources/3dmanager/legoview1.cpp
+  LEGO1/lego/sources/3dmanager/tglsurface.cpp
+)
+register_lego1_target(3dmanager)
+set_property(TARGET 3dmanager PROPERTY ARCHIVE_OUTPUT_NAME "3dmanager$<$<CONFIG:Debug>:d>")
+target_include_directories(3dmanager PRIVATE "${CMAKE_SOURCE_DIR}/LEGO1" "${CMAKE_SOURCE_DIR}/util")
+target_link_libraries(3dmanager PRIVATE Vec::Vec)
+
+add_library(omni STATIC
+  LEGO1/omni/src/action/mxdsaction.cpp
+  LEGO1/omni/src/action/mxdsanim.cpp
+  LEGO1/omni/src/action/mxdsevent.cpp
+  LEGO1/omni/src/action/mxdsmediaaction.cpp
+  LEGO1/omni/src/action/mxdsmultiaction.cpp
+  LEGO1/omni/src/action/mxdsobjectaction.cpp
+  LEGO1/omni/src/action/mxdsobject.cpp
+  LEGO1/omni/src/action/mxdsparallelaction.cpp
+  LEGO1/omni/src/action/mxdsselectaction.cpp
+  LEGO1/omni/src/action/mxdsserialaction.cpp
+  LEGO1/omni/src/action/mxdssound.cpp
+  LEGO1/omni/src/action/mxdsstill.cpp
+  LEGO1/omni/src/action/mxdsstreamingaction.cpp
+  LEGO1/omni/src/audio/mxaudiomanager.cpp
+  LEGO1/omni/src/audio/mxaudiopresenter.cpp
+  LEGO1/omni/src/audio/mxloopingmidipresenter.cpp
+  LEGO1/omni/src/audio/mxmidipresenter.cpp
+  LEGO1/omni/src/audio/mxmusicmanager.cpp
+  LEGO1/omni/src/audio/mxmusicpresenter.cpp
+  LEGO1/omni/src/audio/mxsoundmanager.cpp
+  LEGO1/omni/src/audio/mxsoundpresenter.cpp
+  LEGO1/omni/src/audio/mxwavepresenter.cpp
+  LEGO1/omni/src/common/mxatomidcounter.cpp
+  LEGO1/omni/src/common/mxatomid.cpp
+  LEGO1/omni/src/common/mxcompositepresenter.cpp
+  LEGO1/omni/src/common/mxcore.cpp
+  LEGO1/omni/src/common/mxmediamanager.cpp
+  LEGO1/omni/src/common/mxmediapresenter.cpp
+  LEGO1/omni/src/common/mxobjectfactory.cpp
+  LEGO1/omni/src/common/mxpresenter.cpp
+  LEGO1/omni/src/common/mxstring.cpp
+  LEGO1/omni/src/common/mxticklemanager.cpp
+  LEGO1/omni/src/common/mxtimer.cpp
+  LEGO1/omni/src/common/mxutil.cpp
+  LEGO1/omni/src/common/mxvariable.cpp
+  LEGO1/omni/src/common/mxvariabletable.cpp
+  LEGO1/omni/src/entity/mxentity.cpp
+  LEGO1/omni/src/event/mxeventmanager.cpp
+  LEGO1/omni/src/event/mxeventpresenter.cpp
+  LEGO1/omni/src/main/mxomni.cpp
+  LEGO1/omni/src/main/mxomnicreateflags.cpp
+  LEGO1/omni/src/main/mxomnicreateparam.cpp
+  LEGO1/omni/src/notify/mxactionnotificationparam.cpp
+  LEGO1/omni/src/notify/mxnotificationmanager.cpp
+  LEGO1/omni/src/notify/mxnotificationparam.cpp
+  LEGO1/omni/src/notify/mxtype17notificationparam.cpp
+  LEGO1/omni/src/stream/mxdiskstreamcontroller.cpp
+  LEGO1/omni/src/stream/mxdiskstreamprovider.cpp
+  LEGO1/omni/src/stream/mxdsbuffer.cpp
+  LEGO1/omni/src/stream/mxdschunk.cpp
+  LEGO1/omni/src/stream/mxdsfile.cpp
+  LEGO1/omni/src/stream/mxdssource.cpp
+  LEGO1/omni/src/stream/mxdssubscriber.cpp
+  LEGO1/omni/src/stream/mxioinfo.cpp
+  LEGO1/omni/src/stream/mxramstreamcontroller.cpp
+  LEGO1/omni/src/stream/mxramstreamprovider.cpp
+  LEGO1/omni/src/stream/mxstreamchunk.cpp
+  LEGO1/omni/src/stream/mxstreamcontroller.cpp
+  LEGO1/omni/src/stream/mxstreamer.cpp
+  LEGO1/omni/src/stream/mxstreamlist.cpp
+  LEGO1/omni/src/stream/mxstreamprovider.cpp
+  LEGO1/omni/src/system/mxautolocker.cpp
+  LEGO1/omni/src/system/mxcriticalsection.cpp
+  LEGO1/omni/src/system/mxscheduler.cpp
+  LEGO1/omni/src/system/mxsemaphore.cpp
+  LEGO1/omni/src/system/mxthread.cpp
+  LEGO1/omni/src/video/mxbitmap.cpp
+  LEGO1/omni/src/video/mxdisplaysurface.cpp
+  LEGO1/omni/src/video/mxflcpresenter.cpp
+  LEGO1/omni/src/video/mxloopingflcpresenter.cpp
+  LEGO1/omni/src/video/mxloopingsmkpresenter.cpp
+  LEGO1/omni/src/video/mxpalette.cpp
+  LEGO1/omni/src/video/mxregion.cpp
+  LEGO1/omni/src/video/mxregioncursor.cpp
+  LEGO1/omni/src/video/mxsmack.cpp
+  LEGO1/omni/src/video/mxsmkpresenter.cpp
+  LEGO1/omni/src/video/mxstillpresenter.cpp
+  LEGO1/omni/src/video/mxvideomanager.cpp
+  LEGO1/omni/src/video/mxvideoparam.cpp
+  LEGO1/omni/src/video/mxvideoparamflags.cpp
+  LEGO1/omni/src/video/mxvideopresenter.cpp
+)
+register_lego1_target(omni)
+set_property(TARGET omni PROPERTY ARCHIVE_OUTPUT_NAME "omni$<$<CONFIG:Debug>:d>")
+target_include_directories(omni PRIVATE "${CMAKE_SOURCE_DIR}/LEGO1/omni/include" "${CMAKE_SOURCE_DIR}/LEGO1" "${CMAKE_SOURCE_DIR}/util")
+target_link_libraries(omni PRIVATE dsound winmm FLIC::FLIC Smacker::Smacker)
+
 add_library(lego1 SHARED
   LEGO1/define.cpp
   LEGO1/lego/legoomni/src/act1/act1state.cpp
@@ -143,155 +332,37 @@ add_library(lego1 SHARED
   LEGO1/lego/legoomni/src/video/legotexturepresenter.cpp
   LEGO1/lego/legoomni/src/video/legovideomanager.cpp
   LEGO1/lego/legoomni/src/video/mxtransitionmanager.cpp
-  LEGO1/lego/sources/3dmanager/lego3dmanager.cpp
-  LEGO1/lego/sources/3dmanager/lego3dview.cpp
-  LEGO1/lego/sources/3dmanager/legoview1.cpp
-  LEGO1/lego/sources/3dmanager/tglsurface.cpp
-  LEGO1/lego/sources/misc/legoimage.cpp
-  LEGO1/lego/sources/misc/legostorage.cpp
-  LEGO1/lego/sources/misc/legotexture.cpp
-  LEGO1/lego/sources/roi/legoroi.cpp
   LEGO1/main.cpp
-  LEGO1/mxdirectx/mxdirect3d.cpp
-  LEGO1/mxdirectx/mxdirectdraw.cpp
-  LEGO1/mxgeometry/mxgeometry3d.cpp
-  LEGO1/mxgeometry/mxmatrix.cpp
-  LEGO1/omni/src/action/mxdsaction.cpp
-  LEGO1/omni/src/action/mxdsanim.cpp
-  LEGO1/omni/src/action/mxdsevent.cpp
-  LEGO1/omni/src/action/mxdsmediaaction.cpp
-  LEGO1/omni/src/action/mxdsmultiaction.cpp
-  LEGO1/omni/src/action/mxdsobjectaction.cpp
-  LEGO1/omni/src/action/mxdsobject.cpp
-  LEGO1/omni/src/action/mxdsparallelaction.cpp
-  LEGO1/omni/src/action/mxdsselectaction.cpp
-  LEGO1/omni/src/action/mxdsserialaction.cpp
-  LEGO1/omni/src/action/mxdssound.cpp
-  LEGO1/omni/src/action/mxdsstill.cpp
-  LEGO1/omni/src/action/mxdsstreamingaction.cpp
-  LEGO1/omni/src/audio/mxaudiomanager.cpp
-  LEGO1/omni/src/audio/mxaudiopresenter.cpp
-  LEGO1/omni/src/audio/mxloopingmidipresenter.cpp
-  LEGO1/omni/src/audio/mxmidipresenter.cpp
-  LEGO1/omni/src/audio/mxmusicmanager.cpp
-  LEGO1/omni/src/audio/mxmusicpresenter.cpp
-  LEGO1/omni/src/audio/mxsoundmanager.cpp
-  LEGO1/omni/src/audio/mxsoundpresenter.cpp
-  LEGO1/omni/src/audio/mxwavepresenter.cpp
-  LEGO1/omni/src/common/mxatomidcounter.cpp
-  LEGO1/omni/src/common/mxatomid.cpp
-  LEGO1/omni/src/common/mxcompositepresenter.cpp
-  LEGO1/omni/src/common/mxcore.cpp
-  LEGO1/omni/src/common/mxmediamanager.cpp
-  LEGO1/omni/src/common/mxmediapresenter.cpp
-  LEGO1/omni/src/common/mxobjectfactory.cpp
-  LEGO1/omni/src/common/mxpresenter.cpp
-  LEGO1/omni/src/common/mxstring.cpp
-  LEGO1/omni/src/common/mxticklemanager.cpp
-  LEGO1/omni/src/common/mxtimer.cpp
-  LEGO1/omni/src/common/mxutil.cpp
-  LEGO1/omni/src/common/mxvariable.cpp
-  LEGO1/omni/src/common/mxvariabletable.cpp
-  LEGO1/omni/src/entity/mxentity.cpp
-  LEGO1/omni/src/event/mxeventmanager.cpp
-  LEGO1/omni/src/event/mxeventpresenter.cpp
-  LEGO1/omni/src/main/mxomni.cpp
-  LEGO1/omni/src/main/mxomnicreateflags.cpp
-  LEGO1/omni/src/main/mxomnicreateparam.cpp
-  LEGO1/omni/src/notify/mxactionnotificationparam.cpp
-  LEGO1/omni/src/notify/mxnotificationmanager.cpp
-  LEGO1/omni/src/notify/mxnotificationparam.cpp
-  LEGO1/omni/src/notify/mxtype17notificationparam.cpp
-  LEGO1/omni/src/stream/mxdiskstreamcontroller.cpp
-  LEGO1/omni/src/stream/mxdiskstreamprovider.cpp
-  LEGO1/omni/src/stream/mxdsbuffer.cpp
-  LEGO1/omni/src/stream/mxdschunk.cpp
-  LEGO1/omni/src/stream/mxdsfile.cpp
-  LEGO1/omni/src/stream/mxdssource.cpp
-  LEGO1/omni/src/stream/mxdssubscriber.cpp
-  LEGO1/omni/src/stream/mxioinfo.cpp
-  LEGO1/omni/src/stream/mxramstreamcontroller.cpp
-  LEGO1/omni/src/stream/mxramstreamprovider.cpp
-  LEGO1/omni/src/stream/mxstreamchunk.cpp
-  LEGO1/omni/src/stream/mxstreamcontroller.cpp
-  LEGO1/omni/src/stream/mxstreamer.cpp
-  LEGO1/omni/src/stream/mxstreamlist.cpp
-  LEGO1/omni/src/stream/mxstreamprovider.cpp
-  LEGO1/omni/src/system/mxautolocker.cpp
-  LEGO1/omni/src/system/mxcriticalsection.cpp
-  LEGO1/omni/src/system/mxscheduler.cpp
-  LEGO1/omni/src/system/mxsemaphore.cpp
-  LEGO1/omni/src/system/mxthread.cpp
-  LEGO1/omni/src/video/mxbitmap.cpp
-  LEGO1/omni/src/video/mxdisplaysurface.cpp
-  LEGO1/omni/src/video/mxflcpresenter.cpp
-  LEGO1/omni/src/video/mxloopingflcpresenter.cpp
-  LEGO1/omni/src/video/mxloopingsmkpresenter.cpp
-  LEGO1/omni/src/video/mxpalette.cpp
-  LEGO1/omni/src/video/mxregion.cpp
-  LEGO1/omni/src/video/mxregioncursor.cpp
-  LEGO1/omni/src/video/mxsmack.cpp
-  LEGO1/omni/src/video/mxsmkpresenter.cpp
-  LEGO1/omni/src/video/mxstillpresenter.cpp
-  LEGO1/omni/src/video/mxvideomanager.cpp
-  LEGO1/omni/src/video/mxvideoparam.cpp
-  LEGO1/omni/src/video/mxvideoparamflags.cpp
-  LEGO1/omni/src/video/mxvideopresenter.cpp
-  LEGO1/realtime/matrix.cpp
-  LEGO1/realtime/orientableroi.cpp
-  LEGO1/realtime/realtime.cpp
-  LEGO1/realtime/realtimeview.cpp
-  LEGO1/realtime/vector.cpp
-  LEGO1/tgl/d3drm/camera.cpp
-  LEGO1/tgl/d3drm/device.cpp
-  LEGO1/tgl/d3drm/group.cpp
-  LEGO1/tgl/d3drm/light.cpp
-  LEGO1/tgl/d3drm/mesh.cpp
-  LEGO1/tgl/d3drm/renderer.cpp
-  LEGO1/tgl/d3drm/texture.cpp
-  LEGO1/tgl/d3drm/unk.cpp
-  LEGO1/tgl/d3drm/view.cpp
-  LEGO1/viewmanager/viewlodlist.cpp
-  LEGO1/viewmanager/viewmanager.cpp
-  LEGO1/viewmanager/viewroi.cpp
 )
+register_lego1_target(lego1)
 
 if (MINGW)
   target_compile_definitions(lego1 PRIVATE DIRECTINPUT_VERSION=0x0500)
 endif()
 
-target_include_directories(lego1 PRIVATE "${CMAKE_SOURCE_DIR}/util")
-target_include_directories(lego1 PRIVATE "${CMAKE_SOURCE_DIR}/LEGO1")
-target_include_directories(lego1 PRIVATE "${CMAKE_SOURCE_DIR}/LEGO1/omni/include")
-target_include_directories(lego1 PRIVATE "${CMAKE_SOURCE_DIR}/LEGO1/lego/sources")
-target_include_directories(lego1 PRIVATE "${CMAKE_SOURCE_DIR}/LEGO1/lego/legoomni/include")
-
-# Additional include directories
-target_include_directories(lego1 PUBLIC "${CMAKE_SOURCE_DIR}/3rdparty/vec")
-target_include_directories(lego1 PRIVATE "${CMAKE_SOURCE_DIR}/3rdparty/flic")
-target_include_directories(lego1 PRIVATE "${CMAKE_SOURCE_DIR}/3rdparty/smacker")
-
-if (ISLE_USE_SMARTHEAP)
-  add_library(SmartHeap::SmartHeap STATIC IMPORTED)
-  set_target_properties(SmartHeap::SmartHeap PROPERTIES
-    IMPORTED_LOCATION "${CMAKE_SOURCE_DIR}/3rdparty/smartheap/SHLW32MT.LIB"
-    INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_SOURCE_DIR}/3rdparty/smartheap"
-    INTERFACE_COMPILE_OPTIONS "/FI${CMAKE_SOURCE_DIR}/3rdparty/smartheap/SMRTHEAP.HPP")
-
-  target_link_libraries(lego1 PRIVATE SmartHeap::SmartHeap)
+if (MSVC)
+  target_sources(lego1 PRIVATE LEGO1/LegoOmni.def)
+else()
+  target_sources(lego1 PRIVATE LEGO1/LegoOmni.mingw.def)
 endif()
 
-# Use internal DirectX 5 if required
-if (ISLE_USE_DX5)
-  target_include_directories(lego1 PRIVATE "${CMAKE_SOURCE_DIR}/3rdparty/dx5/inc")
-  target_link_directories(lego1 PRIVATE "${CMAKE_SOURCE_DIR}/3rdparty/dx5/lib")
-endif()
-
-target_link_directories(lego1 PRIVATE "${CMAKE_SOURCE_DIR}/3rdparty/smacker")
-target_link_directories(lego1 PRIVATE "${CMAKE_SOURCE_DIR}/3rdparty/flic")
+target_include_directories(lego1 PUBLIC "${CMAKE_SOURCE_DIR}/util")
+target_include_directories(lego1 PUBLIC "${CMAKE_SOURCE_DIR}/LEGO1")
+target_include_directories(lego1 PUBLIC "${CMAKE_SOURCE_DIR}/LEGO1/omni/include")
+target_include_directories(lego1 PUBLIC "${CMAKE_SOURCE_DIR}/LEGO1/lego/sources")
+target_include_directories(lego1 PUBLIC "${CMAKE_SOURCE_DIR}/LEGO1/lego/legoomni/include")
 
 # Link libraries
-target_link_libraries(lego1 PRIVATE ddraw dsound dinput dxguid winmm d3drm smack flic)
+target_link_libraries(lego1 PRIVATE tglrl viewmanager realtime mxdirectx roi FLIC::FLIC Vec::Vec dinput dxguid misc 3dmanager omni)
+
+if (ISLE_USE_SMARTHEAP)
+  foreach(tgt IN LISTS lego1_targets)
+    target_link_libraries(${tgt} PRIVATE SmartHeap::SmartHeap)
+  endforeach()
+endif()
+foreach(tgt IN LISTS lego1_targets)
+  target_link_libraries(${tgt} PRIVATE $<$<BOOL:${ISLE_USE_DX5}>:DirectX5::DirectX5>)
+endforeach()
 
 # Make sure filenames are ALL CAPS
 set_property(TARGET lego1 PROPERTY OUTPUT_NAME LEGO1)
@@ -301,23 +372,12 @@ set_property(TARGET lego1 PROPERTY SUFFIX ".DLL")
 if (ISLE_BUILD_APP)
   add_executable(isle WIN32
     ISLE/res/isle.rc
-    ISLE/define.cpp
     ISLE/isleapp.cpp
+    ISLE/define.cpp
   )
 
-  target_compile_definitions(isle PRIVATE ISLE_APP)
-
-  target_include_directories(isle PRIVATE "${CMAKE_SOURCE_DIR}/util")
-  target_include_directories(isle PRIVATE "${CMAKE_SOURCE_DIR}/LEGO1")
-  target_include_directories(isle PRIVATE "${CMAKE_SOURCE_DIR}/LEGO1/omni/include")
-  target_include_directories(isle PRIVATE "${CMAKE_SOURCE_DIR}/LEGO1/lego/sources")
-  target_include_directories(isle PRIVATE "${CMAKE_SOURCE_DIR}/LEGO1/lego/legoomni/include")
-
   # Use internal DirectX 5 if required
-  if (ISLE_USE_DX5)
-    target_include_directories(isle PRIVATE "${CMAKE_SOURCE_DIR}/3rdparty/dx5/inc")
-    target_link_directories(isle PRIVATE "${CMAKE_SOURCE_DIR}/3rdparty/dx5/lib")
-  endif()
+  target_link_libraries(isle PRIVATE $<$<BOOL:${ISLE_USE_DX5}>:DirectX5::DirectX5>)
 
   if (ISLE_USE_SMARTHEAP)
     target_link_libraries(isle PRIVATE SmartHeap::SmartHeap)
@@ -333,15 +393,19 @@ endif()
 
 if (MSVC)
   if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL "15")
-    target_compile_definitions(lego1 PRIVATE _CRT_SECURE_NO_WARNINGS)
-    if (ISLE_BUILD_APP)
+    foreach(tgt IN LISTS lego1_targets)
+      target_compile_definitions(${tgt} PRIVATE _CRT_SECURE_NO_WARNINGS)
+    endforeach()
+    if (TARGET isle)
       target_compile_definitions(isle PRIVATE "_CRT_SECURE_NO_WARNINGS")
     endif()
   endif()
   # Visual Studio 2017 version 15.7 needs "/Zc:__cplusplus" for __cplusplus
   if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL "19.14.26428")
-    target_compile_options(lego1 PRIVATE "-Zc:__cplusplus")
-    if (ISLE_BUILD_APP)
+    foreach(tgt IN LISTS lego1_targets)
+      target_compile_options(${tgt} PRIVATE "-Zc:__cplusplus")
+    endforeach()
+    if (TARGET isle)
       target_compile_options(isle PRIVATE "-Zc:__cplusplus")
     endif()
   endif()
@@ -364,6 +428,9 @@ if (MSVC_FOR_DECOMP)
   endif()
 
   target_compile_options(lego1 PRIVATE "/MT$<$<CONFIG:Debug>:d>")
+  foreach(tgt IN LISTS lego1_targets)
+    target_compile_options(${tgt} PRIVATE "/MT$<$<CONFIG:Debug>:d>")
+  endforeach()
 
   set(CMAKE_CXX_FLAGS "/W3 /GX /D \"WIN32\" /D \"_WINDOWS\"")
   set(CMAKE_CXX_FLAGS_DEBUG "/Gm /Zi /Od /D \"_DEBUG\"")
@@ -377,6 +444,8 @@ if (MSVC_FOR_DECOMP)
   set(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "/incremental:no /debug")
   set(CMAKE_EXE_LINKER_FLAGS_MINSIZEREL "/incremental:no")
 
+  set(CMAKE_STATIC_LINKER_FLAGS "/machine:I386")
+
   set(CMAKE_SHARED_LINKER_FLAGS "/machine:I386")
   set(CMAKE_SHARED_LINKER_FLAGS_DEBUG "/incremental:yes /debug")
   set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "/incremental:no")
@@ -385,12 +454,17 @@ if (MSVC_FOR_DECOMP)
 
   # Older MSVC versions don't support building in parallel.
   # Force non-parallel builds of isle and lego1 by putting them in a pool with 1 available job.
-  if(CMAKE_CXX_COMPILER_ID VERSION_LESS 12)
-    set_property(GLOBAL PROPERTY JOB_POOLS "msvc_lego=1;msvc_lego1=1")
-    set_property(TARGET isle PROPERTY JOB_POOL_COMPILE msvc_lego)
-    set_property(TARGET isle PROPERTY JOB_POOL_LINK msvc_lego)
-    set_property(TARGET lego1 PROPERTY JOB_POOL_COMPILE msvc_lego1)
-    set_property(TARGET lego1 PROPERTY JOB_POOL_LINK msvc_lego1)
+  if (CMAKE_CXX_COMPILER_ID VERSION_LESS 12)
+    foreach(tgt IN LISTS lego1_taregets)
+      set_property(GLOBAL APPEND PROPERTY JOB_POOLS "msvc_${tgt}=1;msvc_lego1=1")
+      set_property(TARGET ${tgt} PROPERTY JOB_POOL_COMPILE msvc_${tgt})
+      set_property(TARGET ${tgt} PROPERTY JOB_POOL_LINK msvc_${tgt})
+    endforeach()
+    if (TARGET isle)
+      set_property(GLOBAL APPEND PROPERTY JOB_POOLS "msvc_isle=1")
+      set_property(TARGET isle PROPERTY JOB_POOL_COMPILE msvc_isle)
+      set_property(TARGET isle PROPERTY JOB_POOL_LINK msvc_isle)
+    endif()
   endif()
 endif()
 
diff --git a/ISLE/isleapp.cpp b/ISLE/isleapp.cpp
index 4a2a840b..32b19164 100644
--- a/ISLE/isleapp.cpp
+++ b/ISLE/isleapp.cpp
@@ -52,7 +52,15 @@ IsleApp::IsleApp()
 	m_frameDelta = 10;
 	m_windowActive = 1;
 
+#ifdef COMPAT_MODE
+	{
+		MxRect32 r(0, 0, 639, 479);
+		MxVideoParamFlags flags;
+		m_videoParam = MxVideoParam(r, NULL, 1, flags);
+	}
+#else
 	m_videoParam = MxVideoParam(MxRect32(0, 0, 639, 479), NULL, 1, MxVideoParamFlags());
+#endif
 	m_videoParam.Flags().Set16Bit(MxDirectDraw::GetPrimaryBitDepth() == 16);
 
 	m_windowHandle = NULL;
diff --git a/LEGO1/LegoOmni.def b/LEGO1/LegoOmni.def
new file mode 100644
index 00000000..a3bbfe66
--- /dev/null
+++ b/LEGO1/LegoOmni.def
@@ -0,0 +1,138 @@
+; LegoOmni.def : Declares the module paarameters for the LEGO1.DLL.
+
+DESCRIPTION  "Lego OMNI Windows Dynamic Link Library"
+
+EXPORTS
+
+; EXPORTs really required only.
+
+??0LegoBackgroundColor@@QAE@PBD0@Z
+??0LegoGameState@@QAE@XZ
+??0LegoWorld@@QAE@XZ
+??0MxAtomId@@QAE@PBDW4LookupMode@@@Z
+??0MxBitmap@@QAE@XZ
+??0MxCore@@QAE@XZ
+??0MxCriticalSection@@QAE@XZ
+??0MxDSAction@@QAE@XZ
+??0MxDSFile@@QAE@PBDK@Z
+??0MxOmniCreateFlags@@QAE@XZ
+??0MxOmniCreateParam@@QAE@PBDPAUHWND__@@AAVMxVideoParam@@VMxOmniCreateFlags@@@Z
+??0MxString@@QAE@ABV0@@Z
+??0MxVideoParam@@QAE@AAV0@@Z
+??0MxVideoParam@@QAE@AAVMxRect32@@PAVMxPalette@@KAAVMxVideoParamFlags@@@Z
+??0MxVideoParam@@QAE@XZ
+??0MxVideoParamFlags@@QAE@XZ
+??1LegoEntity@@UAE@XZ
+??1LegoGameState@@QAE@XZ
+??1LegoWorld@@UAE@XZ
+??1MXIOINFO@@QAE@XZ
+??1MxAtomId@@QAE@XZ
+??1MxBitmap@@UAE@XZ
+??1MxCore@@UAE@XZ
+??1MxCriticalSection@@QAE@XZ
+??1MxDSAction@@UAE@XZ
+??1MxDSFile@@UAE@XZ
+??1MxPresenter@@UAE@XZ
+??1MxString@@UAE@XZ
+??1MxVideoParam@@QAE@XZ
+??4MxAtomId@@QAEAAV0@ABV0@@Z
+??4MxString@@QAEABV0@PBD@Z
+??4MxVideoParam@@QAEAAV0@ABV0@@Z
+??8MxPalette@@QAEEAAV0@@Z
+?BackgroundAudioManager@@YAPAVMxBackgroundAudioManager@@XZ
+?Close@MxDSFile@@UAEJXZ
+?Close@MxStreamer@@QAEJPBD@Z
+?CreateBackgroundAudio@LegoOmni@@QAEXXZ
+?CreateInstance@LegoOmni@@SAXXZ
+?CreatePalette@MxBitmap@@UAEPAVMxPalette@@XZ
+?CreateStreamObject@@YAPAVMxDSObject@@PAVMxDSFile@@F@Z
+?DestroyInstance@MxOmni@@SAXXZ
+?Detach@MxPalette@@QAEXXZ
+?DisableRMDevice@LegoVideoManager@@QAEHXZ
+?DoneTickle@MxPresenter@@MAEXXZ
+?Enable@MxBackgroundAudioManager@@QAEXE@Z
+?Enable@MxPresenter@@UAEXE@Z
+?EnableFullScreenMovie@LegoVideoManager@@QAEXEE@Z
+?EnableRMDevice@LegoVideoManager@@QAEHXZ
+?EndAction@MxPresenter@@UAEXXZ
+?EventManager@@YAPAVMxEventManager@@XZ
+?FlipToGDISurface@MxDirectDraw@@QAEHXZ
+?GameState@@YAPAVLegoGameState@@XZ
+?GetBufferSize@MxDSFile@@UAEKXZ
+?GetCD@MxOmni@@SAPBDXZ
+?GetCurrPathInfo@LegoOmni@@SAHPAPAVLegoPathBoundary@@AAH@Z
+?GetDefaults@LegoNavController@@SAXPAHPAM11111111PAE@Z
+?GetHD@MxOmni@@SAPBDXZ
+?GetInstance@LegoOmni@@SAPAV1@XZ
+?GetInstance@MxOmni@@SAPAV1@XZ
+?GetInstance@MxScheduler@@SAPAV1@XZ
+?GetNoCD_SourceName@@YAPBDXZ
+?GetPartsThreshold@RealtimeView@@SAMXZ
+?GetPrimaryBitDepth@MxDirectDraw@@SAHXZ
+?GetRealTime@MxTimer@@QAEJXZ
+?GetStreamBuffersNum@MxDSFile@@UAEKXZ
+?GetUserMaxLOD@RealtimeView@@SAMXZ
+?GetVariable@MxVariableTable@@QAEPBDPBD@Z
+?Init@MxPresenter@@IAEXXZ
+?InputManager@@YAPAVLegoInputManager@@XZ
+?InvalidateRect@MxVideoManager@@QAEXAAVMxRect32@@@Z
+?IsSound3D@MxOmni@@SAEXZ
+?Lego@@YAPAVLegoOmni@@XZ
+?Load@LegoGameState@@QAEJK@Z
+?MSoundManager@@YAPAVMxSoundManager@@XZ
+?MakeSourceName@@YAXPADPBD@Z
+?MoveCursor@LegoVideoManager@@QAEXHH@Z
+?MusicManager@@YAPAVMxMusicManager@@XZ
+?NotificationManager@@YAPAVMxNotificationManager@@XZ
+?Notify@MxCore@@UAEJAAVMxParam@@@Z
+?Open@MxDSFile@@UAEJK@Z
+?Open@MxStreamer@@QAEPAVMxStreamController@@PBDG@Z
+?ParseExtra@MxPresenter@@MAEXXZ
+?Pause@MxDirectDraw@@QAEHH@Z
+?PickEntity@@YAPAVLegoEntity@@JJ@Z
+?PickROI@@YAPAVLegoROI@@JJ@Z
+?QueueEvent@LegoInputManager@@QAEXW4NotificationId@@EJJE@Z
+?Read@MxBitmap@@UAEJPBD@Z
+?Read@MxDSFile@@UAEJPAEK@Z
+?RealizePalette@MxVideoManager@@UAEJPAVMxPalette@@@Z
+?Register@LegoInputManager@@QAEXPAVMxCore@@@Z
+?RemoveAll@ViewManager@@QAEXPAVViewROI@@@Z
+?RemoveWorld@LegoOmni@@QAEXABVMxAtomId@@J@Z
+?Save@LegoGameState@@QAEJK@Z
+?Seek@MxDSFile@@UAEJJH@Z
+?SerializePlayersInfo@LegoGameState@@QAEXF@Z
+?SerializeScoreHistory@LegoGameState@@QAEXF@Z
+?SetCD@MxOmni@@SAXPBD@Z
+?SetDefaults@LegoNavController@@SAXHMMMMMMMMME@Z
+?SetDeviceName@MxVideoParam@@QAEXPAD@Z
+?SetDisplayBB@LegoROI@@QAEXH@Z
+?SetDoMutex@MxCriticalSection@@SAXXZ
+?SetHD@MxOmni@@SAXPBD@Z
+?SetObjectName@MxDSObject@@QAEXPBD@Z
+?SetOmniUserMessage@@YAXP6AXPBDH@Z@Z
+?SetPartsThreshold@RealtimeView@@SAXM@Z
+?SetSavePath@LegoGameState@@QAEXPAD@Z
+?SetSound3D@MxOmni@@SAXE@Z
+?SetUserMaxLOD@RealtimeView@@SAXM@Z
+?SetVariable@MxVariableTable@@QAEXPAVMxVariable@@@Z
+?SetVariable@MxVariableTable@@QAEXPBD0@Z
+?SetWaitIndicator@MxTransitionManager@@QAEXPAVMxVideoPresenter@@@Z
+?SoundManager@@YAPAVLegoSoundManager@@XZ
+?Start@@YAJPAVMxDSAction@@@Z
+?StartAction@MxPresenter@@UAEJPAVMxStreamController@@PAVMxDSAction@@@Z
+?StartMultiTasking@MxScheduler@@QAEXK@Z
+?Streamer@@YAPAVMxStreamer@@XZ
+?Tickle@MxPresenter@@UAEJXZ
+?TickleManager@@YAPAVMxTickleManager@@XZ
+?Timer@@YAPAVMxTimer@@XZ
+?TransitionManager@@YAPAVMxTransitionManager@@XZ
+?UnRegister@LegoInputManager@@QAEXPAVMxCore@@@Z
+?VariableTable@@YAPAVMxVariableTable@@XZ
+?VideoManager@@YAPAVLegoVideoManager@@XZ
+?configureLegoAnimationManager@LegoAnimationManager@@SAXH@Z
+?configureLegoBuildingManager@LegoBuildingManager@@SAXH@Z
+?configureLegoModelPresenter@LegoModelPresenter@@SAXH@Z
+?configureLegoPartPresenter@LegoPartPresenter@@SAXHH@Z
+?configureLegoROI@LegoROI@@SAXH@Z
+?configureLegoWorldPresenter@LegoWorldPresenter@@SAXH@Z
+_DllMain@12
diff --git a/LEGO1/LegoOmni.mingw.def b/LEGO1/LegoOmni.mingw.def
new file mode 100644
index 00000000..d5d9e052
--- /dev/null
+++ b/LEGO1/LegoOmni.mingw.def
@@ -0,0 +1,170 @@
+; LegoOmni.def : Declares the module paarameters for the LEGO1.DLL.
+
+DESCRIPTION  " Lego OMNI Windows Dynamic Link Library"
+
+EXPORTS
+
+; EXPORTs really required only.
+
+_ZN13LegoGameState11SetSavePathEPc
+_ZN13LegoGameState20SerializePlayersInfoEs
+_ZN13LegoGameState21SerializeScoreHistoryEs
+_ZN13LegoGameState4SaveEj
+_ZN13LegoGameStateC1Ev
+_ZN13LegoGameStateC2Ev
+_ZN13LegoGameStateD1Ev
+_ZN13LegoGameStateD2Ev
+_ZN9LegoWorldC1Ev
+_ZN9LegoWorldC2Ev
+_ZN9LegoWorldD0Ev
+_ZN9LegoWorldD1Ev
+_ZN9LegoWorldD2Ev
+DllMain@12
+_Z10PickEntityii
+_Z12EventManagerv
+_Z12InputManagerv
+_Z12MusicManagerv
+_Z12SoundManagerv
+_Z12VideoManagerv
+_Z13MSoundManagerv
+_Z13TickleManagerv
+_Z13VariableTablev
+_Z14MakeSourceNamePcPKc
+_Z17TransitionManagerv
+_Z18CreateStreamObjectP8MxDSFiles
+_Z18GetNoCD_SourceNamev
+_Z18SetOmniUserMessagePFvPKciE
+_Z19NotificationManagerv
+_Z22BackgroundAudioManagerv
+_Z4Legov
+_Z5StartP10MxDSAction
+_Z5Timerv
+_Z7PickROIii
+_Z8Streamerv
+_Z9GameStatev
+_ZN10LegoEntityD0Ev
+_ZN10LegoEntityD1Ev
+_ZN10LegoEntityD2Ev
+_ZN10MxDSActionC1Ev
+_ZN10MxDSActionC2Ev
+_ZN10MxDSActionD0Ev
+_ZN10MxDSActionD1Ev
+_ZN10MxDSActionD2Ev
+_ZN10MxDSObject13SetObjectNameEPKc
+_ZN10MxStreamer4OpenEPKct
+_ZN10MxStreamer5CloseEPKc
+_ZN11MxPresenter10DoneTickleEv
+_ZN11MxPresenter10ParseExtraEv
+_ZN11MxPresenter11StartActionEP18MxStreamControllerP10MxDSAction
+_ZN11MxPresenter4InitEv
+_ZN11MxPresenter6EnableEh
+_ZN11MxPresenter6TickleEv
+_ZN11MxPresenter9EndActionEv
+_ZN11MxPresenterD0Ev
+_ZN11MxPresenterD1Ev
+_ZN11MxPresenterD2Ev
+_ZN11MxScheduler11GetInstanceEv
+_ZN11MxScheduler17StartMultiTaskingEj
+_ZN11ViewManager9RemoveAllEP7ViewROI
+_ZN12MxDirectDraw16FlipToGDISurfaceEv
+_ZN12MxDirectDraw18GetPrimaryBitDepthEv
+_ZN12MxDirectDraw5PauseEi
+_ZN12MxVideoParam13SetDeviceNameEPc
+_ZN12MxVideoParamC1ERS_
+_ZN12MxVideoParamC1Ev
+_ZN12MxVideoParamC2ERS_
+_ZN12MxVideoParamC2Ev
+_ZN12MxVideoParamD1Ev
+_ZN12MxVideoParamD2Ev
+_ZN12MxVideoParamaSERKS_
+_ZN12RealtimeView13GetUserMaxLODEv
+_ZN12RealtimeView13SetUserMaxLODEf
+_ZN12RealtimeView17GetPartsThresholdEv
+_ZN12RealtimeView17SetPartsThresholdEf
+_ZN14MxVideoManager14InvalidateRectER8MxRect32
+_ZN14MxVideoManager14RealizePaletteEP9MxPalette
+_ZN15MxVariableTable11GetVariableEPKc
+_ZN15MxVariableTable11SetVariableEP10MxVariable
+_ZN15MxVariableTable11SetVariableEPKcS1_ = _ZN15MxVariableTable11SetVariableEPKcS1_
+;_ZN16LegoInputManager10QueueEventE14NotificationIdhiih
+_ZN16LegoInputManager10QueueEventE14NotificationIdhiih
+_ZN16LegoInputManager10UnRegisterEP6MxCore
+_ZN16LegoInputManager8RegisterEP6MxCore
+_ZN16LegoVideoManager10MoveCursorEii
+_ZN16LegoVideoManager14EnableRMDeviceEv
+_ZN16LegoVideoManager15DisableRMDeviceEv
+_ZN16LegoVideoManager21EnableFullScreenMovieEhh
+_ZN17LegoNavController11GetDefaultsEPiPfS1_S1_S1_S1_S1_S1_S1_S1_Ph
+_ZN17LegoNavController11SetDefaultsEifffffffffh
+_ZN17LegoPartPresenter26configureLegoPartPresenterEii
+_ZN17MxCriticalSection10SetDoMutexEv
+_ZN17MxCriticalSectionC1Ev
+_ZN17MxCriticalSectionC2Ev
+_ZN17MxCriticalSectionD1Ev
+_ZN17MxCriticalSectionD2Ev
+_ZN17MxOmniCreateFlagsC1Ev
+_ZN17MxOmniCreateFlagsC2Ev
+_ZN17MxOmniCreateParamC1EPKcP6HWND__R12MxVideoParam17MxOmniCreateFlags
+_ZN17MxVideoParamFlagsC1Ev
+_ZN17MxVideoParamFlagsC2Ev
+_ZN18LegoModelPresenter27configureLegoModelPresenterEi
+_ZN18LegoWorldPresenter27configureLegoWorldPresenterEi
+_ZN19LegoBuildingManager28configureLegoBuildingManagerEi
+_ZN19MxTransitionManager16SetWaitIndicatorEP16MxVideoPresenter
+_ZN20LegoAnimationManager29configureLegoAnimationManagerEi
+_ZN24MxBackgroundAudioManager6EnableEh
+_ZN6MxCore6NotifyER7MxParam
+_ZN6MxCoreC1Ev
+_ZN6MxCoreC2Ev
+_ZN6MxCoreD0Ev
+_ZN6MxCoreD1Ev
+_ZN6MxCoreD2Ev
+_ZN6MxOmni10SetSound3DEh
+_ZN6MxOmni11GetInstanceEv
+_ZN6MxOmni15DestroyInstanceEv
+_ZN6MxOmni5GetCDEv
+_ZN6MxOmni5GetHDEv
+_ZN6MxOmni5SetCDEPKc
+_ZN6MxOmni5SetHDEPKc
+_ZN6MxOmni9IsSound3DEv
+_ZN7LegoROI12SetDisplayBBEi
+_ZN7LegoROI16configureLegoROIEi
+_ZN7MxTimer11GetRealTimeEv
+_ZN8LegoOmni11GetInstanceEv
+_ZN8LegoOmni11RemoveWorldERK8MxAtomIdi
+_ZN8LegoOmni14CreateInstanceEv
+_ZN8LegoOmni15GetCurrPathInfoEPP16LegoPathBoundaryRi
+_ZN8LegoOmni21CreateBackgroundAudioEv
+_ZN8MXIOINFOD1Ev
+_ZN8MXIOINFOD2Ev
+_ZN8MxAtomIdC1EPKc10LookupMode
+_ZN8MxAtomIdC2EPKc10LookupMode
+_ZN8MxAtomIdD1Ev
+_ZN8MxAtomIdD2Ev
+_ZN8MxAtomIdaSERKS_
+_ZN8MxBitmap13CreatePaletteEv
+_ZN8MxBitmap4ReadEPKc
+_ZN8MxBitmapC1Ev
+_ZN8MxBitmapC2Ev
+_ZN8MxBitmapD0Ev
+_ZN8MxBitmapD1Ev
+_ZN8MxBitmapD2Ev
+_ZN8MxDSFile13GetBufferSizeEv
+_ZN8MxDSFile19GetStreamBuffersNumEv
+_ZN8MxDSFile4OpenEj
+_ZN8MxDSFile4ReadEPhj
+_ZN8MxDSFile4SeekEii
+_ZN8MxDSFile5CloseEv
+_ZN8MxDSFileC1EPKcj
+_ZN8MxDSFileC2EPKcj
+_ZN8MxDSFileD0Ev
+_ZN8MxDSFileD1Ev
+_ZN8MxDSFileD2Ev
+_ZN8MxStringC1ERKS_
+_ZN8MxStringC2ERKS_
+_ZN8MxStringD0Ev
+_ZN8MxStringD1Ev
+_ZN8MxStringD2Ev
+_ZN8MxStringaSEPKc
+_ZN9MxPalette6DetachEv
+_ZN9MxPaletteeqERS_
diff --git a/LEGO1/lego/legoomni/include/legoanimationmanager.h b/LEGO1/lego/legoomni/include/legoanimationmanager.h
index b81f2c72..82dc429d 100644
--- a/LEGO1/lego/legoomni/include/legoanimationmanager.h
+++ b/LEGO1/lego/legoomni/include/legoanimationmanager.h
@@ -32,7 +32,7 @@ class LegoAnimationManager : public MxCore {
 	void FUN_1005f720(undefined4);
 	void FUN_10064670(MxBool);
 
-	__declspec(dllexport) static void configureLegoAnimationManager(MxS32 p_legoAnimationManagerConfig);
+	static void configureLegoAnimationManager(MxS32 p_legoAnimationManagerConfig);
 
 	// SYNTHETIC: LEGO1 0x1005ed10
 	// LegoAnimationManager::`scalar deleting destructor'
diff --git a/LEGO1/lego/legoomni/include/legobackgroundcolor.h b/LEGO1/lego/legoomni/include/legobackgroundcolor.h
index c11508bc..5d05618b 100644
--- a/LEGO1/lego/legoomni/include/legobackgroundcolor.h
+++ b/LEGO1/lego/legoomni/include/legobackgroundcolor.h
@@ -7,7 +7,7 @@
 // SIZE 0x30
 class LegoBackgroundColor : public MxVariable {
 public:
-	__declspec(dllexport) LegoBackgroundColor(const char* p_key, const char* p_value);
+	LegoBackgroundColor(const char* p_key, const char* p_value);
 	virtual void SetValue(const char* p_colorString) override;
 
 private:
diff --git a/LEGO1/lego/legoomni/include/legobuildingmanager.h b/LEGO1/lego/legoomni/include/legobuildingmanager.h
index 969657ca..d96d9583 100644
--- a/LEGO1/lego/legoomni/include/legobuildingmanager.h
+++ b/LEGO1/lego/legoomni/include/legobuildingmanager.h
@@ -19,7 +19,7 @@ class LegoBuildingManager : public MxCore {
 		return "LegoBuildingManager";
 	}
 
-	__declspec(dllexport) static void configureLegoBuildingManager(MxS32);
+	static void configureLegoBuildingManager(MxS32);
 
 	void FUN_1002fa00();
 
diff --git a/LEGO1/lego/legoomni/include/legoentity.h b/LEGO1/lego/legoomni/include/legoentity.h
index b775f840..12b1ecf1 100644
--- a/LEGO1/lego/legoomni/include/legoentity.h
+++ b/LEGO1/lego/legoomni/include/legoentity.h
@@ -19,12 +19,8 @@ class LegoEntity : public MxEntity {
 	// Inlined at 0x100853f7
 	inline LegoEntity() { Init(); }
 
-#ifdef ISLE_APP
-	__declspec(dllexport) virtual ~LegoEntity() override;
-#else
 	// FUNCTION: LEGO1 0x1000c290
-	__declspec(dllexport) virtual ~LegoEntity() override { Destroy(TRUE); }
-#endif
+	virtual ~LegoEntity() override { Destroy(TRUE); }
 
 	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x4
 
diff --git a/LEGO1/lego/legoomni/include/legogamestate.h b/LEGO1/lego/legoomni/include/legogamestate.h
index 534ac5b9..51d7b888 100644
--- a/LEGO1/lego/legoomni/include/legogamestate.h
+++ b/LEGO1/lego/legoomni/include/legogamestate.h
@@ -20,13 +20,13 @@ struct ColorStringStruct {
 // SIZE 0x430
 class LegoGameState {
 public:
-	__declspec(dllexport) LegoGameState();
-	__declspec(dllexport) ~LegoGameState();
-	__declspec(dllexport) MxResult Load(MxULong);
-	__declspec(dllexport) MxResult Save(MxULong);
-	__declspec(dllexport) void SerializePlayersInfo(MxS16);
-	__declspec(dllexport) void SerializeScoreHistory(MxS16 p_flags);
-	__declspec(dllexport) void SetSavePath(char*);
+	LegoGameState();
+	~LegoGameState();
+	MxResult Load(MxULong);
+	MxResult Save(MxULong);
+	void SerializePlayersInfo(MxS16);
+	void SerializeScoreHistory(MxS16 p_flags);
+	void SetSavePath(char*);
 
 	LegoState* GetState(const char* p_stateName);
 	LegoState* CreateState(const char* p_stateName);
diff --git a/LEGO1/lego/legoomni/include/legoinputmanager.h b/LEGO1/lego/legoomni/include/legoinputmanager.h
index 5198f71e..b2b677b7 100644
--- a/LEGO1/lego/legoomni/include/legoinputmanager.h
+++ b/LEGO1/lego/legoomni/include/legoinputmanager.h
@@ -32,9 +32,9 @@ class LegoInputManager : public MxPresenter {
 	LegoInputManager();
 	virtual ~LegoInputManager() override;
 
-	__declspec(dllexport) void QueueEvent(NotificationId p_id, MxU8 p_modifier, MxLong p_x, MxLong p_y, MxU8 p_key);
-	__declspec(dllexport) void Register(MxCore*);
-	__declspec(dllexport) void UnRegister(MxCore*);
+	void QueueEvent(NotificationId p_id, MxU8 p_modifier, MxLong p_x, MxLong p_y, MxU8 p_key);
+	void Register(MxCore*);
+	void UnRegister(MxCore*);
 
 	virtual MxResult Tickle() override; // vtable+0x8
 
diff --git a/LEGO1/lego/legoomni/include/legomodelpresenter.h b/LEGO1/lego/legoomni/include/legomodelpresenter.h
index 393ea818..8ba2ec8d 100644
--- a/LEGO1/lego/legoomni/include/legomodelpresenter.h
+++ b/LEGO1/lego/legoomni/include/legomodelpresenter.h
@@ -9,7 +9,7 @@ class AutoROI;
 // SIZE 0x6c (discovered through inline constructor at 0x10009ae6)
 class LegoModelPresenter : public MxVideoPresenter {
 public:
-	__declspec(dllexport) static void configureLegoModelPresenter(MxS32 p_modelPresenterConfig);
+	static void configureLegoModelPresenter(MxS32 p_modelPresenterConfig);
 
 	// FUNCTION: LEGO1 0x1000ccb0
 	inline const char* ClassName() const override // vtable+0xc
diff --git a/LEGO1/lego/legoomni/include/legonavcontroller.h b/LEGO1/lego/legoomni/include/legonavcontroller.h
index dd2a46ad..5219c61a 100644
--- a/LEGO1/lego/legoomni/include/legonavcontroller.h
+++ b/LEGO1/lego/legoomni/include/legonavcontroller.h
@@ -9,7 +9,7 @@
 // SIZE 0x70
 class LegoNavController : public MxCore {
 public:
-	__declspec(dllexport) static void GetDefaults(
+	static void GetDefaults(
 		int* p_mouseDeadzone,
 		float* p_movementMaxSpeed,
 		float* p_turnMaxSpeed,
@@ -22,7 +22,7 @@ class LegoNavController : public MxCore {
 		float* p_rotationSensitivity,
 		MxBool* p_turnUseVelocity
 	);
-	__declspec(dllexport) static void SetDefaults(
+	static void SetDefaults(
 		int p_mouseDeadzone,
 		float p_movementMaxSpeed,
 		float p_turnMaxSpeed,
diff --git a/LEGO1/lego/legoomni/include/legoomni.h b/LEGO1/lego/legoomni/include/legoomni.h
index d7d9a2d4..4265c7d2 100644
--- a/LEGO1/lego/legoomni/include/legoomni.h
+++ b/LEGO1/lego/legoomni/include/legoomni.h
@@ -68,11 +68,11 @@ class LegoOmni : public MxOmni {
 		c_clearScreen = 0x04
 	};
 
-	__declspec(dllexport) void CreateBackgroundAudio();
-	__declspec(dllexport) void RemoveWorld(const MxAtomId&, MxLong);
-	__declspec(dllexport) static int GetCurrPathInfo(LegoPathBoundary**, MxS32&);
-	__declspec(dllexport) static void CreateInstance();
-	__declspec(dllexport) static LegoOmni* GetInstance();
+	void CreateBackgroundAudio();
+	void RemoveWorld(const MxAtomId&, MxLong);
+	static int GetCurrPathInfo(LegoPathBoundary**, MxS32&);
+	static void CreateInstance();
+	static LegoOmni* GetInstance();
 
 	LegoOmni();
 	virtual ~LegoOmni(); // vtable+00
@@ -153,16 +153,16 @@ class LegoOmni : public MxOmni {
 	MxBool m_unk0x13c;                           // 0x13c
 };
 
-__declspec(dllexport) MxBackgroundAudioManager* BackgroundAudioManager();
-__declspec(dllexport) LegoGameState* GameState();
-__declspec(dllexport) const char* GetNoCD_SourceName();
-__declspec(dllexport) LegoInputManager* InputManager();
-__declspec(dllexport) LegoOmni* Lego();
-__declspec(dllexport) LegoEntity* PickEntity(MxLong, MxLong);
-__declspec(dllexport) LegoROI* PickROI(MxLong, MxLong);
-__declspec(dllexport) LegoSoundManager* SoundManager();
-__declspec(dllexport) MxTransitionManager* TransitionManager();
-__declspec(dllexport) LegoVideoManager* VideoManager();
+MxBackgroundAudioManager* BackgroundAudioManager();
+LegoGameState* GameState();
+const char* GetNoCD_SourceName();
+LegoInputManager* InputManager();
+LegoOmni* Lego();
+LegoEntity* PickEntity(MxLong, MxLong);
+LegoROI* PickROI(MxLong, MxLong);
+LegoSoundManager* SoundManager();
+MxTransitionManager* TransitionManager();
+LegoVideoManager* VideoManager();
 
 LegoAnimationManager* AnimationManager();
 LegoBuildingManager* BuildingManager();
diff --git a/LEGO1/lego/legoomni/include/legopartpresenter.h b/LEGO1/lego/legoomni/include/legopartpresenter.h
index 5a422684..69d34e47 100644
--- a/LEGO1/lego/legoomni/include/legopartpresenter.h
+++ b/LEGO1/lego/legoomni/include/legopartpresenter.h
@@ -24,7 +24,7 @@ class LegoPartPresenter : public MxMediaPresenter {
 	virtual MxResult AddToManager() override; // vtable+0x34
 	virtual void Destroy() override;          // vtable+0x38
 
-	__declspec(dllexport) static void configureLegoPartPresenter(MxS32, MxS32);
+	static void configureLegoPartPresenter(MxS32, MxS32);
 
 	// SYNTHETIC: LEGO1 0x1000d060
 	// LegoPartPresenter::`scalar deleting destructor'
diff --git a/LEGO1/lego/legoomni/include/legovideomanager.h b/LEGO1/lego/legoomni/include/legovideomanager.h
index 2fe7d7a4..72cb2148 100644
--- a/LEGO1/lego/legoomni/include/legovideomanager.h
+++ b/LEGO1/lego/legoomni/include/legovideomanager.h
@@ -19,11 +19,11 @@ class LegoVideoManager : public MxVideoManager {
 	LegoVideoManager();
 	virtual ~LegoVideoManager() override;
 
-	__declspec(dllexport) int EnableRMDevice();
-	__declspec(dllexport) int DisableRMDevice();
+	int EnableRMDevice();
+	int DisableRMDevice();
 	void EnableFullScreenMovie(MxBool p_enable);
-	__declspec(dllexport) void EnableFullScreenMovie(MxBool p_enable, MxBool p_scale);
-	__declspec(dllexport) void MoveCursor(MxS32 p_cursorX, MxS32 p_cursorY);
+	void EnableFullScreenMovie(MxBool p_enable, MxBool p_scale);
+	void MoveCursor(MxS32 p_cursorX, MxS32 p_cursorY);
 
 	virtual MxResult Tickle() override; // vtable+0x8
 	virtual void Destroy() override;    // vtable+0x18
diff --git a/LEGO1/lego/legoomni/include/legoworld.h b/LEGO1/lego/legoomni/include/legoworld.h
index 4fea4672..115aeef4 100644
--- a/LEGO1/lego/legoomni/include/legoworld.h
+++ b/LEGO1/lego/legoomni/include/legoworld.h
@@ -22,8 +22,8 @@ typedef set<MxPresenter*, PresenterSetCompare> MxPresenterSet;
 // SIZE 0xf8
 class LegoWorld : public LegoEntity {
 public:
-	__declspec(dllexport) LegoWorld();
-	__declspec(dllexport) virtual ~LegoWorld() override; // vtable+0x0
+	LegoWorld();
+	virtual ~LegoWorld() override; // vtable+0x0
 
 	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x4
 	virtual MxResult Tickle() override;               // vtable+0x8
diff --git a/LEGO1/lego/legoomni/include/legoworldpresenter.h b/LEGO1/lego/legoomni/include/legoworldpresenter.h
index f3dbba30..b1fcf90a 100644
--- a/LEGO1/lego/legoomni/include/legoworldpresenter.h
+++ b/LEGO1/lego/legoomni/include/legoworldpresenter.h
@@ -10,7 +10,7 @@ class LegoWorldPresenter : public LegoEntityPresenter {
 	LegoWorldPresenter();
 	virtual ~LegoWorldPresenter() override; // vtable+0x0
 
-	__declspec(dllexport) static void configureLegoWorldPresenter(MxS32 p_legoWorldPresenterQuality);
+	static void configureLegoWorldPresenter(MxS32 p_legoWorldPresenterQuality);
 
 	// FUNCTION: LEGO1 0x10066630
 	inline virtual const char* ClassName() const override // vtable+0x0c
diff --git a/LEGO1/lego/legoomni/include/mxbackgroundaudiomanager.h b/LEGO1/lego/legoomni/include/mxbackgroundaudiomanager.h
index e0e64ae9..bb75af8d 100644
--- a/LEGO1/lego/legoomni/include/mxbackgroundaudiomanager.h
+++ b/LEGO1/lego/legoomni/include/mxbackgroundaudiomanager.h
@@ -39,7 +39,7 @@ class MxBackgroundAudioManager : public MxCore {
 	void FUN_1007ef40();
 	void FadeInOrFadeOut();
 
-	__declspec(dllexport) void Enable(MxBool p_enable);
+	void Enable(MxBool p_enable);
 	virtual MxResult Create(MxAtomId& p_script, MxU32 p_frequencyMS);
 
 	void Stop();
diff --git a/LEGO1/lego/legoomni/include/mxtransitionmanager.h b/LEGO1/lego/legoomni/include/mxtransitionmanager.h
index fdfbf674..31c6f8f7 100644
--- a/LEGO1/lego/legoomni/include/mxtransitionmanager.h
+++ b/LEGO1/lego/legoomni/include/mxtransitionmanager.h
@@ -13,7 +13,7 @@ class MxTransitionManager : public MxCore {
 	MxTransitionManager();
 	virtual ~MxTransitionManager() override; // vtable+0x0
 
-	__declspec(dllexport) void SetWaitIndicator(MxVideoPresenter* p_waitIndicator);
+	void SetWaitIndicator(MxVideoPresenter* p_waitIndicator);
 
 	virtual MxResult Tickle(); // vtable+0x8
 
diff --git a/LEGO1/lego/legoomni/src/build/helicopter.cpp b/LEGO1/lego/legoomni/src/build/helicopter.cpp
index 9f5cc843..adfb1692 100644
--- a/LEGO1/lego/legoomni/src/build/helicopter.cpp
+++ b/LEGO1/lego/legoomni/src/build/helicopter.cpp
@@ -13,6 +13,9 @@
 #include "mxtransitionmanager.h"
 
 DECOMP_SIZE_ASSERT(Helicopter, 0x230)
+DECOMP_SIZE_ASSERT(Mx3DPointFloat, 0x14)
+DECOMP_SIZE_ASSERT(Mx4DPointFloat, 0x18)
+DECOMP_SIZE_ASSERT(MxMatrix, 0x48)
 
 // FUNCTION: LEGO1 0x10001e60
 Helicopter::Helicopter()
diff --git a/LEGO1/lego/legoomni/src/isle/skateboard.cpp b/LEGO1/lego/legoomni/src/isle/skateboard.cpp
index 2863ec40..037dff9a 100644
--- a/LEGO1/lego/legoomni/src/isle/skateboard.cpp
+++ b/LEGO1/lego/legoomni/src/isle/skateboard.cpp
@@ -1,4 +1,4 @@
-#include "SkateBoard.h"
+#include "skateboard.h"
 
 #include "decomp.h"
 #include "mxnotificationmanager.h"
diff --git a/LEGO1/lego/sources/roi/legoroi.cpp b/LEGO1/lego/sources/roi/legoroi.cpp
index 0f262a51..8dab4657 100644
--- a/LEGO1/lego/sources/roi/legoroi.cpp
+++ b/LEGO1/lego/sources/roi/legoroi.cpp
@@ -7,10 +7,10 @@ DECOMP_SIZE_ASSERT(LegoROI, 0x10c);
 // SIZE 0x14
 typedef struct {
 	const char* m_name;
-	MxS32 m_red;
-	MxS32 m_green;
-	MxS32 m_blue;
-	MxS32 m_unk0x10;
+	int m_red;
+	int m_green;
+	int m_blue;
+	int m_unk0x10;
 } ROIColorAlias;
 
 // GLOBAL: LEGO1 0x100dbe28
@@ -32,7 +32,7 @@ ROIColorAlias g_roiColorAliases[22] = {
 };
 
 // GLOBAL: LEGO1 0x10101368
-MxS32 g_roiConfig = 100;
+int g_roiConfig = 100;
 
 // GLOBAL: LEGO1 0x101013ac
 ROIHandler g_someHandlerFunction = NULL;
@@ -54,24 +54,24 @@ void LegoROI::FUN_100a58f0(Matrix4& p_transform)
 }
 
 // FUNCTION: LEGO1 0x100a81c0
-void LegoROI::configureLegoROI(MxS32 p_roiConfig)
+void LegoROI::configureLegoROI(int p_roiConfig)
 {
 	g_roiConfig = p_roiConfig;
 }
 
 // STUB: LEGO1 0x100a9a50
-LegoROI::LegoROI(Tgl::Renderer* p_renderer, ViewLODList* p_lodList, MxTime p_time) : ViewROI(p_renderer, p_lodList)
+LegoROI::LegoROI(Tgl::Renderer* p_renderer, ViewLODList* p_lodList, int p_time) : ViewROI(p_renderer, p_lodList)
 {
 	m_time = p_time;
 }
 
 // FUNCTION: LEGO1 0x100a9bf0
-MxBool LegoROI::CallTheHandlerFunction(
+unsigned char LegoROI::CallTheHandlerFunction(
 	char* p_param,
-	MxFloat& p_red,
-	MxFloat& p_green,
-	MxFloat& p_blue,
-	MxFloat& p_other
+	float& p_red,
+	float& p_green,
+	float& p_blue,
+	float& p_other
 )
 {
 	// TODO
@@ -88,11 +88,11 @@ MxBool LegoROI::CallTheHandlerFunction(
 }
 
 // FUNCTION: LEGO1 0x100a9c50
-MxBool LegoROI::ColorAliasLookup(char* p_param, MxFloat& p_red, MxFloat& p_green, MxFloat& p_blue, MxFloat& p_other)
+unsigned char LegoROI::ColorAliasLookup(char* p_param, float& p_red, float& p_green, float& p_blue, float& p_other)
 {
 	// TODO: this seems awfully hacky for these devs. is there a dynamic way
 	// to represent `the end of this array` that would improve this?
-	MxU32 i = 0;
+	unsigned int i = 0;
 	do {
 		if (strcmpi(g_roiColorAliases[i].m_name, p_param) == 0) {
 			p_red = g_roiColorAliases[i].m_red * g_normalizeByteToFloat;
@@ -102,7 +102,7 @@ MxBool LegoROI::ColorAliasLookup(char* p_param, MxFloat& p_red, MxFloat& p_green
 			return TRUE;
 		}
 		i++;
-	} while ((MxS32*) &g_roiColorAliases[i] < &g_roiConfig);
+	} while ((int*) &g_roiColorAliases[i] < &g_roiConfig);
 
 	return FALSE;
 }
@@ -114,7 +114,7 @@ void LegoROI::SetSomeHandlerFunction(ROIHandler p_func)
 }
 
 // FUNCTION: LEGO1 0x100a9e10
-void LegoROI::SetDisplayBB(MxS32 p_displayBB)
+void LegoROI::SetDisplayBB(int p_displayBB)
 {
 	// Intentionally empty function
 }
diff --git a/LEGO1/lego/sources/roi/legoroi.h b/LEGO1/lego/sources/roi/legoroi.h
index 4bf0ff18..2fb03c63 100644
--- a/LEGO1/lego/sources/roi/legoroi.h
+++ b/LEGO1/lego/sources/roi/legoroi.h
@@ -1,10 +1,9 @@
 #ifndef LEGOROI_H
 #define LEGOROI_H
 
-#include "mxtypes.h"
 #include "viewmanager/viewroi.h"
 
-typedef MxBool (*ROIHandler)(char*, char*, MxU32);
+typedef unsigned char (*ROIHandler)(char*, char*, unsigned int);
 
 class LegoEntity;
 
@@ -18,24 +17,24 @@ class AutoROI : public ViewROI {};
 // SIZE 0x10c
 class LegoROI : public ViewROI {
 public:
-	LegoROI(Tgl::Renderer* p_renderer, ViewLODList* p_lodList, MxTime p_time);
+	LegoROI(Tgl::Renderer* p_renderer, ViewLODList* p_lodList, int p_time);
 
 	virtual float IntrinsicImportance() const override; // vtable+0x4
 	// Note: Actually part of parent class (doesn't exist yet)
 	virtual void UpdateWorldBoundingVolumes() override; // vtable+0x18
 
-	__declspec(dllexport) void SetDisplayBB(MxS32 p_displayBB);
-	__declspec(dllexport) static void configureLegoROI(MxS32 p_roi);
+	void SetDisplayBB(int p_displayBB);
+	static void configureLegoROI(int p_roi);
 
 	static void SetSomeHandlerFunction(ROIHandler p_func);
-	static MxBool CallTheHandlerFunction(
+	static unsigned char CallTheHandlerFunction(
 		char* p_param,
-		MxFloat& p_red,
-		MxFloat& p_green,
-		MxFloat& p_blue,
-		MxFloat& p_other
+		float& p_red,
+		float& p_green,
+		float& p_blue,
+		float& p_other
 	);
-	static MxBool ColorAliasLookup(char* p_param, MxFloat& p_red, MxFloat& p_green, MxFloat& p_blue, MxFloat& p_other);
+	static unsigned char ColorAliasLookup(char* p_param, float& p_red, float& p_green, float& p_blue, float& p_other);
 
 	void WrappedSetLocalTransform(Matrix4& p_transform);
 	void FUN_100a46b0(Matrix4& p_transform);
@@ -50,7 +49,7 @@ class LegoROI : public ViewROI {
 private:
 	undefined m_pad[0x24];  // 0xe0
 	LegoEntity* m_unk0x104; // 0x104
-	MxTime m_time;          // 0x108
+	int m_time;             // 0x108
 };
 
 #endif // LEGOROI_H
diff --git a/LEGO1/main.cpp b/LEGO1/main.cpp
index f760aeae..260afb24 100644
--- a/LEGO1/main.cpp
+++ b/LEGO1/main.cpp
@@ -1,7 +1,7 @@
 #include <windows.h>
 
 // FUNCTION: LEGO1 0x10091ee0
-__declspec(dllexport) BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
+BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
 {
 	return TRUE;
 }
diff --git a/LEGO1/mxdirectx/mxdirectdraw.h b/LEGO1/mxdirectx/mxdirectdraw.h
index b8f5f551..e082c2d4 100644
--- a/LEGO1/mxdirectx/mxdirectdraw.h
+++ b/LEGO1/mxdirectx/mxdirectdraw.h
@@ -34,9 +34,9 @@ class MxDirectDraw {
 		void* m_unk0x178;  // 0x178
 	};
 
-	__declspec(dllexport) int FlipToGDISurface();
-	__declspec(dllexport) static int GetPrimaryBitDepth();
-	__declspec(dllexport) int Pause(int);
+	int FlipToGDISurface();
+	static int GetPrimaryBitDepth();
+	int Pause(int);
 
 	MxDirectDraw();
 	virtual ~MxDirectDraw();
diff --git a/LEGO1/mxgeometry/mxgeometry3d.cpp b/LEGO1/mxgeometry/mxgeometry3d.cpp
deleted file mode 100644
index 03ce60eb..00000000
--- a/LEGO1/mxgeometry/mxgeometry3d.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-#include "mxgeometry3d.h"
-
-#include "decomp.h"
-
-DECOMP_SIZE_ASSERT(Mx3DPointFloat, 0x14);
-DECOMP_SIZE_ASSERT(Mx4DPointFloat, 0x18);
diff --git a/LEGO1/mxgeometry/mxmatrix.cpp b/LEGO1/mxgeometry/mxmatrix.cpp
deleted file mode 100644
index fc768f38..00000000
--- a/LEGO1/mxgeometry/mxmatrix.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "mxmatrix.h"
-
-#include "decomp.h"
-
-DECOMP_SIZE_ASSERT(MxMatrix, 0x48);
diff --git a/LEGO1/omni/include/mxatomid.h b/LEGO1/omni/include/mxatomid.h
index 388ffce3..337f0b76 100644
--- a/LEGO1/omni/include/mxatomid.h
+++ b/LEGO1/omni/include/mxatomid.h
@@ -14,9 +14,9 @@ enum LookupMode {
 // SIZE 0x04
 class MxAtomId {
 public:
-	__declspec(dllexport) MxAtomId(const char*, LookupMode);
-	__declspec(dllexport) MxAtomId& operator=(const MxAtomId& p_atomId);
-	__declspec(dllexport) ~MxAtomId();
+	MxAtomId(const char*, LookupMode);
+	MxAtomId& operator=(const MxAtomId& p_atomId);
+	~MxAtomId();
 
 	MxAtomId() { this->m_internal = 0; }
 
diff --git a/LEGO1/omni/include/mxbitmap.h b/LEGO1/omni/include/mxbitmap.h
index f17ddb4b..fe3e6682 100644
--- a/LEGO1/omni/include/mxbitmap.h
+++ b/LEGO1/omni/include/mxbitmap.h
@@ -34,14 +34,14 @@ struct MxBITMAPINFO {
 // VTABLE: LEGO1 0x100dc7b0
 class MxBitmap : public MxCore {
 public:
-	__declspec(dllexport) MxBitmap();
-	__declspec(dllexport) virtual ~MxBitmap(); // vtable+00
+	MxBitmap();
+	virtual ~MxBitmap(); // vtable+00
 
 	virtual MxResult ImportBitmap(MxBitmap* p_bitmap);                                     // vtable+14
 	virtual MxResult ImportBitmapInfo(MxBITMAPINFO* p_info);                               // vtable+18
 	virtual MxResult SetSize(MxS32 p_width, MxS32 p_height, MxPalette* p_palette, MxBool); // vtable+1c
 	virtual MxResult LoadFile(HANDLE p_handle);                                            // vtable+20
-	__declspec(dllexport) virtual MxLong Read(const char* p_filename);                     // vtable+24
+	virtual MxLong Read(const char* p_filename);                                           // vtable+24
 
 	// FUNCTION: LEGO1 0x1004e0d0
 	virtual int VTable0x28(int) { return -1; }; // vtable+28
@@ -63,10 +63,10 @@ class MxBitmap : public MxCore {
 		MxS32 p_bottom,
 		MxS32 p_width,
 		MxS32 p_height
-	);                                                        // vtable+30
-	__declspec(dllexport) virtual MxPalette* CreatePalette(); // vtable+34
-	virtual void ImportPalette(MxPalette* p_palette);         // vtable+38
-	virtual MxResult SetBitDepth(MxBool);                     // vtable+3c
+	);                                                // vtable+30
+	virtual MxPalette* CreatePalette();               // vtable+34
+	virtual void ImportPalette(MxPalette* p_palette); // vtable+38
+	virtual MxResult SetBitDepth(MxBool);             // vtable+3c
 	virtual MxResult StretchBits(
 		HDC p_hdc,
 		MxS32 p_xSrc,
diff --git a/LEGO1/omni/include/mxcore.h b/LEGO1/omni/include/mxcore.h
index cae7020e..632391bc 100644
--- a/LEGO1/omni/include/mxcore.h
+++ b/LEGO1/omni/include/mxcore.h
@@ -12,9 +12,9 @@ class MxParam;
 // SIZE 0x8
 class MxCore {
 public:
-	__declspec(dllexport) MxCore();
-	__declspec(dllexport) virtual ~MxCore();                       // vtable+00
-	__declspec(dllexport) virtual MxLong Notify(MxParam& p_param); // vtable+04
+	MxCore();
+	virtual ~MxCore();                       // vtable+00
+	virtual MxLong Notify(MxParam& p_param); // vtable+04
 
 	// FUNCTION: LEGO1 0x10001f70
 	virtual MxResult Tickle() { return SUCCESS; }; // vtable+08
diff --git a/LEGO1/omni/include/mxcriticalsection.h b/LEGO1/omni/include/mxcriticalsection.h
index 8c5f77d6..011ac680 100644
--- a/LEGO1/omni/include/mxcriticalsection.h
+++ b/LEGO1/omni/include/mxcriticalsection.h
@@ -6,9 +6,9 @@
 // SIZE 0x1c
 class MxCriticalSection {
 public:
-	__declspec(dllexport) MxCriticalSection();
-	__declspec(dllexport) ~MxCriticalSection();
-	__declspec(dllexport) static void SetDoMutex();
+	MxCriticalSection();
+	~MxCriticalSection();
+	static void SetDoMutex();
 	void Enter();
 	void Leave();
 
diff --git a/LEGO1/omni/include/mxdsaction.h b/LEGO1/omni/include/mxdsaction.h
index 67449868..75b3cc2c 100644
--- a/LEGO1/omni/include/mxdsaction.h
+++ b/LEGO1/omni/include/mxdsaction.h
@@ -24,8 +24,8 @@ class MxDSAction : public MxDSObject {
 		c_bit11 = 0x400,
 	};
 
-	__declspec(dllexport) MxDSAction();
-	__declspec(dllexport) virtual ~MxDSAction();
+	MxDSAction();
+	virtual ~MxDSAction();
 
 	void CopyFrom(MxDSAction& p_dsAction);
 	MxDSAction& operator=(MxDSAction& p_dsAction);
diff --git a/LEGO1/omni/include/mxdsfile.h b/LEGO1/omni/include/mxdsfile.h
index 473b9741..c4de4820 100644
--- a/LEGO1/omni/include/mxdsfile.h
+++ b/LEGO1/omni/include/mxdsfile.h
@@ -11,8 +11,8 @@
 // VTABLE: LEGO1 0x100dc890
 class MxDSFile : public MxDSSource {
 public:
-	__declspec(dllexport) MxDSFile(const char* p_filename, MxULong p_skipReadingChunks);
-	__declspec(dllexport) virtual ~MxDSFile(); // vtable+0x0
+	MxDSFile(const char* p_filename, MxULong p_skipReadingChunks);
+	virtual ~MxDSFile(); // vtable+0x0
 
 	// FUNCTION: LEGO1 0x100c0120
 	inline virtual const char* ClassName() const override // vtable+0x0c
@@ -27,12 +27,12 @@ class MxDSFile : public MxDSSource {
 		return !strcmp(p_name, MxDSFile::ClassName()) || MxDSSource::IsA(p_name);
 	}
 
-	__declspec(dllexport) virtual MxLong Open(MxULong);                   // vtable+0x14
-	__declspec(dllexport) virtual MxLong Close();                         // vtable+0x18
-	__declspec(dllexport) virtual MxResult Read(unsigned char*, MxULong); // vtable+0x20
-	__declspec(dllexport) virtual MxLong Seek(MxLong, int);               // vtable+0x24
-	__declspec(dllexport) virtual MxULong GetBufferSize();                // vtable+0x28
-	__declspec(dllexport) virtual MxULong GetStreamBuffersNum();          // vtable+0x2c
+	virtual MxLong Open(MxULong);                   // vtable+0x14
+	virtual MxLong Close();                         // vtable+0x18
+	virtual MxResult Read(unsigned char*, MxULong); // vtable+0x20
+	virtual MxLong Seek(MxLong, int);               // vtable+0x24
+	virtual MxULong GetBufferSize();                // vtable+0x28
+	virtual MxULong GetStreamBuffersNum();          // vtable+0x2c
 
 	inline void SetFileName(const char* p_filename) { m_filename = p_filename; }
 
diff --git a/LEGO1/omni/include/mxdsobject.h b/LEGO1/omni/include/mxdsobject.h
index ad1cae40..45a3b360 100644
--- a/LEGO1/omni/include/mxdsobject.h
+++ b/LEGO1/omni/include/mxdsobject.h
@@ -32,7 +32,7 @@ class MxDSObject : public MxCore {
 	void CopyFrom(MxDSObject& p_dsObject);
 	MxDSObject& operator=(MxDSObject& p_dsObject);
 
-	__declspec(dllexport) void SetObjectName(const char* p_objectName);
+	void SetObjectName(const char* p_objectName);
 	void SetSourceName(const char* p_sourceName);
 
 	// FUNCTION: LEGO1 0x100bf730
diff --git a/LEGO1/omni/include/mxioinfo.h b/LEGO1/omni/include/mxioinfo.h
index 2a978b63..94901c4a 100644
--- a/LEGO1/omni/include/mxioinfo.h
+++ b/LEGO1/omni/include/mxioinfo.h
@@ -12,7 +12,7 @@
 class MXIOINFO {
 public:
 	MXIOINFO();
-	__declspec(dllexport) ~MXIOINFO();
+	~MXIOINFO();
 
 	MxU16 Open(const char*, MxULong);
 	MxU16 Close(MxLong);
diff --git a/LEGO1/omni/include/mxomni.h b/LEGO1/omni/include/mxomni.h
index 9ade97b3..d92f2b38 100644
--- a/LEGO1/omni/include/mxomni.h
+++ b/LEGO1/omni/include/mxomni.h
@@ -28,14 +28,14 @@ class MxStreamController;
 // SIZE 0x68
 class MxOmni : public MxCore {
 public:
-	__declspec(dllexport) static void DestroyInstance();
-	__declspec(dllexport) static const char* GetCD();
-	__declspec(dllexport) static const char* GetHD();
-	__declspec(dllexport) static MxOmni* GetInstance();
-	__declspec(dllexport) static MxBool IsSound3D();
-	__declspec(dllexport) static void SetCD(const char* p_cd);
-	__declspec(dllexport) static void SetHD(const char* p_hd);
-	__declspec(dllexport) static void SetSound3D(MxBool p_use3dSound);
+	static void DestroyInstance();
+	static const char* GetCD();
+	static const char* GetHD();
+	static MxOmni* GetInstance();
+	static MxBool IsSound3D();
+	static void SetCD(const char* p_cd);
+	static void SetHD(const char* p_hd);
+	static void SetSound3D(MxBool p_use3dSound);
 
 	MxOmni();
 	virtual ~MxOmni() override;
@@ -96,15 +96,15 @@ class MxOmni : public MxCore {
 	MxBool m_timerRunning;                        // 0x64
 };
 
-__declspec(dllexport) MxTickleManager* TickleManager();
-__declspec(dllexport) MxTimer* Timer();
-__declspec(dllexport) MxStreamer* Streamer();
-__declspec(dllexport) MxSoundManager* MSoundManager();
-__declspec(dllexport) MxVariableTable* VariableTable();
-__declspec(dllexport) MxMusicManager* MusicManager();
-__declspec(dllexport) MxEventManager* EventManager();
-__declspec(dllexport) MxResult Start(MxDSAction*);
-__declspec(dllexport) MxNotificationManager* NotificationManager();
+MxTickleManager* TickleManager();
+MxTimer* Timer();
+MxStreamer* Streamer();
+MxSoundManager* MSoundManager();
+MxVariableTable* VariableTable();
+MxMusicManager* MusicManager();
+MxEventManager* EventManager();
+MxResult Start(MxDSAction*);
+MxNotificationManager* NotificationManager();
 
 MxVideoManager* MVideoManager();
 MxAtomIdCounterSet* AtomIdCounterSet();
diff --git a/LEGO1/omni/include/mxomnicreateflags.h b/LEGO1/omni/include/mxomnicreateflags.h
index 24b1e942..1e9f334d 100644
--- a/LEGO1/omni/include/mxomnicreateflags.h
+++ b/LEGO1/omni/include/mxomnicreateflags.h
@@ -21,7 +21,7 @@ class MxOmniCreateFlags {
 		c_createStreamer = 0x04
 	};
 
-	__declspec(dllexport) MxOmniCreateFlags();
+	MxOmniCreateFlags();
 
 	inline const MxBool CreateObjectFactory() const { return this->m_flags1 & c_createObjectFactory; }
 	inline const MxBool CreateVariableTable() const { return this->m_flags1 & c_createVariableTable; }
diff --git a/LEGO1/omni/include/mxomnicreateparam.h b/LEGO1/omni/include/mxomnicreateparam.h
index 53539bc6..8d04ed18 100644
--- a/LEGO1/omni/include/mxomnicreateparam.h
+++ b/LEGO1/omni/include/mxomnicreateparam.h
@@ -11,7 +11,7 @@
 // VTABLE: LEGO1 0x100dc218
 class MxOmniCreateParam : public MxParam {
 public:
-	__declspec(dllexport) MxOmniCreateParam(
+	MxOmniCreateParam(
 		const char* p_mediaPath,
 		struct HWND__* p_windowHandle,
 		MxVideoParam& p_vparam,
diff --git a/LEGO1/omni/include/mxpalette.h b/LEGO1/omni/include/mxpalette.h
index 5ed5e80f..9352950f 100644
--- a/LEGO1/omni/include/mxpalette.h
+++ b/LEGO1/omni/include/mxpalette.h
@@ -10,8 +10,8 @@
 // SIZE 0x414
 class MxPalette : public MxCore {
 public:
-	__declspec(dllexport) MxBool operator==(MxPalette& p_other);
-	__declspec(dllexport) void Detach();
+	MxBool operator==(MxPalette& p_other);
+	void Detach();
 
 	MxPalette();
 	MxPalette(const RGBQUAD*);
diff --git a/LEGO1/omni/include/mxpresenter.h b/LEGO1/omni/include/mxpresenter.h
index a6b3eca8..35a28eda 100644
--- a/LEGO1/omni/include/mxpresenter.h
+++ b/LEGO1/omni/include/mxpresenter.h
@@ -28,14 +28,10 @@ class MxPresenter : public MxCore {
 
 	MxPresenter() { Init(); }
 
-#ifdef ISLE_APP
-	__declspec(dllexport) virtual ~MxPresenter() override; // vtable+0x00
-#else
 	// FUNCTION: LEGO1 0x1000bf00
-	__declspec(dllexport) virtual ~MxPresenter() override{}; // vtable+0x00
-#endif
+	virtual ~MxPresenter() override{}; // vtable+0x00
 
-	__declspec(dllexport) virtual MxResult Tickle() override; // vtable+0x08
+	virtual MxResult Tickle() override; // vtable+0x08
 
 	// FUNCTION: LEGO1 0x1000bfe0
 	inline virtual const char* ClassName() const override // vtable+0xc
@@ -73,14 +69,10 @@ class MxPresenter : public MxCore {
 	virtual void Unk5Tickle() { ProgressTickleState(e_done); }; // vtable+0x28
 
 protected:
-#ifdef ISLE_APP
-	__declspec(dllexport) virtual void DoneTickle(); // vtable+0x2c
-#else
 	// FUNCTION: LEGO1 0x1000bee0
-	__declspec(dllexport) virtual void DoneTickle() { ProgressTickleState(e_idle); }; // vtable+0x2c
-#endif
+	virtual void DoneTickle() { ProgressTickleState(e_idle); }; // vtable+0x2c
 
-	__declspec(dllexport) virtual void ParseExtra(); // vtable+0x30
+	virtual void ParseExtra(); // vtable+0x30
 
 	inline void ProgressTickleState(TickleState p_tickleState)
 	{
@@ -95,8 +87,8 @@ class MxPresenter : public MxCore {
 	// FUNCTION: LEGO1 0x1000bf80
 	virtual void Destroy() { Init(); }; // vtable+0x38
 
-	__declspec(dllexport) virtual MxResult StartAction(MxStreamController*, MxDSAction*); // vtable+0x3c
-	__declspec(dllexport) virtual void EndAction();                                       // vtable+0x40
+	virtual MxResult StartAction(MxStreamController*, MxDSAction*); // vtable+0x3c
+	virtual void EndAction();                                       // vtable+0x40
 
 	// FUNCTION: LEGO1 0x1000bf90
 	virtual void SetTickleState(TickleState p_tickleState) { ProgressTickleState(p_tickleState); } // vtable+0x44
@@ -113,7 +105,7 @@ class MxPresenter : public MxCore {
 	// FUNCTION: LEGO1 0x1000bfd0
 	virtual MxBool IsHit(MxS32 p_x, MxS32 p_y) { return FALSE; }; // vtable+0x50
 
-	__declspec(dllexport) virtual void Enable(MxBool p_enable); // vtable+0x54
+	virtual void Enable(MxBool p_enable); // vtable+0x54
 
 	MxEntity* CreateEntity(const char* p_name);
 	void SendToCompositePresenter(MxOmni*);
@@ -133,7 +125,7 @@ class MxPresenter : public MxCore {
 	// MxPresenter::`scalar deleting destructor'
 
 protected:
-	__declspec(dllexport) void Init();
+	void Init();
 
 	TickleState m_currentTickleState;           // 0x8
 	MxU32 m_previousTickleStates;               // 0x0c
diff --git a/LEGO1/omni/include/mxscheduler.h b/LEGO1/omni/include/mxscheduler.h
index 17b7ecb8..1f60029d 100644
--- a/LEGO1/omni/include/mxscheduler.h
+++ b/LEGO1/omni/include/mxscheduler.h
@@ -5,8 +5,8 @@
 
 class MxScheduler {
 public:
-	__declspec(dllexport) static MxScheduler* GetInstance();
-	__declspec(dllexport) void StartMultiTasking(MxULong);
+	static MxScheduler* GetInstance();
+	void StartMultiTasking(MxULong);
 };
 
 #endif // MXSCHEDULER_H
diff --git a/LEGO1/omni/include/mxstreamer.h b/LEGO1/omni/include/mxstreamer.h
index f22e343f..e0d07b19 100644
--- a/LEGO1/omni/include/mxstreamer.h
+++ b/LEGO1/omni/include/mxstreamer.h
@@ -78,8 +78,8 @@ class MxStreamer : public MxCore {
 	MxStreamer();
 	virtual ~MxStreamer() override; // vtable+0x0
 
-	__declspec(dllexport) MxStreamController* Open(const char* p_name, MxU16 p_openMode);
-	__declspec(dllexport) MxLong Close(const char* p_name);
+	MxStreamController* Open(const char* p_name, MxU16 p_openMode);
+	MxLong Close(const char* p_name);
 
 	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x4
 
diff --git a/LEGO1/omni/include/mxstring.h b/LEGO1/omni/include/mxstring.h
index 65c15d3e..1c745845 100644
--- a/LEGO1/omni/include/mxstring.h
+++ b/LEGO1/omni/include/mxstring.h
@@ -7,9 +7,9 @@
 // SIZE 0x10
 class MxString : public MxCore {
 public:
-	__declspec(dllexport) MxString(const MxString& p_str);
-	__declspec(dllexport) virtual ~MxString();
-	__declspec(dllexport) const MxString& operator=(const char* p_data);
+	MxString(const MxString& p_str);
+	virtual ~MxString();
+	const MxString& operator=(const char* p_data);
 
 	MxString();
 	MxString(const char*);
diff --git a/LEGO1/omni/include/mxtimer.h b/LEGO1/omni/include/mxtimer.h
index 63b597ac..f9851c44 100644
--- a/LEGO1/omni/include/mxtimer.h
+++ b/LEGO1/omni/include/mxtimer.h
@@ -12,7 +12,7 @@ class MxTimer : public MxCore {
 	void Start();
 	void Stop();
 
-	__declspec(dllexport) MxLong GetRealTime();
+	MxLong GetRealTime();
 
 	inline MxLong GetTime()
 	{
diff --git a/LEGO1/omni/include/mxutil.h b/LEGO1/omni/include/mxutil.h
index 5eb0a984..e043ebd4 100644
--- a/LEGO1/omni/include/mxutil.h
+++ b/LEGO1/omni/include/mxutil.h
@@ -69,10 +69,10 @@ MxBool GetRectIntersection(
 	MxS32* p_height
 );
 
-__declspec(dllexport) void MakeSourceName(char*, const char*);
-__declspec(dllexport) void SetOmniUserMessage(void (*)(const char*, int));
+void MakeSourceName(char*, const char*);
+void SetOmniUserMessage(void (*)(const char*, int));
 void FUN_100b7220(MxDSAction* p_action, MxU32 p_newFlags, MxBool p_setFlags);
-__declspec(dllexport) MxDSObject* CreateStreamObject(MxDSFile*, MxS16);
+MxDSObject* CreateStreamObject(MxDSFile*, MxS16);
 
 MxBool KeyValueStringParse(char*, const char*, const char*);
 
diff --git a/LEGO1/omni/include/mxvariabletable.h b/LEGO1/omni/include/mxvariabletable.h
index fd5cdea2..1eec195f 100644
--- a/LEGO1/omni/include/mxvariabletable.h
+++ b/LEGO1/omni/include/mxvariabletable.h
@@ -10,9 +10,9 @@
 class MxVariableTable : public MxHashTable<MxVariable*> {
 public:
 	MxVariableTable() { m_customDestructor = Destroy; }
-	__declspec(dllexport) void SetVariable(const char* p_key, const char* p_value);
-	__declspec(dllexport) void SetVariable(MxVariable* p_var);
-	__declspec(dllexport) const char* GetVariable(const char* p_key);
+	void SetVariable(const char* p_key, const char* p_value);
+	void SetVariable(MxVariable* p_var);
+	const char* GetVariable(const char* p_key);
 
 	static void Destroy(MxVariable* p_obj) { p_obj->Destroy(); }
 
diff --git a/LEGO1/omni/include/mxvideomanager.h b/LEGO1/omni/include/mxvideomanager.h
index 57919da3..c4e26aa2 100644
--- a/LEGO1/omni/include/mxvideomanager.h
+++ b/LEGO1/omni/include/mxvideomanager.h
@@ -30,8 +30,8 @@ class MxVideoManager : public MxMediaManager {
 	);                                                                                               // vtable+0x28
 	virtual MxResult Create(MxVideoParam& p_videoParam, MxU32 p_frequencyMS, MxBool p_createThread); // vtable+0x2c
 
-	__declspec(dllexport) void InvalidateRect(MxRect32&);
-	__declspec(dllexport) virtual MxResult RealizePalette(MxPalette*);            // vtable+0x30
+	void InvalidateRect(MxRect32&);
+	virtual MxResult RealizePalette(MxPalette*);                                  // vtable+0x30
 	virtual void UpdateView(MxU32 p_x, MxU32 p_y, MxU32 p_width, MxU32 p_height); // vtable+0x34
 
 	MxResult Init();
diff --git a/LEGO1/omni/include/mxvideoparam.h b/LEGO1/omni/include/mxvideoparam.h
index 33aecb32..b9ae10ba 100644
--- a/LEGO1/omni/include/mxvideoparam.h
+++ b/LEGO1/omni/include/mxvideoparam.h
@@ -13,17 +13,13 @@
 // SIZE 0x24
 class MxVideoParam {
 public:
-	__declspec(dllexport) MxVideoParam();
-	__declspec(dllexport) MxVideoParam(MxVideoParam& p_videoParam);
-	__declspec(dllexport) MxVideoParam(
-		COMPAT_CONST MxRect32& p_rect,
-		MxPalette* p_palette,
-		MxULong p_backBuffers,
-		COMPAT_CONST MxVideoParamFlags& p_flags
-	);
-	__declspec(dllexport) MxVideoParam& operator=(const MxVideoParam& p_videoParam);
-	__declspec(dllexport) ~MxVideoParam();
-	__declspec(dllexport) void SetDeviceName(char* p_deviceId);
+	MxVideoParam();
+	MxVideoParam(MxVideoParam& p_videoParam);
+	__declspec(dllexport)
+		MxVideoParam(MxRect32& p_rect, MxPalette* p_palette, MxULong p_backBuffers, MxVideoParamFlags& p_flags);
+	MxVideoParam& operator=(const MxVideoParam& p_videoParam);
+	~MxVideoParam();
+	void SetDeviceName(char* p_deviceId);
 
 	inline MxVideoParamFlags& Flags() { return m_flags; }
 
diff --git a/LEGO1/omni/include/mxvideoparamflags.h b/LEGO1/omni/include/mxvideoparamflags.h
index 551a6c0a..8b937d38 100644
--- a/LEGO1/omni/include/mxvideoparamflags.h
+++ b/LEGO1/omni/include/mxvideoparamflags.h
@@ -7,7 +7,7 @@
 
 class MxVideoParamFlags {
 public:
-	__declspec(dllexport) MxVideoParamFlags();
+	MxVideoParamFlags();
 
 	inline void SetFullScreen(BOOL p_e) { m_flags1.m_bit0 = p_e; }
 	inline void SetFlipSurfaces(BOOL p_e) { m_flags1.m_bit1 = p_e; }
diff --git a/LEGO1/omni/src/system/mxthread.cpp b/LEGO1/omni/src/system/mxthread.cpp
index 401860a1..158c0cf6 100644
--- a/LEGO1/omni/src/system/mxthread.cpp
+++ b/LEGO1/omni/src/system/mxthread.cpp
@@ -1,4 +1,3 @@
-
 #include "mxthread.h"
 
 #include "decomp.h"
diff --git a/LEGO1/omni/src/video/mxvideoparam.cpp b/LEGO1/omni/src/video/mxvideoparam.cpp
index c34e832c..cc833727 100644
--- a/LEGO1/omni/src/video/mxvideoparam.cpp
+++ b/LEGO1/omni/src/video/mxvideoparam.cpp
@@ -21,12 +21,7 @@ MxVideoParam::MxVideoParam()
 }
 
 // FUNCTION: LEGO1 0x100beca0
-MxVideoParam::MxVideoParam(
-	COMPAT_CONST MxRect32& p_rect,
-	MxPalette* p_palette,
-	MxULong p_backBuffers,
-	COMPAT_CONST MxVideoParamFlags& p_flags
-)
+MxVideoParam::MxVideoParam(MxRect32& p_rect, MxPalette* p_palette, MxULong p_backBuffers, MxVideoParamFlags& p_flags)
 {
 	this->m_rect = p_rect;
 	this->m_palette = p_palette;
diff --git a/LEGO1/realtime/realtimeview.h b/LEGO1/realtime/realtimeview.h
index 22183ced..f732c480 100644
--- a/LEGO1/realtime/realtimeview.h
+++ b/LEGO1/realtime/realtimeview.h
@@ -3,11 +3,11 @@
 
 class RealtimeView {
 public:
-	__declspec(dllexport) static float GetPartsThreshold();
-	__declspec(dllexport) static float GetUserMaxLOD();
-	__declspec(dllexport) static void SetPartsThreshold(float);
+	static float GetPartsThreshold();
+	static float GetUserMaxLOD();
+	static void SetPartsThreshold(float);
 	static void UpdateMaxLOD();
-	__declspec(dllexport) static void SetUserMaxLOD(float);
+	static void SetUserMaxLOD(float);
 };
 
 #endif // REALTIMEVIEW_H
diff --git a/LEGO1/viewmanager/viewmanager.h b/LEGO1/viewmanager/viewmanager.h
index 8185c572..d89b7cef 100644
--- a/LEGO1/viewmanager/viewmanager.h
+++ b/LEGO1/viewmanager/viewmanager.h
@@ -10,7 +10,7 @@ class ViewManager {
 	ViewManager(Tgl::Renderer* pRenderer, Tgl::Group* scene, const OrientableROI* point_of_view);
 	virtual ~ViewManager();
 
-	__declspec(dllexport) void RemoveAll(ViewROI*);
+	void RemoveAll(ViewROI*);
 
 	void SetPOVSource(const OrientableROI* point_of_view);
 	void SetResolution(int width, int height);
diff --git a/tools/README.md b/tools/README.md
index b24a8f50..6e6b046f 100644
--- a/tools/README.md
+++ b/tools/README.md
@@ -109,9 +109,9 @@ Classes should be annotated using the `SIZE` marker to indicate their size. If y
 // SIZE 0x1c
 class MxCriticalSection {
 public:
-	__declspec(dllexport) MxCriticalSection();
-	__declspec(dllexport) ~MxCriticalSection();
-	__declspec(dllexport) static void SetDoMutex();
+	MxCriticalSection();
+	~MxCriticalSection();
+	static void SetDoMutex();
 ```
 
 ## Member variables (**WIP**)
diff --git a/tools/ncc/skip.yml b/tools/ncc/skip.yml
index ec7f46a0..f6d2de8e 100644
--- a/tools/ncc/skip.yml
+++ b/tools/ncc/skip.yml
@@ -2,7 +2,7 @@ configureLegoAnimationManager(MxS32): 'DLL exported function'
 configureLegoBuildingManager(MxS32): 'DLL exported function'
 configureLegoModelPresenter(MxS32): 'DLL exported function'
 configureLegoPartPresenter(MxS32, MxS32): 'DLL exported function'
-configureLegoROI(MxS32): 'DLL exported function'
+configureLegoROI(int): 'DLL exported function'
 configureLegoWorldPresenter(MxS32): 'DLL exported function'
 GetNoCD_SourceName(): 'DLL exported function'
 m_3dView: 'Allow this variable name'
diff --git a/util/compat.h b/util/compat.h
index b38a1c7c..ea2a6507 100644
--- a/util/compat.h
+++ b/util/compat.h
@@ -7,14 +7,6 @@
 #define COMPAT_MODE
 #endif
 
-// Use `COMPAT_CONST` where something ought to be 'const', and a newer compiler would complain if it
-// wasn't, but we know it isn't 'const' in the original code.
-#if defined(__MINGW32__) || (defined(_MSC_VER) && _MSC_VER >= 1100)
-#define COMPAT_CONST const
-#else
-#define COMPAT_CONST
-#endif
-
 // Disable "identifier was truncated to '255' characters" warning.
 // Impossible to avoid this if using STL map or set.
 // This removes most (but not all) occurrences of the warning.

From a3868e3808dbe3e74636578ef6d207bf953f49cd Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Fri, 26 Jan 2024 12:03:29 -0500
Subject: [PATCH 173/210] Implement/match LegoWorld::FUN_10021790 (#486)

* Implement/match LegoWorld::FUN_10021790

* Improve match

* Match

* Specify python package versions

* Use wildcard version

* Use const atom

* Use const atom
---
 .github/workflows/format.yml                  |  2 +-
 LEGO1/lego/legoomni/include/legoentitylist.h  |  5 ++-
 LEGO1/lego/legoomni/include/legoworld.h       |  2 +-
 LEGO1/lego/legoomni/src/entity/legoworld.cpp  | 43 ++++++++++++++++++-
 .../legoomni/src/infocenter/infocenter.cpp    | 30 ++++++-------
 5 files changed, 62 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml
index 6e4e724e..10e85e0d 100644
--- a/.github/workflows/format.yml
+++ b/.github/workflows/format.yml
@@ -29,7 +29,7 @@ jobs:
     - name: Install python libraries
       shell: bash
       run: |
-        pip install black pylint pytest -r tools/requirements.txt
+        pip install black==23.* pylint==3.* pytest==7.* -r tools/requirements.txt
 
     - name: Run pylint and black
       shell: bash
diff --git a/LEGO1/lego/legoomni/include/legoentitylist.h b/LEGO1/lego/legoomni/include/legoentitylist.h
index 1d29e65d..04935769 100644
--- a/LEGO1/lego/legoomni/include/legoentitylist.h
+++ b/LEGO1/lego/legoomni/include/legoentitylist.h
@@ -86,7 +86,10 @@ class LegoEntityListCursor : public MxPtrListCursor<LegoEntity> {
 // FUNCTION: LEGO1 0x1001f2b0
 // MxListCursor<LegoEntity *>::~MxListCursor<LegoEntity *>
 
-// FUNCTION: LEGO1 0x1001edc6
+// FUNCTION: LEGO1 0x1001f300
 // LegoEntityListCursor::~LegoEntityListCursor
 
+// TEMPLATE: LEGO1 0x100207d0
+// MxListCursor<LegoEntity *>::MxListCursor<LegoEntity *>
+
 #endif // LEGOENTITYLIST_H
diff --git a/LEGO1/lego/legoomni/include/legoworld.h b/LEGO1/lego/legoomni/include/legoworld.h
index 115aeef4..72fc69b6 100644
--- a/LEGO1/lego/legoomni/include/legoworld.h
+++ b/LEGO1/lego/legoomni/include/legoworld.h
@@ -66,7 +66,7 @@ class LegoWorld : public LegoEntity {
 	void FUN_10073430();
 	MxS32 GetCurrPathInfo(LegoPathBoundary** p_path, MxS32& p_value);
 	MxPresenter* FindPresenter(const char* p_presenter, const char* p_name);
-	MxPresenter* FUN_10021790(MxAtomId& p_atom, MxS32 p_entityId);
+	MxCore* FUN_10021790(const MxAtomId& p_atom, MxS32 p_entityId);
 
 	// SYNTHETIC: LEGO1 0x1001dee0
 	// LegoWorld::`scalar deleting destructor'
diff --git a/LEGO1/lego/legoomni/src/entity/legoworld.cpp b/LEGO1/lego/legoomni/src/entity/legoworld.cpp
index 60cb941d..6cc2363a 100644
--- a/LEGO1/lego/legoomni/src/entity/legoworld.cpp
+++ b/LEGO1/lego/legoomni/src/entity/legoworld.cpp
@@ -168,9 +168,48 @@ MxPresenter* LegoWorld::FindPresenter(const char* p_presenter, const char* p_nam
 	return NULL;
 }
 
-// STUB: LEGO1 0x10021790
-MxPresenter* LegoWorld::FUN_10021790(MxAtomId& p_atom, MxS32 p_entityId)
+// FUNCTION: LEGO1 0x10021790
+MxCore* LegoWorld::FUN_10021790(const MxAtomId& p_atom, MxS32 p_entityId)
 {
+	LegoEntityListCursor entityCursor(m_entityList);
+	LegoEntity* entity;
+
+	while (entityCursor.Next(entity)) {
+		if (entity->GetAtom() == p_atom && entity->GetEntityId() == p_entityId)
+			return entity;
+	}
+
+	MxPresenterListCursor presenterCursor0xb8(&m_list0xb8);
+	MxPresenter* presenter;
+
+	while (presenterCursor0xb8.Next(presenter)) {
+		MxDSAction* action = presenter->GetAction();
+
+		if (action->GetAtomId() == p_atom && action->GetObjectId() == p_entityId)
+			return presenter;
+	}
+
+	MxPresenterListCursor presenterCursor0x80(&m_list0x80);
+
+	while (presenterCursor0x80.Next(presenter)) {
+		MxDSAction* action = presenter->GetAction();
+
+		if (action && action->GetAtomId() == p_atom && action->GetObjectId() == p_entityId)
+			return presenter;
+	}
+
+	for (MxPresenterSet::iterator it = m_set0xa8.begin(); it != m_set0xa8.end(); it++) {
+		MxCore* core = *it;
+
+		if (core->IsA("MxPresenter")) {
+			MxPresenter* presenter = (MxPresenter*) *it;
+			MxDSAction* action = presenter->GetAction();
+
+			if (action->GetAtomId() == p_atom && action->GetObjectId() == p_entityId)
+				return *it;
+		}
+	}
+
 	return NULL;
 }
 
diff --git a/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp b/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp
index 5d3722c1..6b14b8af 100644
--- a/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp
+++ b/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp
@@ -365,22 +365,22 @@ void Infocenter::InitializeBitmaps()
 {
 	m_radio.Initialize(TRUE);
 
-	FUN_10021790(m_atom, c_leftArrowCtl)->Enable(TRUE);
-	FUN_10021790(m_atom, c_rightArrowCtl)->Enable(TRUE);
-	FUN_10021790(m_atom, c_infoCtl)->Enable(TRUE);
-	FUN_10021790(m_atom, c_boatCtl)->Enable(TRUE);
-	FUN_10021790(m_atom, c_raceCtl)->Enable(TRUE);
-	FUN_10021790(m_atom, c_pizzaCtl)->Enable(TRUE);
-	FUN_10021790(m_atom, c_gasCtl)->Enable(TRUE);
-	FUN_10021790(m_atom, c_medCtl)->Enable(TRUE);
-	FUN_10021790(m_atom, c_copCtl)->Enable(TRUE);
+	((MxPresenter*) FUN_10021790(m_atom, c_leftArrowCtl))->Enable(TRUE);
+	((MxPresenter*) FUN_10021790(m_atom, c_rightArrowCtl))->Enable(TRUE);
+	((MxPresenter*) FUN_10021790(m_atom, c_infoCtl))->Enable(TRUE);
+	((MxPresenter*) FUN_10021790(m_atom, c_boatCtl))->Enable(TRUE);
+	((MxPresenter*) FUN_10021790(m_atom, c_raceCtl))->Enable(TRUE);
+	((MxPresenter*) FUN_10021790(m_atom, c_pizzaCtl))->Enable(TRUE);
+	((MxPresenter*) FUN_10021790(m_atom, c_gasCtl))->Enable(TRUE);
+	((MxPresenter*) FUN_10021790(m_atom, c_medCtl))->Enable(TRUE);
+	((MxPresenter*) FUN_10021790(m_atom, c_copCtl))->Enable(TRUE);
 
-	FUN_10021790(m_atom, c_mamaCtl)->Enable(TRUE);
-	FUN_10021790(m_atom, c_papaCtl)->Enable(TRUE);
-	FUN_10021790(m_atom, c_pepperCtl)->Enable(TRUE);
-	FUN_10021790(m_atom, c_nickCtl)->Enable(TRUE);
-	FUN_10021790(m_atom, c_lauraCtl)->Enable(TRUE);
-	FUN_10021790(m_atom, c_radioCtl)->Enable(TRUE);
+	((MxPresenter*) FUN_10021790(m_atom, c_mamaCtl))->Enable(TRUE);
+	((MxPresenter*) FUN_10021790(m_atom, c_papaCtl))->Enable(TRUE);
+	((MxPresenter*) FUN_10021790(m_atom, c_pepperCtl))->Enable(TRUE);
+	((MxPresenter*) FUN_10021790(m_atom, c_nickCtl))->Enable(TRUE);
+	((MxPresenter*) FUN_10021790(m_atom, c_lauraCtl))->Enable(TRUE);
+	((MxPresenter*) FUN_10021790(m_atom, c_radioCtl))->Enable(TRUE);
 
 	m_mapAreas[0].m_presenter = (MxStillPresenter*) FindPresenter("MxStillPresenter", "Info_A_Bitmap");
 	m_mapAreas[0].m_unk0x08 = 391;

From 88fd1e658d3d680e57468e482d66bf8c221cbfad Mon Sep 17 00:00:00 2001
From: Joshua Peisach <itzswirlz2020@outlook.com>
Date: Fri, 26 Jan 2024 12:09:59 -0500
Subject: [PATCH 174/210] HelicopterState vtable (#487)

* HelicopterState vtable

* Move functions

---------

Co-authored-by: Christian Semmler <mail@csemmler.com>
---
 LEGO1/lego/legoomni/include/helicopterstate.h     | 11 +++++++++--
 LEGO1/lego/legoomni/src/build/helicopterstate.cpp | 14 --------------
 2 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/LEGO1/lego/legoomni/include/helicopterstate.h b/LEGO1/lego/legoomni/include/helicopterstate.h
index eb104c93..52a92192 100644
--- a/LEGO1/lego/legoomni/include/helicopterstate.h
+++ b/LEGO1/lego/legoomni/include/helicopterstate.h
@@ -21,8 +21,15 @@ class HelicopterState : public LegoState {
 		return !strcmp(p_name, HelicopterState::ClassName()) || LegoState::IsA(p_name);
 	}
 
-	virtual MxBool VTable0x14() override; // vtable+0x14
-	virtual MxBool SetFlag() override;    // vtable+0x18
+	// FUNCTION: LEGO1 0x1000e0b0
+	virtual MxBool VTable0x14() override { return FALSE; }; // vtable+0x14
+
+	// FUNCTION: LEGO1 0x1000e0c0
+	virtual MxBool SetFlag() override
+	{
+		m_unk0x8 = 0;
+		return TRUE;
+	}; // vtable+0x18
 
 	inline void SetUnknown8(MxU32 p_unk0x8) { m_unk0x8 = p_unk0x8; }
 	inline MxU32 GetUnkown8() { return m_unk0x8; }
diff --git a/LEGO1/lego/legoomni/src/build/helicopterstate.cpp b/LEGO1/lego/legoomni/src/build/helicopterstate.cpp
index 368edfad..70d71a0c 100644
--- a/LEGO1/lego/legoomni/src/build/helicopterstate.cpp
+++ b/LEGO1/lego/legoomni/src/build/helicopterstate.cpp
@@ -1,15 +1 @@
 #include "helicopterstate.h"
-
-// STUB: LEGO1 0x1000e0b0
-MxBool HelicopterState::VTable0x14()
-{
-	// TODO
-	return FALSE;
-}
-
-// STUB: LEGO1 0x1000e0c0
-MxBool HelicopterState::SetFlag()
-{
-	// TODO
-	return FALSE;
-}

From 0a672d21468086cc72f0057195bfce263280f6a8 Mon Sep 17 00:00:00 2001
From: Joshua Peisach <itzswirlz2020@outlook.com>
Date: Fri, 26 Jan 2024 12:13:09 -0500
Subject: [PATCH 175/210] RaceCar destructor (#488)

* RaceCar destructor

* Fixes

---------

Co-authored-by: Christian Semmler <mail@csemmler.com>
---
 LEGO1/lego/legoomni/src/build/racecar.cpp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/LEGO1/lego/legoomni/src/build/racecar.cpp b/LEGO1/lego/legoomni/src/build/racecar.cpp
index 02f3a09d..a057b8a4 100644
--- a/LEGO1/lego/legoomni/src/build/racecar.cpp
+++ b/LEGO1/lego/legoomni/src/build/racecar.cpp
@@ -1,17 +1,21 @@
 #include "racecar.h"
 
+#include "legocontrolmanager.h"
+#include "legoomni.h"
+
 DECOMP_SIZE_ASSERT(RaceCar, 0x164);
 
 // FUNCTION: LEGO1 0x10028200
 RaceCar::RaceCar()
 {
-	this->m_unk0x13c = 40.0;
+	m_unk0x13c = 40.0;
 }
 
-// STUB: LEGO1 0x10028420
+// FUNCTION: LEGO1 0x10028420
 RaceCar::~RaceCar()
 {
-	// TODO
+	ControlManager()->Unregister(this);
+	VTable0xe4();
 }
 
 // STUB: LEGO1 0x10028490

From b6aac26269f91d53ccf79ff5ce9ff9cd0e205ddf Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Fri, 26 Jan 2024 16:00:02 -0500
Subject: [PATCH 176/210] Implement LegoWorld::Find (#489)

* Implement LegoWorld::FUN_100213a0

* Rename lists

* Rename cursors

* Rename cursor

* Rename functions

* Remove a comment

* Rename more functions

* Fix return type
---
 LEGO1/lego/legoomni/include/isle.h            |  3 +-
 .../lego/legoomni/include/legoanimpresenter.h |  2 +-
 LEGO1/lego/legoomni/include/legoomni.h        | 26 +++----
 LEGO1/lego/legoomni/include/legoworld.h       | 12 +--
 LEGO1/lego/legoomni/src/build/helicopter.cpp  |  2 +-
 .../legoomni/src/common/legogamestate.cpp     |  6 +-
 LEGO1/lego/legoomni/src/common/legoutil.cpp   |  3 +-
 LEGO1/lego/legoomni/src/entity/legoentity.cpp |  2 +-
 LEGO1/lego/legoomni/src/entity/legoworld.cpp  | 76 ++++++++++++++++---
 .../src/entity/legoworldpresenter.cpp         |  2 +-
 .../legoomni/src/infocenter/infocenter.cpp    | 50 ++++++------
 LEGO1/lego/legoomni/src/isle/isle.cpp         |  6 +-
 LEGO1/lego/legoomni/src/main/legoomni.cpp     | 31 ++++----
 .../legoomni/src/video/legoanimpresenter.cpp  |  6 ++
 .../src/video/legolocomotionanimpresenter.cpp |  2 +-
 LEGO1/lego/sources/roi/legoroi.h              |  9 ++-
 LEGO1/omni/include/mxdsobject.h               |  1 +
 LEGO1/omni/include/mxomni.h                   |  2 +-
 LEGO1/omni/src/common/mxpresenter.cpp         |  2 +-
 LEGO1/omni/src/main/mxomni.cpp                |  2 +-
 20 files changed, 154 insertions(+), 91 deletions(-)

diff --git a/LEGO1/lego/legoomni/include/isle.h b/LEGO1/lego/legoomni/include/isle.h
index 681e0337..e91982ee 100644
--- a/LEGO1/lego/legoomni/include/isle.h
+++ b/LEGO1/lego/legoomni/include/isle.h
@@ -20,7 +20,6 @@ class Act1State;
 
 // VTABLE: LEGO1 0x100d6fb8
 // SIZE 0x140
-// Radio at 0x12c
 class Isle : public LegoWorld {
 public:
 	Isle();
@@ -42,7 +41,7 @@ class Isle : public LegoWorld {
 
 	virtual MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
 	virtual void VTable0x50() override;                       // vtable+50
-	virtual void VTable0x58(MxCore* p_object) override;       // vtable+58
+	virtual void Add(MxCore* p_object) override;              // vtable+58
 	// FUNCTION: LEGO1 0x10030900
 	virtual MxBool VTable0x5c() override { return TRUE; } // vtable+5c
 	// FUNCTION: LEGO1 0x10033170
diff --git a/LEGO1/lego/legoomni/include/legoanimpresenter.h b/LEGO1/lego/legoomni/include/legoanimpresenter.h
index 94832a61..394147e5 100644
--- a/LEGO1/lego/legoomni/include/legoanimpresenter.h
+++ b/LEGO1/lego/legoomni/include/legoanimpresenter.h
@@ -40,7 +40,7 @@ class LegoAnimPresenter : public MxVideoPresenter {
 	virtual void PutFrame() override;                                                              // vtable+0x6c
 	virtual MxResult VTable0x88(MxStreamChunk* p_chunk);                                           // vtable+0x88
 
-	// 6 more virtual functions here
+	const char* GetActionObjectName();
 
 protected:
 	void Init();
diff --git a/LEGO1/lego/legoomni/include/legoomni.h b/LEGO1/lego/legoomni/include/legoomni.h
index 4265c7d2..2f2622c7 100644
--- a/LEGO1/lego/legoomni/include/legoomni.h
+++ b/LEGO1/lego/legoomni/include/legoomni.h
@@ -92,18 +92,18 @@ class LegoOmni : public MxOmni {
 		return !strcmp(p_name, LegoOmni::ClassName()) || MxOmni::IsA(p_name);
 	}
 
-	virtual void Init() override;                                                                       // vtable+14
-	virtual MxResult Create(MxOmniCreateParam& p_param) override;                                       // vtable+18
-	virtual void Destroy() override;                                                                    // vtable+1c
-	virtual MxResult Start(MxDSAction* p_dsAction) override;                                            // vtable+20
-	virtual void DeleteObject(MxDSAction& p_dsAction) override;                                         // vtable+24
-	virtual MxBool DoesEntityExist(MxDSAction& p_dsAction) override;                                    // vtable+28
-	virtual MxEntity* FindWorld(const char* p_id, MxS32 p_entityId, MxPresenter* p_presenter) override; // vtable+30
-	virtual void NotifyCurrentEntity(MxNotificationParam* p_param) override;                            // vtable+34
-	virtual void StartTimer() override;                                                                 // vtable+38
-	virtual void StopTimer() override;                                                                  // vtable+3c
+	virtual void Init() override;                                                                        // vtable+14
+	virtual MxResult Create(MxOmniCreateParam& p_param) override;                                        // vtable+18
+	virtual void Destroy() override;                                                                     // vtable+1c
+	virtual MxResult Start(MxDSAction* p_dsAction) override;                                             // vtable+20
+	virtual void DeleteObject(MxDSAction& p_dsAction) override;                                          // vtable+24
+	virtual MxBool DoesEntityExist(MxDSAction& p_dsAction) override;                                     // vtable+28
+	virtual MxEntity* AddToWorld(const char* p_id, MxS32 p_entityId, MxPresenter* p_presenter) override; // vtable+30
+	virtual void NotifyCurrentEntity(MxNotificationParam* p_param) override;                             // vtable+34
+	virtual void StartTimer() override;                                                                  // vtable+38
+	virtual void StopTimer() override;                                                                   // vtable+3c
 
-	LegoEntity* FindByEntityIdOrAtomId(const MxAtomId& p_atom, MxS32 p_entityid);
+	LegoWorld* FindWorld(const MxAtomId& p_atom, MxS32 p_entityid);
 	void AddWorld(LegoWorld* p_world);
 	void FUN_1005b4f0(MxBool p_disable, MxU16 p_flags);
 
@@ -111,7 +111,7 @@ class LegoOmni : public MxOmni {
 	LegoSoundManager* GetSoundManager() { return (LegoSoundManager*) m_soundManager; }
 	LegoInputManager* GetInputManager() { return m_inputMgr; }
 	GifManager* GetGifManager() { return m_gifManager; }
-	LegoWorld* GetCurrentOmniWorld() { return m_currentWorld; }
+	LegoWorld* GetCurrentWorld() { return m_currentWorld; }
 	LegoNavController* GetNavController() { return m_navController; }
 	IslePathActor* GetCurrentVehicle() { return m_currentVehicle; }
 	LegoPlantManager* GetLegoPlantManager() { return m_plantManager; }
@@ -174,7 +174,7 @@ LegoUnkSaveDataWriter* GetUnkSaveDataWriter();
 GifManager* GetGifManager();
 void FUN_10015820(MxBool p_disable, MxU16 p_flags);
 void FUN_10015860(const char*, MxU8);
-LegoEntity* FindEntityByAtomIdOrEntityId(const MxAtomId& p_atom, MxS32 p_entityid);
+LegoWorld* FindWorld(const MxAtomId& p_atom, MxS32 p_entityid);
 MxDSAction& GetCurrentAction();
 
 void PlayMusic(MxU32 p_index);
diff --git a/LEGO1/lego/legoomni/include/legoworld.h b/LEGO1/lego/legoomni/include/legoworld.h
index 72fc69b6..4bc7ab70 100644
--- a/LEGO1/lego/legoomni/include/legoworld.h
+++ b/LEGO1/lego/legoomni/include/legoworld.h
@@ -45,7 +45,7 @@ class LegoWorld : public LegoEntity {
 	virtual void Destroy(MxBool p_fromDestructor) override;   // vtable+0x1c
 	virtual void VTable0x50();                                // vtable+0x50
 	virtual LegoCameraController* VTable0x54();               // vtable+0x54
-	virtual void VTable0x58(MxCore* p_object);                // vtable+0x58
+	virtual void Add(MxCore* p_object);                       // vtable+0x58
 	virtual MxBool VTable0x5c();                              // vtable+0x5c
 
 	// FUNCTION: LEGO1 0x100010a0
@@ -58,28 +58,28 @@ class LegoWorld : public LegoEntity {
 	inline undefined4 GetUnknown0xec() { return m_unk0xec; }
 
 	undefined FUN_100220e0();
-	void EndAction(MxCore* p_object);
+	void Remove(MxCore* p_object);
 	void FUN_1001fc80(IslePathActor* p_actor);
 	MxBool FUN_100727e0(MxU32, Mx3DPointFloat& p_loc, Mx3DPointFloat& p_dir, Mx3DPointFloat& p_up);
 	MxBool FUN_10072980(MxU32, Mx3DPointFloat& p_loc, Mx3DPointFloat& p_dir, Mx3DPointFloat& p_up);
 	void FUN_10073400();
 	void FUN_10073430();
 	MxS32 GetCurrPathInfo(LegoPathBoundary** p_path, MxS32& p_value);
-	MxPresenter* FindPresenter(const char* p_presenter, const char* p_name);
-	MxCore* FUN_10021790(const MxAtomId& p_atom, MxS32 p_entityId);
+	MxCore* Find(const char* p_class, const char* p_name);
+	MxCore* Find(const MxAtomId& p_atom, MxS32 p_entityId);
 
 	// SYNTHETIC: LEGO1 0x1001dee0
 	// LegoWorld::`scalar deleting destructor'
 
 protected:
 	LegoPathControllerList m_list0x68;        // 0x68
-	MxPresenterList m_list0x80;               // 0x80
+	MxPresenterList m_animPresenters;         // 0x80
 	LegoCameraController* m_cameraController; // 0x98
 	LegoEntityList* m_entityList;             // 0x9c
 	MxCoreList* m_coreList;                   // 0xa0
 	undefined m_unk0xa4;                      // 0xa4
 	MxPresenterSet m_set0xa8;                 // 0xa8
-	MxPresenterList m_list0xb8;               // 0xb8
+	MxPresenterList m_controlPresenters;      // 0xb8
 	MxPresenterSet m_set0xd0;                 // 0xd0
 	list<AutoROI*> m_list0xe0;                // 0xe0
 	undefined4 m_unk0xec;                     // 0xec
diff --git a/LEGO1/lego/legoomni/src/build/helicopter.cpp b/LEGO1/lego/legoomni/src/build/helicopter.cpp
index adfb1692..3bf55354 100644
--- a/LEGO1/lego/legoomni/src/build/helicopter.cpp
+++ b/LEGO1/lego/legoomni/src/build/helicopter.cpp
@@ -41,7 +41,7 @@ MxResult Helicopter::Create(MxDSAction& p_dsAction)
 	}
 	world = GetWorld();
 	if (world)
-		world->VTable0x58(this);
+		world->Add(this);
 	GetState();
 	return result;
 }
diff --git a/LEGO1/lego/legoomni/src/common/legogamestate.cpp b/LEGO1/lego/legoomni/src/common/legogamestate.cpp
index 93a9544b..87466e2b 100644
--- a/LEGO1/lego/legoomni/src/common/legogamestate.cpp
+++ b/LEGO1/lego/legoomni/src/common/legogamestate.cpp
@@ -398,13 +398,13 @@ void LegoGameState::SetSomeEnumState(undefined4 p_state)
 // FUNCTION: LEGO1 0x1003ceb0
 void LegoGameState::FUN_1003ceb0()
 {
-	if (FindEntityByAtomIdOrEntityId(*g_isleScript, 0)) {
+	if (FindWorld(*g_isleScript, 0)) {
 		m_currentAct = 0;
 	}
-	else if (FindEntityByAtomIdOrEntityId(*g_act2mainScript, 0)) {
+	else if (FindWorld(*g_act2mainScript, 0)) {
 		m_currentAct = 1;
 	}
-	else if (FindEntityByAtomIdOrEntityId(*g_act3Script, 0)) {
+	else if (FindWorld(*g_act3Script, 0)) {
 		m_currentAct = 2;
 	}
 	else {
diff --git a/LEGO1/lego/legoomni/src/common/legoutil.cpp b/LEGO1/lego/legoomni/src/common/legoutil.cpp
index fb207f50..843f4abb 100644
--- a/LEGO1/lego/legoomni/src/common/legoutil.cpp
+++ b/LEGO1/lego/legoomni/src/common/legoutil.cpp
@@ -99,7 +99,8 @@ void InvokeAction(Extra::ActionType p_actionId, MxAtomId& p_pAtom, int p_targetE
 // FUNCTION: LEGO1 0x1003e670
 MxBool CheckIfEntityExists(MxBool p_enable, const char* p_filename, MxS32 p_entityId)
 {
-	LegoWorld* world = (LegoWorld*) FindEntityByAtomIdOrEntityId(MxAtomId(p_filename, e_lowerCase2), p_entityId);
+	LegoWorld* world = FindWorld(MxAtomId(p_filename, e_lowerCase2), p_entityId);
+
 	if (world) {
 		world->VTable0x68(p_enable);
 		return TRUE;
diff --git a/LEGO1/lego/legoomni/src/entity/legoentity.cpp b/LEGO1/lego/legoomni/src/entity/legoentity.cpp
index 2c482715..8ad66afb 100644
--- a/LEGO1/lego/legoomni/src/entity/legoentity.cpp
+++ b/LEGO1/lego/legoomni/src/entity/legoentity.cpp
@@ -71,7 +71,7 @@ void LegoEntity::SetWorld()
 {
 	LegoWorld* world = GetCurrentWorld();
 	if (world != NULL && world != (LegoWorld*) this) {
-		world->VTable0x58(this);
+		world->Add(this);
 	}
 }
 
diff --git a/LEGO1/lego/legoomni/src/entity/legoworld.cpp b/LEGO1/lego/legoomni/src/entity/legoworld.cpp
index 6cc2363a..c9381197 100644
--- a/LEGO1/lego/legoomni/src/entity/legoworld.cpp
+++ b/LEGO1/lego/legoomni/src/entity/legoworld.cpp
@@ -1,5 +1,6 @@
 #include "legoworld.h"
 
+#include "legoanimpresenter.h"
 #include "legocontrolmanager.h"
 #include "legoinputmanager.h"
 #include "legoomni.h"
@@ -73,7 +74,7 @@ MxResult LegoWorld::Create(MxDSAction& p_dsAction)
 		}
 
 		SetCurrentWorld(this);
-		ControlManager()->FUN_10028df0(&m_list0xb8);
+		ControlManager()->FUN_10028df0(&m_controlPresenters);
 	}
 
 	SetIsWorldActive(TRUE);
@@ -95,7 +96,7 @@ MxLong LegoWorld::Notify(MxParam& p_param)
 	switch (((MxNotificationParam&) p_param).GetNotification()) {
 	case c_notificationEndAction: {
 		MxPresenter* presenter = (MxPresenter*) ((MxEndActionNotificationParam&) p_param).GetSender();
-		EndAction(presenter);
+		Remove(presenter);
 		ret = 1;
 		break;
 	}
@@ -152,24 +153,75 @@ MxS32 LegoWorld::GetCurrPathInfo(LegoPathBoundary** p_path, MxS32& p_value)
 }
 
 // STUB: LEGO1 0x10020220
-void LegoWorld::VTable0x58(MxCore* p_object)
+void LegoWorld::Add(MxCore* p_object)
 {
 	// TODO
 }
 
 // STUB: LEGO1 0x10020f10
-void LegoWorld::EndAction(MxCore* p_object)
+void LegoWorld::Remove(MxCore* p_object)
 {
+	// TODO
 }
 
-// STUB: LEGO1 0x100213a0
-MxPresenter* LegoWorld::FindPresenter(const char* p_presenter, const char* p_name)
+// FUNCTION: LEGO1 0x100213a0
+MxCore* LegoWorld::Find(const char* p_class, const char* p_name)
 {
-	return NULL;
+	if (!strcmp(p_class, "MxControlPresenter")) {
+		MxPresenterListCursor cursor(&m_controlPresenters);
+		MxPresenter* presenter;
+
+		while (cursor.Next(presenter)) {
+			MxDSAction* action = presenter->GetAction();
+			if (!strcmp(action->GetObjectName(), p_name))
+				return presenter;
+		}
+
+		return NULL;
+	}
+	else if (!strcmp(p_class, "MxEntity")) {
+		LegoEntityListCursor cursor(m_entityList);
+		LegoEntity* entity;
+
+		while (cursor.Next(entity)) {
+			if (!p_name)
+				return entity;
+
+			LegoROI* roi = entity->GetROI();
+			if (roi && !strcmpi(roi->GetUnknown0xe4(), p_name))
+				return entity;
+		}
+
+		return NULL;
+	}
+	else if (!strcmp(p_class, "LegoAnimPresenter")) {
+		MxPresenterListCursor cursor(&m_animPresenters);
+		MxPresenter* presenter;
+
+		while (cursor.Next(presenter)) {
+			if (!strcmpi(((LegoAnimPresenter*) presenter)->GetActionObjectName(), p_name))
+				return presenter;
+		}
+
+		return NULL;
+	}
+	else {
+		for (MxPresenterSet::iterator it = m_set0xa8.begin(); it != m_set0xa8.end(); it++) {
+			if ((*it)->IsA(p_class) && (*it)->IsA("MxPresenter")) {
+				MxPresenter* presenter = (MxPresenter*) *it;
+				MxDSAction* action = presenter->GetAction();
+
+				if (!strcmp(action->GetObjectName(), p_name))
+					return *it;
+			}
+		}
+
+		return NULL;
+	}
 }
 
 // FUNCTION: LEGO1 0x10021790
-MxCore* LegoWorld::FUN_10021790(const MxAtomId& p_atom, MxS32 p_entityId)
+MxCore* LegoWorld::Find(const MxAtomId& p_atom, MxS32 p_entityId)
 {
 	LegoEntityListCursor entityCursor(m_entityList);
 	LegoEntity* entity;
@@ -179,19 +231,19 @@ MxCore* LegoWorld::FUN_10021790(const MxAtomId& p_atom, MxS32 p_entityId)
 			return entity;
 	}
 
-	MxPresenterListCursor presenterCursor0xb8(&m_list0xb8);
+	MxPresenterListCursor controlPresenterCursor(&m_controlPresenters);
 	MxPresenter* presenter;
 
-	while (presenterCursor0xb8.Next(presenter)) {
+	while (controlPresenterCursor.Next(presenter)) {
 		MxDSAction* action = presenter->GetAction();
 
 		if (action->GetAtomId() == p_atom && action->GetObjectId() == p_entityId)
 			return presenter;
 	}
 
-	MxPresenterListCursor presenterCursor0x80(&m_list0x80);
+	MxPresenterListCursor animPresenterCursor(&m_animPresenters);
 
-	while (presenterCursor0x80.Next(presenter)) {
+	while (animPresenterCursor.Next(presenter)) {
 		MxDSAction* action = presenter->GetAction();
 
 		if (action && action->GetAtomId() == p_atom && action->GetObjectId() == p_entityId)
diff --git a/LEGO1/lego/legoomni/src/entity/legoworldpresenter.cpp b/LEGO1/lego/legoomni/src/entity/legoworldpresenter.cpp
index 55f908bd..072da137 100644
--- a/LEGO1/lego/legoomni/src/entity/legoworldpresenter.cpp
+++ b/LEGO1/lego/legoomni/src/entity/legoworldpresenter.cpp
@@ -165,7 +165,7 @@ void LegoWorldPresenter::VTable0x60(MxPresenter* p_presenter)
 	if (!p_presenter->IsA("LegoAnimPresenter") && !p_presenter->IsA("MxControlPresenter") &&
 		!p_presenter->IsA("MxCompositePresenter")) {
 		p_presenter->SendToCompositePresenter(Lego());
-		((LegoWorld*) m_entity)->VTable0x58(p_presenter);
+		((LegoWorld*) m_entity)->Add(p_presenter);
 	}
 }
 
diff --git a/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp b/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp
index 6b14b8af..38b95622 100644
--- a/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp
+++ b/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp
@@ -305,8 +305,8 @@ void Infocenter::VTable0x50()
 	m_unk0x1d4 = 0;
 	m_unk0x1d6 = 0;
 
-	MxStillPresenter* bg = (MxStillPresenter*) FindPresenter("MxStillPresenter", "Background_Bitmap");
-	MxStillPresenter* bgRed = (MxStillPresenter*) FindPresenter("MxStillPresenter", "BackgroundRed_Bitmap");
+	MxStillPresenter* bg = (MxStillPresenter*) Find("MxStillPresenter", "Background_Bitmap");
+	MxStillPresenter* bgRed = (MxStillPresenter*) Find("MxStillPresenter", "BackgroundRed_Bitmap");
 
 	switch (GameState()->GetUnknown10()) {
 	case 0:
@@ -365,73 +365,73 @@ void Infocenter::InitializeBitmaps()
 {
 	m_radio.Initialize(TRUE);
 
-	((MxPresenter*) FUN_10021790(m_atom, c_leftArrowCtl))->Enable(TRUE);
-	((MxPresenter*) FUN_10021790(m_atom, c_rightArrowCtl))->Enable(TRUE);
-	((MxPresenter*) FUN_10021790(m_atom, c_infoCtl))->Enable(TRUE);
-	((MxPresenter*) FUN_10021790(m_atom, c_boatCtl))->Enable(TRUE);
-	((MxPresenter*) FUN_10021790(m_atom, c_raceCtl))->Enable(TRUE);
-	((MxPresenter*) FUN_10021790(m_atom, c_pizzaCtl))->Enable(TRUE);
-	((MxPresenter*) FUN_10021790(m_atom, c_gasCtl))->Enable(TRUE);
-	((MxPresenter*) FUN_10021790(m_atom, c_medCtl))->Enable(TRUE);
-	((MxPresenter*) FUN_10021790(m_atom, c_copCtl))->Enable(TRUE);
+	((MxPresenter*) Find(m_atom, c_leftArrowCtl))->Enable(TRUE);
+	((MxPresenter*) Find(m_atom, c_rightArrowCtl))->Enable(TRUE);
+	((MxPresenter*) Find(m_atom, c_infoCtl))->Enable(TRUE);
+	((MxPresenter*) Find(m_atom, c_boatCtl))->Enable(TRUE);
+	((MxPresenter*) Find(m_atom, c_raceCtl))->Enable(TRUE);
+	((MxPresenter*) Find(m_atom, c_pizzaCtl))->Enable(TRUE);
+	((MxPresenter*) Find(m_atom, c_gasCtl))->Enable(TRUE);
+	((MxPresenter*) Find(m_atom, c_medCtl))->Enable(TRUE);
+	((MxPresenter*) Find(m_atom, c_copCtl))->Enable(TRUE);
 
-	((MxPresenter*) FUN_10021790(m_atom, c_mamaCtl))->Enable(TRUE);
-	((MxPresenter*) FUN_10021790(m_atom, c_papaCtl))->Enable(TRUE);
-	((MxPresenter*) FUN_10021790(m_atom, c_pepperCtl))->Enable(TRUE);
-	((MxPresenter*) FUN_10021790(m_atom, c_nickCtl))->Enable(TRUE);
-	((MxPresenter*) FUN_10021790(m_atom, c_lauraCtl))->Enable(TRUE);
-	((MxPresenter*) FUN_10021790(m_atom, c_radioCtl))->Enable(TRUE);
+	((MxPresenter*) Find(m_atom, c_mamaCtl))->Enable(TRUE);
+	((MxPresenter*) Find(m_atom, c_papaCtl))->Enable(TRUE);
+	((MxPresenter*) Find(m_atom, c_pepperCtl))->Enable(TRUE);
+	((MxPresenter*) Find(m_atom, c_nickCtl))->Enable(TRUE);
+	((MxPresenter*) Find(m_atom, c_lauraCtl))->Enable(TRUE);
+	((MxPresenter*) Find(m_atom, c_radioCtl))->Enable(TRUE);
 
-	m_mapAreas[0].m_presenter = (MxStillPresenter*) FindPresenter("MxStillPresenter", "Info_A_Bitmap");
+	m_mapAreas[0].m_presenter = (MxStillPresenter*) Find("MxStillPresenter", "Info_A_Bitmap");
 	m_mapAreas[0].m_unk0x08 = 391;
 	m_mapAreas[0].m_unk0x0c = 182;
 	m_mapAreas[0].m_unk0x10 = 427;
 	m_mapAreas[0].m_unk0x14 = 230;
 	m_mapAreas[0].m_unk0x04 = 3;
 
-	m_mapAreas[1].m_presenter = (MxStillPresenter*) FindPresenter("MxStillPresenter", "Boat_A_Bitmap");
+	m_mapAreas[1].m_presenter = (MxStillPresenter*) Find("MxStillPresenter", "Boat_A_Bitmap");
 	m_mapAreas[1].m_unk0x08 = 304;
 	m_mapAreas[1].m_unk0x0c = 225;
 	m_mapAreas[1].m_unk0x10 = 350;
 	m_mapAreas[1].m_unk0x14 = 268;
 	m_mapAreas[1].m_unk0x04 = 10;
 
-	m_mapAreas[2].m_presenter = (MxStillPresenter*) FindPresenter("MxStillPresenter", "Race_A_Bitmap");
+	m_mapAreas[2].m_presenter = (MxStillPresenter*) Find("MxStillPresenter", "Race_A_Bitmap");
 	m_mapAreas[2].m_unk0x08 = 301;
 	m_mapAreas[2].m_unk0x0c = 133;
 	m_mapAreas[2].m_unk0x10 = 347;
 	m_mapAreas[2].m_unk0x14 = 181;
 	m_mapAreas[2].m_unk0x04 = 11;
 
-	m_mapAreas[3].m_presenter = (MxStillPresenter*) FindPresenter("MxStillPresenter", "Pizza_A_Bitmap");
+	m_mapAreas[3].m_presenter = (MxStillPresenter*) Find("MxStillPresenter", "Pizza_A_Bitmap");
 	m_mapAreas[3].m_unk0x08 = 289;
 	m_mapAreas[3].m_unk0x0c = 182;
 	m_mapAreas[3].m_unk0x10 = 335;
 	m_mapAreas[3].m_unk0x14 = 225;
 	m_mapAreas[3].m_unk0x04 = 12;
 
-	m_mapAreas[4].m_presenter = (MxStillPresenter*) FindPresenter("MxStillPresenter", "Gas_A_Bitmap");
+	m_mapAreas[4].m_presenter = (MxStillPresenter*) Find("MxStillPresenter", "Gas_A_Bitmap");
 	m_mapAreas[4].m_unk0x10 = 391;
 	m_mapAreas[4].m_unk0x08 = 350;
 	m_mapAreas[4].m_unk0x0c = 161;
 	m_mapAreas[4].m_unk0x14 = 209;
 	m_mapAreas[4].m_unk0x04 = 13;
 
-	m_mapAreas[5].m_presenter = (MxStillPresenter*) FindPresenter("MxStillPresenter", "Med_A_Bitmap");
+	m_mapAreas[5].m_presenter = (MxStillPresenter*) Find("MxStillPresenter", "Med_A_Bitmap");
 	m_mapAreas[5].m_unk0x08 = 392;
 	m_mapAreas[5].m_unk0x0c = 130;
 	m_mapAreas[5].m_unk0x10 = 438;
 	m_mapAreas[5].m_unk0x14 = 176;
 	m_mapAreas[5].m_unk0x04 = 14;
 
-	m_mapAreas[6].m_presenter = (MxStillPresenter*) FindPresenter("MxStillPresenter", "Cop_A_Bitmap");
+	m_mapAreas[6].m_presenter = (MxStillPresenter*) Find("MxStillPresenter", "Cop_A_Bitmap");
 	m_mapAreas[6].m_unk0x08 = 396;
 	m_mapAreas[6].m_unk0x0c = 229;
 	m_mapAreas[6].m_unk0x10 = 442;
 	m_mapAreas[6].m_unk0x14 = 272;
 	m_mapAreas[6].m_unk0x04 = 15;
 
-	m_frameHotBitmap = (MxStillPresenter*) FindPresenter("MxStillPresenter", "FrameHot_Bitmap");
+	m_frameHotBitmap = (MxStillPresenter*) Find("MxStillPresenter", "FrameHot_Bitmap");
 
 	FUN_10070dc0(TRUE);
 }
diff --git a/LEGO1/lego/legoomni/src/isle/isle.cpp b/LEGO1/lego/legoomni/src/isle/isle.cpp
index 7172a7a6..e26e0797 100644
--- a/LEGO1/lego/legoomni/src/isle/isle.cpp
+++ b/LEGO1/lego/legoomni/src/isle/isle.cpp
@@ -201,9 +201,9 @@ MxLong Isle::HandleTransitionEnd()
 }
 
 // FUNCTION: LEGO1 0x10032f10
-void Isle::VTable0x58(MxCore* p_object)
+void Isle::Add(MxCore* p_object)
 {
-	LegoWorld::VTable0x58(p_object);
+	LegoWorld::Add(p_object);
 
 	if (p_object->IsA("Pizza")) {
 		m_pizza = (Pizza*) p_object;
@@ -246,7 +246,7 @@ void Isle::VTable0x58(MxCore* p_object)
 // FUNCTION: LEGO1 0x10033050
 void Isle::VTable0x6c(IslePathActor* p_actor)
 {
-	LegoWorld::EndAction(p_actor);
+	LegoWorld::Remove(p_actor);
 
 	if (p_actor->IsA("Helicopter")) {
 		m_helicopter = NULL;
diff --git a/LEGO1/lego/legoomni/src/main/legoomni.cpp b/LEGO1/lego/legoomni/src/main/legoomni.cpp
index a8d06b89..bd28f071 100644
--- a/LEGO1/lego/legoomni/src/main/legoomni.cpp
+++ b/LEGO1/lego/legoomni/src/main/legoomni.cpp
@@ -179,7 +179,7 @@ IslePathActor* GetCurrentVehicle()
 // FUNCTION: LEGO1 0x100157a0
 LegoWorld* GetCurrentWorld()
 {
-	return LegoOmni::GetInstance()->GetCurrentOmniWorld();
+	return LegoOmni::GetInstance()->GetCurrentWorld();
 }
 
 // FUNCTION: LEGO1 0x100157b0
@@ -219,9 +219,9 @@ void FUN_10015860(const char*, MxU8)
 }
 
 // FUNCTION: LEGO1 0x100158c0
-LegoEntity* FindEntityByAtomIdOrEntityId(const MxAtomId& p_atom, MxS32 p_entityid)
+LegoWorld* FindWorld(const MxAtomId& p_atom, MxS32 p_entityid)
 {
-	return LegoOmni::GetInstance()->FindByEntityIdOrAtomId(p_atom, p_entityid);
+	return LegoOmni::GetInstance()->FindWorld(p_atom, p_entityid);
 }
 
 // FUNCTION: LEGO1 0x100158e0
@@ -612,11 +612,11 @@ void LegoOmni::RemoveWorld(const MxAtomId&, MxLong)
 }
 
 // FUNCTION: LEGO1 0x1005b0c0
-LegoEntity* LegoOmni::FindByEntityIdOrAtomId(const MxAtomId& p_atom, MxS32 p_entityid)
+LegoWorld* LegoOmni::FindWorld(const MxAtomId& p_atom, MxS32 p_entityid)
 {
 	if (m_worldList) {
-		LegoWorld* world;
 		LegoWorldListCursor cursor(m_worldList);
+		LegoWorld* world;
 
 		while (cursor.Next(world)) {
 			if ((p_entityid == -1 || world->GetEntityId() == p_entityid) &&
@@ -635,21 +635,22 @@ void LegoOmni::DeleteObject(MxDSAction& p_dsAction)
 }
 
 // FUNCTION: LEGO1 0x1005b2f0
-MxEntity* LegoOmni::FindWorld(const char* p_id, MxS32 p_entityId, MxPresenter* p_presenter)
+MxEntity* LegoOmni::AddToWorld(const char* p_id, MxS32 p_entityId, MxPresenter* p_presenter)
 {
-	LegoWorld* foundEntity = NULL;
+	LegoWorld* world = NULL;
+
 	if (strcmpi(p_id, g_current)) {
-		foundEntity = (LegoWorld*) FindByEntityIdOrAtomId(MxAtomId(p_id, e_lowerCase2), p_entityId);
+		world = FindWorld(MxAtomId(p_id, e_lowerCase2), p_entityId);
 	}
 	else {
-		foundEntity = this->m_currentWorld;
+		world = this->m_currentWorld;
 	}
 
-	if (foundEntity != NULL) {
-		foundEntity->VTable0x58(p_presenter);
+	if (world != NULL) {
+		world->Add(p_presenter);
 	}
 
-	return foundEntity;
+	return world;
 }
 
 // FUNCTION: LEGO1 0x1005b3a0
@@ -663,7 +664,7 @@ void LegoOmni::NotifyCurrentEntity(MxNotificationParam* p_param)
 MxBool LegoOmni::DoesEntityExist(MxDSAction& p_dsAction)
 {
 	if (MxOmni::DoesEntityExist(p_dsAction)) {
-		if (FindByEntityIdOrAtomId(p_dsAction.GetAtomId(), p_dsAction.GetObjectId()) == NULL) {
+		if (FindWorld(p_dsAction.GetAtomId(), p_dsAction.GetObjectId()) == NULL) {
 			return TRUE;
 		}
 	}
@@ -673,11 +674,11 @@ MxBool LegoOmni::DoesEntityExist(MxDSAction& p_dsAction)
 // FUNCTION: LEGO1 0x1005b400
 MxS32 LegoOmni::GetCurrPathInfo(LegoPathBoundary** p_path, MxS32& p_value)
 {
-	if (GetCurrentWorld() == NULL) {
+	if (::GetCurrentWorld() == NULL) {
 		return -1;
 	}
 
-	return GetCurrentWorld()->GetCurrPathInfo(p_path, p_value);
+	return ::GetCurrentWorld()->GetCurrPathInfo(p_path, p_value);
 }
 
 // FUNCTION: LEGO1 0x1005b4f0
diff --git a/LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp b/LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp
index 0167833d..6da994ec 100644
--- a/LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp
+++ b/LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp
@@ -173,6 +173,12 @@ void LegoAnimPresenter::Destroy()
 	Destroy(FALSE);
 }
 
+// FUNCTION: LEGO1 0x1006b8f0
+const char* LegoAnimPresenter::GetActionObjectName()
+{
+	return m_action->GetObjectName();
+}
+
 // STUB: LEGO1 0x1006bac0
 void LegoAnimPresenter::ParseExtra()
 {
diff --git a/LEGO1/lego/legoomni/src/video/legolocomotionanimpresenter.cpp b/LEGO1/lego/legoomni/src/video/legolocomotionanimpresenter.cpp
index db6e6a79..45098aac 100644
--- a/LEGO1/lego/legoomni/src/video/legolocomotionanimpresenter.cpp
+++ b/LEGO1/lego/legoomni/src/video/legolocomotionanimpresenter.cpp
@@ -82,7 +82,7 @@ void LegoLocomotionAnimPresenter::ReadyTickle()
 	LegoAnimPresenter::ReadyTickle();
 
 	if (m_currentWorld != NULL && m_currentTickleState == e_starting) {
-		m_currentWorld->VTable0x58(this);
+		m_currentWorld->Add(this);
 		if (m_compositePresenter != NULL) {
 			SendToCompositePresenter(Lego());
 		}
diff --git a/LEGO1/lego/sources/roi/legoroi.h b/LEGO1/lego/sources/roi/legoroi.h
index 2fb03c63..9b586353 100644
--- a/LEGO1/lego/sources/roi/legoroi.h
+++ b/LEGO1/lego/sources/roi/legoroi.h
@@ -40,6 +40,7 @@ class LegoROI : public ViewROI {
 	void FUN_100a46b0(Matrix4& p_transform);
 	void FUN_100a58f0(Matrix4& p_transform);
 
+	inline const char* GetUnknown0xe4() { return m_unk0xe4; }
 	inline LegoEntity* GetUnknown0x104() { return m_unk0x104; }
 	inline void SetUnknown0x104(LegoEntity* p_unk0x104) { m_unk0x104 = p_unk0x104; }
 
@@ -47,9 +48,11 @@ class LegoROI : public ViewROI {
 	// LegoROI::`scalar deleting destructor'
 
 private:
-	undefined m_pad[0x24];  // 0xe0
-	LegoEntity* m_unk0x104; // 0x104
-	int m_time;             // 0x108
+	undefined4 m_unk0xe0;      // 0xe0
+	const char* m_unk0xe4;     // 0xe4
+	undefined m_unk0xe8[0x1c]; // 0xe8
+	LegoEntity* m_unk0x104;    // 0x104
+	int m_time;                // 0x108
 };
 
 #endif // LEGOROI_H
diff --git a/LEGO1/omni/include/mxdsobject.h b/LEGO1/omni/include/mxdsobject.h
index 45a3b360..5fa1d4fb 100644
--- a/LEGO1/omni/include/mxdsobject.h
+++ b/LEGO1/omni/include/mxdsobject.h
@@ -51,6 +51,7 @@ class MxDSObject : public MxCore {
 
 	inline Type GetType() const { return (Type) this->m_type; }
 	inline const char* GetSourceName() const { return this->m_sourceName; }
+	inline const char* GetObjectName() const { return this->m_objectName; }
 	inline MxU32 GetObjectId() { return this->m_objectId; }
 	inline const MxAtomId& GetAtomId() { return this->m_atomId; }
 	inline MxS16 GetUnknown24() { return this->m_unk0x24; }
diff --git a/LEGO1/omni/include/mxomni.h b/LEGO1/omni/include/mxomni.h
index d92f2b38..9ba344b7 100644
--- a/LEGO1/omni/include/mxomni.h
+++ b/LEGO1/omni/include/mxomni.h
@@ -48,7 +48,7 @@ class MxOmni : public MxCore {
 	virtual void DeleteObject(MxDSAction& p_dsAction);                                        // vtable+24
 	virtual MxBool DoesEntityExist(MxDSAction& p_dsAction);                                   // vtable+28
 	virtual MxResult CreatePresenter(MxStreamController* p_controller, MxDSAction& p_action); // vtable+2c
-	virtual MxEntity* FindWorld(const char*, MxS32, MxPresenter*);                            // vtable+30
+	virtual MxEntity* AddToWorld(const char*, MxS32, MxPresenter*);                           // vtable+30
 	virtual void NotifyCurrentEntity(MxNotificationParam* p_param);                           // vtable+34
 	virtual void StartTimer();                                                                // vtable+38
 	virtual void StopTimer();                                                                 // vtable+3c
diff --git a/LEGO1/omni/src/common/mxpresenter.cpp b/LEGO1/omni/src/common/mxpresenter.cpp
index 9d074278..ab803493 100644
--- a/LEGO1/omni/src/common/mxpresenter.cpp
+++ b/LEGO1/omni/src/common/mxpresenter.cpp
@@ -94,7 +94,7 @@ void MxPresenter::ParseExtra()
 
 			token = strtok(NULL, g_parseExtraTokens);
 			MxS32 val = token ? atoi(token) : 0;
-			MxEntity* result = MxOmni::GetInstance()->FindWorld(buf, val, this);
+			MxEntity* result = MxOmni::GetInstance()->AddToWorld(buf, val, this);
 
 			m_action->SetFlags(m_action->GetFlags() | MxDSAction::c_world);
 
diff --git a/LEGO1/omni/src/main/mxomni.cpp b/LEGO1/omni/src/main/mxomni.cpp
index f9fa5733..2b266b3b 100644
--- a/LEGO1/omni/src/main/mxomni.cpp
+++ b/LEGO1/omni/src/main/mxomni.cpp
@@ -113,7 +113,7 @@ MxOmni::MxOmni()
 }
 
 // FUNCTION: LEGO1 0x100aefb0
-MxEntity* MxOmni::FindWorld(const char*, MxS32, MxPresenter*)
+MxEntity* MxOmni::AddToWorld(const char*, MxS32, MxPresenter*)
 {
 	return NULL;
 }

From 7b6ec235d8ad97c461c8ed46c4a058776d2be352 Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Fri, 26 Jan 2024 17:52:03 -0500
Subject: [PATCH 177/210] Implement LegoWorld::Add (#490)

* LegoWorld::Add

* Add annotations

* Fix include guard

* Make stub

* Change MxPresenterSet to MxCoreSet

* Improve match

* Match

* Fix annotation
---
 .../lego/legoomni/include/legoanimpresenter.h |  5 +
 .../legoomni/include/legocachesoundlist.h     | 98 +++++++++++++++++++
 LEGO1/lego/legoomni/include/legoentitylist.h  |  3 +
 LEGO1/lego/legoomni/include/legoutil.h        |  2 +
 LEGO1/lego/legoomni/include/legoworld.h       | 79 ++++++++++-----
 LEGO1/lego/legoomni/src/common/legoutil.cpp   |  6 ++
 LEGO1/lego/legoomni/src/entity/legoworld.cpp  | 77 +++++++++++++--
 LEGO1/omni/include/mxcorelist.h               | 95 ------------------
 LEGO1/omni/include/mxpresenterlist.h          |  3 +
 9 files changed, 236 insertions(+), 132 deletions(-)
 create mode 100644 LEGO1/lego/legoomni/include/legocachesoundlist.h
 delete mode 100644 LEGO1/omni/include/mxcorelist.h

diff --git a/LEGO1/lego/legoomni/include/legoanimpresenter.h b/LEGO1/lego/legoomni/include/legoanimpresenter.h
index 394147e5..2ca9c910 100644
--- a/LEGO1/lego/legoomni/include/legoanimpresenter.h
+++ b/LEGO1/lego/legoomni/include/legoanimpresenter.h
@@ -40,6 +40,8 @@ class LegoAnimPresenter : public MxVideoPresenter {
 	virtual void PutFrame() override;                                                              // vtable+0x6c
 	virtual MxResult VTable0x88(MxStreamChunk* p_chunk);                                           // vtable+0x88
 
+	inline LegoAnimClass* GetUnknown0x64() { return m_unk0x64; }
+
 	const char* GetActionObjectName();
 
 protected:
@@ -101,6 +103,9 @@ class LegoAnimClass : public LegoAnimClassBase {
 	virtual void VTable0xc() override;                        // vtable+0x0c
 	virtual MxResult VTable0x10(LegoMemory* p_stream, MxS32); // vtable+0x10
 
+	inline MxLong GetUnknown0x8() { return m_unk0x8; }
+
+	// private:
 	MxLong m_unk0x8;      // 0x08
 	undefined4 m_unk0xc;  // 0x0c
 	undefined4 m_unk0x10; // 0x10
diff --git a/LEGO1/lego/legoomni/include/legocachesoundlist.h b/LEGO1/lego/legoomni/include/legocachesoundlist.h
new file mode 100644
index 00000000..13d8f96c
--- /dev/null
+++ b/LEGO1/lego/legoomni/include/legocachesoundlist.h
@@ -0,0 +1,98 @@
+#ifndef LEGOCACHESOUNDLIST_H
+#define LEGOCACHESOUNDLIST_H
+
+#include "mxlist.h"
+#include "mxtypes.h"
+
+class LegoCacheSound;
+
+// VTABLE: LEGO1 0x100d63b0
+// class MxCollection<LegoCacheSound *>
+
+// VTABLE: LEGO1 0x100d63c8
+// class MxList<LegoCacheSound *>
+
+// VTABLE: LEGO1 0x100d63e0
+// class MxPtrList<LegoCacheSound>
+
+// VTABLE: LEGO1 0x100d63f8
+// SIZE 0x18
+class LegoCacheSoundList : public MxPtrList<LegoCacheSound> {
+public:
+	LegoCacheSoundList(MxBool p_ownership = FALSE) : MxPtrList<LegoCacheSound>(p_ownership) {}
+
+	// FUNCTION: LEGO1 0x1001e650
+	virtual MxS8 Compare(LegoCacheSound* p_a, LegoCacheSound* p_b) override
+	{
+		return p_a == p_b ? 0 : p_a < p_b ? -1 : 1;
+	}; // vtable+0x14
+};
+
+// VTABLE: LEGO1 0x100d64a0
+// class MxListCursor<LegoCacheSound *>
+
+// VTABLE: LEGO1 0x100d6500
+// class MxPtrListCursor<LegoCacheSound>
+
+// VTABLE: LEGO1 0x100d6518
+// SIZE 0x10
+class LegoCacheSoundListCursor : public MxPtrListCursor<LegoCacheSound> {
+public:
+	LegoCacheSoundListCursor(LegoCacheSoundList* p_list) : MxPtrListCursor<LegoCacheSound>(p_list){};
+};
+
+// TEMPLATE: LEGO1 0x1001e670
+// MxCollection<LegoCacheSound *>::Compare
+
+// TEMPLATE: LEGO1 0x1001e680
+// MxCollection<LegoCacheSound *>::~MxCollection<LegoCacheSound *>
+
+// TEMPLATE: LEGO1 0x1001e6d0
+// MxCollection<LegoCacheSound *>::Destroy
+
+// TEMPLATE: LEGO1 0x1001e6e0
+// MxList<LegoCacheSound *>::~MxList<LegoCacheSound *>
+
+// TEMPLATE: LEGO1 0x1001e770
+// MxPtrList<LegoCacheSound>::Destroy
+
+// SYNTHETIC: LEGO1 0x1001e780
+// LegoCacheSoundList::`scalar deleting destructor'
+
+// TEMPLATE: LEGO1 0x1001e7f0
+// MxPtrList<LegoCacheSound>::~MxPtrList<LegoCacheSound>
+
+// SYNTHETIC: LEGO1 0x1001e840
+// MxCollection<LegoCacheSound *>::`scalar deleting destructor'
+
+// SYNTHETIC: LEGO1 0x1001e8b0
+// MxList<LegoCacheSound *>::`scalar deleting destructor'
+
+// SYNTHETIC: LEGO1 0x1001e960
+// MxPtrList<LegoCacheSound>::`scalar deleting destructor'
+
+// SYNTHETIC: LEGO1 0x1001f350
+// LegoCacheSoundListCursor::`scalar deleting destructor'
+
+// FUNCTION: LEGO1 0x1001f3c0
+// MxPtrListCursor<LegoCacheSound>::~MxPtrListCursor<LegoCacheSound>
+
+// SYNTHETIC: LEGO1 0x1001f410
+// MxListCursor<LegoCacheSound *>::`scalar deleting destructor'
+
+// SYNTHETIC: LEGO1 0x1001f480
+// MxPtrListCursor<LegoCacheSound>::`scalar deleting destructor'
+
+// FUNCTION: LEGO1 0x1001f4f0
+// MxListCursor<LegoCacheSound *>::~MxListCursor<LegoCacheSound *>
+
+// FUNCTION: LEGO1 0x1001f540
+// LegoCacheSoundListCursor::~LegoCacheSoundListCursor
+
+// TEMPLATE: LEGO1 0x10020840
+// MxListCursor<LegoCacheSound *>::MxListCursor<LegoCacheSound *>
+
+// TEMPLATE: LEGO1 0x100224e0
+// MxList<LegoCacheSound *>::InsertEntry
+
+#endif // LEGOCACHESOUNDLIST_H
diff --git a/LEGO1/lego/legoomni/include/legoentitylist.h b/LEGO1/lego/legoomni/include/legoentitylist.h
index 04935769..4f212279 100644
--- a/LEGO1/lego/legoomni/include/legoentitylist.h
+++ b/LEGO1/lego/legoomni/include/legoentitylist.h
@@ -92,4 +92,7 @@ class LegoEntityListCursor : public MxPtrListCursor<LegoEntity> {
 // TEMPLATE: LEGO1 0x100207d0
 // MxListCursor<LegoEntity *>::MxListCursor<LegoEntity *>
 
+// TEMPLATE: LEGO1 0x10022430
+// MxList<LegoEntity *>::InsertEntry
+
 #endif // LEGOENTITYLIST_H
diff --git a/LEGO1/lego/legoomni/include/legoutil.h b/LEGO1/lego/legoomni/include/legoutil.h
index 6e9bb5ee..75e51c20 100644
--- a/LEGO1/lego/legoomni/include/legoutil.h
+++ b/LEGO1/lego/legoomni/include/legoutil.h
@@ -9,7 +9,9 @@
 
 class MxAtomId;
 class LegoEntity;
+class LegoAnimPresenter;
 
+void FUN_1003e050(LegoAnimPresenter* p_presenter);
 Extra::ActionType MatchActionString(const char*);
 void InvokeAction(Extra::ActionType p_actionId, MxAtomId& p_pAtom, int p_targetEntityId, LegoEntity* p_sender);
 void ConvertHSVToRGB(float p_h, float p_s, float p_v, float* p_rOut, float* p_bOut, float* p_gOut);
diff --git a/LEGO1/lego/legoomni/include/legoworld.h b/LEGO1/lego/legoomni/include/legoworld.h
index 4bc7ab70..074728e3 100644
--- a/LEGO1/lego/legoomni/include/legoworld.h
+++ b/LEGO1/lego/legoomni/include/legoworld.h
@@ -1,22 +1,24 @@
 #ifndef LEGOWORLD_H
 #define LEGOWORLD_H
 
+#include "legocachesound.h"
+#include "legocachesoundlist.h"
 #include "legocameracontroller.h"
 #include "legoentity.h"
 #include "legoentitylist.h"
 #include "legopathcontrollerlist.h"
-#include "mxcorelist.h"
 #include "mxpresenter.h"
 #include "mxpresenterlist.h"
 
 class IslePathActor;
 class LegoPathBoundary;
+class LegoHideAnimPresenter;
 
-struct PresenterSetCompare {
-	MxS32 operator()(MxPresenter* const& p_a, MxPresenter* const& p_b) const { return p_a > p_b; }
+struct CoreSetCompare {
+	MxS32 operator()(MxCore* const& p_a, MxCore* const& p_b) const { return p_a > p_b; }
 };
 
-typedef set<MxPresenter*, PresenterSetCompare> MxPresenterSet;
+typedef set<MxCore*, CoreSetCompare> MxCoreSet;
 
 // VTABLE: LEGO1 0x100d6280
 // SIZE 0xf8
@@ -72,38 +74,38 @@ class LegoWorld : public LegoEntity {
 	// LegoWorld::`scalar deleting destructor'
 
 protected:
-	LegoPathControllerList m_list0x68;        // 0x68
-	MxPresenterList m_animPresenters;         // 0x80
-	LegoCameraController* m_cameraController; // 0x98
-	LegoEntityList* m_entityList;             // 0x9c
-	MxCoreList* m_coreList;                   // 0xa0
-	undefined m_unk0xa4;                      // 0xa4
-	MxPresenterSet m_set0xa8;                 // 0xa8
-	MxPresenterList m_controlPresenters;      // 0xb8
-	MxPresenterSet m_set0xd0;                 // 0xd0
-	list<AutoROI*> m_list0xe0;                // 0xe0
-	undefined4 m_unk0xec;                     // 0xec
-	undefined4 m_unk0xf0;                     // 0xf0
-	MxS16 m_unk0xf4;                          // 0xf4
-	MxBool m_worldStarted;                    // 0xf6
-	undefined m_unk0xf7;                      // 0xf7
+	LegoPathControllerList m_list0x68;          // 0x68
+	MxPresenterList m_animPresenters;           // 0x80
+	LegoCameraController* m_cameraController;   // 0x98
+	LegoEntityList* m_entityList;               // 0x9c
+	LegoCacheSoundList* m_cacheSoundList;       // 0xa0
+	undefined m_unk0xa4;                        // 0xa4
+	MxCoreSet m_set0xa8;                        // 0xa8
+	MxPresenterList m_controlPresenters;        // 0xb8
+	MxCoreSet m_set0xd0;                        // 0xd0
+	list<AutoROI*> m_list0xe0;                  // 0xe0
+	undefined4 m_unk0xec;                       // 0xec
+	LegoHideAnimPresenter* m_hideAnimPresenter; // 0xf0
+	MxS16 m_unk0xf4;                            // 0xf4
+	MxBool m_worldStarted;                      // 0xf6
+	undefined m_unk0xf7;                        // 0xf7
 };
 
 // clang-format off
 // TEMPLATE: LEGO1 0x1001d780
-// _Tree<MxPresenter *,MxPresenter *,set<MxPresenter *,PresenterSetCompare,allocator<MxPresenter *> >::_Kfn,PresenterSetCompare,allocator<MxPresenter *> >::~_Tree<MxPresenter *,MxPresenter *,set<MxPresenter *,PresenterSetCompare,allocator<MxPresenter *> >::_Kfn,PresenterSetCompare,allocator<MxPresenter *> >
+// _Tree<MxCore *,MxCore *,set<MxCore *,CoreSetCompare,allocator<MxCore *> >::_Kfn,CoreSetCompare,allocator<MxCore *> >::~_Tree<MxCore *,MxCore *,set<MxCore *,CoreSetCompare,allocator<MxCore *> >::_Kfn,CoreSetCompare,allocator<MxCore *> >
 
 // TEMPLATE: LEGO1 0x1001d850
-// _Tree<MxPresenter *,MxPresenter *,set<MxPresenter *,PresenterSetCompare,allocator<MxPresenter *> >::_Kfn,PresenterSetCompare,allocator<MxPresenter *> >::iterator::_Inc
+// _Tree<MxCore *,MxCore *,set<MxCore *,CoreSetCompare,allocator<MxCore *> >::_Kfn,CoreSetCompare,allocator<MxCore *> >::iterator::_Inc
 
 // TEMPLATE: LEGO1 0x1001d890
-// _Tree<MxPresenter *,MxPresenter *,set<MxPresenter *,PresenterSetCompare,allocator<MxPresenter *> >::_Kfn,PresenterSetCompare,allocator<MxPresenter *> >::erase
+// _Tree<MxCore *,MxCore *,set<MxCore *,CoreSetCompare,allocator<MxCore *> >::_Kfn,CoreSetCompare,allocator<MxCore *> >::erase
 
 // TEMPLATE: LEGO1 0x1001dcf0
-// _Tree<MxPresenter *,MxPresenter *,set<MxPresenter *,PresenterSetCompare,allocator<MxPresenter *> >::_Kfn,PresenterSetCompare,allocator<MxPresenter *> >::_Erase
+// _Tree<MxCore *,MxCore *,set<MxCore *,CoreSetCompare,allocator<MxCore *> >::_Kfn,CoreSetCompare,allocator<MxCore *> >::_Erase
 
 // TEMPLATE: LEGO1 0x1001dd30
-// _Tree<MxPresenter *,MxPresenter *,set<MxPresenter *,PresenterSetCompare,allocator<MxPresenter *> >::_Kfn,PresenterSetCompare,allocator<MxPresenter *> >::_Init
+// _Tree<MxCore *,MxCore *,set<MxCore *,CoreSetCompare,allocator<MxCore *> >::_Kfn,CoreSetCompare,allocator<MxCore *> >::_Init
 
 // TEMPLATE: LEGO1 0x1001ddf0
 // list<AutoROI *,allocator<AutoROI *> >::~list<AutoROI *,allocator<AutoROI *> >
@@ -115,10 +117,10 @@ class LegoWorld : public LegoEntity {
 // list<AutoROI *,allocator<AutoROI *> >::_Buynode
 
 // TEMPLATE: LEGO1 0x1001de90
-// set<MxPresenter *,PresenterSetCompare,allocator<MxPresenter *> >::~set<MxPresenter *,PresenterSetCompare,allocator<MxPresenter *> >
+// set<MxCore *,CoreSetCompare,allocator<MxCore *> >::~set<MxCore *,CoreSetCompare,allocator<MxCore *> >
 
 // TEMPLATE: LEGO1 0x1001df00
-// Set<MxPresenter *,PresenterSetCompare>::~Set<MxPresenter *,PresenterSetCompare>
+// Set<MxCore *,CoreSetCompare>::~Set<MxCore *,CoreSetCompare>
 
 // SYNTHETIC: LEGO1 0x1001eed0
 // MxPresenterListCursor::`scalar deleting destructor'
@@ -141,8 +143,31 @@ class LegoWorld : public LegoEntity {
 // TEMPLATE: LEGO1 0x10020760
 // MxListCursor<MxPresenter *>::MxListCursor<MxPresenter *>
 
+// TEMPLATE: LEGO1 0x100208b0
+// _Tree<MxCore *,MxCore *,set<MxCore *,CoreSetCompare,allocator<MxCore *> >::_Kfn,CoreSetCompare,allocator<MxCore *> >::insert
+
+// TEMPLATE: LEGO1 0x10020b20
+// _Tree<MxCore *,MxCore *,set<MxCore *,CoreSetCompare,allocator<MxCore *> >::_Kfn,CoreSetCompare,allocator<MxCore *> >::iterator::_Dec
+
+// XTEMPLATE LEGO1 0x10020b70
+
+// TEMPLATE: LEGO1 0x10020bb0
+// _Tree<MxCore *,MxCore *,set<MxCore *,CoreSetCompare,allocator<MxCore *> >::_Kfn,CoreSetCompare,allocator<MxCore *> >::_Buynode
+
+// TEMPLATE: LEGO1 0x10020bd0
+// _Tree<MxCore *,MxCore *,set<MxCore *,CoreSetCompare,allocator<MxCore *> >::_Kfn,CoreSetCompare,allocator<MxCore *> >::_Insert
+
+// TEMPLATE: LEGO1 0x10020e50
+// _Tree<MxCore *,MxCore *,set<MxCore *,CoreSetCompare,allocator<MxCore *> >::_Kfn,CoreSetCompare,allocator<MxCore *> >::_Lrotate
+
+// TEMPLATE: LEGO1 0x10020eb0
+// _Tree<MxCore *,MxCore *,set<MxCore *,CoreSetCompare,allocator<MxCore *> >::_Kfn,CoreSetCompare,allocator<MxCore *> >::_Rrotate
+
+// TEMPLATE: LEGO1 0x10022360
+// _Construct
+
 // GLOBAL: LEGO1 0x100f11a0
-// _Tree<MxPresenter *,MxPresenter *,set<MxPresenter *,PresenterSetCompare,allocator<MxPresenter *>>::_Kfn,PresenterSetCompare,allocator<MxPresenter *> >::_Nil
+// _Tree<MxCore *,MxCore *,set<MxCore *,CoreSetCompare,allocator<MxCore *> >::_Kfn,CoreSetCompare,allocator<MxCore *> >::_Nil
 // clang-format on
 
 #endif // LEGOWORLD_H
diff --git a/LEGO1/lego/legoomni/src/common/legoutil.cpp b/LEGO1/lego/legoomni/src/common/legoutil.cpp
index 843f4abb..dfb4b740 100644
--- a/LEGO1/lego/legoomni/src/common/legoutil.cpp
+++ b/LEGO1/lego/legoomni/src/common/legoutil.cpp
@@ -10,6 +10,12 @@
 #include <process.h>
 #include <string.h>
 
+// STUB: LEGO1 0x1003e050
+void FUN_1003e050(LegoAnimPresenter* p_presenter)
+{
+	// TODO
+}
+
 // FUNCTION: LEGO1 0x1003e300
 Extra::ActionType MatchActionString(const char* p_str)
 {
diff --git a/LEGO1/lego/legoomni/src/entity/legoworld.cpp b/LEGO1/lego/legoomni/src/entity/legoworld.cpp
index c9381197..a39a957e 100644
--- a/LEGO1/lego/legoomni/src/entity/legoworld.cpp
+++ b/LEGO1/lego/legoomni/src/entity/legoworld.cpp
@@ -15,8 +15,8 @@
 DECOMP_SIZE_ASSERT(LegoWorld, 0xf8)
 DECOMP_SIZE_ASSERT(LegoEntityList, 0x18)
 DECOMP_SIZE_ASSERT(LegoEntityListCursor, 0x10)
-DECOMP_SIZE_ASSERT(MxCoreList, 0x18)
-DECOMP_SIZE_ASSERT(MxCoreListCursor, 0x10)
+DECOMP_SIZE_ASSERT(LegoCacheSoundList, 0x18)
+DECOMP_SIZE_ASSERT(LegoCacheSoundListCursor, 0x10)
 
 // FUNCTION: LEGO1 0x1001ca40
 LegoWorld::LegoWorld() : m_list0x68(TRUE)
@@ -24,9 +24,9 @@ LegoWorld::LegoWorld() : m_list0x68(TRUE)
 	m_unk0xf4 = 4;
 	m_cameraController = NULL;
 	m_entityList = NULL;
-	m_coreList = NULL;
+	m_cacheSoundList = NULL;
 	m_unk0xa4 = 0; // MxBool?
-	m_unk0xf0 = 0;
+	m_hideAnimPresenter = NULL;
 	m_worldStarted = FALSE;
 
 	NotificationManager()->Register(this);
@@ -60,9 +60,9 @@ MxResult LegoWorld::Create(MxDSAction& p_dsAction)
 	if (!m_entityList)
 		return FAILURE;
 
-	m_coreList = new MxCoreList(TRUE);
+	m_cacheSoundList = new LegoCacheSoundList(TRUE);
 
-	if (!m_coreList)
+	if (!m_cacheSoundList)
 		return FAILURE;
 
 	if (!VTable0x54())
@@ -152,10 +152,67 @@ MxS32 LegoWorld::GetCurrPathInfo(LegoPathBoundary** p_path, MxS32& p_value)
 	return 0;
 }
 
-// STUB: LEGO1 0x10020220
+// FUNCTION: LEGO1 0x10020220
 void LegoWorld::Add(MxCore* p_object)
 {
-	// TODO
+	if (p_object && !p_object->IsA("LegoWorld") && !p_object->IsA("LegoWorldPresenter")) {
+		if (p_object->IsA("LegoAnimPresenter")) {
+			LegoAnimPresenter* animPresenter = (LegoAnimPresenter*) p_object;
+
+			if (!strcmpi(animPresenter->GetAction()->GetObjectName(), "ConfigAnimation")) {
+				FUN_1003e050(animPresenter);
+				animPresenter->GetAction()->SetDuration(animPresenter->GetUnknown0x64()->GetUnknown0x8());
+			}
+		}
+
+		if (p_object->IsA("MxControlPresenter")) {
+			MxPresenterListCursor cursor(&m_controlPresenters);
+
+			if (cursor.Find((MxPresenter*) p_object))
+				return;
+
+			m_controlPresenters.Append((MxPresenter*) p_object);
+		}
+		else if (p_object->IsA("MxEntity")) {
+			LegoEntityListCursor cursor(m_entityList);
+
+			if (cursor.Find((LegoEntity*) p_object))
+				return;
+
+			m_entityList->Append((LegoEntity*) p_object);
+		}
+		else if (p_object->IsA("LegoLocomotionAnimPresenter") || p_object->IsA("LegoHideAnimPresenter") || p_object->IsA("LegoLoopingAnimPresenter")) {
+			MxPresenterListCursor cursor(&m_animPresenters);
+
+			if (cursor.Find((MxPresenter*) p_object))
+				return;
+
+			((MxPresenter*) p_object)->SendToCompositePresenter(Lego());
+			m_animPresenters.Append(((MxPresenter*) p_object));
+
+			if (p_object->IsA("LegoHideAnimPresenter"))
+				m_hideAnimPresenter = (LegoHideAnimPresenter*) p_object;
+		}
+		else if (p_object->IsA("LegoCacheSound")) {
+			LegoCacheSoundListCursor cursor(m_cacheSoundList);
+
+			if (cursor.Find((LegoCacheSound*) p_object))
+				return;
+
+			m_cacheSoundList->Append((LegoCacheSound*) p_object);
+		}
+		else {
+			if (m_set0xa8.find(p_object) == m_set0xa8.end())
+				m_set0xa8.insert(p_object);
+		}
+
+		if (!m_set0xd0.empty() && p_object->IsA("MxPresenter")) {
+			if (((MxPresenter*) p_object)->IsEnabled()) {
+				((MxPresenter*) p_object)->Enable(FALSE);
+				m_set0xd0.insert(p_object);
+			}
+		}
+	}
 }
 
 // STUB: LEGO1 0x10020f10
@@ -206,7 +263,7 @@ MxCore* LegoWorld::Find(const char* p_class, const char* p_name)
 		return NULL;
 	}
 	else {
-		for (MxPresenterSet::iterator it = m_set0xa8.begin(); it != m_set0xa8.end(); it++) {
+		for (MxCoreSet::iterator it = m_set0xa8.begin(); it != m_set0xa8.end(); it++) {
 			if ((*it)->IsA(p_class) && (*it)->IsA("MxPresenter")) {
 				MxPresenter* presenter = (MxPresenter*) *it;
 				MxDSAction* action = presenter->GetAction();
@@ -250,7 +307,7 @@ MxCore* LegoWorld::Find(const MxAtomId& p_atom, MxS32 p_entityId)
 			return presenter;
 	}
 
-	for (MxPresenterSet::iterator it = m_set0xa8.begin(); it != m_set0xa8.end(); it++) {
+	for (MxCoreSet::iterator it = m_set0xa8.begin(); it != m_set0xa8.end(); it++) {
 		MxCore* core = *it;
 
 		if (core->IsA("MxPresenter")) {
diff --git a/LEGO1/omni/include/mxcorelist.h b/LEGO1/omni/include/mxcorelist.h
deleted file mode 100644
index 15ae7c9b..00000000
--- a/LEGO1/omni/include/mxcorelist.h
+++ /dev/null
@@ -1,95 +0,0 @@
-#ifndef MXCORELIST_H
-#define MXCORELIST_H
-
-#include "mxlist.h"
-#include "mxtypes.h"
-
-class MxCore;
-
-// VTABLE: LEGO1 0x100d63b0
-// class MxCollection<MxCore *>
-
-// VTABLE: LEGO1 0x100d63c8
-// class MxList<MxCore *>
-
-// VTABLE: LEGO1 0x100d63e0
-// class MxPtrList<MxCore>
-
-// VTABLE: LEGO1 0x100d63f8
-// SIZE 0x18
-class MxCoreList : public MxPtrList<MxCore> {
-public:
-	MxCoreList(MxBool p_ownership = FALSE) : MxPtrList<MxCore>(p_ownership) {}
-
-	// FUNCTION: LEGO1 0x1001e650
-	virtual MxS8 Compare(MxCore* p_a, MxCore* p_b) override
-	{
-		return p_a == p_b ? 0 : p_a < p_b ? -1 : 1;
-	}; // vtable+0x14
-};
-
-// VTABLE: LEGO1 0x100d64a0
-// class MxListCursor<MxCore *>
-
-// VTABLE: LEGO1 0x100d6500
-// class MxPtrListCursor<MxCore>
-
-// VTABLE: LEGO1 0x100d6518
-// SIZE 0x10
-class MxCoreListCursor : public MxPtrListCursor<MxCore> {
-public:
-	MxCoreListCursor(MxCoreList* p_list) : MxPtrListCursor<MxCore>(p_list){};
-};
-
-// TEMPLATE: LEGO1 0x1001e670
-// MxCollection<MxCore *>::Compare
-
-// TEMPLATE: LEGO1 0x1001e680
-// MxCollection<MxCore *>::~MxCollection<MxCore *>
-
-// TEMPLATE: LEGO1 0x1001e6d0
-// MxCollection<MxCore *>::Destroy
-
-// TEMPLATE: LEGO1 0x1001e6e0
-// MxList<MxCore *>::~MxList<MxCore *>
-
-// TEMPLATE: LEGO1 0x1001e770
-// MxPtrList<MxCore>::Destroy
-
-// SYNTHETIC: LEGO1 0x1001e780
-// MxCoreList::`scalar deleting destructor'
-
-// TEMPLATE: LEGO1 0x1001e7f0
-// MxPtrList<MxCore>::~MxPtrList<MxCore>
-
-// SYNTHETIC: LEGO1 0x1001e840
-// MxCollection<MxCore *>::`scalar deleting destructor'
-
-// SYNTHETIC: LEGO1 0x1001e8b0
-// MxList<MxCore *>::`scalar deleting destructor'
-
-// SYNTHETIC: LEGO1 0x1001e960
-// MxPtrList<MxCore>::`scalar deleting destructor'
-
-// SYNTHETIC: LEGO1 0x1001f350
-// MxCoreListCursor::`scalar deleting destructor'
-
-// FUNCTION: LEGO1 0x1001f3c0
-// MxPtrListCursor<MxCore>::~MxPtrListCursor<MxCore>
-
-// SYNTHETIC: LEGO1 0x1001f410
-// MxListCursor<MxCore *>::`scalar deleting destructor'
-
-// SYNTHETIC: LEGO1 0x1001f480
-// MxPtrListCursor<MxCore>::`scalar deleting destructor'
-
-// FUNCTION: LEGO1 0x1001f4f0
-// MxListCursor<MxCore *>::~MxListCursor<MxCore *>
-
-// FUNCTION: LEGO1 0x1001f540
-// MxCoreListCursor::~MxCoreListCursor
-
-// TEMPLATE: LEGO1 0x10020840
-// MxListCursor<MxCore *>::MxListCursor<MxCore *>
-
-#endif // MXCORELIST_H
diff --git a/LEGO1/omni/include/mxpresenterlist.h b/LEGO1/omni/include/mxpresenterlist.h
index a029a4cf..238dedfb 100644
--- a/LEGO1/omni/include/mxpresenterlist.h
+++ b/LEGO1/omni/include/mxpresenterlist.h
@@ -71,4 +71,7 @@ class MxPresenterListCursor : public MxPtrListCursor<MxPresenter> {
 // SYNTHETIC: LEGO1 0x1001d100
 // MxPresenterList::~MxPresenterList
 
+// TEMPLATE: LEGO1 0x10022380
+// MxList<MxPresenter *>::InsertEntry
+
 #endif // MXPRESENTERLIST_H

From 4df7dee037771e6641e9e6e5eafd4f804d3240ad Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Sat, 27 Jan 2024 10:10:09 -0500
Subject: [PATCH 178/210] Implement/match LegoWorld::Remove (#491)

* Implement/match LegoWorld::Remove

* Fix comparison

* Match 100%
---
 .../legoomni/include/legocachesoundlist.h     | 10 +++-
 LEGO1/lego/legoomni/include/legoentitylist.h  |  3 ++
 LEGO1/lego/legoomni/include/legoworld.h       | 26 ++--------
 LEGO1/lego/legoomni/src/entity/legoworld.cpp  | 52 ++++++++++++++++++-
 LEGO1/omni/include/mxpresenterlist.h          | 24 +++++++++
 5 files changed, 89 insertions(+), 26 deletions(-)

diff --git a/LEGO1/lego/legoomni/include/legocachesoundlist.h b/LEGO1/lego/legoomni/include/legocachesoundlist.h
index 13d8f96c..c97d578f 100644
--- a/LEGO1/lego/legoomni/include/legocachesoundlist.h
+++ b/LEGO1/lego/legoomni/include/legocachesoundlist.h
@@ -74,7 +74,7 @@ class LegoCacheSoundListCursor : public MxPtrListCursor<LegoCacheSound> {
 // SYNTHETIC: LEGO1 0x1001f350
 // LegoCacheSoundListCursor::`scalar deleting destructor'
 
-// FUNCTION: LEGO1 0x1001f3c0
+// TEMPLATE: LEGO1 0x1001f3c0
 // MxPtrListCursor<LegoCacheSound>::~MxPtrListCursor<LegoCacheSound>
 
 // SYNTHETIC: LEGO1 0x1001f410
@@ -83,7 +83,7 @@ class LegoCacheSoundListCursor : public MxPtrListCursor<LegoCacheSound> {
 // SYNTHETIC: LEGO1 0x1001f480
 // MxPtrListCursor<LegoCacheSound>::`scalar deleting destructor'
 
-// FUNCTION: LEGO1 0x1001f4f0
+// TEMPLATE: LEGO1 0x1001f4f0
 // MxListCursor<LegoCacheSound *>::~MxListCursor<LegoCacheSound *>
 
 // FUNCTION: LEGO1 0x1001f540
@@ -95,4 +95,10 @@ class LegoCacheSoundListCursor : public MxPtrListCursor<LegoCacheSound> {
 // TEMPLATE: LEGO1 0x100224e0
 // MxList<LegoCacheSound *>::InsertEntry
 
+// TEMPLATE: LEGO1 0x10022590
+// MxListCursor<LegoCacheSound *>::Find
+
+// TEMPLATE: LEGO1 0x10022680
+// MxList<LegoCacheSound *>::DeleteEntry
+
 #endif // LEGOCACHESOUNDLIST_H
diff --git a/LEGO1/lego/legoomni/include/legoentitylist.h b/LEGO1/lego/legoomni/include/legoentitylist.h
index 4f212279..aa691da8 100644
--- a/LEGO1/lego/legoomni/include/legoentitylist.h
+++ b/LEGO1/lego/legoomni/include/legoentitylist.h
@@ -95,4 +95,7 @@ class LegoEntityListCursor : public MxPtrListCursor<LegoEntity> {
 // TEMPLATE: LEGO1 0x10022430
 // MxList<LegoEntity *>::InsertEntry
 
+// TEMPLATE: LEGO1 0x10022630
+// MxList<LegoEntity *>::DeleteEntry
+
 #endif // LEGOENTITYLIST_H
diff --git a/LEGO1/lego/legoomni/include/legoworld.h b/LEGO1/lego/legoomni/include/legoworld.h
index 074728e3..51b47fbf 100644
--- a/LEGO1/lego/legoomni/include/legoworld.h
+++ b/LEGO1/lego/legoomni/include/legoworld.h
@@ -15,7 +15,7 @@ class LegoPathBoundary;
 class LegoHideAnimPresenter;
 
 struct CoreSetCompare {
-	MxS32 operator()(MxCore* const& p_a, MxCore* const& p_b) const { return p_a > p_b; }
+	MxS32 operator()(MxCore* const& p_a, MxCore* const& p_b) const { return (MxS32) p_a < (MxS32) p_b; }
 };
 
 typedef set<MxCore*, CoreSetCompare> MxCoreSet;
@@ -122,27 +122,6 @@ class LegoWorld : public LegoEntity {
 // TEMPLATE: LEGO1 0x1001df00
 // Set<MxCore *,CoreSetCompare>::~Set<MxCore *,CoreSetCompare>
 
-// SYNTHETIC: LEGO1 0x1001eed0
-// MxPresenterListCursor::`scalar deleting destructor'
-
-// TEMPLATE: LEGO1 0x1001ef40
-// MxPtrListCursor<MxPresenter>::~MxPtrListCursor<MxPresenter>
-
-// SYNTHETIC: LEGO1 0x1001ef90
-// MxListCursor<MxPresenter *>::`scalar deleting destructor'
-
-// SYNTHETIC: LEGO1 0x1001f000
-// MxPtrListCursor<MxPresenter>::`scalar deleting destructor'
-
-// TEMPLATE: LEGO1 0x1001f070
-// MxListCursor<MxPresenter *>::~MxListCursor<MxPresenter *>
-
-// FUNCTION: LEGO1 0x1001f0c0
-// MxPresenterListCursor::~MxPresenterListCursor
-
-// TEMPLATE: LEGO1 0x10020760
-// MxListCursor<MxPresenter *>::MxListCursor<MxPresenter *>
-
 // TEMPLATE: LEGO1 0x100208b0
 // _Tree<MxCore *,MxCore *,set<MxCore *,CoreSetCompare,allocator<MxCore *> >::_Kfn,CoreSetCompare,allocator<MxCore *> >::insert
 
@@ -163,6 +142,9 @@ class LegoWorld : public LegoEntity {
 // TEMPLATE: LEGO1 0x10020eb0
 // _Tree<MxCore *,MxCore *,set<MxCore *,CoreSetCompare,allocator<MxCore *> >::_Kfn,CoreSetCompare,allocator<MxCore *> >::_Rrotate
 
+// TEMPLATE: LEGO1 0x10021340
+// _Tree<MxCore *,MxCore *,set<MxCore *,CoreSetCompare,allocator<MxCore *> >::_Kfn,CoreSetCompare,allocator<MxCore *> >::find
+
 // TEMPLATE: LEGO1 0x10022360
 // _Construct
 
diff --git a/LEGO1/lego/legoomni/src/entity/legoworld.cpp b/LEGO1/lego/legoomni/src/entity/legoworld.cpp
index a39a957e..7454e5cd 100644
--- a/LEGO1/lego/legoomni/src/entity/legoworld.cpp
+++ b/LEGO1/lego/legoomni/src/entity/legoworld.cpp
@@ -7,6 +7,7 @@
 #include "legoutil.h"
 #include "legovideomanager.h"
 #include "mxactionnotificationparam.h"
+#include "mxcontrolpresenter.h"
 #include "mxnotificationmanager.h"
 #include "mxnotificationparam.h"
 #include "mxomni.h"
@@ -215,10 +216,57 @@ void LegoWorld::Add(MxCore* p_object)
 	}
 }
 
-// STUB: LEGO1 0x10020f10
+// FUNCTION: LEGO1 0x10020f10
 void LegoWorld::Remove(MxCore* p_object)
 {
-	// TODO
+	if (p_object) {
+		MxCoreSet::iterator it;
+
+		if (p_object->IsA("MxControlPresenter")) {
+			MxPresenterListCursor cursor(&m_controlPresenters);
+
+			if (cursor.Find((MxControlPresenter*) p_object)) {
+				cursor.Detach();
+				((MxControlPresenter*) p_object)->GetAction()->SetOrigin(Lego());
+				((MxControlPresenter*) p_object)->VTable0x68(TRUE);
+			}
+		}
+		else if (p_object->IsA("LegoLocomotionAnimPresenter") || p_object->IsA("LegoHideAnimPresenter") || p_object->IsA("LegoLoopingAnimPresenter")) {
+			MxPresenterListCursor cursor(&m_animPresenters);
+
+			if (cursor.Find((MxPresenter*) p_object))
+				cursor.Detach();
+
+			if (p_object->IsA("LegoHideAnimPresenter"))
+				m_hideAnimPresenter = NULL;
+		}
+		else if (p_object->IsA("MxEntity")) {
+			if (p_object->IsA("LegoPathActor"))
+				FUN_1001fc80((IslePathActor*) p_object);
+
+			if (m_entityList) {
+				LegoEntityListCursor cursor(m_entityList);
+
+				if (cursor.Find((LegoEntity*) p_object))
+					cursor.Detach();
+			}
+		}
+		else if (p_object->IsA("LegoCacheSound")) {
+			LegoCacheSoundListCursor cursor(m_cacheSoundList);
+
+			if (cursor.Find((LegoCacheSound*) p_object))
+				cursor.Detach();
+		}
+		else {
+			it = m_set0xa8.find(p_object);
+			if (it != m_set0xa8.end())
+				m_set0xa8.erase(it);
+		}
+
+		it = m_set0xd0.find(p_object);
+		if (it != m_set0xd0.end())
+			m_set0xd0.erase(it);
+	}
 }
 
 // FUNCTION: LEGO1 0x100213a0
diff --git a/LEGO1/omni/include/mxpresenterlist.h b/LEGO1/omni/include/mxpresenterlist.h
index 238dedfb..8b22a18b 100644
--- a/LEGO1/omni/include/mxpresenterlist.h
+++ b/LEGO1/omni/include/mxpresenterlist.h
@@ -71,7 +71,31 @@ class MxPresenterListCursor : public MxPtrListCursor<MxPresenter> {
 // SYNTHETIC: LEGO1 0x1001d100
 // MxPresenterList::~MxPresenterList
 
+// SYNTHETIC: LEGO1 0x1001eed0
+// MxPresenterListCursor::`scalar deleting destructor'
+
+// TEMPLATE: LEGO1 0x1001ef40
+// MxPtrListCursor<MxPresenter>::~MxPtrListCursor<MxPresenter>
+
+// SYNTHETIC: LEGO1 0x1001ef90
+// MxListCursor<MxPresenter *>::`scalar deleting destructor'
+
+// SYNTHETIC: LEGO1 0x1001f000
+// MxPtrListCursor<MxPresenter>::`scalar deleting destructor'
+
+// TEMPLATE: LEGO1 0x1001f070
+// MxListCursor<MxPresenter *>::~MxListCursor<MxPresenter *>
+
+// FUNCTION: LEGO1 0x1001f0c0
+// MxPresenterListCursor::~MxPresenterListCursor
+
+// TEMPLATE: LEGO1 0x10020760
+// MxListCursor<MxPresenter *>::MxListCursor<MxPresenter *>
+
 // TEMPLATE: LEGO1 0x10022380
 // MxList<MxPresenter *>::InsertEntry
 
+// TEMPLATE: LEGO1 0x100225e0
+// MxList<MxPresenter *>::DeleteEntry
+
 #endif // MXPRESENTERLIST_H

From 883f3429a73dd79a0902478c5897ff55f2a7c685 Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Sat, 27 Jan 2024 11:48:50 -0500
Subject: [PATCH 179/210] Implement/match LegoWorld::Destroy (and destructor)
 (#492)

* Implement/match LegoWorld::Destroy

* Match

* Match
---
 CMakeLists.txt                                |   1 +
 .../legoomni/include/legobuildingmanager.h    |   1 +
 LEGO1/lego/legoomni/include/legoentity.h      |   4 +-
 .../include/legolocomotionanimpresenter.h     |   8 ++
 .../lego/legoomni/include/legoplantmanager.h  |   1 +
 .../lego/legoomni/include/legosoundmanager.h  |   7 +-
 .../legoomni/include/legounknown100d6b4c.h    |  15 +++
 LEGO1/lego/legoomni/include/legoworld.h       |   5 +-
 .../src/audio/legounknown100d6b4c.cpp         |   7 +
 .../src/build/legobuildingmanager.cpp         |   6 +
 .../legoomni/src/common/legoplantmanager.cpp  |   6 +
 LEGO1/lego/legoomni/src/entity/legoworld.cpp  | 125 +++++++++++++++++-
 12 files changed, 177 insertions(+), 9 deletions(-)
 create mode 100644 LEGO1/lego/legoomni/include/legounknown100d6b4c.h
 create mode 100644 LEGO1/lego/legoomni/src/audio/legounknown100d6b4c.cpp

diff --git a/CMakeLists.txt b/CMakeLists.txt
index da1c41f6..388c4777 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -225,6 +225,7 @@ add_library(lego1 SHARED
   LEGO1/lego/legoomni/src/audio/legocachesound.cpp
   LEGO1/lego/legoomni/src/audio/legoloadcachesoundpresenter.cpp
   LEGO1/lego/legoomni/src/audio/legosoundmanager.cpp
+  LEGO1/lego/legoomni/src/audio/legounknown100d6b4c.cpp
   LEGO1/lego/legoomni/src/audio/mxbackgroundaudiomanager.cpp
   LEGO1/lego/legoomni/src/build/buildingentity.cpp
   LEGO1/lego/legoomni/src/build/dunebuggy.cpp
diff --git a/LEGO1/lego/legoomni/include/legobuildingmanager.h b/LEGO1/lego/legoomni/include/legobuildingmanager.h
index d96d9583..7bde7ad9 100644
--- a/LEGO1/lego/legoomni/include/legobuildingmanager.h
+++ b/LEGO1/lego/legoomni/include/legobuildingmanager.h
@@ -22,6 +22,7 @@ class LegoBuildingManager : public MxCore {
 	static void configureLegoBuildingManager(MxS32);
 
 	void FUN_1002fa00();
+	void FUN_1002fb30();
 
 	// SYNTHETIC: LEGO1 0x1002f940
 	// LegoBuildingManager::`scalar deleting destructor'
diff --git a/LEGO1/lego/legoomni/include/legoentity.h b/LEGO1/lego/legoomni/include/legoentity.h
index 12b1ecf1..99813972 100644
--- a/LEGO1/lego/legoomni/include/legoentity.h
+++ b/LEGO1/lego/legoomni/include/legoentity.h
@@ -13,7 +13,8 @@
 class LegoEntity : public MxEntity {
 public:
 	enum {
-		c_bit1 = 0x01
+		c_bit1 = 0x01,
+		c_bit2 = 0x02
 	};
 
 	// Inlined at 0x100853f7
@@ -58,6 +59,7 @@ class LegoEntity : public MxEntity {
 	void SetLocation(Mx3DPointFloat& p_location, Mx3DPointFloat& p_direction, Mx3DPointFloat& p_up, MxBool);
 
 	inline LegoROI* GetROI() { return m_roi; }
+	inline MxU8 GetFlags() { return m_flags; }
 
 protected:
 	void Init();
diff --git a/LEGO1/lego/legoomni/include/legolocomotionanimpresenter.h b/LEGO1/lego/legoomni/include/legolocomotionanimpresenter.h
index cb7e3334..ab3da3eb 100644
--- a/LEGO1/lego/legoomni/include/legolocomotionanimpresenter.h
+++ b/LEGO1/lego/legoomni/include/legolocomotionanimpresenter.h
@@ -35,6 +35,14 @@ class LegoLocomotionAnimPresenter : public LegoLoopingAnimPresenter {
 	// SYNTHETIC: LEGO1 0x1006cfe0
 	// LegoLocomotionAnimPresenter::`scalar deleting destructor'
 
+	inline void DecrementUnknown0xd4()
+	{
+		if (m_unk0xd4)
+			--m_unk0xd4;
+	}
+
+	inline undefined2 GetUnknown0xd4() { return m_unk0xd4; }
+
 private:
 	void Init();
 	void Destroy(MxBool p_fromDestructor);
diff --git a/LEGO1/lego/legoomni/include/legoplantmanager.h b/LEGO1/lego/legoomni/include/legoplantmanager.h
index e199f11b..a47825f3 100644
--- a/LEGO1/lego/legoomni/include/legoplantmanager.h
+++ b/LEGO1/lego/legoomni/include/legoplantmanager.h
@@ -21,6 +21,7 @@ class LegoPlantManager : public MxCore {
 	}
 
 	void FUN_10026360(undefined4 p_world);
+	void FUN_100263a0(undefined4 p_und);
 
 	// SYNTHETIC: LEGO1 0x100262a0
 	// LegoPlantManager::`scalar deleting destructor'
diff --git a/LEGO1/lego/legoomni/include/legosoundmanager.h b/LEGO1/lego/legoomni/include/legosoundmanager.h
index 0e4bbbbd..b1afffe3 100644
--- a/LEGO1/lego/legoomni/include/legosoundmanager.h
+++ b/LEGO1/lego/legoomni/include/legosoundmanager.h
@@ -1,6 +1,7 @@
 #ifndef LEGOSOUNDMANAGER_H
 #define LEGOSOUNDMANAGER_H
 
+#include "legounknown100d6b4c.h"
 #include "mxsoundmanager.h"
 
 // VTABLE: LEGO1 0x100d6b10
@@ -17,12 +18,14 @@ class LegoSoundManager : public MxSoundManager {
 	// SYNTHETIC: LEGO1 0x10029920
 	// LegoSoundManager::`scalar deleting destructor'
 
+	inline LegoUnknown100d6b4c* GetUnknown0x40() { return m_unk0x40; }
+
 private:
 	void Init();
 	void Destroy(MxBool p_fromDestructor);
 
-	undefined4 m_unk0x3c;
-	undefined4 m_unk0x40;
+	undefined4 m_unk0x3c;           // 0x3c
+	LegoUnknown100d6b4c* m_unk0x40; // 0x40
 };
 
 #endif // LEGOSOUNDMANAGER_H
diff --git a/LEGO1/lego/legoomni/include/legounknown100d6b4c.h b/LEGO1/lego/legoomni/include/legounknown100d6b4c.h
new file mode 100644
index 00000000..9b10bd50
--- /dev/null
+++ b/LEGO1/lego/legoomni/include/legounknown100d6b4c.h
@@ -0,0 +1,15 @@
+#ifndef LEGOUNKNOWN100D6B4C_H
+#define LEGOUNKNOWN100D6B4C_H
+
+#include "decomp.h"
+
+class LegoCacheSound;
+
+// VTABLE: LEGO1 0x100d6b4c
+// SIZE 0x20
+class LegoUnknown100d6b4c {
+public:
+	void FUN_1003dc40(LegoCacheSound** p_und);
+};
+
+#endif // LEGOUNKNOWN100D6B4C_H
diff --git a/LEGO1/lego/legoomni/include/legoworld.h b/LEGO1/lego/legoomni/include/legoworld.h
index 51b47fbf..2e0fcee6 100644
--- a/LEGO1/lego/legoomni/include/legoworld.h
+++ b/LEGO1/lego/legoomni/include/legoworld.h
@@ -79,7 +79,7 @@ class LegoWorld : public LegoEntity {
 	LegoCameraController* m_cameraController;   // 0x98
 	LegoEntityList* m_entityList;               // 0x9c
 	LegoCacheSoundList* m_cacheSoundList;       // 0xa0
-	undefined m_unk0xa4;                        // 0xa4
+	MxBool m_destroyed;                         // 0xa4
 	MxCoreSet m_set0xa8;                        // 0xa8
 	MxPresenterList m_controlPresenters;        // 0xb8
 	MxCoreSet m_set0xd0;                        // 0xd0
@@ -122,6 +122,9 @@ class LegoWorld : public LegoEntity {
 // TEMPLATE: LEGO1 0x1001df00
 // Set<MxCore *,CoreSetCompare>::~Set<MxCore *,CoreSetCompare>
 
+// TEMPLATE: LEGO1 0x1001f590
+// list<AutoROI *,allocator<AutoROI *> >::erase
+
 // TEMPLATE: LEGO1 0x100208b0
 // _Tree<MxCore *,MxCore *,set<MxCore *,CoreSetCompare,allocator<MxCore *> >::_Kfn,CoreSetCompare,allocator<MxCore *> >::insert
 
diff --git a/LEGO1/lego/legoomni/src/audio/legounknown100d6b4c.cpp b/LEGO1/lego/legoomni/src/audio/legounknown100d6b4c.cpp
new file mode 100644
index 00000000..2ed5f178
--- /dev/null
+++ b/LEGO1/lego/legoomni/src/audio/legounknown100d6b4c.cpp
@@ -0,0 +1,7 @@
+#include "legounknown100d6b4c.h"
+
+// STUB: LEGO1 0x1003dc40
+void LegoUnknown100d6b4c::FUN_1003dc40(LegoCacheSound** p_und)
+{
+	// TODO
+}
diff --git a/LEGO1/lego/legoomni/src/build/legobuildingmanager.cpp b/LEGO1/lego/legoomni/src/build/legobuildingmanager.cpp
index ed890166..cb5fad99 100644
--- a/LEGO1/lego/legoomni/src/build/legobuildingmanager.cpp
+++ b/LEGO1/lego/legoomni/src/build/legobuildingmanager.cpp
@@ -33,6 +33,12 @@ void LegoBuildingManager::FUN_1002fa00()
 	// TODO
 }
 
+// STUB: LEGO1 0x1002fb30
+void LegoBuildingManager::FUN_1002fb30()
+{
+	// TODO
+}
+
 // STUB: LEGO1 0x10030220
 MxResult LegoBuildingManager::Tickle()
 {
diff --git a/LEGO1/lego/legoomni/src/common/legoplantmanager.cpp b/LEGO1/lego/legoomni/src/common/legoplantmanager.cpp
index 193f5c8a..ec04cf6a 100644
--- a/LEGO1/lego/legoomni/src/common/legoplantmanager.cpp
+++ b/LEGO1/lego/legoomni/src/common/legoplantmanager.cpp
@@ -24,6 +24,12 @@ void LegoPlantManager::FUN_10026360(undefined4 p_world)
 	// TODO
 }
 
+// STUB: LEGO1 0x100263a0
+void LegoPlantManager::FUN_100263a0(undefined4 p_und)
+{
+	// TODO
+}
+
 // STUB: LEGO1 0x10026e00
 MxResult LegoPlantManager::Tickle()
 {
diff --git a/LEGO1/lego/legoomni/src/entity/legoworld.cpp b/LEGO1/lego/legoomni/src/entity/legoworld.cpp
index 7454e5cd..e2a912ef 100644
--- a/LEGO1/lego/legoomni/src/entity/legoworld.cpp
+++ b/LEGO1/lego/legoomni/src/entity/legoworld.cpp
@@ -1,9 +1,13 @@
 #include "legoworld.h"
 
 #include "legoanimpresenter.h"
+#include "legobuildingmanager.h"
 #include "legocontrolmanager.h"
 #include "legoinputmanager.h"
+#include "legolocomotionanimpresenter.h"
 #include "legoomni.h"
+#include "legoplantmanager.h"
+#include "legosoundmanager.h"
 #include "legoutil.h"
 #include "legovideomanager.h"
 #include "mxactionnotificationparam.h"
@@ -26,7 +30,7 @@ LegoWorld::LegoWorld() : m_list0x68(TRUE)
 	m_cameraController = NULL;
 	m_entityList = NULL;
 	m_cacheSoundList = NULL;
-	m_unk0xa4 = 0; // MxBool?
+	m_destroyed = FALSE;
 	m_hideAnimPresenter = NULL;
 	m_worldStarted = FALSE;
 
@@ -45,10 +49,13 @@ MxBool LegoWorld::VTable0x64()
 	return FALSE;
 }
 
-// STUB: LEGO1 0x1001dfa0
+// FUNCTION: LEGO1 0x1001dfa0
 LegoWorld::~LegoWorld()
 {
-	// TODO
+	Destroy(TRUE);
+
+	TickleManager()->UnregisterClient(this);
+	NotificationManager()->Unregister(this);
 }
 
 // FUNCTION: LEGO1 0x1001e0b0
@@ -84,10 +91,118 @@ MxResult LegoWorld::Create(MxDSAction& p_dsAction)
 	return SUCCESS;
 }
 
-// STUB: LEGO1 0x1001e9d0
+// FUNCTION: LEGO1 0x1001e9d0
 void LegoWorld::Destroy(MxBool p_fromDestructor)
 {
-	// TODO
+	m_destroyed = TRUE;
+
+	if (GetCurrentWorld() == this) {
+		ControlManager()->FUN_10028df0(NULL);
+		SetCurrentWorld(NULL);
+	}
+
+	m_list0x68.DeleteAll();
+
+	if (m_cameraController) {
+		delete m_cameraController;
+		m_cameraController = NULL;
+	}
+
+	MxPresenterListCursor animPresenterCursor(&m_animPresenters);
+	MxPresenter* presenter;
+
+	while (animPresenterCursor.First(presenter)) {
+		animPresenterCursor.Detach();
+
+		MxDSAction* action = presenter->GetAction();
+		if (action) {
+			if (presenter->IsA("LegoLocomotionAnimPresenter")) {
+				LegoLocomotionAnimPresenter* animPresenter = (LegoLocomotionAnimPresenter*) presenter;
+
+				animPresenter->DecrementUnknown0xd4();
+				if (animPresenter->GetUnknown0xd4() == 0) {
+					FUN_100b7220(action, MxDSAction::c_world, FALSE);
+					presenter->EndAction();
+				}
+			}
+			else {
+				FUN_100b7220(action, MxDSAction::c_world, FALSE);
+				presenter->EndAction();
+			}
+		}
+	}
+
+	while (!m_set0xa8.empty()) {
+		MxCoreSet::iterator it = m_set0xa8.begin();
+		MxCore* object = *it;
+		m_set0xa8.erase(it);
+
+		if (object->IsA("MxPresenter")) {
+			MxPresenter* presenter = (MxPresenter*) object;
+			MxDSAction* action = presenter->GetAction();
+
+			if (action) {
+				FUN_100b7220(action, MxDSAction::c_world, FALSE);
+				presenter->EndAction();
+			}
+		}
+		else
+			delete object;
+	}
+
+	MxPresenterListCursor controlPresenterCursor(&m_controlPresenters);
+
+	while (controlPresenterCursor.First(presenter)) {
+		controlPresenterCursor.Detach();
+
+		MxDSAction* action = presenter->GetAction();
+		if (action) {
+			FUN_100b7220(action, MxDSAction::c_world, FALSE);
+			presenter->EndAction();
+		}
+	}
+
+	if (m_unk0xec != -1 && m_set0xd0.empty()) {
+		PlantManager()->FUN_100263a0(m_unk0xec);
+		BuildingManager()->FUN_1002fb30();
+	}
+
+	if (m_entityList) {
+		LegoEntityListCursor cursor(m_entityList);
+		LegoEntity* entity;
+
+		while (cursor.First(entity)) {
+			cursor.Detach();
+
+			if (!(entity->GetFlags() & LegoEntity::c_bit2))
+				delete entity;
+		}
+
+		delete m_entityList;
+		m_entityList = NULL;
+	}
+
+	if (m_cacheSoundList) {
+		LegoCacheSoundListCursor cursor(m_cacheSoundList);
+		LegoCacheSound* sound;
+
+		while (cursor.First(sound)) {
+			cursor.Detach();
+			SoundManager()->GetUnknown0x40()->FUN_1003dc40(&sound);
+		}
+
+		delete m_cacheSoundList;
+		m_cacheSoundList = NULL;
+	}
+
+	while (!m_list0xe0.empty()) {
+		AutoROI* roi = m_list0xe0.front();
+		m_list0xe0.pop_front();
+		delete roi;
+	}
+
+	if (!p_fromDestructor)
+		LegoEntity::Destroy(FALSE);
 }
 
 // FUNCTION: LEGO1 0x1001f5e0

From fadf8e7fd5e22b655169e1584f0e4894915b0917 Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Sat, 27 Jan 2024 12:15:14 -0500
Subject: [PATCH 180/210] Move some functions from LegoWorld to Act3 (#493)

---
 LEGO1/lego/legoomni/include/act3.h           |  5 +++++
 LEGO1/lego/legoomni/include/legoworld.h      |  4 ----
 LEGO1/lego/legoomni/src/act3/act3.cpp        | 22 ++++++++++++++++++++
 LEGO1/lego/legoomni/src/build/helicopter.cpp |  8 +++----
 LEGO1/lego/legoomni/src/entity/legoworld.cpp | 22 --------------------
 5 files changed, 31 insertions(+), 30 deletions(-)

diff --git a/LEGO1/lego/legoomni/include/act3.h b/LEGO1/lego/legoomni/include/act3.h
index b693663f..9153ae05 100644
--- a/LEGO1/lego/legoomni/include/act3.h
+++ b/LEGO1/lego/legoomni/include/act3.h
@@ -41,6 +41,11 @@ class Act3 : public LegoWorld {
 	// SYNTHETIC: LEGO1 0x10072630
 	// Act3::`scalar deleting destructor'
 
+	MxBool FUN_100727e0(MxU32, Mx3DPointFloat& p_loc, Mx3DPointFloat& p_dir, Mx3DPointFloat& p_up);
+	MxBool FUN_10072980(MxU32, Mx3DPointFloat& p_loc, Mx3DPointFloat& p_dir, Mx3DPointFloat& p_up);
+	void FUN_10073400();
+	void FUN_10073430();
+
 protected:
 	undefined m_unk0xf8[0x4114]; // 0xf8
 	MxEntity* m_unk0x420c;       // 0x420c
diff --git a/LEGO1/lego/legoomni/include/legoworld.h b/LEGO1/lego/legoomni/include/legoworld.h
index 2e0fcee6..a57bf110 100644
--- a/LEGO1/lego/legoomni/include/legoworld.h
+++ b/LEGO1/lego/legoomni/include/legoworld.h
@@ -62,10 +62,6 @@ class LegoWorld : public LegoEntity {
 	undefined FUN_100220e0();
 	void Remove(MxCore* p_object);
 	void FUN_1001fc80(IslePathActor* p_actor);
-	MxBool FUN_100727e0(MxU32, Mx3DPointFloat& p_loc, Mx3DPointFloat& p_dir, Mx3DPointFloat& p_up);
-	MxBool FUN_10072980(MxU32, Mx3DPointFloat& p_loc, Mx3DPointFloat& p_dir, Mx3DPointFloat& p_up);
-	void FUN_10073400();
-	void FUN_10073430();
 	MxS32 GetCurrPathInfo(LegoPathBoundary** p_path, MxS32& p_value);
 	MxCore* Find(const char* p_class, const char* p_name);
 	MxCore* Find(const MxAtomId& p_atom, MxS32 p_entityId);
diff --git a/LEGO1/lego/legoomni/src/act3/act3.cpp b/LEGO1/lego/legoomni/src/act3/act3.cpp
index e17db3dc..f23202f2 100644
--- a/LEGO1/lego/legoomni/src/act3/act3.cpp
+++ b/LEGO1/lego/legoomni/src/act3/act3.cpp
@@ -21,6 +21,18 @@ Act3::~Act3()
 	// TODO
 }
 
+// STUB: LEGO1 0x100727e0
+MxBool Act3::FUN_100727e0(MxU32, Mx3DPointFloat& p_loc, Mx3DPointFloat& p_dir, Mx3DPointFloat& p_up)
+{
+	return FALSE;
+}
+
+// STUB: LEGO1 0x10072980
+MxBool Act3::FUN_10072980(MxU32, Mx3DPointFloat& p_loc, Mx3DPointFloat& p_dir, Mx3DPointFloat& p_up)
+{
+	return FALSE;
+}
+
 // STUB: LEGO1 0x10072c30
 MxResult Act3::Create(MxDSAction& p_dsAction)
 {
@@ -54,6 +66,16 @@ MxResult Act3::Tickle()
 	return SUCCESS;
 }
 
+// STUB: LEGO1 0x10073400
+void Act3::FUN_10073400()
+{
+}
+
+// STUB: LEGO1 0x10073430
+void Act3::FUN_10073430()
+{
+}
+
 // STUB: LEGO1 0x10073a90
 void Act3::VTable0x68(MxBool p_add)
 {
diff --git a/LEGO1/lego/legoomni/src/build/helicopter.cpp b/LEGO1/lego/legoomni/src/build/helicopter.cpp
index 3bf55354..2a1d1e06 100644
--- a/LEGO1/lego/legoomni/src/build/helicopter.cpp
+++ b/LEGO1/lego/legoomni/src/build/helicopter.cpp
@@ -197,9 +197,9 @@ MxU32 Helicopter::VTable0xd4(MxType17NotificationParam& p_param)
 				va4.EqualsCross(v68, dir);
 				v7c.EqualsCross(va4, v90);
 				if (ret)
-					if (m_world->FUN_100727e0(m_unk0x138, loc, dir, v7c))
+					if (((Act3*) m_world)->FUN_100727e0(m_unk0x138, loc, dir, v7c))
 						break;
-					else if (m_world->FUN_10072980(m_unk0x138, loc, dir, v7c))
+					else if (((Act3*) m_world)->FUN_10072980(m_unk0x138, loc, dir, v7c))
 						break;
 			}
 			ret = 1;
@@ -329,9 +329,9 @@ void Helicopter::VTable0x70(float p_float)
 		}
 		else {
 			if (state == 4)
-				m_world->FUN_10073400();
+				((Act3*) m_world)->FUN_10073400();
 			else
-				m_world->FUN_10073430();
+				((Act3*) m_world)->FUN_10073430();
 			m_unk0xdc = 4;
 		}
 	}
diff --git a/LEGO1/lego/legoomni/src/entity/legoworld.cpp b/LEGO1/lego/legoomni/src/entity/legoworld.cpp
index e2a912ef..002b6f5d 100644
--- a/LEGO1/lego/legoomni/src/entity/legoworld.cpp
+++ b/LEGO1/lego/legoomni/src/entity/legoworld.cpp
@@ -522,25 +522,3 @@ void LegoWorld::VTable0x50()
 {
 	TickleManager()->UnregisterClient(this);
 }
-
-// STUB: LEGO1 0x100727e0
-MxBool LegoWorld::FUN_100727e0(MxU32, Mx3DPointFloat& p_loc, Mx3DPointFloat& p_dir, Mx3DPointFloat& p_up)
-{
-	return FALSE;
-}
-
-// STUB: LEGO1 0x10072980
-MxBool LegoWorld::FUN_10072980(MxU32, Mx3DPointFloat& p_loc, Mx3DPointFloat& p_dir, Mx3DPointFloat& p_up)
-{
-	return FALSE;
-}
-
-// STUB: LEGO1 0x10073400
-void LegoWorld::FUN_10073400()
-{
-}
-
-// STUB: LEGO1 0x10073430
-void LegoWorld::FUN_10073430()
-{
-}

From 19c771b85dd4c754adc53d48eed07e22af06c060 Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Sat, 27 Jan 2024 15:18:35 -0500
Subject: [PATCH 181/210] Implement/match LegoWorld::PresentersPending (#494)

* Implement/match LegoWorld::PresentersPending

* Rename functions
---
 LEGO1/lego/legoomni/include/act3.h            |  2 +-
 LEGO1/lego/legoomni/include/carrace.h         |  2 +-
 LEGO1/lego/legoomni/include/elevatorbottom.h  |  2 +-
 LEGO1/lego/legoomni/include/gasstation.h      |  2 +-
 LEGO1/lego/legoomni/include/historybook.h     |  2 +-
 LEGO1/lego/legoomni/include/hospital.h        |  2 +-
 LEGO1/lego/legoomni/include/infocenter.h      |  2 +-
 LEGO1/lego/legoomni/include/infocenterdoor.h  |  2 +-
 LEGO1/lego/legoomni/include/isle.h            |  2 +-
 LEGO1/lego/legoomni/include/jukebox.h         |  2 +-
 LEGO1/lego/legoomni/include/legoact2.h        |  2 +-
 LEGO1/lego/legoomni/include/legocarbuild.h    |  2 +-
 LEGO1/lego/legoomni/include/legoworld.h       | 14 ++++-
 LEGO1/lego/legoomni/include/police.h          |  2 +-
 .../lego/legoomni/include/registrationbook.h  |  2 +-
 LEGO1/lego/legoomni/include/score.h           |  2 +-
 LEGO1/lego/legoomni/src/act2/legoact2.cpp     |  2 +-
 LEGO1/lego/legoomni/src/act3/act3.cpp         |  2 +-
 .../lego/legoomni/src/build/legocarbuild.cpp  |  2 +-
 LEGO1/lego/legoomni/src/entity/legoworld.cpp  | 55 +++++++++++++++----
 .../legoomni/src/gasstation/gasstation.cpp    |  2 +-
 LEGO1/lego/legoomni/src/hospital/hospital.cpp |  2 +-
 .../src/infocenter/elevatorbottom.cpp         |  4 +-
 .../legoomni/src/infocenter/infocenter.cpp    |  2 +-
 .../src/infocenter/infocenterdoor.cpp         |  4 +-
 .../src/infocenter/registrationbook.cpp       |  2 +-
 LEGO1/lego/legoomni/src/infocenter/score.cpp  |  4 +-
 LEGO1/lego/legoomni/src/isle/historybook.cpp  |  2 +-
 LEGO1/lego/legoomni/src/isle/isle.cpp         |  4 +-
 LEGO1/lego/legoomni/src/isle/jukebox.cpp      |  2 +-
 LEGO1/lego/legoomni/src/police/police.cpp     |  4 +-
 LEGO1/lego/legoomni/src/race/carrace.cpp      |  2 +-
 32 files changed, 90 insertions(+), 49 deletions(-)

diff --git a/LEGO1/lego/legoomni/include/act3.h b/LEGO1/lego/legoomni/include/act3.h
index 9153ae05..f9794f7c 100644
--- a/LEGO1/lego/legoomni/include/act3.h
+++ b/LEGO1/lego/legoomni/include/act3.h
@@ -29,7 +29,7 @@ class Act3 : public LegoWorld {
 
 	virtual MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
 	virtual void Destroy(MxBool p_fromDestructor) override;   // vtable+0x1c
-	virtual void VTable0x50() override;                       // vtable+0x50
+	virtual void ReadyWorld() override;                       // vtable+0x50
 	virtual MxBool VTable0x5c() override;                     // vtable+0x5c
 	virtual void VTable0x60() override;                       // vtable+0x60
 	virtual MxBool VTable0x64() override;                     // vtable+0x64
diff --git a/LEGO1/lego/legoomni/include/carrace.h b/LEGO1/lego/legoomni/include/carrace.h
index 776662db..42a981bc 100644
--- a/LEGO1/lego/legoomni/include/carrace.h
+++ b/LEGO1/lego/legoomni/include/carrace.h
@@ -24,7 +24,7 @@ class CarRace : public LegoRace {
 	}
 
 	virtual MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
-	virtual void VTable0x50() override;                       // vtable+0x50
+	virtual void ReadyWorld() override;                       // vtable+0x50
 	virtual MxBool VTable0x64() override;                     // vtable+0x64
 	virtual undefined4 VTable0x6c(undefined4) override;       // vtable+0x6c
 	virtual undefined4 VTable0x70(undefined4) override;       // vtable+0x70
diff --git a/LEGO1/lego/legoomni/include/elevatorbottom.h b/LEGO1/lego/legoomni/include/elevatorbottom.h
index 1f02d28f..5bf8bced 100644
--- a/LEGO1/lego/legoomni/include/elevatorbottom.h
+++ b/LEGO1/lego/legoomni/include/elevatorbottom.h
@@ -27,7 +27,7 @@ class ElevatorBottom : public LegoWorld {
 	}
 
 	virtual MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
-	virtual void VTable0x50() override;                       // vtable+0x50
+	virtual void ReadyWorld() override;                       // vtable+0x50
 
 	// FUNCTION: LEGO1 0x10017f10
 	virtual MxBool VTable0x5c() override { return TRUE; } // vtable+0x5c
diff --git a/LEGO1/lego/legoomni/include/gasstation.h b/LEGO1/lego/legoomni/include/gasstation.h
index 5f6c64f1..9efb8886 100644
--- a/LEGO1/lego/legoomni/include/gasstation.h
+++ b/LEGO1/lego/legoomni/include/gasstation.h
@@ -30,7 +30,7 @@ class GasStation : public LegoWorld {
 	}
 
 	virtual MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
-	virtual void VTable0x50() override;                       // vtable+0x50
+	virtual void ReadyWorld() override;                       // vtable+0x50
 	virtual MxBool VTable0x5c() override;                     // vtable+0x5c
 	virtual MxBool VTable0x64() override;                     // vtable+0x64
 	virtual void VTable0x68(MxBool p_add) override;           // vtable+0x68
diff --git a/LEGO1/lego/legoomni/include/historybook.h b/LEGO1/lego/legoomni/include/historybook.h
index 172dde98..a5299f63 100644
--- a/LEGO1/lego/legoomni/include/historybook.h
+++ b/LEGO1/lego/legoomni/include/historybook.h
@@ -26,7 +26,7 @@ class HistoryBook : public LegoWorld {
 	}
 
 	virtual MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
-	virtual void VTable0x50() override;                       // vtable+0x50
+	virtual void ReadyWorld() override;                       // vtable+0x50
 	virtual MxBool VTable0x64() override;                     // vtable+0x64
 
 	// SYNTHETIC: LEGO1 0x100824b0
diff --git a/LEGO1/lego/legoomni/include/hospital.h b/LEGO1/lego/legoomni/include/hospital.h
index 3e88a58a..194cb690 100644
--- a/LEGO1/lego/legoomni/include/hospital.h
+++ b/LEGO1/lego/legoomni/include/hospital.h
@@ -28,7 +28,7 @@ class Hospital : public LegoWorld {
 	}
 
 	virtual MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
-	virtual void VTable0x50() override;                       // vtable+0x50
+	virtual void ReadyWorld() override;                       // vtable+0x50
 	virtual MxBool VTable0x5c() override;                     // vtable+0x5c
 	virtual MxBool VTable0x64() override;                     // vtable+0x64
 	virtual void VTable0x68(MxBool p_add) override;           // vtable+0x68
diff --git a/LEGO1/lego/legoomni/include/infocenter.h b/LEGO1/lego/legoomni/include/infocenter.h
index 5de2f745..fe6efff8 100644
--- a/LEGO1/lego/legoomni/include/infocenter.h
+++ b/LEGO1/lego/legoomni/include/infocenter.h
@@ -149,7 +149,7 @@ class Infocenter : public LegoWorld {
 	}
 
 	virtual MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
-	virtual void VTable0x50() override;                       // vtable+0x50
+	virtual void ReadyWorld() override;                       // vtable+0x50
 	virtual MxBool VTable0x5c() override;                     // vtable+0x5c
 	virtual MxBool VTable0x64() override;                     // vtable+0x64
 	virtual void VTable0x68(MxBool p_add) override;           // vtable+0x68
diff --git a/LEGO1/lego/legoomni/include/infocenterdoor.h b/LEGO1/lego/legoomni/include/infocenterdoor.h
index 1890f0b1..de3159f6 100644
--- a/LEGO1/lego/legoomni/include/infocenterdoor.h
+++ b/LEGO1/lego/legoomni/include/infocenterdoor.h
@@ -26,7 +26,7 @@ class InfocenterDoor : public LegoWorld {
 	}
 
 	virtual MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
-	virtual void VTable0x50() override;                       // vtable+0x50
+	virtual void ReadyWorld() override;                       // vtable+0x50
 
 	// FUNCTION: LEGO1 0x100377a0
 	virtual MxBool VTable0x5c() override { return TRUE; } // vtable+0x5c
diff --git a/LEGO1/lego/legoomni/include/isle.h b/LEGO1/lego/legoomni/include/isle.h
index e91982ee..148e099f 100644
--- a/LEGO1/lego/legoomni/include/isle.h
+++ b/LEGO1/lego/legoomni/include/isle.h
@@ -40,7 +40,7 @@ class Isle : public LegoWorld {
 	}
 
 	virtual MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
-	virtual void VTable0x50() override;                       // vtable+50
+	virtual void ReadyWorld() override;                       // vtable+50
 	virtual void Add(MxCore* p_object) override;              // vtable+58
 	// FUNCTION: LEGO1 0x10030900
 	virtual MxBool VTable0x5c() override { return TRUE; } // vtable+5c
diff --git a/LEGO1/lego/legoomni/include/jukebox.h b/LEGO1/lego/legoomni/include/jukebox.h
index 7ee46589..9710a841 100644
--- a/LEGO1/lego/legoomni/include/jukebox.h
+++ b/LEGO1/lego/legoomni/include/jukebox.h
@@ -27,7 +27,7 @@ class JukeBox : public LegoWorld {
 	}
 
 	virtual MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
-	virtual void VTable0x50() override;                       // vtable+0x50
+	virtual void ReadyWorld() override;                       // vtable+0x50
 	virtual MxBool VTable0x5c() override;                     // vtable+0x5c
 	virtual MxBool VTable0x64() override;                     // vtable+0x64
 	virtual void VTable0x68(MxBool p_add) override;           // vtable+0x68
diff --git a/LEGO1/lego/legoomni/include/legoact2.h b/LEGO1/lego/legoomni/include/legoact2.h
index 4918fa76..0ac22875 100644
--- a/LEGO1/lego/legoomni/include/legoact2.h
+++ b/LEGO1/lego/legoomni/include/legoact2.h
@@ -12,7 +12,7 @@ class LegoAct2 : public LegoWorld {
 	virtual MxLong Notify(MxParam& p_param) override;         // vtable+0x04
 	virtual MxResult Tickle() override;                       // vtable+0x08
 	virtual MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
-	virtual void VTable0x50() override;                       // vtable+0x50
+	virtual void ReadyWorld() override;                       // vtable+0x50
 	virtual MxBool VTable0x5c() override;                     // vtable+0x5c
 	virtual void VTable0x60() override;                       // vtable+0x60
 	virtual MxBool VTable0x64() override;                     // vtable+0x64
diff --git a/LEGO1/lego/legoomni/include/legocarbuild.h b/LEGO1/lego/legoomni/include/legocarbuild.h
index 70db5856..cfe4990d 100644
--- a/LEGO1/lego/legoomni/include/legocarbuild.h
+++ b/LEGO1/lego/legoomni/include/legocarbuild.h
@@ -27,7 +27,7 @@ class LegoCarBuild : public LegoWorld {
 	}
 
 	virtual MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
-	virtual void VTable0x50() override;                       // vtable+0x50
+	virtual void ReadyWorld() override;                       // vtable+0x50
 	virtual MxBool VTable0x5c() override;                     // vtable+0x5c
 	virtual MxBool VTable0x64() override;                     // vtable+0x64
 	virtual void VTable0x68(MxBool p_add) override;           // vtable+0x68
diff --git a/LEGO1/lego/legoomni/include/legoworld.h b/LEGO1/lego/legoomni/include/legoworld.h
index a57bf110..b6176067 100644
--- a/LEGO1/lego/legoomni/include/legoworld.h
+++ b/LEGO1/lego/legoomni/include/legoworld.h
@@ -24,6 +24,14 @@ typedef set<MxCore*, CoreSetCompare> MxCoreSet;
 // SIZE 0xf8
 class LegoWorld : public LegoEntity {
 public:
+	enum StartupTicks {
+		e_start = 0,
+		e_one,
+		e_two,
+		e_three,
+		e_four
+	};
+
 	LegoWorld();
 	virtual ~LegoWorld() override; // vtable+0x0
 
@@ -45,7 +53,7 @@ class LegoWorld : public LegoEntity {
 
 	virtual MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
 	virtual void Destroy(MxBool p_fromDestructor) override;   // vtable+0x1c
-	virtual void VTable0x50();                                // vtable+0x50
+	virtual void ReadyWorld();                                // vtable+0x50
 	virtual LegoCameraController* VTable0x54();               // vtable+0x54
 	virtual void Add(MxCore* p_object);                       // vtable+0x58
 	virtual MxBool VTable0x5c();                              // vtable+0x5c
@@ -59,7 +67,7 @@ class LegoWorld : public LegoEntity {
 	inline LegoCameraController* GetCamera() { return m_cameraController; }
 	inline undefined4 GetUnknown0xec() { return m_unk0xec; }
 
-	undefined FUN_100220e0();
+	MxBool PresentersPending();
 	void Remove(MxCore* p_object);
 	void FUN_1001fc80(IslePathActor* p_actor);
 	MxS32 GetCurrPathInfo(LegoPathBoundary** p_path, MxS32& p_value);
@@ -82,7 +90,7 @@ class LegoWorld : public LegoEntity {
 	list<AutoROI*> m_list0xe0;                  // 0xe0
 	undefined4 m_unk0xec;                       // 0xec
 	LegoHideAnimPresenter* m_hideAnimPresenter; // 0xf0
-	MxS16 m_unk0xf4;                            // 0xf4
+	MxS16 m_startupTicks;                       // 0xf4
 	MxBool m_worldStarted;                      // 0xf6
 	undefined m_unk0xf7;                        // 0xf7
 };
diff --git a/LEGO1/lego/legoomni/include/police.h b/LEGO1/lego/legoomni/include/police.h
index 999ae4aa..0261cd49 100644
--- a/LEGO1/lego/legoomni/include/police.h
+++ b/LEGO1/lego/legoomni/include/police.h
@@ -31,7 +31,7 @@ class Police : public LegoWorld {
 	}
 
 	virtual MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
-	virtual void VTable0x50() override;                       // vtable+0x50
+	virtual void ReadyWorld() override;                       // vtable+0x50
 	virtual MxBool VTable0x5c() override;                     // vtable+0x5c
 	virtual MxBool VTable0x64() override;                     // vtable+0x64
 	virtual void VTable0x68(MxBool p_add) override;           // vtable+0x68
diff --git a/LEGO1/lego/legoomni/include/registrationbook.h b/LEGO1/lego/legoomni/include/registrationbook.h
index 25e4b2d8..53baeae9 100644
--- a/LEGO1/lego/legoomni/include/registrationbook.h
+++ b/LEGO1/lego/legoomni/include/registrationbook.h
@@ -27,7 +27,7 @@ class RegistrationBook : public LegoWorld {
 	}
 
 	virtual MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
-	virtual void VTable0x50() override;                       // vtable+0x50
+	virtual void ReadyWorld() override;                       // vtable+0x50
 	virtual MxBool VTable0x64() override;                     // vtable+0x64
 	virtual void VTable0x68(MxBool p_add) override;           // vtable+0x68
 
diff --git a/LEGO1/lego/legoomni/include/score.h b/LEGO1/lego/legoomni/include/score.h
index 1e801aa3..08d4b595 100644
--- a/LEGO1/lego/legoomni/include/score.h
+++ b/LEGO1/lego/legoomni/include/score.h
@@ -32,7 +32,7 @@ class Score : public LegoWorld {
 	// Score::`scalar deleting destructor'
 
 	virtual MxResult Create(MxDSAction& p_dsAction) override; // vtable+18
-	virtual void VTable0x50() override;                       // vtable+50
+	virtual void ReadyWorld() override;                       // vtable+50
 	virtual MxBool VTable0x5c() override;                     // vtable+5c
 	virtual MxBool VTable0x64() override;                     // vtable+64
 	virtual void VTable0x68(MxBool p_add) override;           // vtable+68
diff --git a/LEGO1/lego/legoomni/src/act2/legoact2.cpp b/LEGO1/lego/legoomni/src/act2/legoact2.cpp
index c487e9a4..3aafe018 100644
--- a/LEGO1/lego/legoomni/src/act2/legoact2.cpp
+++ b/LEGO1/lego/legoomni/src/act2/legoact2.cpp
@@ -29,7 +29,7 @@ MxLong LegoAct2::Notify(MxParam& p_param)
 }
 
 // STUB: LEGO1 0x10050a80
-void LegoAct2::VTable0x50()
+void LegoAct2::ReadyWorld()
 {
 	// TODO
 }
diff --git a/LEGO1/lego/legoomni/src/act3/act3.cpp b/LEGO1/lego/legoomni/src/act3/act3.cpp
index f23202f2..02a13c60 100644
--- a/LEGO1/lego/legoomni/src/act3/act3.cpp
+++ b/LEGO1/lego/legoomni/src/act3/act3.cpp
@@ -54,7 +54,7 @@ MxLong Act3::Notify(MxParam& p_param)
 }
 
 // STUB: LEGO1 0x10073270
-void Act3::VTable0x50()
+void Act3::ReadyWorld()
 {
 	// TODO
 }
diff --git a/LEGO1/lego/legoomni/src/build/legocarbuild.cpp b/LEGO1/lego/legoomni/src/build/legocarbuild.cpp
index 61576ece..9aba409b 100644
--- a/LEGO1/lego/legoomni/src/build/legocarbuild.cpp
+++ b/LEGO1/lego/legoomni/src/build/legocarbuild.cpp
@@ -43,7 +43,7 @@ MxLong LegoCarBuild::Notify(MxParam& p_param)
 }
 
 // STUB: LEGO1 0x100242c0
-void LegoCarBuild::VTable0x50()
+void LegoCarBuild::ReadyWorld()
 {
 	// TODO
 }
diff --git a/LEGO1/lego/legoomni/src/entity/legoworld.cpp b/LEGO1/lego/legoomni/src/entity/legoworld.cpp
index 002b6f5d..deaf0ce7 100644
--- a/LEGO1/lego/legoomni/src/entity/legoworld.cpp
+++ b/LEGO1/lego/legoomni/src/entity/legoworld.cpp
@@ -26,7 +26,7 @@ DECOMP_SIZE_ASSERT(LegoCacheSoundListCursor, 0x10)
 // FUNCTION: LEGO1 0x1001ca40
 LegoWorld::LegoWorld() : m_list0x68(TRUE)
 {
-	m_unk0xf4 = 4;
+	m_startupTicks = e_four;
 	m_cameraController = NULL;
 	m_entityList = NULL;
 	m_cacheSoundList = NULL;
@@ -495,30 +495,63 @@ void LegoWorld::VTable0x68(MxBool p_add)
 MxResult LegoWorld::Tickle()
 {
 	if (!m_worldStarted) {
-		switch (m_unk0xf4) {
-		case 0:
+		switch (m_startupTicks) {
+		case e_start:
 			m_worldStarted = TRUE;
 			SetAppCursor(0);
-			VTable0x50();
+			ReadyWorld();
 			return TRUE;
-		case 2:
-			if (FUN_100220e0() == 1)
+		case e_two:
+			if (PresentersPending())
 				break;
 		default:
-			m_unk0xf4--;
+			m_startupTicks--;
 		}
 	}
+
 	return TRUE;
 }
 
-// STUB: LEGO1 0x100220e0
-undefined LegoWorld::FUN_100220e0()
+// FUNCTION: LEGO1 0x100220e0
+MxBool LegoWorld::PresentersPending()
 {
-	return 0;
+	MxPresenterListCursor controlPresenterCursor(&m_controlPresenters);
+	MxPresenter* presenter;
+
+	while (controlPresenterCursor.Next(presenter)) {
+		if (presenter->IsEnabled() && !presenter->HasTickleStatePassed(MxPresenter::e_starting))
+			return TRUE;
+	}
+
+	MxPresenterListCursor animPresenterCursor(&m_animPresenters);
+
+	while (animPresenterCursor.Next(presenter)) {
+		if (presenter->IsEnabled()) {
+			if (presenter->IsA("LegoLocomotionAnimPresenter")) {
+				if (!presenter->HasTickleStatePassed(MxPresenter::e_ready))
+					return TRUE;
+			}
+			else {
+				if (!presenter->HasTickleStatePassed(MxPresenter::e_starting))
+					return TRUE;
+			}
+		}
+	}
+
+	for (MxCoreSet::iterator it = m_set0xa8.begin(); it != m_set0xa8.end(); it++) {
+		if ((*it)->IsA("MxPresenter")) {
+			presenter = (MxPresenter*) *it;
+
+			if (presenter->IsEnabled() && !presenter->HasTickleStatePassed(MxPresenter::e_starting))
+				return TRUE;
+		}
+	}
+
+	return FALSE;
 }
 
 // FUNCTION: LEGO1 0x10022340
-void LegoWorld::VTable0x50()
+void LegoWorld::ReadyWorld()
 {
 	TickleManager()->UnregisterClient(this);
 }
diff --git a/LEGO1/lego/legoomni/src/gasstation/gasstation.cpp b/LEGO1/lego/legoomni/src/gasstation/gasstation.cpp
index 8bedf0cf..c7a695a8 100644
--- a/LEGO1/lego/legoomni/src/gasstation/gasstation.cpp
+++ b/LEGO1/lego/legoomni/src/gasstation/gasstation.cpp
@@ -48,7 +48,7 @@ MxLong GasStation::Notify(MxParam& p_param)
 }
 
 // STUB: LEGO1 0x10004b30
-void GasStation::VTable0x50()
+void GasStation::ReadyWorld()
 {
 	// TODO
 }
diff --git a/LEGO1/lego/legoomni/src/hospital/hospital.cpp b/LEGO1/lego/legoomni/src/hospital/hospital.cpp
index 8ede37e2..b141956d 100644
--- a/LEGO1/lego/legoomni/src/hospital/hospital.cpp
+++ b/LEGO1/lego/legoomni/src/hospital/hospital.cpp
@@ -52,7 +52,7 @@ MxLong Hospital::Notify(MxParam& p_param)
 }
 
 // STUB: LEGO1 0x10074a60
-void Hospital::VTable0x50()
+void Hospital::ReadyWorld()
 {
 	// TODO
 }
diff --git a/LEGO1/lego/legoomni/src/infocenter/elevatorbottom.cpp b/LEGO1/lego/legoomni/src/infocenter/elevatorbottom.cpp
index ab4d3cff..697ce5f1 100644
--- a/LEGO1/lego/legoomni/src/infocenter/elevatorbottom.cpp
+++ b/LEGO1/lego/legoomni/src/infocenter/elevatorbottom.cpp
@@ -65,9 +65,9 @@ MxLong ElevatorBottom::Notify(MxParam& p_param)
 }
 
 // FUNCTION: LEGO1 0x100181b0
-void ElevatorBottom::VTable0x50()
+void ElevatorBottom::ReadyWorld()
 {
-	LegoWorld::VTable0x50();
+	LegoWorld::ReadyWorld();
 	PlayMusic(JukeBox::e_informationCenter);
 	FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
 }
diff --git a/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp b/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp
index 38b95622..4ca6dd79 100644
--- a/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp
+++ b/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp
@@ -298,7 +298,7 @@ MxLong Infocenter::HandleEndAction(MxParam& p_param)
 }
 
 // STUB: LEGO1 0x1006f4e0
-void Infocenter::VTable0x50()
+void Infocenter::ReadyWorld()
 {
 	m_infoManDialogueTimer = 0;
 	m_bookAnimationTimer = 0;
diff --git a/LEGO1/lego/legoomni/src/infocenter/infocenterdoor.cpp b/LEGO1/lego/legoomni/src/infocenter/infocenterdoor.cpp
index 79e88a99..599096b2 100644
--- a/LEGO1/lego/legoomni/src/infocenter/infocenterdoor.cpp
+++ b/LEGO1/lego/legoomni/src/infocenter/infocenterdoor.cpp
@@ -53,9 +53,9 @@ MxLong InfocenterDoor::Notify(MxParam& p_param)
 }
 
 // FUNCTION: LEGO1 0x10037a70
-void InfocenterDoor::VTable0x50()
+void InfocenterDoor::ReadyWorld()
 {
-	LegoWorld::VTable0x50();
+	LegoWorld::ReadyWorld();
 	PlayMusic(JukeBox::e_informationCenter);
 	FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
 }
diff --git a/LEGO1/lego/legoomni/src/infocenter/registrationbook.cpp b/LEGO1/lego/legoomni/src/infocenter/registrationbook.cpp
index f68bc29e..a2ee09b3 100644
--- a/LEGO1/lego/legoomni/src/infocenter/registrationbook.cpp
+++ b/LEGO1/lego/legoomni/src/infocenter/registrationbook.cpp
@@ -29,7 +29,7 @@ MxLong RegistrationBook::Notify(MxParam& p_param)
 }
 
 // STUB: LEGO1 0x10077cc0
-void RegistrationBook::VTable0x50()
+void RegistrationBook::ReadyWorld()
 {
 	// TODO
 }
diff --git a/LEGO1/lego/legoomni/src/infocenter/score.cpp b/LEGO1/lego/legoomni/src/infocenter/score.cpp
index 2d7d8c05..a7c1ee14 100644
--- a/LEGO1/lego/legoomni/src/infocenter/score.cpp
+++ b/LEGO1/lego/legoomni/src/infocenter/score.cpp
@@ -129,9 +129,9 @@ MxLong Score::FUN_10001510(MxEndActionNotificationParam& p_param)
 }
 
 // FUNCTION: LEGO1 0x10001580
-void Score::VTable0x50()
+void Score::ReadyWorld()
 {
-	LegoWorld::VTable0x50();
+	LegoWorld::ReadyWorld();
 
 	MxDSAction action;
 	action.SetObjectId(0x1f4);
diff --git a/LEGO1/lego/legoomni/src/isle/historybook.cpp b/LEGO1/lego/legoomni/src/isle/historybook.cpp
index f5a970b3..4681ce1c 100644
--- a/LEGO1/lego/legoomni/src/isle/historybook.cpp
+++ b/LEGO1/lego/legoomni/src/isle/historybook.cpp
@@ -28,7 +28,7 @@ MxLong HistoryBook::Notify(MxParam& p_param)
 }
 
 // STUB: LEGO1 0x100826f0
-void HistoryBook::VTable0x50()
+void HistoryBook::ReadyWorld()
 {
 	// TODO
 }
diff --git a/LEGO1/lego/legoomni/src/isle/isle.cpp b/LEGO1/lego/legoomni/src/isle/isle.cpp
index e26e0797..40e07fa1 100644
--- a/LEGO1/lego/legoomni/src/isle/isle.cpp
+++ b/LEGO1/lego/legoomni/src/isle/isle.cpp
@@ -153,9 +153,9 @@ MxLong Isle::StopAction(MxParam& p_param)
 }
 
 // FUNCTION: LEGO1 0x10030fc0
-void Isle::VTable0x50()
+void Isle::ReadyWorld()
 {
-	LegoWorld::VTable0x50();
+	LegoWorld::ReadyWorld();
 
 	if (m_act1state->GetUnknown21()) {
 		GameState()->HandleAction(2);
diff --git a/LEGO1/lego/legoomni/src/isle/jukebox.cpp b/LEGO1/lego/legoomni/src/isle/jukebox.cpp
index 687c0a79..c969754f 100644
--- a/LEGO1/lego/legoomni/src/isle/jukebox.cpp
+++ b/LEGO1/lego/legoomni/src/isle/jukebox.cpp
@@ -35,7 +35,7 @@ MxLong JukeBox::Notify(MxParam& p_param)
 }
 
 // STUB: LEGO1 0x1005d9f0
-void JukeBox::VTable0x50()
+void JukeBox::ReadyWorld()
 {
 	// TODO
 }
diff --git a/LEGO1/lego/legoomni/src/police/police.cpp b/LEGO1/lego/legoomni/src/police/police.cpp
index 42456814..aac86238 100644
--- a/LEGO1/lego/legoomni/src/police/police.cpp
+++ b/LEGO1/lego/legoomni/src/police/police.cpp
@@ -69,9 +69,9 @@ MxLong Police::Notify(MxParam& p_param)
 }
 
 // FUNCTION: LEGO1 0x1005e530
-void Police::VTable0x50()
+void Police::ReadyWorld()
 {
-	LegoWorld::VTable0x50();
+	LegoWorld::ReadyWorld();
 	PlayMusic(JukeBox::e_policeStation);
 	FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
 }
diff --git a/LEGO1/lego/legoomni/src/race/carrace.cpp b/LEGO1/lego/legoomni/src/race/carrace.cpp
index 2e5c3b11..6230ed78 100644
--- a/LEGO1/lego/legoomni/src/race/carrace.cpp
+++ b/LEGO1/lego/legoomni/src/race/carrace.cpp
@@ -17,7 +17,7 @@ MxResult CarRace::Create(MxDSAction& p_dsAction)
 }
 
 // STUB: LEGO1 0x10016dd0
-void CarRace::VTable0x50()
+void CarRace::ReadyWorld()
 {
 	// TODO
 }

From f706f804836a5d7122daee4c5e5bb7eaf4cd1c0b Mon Sep 17 00:00:00 2001
From: Misha <106913236+MishaProductions@users.noreply.github.com>
Date: Sat, 27 Jan 2024 16:55:59 -0500
Subject: [PATCH 182/210] implement LegoInputManager::Create (#495)

* implement LegoInputManager::Create

* Fixes

* Add annotation

* Add size assert

---------

Co-authored-by: Christian Semmler <mail@csemmler.com>
---
 .../legoomni/include/legocontrolmanager.h     |   3 +
 .../lego/legoomni/include/legoinputmanager.h  | 104 +++++++++++++-----
 .../src/control/legocontrolmanager.cpp        |   2 +
 .../legoomni/src/input/legoinputmanager.cpp   |  38 +++++--
 4 files changed, 109 insertions(+), 38 deletions(-)

diff --git a/LEGO1/lego/legoomni/include/legocontrolmanager.h b/LEGO1/lego/legoomni/include/legocontrolmanager.h
index 385ee92b..e2861885 100644
--- a/LEGO1/lego/legoomni/include/legocontrolmanager.h
+++ b/LEGO1/lego/legoomni/include/legocontrolmanager.h
@@ -32,6 +32,9 @@ class LegoControlManager : public MxCore {
 
 	// SYNTHETIC: LEGO1 0x10028d40
 	// LegoControlManager::`scalar deleting destructor'
+
+private:
+	undefined m_padding0x08[0x58]; // 0x08
 };
 
 #endif // LEGOCONTROLMANAGER_H
diff --git a/LEGO1/lego/legoomni/include/legoinputmanager.h b/LEGO1/lego/legoomni/include/legoinputmanager.h
index b2b677b7..4d3d0f76 100644
--- a/LEGO1/lego/legoomni/include/legoinputmanager.h
+++ b/LEGO1/lego/legoomni/include/legoinputmanager.h
@@ -25,6 +25,29 @@ class LegoControlManager;
 // SIZE 0x18
 class LegoEventQueue : public MxQueue<LegoEventNotificationParam> {};
 
+// VTABLE: LEGO1 0x100d6a20
+// class MxCollection<MxCore*>
+
+// VTABLE: LEGO1 0x100d6a38
+// class MxList<MxCore*>
+
+// VTABLE: LEGO1 0x100d6a50
+// class MxPtrList<MxCore>
+
+// VTABLE: LEGO1 0x100d6a68
+// SIZE 0x18
+class LegoNotifyList : public MxPtrList<MxCore> {
+protected:
+	// FUNCTION: LEGO1 0x10028830
+	virtual MxS8 Compare(MxCore* p_element1, MxCore* p_element2) override
+	{
+		return p_element1 == p_element2 ? 0 : p_element1 < p_element2 ? -1 : 1;
+	} // vtable+0x14
+
+public:
+	LegoNotifyList(MxBool p_ownership = FALSE) : MxPtrList<MxCore>(p_ownership) {}
+};
+
 // VTABLE: LEGO1 0x100d8760
 // SIZE 0x338
 class LegoInputManager : public MxPresenter {
@@ -78,47 +101,59 @@ class LegoInputManager : public MxPresenter {
 	// LegoInputManager::`scalar deleting destructor'
 
 private:
-	MxCriticalSection m_criticalSection;
-	MxList<undefined4>* m_unk0x5c; // list or hash table
-	LegoCameraController* m_camera;
-	LegoWorld* m_world;
-	LegoEventQueue* m_eventQueue; // +0x68
-	undefined4 m_unk0x6c;
-	undefined4 m_unk0x70;
-	undefined4 m_unk0x74;
-	UINT m_timer;
-	UINT m_timeout;
-	undefined m_unk0x80;
-	undefined m_unk0x81;
-	LegoControlManager* m_controlManager;
-	MxBool m_unk0x88;
-	IDirectInput* m_directInput;
-	IDirectInputDevice* m_directInputDevice;
-	undefined m_unk0x94;
-	undefined4 m_unk0x98;
-	undefined m_unk0x9c[0xF8];
-	undefined m_unk0x194;
-	MxBool m_unk0x195;
-	MxS32 m_joyid;
-	MxS32 m_joystickIndex;
-	JOYCAPS m_joyCaps;
-	MxBool m_useJoystick;
-	MxBool m_unk0x335;
-	MxBool m_unk0x336;
+	MxCriticalSection m_criticalSection;     // 0x58
+	LegoNotifyList* m_keyboardNotifyList;    // 0x5c
+	LegoCameraController* m_camera;          // 0x60
+	LegoWorld* m_world;                      // 0x64
+	LegoEventQueue* m_eventQueue;            // 0x68
+	undefined4 m_unk0x6c;                    // 0x6c
+	undefined4 m_unk0x70;                    // 0x70
+	undefined4 m_unk0x74;                    // 0x74
+	UINT m_timer;                            // 0x78
+	UINT m_timeout;                          // 0x7c
+	undefined m_unk0x80;                     // 0x80
+	undefined m_unk0x81;                     // 0x81
+	LegoControlManager* m_controlManager;    // 0x84
+	MxBool m_unk0x88;                        // 0x88
+	IDirectInput* m_directInput;             // 0x8c
+	IDirectInputDevice* m_directInputDevice; // 0x90
+	undefined m_unk0x94;                     // 0x94
+	undefined4 m_unk0x98;                    // 0x98
+	undefined m_unk0x9c[0xf8];               // 0x9c
+	undefined m_unk0x194;                    // 0x194
+	MxBool m_unk0x195;                       // 0x195
+	MxS32 m_joyid;                           // 0x198
+	MxS32 m_joystickIndex;                   // 0x19c
+	JOYCAPS m_joyCaps;                       // 0x200
+	MxBool m_useJoystick;                    // 0x334
+	MxBool m_unk0x335;                       // 0x335
+	MxBool m_unk0x336;                       // 0x336
 };
 
 // TEMPLATE: LEGO1 0x1005bb80
 // MxCollection<LegoEventNotificationParam>::Compare
 
+// TEMPLATE: LEGO1 0x100288b0
+// MxCollection<MxCore *>::Destroy
+
+// TEMPLATE: LEGO1 0x10028850
+// MxCollection<MxCore *>::Compare
+
 // TEMPLATE: LEGO1 0x1005bbe0
 // MxCollection<LegoEventNotificationParam>::~MxCollection<LegoEventNotificationParam>
 
+// TEMPLATE: LEGO1 0x10028860
+// MxCollection<MxCore *>::~MxCollection<MxCore *>
+
 // TEMPLATE: LEGO1 0x1005bc30
 // MxCollection<LegoEventNotificationParam>::Destroy
 
 // TEMPLATE: LEGO1 0x1005bc80
 // MxList<LegoEventNotificationParam>::~MxList<LegoEventNotificationParam>
 
+// TEMPLATE: LEGO1 0x100288c0
+// MxList<MxCore *>::~MxList<MxCore *>
+
 // SYNTHETIC: LEGO1 0x1005bd50
 // MxCollection<LegoEventNotificationParam>::`scalar deleting destructor'
 
@@ -128,9 +163,24 @@ class LegoInputManager : public MxPresenter {
 // SYNTHETIC: LEGO1 0x1005beb0
 // LegoEventQueue::`scalar deleting destructor'
 
+// SYNTHETIC: LEGO1 0x10028a10
+// MxCollection<MxCore *>::`scalar deleting destructor'
+
+// SYNTHETIC: LEGO1 0x10028a80
+// MxList<MxCore *>::`scalar deleting destructor'
+
+// SYNTHETIC: LEGO1 0x10028b30
+// MxPtrList<MxCore>::`scalar deleting destructor'
+
+// SYNTHETIC: LEGO1 0x10028950
+// LegoNotifyList::`scalar deleting destructor'
+
 // TEMPLATE: LEGO1 0x1005bf20
 // MxQueue<LegoEventNotificationParam>::~MxQueue<LegoEventNotificationParam>
 
+// TEMPLATE: LEGO1 0x100289c0
+// MxPtrList<MxCore>::~MxPtrList<MxCore>
+
 // SYNTHETIC: LEGO1 0x1005bf70
 // MxQueue<LegoEventNotificationParam>::`scalar deleting destructor'
 
diff --git a/LEGO1/lego/legoomni/src/control/legocontrolmanager.cpp b/LEGO1/lego/legoomni/src/control/legocontrolmanager.cpp
index 481bd9c5..5b51b8ec 100644
--- a/LEGO1/lego/legoomni/src/control/legocontrolmanager.cpp
+++ b/LEGO1/lego/legoomni/src/control/legocontrolmanager.cpp
@@ -1,5 +1,7 @@
 #include "legocontrolmanager.h"
 
+DECOMP_SIZE_ASSERT(LegoControlManager, 0x60);
+
 // STUB: LEGO1 0x10028520
 LegoControlManager::LegoControlManager()
 {
diff --git a/LEGO1/lego/legoomni/src/input/legoinputmanager.cpp b/LEGO1/lego/legoomni/src/input/legoinputmanager.cpp
index 87c72a63..ec871b47 100644
--- a/LEGO1/lego/legoomni/src/input/legoinputmanager.cpp
+++ b/LEGO1/lego/legoomni/src/input/legoinputmanager.cpp
@@ -4,8 +4,9 @@
 #include "legoomni.h"
 #include "mxautolocker.h"
 
-DECOMP_SIZE_ASSERT(LegoInputManager, 0x338);
-DECOMP_SIZE_ASSERT(LegoEventQueue, 0x18);
+DECOMP_SIZE_ASSERT(LegoInputManager, 0x338)
+DECOMP_SIZE_ASSERT(LegoNotifyList, 0x18)
+DECOMP_SIZE_ASSERT(LegoEventQueue, 0x18)
 
 // GLOBAL: LEGO1 0x100f31b0
 MxS32 g_unk0x100f31b0 = -1;
@@ -16,7 +17,7 @@ MxS32 g_unk0x100f31b4 = 0;
 // FUNCTION: LEGO1 0x1005b790
 LegoInputManager::LegoInputManager()
 {
-	m_unk0x5c = NULL;
+	m_keyboardNotifyList = NULL;
 	m_world = NULL;
 	m_camera = NULL;
 	m_eventQueue = NULL;
@@ -40,7 +41,7 @@ LegoInputManager::LegoInputManager()
 	m_timeout = 1000;
 }
 
-// STUB: LEGO1 0x1005b8b0
+// FUNCTION: LEGO1 0x1005b8b0
 MxResult LegoInputManager::Tickle()
 {
 	ProcessEvents();
@@ -56,10 +57,25 @@ LegoInputManager::~LegoInputManager()
 // FUNCTION: LEGO1 0x1005b960
 MxResult LegoInputManager::Create(HWND p_hwnd)
 {
-	// TODO
-	if (m_eventQueue == NULL)
-		m_eventQueue = new LegoEventQueue();
-	return SUCCESS;
+	MxResult result = SUCCESS;
+
+	m_controlManager = new LegoControlManager;
+
+	if (!m_keyboardNotifyList)
+		m_keyboardNotifyList = new LegoNotifyList;
+
+	if (!m_eventQueue)
+		m_eventQueue = new LegoEventQueue;
+
+	CreateAndAcquireKeyboard(p_hwnd);
+	GetJoystickId();
+
+	if (!m_keyboardNotifyList || !m_eventQueue || !m_directInputDevice) {
+		Destroy();
+		result = FAILURE;
+	}
+
+	return result;
 }
 
 // FUNCTION: LEGO1 0x1005bfe0
@@ -67,9 +83,9 @@ void LegoInputManager::Destroy()
 {
 	ReleaseDX();
 
-	if (m_unk0x5c)
-		delete m_unk0x5c;
-	m_unk0x5c = NULL;
+	if (m_keyboardNotifyList)
+		delete m_keyboardNotifyList;
+	m_keyboardNotifyList = NULL;
 
 	if (m_eventQueue)
 		delete m_eventQueue;

From 159e27baba4254e01d7d18c091905198a23dd0db Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Fri, 26 Jan 2024 05:37:50 -0500
Subject: [PATCH 183/210] Sort annotations

---
 .../lego/legoomni/include/legoinputmanager.h  | 52 +++++++++----------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/LEGO1/lego/legoomni/include/legoinputmanager.h b/LEGO1/lego/legoomni/include/legoinputmanager.h
index 4d3d0f76..5f596a3d 100644
--- a/LEGO1/lego/legoomni/include/legoinputmanager.h
+++ b/LEGO1/lego/legoomni/include/legoinputmanager.h
@@ -130,38 +130,23 @@ class LegoInputManager : public MxPresenter {
 	MxBool m_unk0x336;                       // 0x336
 };
 
-// TEMPLATE: LEGO1 0x1005bb80
-// MxCollection<LegoEventNotificationParam>::Compare
-
-// TEMPLATE: LEGO1 0x100288b0
-// MxCollection<MxCore *>::Destroy
-
 // TEMPLATE: LEGO1 0x10028850
 // MxCollection<MxCore *>::Compare
 
-// TEMPLATE: LEGO1 0x1005bbe0
-// MxCollection<LegoEventNotificationParam>::~MxCollection<LegoEventNotificationParam>
-
 // TEMPLATE: LEGO1 0x10028860
 // MxCollection<MxCore *>::~MxCollection<MxCore *>
 
-// TEMPLATE: LEGO1 0x1005bc30
-// MxCollection<LegoEventNotificationParam>::Destroy
-
-// TEMPLATE: LEGO1 0x1005bc80
-// MxList<LegoEventNotificationParam>::~MxList<LegoEventNotificationParam>
+// TEMPLATE: LEGO1 0x100288b0
+// MxCollection<MxCore *>::Destroy
 
 // TEMPLATE: LEGO1 0x100288c0
 // MxList<MxCore *>::~MxList<MxCore *>
 
-// SYNTHETIC: LEGO1 0x1005bd50
-// MxCollection<LegoEventNotificationParam>::`scalar deleting destructor'
+// SYNTHETIC: LEGO1 0x10028950
+// LegoNotifyList::`scalar deleting destructor'
 
-// SYNTHETIC: LEGO1 0x1005bdc0
-// MxList<LegoEventNotificationParam>::`scalar deleting destructor'
-
-// SYNTHETIC: LEGO1 0x1005beb0
-// LegoEventQueue::`scalar deleting destructor'
+// TEMPLATE: LEGO1 0x100289c0
+// MxPtrList<MxCore>::~MxPtrList<MxCore>
 
 // SYNTHETIC: LEGO1 0x10028a10
 // MxCollection<MxCore *>::`scalar deleting destructor'
@@ -172,15 +157,30 @@ class LegoInputManager : public MxPresenter {
 // SYNTHETIC: LEGO1 0x10028b30
 // MxPtrList<MxCore>::`scalar deleting destructor'
 
-// SYNTHETIC: LEGO1 0x10028950
-// LegoNotifyList::`scalar deleting destructor'
+// TEMPLATE: LEGO1 0x1005bb80
+// MxCollection<LegoEventNotificationParam>::Compare
+
+// TEMPLATE: LEGO1 0x1005bbe0
+// MxCollection<LegoEventNotificationParam>::~MxCollection<LegoEventNotificationParam>
+
+// TEMPLATE: LEGO1 0x1005bc30
+// MxCollection<LegoEventNotificationParam>::Destroy
+
+// TEMPLATE: LEGO1 0x1005bc80
+// MxList<LegoEventNotificationParam>::~MxList<LegoEventNotificationParam>
+
+// SYNTHETIC: LEGO1 0x1005bd50
+// MxCollection<LegoEventNotificationParam>::`scalar deleting destructor'
+
+// SYNTHETIC: LEGO1 0x1005bdc0
+// MxList<LegoEventNotificationParam>::`scalar deleting destructor'
+
+// SYNTHETIC: LEGO1 0x1005beb0
+// LegoEventQueue::`scalar deleting destructor'
 
 // TEMPLATE: LEGO1 0x1005bf20
 // MxQueue<LegoEventNotificationParam>::~MxQueue<LegoEventNotificationParam>
 
-// TEMPLATE: LEGO1 0x100289c0
-// MxPtrList<MxCore>::~MxPtrList<MxCore>
-
 // SYNTHETIC: LEGO1 0x1005bf70
 // MxQueue<LegoEventNotificationParam>::`scalar deleting destructor'
 

From d4cb8677b81456689378b25b6ea4b83019e0f40e Mon Sep 17 00:00:00 2001
From: Misha <106913236+MishaProductions@users.noreply.github.com>
Date: Sat, 27 Jan 2024 17:15:12 -0500
Subject: [PATCH 184/210] implement LegoInputManager register and unregister
 (#496)

* implement LegoInputManager::Create

* Fixes

* Add annotation

* Add size assert

* push changes

* Add size assert

* Order annotations

---------

Co-authored-by: Christian Semmler <mail@csemmler.com>
---
 .../lego/legoomni/include/legoinputmanager.h  | 31 +++++++++++++++++++
 .../legoomni/src/input/legoinputmanager.cpp   | 21 +++++++++----
 2 files changed, 46 insertions(+), 6 deletions(-)

diff --git a/LEGO1/lego/legoomni/include/legoinputmanager.h b/LEGO1/lego/legoomni/include/legoinputmanager.h
index 5f596a3d..89e30dc7 100644
--- a/LEGO1/lego/legoomni/include/legoinputmanager.h
+++ b/LEGO1/lego/legoomni/include/legoinputmanager.h
@@ -48,6 +48,19 @@ class LegoNotifyList : public MxPtrList<MxCore> {
 	LegoNotifyList(MxBool p_ownership = FALSE) : MxPtrList<MxCore>(p_ownership) {}
 };
 
+// VTABLE: LEGO1 0x100d6ac0
+// class MxListCursor<MxCore *>
+
+// VTABLE: LEGO1 0x100d6ad8
+// class MxPtrListCursor<MxCore>
+
+// VTABLE: LEGO1 0x100d6aa8
+// SIZE 0x10
+class LegoNotifyListCursor : public MxPtrListCursor<MxCore> {
+public:
+	LegoNotifyListCursor(LegoNotifyList* p_list) : MxPtrListCursor<MxCore>(p_list) {}
+};
+
 // VTABLE: LEGO1 0x100d8760
 // SIZE 0x338
 class LegoInputManager : public MxPresenter {
@@ -157,6 +170,24 @@ class LegoInputManager : public MxPresenter {
 // SYNTHETIC: LEGO1 0x10028b30
 // MxPtrList<MxCore>::`scalar deleting destructor'
 
+// SYNTHETIC: LEGO1 0x10028fd0
+// LegoNotifyListCursor::`scalar deleting destructor'
+
+// TEMPLATE: LEGO1 0x10029040
+// MxPtrListCursor<MxCore>::~MxPtrListCursor<MxCore>
+
+// SYNTHETIC: LEGO1 0x10029090
+// MxListCursor<MxCore *>::`scalar deleting destructor'
+
+// SYNTHETIC: LEGO1 0x10029100
+// MxPtrListCursor<MxCore>::`scalar deleting destructor'
+
+// TEMPLATE: LEGO1 0x10029170
+// MxListCursor<MxCore *>::~MxListCursor<MxCore *>
+
+// TEMPLATE: LEGO1 0x100291c0
+// LegoNotifyListCursor::~LegoNotifyListCursor
+
 // TEMPLATE: LEGO1 0x1005bb80
 // MxCollection<LegoEventNotificationParam>::Compare
 
diff --git a/LEGO1/lego/legoomni/src/input/legoinputmanager.cpp b/LEGO1/lego/legoomni/src/input/legoinputmanager.cpp
index ec871b47..2a551c71 100644
--- a/LEGO1/lego/legoomni/src/input/legoinputmanager.cpp
+++ b/LEGO1/lego/legoomni/src/input/legoinputmanager.cpp
@@ -6,6 +6,7 @@
 
 DECOMP_SIZE_ASSERT(LegoInputManager, 0x338)
 DECOMP_SIZE_ASSERT(LegoNotifyList, 0x18)
+DECOMP_SIZE_ASSERT(LegoNotifyListCursor, 0x10)
 DECOMP_SIZE_ASSERT(LegoEventQueue, 0x18)
 
 // GLOBAL: LEGO1 0x100f31b0
@@ -211,16 +212,24 @@ MxResult LegoInputManager::GetJoystickState(
 	return FAILURE;
 }
 
-// STUB: LEGO1 0x1005c470
-void LegoInputManager::Register(MxCore*)
+// FUNCTION: LEGO1 0x1005c470
+void LegoInputManager::Register(MxCore* p_notify)
 {
-	// TODO
+	MxAutoLocker lock(&m_criticalSection);
+
+	LegoNotifyListCursor cursor(m_keyboardNotifyList);
+	if (!cursor.Find(p_notify))
+		m_keyboardNotifyList->Append(p_notify);
 }
 
-// STUB: LEGO1 0x1005c5c0
-void LegoInputManager::UnRegister(MxCore*)
+// FUNCTION: LEGO1 0x1005c5c0
+void LegoInputManager::UnRegister(MxCore* p_notify)
 {
-	// TODO
+	MxAutoLocker lock(&m_criticalSection);
+
+	LegoNotifyListCursor cursor(m_keyboardNotifyList);
+	if (cursor.Find(p_notify))
+		cursor.Detach();
 }
 
 // FUNCTION: LEGO1 0x1005c700

From f1fc5e1d0d45376302584e23dd338be8bd82f7ac Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Sat, 27 Jan 2024 17:57:42 -0500
Subject: [PATCH 185/210] Implement/match LegoEventNotifcationParam::Clone
 (#497)

---
 .../lego/legoomni/include/legoeventnotificationparam.h | 10 +++++++++-
 .../legoomni/src/notify/legoeventnotificationparam.cpp |  7 -------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/LEGO1/lego/legoomni/include/legoeventnotificationparam.h b/LEGO1/lego/legoomni/include/legoeventnotificationparam.h
index f5ec9205..a27ee9df 100644
--- a/LEGO1/lego/legoomni/include/legoeventnotificationparam.h
+++ b/LEGO1/lego/legoomni/include/legoeventnotificationparam.h
@@ -10,7 +10,14 @@
 // SIZE 0x20
 class LegoEventNotificationParam : public MxNotificationParam {
 public:
-	virtual MxNotificationParam* Clone() override; // vtable+0x4
+	// FUNCTION: LEGO1 0x10028690
+	virtual MxNotificationParam* Clone() override
+	{
+		LegoEventNotificationParam* clone =
+			new LegoEventNotificationParam(m_type, m_sender, m_modifier, m_x, m_y, m_key);
+		clone->m_unk0x1c = m_unk0x1c;
+		return clone;
+	}; // vtable+0x4
 
 	inline LegoEventNotificationParam() : MxNotificationParam(c_notificationType0, NULL) {}
 	inline LegoEventNotificationParam(
@@ -25,6 +32,7 @@ class LegoEventNotificationParam : public MxNotificationParam {
 	{
 	}
 
+	inline MxU8 GetModifier() { return m_modifier; }
 	inline MxU8 GetKey() const { return m_key; }
 	inline MxS32 GetX() const { return m_x; }
 	inline MxS32 GetY() const { return m_y; }
diff --git a/LEGO1/lego/legoomni/src/notify/legoeventnotificationparam.cpp b/LEGO1/lego/legoomni/src/notify/legoeventnotificationparam.cpp
index 299bbe33..b6abd2c4 100644
--- a/LEGO1/lego/legoomni/src/notify/legoeventnotificationparam.cpp
+++ b/LEGO1/lego/legoomni/src/notify/legoeventnotificationparam.cpp
@@ -3,10 +3,3 @@
 #include "decomp.h"
 
 DECOMP_SIZE_ASSERT(LegoEventNotificationParam, 0x20);
-
-// STUB: LEGO1 0x10028690
-MxNotificationParam* LegoEventNotificationParam::Clone()
-{
-	// TODO
-	return NULL;
-}

From d9c4151bb86368f38ff5576a633189672718e50f Mon Sep 17 00:00:00 2001
From: Misha <106913236+MishaProductions@users.noreply.github.com>
Date: Sun, 28 Jan 2024 09:20:21 -0500
Subject: [PATCH 186/210] implement LegoInputManager::ProcessOneEvent (#498)

* push changes

* fix

* Match

* Rename functions

* Space

* Fix GetPresenterAt

---------

Co-authored-by: Christian Semmler <mail@csemmler.com>
---
 .../legoomni/include/legocontrolmanager.h     |  10 +-
 .../include/legoeventnotificationparam.h      |   9 +-
 .../lego/legoomni/include/legoinputmanager.h  |   9 +-
 .../lego/legoomni/include/legovideomanager.h  |   3 +-
 .../src/control/legocontrolmanager.cpp        |   9 ++
 .../legoomni/src/input/legoinputmanager.cpp   | 140 ++++++++++++++++--
 .../legoomni/src/video/legovideomanager.cpp   |  15 +-
 LEGO1/lego/sources/roi/legoroi.h              |   1 +
 LEGO1/omni/include/mxnotificationparam.h      |   2 +
 LEGO1/realtime/orientableroi.h                |   3 +-
 LEGO1/realtime/roi.h                          |   2 +
 11 files changed, 178 insertions(+), 25 deletions(-)

diff --git a/LEGO1/lego/legoomni/include/legocontrolmanager.h b/LEGO1/lego/legoomni/include/legocontrolmanager.h
index e2861885..5b83a715 100644
--- a/LEGO1/lego/legoomni/include/legocontrolmanager.h
+++ b/LEGO1/lego/legoomni/include/legocontrolmanager.h
@@ -1,6 +1,7 @@
 #ifndef LEGOCONTROLMANAGER_H
 #define LEGOCONTROLMANAGER_H
 
+#include "legoeventnotificationparam.h"
 #include "mxcore.h"
 #include "mxpresenterlist.h"
 
@@ -28,13 +29,20 @@ class LegoControlManager : public MxCore {
 	void FUN_10028df0(MxPresenterList* p_presenterList);
 	void Register(MxCore* p_listener);
 	void Unregister(MxCore* p_listener);
+	MxBool FUN_10029210(LegoEventNotificationParam& p_param, MxPresenter* p_presenter);
 	void FUN_100293c0(undefined4, const char*, undefined2);
 
+	inline undefined4 GetUnknown0x0c() { return m_unk0x0c; }
+	inline undefined GetUnknown0x10() { return m_unk0x10; }
+
 	// SYNTHETIC: LEGO1 0x10028d40
 	// LegoControlManager::`scalar deleting destructor'
 
 private:
-	undefined m_padding0x08[0x58]; // 0x08
+	undefined4 m_unk0x08;          // 0x08
+	undefined4 m_unk0x0c;          // 0x0c
+	undefined m_unk0x10;           // 0x10
+	undefined m_padding0x14[0x4c]; // 0x14
 };
 
 #endif // LEGOCONTROLMANAGER_H
diff --git a/LEGO1/lego/legoomni/include/legoeventnotificationparam.h b/LEGO1/lego/legoomni/include/legoeventnotificationparam.h
index a27ee9df..9eb6c7b5 100644
--- a/LEGO1/lego/legoomni/include/legoeventnotificationparam.h
+++ b/LEGO1/lego/legoomni/include/legoeventnotificationparam.h
@@ -3,6 +3,7 @@
 
 #include "mxnotificationparam.h"
 #include "mxtypes.h"
+#include "roi/legoroi.h"
 
 #include <stdlib.h>
 
@@ -15,7 +16,7 @@ class LegoEventNotificationParam : public MxNotificationParam {
 	{
 		LegoEventNotificationParam* clone =
 			new LegoEventNotificationParam(m_type, m_sender, m_modifier, m_x, m_y, m_key);
-		clone->m_unk0x1c = m_unk0x1c;
+		clone->m_roi = m_roi;
 		return clone;
 	}; // vtable+0x4
 
@@ -28,7 +29,7 @@ class LegoEventNotificationParam : public MxNotificationParam {
 		MxS32 p_y,
 		MxU8 p_key
 	)
-		: MxNotificationParam(p_type, p_sender), m_modifier(p_modifier), m_x(p_x), m_y(p_y), m_key(p_key), m_unk0x1c(0)
+		: MxNotificationParam(p_type, p_sender), m_modifier(p_modifier), m_x(p_x), m_y(p_y), m_key(p_key), m_roi(NULL)
 	{
 	}
 
@@ -37,12 +38,14 @@ class LegoEventNotificationParam : public MxNotificationParam {
 	inline MxS32 GetX() const { return m_x; }
 	inline MxS32 GetY() const { return m_y; }
 
+	inline void SetROI(LegoROI* p_roi) { m_roi = p_roi; }
+
 protected:
 	MxU8 m_modifier; // 0x0c
 	MxS32 m_x;       // 0x10
 	MxS32 m_y;       // 0x14
 	MxU8 m_key;      // 0x18
-	MxU32 m_unk0x1c; // 0x1c
+	LegoROI* m_roi;  // 0x1c
 };
 
 // SYNTHETIC: LEGO1 0x10028770
diff --git a/LEGO1/lego/legoomni/include/legoinputmanager.h b/LEGO1/lego/legoomni/include/legoinputmanager.h
index 89e30dc7..eada8f70 100644
--- a/LEGO1/lego/legoomni/include/legoinputmanager.h
+++ b/LEGO1/lego/legoomni/include/legoinputmanager.h
@@ -83,8 +83,8 @@ class LegoInputManager : public MxPresenter {
 	void ReleaseDX();
 	MxResult GetJoystickId();
 	MxResult GetJoystickState(MxU32* p_joystickX, MxU32* p_joystickY, DWORD* p_buttonsState, MxU32* p_povPosition);
-	void SetTimer();
-	void KillTimer();
+	void StartAutoDragTimer();
+	void StopAutoDragTimer();
 	void EnableInputProcessing();
 	void SetCamera(LegoCameraController* p_camera);
 	void ClearCamera();
@@ -109,6 +109,7 @@ class LegoInputManager : public MxPresenter {
 
 	void ProcessEvents();
 	MxBool ProcessOneEvent(LegoEventNotificationParam& p_param);
+	MxBool FUN_1005cdf0(LegoEventNotificationParam& p_param);
 
 	// SYNTHETIC: LEGO1 0x1005b8d0
 	// LegoInputManager::`scalar deleting destructor'
@@ -122,8 +123,8 @@ class LegoInputManager : public MxPresenter {
 	undefined4 m_unk0x6c;                    // 0x6c
 	undefined4 m_unk0x70;                    // 0x70
 	undefined4 m_unk0x74;                    // 0x74
-	UINT m_timer;                            // 0x78
-	UINT m_timeout;                          // 0x7c
+	UINT m_autoDragTimerID;                  // 0x78
+	UINT m_autoDragTime;                     // 0x7c
 	undefined m_unk0x80;                     // 0x80
 	undefined m_unk0x81;                     // 0x81
 	LegoControlManager* m_controlManager;    // 0x84
diff --git a/LEGO1/lego/legoomni/include/legovideomanager.h b/LEGO1/lego/legoomni/include/legovideomanager.h
index 72cb2148..ce9963e4 100644
--- a/LEGO1/lego/legoomni/include/legovideomanager.h
+++ b/LEGO1/lego/legoomni/include/legovideomanager.h
@@ -31,7 +31,8 @@ class LegoVideoManager : public MxVideoManager {
 		override;                                                                          // vtable+0x2c
 	virtual MxResult RealizePalette(MxPalette*) override;                                  // vtable+0x30
 	virtual void UpdateView(MxU32 p_x, MxU32 p_y, MxU32 p_width, MxU32 p_height) override; // vtable+0x34
-	virtual void VTable0x38(undefined4, undefined4);                                       // vtable+0x38
+	virtual MxPresenter* GetPresenterAt(MxS32 p_x, MxS32 p_y);                             // vtable+0x38
+
 	// FUNCTION: LEGO1 0x1007ab10
 	virtual LegoUnknown100d9d00* VTable0x3c() { return m_unk0x100d9d00; } // vtable+0x3c
 
diff --git a/LEGO1/lego/legoomni/src/control/legocontrolmanager.cpp b/LEGO1/lego/legoomni/src/control/legocontrolmanager.cpp
index 5b51b8ec..465ccf9f 100644
--- a/LEGO1/lego/legoomni/src/control/legocontrolmanager.cpp
+++ b/LEGO1/lego/legoomni/src/control/legocontrolmanager.cpp
@@ -1,5 +1,8 @@
 #include "legocontrolmanager.h"
 
+#include "legoeventnotificationparam.h"
+#include "mxpresenter.h"
+
 DECOMP_SIZE_ASSERT(LegoControlManager, 0x60);
 
 // STUB: LEGO1 0x10028520
@@ -32,6 +35,12 @@ void LegoControlManager::Unregister(MxCore* p_listener)
 	// TODO
 }
 
+// STUB: LEGO1 0x10029210
+MxBool LegoControlManager::FUN_10029210(LegoEventNotificationParam& p_param, MxPresenter* p_presenter)
+{
+	return TRUE;
+}
+
 // STUB: LEGO1 0x100293c0
 void LegoControlManager::FUN_100293c0(undefined4, const char*, undefined2)
 {
diff --git a/LEGO1/lego/legoomni/src/input/legoinputmanager.cpp b/LEGO1/lego/legoomni/src/input/legoinputmanager.cpp
index 2a551c71..05f09061 100644
--- a/LEGO1/lego/legoomni/src/input/legoinputmanager.cpp
+++ b/LEGO1/lego/legoomni/src/input/legoinputmanager.cpp
@@ -2,7 +2,9 @@
 
 #include "legocontrolmanager.h"
 #include "legoomni.h"
+#include "legovideomanager.h"
 #include "mxautolocker.h"
+#include "roi/legoroi.h"
 
 DECOMP_SIZE_ASSERT(LegoInputManager, 0x338)
 DECOMP_SIZE_ASSERT(LegoNotifyList, 0x18)
@@ -23,7 +25,7 @@ LegoInputManager::LegoInputManager()
 	m_camera = NULL;
 	m_eventQueue = NULL;
 	m_unk0x80 = 0;
-	m_timer = 0;
+	m_autoDragTimerID = 0;
 	m_unk0x6c = 0;
 	m_unk0x70 = 0;
 	m_controlManager = NULL;
@@ -39,7 +41,7 @@ LegoInputManager::LegoInputManager()
 	m_unk0x335 = FALSE;
 	m_unk0x336 = FALSE;
 	m_unk0x74 = 0x19;
-	m_timeout = 1000;
+	m_autoDragTime = 1000;
 }
 
 // FUNCTION: LEGO1 0x1005b8b0
@@ -279,28 +281,142 @@ void LegoInputManager::ProcessEvents()
 	}
 }
 
-// STUB: LEGO1 0x1005c9c0
+// FUNCTION: LEGO1 0x1005c9c0
 MxBool LegoInputManager::ProcessOneEvent(LegoEventNotificationParam& p_param)
+{
+	MxBool processRoi;
+
+	if (p_param.GetType() == c_notificationKeyPress) {
+		if (!Lego()->IsTimerRunning() || p_param.GetKey() == 0x13) {
+			if (p_param.GetKey() == 0x10) {
+				if (m_unk0x195) {
+					m_unk0x80 = 0;
+					p_param.SetType(c_notificationDrag);
+
+					if (m_camera) {
+						m_camera->Notify(p_param);
+					}
+				}
+
+				m_unk0x195 = !m_unk0x195;
+				return TRUE;
+			}
+
+			LegoNotifyListCursor cursor(m_keyboardNotifyList);
+			MxCore* target;
+
+			while (cursor.Next(target)) {
+				if (target->Notify(p_param) != 0) {
+					return TRUE;
+				}
+			}
+		}
+	}
+	else {
+		if (!Lego()->IsTimerRunning()) {
+			processRoi = TRUE;
+
+			if (m_unk0x335 != 0) {
+				if (p_param.GetType() == c_notificationButtonDown) {
+					LegoEventNotificationParam notification(c_notificationKeyPress, NULL, 0, 0, 0, ' ');
+					LegoNotifyListCursor cursor(m_keyboardNotifyList);
+					MxCore* target;
+
+					while (cursor.Next(target)) {
+						if (target->Notify(notification) != 0) {
+							return TRUE;
+						}
+					}
+				}
+
+				return TRUE;
+			}
+
+			if (m_unk0x195 && p_param.GetType() == c_notificationButtonDown) {
+				m_unk0x195 = 0;
+				return TRUE;
+			}
+
+			if (m_world != NULL && m_world->Notify(p_param) != 0) {
+				return TRUE;
+			}
+
+			if (p_param.GetType() == c_notificationButtonDown) {
+				MxPresenter* presenter = VideoManager()->GetPresenterAt(p_param.GetX(), p_param.GetY());
+
+				if (presenter) {
+					if (presenter->GetDisplayZ() < 0) {
+						processRoi = FALSE;
+
+						if (m_controlManager->FUN_10029210(p_param, presenter)) {
+							return TRUE;
+						}
+					}
+					else {
+						LegoROI* roi = PickROI(p_param.GetX(), p_param.GetY());
+
+						if (roi == NULL && m_controlManager->FUN_10029210(p_param, presenter)) {
+							return TRUE;
+						}
+					}
+				}
+			}
+			else if (p_param.GetType() == c_notificationButtonUp) {
+				if (g_unk0x100f31b0 != -1 || m_controlManager->GetUnknown0x10() ||
+					m_controlManager->GetUnknown0x0c() == 1) {
+					MxBool result = m_controlManager->FUN_10029210(p_param, NULL);
+					StopAutoDragTimer();
+
+					m_unk0x80 = 0;
+					m_unk0x81 = 0;
+					return result;
+				}
+			}
+
+			if (FUN_1005cdf0(p_param)) {
+				if (processRoi && p_param.GetType() == c_notificationType11) {
+					LegoROI* roi = PickROI(p_param.GetX(), p_param.GetY());
+					p_param.SetROI(roi);
+
+					if (roi && roi->GetUnk0x0c() == 1) {
+						for (OrientableROI* oroi = roi->GetUnknown0xd4(); oroi; oroi = oroi->GetUnknown0xd4())
+							roi = (LegoROI*) oroi;
+
+						LegoEntity* entity = roi->GetUnknown0x104();
+						if (entity && entity->Notify(p_param) != 0) {
+							return TRUE;
+						}
+					}
+				}
+
+				if (m_camera && m_camera->Notify(p_param) != 0) {
+					return TRUE;
+				}
+			}
+		}
+	}
+
+	return FALSE;
+}
+
+// STUB: LEGO1 0x1005cdf0
+MxBool LegoInputManager::FUN_1005cdf0(LegoEventNotificationParam& p_param)
 {
 	// TODO
 	return FALSE;
 }
 
 // FUNCTION: LEGO1 0x1005cfb0
-void LegoInputManager::SetTimer()
+void LegoInputManager::StartAutoDragTimer()
 {
-	LegoOmni* omni = LegoOmni::GetInstance();
-	UINT timer = ::SetTimer(omni->GetWindowHandle(), 1, m_timeout, NULL);
-	m_timer = timer;
+	m_autoDragTimerID = ::SetTimer(LegoOmni::GetInstance()->GetWindowHandle(), 1, m_autoDragTime, NULL);
 }
 
 // FUNCTION: LEGO1 0x1005cfd0
-void LegoInputManager::KillTimer()
+void LegoInputManager::StopAutoDragTimer()
 {
-	if (m_timer != 0) {
-		LegoOmni* omni = LegoOmni::GetInstance();
-		::KillTimer(omni->GetWindowHandle(), m_timer);
-	}
+	if (m_autoDragTimerID)
+		::KillTimer(LegoOmni::GetInstance()->GetWindowHandle(), m_autoDragTimerID);
 }
 
 // FUNCTION: LEGO1 0x1005cff0
diff --git a/LEGO1/lego/legoomni/src/video/legovideomanager.cpp b/LEGO1/lego/legoomni/src/video/legovideomanager.cpp
index f31879b3..cbb68b79 100644
--- a/LEGO1/lego/legoomni/src/video/legovideomanager.cpp
+++ b/LEGO1/lego/legoomni/src/video/legovideomanager.cpp
@@ -330,10 +330,19 @@ void LegoVideoManager::DrawFPS()
 	// TODO
 }
 
-// STUB: LEGO1 0x1007c080
-void LegoVideoManager::VTable0x38(undefined4, undefined4)
+// FUNCTION: LEGO1 0x1007c080
+MxPresenter* LegoVideoManager::GetPresenterAt(MxS32 p_x, MxS32 p_y)
 {
-	// TODO
+	MxPresenterListCursor cursor(m_presenters);
+	MxPresenter* presenter;
+
+	while (cursor.Prev(presenter)) {
+		if (presenter->IsHit(p_x, p_y)) {
+			return presenter;
+		}
+	}
+
+	return NULL;
 }
 
 // FUNCTION: LEGO1 0x1007c290
diff --git a/LEGO1/lego/sources/roi/legoroi.h b/LEGO1/lego/sources/roi/legoroi.h
index 9b586353..6ac30b45 100644
--- a/LEGO1/lego/sources/roi/legoroi.h
+++ b/LEGO1/lego/sources/roi/legoroi.h
@@ -42,6 +42,7 @@ class LegoROI : public ViewROI {
 
 	inline const char* GetUnknown0xe4() { return m_unk0xe4; }
 	inline LegoEntity* GetUnknown0x104() { return m_unk0x104; }
+
 	inline void SetUnknown0x104(LegoEntity* p_unk0x104) { m_unk0x104 = p_unk0x104; }
 
 	// SYNTHETIC: LEGO1 0x100a9ad0
diff --git a/LEGO1/omni/include/mxnotificationparam.h b/LEGO1/omni/include/mxnotificationparam.h
index e990abe6..a6055fa2 100644
--- a/LEGO1/omni/include/mxnotificationparam.h
+++ b/LEGO1/omni/include/mxnotificationparam.h
@@ -48,6 +48,8 @@ class MxNotificationParam : public MxParam {
 	inline MxCore* GetSender() const { return m_sender; }
 	inline NotificationId GetType() const { return m_type; }
 
+	inline void SetType(NotificationId p_type) { m_type = p_type; }
+
 protected:
 	NotificationId m_type; // 0x04
 	MxCore* m_sender;      // 0x08
diff --git a/LEGO1/realtime/orientableroi.h b/LEGO1/realtime/orientableroi.h
index 36b8ae50..adbd493d 100644
--- a/LEGO1/realtime/orientableroi.h
+++ b/LEGO1/realtime/orientableroi.h
@@ -32,6 +32,7 @@ class OrientableROI : public ROI {
 	const float* GetWorldPosition() const { return m_local2world[3]; }
 	const float* GetWorldDirection() const { return m_local2world[2]; }
 	const float* GetWorldUp() const { return m_local2world[1]; }
+	OrientableROI* GetUnknown0xd4() const { return m_unk0xd4; }
 
 protected:
 	MxMatrix m_local2world;           // 0x10
@@ -46,7 +47,7 @@ class OrientableROI : public ROI {
 	Mx3DPointFloat m_unk0x94;               // 0x94
 	BoundingSphere m_world_bounding_sphere; // 0xa8
 	Mx3DPointFloat m_world_velocity;        // 0xc0
-	undefined4 m_unk0xd4;                   // 0xd4
+	OrientableROI* m_unk0xd4;               // 0xd4
 	undefined4 m_unk0xd8;                   // 0xd8
 };
 
diff --git a/LEGO1/realtime/roi.h b/LEGO1/realtime/roi.h
index 08db5080..b5cbefa5 100644
--- a/LEGO1/realtime/roi.h
+++ b/LEGO1/realtime/roi.h
@@ -103,6 +103,8 @@ class ROI {
 	int GetLODCount() const { return m_lods ? m_lods->Size() : 0; }
 	const CompoundObject* GetComp() const { return m_comp; }
 
+	inline undefined GetUnk0x0c() { return m_unk0xc; }
+
 	// SYNTHETIC: LEGO1 0x100a5d60
 	// ROI::`scalar deleting destructor'
 

From 4137cd75e605a6699ea04eca8046d6baffe47be5 Mon Sep 17 00:00:00 2001
From: MS <disinvite@users.noreply.github.com>
Date: Sun, 28 Jan 2024 09:25:45 -0500
Subject: [PATCH 187/210] parser: Identify namespaces (#499)

---
 .../isledecomp/isledecomp/cvdump/demangler.py |   5 +
 tools/isledecomp/isledecomp/parser/parser.py  |  70 +++++++++++-
 tools/isledecomp/isledecomp/parser/util.py    |  30 ++++-
 tools/isledecomp/tests/test_curly.py          |  73 ++++++++++++
 tools/isledecomp/tests/test_demangler.py      |   1 +
 tools/isledecomp/tests/test_parser.py         | 108 ++++++++++++++++++
 6 files changed, 280 insertions(+), 7 deletions(-)
 create mode 100644 tools/isledecomp/tests/test_curly.py

diff --git a/tools/isledecomp/isledecomp/cvdump/demangler.py b/tools/isledecomp/isledecomp/cvdump/demangler.py
index 07fca42f..10984bff 100644
--- a/tools/isledecomp/isledecomp/cvdump/demangler.py
+++ b/tools/isledecomp/isledecomp/cvdump/demangler.py
@@ -68,4 +68,9 @@ def demangle_vtable(symbol: str) -> str:
 
         return f"{class_name}<{generic}>"
 
+    # If we have two classes listed, it is a namespace hierarchy.
+    # @@6B@ is a common generic suffix for these vtable symbols.
+    if t[1] != "" and t[1] != "6B":
+        return t[1] + "::" + t[0]
+
     return t[0]
diff --git a/tools/isledecomp/isledecomp/parser/parser.py b/tools/isledecomp/isledecomp/parser/parser.py
index 3c955fc3..4d8beace 100644
--- a/tools/isledecomp/isledecomp/parser/parser.py
+++ b/tools/isledecomp/isledecomp/parser/parser.py
@@ -8,6 +8,8 @@
     get_synthetic_name,
     remove_trailing_comment,
     get_string_contents,
+    sanitize_code_line,
+    scopeDetectRegex,
 )
 from .marker import (
     DecompMarker,
@@ -59,6 +61,57 @@ def empty(self):
         self.markers = {}
 
 
+class CurlyManager:
+    """Overly simplified scope manager"""
+
+    def __init__(self):
+        self._stack = []
+
+    def reset(self):
+        self._stack = []
+
+    def _pop(self):
+        """Pop stack safely"""
+        try:
+            self._stack.pop()
+        except IndexError:
+            pass
+
+    def get_prefix(self, name: Optional[str] = None) -> str:
+        """Return the prefix for where we are."""
+
+        scopes = [t for t in self._stack if t != "{"]
+        if len(scopes) == 0:
+            return name if name is not None else ""
+
+        if name is not None and name not in scopes:
+            scopes.append(name)
+
+        return "::".join(scopes)
+
+    def read_line(self, raw_line: str):
+        """Read a line of code and update the stack."""
+        line = sanitize_code_line(raw_line)
+        if (match := scopeDetectRegex.match(line)) is not None:
+            if not line.endswith(";"):
+                self._stack.append(match.group("name"))
+
+        change = line.count("{") - line.count("}")
+        if change > 0:
+            for _ in range(change):
+                self._stack.append("{")
+        elif change < 0:
+            for _ in range(-change):
+                self._pop()
+
+            if len(self._stack) == 0:
+                return
+
+            last = self._stack[-1]
+            if last != "{":
+                self._pop()
+
+
 class DecompParser:
     # pylint: disable=too-many-instance-attributes
     # Could combine output lists into a single list to get under the limit,
@@ -73,6 +126,8 @@ def __init__(self) -> None:
 
         self.last_line: str = ""
 
+        self.curly = CurlyManager()
+
         # To allow for multiple markers where code is shared across different
         # modules, save lists of compatible markers that appear in sequence
         self.fun_markers = MarkerDict()
@@ -110,6 +165,8 @@ def reset(self):
         self.function_start = 0
         self.function_sig = ""
 
+        self.curly.reset()
+
     @property
     def functions(self) -> List[ParserFunction]:
         return [s for s in self._symbols if isinstance(s, ParserFunction)]
@@ -213,7 +270,7 @@ def _vtable_done(self, class_name: str = None):
                     line_number=self.line_number,
                     module=marker.module,
                     offset=marker.offset,
-                    name=class_name,
+                    name=self.curly.get_prefix(class_name),
                 )
             )
 
@@ -254,7 +311,7 @@ def _variable_done(
                         line_number=self.line_number,
                         module=marker.module,
                         offset=marker.offset,
-                        name=variable_name,
+                        name=self.curly.get_prefix(variable_name),
                         is_static=self.state == ReaderState.IN_FUNC_GLOBAL,
                     )
                 )
@@ -353,6 +410,8 @@ def read_line(self, line: str):
             self._handle_marker(marker)
             return
 
+        self.curly.read_line(line)
+
         line_strip = line.strip()
         if self.state in (
             ReaderState.IN_SYNTHETIC,
@@ -451,8 +510,11 @@ def read_line(self, line: str):
                     variable_name = get_variable_name(line)
                     # This is out of our control for library variables, but all of our
                     # variables should start with "g_".
-                    if variable_name is not None and not variable_name.startswith("g_"):
-                        self._syntax_warning(ParserError.GLOBAL_MISSING_PREFIX)
+                    if variable_name is not None:
+                        # Before checking for the prefix, remove the
+                        # namespace chain if there is one.
+                        if not variable_name.split("::")[-1].startswith("g_"):
+                            self._syntax_warning(ParserError.GLOBAL_MISSING_PREFIX)
 
             string_name = get_string_contents(line)
 
diff --git a/tools/isledecomp/isledecomp/parser/util.py b/tools/isledecomp/isledecomp/parser/util.py
index dd90fd03..bfe3803c 100644
--- a/tools/isledecomp/isledecomp/parser/util.py
+++ b/tools/isledecomp/isledecomp/parser/util.py
@@ -7,15 +7,25 @@
 # flexibility in the formatting seems OK
 templateCommentRegex = re.compile(r"\s*//\s+(.*)")
 
-
 # To remove any comment (//) or block comment (/*) and its leading spaces
 # from the end of a code line
 trailingCommentRegex = re.compile(r"(\s*(?://|/\*).*)$")
 
+# Get char contents, ignore escape characters
+singleQuoteRegex = re.compile(r"('(?:[^\'\\]|\\.)')")
+
+# Match contents of block comment on one line
+blockCommentRegex = re.compile(r"(/\*.*?\*/)")
+
+# Match contents of single comment on one line
+regularCommentRegex = re.compile(r"(//.*)")
 
 # Get string contents, ignore escape characters that might interfere
 doubleQuoteRegex = re.compile(r"(\"(?:[^\"\\]|\\.)*\")")
 
+# Detect a line that would cause us to enter a new scope
+scopeDetectRegex = re.compile(r"(?:class|struct|namespace) (?P<name>\w+).*(?:{)?")
+
 
 def get_synthetic_name(line: str) -> Optional[str]:
     """Synthetic names appear on a single line comment on the line after the marker.
@@ -28,6 +38,20 @@ def get_synthetic_name(line: str) -> Optional[str]:
     return None
 
 
+def sanitize_code_line(line: str) -> str:
+    """Helper for scope manager. Removes sections from a code line
+    that would cause us to incorrectly detect curly brackets.
+    This is a very naive implementation and fails entirely on multi-line
+    strings or comments."""
+
+    line = singleQuoteRegex.sub("''", line)
+    line = doubleQuoteRegex.sub('""', line)
+    line = blockCommentRegex.sub("", line)
+    line = regularCommentRegex.sub("", line)
+
+    return line.strip()
+
+
 def remove_trailing_comment(line: str) -> str:
     return trailingCommentRegex.sub("", line)
 
@@ -75,8 +99,8 @@ def get_class_name(line: str) -> Optional[str]:
     return None
 
 
-global_regex = re.compile(r"(?P<name>g_\w+)")
-less_strict_global_regex = re.compile(r"(?P<name>\w+)(?:\)\(|\[.*|\s*=.*|;)")
+global_regex = re.compile(r"(?P<name>(?:\w+::)*g_\w+)")
+less_strict_global_regex = re.compile(r"(?P<name>(?:\w+::)*\w+)(?:\)\(|\[.*|\s*=.*|;)")
 
 
 def get_variable_name(line: str) -> Optional[str]:
diff --git a/tools/isledecomp/tests/test_curly.py b/tools/isledecomp/tests/test_curly.py
new file mode 100644
index 00000000..8328f5e9
--- /dev/null
+++ b/tools/isledecomp/tests/test_curly.py
@@ -0,0 +1,73 @@
+# nyuk nyuk nyuk
+import pytest
+from isledecomp.parser.parser import CurlyManager
+from isledecomp.parser.util import sanitize_code_line
+
+
+@pytest.fixture(name="curly")
+def fixture_curly():
+    return CurlyManager()
+
+
+def test_simple(curly):
+    curly.read_line("namespace Test {")
+    assert curly.get_prefix() == "Test"
+    curly.read_line("}")
+    assert curly.get_prefix() == ""
+
+
+def test_oneliner(curly):
+    """Should not go down into a scope for a class forward reference"""
+    curly.read_line("class LegoEntity;")
+    assert curly.get_prefix() == ""
+    # Now make sure that we still would not consider that class name
+    # even after reading the opening curly brace
+    curly.read_line("if (true) {")
+    assert curly.get_prefix() == ""
+
+
+def test_ignore_comments(curly):
+    curly.read_line("namespace Test {")
+    curly.read_line("// }")
+    assert curly.get_prefix() == "Test"
+
+
+@pytest.mark.xfail(reason="todo: need a real lexer")
+def test_ignore_multiline_comments(curly):
+    curly.read_line("namespace Test {")
+    curly.read_line("/*")
+    curly.read_line("}")
+    curly.read_line("*/")
+    assert curly.get_prefix() == "Test"
+    curly.read_line("}")
+    assert curly.get_prefix() == ""
+
+
+def test_nested(curly):
+    curly.read_line("namespace Test {")
+    curly.read_line("namespace Foo {")
+    assert curly.get_prefix() == "Test::Foo"
+    curly.read_line("}")
+    assert curly.get_prefix() == "Test"
+
+
+sanitize_cases = [
+    ("", ""),
+    ("   ", ""),
+    ("{", "{"),
+    ("// comments {", ""),
+    ("{ // why comment here", "{"),
+    ("/* comments */ {", "{"),
+    ('"curly in a string {"', '""'),
+    ('if (!strcmp("hello { there }", g_test)) {', 'if (!strcmp("", g_test)) {'),
+    ("'{'", "''"),
+    ("weird_function('\"', hello, '\"')", "weird_function('', hello, '')"),
+]
+
+
+@pytest.mark.parametrize("start, end", sanitize_cases)
+def test_sanitize(start: str, end: str):
+    """Make sure that we can remove curly braces in places where they should
+    not be considered as part of the semantic structure of the file.
+    i.e. inside strings or chars, and inside comments"""
+    assert sanitize_code_line(start) == end
diff --git a/tools/isledecomp/tests/test_demangler.py b/tools/isledecomp/tests/test_demangler.py
index 32cac502..9d0b5203 100644
--- a/tools/isledecomp/tests/test_demangler.py
+++ b/tools/isledecomp/tests/test_demangler.py
@@ -48,6 +48,7 @@ def test_invalid_encoded_number():
     ("??_7LegoCarBuildAnimPresenter@@6B@", "LegoCarBuildAnimPresenter"),
     ("??_7?$MxCollection@PAVLegoWorld@@@@6B@", "MxCollection<LegoWorld *>"),
     ("??_7?$MxPtrList@VLegoPathController@@@@6B@", "MxPtrList<LegoPathController>"),
+    ("??_7Renderer@Tgl@@6B@", "Tgl::Renderer"),
 ]
 
 
diff --git a/tools/isledecomp/tests/test_parser.py b/tools/isledecomp/tests/test_parser.py
index 6d8b72b1..7dcc24b1 100644
--- a/tools/isledecomp/tests/test_parser.py
+++ b/tools/isledecomp/tests/test_parser.py
@@ -521,3 +521,111 @@ def test_string_ignore_g_prefix(parser):
     )
     assert len(parser.strings) == 1
     assert len(parser.alerts) == 0
+
+
+def test_class_variable(parser):
+    """We should accurately name static variables that are class members."""
+
+    parser.read_lines(
+        [
+            "class Test {",
+            "protected:",
+            "  // GLOBAL: TEST 0x1234",
+            "  static int g_test;",
+            "};",
+        ]
+    )
+
+    assert len(parser.variables) == 1
+    assert parser.variables[0].name == "Test::g_test"
+
+
+def test_namespace_variable(parser):
+    """We should identify a namespace surrounding any global variables"""
+
+    parser.read_lines(
+        [
+            "namespace Test {",
+            "// GLOBAL: TEST 0x1234",
+            "int g_test = 1234;",
+            "}",
+            "// GLOBAL: TEST 0x5555",
+            "int g_second = 2;",
+        ]
+    )
+
+    assert len(parser.variables) == 2
+    assert parser.variables[0].name == "Test::g_test"
+    assert parser.variables[1].name == "g_second"
+
+
+def test_namespace_vtable(parser):
+    parser.read_lines(
+        [
+            "namespace Tgl {",
+            "// VTABLE: TEST 0x1234",
+            "class Renderer {",
+            "};",
+            "}",
+            "// VTABLE: TEST 0x5555",
+            "class Hello { };",
+        ]
+    )
+
+    assert len(parser.vtables) == 2
+    assert parser.vtables[0].name == "Tgl::Renderer"
+    assert parser.vtables[1].name == "Hello"
+
+
+def test_global_prefix_namespace(parser):
+    """Should correctly identify namespaces before checking for the g_ prefix"""
+
+    parser.read_lines(
+        [
+            "class Test {",
+            "  // GLOBAL: TEST 0x1234",
+            "  static int g_count = 0;",
+            "  // GLOBAL: TEST 0x5555",
+            "  static int count = 0;",
+            "};",
+        ]
+    )
+
+    assert len(parser.variables) == 2
+    assert parser.variables[0].name == "Test::g_count"
+    assert parser.variables[1].name == "Test::count"
+
+    assert len(parser.alerts) == 1
+    assert parser.alerts[0].code == ParserError.GLOBAL_MISSING_PREFIX
+
+
+def test_nested_namespace(parser):
+    parser.read_lines(
+        [
+            "namespace Tgl {",
+            "class Renderer {",
+            "  // GLOBAL: TEST 0x1234",
+            "  static int g_count = 0;",
+            "};",
+            "};",
+        ]
+    )
+
+    assert len(parser.variables) == 1
+    assert parser.variables[0].name == "Tgl::Renderer::g_count"
+
+
+def test_match_qualified_variable(parser):
+    """If a variable belongs to a scope and we use a fully qualified reference
+    below a GLOBAL marker, make sure we capture the full name."""
+
+    parser.read_lines(
+        [
+            "// GLOBAL: TEST 0x1234",
+            "int MxTest::g_count = 0;",
+        ]
+    )
+
+    assert len(parser.variables) == 1
+    assert parser.variables[0].name == "MxTest::g_count"
+    assert len(parser.alerts) == 0

From c0acf11f9bc0da5c8adf3e0f6eb1d5412e7c4072 Mon Sep 17 00:00:00 2001
From: Nathan M Gilbert <tahgtahv@gmail.com>
Date: Sun, 28 Jan 2024 11:45:49 -0500
Subject: [PATCH 188/210] Implement/Match LegoTree (#485)

* Implement/Match LegoTree

* Fix vtable

* Fixes

---------

Co-authored-by: Christian Semmler <mail@csemmler.com>
---
 CMakeLists.txt                                |   1 +
 .../lego/legoomni/include/legoanimpresenter.h |  28 +----
 .../legoomni/src/video/legoanimpresenter.cpp  |  46 ++------
 LEGO1/lego/sources/misc/legotree.cpp          | 110 ++++++++++++++++++
 LEGO1/lego/sources/misc/legotree.h            |  77 ++++++++++++
 5 files changed, 204 insertions(+), 58 deletions(-)
 create mode 100644 LEGO1/lego/sources/misc/legotree.cpp
 create mode 100644 LEGO1/lego/sources/misc/legotree.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 388c4777..03353834 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -106,6 +106,7 @@ add_library(misc STATIC
   LEGO1/lego/sources/misc/legoimage.cpp
   LEGO1/lego/sources/misc/legostorage.cpp
   LEGO1/lego/sources/misc/legotexture.cpp
+  LEGO1/lego/sources/misc/legotree.cpp
 )
 register_lego1_target(misc)
 set_property(TARGET misc PROPERTY ARCHIVE_OUTPUT_NAME "misc$<$<CONFIG:Debug>:d>")
diff --git a/LEGO1/lego/legoomni/include/legoanimpresenter.h b/LEGO1/lego/legoomni/include/legoanimpresenter.h
index 2ca9c910..594c13ca 100644
--- a/LEGO1/lego/legoomni/include/legoanimpresenter.h
+++ b/LEGO1/lego/legoomni/include/legoanimpresenter.h
@@ -2,6 +2,7 @@
 #define LEGOANIMPRESENTER_H
 
 #include "lego/sources/misc/legostorage.h"
+#include "lego/sources/misc/legotree.h"
 #include "mxgeometry/mxgeometry3d.h"
 #include "mxvideopresenter.h"
 
@@ -75,37 +76,20 @@ class LegoAnimPresenter : public MxVideoPresenter {
 // SYNTHETIC: LEGO1 0x10068650
 // LegoAnimPresenter::`scalar deleting destructor'
 
-// VTABLE: LEGO1 0x100db768
-// SIZE 0x08
-class LegoAnimClassBase {
-public:
-	LegoAnimClassBase();
-	virtual ~LegoAnimClassBase();
-
-	virtual void VTable0x4(); // vtable+0x04
-	virtual void VTable0x8(); // vtable+0x08
-	virtual void VTable0xc(); // vtable+0x0c
-
-	undefined4 m_unk0x4; // 0x04
-};
-
-// SYNTHETIC: LEGO1 0x10099de0
-// LegoAnimClassBase::`scalar deleting destructor'
-
 // VTABLE: LEGO1 0x100db8d8
 // SIZE 0x18
-class LegoAnimClass : public LegoAnimClassBase {
+class LegoAnimClass : public LegoTree {
 public:
 	LegoAnimClass();
 	virtual ~LegoAnimClass() override;
 
-	virtual void VTable0x8() override;                        // vtable+0x08
-	virtual void VTable0xc() override;                        // vtable+0x0c
-	virtual MxResult VTable0x10(LegoMemory* p_stream, MxS32); // vtable+0x10
+	virtual LegoResult Write(LegoStorage* p_storage) override; // vtable+0x08
+	virtual LegoTreeNodeData* CreateData() override;           // vtable+0x0c
+	virtual MxResult VTable0x10(LegoMemory* p_stream, MxS32);  // vtable+0x10
 
 	inline MxLong GetUnknown0x8() { return m_unk0x8; }
 
-	// private:
+private:
 	MxLong m_unk0x8;      // 0x08
 	undefined4 m_unk0xc;  // 0x0c
 	undefined4 m_unk0x10; // 0x10
diff --git a/LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp b/LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp
index 6da994ec..be04b444 100644
--- a/LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp
+++ b/LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp
@@ -8,7 +8,6 @@
 #include "mxvideomanager.h"
 
 DECOMP_SIZE_ASSERT(LegoAnimPresenter, 0xc0)
-DECOMP_SIZE_ASSERT(LegoAnimClassBase, 0x08)
 DECOMP_SIZE_ASSERT(LegoAnimClass, 0x18)
 
 // FUNCTION: LEGO1 0x10068420
@@ -140,12 +139,7 @@ void LegoAnimPresenter::StreamingTickle()
 		m_subscriber->DestroyChunk(chunk);
 	}
 
-	if (m_unk0x95 == 0) {
-		if (m_unk0x64->m_unk0x8 + m_action->GetStartTime() < m_action->GetElapsedTime()) {
-			m_unk0x95 = 1;
-		}
-	}
-	else {
+	if (m_unk0x95) {
 		ProgressTickleState(e_done);
 		if (m_compositePresenter) {
 			if (m_compositePresenter->IsA("LegoAnimMMPresenter")) {
@@ -153,6 +147,11 @@ void LegoAnimPresenter::StreamingTickle()
 			}
 		}
 	}
+	else {
+		if (m_action->GetElapsedTime() > m_unk0x64->GetUnknown0x8() + m_action->GetStartTime()) {
+			m_unk0x95 = 1;
+		}
+	}
 }
 
 // STUB: LEGO1 0x1006b8c0
@@ -200,33 +199,6 @@ void LegoAnimPresenter::EndAction()
 	MxVideoPresenter::EndAction();
 }
 
-// FUNCTION: LEGO1 0x10099dd0
-LegoAnimClassBase::LegoAnimClassBase()
-{
-	m_unk0x4 = 0;
-}
-
-// STUB: LEGO1 0x10099e00
-LegoAnimClassBase::~LegoAnimClassBase()
-{
-	// TODO
-}
-
-// STUB: LEGO1 0x10099e20
-void LegoAnimClassBase::VTable0x4()
-{
-}
-
-// STUB: LEGO1 0x10099e40
-void LegoAnimClassBase::VTable0x8()
-{
-}
-
-// STUB: LEGO1 0x10099f70
-void LegoAnimClassBase::VTable0xc()
-{
-}
-
 // FUNCTION: LEGO1 0x100a0b30
 LegoAnimClass::LegoAnimClass()
 {
@@ -249,13 +221,15 @@ MxResult LegoAnimClass::VTable0x10(LegoMemory* p_stream, MxS32)
 }
 
 // STUB: LEGO1 0x100a0e30
-void LegoAnimClass::VTable0x8()
+LegoResult LegoAnimClass::Write(LegoStorage* p_storage)
 {
 	// TODO
+	return SUCCESS;
 }
 
 // STUB: LEGO1 0x100a1040
-void LegoAnimClass::VTable0xc()
+LegoTreeNodeData* LegoAnimClass::CreateData()
 {
 	// TODO
+	return NULL;
 }
diff --git a/LEGO1/lego/sources/misc/legotree.cpp b/LEGO1/lego/sources/misc/legotree.cpp
new file mode 100644
index 00000000..e7f24513
--- /dev/null
+++ b/LEGO1/lego/sources/misc/legotree.cpp
@@ -0,0 +1,110 @@
+#include "legotree.h"
+
+#include "decomp.h"
+#include "legostorage.h"
+
+DECOMP_SIZE_ASSERT(LegoTreeNodeData, 0x04)
+DECOMP_SIZE_ASSERT(LegoTreeNode, 0x010)
+DECOMP_SIZE_ASSERT(LegoTree, 0x08)
+
+// FUNCTION: LEGO1 0x10099d60
+LegoTreeNode::LegoTreeNode()
+{
+	m_data = NULL;
+	m_numChildren = 0;
+	m_children = NULL;
+}
+
+// FUNCTION: LEGO1 0x10099da0
+LegoTreeNode::~LegoTreeNode()
+{
+	if (m_data) {
+		delete m_data;
+	}
+	if (m_children) {
+		delete[] m_children;
+	}
+}
+
+// FUNCTION: LEGO1 0x10099dd0
+LegoTree::LegoTree()
+{
+	m_root = NULL;
+}
+
+// FUNCTION: LEGO1 0x10099e00
+LegoTree::~LegoTree()
+{
+	if (m_root) {
+		Delete(m_root);
+	}
+}
+
+// FUNCTION: LEGO1 0x10099e20
+LegoResult LegoTree::Read(LegoStorage* p_storage)
+{
+	return Read(p_storage, m_root);
+}
+
+// FUNCTION: LEGO1 0x10099e40
+LegoResult LegoTree::Write(LegoStorage* p_storage)
+{
+	return Write(p_storage, m_root);
+}
+
+// FUNCTION: LEGO1 0x10099e60
+LegoResult LegoTree::Read(LegoStorage* p_storage, LegoTreeNode*& p_node)
+{
+	LegoResult result;
+	p_node = new LegoTreeNode();
+	p_node->SetData(CreateData());
+	if ((result = p_node->GetData()->Read(p_storage)) != SUCCESS) {
+		return result;
+	}
+	LegoU32 numChildren;
+	if ((result = p_storage->Read(&numChildren, sizeof(numChildren))) != SUCCESS) {
+		return result;
+	}
+	if (numChildren) {
+		p_node->SetChildren(new LegoTreeNode*[numChildren]);
+		for (LegoU32 i = 0; i < numChildren; i++) {
+			LegoTreeNode* node;
+			if ((result = Read(p_storage, node)) != SUCCESS) {
+				return result;
+			}
+			p_node->SetNumChildren(p_node->GetNumChildren() + 1);
+			p_node->SetChild(i, node);
+		}
+	}
+	return SUCCESS;
+}
+
+// FUNCTION: LEGO1 0x1009a020
+LegoResult LegoTree::Write(LegoStorage* p_storage, LegoTreeNode* p_node)
+{
+	LegoResult result;
+	if (p_node->GetData()) {
+		if ((result = p_node->GetData()->Write(p_storage)) != SUCCESS) {
+			return result;
+		}
+	}
+	LegoU32 numChildren = p_node->GetNumChildren();
+	if ((result = p_storage->Write(&numChildren, sizeof(numChildren))) != SUCCESS) {
+		return result;
+	}
+	for (LegoU32 i = 0; i < p_node->GetNumChildren(); i++) {
+		if ((result = Write(p_storage, p_node->GetChild(i))) != SUCCESS) {
+			return result;
+		}
+	}
+	return SUCCESS;
+}
+
+// FUNCTION: LEGO1 0x1009a0a0
+void LegoTree::Delete(LegoTreeNode* p_node)
+{
+	for (LegoU32 i = 0; i < p_node->GetNumChildren(); i++) {
+		Delete(p_node->GetChild(i));
+	}
+	delete p_node;
+}
diff --git a/LEGO1/lego/sources/misc/legotree.h b/LEGO1/lego/sources/misc/legotree.h
new file mode 100644
index 00000000..185c178f
--- /dev/null
+++ b/LEGO1/lego/sources/misc/legotree.h
@@ -0,0 +1,77 @@
+#ifndef __LEGOTREE_H
+#define __LEGOTREE_H
+
+#ifdef _DEBUG
+#include <stdio.h>
+#endif
+#include "legotypes.h"
+
+class LegoStorage;
+
+// VTABLE: LEGO1 0x100db778
+// SIZE 0x4
+class LegoTreeNodeData {
+public:
+	LegoTreeNodeData() {}
+	virtual ~LegoTreeNodeData() {}
+
+	// FUNCTION: LEGO1 0x10099fe0
+	virtual LegoResult Read(LegoStorage* p_storage) { return SUCCESS; } // vtable+0x4
+
+	// FUNCTION: LEGO1 0x10099ff0
+	virtual LegoResult Write(LegoStorage* p_storage) { return SUCCESS; } // vtable+0x8
+
+	// SYNTHETIC: LEGO1 0x1009a000
+	// LegoTreeNodeData::`scalar deleting destructor'
+};
+
+// VTABLE: LEGO1 0x100db764
+// SIZE 0x10
+class LegoTreeNode {
+public:
+	LegoTreeNode();
+	virtual ~LegoTreeNode();
+	LegoTreeNodeData* GetData() { return m_data; }
+	void SetData(LegoTreeNodeData* p_data) { m_data = p_data; }
+	LegoU32 GetNumChildren() { return m_numChildren; }
+	void SetNumChildren(LegoU32 p_numChildren) { m_numChildren = p_numChildren; }
+	LegoTreeNode* GetChild(LegoU32 p_i) { return m_children[p_i]; }
+	void SetChild(LegoU32 p_i, LegoTreeNode* p_child) { m_children[p_i] = p_child; }
+	LegoTreeNode** GetChildren() { return m_children; }
+	void SetChildren(LegoTreeNode** p_children) { m_children = p_children; }
+
+	// SYNTHETIC: LEGO1 0x10099d80
+	// LegoTreeNode::`scalar deleting destructor'
+
+protected:
+	LegoTreeNodeData* m_data;  // 0x4
+	LegoU32 m_numChildren;     // 0x8
+	LegoTreeNode** m_children; // 0xc
+};
+
+// VTABLE: LEGO1 0x100db768
+// SIZE 0x8
+class LegoTree {
+public:
+	LegoTree();
+	virtual ~LegoTree();
+	LegoTreeNode* GetRoot() { return m_root; }
+	void SetRoot(LegoTreeNode* p_root) { m_root = p_root; }
+	virtual LegoResult Read(LegoStorage* p_storage);  // vtable+0x4
+	virtual LegoResult Write(LegoStorage* p_storage); // vtable+0x8
+
+	// SYNTHETIC: LEGO1 0x10099de0
+	// LegoTree::`scalar deleting destructor'
+
+protected:
+	LegoResult Read(LegoStorage* p_storage, LegoTreeNode*& p_node);
+	LegoResult Write(LegoStorage* p_storage, LegoTreeNode* p_node);
+	void Delete(LegoTreeNode* p_node);
+
+	// FUNCTION: LEGO1 0x10099f70
+	virtual LegoTreeNodeData* CreateData() { return new LegoTreeNodeData(); } // vtable+0xc
+
+	LegoTreeNode* m_root; // 0x4
+};
+
+#endif // __LEGOTREE_H

From 4314d3e297033f1d62a1c36ddeeffca9cb0d92c3 Mon Sep 17 00:00:00 2001
From: Misha <106913236+MishaProductions@users.noreply.github.com>
Date: Sun, 28 Jan 2024 16:09:33 -0500
Subject: [PATCH 189/210] Implement LegoControlManager (#500)

* Push changes

* Update score.cpp

* fix

* Update score.h

* Fixes/matches

---------

Co-authored-by: Christian Semmler <mail@csemmler.com>
---
 CMakeLists.txt                                |   1 -
 LEGO1/lego/legoomni/include/ambulance.h       |  14 +-
 LEGO1/lego/legoomni/include/bike.h            |   8 +-
 LEGO1/lego/legoomni/include/dunebuggy.h       |   2 +-
 LEGO1/lego/legoomni/include/helicopter.h      |   2 +-
 LEGO1/lego/legoomni/include/islepathactor.h   |   4 +-
 LEGO1/lego/legoomni/include/jetski.h          |  12 +-
 .../legoomni/include/legocontrolmanager.h     |  46 ++++-
 .../include/legoeventnotificationparam.h      |   4 +
 .../lego/legoomni/include/legoinputmanager.h  |   6 +
 LEGO1/lego/legoomni/include/motocycle.h       |  12 +-
 .../legoomni/include/mxcontrolpresenter.h     |  10 +-
 LEGO1/lego/legoomni/include/score.h           |   4 +-
 LEGO1/lego/legoomni/include/skateboard.h      |  10 +-
 LEGO1/lego/legoomni/include/towtrack.h        |   2 +-
 LEGO1/lego/legoomni/src/build/dunebuggy.cpp   |   2 +-
 LEGO1/lego/legoomni/src/build/helicopter.cpp  |   6 +-
 LEGO1/lego/legoomni/src/build/jetski.cpp      |   2 +-
 .../src/control/legocontrolmanager.cpp        | 164 ++++++++++++++++--
 .../src/control/mxcontrolpresenter.cpp        |  37 +++-
 .../lego/legoomni/src/hospital/ambulance.cpp  |   2 +-
 LEGO1/lego/legoomni/src/infocenter/score.cpp  |  10 +-
 .../legoomni/src/input/legoinputmanager.cpp   |   4 +-
 LEGO1/lego/legoomni/src/isle/bike.cpp         |   2 +-
 LEGO1/lego/legoomni/src/isle/motocycle.cpp    |   2 +-
 LEGO1/lego/legoomni/src/isle/skateboard.cpp   |   2 +-
 LEGO1/lego/legoomni/src/towtrack/towtrack.cpp |   2 +-
 LEGO1/omni/include/mxnotificationparam.h      |   1 +
 .../omni/include/mxtype17notificationparam.h  |  20 ---
 .../src/notify/mxtype17notificationparam.cpp  |   3 -
 30 files changed, 291 insertions(+), 105 deletions(-)
 delete mode 100644 LEGO1/omni/include/mxtype17notificationparam.h
 delete mode 100644 LEGO1/omni/src/notify/mxtype17notificationparam.cpp

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 03353834..eeee76d5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -170,7 +170,6 @@ add_library(omni STATIC
   LEGO1/omni/src/notify/mxactionnotificationparam.cpp
   LEGO1/omni/src/notify/mxnotificationmanager.cpp
   LEGO1/omni/src/notify/mxnotificationparam.cpp
-  LEGO1/omni/src/notify/mxtype17notificationparam.cpp
   LEGO1/omni/src/stream/mxdiskstreamcontroller.cpp
   LEGO1/omni/src/stream/mxdiskstreamprovider.cpp
   LEGO1/omni/src/stream/mxdsbuffer.cpp
diff --git a/LEGO1/lego/legoomni/include/ambulance.h b/LEGO1/lego/legoomni/include/ambulance.h
index 88fd57d8..5429cc66 100644
--- a/LEGO1/lego/legoomni/include/ambulance.h
+++ b/LEGO1/lego/legoomni/include/ambulance.h
@@ -25,13 +25,13 @@ class Ambulance : public IslePathActor {
 		return !strcmp(p_name, Ambulance::ClassName()) || IslePathActor::IsA(p_name);
 	}
 
-	virtual MxResult Create(MxDSAction& p_dsAction) override;              // vtable+0x18
-	virtual void Destroy(MxBool p_fromDestructor) override;                // vtable+0x1c
-	virtual void VTable0x70(float p_float) override;                       // vtable+0x70
-	virtual MxU32 VTable0xcc() override;                                   // vtable+0xcc
-	virtual MxU32 VTable0xd4(MxType17NotificationParam& p_param) override; // vtable+0xd4
-	virtual MxU32 VTable0xdc(MxType19NotificationParam&) override;         // vtable+0xdc
-	virtual void VTable0xe4() override;                                    // vtable+0xe4
+	virtual MxResult Create(MxDSAction& p_dsAction) override;            // vtable+0x18
+	virtual void Destroy(MxBool p_fromDestructor) override;              // vtable+0x1c
+	virtual void VTable0x70(float p_float) override;                     // vtable+0x70
+	virtual MxU32 VTable0xcc() override;                                 // vtable+0xcc
+	virtual MxU32 VTable0xd4(LegoControlManagerEvent& p_param) override; // vtable+0xd4
+	virtual MxU32 VTable0xdc(MxType19NotificationParam&) override;       // vtable+0xdc
+	virtual void VTable0xe4() override;                                  // vtable+0xe4
 
 	// SYNTHETIC: LEGO1 0x10036130
 	// Ambulance::`scalar deleting destructor'
diff --git a/LEGO1/lego/legoomni/include/bike.h b/LEGO1/lego/legoomni/include/bike.h
index 02265604..3e3f1359 100644
--- a/LEGO1/lego/legoomni/include/bike.h
+++ b/LEGO1/lego/legoomni/include/bike.h
@@ -23,10 +23,10 @@ class Bike : public IslePathActor {
 		return !strcmp(p_name, Bike::ClassName()) || IslePathActor::IsA(p_name);
 	}
 
-	virtual MxResult Create(MxDSAction& p_dsAction) override;              // vtable+0x18
-	virtual MxU32 VTable0xcc() override;                                   // vtable+0xcc
-	virtual MxU32 VTable0xd4(MxType17NotificationParam& p_param) override; // vtable+0xd4
-	virtual void VTable0xe4() override;                                    // vtable+0xe4
+	virtual MxResult Create(MxDSAction& p_dsAction) override;            // vtable+0x18
+	virtual MxU32 VTable0xcc() override;                                 // vtable+0xcc
+	virtual MxU32 VTable0xd4(LegoControlManagerEvent& p_param) override; // vtable+0xd4
+	virtual void VTable0xe4() override;                                  // vtable+0xe4
 
 	// SYNTHETIC: LEGO1 0x10076880
 	// Bike::`scalar deleting destructor'
diff --git a/LEGO1/lego/legoomni/include/dunebuggy.h b/LEGO1/lego/legoomni/include/dunebuggy.h
index ca671955..3aaf7a87 100644
--- a/LEGO1/lego/legoomni/include/dunebuggy.h
+++ b/LEGO1/lego/legoomni/include/dunebuggy.h
@@ -26,7 +26,7 @@ class DuneBuggy : public IslePathActor {
 	virtual MxResult Create(MxDSAction& p_dsAction) override;              // vtable+0x18
 	virtual void VTable0x70(float p_float) override;                       // vtable+0x70
 	virtual MxU32 VTable0xcc() override;                                   // vtable+0xcc
-	virtual MxU32 VTable0xd4(MxType17NotificationParam& p_param) override; // vtable+0xd4
+	virtual MxU32 VTable0xd4(LegoControlManagerEvent& p_param) override;   // vtable+0xd4
 	virtual MxU32 VTable0xdc(MxType19NotificationParam& p_param) override; // vtable+0xdc
 	virtual void VTable0xe4() override;                                    // vtable+0xe4
 
diff --git a/LEGO1/lego/legoomni/include/helicopter.h b/LEGO1/lego/legoomni/include/helicopter.h
index e730fee4..10bcd7da 100644
--- a/LEGO1/lego/legoomni/include/helicopter.h
+++ b/LEGO1/lego/legoomni/include/helicopter.h
@@ -41,7 +41,7 @@ class Helicopter : public IslePathActor {
 	virtual void VTable0x70(float p_float) override;                       // vtable+0x70
 	virtual void VTable0x74(Matrix4& p_transform) override;                // vtable+0x74
 	virtual MxU32 VTable0xcc() override;                                   // vtable+0xcc
-	virtual MxU32 VTable0xd4(MxType17NotificationParam& p_param) override; // vtable+0xd4
+	virtual MxU32 VTable0xd4(LegoControlManagerEvent& p_param) override;   // vtable+0xd4
 	virtual MxU32 VTable0xd8(MxType18NotificationParam& p_param) override; // vtable+0xd8
 	virtual void VTable0xe4() override;                                    // vtable+0xe4
 
diff --git a/LEGO1/lego/legoomni/include/islepathactor.h b/LEGO1/lego/legoomni/include/islepathactor.h
index e2944876..2e92c251 100644
--- a/LEGO1/lego/legoomni/include/islepathactor.h
+++ b/LEGO1/lego/legoomni/include/islepathactor.h
@@ -1,9 +1,9 @@
 #ifndef ISLEPATHACTOR_H
 #define ISLEPATHACTOR_H
 
+#include "legocontrolmanager.h"
 #include "legopathactor.h"
 #include "legoworld.h"
-#include "mxtype17notificationparam.h"
 #include "mxtype18notificationparam.h"
 #include "mxtype19notificationparam.h"
 #include "mxtypes.h"
@@ -39,7 +39,7 @@ class IslePathActor : public LegoPathActor {
 	// FUNCTION: LEGO1 0x10002df0
 	virtual MxU32 VTable0xd0() { return 0; } // vtable+0xd0
 	// FUNCTION: LEGO1 0x10002e80
-	virtual MxU32 VTable0xd4(MxType17NotificationParam&) { return 0; } // vtable+0xd4
+	virtual MxU32 VTable0xd4(LegoControlManagerEvent&) { return 0; } // vtable+0xd4
 	// FUNCTION: LEGO1 0x10002e90
 	virtual MxU32 VTable0xd8(MxType18NotificationParam&) { return 0; } // vtable+0xd8
 	// FUNCTION: LEGO1 0x10002e00
diff --git a/LEGO1/lego/legoomni/include/jetski.h b/LEGO1/lego/legoomni/include/jetski.h
index c3136d80..91de4b91 100644
--- a/LEGO1/lego/legoomni/include/jetski.h
+++ b/LEGO1/lego/legoomni/include/jetski.h
@@ -3,7 +3,7 @@
 
 #include "decomp.h"
 #include "islepathactor.h"
-#include "mxtype17notificationparam.h"
+#include "legocontrolmanager.h"
 
 // VTABLE: LEGO1 0x100d9ec8
 // SIZE 0x164
@@ -24,11 +24,11 @@ class Jetski : public IslePathActor {
 		return !strcmp(p_name, Jetski::ClassName()) || IslePathActor::IsA(p_name);
 	}
 
-	virtual MxResult Create(MxDSAction& p_dsAction) override;      // vtable+0x18
-	virtual void VTable0x70(float p_float) override;               // vtable+0x70
-	virtual MxU32 VTable0xcc() override;                           // vtable+0xcc
-	virtual MxU32 VTable0xd4(MxType17NotificationParam&) override; // vtable+0xd4
-	virtual void VTable0xe4() override;                            // vtable+0xe4
+	virtual MxResult Create(MxDSAction& p_dsAction) override;    // vtable+0x18
+	virtual void VTable0x70(float p_float) override;             // vtable+0x70
+	virtual MxU32 VTable0xcc() override;                         // vtable+0xcc
+	virtual MxU32 VTable0xd4(LegoControlManagerEvent&) override; // vtable+0xd4
+	virtual void VTable0xe4() override;                          // vtable+0xe4
 
 	// SYNTHETIC: LEGO1 0x1007e5c0
 	// Jetski::`scalar deleting destructor'
diff --git a/LEGO1/lego/legoomni/include/legocontrolmanager.h b/LEGO1/lego/legoomni/include/legocontrolmanager.h
index 5b83a715..f2f04026 100644
--- a/LEGO1/lego/legoomni/include/legocontrolmanager.h
+++ b/LEGO1/lego/legoomni/include/legocontrolmanager.h
@@ -2,9 +2,40 @@
 #define LEGOCONTROLMANAGER_H
 
 #include "legoeventnotificationparam.h"
+#include "legoinputmanager.h"
 #include "mxcore.h"
 #include "mxpresenterlist.h"
 
+// VTABLE: LEGO1 0x100d6a98
+// SIZE 0x2c
+class LegoControlManagerEvent : public LegoEventNotificationParam {
+public:
+	inline LegoControlManagerEvent() : LegoEventNotificationParam()
+	{
+		m_clickedObjectId = -1;
+		m_clickedAtom = NULL;
+	}
+
+	inline MxS32 GetClickedObjectId() const { return m_clickedObjectId; }
+	inline const char* GetClickedAtom() const { return m_clickedAtom; }
+	inline MxS16 GetUnknown0x28() const { return m_unk0x28; }
+
+	inline void SetClickedObjectId(MxS32 p_clickedObjectId) { m_clickedObjectId = p_clickedObjectId; }
+	inline void SetClickedAtom(const char* p_clickedAtom) { m_clickedAtom = p_clickedAtom; }
+	inline void SetUnknown0x28(MxS16 p_unk0x28) { m_unk0x28 = p_unk0x28; }
+
+private:
+	MxS32 m_clickedObjectId;   // 0x20
+	const char* m_clickedAtom; // 0x24
+	MxS16 m_unk0x28;           // 0x28
+};
+
+// SYNTHETIC: LEGO1 0x10028bf0
+// LegoControlManagerEvent::`scalar deleting destructor'
+
+// SYNTHETIC: LEGO1 0x10028c60
+// LegoControlManagerEvent::~LegoControlManagerEvent
+
 // VTABLE: LEGO1 0x100d6a80
 class LegoControlManager : public MxCore {
 public:
@@ -31,6 +62,10 @@ class LegoControlManager : public MxCore {
 	void Unregister(MxCore* p_listener);
 	MxBool FUN_10029210(LegoEventNotificationParam& p_param, MxPresenter* p_presenter);
 	void FUN_100293c0(undefined4, const char*, undefined2);
+	void FUN_100294e0(MxS32 p_x, MxS32 p_y);
+	MxBool FUN_10029630();
+	MxBool FUN_10029750();
+	void FUN_100292e0();
 
 	inline undefined4 GetUnknown0x0c() { return m_unk0x0c; }
 	inline undefined GetUnknown0x10() { return m_unk0x10; }
@@ -39,10 +74,13 @@ class LegoControlManager : public MxCore {
 	// LegoControlManager::`scalar deleting destructor'
 
 private:
-	undefined4 m_unk0x08;          // 0x08
-	undefined4 m_unk0x0c;          // 0x0c
-	undefined m_unk0x10;           // 0x10
-	undefined m_padding0x14[0x4c]; // 0x14
+	undefined4 m_unk0x08;             // 0x08
+	undefined4 m_unk0x0c;             // 0x0c
+	MxBool m_unk0x10;                 // 0x10
+	MxPresenter* m_unk0x14;           // 0x14
+	LegoControlManagerEvent m_event;  // 0x18
+	MxPresenterList* m_presenterList; // 0x44
+	LegoNotifyList m_notifyList;      // 0x48
 };
 
 #endif // LEGOCONTROLMANAGER_H
diff --git a/LEGO1/lego/legoomni/include/legoeventnotificationparam.h b/LEGO1/lego/legoomni/include/legoeventnotificationparam.h
index 9eb6c7b5..731b53bb 100644
--- a/LEGO1/lego/legoomni/include/legoeventnotificationparam.h
+++ b/LEGO1/lego/legoomni/include/legoeventnotificationparam.h
@@ -39,6 +39,10 @@ class LegoEventNotificationParam : public MxNotificationParam {
 	inline MxS32 GetY() const { return m_y; }
 
 	inline void SetROI(LegoROI* p_roi) { m_roi = p_roi; }
+	inline void SetModifier(MxU8 p_modifier) { m_modifier = p_modifier; }
+	inline void SetKey(MxU8 p_key) { m_key = p_key; }
+	inline void SetX(MxS32 p_x) { m_x = p_x; }
+	inline void SetY(MxS32 p_y) { m_y = p_y; }
 
 protected:
 	MxU8 m_modifier; // 0x0c
diff --git a/LEGO1/lego/legoomni/include/legoinputmanager.h b/LEGO1/lego/legoomni/include/legoinputmanager.h
index eada8f70..913df81c 100644
--- a/LEGO1/lego/legoomni/include/legoinputmanager.h
+++ b/LEGO1/lego/legoomni/include/legoinputmanager.h
@@ -12,6 +12,9 @@
 
 class LegoControlManager;
 
+extern MxS32 g_unk0x100f31b0;
+extern const char* g_unk0x100f31b4;
+
 // VTABLE: LEGO1 0x100d87b8
 // class MxCollection<LegoEventNotificationParam>
 
@@ -171,6 +174,9 @@ class LegoInputManager : public MxPresenter {
 // SYNTHETIC: LEGO1 0x10028b30
 // MxPtrList<MxCore>::`scalar deleting destructor'
 
+// FUNCTION: LEGO1 0x10028ba0
+// LegoNotifyList::~LegoNotifyList
+
 // SYNTHETIC: LEGO1 0x10028fd0
 // LegoNotifyListCursor::`scalar deleting destructor'
 
diff --git a/LEGO1/lego/legoomni/include/motocycle.h b/LEGO1/lego/legoomni/include/motocycle.h
index e7716a33..6505f35b 100644
--- a/LEGO1/lego/legoomni/include/motocycle.h
+++ b/LEGO1/lego/legoomni/include/motocycle.h
@@ -23,12 +23,12 @@ class Motocycle : public IslePathActor {
 		return !strcmp(p_name, Motocycle::ClassName()) || IslePathActor::IsA(p_name);
 	}
 
-	virtual MxResult Create(MxDSAction& p_dsAction) override;              // vtable+0x18
-	virtual void VTable0x70(float p_float) override;                       // vtable+0x70
-	virtual MxU32 VTable0xcc() override;                                   // vtable+0xcc
-	virtual MxU32 VTable0xd4(MxType17NotificationParam& p_param) override; // vtable+0xd4
-	virtual MxU32 VTable0xdc(MxType19NotificationParam&) override;         // vtable+0xdc
-	virtual void VTable0xe4() override;                                    // vtable+0xe4
+	virtual MxResult Create(MxDSAction& p_dsAction) override;            // vtable+0x18
+	virtual void VTable0x70(float p_float) override;                     // vtable+0x70
+	virtual MxU32 VTable0xcc() override;                                 // vtable+0xcc
+	virtual MxU32 VTable0xd4(LegoControlManagerEvent& p_param) override; // vtable+0xd4
+	virtual MxU32 VTable0xdc(MxType19NotificationParam&) override;       // vtable+0xdc
+	virtual void VTable0xe4() override;                                  // vtable+0xe4
 
 	// SYNTHETIC: LEGO1 0x100359d0
 	// Motocycle::`scalar deleting destructor'
diff --git a/LEGO1/lego/legoomni/include/mxcontrolpresenter.h b/LEGO1/lego/legoomni/include/mxcontrolpresenter.h
index b4c8950e..34b3082d 100644
--- a/LEGO1/lego/legoomni/include/mxcontrolpresenter.h
+++ b/LEGO1/lego/legoomni/include/mxcontrolpresenter.h
@@ -4,6 +4,8 @@
 #include "decomp.h"
 #include "mxcompositepresenter.h"
 
+class LegoControlManagerEvent;
+
 // VTABLE: LEGO1 0x100d7b88
 // SIZE 0x5c
 class MxControlPresenter : public MxCompositePresenter {
@@ -34,11 +36,12 @@ class MxControlPresenter : public MxCompositePresenter {
 	virtual void Enable(MxBool p_enable) override;                           // vtable+0x54
 	virtual MxBool VTable0x64(undefined4 p_undefined) override;              // vtable+0x64
 	virtual void VTable0x68(MxBool p_unk0x50);                               // vtable+0x68
-	virtual void VTable0x6c(undefined4);                                     // vtable+0x6c
+	virtual void VTable0x6c(undefined2);                                     // vtable+0x6c
+
+	MxBool FUN_10044480(LegoControlManagerEvent* p_event, MxPresenter* p_presenter);
 
 private:
-	MxBool FUN_10044270(undefined4, undefined4, undefined4*);
-	MxBool FUN_10044480(undefined4, undefined4*);
+	MxBool FUN_10044270(MxS32 p_x, MxS32 p_y, MxPresenter* p_presenter);
 	void FUN_10044540(undefined2);
 
 	undefined2 m_unk0x4c; // 0x4c
@@ -46,6 +49,7 @@ class MxControlPresenter : public MxCompositePresenter {
 	MxBool m_unk0x50;     // 0x50
 	undefined2 m_unk0x52; // 0x52
 	undefined2 m_unk0x54; // 0x54
+	undefined2 m_unk0x56; // 0x56
 	MxS16* m_unk0x58;     // 0x58
 };
 
diff --git a/LEGO1/lego/legoomni/include/score.h b/LEGO1/lego/legoomni/include/score.h
index 08d4b595..2df0e37c 100644
--- a/LEGO1/lego/legoomni/include/score.h
+++ b/LEGO1/lego/legoomni/include/score.h
@@ -1,10 +1,10 @@
 #ifndef SCORE_H
 #define SCORE_H
 
+#include "legocontrolmanager.h"
 #include "legoeventnotificationparam.h"
 #include "legoworld.h"
 #include "mxactionnotificationparam.h"
-#include "mxtype17notificationparam.h"
 #include "scorestate.h"
 
 // VTABLE: LEGO1 0x100d4018
@@ -39,7 +39,7 @@ class Score : public LegoWorld {
 
 	void Paint();
 	MxLong FUN_10001510(MxEndActionNotificationParam& p_param);
-	MxLong FUN_100016d0(MxType17NotificationParam& p_param);
+	MxLong FUN_100016d0(LegoControlManagerEvent& p_param);
 	void FillArea(MxU32 p_x, MxU32 p_y, MxS16 p_color);
 
 protected:
diff --git a/LEGO1/lego/legoomni/include/skateboard.h b/LEGO1/lego/legoomni/include/skateboard.h
index f4154b8d..4f97d87c 100644
--- a/LEGO1/lego/legoomni/include/skateboard.h
+++ b/LEGO1/lego/legoomni/include/skateboard.h
@@ -23,11 +23,11 @@ class SkateBoard : public IslePathActor {
 		return !strcmp(p_name, SkateBoard::ClassName()) || IslePathActor::IsA(p_name);
 	}
 
-	virtual MxResult Create(MxDSAction& p_dsAction) override;              // vtable+0x18
-	virtual MxU32 VTable0xcc() override;                                   // vtable+0xcc
-	virtual MxU32 VTable0xd0() override;                                   // vtable+0xd0
-	virtual MxU32 VTable0xd4(MxType17NotificationParam& p_param) override; // vtable+0xd4
-	virtual void VTable0xe4() override;                                    // vtable+0xe4
+	virtual MxResult Create(MxDSAction& p_dsAction) override;            // vtable+0x18
+	virtual MxU32 VTable0xcc() override;                                 // vtable+0xcc
+	virtual MxU32 VTable0xd0() override;                                 // vtable+0xd0
+	virtual MxU32 VTable0xd4(LegoControlManagerEvent& p_param) override; // vtable+0xd4
+	virtual void VTable0xe4() override;                                  // vtable+0xe4
 
 	// SYNTHETIC: LEGO1 0x1000ff60
 	// SkateBoard::`scalar deleting destructor'
diff --git a/LEGO1/lego/legoomni/include/towtrack.h b/LEGO1/lego/legoomni/include/towtrack.h
index 8fb6b818..a79f75fb 100644
--- a/LEGO1/lego/legoomni/include/towtrack.h
+++ b/LEGO1/lego/legoomni/include/towtrack.h
@@ -27,7 +27,7 @@ class TowTrack : public IslePathActor {
 	virtual MxResult Create(MxDSAction& p_dsAction) override;              // vtable+0x18
 	virtual void VTable0x70(float p_float) override;                       // vtable+0x70
 	virtual MxU32 VTable0xcc() override;                                   // vtable+0xcc
-	virtual MxU32 VTable0xd4(MxType17NotificationParam& p_param) override; // vtable+0xd4
+	virtual MxU32 VTable0xd4(LegoControlManagerEvent& p_param) override;   // vtable+0xd4
 	virtual MxU32 VTable0xd8(MxType18NotificationParam& p_param) override; // vtable+0xd8
 	virtual MxU32 VTable0xdc(MxType19NotificationParam& p_param) override; // vtable+0xdc
 	virtual void VTable0xe4() override;                                    // vtable+0xe4
diff --git a/LEGO1/lego/legoomni/src/build/dunebuggy.cpp b/LEGO1/lego/legoomni/src/build/dunebuggy.cpp
index 857a316c..66fa23d2 100644
--- a/LEGO1/lego/legoomni/src/build/dunebuggy.cpp
+++ b/LEGO1/lego/legoomni/src/build/dunebuggy.cpp
@@ -38,7 +38,7 @@ MxU32 DuneBuggy::VTable0xcc()
 }
 
 // STUB: LEGO1 0x100681b0
-MxU32 DuneBuggy::VTable0xd4(MxType17NotificationParam& p_param)
+MxU32 DuneBuggy::VTable0xd4(LegoControlManagerEvent& p_param)
 {
 	// TODO
 	return 0;
diff --git a/LEGO1/lego/legoomni/src/build/helicopter.cpp b/LEGO1/lego/legoomni/src/build/helicopter.cpp
index 2a1d1e06..f5add3e0 100644
--- a/LEGO1/lego/legoomni/src/build/helicopter.cpp
+++ b/LEGO1/lego/legoomni/src/build/helicopter.cpp
@@ -123,7 +123,7 @@ MxU32 Helicopter::VTable0xcc()
 }
 
 // FUNCTION: LEGO1 0x100035e0
-MxU32 Helicopter::VTable0xd4(MxType17NotificationParam& p_param)
+MxU32 Helicopter::VTable0xd4(LegoControlManagerEvent& p_param)
 {
 	MxU32 ret = 0;
 	MxAtomId script;
@@ -138,8 +138,8 @@ MxU32 Helicopter::VTable0xd4(MxType17NotificationParam& p_param)
 		script = *g_act3Script;
 		break;
 	}
-	if (p_param.GetUnknown28() == 1) {
-		switch (p_param.GetUnknown20()) {
+	if (p_param.GetUnknown0x28() == 1) {
+		switch (p_param.GetClickedObjectId()) {
 		case 0x17:
 			if (*g_act3Script == script) {
 				((Act3*) GetCurrentWorld())->SetUnkown4270(2);
diff --git a/LEGO1/lego/legoomni/src/build/jetski.cpp b/LEGO1/lego/legoomni/src/build/jetski.cpp
index 4676ea91..7a5a3dcd 100644
--- a/LEGO1/lego/legoomni/src/build/jetski.cpp
+++ b/LEGO1/lego/legoomni/src/build/jetski.cpp
@@ -37,7 +37,7 @@ MxU32 Jetski::VTable0xcc()
 }
 
 // STUB: LEGO1 0x1007e8e0
-MxU32 Jetski::VTable0xd4(MxType17NotificationParam& p_param)
+MxU32 Jetski::VTable0xd4(LegoControlManagerEvent& p_param)
 {
 	// TODO
 	return 0;
diff --git a/LEGO1/lego/legoomni/src/control/legocontrolmanager.cpp b/LEGO1/lego/legoomni/src/control/legocontrolmanager.cpp
index 465ccf9f..e296ad91 100644
--- a/LEGO1/lego/legoomni/src/control/legocontrolmanager.cpp
+++ b/LEGO1/lego/legoomni/src/control/legocontrolmanager.cpp
@@ -1,44 +1,118 @@
 #include "legocontrolmanager.h"
 
 #include "legoeventnotificationparam.h"
+#include "mxcontrolpresenter.h"
 #include "mxpresenter.h"
+#include "mxticklemanager.h"
 
-DECOMP_SIZE_ASSERT(LegoControlManager, 0x60);
+DECOMP_SIZE_ASSERT(LegoControlManager, 0x60)
+DECOMP_SIZE_ASSERT(LegoControlManagerEvent, 0x2c)
 
-// STUB: LEGO1 0x10028520
+// FUNCTION: LEGO1 0x10028520
 LegoControlManager::LegoControlManager()
 {
-	// TODO
+	m_presenterList = NULL;
+	m_unk0x08 = 0;
+	m_unk0x0c = 0;
+	m_unk0x10 = FALSE;
+	m_unk0x14 = NULL;
+	TickleManager()->RegisterClient(this, 10);
 }
 
-// STUB: LEGO1 0x10028d60
+// FUNCTION: LEGO1 0x10028d60
 LegoControlManager::~LegoControlManager()
 {
-	// TODO
+	TickleManager()->UnregisterClient(this);
 }
 
-// STUB: LEGO1 0x10028df0
+// FUNCTION: LEGO1 0x10028df0
 void LegoControlManager::FUN_10028df0(MxPresenterList* p_presenterList)
 {
-	// TODO
+	m_presenterList = p_presenterList;
+	g_unk0x100f31b0 = -1;
+	g_unk0x100f31b4 = NULL;
 }
 
-// STUB: LEGO1 0x10028e10
+// FUNCTION: LEGO1 0x10028e10
 void LegoControlManager::Register(MxCore* p_listener)
 {
-	// TODO
+	m_notifyList.Append(p_listener);
 }
 
-// STUB: LEGO1 0x10028ea0
+// FUNCTION: LEGO1 0x10028ea0
 void LegoControlManager::Unregister(MxCore* p_listener)
 {
-	// TODO
+	LegoNotifyListCursor cursor(&m_notifyList);
+	if (cursor.Find(p_listener))
+		cursor.Detach();
 }
 
-// STUB: LEGO1 0x10029210
+// FUNCTION: LEGO1 0x10029210
 MxBool LegoControlManager::FUN_10029210(LegoEventNotificationParam& p_param, MxPresenter* p_presenter)
 {
-	return TRUE;
+	if (m_presenterList != NULL && m_presenterList->GetCount() != 0) {
+		m_unk0x14 = p_presenter;
+
+		if (p_param.GetType() == c_notificationButtonUp || p_param.GetType() == c_notificationButtonDown) {
+			m_event.SetType(p_param.GetType());
+			m_event.SetSender(p_param.GetSender());
+			m_event.SetModifier(p_param.GetModifier());
+			m_event.SetX(p_param.GetX());
+			m_event.SetY(p_param.GetY());
+			m_event.SetKey(p_param.GetKey());
+
+			if (p_param.GetType() == c_notificationButtonUp) {
+				if (m_unk0x10 == TRUE) {
+					m_unk0x10 = FALSE;
+					return TRUE;
+				}
+
+				if (g_unk0x100f31b0 != -1 && g_unk0x100f31b4 != NULL) {
+					if (m_unk0x08 == 2) {
+						return FUN_10029750();
+					}
+					else {
+						m_unk0x0c = 1;
+						return TRUE;
+					}
+				}
+			}
+			else if (p_param.GetType() == c_notificationButtonDown) {
+				if (m_unk0x0c == 1) {
+					m_unk0x10 = TRUE;
+					return TRUE;
+				}
+				else {
+					return FUN_10029630();
+				}
+			}
+		}
+
+		return FALSE;
+	}
+	else {
+		g_unk0x100f31b0 = -1;
+		g_unk0x100f31b4 = NULL;
+
+		return FALSE;
+	}
+}
+
+// FUNCTION: LEGO1 0x100292e0
+void LegoControlManager::FUN_100292e0()
+{
+	LegoNotifyListCursor cursor(&m_notifyList);
+	MxCore* target;
+
+	// The usual cursor.Next() loop doesn't match here, even though
+	// the logic is the same. It does match when "deconstructed" into
+	// the following Head(), Current() and NextFragment() calls,
+	// but this seems unlikely to be the original code.
+	cursor.Head();
+	while (cursor.Current(target)) {
+		cursor.NextFragment();
+		target->Notify(m_event);
+	}
 }
 
 // STUB: LEGO1 0x100293c0
@@ -46,10 +120,68 @@ void LegoControlManager::FUN_100293c0(undefined4, const char*, undefined2)
 {
 }
 
-// STUB: LEGO1 0x10029600
+// STUB: LEGO1 0x100294e0
+void LegoControlManager::FUN_100294e0(MxS32 p_x, MxS32 p_y)
+{
+}
+
+// FUNCTION: LEGO1 0x10029600
 MxResult LegoControlManager::Tickle()
 {
-	// TODO
-
+	if (m_unk0x08 == 2 && m_unk0x0c == 1) {
+		m_event.SetType(c_notificationButtonUp);
+		FUN_10029750();
+		return 0;
+	}
+	else if (m_unk0x08 == 1) {
+		m_unk0x08 = 2;
+	}
 	return 0;
 }
+
+// FUNCTION: LEGO1 0x10029630
+MxBool LegoControlManager::FUN_10029630()
+{
+	MxPresenterListCursor cursor(m_presenterList);
+	MxPresenter* presenter;
+
+	while (cursor.Next(presenter)) {
+		if (((MxControlPresenter*) presenter)->FUN_10044480(&m_event, m_unk0x14)) {
+			g_unk0x100f31b0 = m_event.GetClickedObjectId();
+			g_unk0x100f31b4 = m_event.GetClickedAtom();
+			FUN_100292e0();
+			m_unk0x08 = 1;
+			return TRUE;
+		}
+	}
+
+	return FALSE;
+}
+
+// FUNCTION: LEGO1 0x10029750
+MxBool LegoControlManager::FUN_10029750()
+{
+	MxPresenterListCursor cursor(m_presenterList);
+	MxPresenter* presenter;
+
+	while (cursor.Next(presenter)) {
+		if (presenter->GetAction() && presenter->GetAction()->GetObjectId() == g_unk0x100f31b0 &&
+			presenter->GetAction()->GetAtomId().GetInternal() == g_unk0x100f31b4) {
+			if (((MxControlPresenter*) presenter)->FUN_10044480(&m_event, m_unk0x14)) {
+				FUN_100292e0();
+			}
+
+			g_unk0x100f31b0 = -1;
+			g_unk0x100f31b4 = NULL;
+
+			m_unk0x08 = 0;
+			m_unk0x0c = 0;
+
+			return TRUE;
+		}
+	}
+
+	g_unk0x100f31b0 = -1;
+	g_unk0x100f31b4 = NULL;
+	return FALSE;
+}
diff --git a/LEGO1/lego/legoomni/src/control/mxcontrolpresenter.cpp b/LEGO1/lego/legoomni/src/control/mxcontrolpresenter.cpp
index b578f107..ad19bb94 100644
--- a/LEGO1/lego/legoomni/src/control/mxcontrolpresenter.cpp
+++ b/LEGO1/lego/legoomni/src/control/mxcontrolpresenter.cpp
@@ -1,6 +1,7 @@
 #include "mxcontrolpresenter.h"
 
 #include "define.h"
+#include "legocontrolmanager.h"
 #include "mxticklemanager.h"
 #include "mxutil.h"
 
@@ -99,21 +100,45 @@ void MxControlPresenter::EndAction()
 }
 
 // STUB: LEGO1 0x10044270
-MxBool MxControlPresenter::FUN_10044270(undefined4, undefined4, undefined4*)
+MxBool MxControlPresenter::FUN_10044270(MxS32 p_x, MxS32 p_y, MxPresenter* p_presenter)
 {
 	// TODO
 	return TRUE;
 }
 
-// STUB: LEGO1 0x10044480
-MxBool MxControlPresenter::FUN_10044480(undefined4, undefined4*)
+// FUNCTION: LEGO1 0x10044480
+MxBool MxControlPresenter::FUN_10044480(LegoControlManagerEvent* p_event, MxPresenter* p_presenter)
 {
-	// TODO
-	return TRUE;
+	if (IsEnabled()) {
+		switch (p_event->GetType()) {
+		case c_notificationButtonUp:
+			if (m_unk0x4c == 0 || m_unk0x4c == 2 || m_unk0x4c == 3) {
+				p_event->SetClickedObjectId(m_action->GetObjectId());
+				p_event->SetClickedAtom(m_action->GetAtomId().GetInternal());
+				VTable0x6c(0);
+				p_event->SetType(c_notificationType17);
+				p_event->SetUnknown0x28(m_unk0x4e);
+				return TRUE;
+			}
+			break;
+		case c_notificationButtonDown:
+			if (FUN_10044270(p_event->GetX(), p_event->GetY(), p_presenter)) {
+				p_event->SetClickedObjectId(m_action->GetObjectId());
+				p_event->SetClickedAtom(m_action->GetAtomId().GetInternal());
+				VTable0x6c(m_unk0x56);
+				p_event->SetType(c_notificationType17);
+				p_event->SetUnknown0x28(m_unk0x4e);
+				return TRUE;
+			}
+			break;
+		}
+	}
+
+	return FALSE;
 }
 
 // STUB: LEGO1 0x10044540
-void MxControlPresenter::VTable0x6c(undefined4)
+void MxControlPresenter::VTable0x6c(undefined2)
 {
 	// TODO
 }
diff --git a/LEGO1/lego/legoomni/src/hospital/ambulance.cpp b/LEGO1/lego/legoomni/src/hospital/ambulance.cpp
index a7bd2689..aad42ca4 100644
--- a/LEGO1/lego/legoomni/src/hospital/ambulance.cpp
+++ b/LEGO1/lego/legoomni/src/hospital/ambulance.cpp
@@ -67,7 +67,7 @@ void Ambulance::VTable0xe4()
 }
 
 // STUB: LEGO1 0x10036f90
-MxU32 Ambulance::VTable0xd4(MxType17NotificationParam& p_param)
+MxU32 Ambulance::VTable0xd4(LegoControlManagerEvent& p_param)
 {
 	// TODO
 	return 0;
diff --git a/LEGO1/lego/legoomni/src/infocenter/score.cpp b/LEGO1/lego/legoomni/src/infocenter/score.cpp
index a7c1ee14..f1db49f2 100644
--- a/LEGO1/lego/legoomni/src/infocenter/score.cpp
+++ b/LEGO1/lego/legoomni/src/infocenter/score.cpp
@@ -92,7 +92,7 @@ MxLong Score::Notify(MxParam& p_param)
 			ret = 1;
 			break;
 		case c_notificationType17:
-			ret = FUN_100016d0((MxType17NotificationParam&) p_param);
+			ret = FUN_100016d0((LegoControlManagerEvent&) p_param);
 			break;
 		case c_notificationTransitioned:
 			DeleteObjects(g_infoscorScript, 7, 9);
@@ -152,12 +152,12 @@ void Score::ReadyWorld()
 }
 
 // FUNCTION: LEGO1 0x100016d0
-MxLong Score::FUN_100016d0(MxType17NotificationParam& p_param)
+MxLong Score::FUN_100016d0(LegoControlManagerEvent& p_param)
 {
-	MxS16 l = p_param.GetUnknown28();
+	MxS16 l = p_param.GetUnknown0x28();
 
-	if (l == 1 || p_param.GetUnknown20() == 4) {
-		switch (p_param.GetUnknown20()) {
+	if (l == 1 || p_param.GetClickedObjectId() == 4) {
+		switch (p_param.GetClickedObjectId()) {
 		case 1:
 			m_unk0xf8 = 2;
 			DeleteScript();
diff --git a/LEGO1/lego/legoomni/src/input/legoinputmanager.cpp b/LEGO1/lego/legoomni/src/input/legoinputmanager.cpp
index 05f09061..783bbfe3 100644
--- a/LEGO1/lego/legoomni/src/input/legoinputmanager.cpp
+++ b/LEGO1/lego/legoomni/src/input/legoinputmanager.cpp
@@ -15,7 +15,7 @@ DECOMP_SIZE_ASSERT(LegoEventQueue, 0x18)
 MxS32 g_unk0x100f31b0 = -1;
 
 // GLOBAL: LEGO1 0x100f31b4
-MxS32 g_unk0x100f31b4 = 0;
+const char* g_unk0x100f31b4 = NULL;
 
 // FUNCTION: LEGO1 0x1005b790
 LegoInputManager::LegoInputManager()
@@ -424,5 +424,5 @@ void LegoInputManager::EnableInputProcessing()
 {
 	m_unk0x88 = FALSE;
 	g_unk0x100f31b0 = -1;
-	g_unk0x100f31b4 = 0;
+	g_unk0x100f31b4 = NULL;
 }
diff --git a/LEGO1/lego/legoomni/src/isle/bike.cpp b/LEGO1/lego/legoomni/src/isle/bike.cpp
index 1c71b299..219208ea 100644
--- a/LEGO1/lego/legoomni/src/isle/bike.cpp
+++ b/LEGO1/lego/legoomni/src/isle/bike.cpp
@@ -31,7 +31,7 @@ MxU32 Bike::VTable0xcc()
 }
 
 // STUB: LEGO1 0x10076aa0
-MxU32 Bike::VTable0xd4(MxType17NotificationParam& p_param)
+MxU32 Bike::VTable0xd4(LegoControlManagerEvent& p_param)
 {
 	// TODO
 	return 0;
diff --git a/LEGO1/lego/legoomni/src/isle/motocycle.cpp b/LEGO1/lego/legoomni/src/isle/motocycle.cpp
index c54bd841..0f4424f9 100644
--- a/LEGO1/lego/legoomni/src/isle/motocycle.cpp
+++ b/LEGO1/lego/legoomni/src/isle/motocycle.cpp
@@ -38,7 +38,7 @@ MxU32 Motocycle::VTable0xcc()
 }
 
 // STUB: LEGO1 0x10035d70
-MxU32 Motocycle::VTable0xd4(MxType17NotificationParam& p_param)
+MxU32 Motocycle::VTable0xd4(LegoControlManagerEvent& p_param)
 {
 	// TODO
 	return 0;
diff --git a/LEGO1/lego/legoomni/src/isle/skateboard.cpp b/LEGO1/lego/legoomni/src/isle/skateboard.cpp
index 037dff9a..22998f85 100644
--- a/LEGO1/lego/legoomni/src/isle/skateboard.cpp
+++ b/LEGO1/lego/legoomni/src/isle/skateboard.cpp
@@ -38,7 +38,7 @@ MxU32 SkateBoard::VTable0xcc()
 }
 
 // STUB: LEGO1 0x10010230
-MxU32 SkateBoard::VTable0xd4(MxType17NotificationParam& p_param)
+MxU32 SkateBoard::VTable0xd4(LegoControlManagerEvent& p_param)
 {
 	// TODO
 	return 0;
diff --git a/LEGO1/lego/legoomni/src/towtrack/towtrack.cpp b/LEGO1/lego/legoomni/src/towtrack/towtrack.cpp
index eb05e57b..ebfd3ee7 100644
--- a/LEGO1/lego/legoomni/src/towtrack/towtrack.cpp
+++ b/LEGO1/lego/legoomni/src/towtrack/towtrack.cpp
@@ -64,7 +64,7 @@ void TowTrack::VTable0xe4()
 }
 
 // STUB: LEGO1 0x1004d9e0
-MxU32 TowTrack::VTable0xd4(MxType17NotificationParam& p_param)
+MxU32 TowTrack::VTable0xd4(LegoControlManagerEvent& p_param)
 {
 	// TODO
 	return 0;
diff --git a/LEGO1/omni/include/mxnotificationparam.h b/LEGO1/omni/include/mxnotificationparam.h
index a6055fa2..2ec5cf19 100644
--- a/LEGO1/omni/include/mxnotificationparam.h
+++ b/LEGO1/omni/include/mxnotificationparam.h
@@ -49,6 +49,7 @@ class MxNotificationParam : public MxParam {
 	inline NotificationId GetType() const { return m_type; }
 
 	inline void SetType(NotificationId p_type) { m_type = p_type; }
+	inline void SetSender(MxCore* p_sender) { m_sender = p_sender; }
 
 protected:
 	NotificationId m_type; // 0x04
diff --git a/LEGO1/omni/include/mxtype17notificationparam.h b/LEGO1/omni/include/mxtype17notificationparam.h
deleted file mode 100644
index cf4e78fa..00000000
--- a/LEGO1/omni/include/mxtype17notificationparam.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef MXTYPE17NOTIFICATIONPARAM_H
-#define MXTYPE17NOTIFICATIONPARAM_H
-
-#include "decomp.h"
-#include "mxnotificationparam.h"
-
-// ??? This type is handled, but seemingly never created and no VTABLE fits
-class MxType17NotificationParam : public MxNotificationParam {
-public:
-	inline MxU32 GetUnknown20() { return m_unk0x20; }
-	inline MxU16 GetUnknown28() { return m_unk0x28; }
-
-protected:
-	undefined m_unk0xc[0x14];
-	MxU32 m_unk0x20;
-	undefined4 m_unk0x24;
-	MxU16 m_unk0x28;
-};
-
-#endif // MXTYPE17NOTIFICATIONPARAM_H
diff --git a/LEGO1/omni/src/notify/mxtype17notificationparam.cpp b/LEGO1/omni/src/notify/mxtype17notificationparam.cpp
deleted file mode 100644
index dbb047f6..00000000
--- a/LEGO1/omni/src/notify/mxtype17notificationparam.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "mxtype17notificationparam.h"
-
-DECOMP_SIZE_ASSERT(MxType17NotificationParam, 0x2c)

From 445084f4b0ce65a8ade312e04f5d607735cc39ed Mon Sep 17 00:00:00 2001
From: Misha <106913236+MishaProductions@users.noreply.github.com>
Date: Sun, 28 Jan 2024 17:10:04 -0500
Subject: [PATCH 190/210] Implement LegoOmni::DeleteObject (#501)

* Push changes

* fixes

* Match

---------

Co-authored-by: Christian Semmler <mail@csemmler.com>
---
 LEGO1/lego/legoomni/include/legoomni.h      |  1 +
 LEGO1/lego/legoomni/include/legoworldlist.h |  3 +
 LEGO1/lego/legoomni/src/main/legoomni.cpp   | 70 +++++++++++++++++++--
 3 files changed, 69 insertions(+), 5 deletions(-)

diff --git a/LEGO1/lego/legoomni/include/legoomni.h b/LEGO1/lego/legoomni/include/legoomni.h
index 2f2622c7..7a8ee7f0 100644
--- a/LEGO1/lego/legoomni/include/legoomni.h
+++ b/LEGO1/lego/legoomni/include/legoomni.h
@@ -105,6 +105,7 @@ class LegoOmni : public MxOmni {
 
 	LegoWorld* FindWorld(const MxAtomId& p_atom, MxS32 p_entityid);
 	void AddWorld(LegoWorld* p_world);
+	void DeleteWorld(LegoWorld* p_world);
 	void FUN_1005b4f0(MxBool p_disable, MxU16 p_flags);
 
 	LegoVideoManager* GetVideoManager() { return (LegoVideoManager*) m_videoManager; }
diff --git a/LEGO1/lego/legoomni/include/legoworldlist.h b/LEGO1/lego/legoomni/include/legoworldlist.h
index 339f5393..64849968 100644
--- a/LEGO1/lego/legoomni/include/legoworldlist.h
+++ b/LEGO1/lego/legoomni/include/legoworldlist.h
@@ -86,4 +86,7 @@ class LegoWorldListCursor : public MxPtrListCursor<LegoWorld> {
 // SYNTHETIC: LEGO1 0x10059be0
 // MxPtrList<LegoWorld>::`scalar deleting destructor'
 
+// TEMPLATE: LEGO1 0x1005b740
+// MxList<LegoWorld *>::DeleteEntry
+
 #endif // LEGOWORLDLIST_H
diff --git a/LEGO1/lego/legoomni/src/main/legoomni.cpp b/LEGO1/lego/legoomni/src/main/legoomni.cpp
index bd28f071..743489a0 100644
--- a/LEGO1/lego/legoomni/src/main/legoomni.cpp
+++ b/LEGO1/lego/legoomni/src/main/legoomni.cpp
@@ -19,6 +19,7 @@
 #include "mxdsfile.h"
 #include "mxomnicreateflags.h"
 #include "mxomnicreateparam.h"
+#include "mxstreamer.h"
 #include "mxticklemanager.h"
 #include "mxtransitionmanager.h"
 
@@ -605,10 +606,46 @@ void LegoOmni::AddWorld(LegoWorld* p_world)
 	m_worldList->Append(p_world);
 }
 
-// STUB: LEGO1 0x1005af10
-void LegoOmni::RemoveWorld(const MxAtomId&, MxLong)
+// FUNCTION: LEGO1 0x1005adb0
+void LegoOmni::DeleteWorld(LegoWorld* p_world)
 {
-	// TODO
+	if (m_worldList) {
+		LegoWorldListCursor cursor(m_worldList);
+
+		if (cursor.Find(p_world)) {
+			cursor.Detach();
+
+			if (m_currentWorld == p_world) {
+				m_currentWorld = NULL;
+			}
+
+			delete p_world;
+		}
+	}
+}
+
+// FUNCTION: LEGO1 0x1005af10
+void LegoOmni::RemoveWorld(const MxAtomId& p_atom, MxLong p_objectId)
+{
+	if (m_worldList) {
+		LegoWorldListCursor a(m_worldList);
+		LegoWorldListCursor b(m_worldList);
+		LegoWorld* world;
+
+		a.Head();
+		while (a.Current(world)) {
+			b = a;
+			b.Next();
+
+			if ((p_objectId == -1 || world->GetEntityId() == p_objectId) &&
+				(!p_atom.GetInternal() || world->GetAtom() == p_atom)) {
+				a.Detach();
+				delete world;
+			}
+
+			a = b;
+		}
+	}
 }
 
 // FUNCTION: LEGO1 0x1005b0c0
@@ -628,10 +665,33 @@ LegoWorld* LegoOmni::FindWorld(const MxAtomId& p_atom, MxS32 p_entityid)
 	return NULL;
 }
 
-// STUB: LEGO1 0x1005b1d0
+// FUNCTION: LEGO1 0x1005b1d0
 void LegoOmni::DeleteObject(MxDSAction& p_dsAction)
 {
-	// TODO
+	if (p_dsAction.GetAtomId().GetInternal() != NULL) {
+		LegoWorld* world = FindWorld(p_dsAction.GetAtomId(), p_dsAction.GetObjectId());
+		if (world) {
+			DeleteWorld(world);
+			return;
+		}
+
+		if (m_currentWorld != NULL) {
+			MxCore* entity = m_currentWorld->Find(p_dsAction.GetAtomId(), p_dsAction.GetObjectId());
+			if (entity) {
+				m_currentWorld->Remove(entity);
+
+				if (entity->IsA("MxPresenter")) {
+					Streamer()->FUN_100b98f0(((MxPresenter*) entity)->GetAction());
+					((MxPresenter*) entity)->EndAction();
+				}
+				else {
+					delete entity;
+				}
+				return;
+			}
+		}
+	}
+	MxOmni::DeleteObject(p_dsAction);
 }
 
 // FUNCTION: LEGO1 0x1005b2f0

From 96234ddc2343d9beb1286a90a1daa8ca87a95ef3 Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Mon, 29 Jan 2024 11:29:12 -0500
Subject: [PATCH 191/210] Implement/match MxStillPresenter::Clone (#502)

* Implement/match MxStillPresenter::Clone

* Fix
---
 .../legoomni/src/video/legometerpresenter.cpp |  2 +-
 LEGO1/omni/include/mxdisplaysurface.h         |  1 +
 LEGO1/omni/include/mxstillpresenter.h         |  1 +
 LEGO1/omni/include/mxvideopresenter.h         | 22 ++++---
 LEGO1/omni/src/video/mxdisplaysurface.cpp     |  7 +++
 LEGO1/omni/src/video/mxflcpresenter.cpp       |  6 +-
 .../omni/src/video/mxloopingflcpresenter.cpp  |  4 +-
 .../omni/src/video/mxloopingsmkpresenter.cpp  |  6 +-
 LEGO1/omni/src/video/mxsmkpresenter.cpp       |  4 +-
 LEGO1/omni/src/video/mxstillpresenter.cpp     | 59 +++++++++++++++----
 LEGO1/omni/src/video/mxvideopresenter.cpp     | 25 ++++----
 11 files changed, 93 insertions(+), 44 deletions(-)

diff --git a/LEGO1/lego/legoomni/src/video/legometerpresenter.cpp b/LEGO1/lego/legoomni/src/video/legometerpresenter.cpp
index f347545d..4ea26beb 100644
--- a/LEGO1/lego/legoomni/src/video/legometerpresenter.cpp
+++ b/LEGO1/lego/legoomni/src/video/legometerpresenter.cpp
@@ -41,7 +41,7 @@ LegoMeterPresenter::LegoMeterPresenter()
 	m_unk0x6c = 0;
 	m_unk0x84 = 0;
 	m_type = 1;
-	m_flags &= ~c_bit2;
+	SetBit1(FALSE);
 }
 
 // FUNCTION: LEGO1 0x10043780
diff --git a/LEGO1/omni/include/mxdisplaysurface.h b/LEGO1/omni/include/mxdisplaysurface.h
index 1d26264c..69706126 100644
--- a/LEGO1/omni/include/mxdisplaysurface.h
+++ b/LEGO1/omni/include/mxdisplaysurface.h
@@ -92,6 +92,7 @@ class MxDisplaySurface : public MxCore {
 
 	void ClearScreen();
 	static LPDIRECTDRAWSURFACE CreateCursorSurface();
+	static LPDIRECTDRAWSURFACE FUN_100bbfb0(LPDIRECTDRAWSURFACE p_und);
 
 	inline LPDIRECTDRAWSURFACE GetDirectDrawSurface1() { return this->m_ddSurface1; }
 	inline LPDIRECTDRAWSURFACE GetDirectDrawSurface2() { return this->m_ddSurface2; }
diff --git a/LEGO1/omni/include/mxstillpresenter.h b/LEGO1/omni/include/mxstillpresenter.h
index 0fa48bf3..7baf864d 100644
--- a/LEGO1/omni/include/mxstillpresenter.h
+++ b/LEGO1/omni/include/mxstillpresenter.h
@@ -9,6 +9,7 @@
 class MxStillPresenter : public MxVideoPresenter {
 public:
 	MxStillPresenter() { m_bitmapInfo = NULL; }
+
 	// FUNCTION: LEGO1 0x10043550
 	virtual ~MxStillPresenter() override { Destroy(TRUE); }; // vtable+0x00
 
diff --git a/LEGO1/omni/include/mxvideopresenter.h b/LEGO1/omni/include/mxvideopresenter.h
index f338b972..187435c8 100644
--- a/LEGO1/omni/include/mxvideopresenter.h
+++ b/LEGO1/omni/include/mxvideopresenter.h
@@ -10,14 +10,6 @@
 // SIZE 0x64
 class MxVideoPresenter : public MxMediaPresenter {
 public:
-	enum {
-		c_bit1 = 0x01,
-		c_bit2 = 0x02,
-		c_bit3 = 0x04,
-		c_bit4 = 0x08,
-		c_bit5 = 0x10,
-	};
-
 	MxVideoPresenter() { Init(); }
 
 	// FUNCTION: LEGO1 0x1000c740
@@ -100,6 +92,18 @@ class MxVideoPresenter : public MxMediaPresenter {
 	inline MxS32 PrepareRects(MxRect32& p_rectDest, MxRect32& p_rectSrc);
 	inline MxBitmap* GetBitmap() { return m_bitmap; }
 
+	inline void SetBit0(BOOL p_e) { m_flags.m_bit0 = p_e; }
+	inline void SetBit1(BOOL p_e) { m_flags.m_bit1 = p_e; }
+	inline void SetBit2(BOOL p_e) { m_flags.m_bit2 = p_e; }
+	inline void SetBit3(BOOL p_e) { m_flags.m_bit3 = p_e; }
+	inline void SetBit4(BOOL p_e) { m_flags.m_bit4 = p_e; }
+
+	inline BYTE GetBit0() { return m_flags.m_bit0; }
+	inline BYTE GetBit1() { return m_flags.m_bit1; }
+	inline BYTE GetBit2() { return m_flags.m_bit2; }
+	inline BYTE GetBit3() { return m_flags.m_bit3; }
+	inline BYTE GetBit4() { return m_flags.m_bit4; }
+
 	// SYNTHETIC: LEGO1 0x1000c910
 	// MxVideoPresenter::`scalar deleting destructor'
 
@@ -113,7 +117,7 @@ class MxVideoPresenter : public MxMediaPresenter {
 	AlphaMask* m_alpha;            // 0x54
 	LPDIRECTDRAWSURFACE m_unk0x58; // 0x58
 	MxS16 m_unk0x5c;               // 0x5c
-	MxU8 m_flags;                  // 0x5e
+	FlagBitfield m_flags;          // 0x5e
 	MxLong m_unk0x60;              // 0x60
 };
 
diff --git a/LEGO1/omni/src/video/mxdisplaysurface.cpp b/LEGO1/omni/src/video/mxdisplaysurface.cpp
index 3a43ff3f..e2965826 100644
--- a/LEGO1/omni/src/video/mxdisplaysurface.cpp
+++ b/LEGO1/omni/src/video/mxdisplaysurface.cpp
@@ -679,6 +679,13 @@ LPDIRECTDRAWSURFACE MxDisplaySurface::VTable0x44(
 	return surface;
 }
 
+// STUB: LEGO1 0x100bbfb0
+LPDIRECTDRAWSURFACE MxDisplaySurface::FUN_100bbfb0(LPDIRECTDRAWSURFACE p_und)
+{
+	// TODO
+	return NULL;
+}
+
 // FUNCTION: LEGO1 0x100bc070
 LPDIRECTDRAWSURFACE MxDisplaySurface::CreateCursorSurface()
 {
diff --git a/LEGO1/omni/src/video/mxflcpresenter.cpp b/LEGO1/omni/src/video/mxflcpresenter.cpp
index 2fc22265..ff82aa60 100644
--- a/LEGO1/omni/src/video/mxflcpresenter.cpp
+++ b/LEGO1/omni/src/video/mxflcpresenter.cpp
@@ -12,9 +12,9 @@ DECOMP_SIZE_ASSERT(MxFlcPresenter, 0x68);
 // FUNCTION: LEGO1 0x100b3310
 MxFlcPresenter::MxFlcPresenter()
 {
-	this->m_flcHeader = NULL;
-	this->m_flags &= ~c_bit2;
-	this->m_flags &= ~c_bit3;
+	m_flcHeader = NULL;
+	SetBit1(FALSE);
+	SetBit2(FALSE);
 }
 
 // FUNCTION: LEGO1 0x100b3420
diff --git a/LEGO1/omni/src/video/mxloopingflcpresenter.cpp b/LEGO1/omni/src/video/mxloopingflcpresenter.cpp
index 59540cb3..cc36792d 100644
--- a/LEGO1/omni/src/video/mxloopingflcpresenter.cpp
+++ b/LEGO1/omni/src/video/mxloopingflcpresenter.cpp
@@ -20,8 +20,8 @@ MxLoopingFlcPresenter::~MxLoopingFlcPresenter()
 void MxLoopingFlcPresenter::Init()
 {
 	this->m_elapsedDuration = 0;
-	this->m_flags &= ~c_bit2;
-	this->m_flags &= ~c_bit3;
+	SetBit1(FALSE);
+	SetBit2(FALSE);
 }
 
 // FUNCTION: LEGO1 0x100b4430
diff --git a/LEGO1/omni/src/video/mxloopingsmkpresenter.cpp b/LEGO1/omni/src/video/mxloopingsmkpresenter.cpp
index 51ed74c8..86b93544 100644
--- a/LEGO1/omni/src/video/mxloopingsmkpresenter.cpp
+++ b/LEGO1/omni/src/video/mxloopingsmkpresenter.cpp
@@ -20,9 +20,9 @@ MxLoopingSmkPresenter::~MxLoopingSmkPresenter()
 // FUNCTION: LEGO1 0x100b49b0
 void MxLoopingSmkPresenter::Init()
 {
-	this->m_elapsedDuration = 0;
-	this->m_flags &= ~c_bit2;
-	this->m_flags &= ~c_bit3;
+	m_elapsedDuration = 0;
+	SetBit1(FALSE);
+	SetBit2(FALSE);
 }
 
 // FUNCTION: LEGO1 0x100b49d0
diff --git a/LEGO1/omni/src/video/mxsmkpresenter.cpp b/LEGO1/omni/src/video/mxsmkpresenter.cpp
index b8001623..1779fe82 100644
--- a/LEGO1/omni/src/video/mxsmkpresenter.cpp
+++ b/LEGO1/omni/src/video/mxsmkpresenter.cpp
@@ -23,8 +23,8 @@ void MxSmkPresenter::Init()
 {
 	m_currentFrame = 0;
 	memset(&m_mxSmack, 0, sizeof(m_mxSmack));
-	m_flags &= ~c_bit2;
-	m_flags &= ~c_bit3;
+	SetBit1(FALSE);
+	SetBit2(FALSE);
 }
 
 // FUNCTION: LEGO1 0x100b3900
diff --git a/LEGO1/omni/src/video/mxstillpresenter.cpp b/LEGO1/omni/src/video/mxstillpresenter.cpp
index 4b81d6f1..83b1a87e 100644
--- a/LEGO1/omni/src/video/mxstillpresenter.cpp
+++ b/LEGO1/omni/src/video/mxstillpresenter.cpp
@@ -75,12 +75,12 @@ void MxStillPresenter::LoadFrame(MxStreamChunk* p_chunk)
 	MxRect32 rect(x, y, width + x, height + y);
 	MVideoManager()->InvalidateRect(rect);
 
-	if (m_flags & c_bit2) {
+	if (GetBit1()) {
 		undefined4 und = 0;
 		m_unk0x58 = MxOmni::GetInstance()->GetVideoManager()->GetDisplaySurface()->VTable0x44(
 			m_bitmap,
 			&und,
-			(m_flags & c_bit4) / 8,
+			GetBit3(),
 			m_action->GetFlags() & MxDSAction::c_bit4
 		);
 
@@ -91,9 +91,9 @@ void MxStillPresenter::LoadFrame(MxStreamChunk* p_chunk)
 		m_bitmap = NULL;
 
 		if (m_unk0x58 && und)
-			m_flags |= c_bit3;
+			SetBit2(TRUE);
 		else
-			m_flags &= ~c_bit3;
+			SetBit2(FALSE);
 	}
 }
 
@@ -186,7 +186,7 @@ void MxStillPresenter::ParseExtra()
 	MxPresenter::ParseExtra();
 
 	if (m_action->GetFlags() & MxDSAction::c_bit5)
-		m_flags |= c_bit4;
+		SetBit3(TRUE);
 
 	MxU32 len = m_action->GetExtraLength();
 
@@ -207,15 +207,52 @@ void MxStillPresenter::ParseExtra()
 	}
 
 	if (KeyValueStringParse(output, g_strBmpIsmap, buf)) {
-		m_flags |= c_bit5;
-		m_flags &= ~c_bit2;
-		m_flags &= ~c_bit3;
+		SetBit4(TRUE);
+		SetBit1(FALSE);
+		SetBit2(FALSE);
 	}
 }
 
-// STUB: LEGO1 0x100ba2c0
+// FUNCTION: LEGO1 0x100ba2c0
 MxStillPresenter* MxStillPresenter::Clone()
 {
-	// TODO
-	return NULL;
+	MxResult result = FAILURE;
+	MxStillPresenter* presenter = new MxStillPresenter;
+
+	if (presenter) {
+		if (presenter->AddToManager() == SUCCESS) {
+			MxDSAction* action = presenter->GetAction()->Clone();
+
+			if (action && presenter->StartAction(NULL, action) == SUCCESS) {
+				presenter->SetBit0(GetBit0());
+				presenter->SetBit1(GetBit1());
+				presenter->SetBit2(GetBit2());
+				presenter->SetBit3(GetBit3());
+				presenter->SetBit4(GetBit4());
+
+				if (m_bitmap) {
+					presenter->m_bitmap = new MxBitmap;
+
+					if (!presenter->m_bitmap || presenter->m_bitmap->ImportBitmap(m_bitmap) != SUCCESS)
+						goto done;
+				}
+
+				if (m_unk0x58)
+					presenter->m_unk0x58 = MxDisplaySurface::FUN_100bbfb0(m_unk0x58);
+
+				if (m_alpha)
+					presenter->m_alpha = new MxVideoPresenter::AlphaMask(*m_alpha);
+
+				result = SUCCESS;
+			}
+		}
+	}
+
+done:
+	if (result != SUCCESS) {
+		delete presenter;
+		presenter = NULL;
+	}
+
+	return presenter;
 }
diff --git a/LEGO1/omni/src/video/mxvideopresenter.cpp b/LEGO1/omni/src/video/mxvideopresenter.cpp
index ebc08487..d1c59bad 100644
--- a/LEGO1/omni/src/video/mxvideopresenter.cpp
+++ b/LEGO1/omni/src/video/mxvideopresenter.cpp
@@ -117,16 +117,16 @@ void MxVideoPresenter::Init()
 	m_unk0x5c = 1;
 	m_unk0x58 = NULL;
 	m_unk0x60 = -1;
-	m_flags &= ~c_bit1;
+	SetBit0(FALSE);
 
 	if (MVideoManager() != NULL) {
 		MVideoManager();
-		m_flags |= c_bit2;
-		m_flags &= ~c_bit3;
+		SetBit1(TRUE);
+		SetBit2(FALSE);
 	}
 
-	m_flags &= ~c_bit4;
-	m_flags &= ~c_bit5;
+	SetBit3(FALSE);
+	SetBit4(FALSE);
 }
 
 // FUNCTION: LEGO1 0x100b27b0
@@ -138,8 +138,8 @@ void MxVideoPresenter::Destroy(MxBool p_fromDestructor)
 	if (m_unk0x58) {
 		m_unk0x58->Release();
 		m_unk0x58 = NULL;
-		m_flags &= ~c_bit2;
-		m_flags &= ~c_bit3;
+		SetBit1(FALSE);
+		SetBit2(FALSE);
 	}
 
 	if (MVideoManager() && (m_alpha || m_bitmap)) {
@@ -230,8 +230,7 @@ MxBool MxVideoPresenter::IsHit(MxS32 p_x, MxS32 p_y)
 		pixel = m_bitmap->GetBmiStride() * height + m_bitmap->GetBitmapData();
 	}
 
-	// DECOMP: m_flags is 1 byte, so no enum here
-	if (m_flags & 0x10)
+	if (GetBit4())
 		return (MxBool) *pixel;
 
 	if ((GetAction()->GetFlags() & MxDSAction::c_bit4) && *pixel == 0)
@@ -429,13 +428,13 @@ void MxVideoPresenter::StreamingTickle()
 			LoadFrame(m_currentChunk);
 			m_subscriber->DestroyChunk(m_currentChunk);
 			m_currentChunk = NULL;
-			m_flags |= c_bit1;
+			SetBit0(TRUE);
 
 			if (m_currentTickleState != e_streaming)
 				break;
 		}
 
-		if (m_flags & c_bit1)
+		if (GetBit0())
 			m_unk0x5c = 5;
 	}
 }
@@ -467,13 +466,13 @@ void MxVideoPresenter::RepeatingTickle()
 
 				LoadFrame(m_currentChunk);
 				m_currentChunk = NULL;
-				m_flags |= c_bit1;
+				SetBit0(TRUE);
 
 				if (m_currentTickleState != e_repeating)
 					break;
 			}
 
-			if (m_flags & c_bit1)
+			if (GetBit0())
 				m_unk0x5c = 5;
 		}
 	}

From 35def3013a262684c237626412248f9ba1afe3c6 Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Mon, 29 Jan 2024 13:54:47 -0500
Subject: [PATCH 192/210] Fix various state classes/missing annotations (#503)

---
 LEGO1/lego/legoomni/include/animstate.h       | 10 +++---
 LEGO1/lego/legoomni/include/gasstationstate.h | 14 ++++----
 LEGO1/lego/legoomni/include/hospitalstate.h   |  1 +
 LEGO1/lego/legoomni/include/infocenterstate.h |  2 +-
 LEGO1/lego/legoomni/include/legoact2state.h   |  2 ++
 LEGO1/lego/legoomni/include/legoentity.h      | 32 +++++++++----------
 LEGO1/lego/legoomni/include/legostate.h       | 21 +++++++++---
 .../legoomni/include/legovehiclebuildstate.h  | 10 +++---
 .../lego/legoomni/include/pizzamissionstate.h |  8 +++--
 LEGO1/lego/legoomni/include/policestate.h     |  1 +
 LEGO1/lego/legoomni/include/racestate.h       |  6 ++--
 LEGO1/lego/legoomni/include/scorestate.h      |  2 +-
 .../legoomni/include/towtrackmissionstate.h   |  1 +
 LEGO1/lego/legoomni/src/common/legostate.cpp  | 28 +---------------
 14 files changed, 66 insertions(+), 72 deletions(-)

diff --git a/LEGO1/lego/legoomni/include/animstate.h b/LEGO1/lego/legoomni/include/animstate.h
index 9ac03a4c..8f64790b 100644
--- a/LEGO1/lego/legoomni/include/animstate.h
+++ b/LEGO1/lego/legoomni/include/animstate.h
@@ -30,11 +30,11 @@ class AnimState : public LegoState {
 	// AnimState::`scalar deleting destructor'
 
 private:
-	undefined4 m_unk0x8;
-	undefined4 m_unk0xc;
-	void* m_unk0x10;
-	undefined4 m_unk0x14;
-	void* m_unk0x18;
+	undefined4 m_unk0x8;  // 0x08
+	undefined4 m_unk0xc;  // 0x0c
+	void* m_unk0x10;      // 0x10
+	undefined4 m_unk0x14; // 0x14
+	void* m_unk0x18;      // 0x18
 };
 
 #endif // ANIMSTATE_H
diff --git a/LEGO1/lego/legoomni/include/gasstationstate.h b/LEGO1/lego/legoomni/include/gasstationstate.h
index 57fd0d39..a756e783 100644
--- a/LEGO1/lego/legoomni/include/gasstationstate.h
+++ b/LEGO1/lego/legoomni/include/gasstationstate.h
@@ -28,13 +28,13 @@ class GasStationState : public LegoState {
 	// GasStationState::`scalar deleting destructor'
 
 private:
-	undefined4 m_unk0x08[3];
-	undefined4 m_unk0x14;
-	undefined2 m_unk0x18;
-	undefined2 m_unk0x1a;
-	undefined2 m_unk0x1c;
-	undefined2 m_unk0x1e;
-	undefined2 m_unk0x20;
+	undefined4 m_unk0x08[3]; // 0x08
+	undefined4 m_unk0x14;    // 0x14
+	undefined2 m_unk0x18;    // 0x18
+	undefined2 m_unk0x1a;    // 0x1a
+	undefined2 m_unk0x1c;    // 0x1c
+	undefined2 m_unk0x1e;    // 0x1e
+	undefined2 m_unk0x20;    // 0x20
 };
 
 #endif // GASSTATIONSTATE_H
diff --git a/LEGO1/lego/legoomni/include/hospitalstate.h b/LEGO1/lego/legoomni/include/hospitalstate.h
index a38cfd2e..2b141709 100644
--- a/LEGO1/lego/legoomni/include/hospitalstate.h
+++ b/LEGO1/lego/legoomni/include/hospitalstate.h
@@ -9,6 +9,7 @@
 class HospitalState : public LegoState {
 public:
 	HospitalState();
+	virtual ~HospitalState() override {}
 
 	// FUNCTION: LEGO1 0x10076400
 	inline virtual const char* ClassName() const override // vtable+0x0c
diff --git a/LEGO1/lego/legoomni/include/infocenterstate.h b/LEGO1/lego/legoomni/include/infocenterstate.h
index 8314529f..9399f8f4 100644
--- a/LEGO1/lego/legoomni/include/infocenterstate.h
+++ b/LEGO1/lego/legoomni/include/infocenterstate.h
@@ -10,7 +10,7 @@
 class InfocenterState : public LegoState {
 public:
 	InfocenterState();
-	virtual ~InfocenterState();
+	virtual ~InfocenterState() override;
 
 	// FUNCTION: LEGO1 0x10071840
 	inline virtual const char* ClassName() const override // vtable+0x0c
diff --git a/LEGO1/lego/legoomni/include/legoact2state.h b/LEGO1/lego/legoomni/include/legoact2state.h
index b2ae4b7e..e37af2dc 100644
--- a/LEGO1/lego/legoomni/include/legoact2state.h
+++ b/LEGO1/lego/legoomni/include/legoact2state.h
@@ -7,6 +7,8 @@
 // SIZE 0x10
 class LegoAct2State : public LegoState {
 public:
+	virtual ~LegoAct2State() override {}
+
 	// FUNCTION: LEGO1 0x1000df80
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
diff --git a/LEGO1/lego/legoomni/include/legoentity.h b/LEGO1/lego/legoomni/include/legoentity.h
index 99813972..b9c58977 100644
--- a/LEGO1/lego/legoomni/include/legoentity.h
+++ b/LEGO1/lego/legoomni/include/legoentity.h
@@ -9,7 +9,7 @@
 #include "roi/legoroi.h"
 
 // VTABLE: LEGO1 0x100d4858
-// SIZE 0x68 (probably)
+// SIZE 0x68
 class LegoEntity : public MxEntity {
 public:
 	enum {
@@ -17,7 +17,6 @@ class LegoEntity : public MxEntity {
 		c_bit2 = 0x02
 	};
 
-	// Inlined at 0x100853f7
 	inline LegoEntity() { Init(); }
 
 	// FUNCTION: LEGO1 0x1000c290
@@ -38,22 +37,23 @@ class LegoEntity : public MxEntity {
 		return !strcmp(p_name, LegoEntity::ClassName()) || MxEntity::IsA(p_name);
 	}
 
-	virtual MxResult Create(MxDSAction& p_dsAction);                     // vtable+0x18
-	virtual void Destroy(MxBool p_fromDestructor);                       // vtable+0x1c
-	virtual void ParseAction(char*);                                     // vtable+0x20
-	virtual void SetROI(LegoROI* p_roi, MxBool p_bool1, MxBool p_bool2); // vtable+0x24
-	virtual void SetWorldTransform(const Vector3& p_loc, const Vector3& p_dir,
-								   const Vector3& p_up);  // vtable+0x28
-	virtual void ResetWorldTransform(MxBool p_inVehicle); // vtable+0x2c
+	virtual MxResult Create(MxDSAction& p_dsAction);                                                 // vtable+0x18
+	virtual void Destroy(MxBool p_fromDestructor);                                                   // vtable+0x1c
+	virtual void ParseAction(char*);                                                                 // vtable+0x20
+	virtual void SetROI(LegoROI* p_roi, MxBool p_bool1, MxBool p_bool2);                             // vtable+0x24
+	virtual void SetWorldTransform(const Vector3& p_loc, const Vector3& p_dir, const Vector3& p_up); // vtable+0x28
+	virtual void ResetWorldTransform(MxBool p_inVehicle);                                            // vtable+0x2c
+
 	// FUNCTION: LEGO1 0x10001090
 	virtual void SetWorldSpeed(MxFloat p_worldSpeed) { m_worldSpeed = p_worldSpeed; } // vtable+0x30
-	virtual void VTable0x34();                                                        // vtable+0x34
-	virtual void VTable0x38();                                                        // vtable+0x38
-	virtual void VTable0x3c();                                                        // vtable+0x3c
-	virtual void VTable0x40();                                                        // vtable+0x40
-	virtual void VTable0x44();                                                        // vtable+0x44
-	virtual void VTable0x48();                                                        // vtable+0x48
-	virtual void VTable0x4c();                                                        // vtable+0x4c
+
+	virtual void VTable0x34(); // vtable+0x34
+	virtual void VTable0x38(); // vtable+0x38
+	virtual void VTable0x3c(); // vtable+0x3c
+	virtual void VTable0x40(); // vtable+0x40
+	virtual void VTable0x44(); // vtable+0x44
+	virtual void VTable0x48(); // vtable+0x48
+	virtual void VTable0x4c(); // vtable+0x4c
 
 	void FUN_10010c30();
 	void SetLocation(Mx3DPointFloat& p_location, Mx3DPointFloat& p_direction, Mx3DPointFloat& p_up, MxBool);
diff --git a/LEGO1/lego/legoomni/include/legostate.h b/LEGO1/lego/legoomni/include/legostate.h
index e6d11bd1..41942312 100644
--- a/LEGO1/lego/legoomni/include/legostate.h
+++ b/LEGO1/lego/legoomni/include/legostate.h
@@ -7,9 +7,11 @@
 #include "mxstring.h"
 
 // VTABLE: LEGO1 0x100d46c0
+// SIZE 0x08
 class LegoState : public MxCore {
 public:
-	virtual ~LegoState() override; // vtable+0x00
+	// FUNCTION: LEGO1 0x10005f40
+	virtual ~LegoState() override {}
 
 	// FUNCTION: LEGO1 0x100060d0
 	inline virtual const char* ClassName() const override // vtable+0x0c
@@ -24,9 +26,20 @@ class LegoState : public MxCore {
 		return !strcmp(p_name, LegoState::ClassName()) || MxCore::IsA(p_name);
 	}
 
-	virtual MxBool VTable0x14();                       // vtable+0x14
-	virtual MxBool SetFlag();                          // vtable+0x18
-	virtual MxResult VTable0x1c(LegoFile* p_legoFile); // vtable+0x1C
+	// FUNCTION: LEGO1 0x10005f90
+	virtual MxBool VTable0x14() { return TRUE; } // vtable+0x14
+
+	// FUNCTION: LEGO1 0x10005fa0
+	virtual MxBool SetFlag() { return FALSE; } // vtable+0x18
+
+	// FUNCTION: LEGO1 0x10005fb0
+	virtual MxResult VTable0x1c(LegoFile* p_legoFile)
+	{
+		if (p_legoFile->IsWriteMode()) {
+			p_legoFile->FUN_10006030(this->ClassName());
+		}
+		return SUCCESS;
+	} // vtable+0x1c
 
 	// SYNTHETIC: LEGO1 0x10006160
 	// LegoState::`scalar deleting destructor'
diff --git a/LEGO1/lego/legoomni/include/legovehiclebuildstate.h b/LEGO1/lego/legoomni/include/legovehiclebuildstate.h
index a155595e..b0463448 100644
--- a/LEGO1/lego/legoomni/include/legovehiclebuildstate.h
+++ b/LEGO1/lego/legoomni/include/legovehiclebuildstate.h
@@ -6,7 +6,7 @@
 #include "mxstring.h"
 
 // VTABLE: LEGO1 0x100d66e0
-// SIZE 0x50 (from 1000acd7)
+// SIZE 0x50
 class LegoVehicleBuildState : public LegoState {
 public:
 	LegoVehicleBuildState(char* p_classType);
@@ -30,10 +30,10 @@ class LegoVehicleBuildState : public LegoState {
 
 public:
 	struct UnkStruct {
-		undefined4 m_unk0x00;
-		undefined2 m_unk0x04;
-		undefined2 m_unk0x06;
-		undefined2 m_unk0x08;
+		undefined4 m_unk0x00; // 0x00
+		undefined2 m_unk0x04; // 0x04
+		undefined2 m_unk0x06; // 0x06
+		undefined2 m_unk0x08; // 0x08
 
 		UnkStruct();
 	};
diff --git a/LEGO1/lego/legoomni/include/pizzamissionstate.h b/LEGO1/lego/legoomni/include/pizzamissionstate.h
index 7c792ed4..3987bd26 100644
--- a/LEGO1/lego/legoomni/include/pizzamissionstate.h
+++ b/LEGO1/lego/legoomni/include/pizzamissionstate.h
@@ -3,6 +3,7 @@
 
 #include "legostate.h"
 
+// SIZE 0x20
 struct PizzaMissionStateEntry {
 public:
 	undefined2 m_unk0x0;
@@ -13,6 +14,7 @@ struct PizzaMissionStateEntry {
 };
 
 // VTABLE: LEGO1 0x100d7408
+// SIZE 0xb0
 class PizzaMissionState : public LegoState {
 public:
 	// FUNCTION: LEGO1 0x10039290
@@ -39,9 +41,9 @@ class PizzaMissionState : public LegoState {
 	PizzaMissionStateEntry* GetState(MxU8 p_id);
 
 protected:
-	undefined4 m_unk0x8;
-	undefined4 m_unk0xc;
-	PizzaMissionStateEntry m_state[5];
+	undefined4 m_unk0x8;               // 0x08
+	undefined4 m_unk0xc;               // 0x0c
+	PizzaMissionStateEntry m_state[5]; // 0x10
 };
 
 #endif // PIZZAMISSIONSTATE_H
diff --git a/LEGO1/lego/legoomni/include/policestate.h b/LEGO1/lego/legoomni/include/policestate.h
index 77005cef..bd73cdbd 100644
--- a/LEGO1/lego/legoomni/include/policestate.h
+++ b/LEGO1/lego/legoomni/include/policestate.h
@@ -9,6 +9,7 @@
 class PoliceState : public LegoState {
 public:
 	PoliceState();
+	virtual ~PoliceState() override {}
 
 	// FUNCTION: LEGO1 0x1005e860
 	inline virtual const char* ClassName() const override // vtable+0x0c
diff --git a/LEGO1/lego/legoomni/include/racestate.h b/LEGO1/lego/legoomni/include/racestate.h
index 7d2de4f6..0104d7a4 100644
--- a/LEGO1/lego/legoomni/include/racestate.h
+++ b/LEGO1/lego/legoomni/include/racestate.h
@@ -41,9 +41,9 @@ class RaceState : public LegoState {
 	RaceStateEntry* GetState(MxU8 p_id);
 
 protected:
-	RaceStateEntry m_state[5];
-	undefined2 m_unk0x26[2];
-	undefined4 m_unk0x28;
+	RaceStateEntry m_state[5]; // 0x08
+	undefined2 m_unk0x26[2];   // 0x26
+	undefined4 m_unk0x28;      // 0x28
 };
 
 #endif // RACESTATE_H
diff --git a/LEGO1/lego/legoomni/include/scorestate.h b/LEGO1/lego/legoomni/include/scorestate.h
index fde33e1a..ad8c26f7 100644
--- a/LEGO1/lego/legoomni/include/scorestate.h
+++ b/LEGO1/lego/legoomni/include/scorestate.h
@@ -30,7 +30,7 @@ class ScoreState : public LegoState {
 	// ScoreState::`scalar deleting destructor'
 
 private:
-	MxBool m_playCubeTutorial;
+	MxBool m_playCubeTutorial; // 0x08
 };
 
 #endif // SCORESTATE_H
diff --git a/LEGO1/lego/legoomni/include/towtrackmissionstate.h b/LEGO1/lego/legoomni/include/towtrackmissionstate.h
index ef5bacda..9e3b78f3 100644
--- a/LEGO1/lego/legoomni/include/towtrackmissionstate.h
+++ b/LEGO1/lego/legoomni/include/towtrackmissionstate.h
@@ -21,6 +21,7 @@ class TowTrackMissionState : public LegoState {
 	{
 		return !strcmp(p_name, TowTrackMissionState::ClassName()) || LegoState::IsA(p_name);
 	}
+
 	virtual MxResult VTable0x1c(LegoFile* p_legoFile) override; // vtable+0x1C
 
 	inline MxU16 GetColor(MxU8 p_id)
diff --git a/LEGO1/lego/legoomni/src/common/legostate.cpp b/LEGO1/lego/legoomni/src/common/legostate.cpp
index 16beb159..c9946492 100644
--- a/LEGO1/lego/legoomni/src/common/legostate.cpp
+++ b/LEGO1/lego/legoomni/src/common/legostate.cpp
@@ -1,29 +1,3 @@
 #include "legostate.h"
 
-DECOMP_SIZE_ASSERT(LegoState, 0x08);
-
-// FUNCTION: LEGO1 0x10005f40
-LegoState::~LegoState()
-{
-}
-
-// FUNCTION: LEGO1 0x10005f90
-MxBool LegoState::VTable0x14()
-{
-	return TRUE;
-}
-
-// FUNCTION: LEGO1 0x10005fa0
-MxBool LegoState::SetFlag()
-{
-	return FALSE;
-}
-
-// FUNCTION: LEGO1 0x10005fb0
-MxResult LegoState::VTable0x1c(LegoFile* p_legoFile)
-{
-	if (p_legoFile->IsWriteMode()) {
-		p_legoFile->FUN_10006030(this->ClassName());
-	}
-	return SUCCESS;
-}
+DECOMP_SIZE_ASSERT(LegoState, 0x08)

From bcdddd4c7e25a394adad3e71b392b2d7c1dbc5a0 Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Mon, 29 Jan 2024 16:17:17 -0500
Subject: [PATCH 193/210] Pad all single-digit hexadecimal values with zero
 (#504)

* Pad all single-digit hexadecimal values with zero

* One more fix
---
 LEGO1/lego/legoomni/include/act1state.h       | 18 +++++++-------
 LEGO1/lego/legoomni/include/act2brick.h       |  4 ++--
 .../lego/legoomni/include/act2policestation.h |  2 +-
 LEGO1/lego/legoomni/include/act3.h            |  4 ++--
 LEGO1/lego/legoomni/include/act3state.h       |  2 +-
 .../legoomni/include/ambulancemissionstate.h  | 24 +++++++++----------
 LEGO1/lego/legoomni/include/animstate.h       |  6 ++---
 LEGO1/lego/legoomni/include/buildingentity.h  |  4 ++--
 LEGO1/lego/legoomni/include/bumpbouy.h        |  2 +-
 LEGO1/lego/legoomni/include/elevatorbottom.h  |  4 ++--
 LEGO1/lego/legoomni/include/gasstation.h      |  6 ++---
 LEGO1/lego/legoomni/include/helicopter.h      |  4 ++--
 LEGO1/lego/legoomni/include/helicopterstate.h | 10 ++++----
 LEGO1/lego/legoomni/include/historybook.h     |  4 ++--
 LEGO1/lego/legoomni/include/hospital.h        |  2 +-
 LEGO1/lego/legoomni/include/hospitalstate.h   | 14 +++++------
 LEGO1/lego/legoomni/include/infocenter.h      |  4 ++--
 LEGO1/lego/legoomni/include/infocenterdoor.h  |  4 ++--
 LEGO1/lego/legoomni/include/isle.h            |  2 +-
 LEGO1/lego/legoomni/include/isleactor.h       |  2 +-
 LEGO1/lego/legoomni/include/islepathactor.h   |  4 ++--
 LEGO1/lego/legoomni/include/jukebox.h         |  4 ++--
 LEGO1/lego/legoomni/include/jukeboxentity.h   |  4 ++--
 .../legoomni/include/legoanimationmanager.h   |  6 ++---
 .../lego/legoomni/include/legoanimpresenter.h |  6 ++---
 LEGO1/lego/legoomni/include/legocachesound.h  |  2 +-
 .../legoomni/include/legocameracontroller.h   |  2 +-
 LEGO1/lego/legoomni/include/legocarbuild.h    |  4 ++--
 .../include/legocarbuildanimpresenter.h       |  2 +-
 .../legoomni/include/legocontrolmanager.h     |  4 ++--
 LEGO1/lego/legoomni/include/legoentity.h      |  4 ++--
 .../legoomni/include/legoentitypresenter.h    |  4 ++--
 .../include/legoeventnotificationparam.h      |  2 +-
 LEGO1/lego/legoomni/include/legoextraactor.h  |  2 +-
 .../include/legoflctexturepresenter.h         |  2 +-
 LEGO1/lego/legoomni/include/legogamestate.h   | 10 ++++----
 .../legoomni/include/legohideanimpresenter.h  |  2 +-
 .../lego/legoomni/include/legoinputmanager.h  |  2 +-
 LEGO1/lego/legoomni/include/legojetski.h      |  2 +-
 .../legoomni/include/legojetskiraceactor.h    |  2 +-
 .../include/legoloadcachesoundpresenter.h     |  2 +-
 .../include/legolocomotionanimpresenter.h     |  2 +-
 .../include/legoloopinganimpresenter.h        |  2 +-
 .../legoomni/include/legomodelpresenter.h     |  2 +-
 .../lego/legoomni/include/legonavcontroller.h |  6 ++---
 .../legoomni/include/legopalettepresenter.h   |  4 ++--
 .../lego/legoomni/include/legopartpresenter.h |  2 +-
 LEGO1/lego/legoomni/include/legopathactor.h   |  2 +-
 .../legoomni/include/legopathcontroller.h     |  2 +-
 .../lego/legoomni/include/legopathpresenter.h |  2 +-
 .../legoomni/include/legophonemepresenter.h   |  4 ++--
 .../lego/legoomni/include/legoplantmanager.h  |  6 ++---
 .../include/legopointofviewcontroller.h       |  8 +++----
 LEGO1/lego/legoomni/include/legorace.h        |  6 ++---
 LEGO1/lego/legoomni/include/legoraceactor.h   |  2 +-
 LEGO1/lego/legoomni/include/legoracecar.h     |  2 +-
 .../lego/legoomni/include/legovideomanager.h  |  2 +-
 LEGO1/lego/legoomni/include/legoworld.h       |  6 ++---
 .../legoomni/include/legoworldpresenter.h     |  2 +-
 .../include/mxbackgroundaudiomanager.h        |  4 ++--
 .../legoomni/include/mxtransitionmanager.h    |  4 ++--
 LEGO1/lego/legoomni/include/pizza.h           |  4 ++--
 .../lego/legoomni/include/pizzamissionstate.h |  8 +++----
 LEGO1/lego/legoomni/include/police.h          |  6 ++---
 LEGO1/lego/legoomni/include/policeentity.h    |  2 +-
 LEGO1/lego/legoomni/include/policestate.h     |  4 ++--
 LEGO1/lego/legoomni/include/racecar.h         |  2 +-
 LEGO1/lego/legoomni/include/racestate.h       |  4 ++--
 LEGO1/lego/legoomni/include/radio.h           |  2 +-
 .../lego/legoomni/include/registrationbook.h  |  6 ++---
 LEGO1/lego/legoomni/include/score.h           |  4 ++--
 LEGO1/lego/legoomni/include/scorestate.h      |  2 +-
 LEGO1/lego/legoomni/src/build/helicopter.cpp  | 16 ++++++-------
 .../src/build/legovehiclebuildstate.cpp       |  2 +-
 LEGO1/lego/legoomni/src/common/animstate.cpp  |  2 +-
 LEGO1/lego/legoomni/src/common/gifmanager.cpp |  2 +-
 .../legoomni/src/common/legogamestate.cpp     |  4 ++--
 .../src/hospital/ambulancemissionstate.cpp    |  4 ++--
 .../legoomni/src/hospital/hospitalstate.cpp   |  4 ++--
 .../legoomni/src/infocenter/infocenter.cpp    |  2 +-
 LEGO1/lego/legoomni/src/infocenter/score.cpp  |  6 ++---
 LEGO1/lego/legoomni/src/isle/radio.cpp        |  6 ++---
 .../lego/legoomni/src/police/policestate.cpp  | 10 ++++----
 .../legoomni/src/video/legoanimpresenter.cpp  |  4 ++--
 LEGO1/lego/sources/misc/legoimage.cpp         |  2 +-
 LEGO1/lego/sources/misc/legoimage.h           |  2 +-
 LEGO1/lego/sources/misc/legostorage.cpp       |  4 ++--
 LEGO1/lego/sources/misc/legotexture.cpp       |  2 +-
 LEGO1/lego/sources/misc/legotree.h            | 22 ++++++++---------
 LEGO1/lego/sources/roi/legoroi.h              |  2 +-
 .../omni/include/mxactionnotificationparam.h  | 10 ++++----
 LEGO1/omni/include/mxbitmap.h                 |  4 ++--
 LEGO1/omni/include/mxcollection.h             |  4 ++--
 LEGO1/omni/include/mxcompositepresenter.h     |  2 +-
 LEGO1/omni/include/mxcore.h                   |  2 +-
 LEGO1/omni/include/mxdiskstreamcontroller.h   |  2 +-
 LEGO1/omni/include/mxdschunk.h                |  4 ++--
 LEGO1/omni/include/mxdsfile.h                 |  2 +-
 LEGO1/omni/include/mxdsobject.h               |  4 ++--
 LEGO1/omni/include/mxentity.h                 |  6 ++---
 LEGO1/omni/include/mxeventpresenter.h         |  2 +-
 LEGO1/omni/include/mxflcpresenter.h           |  2 +-
 LEGO1/omni/include/mxloopingflcpresenter.h    |  2 +-
 LEGO1/omni/include/mxloopingmidipresenter.h   |  2 +-
 LEGO1/omni/include/mxloopingsmkpresenter.h    |  4 ++--
 LEGO1/omni/include/mxmediamanager.h           |  4 ++--
 LEGO1/omni/include/mxmediapresenter.h         |  4 ++--
 LEGO1/omni/include/mxmidipresenter.h          |  2 +-
 LEGO1/omni/include/mxmusicpresenter.h         |  2 +-
 LEGO1/omni/include/mxnextactiondatastart.h    |  2 +-
 LEGO1/omni/include/mxnotificationmanager.h    | 12 +++++-----
 LEGO1/omni/include/mxnotificationparam.h      |  2 +-
 LEGO1/omni/include/mxobjectfactory.h          |  2 +-
 LEGO1/omni/include/mxomni.h                   |  2 +-
 LEGO1/omni/include/mxpalette.h                |  2 +-
 LEGO1/omni/include/mxpresenter.h              |  4 ++--
 LEGO1/omni/include/mxramstreamcontroller.h    |  2 +-
 LEGO1/omni/include/mxramstreamprovider.h      |  2 +-
 LEGO1/omni/include/mxsmkpresenter.h           |  2 +-
 LEGO1/omni/include/mxsoundmanager.h           |  2 +-
 LEGO1/omni/include/mxstillpresenter.h         |  2 +-
 LEGO1/omni/include/mxstreamchunk.h            |  2 +-
 LEGO1/omni/include/mxstreamcontroller.h       |  6 ++---
 LEGO1/omni/include/mxstreamer.h               |  6 ++---
 LEGO1/omni/include/mxstreamlist.h             |  6 ++---
 LEGO1/omni/include/mxticklemanager.h          | 14 +++++------
 .../omni/include/mxtype18notificationparam.h  |  2 +-
 .../omni/include/mxtype19notificationparam.h  |  4 ++--
 LEGO1/omni/include/mxvideomanager.h           |  2 +-
 LEGO1/omni/include/mxvideopresenter.h         |  4 ++--
 LEGO1/omni/src/common/mxticklemanager.cpp     |  2 +-
 .../omni/src/notify/mxnotificationmanager.cpp |  2 +-
 LEGO1/omni/src/notify/mxnotificationparam.cpp |  2 +-
 LEGO1/omni/src/stream/mxdschunk.cpp           |  2 +-
 LEGO1/omni/src/stream/mxdsfile.cpp            |  2 +-
 LEGO1/omni/src/stream/mxstreamlist.cpp        |  6 ++---
 LEGO1/omni/src/video/mxvideopresenter.cpp     |  2 +-
 LEGO1/realtime/matrix.cpp                     |  2 +-
 LEGO1/realtime/matrix.h                       |  2 +-
 LEGO1/realtime/orientableroi.h                |  4 ++--
 LEGO1/realtime/roi.h                          | 22 ++++++++---------
 LEGO1/realtime/vector.cpp                     |  6 ++---
 LEGO1/realtime/vector.h                       |  2 +-
 LEGO1/tgl/d3drm/camera.cpp                    |  4 ++--
 LEGO1/tgl/d3drm/light.cpp                     |  4 ++--
 LEGO1/tgl/d3drm/mesh.cpp                      |  4 ++--
 LEGO1/tgl/d3drm/unk.cpp                       |  4 ++--
 147 files changed, 311 insertions(+), 311 deletions(-)

diff --git a/LEGO1/lego/legoomni/include/act1state.h b/LEGO1/lego/legoomni/include/act1state.h
index 3bc28a0d..62cbf98c 100644
--- a/LEGO1/lego/legoomni/include/act1state.h
+++ b/LEGO1/lego/legoomni/include/act1state.h
@@ -36,15 +36,15 @@ class Act1State : public LegoState {
 	// Act1State::`scalar deleting destructor'
 
 protected:
-	undefined m_unk0x8[0x10]; // 0x8
-	MxU32 m_unk0x18;          // 0x18
-	undefined2 m_unk0x1c;     // 0x1c
-	undefined m_unk0x1e;      // 0x1e
-	undefined m_unk0x1f;      // 0x1f
-	undefined m_unk0x20;      // 0x20
-	MxBool m_unk0x21;         // 0x21
-	undefined m_unk0x22;      // 0x22
-							  // TODO
+	undefined m_unk0x08[0x10]; // 0x08
+	MxU32 m_unk0x18;           // 0x18
+	undefined2 m_unk0x1c;      // 0x1c
+	undefined m_unk0x1e;       // 0x1e
+	undefined m_unk0x1f;       // 0x1f
+	undefined m_unk0x20;       // 0x20
+	MxBool m_unk0x21;          // 0x21
+	undefined m_unk0x22;       // 0x22
+							   // TODO
 };
 
 #endif // ACT1STATE_H
diff --git a/LEGO1/lego/legoomni/include/act2brick.h b/LEGO1/lego/legoomni/include/act2brick.h
index e9f771ad..635fac2d 100644
--- a/LEGO1/lego/legoomni/include/act2brick.h
+++ b/LEGO1/lego/legoomni/include/act2brick.h
@@ -8,9 +8,9 @@
 class Act2Brick : public LegoPathActor {
 public:
 	Act2Brick();
-	virtual ~Act2Brick() override; // vtable+0x0
+	virtual ~Act2Brick() override; // vtable+0x00
 
-	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x4
+	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x04
 	virtual MxResult Tickle() override;               // vtable+0x08
 
 	// FUNCTION: LEGO1 0x1007a360
diff --git a/LEGO1/lego/legoomni/include/act2policestation.h b/LEGO1/lego/legoomni/include/act2policestation.h
index 4746236f..3fa7ebb4 100644
--- a/LEGO1/lego/legoomni/include/act2policestation.h
+++ b/LEGO1/lego/legoomni/include/act2policestation.h
@@ -7,7 +7,7 @@
 // SIZE 0x68
 class Act2PoliceStation : public LegoEntity {
 public:
-	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x4
+	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x04
 
 	// FUNCTION: LEGO1 0x1000e200
 	inline virtual const char* ClassName() const override // vtable+0x0c
diff --git a/LEGO1/lego/legoomni/include/act3.h b/LEGO1/lego/legoomni/include/act3.h
index f9794f7c..fe27b743 100644
--- a/LEGO1/lego/legoomni/include/act3.h
+++ b/LEGO1/lego/legoomni/include/act3.h
@@ -11,8 +11,8 @@ class Act3 : public LegoWorld {
 
 	virtual ~Act3() override; // vtable+00
 
-	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x4
-	virtual MxResult Tickle() override;               // vtable+0x8
+	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x04
+	virtual MxResult Tickle() override;               // vtable+0x08
 
 	// FUNCTION: LEGO1 0x10072510
 	inline virtual const char* ClassName() const override // vtable+0x0c
diff --git a/LEGO1/lego/legoomni/include/act3state.h b/LEGO1/lego/legoomni/include/act3state.h
index c88c4620..1c8643f7 100644
--- a/LEGO1/lego/legoomni/include/act3state.h
+++ b/LEGO1/lego/legoomni/include/act3state.h
@@ -4,7 +4,7 @@
 #include "legostate.h"
 
 // VTABLE: LEGO1 0x100d4fc8
-// SIZE 0xc
+// SIZE 0x0c
 class Act3State : public LegoState {
 public:
 	inline Act3State() { m_unk0x08 = 0; }
diff --git a/LEGO1/lego/legoomni/include/ambulancemissionstate.h b/LEGO1/lego/legoomni/include/ambulancemissionstate.h
index 923a0cc3..cefc3c21 100644
--- a/LEGO1/lego/legoomni/include/ambulancemissionstate.h
+++ b/LEGO1/lego/legoomni/include/ambulancemissionstate.h
@@ -46,18 +46,18 @@ class AmbulanceMissionState : public LegoState {
 	// AmbulanceMissionState::`scalar deleting destructor'
 
 protected:
-	undefined4 m_unk0x8; // 0x08
-	undefined4 m_unk0xc; // 0x0c
-	MxU16 m_unk0x10;     // 0x10
-	MxU16 m_unk0x12;     // 0x12
-	MxU16 m_unk0x14;     // 0x14
-	MxU16 m_unk0x16;     // 0x16
-	MxU16 m_unk0x18;     // 0x18
-	MxU16 m_color1;      // 0x1a
-	MxU16 m_color2;      // 0x1c
-	MxU16 m_color3;      // 0x1e
-	MxU16 m_color4;      // 0x20
-	MxU16 m_color5;      // 0x22
+	undefined4 m_unk0x08; // 0x08
+	undefined4 m_unk0x0c; // 0x0c
+	MxU16 m_unk0x10;      // 0x10
+	MxU16 m_unk0x12;      // 0x12
+	MxU16 m_unk0x14;      // 0x14
+	MxU16 m_unk0x16;      // 0x16
+	MxU16 m_unk0x18;      // 0x18
+	MxU16 m_color1;       // 0x1a
+	MxU16 m_color2;       // 0x1c
+	MxU16 m_color3;       // 0x1e
+	MxU16 m_color4;       // 0x20
+	MxU16 m_color5;       // 0x22
 };
 
 #endif // AMBULANCEMISSIONSTATE_H
diff --git a/LEGO1/lego/legoomni/include/animstate.h b/LEGO1/lego/legoomni/include/animstate.h
index 8f64790b..8d785b11 100644
--- a/LEGO1/lego/legoomni/include/animstate.h
+++ b/LEGO1/lego/legoomni/include/animstate.h
@@ -8,7 +8,7 @@
 class AnimState : public LegoState {
 public:
 	AnimState();
-	virtual ~AnimState() override; // vtable+0x0
+	virtual ~AnimState() override; // vtable+0x00
 
 	// FUNCTION: LEGO1 0x10065070
 	inline virtual const char* ClassName() const override // vtable+0x0c
@@ -30,8 +30,8 @@ class AnimState : public LegoState {
 	// AnimState::`scalar deleting destructor'
 
 private:
-	undefined4 m_unk0x8;  // 0x08
-	undefined4 m_unk0xc;  // 0x0c
+	undefined4 m_unk0x08; // 0x08
+	undefined4 m_unk0x0c; // 0x0c
 	void* m_unk0x10;      // 0x10
 	undefined4 m_unk0x14; // 0x14
 	void* m_unk0x18;      // 0x18
diff --git a/LEGO1/lego/legoomni/include/buildingentity.h b/LEGO1/lego/legoomni/include/buildingentity.h
index 0e9a9d45..490c6a0d 100644
--- a/LEGO1/lego/legoomni/include/buildingentity.h
+++ b/LEGO1/lego/legoomni/include/buildingentity.h
@@ -8,9 +8,9 @@
 class BuildingEntity : public LegoEntity {
 public:
 	BuildingEntity();
-	virtual ~BuildingEntity() override; // vtable+0x0
+	virtual ~BuildingEntity() override; // vtable+0x00
 
-	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x4
+	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x04
 
 	// FUNCTION: LEGO1 0x10014f20
 	inline virtual const char* ClassName() const override // vtable+0x0c
diff --git a/LEGO1/lego/legoomni/include/bumpbouy.h b/LEGO1/lego/legoomni/include/bumpbouy.h
index 112801b2..7dc02c82 100644
--- a/LEGO1/lego/legoomni/include/bumpbouy.h
+++ b/LEGO1/lego/legoomni/include/bumpbouy.h
@@ -7,7 +7,7 @@
 // VTABLE: LEGO1 0x100d6790
 class BumpBouy : public LegoAnimActor {
 public:
-	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x4
+	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x04
 
 	// FUNCTION: LEGO1 0x100274e0
 	inline virtual const char* ClassName() const override // vtable+0x0c
diff --git a/LEGO1/lego/legoomni/include/elevatorbottom.h b/LEGO1/lego/legoomni/include/elevatorbottom.h
index 5bf8bced..e52f5556 100644
--- a/LEGO1/lego/legoomni/include/elevatorbottom.h
+++ b/LEGO1/lego/legoomni/include/elevatorbottom.h
@@ -9,9 +9,9 @@
 class ElevatorBottom : public LegoWorld {
 public:
 	ElevatorBottom();
-	virtual ~ElevatorBottom() override; // vtable+0x0
+	virtual ~ElevatorBottom() override; // vtable+0x00
 
-	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x4
+	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x04
 
 	// FUNCTION: LEGO1 0x10017f20
 	inline virtual const char* ClassName() const override // vtable+0x0c
diff --git a/LEGO1/lego/legoomni/include/gasstation.h b/LEGO1/lego/legoomni/include/gasstation.h
index 9efb8886..baa42ab2 100644
--- a/LEGO1/lego/legoomni/include/gasstation.h
+++ b/LEGO1/lego/legoomni/include/gasstation.h
@@ -11,10 +11,10 @@
 class GasStation : public LegoWorld {
 public:
 	GasStation();
-	virtual ~GasStation() override; // vtable+0x0
+	virtual ~GasStation() override; // vtable+0x00
 
-	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x4
-	virtual MxResult Tickle() override;               // vtable+0x8
+	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x04
+	virtual MxResult Tickle() override;               // vtable+0x08
 
 	// FUNCTION: LEGO1 0x10004780
 	inline virtual const char* ClassName() const override // vtable+0x0c
diff --git a/LEGO1/lego/legoomni/include/helicopter.h b/LEGO1/lego/legoomni/include/helicopter.h
index 10bcd7da..74670324 100644
--- a/LEGO1/lego/legoomni/include/helicopter.h
+++ b/LEGO1/lego/legoomni/include/helicopter.h
@@ -12,7 +12,7 @@ class HelicopterSubclass {
 	MxResult FUN_100040a0(Vector4& p_v, float p_f);
 
 private:
-	Mx4DPointFloat m_unk0x0;  // 0x0
+	Mx4DPointFloat m_unk0x00; // 0x00
 	Mx4DPointFloat m_unk0x18; // 0x18
 	undefined4 m_unk0x30;     // 0x30
 };
@@ -22,7 +22,7 @@ class HelicopterSubclass {
 class Helicopter : public IslePathActor {
 public:
 	Helicopter();
-	virtual ~Helicopter() override; // vtable+0x0
+	virtual ~Helicopter() override; // vtable+0x00
 
 	// FUNCTION: LEGO1 0x10003070
 	inline virtual const char* ClassName() const override // vtable+0x0c
diff --git a/LEGO1/lego/legoomni/include/helicopterstate.h b/LEGO1/lego/legoomni/include/helicopterstate.h
index 52a92192..186469ff 100644
--- a/LEGO1/lego/legoomni/include/helicopterstate.h
+++ b/LEGO1/lego/legoomni/include/helicopterstate.h
@@ -5,7 +5,7 @@
 #include "legostate.h"
 
 // VTABLE: LEGO1 0x100d5418
-// SIZE 0xc
+// SIZE 0x0c
 class HelicopterState : public LegoState {
 public:
 	// FUNCTION: LEGO1 0x1000e0d0
@@ -27,18 +27,18 @@ class HelicopterState : public LegoState {
 	// FUNCTION: LEGO1 0x1000e0c0
 	virtual MxBool SetFlag() override
 	{
-		m_unk0x8 = 0;
+		m_unk0x08 = 0;
 		return TRUE;
 	}; // vtable+0x18
 
-	inline void SetUnknown8(MxU32 p_unk0x8) { m_unk0x8 = p_unk0x8; }
-	inline MxU32 GetUnkown8() { return m_unk0x8; }
+	inline void SetUnknown8(MxU32 p_unk0x08) { m_unk0x08 = p_unk0x08; }
+	inline MxU32 GetUnkown8() { return m_unk0x08; }
 
 	// SYNTHETIC: LEGO1 0x1000e190
 	// HelicopterState::`scalar deleting destructor'
 
 protected:
-	MxU32 m_unk0x8; // 0x8
+	MxU32 m_unk0x08; // 0x08
 };
 
 #endif // HELICOPTERSTATE_H
diff --git a/LEGO1/lego/legoomni/include/historybook.h b/LEGO1/lego/legoomni/include/historybook.h
index a5299f63..9152e07a 100644
--- a/LEGO1/lego/legoomni/include/historybook.h
+++ b/LEGO1/lego/legoomni/include/historybook.h
@@ -8,9 +8,9 @@
 class HistoryBook : public LegoWorld {
 public:
 	HistoryBook();
-	virtual ~HistoryBook() override; // vtable+0x0
+	virtual ~HistoryBook() override; // vtable+0x00
 
-	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x4
+	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x04
 
 	// FUNCTION: LEGO1 0x10082390
 	inline virtual const char* ClassName() const override // vtable+0x0c
diff --git a/LEGO1/lego/legoomni/include/hospital.h b/LEGO1/lego/legoomni/include/hospital.h
index 194cb690..ad8bd137 100644
--- a/LEGO1/lego/legoomni/include/hospital.h
+++ b/LEGO1/lego/legoomni/include/hospital.h
@@ -9,7 +9,7 @@
 class Hospital : public LegoWorld {
 public:
 	Hospital();
-	virtual ~Hospital() override; // vtable+0x0
+	virtual ~Hospital() override; // vtable+0x00
 
 	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x04
 	virtual MxResult Tickle() override;               // vtable+0x08
diff --git a/LEGO1/lego/legoomni/include/hospitalstate.h b/LEGO1/lego/legoomni/include/hospitalstate.h
index 2b141709..a6ccd77a 100644
--- a/LEGO1/lego/legoomni/include/hospitalstate.h
+++ b/LEGO1/lego/legoomni/include/hospitalstate.h
@@ -30,13 +30,13 @@ class HospitalState : public LegoState {
 	// HospitalState::`scalar deleting destructor'
 
 private:
-	undefined m_unk0x8[4]; // 0x8
-	undefined2 m_unk0xc;   // 0xc
-	undefined2 m_unk0xe;   // 0xe
-	undefined2 m_unk0x10;  // 0x10
-	undefined2 m_unk0x12;  // 0x12
-	undefined2 m_unk0x14;  // 0x14
-	undefined2 m_unk0x16;  // 0x16
+	undefined m_unk0x08[4]; // 0x08
+	undefined2 m_unk0x0c;   // 0x0c
+	undefined2 m_unk0x0e;   // 0x0e
+	undefined2 m_unk0x10;   // 0x10
+	undefined2 m_unk0x12;   // 0x12
+	undefined2 m_unk0x14;   // 0x14
+	undefined2 m_unk0x16;   // 0x16
 };
 
 #endif // HOSPITALSTATE_H
diff --git a/LEGO1/lego/legoomni/include/infocenter.h b/LEGO1/lego/legoomni/include/infocenter.h
index fe6efff8..b46099cd 100644
--- a/LEGO1/lego/legoomni/include/infocenter.h
+++ b/LEGO1/lego/legoomni/include/infocenter.h
@@ -132,8 +132,8 @@ class Infocenter : public LegoWorld {
 	Infocenter();
 	virtual ~Infocenter() override;
 
-	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x4
-	virtual MxResult Tickle() override;               // vtable+0x8
+	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x04
+	virtual MxResult Tickle() override;               // vtable+0x08
 
 	// FUNCTION: LEGO1 0x1006eb40
 	inline virtual const char* ClassName() const override // vtable+0x0c
diff --git a/LEGO1/lego/legoomni/include/infocenterdoor.h b/LEGO1/lego/legoomni/include/infocenterdoor.h
index de3159f6..1d7b361d 100644
--- a/LEGO1/lego/legoomni/include/infocenterdoor.h
+++ b/LEGO1/lego/legoomni/include/infocenterdoor.h
@@ -8,9 +8,9 @@
 class InfocenterDoor : public LegoWorld {
 public:
 	InfocenterDoor();
-	virtual ~InfocenterDoor(); // vtable+0x0
+	virtual ~InfocenterDoor(); // vtable+0x00
 
-	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x4
+	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x04
 
 	// FUNCTION: LEGO1 0x100377b0
 	inline virtual const char* ClassName() const override // vtable+0x0c
diff --git a/LEGO1/lego/legoomni/include/isle.h b/LEGO1/lego/legoomni/include/isle.h
index 148e099f..04871028 100644
--- a/LEGO1/lego/legoomni/include/isle.h
+++ b/LEGO1/lego/legoomni/include/isle.h
@@ -24,7 +24,7 @@ class Isle : public LegoWorld {
 public:
 	Isle();
 	virtual ~Isle() override;
-	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x4
+	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x04
 
 	// FUNCTION: LEGO1 0x10030910
 	inline virtual const char* ClassName() const override // vtable+0x0c
diff --git a/LEGO1/lego/legoomni/include/isleactor.h b/LEGO1/lego/legoomni/include/isleactor.h
index f9092363..d8253821 100644
--- a/LEGO1/lego/legoomni/include/isleactor.h
+++ b/LEGO1/lego/legoomni/include/isleactor.h
@@ -6,7 +6,7 @@
 // VTABLE: LEGO1 0x100d5178
 class IsleActor : public LegoActor {
 public:
-	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x4
+	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x04
 
 	// FUNCTION: LEGO1 0x1000e660
 	inline virtual const char* ClassName() const override // vtable+0x0c
diff --git a/LEGO1/lego/legoomni/include/islepathactor.h b/LEGO1/lego/legoomni/include/islepathactor.h
index 2e92c251..2770b457 100644
--- a/LEGO1/lego/legoomni/include/islepathactor.h
+++ b/LEGO1/lego/legoomni/include/islepathactor.h
@@ -15,9 +15,9 @@ class IslePathActor : public LegoPathActor {
 	IslePathActor();
 
 	// FUNCTION: LEGO1 0x10002e10
-	inline virtual ~IslePathActor() override { IslePathActor::Destroy(TRUE); } // vtable+0x0
+	inline virtual ~IslePathActor() override { IslePathActor::Destroy(TRUE); } // vtable+0x00
 
-	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x4
+	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x04
 
 	// FUNCTION: LEGO1 0x10002ea0
 	inline virtual const char* ClassName() const override // vtable+0x0c
diff --git a/LEGO1/lego/legoomni/include/jukebox.h b/LEGO1/lego/legoomni/include/jukebox.h
index 9710a841..f760641d 100644
--- a/LEGO1/lego/legoomni/include/jukebox.h
+++ b/LEGO1/lego/legoomni/include/jukebox.h
@@ -10,8 +10,8 @@ class JukeBox : public LegoWorld {
 public:
 	JukeBox();
 
-	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x4
-	virtual MxResult Tickle() override;               // vtable+0x8
+	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x04
+	virtual MxResult Tickle() override;               // vtable+0x08
 
 	// FUNCTION: LEGO1 0x1005d6f0
 	inline virtual const char* ClassName() const override // vtable+0x0c
diff --git a/LEGO1/lego/legoomni/include/jukeboxentity.h b/LEGO1/lego/legoomni/include/jukeboxentity.h
index a0121eed..38691ba6 100644
--- a/LEGO1/lego/legoomni/include/jukeboxentity.h
+++ b/LEGO1/lego/legoomni/include/jukeboxentity.h
@@ -8,9 +8,9 @@
 class JukeBoxEntity : public LegoEntity {
 public:
 	JukeBoxEntity();
-	virtual ~JukeBoxEntity() override; // vtable+0x0
+	virtual ~JukeBoxEntity() override; // vtable+0x00
 
-	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x4
+	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x04
 
 	// FUNCTION: LEGO1 0x10085cc0
 	inline virtual const char* ClassName() const override // vtable+0x0c
diff --git a/LEGO1/lego/legoomni/include/legoanimationmanager.h b/LEGO1/lego/legoomni/include/legoanimationmanager.h
index 82dc429d..c8ad60cd 100644
--- a/LEGO1/lego/legoomni/include/legoanimationmanager.h
+++ b/LEGO1/lego/legoomni/include/legoanimationmanager.h
@@ -9,10 +9,10 @@
 class LegoAnimationManager : public MxCore {
 public:
 	LegoAnimationManager();
-	virtual ~LegoAnimationManager() override; // vtable+0x0
+	virtual ~LegoAnimationManager() override; // vtable+0x00
 
-	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x4
-	virtual MxResult Tickle() override;               // vtable+0x8
+	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x04
+	virtual MxResult Tickle() override;               // vtable+0x08
 
 	// FUNCTION: LEGO1 0x1005ec80
 	inline virtual const char* ClassName() const override // vtable+0x0c
diff --git a/LEGO1/lego/legoomni/include/legoanimpresenter.h b/LEGO1/lego/legoomni/include/legoanimpresenter.h
index 594c13ca..2a2845cf 100644
--- a/LEGO1/lego/legoomni/include/legoanimpresenter.h
+++ b/LEGO1/lego/legoomni/include/legoanimpresenter.h
@@ -87,11 +87,11 @@ class LegoAnimClass : public LegoTree {
 	virtual LegoTreeNodeData* CreateData() override;           // vtable+0x0c
 	virtual MxResult VTable0x10(LegoMemory* p_stream, MxS32);  // vtable+0x10
 
-	inline MxLong GetUnknown0x8() { return m_unk0x8; }
+	inline MxLong GetUnknown0x8() { return m_unk0x08; }
 
 private:
-	MxLong m_unk0x8;      // 0x08
-	undefined4 m_unk0xc;  // 0x0c
+	MxLong m_unk0x08;     // 0x08
+	undefined4 m_unk0x0c; // 0x0c
 	undefined4 m_unk0x10; // 0x10
 	undefined4 m_unk0x14; // 0x14
 };
diff --git a/LEGO1/lego/legoomni/include/legocachesound.h b/LEGO1/lego/legoomni/include/legocachesound.h
index 1c3dfcc4..44ddb859 100644
--- a/LEGO1/lego/legoomni/include/legocachesound.h
+++ b/LEGO1/lego/legoomni/include/legocachesound.h
@@ -9,7 +9,7 @@
 class LegoCacheSound : public MxCore {
 public:
 	LegoCacheSound();
-	virtual ~LegoCacheSound() override; // vtable+0x0
+	virtual ~LegoCacheSound() override; // vtable+0x00
 
 	// FUNCTION: LEGO1 0x10006580
 	inline virtual const char* ClassName() const override // vtable+0x0c
diff --git a/LEGO1/lego/legoomni/include/legocameracontroller.h b/LEGO1/lego/legoomni/include/legocameracontroller.h
index 7d038d02..a3ef12a7 100644
--- a/LEGO1/lego/legoomni/include/legocameracontroller.h
+++ b/LEGO1/lego/legoomni/include/legocameracontroller.h
@@ -12,7 +12,7 @@
 class LegoCameraController : public LegoPointOfViewController {
 public:
 	LegoCameraController();
-	virtual ~LegoCameraController() override; // vtable+0x0
+	virtual ~LegoCameraController() override; // vtable+0x00
 
 	virtual MxLong Notify(MxParam& p_param) override; // vtable+04
 
diff --git a/LEGO1/lego/legoomni/include/legocarbuild.h b/LEGO1/lego/legoomni/include/legocarbuild.h
index cfe4990d..3ce04e02 100644
--- a/LEGO1/lego/legoomni/include/legocarbuild.h
+++ b/LEGO1/lego/legoomni/include/legocarbuild.h
@@ -10,8 +10,8 @@ class LegoCarBuild : public LegoWorld {
 	LegoCarBuild();
 	virtual ~LegoCarBuild() override;
 
-	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x4
-	virtual MxResult Tickle() override;               // vtable+0x8
+	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x04
+	virtual MxResult Tickle() override;               // vtable+0x08
 
 	// FUNCTION: LEGO1 0x10022940
 	inline virtual const char* ClassName() const override // vtable+0x0c
diff --git a/LEGO1/lego/legoomni/include/legocarbuildanimpresenter.h b/LEGO1/lego/legoomni/include/legocarbuildanimpresenter.h
index fb2d254d..d15e2f19 100644
--- a/LEGO1/lego/legoomni/include/legocarbuildanimpresenter.h
+++ b/LEGO1/lego/legoomni/include/legocarbuildanimpresenter.h
@@ -8,7 +8,7 @@
 class LegoCarBuildAnimPresenter : public LegoAnimPresenter {
 public:
 	LegoCarBuildAnimPresenter();
-	virtual ~LegoCarBuildAnimPresenter() override; // vtable+0x0
+	virtual ~LegoCarBuildAnimPresenter() override; // vtable+0x00
 
 	// FUNCTION: LEGO1 0x10078510
 	inline virtual const char* ClassName() const override // vtable+0x0c
diff --git a/LEGO1/lego/legoomni/include/legocontrolmanager.h b/LEGO1/lego/legoomni/include/legocontrolmanager.h
index f2f04026..0206c520 100644
--- a/LEGO1/lego/legoomni/include/legocontrolmanager.h
+++ b/LEGO1/lego/legoomni/include/legocontrolmanager.h
@@ -40,9 +40,9 @@ class LegoControlManagerEvent : public LegoEventNotificationParam {
 class LegoControlManager : public MxCore {
 public:
 	LegoControlManager();
-	virtual ~LegoControlManager() override; // vtable+0x0
+	virtual ~LegoControlManager() override; // vtable+0x00
 
-	virtual MxResult Tickle() override; // vtable+0x8
+	virtual MxResult Tickle() override; // vtable+0x08
 
 	// FUNCTION: LEGO1 0x10028cb0
 	inline virtual const char* ClassName() const override // vtable+0x0c
diff --git a/LEGO1/lego/legoomni/include/legoentity.h b/LEGO1/lego/legoomni/include/legoentity.h
index b9c58977..c5088097 100644
--- a/LEGO1/lego/legoomni/include/legoentity.h
+++ b/LEGO1/lego/legoomni/include/legoentity.h
@@ -22,10 +22,10 @@ class LegoEntity : public MxEntity {
 	// FUNCTION: LEGO1 0x1000c290
 	virtual ~LegoEntity() override { Destroy(TRUE); }
 
-	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x4
+	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x04
 
 	// FUNCTION: LEGO1 0x1000c2f0
-	inline const char* ClassName() const override // vtable+0xc
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f0064
 		return "LegoEntity";
diff --git a/LEGO1/lego/legoomni/include/legoentitypresenter.h b/LEGO1/lego/legoomni/include/legoentitypresenter.h
index 249e8b5c..291809ab 100644
--- a/LEGO1/lego/legoomni/include/legoentitypresenter.h
+++ b/LEGO1/lego/legoomni/include/legoentitypresenter.h
@@ -10,10 +10,10 @@ class LegoEntity;
 class LegoEntityPresenter : public MxCompositePresenter {
 public:
 	LegoEntityPresenter();
-	virtual ~LegoEntityPresenter() override; // vtable+0x0
+	virtual ~LegoEntityPresenter() override; // vtable+0x00
 
 	// FUNCTION: LEGO1 0x100534b0
-	inline const char* ClassName() const override // vtable+0xc
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f06b8
 		return "LegoEntityPresenter";
diff --git a/LEGO1/lego/legoomni/include/legoeventnotificationparam.h b/LEGO1/lego/legoomni/include/legoeventnotificationparam.h
index 731b53bb..fea26d46 100644
--- a/LEGO1/lego/legoomni/include/legoeventnotificationparam.h
+++ b/LEGO1/lego/legoomni/include/legoeventnotificationparam.h
@@ -18,7 +18,7 @@ class LegoEventNotificationParam : public MxNotificationParam {
 			new LegoEventNotificationParam(m_type, m_sender, m_modifier, m_x, m_y, m_key);
 		clone->m_roi = m_roi;
 		return clone;
-	}; // vtable+0x4
+	}; // vtable+0x04
 
 	inline LegoEventNotificationParam() : MxNotificationParam(c_notificationType0, NULL) {}
 	inline LegoEventNotificationParam(
diff --git a/LEGO1/lego/legoomni/include/legoextraactor.h b/LEGO1/lego/legoomni/include/legoextraactor.h
index c4c76cee..87a0ab21 100644
--- a/LEGO1/lego/legoomni/include/legoextraactor.h
+++ b/LEGO1/lego/legoomni/include/legoextraactor.h
@@ -7,7 +7,7 @@
 class LegoExtraActor : public LegoAnimActor {
 public:
 	// FUNCTION: LEGO1 0x1002b7a0
-	inline const char* ClassName() const override // vtable+0xc
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f3204
 		return "LegoExtraActor";
diff --git a/LEGO1/lego/legoomni/include/legoflctexturepresenter.h b/LEGO1/lego/legoomni/include/legoflctexturepresenter.h
index 9b136074..f86cf448 100644
--- a/LEGO1/lego/legoomni/include/legoflctexturepresenter.h
+++ b/LEGO1/lego/legoomni/include/legoflctexturepresenter.h
@@ -11,7 +11,7 @@ class LegoFlcTexturePresenter : public MxFlcPresenter {
 	LegoFlcTexturePresenter();
 
 	// FUNCTION: LEGO1 0x1005def0
-	inline const char* ClassName() const override // vtable+0xc
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f0634
 		return "LegoFlcTexturePresenter";
diff --git a/LEGO1/lego/legoomni/include/legogamestate.h b/LEGO1/lego/legoomni/include/legogamestate.h
index 51d7b888..318aa7a3 100644
--- a/LEGO1/lego/legoomni/include/legogamestate.h
+++ b/LEGO1/lego/legoomni/include/legogamestate.h
@@ -35,7 +35,7 @@ class LegoGameState {
 	void FUN_1003a720(MxU32);
 	void HandleAction(MxU32);
 
-	inline MxU8 GetUnknownC() { return m_unk0xc; }
+	inline MxU8 GetUnknownC() { return m_unk0x0c; }
 	inline MxU32 GetUnknown10() { return m_unk0x10; }
 	inline MxS32 GetCurrentAct() { return m_currentAct; }
 	inline undefined4 GetUnknown424() { return m_unk0x424; }
@@ -61,10 +61,10 @@ class LegoGameState {
 	MxS32 ReadVariable(LegoStorage* p_stream, MxVariableTable* p_to);
 	void SetROIHandlerFunction();
 
-	char* m_savePath;                           // 0x0
-	MxS16 m_stateCount;                         // 0x4
-	LegoState** m_stateArray;                   // 0x8
-	MxU8 m_unk0xc;                              // 0xc
+	char* m_savePath;                           // 0x00
+	MxS16 m_stateCount;                         // 0x04
+	LegoState** m_stateArray;                   // 0x08
+	MxU8 m_unk0x0c;                             // 0x0c
 	MxU32 m_unk0x10;                            // 0x10
 	MxS32 m_currentAct;                         // 0x14
 	LegoBackgroundColor* m_backgroundColor;     // 0x18
diff --git a/LEGO1/lego/legoomni/include/legohideanimpresenter.h b/LEGO1/lego/legoomni/include/legohideanimpresenter.h
index 06e8af33..29232923 100644
--- a/LEGO1/lego/legoomni/include/legohideanimpresenter.h
+++ b/LEGO1/lego/legoomni/include/legohideanimpresenter.h
@@ -12,7 +12,7 @@ class LegoHideAnimPresenter : public LegoLoopingAnimPresenter {
 	virtual ~LegoHideAnimPresenter() override;
 
 	// FUNCTION: LEGO1 0x1006d880
-	inline const char* ClassName() const override // vtable+0xc
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f06cc
 		return "LegoHideAnimPresenter";
diff --git a/LEGO1/lego/legoomni/include/legoinputmanager.h b/LEGO1/lego/legoomni/include/legoinputmanager.h
index 913df81c..cd9b9d0d 100644
--- a/LEGO1/lego/legoomni/include/legoinputmanager.h
+++ b/LEGO1/lego/legoomni/include/legoinputmanager.h
@@ -75,7 +75,7 @@ class LegoInputManager : public MxPresenter {
 	void Register(MxCore*);
 	void UnRegister(MxCore*);
 
-	virtual MxResult Tickle() override; // vtable+0x8
+	virtual MxResult Tickle() override; // vtable+0x08
 
 	// FUNCTION: LEGO1 0x1005b8c0
 	virtual MxResult PutData() override { return SUCCESS; }; // vtable+0x4c
diff --git a/LEGO1/lego/legoomni/include/legojetski.h b/LEGO1/lego/legoomni/include/legojetski.h
index ac376ab1..a4699945 100644
--- a/LEGO1/lego/legoomni/include/legojetski.h
+++ b/LEGO1/lego/legoomni/include/legojetski.h
@@ -9,7 +9,7 @@ class LegoJetski : public LegoJetskiRaceActor {
 	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x04
 
 	// FUNCTION: LEGO1 0x10013e80
-	inline const char* ClassName() const override // vtable+0xc
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f053c
 		return "LegoJetski";
diff --git a/LEGO1/lego/legoomni/include/legojetskiraceactor.h b/LEGO1/lego/legoomni/include/legojetskiraceactor.h
index 8b3a38c7..149b7011 100644
--- a/LEGO1/lego/legoomni/include/legojetskiraceactor.h
+++ b/LEGO1/lego/legoomni/include/legojetskiraceactor.h
@@ -7,7 +7,7 @@
 class LegoJetskiRaceActor : public LegoCarRaceActor {
 public:
 	// FUNCTION: LEGO1 0x10081d80
-	inline const char* ClassName() const override // vtable+0xc
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f0554
 		return "LegoJetskiRaceActor";
diff --git a/LEGO1/lego/legoomni/include/legoloadcachesoundpresenter.h b/LEGO1/lego/legoomni/include/legoloadcachesoundpresenter.h
index 47dc4e1f..b0fc9db9 100644
--- a/LEGO1/lego/legoomni/include/legoloadcachesoundpresenter.h
+++ b/LEGO1/lego/legoomni/include/legoloadcachesoundpresenter.h
@@ -14,7 +14,7 @@ class LegoLoadCacheSoundPresenter : public MxWavePresenter {
 	virtual ~LegoLoadCacheSoundPresenter() override;
 
 	// FUNCTION: LEGO1 0x10018450
-	inline const char* ClassName() const override // vtable+0xc
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f05a0
 		return "LegoLoadCacheSoundPresenter";
diff --git a/LEGO1/lego/legoomni/include/legolocomotionanimpresenter.h b/LEGO1/lego/legoomni/include/legolocomotionanimpresenter.h
index ab3da3eb..34b6ed2e 100644
--- a/LEGO1/lego/legoomni/include/legolocomotionanimpresenter.h
+++ b/LEGO1/lego/legoomni/include/legolocomotionanimpresenter.h
@@ -11,7 +11,7 @@ class LegoLocomotionAnimPresenter : public LegoLoopingAnimPresenter {
 	virtual ~LegoLocomotionAnimPresenter() override;
 
 	// FUNCTION: LEGO1 0x1006ce50
-	inline const char* ClassName() const override // vtable+0xc
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f06e4
 		return "LegoLocomotionAnimPresenter";
diff --git a/LEGO1/lego/legoomni/include/legoloopinganimpresenter.h b/LEGO1/lego/legoomni/include/legoloopinganimpresenter.h
index d4f47d7e..22bdffc9 100644
--- a/LEGO1/lego/legoomni/include/legoloopinganimpresenter.h
+++ b/LEGO1/lego/legoomni/include/legoloopinganimpresenter.h
@@ -8,7 +8,7 @@
 class LegoLoopingAnimPresenter : public LegoAnimPresenter {
 public:
 	// FUNCTION: LEGO1 0x1000c9a0
-	inline const char* ClassName() const override // vtable+0xc
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f0700
 		return "LegoLoopingAnimPresenter";
diff --git a/LEGO1/lego/legoomni/include/legomodelpresenter.h b/LEGO1/lego/legoomni/include/legomodelpresenter.h
index 8ba2ec8d..e0480d23 100644
--- a/LEGO1/lego/legoomni/include/legomodelpresenter.h
+++ b/LEGO1/lego/legoomni/include/legomodelpresenter.h
@@ -12,7 +12,7 @@ class LegoModelPresenter : public MxVideoPresenter {
 	static void configureLegoModelPresenter(MxS32 p_modelPresenterConfig);
 
 	// FUNCTION: LEGO1 0x1000ccb0
-	inline const char* ClassName() const override // vtable+0xc
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f067c
 		return "LegoModelPresenter";
diff --git a/LEGO1/lego/legoomni/include/legonavcontroller.h b/LEGO1/lego/legoomni/include/legonavcontroller.h
index 5219c61a..5e251563 100644
--- a/LEGO1/lego/legoomni/include/legonavcontroller.h
+++ b/LEGO1/lego/legoomni/include/legonavcontroller.h
@@ -37,11 +37,11 @@ class LegoNavController : public MxCore {
 	);
 
 	LegoNavController();
-	virtual ~LegoNavController() override;            // vtable+0x0
-	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x4
+	virtual ~LegoNavController() override;            // vtable+0x00
+	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x04
 
 	// FUNCTION: LEGO1 0x10054b80
-	inline const char* ClassName() const override // vtable+0xc
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f66d8
 		return "LegoNavController";
diff --git a/LEGO1/lego/legoomni/include/legopalettepresenter.h b/LEGO1/lego/legoomni/include/legopalettepresenter.h
index 242c7bc0..04ee620b 100644
--- a/LEGO1/lego/legoomni/include/legopalettepresenter.h
+++ b/LEGO1/lego/legoomni/include/legopalettepresenter.h
@@ -10,10 +10,10 @@
 class LegoPalettePresenter : public MxVideoPresenter {
 public:
 	LegoPalettePresenter();
-	virtual ~LegoPalettePresenter() override; // vtable+0x0
+	virtual ~LegoPalettePresenter() override; // vtable+0x00
 
 	// FUNCTION: LEGO1 0x10079f30
-	inline const char* ClassName() const override // vtable+0xc
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f061c
 		return "LegoPalettePresenter";
diff --git a/LEGO1/lego/legoomni/include/legopartpresenter.h b/LEGO1/lego/legoomni/include/legopartpresenter.h
index 69d34e47..8f14633d 100644
--- a/LEGO1/lego/legoomni/include/legopartpresenter.h
+++ b/LEGO1/lego/legoomni/include/legopartpresenter.h
@@ -8,7 +8,7 @@
 class LegoPartPresenter : public MxMediaPresenter {
 public:
 	// FUNCTION: LEGO1 0x1000cf70
-	inline const char* ClassName() const override // vtable+0xc
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f05d8
 		return "LegoPartPresenter";
diff --git a/LEGO1/lego/legoomni/include/legopathactor.h b/LEGO1/lego/legoomni/include/legopathactor.h
index 2f0ce280..adc1c392 100644
--- a/LEGO1/lego/legoomni/include/legopathactor.h
+++ b/LEGO1/lego/legoomni/include/legopathactor.h
@@ -13,7 +13,7 @@ class LegoPathActor : public LegoActor {
 	virtual ~LegoPathActor() override;
 
 	// FUNCTION: LEGO1 0x1000c430
-	inline const char* ClassName() const override // vtable+0xc
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f0114
 		return "LegoPathActor";
diff --git a/LEGO1/lego/legoomni/include/legopathcontroller.h b/LEGO1/lego/legoomni/include/legopathcontroller.h
index ada96e7e..d4c7163b 100644
--- a/LEGO1/lego/legoomni/include/legopathcontroller.h
+++ b/LEGO1/lego/legoomni/include/legopathcontroller.h
@@ -13,7 +13,7 @@ class LegoPathController : public MxCore {
 	virtual MxResult Tickle() override; // vtable+08
 
 	// FUNCTION: LEGO1 0x10045110
-	inline const char* ClassName() const override // vtable+0xc
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f11b8
 		return "LegoPathController";
diff --git a/LEGO1/lego/legoomni/include/legopathpresenter.h b/LEGO1/lego/legoomni/include/legopathpresenter.h
index 792b99eb..ab66a5df 100644
--- a/LEGO1/lego/legoomni/include/legopathpresenter.h
+++ b/LEGO1/lego/legoomni/include/legopathpresenter.h
@@ -11,7 +11,7 @@ class LegoPathPresenter : public MxMediaPresenter {
 	virtual ~LegoPathPresenter() override;
 
 	// FUNCTION: LEGO1 0x100449a0
-	inline const char* ClassName() const override // vtable+0xc
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f0690
 		return "LegoPathPresenter";
diff --git a/LEGO1/lego/legoomni/include/legophonemepresenter.h b/LEGO1/lego/legoomni/include/legophonemepresenter.h
index b5aa3616..2a2ec497 100644
--- a/LEGO1/lego/legoomni/include/legophonemepresenter.h
+++ b/LEGO1/lego/legoomni/include/legophonemepresenter.h
@@ -11,10 +11,10 @@
 class LegoPhonemePresenter : public MxFlcPresenter {
 public:
 	LegoPhonemePresenter();
-	virtual ~LegoPhonemePresenter() override; // vtable+0x0
+	virtual ~LegoPhonemePresenter() override; // vtable+0x00
 
 	// FUNCTION: LEGO1 0x1004e310
-	inline const char* ClassName() const override // vtable+0xc
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f064c
 		return "LegoPhonemePresenter";
diff --git a/LEGO1/lego/legoomni/include/legoplantmanager.h b/LEGO1/lego/legoomni/include/legoplantmanager.h
index a47825f3..e1335e33 100644
--- a/LEGO1/lego/legoomni/include/legoplantmanager.h
+++ b/LEGO1/lego/legoomni/include/legoplantmanager.h
@@ -9,12 +9,12 @@
 class LegoPlantManager : public MxCore {
 public:
 	LegoPlantManager();
-	virtual ~LegoPlantManager() override; // vtable+0x0
+	virtual ~LegoPlantManager() override; // vtable+0x00
 
-	virtual MxResult Tickle() override; // vtable+0x8
+	virtual MxResult Tickle() override; // vtable+0x08
 
 	// FUNCTION: LEGO1 0x10026290
-	inline const char* ClassName() const override // vtable+0xc
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f318c
 		return "LegoPlantManager";
diff --git a/LEGO1/lego/legoomni/include/legopointofviewcontroller.h b/LEGO1/lego/legoomni/include/legopointofviewcontroller.h
index 99c213e2..27a58291 100644
--- a/LEGO1/lego/legoomni/include/legopointofviewcontroller.h
+++ b/LEGO1/lego/legoomni/include/legopointofviewcontroller.h
@@ -30,10 +30,10 @@ class LegoMouseController : public MxCore {
 	virtual void RightUp(int, int);   // vtable+0x28
 
 private:
-	BOOL m_isButtonDown; // 0x08
-	undefined4 m_unk0xc; // 0x0c
-	MxDouble m_buttonX;  // 0x10
-	MxDouble m_buttonY;  // 0x18
+	BOOL m_isButtonDown;  // 0x08
+	undefined4 m_unk0x0c; // 0x0c
+	MxDouble m_buttonX;   // 0x10
+	MxDouble m_buttonY;   // 0x18
 };
 
 // SYNTHETIC: LEGO1 0x100655b0
diff --git a/LEGO1/lego/legoomni/include/legorace.h b/LEGO1/lego/legoomni/include/legorace.h
index e3f9df88..1ebf015a 100644
--- a/LEGO1/lego/legoomni/include/legorace.h
+++ b/LEGO1/lego/legoomni/include/legorace.h
@@ -11,12 +11,12 @@
 class LegoRace : public LegoWorld {
 public:
 	LegoRace();
-	virtual ~LegoRace() override; // vtable+0x0
+	virtual ~LegoRace() override; // vtable+0x00
 
-	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x4
+	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x04
 
 	// FUNCTION: LEGO1 0x10015ba0
-	inline const char* ClassName() const override // vtable+0xc
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f07c4
 		return "LegoRace";
diff --git a/LEGO1/lego/legoomni/include/legoraceactor.h b/LEGO1/lego/legoomni/include/legoraceactor.h
index fc6c6a2d..40eb6ef6 100644
--- a/LEGO1/lego/legoomni/include/legoraceactor.h
+++ b/LEGO1/lego/legoomni/include/legoraceactor.h
@@ -8,7 +8,7 @@
 class LegoRaceActor : public LegoAnimActor {
 public:
 	// FUNCTION: LEGO1 0x10014af0
-	inline const char* ClassName() const override // vtable+0xc
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f0bf4
 		return "LegoRaceActor";
diff --git a/LEGO1/lego/legoomni/include/legoracecar.h b/LEGO1/lego/legoomni/include/legoracecar.h
index f080ba46..beb70632 100644
--- a/LEGO1/lego/legoomni/include/legoracecar.h
+++ b/LEGO1/lego/legoomni/include/legoracecar.h
@@ -11,7 +11,7 @@ class LegoRaceCar : public LegoCarRaceActor {
 	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x04
 
 	// FUNCTION: LEGO1 0x10014290
-	inline const char* ClassName() const override // vtable+0xc
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f0548
 		return "LegoRaceCar";
diff --git a/LEGO1/lego/legoomni/include/legovideomanager.h b/LEGO1/lego/legoomni/include/legovideomanager.h
index ce9963e4..42a065b9 100644
--- a/LEGO1/lego/legoomni/include/legovideomanager.h
+++ b/LEGO1/lego/legoomni/include/legovideomanager.h
@@ -25,7 +25,7 @@ class LegoVideoManager : public MxVideoManager {
 	void EnableFullScreenMovie(MxBool p_enable, MxBool p_scale);
 	void MoveCursor(MxS32 p_cursorX, MxS32 p_cursorY);
 
-	virtual MxResult Tickle() override; // vtable+0x8
+	virtual MxResult Tickle() override; // vtable+0x08
 	virtual void Destroy() override;    // vtable+0x18
 	virtual MxResult Create(MxVideoParam& p_videoParam, MxU32 p_frequencyMS, MxBool p_createThread)
 		override;                                                                          // vtable+0x2c
diff --git a/LEGO1/lego/legoomni/include/legoworld.h b/LEGO1/lego/legoomni/include/legoworld.h
index b6176067..7e995e73 100644
--- a/LEGO1/lego/legoomni/include/legoworld.h
+++ b/LEGO1/lego/legoomni/include/legoworld.h
@@ -33,10 +33,10 @@ class LegoWorld : public LegoEntity {
 	};
 
 	LegoWorld();
-	virtual ~LegoWorld() override; // vtable+0x0
+	virtual ~LegoWorld() override; // vtable+0x00
 
-	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x4
-	virtual MxResult Tickle() override;               // vtable+0x8
+	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x04
+	virtual MxResult Tickle() override;               // vtable+0x08
 
 	// FUNCTION: LEGO1 0x1001d690
 	inline virtual const char* ClassName() const override // vtable+0x0c
diff --git a/LEGO1/lego/legoomni/include/legoworldpresenter.h b/LEGO1/lego/legoomni/include/legoworldpresenter.h
index b1fcf90a..3d0fba37 100644
--- a/LEGO1/lego/legoomni/include/legoworldpresenter.h
+++ b/LEGO1/lego/legoomni/include/legoworldpresenter.h
@@ -8,7 +8,7 @@
 class LegoWorldPresenter : public LegoEntityPresenter {
 public:
 	LegoWorldPresenter();
-	virtual ~LegoWorldPresenter() override; // vtable+0x0
+	virtual ~LegoWorldPresenter() override; // vtable+0x00
 
 	static void configureLegoWorldPresenter(MxS32 p_legoWorldPresenterQuality);
 
diff --git a/LEGO1/lego/legoomni/include/mxbackgroundaudiomanager.h b/LEGO1/lego/legoomni/include/mxbackgroundaudiomanager.h
index bb75af8d..787484b0 100644
--- a/LEGO1/lego/legoomni/include/mxbackgroundaudiomanager.h
+++ b/LEGO1/lego/legoomni/include/mxbackgroundaudiomanager.h
@@ -54,8 +54,8 @@ class MxBackgroundAudioManager : public MxCore {
 	MxResult OpenMusic(MxAtomId& p_script);
 	void DestroyMusic();
 
-	MxBool m_musicEnabled; // 0x8
-	MxDSAction m_action1;  // 0xc
+	MxBool m_musicEnabled; // 0x08
+	MxDSAction m_action1;  // 0x0c
 	MxAudioPresenter* m_unk0xa0;
 	MxDSAction m_action2; // 0xa4
 	MxAudioPresenter* m_unk0x138;
diff --git a/LEGO1/lego/legoomni/include/mxtransitionmanager.h b/LEGO1/lego/legoomni/include/mxtransitionmanager.h
index 31c6f8f7..ab673b11 100644
--- a/LEGO1/lego/legoomni/include/mxtransitionmanager.h
+++ b/LEGO1/lego/legoomni/include/mxtransitionmanager.h
@@ -11,11 +11,11 @@
 class MxTransitionManager : public MxCore {
 public:
 	MxTransitionManager();
-	virtual ~MxTransitionManager() override; // vtable+0x0
+	virtual ~MxTransitionManager() override; // vtable+0x00
 
 	void SetWaitIndicator(MxVideoPresenter* p_waitIndicator);
 
-	virtual MxResult Tickle(); // vtable+0x8
+	virtual MxResult Tickle(); // vtable+0x08
 
 	// FUNCTION: LEGO1 0x1004b950
 	inline virtual const char* ClassName() const override // vtable+0x0c
diff --git a/LEGO1/lego/legoomni/include/pizza.h b/LEGO1/lego/legoomni/include/pizza.h
index 78eb4f75..b2679fd1 100644
--- a/LEGO1/lego/legoomni/include/pizza.h
+++ b/LEGO1/lego/legoomni/include/pizza.h
@@ -15,10 +15,10 @@ class Pizza : public IsleActor {
 	Pizza();
 	virtual ~Pizza() override;
 
-	virtual MxResult Tickle() override; // vtable+0x8
+	virtual MxResult Tickle() override; // vtable+0x08
 
 	// FUNCTION: LEGO1 0x10037f90
-	inline const char* ClassName() const // vtable+0xc
+	inline const char* ClassName() const // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f038c
 		return "Pizza";
diff --git a/LEGO1/lego/legoomni/include/pizzamissionstate.h b/LEGO1/lego/legoomni/include/pizzamissionstate.h
index 3987bd26..e8668544 100644
--- a/LEGO1/lego/legoomni/include/pizzamissionstate.h
+++ b/LEGO1/lego/legoomni/include/pizzamissionstate.h
@@ -6,9 +6,9 @@
 // SIZE 0x20
 struct PizzaMissionStateEntry {
 public:
-	undefined2 m_unk0x0;
+	undefined2 m_unk0x00;
 	MxU8 m_id;
-	undefined m_unk0x3[0x15];
+	undefined m_unk0x03[0x15];
 	MxU16 m_color;
 	undefined m_unk0x18[6];
 };
@@ -41,8 +41,8 @@ class PizzaMissionState : public LegoState {
 	PizzaMissionStateEntry* GetState(MxU8 p_id);
 
 protected:
-	undefined4 m_unk0x8;               // 0x08
-	undefined4 m_unk0xc;               // 0x0c
+	undefined4 m_unk0x08;              // 0x08
+	undefined4 m_unk0x0c;              // 0x0c
 	PizzaMissionStateEntry m_state[5]; // 0x10
 };
 
diff --git a/LEGO1/lego/legoomni/include/police.h b/LEGO1/lego/legoomni/include/police.h
index 0261cd49..cb82ee35 100644
--- a/LEGO1/lego/legoomni/include/police.h
+++ b/LEGO1/lego/legoomni/include/police.h
@@ -13,12 +13,12 @@
 class Police : public LegoWorld {
 public:
 	Police();
-	virtual ~Police() override; // vtable+0x0
+	virtual ~Police() override; // vtable+0x00
 
-	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x4
+	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x04
 
 	// FUNCTION: LEGO1 0x1005e1e0
-	inline virtual const char* ClassName() const override // vtable+0xc
+	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f0450
 		return "Police";
diff --git a/LEGO1/lego/legoomni/include/policeentity.h b/LEGO1/lego/legoomni/include/policeentity.h
index cdb89af6..490e35a3 100644
--- a/LEGO1/lego/legoomni/include/policeentity.h
+++ b/LEGO1/lego/legoomni/include/policeentity.h
@@ -8,7 +8,7 @@
 class PoliceEntity : public BuildingEntity {
 public:
 	// FUNCTION: LEGO1 0x1000ed60
-	inline virtual const char* ClassName() const override // vtable+0xc
+	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f0328
 		return "PoliceEntity";
diff --git a/LEGO1/lego/legoomni/include/policestate.h b/LEGO1/lego/legoomni/include/policestate.h
index bd73cdbd..33799092 100644
--- a/LEGO1/lego/legoomni/include/policestate.h
+++ b/LEGO1/lego/legoomni/include/policestate.h
@@ -30,8 +30,8 @@ class PoliceState : public LegoState {
 	// PoliceState::`scalar deleting destructor'
 
 private:
-	undefined4 m_unk0x8; // 0x8
-	undefined4 m_unk0xc; // 0xc
+	undefined4 m_unk0x08; // 0x08
+	undefined4 m_unk0x0c; // 0x0c
 };
 
 #endif // POLICESTATE_H
diff --git a/LEGO1/lego/legoomni/include/racecar.h b/LEGO1/lego/legoomni/include/racecar.h
index ddd4a9ac..596473b4 100644
--- a/LEGO1/lego/legoomni/include/racecar.h
+++ b/LEGO1/lego/legoomni/include/racecar.h
@@ -9,7 +9,7 @@
 class RaceCar : public IslePathActor {
 public:
 	RaceCar();
-	virtual ~RaceCar() override; // vtable+0x0
+	virtual ~RaceCar() override; // vtable+0x00
 
 	// FUNCTION: LEGO1 0x10028270
 	inline virtual const char* ClassName() const override // vtable+0x0c
diff --git a/LEGO1/lego/legoomni/include/racestate.h b/LEGO1/lego/legoomni/include/racestate.h
index 0104d7a4..3bbb86f6 100644
--- a/LEGO1/lego/legoomni/include/racestate.h
+++ b/LEGO1/lego/legoomni/include/racestate.h
@@ -6,8 +6,8 @@
 struct RaceStateEntry {
 public:
 	MxU8 m_id;
-	undefined m_unk0x1[1];
-	MxU16 m_unk0x2;
+	undefined m_unk0x01[1];
+	MxU16 m_unk0x02;
 	MxU16 m_color;
 };
 
diff --git a/LEGO1/lego/legoomni/include/radio.h b/LEGO1/lego/legoomni/include/radio.h
index 536b9a7b..4edf734f 100644
--- a/LEGO1/lego/legoomni/include/radio.h
+++ b/LEGO1/lego/legoomni/include/radio.h
@@ -32,7 +32,7 @@ class Radio : public MxCore {
 
 private:
 	RadioState* m_state; // 0x08
-	MxBool m_unk0xc;     // 0x0c
+	MxBool m_unk0x0c;    // 0x0c
 
 	void CreateRadioState();
 };
diff --git a/LEGO1/lego/legoomni/include/registrationbook.h b/LEGO1/lego/legoomni/include/registrationbook.h
index 53baeae9..d47dbf28 100644
--- a/LEGO1/lego/legoomni/include/registrationbook.h
+++ b/LEGO1/lego/legoomni/include/registrationbook.h
@@ -8,10 +8,10 @@
 class RegistrationBook : public LegoWorld {
 public:
 	RegistrationBook();
-	virtual ~RegistrationBook() override; // vtable+0x0
+	virtual ~RegistrationBook() override; // vtable+0x00
 
-	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x4
-	virtual MxResult Tickle() override;               // vtable+0x8
+	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x04
+	virtual MxResult Tickle() override;               // vtable+0x08
 
 	// FUNCTION: LEGO1 0x10076e10
 	inline virtual const char* ClassName() const override // vtable+0x0c
diff --git a/LEGO1/lego/legoomni/include/score.h b/LEGO1/lego/legoomni/include/score.h
index 2df0e37c..03d69eb8 100644
--- a/LEGO1/lego/legoomni/include/score.h
+++ b/LEGO1/lego/legoomni/include/score.h
@@ -12,8 +12,8 @@
 class Score : public LegoWorld {
 public:
 	Score();
-	virtual ~Score() override;                        // vtable+0x0
-	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x4
+	virtual ~Score() override;                        // vtable+0x00
+	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x04
 
 	// FUNCTION: LEGO1 0x100010c0
 	inline virtual const char* ClassName() const override // vtable+0x0c
diff --git a/LEGO1/lego/legoomni/include/scorestate.h b/LEGO1/lego/legoomni/include/scorestate.h
index ad8c26f7..5bc45c70 100644
--- a/LEGO1/lego/legoomni/include/scorestate.h
+++ b/LEGO1/lego/legoomni/include/scorestate.h
@@ -4,7 +4,7 @@
 #include "legostate.h"
 
 // VTABLE: LEGO1 0x100d53f8
-// SIZE 0xc
+// SIZE 0x0c
 class ScoreState : public LegoState {
 public:
 	// FUNCTION: LEGO1 0x1000de40
diff --git a/LEGO1/lego/legoomni/src/build/helicopter.cpp b/LEGO1/lego/legoomni/src/build/helicopter.cpp
index f5add3e0..0f099228 100644
--- a/LEGO1/lego/legoomni/src/build/helicopter.cpp
+++ b/LEGO1/lego/legoomni/src/build/helicopter.cpp
@@ -342,7 +342,7 @@ MxResult HelicopterSubclass::FUN_100040a0(Vector4& p_v, float p_f)
 {
 	MxU32 state = m_unk0x30;
 	if (state == 1) {
-		p_v.EqualsImpl(m_unk0x0.GetData());
+		p_v.EqualsImpl(m_unk0x00.GetData());
 		p_v[3] = acos(p_v[3]) * (1 - p_f) * 2.0;
 		return p_v.NormalizeQuaternion();
 	}
@@ -352,7 +352,7 @@ MxResult HelicopterSubclass::FUN_100040a0(Vector4& p_v, float p_f)
 		return p_v.NormalizeQuaternion();
 	}
 	else if (state == 3) {
-		double d1 = p_v.Dot(&m_unk0x0, &m_unk0x18), d2;
+		double d1 = p_v.Dot(&m_unk0x00, &m_unk0x18), d2;
 		if (d1 + 1 > 0.00001) {
 			if (1 - d1 > 0.00001) {
 				double d = acos(d1);
@@ -365,18 +365,18 @@ MxResult HelicopterSubclass::FUN_100040a0(Vector4& p_v, float p_f)
 				d2 = p_f;
 			}
 			for (MxS32 i = 0; i < 4; i++) {
-				p_v[i] = m_unk0x18[i] * d2 + m_unk0x0[i] * d1;
+				p_v[i] = m_unk0x18[i] * d2 + m_unk0x00[i] * d1;
 			}
 			return SUCCESS;
 		}
-		p_v[0] = -m_unk0x0[1];
-		p_v[1] = m_unk0x0[1];
-		p_v[2] = -m_unk0x0[3];
-		p_v[3] = m_unk0x0[2];
+		p_v[0] = -m_unk0x00[1];
+		p_v[1] = m_unk0x00[1];
+		p_v[2] = -m_unk0x00[3];
+		p_v[3] = m_unk0x00[2];
 		d1 = sin((1 - p_f) * 1.570796326794895);
 		d2 = sin(p_f * 1.570796326794895);
 		for (MxS32 i = 0; i < 3; i++) {
-			p_v[i] = m_unk0x0[i] * d1 + p_v[i] * d2;
+			p_v[i] = m_unk0x00[i] * d1 + p_v[i] * d2;
 		}
 		return SUCCESS;
 	}
diff --git a/LEGO1/lego/legoomni/src/build/legovehiclebuildstate.cpp b/LEGO1/lego/legoomni/src/build/legovehiclebuildstate.cpp
index a7b68529..f950c429 100644
--- a/LEGO1/lego/legoomni/src/build/legovehiclebuildstate.cpp
+++ b/LEGO1/lego/legoomni/src/build/legovehiclebuildstate.cpp
@@ -3,7 +3,7 @@
 #include "decomp.h"
 
 DECOMP_SIZE_ASSERT(LegoVehicleBuildState, 0x50); // 1000acd7
-DECOMP_SIZE_ASSERT(LegoVehicleBuildState::UnkStruct, 0xc);
+DECOMP_SIZE_ASSERT(LegoVehicleBuildState::UnkStruct, 0x0c);
 
 // FUNCTION: LEGO1 0x10017c00
 LegoVehicleBuildState::UnkStruct::UnkStruct()
diff --git a/LEGO1/lego/legoomni/src/common/animstate.cpp b/LEGO1/lego/legoomni/src/common/animstate.cpp
index c20841b7..c7665237 100644
--- a/LEGO1/lego/legoomni/src/common/animstate.cpp
+++ b/LEGO1/lego/legoomni/src/common/animstate.cpp
@@ -5,7 +5,7 @@ DECOMP_SIZE_ASSERT(AnimState, 0x1c);
 // FUNCTION: LEGO1 0x10064ff0
 AnimState::AnimState()
 {
-	m_unk0xc = 0;
+	m_unk0x0c = 0;
 	m_unk0x10 = NULL;
 	m_unk0x14 = 0;
 	m_unk0x18 = NULL;
diff --git a/LEGO1/lego/legoomni/src/common/gifmanager.cpp b/LEGO1/lego/legoomni/src/common/gifmanager.cpp
index cd485b11..821a97d2 100644
--- a/LEGO1/lego/legoomni/src/common/gifmanager.cpp
+++ b/LEGO1/lego/legoomni/src/common/gifmanager.cpp
@@ -47,7 +47,7 @@ void GifManager::FUN_10099cc0(GifData* p_data)
 	for (GifList::iterator it = m_list.begin(); it != m_list.end(); it++) {
 #endif
 		if (*it == p_data) {
-			// TODO: This is wrong, but what is at +0xc on the iterator?
+			// TODO: This is wrong, but what is at +0x0c on the iterator?
 			*it = NULL;
 
 			if (p_data->m_texture->Release() == TRUE) {
diff --git a/LEGO1/lego/legoomni/src/common/legogamestate.cpp b/LEGO1/lego/legoomni/src/common/legogamestate.cpp
index 87466e2b..af5e8dac 100644
--- a/LEGO1/lego/legoomni/src/common/legogamestate.cpp
+++ b/LEGO1/lego/legoomni/src/common/legogamestate.cpp
@@ -67,7 +67,7 @@ LegoGameState::LegoGameState()
 	SetROIHandlerFunction();
 
 	this->m_stateCount = 0;
-	this->m_unk0xc = 0;
+	this->m_unk0x0c = 0;
 	this->m_savePath = NULL;
 	this->m_unk0x424 = 0;
 	this->m_prevArea = 0;
@@ -131,7 +131,7 @@ MxResult LegoGameState::Save(MxULong p_slot)
 			fileStream.Write(&maybeVersion, 4);
 			fileStream.Write(&m_unk0x24, 2);
 			fileStream.Write(&m_unk0x10, 2);
-			fileStream.Write(&m_unk0xc, 1);
+			fileStream.Write(&m_unk0x0c, 1);
 
 			for (MxS32 i = 0; i < sizeof(g_colorSaveData) / sizeof(g_colorSaveData[0]); ++i) {
 				if (WriteVariable(&fileStream, variableTable, g_colorSaveData[i].m_targetName) == FAILURE)
diff --git a/LEGO1/lego/legoomni/src/hospital/ambulancemissionstate.cpp b/LEGO1/lego/legoomni/src/hospital/ambulancemissionstate.cpp
index eb74f64c..e99c3229 100644
--- a/LEGO1/lego/legoomni/src/hospital/ambulancemissionstate.cpp
+++ b/LEGO1/lego/legoomni/src/hospital/ambulancemissionstate.cpp
@@ -8,9 +8,9 @@ AmbulanceMissionState::AmbulanceMissionState()
 	m_unk0x10 = 0;
 	m_unk0x12 = 0;
 	m_unk0x14 = 0;
-	m_unk0x8 = 0;
+	m_unk0x08 = 0;
 	m_unk0x16 = 0;
-	m_unk0xc = 0;
+	m_unk0x0c = 0;
 	m_unk0x18 = 0;
 	m_color1 = 0;
 	m_color2 = 0;
diff --git a/LEGO1/lego/legoomni/src/hospital/hospitalstate.cpp b/LEGO1/lego/legoomni/src/hospital/hospitalstate.cpp
index 012d9c4a..326415d1 100644
--- a/LEGO1/lego/legoomni/src/hospital/hospitalstate.cpp
+++ b/LEGO1/lego/legoomni/src/hospital/hospitalstate.cpp
@@ -5,8 +5,8 @@ DECOMP_SIZE_ASSERT(HospitalState, 0x18)
 // FUNCTION: LEGO1 0x10076370
 HospitalState::HospitalState()
 {
-	this->m_unk0xc = 0;
-	this->m_unk0xe = 0;
+	this->m_unk0x0c = 0;
+	this->m_unk0x0e = 0;
 	this->m_unk0x10 = 0;
 	this->m_unk0x12 = 0;
 	this->m_unk0x14 = 0;
diff --git a/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp b/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp
index 4ca6dd79..651f06a6 100644
--- a/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp
+++ b/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp
@@ -133,7 +133,7 @@ MxLong Infocenter::Notify(MxParam& p_param)
 			StopBookAnimation();
 			m_bookAnimationTimer = 0;
 
-			if (m_infocenterState->GetUnknown0x74() == 0xc) {
+			if (m_infocenterState->GetUnknown0x74() == 0x0c) {
 				StartCredits();
 				m_infocenterState->SetUnknown0x74(0xd);
 			}
diff --git a/LEGO1/lego/legoomni/src/infocenter/score.cpp b/LEGO1/lego/legoomni/src/infocenter/score.cpp
index f1db49f2..181553d4 100644
--- a/LEGO1/lego/legoomni/src/infocenter/score.cpp
+++ b/LEGO1/lego/legoomni/src/infocenter/score.cpp
@@ -303,12 +303,12 @@ void Score::FillArea(MxU32 p_x, MxU32 p_y, MxS16 p_color)
 	data[0] = 0x11;
 	data[17] = 0x28;
 	data[18] = 0x28;
-	data[1] = 0xf;
+	data[1] = 0x0f;
 	MxU32 size = data[p_x + 14];
 	MxU8* ptr = data[p_x + 4] + data[p_y + 9] + m_surface;
 	MxS32 count = data[p_y + 19];
-	data[2] = 0x8;
-	data[3] = 0x5;
+	data[2] = 0x08;
+	data[3] = 0x05;
 	MxU32 value = data[p_color];
 	for (; count > 0; count--) {
 		memset(ptr++, value, size);
diff --git a/LEGO1/lego/legoomni/src/isle/radio.cpp b/LEGO1/lego/legoomni/src/isle/radio.cpp
index 993a12f0..c0182a1c 100644
--- a/LEGO1/lego/legoomni/src/isle/radio.cpp
+++ b/LEGO1/lego/legoomni/src/isle/radio.cpp
@@ -13,7 +13,7 @@ Radio::Radio()
 	NotificationManager()->Register(this);
 	ControlManager()->Register(this);
 
-	m_unk0xc = TRUE;
+	m_unk0x0c = TRUE;
 	CreateRadioState();
 }
 
@@ -33,8 +33,8 @@ MxLong Radio::Notify(MxParam& p_param)
 // FUNCTION: LEGO1 0x1002cdc0
 void Radio::Initialize(MxBool p_und)
 {
-	if (m_unk0xc != p_und) {
-		m_unk0xc = p_und;
+	if (m_unk0x0c != p_und) {
+		m_unk0x0c = p_und;
 		CreateRadioState();
 	}
 }
diff --git a/LEGO1/lego/legoomni/src/police/policestate.cpp b/LEGO1/lego/legoomni/src/police/policestate.cpp
index 6e026c79..87ce9ff8 100644
--- a/LEGO1/lego/legoomni/src/police/policestate.cpp
+++ b/LEGO1/lego/legoomni/src/police/policestate.cpp
@@ -7,8 +7,8 @@ DECOMP_SIZE_ASSERT(PoliceState, 0x10)
 // FUNCTION: LEGO1 0x1005e7c0
 PoliceState::PoliceState()
 {
-	m_unk0xc = 0;
-	m_unk0x8 = (rand() % 2 == 0) ? 501 : 500;
+	m_unk0x0c = 0;
+	m_unk0x08 = (rand() % 2 == 0) ? 501 : 500;
 }
 
 // FUNCTION: LEGO1 0x1005e990
@@ -19,11 +19,11 @@ MxResult PoliceState::VTable0x1c(LegoFile* p_legoFile)
 	}
 
 	if (p_legoFile->IsReadMode()) {
-		p_legoFile->Read(&m_unk0x8, sizeof(m_unk0x8));
+		p_legoFile->Read(&m_unk0x08, sizeof(m_unk0x08));
 	}
 	else {
-		undefined4 unk0x8 = m_unk0x8;
-		p_legoFile->Write(&unk0x8, sizeof(m_unk0x8));
+		undefined4 unk0x08 = m_unk0x08;
+		p_legoFile->Write(&unk0x08, sizeof(m_unk0x08));
 	}
 
 	return SUCCESS;
diff --git a/LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp b/LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp
index be04b444..f01d3ae1 100644
--- a/LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp
+++ b/LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp
@@ -202,8 +202,8 @@ void LegoAnimPresenter::EndAction()
 // FUNCTION: LEGO1 0x100a0b30
 LegoAnimClass::LegoAnimClass()
 {
-	m_unk0x8 = 0;
-	m_unk0xc = 0;
+	m_unk0x08 = 0;
+	m_unk0x0c = 0;
 	m_unk0x10 = 0;
 	m_unk0x14 = 0;
 }
diff --git a/LEGO1/lego/sources/misc/legoimage.cpp b/LEGO1/lego/sources/misc/legoimage.cpp
index 34d4978f..da3f04a0 100644
--- a/LEGO1/lego/sources/misc/legoimage.cpp
+++ b/LEGO1/lego/sources/misc/legoimage.cpp
@@ -4,7 +4,7 @@
 #include "legostorage.h"
 #include "memory.h"
 
-DECOMP_SIZE_ASSERT(LegoPaletteEntry, 0x3);
+DECOMP_SIZE_ASSERT(LegoPaletteEntry, 0x03);
 DECOMP_SIZE_ASSERT(LegoImage, 0x310);
 
 // FUNCTION: LEGO1 0x100994c0
diff --git a/LEGO1/lego/sources/misc/legoimage.h b/LEGO1/lego/sources/misc/legoimage.h
index 7990277e..d77a1439 100644
--- a/LEGO1/lego/sources/misc/legoimage.h
+++ b/LEGO1/lego/sources/misc/legoimage.h
@@ -5,7 +5,7 @@
 
 class LegoStorage;
 
-// SIZE 0x3
+// SIZE 0x03
 class LegoPaletteEntry {
 public:
 	LegoPaletteEntry();
diff --git a/LEGO1/lego/sources/misc/legostorage.cpp b/LEGO1/lego/sources/misc/legostorage.cpp
index 50621f73..d8749dc1 100644
--- a/LEGO1/lego/sources/misc/legostorage.cpp
+++ b/LEGO1/lego/sources/misc/legostorage.cpp
@@ -5,9 +5,9 @@
 #include <memory.h>
 #include <string.h>
 
-DECOMP_SIZE_ASSERT(LegoStorage, 0x8);
+DECOMP_SIZE_ASSERT(LegoStorage, 0x08);
 DECOMP_SIZE_ASSERT(LegoMemory, 0x10);
-DECOMP_SIZE_ASSERT(LegoFile, 0xc);
+DECOMP_SIZE_ASSERT(LegoFile, 0x0c);
 
 // FUNCTION: LEGO1 0x10099080
 LegoMemory::LegoMemory(void* p_buffer) : LegoStorage()
diff --git a/LEGO1/lego/sources/misc/legotexture.cpp b/LEGO1/lego/sources/misc/legotexture.cpp
index 8eb74bfe..1f8844ff 100644
--- a/LEGO1/lego/sources/misc/legotexture.cpp
+++ b/LEGO1/lego/sources/misc/legotexture.cpp
@@ -4,7 +4,7 @@
 #include "legoimage.h"
 #include "legostorage.h"
 
-DECOMP_SIZE_ASSERT(LegoTexture, 0x4);
+DECOMP_SIZE_ASSERT(LegoTexture, 0x04);
 
 // FUNCTION: LEGO1 0x10098fb0
 LegoTexture::LegoTexture()
diff --git a/LEGO1/lego/sources/misc/legotree.h b/LEGO1/lego/sources/misc/legotree.h
index 185c178f..3ee3d4e5 100644
--- a/LEGO1/lego/sources/misc/legotree.h
+++ b/LEGO1/lego/sources/misc/legotree.h
@@ -9,17 +9,17 @@
 class LegoStorage;
 
 // VTABLE: LEGO1 0x100db778
-// SIZE 0x4
+// SIZE 0x04
 class LegoTreeNodeData {
 public:
 	LegoTreeNodeData() {}
 	virtual ~LegoTreeNodeData() {}
 
 	// FUNCTION: LEGO1 0x10099fe0
-	virtual LegoResult Read(LegoStorage* p_storage) { return SUCCESS; } // vtable+0x4
+	virtual LegoResult Read(LegoStorage* p_storage) { return SUCCESS; } // vtable+0x04
 
 	// FUNCTION: LEGO1 0x10099ff0
-	virtual LegoResult Write(LegoStorage* p_storage) { return SUCCESS; } // vtable+0x8
+	virtual LegoResult Write(LegoStorage* p_storage) { return SUCCESS; } // vtable+0x08
 
 	// SYNTHETIC: LEGO1 0x1009a000
 	// LegoTreeNodeData::`scalar deleting destructor'
@@ -44,21 +44,21 @@ class LegoTreeNode {
 	// LegoTreeNode::`scalar deleting destructor'
 
 protected:
-	LegoTreeNodeData* m_data;  // 0x4
-	LegoU32 m_numChildren;     // 0x8
-	LegoTreeNode** m_children; // 0xc
+	LegoTreeNodeData* m_data;  // 0x04
+	LegoU32 m_numChildren;     // 0x08
+	LegoTreeNode** m_children; // 0x0c
 };
 
 // VTABLE: LEGO1 0x100db768
-// SIZE 0x8
+// SIZE 0x08
 class LegoTree {
 public:
 	LegoTree();
 	virtual ~LegoTree();
 	LegoTreeNode* GetRoot() { return m_root; }
 	void SetRoot(LegoTreeNode* p_root) { m_root = p_root; }
-	virtual LegoResult Read(LegoStorage* p_storage);  // vtable+0x4
-	virtual LegoResult Write(LegoStorage* p_storage); // vtable+0x8
+	virtual LegoResult Read(LegoStorage* p_storage);  // vtable+0x04
+	virtual LegoResult Write(LegoStorage* p_storage); // vtable+0x08
 
 	// SYNTHETIC: LEGO1 0x10099de0
 	// LegoTree::`scalar deleting destructor'
@@ -69,9 +69,9 @@ class LegoTree {
 	void Delete(LegoTreeNode* p_node);
 
 	// FUNCTION: LEGO1 0x10099f70
-	virtual LegoTreeNodeData* CreateData() { return new LegoTreeNodeData(); } // vtable+0xc
+	virtual LegoTreeNodeData* CreateData() { return new LegoTreeNodeData(); } // vtable+0x0c
 
-	LegoTreeNode* m_root; // 0x4
+	LegoTreeNode* m_root; // 0x04
 };
 
 #endif // __LEGOTREE_H
diff --git a/LEGO1/lego/sources/roi/legoroi.h b/LEGO1/lego/sources/roi/legoroi.h
index 6ac30b45..a750b949 100644
--- a/LEGO1/lego/sources/roi/legoroi.h
+++ b/LEGO1/lego/sources/roi/legoroi.h
@@ -19,7 +19,7 @@ class LegoROI : public ViewROI {
 public:
 	LegoROI(Tgl::Renderer* p_renderer, ViewLODList* p_lodList, int p_time);
 
-	virtual float IntrinsicImportance() const override; // vtable+0x4
+	virtual float IntrinsicImportance() const override; // vtable+0x04
 	// Note: Actually part of parent class (doesn't exist yet)
 	virtual void UpdateWorldBoundingVolumes() override; // vtable+0x18
 
diff --git a/LEGO1/omni/include/mxactionnotificationparam.h b/LEGO1/omni/include/mxactionnotificationparam.h
index 5628cf7b..1bd5feb3 100644
--- a/LEGO1/omni/include/mxactionnotificationparam.h
+++ b/LEGO1/omni/include/mxactionnotificationparam.h
@@ -47,12 +47,12 @@ class MxActionNotificationParam : public MxNotificationParam {
 	virtual MxNotificationParam* Clone() override
 	{
 		return new MxActionNotificationParam(this->m_type, this->m_sender, this->m_action, this->m_realloc);
-	}; // vtable+0x4
+	}; // vtable+0x04
 
 	inline MxDSAction* GetAction() { return m_action; }
 
 protected:
-	MxDSAction* m_action; // 0xc
+	MxDSAction* m_action; // 0x0c
 	MxBool m_realloc;     // 0x10
 };
 
@@ -70,7 +70,7 @@ class MxStartActionNotificationParam : public MxActionNotificationParam {
 	{
 	}
 
-	virtual MxNotificationParam* Clone() override; // vtable+0x4
+	virtual MxNotificationParam* Clone() override; // vtable+0x04
 };
 
 // VTABLE: LEGO1 0x100d8358
@@ -96,7 +96,7 @@ class MxEndActionNotificationParam : public MxActionNotificationParam {
 			this->m_action,
 			this->m_realloc
 		);
-	}; // vtable+0x4
+	}; // vtable+0x04
 };
 
 // VTABLE: LEGO1 0x100dc208
@@ -109,7 +109,7 @@ class MxType4NotificationParam : public MxActionNotificationParam {
 		m_unk0x14 = p_unk0x14;
 	}
 
-	virtual MxNotificationParam* Clone() override; // vtable+0x4
+	virtual MxNotificationParam* Clone() override; // vtable+0x04
 
 private:
 	MxPresenter* m_unk0x14; // 0x14
diff --git a/LEGO1/omni/include/mxbitmap.h b/LEGO1/omni/include/mxbitmap.h
index fe3e6682..764a304a 100644
--- a/LEGO1/omni/include/mxbitmap.h
+++ b/LEGO1/omni/include/mxbitmap.h
@@ -134,8 +134,8 @@ class MxBitmap : public MxCore {
 private:
 	MxResult ImportColorsToPalette(RGBQUAD*, MxPalette*);
 
-	MxBITMAPINFO* m_info;          // 0x8
-	BITMAPINFOHEADER* m_bmiHeader; // 0xc
+	MxBITMAPINFO* m_info;          // 0x08
+	BITMAPINFOHEADER* m_bmiHeader; // 0x0c
 	RGBQUAD* m_paletteData;        // 0x10
 	MxU8* m_data;                  // 0x14
 	MxBool m_isHighColor;          // 0x18
diff --git a/LEGO1/omni/include/mxcollection.h b/LEGO1/omni/include/mxcollection.h
index b0b4da88..58647ed4 100644
--- a/LEGO1/omni/include/mxcollection.h
+++ b/LEGO1/omni/include/mxcollection.h
@@ -20,8 +20,8 @@ class MxCollection : public MxCore {
 	virtual MxS8 Compare(T, T) { return 0; }
 
 protected:
-	MxU32 m_count;                 // 0x8
-	void (*m_customDestructor)(T); // 0xc
+	MxU32 m_count;                 // 0x08
+	void (*m_customDestructor)(T); // 0x0c
 };
 
 #endif // MXCOLLECTION_H
diff --git a/LEGO1/omni/include/mxcompositepresenter.h b/LEGO1/omni/include/mxcompositepresenter.h
index 33d00dc8..45ea1f4f 100644
--- a/LEGO1/omni/include/mxcompositepresenter.h
+++ b/LEGO1/omni/include/mxcompositepresenter.h
@@ -12,7 +12,7 @@ class MxCompositePresenterList : public list<MxPresenter*> {};
 class MxCompositePresenter : public MxPresenter {
 public:
 	MxCompositePresenter();
-	virtual ~MxCompositePresenter() override; // vtable+0x0
+	virtual ~MxCompositePresenter() override; // vtable+0x00
 
 	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x04
 
diff --git a/LEGO1/omni/include/mxcore.h b/LEGO1/omni/include/mxcore.h
index 632391bc..74ebbef0 100644
--- a/LEGO1/omni/include/mxcore.h
+++ b/LEGO1/omni/include/mxcore.h
@@ -9,7 +9,7 @@
 class MxParam;
 
 // VTABLE: LEGO1 0x100dc0f8
-// SIZE 0x8
+// SIZE 0x08
 class MxCore {
 public:
 	MxCore();
diff --git a/LEGO1/omni/include/mxdiskstreamcontroller.h b/LEGO1/omni/include/mxdiskstreamcontroller.h
index 52c0d8b4..c571882a 100644
--- a/LEGO1/omni/include/mxdiskstreamcontroller.h
+++ b/LEGO1/omni/include/mxdiskstreamcontroller.h
@@ -17,7 +17,7 @@ class MxDiskStreamController : public MxStreamController {
 	MxDiskStreamController();
 	virtual ~MxDiskStreamController() override;
 
-	virtual MxResult Tickle() override; // vtable+0x8
+	virtual MxResult Tickle() override; // vtable+0x08
 
 	// FUNCTION: LEGO1 0x100c7360
 	inline virtual const char* ClassName() const override // vtable+0x0c
diff --git a/LEGO1/omni/include/mxdschunk.h b/LEGO1/omni/include/mxdschunk.h
index 52806580..1933df93 100644
--- a/LEGO1/omni/include/mxdschunk.h
+++ b/LEGO1/omni/include/mxdschunk.h
@@ -61,8 +61,8 @@ class MxDSChunk : public MxCore {
 	// MxDSChunk::`scalar deleting destructor'
 
 protected:
-	MxU16 m_flags;    // 0x8
-	MxU32 m_objectId; // 0xc
+	MxU16 m_flags;    // 0x08
+	MxU32 m_objectId; // 0x0c
 	MxLong m_time;    // 0x10
 	MxU32 m_length;   // 0x14
 	MxU8* m_data;     // 0x18
diff --git a/LEGO1/omni/include/mxdsfile.h b/LEGO1/omni/include/mxdsfile.h
index c4de4820..4242fe0d 100644
--- a/LEGO1/omni/include/mxdsfile.h
+++ b/LEGO1/omni/include/mxdsfile.h
@@ -12,7 +12,7 @@
 class MxDSFile : public MxDSSource {
 public:
 	MxDSFile(const char* p_filename, MxULong p_skipReadingChunks);
-	virtual ~MxDSFile(); // vtable+0x0
+	virtual ~MxDSFile(); // vtable+0x00
 
 	// FUNCTION: LEGO1 0x100c0120
 	inline virtual const char* ClassName() const override // vtable+0x0c
diff --git a/LEGO1/omni/include/mxdsobject.h b/LEGO1/omni/include/mxdsobject.h
index 5fa1d4fb..63f36975 100644
--- a/LEGO1/omni/include/mxdsobject.h
+++ b/LEGO1/omni/include/mxdsobject.h
@@ -68,8 +68,8 @@ class MxDSObject : public MxCore {
 	// MxDSObject::`scalar deleting destructor'
 
 private:
-	MxU32 m_sizeOnDisk;     // 0x8
-	MxU16 m_type;           // 0xc
+	MxU32 m_sizeOnDisk;     // 0x08
+	MxU16 m_type;           // 0x0c
 	char* m_sourceName;     // 0x10
 	undefined4 m_unk0x14;   // 0x14
 	char* m_objectName;     // 0x18
diff --git a/LEGO1/omni/include/mxentity.h b/LEGO1/omni/include/mxentity.h
index e78d3b2b..60f24c56 100644
--- a/LEGO1/omni/include/mxentity.h
+++ b/LEGO1/omni/include/mxentity.h
@@ -18,7 +18,7 @@ class MxEntity : public MxCore {
 	virtual ~MxEntity() override{};
 
 	// FUNCTION: LEGO1 0x1000c180
-	inline virtual const char* ClassName() const override // vtable+0xc
+	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f0070
 		return "MxEntity";
@@ -52,8 +52,8 @@ class MxEntity : public MxCore {
 	// MxEntity::`scalar deleting destructor'
 
 protected:
-	MxS32 m_mxEntityId; // 0x8
-	MxAtomId m_atom;    // 0xc
+	MxS32 m_mxEntityId; // 0x08
+	MxAtomId m_atom;    // 0x0c
 };
 
 #endif // MXENTITY_H
diff --git a/LEGO1/omni/include/mxeventpresenter.h b/LEGO1/omni/include/mxeventpresenter.h
index 52d503df..06599693 100644
--- a/LEGO1/omni/include/mxeventpresenter.h
+++ b/LEGO1/omni/include/mxeventpresenter.h
@@ -12,7 +12,7 @@ class MxEventPresenter : public MxMediaPresenter {
 	virtual ~MxEventPresenter() override;
 
 	// FUNCTION: LEGO1 0x100c2c30
-	inline virtual const char* ClassName() const override // vtable+0xc
+	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x10101dcc
 		return "MxEventPresenter";
diff --git a/LEGO1/omni/include/mxflcpresenter.h b/LEGO1/omni/include/mxflcpresenter.h
index c8f9854d..2c4063f9 100644
--- a/LEGO1/omni/include/mxflcpresenter.h
+++ b/LEGO1/omni/include/mxflcpresenter.h
@@ -20,7 +20,7 @@ class MxFlcPresenter : public MxVideoPresenter {
 	}
 
 	// FUNCTION: LEGO1 0x100b33f0
-	inline virtual const char* ClassName() const override // vtable+0xc
+	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f43c8
 		return "MxFlcPresenter";
diff --git a/LEGO1/omni/include/mxloopingflcpresenter.h b/LEGO1/omni/include/mxloopingflcpresenter.h
index 7075332d..e9cfac1a 100644
--- a/LEGO1/omni/include/mxloopingflcpresenter.h
+++ b/LEGO1/omni/include/mxloopingflcpresenter.h
@@ -12,7 +12,7 @@ class MxLoopingFlcPresenter : public MxFlcPresenter {
 	virtual ~MxLoopingFlcPresenter() override;
 
 	// FUNCTION: LEGO1 0x100b4380
-	inline virtual const char* ClassName() const override // vtable+0xc
+	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x10101e20
 		return "MxLoopingFlcPresenter";
diff --git a/LEGO1/omni/include/mxloopingmidipresenter.h b/LEGO1/omni/include/mxloopingmidipresenter.h
index e47ef30d..81ccab74 100644
--- a/LEGO1/omni/include/mxloopingmidipresenter.h
+++ b/LEGO1/omni/include/mxloopingmidipresenter.h
@@ -8,7 +8,7 @@
 class MxLoopingMIDIPresenter : public MxMIDIPresenter {
 public:
 	// FUNCTION: LEGO1 0x100b1830
-	inline virtual const char* ClassName() const override // vtable+0xc
+	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x10101de0
 		return "MxLoopingMIDIPresenter";
diff --git a/LEGO1/omni/include/mxloopingsmkpresenter.h b/LEGO1/omni/include/mxloopingsmkpresenter.h
index 9506de84..832b4263 100644
--- a/LEGO1/omni/include/mxloopingsmkpresenter.h
+++ b/LEGO1/omni/include/mxloopingsmkpresenter.h
@@ -9,10 +9,10 @@
 class MxLoopingSmkPresenter : public MxSmkPresenter {
 public:
 	MxLoopingSmkPresenter();
-	virtual ~MxLoopingSmkPresenter() override; // vtable+0x0
+	virtual ~MxLoopingSmkPresenter() override; // vtable+0x00
 
 	// FUNCTION: LEGO1 0x100b4920
-	inline virtual const char* ClassName() const override // vtable+0xc
+	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x10101e08
 		return "MxLoopingSmkPresenter";
diff --git a/LEGO1/omni/include/mxmediamanager.h b/LEGO1/omni/include/mxmediamanager.h
index 25853adf..d531e5c7 100644
--- a/LEGO1/omni/include/mxmediamanager.h
+++ b/LEGO1/omni/include/mxmediamanager.h
@@ -27,8 +27,8 @@ class MxMediaManager : public MxCore {
 	// MxMediaManager::`scalar deleting destructor'
 
 protected:
-	MxPresenterList* m_presenters;       // 0x8
-	MxThread* m_thread;                  // 0xc
+	MxPresenterList* m_presenters;       // 0x08
+	MxThread* m_thread;                  // 0x0c
 	MxCriticalSection m_criticalSection; // 0x10
 };
 
diff --git a/LEGO1/omni/include/mxmediapresenter.h b/LEGO1/omni/include/mxmediapresenter.h
index 954a2dcc..96d4d0ad 100644
--- a/LEGO1/omni/include/mxmediapresenter.h
+++ b/LEGO1/omni/include/mxmediapresenter.h
@@ -15,10 +15,10 @@ class MxMediaPresenter : public MxPresenter {
 	// FUNCTION: LEGO1 0x1000c550
 	virtual ~MxMediaPresenter() override { Destroy(TRUE); };
 
-	virtual MxResult Tickle() override; // vtable+0x8
+	virtual MxResult Tickle() override; // vtable+0x08
 
 	// FUNCTION: LEGO1 0x1000c5c0
-	inline virtual const char* ClassName() const override // vtable+0xc
+	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f074c
 		return "MxMediaPresenter";
diff --git a/LEGO1/omni/include/mxmidipresenter.h b/LEGO1/omni/include/mxmidipresenter.h
index 0bde447c..1abab9d1 100644
--- a/LEGO1/omni/include/mxmidipresenter.h
+++ b/LEGO1/omni/include/mxmidipresenter.h
@@ -12,7 +12,7 @@ class MxMIDIPresenter : public MxMusicPresenter {
 	virtual ~MxMIDIPresenter() override;
 
 	// FUNCTION: LEGO1 0x100c2650
-	inline virtual const char* ClassName() const override // vtable+0xc
+	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x10101df8
 		return "MxMIDIPresenter";
diff --git a/LEGO1/omni/include/mxmusicpresenter.h b/LEGO1/omni/include/mxmusicpresenter.h
index 88be5c7f..7b8948cd 100644
--- a/LEGO1/omni/include/mxmusicpresenter.h
+++ b/LEGO1/omni/include/mxmusicpresenter.h
@@ -11,7 +11,7 @@ class MxMusicPresenter : public MxAudioPresenter {
 	virtual ~MxMusicPresenter() override;
 
 	// FUNCTION: LEGO1 0x100c23a0
-	inline virtual const char* ClassName() const override // vtable+0xc
+	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x10101e48
 		return "MxMusicPresenter";
diff --git a/LEGO1/omni/include/mxnextactiondatastart.h b/LEGO1/omni/include/mxnextactiondatastart.h
index 3b58a338..de425989 100644
--- a/LEGO1/omni/include/mxnextactiondatastart.h
+++ b/LEGO1/omni/include/mxnextactiondatastart.h
@@ -16,7 +16,7 @@ class MxNextActionDataStart : public MxCore {
 	}
 
 	// FUNCTION: LEGO1 0x100c1900
-	inline virtual const char* ClassName() const override // vtable+0xc
+	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x101025a0
 		return "MxNextActionDataStart";
diff --git a/LEGO1/omni/include/mxnotificationmanager.h b/LEGO1/omni/include/mxnotificationmanager.h
index 4ed58f62..829473b8 100644
--- a/LEGO1/omni/include/mxnotificationmanager.h
+++ b/LEGO1/omni/include/mxnotificationmanager.h
@@ -16,8 +16,8 @@ class MxNotification {
 	inline MxNotificationParam* GetParam() { return m_param; }
 
 private:
-	MxCore* m_target;             // 0x0
-	MxNotificationParam* m_param; // 0x4
+	MxCore* m_target;             // 0x00
+	MxNotificationParam* m_param; // 0x04
 };
 
 class MxIdList : public list<MxU32> {};
@@ -27,8 +27,8 @@ class MxNotificationPtrList : public list<MxNotification*> {};
 // VTABLE: LEGO1 0x100dc078
 class MxNotificationManager : public MxCore {
 private:
-	MxNotificationPtrList* m_queue;    // 0x8
-	MxNotificationPtrList* m_sendList; // 0xc
+	MxNotificationPtrList* m_queue;    // 0x08
+	MxNotificationPtrList* m_sendList; // 0x0c
 	MxCriticalSection m_lock;          // 0x10
 	MxS32 m_unk0x2c;                   // 0x2c
 	MxIdList m_listenerIds;            // 0x30
@@ -36,9 +36,9 @@ class MxNotificationManager : public MxCore {
 
 public:
 	MxNotificationManager();
-	virtual ~MxNotificationManager(); // vtable+0x0 (scalar deleting destructor)
+	virtual ~MxNotificationManager(); // vtable+0x00 (scalar deleting destructor)
 
-	virtual MxResult Tickle(); // vtable+0x8
+	virtual MxResult Tickle(); // vtable+0x08
 	// TODO: Where does this method come from?
 	virtual MxResult Create(MxU32 p_frequencyMS, MxBool p_createThread); // vtable+0x14
 	void Register(MxCore* p_listener);
diff --git a/LEGO1/omni/include/mxnotificationparam.h b/LEGO1/omni/include/mxnotificationparam.h
index 2ec5cf19..ada00a35 100644
--- a/LEGO1/omni/include/mxnotificationparam.h
+++ b/LEGO1/omni/include/mxnotificationparam.h
@@ -42,7 +42,7 @@ class MxNotificationParam : public MxParam {
 	}
 
 	// FUNCTION: LEGO1 0x10010390
-	virtual MxNotificationParam* Clone() { return new MxNotificationParam(m_type, m_sender); }; // vtable+0x4
+	virtual MxNotificationParam* Clone() { return new MxNotificationParam(m_type, m_sender); }; // vtable+0x04
 
 	inline NotificationId GetNotification() const { return m_type; }
 	inline MxCore* GetSender() const { return m_sender; }
diff --git a/LEGO1/omni/include/mxobjectfactory.h b/LEGO1/omni/include/mxobjectfactory.h
index 4ae3e348..3f74f1c4 100644
--- a/LEGO1/omni/include/mxobjectfactory.h
+++ b/LEGO1/omni/include/mxobjectfactory.h
@@ -24,7 +24,7 @@ class MxObjectFactory : public MxCore {
 	MxObjectFactory();
 
 	// FUNCTION: LEGO1 0x10008f70
-	inline virtual const char* ClassName() const override // vtable+0xc
+	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f0730
 		return "MxObjectFactory";
diff --git a/LEGO1/omni/include/mxomni.h b/LEGO1/omni/include/mxomni.h
index 9ba344b7..99962f82 100644
--- a/LEGO1/omni/include/mxomni.h
+++ b/LEGO1/omni/include/mxomni.h
@@ -79,7 +79,7 @@ class MxOmni : public MxCore {
 protected:
 	static MxOmni* g_instance;
 
-	MxString m_mediaPath;                         // 0x8
+	MxString m_mediaPath;                         // 0x08
 	HWND m_windowHandle;                          // 0x18
 	MxObjectFactory* m_objectFactory;             // 0x1C
 	MxVariableTable* m_variableTable;             // 0x20
diff --git a/LEGO1/omni/include/mxpalette.h b/LEGO1/omni/include/mxpalette.h
index 9352950f..4a1eebf0 100644
--- a/LEGO1/omni/include/mxpalette.h
+++ b/LEGO1/omni/include/mxpalette.h
@@ -33,7 +33,7 @@ class MxPalette : public MxCore {
 
 private:
 	LPDIRECTDRAWPALETTE m_palette;
-	PALETTEENTRY m_entries[256]; // 0xc
+	PALETTEENTRY m_entries[256]; // 0x0c
 	MxBool m_overrideSkyColor;   // 0x40c
 	PALETTEENTRY m_skyColor;     // 0x40d
 };
diff --git a/LEGO1/omni/include/mxpresenter.h b/LEGO1/omni/include/mxpresenter.h
index 35a28eda..65beeb05 100644
--- a/LEGO1/omni/include/mxpresenter.h
+++ b/LEGO1/omni/include/mxpresenter.h
@@ -34,7 +34,7 @@ class MxPresenter : public MxCore {
 	virtual MxResult Tickle() override; // vtable+0x08
 
 	// FUNCTION: LEGO1 0x1000bfe0
-	inline virtual const char* ClassName() const override // vtable+0xc
+	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f0740
 		return "MxPresenter";
@@ -127,7 +127,7 @@ class MxPresenter : public MxCore {
 protected:
 	void Init();
 
-	TickleState m_currentTickleState;           // 0x8
+	TickleState m_currentTickleState;           // 0x08
 	MxU32 m_previousTickleStates;               // 0x0c
 	MxPoint32 m_location;                       // 0x10
 	MxS32 m_displayZ;                           // 0x18
diff --git a/LEGO1/omni/include/mxramstreamcontroller.h b/LEGO1/omni/include/mxramstreamcontroller.h
index 6b56ee49..00e1b06d 100644
--- a/LEGO1/omni/include/mxramstreamcontroller.h
+++ b/LEGO1/omni/include/mxramstreamcontroller.h
@@ -12,7 +12,7 @@ class MxRAMStreamController : public MxStreamController {
 	inline MxRAMStreamController() {}
 
 	// FUNCTION: LEGO1 0x100b9430
-	inline virtual const char* ClassName() const override // vtable+0xc
+	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x10102118
 		return "MxRAMStreamController";
diff --git a/LEGO1/omni/include/mxramstreamprovider.h b/LEGO1/omni/include/mxramstreamprovider.h
index f5ac0897..c994b848 100644
--- a/LEGO1/omni/include/mxramstreamprovider.h
+++ b/LEGO1/omni/include/mxramstreamprovider.h
@@ -11,7 +11,7 @@ class MxRAMStreamProvider : public MxStreamProvider {
 	virtual ~MxRAMStreamProvider() override;
 
 	// FUNCTION: LEGO1 0x100d0970
-	inline virtual const char* ClassName() const override // vtable+0xc
+	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x10102864
 		return "MxRAMStreamProvider";
diff --git a/LEGO1/omni/include/mxsmkpresenter.h b/LEGO1/omni/include/mxsmkpresenter.h
index eeb12945..b9dcc341 100644
--- a/LEGO1/omni/include/mxsmkpresenter.h
+++ b/LEGO1/omni/include/mxsmkpresenter.h
@@ -13,7 +13,7 @@ class MxSmkPresenter : public MxVideoPresenter {
 	virtual ~MxSmkPresenter() override;
 
 	// FUNCTION: LEGO1 0x100b3730
-	inline virtual const char* ClassName() const override // vtable+0xc
+	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x10101e38
 		return "MxSmkPresenter";
diff --git a/LEGO1/omni/include/mxsoundmanager.h b/LEGO1/omni/include/mxsoundmanager.h
index 5131e1e2..c0bec1bb 100644
--- a/LEGO1/omni/include/mxsoundmanager.h
+++ b/LEGO1/omni/include/mxsoundmanager.h
@@ -12,7 +12,7 @@
 class MxSoundManager : public MxAudioManager {
 public:
 	MxSoundManager();
-	virtual ~MxSoundManager() override; // vtable+0x0
+	virtual ~MxSoundManager() override; // vtable+0x00
 
 	virtual void Destroy() override;                                     // vtable+0x18
 	virtual void SetVolume(MxS32 p_volume) override;                     // vtable+0x2c
diff --git a/LEGO1/omni/include/mxstillpresenter.h b/LEGO1/omni/include/mxstillpresenter.h
index 7baf864d..09852493 100644
--- a/LEGO1/omni/include/mxstillpresenter.h
+++ b/LEGO1/omni/include/mxstillpresenter.h
@@ -14,7 +14,7 @@ class MxStillPresenter : public MxVideoPresenter {
 	virtual ~MxStillPresenter() override { Destroy(TRUE); }; // vtable+0x00
 
 	// FUNCTION: LEGO1 0x100435c0
-	inline virtual const char* ClassName() const override // vtable+0xc
+	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f0184
 		return "MxStillPresenter";
diff --git a/LEGO1/omni/include/mxstreamchunk.h b/LEGO1/omni/include/mxstreamchunk.h
index 5b9ecb64..baa5edda 100644
--- a/LEGO1/omni/include/mxstreamchunk.h
+++ b/LEGO1/omni/include/mxstreamchunk.h
@@ -15,7 +15,7 @@ class MxStreamChunk : public MxDSChunk {
 	virtual ~MxStreamChunk() override;
 
 	// FUNCTION: LEGO1 0x100b1fe0
-	inline virtual const char* ClassName() const override // vtable+0xc
+	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x10101e5c
 		return "MxStreamChunk";
diff --git a/LEGO1/omni/include/mxstreamcontroller.h b/LEGO1/omni/include/mxstreamcontroller.h
index 57caae8e..e6448947 100644
--- a/LEGO1/omni/include/mxstreamcontroller.h
+++ b/LEGO1/omni/include/mxstreamcontroller.h
@@ -19,10 +19,10 @@ class MxDSStreamingAction;
 class MxStreamController : public MxCore {
 public:
 	MxStreamController();
-	virtual ~MxStreamController() override; // vtable+0x0
+	virtual ~MxStreamController() override; // vtable+0x00
 
 	// FUNCTION: LEGO1 0x100c0f10
-	inline virtual const char* ClassName() const override // vtable+0xc
+	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x10102130
 		return "MxStreamController";
@@ -60,7 +60,7 @@ class MxStreamController : public MxCore {
 	inline MxStreamListMxDSSubscriber& GetSubscriberList() { return m_subscriberList; };
 
 protected:
-	MxCriticalSection m_criticalSection;                // 0x8
+	MxCriticalSection m_criticalSection;                // 0x08
 	MxAtomId m_atom;                                    // 0x24
 	MxStreamProvider* m_provider;                       // 0x28
 	undefined4* m_unk0x2c;                              // 0x2c
diff --git a/LEGO1/omni/include/mxstreamer.h b/LEGO1/omni/include/mxstreamer.h
index e0d07b19..86c8956e 100644
--- a/LEGO1/omni/include/mxstreamer.h
+++ b/LEGO1/omni/include/mxstreamer.h
@@ -76,12 +76,12 @@ class MxStreamer : public MxCore {
 	};
 
 	MxStreamer();
-	virtual ~MxStreamer() override; // vtable+0x0
+	virtual ~MxStreamer() override; // vtable+0x00
 
 	MxStreamController* Open(const char* p_name, MxU16 p_openMode);
 	MxLong Close(const char* p_name);
 
-	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x4
+	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x04
 
 	// FUNCTION: LEGO1 0x100b9000
 	inline virtual const char* ClassName() const override // vtable+0x0c
@@ -109,7 +109,7 @@ class MxStreamer : public MxCore {
 	inline const MxStreamerSubClass3& GetSubclass2() { return m_subclass2; }
 
 private:
-	list<MxStreamController*> m_openStreams; // 0x8
+	list<MxStreamController*> m_openStreams; // 0x08
 	MxStreamerSubClass2 m_subclass1;         // 0x14
 	MxStreamerSubClass3 m_subclass2;         // 0x20
 };
diff --git a/LEGO1/omni/include/mxstreamlist.h b/LEGO1/omni/include/mxstreamlist.h
index cbe53eae..08cee5bc 100644
--- a/LEGO1/omni/include/mxstreamlist.h
+++ b/LEGO1/omni/include/mxstreamlist.h
@@ -20,7 +20,7 @@ class MxStreamList : public list<T> {
 	}
 };
 
-// SIZE 0xc
+// SIZE 0x0c
 class MxStreamListMxDSAction : public MxStreamList<MxDSAction*> {
 public:
 	MxDSAction* Find(MxDSAction* p_action, MxBool p_delete);
@@ -38,14 +38,14 @@ class MxStreamListMxDSAction : public MxStreamList<MxDSAction*> {
 	}
 };
 
-// SIZE 0xc
+// SIZE 0x0c
 class MxStreamListMxNextActionDataStart : public MxStreamList<MxNextActionDataStart*> {
 public:
 	MxNextActionDataStart* Find(MxU32 p_id, MxS16 p_value);
 	MxNextActionDataStart* FindAndErase(MxU32 p_id, MxS16 p_value);
 };
 
-// SIZE 0xc
+// SIZE 0x0c
 class MxStreamListMxDSSubscriber : public MxStreamList<MxDSSubscriber*> {
 public:
 	MxDSSubscriber* Find(MxDSObject* p_object);
diff --git a/LEGO1/omni/include/mxticklemanager.h b/LEGO1/omni/include/mxticklemanager.h
index 6ebd655b..dba9b029 100644
--- a/LEGO1/omni/include/mxticklemanager.h
+++ b/LEGO1/omni/include/mxticklemanager.h
@@ -24,10 +24,10 @@ class MxTickleClient {
 	inline void SetFlags(MxU16 p_flags) { m_flags = p_flags; }
 
 private:
-	MxCore* m_client;        // 0x0
-	MxTime m_interval;       // 0x4
-	MxTime m_lastUpdateTime; // 0x8
-	MxU16 m_flags;           // 0xc
+	MxCore* m_client;        // 0x00
+	MxTime m_interval;       // 0x04
+	MxTime m_lastUpdateTime; // 0x08
+	MxU16 m_flags;           // 0x0c
 };
 
 typedef list<MxTickleClient*> MxTickleClientPtrList;
@@ -36,9 +36,9 @@ typedef list<MxTickleClient*> MxTickleClientPtrList;
 class MxTickleManager : public MxCore {
 public:
 	inline MxTickleManager() {}
-	virtual ~MxTickleManager(); // vtable+0x0 (scalar deleting destructor)
+	virtual ~MxTickleManager(); // vtable+0x00 (scalar deleting destructor)
 
-	virtual MxResult Tickle();                                                 // vtable+0x8
+	virtual MxResult Tickle();                                                 // vtable+0x08
 	virtual void RegisterClient(MxCore* p_client, MxTime p_interval);          // vtable+0x14
 	virtual void UnregisterClient(MxCore* p_client);                           // vtable+0x18
 	virtual void SetClientTickleInterval(MxCore* p_client, MxTime p_interval); // vtable+0x1c
@@ -48,7 +48,7 @@ class MxTickleManager : public MxCore {
 	// MxTickleManager::`scalar deleting destructor'
 
 private:
-	MxTickleClientPtrList m_clients; // 0x8
+	MxTickleClientPtrList m_clients; // 0x08
 };
 
 #define TICKLE_MANAGER_NOT_FOUND 0x80000000
diff --git a/LEGO1/omni/include/mxtype18notificationparam.h b/LEGO1/omni/include/mxtype18notificationparam.h
index bce896e3..589fd2bb 100644
--- a/LEGO1/omni/include/mxtype18notificationparam.h
+++ b/LEGO1/omni/include/mxtype18notificationparam.h
@@ -8,7 +8,7 @@
 // SIZE 0x10
 class MxType18NotificationParam : public MxNotificationParam {
 protected:
-	undefined4 m_unk0xc; // 0xc
+	undefined4 m_unk0x0c; // 0x0c
 };
 
 #endif // MXTYPE18NOTIFICATIONPARAM_H
diff --git a/LEGO1/omni/include/mxtype19notificationparam.h b/LEGO1/omni/include/mxtype19notificationparam.h
index ddd47998..51a6a713 100644
--- a/LEGO1/omni/include/mxtype19notificationparam.h
+++ b/LEGO1/omni/include/mxtype19notificationparam.h
@@ -8,8 +8,8 @@
 // SIZE 0x10
 class MxType19NotificationParam : public MxNotificationParam {
 protected:
-	MxU16 m_unk0xc; // 0xc
-	MxU8 m_unk0xe;  // 0xe
+	MxU16 m_unk0x0c; // 0x0c
+	MxU8 m_unk0x0e;  // 0x0e
 };
 
 #endif // MXTYPE19NOTIFICATIONPARAM_H
diff --git a/LEGO1/omni/include/mxvideomanager.h b/LEGO1/omni/include/mxvideomanager.h
index c4e26aa2..b2719529 100644
--- a/LEGO1/omni/include/mxvideomanager.h
+++ b/LEGO1/omni/include/mxvideomanager.h
@@ -16,7 +16,7 @@ class MxVideoManager : public MxMediaManager {
 	MxVideoManager();
 	virtual ~MxVideoManager() override;
 
-	virtual MxResult Tickle() override; // vtable+0x8
+	virtual MxResult Tickle() override; // vtable+0x08
 	virtual void Destroy() override;    // vtable+0x18
 	virtual MxResult VTable0x28(
 		MxVideoParam& p_videoParam,
diff --git a/LEGO1/omni/include/mxvideopresenter.h b/LEGO1/omni/include/mxvideopresenter.h
index 187435c8..b6483af9 100644
--- a/LEGO1/omni/include/mxvideopresenter.h
+++ b/LEGO1/omni/include/mxvideopresenter.h
@@ -13,7 +13,7 @@ class MxVideoPresenter : public MxMediaPresenter {
 	MxVideoPresenter() { Init(); }
 
 	// FUNCTION: LEGO1 0x1000c740
-	virtual ~MxVideoPresenter() override { Destroy(TRUE); }; // vtable+0x0
+	virtual ~MxVideoPresenter() override { Destroy(TRUE); }; // vtable+0x00
 
 	// FUNCTION: LEGO1 0x1000c820
 	inline virtual const char* ClassName() const override // vtable+0x0c
@@ -73,7 +73,7 @@ class MxVideoPresenter : public MxMediaPresenter {
 	virtual MxS32 GetHeight() { return m_alpha ? m_alpha->m_height : m_bitmap->GetBmiHeightAbs(); }; // vtable+0x84
 
 	// VTABLE: LEGO1 0x100dc2bc
-	// SIZE 0xc
+	// SIZE 0x0c
 	struct AlphaMask {
 		MxU8* m_bitmask;
 		MxU16 m_width;
diff --git a/LEGO1/omni/src/common/mxticklemanager.cpp b/LEGO1/omni/src/common/mxticklemanager.cpp
index 29f8428c..667902c8 100644
--- a/LEGO1/omni/src/common/mxticklemanager.cpp
+++ b/LEGO1/omni/src/common/mxticklemanager.cpp
@@ -5,7 +5,7 @@
 #include "mxtimer.h"
 #include "mxtypes.h"
 
-#define TICKLE_MANAGER_FLAG_DESTROY 0x1
+#define TICKLE_MANAGER_FLAG_DESTROY 0x01
 
 DECOMP_SIZE_ASSERT(MxTickleClient, 0x10);
 DECOMP_SIZE_ASSERT(MxTickleManager, 0x14);
diff --git a/LEGO1/omni/src/notify/mxnotificationmanager.cpp b/LEGO1/omni/src/notify/mxnotificationmanager.cpp
index 37eab387..9e4858df 100644
--- a/LEGO1/omni/src/notify/mxnotificationmanager.cpp
+++ b/LEGO1/omni/src/notify/mxnotificationmanager.cpp
@@ -8,7 +8,7 @@
 #include "mxticklemanager.h"
 #include "mxtypes.h"
 
-DECOMP_SIZE_ASSERT(MxNotification, 0x8);
+DECOMP_SIZE_ASSERT(MxNotification, 0x08);
 DECOMP_SIZE_ASSERT(MxNotificationManager, 0x40);
 
 // FUNCTION: LEGO1 0x100ac220
diff --git a/LEGO1/omni/src/notify/mxnotificationparam.cpp b/LEGO1/omni/src/notify/mxnotificationparam.cpp
index cb15a2df..cf5bf8b9 100644
--- a/LEGO1/omni/src/notify/mxnotificationparam.cpp
+++ b/LEGO1/omni/src/notify/mxnotificationparam.cpp
@@ -2,4 +2,4 @@
 
 #include "decomp.h"
 
-DECOMP_SIZE_ASSERT(MxNotificationParam, 0xc);
+DECOMP_SIZE_ASSERT(MxNotificationParam, 0x0c);
diff --git a/LEGO1/omni/src/stream/mxdschunk.cpp b/LEGO1/omni/src/stream/mxdschunk.cpp
index 61d794cc..fede0762 100644
--- a/LEGO1/omni/src/stream/mxdschunk.cpp
+++ b/LEGO1/omni/src/stream/mxdschunk.cpp
@@ -22,5 +22,5 @@ MxDSChunk::~MxDSChunk()
 // FUNCTION: LEGO1 0x100be1e0
 MxU32 MxDSChunk::GetHeaderSize()
 {
-	return 0xe;
+	return 0x0e;
 }
diff --git a/LEGO1/omni/src/stream/mxdsfile.cpp b/LEGO1/omni/src/stream/mxdsfile.cpp
index 3e03ad6e..33b85929 100644
--- a/LEGO1/omni/src/stream/mxdsfile.cpp
+++ b/LEGO1/omni/src/stream/mxdsfile.cpp
@@ -62,7 +62,7 @@ MxLong MxDSFile::ReadChunks()
 		return -1;
 	}
 
-	m_io.Read(&m_header, 0xc);
+	m_io.Read(&m_header, 0x0c);
 	if ((m_header.m_majorVersion == SI_MAJOR_VERSION) && (m_header.m_minorVersion == SI_MINOR_VERSION)) {
 		childChunk.ckid = FOURCC('M', 'x', 'O', 'f');
 		if (m_io.Descend(&childChunk, &topChunk, 0) != 0) {
diff --git a/LEGO1/omni/src/stream/mxstreamlist.cpp b/LEGO1/omni/src/stream/mxstreamlist.cpp
index 46e9841b..531d0446 100644
--- a/LEGO1/omni/src/stream/mxstreamlist.cpp
+++ b/LEGO1/omni/src/stream/mxstreamlist.cpp
@@ -1,9 +1,9 @@
 #include "mxstreamlist.h"
 
 // Wrappers around STL list that are used by the MxStream* classes.
-DECOMP_SIZE_ASSERT(MxStreamListMxDSAction, 0xc);
-DECOMP_SIZE_ASSERT(MxStreamListMxNextActionDataStart, 0xc);
-DECOMP_SIZE_ASSERT(MxStreamListMxDSSubscriber, 0xc);
+DECOMP_SIZE_ASSERT(MxStreamListMxDSAction, 0x0c);
+DECOMP_SIZE_ASSERT(MxStreamListMxNextActionDataStart, 0x0c);
+DECOMP_SIZE_ASSERT(MxStreamListMxDSSubscriber, 0x0c);
 
 // FUNCTION: LEGO1 0x100b8450
 MxDSSubscriber* MxStreamListMxDSSubscriber::Find(MxDSObject* p_object)
diff --git a/LEGO1/omni/src/video/mxvideopresenter.cpp b/LEGO1/omni/src/video/mxvideopresenter.cpp
index d1c59bad..546b7ea4 100644
--- a/LEGO1/omni/src/video/mxvideopresenter.cpp
+++ b/LEGO1/omni/src/video/mxvideopresenter.cpp
@@ -6,7 +6,7 @@
 #include "mxvideomanager.h"
 
 DECOMP_SIZE_ASSERT(MxVideoPresenter, 0x64);
-DECOMP_SIZE_ASSERT(MxVideoPresenter::AlphaMask, 0xc);
+DECOMP_SIZE_ASSERT(MxVideoPresenter::AlphaMask, 0x0c);
 
 // FUNCTION: LEGO1 0x100b24f0
 MxVideoPresenter::AlphaMask::AlphaMask(const MxBitmap& p_bitmap)
diff --git a/LEGO1/realtime/matrix.cpp b/LEGO1/realtime/matrix.cpp
index 806e6659..c1de1535 100644
--- a/LEGO1/realtime/matrix.cpp
+++ b/LEGO1/realtime/matrix.cpp
@@ -2,4 +2,4 @@
 
 #include "decomp.h"
 
-DECOMP_SIZE_ASSERT(Matrix4, 0x8);
+DECOMP_SIZE_ASSERT(Matrix4, 0x08);
diff --git a/LEGO1/realtime/matrix.h b/LEGO1/realtime/matrix.h
index 9a301a01..ea217c0c 100644
--- a/LEGO1/realtime/matrix.h
+++ b/LEGO1/realtime/matrix.h
@@ -10,7 +10,7 @@ struct UnknownMatrixType {
 };
 
 // VTABLE: LEGO1 0x100d4350
-// SIZE 0x8
+// SIZE 0x08
 class Matrix4 {
 public:
 	inline Matrix4(float (*p_data)[4]) { SetData(p_data); }
diff --git a/LEGO1/realtime/orientableroi.h b/LEGO1/realtime/orientableroi.h
index adbd493d..f218cdf4 100644
--- a/LEGO1/realtime/orientableroi.h
+++ b/LEGO1/realtime/orientableroi.h
@@ -16,8 +16,8 @@ class OrientableROI : public ROI {
 
 	OrientableROI();
 
-	virtual const float* GetWorldVelocity() const override;                // vtable+0x8
-	virtual const BoundingBox& GetWorldBoundingBox() const override;       // vtable+0xc
+	virtual const float* GetWorldVelocity() const override;                // vtable+0x08
+	virtual const BoundingBox& GetWorldBoundingBox() const override;       // vtable+0x0c
 	virtual const BoundingSphere& GetWorldBoundingSphere() const override; // vtable+0x10
 	// FUNCTION: LEGO1 0x100a5db0
 	virtual void VTable0x14() { VTable0x1c(); }                 // vtable+0x14
diff --git a/LEGO1/realtime/roi.h b/LEGO1/realtime/roi.h
index b5cbefa5..6f367c48 100644
--- a/LEGO1/realtime/roi.h
+++ b/LEGO1/realtime/roi.h
@@ -49,9 +49,9 @@ class LODObject {
 public:
 	// LODObject();
 	virtual ~LODObject() {}
-	virtual float Cost(float pixels_covered) const = 0; // vtable+0x4
-	virtual float AveragePolyArea() const = 0;          // vtable+0x8
-	virtual int NVerts() const = 0;                     // vtable+0xc
+	virtual float Cost(float pixels_covered) const = 0; // vtable+0x04
+	virtual float AveragePolyArea() const = 0;          // vtable+0x08
+	virtual int NVerts() const = 0;                     // vtable+0x0c
 };
 
 /*
@@ -81,7 +81,7 @@ class ROI {
 	{
 		m_comp = 0;
 		m_lods = 0;
-		m_unk0xc = 1;
+		m_unk0x0c = 1;
 	}
 	virtual ~ROI()
 	{
@@ -89,9 +89,9 @@ class ROI {
 		assert(!m_comp);
 		assert(!m_lods);
 	}
-	virtual float IntrinsicImportance() const = 0;                    // vtable+0x4
-	virtual const float* GetWorldVelocity() const = 0;                // vtable+0x8
-	virtual const BoundingBox& GetWorldBoundingBox() const = 0;       // vtable+0xc
+	virtual float IntrinsicImportance() const = 0;                    // vtable+0x04
+	virtual const float* GetWorldVelocity() const = 0;                // vtable+0x08
+	virtual const BoundingBox& GetWorldBoundingBox() const = 0;       // vtable+0x0c
 	virtual const BoundingSphere& GetWorldBoundingSphere() const = 0; // vtable+0x10
 
 	const LODListBase* GetLODs() const { return m_lods; }
@@ -103,15 +103,15 @@ class ROI {
 	int GetLODCount() const { return m_lods ? m_lods->Size() : 0; }
 	const CompoundObject* GetComp() const { return m_comp; }
 
-	inline undefined GetUnk0x0c() { return m_unk0xc; }
+	inline undefined GetUnk0x0c() { return m_unk0x0c; }
 
 	// SYNTHETIC: LEGO1 0x100a5d60
 	// ROI::`scalar deleting destructor'
 
 protected:
-	CompoundObject* m_comp; // 0x4
-	LODListBase* m_lods;    // 0x8
-	undefined m_unk0xc;     // 0xc
+	CompoundObject* m_comp; // 0x04
+	LODListBase* m_lods;    // 0x08
+	undefined m_unk0x0c;    // 0x0c
 };
 
 // SYNTHETIC: LEGO1 0x100a5d50
diff --git a/LEGO1/realtime/vector.cpp b/LEGO1/realtime/vector.cpp
index 57c93e66..ad09b0b0 100644
--- a/LEGO1/realtime/vector.cpp
+++ b/LEGO1/realtime/vector.cpp
@@ -2,6 +2,6 @@
 
 #include "decomp.h"
 
-DECOMP_SIZE_ASSERT(Vector2, 0x8);
-DECOMP_SIZE_ASSERT(Vector3, 0x8);
-DECOMP_SIZE_ASSERT(Vector4, 0x8);
+DECOMP_SIZE_ASSERT(Vector2, 0x08);
+DECOMP_SIZE_ASSERT(Vector3, 0x08);
+DECOMP_SIZE_ASSERT(Vector4, 0x08);
diff --git a/LEGO1/realtime/vector.h b/LEGO1/realtime/vector.h
index eb03d29d..91403ee8 100644
--- a/LEGO1/realtime/vector.h
+++ b/LEGO1/realtime/vector.h
@@ -263,7 +263,7 @@ class Vector3 : public Vector2 {
 };
 
 // VTABLE: LEGO1 0x100d45a0
-// SIZE 0x8
+// SIZE 0x08
 class Vector4 : public Vector3 {
 public:
 	inline Vector4(float* p_data) : Vector3(p_data) {}
diff --git a/LEGO1/tgl/d3drm/camera.cpp b/LEGO1/tgl/d3drm/camera.cpp
index 9e000ba8..c7bc06f9 100644
--- a/LEGO1/tgl/d3drm/camera.cpp
+++ b/LEGO1/tgl/d3drm/camera.cpp
@@ -2,8 +2,8 @@
 
 using namespace TglImpl;
 
-DECOMP_SIZE_ASSERT(Camera, 0x4);
-DECOMP_SIZE_ASSERT(CameraImpl, 0x8);
+DECOMP_SIZE_ASSERT(Camera, 0x04);
+DECOMP_SIZE_ASSERT(CameraImpl, 0x08);
 
 // FUNCTION: LEGO1 0x100a36f0
 void* CameraImpl::ImplementationDataPtr()
diff --git a/LEGO1/tgl/d3drm/light.cpp b/LEGO1/tgl/d3drm/light.cpp
index dfc23b44..0fe66bfb 100644
--- a/LEGO1/tgl/d3drm/light.cpp
+++ b/LEGO1/tgl/d3drm/light.cpp
@@ -2,8 +2,8 @@
 
 using namespace TglImpl;
 
-DECOMP_SIZE_ASSERT(Light, 0x4);
-DECOMP_SIZE_ASSERT(LightImpl, 0x8);
+DECOMP_SIZE_ASSERT(Light, 0x04);
+DECOMP_SIZE_ASSERT(LightImpl, 0x08);
 
 // FUNCTION: LEGO1 0x100a3770
 void* LightImpl::ImplementationDataPtr()
diff --git a/LEGO1/tgl/d3drm/mesh.cpp b/LEGO1/tgl/d3drm/mesh.cpp
index f044d512..ceaf7079 100644
--- a/LEGO1/tgl/d3drm/mesh.cpp
+++ b/LEGO1/tgl/d3drm/mesh.cpp
@@ -4,8 +4,8 @@ using namespace TglImpl;
 
 DECOMP_SIZE_ASSERT(D3DRMVERTEX, 0x24);
 
-DECOMP_SIZE_ASSERT(Mesh, 0x4);
-DECOMP_SIZE_ASSERT(MeshImpl, 0x8);
+DECOMP_SIZE_ASSERT(Mesh, 0x04);
+DECOMP_SIZE_ASSERT(MeshImpl, 0x08);
 
 // FUNCTION: LEGO1 0x100a3ed0
 void* MeshImpl::ImplementationDataPtr()
diff --git a/LEGO1/tgl/d3drm/unk.cpp b/LEGO1/tgl/d3drm/unk.cpp
index debc1484..038b0e9d 100644
--- a/LEGO1/tgl/d3drm/unk.cpp
+++ b/LEGO1/tgl/d3drm/unk.cpp
@@ -2,8 +2,8 @@
 
 using namespace TglImpl;
 
-DECOMP_SIZE_ASSERT(Unk, 0x4);
-DECOMP_SIZE_ASSERT(UnkImpl, 0x8);
+DECOMP_SIZE_ASSERT(Unk, 0x04);
+DECOMP_SIZE_ASSERT(UnkImpl, 0x08);
 
 // FUNCTION: LEGO1 0x100a3830
 void* UnkImpl::ImplementationDataPtr()

From baed704a384350b69dac0afe613174a15869c0c2 Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Mon, 29 Jan 2024 17:30:20 -0500
Subject: [PATCH 194/210] (clang-format) Add RemoveSemicolon (#506)

---
 .clang-format                                  |  1 +
 LEGO1/lego/legoomni/include/act1state.h        |  4 ++--
 LEGO1/lego/legoomni/include/gifmanager.h       |  2 +-
 LEGO1/lego/legoomni/include/helicopterstate.h  |  4 ++--
 .../include/legoactioncontrolpresenter.h       |  2 +-
 .../lego/legoomni/include/legocachesoundlist.h |  2 +-
 LEGO1/lego/legoomni/include/legoentitylist.h   |  2 +-
 .../include/legoeventnotificationparam.h       |  2 +-
 LEGO1/lego/legoomni/include/legoinputmanager.h |  2 +-
 LEGO1/lego/legoomni/include/legoomni.h         |  2 +-
 .../lego/legoomni/include/legopathcontroller.h |  2 +-
 LEGO1/lego/legoomni/include/legoworldlist.h    |  2 +-
 LEGO1/lego/legoomni/include/scorestate.h       |  4 ++--
 LEGO1/mxdirectx/mxdirect3d.h                   |  2 +-
 LEGO1/omni/include/mxactionnotificationparam.h |  4 ++--
 LEGO1/omni/include/mxatomidcounter.h           |  4 ++--
 LEGO1/omni/include/mxaudiomanager.h            |  2 +-
 LEGO1/omni/include/mxaudiopresenter.h          |  4 ++--
 LEGO1/omni/include/mxbitmap.h                  |  2 +-
 LEGO1/omni/include/mxcompositepresenter.h      |  2 +-
 LEGO1/omni/include/mxcore.h                    |  2 +-
 LEGO1/omni/include/mxdsmultiaction.h           |  2 +-
 LEGO1/omni/include/mxdsobject.h                |  4 ++--
 LEGO1/omni/include/mxentity.h                  |  2 +-
 LEGO1/omni/include/mxlist.h                    |  6 +++---
 LEGO1/omni/include/mxmediapresenter.h          |  4 ++--
 LEGO1/omni/include/mxnotificationparam.h       |  2 +-
 LEGO1/omni/include/mxomni.h                    |  2 +-
 LEGO1/omni/include/mxpresenter.h               | 18 +++++++++---------
 LEGO1/omni/include/mxpresenterlist.h           |  2 +-
 LEGO1/omni/include/mxrect32.h                  |  4 ++--
 LEGO1/omni/include/mxsoundpresenter.h          |  8 ++++----
 LEGO1/omni/include/mxstillpresenter.h          |  4 ++--
 LEGO1/omni/include/mxstreamcontroller.h        | 10 +++++-----
 LEGO1/omni/include/mxvariable.h                |  6 +++---
 LEGO1/omni/include/mxvideopresenter.h          | 12 ++++++------
 LEGO1/omni/include/mxwavepresenter.h           |  6 +++---
 LEGO1/realtime/matrix.h                        | 14 +++++++-------
 LEGO1/tgl/d3drm/impl.h                         |  2 +-
 39 files changed, 81 insertions(+), 80 deletions(-)

diff --git a/.clang-format b/.clang-format
index 19e35762..5d97094c 100644
--- a/.clang-format
+++ b/.clang-format
@@ -30,6 +30,7 @@ QualifierOrder:
   - const
   - volatile
   - type
+RemoveSemicolon: true
 SpaceAfterCStyleCast: true
 TabWidth: 4
 UseTab: ForContinuationAndIndentation
diff --git a/LEGO1/lego/legoomni/include/act1state.h b/LEGO1/lego/legoomni/include/act1state.h
index 62cbf98c..324d7195 100644
--- a/LEGO1/lego/legoomni/include/act1state.h
+++ b/LEGO1/lego/legoomni/include/act1state.h
@@ -14,13 +14,13 @@ class Act1State : public LegoState {
 	{
 		// STRING: LEGO1 0x100f0154
 		return "Act1State";
-	};
+	}
 
 	// FUNCTION: LEGO1 0x100338b0
 	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, Act1State::ClassName()) || LegoState::IsA(p_name);
-	};
+	}
 
 	virtual MxBool SetFlag() override;                          // vtable+0x18
 	virtual MxResult VTable0x1c(LegoFile* p_legoFile) override; // vtable+0x1c
diff --git a/LEGO1/lego/legoomni/include/gifmanager.h b/LEGO1/lego/legoomni/include/gifmanager.h
index 898ab1fb..1d424fb7 100644
--- a/LEGO1/lego/legoomni/include/gifmanager.h
+++ b/LEGO1/lego/legoomni/include/gifmanager.h
@@ -76,7 +76,7 @@ class GifManagerBase {
 // SIZE 0x24
 class GifManager : public GifManagerBase {
 public:
-	GifManager() { m_ownership = TRUE; };
+	GifManager() { m_ownership = TRUE; }
 	virtual ~GifManager() override;
 
 	// SYNTHETIC: LEGO1 0x1005a580
diff --git a/LEGO1/lego/legoomni/include/helicopterstate.h b/LEGO1/lego/legoomni/include/helicopterstate.h
index 186469ff..a1562157 100644
--- a/LEGO1/lego/legoomni/include/helicopterstate.h
+++ b/LEGO1/lego/legoomni/include/helicopterstate.h
@@ -22,14 +22,14 @@ class HelicopterState : public LegoState {
 	}
 
 	// FUNCTION: LEGO1 0x1000e0b0
-	virtual MxBool VTable0x14() override { return FALSE; }; // vtable+0x14
+	virtual MxBool VTable0x14() override { return FALSE; } // vtable+0x14
 
 	// FUNCTION: LEGO1 0x1000e0c0
 	virtual MxBool SetFlag() override
 	{
 		m_unk0x08 = 0;
 		return TRUE;
-	}; // vtable+0x18
+	} // vtable+0x18
 
 	inline void SetUnknown8(MxU32 p_unk0x08) { m_unk0x08 = p_unk0x08; }
 	inline MxU32 GetUnkown8() { return m_unk0x08; }
diff --git a/LEGO1/lego/legoomni/include/legoactioncontrolpresenter.h b/LEGO1/lego/legoomni/include/legoactioncontrolpresenter.h
index 0cc18935..633fc5eb 100644
--- a/LEGO1/lego/legoomni/include/legoactioncontrolpresenter.h
+++ b/LEGO1/lego/legoomni/include/legoactioncontrolpresenter.h
@@ -10,7 +10,7 @@
 class LegoActionControlPresenter : public MxMediaPresenter {
 public:
 	inline LegoActionControlPresenter() { m_unk0x50 = Extra::ActionType::e_none; }
-	virtual ~LegoActionControlPresenter() override { Destroy(TRUE); }; // vtable+0x00
+	virtual ~LegoActionControlPresenter() override { Destroy(TRUE); } // vtable+0x00
 
 	// FUNCTION: LEGO1 0x1000d0e0
 	inline virtual const char* ClassName() const override // vtable+0x0c
diff --git a/LEGO1/lego/legoomni/include/legocachesoundlist.h b/LEGO1/lego/legoomni/include/legocachesoundlist.h
index c97d578f..2080ae14 100644
--- a/LEGO1/lego/legoomni/include/legocachesoundlist.h
+++ b/LEGO1/lego/legoomni/include/legocachesoundlist.h
@@ -25,7 +25,7 @@ class LegoCacheSoundList : public MxPtrList<LegoCacheSound> {
 	virtual MxS8 Compare(LegoCacheSound* p_a, LegoCacheSound* p_b) override
 	{
 		return p_a == p_b ? 0 : p_a < p_b ? -1 : 1;
-	}; // vtable+0x14
+	} // vtable+0x14
 };
 
 // VTABLE: LEGO1 0x100d64a0
diff --git a/LEGO1/lego/legoomni/include/legoentitylist.h b/LEGO1/lego/legoomni/include/legoentitylist.h
index aa691da8..d1c1383f 100644
--- a/LEGO1/lego/legoomni/include/legoentitylist.h
+++ b/LEGO1/lego/legoomni/include/legoentitylist.h
@@ -25,7 +25,7 @@ class LegoEntityList : public MxPtrList<LegoEntity> {
 	virtual MxS8 Compare(LegoEntity* p_a, LegoEntity* p_b) override
 	{
 		return p_a == p_b ? 0 : p_a < p_b ? -1 : 1;
-	}; // vtable+0x14
+	} // vtable+0x14
 };
 
 // VTABLE: LEGO1 0x100d64e8
diff --git a/LEGO1/lego/legoomni/include/legoeventnotificationparam.h b/LEGO1/lego/legoomni/include/legoeventnotificationparam.h
index fea26d46..650ef8f6 100644
--- a/LEGO1/lego/legoomni/include/legoeventnotificationparam.h
+++ b/LEGO1/lego/legoomni/include/legoeventnotificationparam.h
@@ -18,7 +18,7 @@ class LegoEventNotificationParam : public MxNotificationParam {
 			new LegoEventNotificationParam(m_type, m_sender, m_modifier, m_x, m_y, m_key);
 		clone->m_roi = m_roi;
 		return clone;
-	}; // vtable+0x04
+	} // vtable+0x04
 
 	inline LegoEventNotificationParam() : MxNotificationParam(c_notificationType0, NULL) {}
 	inline LegoEventNotificationParam(
diff --git a/LEGO1/lego/legoomni/include/legoinputmanager.h b/LEGO1/lego/legoomni/include/legoinputmanager.h
index cd9b9d0d..e872eff6 100644
--- a/LEGO1/lego/legoomni/include/legoinputmanager.h
+++ b/LEGO1/lego/legoomni/include/legoinputmanager.h
@@ -78,7 +78,7 @@ class LegoInputManager : public MxPresenter {
 	virtual MxResult Tickle() override; // vtable+0x08
 
 	// FUNCTION: LEGO1 0x1005b8c0
-	virtual MxResult PutData() override { return SUCCESS; }; // vtable+0x4c
+	virtual MxResult PutData() override { return SUCCESS; } // vtable+0x4c
 
 	MxResult Create(HWND p_hwnd);
 	void Destroy();
diff --git a/LEGO1/lego/legoomni/include/legoomni.h b/LEGO1/lego/legoomni/include/legoomni.h
index 7a8ee7f0..f27bf140 100644
--- a/LEGO1/lego/legoomni/include/legoomni.h
+++ b/LEGO1/lego/legoomni/include/legoomni.h
@@ -126,7 +126,7 @@ class LegoOmni : public MxOmni {
 
 	inline void SetNavController(LegoNavController* p_navController) { m_navController = p_navController; }
 	inline void SetWorld(LegoWorld* p_currentWorld) { m_currentWorld = p_currentWorld; }
-	inline void SetExit(MxBool p_exit) { m_exit = p_exit; };
+	inline void SetExit(MxBool p_exit) { m_exit = p_exit; }
 
 	inline void CloseMainWindow() { PostMessageA(m_windowHandle, WM_CLOSE, 0, 0); }
 
diff --git a/LEGO1/lego/legoomni/include/legopathcontroller.h b/LEGO1/lego/legoomni/include/legopathcontroller.h
index d4c7163b..86298726 100644
--- a/LEGO1/lego/legoomni/include/legopathcontroller.h
+++ b/LEGO1/lego/legoomni/include/legopathcontroller.h
@@ -8,7 +8,7 @@
 class LegoPathController : public MxCore {
 public:
 	LegoPathController();
-	virtual ~LegoPathController() override { Destroy(); };
+	virtual ~LegoPathController() override { Destroy(); }
 
 	virtual MxResult Tickle() override; // vtable+08
 
diff --git a/LEGO1/lego/legoomni/include/legoworldlist.h b/LEGO1/lego/legoomni/include/legoworldlist.h
index 64849968..6467859c 100644
--- a/LEGO1/lego/legoomni/include/legoworldlist.h
+++ b/LEGO1/lego/legoomni/include/legoworldlist.h
@@ -25,7 +25,7 @@ class LegoWorldList : public MxPtrList<LegoWorld> {
 	virtual MxS8 Compare(LegoWorld* p_a, LegoWorld* p_b) override
 	{
 		return p_a == p_b ? 0 : p_a < p_b ? -1 : 1;
-	}; // vtable+0x14
+	} // vtable+0x14
 
 	// SYNTHETIC: LEGO1 0x10059a00
 	// LegoWorldList::`scalar deleting destructor'
diff --git a/LEGO1/lego/legoomni/include/scorestate.h b/LEGO1/lego/legoomni/include/scorestate.h
index 5bc45c70..e02c2e56 100644
--- a/LEGO1/lego/legoomni/include/scorestate.h
+++ b/LEGO1/lego/legoomni/include/scorestate.h
@@ -12,13 +12,13 @@ class ScoreState : public LegoState {
 	{
 		// STRING: LEGO1 0x100f0084
 		return "ScoreState";
-	};
+	}
 
 	// FUNCTION: LEGO1 0x1000de50
 	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, ScoreState::ClassName()) || LegoState::IsA(p_name);
-	};
+	}
 
 	virtual MxBool VTable0x14() override; // vtable+0x14
 	virtual MxBool SetFlag() override;    // vtable+0x18
diff --git a/LEGO1/mxdirectx/mxdirect3d.h b/LEGO1/mxdirectx/mxdirect3d.h
index 2d89ad39..4de9f058 100644
--- a/LEGO1/mxdirectx/mxdirect3d.h
+++ b/LEGO1/mxdirectx/mxdirect3d.h
@@ -62,7 +62,7 @@ class MxDirect3D : public MxDirectDraw {
 	DWORD GetZBufferBitDepth(MxAssignedDevice* p_assignedDevice);
 	BOOL SetDevice(MxDeviceEnumerate& p_deviceEnumerate, MxDriver* p_driver, MxDevice* p_device);
 
-	inline MxAssignedDevice* GetAssignedDevice() { return this->m_assignedDevice; };
+	inline MxAssignedDevice* GetAssignedDevice() { return this->m_assignedDevice; }
 	inline IDirect3D2* GetDirect3D() { return this->m_pDirect3d; }
 	inline IDirect3DDevice2* GetDirect3DDevice() { return this->m_pDirect3dDevice; }
 
diff --git a/LEGO1/omni/include/mxactionnotificationparam.h b/LEGO1/omni/include/mxactionnotificationparam.h
index 1bd5feb3..f53ac728 100644
--- a/LEGO1/omni/include/mxactionnotificationparam.h
+++ b/LEGO1/omni/include/mxactionnotificationparam.h
@@ -47,7 +47,7 @@ class MxActionNotificationParam : public MxNotificationParam {
 	virtual MxNotificationParam* Clone() override
 	{
 		return new MxActionNotificationParam(this->m_type, this->m_sender, this->m_action, this->m_realloc);
-	}; // vtable+0x04
+	} // vtable+0x04
 
 	inline MxDSAction* GetAction() { return m_action; }
 
@@ -96,7 +96,7 @@ class MxEndActionNotificationParam : public MxActionNotificationParam {
 			this->m_action,
 			this->m_realloc
 		);
-	}; // vtable+0x04
+	} // vtable+0x04
 };
 
 // VTABLE: LEGO1 0x100dc208
diff --git a/LEGO1/omni/include/mxatomidcounter.h b/LEGO1/omni/include/mxatomidcounter.h
index 79a98f34..4d8bfe38 100644
--- a/LEGO1/omni/include/mxatomidcounter.h
+++ b/LEGO1/omni/include/mxatomidcounter.h
@@ -25,8 +25,8 @@ class MxAtomIdCounter {
 
 	void Inc();
 	void Dec();
-	inline MxString* GetKey() { return &m_key; };
-	inline MxU16 GetValue() { return m_value; };
+	inline MxString* GetKey() { return &m_key; }
+	inline MxU16 GetValue() { return m_value; }
 
 private:
 	MxString m_key;
diff --git a/LEGO1/omni/include/mxaudiomanager.h b/LEGO1/omni/include/mxaudiomanager.h
index 94b5c4c9..d2b97d1a 100644
--- a/LEGO1/omni/include/mxaudiomanager.h
+++ b/LEGO1/omni/include/mxaudiomanager.h
@@ -15,7 +15,7 @@ class MxAudioManager : public MxMediaManager {
 	virtual void Destroy() override;            // vtable+18
 
 	// FUNCTION: LEGO1 0x10029910
-	virtual MxS32 GetVolume() { return this->m_volume; }; // vtable+28
+	virtual MxS32 GetVolume() { return this->m_volume; } // vtable+28
 
 	virtual void SetVolume(MxS32 p_volume); // vtable+2c
 
diff --git a/LEGO1/omni/include/mxaudiopresenter.h b/LEGO1/omni/include/mxaudiopresenter.h
index 82e4b48a..bf127d2b 100644
--- a/LEGO1/omni/include/mxaudiopresenter.h
+++ b/LEGO1/omni/include/mxaudiopresenter.h
@@ -24,10 +24,10 @@ class MxAudioPresenter : public MxMediaPresenter {
 	}
 
 	// FUNCTION: LEGO1 0x1000d260
-	virtual MxS32 GetVolume() { return m_volume; }; // vtable+0x5c
+	virtual MxS32 GetVolume() { return m_volume; } // vtable+0x5c
 
 	// FUNCTION: LEGO1 0x1000d270
-	virtual void SetVolume(MxS32 p_volume) { m_volume = p_volume; }; // vtable+0x60
+	virtual void SetVolume(MxS32 p_volume) { m_volume = p_volume; } // vtable+0x60
 
 protected:
 	MxS32 m_volume;
diff --git a/LEGO1/omni/include/mxbitmap.h b/LEGO1/omni/include/mxbitmap.h
index 764a304a..7045c01e 100644
--- a/LEGO1/omni/include/mxbitmap.h
+++ b/LEGO1/omni/include/mxbitmap.h
@@ -44,7 +44,7 @@ class MxBitmap : public MxCore {
 	virtual MxLong Read(const char* p_filename);                                           // vtable+24
 
 	// FUNCTION: LEGO1 0x1004e0d0
-	virtual int VTable0x28(int) { return -1; }; // vtable+28
+	virtual int VTable0x28(int) { return -1; } // vtable+28
 
 	virtual void BitBlt(
 		MxBitmap* p_src,
diff --git a/LEGO1/omni/include/mxcompositepresenter.h b/LEGO1/omni/include/mxcompositepresenter.h
index 45ea1f4f..066a9ae2 100644
--- a/LEGO1/omni/include/mxcompositepresenter.h
+++ b/LEGO1/omni/include/mxcompositepresenter.h
@@ -44,7 +44,7 @@ class MxCompositePresenter : public MxPresenter {
 		if (m_compositePresenter)
 			return m_compositePresenter->VTable0x64(p_undefined);
 		return TRUE;
-	}; // vtable+0x64
+	} // vtable+0x64
 
 protected:
 	MxCompositePresenterList m_list; // 0x40
diff --git a/LEGO1/omni/include/mxcore.h b/LEGO1/omni/include/mxcore.h
index 74ebbef0..dc167f2b 100644
--- a/LEGO1/omni/include/mxcore.h
+++ b/LEGO1/omni/include/mxcore.h
@@ -17,7 +17,7 @@ class MxCore {
 	virtual MxLong Notify(MxParam& p_param); // vtable+04
 
 	// FUNCTION: LEGO1 0x10001f70
-	virtual MxResult Tickle() { return SUCCESS; }; // vtable+08
+	virtual MxResult Tickle() { return SUCCESS; } // vtable+08
 
 	// FUNCTION: LEGO1 0x100144c0
 	inline virtual const char* ClassName() const // vtable+0c
diff --git a/LEGO1/omni/include/mxdsmultiaction.h b/LEGO1/omni/include/mxdsmultiaction.h
index efc1a11d..22a04feb 100644
--- a/LEGO1/omni/include/mxdsmultiaction.h
+++ b/LEGO1/omni/include/mxdsmultiaction.h
@@ -36,7 +36,7 @@ class MxDSMultiAction : public MxDSAction {
 	virtual MxBool HasId(MxU32 p_objectId) override;                     // vtable+34;
 	virtual void SetUnknown90(MxLong p_unk0x90) override;                // vtable+38;
 
-	inline MxDSActionList* GetActionList() const { return m_actions; };
+	inline MxDSActionList* GetActionList() const { return m_actions; }
 
 	// SYNTHETIC: LEGO1 0x100ca040
 	// MxDSMultiAction::`scalar deleting destructor'
diff --git a/LEGO1/omni/include/mxdsobject.h b/LEGO1/omni/include/mxdsobject.h
index 63f36975..9ede2f11 100644
--- a/LEGO1/omni/include/mxdsobject.h
+++ b/LEGO1/omni/include/mxdsobject.h
@@ -36,13 +36,13 @@ class MxDSObject : public MxCore {
 	void SetSourceName(const char* p_sourceName);
 
 	// FUNCTION: LEGO1 0x100bf730
-	inline virtual const char* ClassName() const override { return "MxDSObject"; }; // vtable+0c
+	inline virtual const char* ClassName() const override { return "MxDSObject"; } // vtable+0c
 
 	// FUNCTION: LEGO1 0x100bf740
 	inline virtual MxBool IsA(const char* p_name) const override
 	{
 		return !strcmp(p_name, MxDSObject::ClassName()) || MxCore::IsA(p_name);
-	}; // vtable+10;
+	} // vtable+10;
 
 	virtual undefined4 VTable0x14();                                                // vtable+14;
 	virtual MxU32 GetSizeOnDisk();                                                  // vtable+18;
diff --git a/LEGO1/omni/include/mxentity.h b/LEGO1/omni/include/mxentity.h
index 60f24c56..df36ea37 100644
--- a/LEGO1/omni/include/mxentity.h
+++ b/LEGO1/omni/include/mxentity.h
@@ -36,7 +36,7 @@ class MxEntity : public MxCore {
 		this->m_mxEntityId = p_id;
 		this->m_atom = p_atom;
 		return SUCCESS;
-	}; // vtable+0x14
+	} // vtable+0x14
 
 	inline MxResult Create(MxDSAction& p_dsAction)
 	{
diff --git a/LEGO1/omni/include/mxlist.h b/LEGO1/omni/include/mxlist.h
index 99330975..b25c1ce2 100644
--- a/LEGO1/omni/include/mxlist.h
+++ b/LEGO1/omni/include/mxlist.h
@@ -53,8 +53,8 @@ class MxList : protected MxCollection<T> {
 
 	virtual ~MxList() override;
 
-	void Append(T p_obj) { InsertEntry(p_obj, this->m_last, NULL); };
-	void Prepend(T p_obj) { InsertEntry(p_obj, NULL, this->m_first); };
+	void Append(T p_obj) { InsertEntry(p_obj, this->m_last, NULL); }
+	void Prepend(T p_obj) { InsertEntry(p_obj, NULL, this->m_first); }
 	void DeleteAll(MxBool p_destroy = TRUE);
 	MxU32 GetCount() { return this->m_count; }
 
@@ -75,7 +75,7 @@ class MxPtrList : public MxList<T*> {
 public:
 	MxPtrList(MxBool p_ownership) { SetOwnership(p_ownership); }
 
-	static void Destroy(T* p_obj) { delete p_obj; };
+	static void Destroy(T* p_obj) { delete p_obj; }
 
 	void SetOwnership(MxBool p_ownership)
 	{
diff --git a/LEGO1/omni/include/mxmediapresenter.h b/LEGO1/omni/include/mxmediapresenter.h
index 96d4d0ad..f73cf2bf 100644
--- a/LEGO1/omni/include/mxmediapresenter.h
+++ b/LEGO1/omni/include/mxmediapresenter.h
@@ -13,7 +13,7 @@ class MxMediaPresenter : public MxPresenter {
 	inline MxMediaPresenter() { Init(); }
 
 	// FUNCTION: LEGO1 0x1000c550
-	virtual ~MxMediaPresenter() override { Destroy(TRUE); };
+	virtual ~MxMediaPresenter() override { Destroy(TRUE); }
 
 	virtual MxResult Tickle() override; // vtable+0x08
 
@@ -35,7 +35,7 @@ class MxMediaPresenter : public MxPresenter {
 	virtual void DoneTickle() override;      // vtable+0x2c
 
 	// FUNCTION: LEGO1 0x1000c5b0
-	virtual void Destroy() override { Destroy(FALSE); }; // vtable+0x38
+	virtual void Destroy() override { Destroy(FALSE); } // vtable+0x38
 
 	virtual MxResult StartAction(MxStreamController*, MxDSAction*) override; // vtable+0x3c
 	virtual void EndAction() override;                                       // vtable+0x40
diff --git a/LEGO1/omni/include/mxnotificationparam.h b/LEGO1/omni/include/mxnotificationparam.h
index ada00a35..9fe01c18 100644
--- a/LEGO1/omni/include/mxnotificationparam.h
+++ b/LEGO1/omni/include/mxnotificationparam.h
@@ -42,7 +42,7 @@ class MxNotificationParam : public MxParam {
 	}
 
 	// FUNCTION: LEGO1 0x10010390
-	virtual MxNotificationParam* Clone() { return new MxNotificationParam(m_type, m_sender); }; // vtable+0x04
+	virtual MxNotificationParam* Clone() { return new MxNotificationParam(m_type, m_sender); } // vtable+0x04
 
 	inline NotificationId GetNotification() const { return m_type; }
 	inline MxCore* GetSender() const { return m_sender; }
diff --git a/LEGO1/omni/include/mxomni.h b/LEGO1/omni/include/mxomni.h
index 99962f82..a2092168 100644
--- a/LEGO1/omni/include/mxomni.h
+++ b/LEGO1/omni/include/mxomni.h
@@ -54,7 +54,7 @@ class MxOmni : public MxCore {
 	virtual void StopTimer();                                                                 // vtable+3c
 
 	// FUNCTION: LEGO1 0x10058a90
-	virtual MxBool IsTimerRunning() { return m_timerRunning; }; // vtable+40
+	virtual MxBool IsTimerRunning() { return m_timerRunning; } // vtable+40
 
 	static void SetInstance(MxOmni* p_instance);
 	static MxBool ActionSourceEquals(MxDSAction* p_action, const char* p_name);
diff --git a/LEGO1/omni/include/mxpresenter.h b/LEGO1/omni/include/mxpresenter.h
index 65beeb05..3d9dd355 100644
--- a/LEGO1/omni/include/mxpresenter.h
+++ b/LEGO1/omni/include/mxpresenter.h
@@ -60,17 +60,17 @@ class MxPresenter : public MxCore {
 	virtual void StartingTickle() { ProgressTickleState(e_streaming); } // vtable+0x1c
 
 	// FUNCTION: LEGO1 0x1000be80
-	virtual void StreamingTickle() { ProgressTickleState(e_repeating); }; // vtable+0x20
+	virtual void StreamingTickle() { ProgressTickleState(e_repeating); } // vtable+0x20
 
 	// FUNCTION: LEGO1 0x1000bea0
-	virtual void RepeatingTickle() { ProgressTickleState(e_unk5); }; // vtable+0x24
+	virtual void RepeatingTickle() { ProgressTickleState(e_unk5); } // vtable+0x24
 
 	// FUNCTION: LEGO1 0x1000bec0
-	virtual void Unk5Tickle() { ProgressTickleState(e_done); }; // vtable+0x28
+	virtual void Unk5Tickle() { ProgressTickleState(e_done); } // vtable+0x28
 
 protected:
 	// FUNCTION: LEGO1 0x1000bee0
-	virtual void DoneTickle() { ProgressTickleState(e_idle); }; // vtable+0x2c
+	virtual void DoneTickle() { ProgressTickleState(e_idle); } // vtable+0x2c
 
 	virtual void ParseExtra(); // vtable+0x30
 
@@ -82,10 +82,10 @@ class MxPresenter : public MxCore {
 
 public:
 	// FUNCTION: LEGO1 0x1000bf70
-	virtual MxResult AddToManager() { return SUCCESS; }; // vtable+0x34
+	virtual MxResult AddToManager() { return SUCCESS; } // vtable+0x34
 
 	// FUNCTION: LEGO1 0x1000bf80
-	virtual void Destroy() { Init(); }; // vtable+0x38
+	virtual void Destroy() { Init(); } // vtable+0x38
 
 	virtual MxResult StartAction(MxStreamController*, MxDSAction*); // vtable+0x3c
 	virtual void EndAction();                                       // vtable+0x40
@@ -97,13 +97,13 @@ class MxPresenter : public MxCore {
 	virtual MxBool HasTickleStatePassed(TickleState p_tickleState)
 	{
 		return m_previousTickleStates & (1 << (MxU8) p_tickleState);
-	}; // vtable+0x48
+	} // vtable+0x48
 
 	// FUNCTION: LEGO1 0x1000bfc0
-	virtual MxResult PutData() { return SUCCESS; }; // vtable+0x4c
+	virtual MxResult PutData() { return SUCCESS; } // vtable+0x4c
 
 	// FUNCTION: LEGO1 0x1000bfd0
-	virtual MxBool IsHit(MxS32 p_x, MxS32 p_y) { return FALSE; }; // vtable+0x50
+	virtual MxBool IsHit(MxS32 p_x, MxS32 p_y) { return FALSE; } // vtable+0x50
 
 	virtual void Enable(MxBool p_enable); // vtable+0x54
 
diff --git a/LEGO1/omni/include/mxpresenterlist.h b/LEGO1/omni/include/mxpresenterlist.h
index 8b22a18b..dd119621 100644
--- a/LEGO1/omni/include/mxpresenterlist.h
+++ b/LEGO1/omni/include/mxpresenterlist.h
@@ -17,7 +17,7 @@ class MxPresenterList : public MxPtrList<MxPresenter> {
 	virtual MxS8 Compare(MxPresenter* p_a, MxPresenter* p_b) override
 	{
 		return p_a == p_b ? 0 : p_a < p_b ? -1 : 1;
-	}; // vtable+0x14
+	} // vtable+0x14
 
 	// SYNTHETIC: LEGO1 0x1001ceb0
 	// MxPresenterList::`scalar deleting destructor'
diff --git a/LEGO1/omni/include/mxrect32.h b/LEGO1/omni/include/mxrect32.h
index b52a0c31..20e1706e 100644
--- a/LEGO1/omni/include/mxrect32.h
+++ b/LEGO1/omni/include/mxrect32.h
@@ -114,8 +114,8 @@ class MxRect32 {
 		return this;
 	}
 
-	inline static MxS32 Min(MxS32 p_a, MxS32 p_b) { return p_a <= p_b ? p_a : p_b; };
-	inline static MxS32 Max(MxS32 p_a, MxS32 p_b) { return p_a <= p_b ? p_b : p_a; };
+	inline static MxS32 Min(MxS32 p_a, MxS32 p_b) { return p_a <= p_b ? p_a : p_b; }
+	inline static MxS32 Max(MxS32 p_a, MxS32 p_b) { return p_a <= p_b ? p_b : p_a; }
 
 	MxS32 m_left;   // 0x00
 	MxS32 m_top;    // 0x04
diff --git a/LEGO1/omni/include/mxsoundpresenter.h b/LEGO1/omni/include/mxsoundpresenter.h
index 1949617f..4d1ab300 100644
--- a/LEGO1/omni/include/mxsoundpresenter.h
+++ b/LEGO1/omni/include/mxsoundpresenter.h
@@ -9,25 +9,25 @@
 class MxSoundPresenter : public MxAudioPresenter {
 public:
 	// FUNCTION: LEGO1 0x1000d430
-	virtual ~MxSoundPresenter() override { Destroy(TRUE); };
+	virtual ~MxSoundPresenter() override { Destroy(TRUE); }
 
 	// FUNCTION: LEGO1 0x1000d4a0
 	inline virtual const char* ClassName() const // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f07a0
 		return "MxSoundPresenter";
-	};
+	}
 
 	// FUNCTION: LEGO1 0x1000d4b0
 	inline virtual MxBool IsA(const char* p_name) const // vtable+0x10
 	{
 		return !strcmp(p_name, MxSoundPresenter::ClassName()) || MxAudioPresenter::IsA(p_name);
-	};
+	}
 
 	virtual MxResult AddToManager() override; // vtable+0x34
 
 	// FUNCTION: LEGO1 0x1000d490
-	virtual void Destroy() override { Destroy(FALSE); }; // vtable+0x38
+	virtual void Destroy() override { Destroy(FALSE); } // vtable+0x38
 
 	// SYNTHETIC: LEGO1 0x1000d5c0
 	// MxSoundPresenter::`scalar deleting destructor'
diff --git a/LEGO1/omni/include/mxstillpresenter.h b/LEGO1/omni/include/mxstillpresenter.h
index 09852493..a559b7e5 100644
--- a/LEGO1/omni/include/mxstillpresenter.h
+++ b/LEGO1/omni/include/mxstillpresenter.h
@@ -11,7 +11,7 @@ class MxStillPresenter : public MxVideoPresenter {
 	MxStillPresenter() { m_bitmapInfo = NULL; }
 
 	// FUNCTION: LEGO1 0x10043550
-	virtual ~MxStillPresenter() override { Destroy(TRUE); }; // vtable+0x00
+	virtual ~MxStillPresenter() override { Destroy(TRUE); } // vtable+0x00
 
 	// FUNCTION: LEGO1 0x100435c0
 	inline virtual const char* ClassName() const override // vtable+0x0c
@@ -32,7 +32,7 @@ class MxStillPresenter : public MxVideoPresenter {
 	virtual void ParseExtra() override;      // vtable+0x30
 
 	// FUNCTION: LEGO1 0x100435b0
-	virtual void Destroy() override { Destroy(FALSE); }; // vtable+0x38
+	virtual void Destroy() override { Destroy(FALSE); } // vtable+0x38
 
 	virtual void Enable(MxBool p_enable) override;            // vtable+0x54
 	virtual void LoadHeader(MxStreamChunk* p_chunk) override; // vtable+0x5c
diff --git a/LEGO1/omni/include/mxstreamcontroller.h b/LEGO1/omni/include/mxstreamcontroller.h
index e6448947..a23c2537 100644
--- a/LEGO1/omni/include/mxstreamcontroller.h
+++ b/LEGO1/omni/include/mxstreamcontroller.h
@@ -53,11 +53,11 @@ class MxStreamController : public MxCore {
 	MxResult InsertActionToList54(MxDSAction* p_action);
 	MxNextActionDataStart* FindNextActionDataStartFromStreamingAction(MxDSStreamingAction* p_action);
 
-	inline MxAtomId& GetAtom() { return m_atom; };
-	inline MxStreamProvider* GetProvider() { return m_provider; };
-	inline MxStreamListMxDSAction& GetUnk0x3c() { return m_unk0x3c; };
-	inline MxStreamListMxDSAction& GetUnk0x54() { return m_unk0x54; };
-	inline MxStreamListMxDSSubscriber& GetSubscriberList() { return m_subscriberList; };
+	inline MxAtomId& GetAtom() { return m_atom; }
+	inline MxStreamProvider* GetProvider() { return m_provider; }
+	inline MxStreamListMxDSAction& GetUnk0x3c() { return m_unk0x3c; }
+	inline MxStreamListMxDSAction& GetUnk0x54() { return m_unk0x54; }
+	inline MxStreamListMxDSSubscriber& GetSubscriberList() { return m_subscriberList; }
 
 protected:
 	MxCriticalSection m_criticalSection;                // 0x08
diff --git a/LEGO1/omni/include/mxvariable.h b/LEGO1/omni/include/mxvariable.h
index e09d449c..9b0a3816 100644
--- a/LEGO1/omni/include/mxvariable.h
+++ b/LEGO1/omni/include/mxvariable.h
@@ -22,13 +22,13 @@ class MxVariable {
 	}
 
 	// FUNCTION: LEGO1 0x1003bea0
-	virtual MxString* GetValue() { return &m_value; };
+	virtual MxString* GetValue() { return &m_value; }
 
 	// FUNCTION: LEGO1 0x1003beb0
-	virtual void SetValue(const char* p_value) { m_value = p_value; };
+	virtual void SetValue(const char* p_value) { m_value = p_value; }
 
 	// FUNCTION: LEGO1 0x1003bec0
-	virtual void Destroy() { delete this; };
+	virtual void Destroy() { delete this; }
 
 	inline const MxString* GetKey() const { return &m_key; }
 
diff --git a/LEGO1/omni/include/mxvideopresenter.h b/LEGO1/omni/include/mxvideopresenter.h
index b6483af9..d6ed46fa 100644
--- a/LEGO1/omni/include/mxvideopresenter.h
+++ b/LEGO1/omni/include/mxvideopresenter.h
@@ -13,7 +13,7 @@ class MxVideoPresenter : public MxMediaPresenter {
 	MxVideoPresenter() { Init(); }
 
 	// FUNCTION: LEGO1 0x1000c740
-	virtual ~MxVideoPresenter() override { Destroy(TRUE); }; // vtable+0x00
+	virtual ~MxVideoPresenter() override { Destroy(TRUE); } // vtable+0x00
 
 	// FUNCTION: LEGO1 0x1000c820
 	inline virtual const char* ClassName() const override // vtable+0x0c
@@ -36,7 +36,7 @@ class MxVideoPresenter : public MxMediaPresenter {
 	virtual MxResult AddToManager() override; // vtable+0x34
 
 	// FUNCTION: LEGO1 0x1000c7a0
-	virtual void Destroy() override { Destroy(FALSE); }; // vtable+0x38
+	virtual void Destroy() override { Destroy(FALSE); } // vtable+0x38
 
 	virtual void EndAction() override;                   // vtable+0x40
 	virtual MxResult PutData() override;                 // vtable+0x4c
@@ -61,16 +61,16 @@ class MxVideoPresenter : public MxMediaPresenter {
 	virtual undefined VTable0x74(); // vtable+0x74
 
 	// FUNCTION: LEGO1 0x1000c7b0
-	virtual LPDIRECTDRAWSURFACE VTable0x78() { return m_unk0x58; }; // vtable+0x78
+	virtual LPDIRECTDRAWSURFACE VTable0x78() { return m_unk0x58; } // vtable+0x78
 
 	// FUNCTION: LEGO1 0x1000c7c0
-	virtual MxBool VTable0x7c() { return (m_bitmap != NULL) || (m_alpha != NULL); }; // vtable+0x7c
+	virtual MxBool VTable0x7c() { return (m_bitmap != NULL) || (m_alpha != NULL); } // vtable+0x7c
 
 	// FUNCTION: LEGO1 0x1000c7e0
-	virtual MxS32 GetWidth() { return m_alpha ? m_alpha->m_width : m_bitmap->GetBmiWidth(); }; // vtable+0x80
+	virtual MxS32 GetWidth() { return m_alpha ? m_alpha->m_width : m_bitmap->GetBmiWidth(); } // vtable+0x80
 
 	// FUNCTION: LEGO1 0x1000c800
-	virtual MxS32 GetHeight() { return m_alpha ? m_alpha->m_height : m_bitmap->GetBmiHeightAbs(); }; // vtable+0x84
+	virtual MxS32 GetHeight() { return m_alpha ? m_alpha->m_height : m_bitmap->GetBmiHeightAbs(); } // vtable+0x84
 
 	// VTABLE: LEGO1 0x100dc2bc
 	// SIZE 0x0c
diff --git a/LEGO1/omni/include/mxwavepresenter.h b/LEGO1/omni/include/mxwavepresenter.h
index 289fa879..8976b458 100644
--- a/LEGO1/omni/include/mxwavepresenter.h
+++ b/LEGO1/omni/include/mxwavepresenter.h
@@ -13,7 +13,7 @@ class MxWavePresenter : public MxSoundPresenter {
 	MxWavePresenter() { Init(); }
 
 	// FUNCTION: LEGO1 0x1000d640
-	virtual ~MxWavePresenter() override { Destroy(TRUE); }; // vtable+0x00
+	virtual ~MxWavePresenter() override { Destroy(TRUE); } // vtable+0x00
 
 	// FUNCTION: LEGO1 0x1000d6c0
 	inline virtual const char* ClassName() const override // vtable+0x0c
@@ -36,7 +36,7 @@ class MxWavePresenter : public MxSoundPresenter {
 	virtual MxResult AddToManager() override; // vtable+0x34
 
 	// FUNCTION: LEGO1 0x1000d6a0
-	virtual void Destroy() override { Destroy(FALSE); }; // vtable+0x38
+	virtual void Destroy() override { Destroy(FALSE); } // vtable+0x38
 
 	virtual void EndAction() override;                       // vtable+0x40
 	virtual MxResult PutData() override;                     // vtable+0x4c
@@ -47,7 +47,7 @@ class MxWavePresenter : public MxSoundPresenter {
 	virtual void Resume();                                   // vtable+0x68
 
 	// FUNCTION: LEGO1 0x1000d6b0
-	virtual MxBool IsPaused() { return m_paused; }; // vtable+0x6c
+	virtual MxBool IsPaused() { return m_paused; } // vtable+0x6c
 
 	// SIZE 0x18
 	struct WaveFormat {
diff --git a/LEGO1/realtime/matrix.h b/LEGO1/realtime/matrix.h
index ea217c0c..edca5395 100644
--- a/LEGO1/realtime/matrix.h
+++ b/LEGO1/realtime/matrix.h
@@ -25,28 +25,28 @@ class Matrix4 {
 	virtual void Equals(const Matrix4& p_matrix)
 	{
 		memcpy(m_data, p_matrix.m_data, sizeof(float) * 4 * 4);
-	}; // vtable+0x00
+	} // vtable+0x00
 
 	// FUNCTION: LEGO1 0x10002360
 	virtual void SetData(float (*p_data)[4]) { m_data = p_data; } // vtable+0x0c
 
 	// FUNCTION: LEGO1 0x10002370
-	virtual void SetData(UnknownMatrixType& p_matrix) { m_data = p_matrix.m_data; }; // vtable+0x08
+	virtual void SetData(UnknownMatrixType& p_matrix) { m_data = p_matrix.m_data; } // vtable+0x08
 
 	// FUNCTION: LEGO1 0x10002380
-	virtual float (*GetData())[4] { return m_data; }; // vtable+0x14
+	virtual float (*GetData())[4] { return m_data; } // vtable+0x14
 
 	// FUNCTION: LEGO1 0x10002390
-	virtual float (*GetData() const)[4] { return m_data; }; // vtable+0x10
+	virtual float (*GetData() const)[4] { return m_data; } // vtable+0x10
 
 	// FUNCTION: LEGO1 0x100023a0
 	virtual float* Element(int p_row, int p_col) { return &m_data[p_row][p_col]; } // vtable+0x1c
 
 	// FUNCTION: LEGO1 0x100023c0
-	virtual const float* Element(int p_row, int p_col) const { return &m_data[p_row][p_col]; }; // vtable+0x18
+	virtual const float* Element(int p_row, int p_col) const { return &m_data[p_row][p_col]; } // vtable+0x18
 
 	// FUNCTION: LEGO1 0x100023e0
-	virtual void Clear() { memset(m_data, 0, 16 * sizeof(float)); }; // vtable+0x20
+	virtual void Clear() { memset(m_data, 0, 16 * sizeof(float)); } // vtable+0x20
 
 	// FUNCTION: LEGO1 0x100023f0
 	virtual void SetIdentity()
@@ -98,7 +98,7 @@ class Matrix4 {
 				cur++;
 			}
 		}
-	}; // vtable+0x3c
+	} // vtable+0x3c
 
 	// FUNCTION: LEGO1 0x10002530
 	virtual void Product(const Matrix4& p_a, const Matrix4& p_b) { Product(p_a.m_data, p_b.m_data); } // vtable+0x38
diff --git a/LEGO1/tgl/d3drm/impl.h b/LEGO1/tgl/d3drm/impl.h
index 614b5f60..002ee7e9 100644
--- a/LEGO1/tgl/d3drm/impl.h
+++ b/LEGO1/tgl/d3drm/impl.h
@@ -40,7 +40,7 @@ class UnkImpl;
 class RendererImpl : public Renderer {
 public:
 	RendererImpl() : m_data(0) {}
-	~RendererImpl() { Destroy(); };
+	~RendererImpl() { Destroy(); }
 
 	virtual void* ImplementationDataPtr() override;
 

From 743e042564bc6a9f44a0367b796e1ab169446161 Mon Sep 17 00:00:00 2001
From: Misha <106913236+MishaProductions@users.noreply.github.com>
Date: Mon, 29 Jan 2024 17:46:22 -0500
Subject: [PATCH 195/210] Finish MxControlPresenter (#505)

* Push changes

* fix order

* use MxBitmap::Start

* Fixes/changes

---------

Co-authored-by: Christian Semmler <mail@csemmler.com>
---
 .../legoomni/include/mxcontrolpresenter.h     |   5 +-
 .../src/control/mxcontrolpresenter.cpp        | 116 ++++++++++++++++--
 LEGO1/omni/include/mxcompositepresenter.h     |   2 +
 LEGO1/omni/include/mxutil.h                   |   3 +
 LEGO1/omni/include/mxvideopresenter.h         |   3 +-
 LEGO1/omni/src/common/mxutil.cpp              |  15 +++
 6 files changed, 133 insertions(+), 11 deletions(-)

diff --git a/LEGO1/lego/legoomni/include/mxcontrolpresenter.h b/LEGO1/lego/legoomni/include/mxcontrolpresenter.h
index 34b3082d..0903f557 100644
--- a/LEGO1/lego/legoomni/include/mxcontrolpresenter.h
+++ b/LEGO1/lego/legoomni/include/mxcontrolpresenter.h
@@ -5,6 +5,7 @@
 #include "mxcompositepresenter.h"
 
 class LegoControlManagerEvent;
+class MxVideoPresenter;
 
 // VTABLE: LEGO1 0x100d7b88
 // SIZE 0x5c
@@ -36,12 +37,12 @@ class MxControlPresenter : public MxCompositePresenter {
 	virtual void Enable(MxBool p_enable) override;                           // vtable+0x54
 	virtual MxBool VTable0x64(undefined4 p_undefined) override;              // vtable+0x64
 	virtual void VTable0x68(MxBool p_unk0x50);                               // vtable+0x68
-	virtual void VTable0x6c(undefined2);                                     // vtable+0x6c
+	virtual void VTable0x6c(MxS16);                                          // vtable+0x6c
 
 	MxBool FUN_10044480(LegoControlManagerEvent* p_event, MxPresenter* p_presenter);
 
 private:
-	MxBool FUN_10044270(MxS32 p_x, MxS32 p_y, MxPresenter* p_presenter);
+	MxBool FUN_10044270(MxS32 p_x, MxS32 p_y, MxVideoPresenter* p_presenter);
 	void FUN_10044540(undefined2);
 
 	undefined2 m_unk0x4c; // 0x4c
diff --git a/LEGO1/lego/legoomni/src/control/mxcontrolpresenter.cpp b/LEGO1/lego/legoomni/src/control/mxcontrolpresenter.cpp
index ad19bb94..ae0288f7 100644
--- a/LEGO1/lego/legoomni/src/control/mxcontrolpresenter.cpp
+++ b/LEGO1/lego/legoomni/src/control/mxcontrolpresenter.cpp
@@ -2,8 +2,11 @@
 
 #include "define.h"
 #include "legocontrolmanager.h"
+#include "mxdsmultiaction.h"
 #include "mxticklemanager.h"
+#include "mxtimer.h"
 #include "mxutil.h"
+#include "mxvideopresenter.h"
 
 DECOMP_SIZE_ASSERT(MxControlPresenter, 0x5c)
 
@@ -99,11 +102,90 @@ void MxControlPresenter::EndAction()
 	}
 }
 
-// STUB: LEGO1 0x10044270
-MxBool MxControlPresenter::FUN_10044270(MxS32 p_x, MxS32 p_y, MxPresenter* p_presenter)
+// FUNCTION: LEGO1 0x10044270
+MxBool MxControlPresenter::FUN_10044270(MxS32 p_x, MxS32 p_y, MxVideoPresenter* p_presenter)
 {
-	// TODO
-	return TRUE;
+	if (m_unk0x4c == 3) {
+		MxVideoPresenter* frontPresenter = (MxVideoPresenter*) m_list.front();
+
+		if (p_presenter == frontPresenter || frontPresenter->GetDisplayZ() < frontPresenter->GetDisplayZ()) {
+			if (p_presenter->VTable0x7c()) {
+				MxS32 height = frontPresenter->GetHeight();
+				MxS32 width = frontPresenter->GetWidth();
+
+				if (frontPresenter->GetLocation().GetX() <= p_x &&
+					p_x < width - 1 + frontPresenter->GetLocation().GetY() &&
+					frontPresenter->GetLocation().GetY() <= p_y &&
+					p_y < height - 1 + frontPresenter->GetLocation().GetY()) {
+					MxU8* start;
+
+					if (frontPresenter->GetAlphaMask() == NULL) {
+						start = frontPresenter->GetBitmap()->GetStart(
+							p_x - frontPresenter->GetLocation().GetX(),
+							p_y - frontPresenter->GetLocation().GetY()
+						);
+					}
+					else {
+						start = NULL;
+					}
+
+					m_unk0x56 = 0;
+					if (m_unk0x58 == NULL) {
+						if (*start != 0) {
+							m_unk0x56 = 1;
+						}
+					}
+					else {
+						for (MxS16 i = 1; i <= *m_unk0x58; i++) {
+							if (m_unk0x58[i] == *start) {
+								m_unk0x56 = i;
+								break;
+							}
+						}
+					}
+
+					if (m_unk0x56) {
+						return TRUE;
+					}
+				}
+			}
+		}
+	}
+	else {
+		if (ContainsPresenter(m_list, p_presenter)) {
+			if (m_unk0x4c == 2) {
+				MxS32 width = p_presenter->GetWidth();
+				MxS32 height = p_presenter->GetHeight();
+
+				if (m_unk0x52 == 2 && m_unk0x54 == 2) {
+					MxS16 val;
+					if (p_x < p_presenter->GetLocation().GetX() + width / 2) {
+						val = 3;
+						if (p_y < p_presenter->GetLocation().GetY() + height / 2) {
+							val = 1;
+						}
+						m_unk0x56 = val;
+						return TRUE;
+					}
+
+					val = 4;
+					if (p_y < p_presenter->GetLocation().GetY() + height / 2) {
+						val = 2;
+					}
+
+					m_unk0x56 = val;
+					return TRUE;
+				}
+			}
+			else {
+				m_unk0x56 = -1;
+			}
+
+			return TRUE;
+		}
+	}
+
+	return FALSE;
 }
 
 // FUNCTION: LEGO1 0x10044480
@@ -122,7 +204,7 @@ MxBool MxControlPresenter::FUN_10044480(LegoControlManagerEvent* p_event, MxPres
 			}
 			break;
 		case c_notificationButtonDown:
-			if (FUN_10044270(p_event->GetX(), p_event->GetY(), p_presenter)) {
+			if (FUN_10044270(p_event->GetX(), p_event->GetY(), (MxVideoPresenter*) p_presenter)) {
 				p_event->SetClickedObjectId(m_action->GetObjectId());
 				p_event->SetClickedAtom(m_action->GetAtomId().GetInternal());
 				VTable0x6c(m_unk0x56);
@@ -137,10 +219,28 @@ MxBool MxControlPresenter::FUN_10044480(LegoControlManagerEvent* p_event, MxPres
 	return FALSE;
 }
 
-// STUB: LEGO1 0x10044540
-void MxControlPresenter::VTable0x6c(undefined2)
+// FUNCTION: LEGO1 0x10044540
+void MxControlPresenter::VTable0x6c(MxS16 p_val)
 {
-	// TODO
+	if (p_val == -1) {
+		if ((MxS16) ((MxDSMultiAction*) m_action)->GetActionList()->GetCount() - m_unk0x4e == 1) {
+			m_unk0x4e = 0;
+		}
+		else {
+			m_unk0x4e++;
+		}
+	}
+	else {
+		m_unk0x4e = p_val;
+	}
+
+	m_action->SetUnknown90(Timer()->GetTime());
+
+	MxS16 i = 0;
+	for (MxCompositePresenterList::iterator it = m_list.begin(); it != m_list.end(); it++) {
+		(*it)->Enable((m_unk0x4c == 3 && m_unk0x4e == 0 || !IsEnabled()) ? FALSE : m_unk0x4e == i);
+		i++;
+	}
 }
 
 // FUNCTION: LEGO1 0x10044610
diff --git a/LEGO1/omni/include/mxcompositepresenter.h b/LEGO1/omni/include/mxcompositepresenter.h
index 066a9ae2..122778d6 100644
--- a/LEGO1/omni/include/mxcompositepresenter.h
+++ b/LEGO1/omni/include/mxcompositepresenter.h
@@ -46,6 +46,8 @@ class MxCompositePresenter : public MxPresenter {
 		return TRUE;
 	} // vtable+0x64
 
+	inline MxCompositePresenterList& GetList() { return m_list; }
+
 protected:
 	MxCompositePresenterList m_list; // 0x40
 };
diff --git a/LEGO1/omni/include/mxutil.h b/LEGO1/omni/include/mxutil.h
index e043ebd4..c85259bb 100644
--- a/LEGO1/omni/include/mxutil.h
+++ b/LEGO1/omni/include/mxutil.h
@@ -8,6 +8,8 @@
 class MxDSFile;
 class MxDSObject;
 class MxDSAction;
+class MxCompositePresenterList;
+class MxPresenter;
 
 template <class T>
 inline T Abs(T p_t)
@@ -71,6 +73,7 @@ MxBool GetRectIntersection(
 
 void MakeSourceName(char*, const char*);
 void SetOmniUserMessage(void (*)(const char*, int));
+MxBool ContainsPresenter(MxCompositePresenterList& p_presenterList, MxPresenter* p_presenter);
 void FUN_100b7220(MxDSAction* p_action, MxU32 p_newFlags, MxBool p_setFlags);
 MxDSObject* CreateStreamObject(MxDSFile*, MxS16);
 
diff --git a/LEGO1/omni/include/mxvideopresenter.h b/LEGO1/omni/include/mxvideopresenter.h
index d6ed46fa..2fc3b1f4 100644
--- a/LEGO1/omni/include/mxvideopresenter.h
+++ b/LEGO1/omni/include/mxvideopresenter.h
@@ -64,7 +64,7 @@ class MxVideoPresenter : public MxMediaPresenter {
 	virtual LPDIRECTDRAWSURFACE VTable0x78() { return m_unk0x58; } // vtable+0x78
 
 	// FUNCTION: LEGO1 0x1000c7c0
-	virtual MxBool VTable0x7c() { return (m_bitmap != NULL) || (m_alpha != NULL); } // vtable+0x7c
+	virtual MxBool VTable0x7c() { return m_bitmap != NULL || m_alpha != NULL; } // vtable+0x7c
 
 	// FUNCTION: LEGO1 0x1000c7e0
 	virtual MxS32 GetWidth() { return m_alpha ? m_alpha->m_width : m_bitmap->GetBmiWidth(); } // vtable+0x80
@@ -91,6 +91,7 @@ class MxVideoPresenter : public MxMediaPresenter {
 
 	inline MxS32 PrepareRects(MxRect32& p_rectDest, MxRect32& p_rectSrc);
 	inline MxBitmap* GetBitmap() { return m_bitmap; }
+	inline AlphaMask* GetAlphaMask() { return m_alpha; }
 
 	inline void SetBit0(BOOL p_e) { m_flags.m_bit0 = p_e; }
 	inline void SetBit1(BOOL p_e) { m_flags.m_bit1 = p_e; }
diff --git a/LEGO1/omni/src/common/mxutil.cpp b/LEGO1/omni/src/common/mxutil.cpp
index 29b71863..d06b2653 100644
--- a/LEGO1/omni/src/common/mxutil.cpp
+++ b/LEGO1/omni/src/common/mxutil.cpp
@@ -1,10 +1,12 @@
 #include "mxutil.h"
 
+#include "mxcompositepresenter.h"
 #include "mxdsaction.h"
 #include "mxdsactionlist.h"
 #include "mxdsfile.h"
 #include "mxdsmultiaction.h"
 #include "mxdsobject.h"
+#include "mxpresenterlist.h"
 #include "mxrect32.h"
 
 // GLOBAL: LEGO1 0x101020e8
@@ -109,6 +111,19 @@ MxBool KeyValueStringParse(char* p_outputValue, const char* p_key, const char* p
 	return didMatch;
 }
 
+// FUNCTION: LEGO1 0x100b7170
+MxBool ContainsPresenter(MxCompositePresenterList& p_presenterList, MxPresenter* p_presenter)
+{
+	for (MxCompositePresenterList::iterator it = p_presenterList.begin(); it != p_presenterList.end(); it++) {
+		if (p_presenter == *it || (*it)->IsA("MxCompositePresenter") &&
+									  ContainsPresenter(((MxCompositePresenter*) *it)->GetList(), p_presenter)) {
+			return TRUE;
+		}
+	}
+
+	return FALSE;
+}
+
 // FUNCTION: LEGO1 0x100b7210
 void SetOmniUserMessage(void (*p_userMsg)(const char*, int))
 {

From cdf76754f7beb282189af3028e1a6b87b90b6fcf Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Tue, 30 Jan 2024 13:57:20 -0500
Subject: [PATCH 196/210] Implement/match Radio, RadioState (#509)

* WIP RadioState

* WIP

* WIP

* Implement/match Radio/RadioState

* Fix naming

* Use sizeof
---
 LEGO1/lego/legoomni/include/jukebox.h         |  12 +-
 LEGO1/lego/legoomni/include/legostate.h       |  13 ++
 .../legoomni/include/legovehiclebuildstate.h  |  12 +-
 .../include/mxbackgroundaudiomanager.h        |   2 +
 .../legoomni/include/mxcontrolpresenter.h     |   1 -
 LEGO1/lego/legoomni/include/radio.h           |  12 +-
 LEGO1/lego/legoomni/include/radiostate.h      |  13 ++
 .../src/build/legovehiclebuildstate.cpp       |  12 +-
 LEGO1/lego/legoomni/src/common/legostate.cpp  |  24 ++++
 LEGO1/lego/legoomni/src/isle/radio.cpp        | 113 +++++++++++++++++-
 LEGO1/lego/legoomni/src/isle/radiostate.cpp   | 109 ++++++++++++++++-
 11 files changed, 279 insertions(+), 44 deletions(-)

diff --git a/LEGO1/lego/legoomni/include/jukebox.h b/LEGO1/lego/legoomni/include/jukebox.h
index f760641d..9879a446 100644
--- a/LEGO1/lego/legoomni/include/jukebox.h
+++ b/LEGO1/lego/legoomni/include/jukebox.h
@@ -34,6 +34,7 @@ class JukeBox : public LegoWorld {
 
 	// SYNTHETIC: LEGO1 0x1005d810
 	// JukeBox::`scalar deleting destructor'
+
 	enum JukeBoxScript {
 		e_mamaPapaBrickolini,
 		e_jailUnused,
@@ -65,29 +66,18 @@ class JukeBox : public LegoWorld {
 		e_legoRadioReminder2,
 
 		e_legoRadioRacingAd,
-
 		e_legoRadioNews1,
 		e_legoRadioNews2,
-
 		e_legoRadioPizzaAd1,
-
 		e_legoRadioBricksterPSA,
-
 		e_legoRadioSports1,
-
 		e_legoRadioIntermission1,
 		e_legoRadioIntermission2,
-
 		e_legoRadioPizzaAd2,
-
 		e_legoRadioWeatherReport,
-
 		e_legoRadioSports2,
-
 		e_legoRadioPizzaAd3,
-
 		e_legoRadioIntermission3,
-
 		e_legoRadioSuperStoreAd,
 
 		e_legoRadioLuckyYou,
diff --git a/LEGO1/lego/legoomni/include/legostate.h b/LEGO1/lego/legoomni/include/legostate.h
index 41942312..de66cdc6 100644
--- a/LEGO1/lego/legoomni/include/legostate.h
+++ b/LEGO1/lego/legoomni/include/legostate.h
@@ -43,6 +43,19 @@ class LegoState : public MxCore {
 
 	// SYNTHETIC: LEGO1 0x10006160
 	// LegoState::`scalar deleting destructor'
+
+	// SIZE 0x0c
+	struct StateStruct {
+		void* m_unk0x00;      // 0x00
+		undefined2 m_unk0x04; // 0x04
+		undefined2 m_unk0x06; // 0x06
+		MxU16 m_unk0x08;      // 0x08
+
+		StateStruct();
+
+		MxU32 FUN_10014d00();
+		MxBool FUN_10014de0(MxU32 p_objectId);
+	};
 };
 
 #endif // LEGOSTATE_H
diff --git a/LEGO1/lego/legoomni/include/legovehiclebuildstate.h b/LEGO1/lego/legoomni/include/legovehiclebuildstate.h
index b0463448..7a78b4ed 100644
--- a/LEGO1/lego/legoomni/include/legovehiclebuildstate.h
+++ b/LEGO1/lego/legoomni/include/legovehiclebuildstate.h
@@ -28,18 +28,8 @@ class LegoVehicleBuildState : public LegoState {
 	// SYNTHETIC: LEGO1 0x100260a0
 	// LegoVehicleBuildState::`scalar deleting destructor'
 
-public:
-	struct UnkStruct {
-		undefined4 m_unk0x00; // 0x00
-		undefined2 m_unk0x04; // 0x04
-		undefined2 m_unk0x06; // 0x06
-		undefined2 m_unk0x08; // 0x08
-
-		UnkStruct();
-	};
-
 private:
-	UnkStruct m_unk0x08[4]; // 0x08
+	StateStruct m_unk0x08[4]; // 0x08
 
 	// This can be one of the following:
 	// * LegoRaceCarBuildState
diff --git a/LEGO1/lego/legoomni/include/mxbackgroundaudiomanager.h b/LEGO1/lego/legoomni/include/mxbackgroundaudiomanager.h
index 787484b0..cb2e3435 100644
--- a/LEGO1/lego/legoomni/include/mxbackgroundaudiomanager.h
+++ b/LEGO1/lego/legoomni/include/mxbackgroundaudiomanager.h
@@ -31,6 +31,8 @@ class MxBackgroundAudioManager : public MxCore {
 		return !strcmp(p_name, MxBackgroundAudioManager::ClassName()) || MxCore::IsA(p_name);
 	}
 
+	inline MxBool GetMusicEnabled() { return m_musicEnabled; }
+
 	void StartAction(MxParam& p_param);
 	void StopAction(MxParam& p_param);
 	MxResult PlayMusic(MxDSAction& p_action, undefined4 p_unk0x140, undefined4 p_unk0x13c);
diff --git a/LEGO1/lego/legoomni/include/mxcontrolpresenter.h b/LEGO1/lego/legoomni/include/mxcontrolpresenter.h
index 0903f557..1ead16da 100644
--- a/LEGO1/lego/legoomni/include/mxcontrolpresenter.h
+++ b/LEGO1/lego/legoomni/include/mxcontrolpresenter.h
@@ -43,7 +43,6 @@ class MxControlPresenter : public MxCompositePresenter {
 
 private:
 	MxBool FUN_10044270(MxS32 p_x, MxS32 p_y, MxVideoPresenter* p_presenter);
-	void FUN_10044540(undefined2);
 
 	undefined2 m_unk0x4c; // 0x4c
 	MxS16 m_unk0x4e;      // 0x4e
diff --git a/LEGO1/lego/legoomni/include/radio.h b/LEGO1/lego/legoomni/include/radio.h
index 4edf734f..347a22d1 100644
--- a/LEGO1/lego/legoomni/include/radio.h
+++ b/LEGO1/lego/legoomni/include/radio.h
@@ -1,10 +1,13 @@
 #ifndef RADIO_H
 #define RADIO_H
 
+#include "legocontrolmanager.h"
+#include "mxactionnotificationparam.h"
 #include "mxcore.h"
 #include "radiostate.h"
 
 // VTABLE: LEGO1 0x100d6d10
+// SIZE 0x10
 class Radio : public MxCore {
 public:
 	Radio();
@@ -31,10 +34,15 @@ class Radio : public MxCore {
 	// Radio::`scalar deleting destructor'
 
 private:
-	RadioState* m_state; // 0x08
-	MxBool m_unk0x0c;    // 0x0c
+	RadioState* m_state;               // 0x08
+	MxBool m_unk0x0c;                  // 0x0c
+	MxBool m_bgAudioPreviouslyEnabled; // 0x0d
 
 	void CreateRadioState();
+	void Play();
+	void Stop();
+	MxLong HandleEndAction(MxEndActionNotificationParam& p_param);
+	MxLong HandleNotification17(LegoControlManagerEvent& p_param);
 };
 
 #endif // RADIO_H
diff --git a/LEGO1/lego/legoomni/include/radiostate.h b/LEGO1/lego/legoomni/include/radiostate.h
index 68dc154a..adfbe623 100644
--- a/LEGO1/lego/legoomni/include/radiostate.h
+++ b/LEGO1/lego/legoomni/include/radiostate.h
@@ -2,6 +2,7 @@
 #define RADIOSTATE_H
 
 #include "legostate.h"
+#include "mxdsaction.h"
 
 // VTABLE: LEGO1 0x100d6d28
 // SIZE 0x30
@@ -26,6 +27,18 @@ class RadioState : public LegoState {
 
 	// SYNTHETIC: LEGO1 0x1002d020
 	// RadioState::`scalar deleting destructor'
+
+	inline MxBool IsActive() { return m_active; }
+
+	inline void SetActive(MxBool p_active) { m_active = p_active; }
+
+	undefined4 FUN_1002d090();
+	MxBool FUN_1002d0c0(const MxAtomId& p_atom, MxU32 p_objectId);
+
+private:
+	StateStruct m_unk0x08[3]; // 0x08
+	MxS16 m_unk0x2c;          // 0x2c
+	MxBool m_active;          // 0x2e
 };
 
 #endif // RADIOSTATE_H
diff --git a/LEGO1/lego/legoomni/src/build/legovehiclebuildstate.cpp b/LEGO1/lego/legoomni/src/build/legovehiclebuildstate.cpp
index f950c429..8cf60edd 100644
--- a/LEGO1/lego/legoomni/src/build/legovehiclebuildstate.cpp
+++ b/LEGO1/lego/legoomni/src/build/legovehiclebuildstate.cpp
@@ -2,17 +2,7 @@
 
 #include "decomp.h"
 
-DECOMP_SIZE_ASSERT(LegoVehicleBuildState, 0x50); // 1000acd7
-DECOMP_SIZE_ASSERT(LegoVehicleBuildState::UnkStruct, 0x0c);
-
-// FUNCTION: LEGO1 0x10017c00
-LegoVehicleBuildState::UnkStruct::UnkStruct()
-{
-	m_unk0x04 = 0;
-	m_unk0x00 = 0;
-	m_unk0x06 = 0;
-	m_unk0x08 = 0;
-}
+DECOMP_SIZE_ASSERT(LegoVehicleBuildState, 0x50)
 
 // FUNCTION: LEGO1 0x10025f30
 LegoVehicleBuildState::LegoVehicleBuildState(char* p_classType)
diff --git a/LEGO1/lego/legoomni/src/common/legostate.cpp b/LEGO1/lego/legoomni/src/common/legostate.cpp
index c9946492..5d3bcf4e 100644
--- a/LEGO1/lego/legoomni/src/common/legostate.cpp
+++ b/LEGO1/lego/legoomni/src/common/legostate.cpp
@@ -1,3 +1,27 @@
 #include "legostate.h"
 
 DECOMP_SIZE_ASSERT(LegoState, 0x08)
+DECOMP_SIZE_ASSERT(LegoState::StateStruct, 0x0c)
+
+// STUB: LEGO1 0x10014d00
+MxU32 LegoState::StateStruct::FUN_10014d00()
+{
+	// TODO
+	return 0;
+}
+
+// STUB: LEGO1 0x10014de0
+MxBool LegoState::StateStruct::FUN_10014de0(MxU32 p_objectId)
+{
+	// TODO
+	return FALSE;
+}
+
+// FUNCTION: LEGO1 0x10017c00
+LegoState::StateStruct::StateStruct()
+{
+	m_unk0x04 = 0;
+	m_unk0x00 = 0;
+	m_unk0x06 = 0;
+	m_unk0x08 = 0;
+}
diff --git a/LEGO1/lego/legoomni/src/isle/radio.cpp b/LEGO1/lego/legoomni/src/isle/radio.cpp
index c0182a1c..ad5d96b7 100644
--- a/LEGO1/lego/legoomni/src/isle/radio.cpp
+++ b/LEGO1/lego/legoomni/src/isle/radio.cpp
@@ -3,6 +3,8 @@
 #include "legocontrolmanager.h"
 #include "legogamestate.h"
 #include "legoomni.h"
+#include "mxbackgroundaudiomanager.h"
+#include "mxcontrolpresenter.h"
 #include "mxnotificationmanager.h"
 
 DECOMP_SIZE_ASSERT(Radio, 0x10);
@@ -17,16 +19,119 @@ Radio::Radio()
 	CreateRadioState();
 }
 
-// STUB: LEGO1 0x1002c990
+// FUNCTION: LEGO1 0x1002c990
 Radio::~Radio()
 {
-	// TODO
+	if (m_state->IsActive()) {
+		BackgroundAudioManager()->Stop();
+		m_state->SetActive(FALSE);
+	}
+
+	ControlManager()->Unregister(this);
+	NotificationManager()->Unregister(this);
 }
 
-// STUB: LEGO1 0x1002ca30
+// FUNCTION: LEGO1 0x1002ca30
 MxLong Radio::Notify(MxParam& p_param)
 {
-	// TODO
+	MxLong result = 0;
+
+	if (m_unk0x0c) {
+		switch (((MxNotificationParam&) p_param).GetType()) {
+		case c_notificationEndAction:
+			result = HandleEndAction((MxEndActionNotificationParam&) p_param);
+			break;
+		case c_notificationType17:
+			result = HandleNotification17((LegoControlManagerEvent&) p_param);
+			break;
+		}
+	}
+
+	return result;
+}
+
+// FUNCTION: LEGO1 0x1002ca70
+void Radio::Play()
+{
+	if (!m_state->IsActive()) {
+		GetCurrentWorld();
+
+		MxDSAction action;
+		action.SetObjectId(m_state->FUN_1002d090());
+		action.SetAtomId(*g_jukeboxScript);
+		action.SetLoopCount(1);
+
+		m_bgAudioPreviouslyEnabled = BackgroundAudioManager()->GetMusicEnabled();
+		if (!m_bgAudioPreviouslyEnabled) {
+			BackgroundAudioManager()->Enable(TRUE);
+		}
+
+		BackgroundAudioManager()->PlayMusic(action, 3, 4);
+		m_state->SetActive(TRUE);
+	}
+}
+
+// FUNCTION: LEGO1 0x1002cb70
+void Radio::Stop()
+{
+	if (m_state->IsActive()) {
+		LegoWorld* world = GetCurrentWorld();
+
+		MxControlPresenter* presenter = (MxControlPresenter*) world->Find(world->GetAtom(), 18);
+
+		if (presenter)
+			presenter->VTable0x6c(0);
+
+		BackgroundAudioManager()->Stop();
+		BackgroundAudioManager()->Enable(m_bgAudioPreviouslyEnabled);
+		m_state->SetActive(FALSE);
+	}
+}
+
+// FUNCTION: LEGO1 0x1002cbc0
+MxLong Radio::HandleNotification17(LegoControlManagerEvent& p_param)
+{
+	MxDSAction action; // Unused
+	MxS32 objectId = p_param.GetClickedObjectId();
+
+	if (objectId == 18) {
+		if (m_state->IsActive()) {
+			Stop();
+		}
+		else {
+			Play();
+		}
+
+		if (GetCurrentWorld()) {
+#ifdef COMPAT_MODE
+			MxNotificationParam param(c_notificationEndAction, this);
+			GetCurrentWorld()->Notify(param);
+#else
+			GetCurrentWorld()->Notify(MxNotificationParam(c_notificationType0, this));
+#endif
+		}
+
+		return 1;
+	}
+
+	return 0;
+}
+
+// FUNCTION: LEGO1 0x1002ccc0
+MxLong Radio::HandleEndAction(MxEndActionNotificationParam& p_param)
+{
+	if (m_state->IsActive() &&
+		m_state->FUN_1002d0c0(p_param.GetAction()->GetAtomId(), p_param.GetAction()->GetObjectId())) {
+
+		MxDSAction action;
+		action.SetAtomId(*g_jukeboxScript);
+		action.SetObjectId(m_state->FUN_1002d090());
+		action.SetLoopCount(1);
+
+		BackgroundAudioManager()->PlayMusic(action, 3, 4);
+		return 1;
+	}
+
 	return 0;
 }
 
diff --git a/LEGO1/lego/legoomni/src/isle/radiostate.cpp b/LEGO1/lego/legoomni/src/isle/radiostate.cpp
index 08aa91fa..cb692fcf 100644
--- a/LEGO1/lego/legoomni/src/isle/radiostate.cpp
+++ b/LEGO1/lego/legoomni/src/isle/radiostate.cpp
@@ -1,14 +1,115 @@
 #include "radiostate.h"
 
-// STUB: LEGO1 0x1002ce10
+#include "jukebox.h"
+#include "legoomni.h"
+#include "mxtimer.h"
+
+// GLOBAL: LEGO1 0x100f3218
+JukeBox::JukeBoxScript g_unk0x100f3218[6] = {
+	JukeBox::e_legoRadioReminder1,
+	JukeBox::e_legoRadioJingle1,
+	JukeBox::e_legoRadioJingle2,
+	JukeBox::e_legoRadioJingle3,
+	JukeBox::e_legoRadioJingle4,
+	JukeBox::e_legoRadioReminder2
+};
+
+// GLOBAL: LEGO1 0x100f3230
+JukeBox::JukeBoxScript g_unk0x100f3230[14] = {
+	JukeBox::e_legoRadioRacingAd,
+	JukeBox::e_legoRadioNews1,
+	JukeBox::e_legoRadioNews2,
+	JukeBox::e_legoRadioPizzaAd1,
+	JukeBox::e_legoRadioBricksterPSA,
+	JukeBox::e_legoRadioSports1,
+	JukeBox::e_legoRadioIntermission1,
+	JukeBox::e_legoRadioIntermission2,
+	JukeBox::e_legoRadioPizzaAd2,
+	JukeBox::e_legoRadioWeatherReport,
+	JukeBox::e_legoRadioSports2,
+	JukeBox::e_legoRadioPizzaAd3,
+	JukeBox::e_legoRadioIntermission3,
+	JukeBox::e_legoRadioSuperStoreAd,
+};
+
+// GLOBAL: LEGO1 0x100f3268
+JukeBox::JukeBoxScript g_unk0x100f3268[9] = {
+	JukeBox::e_centralRoads,
+	JukeBox::e_beachBlvd,
+	JukeBox::e_residentialArea,
+	JukeBox::e_legoRadioLuckyYou,
+	JukeBox::e_legoRadioJazzInterlude,
+	JukeBox::e_legoRadioPianoInterlude1,
+	JukeBox::e_legoRadioPoliceStation,
+	JukeBox::e_legoRadioPianoInterlude2,
+	JukeBox::e_legoRadioCredits,
+};
+
+// FUNCTION: LEGO1 0x1002ce10
 RadioState::RadioState()
 {
-	// TODO
+	srand(Timer()->GetTime());
+
+	MxS32 random = rand();
+	m_unk0x2c = random % 3;
+
+	// TODO: Most likely inline function
+
+	m_unk0x08[0].m_unk0x04 = sizeof(g_unk0x100f3218) / sizeof(g_unk0x100f3218[0]);
+	m_unk0x08[0].m_unk0x00 = g_unk0x100f3218;
+	m_unk0x08[0].m_unk0x08 = 0;
+	m_unk0x08[0].m_unk0x06 = 0;
+
+	random = rand();
+
+	m_unk0x08[1].m_unk0x08 = 0;
+	m_unk0x08[1].m_unk0x06 = 0;
+	m_unk0x08[1].m_unk0x04 = sizeof(g_unk0x100f3230) / sizeof(g_unk0x100f3230[0]);
+	m_unk0x08[1].m_unk0x00 = g_unk0x100f3230;
+
+	m_unk0x08[0].m_unk0x08 = (MxU32) random % (sizeof(g_unk0x100f3218) / sizeof(g_unk0x100f3218[0]));
+	random = rand();
+
+	m_unk0x08[2].m_unk0x08 = 0;
+	m_unk0x08[2].m_unk0x06 = 0;
+	m_unk0x08[2].m_unk0x04 = sizeof(g_unk0x100f3268) / sizeof(g_unk0x100f3268[0]);
+	m_unk0x08[2].m_unk0x00 = g_unk0x100f3268;
+
+	m_unk0x08[1].m_unk0x08 = (MxU32) random % (sizeof(g_unk0x100f3230) / sizeof(g_unk0x100f3230[0]));
+	random = rand();
+
+	m_unk0x08[2].m_unk0x08 = (MxU32) random % (sizeof(g_unk0x100f3268) / sizeof(g_unk0x100f3268[0]));
+
+	m_active = FALSE;
 }
 
-// STUB: LEGO1 0x1002cf50
+// FUNCTION: LEGO1 0x1002cf50
 MxBool RadioState::VTable0x14()
 {
-	// TODO
+	return FALSE;
+}
+
+// FUNCTION: LEGO1 0x1002d090
+MxU32 RadioState::FUN_1002d090()
+{
+	if (m_unk0x2c == 2) {
+		m_unk0x2c = 0;
+	}
+	else {
+		m_unk0x2c++;
+	}
+
+	return m_unk0x08[m_unk0x2c].FUN_10014d00();
+}
+
+// FUNCTION: LEGO1 0x1002d0c0
+MxBool RadioState::FUN_1002d0c0(const MxAtomId& p_atom, MxU32 p_objectId)
+{
+	if (*g_jukeboxScript == p_atom) {
+		for (MxS16 i = 0; i < 3; i++)
+			if (m_unk0x08[i].FUN_10014de0(p_objectId))
+				return TRUE;
+	}
+
 	return FALSE;
 }

From bad32149cadeebb281b7d30a2de686bfc36e7537 Mon Sep 17 00:00:00 2001
From: Misha <106913236+MishaProductions@users.noreply.github.com>
Date: Wed, 31 Jan 2024 07:34:36 -0500
Subject: [PATCH 197/210] implement LegoGameState::StopPreviousAction (#511)

* implement RemoveFromWorld

* fix unloading

* Rename stuff, add default arg

* Rename functions

---------

Co-authored-by: Christian Semmler <mail@csemmler.com>
---
 LEGO1/lego/legoomni/include/legogamestate.h   |  13 +-
 LEGO1/lego/legoomni/include/legoutil.h        |   1 +
 LEGO1/lego/legoomni/src/build/helicopter.cpp  |   4 +-
 .../legoomni/src/common/legogamestate.cpp     | 174 +++++++++++++++++-
 LEGO1/lego/legoomni/src/common/legoutil.cpp   |  29 +++
 .../src/infocenter/elevatorbottom.cpp         |   6 +-
 .../legoomni/src/infocenter/infocenter.cpp    |   2 +-
 .../src/infocenter/infocenterdoor.cpp         |   4 +-
 LEGO1/lego/legoomni/src/infocenter/score.cpp  |   6 +-
 LEGO1/lego/legoomni/src/isle/isle.cpp         |  12 +-
 LEGO1/lego/legoomni/src/police/police.cpp     |   4 +-
 11 files changed, 223 insertions(+), 32 deletions(-)

diff --git a/LEGO1/lego/legoomni/include/legogamestate.h b/LEGO1/lego/legoomni/include/legogamestate.h
index 318aa7a3..5c631c6f 100644
--- a/LEGO1/lego/legoomni/include/legogamestate.h
+++ b/LEGO1/lego/legoomni/include/legogamestate.h
@@ -32,15 +32,16 @@ class LegoGameState {
 	LegoState* CreateState(const char* p_stateName);
 
 	void GetFileSavePath(MxString* p_outPath, MxULong p_slotn);
-	void FUN_1003a720(MxU32);
-	void HandleAction(MxU32);
+	void StopArea(MxU32 p_area = 0);
+	void SwitchArea(MxU32 p_area);
 
 	inline MxU8 GetUnknownC() { return m_unk0x0c; }
 	inline MxU32 GetUnknown10() { return m_unk0x10; }
 	inline MxS32 GetCurrentAct() { return m_currentAct; }
-	inline undefined4 GetUnknown424() { return m_unk0x424; }
+	inline MxU32 GetCurrentArea() { return m_currentArea; }
+
 	inline void SetDirty(MxBool p_dirty) { m_isDirty = p_dirty; }
-	inline void SetUnknown424(undefined4 p_unk0x424) { m_unk0x424 = p_unk0x424; }
+	inline void SetCurrentArea(MxU32 p_currentArea) { m_currentArea = p_currentArea; }
 
 	void SetSomeEnumState(undefined4 p_state);
 	void FUN_1003ceb0();
@@ -75,8 +76,8 @@ class LegoGameState {
 	ScoreStruct m_unk0xa6;                      // 0xa6
 	undefined m_unk0x41a[8];                    // 0x41a - might be part of the structure at 0xa6
 	MxBool m_isDirty;                           // 0x420
-	undefined4 m_unk0x424;                      // 0x424
-	undefined4 m_prevArea;                      // 0x428
+	MxU32 m_currentArea;                        // 0x424
+	MxU32 m_previousArea;                       // 0x428
 	undefined4 m_unk0x42c;                      // 0x42c
 };
 
diff --git a/LEGO1/lego/legoomni/include/legoutil.h b/LEGO1/lego/legoomni/include/legoutil.h
index 75e51c20..922a2c60 100644
--- a/LEGO1/lego/legoomni/include/legoutil.h
+++ b/LEGO1/lego/legoomni/include/legoutil.h
@@ -19,5 +19,6 @@ MxBool FUN_1003ee00(MxAtomId& p_atomId, MxS32 p_id);
 void FUN_1003ef00(MxBool);
 void SetAppCursor(WPARAM p_wparam);
 MxBool FUN_1003ef60();
+MxBool RemoveFromWorld(MxAtomId& p_atomId1, MxS32 p_id1, MxAtomId& p_atomId2, MxS32 p_id2);
 
 #endif // LEGOUTIL_H
diff --git a/LEGO1/lego/legoomni/src/build/helicopter.cpp b/LEGO1/lego/legoomni/src/build/helicopter.cpp
index 0f099228..9f11ace4 100644
--- a/LEGO1/lego/legoomni/src/build/helicopter.cpp
+++ b/LEGO1/lego/legoomni/src/build/helicopter.cpp
@@ -62,7 +62,7 @@ void Helicopter::VTable0xe4()
 	}
 	IslePathActor::VTable0xe4();
 	if (!GameState()->GetUnknown10()) {
-		GameState()->SetUnknown424(0x3c);
+		GameState()->SetCurrentArea(0x3c);
 		if (GetCurrentVehicle()) {
 			if (GetCurrentVehicle()->IsA("IslePathActor")) {
 				((IslePathActor*) GetCurrentVehicle())->VTable0xe8(0x37, TRUE, 7);
@@ -148,7 +148,7 @@ MxU32 Helicopter::VTable0xd4(LegoControlManagerEvent& p_param)
 			else if (m_state->GetUnkown8() != 0)
 				break;
 			VTable0xe4();
-			GameState()->SetUnknown424(0x42);
+			GameState()->SetCurrentArea(0x42);
 			ret = 1;
 			break;
 		case 0x18: {
diff --git a/LEGO1/lego/legoomni/src/common/legogamestate.cpp b/LEGO1/lego/legoomni/src/common/legogamestate.cpp
index af5e8dac..789cf7c8 100644
--- a/LEGO1/lego/legoomni/src/common/legogamestate.cpp
+++ b/LEGO1/lego/legoomni/src/common/legogamestate.cpp
@@ -69,8 +69,8 @@ LegoGameState::LegoGameState()
 	this->m_stateCount = 0;
 	this->m_unk0x0c = 0;
 	this->m_savePath = NULL;
-	this->m_unk0x424 = 0;
-	this->m_prevArea = 0;
+	this->m_currentArea = 0;
+	this->m_previousArea = 0;
 	this->m_unk0x42c = 0;
 	this->m_isDirty = FALSE;
 	this->m_currentAct = -1;
@@ -256,16 +256,176 @@ void LegoGameState::SerializePlayersInfo(MxS16)
 	// TODO
 }
 
-// STUB: LEGO1 0x1003a720
-void LegoGameState::FUN_1003a720(MxU32)
+// FUNCTION: LEGO1 0x1003a720
+void LegoGameState::StopArea(MxU32 p_area)
 {
-	// TODO
+	if (p_area == 0) {
+		p_area = m_previousArea;
+	}
+
+	switch (p_area) {
+	case 1:
+		InvokeAction(Extra::e_stop, *g_isleScript, 0, NULL);
+		InvokeAction(Extra::e_close, *g_isleScript, 0, NULL);
+		InvokeAction(Extra::e_close, *g_sndAnimScript, 0, NULL);
+		break;
+	case 2:
+		InvokeAction(Extra::e_stop, *g_infomainScript, 0, NULL);
+		InvokeAction(Extra::e_close, *g_infomainScript, 0, NULL);
+		break;
+	case 3:
+		InvokeAction(Extra::e_stop, *g_infodoorScript, 0, NULL);
+		InvokeAction(Extra::e_close, *g_infodoorScript, 0, NULL);
+		break;
+	case 5:
+		InvokeAction(Extra::e_stop, *g_elevbottScript, 0, NULL);
+		InvokeAction(Extra::e_close, *g_elevbottScript, 0, NULL);
+		break;
+	case 6:
+	case 7:
+		RemoveFromWorld(*g_isleScript, 0x41b, *g_isleScript, 0);
+		RemoveFromWorld(*g_isleScript, 1052, *g_isleScript, 0);
+		RemoveFromWorld(*g_isleScript, 0x41d, *g_isleScript, 0);
+		RemoveFromWorld(*g_isleScript, 0x41e, *g_isleScript, 0);
+		RemoveFromWorld(*g_isleScript, 0x420, *g_isleScript, 0);
+		RemoveFromWorld(*g_isleScript, 0x422, *g_isleScript, 0);
+		RemoveFromWorld(*g_isleScript, 0x424, *g_isleScript, 0);
+		RemoveFromWorld(*g_isleScript, 0x426, *g_isleScript, 0);
+		RemoveFromWorld(*g_isleScript, 0x428, *g_isleScript, 0);
+		RemoveFromWorld(*g_isleScript, 0x42a, *g_isleScript, 0);
+		RemoveFromWorld(*g_isleScript, 0x42b, *g_isleScript, 0);
+		break;
+	case 8:
+		RemoveFromWorld(*g_isleScript, 0x45b, *g_isleScript, 0);
+		RemoveFromWorld(*g_isleScript, 0x45c, *g_isleScript, 0);
+		RemoveFromWorld(*g_isleScript, 0x45d, *g_isleScript, 0);
+		break;
+	case 9:
+		RemoveFromWorld(*g_isleScript, 0x475, *g_isleScript, 0);
+		RemoveFromWorld(*g_isleScript, 0x476, *g_isleScript, 0);
+		RemoveFromWorld(*g_isleScript, 0x477, *g_isleScript, 0);
+		break;
+	case 10:
+		RemoveFromWorld(*g_isleScript, 0x45f, *g_isleScript, 0);
+		RemoveFromWorld(*g_isleScript, 0x460, *g_isleScript, 0);
+		RemoveFromWorld(*g_isleScript, 0x461, *g_isleScript, 0);
+		RemoveFromWorld(*g_isleScript, 0x462, *g_isleScript, 0);
+		RemoveFromWorld(*g_isleScript, 0x463, *g_isleScript, 0);
+		RemoveFromWorld(*g_isleScript, 0x464, *g_isleScript, 0);
+		RemoveFromWorld(*g_isleScript, 0x465, *g_isleScript, 0);
+		RemoveFromWorld(*g_isleScript, 0x466, *g_isleScript, 0);
+		RemoveFromWorld(*g_isleScript, 0x467, *g_isleScript, 0);
+		RemoveFromWorld(*g_isleScript, 0x469, *g_isleScript, 0);
+		RemoveFromWorld(*g_isleScript, 0x468, *g_isleScript, 0);
+		RemoveFromWorld(*g_isleScript, 0x46a, *g_isleScript, 0);
+		RemoveFromWorld(*g_isleScript, 0x46b, *g_isleScript, 0);
+		RemoveFromWorld(*g_isleScript, 0x46c, *g_isleScript, 0);
+		RemoveFromWorld(*g_isleScript, 0x46d, *g_isleScript, 0);
+		RemoveFromWorld(*g_isleScript, 0x46e, *g_isleScript, 0);
+		RemoveFromWorld(*g_isleScript, 0x46f, *g_isleScript, 0);
+		RemoveFromWorld(*g_isleScript, 0x471, *g_isleScript, 0);
+		RemoveFromWorld(*g_isleScript, 0x472, *g_isleScript, 0);
+		RemoveFromWorld(*g_isleScript, 0x12, *g_isleScript, 0);
+		break;
+	case 0xb:
+		RemoveFromWorld(*g_isleScript, 0x47a, *g_isleScript, 0);
+		RemoveFromWorld(*g_isleScript, 0x47b, *g_isleScript, 0);
+		RemoveFromWorld(*g_isleScript, 0x47c, *g_isleScript, 0);
+		RemoveFromWorld(*g_isleScript, 0x47d, *g_isleScript, 0);
+		break;
+	case 0xc:
+		InvokeAction(Extra::e_stop, *g_regbookScript, 0, NULL);
+		InvokeAction(Extra::e_close, *g_regbookScript, 0, NULL);
+		break;
+	case 0xd:
+		InvokeAction(Extra::e_stop, *g_infoscorScript, 0, NULL);
+		InvokeAction(Extra::e_close, *g_infoscorScript, 0, NULL);
+		break;
+	case 0xe:
+		InvokeAction(Extra::e_stop, *g_jetraceScript, 0, NULL);
+		InvokeAction(Extra::e_close, *g_jetraceScript, 0, NULL);
+		InvokeAction(Extra::e_close, *g_jetracerScript, 0, NULL);
+		break;
+	case 0x12:
+		InvokeAction(Extra::e_stop, *g_carraceScript, 0, NULL);
+		InvokeAction(Extra::e_close, *g_carraceScript, 0, NULL);
+		InvokeAction(Extra::e_close, *g_carracerScript, 0, NULL);
+		break;
+	case 0x1a:
+		Lego()->RemoveWorld(*g_garageScript, 0);
+		InvokeAction(Extra::e_stop, *g_garageScript, 0, NULL);
+		InvokeAction(Extra::e_close, *g_garageScript, 0, NULL);
+		break;
+	case 0x1b:
+		RemoveFromWorld(*g_isleScript, 0x489, *g_isleScript, 0);
+		RemoveFromWorld(*g_isleScript, 0x48a, *g_isleScript, 0);
+		RemoveFromWorld(*g_isleScript, 0x48b, *g_isleScript, 0);
+		RemoveFromWorld(*g_isleScript, 0x48c, *g_isleScript, 0);
+		break;
+	case 0x1e:
+		InvokeAction(Extra::e_stop, *g_hospitalScript, 0, NULL);
+		InvokeAction(Extra::e_close, *g_hospitalScript, 0, NULL);
+		break;
+	case 0x22:
+		InvokeAction(Extra::e_stop, *g_policeScript, 0, NULL);
+		InvokeAction(Extra::e_close, *g_policeScript, 0, NULL);
+		break;
+	case 0x23:
+		RemoveFromWorld(*g_isleScript, 0x47f, *g_isleScript, 0);
+		RemoveFromWorld(*g_isleScript, 0x480, *g_isleScript, 0);
+		RemoveFromWorld(*g_isleScript, 0x481, *g_isleScript, 0);
+		RemoveFromWorld(*g_isleScript, 0x482, *g_isleScript, 0);
+		break;
+	case 0x24:
+		InvokeAction(Extra::e_stop, *g_jukeboxScript, 0x2f, NULL);
+		InvokeAction(Extra::e_stop, *g_copterScript, 0, NULL);
+		InvokeAction(Extra::e_close, *g_copterScript, 0, NULL);
+		break;
+	case 0x25:
+		InvokeAction(Extra::e_stop, *g_jukeboxScript, 0x31, NULL);
+		InvokeAction(Extra::e_stop, *g_dunecarScript, 0, NULL);
+		InvokeAction(Extra::e_close, *g_dunecarScript, 0, NULL);
+		break;
+	case 0x26:
+		InvokeAction(Extra::e_stop, *g_jukeboxScript, 0x33, NULL);
+		InvokeAction(Extra::e_stop, *g_jetskiScript, 0, NULL);
+		InvokeAction(Extra::e_close, *g_jetskiScript, 0, NULL);
+		break;
+	case 0x27:
+		InvokeAction(Extra::e_stop, *g_jukeboxScript, 0x35, NULL);
+		InvokeAction(Extra::e_stop, *g_racecarScript, 0, NULL);
+		InvokeAction(Extra::e_close, *g_racecarScript, 0, NULL);
+		break;
+	case 0x2e:
+		if (m_currentArea != 2) {
+			InvokeAction(Extra::e_stop, *g_act2mainScript, 0, NULL);
+			InvokeAction(Extra::e_close, *g_act2mainScript, 0, NULL);
+		}
+		break;
+	case 0x2f:
+		if (m_currentArea != 2) {
+			InvokeAction(Extra::e_stop, *g_act3Script, 0, NULL);
+			InvokeAction(Extra::e_close, *g_act3Script, 0, NULL);
+		}
+		break;
+	case 0x35:
+		InvokeAction(Extra::e_stop, *g_jukeboxwScript, 0, NULL);
+		InvokeAction(Extra::e_close, *g_jukeboxwScript, 0, NULL);
+		break;
+	case 0x38:
+		InvokeAction(Extra::e_disable, *g_histbookScript, 0, NULL);
+		InvokeAction(Extra::e_stop, *g_histbookScript, 0, NULL);
+		InvokeAction(Extra::e_close, *g_histbookScript, 0, NULL);
+		break;
+	}
 }
 
 // STUB: LEGO1 0x1003b060
-void LegoGameState::HandleAction(MxU32 p_area)
+void LegoGameState::SwitchArea(MxU32 p_area)
 {
-	m_prevArea = p_area;
+	m_previousArea = m_currentArea;
+	m_currentArea = p_area;
+
 	BackgroundAudioManager()->Stop();
 	AnimationManager()->FUN_1005ef10();
 	VideoManager()->SetUnk0x554(0);
diff --git a/LEGO1/lego/legoomni/src/common/legoutil.cpp b/LEGO1/lego/legoomni/src/common/legoutil.cpp
index dfb4b740..9f388ad5 100644
--- a/LEGO1/lego/legoomni/src/common/legoutil.cpp
+++ b/LEGO1/lego/legoomni/src/common/legoutil.cpp
@@ -195,6 +195,35 @@ MxBool FUN_1003ee00(MxAtomId& p_atomId, MxS32 p_id)
 	return TRUE;
 }
 
+// FUNCTION: LEGO1 0x1003ee80
+MxBool RemoveFromWorld(MxAtomId& p_entityAtom, MxS32 p_entityId, MxAtomId& p_worldAtom, MxS32 p_worldEntityId)
+{
+	LegoWorld* world = FindWorld(p_worldAtom, p_worldEntityId);
+
+	if (world) {
+		MxCore* object = world->Find(p_entityAtom, p_entityId);
+
+		if (object) {
+			world->Remove(object);
+
+			if (!object->IsA("MxPresenter")) {
+				delete object;
+			}
+			else {
+				if (((MxPresenter*) object)->GetAction()) {
+					FUN_100b7220(((MxPresenter*) object)->GetAction(), MxDSAction::c_world, FALSE);
+				}
+
+				((MxPresenter*) object)->EndAction();
+			}
+
+			return TRUE;
+		}
+	}
+
+	return FALSE;
+}
+
 // STUB: LEGO1 0x1003ef00
 void FUN_1003ef00(MxBool)
 {
diff --git a/LEGO1/lego/legoomni/src/infocenter/elevatorbottom.cpp b/LEGO1/lego/legoomni/src/infocenter/elevatorbottom.cpp
index 697ce5f1..84bbb4c6 100644
--- a/LEGO1/lego/legoomni/src/infocenter/elevatorbottom.cpp
+++ b/LEGO1/lego/legoomni/src/infocenter/elevatorbottom.cpp
@@ -38,8 +38,8 @@ MxResult ElevatorBottom::Create(MxDSAction& p_dsAction)
 
 	SetIsWorldActive(FALSE);
 
-	GameState()->SetUnknown424(5);
-	GameState()->FUN_1003a720(0);
+	GameState()->SetCurrentArea(5);
+	GameState()->StopArea();
 
 	return result;
 }
@@ -56,7 +56,7 @@ MxLong ElevatorBottom::Notify(MxParam& p_param)
 			ret = HandleNotification17(p_param);
 			break;
 		case c_notificationTransitioned:
-			GameState()->HandleAction(m_unk0xf8);
+			GameState()->SwitchArea(m_unk0xf8);
 			break;
 		}
 	}
diff --git a/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp b/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp
index 651f06a6..3dca5c64 100644
--- a/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp
+++ b/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp
@@ -139,7 +139,7 @@ MxLong Infocenter::Notify(MxParam& p_param)
 			}
 			else if (m_unk0x104 != 0) {
 				BackgroundAudioManager()->RaiseVolume();
-				GameState()->HandleAction(m_unk0x104);
+				GameState()->SwitchArea(m_unk0x104);
 				m_unk0x104 = 0;
 			}
 			break;
diff --git a/LEGO1/lego/legoomni/src/infocenter/infocenterdoor.cpp b/LEGO1/lego/legoomni/src/infocenter/infocenterdoor.cpp
index 599096b2..4ed626ff 100644
--- a/LEGO1/lego/legoomni/src/infocenter/infocenterdoor.cpp
+++ b/LEGO1/lego/legoomni/src/infocenter/infocenterdoor.cpp
@@ -39,8 +39,8 @@ MxResult InfocenterDoor::Create(MxDSAction& p_dsAction)
 
 	SetIsWorldActive(FALSE);
 
-	GameState()->SetUnknown424(3);
-	GameState()->FUN_1003a720(0);
+	GameState()->SetCurrentArea(3);
+	GameState()->StopArea();
 
 	return result;
 }
diff --git a/LEGO1/lego/legoomni/src/infocenter/score.cpp b/LEGO1/lego/legoomni/src/infocenter/score.cpp
index 181553d4..f75e0418 100644
--- a/LEGO1/lego/legoomni/src/infocenter/score.cpp
+++ b/LEGO1/lego/legoomni/src/infocenter/score.cpp
@@ -52,8 +52,8 @@ MxResult Score::Create(MxDSAction& p_dsAction)
 		LegoGameState* gs = GameState();
 		ScoreState* state = (ScoreState*) gs->GetState("ScoreState");
 		m_state = state ? state : (ScoreState*) gs->CreateState("ScoreState");
-		GameState()->SetUnknown424(0xd);
-		GameState()->FUN_1003a720(0);
+		GameState()->SetCurrentArea(0xd);
+		GameState()->StopArea();
 	}
 
 	return result;
@@ -97,7 +97,7 @@ MxLong Score::Notify(MxParam& p_param)
 		case c_notificationTransitioned:
 			DeleteObjects(g_infoscorScript, 7, 9);
 			if (m_unk0xf8)
-				GameState()->HandleAction(m_unk0xf8);
+				GameState()->SwitchArea(m_unk0xf8);
 			ret = 1;
 			break;
 		default:
diff --git a/LEGO1/lego/legoomni/src/isle/isle.cpp b/LEGO1/lego/legoomni/src/isle/isle.cpp
index 40e07fa1..bb6d4fd8 100644
--- a/LEGO1/lego/legoomni/src/isle/isle.cpp
+++ b/LEGO1/lego/legoomni/src/isle/isle.cpp
@@ -62,21 +62,21 @@ MxResult Isle::Create(MxDSAction& p_dsAction)
 	if (result == SUCCESS) {
 		ControlManager()->Register(this);
 		InputManager()->SetWorld(this);
-		GameState()->FUN_1003a720(0);
+		GameState()->StopArea();
 
 		switch (GameState()->GetCurrentAct()) {
 		case 1:
-			GameState()->FUN_1003a720(0x2e);
+			GameState()->StopArea(0x2e);
 			break;
 		case 2:
-			GameState()->FUN_1003a720(0x2e);
+			GameState()->StopArea(0x2e);
 			break;
 		case -1:
 			m_unk0x13c = 2;
 		}
 
-		if (GameState()->GetUnknown424() == 1) {
-			GameState()->SetUnknown424(0);
+		if (GameState()->GetCurrentArea() == 1) {
+			GameState()->SetCurrentArea(0);
 		}
 
 		LegoGameState* gameState = GameState();
@@ -158,7 +158,7 @@ void Isle::ReadyWorld()
 	LegoWorld::ReadyWorld();
 
 	if (m_act1state->GetUnknown21()) {
-		GameState()->HandleAction(2);
+		GameState()->SwitchArea(2);
 		m_act1state->SetUnknown18(0);
 		m_act1state->SetUnknown21(0);
 	}
diff --git a/LEGO1/lego/legoomni/src/police/police.cpp b/LEGO1/lego/legoomni/src/police/police.cpp
index aac86238..c8c29486 100644
--- a/LEGO1/lego/legoomni/src/police/police.cpp
+++ b/LEGO1/lego/legoomni/src/police/police.cpp
@@ -55,8 +55,8 @@ MxResult Police::Create(MxDSAction& p_dsAction)
 	}
 
 	m_policeState = policeState;
-	GameState()->SetUnknown424(0x22);
-	GameState()->FUN_1003a720(0);
+	GameState()->SetCurrentArea(0x22);
+	GameState()->StopArea();
 	return ret;
 }
 

From 9e0b19856c6d031b7581f49dc663ab38d54da49b Mon Sep 17 00:00:00 2001
From: Misha <106913236+MishaProductions@users.noreply.github.com>
Date: Wed, 31 Jan 2024 09:47:15 -0500
Subject: [PATCH 198/210] Implement various infocenter functions (#510)

* Implement various infocenter methods

* fix order

* Update infocenter.cpp

* Update infocenter.cpp

* Update infocenter.cpp

* Update mxcontrolpresenter.cpp

* Rename stuff for consistency

* Add StateStruct to InfocenterState

* Resolve some TODO

* Use MxRect32

* Improve match

* Match Infocenter::UpdateFrameHot

* Fix VTable0x64

* WIP Match

* Match

* Cleanup

---------

Co-authored-by: Christian Semmler <mail@csemmler.com>
---
 LEGO1/lego/legoomni/include/act1state.h       |   5 +-
 LEGO1/lego/legoomni/include/elevatorbottom.h  |   4 +-
 LEGO1/lego/legoomni/include/infocenter.h      |  36 +-
 LEGO1/lego/legoomni/include/infocenterdoor.h  |   4 +
 LEGO1/lego/legoomni/include/infocenterstate.h |  34 +-
 LEGO1/lego/legoomni/include/legogamestate.h   |   1 +
 LEGO1/lego/legoomni/include/legostate.h       |   9 +-
 LEGO1/lego/legoomni/include/radio.h           |   9 +-
 .../legoomni/src/common/legogamestate.cpp     |  18 +-
 LEGO1/lego/legoomni/src/common/legostate.cpp  |   9 -
 .../src/control/mxcontrolpresenter.cpp        |   8 +-
 .../src/infocenter/elevatorbottom.cpp         |  47 ++-
 .../legoomni/src/infocenter/infocenter.cpp    | 320 +++++++++++++++---
 .../src/infocenter/infocenterdoor.cpp         |  85 ++++-
 LEGO1/lego/legoomni/src/infocenter/score.cpp  |   2 +-
 LEGO1/lego/legoomni/src/isle/isle.cpp         |   2 +-
 LEGO1/lego/legoomni/src/isle/radio.cpp        |   6 +-
 LEGO1/omni/include/mxnotificationparam.h      |   2 +-
 LEGO1/omni/include/mxpresenter.h              |   2 +
 LEGO1/omni/include/mxrect32.h                 |   1 +
 20 files changed, 486 insertions(+), 118 deletions(-)

diff --git a/LEGO1/lego/legoomni/include/act1state.h b/LEGO1/lego/legoomni/include/act1state.h
index 324d7195..988eb8c7 100644
--- a/LEGO1/lego/legoomni/include/act1state.h
+++ b/LEGO1/lego/legoomni/include/act1state.h
@@ -27,9 +27,12 @@ class Act1State : public LegoState {
 
 	inline void SetUnknown18(MxU32 p_unk0x18) { m_unk0x18 = p_unk0x18; }
 	inline MxU32 GetUnknown18() { return m_unk0x18; }
-	inline void SetUnknown21(MxS16 p_unk0x21) { m_unk0x21 = p_unk0x21; }
+	inline MxU32 GetUnknown1c() { return m_unk0x1c; }
 	inline MxS16 GetUnknown21() { return m_unk0x21; }
 
+	inline void SetUnknown1c(MxU32 p_unk0x1c) { m_unk0x1c = p_unk0x1c; }
+	inline void SetUnknown21(MxS16 p_unk0x21) { m_unk0x21 = p_unk0x21; }
+
 	void FUN_10034d00();
 
 	// SYNTHETIC: LEGO1 0x10033960
diff --git a/LEGO1/lego/legoomni/include/elevatorbottom.h b/LEGO1/lego/legoomni/include/elevatorbottom.h
index e52f5556..2c8711a3 100644
--- a/LEGO1/lego/legoomni/include/elevatorbottom.h
+++ b/LEGO1/lego/legoomni/include/elevatorbottom.h
@@ -4,6 +4,8 @@
 #include "decomp.h"
 #include "legoworld.h"
 
+class LegoControlManagerEvent;
+
 // VTABLE: LEGO1 0x100d5f20
 // SIZE: 0xfc (from inlined ctor at 0x1000a8aa)
 class ElevatorBottom : public LegoWorld {
@@ -41,7 +43,7 @@ class ElevatorBottom : public LegoWorld {
 private:
 	undefined4 m_unk0xf8; // 0xf8
 
-	MxLong HandleNotification17(MxParam& p_param);
+	MxLong HandleClick(LegoControlManagerEvent& p_param);
 };
 
 #endif // ELEVATORBOTTOM_H
diff --git a/LEGO1/lego/legoomni/include/infocenter.h b/LEGO1/lego/legoomni/include/infocenter.h
index b46099cd..56f01e09 100644
--- a/LEGO1/lego/legoomni/include/infocenter.h
+++ b/LEGO1/lego/legoomni/include/infocenter.h
@@ -2,10 +2,12 @@
 #define INFOCENTER_H
 
 #include "legoworld.h"
+#include "mxrect32.h"
 #include "radio.h"
 
 class InfocenterState;
 class MxStillPresenter;
+class LegoControlManagerEvent;
 
 // SIZE 0x18
 struct InfocenterMapEntry {
@@ -14,10 +16,7 @@ struct InfocenterMapEntry {
 
 	MxStillPresenter* m_presenter; // 0x00
 	undefined4 m_unk0x04;          // 0x04
-	undefined4 m_unk0x08;          // 0x08
-	undefined4 m_unk0x0c;          // 0x0c
-	undefined4 m_unk0x10;          // 0x10
-	undefined4 m_unk0x14;          // 0x14
+	MxRect32 m_area;               // 0x08
 };
 
 // VTABLE: LEGO1 0x100d9338
@@ -40,12 +39,15 @@ class Infocenter : public LegoWorld {
 		c_leftArrowCtl = 1,
 		c_rightArrowCtl = 2,
 		c_infoCtl = 3,
+		c_doorCtl = 4,
 		c_boatCtl = 10,
 		c_raceCtl = 11,
 		c_pizzaCtl = 12,
 		c_gasCtl = 13,
 		c_medCtl = 14,
 		c_copCtl = 15,
+		c_bigInfoCtl = 16,
+		c_bookCtl = 17,
 		c_radioCtl = 18,
 		c_mamaCtl = 21,
 		c_papaCtl = 22,
@@ -53,6 +55,15 @@ class Infocenter : public LegoWorld {
 		c_nickCtl = 24,
 		c_lauraCtl = 25,
 
+		c_mamaSelected = 30,
+		c_papaSelected = 31,
+		c_pepperSelected = 32,
+		c_nickSelected = 33,
+		c_lauraSelected = 34,
+
+		c_goToRegBook = 70,
+		c_goToRegBookRed = 71,
+
 		c_welcomeDialogue = 500,
 		c_goodJobDialogue = 501,
 
@@ -114,6 +125,13 @@ class Infocenter : public LegoWorld {
 		c_noCDDialogueUnused1 = 552,
 		c_noCDDialogueUnused2 = 553,
 
+		c_gasCtlDescription = 555,
+		c_medCtlDescription = 556,
+		c_boatCtlDescription = 558,
+		c_copCtlDescription = 559,
+		c_pizzaCtlDescription = 560,
+		c_raceCtlDescription = 561,
+
 		c_leaveInfoCenterDialogue1 = 562,
 		c_leaveInfoCenterDialogue2 = 563,
 		c_leaveInfoCenterDialogue3 = 564,
@@ -163,16 +181,18 @@ class Infocenter : public LegoWorld {
 	MxLong HandleKeyPress(MxS8 p_key);
 	MxU8 HandleMouseMove(MxS32 p_x, MxS32 p_y);
 	MxU8 HandleButtonUp(MxS32 p_x, MxS32 p_y);
-	MxU8 HandleNotification17(MxParam&);
+	MxU8 HandleClick(LegoControlManagerEvent& p_param);
 	MxLong HandleEndAction(MxParam& p_param);
 	MxLong HandleNotification0(MxParam&);
 
-	void FUN_10070dc0(MxBool);
+	void UpdateFrameHot(MxBool p_display);
 	void FUN_10070e90();
 
 	void PlayCutscene(Cutscene p_entityId, MxBool p_scale);
 	void StopCutscene();
 
+	void FUN_10070d10(MxS32 p_x, MxS32 p_y);
+
 	void StartCredits();
 	void StopCredits();
 
@@ -185,10 +205,10 @@ class Infocenter : public LegoWorld {
 	InfomainScript m_currentInfomainScript; // 0xf8
 	MxS16 m_unk0xfc;                        // 0xfc
 	InfocenterState* m_infocenterState;     // 0x100
-	undefined4 m_unk0x104;                  // 0x104
+	undefined4 m_transitionDestination;     // 0x104
 	Cutscene m_currentCutscene;             // 0x108
 	Radio m_radio;                          // 0x10c
-	undefined4 m_unk0x11c;                  // 0x11c
+	MxStillPresenter* m_unk0x11c;           // 0x11c
 	InfocenterMapEntry m_mapAreas[7];       // 0x120
 	MxS16 m_unk0x1c8;                       // 0x1c8
 	MxStillPresenter* m_frameHotBitmap;     // 0x1cc
diff --git a/LEGO1/lego/legoomni/include/infocenterdoor.h b/LEGO1/lego/legoomni/include/infocenterdoor.h
index 1d7b361d..0869d4e4 100644
--- a/LEGO1/lego/legoomni/include/infocenterdoor.h
+++ b/LEGO1/lego/legoomni/include/infocenterdoor.h
@@ -3,6 +3,8 @@
 
 #include "legoworld.h"
 
+class LegoControlManagerEvent;
+
 // VTABLE: LEGO1 0x100d72d8
 // SIZE 0xfc
 class InfocenterDoor : public LegoWorld {
@@ -39,6 +41,8 @@ class InfocenterDoor : public LegoWorld {
 
 private:
 	MxS32 m_unk0xf8; // 0xf8
+
+	MxLong HandleClick(LegoControlManagerEvent& p_param);
 };
 
 #endif // INFOCENTERDOOR_H
diff --git a/LEGO1/lego/legoomni/include/infocenterstate.h b/LEGO1/lego/legoomni/include/infocenterstate.h
index 9399f8f4..ed23acef 100644
--- a/LEGO1/lego/legoomni/include/infocenterstate.h
+++ b/LEGO1/lego/legoomni/include/infocenterstate.h
@@ -30,6 +30,7 @@ class InfocenterState : public LegoState {
 
 	inline MxS16 GetInfocenterBufferSize() { return sizeof(m_buffer) / sizeof(m_buffer[0]); }
 	inline MxStillPresenter* GetInfocenterBufferElement(MxS32 p_index) { return m_buffer[p_index]; }
+	inline StateStruct& GetUnknown0x68() { return m_unk0x68; }
 	inline MxU32 GetUnknown0x74() { return m_unk0x74; }
 
 	inline void SetUnknown0x74(MxU32 p_unk0x74) { m_unk0x74 = p_unk0x74; }
@@ -38,35 +39,10 @@ class InfocenterState : public LegoState {
 	// InfocenterState::`scalar deleting destructor'
 
 private:
-	// Members should be renamed with their offsets before use
-	/*
-	  struct UnkStruct
-	  {
-		undefined4 unk1;
-		undefined2 unk2;
-		undefined2 unk3;
-		undefined2 unk4;
-	  };
-
-	  undefined2 unk1;
-	  undefined2 unk2;
-	  undefined4 unk3;
-	  undefined4 padding1;
-	  void *unk4;
-	  undefined2 unk5;
-	  undefined2 unk6;
-	  undefined2 unk7;
-	  undefined2 padding2;
-	  void *unk8;
-	  undefined2 unk9;
-	  undefined2 unk10;
-	  undefined2 unk11;
-	  undefined2 padding3;
-	  UnkStruct unk12[6];
-	  undefined4 unk13;
-	*/
-
-	undefined m_pad[0x6c];
+	undefined m_unk0x08[0x18];     // 0x08
+	StateStruct m_unk0x20[3];      // 0x20
+	StateStruct m_unk0x44[3];      // 0x44
+	StateStruct m_unk0x68;         // 0x68
 	MxU32 m_unk0x74;               // 0x74
 	MxStillPresenter* m_buffer[7]; // 0x78
 };
diff --git a/LEGO1/lego/legoomni/include/legogamestate.h b/LEGO1/lego/legoomni/include/legogamestate.h
index 5c631c6f..1af22e55 100644
--- a/LEGO1/lego/legoomni/include/legogamestate.h
+++ b/LEGO1/lego/legoomni/include/legogamestate.h
@@ -39,6 +39,7 @@ class LegoGameState {
 	inline MxU32 GetUnknown10() { return m_unk0x10; }
 	inline MxS32 GetCurrentAct() { return m_currentAct; }
 	inline MxU32 GetCurrentArea() { return m_currentArea; }
+	inline MxU32 GetPreviousArea() { return m_previousArea; }
 
 	inline void SetDirty(MxBool p_dirty) { m_isDirty = p_dirty; }
 	inline void SetCurrentArea(MxU32 p_currentArea) { m_currentArea = p_currentArea; }
diff --git a/LEGO1/lego/legoomni/include/legostate.h b/LEGO1/lego/legoomni/include/legostate.h
index de66cdc6..fe10bbf7 100644
--- a/LEGO1/lego/legoomni/include/legostate.h
+++ b/LEGO1/lego/legoomni/include/legostate.h
@@ -51,7 +51,14 @@ class LegoState : public MxCore {
 		undefined2 m_unk0x06; // 0x06
 		MxU16 m_unk0x08;      // 0x08
 
-		StateStruct();
+		// FUNCTION: LEGO1 0x10017c00
+		StateStruct()
+		{
+			m_unk0x04 = 0;
+			m_unk0x00 = NULL;
+			m_unk0x06 = 0;
+			m_unk0x08 = 0;
+		}
 
 		MxU32 FUN_10014d00();
 		MxBool FUN_10014de0(MxU32 p_objectId);
diff --git a/LEGO1/lego/legoomni/include/radio.h b/LEGO1/lego/legoomni/include/radio.h
index 347a22d1..dd37ba44 100644
--- a/LEGO1/lego/legoomni/include/radio.h
+++ b/LEGO1/lego/legoomni/include/radio.h
@@ -29,20 +29,21 @@ class Radio : public MxCore {
 	}
 
 	void Initialize(MxBool p_und);
+	void Play();
+	void Stop();
 
 	// SYNTHETIC: LEGO1 0x1002c970
 	// Radio::`scalar deleting destructor'
 
 private:
+	void CreateRadioState();
+
 	RadioState* m_state;               // 0x08
 	MxBool m_unk0x0c;                  // 0x0c
 	MxBool m_bgAudioPreviouslyEnabled; // 0x0d
 
-	void CreateRadioState();
-	void Play();
-	void Stop();
 	MxLong HandleEndAction(MxEndActionNotificationParam& p_param);
-	MxLong HandleNotification17(LegoControlManagerEvent& p_param);
+	MxLong HandleClick(LegoControlManagerEvent& p_param);
 };
 
 #endif // RADIO_H
diff --git a/LEGO1/lego/legoomni/src/common/legogamestate.cpp b/LEGO1/lego/legoomni/src/common/legogamestate.cpp
index 789cf7c8..0a884a53 100644
--- a/LEGO1/lego/legoomni/src/common/legogamestate.cpp
+++ b/LEGO1/lego/legoomni/src/common/legogamestate.cpp
@@ -428,20 +428,32 @@ void LegoGameState::SwitchArea(MxU32 p_area)
 
 	BackgroundAudioManager()->Stop();
 	AnimationManager()->FUN_1005ef10();
-	VideoManager()->SetUnk0x554(0);
+	VideoManager()->SetUnk0x554(FALSE);
 
 	MxAtomId* script = g_isleScript;
 	switch (p_area) {
 	case 1:
 		break;
 	case 2:
-		VideoManager()->SetUnk0x554(1);
+		VideoManager()->SetUnk0x554(TRUE);
 		script = g_infomainScript;
 		break;
 	case 3:
-		VideoManager()->SetUnk0x554(1);
+		VideoManager()->SetUnk0x554(TRUE);
 		script = g_infodoorScript;
 		break;
+		// TODO
+	case 5:
+		script = g_elevbottScript;
+		break;
+	case 12:
+		VideoManager()->SetUnk0x554(TRUE);
+		script = g_regbookScript;
+		break;
+	case 13:
+		VideoManager()->SetUnk0x554(TRUE);
+		script = g_infoscorScript;
+		break;
 
 		// TODO: implement other cases
 	}
diff --git a/LEGO1/lego/legoomni/src/common/legostate.cpp b/LEGO1/lego/legoomni/src/common/legostate.cpp
index 5d3bcf4e..96a08dbe 100644
--- a/LEGO1/lego/legoomni/src/common/legostate.cpp
+++ b/LEGO1/lego/legoomni/src/common/legostate.cpp
@@ -16,12 +16,3 @@ MxBool LegoState::StateStruct::FUN_10014de0(MxU32 p_objectId)
 	// TODO
 	return FALSE;
 }
-
-// FUNCTION: LEGO1 0x10017c00
-LegoState::StateStruct::StateStruct()
-{
-	m_unk0x04 = 0;
-	m_unk0x00 = 0;
-	m_unk0x06 = 0;
-	m_unk0x08 = 0;
-}
diff --git a/LEGO1/lego/legoomni/src/control/mxcontrolpresenter.cpp b/LEGO1/lego/legoomni/src/control/mxcontrolpresenter.cpp
index ae0288f7..39fb5eee 100644
--- a/LEGO1/lego/legoomni/src/control/mxcontrolpresenter.cpp
+++ b/LEGO1/lego/legoomni/src/control/mxcontrolpresenter.cpp
@@ -108,13 +108,13 @@ MxBool MxControlPresenter::FUN_10044270(MxS32 p_x, MxS32 p_y, MxVideoPresenter*
 	if (m_unk0x4c == 3) {
 		MxVideoPresenter* frontPresenter = (MxVideoPresenter*) m_list.front();
 
-		if (p_presenter == frontPresenter || frontPresenter->GetDisplayZ() < frontPresenter->GetDisplayZ()) {
+		if (p_presenter == frontPresenter || frontPresenter->GetDisplayZ() < p_presenter->GetDisplayZ()) {
 			if (p_presenter->VTable0x7c()) {
 				MxS32 height = frontPresenter->GetHeight();
 				MxS32 width = frontPresenter->GetWidth();
 
 				if (frontPresenter->GetLocation().GetX() <= p_x &&
-					p_x < width - 1 + frontPresenter->GetLocation().GetY() &&
+					p_x < width - 1 + frontPresenter->GetLocation().GetX() &&
 					frontPresenter->GetLocation().GetY() <= p_y &&
 					p_y < height - 1 + frontPresenter->GetLocation().GetY()) {
 					MxU8* start;
@@ -198,7 +198,7 @@ MxBool MxControlPresenter::FUN_10044480(LegoControlManagerEvent* p_event, MxPres
 				p_event->SetClickedObjectId(m_action->GetObjectId());
 				p_event->SetClickedAtom(m_action->GetAtomId().GetInternal());
 				VTable0x6c(0);
-				p_event->SetType(c_notificationType17);
+				p_event->SetType(c_notificationClick);
 				p_event->SetUnknown0x28(m_unk0x4e);
 				return TRUE;
 			}
@@ -208,7 +208,7 @@ MxBool MxControlPresenter::FUN_10044480(LegoControlManagerEvent* p_event, MxPres
 				p_event->SetClickedObjectId(m_action->GetObjectId());
 				p_event->SetClickedAtom(m_action->GetAtomId().GetInternal());
 				VTable0x6c(m_unk0x56);
-				p_event->SetType(c_notificationType17);
+				p_event->SetType(c_notificationClick);
 				p_event->SetUnknown0x28(m_unk0x4e);
 				return TRUE;
 			}
diff --git a/LEGO1/lego/legoomni/src/infocenter/elevatorbottom.cpp b/LEGO1/lego/legoomni/src/infocenter/elevatorbottom.cpp
index 84bbb4c6..08f2cf50 100644
--- a/LEGO1/lego/legoomni/src/infocenter/elevatorbottom.cpp
+++ b/LEGO1/lego/legoomni/src/infocenter/elevatorbottom.cpp
@@ -1,5 +1,6 @@
 #include "elevatorbottom.h"
 
+#include "act1state.h"
 #include "jukebox.h"
 #include "legocontrolmanager.h"
 #include "legogamestate.h"
@@ -7,9 +8,14 @@
 #include "legoomni.h"
 #include "mxnotificationmanager.h"
 #include "mxomni.h"
+#include "mxtransitionmanager.h"
 
 DECOMP_SIZE_ASSERT(ElevatorBottom, 0xfc)
 
+// STRING: LEGO1 0x100f0d34
+// GLOBAL: LEGO1 0x100f3a44
+char* g_cameraLoc = "CAMERA_LOCATION";
+
 // FUNCTION: LEGO1 0x10017e90
 ElevatorBottom::ElevatorBottom()
 {
@@ -52,8 +58,8 @@ MxLong ElevatorBottom::Notify(MxParam& p_param)
 
 	if (m_worldStarted) {
 		switch (((MxNotificationParam&) p_param).GetType()) {
-		case c_notificationType17:
-			ret = HandleNotification17(p_param);
+		case c_notificationClick:
+			ret = HandleClick((LegoControlManagerEvent&) p_param);
 			break;
 		case c_notificationTransitioned:
 			GameState()->SwitchArea(m_unk0xf8);
@@ -72,10 +78,41 @@ void ElevatorBottom::ReadyWorld()
 	FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
 }
 
-// STUB: LEGO1 0x100181d0
-MxLong ElevatorBottom::HandleNotification17(MxParam& p_param)
+// FUNCTION: LEGO1 0x100181d0
+MxLong ElevatorBottom::HandleClick(LegoControlManagerEvent& p_param)
 {
-	return 0;
+	MxLong result = 0;
+
+	if (p_param.GetUnknown0x28() == 1) {
+		switch (p_param.GetClickedObjectId()) {
+		case 1:
+			m_unk0xf8 = 3;
+			TransitionManager()->StartTransition(MxTransitionManager::e_pixelation, 50, FALSE, FALSE);
+			result = 1;
+			break;
+		case 2:
+			m_unk0xf8 = 2;
+			TransitionManager()->StartTransition(MxTransitionManager::e_pixelation, 50, FALSE, FALSE);
+			result = 1;
+			break;
+		case 3:
+			LegoGameState* gs = GameState();
+			Act1State* state = (Act1State*) gs->GetState("Act1State");
+
+			if (state == NULL) {
+				state = (Act1State*) gs->CreateState("Act1State");
+			}
+
+			state->SetUnknown1c(1);
+			m_unk0xf8 = 6;
+			TransitionManager()->StartTransition(MxTransitionManager::e_pixelation, 50, FALSE, FALSE);
+			VariableTable()->SetVariable(g_cameraLoc, "LCAMZI1,90");
+			result = 1;
+			break;
+		}
+	}
+
+	return result;
 }
 
 // FUNCTION: LEGO1 0x100182c0
diff --git a/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp b/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp
index 3dca5c64..2a98f5af 100644
--- a/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp
+++ b/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp
@@ -32,7 +32,7 @@ Infocenter::Infocenter()
 	m_infocenterState = NULL;
 	m_frameHotBitmap = 0;
 	m_unk0x11c = 0;
-	m_unk0x104 = 0;
+	m_transitionDestination = 0;
 	m_currentInfomainScript = c_noInfomain;
 	m_currentCutscene = e_noIntro;
 
@@ -126,8 +126,8 @@ MxLong Infocenter::Notify(MxParam& p_param)
 				((LegoEventNotificationParam&) p_param).GetY()
 			);
 			break;
-		case c_notificationType17:
-			result = HandleNotification17(p_param);
+		case c_notificationClick:
+			result = HandleClick((LegoControlManagerEvent&) p_param);
 			break;
 		case c_notificationTransitioned:
 			StopBookAnimation();
@@ -137,10 +137,10 @@ MxLong Infocenter::Notify(MxParam& p_param)
 				StartCredits();
 				m_infocenterState->SetUnknown0x74(0xd);
 			}
-			else if (m_unk0x104 != 0) {
+			else if (m_transitionDestination != 0) {
 				BackgroundAudioManager()->RaiseVolume();
-				GameState()->SwitchArea(m_unk0x104);
-				m_unk0x104 = 0;
+				GameState()->SwitchArea(m_transitionDestination);
+				m_transitionDestination = 0;
 			}
 			break;
 		}
@@ -189,7 +189,7 @@ MxLong Infocenter::HandleEndAction(MxParam& p_param)
 				break;
 			}
 
-			FUN_10070dc0(TRUE);
+			UpdateFrameHot(TRUE);
 		}
 	}
 
@@ -383,63 +383,82 @@ void Infocenter::InitializeBitmaps()
 	((MxPresenter*) Find(m_atom, c_radioCtl))->Enable(TRUE);
 
 	m_mapAreas[0].m_presenter = (MxStillPresenter*) Find("MxStillPresenter", "Info_A_Bitmap");
-	m_mapAreas[0].m_unk0x08 = 391;
-	m_mapAreas[0].m_unk0x0c = 182;
-	m_mapAreas[0].m_unk0x10 = 427;
-	m_mapAreas[0].m_unk0x14 = 230;
+	m_mapAreas[0].m_area.SetLeft(391);
+	m_mapAreas[0].m_area.SetTop(182);
+	m_mapAreas[0].m_area.SetRight(427);
+	m_mapAreas[0].m_area.SetBottom(230);
 	m_mapAreas[0].m_unk0x04 = 3;
 
 	m_mapAreas[1].m_presenter = (MxStillPresenter*) Find("MxStillPresenter", "Boat_A_Bitmap");
-	m_mapAreas[1].m_unk0x08 = 304;
-	m_mapAreas[1].m_unk0x0c = 225;
-	m_mapAreas[1].m_unk0x10 = 350;
-	m_mapAreas[1].m_unk0x14 = 268;
+	m_mapAreas[1].m_area.SetLeft(304);
+	m_mapAreas[1].m_area.SetTop(225);
+	m_mapAreas[1].m_area.SetRight(350);
+	m_mapAreas[1].m_area.SetBottom(268);
 	m_mapAreas[1].m_unk0x04 = 10;
 
 	m_mapAreas[2].m_presenter = (MxStillPresenter*) Find("MxStillPresenter", "Race_A_Bitmap");
-	m_mapAreas[2].m_unk0x08 = 301;
-	m_mapAreas[2].m_unk0x0c = 133;
-	m_mapAreas[2].m_unk0x10 = 347;
-	m_mapAreas[2].m_unk0x14 = 181;
+	m_mapAreas[2].m_area.SetLeft(301);
+	m_mapAreas[2].m_area.SetTop(133);
+	m_mapAreas[2].m_area.SetRight(347);
+	m_mapAreas[2].m_area.SetBottom(181);
 	m_mapAreas[2].m_unk0x04 = 11;
 
 	m_mapAreas[3].m_presenter = (MxStillPresenter*) Find("MxStillPresenter", "Pizza_A_Bitmap");
-	m_mapAreas[3].m_unk0x08 = 289;
-	m_mapAreas[3].m_unk0x0c = 182;
-	m_mapAreas[3].m_unk0x10 = 335;
-	m_mapAreas[3].m_unk0x14 = 225;
+	m_mapAreas[3].m_area.SetLeft(289);
+	m_mapAreas[3].m_area.SetTop(182);
+	m_mapAreas[3].m_area.SetRight(335);
+	m_mapAreas[3].m_area.SetBottom(225);
 	m_mapAreas[3].m_unk0x04 = 12;
 
 	m_mapAreas[4].m_presenter = (MxStillPresenter*) Find("MxStillPresenter", "Gas_A_Bitmap");
-	m_mapAreas[4].m_unk0x10 = 391;
-	m_mapAreas[4].m_unk0x08 = 350;
-	m_mapAreas[4].m_unk0x0c = 161;
-	m_mapAreas[4].m_unk0x14 = 209;
+	m_mapAreas[4].m_area.SetLeft(350);
+	m_mapAreas[4].m_area.SetTop(161);
+	m_mapAreas[4].m_area.SetRight(391);
+	m_mapAreas[4].m_area.SetBottom(209);
 	m_mapAreas[4].m_unk0x04 = 13;
 
 	m_mapAreas[5].m_presenter = (MxStillPresenter*) Find("MxStillPresenter", "Med_A_Bitmap");
-	m_mapAreas[5].m_unk0x08 = 392;
-	m_mapAreas[5].m_unk0x0c = 130;
-	m_mapAreas[5].m_unk0x10 = 438;
-	m_mapAreas[5].m_unk0x14 = 176;
+	m_mapAreas[5].m_area.SetLeft(392);
+	m_mapAreas[5].m_area.SetTop(130);
+	m_mapAreas[5].m_area.SetRight(438);
+	m_mapAreas[5].m_area.SetBottom(176);
 	m_mapAreas[5].m_unk0x04 = 14;
 
 	m_mapAreas[6].m_presenter = (MxStillPresenter*) Find("MxStillPresenter", "Cop_A_Bitmap");
-	m_mapAreas[6].m_unk0x08 = 396;
-	m_mapAreas[6].m_unk0x0c = 229;
-	m_mapAreas[6].m_unk0x10 = 442;
-	m_mapAreas[6].m_unk0x14 = 272;
+	m_mapAreas[6].m_area.SetLeft(396);
+	m_mapAreas[6].m_area.SetTop(229);
+	m_mapAreas[6].m_area.SetRight(442);
+	m_mapAreas[6].m_area.SetBottom(272);
 	m_mapAreas[6].m_unk0x04 = 15;
 
 	m_frameHotBitmap = (MxStillPresenter*) Find("MxStillPresenter", "FrameHot_Bitmap");
 
-	FUN_10070dc0(TRUE);
+	UpdateFrameHot(TRUE);
 }
 
-// STUB: LEGO1 0x1006fd00
+// FUNCTION: LEGO1 0x1006fd00
 MxU8 Infocenter::HandleMouseMove(MxS32 p_x, MxS32 p_y)
 {
-	return 1;
+	if (m_unk0x11c) {
+		if (!m_unk0x11c->IsEnabled()) {
+			MxS32 oldDisplayZ = m_unk0x11c->GetDisplayZ();
+
+			m_unk0x11c->SetDisplayZ(1000);
+			VideoManager()->SortPresenterList();
+			m_unk0x11c->Enable(TRUE);
+			m_unk0x11c->VTable0x88(p_x, p_y);
+
+			m_unk0x11c->SetDisplayZ(oldDisplayZ);
+		}
+		else {
+			m_unk0x11c->VTable0x88(p_x, p_y);
+		}
+
+		FUN_10070d10(p_x, p_y);
+		return 1;
+	}
+
+	return 0;
 }
 
 // FUNCTION: LEGO1 0x1006fda0
@@ -492,12 +511,129 @@ MxLong Infocenter::HandleKeyPress(MxS8 p_key)
 // STUB: LEGO1 0x1006feb0
 MxU8 Infocenter::HandleButtonUp(MxS32 p_x, MxS32 p_y)
 {
-	return 1;
+	return FALSE;
 }
 
-// STUB: LEGO1 0x10070370
-MxU8 Infocenter::HandleNotification17(MxParam&)
+// FUNCTION: LEGO1 0x10070370
+MxU8 Infocenter::HandleClick(LegoControlManagerEvent& p_param)
 {
+	if (p_param.GetUnknown0x28() == 1) {
+		m_infoManDialogueTimer = 0;
+
+		InfomainScript actionToPlay = c_noInfomain;
+		StopCurrentAction();
+		InfomainScript characterBitmap = c_noInfomain;
+
+		GameState();
+
+		switch (p_param.GetClickedObjectId()) {
+		case c_leftArrowCtl:
+			m_infocenterState->SetUnknown0x74(14);
+			StopCurrentAction();
+
+			if (GameState()->GetUnknown10() == 0) {
+				m_radio.Stop();
+				TransitionManager()->StartTransition(MxTransitionManager::e_pixelation, 50, FALSE, FALSE);
+				m_transitionDestination = 5;
+			}
+			else {
+				MxU32 objectId = m_infocenterState->GetUnknown0x68().FUN_10014d00();
+				PlayAction((InfomainScript) objectId);
+			}
+
+			break;
+		case c_rightArrowCtl:
+			m_infocenterState->SetUnknown0x74(14);
+			StopCurrentAction();
+
+			if (GameState()->GetUnknown10() == 0) {
+				m_radio.Stop();
+				TransitionManager()->StartTransition(MxTransitionManager::e_pixelation, 50, FALSE, FALSE);
+				m_transitionDestination = 13;
+			}
+			else {
+				MxU32 objectId = m_infocenterState->GetUnknown0x68().FUN_10014d00();
+				PlayAction((InfomainScript) objectId);
+			}
+
+			break;
+		case c_infoCtl:
+			m_radio.Stop();
+			break;
+		case c_doorCtl:
+			if (m_infocenterState->GetUnknown0x74() != 8) {
+				actionToPlay = c_exitConfirmationDialogue;
+				m_radio.Stop();
+				m_infocenterState->SetUnknown0x74(8);
+			}
+
+			break;
+		case c_boatCtl:
+			actionToPlay = c_boatCtlDescription;
+			m_radio.Stop();
+			break;
+		case c_raceCtl:
+			actionToPlay = c_raceCtlDescription;
+			m_radio.Stop();
+			break;
+		case c_pizzaCtl:
+			actionToPlay = c_pizzaCtlDescription;
+			m_radio.Stop();
+			break;
+		case c_gasCtl:
+			actionToPlay = c_gasCtlDescription;
+			m_radio.Stop();
+			break;
+		case c_medCtl:
+			actionToPlay = c_medCtlDescription;
+			m_radio.Stop();
+			break;
+		case c_copCtlDescription:
+			actionToPlay = c_copCtlDescription;
+			m_radio.Stop();
+			break;
+		case c_bigInfoCtl:
+			// TODO
+			break;
+		case c_bookCtl:
+			m_transitionDestination = 12;
+			m_infocenterState->SetUnknown0x74(4);
+			actionToPlay = GameState()->GetUnknown10() ? c_goToRegBookRed : c_goToRegBook;
+			m_radio.Stop();
+			GameState()->SetCurrentArea(GameState()->GetPreviousArea());
+			InputManager()->DisableInputProcessing();
+			break;
+		case c_mamaCtl:
+			characterBitmap = c_mamaSelected;
+			UpdateFrameHot(FALSE);
+			break;
+		case c_papaCtl:
+			characterBitmap = c_papaSelected;
+			UpdateFrameHot(FALSE);
+			break;
+		case c_pepperCtl:
+			characterBitmap = c_pepperSelected;
+			UpdateFrameHot(FALSE);
+			break;
+		case c_nickCtl:
+			characterBitmap = c_nickSelected;
+			UpdateFrameHot(FALSE);
+			break;
+		case c_lauraCtl:
+			characterBitmap = c_lauraCtl;
+			UpdateFrameHot(FALSE);
+			break;
+		}
+
+		if (actionToPlay != c_noInfomain) {
+			PlayAction(actionToPlay);
+		}
+
+		if (characterBitmap != c_noInfomain) {
+			m_unk0x11c = (MxStillPresenter*) Find(m_atom, characterBitmap);
+		}
+	}
+
 	return 1;
 }
 
@@ -601,9 +737,81 @@ MxBool Infocenter::VTable0x5c()
 	return TRUE;
 }
 
-// STUB: LEGO1 0x10070dc0
-void Infocenter::FUN_10070dc0(MxBool)
+// FUNCTION: LEGO1 0x10070d10
+void Infocenter::FUN_10070d10(MxS32 p_x, MxS32 p_y)
 {
+	MxS16 i;
+	for (i = 0; i < (MxS32) (sizeof(m_mapAreas) / sizeof(m_mapAreas[0])); i++) {
+		MxS32 right = m_mapAreas[i].m_area.GetRight();
+		MxS32 bottom = m_mapAreas[i].m_area.GetBottom();
+		MxS32 left = m_mapAreas[i].m_area.GetLeft();
+		MxS32 top = m_mapAreas[i].m_area.GetTop();
+
+		if (left <= p_x && p_x <= right && top <= p_y && p_y <= bottom)
+			break;
+	}
+
+	if (i == 7) {
+		i = -1;
+	}
+
+	if (i != m_unk0x1c8) {
+		if (m_unk0x1c8 != -1) {
+			m_mapAreas[i].m_presenter->Enable(FALSE);
+		}
+
+		m_unk0x1c8 = i;
+		if (i != -1) {
+			m_mapAreas[i].m_presenter->Enable(TRUE);
+		}
+	}
+}
+
+// FUNCTION: LEGO1 0x10070dc0
+void Infocenter::UpdateFrameHot(MxBool p_display)
+{
+	if (p_display) {
+		MxS32 x, y;
+
+		switch (GameState()->GetUnknownC()) {
+		case 1:
+			x = 302;
+			y = 81;
+			break;
+		case 2:
+			x = 204;
+			y = 81;
+			break;
+		case 3:
+			x = 253;
+			y = 81;
+			break;
+		case 4:
+			x = 353;
+			y = 81;
+			break;
+		case 5:
+			x = 399;
+			y = 81;
+			break;
+		default:
+			return;
+		}
+
+		MxS32 originalDisplayZ = m_frameHotBitmap->GetDisplayZ();
+
+		m_frameHotBitmap->SetDisplayZ(1000);
+		VideoManager()->SortPresenterList();
+
+		m_frameHotBitmap->Enable(TRUE);
+		m_frameHotBitmap->VTable0x88(x, y);
+		m_frameHotBitmap->SetDisplayZ(originalDisplayZ);
+	}
+	else {
+		if (m_frameHotBitmap) {
+			m_frameHotBitmap->Enable(FALSE);
+		}
+	}
 }
 
 // STUB: LEGO1 0x10070e90
@@ -611,9 +819,33 @@ void Infocenter::FUN_10070e90()
 {
 }
 
-// STUB: LEGO1 0x10070f60
+// FUNCTION: LEGO1 0x10070f60
 MxBool Infocenter::VTable0x64()
 {
+	if (m_infocenterState != NULL) {
+		MxU32 val = m_infocenterState->GetUnknown0x74();
+
+		if (val == 0) {
+			StopCutscene();
+			m_infocenterState->SetUnknown0x74(1);
+		}
+		else if (val == 13) {
+			StopCredits();
+		}
+		else if (val != 8) {
+			m_infocenterState->SetUnknown0x74(8);
+
+#ifdef COMPAT_MODE
+			{
+				MxNotificationParam param(c_notificationType0, NULL);
+				Notify(param);
+			}
+#else
+			Notify(MxNotificationParam(c_notificationType0, NULL));
+#endif
+		}
+	}
+
 	return FALSE;
 }
 
diff --git a/LEGO1/lego/legoomni/src/infocenter/infocenterdoor.cpp b/LEGO1/lego/legoomni/src/infocenter/infocenterdoor.cpp
index 4ed626ff..47ab29ac 100644
--- a/LEGO1/lego/legoomni/src/infocenter/infocenterdoor.cpp
+++ b/LEGO1/lego/legoomni/src/infocenter/infocenterdoor.cpp
@@ -1,11 +1,15 @@
 #include "infocenterdoor.h"
 
+#include "infocenterstate.h"
 #include "jukebox.h"
 #include "legocontrolmanager.h"
 #include "legogamestate.h"
 #include "legoinputmanager.h"
 #include "legoomni.h"
+#include "mxactionnotificationparam.h"
+#include "mxbackgroundaudiomanager.h"
 #include "mxnotificationmanager.h"
+#include "mxtransitionmanager.h"
 
 DECOMP_SIZE_ASSERT(InfocenterDoor, 0xfc)
 
@@ -45,11 +49,31 @@ MxResult InfocenterDoor::Create(MxDSAction& p_dsAction)
 	return result;
 }
 
-// STUB: LEGO1 0x100379e0
+// FUNCTION: LEGO1 0x100379e0
 MxLong InfocenterDoor::Notify(MxParam& p_param)
 {
-	// TODO
-	return LegoWorld::Notify(p_param);
+	MxLong result = 0;
+	LegoWorld::Notify(p_param);
+
+	if (m_worldStarted) {
+		switch (((MxNotificationParam&) p_param).GetType()) {
+		case c_notificationEndAction:
+			if (((MxEndActionNotificationParam&) p_param).GetAction()->GetAtomId() == m_atom) {
+				BackgroundAudioManager()->RaiseVolume();
+				result = 1;
+			}
+			break;
+		case c_notificationClick:
+			result = HandleClick((LegoControlManagerEvent&) p_param);
+			break;
+		case c_notificationTransitioned:
+			GameState()->SwitchArea(m_unk0xf8);
+			result = 1;
+			break;
+		}
+	}
+
+	return result;
 }
 
 // FUNCTION: LEGO1 0x10037a70
@@ -60,6 +84,61 @@ void InfocenterDoor::ReadyWorld()
 	FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
 }
 
+// FUNCTION: LEGO1 0x10037a90
+MxLong InfocenterDoor::HandleClick(LegoControlManagerEvent& p_param)
+{
+	MxLong result = 0;
+
+	if (p_param.GetUnknown0x28() == 1) {
+		DeleteObjects(&m_atom, 500, 510);
+
+		switch (p_param.GetClickedObjectId()) {
+		case 1:
+			m_unk0xf8 = 13;
+			TransitionManager()->StartTransition(MxTransitionManager::e_pixelation, 50, FALSE, FALSE);
+			result = 1;
+			break;
+		case 2:
+			m_unk0xf8 = 5;
+			TransitionManager()->StartTransition(MxTransitionManager::e_pixelation, 50, FALSE, FALSE);
+			result = 1;
+			break;
+		case 3:
+			m_unk0xf8 = 2;
+			TransitionManager()->StartTransition(MxTransitionManager::e_pixelation, 50, FALSE, FALSE);
+			result = 1;
+			break;
+		case 4:
+			if (GameState()->GetUnknownC()) {
+				InfocenterState* state = (InfocenterState*) GameState()->GetState("InfocenterState");
+				if (state->GetInfocenterBufferElement(0) != NULL) {
+					m_unk0xf8 = 4;
+				}
+				else {
+					MxDSAction action;
+					action.SetObjectId(503);
+					action.SetAtomId(*g_infodoorScript);
+					BackgroundAudioManager()->LowerVolume();
+					Start(&action);
+				}
+			}
+			else {
+				MxDSAction action;
+				action.SetObjectId(500);
+				action.SetAtomId(*g_infodoorScript);
+				BackgroundAudioManager()->LowerVolume();
+				Start(&action);
+			}
+
+			TransitionManager()->StartTransition(MxTransitionManager::e_pixelation, 50, FALSE, FALSE);
+			result = 1;
+			break;
+		}
+	}
+
+	return result;
+}
+
 // FUNCTION: LEGO1 0x10037c80
 void InfocenterDoor::VTable0x68(MxBool p_add)
 {
diff --git a/LEGO1/lego/legoomni/src/infocenter/score.cpp b/LEGO1/lego/legoomni/src/infocenter/score.cpp
index f75e0418..ce378399 100644
--- a/LEGO1/lego/legoomni/src/infocenter/score.cpp
+++ b/LEGO1/lego/legoomni/src/infocenter/score.cpp
@@ -91,7 +91,7 @@ MxLong Score::Notify(MxParam& p_param)
 				DeleteScript(); // Shutting down
 			ret = 1;
 			break;
-		case c_notificationType17:
+		case c_notificationClick:
 			ret = FUN_100016d0((LegoControlManagerEvent&) p_param);
 			break;
 		case c_notificationTransitioned:
diff --git a/LEGO1/lego/legoomni/src/isle/isle.cpp b/LEGO1/lego/legoomni/src/isle/isle.cpp
index bb6d4fd8..c8c67570 100644
--- a/LEGO1/lego/legoomni/src/isle/isle.cpp
+++ b/LEGO1/lego/legoomni/src/isle/isle.cpp
@@ -115,7 +115,7 @@ MxLong Isle::Notify(MxParam& p_param)
 				break;
 			}
 			break;
-		case c_notificationType17:
+		case c_notificationClick:
 			result = HandleType17Notification(p_param);
 			break;
 		case c_notificationType18:
diff --git a/LEGO1/lego/legoomni/src/isle/radio.cpp b/LEGO1/lego/legoomni/src/isle/radio.cpp
index ad5d96b7..2f18ae59 100644
--- a/LEGO1/lego/legoomni/src/isle/radio.cpp
+++ b/LEGO1/lego/legoomni/src/isle/radio.cpp
@@ -41,8 +41,8 @@ MxLong Radio::Notify(MxParam& p_param)
 		case c_notificationEndAction:
 			result = HandleEndAction((MxEndActionNotificationParam&) p_param);
 			break;
-		case c_notificationType17:
-			result = HandleNotification17((LegoControlManagerEvent&) p_param);
+		case c_notificationClick:
+			result = HandleClick((LegoControlManagerEvent&) p_param);
 			break;
 		}
 	}
@@ -89,7 +89,7 @@ void Radio::Stop()
 }
 
 // FUNCTION: LEGO1 0x1002cbc0
-MxLong Radio::HandleNotification17(LegoControlManagerEvent& p_param)
+MxLong Radio::HandleClick(LegoControlManagerEvent& p_param)
 {
 	MxDSAction action; // Unused
 	MxS32 objectId = p_param.GetClickedObjectId();
diff --git a/LEGO1/omni/include/mxnotificationparam.h b/LEGO1/omni/include/mxnotificationparam.h
index 9fe01c18..d0ad675f 100644
--- a/LEGO1/omni/include/mxnotificationparam.h
+++ b/LEGO1/omni/include/mxnotificationparam.h
@@ -23,7 +23,7 @@ enum NotificationId {
 	c_notificationDragStart = 13,
 	c_notificationDrag = 14,
 	c_notificationTimer = 15, // 100d6aa0
-	c_notificationType17 = 17,
+	c_notificationClick = 17,
 	c_notificationType18 = 18, // 100d7e80
 	c_notificationType19 = 19, // 100d6230
 	c_notificationType20 = 20,
diff --git a/LEGO1/omni/include/mxpresenter.h b/LEGO1/omni/include/mxpresenter.h
index 3d9dd355..6198cd09 100644
--- a/LEGO1/omni/include/mxpresenter.h
+++ b/LEGO1/omni/include/mxpresenter.h
@@ -121,6 +121,8 @@ class MxPresenter : public MxCore {
 		m_compositePresenter = p_compositePresenter;
 	}
 
+	inline void SetDisplayZ(MxS32 p_displayZ) { m_displayZ = p_displayZ; }
+
 	// SYNTHETIC: LEGO1 0x1000c070
 	// MxPresenter::`scalar deleting destructor'
 
diff --git a/LEGO1/omni/include/mxrect32.h b/LEGO1/omni/include/mxrect32.h
index 20e1706e..207d93fa 100644
--- a/LEGO1/omni/include/mxrect32.h
+++ b/LEGO1/omni/include/mxrect32.h
@@ -65,6 +65,7 @@ class MxRect32 {
 	}
 
 	inline MxBool IsValid() const { return m_left < m_right && m_top < m_bottom; }
+
 	inline MxBool IntersectsWith(const MxRect32& p_rect) const
 	{
 		return m_left < p_rect.m_right && p_rect.m_left < m_right && m_top < p_rect.m_bottom && p_rect.m_top < m_bottom;

From a1488b16b4d468cb94726526ba64ae83d0d2dff0 Mon Sep 17 00:00:00 2001
From: MS <disinvite@users.noreply.github.com>
Date: Wed, 31 Jan 2024 16:34:05 -0500
Subject: [PATCH 199/210] roadmap: Suggest order of modules (#507)

* roadmap: Suggest order of modules

* Include more modules in the list

* Sort by avg address with outliers removed

* Mark order-adjusted modules. Show library order.

* Use bisect for performance

* Use average address for library order

* Bugfix for get_module
---
 tools/roadmap/roadmap.py | 227 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 222 insertions(+), 5 deletions(-)

diff --git a/tools/roadmap/roadmap.py b/tools/roadmap/roadmap.py
index e8023c1d..97a4f894 100644
--- a/tools/roadmap/roadmap.py
+++ b/tools/roadmap/roadmap.py
@@ -5,7 +5,9 @@
 import os
 import argparse
 import logging
-from typing import List, Optional
+import statistics
+import bisect
+from typing import Iterator, List, Optional, Tuple
 from collections import namedtuple
 from isledecomp import Bin as IsleBin
 from isledecomp.cvdump import Cvdump
@@ -28,6 +30,7 @@ class ModuleMap:
     def __init__(self, pdb, binfile) -> None:
         cvdump = Cvdump(pdb).section_contributions().modules().run()
         self.module_lookup = {m.id: (m.lib, m.obj) for m in cvdump.modules}
+        self.library_lookup = {m.obj: m.lib for m in cvdump.modules}
         self.section_contrib = [
             (
                 binfile.get_abs_addr(sizeref.section, sizeref.offset),
@@ -38,11 +41,37 @@ def __init__(self, pdb, binfile) -> None:
             if binfile.is_valid_section(sizeref.section)
         ]
 
+        # For bisect performance enhancement
+        self.contrib_starts = [start for (start, _, __) in self.section_contrib]
+
+    def get_lib_for_module(self, module: str) -> Optional[str]:
+        return self.library_lookup.get(module)
+
+    def get_all_cmake_modules(self) -> List[str]:
+        return [
+            obj
+            for (_, (__, obj)) in self.module_lookup.items()
+            if obj.startswith("CMakeFiles")
+        ]
+
     def get_module(self, addr: int) -> Optional[str]:
-        for start, size, module_id in self.section_contrib:
-            if start <= addr < start + size:
-                if (module := self.module_lookup.get(module_id)) is not None:
-                    return module
+        i = bisect.bisect_left(self.contrib_starts, addr)
+        # If the addr matches the section contribution start, we are in the
+        # right spot. Otherwise, we need to subtract one here.
+        # We don't want the insertion point given by bisect, but the
+        # section contribution that contains the address.
+
+        (potential_start, _, __) = self.section_contrib[i]
+        if potential_start != addr:
+            i -= 1
+
+        # Safety catch: clamp to range of indices from section_contrib.
+        i = max(0, min(i, len(self.section_contrib) - 1))
+
+        (start, size, module_id) = self.section_contrib[i]
+        if start <= addr < start + size:
+            if (module := self.module_lookup.get(module_id)) is not None:
+                return module
 
         return None
 
@@ -58,6 +87,9 @@ def print_sections(sections):
     print()
 
 
+ALLOWED_TYPE_ABBREVIATIONS = ["fun", "dat", "poi", "str", "vta"]
+
+
 def match_type_abbreviation(mtype: Optional[SymbolType]) -> str:
     """Return abbreviation of the given SymbolType name"""
     if mtype is None:
@@ -66,6 +98,42 @@ def match_type_abbreviation(mtype: Optional[SymbolType]) -> str:
     return mtype.name.lower()[:3]
 
 
+def get_cmakefiles_prefix(module: str) -> str:
+    """For the given .obj, get the "CMakeFiles/something.dir/" prefix.
+    For lack of a better option, this is the library for this module."""
+    if module.startswith("CMakeFiles"):
+        return "/".join(module.split("/", 2)[:2]) + "/"
+
+    return module
+
+
+def truncate_module_name(prefix: str, module: str) -> str:
+    """Remove the CMakeFiles prefix and the .obj suffix for the given module.
+    Input: CMakeFiles/lego1.dir/, CMakeFiles/lego1.dir/LEGO1/define.cpp.obj
+    Output: LEGO1/define.cpp"""
+
+    if module.startswith(prefix):
+        module = module[len(prefix) :]
+
+    if module.endswith(".obj"):
+        module = module[:-4]
+
+    return module
+
+
+def avg_remove_outliers(entries: List[int]) -> int:
+    """Compute the average from this list of entries (addresses)
+    after removing outlier values."""
+
+    if len(entries) == 1:
+        return entries[0]
+
+    avg = statistics.mean(entries)
+    sd = statistics.pstdev(entries)
+
+    return int(statistics.mean([e for e in entries if abs(e - avg) <= 2 * sd]))
+
+
 RoadmapRow = namedtuple(
     "RoadmapRow",
     [
@@ -82,6 +150,144 @@ def match_type_abbreviation(mtype: Optional[SymbolType]) -> str:
 )
 
 
+class DeltaCollector:
+    """Reads each row of the results and aggregates information about the
+    placement of each module."""
+
+    def __init__(self, match_type: str = "fun") -> None:
+        # The displacement for each symbol from each module
+        self.disp_map = {}
+
+        # Each address for each module
+        self.addresses = {}
+
+        # The earliest address for each module
+        self.earliest = {}
+
+        # String abbreviation for which symbol type we are checking
+        self.match_type = "fun"
+
+        match_type = str(match_type).strip().lower()[:3]
+        if match_type in ALLOWED_TYPE_ABBREVIATIONS:
+            self.match_type = match_type
+
+    def read_row(self, row: RoadmapRow):
+        if row.module is None:
+            return
+
+        if row.sym_type != self.match_type:
+            return
+
+        if row.orig_addr is not None:
+            if row.module not in self.addresses:
+                self.addresses[row.module] = []
+
+            self.addresses[row.module].append(row.orig_addr)
+
+            if row.orig_addr < self.earliest.get(row.module, 0xFFFFFFFFF):
+                self.earliest[row.module] = row.orig_addr
+
+        if row.displacement is not None:
+            if row.module not in self.disp_map:
+                self.disp_map[row.module] = []
+
+            self.disp_map[row.module].append(row.displacement)
+
+    def iter_sorted(self) -> Iterator[Tuple[int, int]]:
+        """Compute the average address for each module, then generate them
+        in ascending order."""
+        avg_address = {
+            mod: avg_remove_outliers(values) for mod, values in self.addresses.items()
+        }
+        for mod, avg in sorted(avg_address.items(), key=lambda x: x[1]):
+            yield (avg, mod)
+
+
+def suggest_order(results: List[RoadmapRow], module_map: ModuleMap, match_type: str):
+    """Suggest the order of modules for CMakeLists.txt"""
+
+    dc = DeltaCollector(match_type)
+    for row in results:
+        dc.read_row(row)
+
+    # First, show the order of .obj files for the "CMake Modules"
+    # Meaning: the modules where the .obj file begins with "CMakeFiles".
+    # These are the libraries where we directly control the order.
+    # The library name (from cvdump) doesn't make it obvious that these are
+    # our libraries so we derive the name based on the CMakeFiles prefix.
+    leftover_modules = set(module_map.get_all_cmake_modules())
+
+    # A little convoluted, but we want to take the first two tokens
+    # of the string with '/' as the delimiter.
+    # i.e. CMakeFiles/isle.dir/
+    # The idea is to print exactly what appears in CMakeLists.txt.
+    cmake_prefixes = sorted(set(get_cmakefiles_prefix(mod) for mod in leftover_modules))
+
+    # Save this off because we'll use it again later.
+    computed_order = list(dc.iter_sorted())
+
+    for prefix in cmake_prefixes:
+        print(prefix)
+
+        last_earliest = 0
+        # Show modules ordered by the computed average of addresses
+        for _, module in computed_order:
+            if not module.startswith(prefix):
+                continue
+
+            leftover_modules.remove(module)
+
+            avg_displacement = None
+            displacements = dc.disp_map.get(module)
+            if displacements is not None and len(displacements) > 0:
+                avg_displacement = int(statistics.mean(displacements))
+
+            # Call attention to any modules where ordering by earliest
+            # address is different from the computed order we display.
+            earliest = dc.earliest.get(module)
+            ooo_mark = "*" if earliest < last_earliest else " "
+            last_earliest = earliest
+
+            code_file = truncate_module_name(prefix, module)
+            print(f"0x{earliest:08x}{ooo_mark} {avg_displacement:10}  {code_file}")
+
+        # These modules are included in the final binary (in some form) but
+        # don't contribute any symbols of the type we are checking.
+        # n.b. There could still be other modules that are part of
+        # CMakeLists.txt but are not included in the pdb for whatever reason.
+        # In other words: don't take the list we provide as the final word on
+        # what should or should not be included.
+        # This is merely a suggestion of the order.
+        for module in leftover_modules:
+            if not module.startswith(prefix):
+                continue
+
+            # aligned with previous print
+            code_file = truncate_module_name(prefix, module)
+            print(f"      no suggestion     {code_file}")
+
+        print()
+
+    # Now display the order of all libaries in the final file.
+    library_order = {}
+
+    for start, module in computed_order:
+        lib = module_map.get_lib_for_module(module)
+        if lib is None:
+            lib = get_cmakefiles_prefix(module)
+
+        if start < library_order.get(lib, 0xFFFFFFFFF):
+            library_order[lib] = start
+
+    print("Library order (average address shown):")
+    for lib, start in sorted(library_order.items(), key=lambda x: x[1]):
+        # Strip off any OS path for brevity
+        if not lib.startswith("CMakeFiles"):
+            lib = os.path.basename(lib)
+
+        print(f"{lib:40} {start:08x}")
+
+
 def print_text_report(results: List[RoadmapRow]):
     """Print the result with original and recomp addresses."""
     for row in results:
@@ -150,6 +356,13 @@ def parse_args() -> argparse.Namespace:
     parser.add_argument(
         "--verbose", "-v", action="store_true", help="Show recomp addresses in output"
     )
+    parser.add_argument(
+        "--order",
+        const="fun",
+        nargs="?",
+        type=str,
+        help="Show suggested order of modules (using the specified symbol type)",
+    )
 
     (args, _) = parser.parse_known_args()
 
@@ -245,6 +458,10 @@ def to_roadmap_row(match):
 
         results = list(map(to_roadmap_row, engine.get_all()))
 
+        if args.order is not None:
+            suggest_order(results, module_map, args.order)
+            return
+
         if args.csv is None:
             if args.verbose:
                 print("ORIG sections:")

From 97d1ba7c711f290a6bd9ef97ee730ca55ebf4d1f Mon Sep 17 00:00:00 2001
From: MS <disinvite@users.noreply.github.com>
Date: Wed, 31 Jan 2024 17:39:50 -0500
Subject: [PATCH 200/210] MxTransitionManager corrections (#513)

---
 .../src/video/mxtransitionmanager.cpp         | 55 +++++++------------
 1 file changed, 21 insertions(+), 34 deletions(-)

diff --git a/LEGO1/lego/legoomni/src/video/mxtransitionmanager.cpp b/LEGO1/lego/legoomni/src/video/mxtransitionmanager.cpp
index 677837bf..d0b3aa96 100644
--- a/LEGO1/lego/legoomni/src/video/mxtransitionmanager.cpp
+++ b/LEGO1/lego/legoomni/src/video/mxtransitionmanager.cpp
@@ -223,10 +223,12 @@ void MxTransitionManager::TransitionDissolve()
 
 				// Set the chosen pixel to black
 				if (ddsd.ddpfPixelFormat.dwRGBBitCount == 8) {
-					((MxU8*) ddsd.lpSurface)[row * ddsd.lPitch + xShift] = 0;
+					MxU8* surf = (MxU8*) ddsd.lpSurface + ddsd.lPitch * row + xShift;
+					*surf = 0;
 				}
 				else {
-					((MxU16*) ddsd.lpSurface)[row * ddsd.lPitch + xShift] = 0;
+					MxU8* surf = (MxU8*) ddsd.lpSurface + ddsd.lPitch * row + xShift * 2;
+					*(MxU16*) surf = 0;
 				}
 			}
 		}
@@ -296,53 +298,38 @@ void MxTransitionManager::TransitionPixelation()
 				continue;
 
 			for (MxS32 row = 0; row < 48; row++) {
-				MxS32 xShift = 10 * ((m_randomShift[row] + col) % 64);
-
 				// To do the pixelation, we subdivide the 640x480 surface into
 				// 10x10 pixel blocks. At the chosen block, we sample the top-leftmost
 				// color and set the other 99 pixels to that value.
 
-				// Find the pixel to sample
-				MxS32 sampleOfs = 10 * row * ddsd.lPitch + xShift;
+				// First, get the offset of the 10x10 block that we will sample for this row.
+				MxS32 xShift = 10 * ((m_randomShift[row] + col) % 64);
+
+				// Combine xShift with this value to target the correct location in the buffer.
 				MxS32 bytesPerPixel = ddsd.ddpfPixelFormat.dwRGBBitCount / 8;
 
-				// Save this cast from void* to save time.
-				// Seems to help accuracy doing it this way.
-				MxU8* surface = (MxU8*) ddsd.lpSurface;
-				MxU8* source = surface + sampleOfs * bytesPerPixel;
+				// Seek to the sample position.
+				MxU8* source = (MxU8*) ddsd.lpSurface + 10 * row * ddsd.lPitch + bytesPerPixel * xShift;
 
+				// Sample byte or word depending on display mode.
 				MxU32 sample = bytesPerPixel == 1 ? *source : *(MxU16*) source;
 
+				// For each of the 10 rows in the 10x10 square:
 				for (MxS32 k = 10 * row; k < 10 * row + 10; k++) {
 					if (ddsd.ddpfPixelFormat.dwRGBBitCount == 8) {
-						// TODO: This block and the next don't match, but they are
-						// hopefully correct in principle.
-						MxU16 colorWord = MAKEWORD(LOBYTE(sample), LOBYTE(sample));
-						MxU32 newColor = MAKELONG(colorWord, colorWord);
+						MxU8* pos = (MxU8*) ddsd.lpSurface + k * ddsd.lPitch + xShift;
 
-						MxU8* pos = surface + k * ddsd.lPitch + xShift;
-						MxU32* dest = (MxU32*) pos;
-
-						// Sets 10 pixels (10 bytes)
-						dest[0] = newColor;
-						dest[1] = newColor;
-						MxU16* half = (MxU16*) (dest + 2);
-						*half = newColor;
+						for (MxS32 tt = 0; tt < 10; tt++) {
+							pos[tt] = sample;
+						}
 					}
 					else {
-						MxU32 newColor = MAKELONG(sample, sample);
+						// Need to double xShift because it measures pixels not bytes
+						MxU16* pos = (MxU16*) ((MxU8*) ddsd.lpSurface + k * ddsd.lPitch + 2 * xShift);
 
-						// You might expect a cast to MxU16* instead, but lPitch is
-						// bytes/scanline, not pixels/scanline. Therefore, we just
-						// need to double the xShift to get to the right spot.
-						MxU8* pos = surface + k * ddsd.lPitch + 2 * xShift;
-						MxU32* dest = (MxU32*) pos;
-						// Sets 10 pixels (20 bytes)
-						dest[0] = newColor;
-						dest[1] = newColor;
-						dest[2] = newColor;
-						dest[3] = newColor;
-						dest[4] = newColor;
+						for (MxS32 tt = 0; tt < 10; tt++) {
+							pos[tt] = sample;
+						}
 					}
 				}
 			}

From 9e686e2a87f841d1dee0543dd65c8ce197c41bd2 Mon Sep 17 00:00:00 2001
From: Anonymous Maarten <madebr@users.noreply.github.com>
Date: Thu, 1 Feb 2024 21:42:10 +0100
Subject: [PATCH 201/210] cmake+ci: run clang-tidy (#512)

* cmake+ci: run clang-tidy

* Remove DESCRIPTION from LEGO1/LegoOmni.mingw.def

* Add initial .clang-tidy and fixes

* fix file perms

* Comment out DESCRIPTION

* Remove LegoEntity::~LegoEntity and MxPresenter::~MxPresenter from mingw's LEGO1.def

* Looks like clang is allergic to the libs in the directx5 SDK

* Update .clang-tidy

* Fix typo in .clang-tidy

* Attempt to generate an action error

* Revert "Attempt to generate an action error"

This reverts commit 96c4c65fedbc4102837f4bcbbb9ee83a7d14cba3.

* cmake: test with -Wparentheses + optionally with -Werror

* ci: -k0 is a Ninja argument

* Use -Werror only for msys2 builds

* cmake: only emit warnings for specific warnings

* cmake: and don't do -Werror/-WX anymore

* Fix warnings

* Fix mingw warnings

---------

Co-authored-by: Christian Semmler <mail@csemmler.com>
---
 .clang-tidy                                   |   6 +
 .github/workflows/build.yml                   |  23 ++-
 CMakeLists.txt                                |  43 ++++-
 ISLE/isleapp.cpp                              |  12 +-
 LEGO1/LegoOmni.mingw.def                      |   8 +-
 LEGO1/lego/legoomni/include/act1state.h       |   8 +-
 LEGO1/lego/legoomni/include/act2brick.h       |  12 +-
 .../lego/legoomni/include/act2policestation.h |   6 +-
 LEGO1/lego/legoomni/include/act3.h            |  24 +--
 LEGO1/lego/legoomni/include/act3actor.h       |   2 +-
 LEGO1/lego/legoomni/include/act3shark.h       |  12 +-
 LEGO1/lego/legoomni/include/act3state.h       |   6 +-
 LEGO1/lego/legoomni/include/ambulance.h       |  22 +--
 .../legoomni/include/ambulancemissionstate.h  |   6 +-
 LEGO1/lego/legoomni/include/animstate.h       |  10 +-
 .../lego/legoomni/include/beachhouseentity.h  |   4 +-
 LEGO1/lego/legoomni/include/bike.h            |  12 +-
 LEGO1/lego/legoomni/include/buildingentity.h  |   8 +-
 LEGO1/lego/legoomni/include/bumpbouy.h        |  14 +-
 LEGO1/lego/legoomni/include/carrace.h         |  18 +-
 LEGO1/lego/legoomni/include/carracestate.h    |   4 +-
 LEGO1/lego/legoomni/include/doors.h           |  10 +-
 LEGO1/lego/legoomni/include/dunebuggy.h       |  16 +-
 LEGO1/lego/legoomni/include/elevatorbottom.h  |  18 +-
 LEGO1/lego/legoomni/include/gasstation.h      |  20 +--
 .../lego/legoomni/include/gasstationentity.h  |   4 +-
 LEGO1/lego/legoomni/include/gasstationstate.h |   6 +-
 LEGO1/lego/legoomni/include/gifmanager.h      |   2 +-
 LEGO1/lego/legoomni/include/helicopter.h      |  20 +--
 LEGO1/lego/legoomni/include/helicopterstate.h |   8 +-
 LEGO1/lego/legoomni/include/historybook.h     |  14 +-
 LEGO1/lego/legoomni/include/hospital.h        |  20 +--
 LEGO1/lego/legoomni/include/hospitalentity.h  |   4 +-
 LEGO1/lego/legoomni/include/hospitalstate.h   |   8 +-
 LEGO1/lego/legoomni/include/infocenter.h      |  20 +--
 LEGO1/lego/legoomni/include/infocenterdoor.h  |  18 +-
 .../lego/legoomni/include/infocenterentity.h  |   4 +-
 LEGO1/lego/legoomni/include/infocenterstate.h |   8 +-
 LEGO1/lego/legoomni/include/isle.h            |  22 +--
 LEGO1/lego/legoomni/include/isleactor.h       |   8 +-
 LEGO1/lego/legoomni/include/islepathactor.h   |  12 +-
 LEGO1/lego/legoomni/include/jetski.h          |  14 +-
 LEGO1/lego/legoomni/include/jetskirace.h      |   4 +-
 LEGO1/lego/legoomni/include/jetskiracestate.h |   4 +-
 LEGO1/lego/legoomni/include/jukebox.h         |  18 +-
 LEGO1/lego/legoomni/include/jukeboxentity.h   |   8 +-
 LEGO1/lego/legoomni/include/jukeboxstate.h    |   6 +-
 .../legoomni/include/lego3dwavepresenter.h    |  12 +-
 LEGO1/lego/legoomni/include/legoact2.h        |  16 +-
 LEGO1/lego/legoomni/include/legoact2state.h   |   8 +-
 .../include/legoactioncontrolpresenter.h      |  14 +-
 LEGO1/lego/legoomni/include/legoactor.h       |  10 +-
 .../legoomni/include/legoactorpresenter.h     |  12 +-
 .../legoomni/include/legoanimationmanager.h   |  10 +-
 .../legoomni/include/legoanimmmpresenter.h    |  24 +--
 .../lego/legoomni/include/legoanimpresenter.h |  36 ++--
 .../legoomni/include/legobackgroundcolor.h    |   2 +-
 .../legoomni/include/legobuildingmanager.h    |   6 +-
 LEGO1/lego/legoomni/include/legocachesound.h  |   6 +-
 .../legoomni/include/legocachesoundlist.h     |   2 +-
 .../legoomni/include/legocameracontroller.h   |   8 +-
 LEGO1/lego/legoomni/include/legocarbuild.h    |  20 +--
 .../include/legocarbuildanimpresenter.h       |  16 +-
 .../lego/legoomni/include/legocarraceactor.h  |  18 +-
 .../legoomni/include/legocontrolmanager.h     |   8 +-
 LEGO1/lego/legoomni/include/legoentity.h      |   4 +-
 LEGO1/lego/legoomni/include/legoentitylist.h  |   2 +-
 .../legoomni/include/legoentitypresenter.h    |  16 +-
 .../include/legoeventnotificationparam.h      |   2 +-
 .../include/legoflctexturepresenter.h         |   6 +-
 .../legoomni/include/legofullscreenmovie.h    |   2 +-
 .../legoomni/include/legohideanimpresenter.h  |  14 +-
 .../lego/legoomni/include/legoinputmanager.h  |  10 +-
 LEGO1/lego/legoomni/include/legojetski.h      |  16 +-
 .../legoomni/include/legojetskiraceactor.h    |   8 +-
 .../include/legoloadcachesoundpresenter.h     |  10 +-
 .../include/legolocomotionanimpresenter.h     |  21 +--
 .../include/legoloopinganimpresenter.h        |   4 +-
 .../legoomni/include/legometerpresenter.h     |   8 +-
 .../legoomni/include/legomodelpresenter.h     |   6 +-
 .../lego/legoomni/include/legonavcontroller.h |   4 +-
 .../lego/legoomni/include/legoobjectfactory.h |   4 +-
 LEGO1/lego/legoomni/include/legoomni.h        |  28 +--
 .../legoomni/include/legopalettepresenter.h   |   6 +-
 .../lego/legoomni/include/legopartpresenter.h |   6 +-
 LEGO1/lego/legoomni/include/legopathactor.h   |   4 +-
 .../legoomni/include/legopathcontroller.h     |   4 +-
 .../legoomni/include/legopathcontrollerlist.h |   2 +-
 .../lego/legoomni/include/legopathpresenter.h |  14 +-
 .../legoomni/include/legophonemepresenter.h   |  10 +-
 .../lego/legoomni/include/legoplantmanager.h  |   4 +-
 .../include/legopointofviewcontroller.h       |  18 +-
 LEGO1/lego/legoomni/include/legorace.h        |  22 +--
 LEGO1/lego/legoomni/include/legoraceactor.h   |  14 +-
 LEGO1/lego/legoomni/include/legoracecar.h     |  16 +-
 .../lego/legoomni/include/legosoundmanager.h  |   8 +-
 LEGO1/lego/legoomni/include/legostate.h       |   6 +-
 .../legoomni/include/legotexturepresenter.h   |  12 +-
 .../legoomni/include/legounknown100d9d00.h    |   2 +-
 .../legoomni/include/legovehiclebuildstate.h  |   6 +-
 .../lego/legoomni/include/legovideomanager.h  |  15 +-
 LEGO1/lego/legoomni/include/legoworld.h       |  22 +--
 LEGO1/lego/legoomni/include/legoworldlist.h   |   5 +-
 .../legoomni/include/legoworldpresenter.h     |  16 +-
 LEGO1/lego/legoomni/include/motocycle.h       |  16 +-
 .../include/mxbackgroundaudiomanager.h        |  10 +-
 .../include/mxcompositemediapresenter.h       |  14 +-
 .../legoomni/include/mxcontrolpresenter.h     |  28 +--
 .../legoomni/include/mxtransitionmanager.h    |   8 +-
 LEGO1/lego/legoomni/include/pizza.h           |   8 +-
 .../lego/legoomni/include/pizzamissionstate.h |   6 +-
 LEGO1/lego/legoomni/include/pizzeria.h        |   6 +-
 LEGO1/lego/legoomni/include/pizzeriastate.h   |   6 +-
 LEGO1/lego/legoomni/include/police.h          |  18 +-
 LEGO1/lego/legoomni/include/policeentity.h    |   4 +-
 LEGO1/lego/legoomni/include/policestate.h     |   8 +-
 LEGO1/lego/legoomni/include/racecar.h         |  10 +-
 .../lego/legoomni/include/racestandsentity.h  |   4 +-
 LEGO1/lego/legoomni/include/racestate.h       |   6 +-
 LEGO1/lego/legoomni/include/radio.h           |   8 +-
 LEGO1/lego/legoomni/include/radiostate.h      |   6 +-
 .../lego/legoomni/include/registrationbook.h  |  18 +-
 LEGO1/lego/legoomni/include/score.h           |  18 +-
 LEGO1/lego/legoomni/include/scorestate.h      |   8 +-
 LEGO1/lego/legoomni/include/skateboard.h      |  14 +-
 LEGO1/lego/legoomni/include/towtrack.h        |  20 +--
 .../legoomni/include/towtrackmissionstate.h   |   6 +-
 .../src/audio/mxbackgroundaudiomanager.cpp    |   9 +-
 LEGO1/lego/legoomni/src/build/helicopter.cpp  |  60 ++++---
 LEGO1/lego/legoomni/src/common/gifmanager.cpp |   3 +-
 .../src/common/legoactioncontrolpresenter.cpp |   3 +-
 .../src/common/legobackgroundcolor.cpp        |  12 +-
 .../legoomni/src/common/legogamestate.cpp     |  42 +++--
 .../src/common/legounksavedatawriter.cpp      |  30 ++--
 LEGO1/lego/legoomni/src/common/legoutil.cpp   |  36 ++--
 .../src/common/mxcompositemediapresenter.cpp  |  21 ++-
 .../src/control/legocontrolmanager.cpp        |   3 +-
 .../src/control/mxcontrolpresenter.cpp        |   8 +-
 .../src/entity/legocameracontroller.cpp       |  15 +-
 LEGO1/lego/legoomni/src/entity/legoentity.cpp |   6 +-
 .../legoomni/src/entity/legonavcontroller.cpp |  21 ++-
 LEGO1/lego/legoomni/src/entity/legoworld.cpp  |  99 +++++++----
 .../src/entity/legoworldpresenter.cpp         |   3 +-
 .../legoomni/src/infocenter/infocenter.cpp    |   6 +-
 LEGO1/lego/legoomni/src/infocenter/score.cpp  |  30 ++--
 .../legoomni/src/input/legoinputmanager.cpp   |  33 ++--
 .../lego/legoomni/src/isle/islepathactor.cpp  |   3 +-
 LEGO1/lego/legoomni/src/isle/radio.cpp        |   3 +-
 LEGO1/lego/legoomni/src/isle/radiostate.cpp   |   6 +-
 LEGO1/lego/legoomni/src/main/legoomni.cpp     |  27 +--
 .../legoomni/src/paths/legopathpresenter.cpp  |   9 +-
 .../src/pizzeria/pizzamissionstate.cpp        |   6 +-
 LEGO1/lego/legoomni/src/race/racestate.cpp    |   6 +-
 .../src/video/legohideanimpresenter.cpp       |   6 +-
 .../legoomni/src/video/legovideomanager.cpp   |  81 ++++++---
 .../src/video/mxtransitionmanager.cpp         |  15 +-
 LEGO1/lego/sources/3dmanager/lego3dview.cpp   |   3 +-
 LEGO1/lego/sources/3dmanager/lego3dview.h     |   4 +-
 LEGO1/lego/sources/3dmanager/legoview1.cpp    |   3 +-
 LEGO1/lego/sources/3dmanager/legoview1.h      |  10 +-
 LEGO1/lego/sources/misc/legostorage.cpp       |   9 +-
 LEGO1/lego/sources/misc/legostorage.h         |  18 +-
 LEGO1/lego/sources/roi/legoroi.cpp            |   6 +-
 LEGO1/lego/sources/roi/legoroi.h              |   4 +-
 LEGO1/mxdirectx/mxdirect3d.cpp                | 165 +++++++++++------
 LEGO1/mxdirectx/mxdirect3d.h                  |  10 +-
 LEGO1/mxdirectx/mxdirectdraw.cpp              |   9 +-
 LEGO1/mxgeometry/mxgeometry3d.h               |   3 +-
 LEGO1/mxgeometry/mxmatrix.h                   |   2 +-
 .../omni/include/mxactionnotificationparam.h  |  19 +-
 LEGO1/omni/include/mxaudiomanager.h           |   6 +-
 LEGO1/omni/include/mxaudiopresenter.h         |   4 +-
 LEGO1/omni/include/mxbitmap.h                 |  23 ++-
 LEGO1/omni/include/mxcollection.h             |   2 +-
 LEGO1/omni/include/mxcompositepresenter.h     |  27 +--
 LEGO1/omni/include/mxdiskstreamcontroller.h   |  22 +--
 LEGO1/omni/include/mxdiskstreamprovider.h     |  18 +-
 LEGO1/omni/include/mxdisplaysurface.h         |   2 +-
 LEGO1/omni/include/mxdsaction.h               |  34 ++--
 LEGO1/omni/include/mxdsactionlist.h           |   2 +-
 LEGO1/omni/include/mxdsanim.h                 |   8 +-
 LEGO1/omni/include/mxdsbuffer.h               |   4 +-
 LEGO1/omni/include/mxdschunk.h                |   9 +-
 LEGO1/omni/include/mxdsevent.h                |   8 +-
 LEGO1/omni/include/mxdsfile.h                 |  18 +-
 LEGO1/omni/include/mxdsmediaaction.h          |  14 +-
 LEGO1/omni/include/mxdsmultiaction.h          |  22 +--
 LEGO1/omni/include/mxdsobject.h               |   6 +-
 LEGO1/omni/include/mxdsobjectaction.h         |   8 +-
 LEGO1/omni/include/mxdsparallelaction.h       |  12 +-
 LEGO1/omni/include/mxdsselectaction.h         |  12 +-
 LEGO1/omni/include/mxdsserialaction.h         |  12 +-
 LEGO1/omni/include/mxdssound.h                |  12 +-
 LEGO1/omni/include/mxdssource.h               |   6 +-
 LEGO1/omni/include/mxdsstill.h                |   8 +-
 LEGO1/omni/include/mxdsstreamingaction.h      |   4 +-
 LEGO1/omni/include/mxdssubscriber.h           |   6 +-
 LEGO1/omni/include/mxentity.h                 |   6 +-
 LEGO1/omni/include/mxeventmanager.h           |   4 +-
 LEGO1/omni/include/mxeventpresenter.h         |  16 +-
 LEGO1/omni/include/mxflcpresenter.h           |  14 +-
 LEGO1/omni/include/mxhashtable.h              |  17 +-
 LEGO1/omni/include/mxlist.h                   |  83 ++++++---
 LEGO1/omni/include/mxloopingflcpresenter.h    |  14 +-
 LEGO1/omni/include/mxloopingmidipresenter.h   |  10 +-
 LEGO1/omni/include/mxloopingsmkpresenter.h    |  16 +-
 LEGO1/omni/include/mxmediamanager.h           |   4 +-
 LEGO1/omni/include/mxmediapresenter.h         |  24 +--
 LEGO1/omni/include/mxmidipresenter.h          |  22 +--
 LEGO1/omni/include/mxmusicmanager.h           |   6 +-
 LEGO1/omni/include/mxmusicpresenter.h         |  10 +-
 LEGO1/omni/include/mxnextactiondatastart.h    |   4 +-
 LEGO1/omni/include/mxnotificationmanager.h    |   4 +-
 LEGO1/omni/include/mxobjectfactory.h          |   4 +-
 LEGO1/omni/include/mxomni.h                   |   4 +-
 LEGO1/omni/include/mxpalette.h                |   2 +-
 LEGO1/omni/include/mxpresenter.h              |   8 +-
 LEGO1/omni/include/mxpresenterlist.h          |   2 +-
 LEGO1/omni/include/mxramstreamcontroller.h    |  10 +-
 LEGO1/omni/include/mxramstreamprovider.h      |  16 +-
 LEGO1/omni/include/mxregion.h                 |   2 +-
 LEGO1/omni/include/mxregioncursor.h           |   2 +-
 LEGO1/omni/include/mxsmkpresenter.h           |  20 +--
 LEGO1/omni/include/mxsoundmanager.h           |   6 +-
 LEGO1/omni/include/mxsoundpresenter.h         |  10 +-
 LEGO1/omni/include/mxstillpresenter.h         |  32 ++--
 LEGO1/omni/include/mxstreamchunk.h            |   6 +-
 LEGO1/omni/include/mxstreamchunklist.h        |   2 +-
 LEGO1/omni/include/mxstreamcontroller.h       |   6 +-
 LEGO1/omni/include/mxstreamer.h               |  10 +-
 LEGO1/omni/include/mxstreamlist.h             |   6 +-
 LEGO1/omni/include/mxstreamprovider.h         |   4 +-
 LEGO1/omni/include/mxstring.h                 |   2 +-
 LEGO1/omni/include/mxthread.h                 |   2 +-
 LEGO1/omni/include/mxticklemanager.h          |   4 +-
 LEGO1/omni/include/mxtimer.h                  |   6 +-
 LEGO1/omni/include/mxvariabletable.h          |   4 +-
 LEGO1/omni/include/mxvideomanager.h           |   6 +-
 LEGO1/omni/include/mxvideopresenter.h         |  26 +--
 LEGO1/omni/include/mxwavepresenter.h          |  34 ++--
 LEGO1/omni/src/action/mxdsaction.cpp          |  45 +++--
 LEGO1/omni/src/action/mxdsanim.cpp            |   6 +-
 LEGO1/omni/src/action/mxdsevent.cpp           |   6 +-
 LEGO1/omni/src/action/mxdsmediaaction.cpp     |  21 ++-
 LEGO1/omni/src/action/mxdsmultiaction.cpp     |  33 ++--
 LEGO1/omni/src/action/mxdsobject.cpp          |  15 +-
 LEGO1/omni/src/action/mxdsobjectaction.cpp    |   6 +-
 LEGO1/omni/src/action/mxdsparallelaction.cpp  |  24 ++-
 LEGO1/omni/src/action/mxdsselectaction.cpp    |  24 ++-
 LEGO1/omni/src/action/mxdsserialaction.cpp    |  18 +-
 LEGO1/omni/src/action/mxdssound.cpp           |   6 +-
 LEGO1/omni/src/action/mxdsstill.cpp           |   6 +-
 LEGO1/omni/src/action/mxdsstreamingaction.cpp |  18 +-
 LEGO1/omni/src/audio/mxaudiomanager.cpp       |   9 +-
 .../omni/src/audio/mxloopingmidipresenter.cpp |   9 +-
 LEGO1/omni/src/audio/mxmidipresenter.cpp      |  21 ++-
 LEGO1/omni/src/audio/mxmusicmanager.cpp       |  39 ++--
 LEGO1/omni/src/audio/mxsoundmanager.cpp       |  60 ++++---
 LEGO1/omni/src/audio/mxsoundpresenter.cpp     |   6 +-
 LEGO1/omni/src/audio/mxwavepresenter.cpp      |  57 ++++--
 LEGO1/omni/src/common/mxatomid.cpp            |  18 +-
 LEGO1/omni/src/common/mxatomidcounter.cpp     |   3 +-
 .../omni/src/common/mxcompositepresenter.cpp  |  42 +++--
 LEGO1/omni/src/common/mxmediamanager.cpp      |  15 +-
 LEGO1/omni/src/common/mxmediapresenter.cpp    |  39 ++--
 LEGO1/omni/src/common/mxpresenter.cpp         |  27 ++-
 LEGO1/omni/src/common/mxticklemanager.cpp     |   9 +-
 LEGO1/omni/src/common/mxutil.cpp              |  13 +-
 LEGO1/omni/src/common/mxvariabletable.cpp     |   3 +-
 LEGO1/omni/src/event/mxeventmanager.cpp       |  18 +-
 LEGO1/omni/src/event/mxeventpresenter.cpp     |  12 +-
 LEGO1/omni/src/main/mxomni.cpp                |  59 ++++---
 .../omni/src/notify/mxnotificationmanager.cpp |  13 +-
 .../src/stream/mxdiskstreamcontroller.cpp     |  30 ++--
 .../omni/src/stream/mxdiskstreamprovider.cpp  |  51 ++++--
 LEGO1/omni/src/stream/mxdsbuffer.cpp          |  26 ++-
 LEGO1/omni/src/stream/mxdschunk.cpp           |   3 +-
 LEGO1/omni/src/stream/mxdsfile.cpp            |   3 +-
 LEGO1/omni/src/stream/mxdssubscriber.cpp      |  36 ++--
 LEGO1/omni/src/stream/mxioinfo.cpp            |  21 ++-
 LEGO1/omni/src/stream/mxramstreamprovider.cpp |  15 +-
 LEGO1/omni/src/stream/mxstreamcontroller.cpp  |  48 +++--
 LEGO1/omni/src/stream/mxstreamer.cpp          |   9 +-
 LEGO1/omni/src/stream/mxstreamlist.cpp        |   6 +-
 LEGO1/omni/src/system/mxautolocker.cpp        |   6 +-
 LEGO1/omni/src/system/mxsemaphore.cpp         |   3 +-
 LEGO1/omni/src/system/mxthread.cpp            |   8 +-
 LEGO1/omni/src/video/mxbitmap.cpp             |  39 ++--
 LEGO1/omni/src/video/mxdisplaysurface.cpp     |  93 ++++++----
 LEGO1/omni/src/video/mxflcpresenter.cpp       |   6 +-
 .../omni/src/video/mxloopingflcpresenter.cpp  |  21 ++-
 .../omni/src/video/mxloopingsmkpresenter.cpp  |  18 +-
 LEGO1/omni/src/video/mxpalette.cpp            |  33 ++--
 LEGO1/omni/src/video/mxregion.cpp             |  33 ++--
 LEGO1/omni/src/video/mxregioncursor.cpp       |  39 ++--
 LEGO1/omni/src/video/mxsmack.cpp              |  33 ++--
 LEGO1/omni/src/video/mxsmkpresenter.cpp       |   9 +-
 LEGO1/omni/src/video/mxstillpresenter.cpp     |  42 +++--
 LEGO1/omni/src/video/mxvideomanager.cpp       |  87 ++++++---
 LEGO1/omni/src/video/mxvideoparam.cpp         |   6 +-
 LEGO1/omni/src/video/mxvideopresenter.cpp     | 116 ++++++++----
 LEGO1/realtime/matrix.h                       |   3 +-
 LEGO1/realtime/orientableroi.cpp              |   3 +-
 LEGO1/realtime/orientableroi.h                |   6 +-
 LEGO1/realtime/vector.h                       |  42 ++---
 LEGO1/tgl/d3drm/impl.h                        | 166 +++++++++---------
 LEGO1/viewmanager/viewlodlist.h               |   5 +-
 LEGO1/viewmanager/viewroi.h                   |  16 +-
 308 files changed, 2863 insertions(+), 1995 deletions(-)
 create mode 100644 .clang-tidy

diff --git a/.clang-tidy b/.clang-tidy
new file mode 100644
index 00000000..189ddf5a
--- /dev/null
+++ b/.clang-tidy
@@ -0,0 +1,6 @@
+Checks: >
+  -*,
+  readability-braces-around-statements,
+  modernize-use-override
+WarningsAsErrors: '-*,readability-braces-around-statements,modernize-use-override'
+HeaderFilterRegex: ".*"
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a3f81642..9a21e56e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -14,18 +14,20 @@ jobs:
       matrix:
         toolchain:
         - { name: 'MSVC',           shell: 'sh',        setup-cmake: true, setup-ninja: true, setup-msvc: true }
-        - { name: 'msys2 mingw32',  shell: 'msys2 {0}', setup-msys2: true }
+        - { name: 'msys2 mingw32',  shell: 'msys2 {0}', msystem: mingw32, msys-env: mingw-w64-i686,        clang-tidy: true, werror: true }
+        - { name: 'msys2 clang32',  shell: 'msys2 {0}', msystem: clang32, msys-env: mingw-w64-clang-i686,  clang-tidy: true, werror: true, no-dx5-libs: true }
 
     steps:
       - name: Set up MSYS2
-        if: matrix.toolchain.setup-msys2
+        if: ${{ !!matrix.toolchain.msystem }}
         uses: msys2/setup-msys2@v2
         with:
-          msystem: mingw32
+          msystem: ${{ matrix.toolchain.msystem }}
           install: >-
-            mingw-w64-i686-cc
-            mingw-w64-i686-cmake
-            mingw-w64-i686-ninja
+            ${{ matrix.toolchain.msys-env }}-cc
+            ${{ matrix.toolchain.msys-env }}-cmake
+            ${{ matrix.toolchain.msys-env }}-ninja
+            ${{ matrix.toolchain.msys-env }}-clang-tools-extra
 
       - name: Setup cmake
         if: matrix.toolchain.setup-cmake
@@ -45,8 +47,13 @@ jobs:
 
       - name: Build
         run: |
-          cmake -S . -B build -DCMAKE_BUILD_TYPE=Debug -GNinja -Werror=dev
-          cmake --build build
+          cmake -S . -B build -GNinja \
+            -DCMAKE_BUILD_TYPE=Debug \
+            -DISLE_USE_DX5_LIBS=${{ !matrix.toolchain.no-dx5-libs }} \
+            -DENABLE_CLANG_TIDY=${{ !!matrix.toolchain.clang-tidy }} \
+            -DISLE_WERROR=${{ !!matrix.toolchain.werror }} \
+            -Werror=dev
+          cmake --build build -- -k0
 
   build:
     name: 'MSVC 4.20'
diff --git a/CMakeLists.txt b/CMakeLists.txt
index eeee76d5..eb509e5b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,6 +2,18 @@ cmake_minimum_required(VERSION 3.13 FATAL_ERROR)
 
 project(isle CXX)
 
+include(CheckCXXSourceCompiles)
+include(CMakeDependentOption)
+include(CMakePushCheckState)
+
+set(CMAKE_EXPORT_COMPILE_COMMANDS TRUE)
+option(ENABLE_CLANG_TIDY "Enable clang-tidy")
+if (ENABLE_CLANG_TIDY)
+    find_program(CLANG_TIDY_BIN NAMES "clang-tidy")
+    set(CMAKE_C_CLANG_TIDY "${CLANG_TIDY_BIN}")
+    set(CMAKE_CXX_CLANG_TIDY "${CLANG_TIDY_BIN}")
+endif()
+
 math(EXPR bits "8 * ${CMAKE_SIZEOF_VOID_P}")
 message(STATUS "Building ${bits}-bit LEGO Island")
 if (NOT bits EQUAL 32)
@@ -21,15 +33,44 @@ macro(register_lego1_target __target)
   list(APPEND lego1_targets ${__target})
 endmacro()
 
+function(add_cxx_warning WARNING)
+    if(ISLE_WERROR)
+        set(compiler_option "-Werror=${WARNING}")
+    else()
+        set(compiler_option "-W${WARNING}")
+    endif()
+    string(MAKE_C_IDENTIFIER "COMPILER_SUPPORTS${compiler_option}" varname)
+
+    cmake_push_check_state(RESET)
+    set(CMAKE_REQUIRED_FLAGS "${compiler_option} ")
+    if(MSVC)
+        string(APPEND CMAKE_REQUIRED_FLAGS "/WX")
+    else()
+        string(APPEND CMAKE_REQUIRED_FLAGS "-Werror")
+    endif()
+    check_cxx_source_compiles("int main() { return 0; }" ${varname})
+    cmake_pop_check_state()
+
+    if(${varname})
+        add_compile_options(${compiler_option})
+    endif()
+endfunction()
+
 message(STATUS "MSVC for decompilation: ${MSVC_FOR_DECOMP}")
 
+option(ISLE_WERROR "Treat warnings as errors" OFF)
 option(ISLE_BUILD_APP "Build ISLE.EXE application" ON)
 option(ISLE_USE_SMARTHEAP "Build with SmartHeap" ${MSVC_FOR_DECOMP})
 option(ISLE_USE_DX5 "Build with internal DirectX 5 SDK" ON)
+cmake_dependent_option(ISLE_USE_DX5_LIBS "Build with internal DirectX 5 SDK Libraries" ON ISLE_USE_DX5 OFF)
+
+add_cxx_warning(parentheses)
 
 add_library(DirectX5::DirectX5 INTERFACE IMPORTED)
 target_include_directories(DirectX5::DirectX5 INTERFACE "${CMAKE_SOURCE_DIR}/3rdparty/dx5/inc")
-target_link_directories(DirectX5::DirectX5 INTERFACE "${CMAKE_SOURCE_DIR}/3rdparty/dx5/lib")
+if(ISLE_USE_DX5_LIBS)
+    target_link_directories(DirectX5::DirectX5 INTERFACE "${CMAKE_SOURCE_DIR}/3rdparty/dx5/lib")
+endif()
 
 add_library(Smacker::Smacker STATIC IMPORTED)
 set_property(TARGET Smacker::Smacker PROPERTY IMPORTED_LOCATION "${CMAKE_SOURCE_DIR}/3rdparty/smacker/smack.lib")
diff --git a/ISLE/isleapp.cpp b/ISLE/isleapp.cpp
index 32b19164..c4897a2b 100644
--- a/ISLE/isleapp.cpp
+++ b/ISLE/isleapp.cpp
@@ -770,12 +770,15 @@ inline void IsleApp::Tick(BOOL sleepIfNotNextFrame)
 		return;
 	}
 
-	if (!Lego())
+	if (!Lego()) {
 		return;
-	if (!TickleManager())
+	}
+	if (!TickleManager()) {
 		return;
-	if (!Timer())
+	}
+	if (!Timer()) {
 		return;
+	}
 
 	MxLong currentTime = Timer()->GetRealTime();
 	if (currentTime < g_lastFrameTime) {
@@ -828,8 +831,9 @@ inline void IsleApp::Tick(BOOL sleepIfNotNextFrame)
 			this->m_gameStarted = 1;
 		}
 	}
-	else if (sleepIfNotNextFrame != 0)
+	else if (sleepIfNotNextFrame != 0) {
 		Sleep(0);
+	}
 }
 
 // FUNCTION: ISLE 0x402e80
diff --git a/LEGO1/LegoOmni.mingw.def b/LEGO1/LegoOmni.mingw.def
index d5d9e052..e2c4ce5f 100644
--- a/LEGO1/LegoOmni.mingw.def
+++ b/LEGO1/LegoOmni.mingw.def
@@ -1,6 +1,6 @@
 ; LegoOmni.def : Declares the module paarameters for the LEGO1.DLL.
 
-DESCRIPTION  " Lego OMNI Windows Dynamic Link Library"
+; DESCRIPTION  " Lego OMNI Windows Dynamic Link Library"
 
 EXPORTS
 
@@ -42,9 +42,6 @@ _Z5Timerv
 _Z7PickROIii
 _Z8Streamerv
 _Z9GameStatev
-_ZN10LegoEntityD0Ev
-_ZN10LegoEntityD1Ev
-_ZN10LegoEntityD2Ev
 _ZN10MxDSActionC1Ev
 _ZN10MxDSActionC2Ev
 _ZN10MxDSActionD0Ev
@@ -60,9 +57,6 @@ _ZN11MxPresenter4InitEv
 _ZN11MxPresenter6EnableEh
 _ZN11MxPresenter6TickleEv
 _ZN11MxPresenter9EndActionEv
-_ZN11MxPresenterD0Ev
-_ZN11MxPresenterD1Ev
-_ZN11MxPresenterD2Ev
 _ZN11MxScheduler11GetInstanceEv
 _ZN11MxScheduler17StartMultiTaskingEj
 _ZN11ViewManager9RemoveAllEP7ViewROI
diff --git a/LEGO1/lego/legoomni/include/act1state.h b/LEGO1/lego/legoomni/include/act1state.h
index 988eb8c7..1ad86c64 100644
--- a/LEGO1/lego/legoomni/include/act1state.h
+++ b/LEGO1/lego/legoomni/include/act1state.h
@@ -10,20 +10,20 @@ class Act1State : public LegoState {
 	Act1State();
 
 	// FUNCTION: LEGO1 0x100338a0
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f0154
 		return "Act1State";
 	}
 
 	// FUNCTION: LEGO1 0x100338b0
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, Act1State::ClassName()) || LegoState::IsA(p_name);
 	}
 
-	virtual MxBool SetFlag() override;                          // vtable+0x18
-	virtual MxResult VTable0x1c(LegoFile* p_legoFile) override; // vtable+0x1c
+	MxBool SetFlag() override;                          // vtable+0x18
+	MxResult VTable0x1c(LegoFile* p_legoFile) override; // vtable+0x1c
 
 	inline void SetUnknown18(MxU32 p_unk0x18) { m_unk0x18 = p_unk0x18; }
 	inline MxU32 GetUnknown18() { return m_unk0x18; }
diff --git a/LEGO1/lego/legoomni/include/act2brick.h b/LEGO1/lego/legoomni/include/act2brick.h
index 635fac2d..32856732 100644
--- a/LEGO1/lego/legoomni/include/act2brick.h
+++ b/LEGO1/lego/legoomni/include/act2brick.h
@@ -8,25 +8,25 @@
 class Act2Brick : public LegoPathActor {
 public:
 	Act2Brick();
-	virtual ~Act2Brick() override; // vtable+0x00
+	~Act2Brick() override; // vtable+0x00
 
-	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x04
-	virtual MxResult Tickle() override;               // vtable+0x08
+	MxLong Notify(MxParam& p_param) override; // vtable+0x04
+	MxResult Tickle() override;               // vtable+0x08
 
 	// FUNCTION: LEGO1 0x1007a360
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f0438
 		return "Act2Brick";
 	}
 
 	// FUNCTION: LEGO1 0x1007a370
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, Act2Brick::ClassName()) || LegoEntity::IsA(p_name);
 	}
 
-	virtual MxS32 VTable0x94() override; // vtable+0x94
+	MxS32 VTable0x94() override; // vtable+0x94
 
 	// SYNTHETIC: LEGO1 0x1007a450
 	// Act2Brick::`scalar deleting destructor'
diff --git a/LEGO1/lego/legoomni/include/act2policestation.h b/LEGO1/lego/legoomni/include/act2policestation.h
index 3fa7ebb4..02d95e5b 100644
--- a/LEGO1/lego/legoomni/include/act2policestation.h
+++ b/LEGO1/lego/legoomni/include/act2policestation.h
@@ -7,17 +7,17 @@
 // SIZE 0x68
 class Act2PoliceStation : public LegoEntity {
 public:
-	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x04
+	MxLong Notify(MxParam& p_param) override; // vtable+0x04
 
 	// FUNCTION: LEGO1 0x1000e200
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f03fc
 		return "Act2PoliceStation";
 	}
 
 	// FUNCTION: LEGO1 0x1000e210
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, Act2PoliceStation::ClassName()) || LegoEntity::IsA(p_name);
 	}
diff --git a/LEGO1/lego/legoomni/include/act3.h b/LEGO1/lego/legoomni/include/act3.h
index fe27b743..1d109052 100644
--- a/LEGO1/lego/legoomni/include/act3.h
+++ b/LEGO1/lego/legoomni/include/act3.h
@@ -9,31 +9,31 @@ class Act3 : public LegoWorld {
 public:
 	Act3();
 
-	virtual ~Act3() override; // vtable+00
+	~Act3() override; // vtable+00
 
-	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x04
-	virtual MxResult Tickle() override;               // vtable+0x08
+	MxLong Notify(MxParam& p_param) override; // vtable+0x04
+	MxResult Tickle() override;               // vtable+0x08
 
 	// FUNCTION: LEGO1 0x10072510
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f013c
 		return "Act3";
 	}
 
 	// FUNCTION: LEGO1 0x10072520
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, Act3::ClassName()) || LegoWorld::IsA(p_name);
 	}
 
-	virtual MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
-	virtual void Destroy(MxBool p_fromDestructor) override;   // vtable+0x1c
-	virtual void ReadyWorld() override;                       // vtable+0x50
-	virtual MxBool VTable0x5c() override;                     // vtable+0x5c
-	virtual void VTable0x60() override;                       // vtable+0x60
-	virtual MxBool VTable0x64() override;                     // vtable+0x64
-	virtual void VTable0x68(MxBool p_add) override;           // vtable+0x68
+	MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
+	void Destroy(MxBool p_fromDestructor) override;   // vtable+0x1c
+	void ReadyWorld() override;                       // vtable+0x50
+	MxBool VTable0x5c() override;                     // vtable+0x5c
+	void VTable0x60() override;                       // vtable+0x60
+	MxBool VTable0x64() override;                     // vtable+0x64
+	void VTable0x68(MxBool p_add) override;           // vtable+0x68
 
 	inline void SetUnkown420c(MxEntity* p_entity) { m_unk0x420c = p_entity; }
 	inline void SetUnkown4270(MxU32 p_unk0x4270) { m_unk0x4270 = p_unk0x4270; }
diff --git a/LEGO1/lego/legoomni/include/act3actor.h b/LEGO1/lego/legoomni/include/act3actor.h
index 00d06495..3d146cb7 100644
--- a/LEGO1/lego/legoomni/include/act3actor.h
+++ b/LEGO1/lego/legoomni/include/act3actor.h
@@ -8,7 +8,7 @@
 class Act3Actor : public MxCore {
 public:
 	// FUNCTION: LEGO1 0x100431b0
-	inline virtual const char* ClassName() const override
+	inline const char* ClassName() const override
 	{
 		// STRING: LEGO1 0x100f03ac
 		return "Act3Actor";
diff --git a/LEGO1/lego/legoomni/include/act3shark.h b/LEGO1/lego/legoomni/include/act3shark.h
index 5ba5a6f2..b0b26a48 100644
--- a/LEGO1/lego/legoomni/include/act3shark.h
+++ b/LEGO1/lego/legoomni/include/act3shark.h
@@ -7,22 +7,22 @@
 class Act3Shark : public LegoAnimActor {
 public:
 	// FUNCTION: LEGO1 0x100430c0
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f03a0
 		return "Act3Shark";
 	}
 
 	// FUNCTION: LEGO1 0x1001a130
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, Act3Shark::ClassName()) || LegoAnimActor::IsA(p_name);
 	}
 
-	virtual void ParseAction(char*) override;                  // vtable+0x20
-	virtual void SetWorldSpeed(MxFloat p_worldSpeed) override; // vtable+0x30
-	virtual void VTable0x70(float p_float) override;           // vtable+0x70
-	virtual void VTable0x74(Matrix4& p_transform) override;    // vtable+0x74
+	void ParseAction(char*) override;                  // vtable+0x20
+	void SetWorldSpeed(MxFloat p_worldSpeed) override; // vtable+0x30
+	void VTable0x70(float p_float) override;           // vtable+0x70
+	void VTable0x74(Matrix4& p_transform) override;    // vtable+0x74
 
 	// SYNTHETIC: LEGO1 0x10043020
 	// Act3Shark::`scalar deleting destructor'
diff --git a/LEGO1/lego/legoomni/include/act3state.h b/LEGO1/lego/legoomni/include/act3state.h
index 1c8643f7..d1c83e48 100644
--- a/LEGO1/lego/legoomni/include/act3state.h
+++ b/LEGO1/lego/legoomni/include/act3state.h
@@ -10,19 +10,19 @@ class Act3State : public LegoState {
 	inline Act3State() { m_unk0x08 = 0; }
 
 	// FUNCTION: LEGO1 0x1000e300
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f03f0
 		return "Act3State";
 	}
 
 	// FUNCTION: LEGO1 0x1000e310
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, Act3State::ClassName()) || LegoState::IsA(p_name);
 	}
 
-	virtual MxBool VTable0x14() override;
+	MxBool VTable0x14() override;
 
 	// SYNTHETIC: LEGO1 0x1000e3c0
 	// Act3State::`scalar deleting destructor'
diff --git a/LEGO1/lego/legoomni/include/ambulance.h b/LEGO1/lego/legoomni/include/ambulance.h
index 5429cc66..17175b03 100644
--- a/LEGO1/lego/legoomni/include/ambulance.h
+++ b/LEGO1/lego/legoomni/include/ambulance.h
@@ -9,29 +9,29 @@ class Ambulance : public IslePathActor {
 public:
 	Ambulance();
 
-	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x04
-	virtual MxResult Tickle() override;               // vtable+0x08
+	MxLong Notify(MxParam& p_param) override; // vtable+0x04
+	MxResult Tickle() override;               // vtable+0x08
 
 	// FUNCTION: LEGO1 0x10035fa0
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f03c4
 		return "Ambulance";
 	}
 
 	// FUNCTION: LEGO1 0x10035fb0
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, Ambulance::ClassName()) || IslePathActor::IsA(p_name);
 	}
 
-	virtual MxResult Create(MxDSAction& p_dsAction) override;            // vtable+0x18
-	virtual void Destroy(MxBool p_fromDestructor) override;              // vtable+0x1c
-	virtual void VTable0x70(float p_float) override;                     // vtable+0x70
-	virtual MxU32 VTable0xcc() override;                                 // vtable+0xcc
-	virtual MxU32 VTable0xd4(LegoControlManagerEvent& p_param) override; // vtable+0xd4
-	virtual MxU32 VTable0xdc(MxType19NotificationParam&) override;       // vtable+0xdc
-	virtual void VTable0xe4() override;                                  // vtable+0xe4
+	MxResult Create(MxDSAction& p_dsAction) override;            // vtable+0x18
+	void Destroy(MxBool p_fromDestructor) override;              // vtable+0x1c
+	void VTable0x70(float p_float) override;                     // vtable+0x70
+	MxU32 VTable0xcc() override;                                 // vtable+0xcc
+	MxU32 VTable0xd4(LegoControlManagerEvent& p_param) override; // vtable+0xd4
+	MxU32 VTable0xdc(MxType19NotificationParam&) override;       // vtable+0xdc
+	void VTable0xe4() override;                                  // vtable+0xe4
 
 	// SYNTHETIC: LEGO1 0x10036130
 	// Ambulance::`scalar deleting destructor'
diff --git a/LEGO1/lego/legoomni/include/ambulancemissionstate.h b/LEGO1/lego/legoomni/include/ambulancemissionstate.h
index cefc3c21..aca6120b 100644
--- a/LEGO1/lego/legoomni/include/ambulancemissionstate.h
+++ b/LEGO1/lego/legoomni/include/ambulancemissionstate.h
@@ -10,19 +10,19 @@ class AmbulanceMissionState : public LegoState {
 	AmbulanceMissionState();
 
 	// FUNCTION: LEGO1 0x10037600
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f00e8
 		return "AmbulanceMissionState";
 	}
 
 	// FUNCTION: LEGO1 0x10037610
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, AmbulanceMissionState::ClassName()) || LegoState::IsA(p_name);
 	}
 
-	virtual MxResult VTable0x1c(LegoFile* p_legoFile) override; // vtable+0x1c
+	MxResult VTable0x1c(LegoFile* p_legoFile) override; // vtable+0x1c
 
 	inline MxU16 GetColor(MxU8 p_id)
 	{
diff --git a/LEGO1/lego/legoomni/include/animstate.h b/LEGO1/lego/legoomni/include/animstate.h
index 8d785b11..63b884d8 100644
--- a/LEGO1/lego/legoomni/include/animstate.h
+++ b/LEGO1/lego/legoomni/include/animstate.h
@@ -8,23 +8,23 @@
 class AnimState : public LegoState {
 public:
 	AnimState();
-	virtual ~AnimState() override; // vtable+0x00
+	~AnimState() override; // vtable+0x00
 
 	// FUNCTION: LEGO1 0x10065070
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f0460
 		return "AnimState";
 	}
 
 	// FUNCTION: LEGO1 0x10065080
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, AnimState::ClassName()) || LegoState::IsA(p_name);
 	}
 
-	virtual MxBool SetFlag() override;                          // vtable+0x18
-	virtual MxResult VTable0x1c(LegoFile* p_legoFile) override; // vtable+0x1C
+	MxBool SetFlag() override;                          // vtable+0x18
+	MxResult VTable0x1c(LegoFile* p_legoFile) override; // vtable+0x1C
 
 	// SYNTHETIC: LEGO1 0x10065130
 	// AnimState::`scalar deleting destructor'
diff --git a/LEGO1/lego/legoomni/include/beachhouseentity.h b/LEGO1/lego/legoomni/include/beachhouseentity.h
index 1c92fc17..0910f49e 100644
--- a/LEGO1/lego/legoomni/include/beachhouseentity.h
+++ b/LEGO1/lego/legoomni/include/beachhouseentity.h
@@ -8,14 +8,14 @@
 class BeachHouseEntity : public BuildingEntity {
 public:
 	// FUNCTION: LEGO1 0x1000ee80
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f0314
 		return "BeachHouseEntity";
 	}
 
 	// FUNCTION: LEGO1 0x1000ee90
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, BeachHouseEntity::ClassName()) || BuildingEntity::IsA(p_name);
 	}
diff --git a/LEGO1/lego/legoomni/include/bike.h b/LEGO1/lego/legoomni/include/bike.h
index 3e3f1359..bfc634b4 100644
--- a/LEGO1/lego/legoomni/include/bike.h
+++ b/LEGO1/lego/legoomni/include/bike.h
@@ -11,22 +11,22 @@ class Bike : public IslePathActor {
 	Bike();
 
 	// FUNCTION: LEGO1 0x100766f0
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f03d0
 		return "Bike";
 	}
 
 	// FUNCTION: LEGO1 0x10076700
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, Bike::ClassName()) || IslePathActor::IsA(p_name);
 	}
 
-	virtual MxResult Create(MxDSAction& p_dsAction) override;            // vtable+0x18
-	virtual MxU32 VTable0xcc() override;                                 // vtable+0xcc
-	virtual MxU32 VTable0xd4(LegoControlManagerEvent& p_param) override; // vtable+0xd4
-	virtual void VTable0xe4() override;                                  // vtable+0xe4
+	MxResult Create(MxDSAction& p_dsAction) override;            // vtable+0x18
+	MxU32 VTable0xcc() override;                                 // vtable+0xcc
+	MxU32 VTable0xd4(LegoControlManagerEvent& p_param) override; // vtable+0xd4
+	void VTable0xe4() override;                                  // vtable+0xe4
 
 	// SYNTHETIC: LEGO1 0x10076880
 	// Bike::`scalar deleting destructor'
diff --git a/LEGO1/lego/legoomni/include/buildingentity.h b/LEGO1/lego/legoomni/include/buildingentity.h
index 490c6a0d..d07d9f5d 100644
--- a/LEGO1/lego/legoomni/include/buildingentity.h
+++ b/LEGO1/lego/legoomni/include/buildingentity.h
@@ -8,19 +8,19 @@
 class BuildingEntity : public LegoEntity {
 public:
 	BuildingEntity();
-	virtual ~BuildingEntity() override; // vtable+0x00
+	~BuildingEntity() override; // vtable+0x00
 
-	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x04
+	MxLong Notify(MxParam& p_param) override; // vtable+0x04
 
 	// FUNCTION: LEGO1 0x10014f20
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f07e8
 		return "BuildingEntity";
 	}
 
 	// FUNCTION: LEGO1 0x10014f30
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, BuildingEntity::ClassName()) || LegoEntity::IsA(p_name);
 	}
diff --git a/LEGO1/lego/legoomni/include/bumpbouy.h b/LEGO1/lego/legoomni/include/bumpbouy.h
index 7dc02c82..c6308d57 100644
--- a/LEGO1/lego/legoomni/include/bumpbouy.h
+++ b/LEGO1/lego/legoomni/include/bumpbouy.h
@@ -7,25 +7,25 @@
 // VTABLE: LEGO1 0x100d6790
 class BumpBouy : public LegoAnimActor {
 public:
-	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x04
+	MxLong Notify(MxParam& p_param) override; // vtable+0x04
 
 	// FUNCTION: LEGO1 0x100274e0
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f0394
 		return "BumpBouy";
 	}
 
 	// FUNCTION: LEGO1 0x10027500
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, BumpBouy::ClassName()) || LegoAnimActor::IsA(p_name);
 	}
 
-	virtual void ParseAction(char*) override;                  // vtable+0x20
-	virtual void SetWorldSpeed(MxFloat p_worldSpeed) override; // vtable+0x30
-	virtual void VTable0x70(float p_float) override;           // vtable+0x70
-	virtual void VTable0x74(Matrix4& p_transform) override;    // vtable+0x74
+	void ParseAction(char*) override;                  // vtable+0x20
+	void SetWorldSpeed(MxFloat p_worldSpeed) override; // vtable+0x30
+	void VTable0x70(float p_float) override;           // vtable+0x70
+	void VTable0x74(Matrix4& p_transform) override;    // vtable+0x74
 
 	// SYNTHETIC: LEGO1 0x10027490
 	// BumpBouy::`scalar deleting destructor'
diff --git a/LEGO1/lego/legoomni/include/carrace.h b/LEGO1/lego/legoomni/include/carrace.h
index 42a981bc..c5af66e8 100644
--- a/LEGO1/lego/legoomni/include/carrace.h
+++ b/LEGO1/lego/legoomni/include/carrace.h
@@ -11,25 +11,25 @@ class CarRace : public LegoRace {
 	CarRace();
 
 	// FUNCTION: LEGO1 0x10016b20
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f0528
 		return "CarRace";
 	}
 
 	// FUNCTION: LEGO1 0x10016b30
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, CarRace::ClassName()) || LegoRace::IsA(p_name);
 	}
 
-	virtual MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
-	virtual void ReadyWorld() override;                       // vtable+0x50
-	virtual MxBool VTable0x64() override;                     // vtable+0x64
-	virtual undefined4 VTable0x6c(undefined4) override;       // vtable+0x6c
-	virtual undefined4 VTable0x70(undefined4) override;       // vtable+0x70
-	virtual undefined4 VTable0x74(undefined4) override;       // vtable+0x74
-	virtual undefined4 VTable0x78(undefined4) override;       // vtable+0x78
+	MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
+	void ReadyWorld() override;                       // vtable+0x50
+	MxBool VTable0x64() override;                     // vtable+0x64
+	undefined4 VTable0x6c(undefined4) override;       // vtable+0x6c
+	undefined4 VTable0x70(undefined4) override;       // vtable+0x70
+	undefined4 VTable0x74(undefined4) override;       // vtable+0x74
+	undefined4 VTable0x78(undefined4) override;       // vtable+0x78
 
 	// SYNTHETIC: LEGO1 0x10016c70
 	// CarRace::`scalar deleting destructor'
diff --git a/LEGO1/lego/legoomni/include/carracestate.h b/LEGO1/lego/legoomni/include/carracestate.h
index 490900dd..c7a1e376 100644
--- a/LEGO1/lego/legoomni/include/carracestate.h
+++ b/LEGO1/lego/legoomni/include/carracestate.h
@@ -8,14 +8,14 @@
 class CarRaceState : public RaceState {
 public:
 	// FUNCTION: LEGO1 0x1000dd30
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f009c
 		return "CarRaceState";
 	}
 
 	// FUNCTION: LEGO1 0x1000dd40
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, CarRaceState::ClassName()) || RaceState::IsA(p_name);
 	}
diff --git a/LEGO1/lego/legoomni/include/doors.h b/LEGO1/lego/legoomni/include/doors.h
index dc98a866..35958455 100644
--- a/LEGO1/lego/legoomni/include/doors.h
+++ b/LEGO1/lego/legoomni/include/doors.h
@@ -8,21 +8,21 @@
 class Doors : public LegoPathActor {
 public:
 	// FUNCTION: LEGO1 0x1000e430
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f03e8
 		return "Doors";
 	}
 
 	// FUNCTION: LEGO1 0x1000e440
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, Doors::ClassName()) || LegoPathActor::IsA(p_name);
 	}
 
-	virtual void ParseAction(char*) override;        // vtable+0x20
-	virtual void VTable0x70(float p_float) override; // vtable+0x70
-	virtual MxS32 VTable0x94() override;             // vtable+0x94
+	void ParseAction(char*) override;        // vtable+0x20
+	void VTable0x70(float p_float) override; // vtable+0x70
+	MxS32 VTable0x94() override;             // vtable+0x94
 
 	// SYNTHETIC: LEGO1 0x1000e580
 	// Doors::`scalar deleting destructor'
diff --git a/LEGO1/lego/legoomni/include/dunebuggy.h b/LEGO1/lego/legoomni/include/dunebuggy.h
index 3aaf7a87..27c0cdb5 100644
--- a/LEGO1/lego/legoomni/include/dunebuggy.h
+++ b/LEGO1/lego/legoomni/include/dunebuggy.h
@@ -11,24 +11,24 @@ class DuneBuggy : public IslePathActor {
 	DuneBuggy();
 
 	// FUNCTION: LEGO1 0x10067c30
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f0410
 		return "DuneBuggy";
 	}
 
 	// FUNCTION: LEGO1 0x10067c40
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, DuneBuggy::ClassName()) || IslePathActor::IsA(p_name);
 	}
 
-	virtual MxResult Create(MxDSAction& p_dsAction) override;              // vtable+0x18
-	virtual void VTable0x70(float p_float) override;                       // vtable+0x70
-	virtual MxU32 VTable0xcc() override;                                   // vtable+0xcc
-	virtual MxU32 VTable0xd4(LegoControlManagerEvent& p_param) override;   // vtable+0xd4
-	virtual MxU32 VTable0xdc(MxType19NotificationParam& p_param) override; // vtable+0xdc
-	virtual void VTable0xe4() override;                                    // vtable+0xe4
+	MxResult Create(MxDSAction& p_dsAction) override;              // vtable+0x18
+	void VTable0x70(float p_float) override;                       // vtable+0x70
+	MxU32 VTable0xcc() override;                                   // vtable+0xcc
+	MxU32 VTable0xd4(LegoControlManagerEvent& p_param) override;   // vtable+0xd4
+	MxU32 VTable0xdc(MxType19NotificationParam& p_param) override; // vtable+0xdc
+	void VTable0xe4() override;                                    // vtable+0xe4
 
 	// SYNTHETIC: LEGO1 0x10067dc0
 	// DuneBuggy::`scalar deleting destructor'
diff --git a/LEGO1/lego/legoomni/include/elevatorbottom.h b/LEGO1/lego/legoomni/include/elevatorbottom.h
index 2c8711a3..80ea3fe0 100644
--- a/LEGO1/lego/legoomni/include/elevatorbottom.h
+++ b/LEGO1/lego/legoomni/include/elevatorbottom.h
@@ -11,31 +11,31 @@ class LegoControlManagerEvent;
 class ElevatorBottom : public LegoWorld {
 public:
 	ElevatorBottom();
-	virtual ~ElevatorBottom() override; // vtable+0x00
+	~ElevatorBottom() override; // vtable+0x00
 
-	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x04
+	MxLong Notify(MxParam& p_param) override; // vtable+0x04
 
 	// FUNCTION: LEGO1 0x10017f20
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f04ac
 		return "ElevatorBottom";
 	}
 
 	// FUNCTION: LEGO1 0x10017f30
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, ElevatorBottom::ClassName()) || LegoWorld::IsA(p_name);
 	}
 
-	virtual MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
-	virtual void ReadyWorld() override;                       // vtable+0x50
+	MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
+	void ReadyWorld() override;                       // vtable+0x50
 
 	// FUNCTION: LEGO1 0x10017f10
-	virtual MxBool VTable0x5c() override { return TRUE; } // vtable+0x5c
+	MxBool VTable0x5c() override { return TRUE; } // vtable+0x5c
 
-	virtual MxBool VTable0x64() override;           // vtable+0x64
-	virtual void VTable0x68(MxBool p_add) override; // vtable+0x68
+	MxBool VTable0x64() override;           // vtable+0x64
+	void VTable0x68(MxBool p_add) override; // vtable+0x68
 
 	// SYNTHETIC: LEGO1 0x10018040
 	// ElevatorBottom::`scalar deleting destructor'
diff --git a/LEGO1/lego/legoomni/include/gasstation.h b/LEGO1/lego/legoomni/include/gasstation.h
index baa42ab2..f8115487 100644
--- a/LEGO1/lego/legoomni/include/gasstation.h
+++ b/LEGO1/lego/legoomni/include/gasstation.h
@@ -11,29 +11,29 @@
 class GasStation : public LegoWorld {
 public:
 	GasStation();
-	virtual ~GasStation() override; // vtable+0x00
+	~GasStation() override; // vtable+0x00
 
-	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x04
-	virtual MxResult Tickle() override;               // vtable+0x08
+	MxLong Notify(MxParam& p_param) override; // vtable+0x04
+	MxResult Tickle() override;               // vtable+0x08
 
 	// FUNCTION: LEGO1 0x10004780
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f0168
 		return "GasStation";
 	}
 
 	// FUNCTION: LEGO1 0x10004790
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, GasStation::ClassName()) || LegoWorld::IsA(p_name);
 	}
 
-	virtual MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
-	virtual void ReadyWorld() override;                       // vtable+0x50
-	virtual MxBool VTable0x5c() override;                     // vtable+0x5c
-	virtual MxBool VTable0x64() override;                     // vtable+0x64
-	virtual void VTable0x68(MxBool p_add) override;           // vtable+0x68
+	MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
+	void ReadyWorld() override;                       // vtable+0x50
+	MxBool VTable0x5c() override;                     // vtable+0x5c
+	MxBool VTable0x64() override;                     // vtable+0x64
+	void VTable0x68(MxBool p_add) override;           // vtable+0x68
 
 	// SYNTHETIC: LEGO1 0x100048a0
 	// GasStation::`scalar deleting destructor'
diff --git a/LEGO1/lego/legoomni/include/gasstationentity.h b/LEGO1/lego/legoomni/include/gasstationentity.h
index 7ab807cd..0b271d46 100644
--- a/LEGO1/lego/legoomni/include/gasstationentity.h
+++ b/LEGO1/lego/legoomni/include/gasstationentity.h
@@ -8,14 +8,14 @@
 class GasStationEntity : public BuildingEntity {
 public:
 	// FUNCTION: LEGO1 0x1000eb20
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f0348
 		return "GasStationEntity";
 	}
 
 	// FUNCTION: LEGO1 0x1000eb30
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, GasStationEntity::ClassName()) || BuildingEntity::IsA(p_name);
 	}
diff --git a/LEGO1/lego/legoomni/include/gasstationstate.h b/LEGO1/lego/legoomni/include/gasstationstate.h
index a756e783..e9bbd0df 100644
--- a/LEGO1/lego/legoomni/include/gasstationstate.h
+++ b/LEGO1/lego/legoomni/include/gasstationstate.h
@@ -10,19 +10,19 @@ class GasStationState : public LegoState {
 	GasStationState();
 
 	// FUNCTION: LEGO1 0x100061d0
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f0174
 		return "GasStationState";
 	}
 
 	// FUNCTION: LEGO1 0x100061e0
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, GasStationState::ClassName()) || LegoState::IsA(p_name);
 	}
 
-	virtual MxResult VTable0x1c(LegoFile* p_legoFile) override; // vtable+0x1c
+	MxResult VTable0x1c(LegoFile* p_legoFile) override; // vtable+0x1c
 
 	// SYNTHETIC: LEGO1 0x10006290
 	// GasStationState::`scalar deleting destructor'
diff --git a/LEGO1/lego/legoomni/include/gifmanager.h b/LEGO1/lego/legoomni/include/gifmanager.h
index 1d424fb7..ce600a62 100644
--- a/LEGO1/lego/legoomni/include/gifmanager.h
+++ b/LEGO1/lego/legoomni/include/gifmanager.h
@@ -77,7 +77,7 @@ class GifManagerBase {
 class GifManager : public GifManagerBase {
 public:
 	GifManager() { m_ownership = TRUE; }
-	virtual ~GifManager() override;
+	~GifManager() override;
 
 	// SYNTHETIC: LEGO1 0x1005a580
 	// GifManager::`scalar deleting destructor'
diff --git a/LEGO1/lego/legoomni/include/helicopter.h b/LEGO1/lego/legoomni/include/helicopter.h
index 74670324..6c917aec 100644
--- a/LEGO1/lego/legoomni/include/helicopter.h
+++ b/LEGO1/lego/legoomni/include/helicopter.h
@@ -22,28 +22,28 @@ class HelicopterSubclass {
 class Helicopter : public IslePathActor {
 public:
 	Helicopter();
-	virtual ~Helicopter() override; // vtable+0x00
+	~Helicopter() override; // vtable+0x00
 
 	// FUNCTION: LEGO1 0x10003070
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f0130
 		return "Helicopter";
 	}
 
 	// FUNCTION: LEGO1 0x10003080
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, Helicopter::ClassName()) || IslePathActor::IsA(p_name);
 	}
 
-	virtual MxResult Create(MxDSAction& p_dsAction) override;              // vtable+0x18
-	virtual void VTable0x70(float p_float) override;                       // vtable+0x70
-	virtual void VTable0x74(Matrix4& p_transform) override;                // vtable+0x74
-	virtual MxU32 VTable0xcc() override;                                   // vtable+0xcc
-	virtual MxU32 VTable0xd4(LegoControlManagerEvent& p_param) override;   // vtable+0xd4
-	virtual MxU32 VTable0xd8(MxType18NotificationParam& p_param) override; // vtable+0xd8
-	virtual void VTable0xe4() override;                                    // vtable+0xe4
+	MxResult Create(MxDSAction& p_dsAction) override;              // vtable+0x18
+	void VTable0x70(float p_float) override;                       // vtable+0x70
+	void VTable0x74(Matrix4& p_transform) override;                // vtable+0x74
+	MxU32 VTable0xcc() override;                                   // vtable+0xcc
+	MxU32 VTable0xd4(LegoControlManagerEvent& p_param) override;   // vtable+0xd4
+	MxU32 VTable0xd8(MxType18NotificationParam& p_param) override; // vtable+0xd8
+	void VTable0xe4() override;                                    // vtable+0xe4
 
 	// SYNTHETIC: LEGO1 0x10003210
 	// Helicopter::`scalar deleting destructor'
diff --git a/LEGO1/lego/legoomni/include/helicopterstate.h b/LEGO1/lego/legoomni/include/helicopterstate.h
index a1562157..993b8f7c 100644
--- a/LEGO1/lego/legoomni/include/helicopterstate.h
+++ b/LEGO1/lego/legoomni/include/helicopterstate.h
@@ -9,23 +9,23 @@
 class HelicopterState : public LegoState {
 public:
 	// FUNCTION: LEGO1 0x1000e0d0
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f0144
 		return "HelicopterState";
 	}
 
 	// FUNCTION: LEGO1 0x1000e0e0
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, HelicopterState::ClassName()) || LegoState::IsA(p_name);
 	}
 
 	// FUNCTION: LEGO1 0x1000e0b0
-	virtual MxBool VTable0x14() override { return FALSE; } // vtable+0x14
+	MxBool VTable0x14() override { return FALSE; } // vtable+0x14
 
 	// FUNCTION: LEGO1 0x1000e0c0
-	virtual MxBool SetFlag() override
+	MxBool SetFlag() override
 	{
 		m_unk0x08 = 0;
 		return TRUE;
diff --git a/LEGO1/lego/legoomni/include/historybook.h b/LEGO1/lego/legoomni/include/historybook.h
index 9152e07a..862be059 100644
--- a/LEGO1/lego/legoomni/include/historybook.h
+++ b/LEGO1/lego/legoomni/include/historybook.h
@@ -8,26 +8,26 @@
 class HistoryBook : public LegoWorld {
 public:
 	HistoryBook();
-	virtual ~HistoryBook() override; // vtable+0x00
+	~HistoryBook() override; // vtable+0x00
 
-	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x04
+	MxLong Notify(MxParam& p_param) override; // vtable+0x04
 
 	// FUNCTION: LEGO1 0x10082390
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f04bc
 		return "HistoryBook";
 	}
 
 	// FUNCTION: LEGO1 0x100823a0
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, HistoryBook::ClassName()) || LegoWorld::IsA(p_name);
 	}
 
-	virtual MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
-	virtual void ReadyWorld() override;                       // vtable+0x50
-	virtual MxBool VTable0x64() override;                     // vtable+0x64
+	MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
+	void ReadyWorld() override;                       // vtable+0x50
+	MxBool VTable0x64() override;                     // vtable+0x64
 
 	// SYNTHETIC: LEGO1 0x100824b0
 	// HistoryBook::`scalar deleting destructor'
diff --git a/LEGO1/lego/legoomni/include/hospital.h b/LEGO1/lego/legoomni/include/hospital.h
index ad8bd137..ebf802a9 100644
--- a/LEGO1/lego/legoomni/include/hospital.h
+++ b/LEGO1/lego/legoomni/include/hospital.h
@@ -9,29 +9,29 @@
 class Hospital : public LegoWorld {
 public:
 	Hospital();
-	virtual ~Hospital() override; // vtable+0x00
+	~Hospital() override; // vtable+0x00
 
-	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x04
-	virtual MxResult Tickle() override;               // vtable+0x08
+	MxLong Notify(MxParam& p_param) override; // vtable+0x04
+	MxResult Tickle() override;               // vtable+0x08
 
 	// FUNCTION: LEGO1 0x100746b0
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f0490
 		return "Hospital";
 	}
 
 	// FUNCTION: LEGO1 0x100746c0
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, Hospital::ClassName()) || LegoWorld::IsA(p_name);
 	}
 
-	virtual MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
-	virtual void ReadyWorld() override;                       // vtable+0x50
-	virtual MxBool VTable0x5c() override;                     // vtable+0x5c
-	virtual MxBool VTable0x64() override;                     // vtable+0x64
-	virtual void VTable0x68(MxBool p_add) override;           // vtable+0x68
+	MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
+	void ReadyWorld() override;                       // vtable+0x50
+	MxBool VTable0x5c() override;                     // vtable+0x5c
+	MxBool VTable0x64() override;                     // vtable+0x64
+	void VTable0x68(MxBool p_add) override;           // vtable+0x68
 
 	// SYNTHETIC: LEGO1 0x100747d0
 	// Hospital::`scalar deleting destructor'
diff --git a/LEGO1/lego/legoomni/include/hospitalentity.h b/LEGO1/lego/legoomni/include/hospitalentity.h
index fea461d8..a837bd7b 100644
--- a/LEGO1/lego/legoomni/include/hospitalentity.h
+++ b/LEGO1/lego/legoomni/include/hospitalentity.h
@@ -8,14 +8,14 @@
 class HospitalEntity : public BuildingEntity {
 public:
 	// FUNCTION: LEGO1 0x1000ec40
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f0338
 		return "HospitalEntity";
 	}
 
 	// FUNCTION: LEGO1 0x1000ec50
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, HospitalEntity::ClassName()) || BuildingEntity::IsA(p_name);
 	}
diff --git a/LEGO1/lego/legoomni/include/hospitalstate.h b/LEGO1/lego/legoomni/include/hospitalstate.h
index a6ccd77a..980007e3 100644
--- a/LEGO1/lego/legoomni/include/hospitalstate.h
+++ b/LEGO1/lego/legoomni/include/hospitalstate.h
@@ -9,22 +9,22 @@
 class HospitalState : public LegoState {
 public:
 	HospitalState();
-	virtual ~HospitalState() override {}
+	~HospitalState() override {}
 
 	// FUNCTION: LEGO1 0x10076400
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f0480
 		return "HospitalState";
 	}
 
 	// FUNCTION: LEGO1 0x10076410
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, HospitalState::ClassName()) || LegoState::IsA(p_name);
 	}
 
-	virtual MxResult VTable0x1c(LegoFile* p_legoFile) override; // vtable+0x1c
+	MxResult VTable0x1c(LegoFile* p_legoFile) override; // vtable+0x1c
 
 	// SYNTHETIC: LEGO1 0x100764c0
 	// HospitalState::`scalar deleting destructor'
diff --git a/LEGO1/lego/legoomni/include/infocenter.h b/LEGO1/lego/legoomni/include/infocenter.h
index 56f01e09..bd06f5bf 100644
--- a/LEGO1/lego/legoomni/include/infocenter.h
+++ b/LEGO1/lego/legoomni/include/infocenter.h
@@ -148,29 +148,29 @@ class Infocenter : public LegoWorld {
 	};
 
 	Infocenter();
-	virtual ~Infocenter() override;
+	~Infocenter() override;
 
-	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x04
-	virtual MxResult Tickle() override;               // vtable+0x08
+	MxLong Notify(MxParam& p_param) override; // vtable+0x04
+	MxResult Tickle() override;               // vtable+0x08
 
 	// FUNCTION: LEGO1 0x1006eb40
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f04ec
 		return "Infocenter";
 	}
 
 	// FUNCTION: LEGO1 0x1006eb50
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, Infocenter::ClassName()) || LegoWorld::IsA(p_name);
 	}
 
-	virtual MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
-	virtual void ReadyWorld() override;                       // vtable+0x50
-	virtual MxBool VTable0x5c() override;                     // vtable+0x5c
-	virtual MxBool VTable0x64() override;                     // vtable+0x64
-	virtual void VTable0x68(MxBool p_add) override;           // vtable+0x68
+	MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
+	void ReadyWorld() override;                       // vtable+0x50
+	MxBool VTable0x5c() override;                     // vtable+0x5c
+	MxBool VTable0x64() override;                     // vtable+0x64
+	void VTable0x68(MxBool p_add) override;           // vtable+0x68
 
 	// SYNTHETIC: LEGO1 0x1006ec60
 	// Infocenter::`scalar deleting destructor'
diff --git a/LEGO1/lego/legoomni/include/infocenterdoor.h b/LEGO1/lego/legoomni/include/infocenterdoor.h
index 0869d4e4..3335731c 100644
--- a/LEGO1/lego/legoomni/include/infocenterdoor.h
+++ b/LEGO1/lego/legoomni/include/infocenterdoor.h
@@ -10,31 +10,31 @@ class LegoControlManagerEvent;
 class InfocenterDoor : public LegoWorld {
 public:
 	InfocenterDoor();
-	virtual ~InfocenterDoor(); // vtable+0x00
+	~InfocenterDoor() override; // vtable+0x00
 
-	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x04
+	MxLong Notify(MxParam& p_param) override; // vtable+0x04
 
 	// FUNCTION: LEGO1 0x100377b0
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f049c
 		return "InfocenterDoor";
 	}
 
 	// FUNCTION: LEGO1 0x100377c0
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, InfocenterDoor::ClassName()) || LegoWorld::IsA(p_name);
 	}
 
-	virtual MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
-	virtual void ReadyWorld() override;                       // vtable+0x50
+	MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
+	void ReadyWorld() override;                       // vtable+0x50
 
 	// FUNCTION: LEGO1 0x100377a0
-	virtual MxBool VTable0x5c() override { return TRUE; } // vtable+0x5c
+	MxBool VTable0x5c() override { return TRUE; } // vtable+0x5c
 
-	virtual MxBool VTable0x64() override;           // vtable+0x64
-	virtual void VTable0x68(MxBool p_add) override; // vtable+0x68
+	MxBool VTable0x64() override;           // vtable+0x64
+	void VTable0x68(MxBool p_add) override; // vtable+0x68
 
 	// SYNTHETIC: LEGO1 0x100378d0
 	// InfocenterDoor::`scalar deleting destructor'
diff --git a/LEGO1/lego/legoomni/include/infocenterentity.h b/LEGO1/lego/legoomni/include/infocenterentity.h
index 91fe03ff..85bcbce5 100644
--- a/LEGO1/lego/legoomni/include/infocenterentity.h
+++ b/LEGO1/lego/legoomni/include/infocenterentity.h
@@ -8,14 +8,14 @@
 class InfoCenterEntity : public BuildingEntity {
 public:
 	// FUNCTION: LEGO1 0x1000ea00
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f035c
 		return "InfoCenterEntity";
 	}
 
 	// FUNCTION: LEGO1 0x1000ea10
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, InfoCenterEntity::ClassName()) || BuildingEntity::IsA(p_name);
 	}
diff --git a/LEGO1/lego/legoomni/include/infocenterstate.h b/LEGO1/lego/legoomni/include/infocenterstate.h
index ed23acef..49ca0988 100644
--- a/LEGO1/lego/legoomni/include/infocenterstate.h
+++ b/LEGO1/lego/legoomni/include/infocenterstate.h
@@ -10,23 +10,23 @@
 class InfocenterState : public LegoState {
 public:
 	InfocenterState();
-	virtual ~InfocenterState() override;
+	~InfocenterState() override;
 
 	// FUNCTION: LEGO1 0x10071840
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f04dc
 		return "InfocenterState";
 	}
 
 	// FUNCTION: LEGO1 0x10071850
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, InfocenterState::ClassName()) || LegoState::IsA(p_name);
 	}
 
 	// FUNCTION: LEGO1 0x10071830
-	virtual MxBool VTable0x14() override { return FALSE; } // vtable+0x14
+	MxBool VTable0x14() override { return FALSE; } // vtable+0x14
 
 	inline MxS16 GetInfocenterBufferSize() { return sizeof(m_buffer) / sizeof(m_buffer[0]); }
 	inline MxStillPresenter* GetInfocenterBufferElement(MxS32 p_index) { return m_buffer[p_index]; }
diff --git a/LEGO1/lego/legoomni/include/isle.h b/LEGO1/lego/legoomni/include/isle.h
index 04871028..e62577d6 100644
--- a/LEGO1/lego/legoomni/include/isle.h
+++ b/LEGO1/lego/legoomni/include/isle.h
@@ -23,31 +23,31 @@ class Act1State;
 class Isle : public LegoWorld {
 public:
 	Isle();
-	virtual ~Isle() override;
-	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x04
+	~Isle() override;
+	MxLong Notify(MxParam& p_param) override; // vtable+0x04
 
 	// FUNCTION: LEGO1 0x10030910
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f0458
 		return "Isle";
 	}
 
 	// FUNCTION: LEGO1 0x10030920
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, Isle::ClassName()) || LegoWorld::IsA(p_name);
 	}
 
-	virtual MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
-	virtual void ReadyWorld() override;                       // vtable+50
-	virtual void Add(MxCore* p_object) override;              // vtable+58
+	MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
+	void ReadyWorld() override;                       // vtable+50
+	void Add(MxCore* p_object) override;              // vtable+58
 	// FUNCTION: LEGO1 0x10030900
-	virtual MxBool VTable0x5c() override { return TRUE; } // vtable+5c
+	MxBool VTable0x5c() override { return TRUE; } // vtable+5c
 	// FUNCTION: LEGO1 0x10033170
-	virtual void VTable0x60() override {}            // vtable+60
-	virtual MxBool VTable0x64() override;            // vtable+64
-	virtual void VTable0x68(MxBool p_add) override;  // vtable+68
+	void VTable0x60() override {}                    // vtable+60
+	MxBool VTable0x64() override;                    // vtable+64
+	void VTable0x68(MxBool p_add) override;          // vtable+68
 	virtual void VTable0x6c(IslePathActor* p_actor); // vtable+6c
 
 	inline void SetUnknown13c(MxU32 p_unk0x13c) { m_unk0x13c = p_unk0x13c; }
diff --git a/LEGO1/lego/legoomni/include/isleactor.h b/LEGO1/lego/legoomni/include/isleactor.h
index d8253821..c51946d3 100644
--- a/LEGO1/lego/legoomni/include/isleactor.h
+++ b/LEGO1/lego/legoomni/include/isleactor.h
@@ -6,22 +6,22 @@
 // VTABLE: LEGO1 0x100d5178
 class IsleActor : public LegoActor {
 public:
-	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x04
+	MxLong Notify(MxParam& p_param) override; // vtable+0x04
 
 	// FUNCTION: LEGO1 0x1000e660
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f07dc
 		return "IsleActor";
 	}
 
 	// FUNCTION: LEGO1 0x1000e670
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, IsleActor::ClassName()) || LegoActor::IsA(p_name);
 	}
 
-	virtual MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
+	MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
 };
 
 // SYNTHETIC: LEGO1 0x1000e940
diff --git a/LEGO1/lego/legoomni/include/islepathactor.h b/LEGO1/lego/legoomni/include/islepathactor.h
index 2770b457..a7fabbfa 100644
--- a/LEGO1/lego/legoomni/include/islepathactor.h
+++ b/LEGO1/lego/legoomni/include/islepathactor.h
@@ -15,25 +15,25 @@ class IslePathActor : public LegoPathActor {
 	IslePathActor();
 
 	// FUNCTION: LEGO1 0x10002e10
-	inline virtual ~IslePathActor() override { IslePathActor::Destroy(TRUE); } // vtable+0x00
+	inline ~IslePathActor() override { IslePathActor::Destroy(TRUE); } // vtable+0x00
 
-	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x04
+	MxLong Notify(MxParam& p_param) override; // vtable+0x04
 
 	// FUNCTION: LEGO1 0x10002ea0
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f0104
 		return "IslePathActor";
 	}
 
 	// FUNCTION: LEGO1 0x10002eb0
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, IslePathActor::ClassName()) || LegoPathActor::IsA(p_name);
 	}
 
-	virtual MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
-	virtual void Destroy(MxBool p_fromDestructor) override;   // vtable+0x1c
+	MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
+	void Destroy(MxBool p_fromDestructor) override;   // vtable+0x1c
 	// FUNCTION: LEGO1 0x10002e70
 	virtual MxU32 VTable0xcc() { return 0; } // vtable+0xcc
 	// FUNCTION: LEGO1 0x10002df0
diff --git a/LEGO1/lego/legoomni/include/jetski.h b/LEGO1/lego/legoomni/include/jetski.h
index 91de4b91..b71e43cf 100644
--- a/LEGO1/lego/legoomni/include/jetski.h
+++ b/LEGO1/lego/legoomni/include/jetski.h
@@ -12,23 +12,23 @@ class Jetski : public IslePathActor {
 	Jetski();
 
 	// FUNCTION: LEGO1 0x1007e430
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f03d8
 		return "Jetski";
 	}
 
 	// FUNCTION: LEGO1 0x1007e440
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, Jetski::ClassName()) || IslePathActor::IsA(p_name);
 	}
 
-	virtual MxResult Create(MxDSAction& p_dsAction) override;    // vtable+0x18
-	virtual void VTable0x70(float p_float) override;             // vtable+0x70
-	virtual MxU32 VTable0xcc() override;                         // vtable+0xcc
-	virtual MxU32 VTable0xd4(LegoControlManagerEvent&) override; // vtable+0xd4
-	virtual void VTable0xe4() override;                          // vtable+0xe4
+	MxResult Create(MxDSAction& p_dsAction) override;    // vtable+0x18
+	void VTable0x70(float p_float) override;             // vtable+0x70
+	MxU32 VTable0xcc() override;                         // vtable+0xcc
+	MxU32 VTable0xd4(LegoControlManagerEvent&) override; // vtable+0xd4
+	void VTable0xe4() override;                          // vtable+0xe4
 
 	// SYNTHETIC: LEGO1 0x1007e5c0
 	// Jetski::`scalar deleting destructor'
diff --git a/LEGO1/lego/legoomni/include/jetskirace.h b/LEGO1/lego/legoomni/include/jetskirace.h
index 9b16d9a7..d926e871 100644
--- a/LEGO1/lego/legoomni/include/jetskirace.h
+++ b/LEGO1/lego/legoomni/include/jetskirace.h
@@ -8,14 +8,14 @@
 class JetskiRace : public LegoRace {
 public:
 	// FUNCTION: LEGO1 0x1000daf0
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f0530
 		return "JetskiRace";
 	}
 
 	// FUNCTION: LEGO1 0x1000db00
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, JetskiRace::ClassName()) || LegoRace::IsA(p_name);
 	}
diff --git a/LEGO1/lego/legoomni/include/jetskiracestate.h b/LEGO1/lego/legoomni/include/jetskiracestate.h
index ccb60112..812a0a0f 100644
--- a/LEGO1/lego/legoomni/include/jetskiracestate.h
+++ b/LEGO1/lego/legoomni/include/jetskiracestate.h
@@ -8,14 +8,14 @@
 class JetskiRaceState : public RaceState {
 public:
 	// FUNCTION: LEGO1 0x1000dc40
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f00ac
 		return "JetskiRaceState";
 	}
 
 	// FUNCTION: LEGO1 0x1000dc50
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, JetskiRaceState::ClassName()) || RaceState::IsA(p_name);
 	}
diff --git a/LEGO1/lego/legoomni/include/jukebox.h b/LEGO1/lego/legoomni/include/jukebox.h
index 9879a446..f1335262 100644
--- a/LEGO1/lego/legoomni/include/jukebox.h
+++ b/LEGO1/lego/legoomni/include/jukebox.h
@@ -10,27 +10,27 @@ class JukeBox : public LegoWorld {
 public:
 	JukeBox();
 
-	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x04
-	virtual MxResult Tickle() override;               // vtable+0x08
+	MxLong Notify(MxParam& p_param) override; // vtable+0x04
+	MxResult Tickle() override;               // vtable+0x08
 
 	// FUNCTION: LEGO1 0x1005d6f0
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f02cc
 		return "JukeBox";
 	}
 
 	// FUNCTION: LEGO1 0x1005d700
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, JukeBox::ClassName()) || LegoWorld::IsA(p_name);
 	}
 
-	virtual MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
-	virtual void ReadyWorld() override;                       // vtable+0x50
-	virtual MxBool VTable0x5c() override;                     // vtable+0x5c
-	virtual MxBool VTable0x64() override;                     // vtable+0x64
-	virtual void VTable0x68(MxBool p_add) override;           // vtable+0x68
+	MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
+	void ReadyWorld() override;                       // vtable+0x50
+	MxBool VTable0x5c() override;                     // vtable+0x5c
+	MxBool VTable0x64() override;                     // vtable+0x64
+	void VTable0x68(MxBool p_add) override;           // vtable+0x68
 
 	// SYNTHETIC: LEGO1 0x1005d810
 	// JukeBox::`scalar deleting destructor'
diff --git a/LEGO1/lego/legoomni/include/jukeboxentity.h b/LEGO1/lego/legoomni/include/jukeboxentity.h
index 38691ba6..8afee4b5 100644
--- a/LEGO1/lego/legoomni/include/jukeboxentity.h
+++ b/LEGO1/lego/legoomni/include/jukeboxentity.h
@@ -8,19 +8,19 @@
 class JukeBoxEntity : public LegoEntity {
 public:
 	JukeBoxEntity();
-	virtual ~JukeBoxEntity() override; // vtable+0x00
+	~JukeBoxEntity() override; // vtable+0x00
 
-	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x04
+	MxLong Notify(MxParam& p_param) override; // vtable+0x04
 
 	// FUNCTION: LEGO1 0x10085cc0
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f02f0
 		return "JukeBoxEntity";
 	}
 
 	// FUNCTION: LEGO1 0x10085cd0
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, JukeBoxEntity::ClassName()) || LegoEntity::IsA(p_name);
 	}
diff --git a/LEGO1/lego/legoomni/include/jukeboxstate.h b/LEGO1/lego/legoomni/include/jukeboxstate.h
index 8263e97c..7f157bd0 100644
--- a/LEGO1/lego/legoomni/include/jukeboxstate.h
+++ b/LEGO1/lego/legoomni/include/jukeboxstate.h
@@ -8,19 +8,19 @@
 class JukeBoxState : public LegoState {
 public:
 	// FUNCTION: LEGO1 0x1000f310
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f02bc
 		return "JukeBoxState";
 	}
 
 	// FUNCTION: LEGO1 0x1000f320
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, JukeBoxState::ClassName()) || LegoState::IsA(p_name);
 	}
 
-	virtual MxBool VTable0x14() override; // vtable+0x14
+	MxBool VTable0x14() override; // vtable+0x14
 
 	// SYNTHETIC: LEGO1 0x1000f3d0
 	// JukeBoxState::`scalar deleting destructor'
diff --git a/LEGO1/lego/legoomni/include/lego3dwavepresenter.h b/LEGO1/lego/legoomni/include/lego3dwavepresenter.h
index bf771d45..22b39156 100644
--- a/LEGO1/lego/legoomni/include/lego3dwavepresenter.h
+++ b/LEGO1/lego/legoomni/include/lego3dwavepresenter.h
@@ -8,22 +8,22 @@
 class Lego3DWavePresenter : public MxWavePresenter {
 public:
 	// FUNCTION: LEGO1 0x1000d890
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f058c
 		return "Lego3DWavePresenter";
 	}
 
 	// FUNCTION: LEGO1 0x1000d8a0
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, Lego3DWavePresenter::ClassName()) || MxWavePresenter::IsA(p_name);
 	}
 
-	virtual void StartingTickle() override;   // vtable+0x1c
-	virtual void StreamingTickle() override;  // vtable+0x20
-	virtual MxResult AddToManager() override; // vtable+0x34
-	virtual void Destroy() override;          // vtable+0x38
+	void StartingTickle() override;   // vtable+0x1c
+	void StreamingTickle() override;  // vtable+0x20
+	MxResult AddToManager() override; // vtable+0x34
+	void Destroy() override;          // vtable+0x38
 
 	// SYNTHETIC: LEGO1 0x1000f4b0
 	// Lego3DWavePresenter::`scalar deleting destructor'
diff --git a/LEGO1/lego/legoomni/include/legoact2.h b/LEGO1/lego/legoomni/include/legoact2.h
index 0ac22875..5e89e06e 100644
--- a/LEGO1/lego/legoomni/include/legoact2.h
+++ b/LEGO1/lego/legoomni/include/legoact2.h
@@ -9,14 +9,14 @@
 // SIZE 0x1154
 class LegoAct2 : public LegoWorld {
 
-	virtual MxLong Notify(MxParam& p_param) override;         // vtable+0x04
-	virtual MxResult Tickle() override;                       // vtable+0x08
-	virtual MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
-	virtual void ReadyWorld() override;                       // vtable+0x50
-	virtual MxBool VTable0x5c() override;                     // vtable+0x5c
-	virtual void VTable0x60() override;                       // vtable+0x60
-	virtual MxBool VTable0x64() override;                     // vtable+0x64
-	virtual void VTable0x68(MxBool p_add) override;           // vtable+0x68
+	MxLong Notify(MxParam& p_param) override;         // vtable+0x04
+	MxResult Tickle() override;                       // vtable+0x08
+	MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
+	void ReadyWorld() override;                       // vtable+0x50
+	MxBool VTable0x5c() override;                     // vtable+0x5c
+	void VTable0x60() override;                       // vtable+0x60
+	MxBool VTable0x64() override;                     // vtable+0x64
+	void VTable0x68(MxBool p_add) override;           // vtable+0x68
 
 	// SYNTHETIC: LEGO1 0x1004fe20
 	// LegoAct2::`scalar deleting destructor'
diff --git a/LEGO1/lego/legoomni/include/legoact2state.h b/LEGO1/lego/legoomni/include/legoact2state.h
index e37af2dc..78101599 100644
--- a/LEGO1/lego/legoomni/include/legoact2state.h
+++ b/LEGO1/lego/legoomni/include/legoact2state.h
@@ -7,22 +7,22 @@
 // SIZE 0x10
 class LegoAct2State : public LegoState {
 public:
-	virtual ~LegoAct2State() override {}
+	~LegoAct2State() override {}
 
 	// FUNCTION: LEGO1 0x1000df80
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f0428
 		return "LegoAct2State";
 	}
 
 	// FUNCTION: LEGO1 0x1000df90
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, LegoAct2State::ClassName()) || LegoState::IsA(p_name);
 	}
 
-	virtual MxBool VTable0x14() override; // vtable+0x14
+	MxBool VTable0x14() override; // vtable+0x14
 
 	// SYNTHETIC: LEGO1 0x1000e040
 	// LegoAct2State::`scalar deleting destructor'
diff --git a/LEGO1/lego/legoomni/include/legoactioncontrolpresenter.h b/LEGO1/lego/legoomni/include/legoactioncontrolpresenter.h
index 633fc5eb..3dcbfecb 100644
--- a/LEGO1/lego/legoomni/include/legoactioncontrolpresenter.h
+++ b/LEGO1/lego/legoomni/include/legoactioncontrolpresenter.h
@@ -10,25 +10,25 @@
 class LegoActionControlPresenter : public MxMediaPresenter {
 public:
 	inline LegoActionControlPresenter() { m_unk0x50 = Extra::ActionType::e_none; }
-	virtual ~LegoActionControlPresenter() override { Destroy(TRUE); } // vtable+0x00
+	~LegoActionControlPresenter() override { Destroy(TRUE); } // vtable+0x00
 
 	// FUNCTION: LEGO1 0x1000d0e0
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f05bc
 		return "LegoActionControlPresenter";
 	}
 
 	// FUNCTION: LEGO1 0x1000d0f0
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, LegoActionControlPresenter::ClassName()) || MxMediaPresenter::IsA(p_name);
 	}
 
-	virtual void ReadyTickle() override;           // vtable+0x18
-	virtual void RepeatingTickle() override;       // vtable+0x24
-	virtual void ParseExtra() override;            // vtable+0x30
-	virtual MxResult AddToManager() override;      // vtable+0x34
+	void ReadyTickle() override;                   // vtable+0x18
+	void RepeatingTickle() override;               // vtable+0x24
+	void ParseExtra() override;                    // vtable+0x30
+	MxResult AddToManager() override;              // vtable+0x34
 	virtual void Destroy(MxBool p_fromDestructor); // vtable+0x5c
 
 private:
diff --git a/LEGO1/lego/legoomni/include/legoactor.h b/LEGO1/lego/legoomni/include/legoactor.h
index 76beb249..0f048619 100644
--- a/LEGO1/lego/legoomni/include/legoactor.h
+++ b/LEGO1/lego/legoomni/include/legoactor.h
@@ -9,23 +9,23 @@
 class LegoActor : public LegoEntity {
 public:
 	LegoActor();
-	virtual ~LegoActor() override;
+	~LegoActor() override;
 
 	// FUNCTION: LEGO1 0x1002d210
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f0124
 		return "LegoActor";
 	}
 
 	// FUNCTION: LEGO1 0x1002d220
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, LegoActor::ClassName()) || LegoEntity::IsA(p_name);
 	}
 
-	virtual void ParseAction(char*) override;                                     // vtable+0x20
-	virtual void SetROI(LegoROI* p_roi, MxBool p_bool1, MxBool p_bool2) override; // vtable+0x24
+	void ParseAction(char*) override;                                     // vtable+0x20
+	void SetROI(LegoROI* p_roi, MxBool p_bool1, MxBool p_bool2) override; // vtable+0x24
 
 	// FUNCTION: LEGO1 0x10002cc0
 	virtual MxFloat VTable0x50() { return m_unk0x68; } // vtable+0x50
diff --git a/LEGO1/lego/legoomni/include/legoactorpresenter.h b/LEGO1/lego/legoomni/include/legoactorpresenter.h
index a9b8ae7e..9c3b35bf 100644
--- a/LEGO1/lego/legoomni/include/legoactorpresenter.h
+++ b/LEGO1/lego/legoomni/include/legoactorpresenter.h
@@ -7,24 +7,24 @@
 // SIZE 0x50
 class LegoActorPresenter : public LegoEntityPresenter {
 public:
-	virtual ~LegoActorPresenter() override{};
+	~LegoActorPresenter() override{};
 
 	// FUNCTION: LEGO1 0x1000cb10
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f06a4
 		return "LegoActorPresenter";
 	}
 
 	// FUNCTION: LEGO1 0x1000cb20
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, LegoActorPresenter::ClassName()) || LegoEntityPresenter::IsA(p_name);
 	}
 
-	virtual void ReadyTickle() override;    // vtable+0x18
-	virtual void StartingTickle() override; // vtable+0x1c
-	virtual void ParseExtra() override;     // vtable+0x30
+	void ReadyTickle() override;    // vtable+0x18
+	void StartingTickle() override; // vtable+0x1c
+	void ParseExtra() override;     // vtable+0x30
 };
 
 // SYNTHETIC: LEGO1 0x1000cc30
diff --git a/LEGO1/lego/legoomni/include/legoanimationmanager.h b/LEGO1/lego/legoomni/include/legoanimationmanager.h
index c8ad60cd..85f1d8ec 100644
--- a/LEGO1/lego/legoomni/include/legoanimationmanager.h
+++ b/LEGO1/lego/legoomni/include/legoanimationmanager.h
@@ -9,20 +9,20 @@
 class LegoAnimationManager : public MxCore {
 public:
 	LegoAnimationManager();
-	virtual ~LegoAnimationManager() override; // vtable+0x00
+	~LegoAnimationManager() override; // vtable+0x00
 
-	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x04
-	virtual MxResult Tickle() override;               // vtable+0x08
+	MxLong Notify(MxParam& p_param) override; // vtable+0x04
+	MxResult Tickle() override;               // vtable+0x08
 
 	// FUNCTION: LEGO1 0x1005ec80
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f7508
 		return "LegoAnimationManager";
 	}
 
 	// FUNCTION: LEGO1 0x1005ec90
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, ClassName()) || MxCore::IsA(p_name);
 	}
diff --git a/LEGO1/lego/legoomni/include/legoanimmmpresenter.h b/LEGO1/lego/legoomni/include/legoanimmmpresenter.h
index 790ee92c..c79c8043 100644
--- a/LEGO1/lego/legoomni/include/legoanimmmpresenter.h
+++ b/LEGO1/lego/legoomni/include/legoanimmmpresenter.h
@@ -9,30 +9,30 @@ class LegoAnimMMPresenter : public MxCompositePresenter {
 public:
 	LegoAnimMMPresenter();
 
-	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x04
+	MxLong Notify(MxParam& p_param) override; // vtable+0x04
 
 	// FUNCTION: LEGO1 0x1004a950
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f046c
 		return "LegoAnimMMPresenter";
 	}
 
 	// FUNCTION: LEGO1 0x1004a960
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, LegoAnimMMPresenter::ClassName()) || MxCompositePresenter::IsA(p_name);
 	}
 
-	virtual void ReadyTickle() override;                                                           // vtable+0x18
-	virtual void StartingTickle() override;                                                        // vtable+0x1c
-	virtual void StreamingTickle() override;                                                       // vtable+0x20
-	virtual void RepeatingTickle() override;                                                       // vtable+0x24
-	virtual void DoneTickle() override;                                                            // vtable+0x2c
-	virtual void ParseExtra() override;                                                            // vtable+0x30
-	virtual MxResult StartAction(MxStreamController* p_controller, MxDSAction* p_action) override; // vtable+0x3c
-	virtual void EndAction() override;                                                             // vtable+0x40
-	virtual void VTable0x60(MxPresenter* p_presenter) override;                                    // vtable+0x60
+	void ReadyTickle() override;                                                           // vtable+0x18
+	void StartingTickle() override;                                                        // vtable+0x1c
+	void StreamingTickle() override;                                                       // vtable+0x20
+	void RepeatingTickle() override;                                                       // vtable+0x24
+	void DoneTickle() override;                                                            // vtable+0x2c
+	void ParseExtra() override;                                                            // vtable+0x30
+	MxResult StartAction(MxStreamController* p_controller, MxDSAction* p_action) override; // vtable+0x3c
+	void EndAction() override;                                                             // vtable+0x40
+	void VTable0x60(MxPresenter* p_presenter) override;                                    // vtable+0x60
 
 	// SYNTHETIC: LEGO1 0x1004aa40
 	// LegoAnimMMPresenter::`scalar deleting destructor'
diff --git a/LEGO1/lego/legoomni/include/legoanimpresenter.h b/LEGO1/lego/legoomni/include/legoanimpresenter.h
index 2a2845cf..221dfeb0 100644
--- a/LEGO1/lego/legoomni/include/legoanimpresenter.h
+++ b/LEGO1/lego/legoomni/include/legoanimpresenter.h
@@ -14,32 +14,32 @@ class LegoAnimClass;
 class LegoAnimPresenter : public MxVideoPresenter {
 public:
 	LegoAnimPresenter();
-	virtual ~LegoAnimPresenter() override;
+	~LegoAnimPresenter() override;
 
 	// FUNCTION: LEGO1 0x10068530
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f071c
 		return "LegoAnimPresenter";
 	}
 
 	// FUNCTION: LEGO1 0x10068540
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, LegoAnimPresenter::ClassName()) || MxVideoPresenter::IsA(p_name);
 	}
 
-	virtual void ReadyTickle() override;                                                           // vtable+0x18
-	virtual void StartingTickle() override;                                                        // vtable+0x1c
-	virtual void StreamingTickle() override;                                                       // vtable+0x20
-	virtual void DoneTickle() override;                                                            // vtable+0x2c
-	virtual void ParseExtra() override;                                                            // vtable+0x30
-	virtual MxResult AddToManager() override;                                                      // vtable+0x34
-	virtual void Destroy() override;                                                               // vtable+0x38
-	virtual MxResult StartAction(MxStreamController* p_controller, MxDSAction* p_action) override; // vtable+0x3c
-	virtual void EndAction() override;                                                             // vtable+0x40
-	virtual void PutFrame() override;                                                              // vtable+0x6c
-	virtual MxResult VTable0x88(MxStreamChunk* p_chunk);                                           // vtable+0x88
+	void ReadyTickle() override;                                                           // vtable+0x18
+	void StartingTickle() override;                                                        // vtable+0x1c
+	void StreamingTickle() override;                                                       // vtable+0x20
+	void DoneTickle() override;                                                            // vtable+0x2c
+	void ParseExtra() override;                                                            // vtable+0x30
+	MxResult AddToManager() override;                                                      // vtable+0x34
+	void Destroy() override;                                                               // vtable+0x38
+	MxResult StartAction(MxStreamController* p_controller, MxDSAction* p_action) override; // vtable+0x3c
+	void EndAction() override;                                                             // vtable+0x40
+	void PutFrame() override;                                                              // vtable+0x6c
+	virtual MxResult VTable0x88(MxStreamChunk* p_chunk);                                   // vtable+0x88
 
 	inline LegoAnimClass* GetUnknown0x64() { return m_unk0x64; }
 
@@ -81,11 +81,11 @@ class LegoAnimPresenter : public MxVideoPresenter {
 class LegoAnimClass : public LegoTree {
 public:
 	LegoAnimClass();
-	virtual ~LegoAnimClass() override;
+	~LegoAnimClass() override;
 
-	virtual LegoResult Write(LegoStorage* p_storage) override; // vtable+0x08
-	virtual LegoTreeNodeData* CreateData() override;           // vtable+0x0c
-	virtual MxResult VTable0x10(LegoMemory* p_stream, MxS32);  // vtable+0x10
+	LegoResult Write(LegoStorage* p_storage) override;        // vtable+0x08
+	LegoTreeNodeData* CreateData() override;                  // vtable+0x0c
+	virtual MxResult VTable0x10(LegoMemory* p_stream, MxS32); // vtable+0x10
 
 	inline MxLong GetUnknown0x8() { return m_unk0x08; }
 
diff --git a/LEGO1/lego/legoomni/include/legobackgroundcolor.h b/LEGO1/lego/legoomni/include/legobackgroundcolor.h
index 5d05618b..672e39be 100644
--- a/LEGO1/lego/legoomni/include/legobackgroundcolor.h
+++ b/LEGO1/lego/legoomni/include/legobackgroundcolor.h
@@ -8,7 +8,7 @@
 class LegoBackgroundColor : public MxVariable {
 public:
 	LegoBackgroundColor(const char* p_key, const char* p_value);
-	virtual void SetValue(const char* p_colorString) override;
+	void SetValue(const char* p_colorString) override;
 
 private:
 	float m_h;
diff --git a/LEGO1/lego/legoomni/include/legobuildingmanager.h b/LEGO1/lego/legoomni/include/legobuildingmanager.h
index 7bde7ad9..4559d41d 100644
--- a/LEGO1/lego/legoomni/include/legobuildingmanager.h
+++ b/LEGO1/lego/legoomni/include/legobuildingmanager.h
@@ -8,12 +8,12 @@
 class LegoBuildingManager : public MxCore {
 public:
 	LegoBuildingManager();
-	virtual ~LegoBuildingManager() override;
+	~LegoBuildingManager() override;
 
-	virtual MxResult Tickle() override; // vtable+0x08
+	MxResult Tickle() override; // vtable+0x08
 
 	// FUNCTION: LEGO1 0x1002f930
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f37d0
 		return "LegoBuildingManager";
diff --git a/LEGO1/lego/legoomni/include/legocachesound.h b/LEGO1/lego/legoomni/include/legocachesound.h
index 44ddb859..2d7c932c 100644
--- a/LEGO1/lego/legoomni/include/legocachesound.h
+++ b/LEGO1/lego/legoomni/include/legocachesound.h
@@ -9,17 +9,17 @@
 class LegoCacheSound : public MxCore {
 public:
 	LegoCacheSound();
-	virtual ~LegoCacheSound() override; // vtable+0x00
+	~LegoCacheSound() override; // vtable+0x00
 
 	// FUNCTION: LEGO1 0x10006580
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f01c4
 		return "LegoCacheSound";
 	}
 
 	// FUNCTION: LEGO1 0x10006590
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, LegoCacheSound::ClassName()) || MxCore::IsA(p_name);
 	}
diff --git a/LEGO1/lego/legoomni/include/legocachesoundlist.h b/LEGO1/lego/legoomni/include/legocachesoundlist.h
index 2080ae14..25459911 100644
--- a/LEGO1/lego/legoomni/include/legocachesoundlist.h
+++ b/LEGO1/lego/legoomni/include/legocachesoundlist.h
@@ -22,7 +22,7 @@ class LegoCacheSoundList : public MxPtrList<LegoCacheSound> {
 	LegoCacheSoundList(MxBool p_ownership = FALSE) : MxPtrList<LegoCacheSound>(p_ownership) {}
 
 	// FUNCTION: LEGO1 0x1001e650
-	virtual MxS8 Compare(LegoCacheSound* p_a, LegoCacheSound* p_b) override
+	MxS8 Compare(LegoCacheSound* p_a, LegoCacheSound* p_b) override
 	{
 		return p_a == p_b ? 0 : p_a < p_b ? -1 : 1;
 	} // vtable+0x14
diff --git a/LEGO1/lego/legoomni/include/legocameracontroller.h b/LEGO1/lego/legoomni/include/legocameracontroller.h
index a3ef12a7..0032092b 100644
--- a/LEGO1/lego/legoomni/include/legocameracontroller.h
+++ b/LEGO1/lego/legoomni/include/legocameracontroller.h
@@ -12,19 +12,19 @@
 class LegoCameraController : public LegoPointOfViewController {
 public:
 	LegoCameraController();
-	virtual ~LegoCameraController() override; // vtable+0x00
+	~LegoCameraController() override; // vtable+0x00
 
-	virtual MxLong Notify(MxParam& p_param) override; // vtable+04
+	MxLong Notify(MxParam& p_param) override; // vtable+04
 
 	// FUNCTION: LEGO1 0x10011ec0
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f0850
 		return "LegoCameraController";
 	}
 
 	// FUNCTION: LEGO1 0x10011ed0
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, ClassName()) || MxCore::IsA(p_name);
 	}
diff --git a/LEGO1/lego/legoomni/include/legocarbuild.h b/LEGO1/lego/legoomni/include/legocarbuild.h
index 3ce04e02..8314b149 100644
--- a/LEGO1/lego/legoomni/include/legocarbuild.h
+++ b/LEGO1/lego/legoomni/include/legocarbuild.h
@@ -8,29 +8,29 @@
 class LegoCarBuild : public LegoWorld {
 public:
 	LegoCarBuild();
-	virtual ~LegoCarBuild() override;
+	~LegoCarBuild() override;
 
-	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x04
-	virtual MxResult Tickle() override;               // vtable+0x08
+	MxLong Notify(MxParam& p_param) override; // vtable+0x04
+	MxResult Tickle() override;               // vtable+0x08
 
 	// FUNCTION: LEGO1 0x10022940
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f0504
 		return "LegoCarBuild";
 	}
 
 	// FUNCTION: LEGO1 0x10022950
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, LegoCarBuild::ClassName()) || LegoWorld::IsA(p_name);
 	}
 
-	virtual MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
-	virtual void ReadyWorld() override;                       // vtable+0x50
-	virtual MxBool VTable0x5c() override;                     // vtable+0x5c
-	virtual MxBool VTable0x64() override;                     // vtable+0x64
-	virtual void VTable0x68(MxBool p_add) override;           // vtable+0x68
+	MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
+	void ReadyWorld() override;                       // vtable+0x50
+	MxBool VTable0x5c() override;                     // vtable+0x5c
+	MxBool VTable0x64() override;                     // vtable+0x64
+	void VTable0x68(MxBool p_add) override;           // vtable+0x68
 
 	// SYNTHETIC: LEGO1 0x10022a60
 	// LegoCarBuild::`scalar deleting destructor'
diff --git a/LEGO1/lego/legoomni/include/legocarbuildanimpresenter.h b/LEGO1/lego/legoomni/include/legocarbuildanimpresenter.h
index d15e2f19..fd5f8148 100644
--- a/LEGO1/lego/legoomni/include/legocarbuildanimpresenter.h
+++ b/LEGO1/lego/legoomni/include/legocarbuildanimpresenter.h
@@ -8,26 +8,26 @@
 class LegoCarBuildAnimPresenter : public LegoAnimPresenter {
 public:
 	LegoCarBuildAnimPresenter();
-	virtual ~LegoCarBuildAnimPresenter() override; // vtable+0x00
+	~LegoCarBuildAnimPresenter() override; // vtable+0x00
 
 	// FUNCTION: LEGO1 0x10078510
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f05ec
 		return "LegoCarBuildAnimPresenter";
 	}
 
 	// FUNCTION: LEGO1 0x10078520
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, LegoCarBuildAnimPresenter::ClassName()) || LegoAnimPresenter::IsA(p_name);
 	}
 
-	virtual void ReadyTickle() override;     // vtable+0x18
-	virtual void StreamingTickle() override; // vtable+0x20
-	virtual void RepeatingTickle() override; // vtable+0x24
-	virtual void EndAction() override;       // vtable+0x40
-	virtual void PutFrame() override;        // vtable+0x6c
+	void ReadyTickle() override;     // vtable+0x18
+	void StreamingTickle() override; // vtable+0x20
+	void RepeatingTickle() override; // vtable+0x24
+	void EndAction() override;       // vtable+0x40
+	void PutFrame() override;        // vtable+0x6c
 
 	// SYNTHETIC: LEGO1 0x10078660
 	// LegoCarBuildAnimPresenter::`scalar deleting destructor'
diff --git a/LEGO1/lego/legoomni/include/legocarraceactor.h b/LEGO1/lego/legoomni/include/legocarraceactor.h
index 5f2756a3..3905be16 100644
--- a/LEGO1/lego/legoomni/include/legocarraceactor.h
+++ b/LEGO1/lego/legoomni/include/legocarraceactor.h
@@ -7,25 +7,25 @@
 class LegoCarRaceActor : public LegoRaceActor {
 public:
 	// FUNCTION: LEGO1 0x10081650
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f0568
 		return "LegoCarRaceActor";
 	}
 
 	// FUNCTION: LEGO1 0x10081670
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, LegoCarRaceActor::ClassName()) || LegoRaceActor::IsA(p_name);
 	}
 
-	virtual void VTable0x68() override;              // vtable+0x68
-	virtual void VTable0x6c() override;              // vtable+0x6c
-	virtual void VTable0x70(float p_float) override; // vtable+0x70
-	virtual MxS32 VTable0x90() override;             // vtable+0x90
-	virtual MxS32 VTable0x94() override;             // vtable+0x94
-	virtual void VTable0x98() override;              // vtable+0x98
-	virtual void VTable0x9c() override;              // vtable+0x9c
+	void VTable0x68() override;              // vtable+0x68
+	void VTable0x6c() override;              // vtable+0x6c
+	void VTable0x70(float p_float) override; // vtable+0x70
+	MxS32 VTable0x90() override;             // vtable+0x90
+	MxS32 VTable0x94() override;             // vtable+0x94
+	void VTable0x98() override;              // vtable+0x98
+	void VTable0x9c() override;              // vtable+0x9c
 
 	// SYNTHETIC: LEGO1 0x10081610
 	// LegoCarRaceActor::`scalar deleting destructor'
diff --git a/LEGO1/lego/legoomni/include/legocontrolmanager.h b/LEGO1/lego/legoomni/include/legocontrolmanager.h
index 0206c520..b4222164 100644
--- a/LEGO1/lego/legoomni/include/legocontrolmanager.h
+++ b/LEGO1/lego/legoomni/include/legocontrolmanager.h
@@ -40,19 +40,19 @@ class LegoControlManagerEvent : public LegoEventNotificationParam {
 class LegoControlManager : public MxCore {
 public:
 	LegoControlManager();
-	virtual ~LegoControlManager() override; // vtable+0x00
+	~LegoControlManager() override; // vtable+0x00
 
-	virtual MxResult Tickle() override; // vtable+0x08
+	MxResult Tickle() override; // vtable+0x08
 
 	// FUNCTION: LEGO1 0x10028cb0
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f31b8
 		return "LegoControlManager";
 	}
 
 	// FUNCTION: LEGO1 0x10028cc0
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, LegoControlManager::ClassName()) || MxCore::IsA(p_name);
 	}
diff --git a/LEGO1/lego/legoomni/include/legoentity.h b/LEGO1/lego/legoomni/include/legoentity.h
index c5088097..e132a113 100644
--- a/LEGO1/lego/legoomni/include/legoentity.h
+++ b/LEGO1/lego/legoomni/include/legoentity.h
@@ -20,9 +20,9 @@ class LegoEntity : public MxEntity {
 	inline LegoEntity() { Init(); }
 
 	// FUNCTION: LEGO1 0x1000c290
-	virtual ~LegoEntity() override { Destroy(TRUE); }
+	~LegoEntity() override { Destroy(TRUE); }
 
-	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x04
+	MxLong Notify(MxParam& p_param) override; // vtable+0x04
 
 	// FUNCTION: LEGO1 0x1000c2f0
 	inline const char* ClassName() const override // vtable+0x0c
diff --git a/LEGO1/lego/legoomni/include/legoentitylist.h b/LEGO1/lego/legoomni/include/legoentitylist.h
index d1c1383f..ef64b06c 100644
--- a/LEGO1/lego/legoomni/include/legoentitylist.h
+++ b/LEGO1/lego/legoomni/include/legoentitylist.h
@@ -22,7 +22,7 @@ class LegoEntityList : public MxPtrList<LegoEntity> {
 	LegoEntityList(MxBool p_ownership = FALSE) : MxPtrList<LegoEntity>(p_ownership) {}
 
 	// FUNCTION: LEGO1 0x1001e2d0
-	virtual MxS8 Compare(LegoEntity* p_a, LegoEntity* p_b) override
+	MxS8 Compare(LegoEntity* p_a, LegoEntity* p_b) override
 	{
 		return p_a == p_b ? 0 : p_a < p_b ? -1 : 1;
 	} // vtable+0x14
diff --git a/LEGO1/lego/legoomni/include/legoentitypresenter.h b/LEGO1/lego/legoomni/include/legoentitypresenter.h
index 291809ab..565e7878 100644
--- a/LEGO1/lego/legoomni/include/legoentitypresenter.h
+++ b/LEGO1/lego/legoomni/include/legoentitypresenter.h
@@ -10,7 +10,7 @@ class LegoEntity;
 class LegoEntityPresenter : public MxCompositePresenter {
 public:
 	LegoEntityPresenter();
-	virtual ~LegoEntityPresenter() override; // vtable+0x00
+	~LegoEntityPresenter() override; // vtable+0x00
 
 	// FUNCTION: LEGO1 0x100534b0
 	inline const char* ClassName() const override // vtable+0x0c
@@ -25,13 +25,13 @@ class LegoEntityPresenter : public MxCompositePresenter {
 		return !strcmp(p_name, LegoEntityPresenter::ClassName()) || MxCompositePresenter::IsA(p_name);
 	}
 
-	virtual void ReadyTickle() override;                                                           // vtable+0x18
-	virtual void RepeatingTickle() override;                                                       // vtable+0x24
-	virtual void ParseExtra() override;                                                            // vtable+0x30
-	virtual void Destroy() override;                                                               // vtable+0x38
-	virtual MxResult StartAction(MxStreamController* p_controller, MxDSAction* p_action) override; // vtable+0x3c
-	virtual void Init();                                                                           // vtable+0x68
-	virtual undefined4 SetEntity(LegoEntity* p_entity);                                            // vtable+0x6c
+	void ReadyTickle() override;                                                           // vtable+0x18
+	void RepeatingTickle() override;                                                       // vtable+0x24
+	void ParseExtra() override;                                                            // vtable+0x30
+	void Destroy() override;                                                               // vtable+0x38
+	MxResult StartAction(MxStreamController* p_controller, MxDSAction* p_action) override; // vtable+0x3c
+	virtual void Init();                                                                   // vtable+0x68
+	virtual undefined4 SetEntity(LegoEntity* p_entity);                                    // vtable+0x6c
 
 	void SetEntityLocation(Mx3DPointFloat& p_location, Mx3DPointFloat& p_direction, Mx3DPointFloat& p_up);
 
diff --git a/LEGO1/lego/legoomni/include/legoeventnotificationparam.h b/LEGO1/lego/legoomni/include/legoeventnotificationparam.h
index 650ef8f6..a9c13632 100644
--- a/LEGO1/lego/legoomni/include/legoeventnotificationparam.h
+++ b/LEGO1/lego/legoomni/include/legoeventnotificationparam.h
@@ -12,7 +12,7 @@
 class LegoEventNotificationParam : public MxNotificationParam {
 public:
 	// FUNCTION: LEGO1 0x10028690
-	virtual MxNotificationParam* Clone() override
+	MxNotificationParam* Clone() override
 	{
 		LegoEventNotificationParam* clone =
 			new LegoEventNotificationParam(m_type, m_sender, m_modifier, m_x, m_y, m_key);
diff --git a/LEGO1/lego/legoomni/include/legoflctexturepresenter.h b/LEGO1/lego/legoomni/include/legoflctexturepresenter.h
index f86cf448..70f8a309 100644
--- a/LEGO1/lego/legoomni/include/legoflctexturepresenter.h
+++ b/LEGO1/lego/legoomni/include/legoflctexturepresenter.h
@@ -17,9 +17,9 @@ class LegoFlcTexturePresenter : public MxFlcPresenter {
 		return "LegoFlcTexturePresenter";
 	}
 
-	virtual void StartingTickle() override;                  // vtable+0x1c
-	virtual void LoadFrame(MxStreamChunk* p_chunk) override; // vtable+0x68
-	virtual void PutFrame() override;                        // vtable+0x6c
+	void StartingTickle() override;                  // vtable+0x1c
+	void LoadFrame(MxStreamChunk* p_chunk) override; // vtable+0x68
+	void PutFrame() override;                        // vtable+0x6c
 
 	// SYNTHETIC: LEGO1 0x1005df00
 	// LegoFlcTexturePresenter::`scalar deleting destructor'
diff --git a/LEGO1/lego/legoomni/include/legofullscreenmovie.h b/LEGO1/lego/legoomni/include/legofullscreenmovie.h
index f2cdaae4..2f2f7614 100644
--- a/LEGO1/lego/legoomni/include/legofullscreenmovie.h
+++ b/LEGO1/lego/legoomni/include/legofullscreenmovie.h
@@ -8,7 +8,7 @@
 class LegoFullScreenMovie : public MxVariable {
 public:
 	LegoFullScreenMovie(const char* p_key, const char* p_value);
-	virtual void SetValue(const char* p_option) override;
+	void SetValue(const char* p_option) override;
 };
 
 #endif // LEGOFULLSCREENMOVIE_H
diff --git a/LEGO1/lego/legoomni/include/legohideanimpresenter.h b/LEGO1/lego/legoomni/include/legohideanimpresenter.h
index 29232923..37b8c475 100644
--- a/LEGO1/lego/legoomni/include/legohideanimpresenter.h
+++ b/LEGO1/lego/legoomni/include/legohideanimpresenter.h
@@ -9,7 +9,7 @@
 class LegoHideAnimPresenter : public LegoLoopingAnimPresenter {
 public:
 	LegoHideAnimPresenter();
-	virtual ~LegoHideAnimPresenter() override;
+	~LegoHideAnimPresenter() override;
 
 	// FUNCTION: LEGO1 0x1006d880
 	inline const char* ClassName() const override // vtable+0x0c
@@ -24,12 +24,12 @@ class LegoHideAnimPresenter : public LegoLoopingAnimPresenter {
 		return !strcmp(p_name, ClassName()) || LegoAnimPresenter::IsA(p_name);
 	}
 
-	virtual void ReadyTickle() override;      // vtable+0x18
-	virtual void StartingTickle() override;   // vtable+0x18
-	virtual MxResult AddToManager() override; // vtable+0x34
-	virtual void Destroy() override;          // vtable+0x38
-	virtual void EndAction() override;        // vtable+0x40
-	virtual void PutFrame() override;         // vtable+0x6c
+	void ReadyTickle() override;      // vtable+0x18
+	void StartingTickle() override;   // vtable+0x18
+	MxResult AddToManager() override; // vtable+0x34
+	void Destroy() override;          // vtable+0x38
+	void EndAction() override;        // vtable+0x40
+	void PutFrame() override;         // vtable+0x6c
 
 private:
 	void Init();
diff --git a/LEGO1/lego/legoomni/include/legoinputmanager.h b/LEGO1/lego/legoomni/include/legoinputmanager.h
index e872eff6..69a9dc64 100644
--- a/LEGO1/lego/legoomni/include/legoinputmanager.h
+++ b/LEGO1/lego/legoomni/include/legoinputmanager.h
@@ -42,7 +42,7 @@ class LegoEventQueue : public MxQueue<LegoEventNotificationParam> {};
 class LegoNotifyList : public MxPtrList<MxCore> {
 protected:
 	// FUNCTION: LEGO1 0x10028830
-	virtual MxS8 Compare(MxCore* p_element1, MxCore* p_element2) override
+	MxS8 Compare(MxCore* p_element1, MxCore* p_element2) override
 	{
 		return p_element1 == p_element2 ? 0 : p_element1 < p_element2 ? -1 : 1;
 	} // vtable+0x14
@@ -69,19 +69,19 @@ class LegoNotifyListCursor : public MxPtrListCursor<MxCore> {
 class LegoInputManager : public MxPresenter {
 public:
 	LegoInputManager();
-	virtual ~LegoInputManager() override;
+	~LegoInputManager() override;
 
 	void QueueEvent(NotificationId p_id, MxU8 p_modifier, MxLong p_x, MxLong p_y, MxU8 p_key);
 	void Register(MxCore*);
 	void UnRegister(MxCore*);
 
-	virtual MxResult Tickle() override; // vtable+0x08
+	MxResult Tickle() override; // vtable+0x08
 
 	// FUNCTION: LEGO1 0x1005b8c0
-	virtual MxResult PutData() override { return SUCCESS; } // vtable+0x4c
+	MxResult PutData() override { return SUCCESS; } // vtable+0x4c
 
 	MxResult Create(HWND p_hwnd);
-	void Destroy();
+	void Destroy() override;
 	void CreateAndAcquireKeyboard(HWND p_hwnd);
 	void ReleaseDX();
 	MxResult GetJoystickId();
diff --git a/LEGO1/lego/legoomni/include/legojetski.h b/LEGO1/lego/legoomni/include/legojetski.h
index a4699945..1ec0b9bb 100644
--- a/LEGO1/lego/legoomni/include/legojetski.h
+++ b/LEGO1/lego/legoomni/include/legojetski.h
@@ -6,7 +6,7 @@
 // VTABLE: LEGO1 0x100d5a40
 class LegoJetski : public LegoJetskiRaceActor {
 public:
-	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x04
+	MxLong Notify(MxParam& p_param) override; // vtable+0x04
 
 	// FUNCTION: LEGO1 0x10013e80
 	inline const char* ClassName() const override // vtable+0x0c
@@ -21,13 +21,13 @@ class LegoJetski : public LegoJetskiRaceActor {
 		return !strcmp(p_name, LegoJetski::ClassName()) || LegoJetskiRaceActor::IsA(p_name);
 	}
 
-	virtual void ParseAction(char*) override;                  // vtable+0x20
-	virtual void SetWorldSpeed(MxFloat p_worldSpeed) override; // vtable+0x30
-	virtual void VTable0x6c() override;                        // vtable+0x6c
-	virtual void VTable0x70(float p_float) override;           // vtable+0x70
-	virtual MxS32 VTable0x94() override;                       // vtable+0x94
-	virtual void VTable0x98() override;                        // vtable+0x98
-	virtual void VTable0x9c() override;                        // vtable+0x9c
+	void ParseAction(char*) override;                  // vtable+0x20
+	void SetWorldSpeed(MxFloat p_worldSpeed) override; // vtable+0x30
+	void VTable0x6c() override;                        // vtable+0x6c
+	void VTable0x70(float p_float) override;           // vtable+0x70
+	MxS32 VTable0x94() override;                       // vtable+0x94
+	void VTable0x98() override;                        // vtable+0x98
+	void VTable0x9c() override;                        // vtable+0x9c
 
 	// SYNTHETIC: LEGO1 0x10013e20
 	// LegoJetski::`scalar deleting destructor'
diff --git a/LEGO1/lego/legoomni/include/legojetskiraceactor.h b/LEGO1/lego/legoomni/include/legojetskiraceactor.h
index 149b7011..fd7d88bb 100644
--- a/LEGO1/lego/legoomni/include/legojetskiraceactor.h
+++ b/LEGO1/lego/legoomni/include/legojetskiraceactor.h
@@ -19,10 +19,10 @@ class LegoJetskiRaceActor : public LegoCarRaceActor {
 		return !strcmp(p_name, LegoJetskiRaceActor::ClassName()) || LegoCarRaceActor::IsA(p_name);
 	}
 
-	virtual void VTable0x6c() override;              // vtable+0x6c
-	virtual void VTable0x70(float p_float) override; // vtable+0x70
-	virtual void VTable0x98() override;              // vtable+0x98
-	virtual void VTable0x9c() override;              // vtable+0x9c
+	void VTable0x6c() override;              // vtable+0x6c
+	void VTable0x70(float p_float) override; // vtable+0x70
+	void VTable0x98() override;              // vtable+0x98
+	void VTable0x9c() override;              // vtable+0x9c
 
 	// SYNTHETIC: LEGO1 0x10081d40
 	// LegoJetskiRaceActor::`scalar deleting destructor'
diff --git a/LEGO1/lego/legoomni/include/legoloadcachesoundpresenter.h b/LEGO1/lego/legoomni/include/legoloadcachesoundpresenter.h
index b0fc9db9..cb6ad80a 100644
--- a/LEGO1/lego/legoomni/include/legoloadcachesoundpresenter.h
+++ b/LEGO1/lego/legoomni/include/legoloadcachesoundpresenter.h
@@ -11,7 +11,7 @@ class LegoCacheSound;
 class LegoLoadCacheSoundPresenter : public MxWavePresenter {
 public:
 	LegoLoadCacheSoundPresenter();
-	virtual ~LegoLoadCacheSoundPresenter() override;
+	~LegoLoadCacheSoundPresenter() override;
 
 	// FUNCTION: LEGO1 0x10018450
 	inline const char* ClassName() const override // vtable+0x0c
@@ -20,10 +20,10 @@ class LegoLoadCacheSoundPresenter : public MxWavePresenter {
 		return "LegoLoadCacheSoundPresenter";
 	}
 
-	virtual void ReadyTickle() override;     // vtable+0x18
-	virtual void StreamingTickle() override; // vtable+0x20
-	virtual void DoneTickle() override;      // vtable+0x2c
-	virtual MxResult PutData() override;     // vtable+0x4c
+	void ReadyTickle() override;     // vtable+0x18
+	void StreamingTickle() override; // vtable+0x20
+	void DoneTickle() override;      // vtable+0x2c
+	MxResult PutData() override;     // vtable+0x4c
 
 private:
 	void Init();
diff --git a/LEGO1/lego/legoomni/include/legolocomotionanimpresenter.h b/LEGO1/lego/legoomni/include/legolocomotionanimpresenter.h
index 34b6ed2e..2a78176d 100644
--- a/LEGO1/lego/legoomni/include/legolocomotionanimpresenter.h
+++ b/LEGO1/lego/legoomni/include/legolocomotionanimpresenter.h
@@ -8,7 +8,7 @@
 class LegoLocomotionAnimPresenter : public LegoLoopingAnimPresenter {
 public:
 	LegoLocomotionAnimPresenter();
-	virtual ~LegoLocomotionAnimPresenter() override;
+	~LegoLocomotionAnimPresenter() override;
 
 	// FUNCTION: LEGO1 0x1006ce50
 	inline const char* ClassName() const override // vtable+0x0c
@@ -23,22 +23,23 @@ class LegoLocomotionAnimPresenter : public LegoLoopingAnimPresenter {
 		return !strcmp(p_name, ClassName()) || LegoLoopingAnimPresenter::IsA(p_name);
 	}
 
-	virtual void ReadyTickle() override;                          // vtable+0x18
-	virtual void StartingTickle() override;                       // vtable+0x1c
-	virtual void StreamingTickle() override;                      // vtable+0x20
-	virtual MxResult AddToManager() override;                     // vtable+0x34
-	virtual void Destroy() override;                              // vtable+0x38
-	virtual void EndAction() override;                            // vtable+0x40
-	virtual void PutFrame() override;                             // vtable+0x6c
-	virtual MxResult VTable0x88(MxStreamChunk* p_chunk) override; // vtable+0x88
+	void ReadyTickle() override;                          // vtable+0x18
+	void StartingTickle() override;                       // vtable+0x1c
+	void StreamingTickle() override;                      // vtable+0x20
+	MxResult AddToManager() override;                     // vtable+0x34
+	void Destroy() override;                              // vtable+0x38
+	void EndAction() override;                            // vtable+0x40
+	void PutFrame() override;                             // vtable+0x6c
+	MxResult VTable0x88(MxStreamChunk* p_chunk) override; // vtable+0x88
 
 	// SYNTHETIC: LEGO1 0x1006cfe0
 	// LegoLocomotionAnimPresenter::`scalar deleting destructor'
 
 	inline void DecrementUnknown0xd4()
 	{
-		if (m_unk0xd4)
+		if (m_unk0xd4) {
 			--m_unk0xd4;
+		}
 	}
 
 	inline undefined2 GetUnknown0xd4() { return m_unk0xd4; }
diff --git a/LEGO1/lego/legoomni/include/legoloopinganimpresenter.h b/LEGO1/lego/legoomni/include/legoloopinganimpresenter.h
index 22bdffc9..50815015 100644
--- a/LEGO1/lego/legoomni/include/legoloopinganimpresenter.h
+++ b/LEGO1/lego/legoomni/include/legoloopinganimpresenter.h
@@ -20,8 +20,8 @@ class LegoLoopingAnimPresenter : public LegoAnimPresenter {
 		return !strcmp(p_name, ClassName()) || LegoAnimPresenter::IsA(p_name);
 	}
 
-	virtual void StreamingTickle() override; // vtable+0x20
-	virtual void PutFrame() override;        // vtable+0x6c
+	void StreamingTickle() override; // vtable+0x20
+	void PutFrame() override;        // vtable+0x6c
 };
 
 // SYNTHETIC: LEGO1 0x1006d000
diff --git a/LEGO1/lego/legoomni/include/legometerpresenter.h b/LEGO1/lego/legoomni/include/legometerpresenter.h
index 33c7aa37..378c0574 100644
--- a/LEGO1/lego/legoomni/include/legometerpresenter.h
+++ b/LEGO1/lego/legoomni/include/legometerpresenter.h
@@ -8,13 +8,13 @@
 class LegoMeterPresenter : public MxStillPresenter {
 public:
 	LegoMeterPresenter();
-	virtual ~LegoMeterPresenter() override;
+	~LegoMeterPresenter() override;
 
 	// MxStillPresenter's `::ClassName` and `::IsA` are used.
 
-	virtual void StreamingTickle() override; // vtable+0x20
-	virtual void RepeatingTickle() override; // vtable+0x24
-	virtual void ParseExtra() override;      // vtable+0x30
+	void StreamingTickle() override; // vtable+0x20
+	void RepeatingTickle() override; // vtable+0x24
+	void ParseExtra() override;      // vtable+0x30
 
 private:
 	void FUN_10043a50();
diff --git a/LEGO1/lego/legoomni/include/legomodelpresenter.h b/LEGO1/lego/legoomni/include/legomodelpresenter.h
index e0480d23..c94be713 100644
--- a/LEGO1/lego/legoomni/include/legomodelpresenter.h
+++ b/LEGO1/lego/legoomni/include/legomodelpresenter.h
@@ -24,9 +24,9 @@ class LegoModelPresenter : public MxVideoPresenter {
 		return !strcmp(p_name, ClassName()) || MxVideoPresenter::IsA(p_name);
 	}
 
-	virtual void ReadyTickle() override; // vtable+0x18
-	virtual void ParseExtra() override;  // vtable+0x30
-	virtual void Destroy() override;     // vtable+0x38
+	void ReadyTickle() override; // vtable+0x18
+	void ParseExtra() override;  // vtable+0x30
+	void Destroy() override;     // vtable+0x38
 
 	// SYNTHETIC: LEGO1 0x1000cdd0
 	// LegoModelPresenter::`scalar deleting destructor'
diff --git a/LEGO1/lego/legoomni/include/legonavcontroller.h b/LEGO1/lego/legoomni/include/legonavcontroller.h
index 5e251563..58ace217 100644
--- a/LEGO1/lego/legoomni/include/legonavcontroller.h
+++ b/LEGO1/lego/legoomni/include/legonavcontroller.h
@@ -37,8 +37,8 @@ class LegoNavController : public MxCore {
 	);
 
 	LegoNavController();
-	virtual ~LegoNavController() override;            // vtable+0x00
-	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x04
+	~LegoNavController() override;            // vtable+0x00
+	MxLong Notify(MxParam& p_param) override; // vtable+0x04
 
 	// FUNCTION: LEGO1 0x10054b80
 	inline const char* ClassName() const override // vtable+0x0c
diff --git a/LEGO1/lego/legoomni/include/legoobjectfactory.h b/LEGO1/lego/legoomni/include/legoobjectfactory.h
index 9357ce34..66006588 100644
--- a/LEGO1/lego/legoomni/include/legoobjectfactory.h
+++ b/LEGO1/lego/legoomni/include/legoobjectfactory.h
@@ -105,8 +105,8 @@
 class LegoObjectFactory : public MxObjectFactory {
 public:
 	LegoObjectFactory();
-	virtual MxCore* Create(const char* p_name) override; // vtable 0x14
-	virtual void Destroy(MxCore* p_object) override;     // vtable 0x18
+	MxCore* Create(const char* p_name) override; // vtable 0x14
+	void Destroy(MxCore* p_object) override;     // vtable 0x18
 
 	// SYNTHETIC: LEGO1 0x10009000
 	// LegoObjectFactory::`scalar deleting destructor'
diff --git a/LEGO1/lego/legoomni/include/legoomni.h b/LEGO1/lego/legoomni/include/legoomni.h
index f27bf140..33fc6a46 100644
--- a/LEGO1/lego/legoomni/include/legoomni.h
+++ b/LEGO1/lego/legoomni/include/legoomni.h
@@ -75,33 +75,33 @@ class LegoOmni : public MxOmni {
 	static LegoOmni* GetInstance();
 
 	LegoOmni();
-	virtual ~LegoOmni(); // vtable+00
+	~LegoOmni() override; // vtable+00
 
-	virtual MxLong Notify(MxParam& p_param) override; // vtable+04
+	MxLong Notify(MxParam& p_param) override; // vtable+04
 
 	// FUNCTION: LEGO1 0x10058aa0
-	inline virtual const char* ClassName() const override // vtable+0c
+	inline const char* ClassName() const override // vtable+0c
 	{
 		// STRING: LEGO1 0x100f671c
 		return "LegoOmni";
 	}
 
 	// FUNCTION: LEGO1 0x10058ab0
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+10
+	inline MxBool IsA(const char* p_name) const override // vtable+10
 	{
 		return !strcmp(p_name, LegoOmni::ClassName()) || MxOmni::IsA(p_name);
 	}
 
-	virtual void Init() override;                                                                        // vtable+14
-	virtual MxResult Create(MxOmniCreateParam& p_param) override;                                        // vtable+18
-	virtual void Destroy() override;                                                                     // vtable+1c
-	virtual MxResult Start(MxDSAction* p_dsAction) override;                                             // vtable+20
-	virtual void DeleteObject(MxDSAction& p_dsAction) override;                                          // vtable+24
-	virtual MxBool DoesEntityExist(MxDSAction& p_dsAction) override;                                     // vtable+28
-	virtual MxEntity* AddToWorld(const char* p_id, MxS32 p_entityId, MxPresenter* p_presenter) override; // vtable+30
-	virtual void NotifyCurrentEntity(MxNotificationParam* p_param) override;                             // vtable+34
-	virtual void StartTimer() override;                                                                  // vtable+38
-	virtual void StopTimer() override;                                                                   // vtable+3c
+	void Init() override;                                                                        // vtable+14
+	MxResult Create(MxOmniCreateParam& p_param) override;                                        // vtable+18
+	void Destroy() override;                                                                     // vtable+1c
+	MxResult Start(MxDSAction* p_dsAction) override;                                             // vtable+20
+	void DeleteObject(MxDSAction& p_dsAction) override;                                          // vtable+24
+	MxBool DoesEntityExist(MxDSAction& p_dsAction) override;                                     // vtable+28
+	MxEntity* AddToWorld(const char* p_id, MxS32 p_entityId, MxPresenter* p_presenter) override; // vtable+30
+	void NotifyCurrentEntity(MxNotificationParam* p_param) override;                             // vtable+34
+	void StartTimer() override;                                                                  // vtable+38
+	void StopTimer() override;                                                                   // vtable+3c
 
 	LegoWorld* FindWorld(const MxAtomId& p_atom, MxS32 p_entityid);
 	void AddWorld(LegoWorld* p_world);
diff --git a/LEGO1/lego/legoomni/include/legopalettepresenter.h b/LEGO1/lego/legoomni/include/legopalettepresenter.h
index 04ee620b..c9e7fb81 100644
--- a/LEGO1/lego/legoomni/include/legopalettepresenter.h
+++ b/LEGO1/lego/legoomni/include/legopalettepresenter.h
@@ -10,7 +10,7 @@
 class LegoPalettePresenter : public MxVideoPresenter {
 public:
 	LegoPalettePresenter();
-	virtual ~LegoPalettePresenter() override; // vtable+0x00
+	~LegoPalettePresenter() override; // vtable+0x00
 
 	// FUNCTION: LEGO1 0x10079f30
 	inline const char* ClassName() const override // vtable+0x0c
@@ -25,8 +25,8 @@ class LegoPalettePresenter : public MxVideoPresenter {
 		return !strcmp(p_name, ClassName()) || MxVideoPresenter::IsA(p_name);
 	}
 
-	virtual void ReadyTickle() override; // vtable+0x18
-	virtual void Destroy() override;     // vtable+0x38
+	void ReadyTickle() override; // vtable+0x18
+	void Destroy() override;     // vtable+0x38
 
 	MxResult ParsePalette(MxStreamChunk* p_chunk);
 
diff --git a/LEGO1/lego/legoomni/include/legopartpresenter.h b/LEGO1/lego/legoomni/include/legopartpresenter.h
index 8f14633d..ab27b0e9 100644
--- a/LEGO1/lego/legoomni/include/legopartpresenter.h
+++ b/LEGO1/lego/legoomni/include/legopartpresenter.h
@@ -20,9 +20,9 @@ class LegoPartPresenter : public MxMediaPresenter {
 		return !strcmp(p_name, LegoPartPresenter::ClassName()) || MxMediaPresenter::IsA(p_name);
 	}
 
-	virtual void ReadyTickle() override;      // vtable+0x18
-	virtual MxResult AddToManager() override; // vtable+0x34
-	virtual void Destroy() override;          // vtable+0x38
+	void ReadyTickle() override;      // vtable+0x18
+	MxResult AddToManager() override; // vtable+0x34
+	void Destroy() override;          // vtable+0x38
 
 	static void configureLegoPartPresenter(MxS32, MxS32);
 
diff --git a/LEGO1/lego/legoomni/include/legopathactor.h b/LEGO1/lego/legoomni/include/legopathactor.h
index adc1c392..c2a2026c 100644
--- a/LEGO1/lego/legoomni/include/legopathactor.h
+++ b/LEGO1/lego/legoomni/include/legopathactor.h
@@ -10,7 +10,7 @@
 class LegoPathActor : public LegoActor {
 public:
 	LegoPathActor();
-	virtual ~LegoPathActor() override;
+	~LegoPathActor() override;
 
 	// FUNCTION: LEGO1 0x1000c430
 	inline const char* ClassName() const override // vtable+0x0c
@@ -25,7 +25,7 @@ class LegoPathActor : public LegoActor {
 		return !strcmp(p_name, LegoPathActor::ClassName()) || LegoActor::IsA(p_name);
 	}
 
-	virtual void ParseAction(char*) override;      // vtable+0x20
+	void ParseAction(char*) override;              // vtable+0x20
 	virtual void VTable0x68();                     // vtable+0x68
 	virtual void VTable0x6c();                     // vtable+0x6c
 	virtual void VTable0x70(float p_float);        // vtable+0x70
diff --git a/LEGO1/lego/legoomni/include/legopathcontroller.h b/LEGO1/lego/legoomni/include/legopathcontroller.h
index 86298726..8363ee7a 100644
--- a/LEGO1/lego/legoomni/include/legopathcontroller.h
+++ b/LEGO1/lego/legoomni/include/legopathcontroller.h
@@ -8,9 +8,9 @@
 class LegoPathController : public MxCore {
 public:
 	LegoPathController();
-	virtual ~LegoPathController() override { Destroy(); }
+	~LegoPathController() override { Destroy(); }
 
-	virtual MxResult Tickle() override; // vtable+08
+	MxResult Tickle() override; // vtable+08
 
 	// FUNCTION: LEGO1 0x10045110
 	inline const char* ClassName() const override // vtable+0x0c
diff --git a/LEGO1/lego/legoomni/include/legopathcontrollerlist.h b/LEGO1/lego/legoomni/include/legopathcontrollerlist.h
index a13557b8..0bcd9c09 100644
--- a/LEGO1/lego/legoomni/include/legopathcontrollerlist.h
+++ b/LEGO1/lego/legoomni/include/legopathcontrollerlist.h
@@ -15,7 +15,7 @@ class LegoPathControllerList : public MxPtrList<LegoPathController> {
 	LegoPathControllerList(MxBool p_ownership = FALSE) : MxPtrList<LegoPathController>(p_ownership) {}
 
 	// FUNCTION: LEGO1 0x1001d210
-	virtual MxS8 Compare(LegoPathController* p_a, LegoPathController* p_b) override
+	MxS8 Compare(LegoPathController* p_a, LegoPathController* p_b) override
 	{
 		return p_a == p_b ? 0 : p_a < p_b ? -1 : 1;
 	} // vtable+0x14
diff --git a/LEGO1/lego/legoomni/include/legopathpresenter.h b/LEGO1/lego/legoomni/include/legopathpresenter.h
index ab66a5df..e6c5da14 100644
--- a/LEGO1/lego/legoomni/include/legopathpresenter.h
+++ b/LEGO1/lego/legoomni/include/legopathpresenter.h
@@ -8,7 +8,7 @@
 class LegoPathPresenter : public MxMediaPresenter {
 public:
 	LegoPathPresenter();
-	virtual ~LegoPathPresenter() override;
+	~LegoPathPresenter() override;
 
 	// FUNCTION: LEGO1 0x100449a0
 	inline const char* ClassName() const override // vtable+0x0c
@@ -23,12 +23,12 @@ class LegoPathPresenter : public MxMediaPresenter {
 		return !strcmp(p_name, LegoPathPresenter::ClassName()) || MxMediaPresenter::IsA(p_name);
 	}
 
-	virtual void ReadyTickle() override;      // vtable+0x18
-	virtual void StreamingTickle() override;  // vtable+0x20
-	virtual void RepeatingTickle() override;  // vtable+0x24
-	virtual void ParseExtra() override;       // vtable+0x30
-	virtual MxResult AddToManager() override; // vtable+0x34
-	virtual void Destroy() override;          // vtable+0x38
+	void ReadyTickle() override;      // vtable+0x18
+	void StreamingTickle() override;  // vtable+0x20
+	void RepeatingTickle() override;  // vtable+0x24
+	void ParseExtra() override;       // vtable+0x30
+	MxResult AddToManager() override; // vtable+0x34
+	void Destroy() override;          // vtable+0x38
 
 	// SYNTHETIC: LEGO1 0x10044a90
 	// LegoPathPresenter::`scalar deleting destructor'
diff --git a/LEGO1/lego/legoomni/include/legophonemepresenter.h b/LEGO1/lego/legoomni/include/legophonemepresenter.h
index 2a2ec497..db86a1e5 100644
--- a/LEGO1/lego/legoomni/include/legophonemepresenter.h
+++ b/LEGO1/lego/legoomni/include/legophonemepresenter.h
@@ -11,7 +11,7 @@
 class LegoPhonemePresenter : public MxFlcPresenter {
 public:
 	LegoPhonemePresenter();
-	virtual ~LegoPhonemePresenter() override; // vtable+0x00
+	~LegoPhonemePresenter() override; // vtable+0x00
 
 	// FUNCTION: LEGO1 0x1004e310
 	inline const char* ClassName() const override // vtable+0x0c
@@ -20,10 +20,10 @@ class LegoPhonemePresenter : public MxFlcPresenter {
 		return "LegoPhonemePresenter";
 	}
 
-	virtual void StartingTickle() override;                  // vtable+0x1c
-	virtual void EndAction() override;                       // vtable+0x40
-	virtual void LoadFrame(MxStreamChunk* p_chunk) override; // vtable+0x68
-	virtual void PutFrame() override;                        // vtable+0x6c
+	void StartingTickle() override;                  // vtable+0x1c
+	void EndAction() override;                       // vtable+0x40
+	void LoadFrame(MxStreamChunk* p_chunk) override; // vtable+0x68
+	void PutFrame() override;                        // vtable+0x6c
 
 	// SYNTHETIC: LEGO1 0x1004e320
 	// LegoPhonemePresenter::`scalar deleting destructor'
diff --git a/LEGO1/lego/legoomni/include/legoplantmanager.h b/LEGO1/lego/legoomni/include/legoplantmanager.h
index e1335e33..bc96de5a 100644
--- a/LEGO1/lego/legoomni/include/legoplantmanager.h
+++ b/LEGO1/lego/legoomni/include/legoplantmanager.h
@@ -9,9 +9,9 @@
 class LegoPlantManager : public MxCore {
 public:
 	LegoPlantManager();
-	virtual ~LegoPlantManager() override; // vtable+0x00
+	~LegoPlantManager() override; // vtable+0x00
 
-	virtual MxResult Tickle() override; // vtable+0x08
+	MxResult Tickle() override; // vtable+0x08
 
 	// FUNCTION: LEGO1 0x10026290
 	inline const char* ClassName() const override // vtable+0x0c
diff --git a/LEGO1/lego/legoomni/include/legopointofviewcontroller.h b/LEGO1/lego/legoomni/include/legopointofviewcontroller.h
index 27a58291..650ca90b 100644
--- a/LEGO1/lego/legoomni/include/legopointofviewcontroller.h
+++ b/LEGO1/lego/legoomni/include/legopointofviewcontroller.h
@@ -20,7 +20,7 @@ class LegoNavController;
 class LegoMouseController : public MxCore {
 public:
 	LegoMouseController();
-	virtual ~LegoMouseController() override;
+	~LegoMouseController() override;
 
 	virtual void LeftDown(int, int);  // vtable+0x14
 	virtual void LeftDrag(int, int);  // vtable+0x18
@@ -44,14 +44,14 @@ class LegoMouseController : public MxCore {
 class LegoPointOfViewController : public LegoMouseController {
 public:
 	LegoPointOfViewController();
-	virtual ~LegoPointOfViewController() override;
+	~LegoPointOfViewController() override;
 
-	virtual MxResult Tickle() override;               // vtable+0x08
-	virtual void LeftDown(int p_x, int p_y) override; // vtable+0x0c
-	virtual void LeftDrag(int p_x, int p_y) override; // vtable+0x10
+	MxResult Tickle() override;               // vtable+0x08
+	void LeftDown(int p_x, int p_y) override; // vtable+0x0c
+	void LeftDrag(int p_x, int p_y) override; // vtable+0x10
 
 	// FUNCTION: LEGO1 0x10011e40
-	virtual void LeftUp(int p_x, int p_y) override
+	void LeftUp(int p_x, int p_y) override
 	{
 		LegoMouseController::LeftUp(p_x, p_y);
 		AffectPointOfView();
@@ -59,7 +59,7 @@ class LegoPointOfViewController : public LegoMouseController {
 	// vtable+0x14
 
 	// FUNCTION: LEGO1 0x10011e60
-	virtual void RightDown(int p_x, int p_y) override
+	void RightDown(int p_x, int p_y) override
 	{
 		LegoMouseController::RightDown(p_x, p_y);
 		AffectPointOfView();
@@ -67,7 +67,7 @@ class LegoPointOfViewController : public LegoMouseController {
 	// vtable+0x20
 
 	// FUNCTION: LEGO1 0x10011e80
-	virtual void RightDrag(int p_x, int p_y) override
+	void RightDrag(int p_x, int p_y) override
 	{
 		LegoMouseController::RightDrag(p_x, p_y);
 		AffectPointOfView();
@@ -75,7 +75,7 @@ class LegoPointOfViewController : public LegoMouseController {
 	// vtable+0x24
 
 	// FUNCTION: LEGO1 0x10011ea0
-	virtual void RightUp(int p_x, int p_y) override
+	void RightUp(int p_x, int p_y) override
 	{
 		LegoMouseController::RightUp(p_x, p_y);
 		AffectPointOfView();
diff --git a/LEGO1/lego/legoomni/include/legorace.h b/LEGO1/lego/legoomni/include/legorace.h
index 1ebf015a..8a6eed8a 100644
--- a/LEGO1/lego/legoomni/include/legorace.h
+++ b/LEGO1/lego/legoomni/include/legorace.h
@@ -11,9 +11,9 @@
 class LegoRace : public LegoWorld {
 public:
 	LegoRace();
-	virtual ~LegoRace() override; // vtable+0x00
+	~LegoRace() override; // vtable+0x00
 
-	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x04
+	MxLong Notify(MxParam& p_param) override; // vtable+0x04
 
 	// FUNCTION: LEGO1 0x10015ba0
 	inline const char* ClassName() const override // vtable+0x0c
@@ -28,15 +28,15 @@ class LegoRace : public LegoWorld {
 		return !strcmp(p_name, LegoRace::ClassName()) || LegoWorld::IsA(p_name);
 	}
 
-	virtual MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
-	virtual MxBool VTable0x5c() override;                     // vtable+0x5c
-	virtual MxBool VTable0x64() override;                     // vtable+0x64
-	virtual void VTable0x68(MxBool p_add) override;           // vtable+0x68
-	virtual undefined4 VTable0x6c(undefined4) = 0;            // vtable+0x6c
-	virtual undefined4 VTable0x70(undefined4);                // vtable+0x70
-	virtual undefined4 VTable0x74(undefined4);                // vtable+0x74
-	virtual undefined4 VTable0x78(undefined4);                // vtable+0x78
-	virtual void VTable0x7c(undefined4, undefined4);          // vtable+0x7c
+	MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
+	MxBool VTable0x5c() override;                     // vtable+0x5c
+	MxBool VTable0x64() override;                     // vtable+0x64
+	void VTable0x68(MxBool p_add) override;           // vtable+0x68
+	virtual undefined4 VTable0x6c(undefined4) = 0;    // vtable+0x6c
+	virtual undefined4 VTable0x70(undefined4);        // vtable+0x70
+	virtual undefined4 VTable0x74(undefined4);        // vtable+0x74
+	virtual undefined4 VTable0x78(undefined4);        // vtable+0x78
+	virtual void VTable0x7c(undefined4, undefined4);  // vtable+0x7c
 
 	// SYNTHETIC: LEGO1 0x10015cc0
 	// LegoRace::`scalar deleting destructor'
diff --git a/LEGO1/lego/legoomni/include/legoraceactor.h b/LEGO1/lego/legoomni/include/legoraceactor.h
index 40eb6ef6..48f66b26 100644
--- a/LEGO1/lego/legoomni/include/legoraceactor.h
+++ b/LEGO1/lego/legoomni/include/legoraceactor.h
@@ -20,13 +20,13 @@ class LegoRaceActor : public LegoAnimActor {
 		return !strcmp(p_name, LegoRaceActor::ClassName()) || LegoAnimActor::IsA(p_name);
 	}
 
-	virtual void ParseAction(char*) override;                  // vtable+0x20
-	virtual void SetWorldSpeed(MxFloat p_worldSpeed) override; // vtable+0x30
-	virtual void VTable0x68() override;                        // vtable+0x68
-	virtual void VTable0x70(float p_float) override;           // vtable+0x70
-	virtual void VTable0x74(Matrix4& p_transform) override;    // vtable+0x74
-	virtual MxS32 VTable0x90() override;                       // vtable+0x90
-	virtual MxS32 VTable0x94() override;                       // vtable+0x94
+	void ParseAction(char*) override;                  // vtable+0x20
+	void SetWorldSpeed(MxFloat p_worldSpeed) override; // vtable+0x30
+	void VTable0x68() override;                        // vtable+0x68
+	void VTable0x70(float p_float) override;           // vtable+0x70
+	void VTable0x74(Matrix4& p_transform) override;    // vtable+0x74
+	MxS32 VTable0x90() override;                       // vtable+0x90
+	MxS32 VTable0x94() override;                       // vtable+0x94
 
 	// SYNTHETIC: LEGO1 0x10014ab0
 	// LegoRaceActor::`scalar deleting destructor'
diff --git a/LEGO1/lego/legoomni/include/legoracecar.h b/LEGO1/lego/legoomni/include/legoracecar.h
index beb70632..f90c4cad 100644
--- a/LEGO1/lego/legoomni/include/legoracecar.h
+++ b/LEGO1/lego/legoomni/include/legoracecar.h
@@ -8,7 +8,7 @@
 // SIZE 0x200
 class LegoRaceCar : public LegoCarRaceActor {
 public:
-	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x04
+	MxLong Notify(MxParam& p_param) override; // vtable+0x04
 
 	// FUNCTION: LEGO1 0x10014290
 	inline const char* ClassName() const override // vtable+0x0c
@@ -23,13 +23,13 @@ class LegoRaceCar : public LegoCarRaceActor {
 		return !strcmp(p_name, LegoCarRaceActor::ClassName()) || LegoCarRaceActor::IsA(p_name);
 	}
 
-	virtual void ParseAction(char*) override;                  // vtable+0x20
-	virtual void SetWorldSpeed(MxFloat p_worldSpeed) override; // vtable+0x30
-	virtual void VTable0x6c() override;                        // vtable+0x6c
-	virtual void VTable0x70(float p_float) override;           // vtable+0x70
-	virtual MxS32 VTable0x94() override;                       // vtable+0x94
-	virtual void VTable0x98() override;                        // vtable+0x98
-	virtual void VTable0x9c() override;                        // vtable+0x9c
+	void ParseAction(char*) override;                  // vtable+0x20
+	void SetWorldSpeed(MxFloat p_worldSpeed) override; // vtable+0x30
+	void VTable0x6c() override;                        // vtable+0x6c
+	void VTable0x70(float p_float) override;           // vtable+0x70
+	MxS32 VTable0x94() override;                       // vtable+0x94
+	void VTable0x98() override;                        // vtable+0x98
+	void VTable0x9c() override;                        // vtable+0x9c
 
 	// SYNTHETIC: LEGO1 0x10014230
 	// LegoRaceCar::`scalar deleting destructor'
diff --git a/LEGO1/lego/legoomni/include/legosoundmanager.h b/LEGO1/lego/legoomni/include/legosoundmanager.h
index b1afffe3..83a4ea7d 100644
--- a/LEGO1/lego/legoomni/include/legosoundmanager.h
+++ b/LEGO1/lego/legoomni/include/legosoundmanager.h
@@ -9,11 +9,11 @@
 class LegoSoundManager : public MxSoundManager {
 public:
 	LegoSoundManager();
-	virtual ~LegoSoundManager() override;
+	~LegoSoundManager() override;
 
-	virtual MxResult Tickle() override;                                           // vtable+08
-	virtual void Destroy() override;                                              // vtable+18
-	virtual MxResult Create(MxU32 p_frequencyMS, MxBool p_createThread) override; // vtable+0x30
+	MxResult Tickle() override;                                           // vtable+08
+	void Destroy() override;                                              // vtable+18
+	MxResult Create(MxU32 p_frequencyMS, MxBool p_createThread) override; // vtable+0x30
 
 	// SYNTHETIC: LEGO1 0x10029920
 	// LegoSoundManager::`scalar deleting destructor'
diff --git a/LEGO1/lego/legoomni/include/legostate.h b/LEGO1/lego/legoomni/include/legostate.h
index fe10bbf7..8aa55226 100644
--- a/LEGO1/lego/legoomni/include/legostate.h
+++ b/LEGO1/lego/legoomni/include/legostate.h
@@ -11,17 +11,17 @@
 class LegoState : public MxCore {
 public:
 	// FUNCTION: LEGO1 0x10005f40
-	virtual ~LegoState() override {}
+	~LegoState() override {}
 
 	// FUNCTION: LEGO1 0x100060d0
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f01b8
 		return "LegoState";
 	}
 
 	// FUNCTION: LEGO1 0x100060e0
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, LegoState::ClassName()) || MxCore::IsA(p_name);
 	}
diff --git a/LEGO1/lego/legoomni/include/legotexturepresenter.h b/LEGO1/lego/legoomni/include/legotexturepresenter.h
index ca6541df..472c5828 100644
--- a/LEGO1/lego/legoomni/include/legotexturepresenter.h
+++ b/LEGO1/lego/legoomni/include/legotexturepresenter.h
@@ -7,24 +7,24 @@
 // SIZE 0x54 (from inlined construction at 0x10009bb5)
 class LegoTexturePresenter : public MxMediaPresenter {
 public:
-	virtual ~LegoTexturePresenter() override;
+	~LegoTexturePresenter() override;
 
 	// FUNCTION: LEGO1 0x1000ce50
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f0664
 		return "LegoTexturePresenter";
 	}
 
 	// FUNCTION: LEGO1 0x1000ce60
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, LegoTexturePresenter::ClassName()) || MxMediaPresenter::IsA(p_name);
 	}
 
-	virtual void DoneTickle() override;       // vtable+0x2c
-	virtual MxResult AddToManager() override; // vtable+0x34
-	virtual MxResult PutData() override;      // vtable+0x4c
+	void DoneTickle() override;       // vtable+0x2c
+	MxResult AddToManager() override; // vtable+0x34
+	MxResult PutData() override;      // vtable+0x4c
 
 	// SYNTHETIC: LEGO1 0x1000cf40
 	// LegoTexturePresenter::`scalar deleting destructor'
diff --git a/LEGO1/lego/legoomni/include/legounknown100d9d00.h b/LEGO1/lego/legoomni/include/legounknown100d9d00.h
index 394ffbbd..0c567b17 100644
--- a/LEGO1/lego/legoomni/include/legounknown100d9d00.h
+++ b/LEGO1/lego/legoomni/include/legounknown100d9d00.h
@@ -18,7 +18,7 @@ class LegoUnknown100d9d00 : public MxList<LegoUnknown100d7c88*> {
 	LegoUnknown100d9d00() { SetDestroy(Destroy); }
 
 	// STUB: LEGO1 0x1007b210
-	virtual MxS8 Compare(LegoUnknown100d7c88* p_a, LegoUnknown100d7c88* p_b) override { return -1; } // vtable+0x14
+	MxS8 Compare(LegoUnknown100d7c88* p_a, LegoUnknown100d7c88* p_b) override { return -1; } // vtable+0x14
 
 	// FUNCTION: LEGO1 0x1007b2e0
 	static void Destroy(LegoUnknown100d7c88* p_element) { delete p_element; }
diff --git a/LEGO1/lego/legoomni/include/legovehiclebuildstate.h b/LEGO1/lego/legoomni/include/legovehiclebuildstate.h
index 7a78b4ed..83032325 100644
--- a/LEGO1/lego/legoomni/include/legovehiclebuildstate.h
+++ b/LEGO1/lego/legoomni/include/legovehiclebuildstate.h
@@ -12,18 +12,18 @@ class LegoVehicleBuildState : public LegoState {
 	LegoVehicleBuildState(char* p_classType);
 
 	// FUNCTION: LEGO1 0x10025ff0
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		return this->m_className.GetData();
 	}
 
 	// FUNCTION: LEGO1 0x10026000
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, this->m_className.GetData()) || LegoState::IsA(p_name);
 	}
 
-	virtual MxResult VTable0x1c(LegoFile* p_legoFile) override; // vtable+0x1c
+	MxResult VTable0x1c(LegoFile* p_legoFile) override; // vtable+0x1c
 
 	// SYNTHETIC: LEGO1 0x100260a0
 	// LegoVehicleBuildState::`scalar deleting destructor'
diff --git a/LEGO1/lego/legoomni/include/legovideomanager.h b/LEGO1/lego/legoomni/include/legovideomanager.h
index 42a065b9..bb43c05c 100644
--- a/LEGO1/lego/legoomni/include/legovideomanager.h
+++ b/LEGO1/lego/legoomni/include/legovideomanager.h
@@ -17,7 +17,7 @@ class LegoROI;
 class LegoVideoManager : public MxVideoManager {
 public:
 	LegoVideoManager();
-	virtual ~LegoVideoManager() override;
+	~LegoVideoManager() override;
 
 	int EnableRMDevice();
 	int DisableRMDevice();
@@ -25,13 +25,12 @@ class LegoVideoManager : public MxVideoManager {
 	void EnableFullScreenMovie(MxBool p_enable, MxBool p_scale);
 	void MoveCursor(MxS32 p_cursorX, MxS32 p_cursorY);
 
-	virtual MxResult Tickle() override; // vtable+0x08
-	virtual void Destroy() override;    // vtable+0x18
-	virtual MxResult Create(MxVideoParam& p_videoParam, MxU32 p_frequencyMS, MxBool p_createThread)
-		override;                                                                          // vtable+0x2c
-	virtual MxResult RealizePalette(MxPalette*) override;                                  // vtable+0x30
-	virtual void UpdateView(MxU32 p_x, MxU32 p_y, MxU32 p_width, MxU32 p_height) override; // vtable+0x34
-	virtual MxPresenter* GetPresenterAt(MxS32 p_x, MxS32 p_y);                             // vtable+0x38
+	MxResult Tickle() override;                                                                       // vtable+0x08
+	void Destroy() override;                                                                          // vtable+0x18
+	MxResult Create(MxVideoParam& p_videoParam, MxU32 p_frequencyMS, MxBool p_createThread) override; // vtable+0x2c
+	MxResult RealizePalette(MxPalette*) override;                                                     // vtable+0x30
+	void UpdateView(MxU32 p_x, MxU32 p_y, MxU32 p_width, MxU32 p_height) override;                    // vtable+0x34
+	virtual MxPresenter* GetPresenterAt(MxS32 p_x, MxS32 p_y);                                        // vtable+0x38
 
 	// FUNCTION: LEGO1 0x1007ab10
 	virtual LegoUnknown100d9d00* VTable0x3c() { return m_unk0x100d9d00; } // vtable+0x3c
diff --git a/LEGO1/lego/legoomni/include/legoworld.h b/LEGO1/lego/legoomni/include/legoworld.h
index 7e995e73..0690f570 100644
--- a/LEGO1/lego/legoomni/include/legoworld.h
+++ b/LEGO1/lego/legoomni/include/legoworld.h
@@ -33,30 +33,30 @@ class LegoWorld : public LegoEntity {
 	};
 
 	LegoWorld();
-	virtual ~LegoWorld() override; // vtable+0x00
+	~LegoWorld() override; // vtable+0x00
 
-	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x04
-	virtual MxResult Tickle() override;               // vtable+0x08
+	MxLong Notify(MxParam& p_param) override; // vtable+0x04
+	MxResult Tickle() override;               // vtable+0x08
 
 	// FUNCTION: LEGO1 0x1001d690
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f0058
 		return "LegoWorld";
 	}
 
 	// FUNCTION: LEGO1 0x1001d6a0
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, LegoWorld::ClassName()) || LegoEntity::IsA(p_name);
 	}
 
-	virtual MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
-	virtual void Destroy(MxBool p_fromDestructor) override;   // vtable+0x1c
-	virtual void ReadyWorld();                                // vtable+0x50
-	virtual LegoCameraController* VTable0x54();               // vtable+0x54
-	virtual void Add(MxCore* p_object);                       // vtable+0x58
-	virtual MxBool VTable0x5c();                              // vtable+0x5c
+	MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
+	void Destroy(MxBool p_fromDestructor) override;   // vtable+0x1c
+	virtual void ReadyWorld();                        // vtable+0x50
+	virtual LegoCameraController* VTable0x54();       // vtable+0x54
+	virtual void Add(MxCore* p_object);               // vtable+0x58
+	virtual MxBool VTable0x5c();                      // vtable+0x5c
 
 	// FUNCTION: LEGO1 0x100010a0
 	virtual void VTable0x60() {} // vtable+0x60
diff --git a/LEGO1/lego/legoomni/include/legoworldlist.h b/LEGO1/lego/legoomni/include/legoworldlist.h
index 6467859c..bd8197bc 100644
--- a/LEGO1/lego/legoomni/include/legoworldlist.h
+++ b/LEGO1/lego/legoomni/include/legoworldlist.h
@@ -22,10 +22,7 @@ class LegoWorldList : public MxPtrList<LegoWorld> {
 	LegoWorldList(MxBool p_ownership = FALSE) : MxPtrList<LegoWorld>(p_ownership) {}
 
 	// FUNCTION: LEGO1 0x100598d0
-	virtual MxS8 Compare(LegoWorld* p_a, LegoWorld* p_b) override
-	{
-		return p_a == p_b ? 0 : p_a < p_b ? -1 : 1;
-	} // vtable+0x14
+	MxS8 Compare(LegoWorld* p_a, LegoWorld* p_b) override { return p_a == p_b ? 0 : p_a < p_b ? -1 : 1; } // vtable+0x14
 
 	// SYNTHETIC: LEGO1 0x10059a00
 	// LegoWorldList::`scalar deleting destructor'
diff --git a/LEGO1/lego/legoomni/include/legoworldpresenter.h b/LEGO1/lego/legoomni/include/legoworldpresenter.h
index 3d0fba37..a9a7f324 100644
--- a/LEGO1/lego/legoomni/include/legoworldpresenter.h
+++ b/LEGO1/lego/legoomni/include/legoworldpresenter.h
@@ -8,28 +8,28 @@
 class LegoWorldPresenter : public LegoEntityPresenter {
 public:
 	LegoWorldPresenter();
-	virtual ~LegoWorldPresenter() override; // vtable+0x00
+	~LegoWorldPresenter() override; // vtable+0x00
 
 	static void configureLegoWorldPresenter(MxS32 p_legoWorldPresenterQuality);
 
 	// FUNCTION: LEGO1 0x10066630
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f0608
 		return "LegoWorldPresenter";
 	}
 
 	// FUNCTION: LEGO1 0x10066640
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, LegoWorldPresenter::ClassName()) || LegoEntityPresenter::IsA(p_name);
 	}
 
-	virtual void ReadyTickle() override;                                                           // vtable+0x18
-	virtual void StartingTickle() override;                                                        // vtable+0x1c
-	virtual void ParseExtra() override;                                                            // vtable+0x30
-	virtual MxResult StartAction(MxStreamController* p_controller, MxDSAction* p_action) override; // vtable+0x3c
-	virtual void VTable0x60(MxPresenter* p_presenter) override;                                    // vtable+0x60
+	void ReadyTickle() override;                                                           // vtable+0x18
+	void StartingTickle() override;                                                        // vtable+0x1c
+	void ParseExtra() override;                                                            // vtable+0x30
+	MxResult StartAction(MxStreamController* p_controller, MxDSAction* p_action) override; // vtable+0x3c
+	void VTable0x60(MxPresenter* p_presenter) override;                                    // vtable+0x60
 
 	// SYNTHETIC: LEGO1 0x10066750
 	// LegoWorldPresenter::`scalar deleting destructor'
diff --git a/LEGO1/lego/legoomni/include/motocycle.h b/LEGO1/lego/legoomni/include/motocycle.h
index 6505f35b..cf3f376f 100644
--- a/LEGO1/lego/legoomni/include/motocycle.h
+++ b/LEGO1/lego/legoomni/include/motocycle.h
@@ -11,24 +11,24 @@ class Motocycle : public IslePathActor {
 	Motocycle();
 
 	// FUNCTION: LEGO1 0x10035840
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f38e8
 		return "Motorcycle";
 	}
 
 	// FUNCTION: LEGO1 0x10035850
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, Motocycle::ClassName()) || IslePathActor::IsA(p_name);
 	}
 
-	virtual MxResult Create(MxDSAction& p_dsAction) override;            // vtable+0x18
-	virtual void VTable0x70(float p_float) override;                     // vtable+0x70
-	virtual MxU32 VTable0xcc() override;                                 // vtable+0xcc
-	virtual MxU32 VTable0xd4(LegoControlManagerEvent& p_param) override; // vtable+0xd4
-	virtual MxU32 VTable0xdc(MxType19NotificationParam&) override;       // vtable+0xdc
-	virtual void VTable0xe4() override;                                  // vtable+0xe4
+	MxResult Create(MxDSAction& p_dsAction) override;            // vtable+0x18
+	void VTable0x70(float p_float) override;                     // vtable+0x70
+	MxU32 VTable0xcc() override;                                 // vtable+0xcc
+	MxU32 VTable0xd4(LegoControlManagerEvent& p_param) override; // vtable+0xd4
+	MxU32 VTable0xdc(MxType19NotificationParam&) override;       // vtable+0xdc
+	void VTable0xe4() override;                                  // vtable+0xe4
 
 	// SYNTHETIC: LEGO1 0x100359d0
 	// Motocycle::`scalar deleting destructor'
diff --git a/LEGO1/lego/legoomni/include/mxbackgroundaudiomanager.h b/LEGO1/lego/legoomni/include/mxbackgroundaudiomanager.h
index cb2e3435..31fa01e5 100644
--- a/LEGO1/lego/legoomni/include/mxbackgroundaudiomanager.h
+++ b/LEGO1/lego/legoomni/include/mxbackgroundaudiomanager.h
@@ -13,20 +13,20 @@
 class MxBackgroundAudioManager : public MxCore {
 public:
 	MxBackgroundAudioManager();
-	virtual ~MxBackgroundAudioManager() override;
+	~MxBackgroundAudioManager() override;
 
-	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x04
-	virtual MxResult Tickle() override;               // vtable+0x08
+	MxLong Notify(MxParam& p_param) override; // vtable+0x04
+	MxResult Tickle() override;               // vtable+0x08
 
 	// FUNCTION: LEGO1 0x1007eb70
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f7ac4
 		return "MxBackgroundAudioManager";
 	}
 
 	// FUNCTION: LEGO1 0x1007eb80
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, MxBackgroundAudioManager::ClassName()) || MxCore::IsA(p_name);
 	}
diff --git a/LEGO1/lego/legoomni/include/mxcompositemediapresenter.h b/LEGO1/lego/legoomni/include/mxcompositemediapresenter.h
index ed6f1335..efba804f 100644
--- a/LEGO1/lego/legoomni/include/mxcompositemediapresenter.h
+++ b/LEGO1/lego/legoomni/include/mxcompositemediapresenter.h
@@ -8,26 +8,26 @@
 class MxCompositeMediaPresenter : public MxCompositePresenter {
 public:
 	MxCompositeMediaPresenter();
-	virtual ~MxCompositeMediaPresenter() override;
+	~MxCompositeMediaPresenter() override;
 
-	virtual MxResult Tickle() override; // vtable+0x08
+	MxResult Tickle() override; // vtable+0x08
 
 	// FUNCTION: LEGO1 0x10073f10
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f02d4
 		return "MxCompositeMediaPresenter";
 	}
 
 	// FUNCTION: LEGO1 0x10073f20
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, MxCompositeMediaPresenter::ClassName()) || MxCompositePresenter::IsA(p_name);
 	}
 
-	virtual void StartingTickle() override;                                           // vtable+0x1c
-	virtual MxResult StartAction(MxStreamController*, MxDSAction* p_action) override; // vtable+0x3c
-	virtual MxResult PutData() override;                                              // vtable+0x4c
+	void StartingTickle() override;                                           // vtable+0x1c
+	MxResult StartAction(MxStreamController*, MxDSAction* p_action) override; // vtable+0x3c
+	MxResult PutData() override;                                              // vtable+0x4c
 
 private:
 	MxS16 m_unk0x4c;  // 0x4c
diff --git a/LEGO1/lego/legoomni/include/mxcontrolpresenter.h b/LEGO1/lego/legoomni/include/mxcontrolpresenter.h
index 1ead16da..b1c01fab 100644
--- a/LEGO1/lego/legoomni/include/mxcontrolpresenter.h
+++ b/LEGO1/lego/legoomni/include/mxcontrolpresenter.h
@@ -12,32 +12,32 @@ class MxVideoPresenter;
 class MxControlPresenter : public MxCompositePresenter {
 public:
 	MxControlPresenter();
-	virtual ~MxControlPresenter() override;
+	~MxControlPresenter() override;
 
 	// FUNCTION: LEGO1 0x10044000
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f0514
 		return "MxControlPresenter";
 	}
 
 	// FUNCTION: LEGO1 0x10044010
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, MxControlPresenter::ClassName()) || MxCompositePresenter::IsA(p_name);
 	}
 
-	virtual void ReadyTickle() override;                                     // vtable+0x18
-	virtual void RepeatingTickle() override;                                 // vtable+0x24
-	virtual void ParseExtra() override;                                      // vtable+0x30
-	virtual MxResult AddToManager() override;                                // vtable+0x34
-	virtual MxResult StartAction(MxStreamController*, MxDSAction*) override; // vtable+0x3c
-	virtual void EndAction() override;                                       // vtable+0x40
-	virtual MxBool HasTickleStatePassed(TickleState p_tickleState) override; // vtable+0x48
-	virtual void Enable(MxBool p_enable) override;                           // vtable+0x54
-	virtual MxBool VTable0x64(undefined4 p_undefined) override;              // vtable+0x64
-	virtual void VTable0x68(MxBool p_unk0x50);                               // vtable+0x68
-	virtual void VTable0x6c(MxS16);                                          // vtable+0x6c
+	void ReadyTickle() override;                                     // vtable+0x18
+	void RepeatingTickle() override;                                 // vtable+0x24
+	void ParseExtra() override;                                      // vtable+0x30
+	MxResult AddToManager() override;                                // vtable+0x34
+	MxResult StartAction(MxStreamController*, MxDSAction*) override; // vtable+0x3c
+	void EndAction() override;                                       // vtable+0x40
+	MxBool HasTickleStatePassed(TickleState p_tickleState) override; // vtable+0x48
+	void Enable(MxBool p_enable) override;                           // vtable+0x54
+	MxBool VTable0x64(undefined4 p_undefined) override;              // vtable+0x64
+	virtual void VTable0x68(MxBool p_unk0x50);                       // vtable+0x68
+	virtual void VTable0x6c(MxS16);                                  // vtable+0x6c
 
 	MxBool FUN_10044480(LegoControlManagerEvent* p_event, MxPresenter* p_presenter);
 
diff --git a/LEGO1/lego/legoomni/include/mxtransitionmanager.h b/LEGO1/lego/legoomni/include/mxtransitionmanager.h
index ab673b11..89f0d73b 100644
--- a/LEGO1/lego/legoomni/include/mxtransitionmanager.h
+++ b/LEGO1/lego/legoomni/include/mxtransitionmanager.h
@@ -11,20 +11,20 @@
 class MxTransitionManager : public MxCore {
 public:
 	MxTransitionManager();
-	virtual ~MxTransitionManager() override; // vtable+0x00
+	~MxTransitionManager() override; // vtable+0x00
 
 	void SetWaitIndicator(MxVideoPresenter* p_waitIndicator);
 
-	virtual MxResult Tickle(); // vtable+0x08
+	MxResult Tickle() override; // vtable+0x08
 
 	// FUNCTION: LEGO1 0x1004b950
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		return "MxTransitionManager";
 	}
 
 	// FUNCTION: LEGO1 0x1004b960
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, MxTransitionManager::ClassName()) || MxCore::IsA(p_name);
 	}
diff --git a/LEGO1/lego/legoomni/include/pizza.h b/LEGO1/lego/legoomni/include/pizza.h
index b2679fd1..5ba1da94 100644
--- a/LEGO1/lego/legoomni/include/pizza.h
+++ b/LEGO1/lego/legoomni/include/pizza.h
@@ -13,12 +13,12 @@
 class Pizza : public IsleActor {
 public:
 	Pizza();
-	virtual ~Pizza() override;
+	~Pizza() override;
 
-	virtual MxResult Tickle() override; // vtable+0x08
+	MxResult Tickle() override; // vtable+0x08
 
 	// FUNCTION: LEGO1 0x10037f90
-	inline const char* ClassName() const // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f038c
 		return "Pizza";
@@ -30,7 +30,7 @@ class Pizza : public IsleActor {
 		return !strcmp(p_name, Pizza::ClassName()) || IsleActor::IsA(p_name);
 	}
 
-	virtual MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
+	MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
 
 	// SYNTHETIC: LEGO1 0x100380e0
 	// Pizza::`scalar deleting destructor'
diff --git a/LEGO1/lego/legoomni/include/pizzamissionstate.h b/LEGO1/lego/legoomni/include/pizzamissionstate.h
index e8668544..1b111c43 100644
--- a/LEGO1/lego/legoomni/include/pizzamissionstate.h
+++ b/LEGO1/lego/legoomni/include/pizzamissionstate.h
@@ -18,19 +18,19 @@ struct PizzaMissionStateEntry {
 class PizzaMissionState : public LegoState {
 public:
 	// FUNCTION: LEGO1 0x10039290
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f00d4
 		return "PizzaMissionState";
 	}
 
 	// FUNCTION: LEGO1 0x100392a0
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, PizzaMissionState::ClassName()) || LegoState::IsA(p_name);
 	}
 
-	virtual MxResult VTable0x1c(LegoFile* p_legoFile) override; // vtable+0x1c
+	MxResult VTable0x1c(LegoFile* p_legoFile) override; // vtable+0x1c
 
 	inline MxU16 GetColor(MxU8 p_id) { return GetState(p_id)->m_color; }
 
diff --git a/LEGO1/lego/legoomni/include/pizzeria.h b/LEGO1/lego/legoomni/include/pizzeria.h
index f75cf0a7..49c4960a 100644
--- a/LEGO1/lego/legoomni/include/pizzeria.h
+++ b/LEGO1/lego/legoomni/include/pizzeria.h
@@ -8,19 +8,19 @@
 class Pizzeria : public IsleActor {
 public:
 	// FUNCTION: LEGO1 0x1000e780
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f0380
 		return "Pizzeria";
 	}
 
 	// FUNCTION: LEGO1 0x1000e790
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, Pizzeria::ClassName()) || IsleActor::IsA(p_name);
 	}
 
-	virtual MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
+	MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
 
 	// SYNTHETIC: LEGO1 0x1000e8d0
 	// Pizzeria::`scalar deleting destructor'
diff --git a/LEGO1/lego/legoomni/include/pizzeriastate.h b/LEGO1/lego/legoomni/include/pizzeriastate.h
index 1e9da6d3..b4d6b0fe 100644
--- a/LEGO1/lego/legoomni/include/pizzeriastate.h
+++ b/LEGO1/lego/legoomni/include/pizzeriastate.h
@@ -10,19 +10,19 @@ class PizzeriaState : public LegoState {
 	PizzeriaState();
 
 	// FUNCTION: LEGO1 0x10017c20
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f0370
 		return "PizzeriaState";
 	}
 
 	// FUNCTION: LEGO1 0x10017c30
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, PizzeriaState::ClassName()) || LegoState::IsA(p_name);
 	}
 
-	virtual MxResult VTable0x1c(LegoFile* p_legoFile) override; // vtable+0x1c
+	MxResult VTable0x1c(LegoFile* p_legoFile) override; // vtable+0x1c
 
 	// SYNTHETIC: LEGO1 0x10017ce0
 	// PizzeriaState::`scalar deleting destructor'
diff --git a/LEGO1/lego/legoomni/include/police.h b/LEGO1/lego/legoomni/include/police.h
index cb82ee35..dd5c10e6 100644
--- a/LEGO1/lego/legoomni/include/police.h
+++ b/LEGO1/lego/legoomni/include/police.h
@@ -13,28 +13,28 @@
 class Police : public LegoWorld {
 public:
 	Police();
-	virtual ~Police() override; // vtable+0x00
+	~Police() override; // vtable+0x00
 
-	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x04
+	MxLong Notify(MxParam& p_param) override; // vtable+0x04
 
 	// FUNCTION: LEGO1 0x1005e1e0
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f0450
 		return "Police";
 	}
 
 	// FUNCTION: LEGO1 0x1005e1f0
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, Police::ClassName()) || LegoWorld::IsA(p_name);
 	}
 
-	virtual MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
-	virtual void ReadyWorld() override;                       // vtable+0x50
-	virtual MxBool VTable0x5c() override;                     // vtable+0x5c
-	virtual MxBool VTable0x64() override;                     // vtable+0x64
-	virtual void VTable0x68(MxBool p_add) override;           // vtable+0x68
+	MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
+	void ReadyWorld() override;                       // vtable+0x50
+	MxBool VTable0x5c() override;                     // vtable+0x5c
+	MxBool VTable0x64() override;                     // vtable+0x64
+	void VTable0x68(MxBool p_add) override;           // vtable+0x68
 
 	// SYNTHETIC: LEGO1 0x1005e300
 	// Police::`scalar deleting destructor'
diff --git a/LEGO1/lego/legoomni/include/policeentity.h b/LEGO1/lego/legoomni/include/policeentity.h
index 490e35a3..acf0937b 100644
--- a/LEGO1/lego/legoomni/include/policeentity.h
+++ b/LEGO1/lego/legoomni/include/policeentity.h
@@ -8,14 +8,14 @@
 class PoliceEntity : public BuildingEntity {
 public:
 	// FUNCTION: LEGO1 0x1000ed60
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f0328
 		return "PoliceEntity";
 	}
 
 	// FUNCTION: LEGO1 0x1000ed70
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, PoliceEntity::ClassName()) || BuildingEntity::IsA(p_name);
 	}
diff --git a/LEGO1/lego/legoomni/include/policestate.h b/LEGO1/lego/legoomni/include/policestate.h
index 33799092..551d83c4 100644
--- a/LEGO1/lego/legoomni/include/policestate.h
+++ b/LEGO1/lego/legoomni/include/policestate.h
@@ -9,22 +9,22 @@
 class PoliceState : public LegoState {
 public:
 	PoliceState();
-	virtual ~PoliceState() override {}
+	~PoliceState() override {}
 
 	// FUNCTION: LEGO1 0x1005e860
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f0444
 		return "PoliceState";
 	}
 
 	// FUNCTION: LEGO1 0x1005e870
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, PoliceState::ClassName()) || LegoState::IsA(p_name);
 	}
 
-	virtual MxResult VTable0x1c(LegoFile* p_legoFile) override; // vtable+0x1c
+	MxResult VTable0x1c(LegoFile* p_legoFile) override; // vtable+0x1c
 
 	// SYNTHETIC: LEGO1 0x1005e920
 	// PoliceState::`scalar deleting destructor'
diff --git a/LEGO1/lego/legoomni/include/racecar.h b/LEGO1/lego/legoomni/include/racecar.h
index 596473b4..462c2dbe 100644
--- a/LEGO1/lego/legoomni/include/racecar.h
+++ b/LEGO1/lego/legoomni/include/racecar.h
@@ -9,23 +9,23 @@
 class RaceCar : public IslePathActor {
 public:
 	RaceCar();
-	virtual ~RaceCar() override; // vtable+0x00
+	~RaceCar() override; // vtable+0x00
 
 	// FUNCTION: LEGO1 0x10028270
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f03e0
 		return "RaceCar";
 	}
 
 	// FUNCTION: LEGO1 0x10028280
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, RaceCar::ClassName()) || IslePathActor::IsA(p_name);
 	}
 
-	virtual MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
-	virtual MxU32 VTable0xcc() override;                      // vtable+0xcc
+	MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
+	MxU32 VTable0xcc() override;                      // vtable+0xcc
 
 	// SYNTHETIC: LEGO1 0x10028400
 	// RaceCar::`scalar deleting destructor'
diff --git a/LEGO1/lego/legoomni/include/racestandsentity.h b/LEGO1/lego/legoomni/include/racestandsentity.h
index b2ca8ef3..5b5b83e5 100644
--- a/LEGO1/lego/legoomni/include/racestandsentity.h
+++ b/LEGO1/lego/legoomni/include/racestandsentity.h
@@ -7,14 +7,14 @@
 // SIZE 0x68
 class RaceStandsEntity : public BuildingEntity {
 	// FUNCTION: LEGO1 0x1000efa0
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f0300
 		return "RaceStandsEntity";
 	}
 
 	// FUNCTION: LEGO1 0x1000efb0
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, RaceStandsEntity::ClassName()) || BuildingEntity::IsA(p_name);
 	}
diff --git a/LEGO1/lego/legoomni/include/racestate.h b/LEGO1/lego/legoomni/include/racestate.h
index 3bbb86f6..987d3a69 100644
--- a/LEGO1/lego/legoomni/include/racestate.h
+++ b/LEGO1/lego/legoomni/include/racestate.h
@@ -18,19 +18,19 @@ class RaceState : public LegoState {
 	RaceState();
 
 	// FUNCTION: LEGO1 0x10016010
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f07d0
 		return "RaceState";
 	}
 
 	// FUNCTION: LEGO1 0x10016020
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, RaceState::ClassName()) || LegoState::IsA(p_name);
 	}
 
-	virtual MxResult VTable0x1c(LegoFile* p_legoFile) override; // vtable+0x1c
+	MxResult VTable0x1c(LegoFile* p_legoFile) override; // vtable+0x1c
 
 	inline MxU16 GetColor(MxU8 p_id) { return GetState(p_id)->m_color; }
 
diff --git a/LEGO1/lego/legoomni/include/radio.h b/LEGO1/lego/legoomni/include/radio.h
index dd37ba44..fe06be9b 100644
--- a/LEGO1/lego/legoomni/include/radio.h
+++ b/LEGO1/lego/legoomni/include/radio.h
@@ -11,19 +11,19 @@
 class Radio : public MxCore {
 public:
 	Radio();
-	virtual ~Radio() override;
+	~Radio() override;
 
-	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x04
+	MxLong Notify(MxParam& p_param) override; // vtable+0x04
 
 	// FUNCTION: LEGO1 0x1002c8e0
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f328c
 		return "Radio";
 	}
 
 	// FUNCTION: LEGO1 0x1002c8f0
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, Radio::ClassName()) || MxCore::IsA(p_name);
 	}
diff --git a/LEGO1/lego/legoomni/include/radiostate.h b/LEGO1/lego/legoomni/include/radiostate.h
index adfbe623..cffef003 100644
--- a/LEGO1/lego/legoomni/include/radiostate.h
+++ b/LEGO1/lego/legoomni/include/radiostate.h
@@ -11,19 +11,19 @@ class RadioState : public LegoState {
 	RadioState();
 
 	// FUNCTION: LEGO1 0x1002cf60
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f04f8
 		return "RadioState";
 	}
 
 	// FUNCTION: LEGO1 0x1002cf70
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, RadioState::ClassName()) || LegoState::IsA(p_name);
 	}
 
-	virtual MxBool VTable0x14() override; // vtable+0x14
+	MxBool VTable0x14() override; // vtable+0x14
 
 	// SYNTHETIC: LEGO1 0x1002d020
 	// RadioState::`scalar deleting destructor'
diff --git a/LEGO1/lego/legoomni/include/registrationbook.h b/LEGO1/lego/legoomni/include/registrationbook.h
index d47dbf28..a712fdc6 100644
--- a/LEGO1/lego/legoomni/include/registrationbook.h
+++ b/LEGO1/lego/legoomni/include/registrationbook.h
@@ -8,28 +8,28 @@
 class RegistrationBook : public LegoWorld {
 public:
 	RegistrationBook();
-	virtual ~RegistrationBook() override; // vtable+0x00
+	~RegistrationBook() override; // vtable+0x00
 
-	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x04
-	virtual MxResult Tickle() override;               // vtable+0x08
+	MxLong Notify(MxParam& p_param) override; // vtable+0x04
+	MxResult Tickle() override;               // vtable+0x08
 
 	// FUNCTION: LEGO1 0x10076e10
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f04c8
 		return "RegistrationBook";
 	}
 
 	// FUNCTION: LEGO1 0x10076e20
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, RegistrationBook::ClassName()) || LegoWorld::IsA(p_name);
 	}
 
-	virtual MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
-	virtual void ReadyWorld() override;                       // vtable+0x50
-	virtual MxBool VTable0x64() override;                     // vtable+0x64
-	virtual void VTable0x68(MxBool p_add) override;           // vtable+0x68
+	MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
+	void ReadyWorld() override;                       // vtable+0x50
+	MxBool VTable0x64() override;                     // vtable+0x64
+	void VTable0x68(MxBool p_add) override;           // vtable+0x68
 
 	// SYNTHETIC: LEGO1 0x10076f30
 	// RegistrationBook::`scalar deleting destructor'
diff --git a/LEGO1/lego/legoomni/include/score.h b/LEGO1/lego/legoomni/include/score.h
index 03d69eb8..98774249 100644
--- a/LEGO1/lego/legoomni/include/score.h
+++ b/LEGO1/lego/legoomni/include/score.h
@@ -12,18 +12,18 @@
 class Score : public LegoWorld {
 public:
 	Score();
-	virtual ~Score() override;                        // vtable+0x00
-	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x04
+	~Score() override;                        // vtable+0x00
+	MxLong Notify(MxParam& p_param) override; // vtable+0x04
 
 	// FUNCTION: LEGO1 0x100010c0
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f0050
 		return "Score";
 	}
 
 	// FUNCTION: LEGO1 0x100010d0
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, Score::ClassName()) || LegoWorld::IsA(p_name);
 	}
@@ -31,11 +31,11 @@ class Score : public LegoWorld {
 	// SYNTHETIC: LEGO1 0x100011e0
 	// Score::`scalar deleting destructor'
 
-	virtual MxResult Create(MxDSAction& p_dsAction) override; // vtable+18
-	virtual void ReadyWorld() override;                       // vtable+50
-	virtual MxBool VTable0x5c() override;                     // vtable+5c
-	virtual MxBool VTable0x64() override;                     // vtable+64
-	virtual void VTable0x68(MxBool p_add) override;           // vtable+68
+	MxResult Create(MxDSAction& p_dsAction) override; // vtable+18
+	void ReadyWorld() override;                       // vtable+50
+	MxBool VTable0x5c() override;                     // vtable+5c
+	MxBool VTable0x64() override;                     // vtable+64
+	void VTable0x68(MxBool p_add) override;           // vtable+68
 
 	void Paint();
 	MxLong FUN_10001510(MxEndActionNotificationParam& p_param);
diff --git a/LEGO1/lego/legoomni/include/scorestate.h b/LEGO1/lego/legoomni/include/scorestate.h
index e02c2e56..78609c02 100644
--- a/LEGO1/lego/legoomni/include/scorestate.h
+++ b/LEGO1/lego/legoomni/include/scorestate.h
@@ -8,20 +8,20 @@
 class ScoreState : public LegoState {
 public:
 	// FUNCTION: LEGO1 0x1000de40
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f0084
 		return "ScoreState";
 	}
 
 	// FUNCTION: LEGO1 0x1000de50
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, ScoreState::ClassName()) || LegoState::IsA(p_name);
 	}
 
-	virtual MxBool VTable0x14() override; // vtable+0x14
-	virtual MxBool SetFlag() override;    // vtable+0x18
+	MxBool VTable0x14() override; // vtable+0x14
+	MxBool SetFlag() override;    // vtable+0x18
 
 	inline MxBool GetTutorialFlag() { return m_playCubeTutorial; }
 	inline void SetTutorialFlag(MxBool p_playCubeTutorial) { m_playCubeTutorial = p_playCubeTutorial; }
diff --git a/LEGO1/lego/legoomni/include/skateboard.h b/LEGO1/lego/legoomni/include/skateboard.h
index 4f97d87c..628e26f5 100644
--- a/LEGO1/lego/legoomni/include/skateboard.h
+++ b/LEGO1/lego/legoomni/include/skateboard.h
@@ -11,23 +11,23 @@ class SkateBoard : public IslePathActor {
 	SkateBoard();
 
 	// FUNCTION: LEGO1 0x1000fdd0
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f041c
 		return "SkateBoard";
 	}
 
 	// FUNCTION: LEGO1 0x1000fde0
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, SkateBoard::ClassName()) || IslePathActor::IsA(p_name);
 	}
 
-	virtual MxResult Create(MxDSAction& p_dsAction) override;            // vtable+0x18
-	virtual MxU32 VTable0xcc() override;                                 // vtable+0xcc
-	virtual MxU32 VTable0xd0() override;                                 // vtable+0xd0
-	virtual MxU32 VTable0xd4(LegoControlManagerEvent& p_param) override; // vtable+0xd4
-	virtual void VTable0xe4() override;                                  // vtable+0xe4
+	MxResult Create(MxDSAction& p_dsAction) override;            // vtable+0x18
+	MxU32 VTable0xcc() override;                                 // vtable+0xcc
+	MxU32 VTable0xd0() override;                                 // vtable+0xd0
+	MxU32 VTable0xd4(LegoControlManagerEvent& p_param) override; // vtable+0xd4
+	void VTable0xe4() override;                                  // vtable+0xe4
 
 	// SYNTHETIC: LEGO1 0x1000ff60
 	// SkateBoard::`scalar deleting destructor'
diff --git a/LEGO1/lego/legoomni/include/towtrack.h b/LEGO1/lego/legoomni/include/towtrack.h
index a79f75fb..85e54e6b 100644
--- a/LEGO1/lego/legoomni/include/towtrack.h
+++ b/LEGO1/lego/legoomni/include/towtrack.h
@@ -11,26 +11,26 @@ class TowTrack : public IslePathActor {
 	TowTrack();
 
 	// FUNCTION: LEGO1 0x1004c7c0
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f03b8
 		return "TowTrack";
 	}
 
 	// FUNCTION: LEGO1 0x1004c7d0
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, TowTrack::ClassName()) || IslePathActor::IsA(p_name);
 	}
 
-	virtual MxLong Notify(MxParam& p_param) override;                      // vtable+0x04
-	virtual MxResult Create(MxDSAction& p_dsAction) override;              // vtable+0x18
-	virtual void VTable0x70(float p_float) override;                       // vtable+0x70
-	virtual MxU32 VTable0xcc() override;                                   // vtable+0xcc
-	virtual MxU32 VTable0xd4(LegoControlManagerEvent& p_param) override;   // vtable+0xd4
-	virtual MxU32 VTable0xd8(MxType18NotificationParam& p_param) override; // vtable+0xd8
-	virtual MxU32 VTable0xdc(MxType19NotificationParam& p_param) override; // vtable+0xdc
-	virtual void VTable0xe4() override;                                    // vtable+0xe4
+	MxLong Notify(MxParam& p_param) override;                      // vtable+0x04
+	MxResult Create(MxDSAction& p_dsAction) override;              // vtable+0x18
+	void VTable0x70(float p_float) override;                       // vtable+0x70
+	MxU32 VTable0xcc() override;                                   // vtable+0xcc
+	MxU32 VTable0xd4(LegoControlManagerEvent& p_param) override;   // vtable+0xd4
+	MxU32 VTable0xd8(MxType18NotificationParam& p_param) override; // vtable+0xd8
+	MxU32 VTable0xdc(MxType19NotificationParam& p_param) override; // vtable+0xdc
+	void VTable0xe4() override;                                    // vtable+0xe4
 
 	// SYNTHETIC: LEGO1 0x1004c950
 	// TowTrack::`scalar deleting destructor'
diff --git a/LEGO1/lego/legoomni/include/towtrackmissionstate.h b/LEGO1/lego/legoomni/include/towtrackmissionstate.h
index 9e3b78f3..e96e87be 100644
--- a/LEGO1/lego/legoomni/include/towtrackmissionstate.h
+++ b/LEGO1/lego/legoomni/include/towtrackmissionstate.h
@@ -10,19 +10,19 @@ class TowTrackMissionState : public LegoState {
 	TowTrackMissionState();
 
 	// FUNCTION: LEGO1 0x1004dfa0
-	inline virtual const char* ClassName() const // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f00bc
 		return "TowTrackMissionState";
 	}
 
 	// FUNCTION: LEGO1 0x1004dfb0
-	inline virtual MxBool IsA(const char* p_name) const // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, TowTrackMissionState::ClassName()) || LegoState::IsA(p_name);
 	}
 
-	virtual MxResult VTable0x1c(LegoFile* p_legoFile) override; // vtable+0x1C
+	MxResult VTable0x1c(LegoFile* p_legoFile) override; // vtable+0x1C
 
 	inline MxU16 GetColor(MxU8 p_id)
 	{
diff --git a/LEGO1/lego/legoomni/src/audio/mxbackgroundaudiomanager.cpp b/LEGO1/lego/legoomni/src/audio/mxbackgroundaudiomanager.cpp
index 74f8c146..e51e2519 100644
--- a/LEGO1/lego/legoomni/src/audio/mxbackgroundaudiomanager.cpp
+++ b/LEGO1/lego/legoomni/src/audio/mxbackgroundaudiomanager.cpp
@@ -47,8 +47,9 @@ MxResult MxBackgroundAudioManager::Create(MxAtomId& p_script, MxU32 p_frequencyM
 // FUNCTION: LEGO1 0x1007ed20
 MxResult MxBackgroundAudioManager::OpenMusic(MxAtomId& p_script)
 {
-	if (m_script.GetInternal())
+	if (m_script.GetInternal()) {
 		DestroyMusic();
+	}
 
 	MxResult result = FAILURE;
 
@@ -264,15 +265,17 @@ MxResult MxBackgroundAudioManager::PlayMusic(MxDSAction& p_action, undefined4 p_
 // FUNCTION: LEGO1 0x1007f470
 void MxBackgroundAudioManager::Stop()
 {
-	if (m_action2.GetObjectId() != -1)
+	if (m_action2.GetObjectId() != -1) {
 		DeleteObject(m_action2);
+	}
 
 	m_unk0x138 = 0;
 	m_action2.SetAtomId(MxAtomId());
 	m_action2.SetObjectId(-1);
 
-	if (m_action1.GetObjectId() != -1)
+	if (m_action1.GetObjectId() != -1) {
 		DeleteObject(m_action1);
+	}
 
 	m_unk0xa0 = 0;
 	m_action1.SetAtomId(MxAtomId());
diff --git a/LEGO1/lego/legoomni/src/build/helicopter.cpp b/LEGO1/lego/legoomni/src/build/helicopter.cpp
index 9f11ace4..2b7be890 100644
--- a/LEGO1/lego/legoomni/src/build/helicopter.cpp
+++ b/LEGO1/lego/legoomni/src/build/helicopter.cpp
@@ -40,8 +40,9 @@ MxResult Helicopter::Create(MxDSAction& p_dsAction)
 		((Act3*) GetWorld())->SetUnkown420c(this);
 	}
 	world = GetWorld();
-	if (world)
+	if (world) {
 		world->Add(this);
+	}
 	GetState();
 	return result;
 }
@@ -50,8 +51,9 @@ MxResult Helicopter::Create(MxDSAction& p_dsAction)
 void Helicopter::GetState()
 {
 	m_state = (HelicopterState*) GameState()->GetState("HelicopterState");
-	if (!m_state)
+	if (!m_state) {
 		m_state = (HelicopterState*) GameState()->CreateState("HelicopterState");
+	}
 }
 
 // FUNCTION: LEGO1 0x10003360
@@ -87,10 +89,12 @@ void Helicopter::VTable0xe4()
 // FUNCTION: LEGO1 0x10003480
 MxU32 Helicopter::VTable0xcc()
 {
-	if (!FUN_1003ef60())
+	if (!FUN_1003ef60()) {
 		return 1;
-	if (!m_world)
+	}
+	if (!m_world) {
 		m_world = GetCurrentWorld();
+	}
 	AnimationManager()->FUN_1005f6d0(FALSE);
 	if (GetCurrentVehicle()) {
 		if (GetCurrentVehicle()->VTable0x60() != GameState()->GetUnknownC()) {
@@ -145,15 +149,17 @@ MxU32 Helicopter::VTable0xd4(LegoControlManagerEvent& p_param)
 				((Act3*) GetCurrentWorld())->SetUnkown4270(2);
 				TransitionManager()->StartTransition(MxTransitionManager::e_pixelation, 50, FALSE, FALSE);
 			}
-			else if (m_state->GetUnkown8() != 0)
+			else if (m_state->GetUnkown8() != 0) {
 				break;
+			}
 			VTable0xe4();
 			GameState()->SetCurrentArea(0x42);
 			ret = 1;
 			break;
 		case 0x18: {
-			if (*g_act3Script == script)
+			if (*g_act3Script == script) {
 				break;
+			}
 			Act1State* state = (Act1State*) GameState()->GetState("Act1State");
 			if (m_state->GetUnkown8() == 0) {
 				state->SetUnknown18(4);
@@ -166,8 +172,9 @@ MxU32 Helicopter::VTable0xd4(LegoControlManagerEvent& p_param)
 			break;
 		}
 		case 0x19:
-			if (*g_act3Script == script)
+			if (*g_act3Script == script) {
 				break;
+			}
 			if (m_state->GetUnkown8() == 2) {
 				m_state->SetUnknown8(3);
 				m_world->FUN_1001fc80(this);
@@ -177,13 +184,15 @@ MxU32 Helicopter::VTable0xd4(LegoControlManagerEvent& p_param)
 			ret = 1;
 			break;
 		case 0x1a:
-			if (*g_act3Script != script)
+			if (*g_act3Script != script) {
 				break;
+			}
 			ret = 1;
 			/* fall through */
 		case 0x1b:
-			if (*g_act3Script != script)
+			if (*g_act3Script != script) {
 				break;
+			}
 			if (m_world && m_world->GetCamera()) {
 				Mx3DPointFloat loc, dir, lookat;
 				loc.CopyFrom(m_world->GetCamera()->GetWorldLocation());
@@ -196,11 +205,14 @@ MxU32 Helicopter::VTable0xd4(LegoControlManagerEvent& p_param)
 				v68.CopyFrom(m_world->GetCamera()->GetWorldUp());
 				va4.EqualsCross(v68, dir);
 				v7c.EqualsCross(va4, v90);
-				if (ret)
-					if (((Act3*) m_world)->FUN_100727e0(m_unk0x138, loc, dir, v7c))
+				if (ret) {
+					if (((Act3*) m_world)->FUN_100727e0(m_unk0x138, loc, dir, v7c)) {
 						break;
-					else if (((Act3*) m_world)->FUN_10072980(m_unk0x138, loc, dir, v7c))
+					}
+					else if (((Act3*) m_world)->FUN_10072980(m_unk0x138, loc, dir, v7c)) {
 						break;
+					}
+				}
 			}
 			ret = 1;
 			break;
@@ -231,8 +243,9 @@ MxU32 Helicopter::VTable0xd8(MxType18NotificationParam& p_param)
 			((Act1State*) GameState()->GetState("Act1State"))->SetUnknown18(4);
 			VTable0xe8(0x2a, TRUE, 7);
 		}
-		else
+		else {
 			VTable0xe8(0x31, TRUE, 7);
+		}
 
 		m_state->SetUnknown8(2);
 
@@ -267,8 +280,9 @@ MxU32 Helicopter::VTable0xd8(MxType18NotificationParam& p_param)
 			((Act1State*) GameState()->GetState("Act1State"))->SetUnknown18(0);
 			VTable0xe8(0x29, TRUE, 7);
 		}
-		else
+		else {
 			VTable0xe8(0x30, TRUE, 7);
+		}
 
 		m_state->SetUnknown8(0);
 		ret = 1;
@@ -289,8 +303,9 @@ void Helicopter::VTable0x74(Matrix4& p_transform)
 	else {
 		m_roi->FUN_100a58f0(p_transform);
 		m_roi->VTable0x14();
-		if (m_cameraFlag)
+		if (m_cameraFlag) {
 			FUN_10010c30();
+		}
 	}
 }
 
@@ -307,10 +322,12 @@ void Helicopter::VTable0x70(float p_float)
 		float f = m_unk0x1f0 - p_float + 3000;
 		if (f >= 0) {
 			float f2 = f / 3000 + 1;
-			if (f2 < 0)
+			if (f2 < 0) {
 				f2 = 0;
-			if (1.0f < f2)
+			}
+			if (1.0f < f2) {
 				f2 = 1.0f;
+			}
 			Vector3 v(m_unk0x160[3]);
 			MxMatrix mat;
 			Vector3 v2(m_unk0x1a8[3]);
@@ -328,10 +345,12 @@ void Helicopter::VTable0x70(float p_float)
 			m_world->GetCamera()->FUN_100123e0(mat, 0);
 		}
 		else {
-			if (state == 4)
+			if (state == 4) {
 				((Act3*) m_world)->FUN_10073400();
-			else
+			}
+			else {
 				((Act3*) m_world)->FUN_10073430();
+			}
 			m_unk0xdc = 4;
 		}
 	}
@@ -380,6 +399,7 @@ MxResult HelicopterSubclass::FUN_100040a0(Vector4& p_v, float p_f)
 		}
 		return SUCCESS;
 	}
-	else
+	else {
 		return FAILURE;
+	}
 }
diff --git a/LEGO1/lego/legoomni/src/common/gifmanager.cpp b/LEGO1/lego/legoomni/src/common/gifmanager.cpp
index 821a97d2..09e25c5e 100644
--- a/LEGO1/lego/legoomni/src/common/gifmanager.cpp
+++ b/LEGO1/lego/legoomni/src/common/gifmanager.cpp
@@ -37,8 +37,9 @@ GifManager::~GifManager()
 // FUNCTION: LEGO1 0x10099cc0
 void GifManager::FUN_10099cc0(GifData* p_data)
 {
-	if (p_data == NULL)
+	if (p_data == NULL) {
 		return;
+	}
 
 #ifdef COMPAT_MODE
 	GifList::iterator it;
diff --git a/LEGO1/lego/legoomni/src/common/legoactioncontrolpresenter.cpp b/LEGO1/lego/legoomni/src/common/legoactioncontrolpresenter.cpp
index 1407de1b..370b54c7 100644
--- a/LEGO1/lego/legoomni/src/common/legoactioncontrolpresenter.cpp
+++ b/LEGO1/lego/legoomni/src/common/legoactioncontrolpresenter.cpp
@@ -80,8 +80,9 @@ void LegoActionControlPresenter::ParseExtra()
 {
 	MxU32 len = m_action->GetExtraLength();
 
-	if (len == 0)
+	if (len == 0) {
 		return;
+	}
 
 	len &= MAXWORD;
 
diff --git a/LEGO1/lego/legoomni/src/common/legobackgroundcolor.cpp b/LEGO1/lego/legoomni/src/common/legobackgroundcolor.cpp
index 5d594eaa..461e84db 100644
--- a/LEGO1/lego/legoomni/src/common/legobackgroundcolor.cpp
+++ b/LEGO1/lego/legoomni/src/common/legobackgroundcolor.cpp
@@ -34,8 +34,9 @@ void LegoBackgroundColor::SetValue(const char* p_colorString)
 	m_value.ToLowerCase();
 
 	LegoVideoManager* videomanager = VideoManager();
-	if (!videomanager || !p_colorString)
+	if (!videomanager || !p_colorString) {
 		return;
+	}
 
 	float convertedR, convertedG, convertedB;
 	char* colorStringCopy = strcpy(new char[strlen(p_colorString) + 1], p_colorString);
@@ -43,14 +44,17 @@ void LegoBackgroundColor::SetValue(const char* p_colorString)
 
 	if (!strcmp(colorStringSplit, g_set)) {
 		colorStringSplit = strtok(0, g_delimiter);
-		if (colorStringSplit)
+		if (colorStringSplit) {
 			m_h = (float) (atoi(colorStringSplit) * 0.01);
+		}
 		colorStringSplit = strtok(0, g_delimiter);
-		if (colorStringSplit)
+		if (colorStringSplit) {
 			m_s = (float) (atoi(colorStringSplit) * 0.01);
+		}
 		colorStringSplit = strtok(0, g_delimiter);
-		if (colorStringSplit)
+		if (colorStringSplit) {
 			m_v = (float) (atoi(colorStringSplit) * 0.01);
+		}
 
 		ConvertHSVToRGB(m_h, m_s, m_v, &convertedR, &convertedG, &convertedB);
 		videomanager->SetSkyColor(convertedR, convertedG, convertedB);
diff --git a/LEGO1/lego/legoomni/src/common/legogamestate.cpp b/LEGO1/lego/legoomni/src/common/legogamestate.cpp
index 0a884a53..28453d61 100644
--- a/LEGO1/lego/legoomni/src/common/legogamestate.cpp
+++ b/LEGO1/lego/legoomni/src/common/legogamestate.cpp
@@ -96,8 +96,9 @@ LegoGameState::~LegoGameState()
 	if (m_stateCount) {
 		for (MxS16 i = 0; i < m_stateCount; i++) {
 			LegoState* state = m_stateArray[i];
-			if (state)
+			if (state) {
 				delete state;
+			}
 		}
 
 		delete[] m_stateArray;
@@ -118,8 +119,9 @@ MxResult LegoGameState::Save(MxULong p_slot)
 	MxResult result;
 	InfocenterState* infocenterState = (InfocenterState*) GameState()->GetState("InfocenterState");
 
-	if (!infocenterState || infocenterState->GetInfocenterBufferElement(0) == NULL)
+	if (!infocenterState || infocenterState->GetInfocenterBufferElement(0) == NULL) {
 		result = SUCCESS;
+	}
 	else {
 		result = FAILURE;
 		MxVariableTable* variableTable = VariableTable();
@@ -134,8 +136,9 @@ MxResult LegoGameState::Save(MxULong p_slot)
 			fileStream.Write(&m_unk0x0c, 1);
 
 			for (MxS32 i = 0; i < sizeof(g_colorSaveData) / sizeof(g_colorSaveData[0]); ++i) {
-				if (WriteVariable(&fileStream, variableTable, g_colorSaveData[i].m_targetName) == FAILURE)
+				if (WriteVariable(&fileStream, variableTable, g_colorSaveData[i].m_targetName) == FAILURE) {
 					return result;
+				}
 			}
 
 			if (WriteVariable(&fileStream, variableTable, "backgroundcolor") != FAILURE) {
@@ -161,15 +164,17 @@ MxResult LegoGameState::Load(MxULong)
 // FUNCTION: LEGO1 0x10039f00
 void LegoGameState::SetSavePath(char* p_savePath)
 {
-	if (m_savePath != NULL)
+	if (m_savePath != NULL) {
 		delete[] m_savePath;
+	}
 
 	if (p_savePath) {
 		m_savePath = new char[strlen(p_savePath) + 1];
 		strcpy(m_savePath, p_savePath);
 	}
-	else
+	else {
 		m_savePath = NULL;
+	}
 }
 
 // FUNCTION: LEGO1 0x10039f70
@@ -183,8 +188,9 @@ MxResult LegoGameState::WriteVariable(LegoStorage* p_stream, MxVariableTable* p_
 		if (p_stream->Write((char*) &length, 1) == SUCCESS) {
 			if (p_stream->Write(p_variableName, length) == SUCCESS) {
 				length = strlen(variableValue);
-				if (p_stream->Write((char*) &length, 1) == SUCCESS)
+				if (p_stream->Write((char*) &length, 1) == SUCCESS) {
 					result = p_stream->Write((char*) variableValue, length);
+				}
 			}
 		}
 	}
@@ -195,8 +201,9 @@ MxResult LegoGameState::WriteVariable(LegoStorage* p_stream, MxVariableTable* p_
 MxResult LegoGameState::WriteEndOfVariables(LegoStorage* p_stream)
 {
 	MxU8 len = strlen(g_endOfVariables);
-	if (p_stream->Write(&len, 1) == SUCCESS)
+	if (p_stream->Write(&len, 1) == SUCCESS) {
 		return p_stream->Write(g_endOfVariables, len);
+	}
 	return FAILURE;
 }
 
@@ -212,9 +219,10 @@ MxS32 LegoGameState::ReadVariable(LegoStorage* p_stream, MxVariableTable* p_to)
 		char nameBuffer[256];
 		if (p_stream->Read(nameBuffer, length) == SUCCESS) {
 			nameBuffer[length] = '\0';
-			if (strcmp(nameBuffer, g_endOfVariables) == 0)
+			if (strcmp(nameBuffer, g_endOfVariables) == 0) {
 				// 2 -> "This was the last entry, done reading."
 				result = 2;
+			}
 			else {
 				if (p_stream->Read((char*) &length, 1) == SUCCESS) {
 					char valueBuffer[256];
@@ -237,8 +245,9 @@ void LegoGameState::GetFileSavePath(MxString* p_outPath, MxULong p_slotn)
 	char path[1024] = "";
 
 	// Save path base
-	if (m_savePath != NULL)
+	if (m_savePath != NULL) {
 		strcpy(path, m_savePath);
+	}
 
 	// Slot: "G0", "G1", ...
 	strcat(path, "\\G");
@@ -491,9 +500,11 @@ MxBool ROIHandlerFunction(char* p_input, char* p_output, MxU32 p_copyLen)
 // FUNCTION: LEGO1 0x1003bbb0
 LegoState* LegoGameState::GetState(const char* p_stateName)
 {
-	for (MxS32 i = 0; i < m_stateCount; ++i)
-		if (m_stateArray[i]->IsA(p_stateName))
+	for (MxS32 i = 0; i < m_stateCount; ++i) {
+		if (m_stateArray[i]->IsA(p_stateName)) {
 			return m_stateArray[i];
+		}
+	}
 	return NULL;
 }
 
@@ -510,9 +521,11 @@ LegoState* LegoGameState::CreateState(const char* p_stateName)
 void LegoGameState::RegisterState(LegoState* p_state)
 {
 	MxS32 targetIndex;
-	for (targetIndex = 0; targetIndex < m_stateCount; ++targetIndex)
-		if (m_stateArray[targetIndex]->IsA(p_state->ClassName()))
+	for (targetIndex = 0; targetIndex < m_stateCount; ++targetIndex) {
+		if (m_stateArray[targetIndex]->IsA(p_state->ClassName())) {
 			break;
+		}
+	}
 
 	if (targetIndex == m_stateCount) {
 		LegoState** newBuffer = new LegoState*[m_stateCount + 1];
@@ -527,8 +540,9 @@ void LegoGameState::RegisterState(LegoState* p_state)
 		return;
 	}
 
-	if (m_stateArray[targetIndex])
+	if (m_stateArray[targetIndex]) {
 		delete m_stateArray[targetIndex];
+	}
 	m_stateArray[targetIndex] = p_state;
 }
 
diff --git a/LEGO1/lego/legoomni/src/common/legounksavedatawriter.cpp b/LEGO1/lego/legoomni/src/common/legounksavedatawriter.cpp
index 551dea32..c7154155 100644
--- a/LEGO1/lego/legoomni/src/common/legounksavedatawriter.cpp
+++ b/LEGO1/lego/legoomni/src/common/legounksavedatawriter.cpp
@@ -19,26 +19,36 @@ MxResult LegoUnkSaveDataWriter::WriteSaveData3(LegoStorage* p_stream)
 	const LegoSaveDataEntry3* end = &g_saveData3[66];
 
 	while (TRUE) {
-		if (p_stream->Write(&entry->m_savePart1, 4) != SUCCESS)
+		if (p_stream->Write(&entry->m_savePart1, 4) != SUCCESS) {
 			break;
-		if (p_stream->Write(&entry->m_savePart2, 4) != SUCCESS)
+		}
+		if (p_stream->Write(&entry->m_savePart2, 4) != SUCCESS) {
 			break;
-		if (p_stream->Write(&entry->m_savePart3, 1) != SUCCESS)
+		}
+		if (p_stream->Write(&entry->m_savePart3, 1) != SUCCESS) {
 			break;
-		if (p_stream->Write(&entry->m_currentFrame, 1) != SUCCESS)
+		}
+		if (p_stream->Write(&entry->m_currentFrame, 1) != SUCCESS) {
 			break;
-		if (p_stream->Write(&entry->m_savePart5, 1) != SUCCESS)
+		}
+		if (p_stream->Write(&entry->m_savePart5, 1) != SUCCESS) {
 			break;
-		if (p_stream->Write(&entry->m_savePart6, 1) != SUCCESS)
+		}
+		if (p_stream->Write(&entry->m_savePart6, 1) != SUCCESS) {
 			break;
-		if (p_stream->Write(&entry->m_savePart7, 1) != SUCCESS)
+		}
+		if (p_stream->Write(&entry->m_savePart7, 1) != SUCCESS) {
 			break;
-		if (p_stream->Write(&entry->m_savePart8, 1) != SUCCESS)
+		}
+		if (p_stream->Write(&entry->m_savePart8, 1) != SUCCESS) {
 			break;
-		if (p_stream->Write(&entry->m_savePart9, 1) != SUCCESS)
+		}
+		if (p_stream->Write(&entry->m_savePart9, 1) != SUCCESS) {
 			break;
-		if (p_stream->Write(&entry->m_savePart10, 1) != SUCCESS)
+		}
+		if (p_stream->Write(&entry->m_savePart10, 1) != SUCCESS) {
 			break;
+		}
 		if (++entry >= end) {
 			result = SUCCESS;
 			break;
diff --git a/LEGO1/lego/legoomni/src/common/legoutil.cpp b/LEGO1/lego/legoomni/src/common/legoutil.cpp
index 9f388ad5..251942fb 100644
--- a/LEGO1/lego/legoomni/src/common/legoutil.cpp
+++ b/LEGO1/lego/legoomni/src/common/legoutil.cpp
@@ -21,26 +21,36 @@ Extra::ActionType MatchActionString(const char* p_str)
 {
 	Extra::ActionType result = Extra::ActionType::e_unknown;
 
-	if (!strcmpi("openram", p_str))
+	if (!strcmpi("openram", p_str)) {
 		result = Extra::ActionType::e_openram;
-	else if (!strcmpi("opendisk", p_str))
+	}
+	else if (!strcmpi("opendisk", p_str)) {
 		result = Extra::ActionType::e_opendisk;
-	else if (!strcmpi("close", p_str))
+	}
+	else if (!strcmpi("close", p_str)) {
 		result = Extra::ActionType::e_close;
-	else if (!strcmpi("start", p_str))
+	}
+	else if (!strcmpi("start", p_str)) {
 		result = Extra::ActionType::e_start;
-	else if (!strcmpi("stop", p_str))
+	}
+	else if (!strcmpi("stop", p_str)) {
 		result = Extra::ActionType::e_stop;
-	else if (!strcmpi("run", p_str))
+	}
+	else if (!strcmpi("run", p_str)) {
 		result = Extra::ActionType::e_run;
-	else if (!strcmpi("exit", p_str))
+	}
+	else if (!strcmpi("exit", p_str)) {
 		result = Extra::ActionType::e_exit;
-	else if (!strcmpi("enable", p_str))
+	}
+	else if (!strcmpi("enable", p_str)) {
 		result = Extra::ActionType::e_enable;
-	else if (!strcmpi("disable", p_str))
+	}
+	else if (!strcmpi("disable", p_str)) {
 		result = Extra::ActionType::e_disable;
-	else if (!strcmpi("notify", p_str))
+	}
+	else if (!strcmpi("notify", p_str)) {
 		result = Extra::ActionType::e_notify;
+	}
 
 	return result;
 }
@@ -133,10 +143,12 @@ void ConvertHSVToRGB(float p_h, float p_s, float p_v, float* p_rOut, float* p_bO
 
 	double sDbl = p_s;
 
-	if (p_s > 0.5f)
+	if (p_s > 0.5f) {
 		calc = (1.0f - p_v) * p_s + p_v;
-	else
+	}
+	else {
 		calc = (p_v + 1.0) * sDbl;
+	}
 	if (calc <= 0.0) {
 		*p_gOut = 0.0f;
 		*p_bOut = 0.0f;
diff --git a/LEGO1/lego/legoomni/src/common/mxcompositemediapresenter.cpp b/LEGO1/lego/legoomni/src/common/mxcompositemediapresenter.cpp
index d3971150..fe1543a2 100644
--- a/LEGO1/lego/legoomni/src/common/mxcompositemediapresenter.cpp
+++ b/LEGO1/lego/legoomni/src/common/mxcompositemediapresenter.cpp
@@ -57,10 +57,12 @@ MxResult MxCompositeMediaPresenter::StartAction(MxStreamController* p_controller
 				if (presenter->StartAction(p_controller, action) == SUCCESS) {
 					presenter->SetTickleState(e_idle);
 
-					if (presenter->IsA("MxVideoPresenter"))
+					if (presenter->IsA("MxVideoPresenter")) {
 						VideoManager()->UnregisterPresenter(*presenter);
-					else if (presenter->IsA("MxAudioPresenter"))
+					}
+					else if (presenter->IsA("MxAudioPresenter")) {
 						SoundManager()->UnregisterPresenter(*presenter);
+					}
 
 					success = TRUE;
 				}
@@ -70,8 +72,9 @@ MxResult MxCompositeMediaPresenter::StartAction(MxStreamController* p_controller
 				action->SetOrigin(this);
 				m_list.push_back(presenter);
 			}
-			else if (presenter)
+			else if (presenter) {
 				delete presenter;
+			}
 		}
 
 		if (!m_compositePresenter) {
@@ -97,8 +100,9 @@ void MxCompositeMediaPresenter::StartingTickle()
 				(*it)->Tickle();
 
 				if ((*it)->GetCurrentTickleState() == e_streaming ||
-					((*it)->GetAction() && (*it)->GetAction()->GetStartTime()))
+					((*it)->GetAction() && (*it)->GetAction()->GetStartTime())) {
 					m_unk0x4c++;
+				}
 			}
 		}
 
@@ -107,8 +111,9 @@ void MxCompositeMediaPresenter::StartingTickle()
 			m_unk0x4c = 0;
 
 			for (MxCompositePresenterList::iterator it = m_list.begin(); it != m_list.end(); it++) {
-				if (!(*it)->GetAction()->GetStartTime())
+				if (!(*it)->GetAction()->GetStartTime()) {
 					m_unk0x4c++;
+				}
 			}
 		}
 	}
@@ -145,8 +150,9 @@ MxResult MxCompositeMediaPresenter::Tickle()
 	case e_repeating:
 	case e_unk5:
 	case e_done: {
-		for (MxCompositePresenterList::iterator it = m_list.begin(); it != m_list.end(); it++)
+		for (MxCompositePresenterList::iterator it = m_list.begin(); it != m_list.end(); it++) {
 			(*it)->Tickle();
+		}
 		break;
 	}
 	default:
@@ -162,8 +168,9 @@ MxResult MxCompositeMediaPresenter::PutData()
 	MxAutoLocker lock(&m_criticalSection);
 
 	if (m_currentTickleState >= e_streaming && m_currentTickleState <= e_done) {
-		for (MxCompositePresenterList::iterator it = m_list.begin(); it != m_list.end(); it++)
+		for (MxCompositePresenterList::iterator it = m_list.begin(); it != m_list.end(); it++) {
 			(*it)->PutData();
+		}
 	}
 
 	return SUCCESS;
diff --git a/LEGO1/lego/legoomni/src/control/legocontrolmanager.cpp b/LEGO1/lego/legoomni/src/control/legocontrolmanager.cpp
index e296ad91..8bcf9999 100644
--- a/LEGO1/lego/legoomni/src/control/legocontrolmanager.cpp
+++ b/LEGO1/lego/legoomni/src/control/legocontrolmanager.cpp
@@ -43,8 +43,9 @@ void LegoControlManager::Register(MxCore* p_listener)
 void LegoControlManager::Unregister(MxCore* p_listener)
 {
 	LegoNotifyListCursor cursor(&m_notifyList);
-	if (cursor.Find(p_listener))
+	if (cursor.Find(p_listener)) {
 		cursor.Detach();
+	}
 }
 
 // FUNCTION: LEGO1 0x10029210
diff --git a/LEGO1/lego/legoomni/src/control/mxcontrolpresenter.cpp b/LEGO1/lego/legoomni/src/control/mxcontrolpresenter.cpp
index 39fb5eee..ae131445 100644
--- a/LEGO1/lego/legoomni/src/control/mxcontrolpresenter.cpp
+++ b/LEGO1/lego/legoomni/src/control/mxcontrolpresenter.cpp
@@ -58,8 +58,9 @@ void MxControlPresenter::VTable0x68(MxBool p_unk0x50)
 // FUNCTION: LEGO1 0x10044110
 MxControlPresenter::~MxControlPresenter()
 {
-	if (m_unk0x58)
+	if (m_unk0x58) {
 		delete m_unk0x58;
+	}
 }
 
 // FUNCTION: LEGO1 0x10044180
@@ -238,7 +239,7 @@ void MxControlPresenter::VTable0x6c(MxS16 p_val)
 
 	MxS16 i = 0;
 	for (MxCompositePresenterList::iterator it = m_list.begin(); it != m_list.end(); it++) {
-		(*it)->Enable((m_unk0x4c == 3 && m_unk0x4e == 0 || !IsEnabled()) ? FALSE : m_unk0x4e == i);
+		(*it)->Enable(((m_unk0x4c == 3 && m_unk0x4e == 0) || !IsEnabled()) ? FALSE : m_unk0x4e == i);
 		i++;
 	}
 }
@@ -322,8 +323,9 @@ void MxControlPresenter::Enable(MxBool p_enable)
 MxBool MxControlPresenter::HasTickleStatePassed(TickleState p_tickleState)
 {
 	MxCompositePresenterList::iterator it = m_list.begin();
-	for (MxS16 i = m_unk0x4e; i > 0; i--, it++)
+	for (MxS16 i = m_unk0x4e; i > 0; i--, it++) {
 		;
+	}
 
 	return (*it)->HasTickleStatePassed(p_tickleState);
 }
diff --git a/LEGO1/lego/legoomni/src/entity/legocameracontroller.cpp b/LEGO1/lego/legoomni/src/entity/legocameracontroller.cpp
index d48d22ff..b68d0a01 100644
--- a/LEGO1/lego/legoomni/src/entity/legocameracontroller.cpp
+++ b/LEGO1/lego/legoomni/src/entity/legocameracontroller.cpp
@@ -64,10 +64,12 @@ void LegoCameraController::OnRButtonUp(MxPoint32 p_point)
 // FUNCTION: LEGO1 0x10012230
 void LegoCameraController::OnMouseMove(MxU8 p_modifier, MxPoint32 p_point)
 {
-	if (p_modifier & c_lButtonState)
+	if (p_modifier & c_lButtonState) {
 		LeftDrag(p_point.GetX(), p_point.GetY());
-	else if (p_modifier & c_rButtonState)
+	}
+	else if (p_modifier & c_rButtonState) {
 		RightDrag(p_point.GetX(), p_point.GetY());
+	}
 }
 
 // FUNCTION: LEGO1 0x10012260
@@ -90,8 +92,9 @@ Mx3DPointFloat LegoCameraController::GetWorldUp()
 		vec = m_lego3DView->GetPointOfView()->GetWorldUp();
 		return Mx3DPointFloat(vec[0], vec[1], vec[2]);
 	}
-	else
+	else {
 		return Mx3DPointFloat(0, 0, 0);
+	}
 }
 
 // FUNCTION: LEGO1 0x100127f0
@@ -102,8 +105,9 @@ Mx3DPointFloat LegoCameraController::GetWorldLocation()
 		vec = m_lego3DView->GetPointOfView()->GetWorldPosition();
 		return Mx3DPointFloat(vec[0], vec[1] - m_entityOffsetUp, vec[2]);
 	}
-	else
+	else {
 		return Mx3DPointFloat(0, 0, 0);
+	}
 }
 
 // FUNCTION: LEGO1 0x100128a0
@@ -114,6 +118,7 @@ Mx3DPointFloat LegoCameraController::GetWorldDirection()
 		vec = m_lego3DView->GetPointOfView()->GetWorldDirection();
 		return Mx3DPointFloat(vec[0], vec[1], vec[2]);
 	}
-	else
+	else {
 		return Mx3DPointFloat(0, 0, 0);
+	}
 }
diff --git a/LEGO1/lego/legoomni/src/entity/legoentity.cpp b/LEGO1/lego/legoomni/src/entity/legoentity.cpp
index 8ad66afb..3057a71f 100644
--- a/LEGO1/lego/legoomni/src/entity/legoentity.cpp
+++ b/LEGO1/lego/legoomni/src/entity/legoentity.cpp
@@ -51,8 +51,9 @@ void LegoEntity::Destroy(MxBool p_fromDestructor)
 {
 	if (m_roi) {
 		if (m_flags & c_bit1) {
-			if (m_roi->GetUnknown0x104() == this)
+			if (m_roi->GetUnknown0x104() == this) {
 				m_roi->SetUnknown0x104(NULL);
+			}
 
 			GetUnkSaveDataWriter()->FUN_10083db0(m_roi);
 		}
@@ -92,8 +93,9 @@ void LegoEntity::FUN_10010c30()
 {
 	LegoWorld* world = GetCurrentWorld();
 
-	if (m_cameraFlag && world && world->GetCamera() && m_roi)
+	if (m_cameraFlag && world && world->GetCamera() && m_roi) {
 		world->GetCamera()->FUN_100123e0(m_roi->GetLocal2World(), 1);
+	}
 }
 
 // FUNCTION: LEGO1 0x10010e10
diff --git a/LEGO1/lego/legoomni/src/entity/legonavcontroller.cpp b/LEGO1/lego/legoomni/src/entity/legonavcontroller.cpp
index 6a6a035c..8a9ec812 100644
--- a/LEGO1/lego/legoomni/src/entity/legonavcontroller.cpp
+++ b/LEGO1/lego/legoomni/src/entity/legonavcontroller.cpp
@@ -148,8 +148,9 @@ void LegoNavController::SetDefaults(
 // FUNCTION: LEGO1 0x10054e40
 void LegoNavController::SetTargets(int p_hPos, int p_vPos, MxBool p_accel)
 {
-	if (this->m_trackDefault != FALSE)
+	if (this->m_trackDefault != FALSE) {
 		ResetToDefault();
+	}
 
 	if (p_accel != FALSE) {
 		this->m_targetTurnSpeed = CalculateNewTargetSpeed(p_hPos, this->m_hMax / 2, this->m_turnMaxSpeed);
@@ -178,12 +179,15 @@ float LegoNavController::CalculateNewTargetSpeed(int p_pos, int p_center, float
 	float result;
 	int diff = p_pos - p_center;
 
-	if (diff > this->m_mouseDeadzone)
+	if (diff > this->m_mouseDeadzone) {
 		result = (diff - m_mouseDeadzone) * p_maxSpeed / (p_center - m_mouseDeadzone);
-	else if (diff < -m_mouseDeadzone)
+	}
+	else if (diff < -m_mouseDeadzone) {
 		result = (diff + m_mouseDeadzone) * p_maxSpeed / (p_center - m_mouseDeadzone);
-	else
+	}
+	else {
 		result = 0.0f;
+	}
 
 	return result;
 }
@@ -196,8 +200,9 @@ float LegoNavController::CalculateNewAccel(int p_pos, int p_center, float p_maxA
 
 	result = Abs(diff) * p_maxAccel / p_center;
 
-	if (result < p_minAccel)
+	if (result < p_minAccel) {
 		result = (float) p_minAccel;
+	}
 
 	return result;
 }
@@ -214,10 +219,12 @@ float LegoNavController::CalculateNewVel(float p_targetVel, float p_currentVel,
 		float deltaVel = p_accel * p_time;
 		newVel = p_currentVel + (deltaVel * vSign);
 
-		if (vSign > 0)
+		if (vSign > 0) {
 			newVel = Min(newVel, p_targetVel);
-		else
+		}
+		else {
 			newVel = Max(newVel, p_targetVel);
+		}
 	}
 
 	return newVel;
diff --git a/LEGO1/lego/legoomni/src/entity/legoworld.cpp b/LEGO1/lego/legoomni/src/entity/legoworld.cpp
index deaf0ce7..a8111dc8 100644
--- a/LEGO1/lego/legoomni/src/entity/legoworld.cpp
+++ b/LEGO1/lego/legoomni/src/entity/legoworld.cpp
@@ -65,16 +65,19 @@ MxResult LegoWorld::Create(MxDSAction& p_dsAction)
 
 	m_entityList = new LegoEntityList(TRUE);
 
-	if (!m_entityList)
+	if (!m_entityList) {
 		return FAILURE;
+	}
 
 	m_cacheSoundList = new LegoCacheSoundList(TRUE);
 
-	if (!m_cacheSoundList)
+	if (!m_cacheSoundList) {
 		return FAILURE;
+	}
 
-	if (!VTable0x54())
+	if (!VTable0x54()) {
 		return FAILURE;
+	}
 
 	if (p_dsAction.GetFlags() & MxDSAction::c_enabled) {
 		if (GetCurrentWorld()) {
@@ -146,8 +149,9 @@ void LegoWorld::Destroy(MxBool p_fromDestructor)
 				presenter->EndAction();
 			}
 		}
-		else
+		else {
 			delete object;
+		}
 	}
 
 	MxPresenterListCursor controlPresenterCursor(&m_controlPresenters);
@@ -174,8 +178,9 @@ void LegoWorld::Destroy(MxBool p_fromDestructor)
 		while (cursor.First(entity)) {
 			cursor.Detach();
 
-			if (!(entity->GetFlags() & LegoEntity::c_bit2))
+			if (!(entity->GetFlags() & LegoEntity::c_bit2)) {
 				delete entity;
+			}
 		}
 
 		delete m_entityList;
@@ -201,8 +206,9 @@ void LegoWorld::Destroy(MxBool p_fromDestructor)
 		delete roi;
 	}
 
-	if (!p_fromDestructor)
+	if (!p_fromDestructor) {
 		LegoEntity::Destroy(FALSE);
+	}
 }
 
 // FUNCTION: LEGO1 0x1001f5e0
@@ -284,42 +290,48 @@ void LegoWorld::Add(MxCore* p_object)
 		if (p_object->IsA("MxControlPresenter")) {
 			MxPresenterListCursor cursor(&m_controlPresenters);
 
-			if (cursor.Find((MxPresenter*) p_object))
+			if (cursor.Find((MxPresenter*) p_object)) {
 				return;
+			}
 
 			m_controlPresenters.Append((MxPresenter*) p_object);
 		}
 		else if (p_object->IsA("MxEntity")) {
 			LegoEntityListCursor cursor(m_entityList);
 
-			if (cursor.Find((LegoEntity*) p_object))
+			if (cursor.Find((LegoEntity*) p_object)) {
 				return;
+			}
 
 			m_entityList->Append((LegoEntity*) p_object);
 		}
 		else if (p_object->IsA("LegoLocomotionAnimPresenter") || p_object->IsA("LegoHideAnimPresenter") || p_object->IsA("LegoLoopingAnimPresenter")) {
 			MxPresenterListCursor cursor(&m_animPresenters);
 
-			if (cursor.Find((MxPresenter*) p_object))
+			if (cursor.Find((MxPresenter*) p_object)) {
 				return;
+			}
 
 			((MxPresenter*) p_object)->SendToCompositePresenter(Lego());
 			m_animPresenters.Append(((MxPresenter*) p_object));
 
-			if (p_object->IsA("LegoHideAnimPresenter"))
+			if (p_object->IsA("LegoHideAnimPresenter")) {
 				m_hideAnimPresenter = (LegoHideAnimPresenter*) p_object;
+			}
 		}
 		else if (p_object->IsA("LegoCacheSound")) {
 			LegoCacheSoundListCursor cursor(m_cacheSoundList);
 
-			if (cursor.Find((LegoCacheSound*) p_object))
+			if (cursor.Find((LegoCacheSound*) p_object)) {
 				return;
+			}
 
 			m_cacheSoundList->Append((LegoCacheSound*) p_object);
 		}
 		else {
-			if (m_set0xa8.find(p_object) == m_set0xa8.end())
+			if (m_set0xa8.find(p_object) == m_set0xa8.end()) {
 				m_set0xa8.insert(p_object);
+			}
 		}
 
 		if (!m_set0xd0.empty() && p_object->IsA("MxPresenter")) {
@@ -349,38 +361,45 @@ void LegoWorld::Remove(MxCore* p_object)
 		else if (p_object->IsA("LegoLocomotionAnimPresenter") || p_object->IsA("LegoHideAnimPresenter") || p_object->IsA("LegoLoopingAnimPresenter")) {
 			MxPresenterListCursor cursor(&m_animPresenters);
 
-			if (cursor.Find((MxPresenter*) p_object))
+			if (cursor.Find((MxPresenter*) p_object)) {
 				cursor.Detach();
+			}
 
-			if (p_object->IsA("LegoHideAnimPresenter"))
+			if (p_object->IsA("LegoHideAnimPresenter")) {
 				m_hideAnimPresenter = NULL;
+			}
 		}
 		else if (p_object->IsA("MxEntity")) {
-			if (p_object->IsA("LegoPathActor"))
+			if (p_object->IsA("LegoPathActor")) {
 				FUN_1001fc80((IslePathActor*) p_object);
+			}
 
 			if (m_entityList) {
 				LegoEntityListCursor cursor(m_entityList);
 
-				if (cursor.Find((LegoEntity*) p_object))
+				if (cursor.Find((LegoEntity*) p_object)) {
 					cursor.Detach();
+				}
 			}
 		}
 		else if (p_object->IsA("LegoCacheSound")) {
 			LegoCacheSoundListCursor cursor(m_cacheSoundList);
 
-			if (cursor.Find((LegoCacheSound*) p_object))
+			if (cursor.Find((LegoCacheSound*) p_object)) {
 				cursor.Detach();
+			}
 		}
 		else {
 			it = m_set0xa8.find(p_object);
-			if (it != m_set0xa8.end())
+			if (it != m_set0xa8.end()) {
 				m_set0xa8.erase(it);
+			}
 		}
 
 		it = m_set0xd0.find(p_object);
-		if (it != m_set0xd0.end())
+		if (it != m_set0xd0.end()) {
 			m_set0xd0.erase(it);
+		}
 	}
 }
 
@@ -393,8 +412,9 @@ MxCore* LegoWorld::Find(const char* p_class, const char* p_name)
 
 		while (cursor.Next(presenter)) {
 			MxDSAction* action = presenter->GetAction();
-			if (!strcmp(action->GetObjectName(), p_name))
+			if (!strcmp(action->GetObjectName(), p_name)) {
 				return presenter;
+			}
 		}
 
 		return NULL;
@@ -404,12 +424,14 @@ MxCore* LegoWorld::Find(const char* p_class, const char* p_name)
 		LegoEntity* entity;
 
 		while (cursor.Next(entity)) {
-			if (!p_name)
+			if (!p_name) {
 				return entity;
+			}
 
 			LegoROI* roi = entity->GetROI();
-			if (roi && !strcmpi(roi->GetUnknown0xe4(), p_name))
+			if (roi && !strcmpi(roi->GetUnknown0xe4(), p_name)) {
 				return entity;
+			}
 		}
 
 		return NULL;
@@ -419,8 +441,9 @@ MxCore* LegoWorld::Find(const char* p_class, const char* p_name)
 		MxPresenter* presenter;
 
 		while (cursor.Next(presenter)) {
-			if (!strcmpi(((LegoAnimPresenter*) presenter)->GetActionObjectName(), p_name))
+			if (!strcmpi(((LegoAnimPresenter*) presenter)->GetActionObjectName(), p_name)) {
 				return presenter;
+			}
 		}
 
 		return NULL;
@@ -431,8 +454,9 @@ MxCore* LegoWorld::Find(const char* p_class, const char* p_name)
 				MxPresenter* presenter = (MxPresenter*) *it;
 				MxDSAction* action = presenter->GetAction();
 
-				if (!strcmp(action->GetObjectName(), p_name))
+				if (!strcmp(action->GetObjectName(), p_name)) {
 					return *it;
+				}
 			}
 		}
 
@@ -447,8 +471,9 @@ MxCore* LegoWorld::Find(const MxAtomId& p_atom, MxS32 p_entityId)
 	LegoEntity* entity;
 
 	while (entityCursor.Next(entity)) {
-		if (entity->GetAtom() == p_atom && entity->GetEntityId() == p_entityId)
+		if (entity->GetAtom() == p_atom && entity->GetEntityId() == p_entityId) {
 			return entity;
+		}
 	}
 
 	MxPresenterListCursor controlPresenterCursor(&m_controlPresenters);
@@ -457,8 +482,9 @@ MxCore* LegoWorld::Find(const MxAtomId& p_atom, MxS32 p_entityId)
 	while (controlPresenterCursor.Next(presenter)) {
 		MxDSAction* action = presenter->GetAction();
 
-		if (action->GetAtomId() == p_atom && action->GetObjectId() == p_entityId)
+		if (action->GetAtomId() == p_atom && action->GetObjectId() == p_entityId) {
 			return presenter;
+		}
 	}
 
 	MxPresenterListCursor animPresenterCursor(&m_animPresenters);
@@ -466,8 +492,9 @@ MxCore* LegoWorld::Find(const MxAtomId& p_atom, MxS32 p_entityId)
 	while (animPresenterCursor.Next(presenter)) {
 		MxDSAction* action = presenter->GetAction();
 
-		if (action && action->GetAtomId() == p_atom && action->GetObjectId() == p_entityId)
+		if (action && action->GetAtomId() == p_atom && action->GetObjectId() == p_entityId) {
 			return presenter;
+		}
 	}
 
 	for (MxCoreSet::iterator it = m_set0xa8.begin(); it != m_set0xa8.end(); it++) {
@@ -477,8 +504,9 @@ MxCore* LegoWorld::Find(const MxAtomId& p_atom, MxS32 p_entityId)
 			MxPresenter* presenter = (MxPresenter*) *it;
 			MxDSAction* action = presenter->GetAction();
 
-			if (action->GetAtomId() == p_atom && action->GetObjectId() == p_entityId)
+			if (action->GetAtomId() == p_atom && action->GetObjectId() == p_entityId) {
 				return *it;
+			}
 		}
 	}
 
@@ -502,8 +530,9 @@ MxResult LegoWorld::Tickle()
 			ReadyWorld();
 			return TRUE;
 		case e_two:
-			if (PresentersPending())
+			if (PresentersPending()) {
 				break;
+			}
 		default:
 			m_startupTicks--;
 		}
@@ -519,8 +548,9 @@ MxBool LegoWorld::PresentersPending()
 	MxPresenter* presenter;
 
 	while (controlPresenterCursor.Next(presenter)) {
-		if (presenter->IsEnabled() && !presenter->HasTickleStatePassed(MxPresenter::e_starting))
+		if (presenter->IsEnabled() && !presenter->HasTickleStatePassed(MxPresenter::e_starting)) {
 			return TRUE;
+		}
 	}
 
 	MxPresenterListCursor animPresenterCursor(&m_animPresenters);
@@ -528,12 +558,14 @@ MxBool LegoWorld::PresentersPending()
 	while (animPresenterCursor.Next(presenter)) {
 		if (presenter->IsEnabled()) {
 			if (presenter->IsA("LegoLocomotionAnimPresenter")) {
-				if (!presenter->HasTickleStatePassed(MxPresenter::e_ready))
+				if (!presenter->HasTickleStatePassed(MxPresenter::e_ready)) {
 					return TRUE;
+				}
 			}
 			else {
-				if (!presenter->HasTickleStatePassed(MxPresenter::e_starting))
+				if (!presenter->HasTickleStatePassed(MxPresenter::e_starting)) {
 					return TRUE;
+				}
 			}
 		}
 	}
@@ -542,8 +574,9 @@ MxBool LegoWorld::PresentersPending()
 		if ((*it)->IsA("MxPresenter")) {
 			presenter = (MxPresenter*) *it;
 
-			if (presenter->IsEnabled() && !presenter->HasTickleStatePassed(MxPresenter::e_starting))
+			if (presenter->IsEnabled() && !presenter->HasTickleStatePassed(MxPresenter::e_starting)) {
 				return TRUE;
+			}
 		}
 	}
 
diff --git a/LEGO1/lego/legoomni/src/entity/legoworldpresenter.cpp b/LEGO1/lego/legoomni/src/entity/legoworldpresenter.cpp
index 072da137..d4e002de 100644
--- a/LEGO1/lego/legoomni/src/entity/legoworldpresenter.cpp
+++ b/LEGO1/lego/legoomni/src/entity/legoworldpresenter.cpp
@@ -100,8 +100,9 @@ MxResult LegoWorldPresenter::StartAction(MxStreamController* p_controller, MxDSA
 				action->SetOrigin(this);
 				m_list.push_back(presenter);
 			}
-			else if (presenter)
+			else if (presenter) {
 				delete presenter;
+			}
 		}
 
 		VideoManager()->RegisterPresenter(*this);
diff --git a/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp b/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp
index 2a98f5af..0e90c761 100644
--- a/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp
+++ b/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp
@@ -195,8 +195,9 @@ MxLong Infocenter::HandleEndAction(MxParam& p_param)
 
 	MxLong result = m_radio.Notify(p_param);
 
-	if (result || (action->GetAtomId() != m_atom && action->GetAtomId() != *g_introScript))
+	if (result || (action->GetAtomId() != m_atom && action->GetAtomId() != *g_introScript)) {
 		return result;
+	}
 
 	if (action->GetObjectId() == c_returnBackGuidanceDialogue2) {
 		ControlManager()->FUN_100293c0(0x10, action->GetAtomId().GetInternal(), 0);
@@ -747,8 +748,9 @@ void Infocenter::FUN_10070d10(MxS32 p_x, MxS32 p_y)
 		MxS32 left = m_mapAreas[i].m_area.GetLeft();
 		MxS32 top = m_mapAreas[i].m_area.GetTop();
 
-		if (left <= p_x && p_x <= right && top <= p_y && p_y <= bottom)
+		if (left <= p_x && p_x <= right && top <= p_y && p_y <= bottom) {
 			break;
+		}
 	}
 
 	if (i == 7) {
diff --git a/LEGO1/lego/legoomni/src/infocenter/score.cpp b/LEGO1/lego/legoomni/src/infocenter/score.cpp
index ce378399..197cd7ae 100644
--- a/LEGO1/lego/legoomni/src/infocenter/score.cpp
+++ b/LEGO1/lego/legoomni/src/infocenter/score.cpp
@@ -32,8 +32,9 @@ MxBool Score::VTable0x5c()
 // FUNCTION: LEGO1 0x10001200
 Score::~Score()
 {
-	if (InputManager()->GetWorld() == this)
+	if (InputManager()->GetWorld() == this) {
 		InputManager()->ClearWorld();
+	}
 	InputManager()->UnRegister(this);
 	ControlManager()->Unregister(this);
 	NotificationManager()->Unregister(this);
@@ -87,8 +88,9 @@ MxLong Score::Notify(MxParam& p_param)
 			ret = FUN_10001510((MxEndActionNotificationParam&) p_param);
 			break;
 		case c_notificationKeyPress:
-			if (((LegoEventNotificationParam&) p_param).GetKey() == 0x20)
+			if (((LegoEventNotificationParam&) p_param).GetKey() == 0x20) {
 				DeleteScript(); // Shutting down
+			}
 			ret = 1;
 			break;
 		case c_notificationClick:
@@ -96,8 +98,9 @@ MxLong Score::Notify(MxParam& p_param)
 			break;
 		case c_notificationTransitioned:
 			DeleteObjects(g_infoscorScript, 7, 9);
-			if (m_unk0xf8)
+			if (m_unk0xf8) {
 				GameState()->SwitchArea(m_unk0xf8);
+			}
 			ret = 1;
 			break;
 		default:
@@ -145,8 +148,9 @@ void Score::ReadyWorld()
 		action.SetAtomId(*g_infoscorScript);
 		Start(&action);
 	}
-	else
+	else {
 		PlayMusic(JukeBox::e_informationCenter);
+	}
 
 	FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
 }
@@ -221,8 +225,9 @@ void Score::VTable0x68(MxBool p_add)
 		InputManager()->SetWorld(this);
 		SetIsWorldActive(FALSE);
 	}
-	else if (InputManager()->GetWorld() == this)
+	else if (InputManager()->GetWorld() == this) {
 		InputManager()->ClearWorld();
+	}
 }
 
 // FUNCTION: LEGO1 0x100019d0
@@ -249,25 +254,30 @@ void Score::Paint()
 			for (MxU8 id = 1; id <= 5; id++) {
 				m_surface = (MxU8*) desc.lpSurface;
 				MxU16 color = 0;
-				if (l70)
+				if (l70) {
 					color = l70->GetColor(id);
+				}
 				MxU32 row = id - 1;
 				FillArea(0, row, color);
 				color = 0;
-				if (l78)
+				if (l78) {
 					color = l78->GetColor(id);
+				}
 				FillArea(1, row, color);
 				color = 0;
-				if (l74)
+				if (l74) {
 					color = l74->GetColor(id);
+				}
 				FillArea(2, row, color);
 				color = 0;
-				if (lesi)
+				if (lesi) {
 					color = lesi->GetColor(id);
+				}
 				FillArea(3, row, color);
 				color = 0;
-				if (lebp)
+				if (lebp) {
 					color = lebp->GetColor(id);
+				}
 				FillArea(4, row, color);
 			}
 
diff --git a/LEGO1/lego/legoomni/src/input/legoinputmanager.cpp b/LEGO1/lego/legoomni/src/input/legoinputmanager.cpp
index 783bbfe3..45801476 100644
--- a/LEGO1/lego/legoomni/src/input/legoinputmanager.cpp
+++ b/LEGO1/lego/legoomni/src/input/legoinputmanager.cpp
@@ -64,11 +64,13 @@ MxResult LegoInputManager::Create(HWND p_hwnd)
 
 	m_controlManager = new LegoControlManager;
 
-	if (!m_keyboardNotifyList)
+	if (!m_keyboardNotifyList) {
 		m_keyboardNotifyList = new LegoNotifyList;
+	}
 
-	if (!m_eventQueue)
+	if (!m_eventQueue) {
 		m_eventQueue = new LegoEventQueue;
+	}
 
 	CreateAndAcquireKeyboard(p_hwnd);
 	GetJoystickId();
@@ -86,16 +88,19 @@ void LegoInputManager::Destroy()
 {
 	ReleaseDX();
 
-	if (m_keyboardNotifyList)
+	if (m_keyboardNotifyList) {
 		delete m_keyboardNotifyList;
+	}
 	m_keyboardNotifyList = NULL;
 
-	if (m_eventQueue)
+	if (m_eventQueue) {
 		delete m_eventQueue;
+	}
 	m_eventQueue = NULL;
 
-	if (m_controlManager)
+	if (m_controlManager) {
 		delete m_controlManager;
+	}
 }
 
 // FUNCTION: LEGO1 0x1005c030
@@ -183,8 +188,9 @@ MxResult LegoInputManager::GetJoystickState(
 		if ((capabilities & JOYCAPS_HASPOV) != 0) {
 			joyinfoex.dwFlags = JOY_RETURNX | JOY_RETURNY | JOY_RETURNPOV | JOY_RETURNBUTTONS;
 
-			if ((capabilities & JOYCAPS_POVCTS) != 0)
+			if ((capabilities & JOYCAPS_POVCTS) != 0) {
 				joyinfoex.dwFlags = JOY_RETURNX | JOY_RETURNY | JOY_RETURNPOV | JOY_RETURNBUTTONS | JOY_RETURNPOVCTS;
+			}
 		}
 
 		MMRESULT mmresult = joyGetPosEx(m_joyid, &joyinfoex);
@@ -220,8 +226,9 @@ void LegoInputManager::Register(MxCore* p_notify)
 	MxAutoLocker lock(&m_criticalSection);
 
 	LegoNotifyListCursor cursor(m_keyboardNotifyList);
-	if (!cursor.Find(p_notify))
+	if (!cursor.Find(p_notify)) {
 		m_keyboardNotifyList->Append(p_notify);
+	}
 }
 
 // FUNCTION: LEGO1 0x1005c5c0
@@ -230,8 +237,9 @@ void LegoInputManager::UnRegister(MxCore* p_notify)
 	MxAutoLocker lock(&m_criticalSection);
 
 	LegoNotifyListCursor cursor(m_keyboardNotifyList);
-	if (cursor.Find(p_notify))
+	if (cursor.Find(p_notify)) {
 		cursor.Detach();
+	}
 }
 
 // FUNCTION: LEGO1 0x1005c700
@@ -276,8 +284,9 @@ void LegoInputManager::ProcessEvents()
 
 	LegoEventNotificationParam event;
 	while (m_eventQueue->Dequeue(event)) {
-		if (ProcessOneEvent(event))
+		if (ProcessOneEvent(event)) {
 			break;
+		}
 	}
 }
 
@@ -379,8 +388,9 @@ MxBool LegoInputManager::ProcessOneEvent(LegoEventNotificationParam& p_param)
 					p_param.SetROI(roi);
 
 					if (roi && roi->GetUnk0x0c() == 1) {
-						for (OrientableROI* oroi = roi->GetUnknown0xd4(); oroi; oroi = oroi->GetUnknown0xd4())
+						for (OrientableROI* oroi = roi->GetUnknown0xd4(); oroi; oroi = oroi->GetUnknown0xd4()) {
 							roi = (LegoROI*) oroi;
+						}
 
 						LegoEntity* entity = roi->GetUnknown0x104();
 						if (entity && entity->Notify(p_param) != 0) {
@@ -415,8 +425,9 @@ void LegoInputManager::StartAutoDragTimer()
 // FUNCTION: LEGO1 0x1005cfd0
 void LegoInputManager::StopAutoDragTimer()
 {
-	if (m_autoDragTimerID)
+	if (m_autoDragTimerID) {
 		::KillTimer(LegoOmni::GetInstance()->GetWindowHandle(), m_autoDragTimerID);
+	}
 }
 
 // FUNCTION: LEGO1 0x1005cff0
diff --git a/LEGO1/lego/legoomni/src/isle/islepathactor.cpp b/LEGO1/lego/legoomni/src/isle/islepathactor.cpp
index b93535f6..55ef5b71 100644
--- a/LEGO1/lego/legoomni/src/isle/islepathactor.cpp
+++ b/LEGO1/lego/legoomni/src/isle/islepathactor.cpp
@@ -20,8 +20,9 @@ MxResult IslePathActor::Create(MxDSAction& p_dsAction)
 // FUNCTION: LEGO1 0x1001a2a0
 void IslePathActor::Destroy(MxBool p_fromDestructor)
 {
-	if (!p_fromDestructor)
+	if (!p_fromDestructor) {
 		LegoPathActor::Destroy(FALSE);
+	}
 }
 
 // STUB: LEGO1 0x1001a2c0
diff --git a/LEGO1/lego/legoomni/src/isle/radio.cpp b/LEGO1/lego/legoomni/src/isle/radio.cpp
index 2f18ae59..86561c16 100644
--- a/LEGO1/lego/legoomni/src/isle/radio.cpp
+++ b/LEGO1/lego/legoomni/src/isle/radio.cpp
@@ -79,8 +79,9 @@ void Radio::Stop()
 
 		MxControlPresenter* presenter = (MxControlPresenter*) world->Find(world->GetAtom(), 18);
 
-		if (presenter)
+		if (presenter) {
 			presenter->VTable0x6c(0);
+		}
 
 		BackgroundAudioManager()->Stop();
 		BackgroundAudioManager()->Enable(m_bgAudioPreviouslyEnabled);
diff --git a/LEGO1/lego/legoomni/src/isle/radiostate.cpp b/LEGO1/lego/legoomni/src/isle/radiostate.cpp
index cb692fcf..74094c2c 100644
--- a/LEGO1/lego/legoomni/src/isle/radiostate.cpp
+++ b/LEGO1/lego/legoomni/src/isle/radiostate.cpp
@@ -106,9 +106,11 @@ MxU32 RadioState::FUN_1002d090()
 MxBool RadioState::FUN_1002d0c0(const MxAtomId& p_atom, MxU32 p_objectId)
 {
 	if (*g_jukeboxScript == p_atom) {
-		for (MxS16 i = 0; i < 3; i++)
-			if (m_unk0x08[i].FUN_10014de0(p_objectId))
+		for (MxS16 i = 0; i < 3; i++) {
+			if (m_unk0x08[i].FUN_10014de0(p_objectId)) {
 				return TRUE;
+			}
+		}
 	}
 
 	return FALSE;
diff --git a/LEGO1/lego/legoomni/src/main/legoomni.cpp b/LEGO1/lego/legoomni/src/main/legoomni.cpp
index 743489a0..153d5522 100644
--- a/LEGO1/lego/legoomni/src/main/legoomni.cpp
+++ b/LEGO1/lego/legoomni/src/main/legoomni.cpp
@@ -257,8 +257,9 @@ void PlayMusic(MxU32 p_index)
 // FUNCTION: LEGO1 0x100159c0
 void SetIsWorldActive(MxBool p_isWorldActive)
 {
-	if (!p_isWorldActive)
+	if (!p_isWorldActive) {
 		LegoOmni::GetInstance()->GetInputManager()->SetCamera(NULL);
+	}
 	g_isWorldActive = p_isWorldActive;
 }
 
@@ -523,17 +524,20 @@ MxResult LegoOmni::Create(MxOmniCreateParam& p_param)
 	p_param.CreateFlags().CreateSoundManager(FALSE);
 	p_param.CreateFlags().CreateTickleManager(FALSE);
 
-	if (!(m_tickleManager = new MxTickleManager()))
+	if (!(m_tickleManager = new MxTickleManager())) {
 		return FAILURE;
+	}
 
-	if (MxOmni::Create(p_param) != SUCCESS)
+	if (MxOmni::Create(p_param) != SUCCESS) {
 		return FAILURE;
+	}
 
 	m_objectFactory = new LegoObjectFactory();
-	if (m_objectFactory == NULL)
+	if (m_objectFactory == NULL) {
 		return FAILURE;
+	}
 
-	if (m_soundManager = new LegoSoundManager()) {
+	if ((m_soundManager = new LegoSoundManager())) {
 		if (m_soundManager->Create(10, 0) != SUCCESS) {
 			delete m_soundManager;
 			m_soundManager = NULL;
@@ -541,14 +545,14 @@ MxResult LegoOmni::Create(MxOmniCreateParam& p_param)
 		}
 	}
 
-	if (m_videoManager = new LegoVideoManager()) {
+	if ((m_videoManager = new LegoVideoManager())) {
 		if (m_videoManager->Create(p_param.GetVideoParam(), 100, 0) != SUCCESS) {
 			delete m_videoManager;
 			m_videoManager = NULL;
 		}
 	}
 
-	if (m_inputMgr = new LegoInputManager()) {
+	if ((m_inputMgr = new LegoInputManager())) {
 		if (m_inputMgr->Create(p_param.GetWindowHandle()) != SUCCESS) {
 			delete m_inputMgr;
 			m_inputMgr = NULL;
@@ -657,8 +661,9 @@ LegoWorld* LegoOmni::FindWorld(const MxAtomId& p_atom, MxS32 p_entityid)
 
 		while (cursor.Next(world)) {
 			if ((p_entityid == -1 || world->GetEntityId() == p_entityid) &&
-				(!p_atom.GetInternal() || world->GetAtom() == p_atom))
+				(!p_atom.GetInternal() || world->GetAtom() == p_atom)) {
 				return world;
+			}
 		}
 	}
 
@@ -716,8 +721,9 @@ MxEntity* LegoOmni::AddToWorld(const char* p_id, MxS32 p_entityId, MxPresenter*
 // FUNCTION: LEGO1 0x1005b3a0
 void LegoOmni::NotifyCurrentEntity(MxNotificationParam* p_param)
 {
-	if (m_currentWorld)
+	if (m_currentWorld) {
 		NotificationManager()->Send(m_currentWorld, p_param);
+	}
 }
 
 // FUNCTION: LEGO1 0x1005b3c0
@@ -767,8 +773,9 @@ void LegoOmni::FUN_1005b4f0(MxBool p_disable, MxU16 p_flags)
 // FUNCTION: LEGO1 0x1005b560
 void LegoOmni::CreateBackgroundAudio()
 {
-	if (m_bkgAudioManager)
+	if (m_bkgAudioManager) {
 		m_bkgAudioManager->Create(*g_jukeboxScript, 100);
+	}
 }
 
 // FUNCTION: LEGO1 0x1005b580
diff --git a/LEGO1/lego/legoomni/src/paths/legopathpresenter.cpp b/LEGO1/lego/legoomni/src/paths/legopathpresenter.cpp
index 48d592a3..f0ff859f 100644
--- a/LEGO1/lego/legoomni/src/paths/legopathpresenter.cpp
+++ b/LEGO1/lego/legoomni/src/paths/legopathpresenter.cpp
@@ -39,16 +39,18 @@ MxResult LegoPathPresenter::AddToManager()
 // FUNCTION: LEGO1 0x10044b70
 void LegoPathPresenter::Destroy(MxBool p_fromDestructor)
 {
-	if (VideoManager())
+	if (VideoManager()) {
 		VideoManager()->UnregisterPresenter(*this);
+	}
 
 	{
 		MxAutoLocker lock(&this->m_criticalSection);
 		Init();
 	}
 
-	if (!p_fromDestructor)
+	if (!p_fromDestructor) {
 		MxMediaPresenter::Destroy(FALSE);
+	}
 }
 
 // FUNCTION: LEGO1 0x10044c10
@@ -81,8 +83,9 @@ void LegoPathPresenter::StreamingTickle()
 // FUNCTION: LEGO1 0x10044d40
 void LegoPathPresenter::RepeatingTickle()
 {
-	if (this->m_action->GetDuration() == -1)
+	if (this->m_action->GetDuration() == -1) {
 		return;
+	}
 
 	EndAction();
 }
diff --git a/LEGO1/lego/legoomni/src/pizzeria/pizzamissionstate.cpp b/LEGO1/lego/legoomni/src/pizzeria/pizzamissionstate.cpp
index 6d1cac49..c1804a4f 100644
--- a/LEGO1/lego/legoomni/src/pizzeria/pizzamissionstate.cpp
+++ b/LEGO1/lego/legoomni/src/pizzeria/pizzamissionstate.cpp
@@ -13,8 +13,10 @@ MxResult PizzaMissionState::VTable0x1c(LegoFile* p_legoFile)
 // FUNCTION: LEGO1 0x10039510
 PizzaMissionStateEntry* PizzaMissionState::GetState(MxU8 p_id)
 {
-	for (MxS16 i = 0; i < 5; i++)
-		if (m_state[i].m_id == p_id)
+	for (MxS16 i = 0; i < 5; i++) {
+		if (m_state[i].m_id == p_id) {
 			return m_state + i;
+		}
+	}
 	return NULL;
 }
diff --git a/LEGO1/lego/legoomni/src/race/racestate.cpp b/LEGO1/lego/legoomni/src/race/racestate.cpp
index db6d96dc..39e6c51c 100644
--- a/LEGO1/lego/legoomni/src/race/racestate.cpp
+++ b/LEGO1/lego/legoomni/src/race/racestate.cpp
@@ -22,9 +22,11 @@ MxResult RaceState::VTable0x1c(LegoFile* p_legoFile)
 RaceStateEntry* RaceState::GetState(MxU8 p_id)
 {
 	for (MxS16 i = 0;; i++) {
-		if (i >= 5)
+		if (i >= 5) {
 			return NULL;
-		if (m_state[i].m_id == p_id)
+		}
+		if (m_state[i].m_id == p_id) {
 			return m_state + i;
+		}
 	}
 }
diff --git a/LEGO1/lego/legoomni/src/video/legohideanimpresenter.cpp b/LEGO1/lego/legoomni/src/video/legohideanimpresenter.cpp
index 07035332..81a854f8 100644
--- a/LEGO1/lego/legoomni/src/video/legohideanimpresenter.cpp
+++ b/LEGO1/lego/legoomni/src/video/legohideanimpresenter.cpp
@@ -25,15 +25,17 @@ void LegoHideAnimPresenter::Destroy(MxBool p_fromDestructor)
 {
 	m_criticalSection.Enter();
 
-	if (m_unk0xc0)
+	if (m_unk0xc0) {
 		delete m_unk0xc0;
+	}
 	Init();
 
 	m_criticalSection.Leave();
 
 	// This appears to be a bug, since it results in an endless loop
-	if (!p_fromDestructor)
+	if (!p_fromDestructor) {
 		LegoHideAnimPresenter::Destroy();
+	}
 }
 
 // STUB: LEGO1 0x1006dab0
diff --git a/LEGO1/lego/legoomni/src/video/legovideomanager.cpp b/LEGO1/lego/legoomni/src/video/legovideomanager.cpp
index cbb68b79..e80b7eed 100644
--- a/LEGO1/lego/legoomni/src/video/legovideomanager.cpp
+++ b/LEGO1/lego/legoomni/src/video/legovideomanager.cpp
@@ -50,8 +50,9 @@ LegoVideoManager::~LegoVideoManager()
 // FUNCTION: LEGO1 0x1007abb0
 MxResult LegoVideoManager::CreateDirect3D()
 {
-	if (!m_direct3d)
+	if (!m_direct3d) {
 		m_direct3d = new MxDirect3D;
+	}
 
 	return m_direct3d ? SUCCESS : FAILURE;
 }
@@ -77,25 +78,29 @@ MxResult LegoVideoManager::Create(MxVideoParam& p_videoParam, MxU32 p_frequencyM
 		MxPalette* palette = new MxPalette;
 		p_videoParam.SetPalette(palette);
 
-		if (!palette)
+		if (!palette) {
 			goto done;
+		}
 		paletteCreated = TRUE;
 	}
 
 	PALETTEENTRY paletteEntries[256];
 	p_videoParam.GetPalette()->GetEntries(paletteEntries);
 
-	if (CreateDirect3D() != SUCCESS)
+	if (CreateDirect3D() != SUCCESS) {
 		goto done;
+	}
 
-	if (deviceEnumerate.DoEnumerate() != SUCCESS)
+	if (deviceEnumerate.DoEnumerate() != SUCCESS) {
 		goto done;
+	}
 
 	if (p_videoParam.GetDeviceName()) {
 		deviceNum = deviceEnumerate.ParseDeviceName(p_videoParam.GetDeviceName());
 		if (deviceNum >= 0) {
-			if ((deviceNum = deviceEnumerate.GetDevice(deviceNum, driver, device)) != SUCCESS)
+			if ((deviceNum = deviceEnumerate.GetDevice(deviceNum, driver, device)) != SUCCESS) {
 				deviceNum = -1;
+			}
 		}
 	}
 
@@ -107,10 +112,12 @@ MxResult LegoVideoManager::Create(MxVideoParam& p_videoParam, MxU32 p_frequencyM
 
 	m_direct3d->SetDevice(deviceEnumerate, driver, device);
 
-	if (!driver->m_ddCaps.dwCaps2 && driver->m_ddCaps.dwSVBRops[7] != 2)
+	if (!driver->m_ddCaps.dwCaps2 && driver->m_ddCaps.dwSVBRops[7] != 2) {
 		p_videoParam.Flags().SetF2bit0(TRUE);
-	else
+	}
+	else {
 		p_videoParam.Flags().SetF2bit0(FALSE);
+	}
 
 	ViewROI::SetUnk101013d8(p_videoParam.Flags().GetF2bit0() == FALSE);
 
@@ -124,8 +131,9 @@ MxResult LegoVideoManager::Create(MxVideoParam& p_videoParam, MxU32 p_frequencyM
 			bits,
 			paletteEntries,
 			sizeof(paletteEntries) / sizeof(paletteEntries[0])
-		))
+		)) {
 		goto done;
+	}
 
 	if (MxVideoManager::VTable0x28(
 			p_videoParam,
@@ -136,18 +144,21 @@ MxResult LegoVideoManager::Create(MxVideoParam& p_videoParam, MxU32 p_frequencyM
 			m_direct3d->GetClipper(),
 			p_frequencyMS,
 			p_createThread
-		) != SUCCESS)
+		) != SUCCESS) {
 		goto done;
+	}
 
 	m_renderer = Tgl::CreateRenderer();
 
-	if (!m_renderer)
+	if (!m_renderer) {
 		goto done;
+	}
 
 	m_3dManager = new Lego3DManager;
 
-	if (!m_3dManager)
+	if (!m_3dManager) {
 		goto done;
+	}
 
 	Lego3DManager::CreateStruct createStruct;
 	memset(&createStruct, 0, sizeof(createStruct));
@@ -161,13 +172,15 @@ MxResult LegoVideoManager::Create(MxVideoParam& p_videoParam, MxU32 p_frequencyM
 	createStruct.m_direct3d = m_direct3d->GetDirect3D();
 	createStruct.m_d3dDevice = m_direct3d->GetDirect3DDevice();
 
-	if (!m_3dManager->Create(createStruct))
+	if (!m_3dManager->Create(createStruct)) {
 		goto done;
+	}
 
 	ViewLODList* pLODList;
 
-	if (ConfigureD3DRM() != SUCCESS)
+	if (ConfigureD3DRM() != SUCCESS) {
 		goto done;
+	}
 
 	pLODList = m_3dManager->GetViewLODListManager()->Create("CameraROI", 1);
 	m_viewROI = new LegoROI(m_renderer, pLODList, Timer()->GetTime());
@@ -219,19 +232,22 @@ void LegoVideoManager::MoveCursor(MxS32 p_cursorX, MxS32 p_cursorY)
 	m_cursorY = p_cursorY;
 	m_drawCursor = TRUE;
 
-	if (623 < p_cursorX)
+	if (623 < p_cursorX) {
 		m_cursorX = 623;
+	}
 
-	if (463 < p_cursorY)
+	if (463 < p_cursorY) {
 		m_cursorY = 463;
+	}
 }
 
 // FUNCTION: LEGO1 0x1007b770
 MxResult LegoVideoManager::Tickle()
 {
 	if (m_unk0x554 && !m_videoParam.Flags().GetFlipSurfaces() &&
-		TransitionManager()->GetTransitionType() == MxTransitionManager::e_notTransitioning)
+		TransitionManager()->GetTransitionType() == MxTransitionManager::e_notTransitioning) {
 		Sleep(30);
+	}
 
 	m_stopWatch->Stop();
 	m_elapsedSeconds = m_stopWatch->ElapsedSeconds();
@@ -245,11 +261,13 @@ MxResult LegoVideoManager::Tickle()
 	MxPresenter* presenter;
 	MxPresenterListCursor cursor(m_presenters);
 
-	while (cursor.Next(presenter))
+	while (cursor.Next(presenter)) {
 		presenter->Tickle();
+	}
 
-	if (m_render3d && !m_paused)
+	if (m_render3d && !m_paused) {
 		m_3dManager->GetLego3DView()->GetView()->Clear();
+	}
 
 	MxRect32 rect(0, 0, m_videoParam.GetRect().GetWidth() - 1, m_videoParam.GetRect().GetHeight() - 1);
 	InvalidateRect(rect);
@@ -257,8 +275,9 @@ MxResult LegoVideoManager::Tickle()
 	if (!m_paused && (m_render3d || m_unk0xe5)) {
 		cursor.Reset();
 
-		while (cursor.Next(presenter) && presenter->GetDisplayZ() >= 0)
+		while (cursor.Next(presenter) && presenter->GetDisplayZ() >= 0) {
 			presenter->PutData();
+		}
 
 		if (!m_unk0xe5) {
 			m_3dManager->Render(0.0);
@@ -267,21 +286,25 @@ MxResult LegoVideoManager::Tickle()
 
 		cursor.Prev();
 
-		while (cursor.Next(presenter))
+		while (cursor.Next(presenter)) {
 			presenter->PutData();
+		}
 
-		if (m_drawCursor)
+		if (m_drawCursor) {
 			DrawCursor();
+		}
 
-		if (m_drawFPS)
+		if (m_drawFPS) {
 			DrawFPS();
+		}
 	}
 	else if (m_fullScreenMovie) {
 		MxPresenter* presenter;
 		MxPresenterListCursor cursor(m_presenters);
 
-		if (cursor.Last(presenter))
+		if (cursor.Last(presenter)) {
 			presenter->PutData();
+		}
 	}
 
 	if (!m_paused) {
@@ -316,8 +339,9 @@ inline void LegoVideoManager::DrawCursor()
 		m_cursorRect.right = 16;
 		m_cursorSurface = MxDisplaySurface::CreateCursorSurface();
 
-		if (!m_cursorSurface)
+		if (!m_cursorSurface) {
 			m_drawCursor = FALSE;
+		}
 	}
 
 	ddSurface2
@@ -467,19 +491,22 @@ MxResult LegoVideoManager::ConfigureD3DRM()
 	IDirect3DRMDevice2* d3drm =
 		((TglImpl::DeviceImpl*) m_3dManager->GetLego3DView()->GetDevice())->ImplementationData();
 
-	if (!d3drm)
+	if (!d3drm) {
 		return FAILURE;
+	}
 
 	MxAssignedDevice* assignedDevice = m_direct3d->GetAssignedDevice();
 
 	if (assignedDevice && assignedDevice->GetFlags() & MxAssignedDevice::c_hardwareMode) {
-		if (assignedDevice->GetDesc().dpcTriCaps.dwTextureFilterCaps & D3DPTFILTERCAPS_LINEAR)
+		if (assignedDevice->GetDesc().dpcTriCaps.dwTextureFilterCaps & D3DPTFILTERCAPS_LINEAR) {
 			d3drm->SetTextureQuality(D3DRMTEXTURE_LINEAR);
+		}
 
 		d3drm->SetDither(TRUE);
 
-		if (assignedDevice->GetDesc().dpcTriCaps.dwShadeCaps & D3DPSHADECAPS_ALPHAFLATBLEND)
+		if (assignedDevice->GetDesc().dpcTriCaps.dwShadeCaps & D3DPSHADECAPS_ALPHAFLATBLEND) {
 			d3drm->SetRenderMode(D3DRMRENDERMODE_BLENDEDTRANSPARENCY);
+		}
 	}
 
 	return SUCCESS;
diff --git a/LEGO1/lego/legoomni/src/video/mxtransitionmanager.cpp b/LEGO1/lego/legoomni/src/video/mxtransitionmanager.cpp
index d0b3aa96..56fc3c9a 100644
--- a/LEGO1/lego/legoomni/src/video/mxtransitionmanager.cpp
+++ b/LEGO1/lego/legoomni/src/video/mxtransitionmanager.cpp
@@ -209,11 +209,13 @@ void MxTransitionManager::TransitionDissolve()
 
 		for (MxS32 col = 0; col < 640; col++) {
 			// Select 16 columns on each tick
-			if (m_animationTimer * 16 > m_columnOrder[col])
+			if (m_animationTimer * 16 > m_columnOrder[col]) {
 				continue;
+			}
 
-			if (m_animationTimer * 16 + 15 < m_columnOrder[col])
+			if (m_animationTimer * 16 + 15 < m_columnOrder[col]) {
 				continue;
+			}
 
 			for (MxS32 row = 0; row < 480; row++) {
 				// Shift the chosen column a different amount at each scanline.
@@ -291,11 +293,13 @@ void MxTransitionManager::TransitionPixelation()
 
 		for (MxS32 col = 0; col < 64; col++) {
 			// Select 4 columns on each tick
-			if (m_animationTimer * 4 > m_columnOrder[col])
+			if (m_animationTimer * 4 > m_columnOrder[col]) {
 				continue;
+			}
 
-			if (m_animationTimer * 4 + 3 < m_columnOrder[col])
+			if (m_animationTimer * 4 + 3 < m_columnOrder[col]) {
 				continue;
+			}
 
 			for (MxS32 row = 0; row < 48; row++) {
 				// To do the pixelation, we subdivide the 640x480 surface into
@@ -549,8 +553,9 @@ void MxTransitionManager::SetupCopyRect(LPDDSURFACEDESC p_ddsc)
 			(const MxU8*) p_ddsc->lpSurface + m_copyRect.top * p_ddsc->lPitch + bytesPerPixel * m_copyRect.left;
 
 		m_copyBuffer = new MxU8[bytesPerPixel * width * height];
-		if (!m_copyBuffer)
+		if (!m_copyBuffer) {
 			return;
+		}
 
 		// Copy into the copy buffer
 		MxU8* dst = m_copyBuffer;
diff --git a/LEGO1/lego/sources/3dmanager/lego3dview.cpp b/LEGO1/lego/sources/3dmanager/lego3dview.cpp
index cfa274f6..34f699d8 100644
--- a/LEGO1/lego/sources/3dmanager/lego3dview.cpp
+++ b/LEGO1/lego/sources/3dmanager/lego3dview.cpp
@@ -29,8 +29,9 @@ Lego3DView::~Lego3DView()
 BOOL Lego3DView::Create(const TglSurface::CreateStruct& rCreateStruct, Tgl::Renderer* pRenderer)
 {
 	double viewAngle = 45;
-	if (rCreateStruct.m_isWideViewAngle)
+	if (rCreateStruct.m_isWideViewAngle) {
 		viewAngle = 90;
+	}
 
 	float frontClippingDistance = 0.1;
 	float backClippingDistance = 500;
diff --git a/LEGO1/lego/sources/3dmanager/lego3dview.h b/LEGO1/lego/sources/3dmanager/lego3dview.h
index 7e68bdcb..cbbde4a8 100644
--- a/LEGO1/lego/sources/3dmanager/lego3dview.h
+++ b/LEGO1/lego/sources/3dmanager/lego3dview.h
@@ -13,10 +13,10 @@
 class Lego3DView : public LegoView1 {
 public:
 	Lego3DView();
-	virtual ~Lego3DView() override;
+	~Lego3DView() override;
 
 	BOOL Create(const CreateStruct&, Tgl::Renderer*);
-	virtual void Destroy() override; // vtable+0x08
+	void Destroy() override; // vtable+0x08
 
 	BOOL Add(ViewROI&);
 	BOOL Remove(ViewROI&);
diff --git a/LEGO1/lego/sources/3dmanager/legoview1.cpp b/LEGO1/lego/sources/3dmanager/legoview1.cpp
index 97114469..28ffb911 100644
--- a/LEGO1/lego/sources/3dmanager/legoview1.cpp
+++ b/LEGO1/lego/sources/3dmanager/legoview1.cpp
@@ -42,8 +42,9 @@ LegoView::~LegoView()
 BOOL LegoView::Create(const TglSurface::CreateStruct& rCreateStruct, Tgl::Renderer* pRenderer)
 {
 	float viewAngle = 45;
-	if (rCreateStruct.m_isWideViewAngle)
+	if (rCreateStruct.m_isWideViewAngle) {
 		viewAngle = 90;
+	}
 
 	float frontClippingDistance = 0.1;
 	float backClippingDistance = 500;
diff --git a/LEGO1/lego/sources/3dmanager/legoview1.h b/LEGO1/lego/sources/3dmanager/legoview1.h
index 4060e54f..34b8f026 100644
--- a/LEGO1/lego/sources/3dmanager/legoview1.h
+++ b/LEGO1/lego/sources/3dmanager/legoview1.h
@@ -18,16 +18,16 @@ class Camera;
 class LegoView : public TglSurface {
 public:
 	LegoView();
-	virtual ~LegoView() override;
+	~LegoView() override;
 
 	BOOL Create(const CreateStruct&, Tgl::Renderer*);
-	virtual void Destroy() override; // vtable+0x08
+	void Destroy() override; // vtable+0x08
 
 	Tgl::Group* GetScene() const;
 	Tgl::Camera* GetCamera() const;
 
 protected:
-	virtual Tgl::View* CreateView(Tgl::Renderer*, Tgl::Device*); // vtable+0x10
+	Tgl::View* CreateView(Tgl::Renderer*, Tgl::Device*) override; // vtable+0x10
 
 private:
 	Tgl::Group* m_pScene;   // 0x70
@@ -58,11 +58,11 @@ inline Tgl::Camera* LegoView::GetCamera() const
 class LegoView1 : public LegoView {
 public:
 	LegoView1();
-	virtual ~LegoView1() override;
+	~LegoView1() override;
 
 	BOOL AddLightsToViewport();
 	BOOL Create(const TglSurface::CreateStruct&, Tgl::Renderer*);
-	virtual void Destroy() override; // vtable+0x08
+	void Destroy() override; // vtable+0x08
 
 private:
 	Tgl::Light* m_pSunLight;         // 0x78
diff --git a/LEGO1/lego/sources/misc/legostorage.cpp b/LEGO1/lego/sources/misc/legostorage.cpp
index d8749dc1..8fa71553 100644
--- a/LEGO1/lego/sources/misc/legostorage.cpp
+++ b/LEGO1/lego/sources/misc/legostorage.cpp
@@ -109,14 +109,17 @@ LegoResult LegoFile::Open(const char* p_name, LegoU32 p_mode)
 		strcat(mode, "r");
 	}
 	if (p_mode & c_write) {
-		if (m_mode != c_read)
+		if (m_mode != c_read) {
 			m_mode = c_write;
+		}
 		strcat(mode, "w");
 	}
-	if ((p_mode & c_text) != 0)
+	if ((p_mode & c_text) != 0) {
 		strcat(mode, "t");
-	else
+	}
+	else {
 		strcat(mode, "b");
+	}
 
 	if (!(m_file = fopen(p_name, mode))) {
 		return FAILURE;
diff --git a/LEGO1/lego/sources/misc/legostorage.h b/LEGO1/lego/sources/misc/legostorage.h
index 5bd6ea67..97dcc538 100644
--- a/LEGO1/lego/sources/misc/legostorage.h
+++ b/LEGO1/lego/sources/misc/legostorage.h
@@ -44,10 +44,10 @@ class LegoStorage {
 class LegoMemory : public LegoStorage {
 public:
 	LegoMemory(void* p_buffer);
-	virtual LegoResult Read(void* p_buffer, LegoU32 p_size);
-	virtual LegoResult Write(const void* p_buffer, LegoU32 p_size);
-	virtual LegoResult GetPosition(LegoU32& p_position);
-	virtual LegoResult SetPosition(LegoU32 p_position);
+	LegoResult Read(void* p_buffer, LegoU32 p_size) override;
+	LegoResult Write(const void* p_buffer, LegoU32 p_size) override;
+	LegoResult GetPosition(LegoU32& p_position) override;
+	LegoResult SetPosition(LegoU32 p_position) override;
 
 	// SYNTHETIC: LEGO1 0x10045a80
 	// LegoMemory::~LegoMemory
@@ -65,11 +65,11 @@ class LegoMemory : public LegoStorage {
 class LegoFile : public LegoStorage {
 public:
 	LegoFile();
-	virtual ~LegoFile() override;
-	virtual LegoResult Read(void* p_buffer, LegoU32 p_size);
-	virtual LegoResult Write(const void* p_buffer, LegoU32 p_size);
-	virtual LegoResult GetPosition(LegoU32& p_position);
-	virtual LegoResult SetPosition(LegoU32 p_position);
+	~LegoFile() override;
+	LegoResult Read(void* p_buffer, LegoU32 p_size) override;
+	LegoResult Write(const void* p_buffer, LegoU32 p_size) override;
+	LegoResult GetPosition(LegoU32& p_position) override;
+	LegoResult SetPosition(LegoU32 p_position) override;
 	LegoResult Open(const char* p_name, LegoU32 p_mode);
 
 	// FUNCTION: LEGO1 0x10006030
diff --git a/LEGO1/lego/sources/roi/legoroi.cpp b/LEGO1/lego/sources/roi/legoroi.cpp
index 8dab4657..e54696a8 100644
--- a/LEGO1/lego/sources/roi/legoroi.cpp
+++ b/LEGO1/lego/sources/roi/legoroi.cpp
@@ -75,13 +75,15 @@ unsigned char LegoROI::CallTheHandlerFunction(
 )
 {
 	// TODO
-	if (p_param == NULL)
+	if (p_param == NULL) {
 		return FALSE;
+	}
 
 	if (g_someHandlerFunction) {
 		char buf[32];
-		if (g_someHandlerFunction(p_param, buf, 32))
+		if (g_someHandlerFunction(p_param, buf, 32)) {
 			p_param = buf;
+		}
 	}
 
 	return ColorAliasLookup(p_param, p_red, p_green, p_blue, p_other);
diff --git a/LEGO1/lego/sources/roi/legoroi.h b/LEGO1/lego/sources/roi/legoroi.h
index a750b949..cfaa21c0 100644
--- a/LEGO1/lego/sources/roi/legoroi.h
+++ b/LEGO1/lego/sources/roi/legoroi.h
@@ -19,9 +19,9 @@ class LegoROI : public ViewROI {
 public:
 	LegoROI(Tgl::Renderer* p_renderer, ViewLODList* p_lodList, int p_time);
 
-	virtual float IntrinsicImportance() const override; // vtable+0x04
+	float IntrinsicImportance() const override; // vtable+0x04
 	// Note: Actually part of parent class (doesn't exist yet)
-	virtual void UpdateWorldBoundingVolumes() override; // vtable+0x18
+	void UpdateWorldBoundingVolumes() override; // vtable+0x18
 
 	void SetDisplayBB(int p_displayBB);
 	static void configureLegoROI(int p_roi);
diff --git a/LEGO1/mxdirectx/mxdirect3d.cpp b/LEGO1/mxdirectx/mxdirect3d.cpp
index b2166ca1..a224158b 100644
--- a/LEGO1/mxdirectx/mxdirect3d.cpp
+++ b/LEGO1/mxdirectx/mxdirect3d.cpp
@@ -50,11 +50,13 @@ BOOL MxDirect3D::Create(
 		paletteEntryCount
 	);
 
-	if (ret && CreateIDirect3D() && D3DSetMode())
+	if (ret && CreateIDirect3D() && D3DSetMode()) {
 		success = TRUE;
+	}
 
-	if (!success)
+	if (!success) {
 		FUN_1009d920();
+	}
 
 	return success;
 }
@@ -77,8 +79,9 @@ void MxDirect3D::Destroy()
 		this->m_assignedDevice = NULL;
 	}
 
-	if (m_pCurrentDeviceModesList)
+	if (m_pCurrentDeviceModesList) {
 		m_pCurrentDeviceModesList = NULL;
+	}
 
 	MxDirectDraw::Destroy();
 }
@@ -119,24 +122,30 @@ BOOL MxDirect3D::D3DSetMode()
 			return FALSE;
 		}
 
-		if (m_assignedDevice->m_desc.dpcTriCaps.dwTextureCaps & D3DPTEXTURECAPS_PERSPECTIVE)
+		if (m_assignedDevice->m_desc.dpcTriCaps.dwTextureCaps & D3DPTEXTURECAPS_PERSPECTIVE) {
 			m_unk0x88c = FALSE;
-		else
+		}
+		else {
 			m_unk0x88c = TRUE;
+		}
 
 		DWORD bitDepth = GetZBufferBitDepth(m_assignedDevice);
-		if (!CreateZBuffer(DDSCAPS_VIDEOMEMORY, bitDepth))
+		if (!CreateZBuffer(DDSCAPS_VIDEOMEMORY, bitDepth)) {
 			return FALSE;
+		}
 	}
 	else {
-		if (m_assignedDevice->m_desc.dpcTriCaps.dwTextureCaps & D3DPTEXTURECAPS_PERSPECTIVE)
+		if (m_assignedDevice->m_desc.dpcTriCaps.dwTextureCaps & D3DPTEXTURECAPS_PERSPECTIVE) {
 			m_unk0x88c = FALSE;
-		else
+		}
+		else {
 			m_unk0x88c = TRUE;
+		}
 
 		DWORD bitDepth = GetZBufferBitDepth(m_assignedDevice);
-		if (!CreateZBuffer(DDSCAPS_SYSTEMMEMORY, bitDepth))
+		if (!CreateZBuffer(DDSCAPS_SYSTEMMEMORY, bitDepth)) {
 			return FALSE;
+		}
 	}
 
 	HRESULT result = m_pDirect3d->CreateDevice(m_assignedDevice->m_guid, m_pBackBuffer, &m_pDirect3dDevice);
@@ -201,19 +210,25 @@ DWORD MxDirect3D::GetZBufferBitDepth(MxAssignedDevice* p_assignedDevice)
 {
 	DWORD bitDepth;
 
-	if (p_assignedDevice->m_desc.dwFlags & D3DDD_DEVICEZBUFFERBITDEPTH)
+	if (p_assignedDevice->m_desc.dwFlags & D3DDD_DEVICEZBUFFERBITDEPTH) {
 		bitDepth = p_assignedDevice->m_desc.dwDeviceZBufferBitDepth;
-	else
+	}
+	else {
 		bitDepth = 0;
+	}
 
-	if (bitDepth & DDBD_32)
+	if (bitDepth & DDBD_32) {
 		return 32;
-	if (bitDepth & DDBD_24)
+	}
+	if (bitDepth & DDBD_24) {
 		return 24;
-	if (bitDepth & DDBD_16)
+	}
+	if (bitDepth & DDBD_16) {
 		return 16;
-	if (bitDepth & DDBD_8)
+	}
+	if (bitDepth & DDBD_8) {
 		return 8;
+	}
 
 	return -1;
 }
@@ -264,13 +279,15 @@ BOOL MxDirect3D::SetDevice(MxDeviceEnumerate& p_deviceEnumerate, MxDriver* p_dri
 				sizeof(assignedDevice->m_deviceInfo->m_ddcaps)
 			);
 
-			if (i == 0)
+			if (i == 0) {
 				assignedDevice->m_flags |= MxAssignedDevice::c_primaryDevice;
+			}
 
 			for (list<MxDevice>::iterator it2 = driver.m_devices.begin(); it2 != driver.m_devices.end(); it2++) {
 				MxDevice& device = *it2;
-				if (&device != p_device)
+				if (&device != p_device) {
 					continue;
+				}
 
 				memcpy(&assignedDevice->m_guid, device.m_guid, sizeof(assignedDevice->m_guid));
 
@@ -279,8 +296,9 @@ BOOL MxDirect3D::SetDevice(MxDeviceEnumerate& p_deviceEnumerate, MxDriver* p_dri
 					assignedDevice->m_flags |= MxAssignedDevice::c_hardwareMode;
 					desc = &device.m_HWDesc;
 				}
-				else
+				else {
 					desc = &device.m_HELDesc;
+				}
 
 				memcpy(&assignedDevice->m_desc, desc, sizeof(assignedDevice->m_desc));
 				m_assignedDevice = assignedDevice;
@@ -329,12 +347,15 @@ MxDriver::MxDriver(LPGUID p_guid, LPSTR p_driverDesc, LPSTR p_driverName)
 // FUNCTION: LEGO1 0x1009bb80
 MxDriver::~MxDriver()
 {
-	if (m_guid)
+	if (m_guid) {
 		delete m_guid;
-	if (m_driverDesc)
+	}
+	if (m_driverDesc) {
 		delete[] m_driverDesc;
-	if (m_driverName)
+	}
+	if (m_driverName) {
 		delete[] m_driverName;
+	}
 }
 
 // FUNCTION: LEGO1 0x1009bc30
@@ -383,12 +404,15 @@ MxDevice::MxDevice(
 // FUNCTION: LEGO1 0x1009bd60
 MxDevice::~MxDevice()
 {
-	if (m_guid)
+	if (m_guid) {
 		delete m_guid;
-	if (m_deviceDesc)
+	}
+	if (m_deviceDesc) {
 		delete[] m_deviceDesc;
-	if (m_deviceName)
+	}
+	if (m_deviceName) {
 		delete[] m_deviceName;
+	}
 }
 
 // FUNCTION: LEGO1 0x1009bda0
@@ -425,11 +449,13 @@ void MxDevice::Init(
 		strcpy(m_deviceName, p_deviceName);
 	}
 
-	if (p_HWDesc)
+	if (p_HWDesc) {
 		memcpy(&m_HWDesc, p_HWDesc, sizeof(m_HWDesc));
+	}
 
-	if (p_HELDesc)
+	if (p_HELDesc) {
 		memcpy(&m_HELDesc, p_HELDesc, sizeof(m_HELDesc));
+	}
 }
 
 // FUNCTION: LEGO1 0x1009bec0
@@ -456,25 +482,29 @@ BOOL MxDeviceEnumerate::EnumDirectDrawCallback(LPGUID p_guid, LPSTR p_driverDesc
 	MxDriver& newDevice = m_list.back();
 	HRESULT result = DirectDrawCreate(newDevice.m_guid, &lpDD, NULL);
 
-	if (result != DD_OK)
+	if (result != DD_OK) {
 		BuildErrorString("DirectDraw Create failed: %s\n", EnumerateErrorToString(result));
+	}
 	else {
 		lpDD->EnumDisplayModes(0, NULL, this, DisplayModesEnumerateCallback);
 		newDevice.m_ddCaps.dwSize = sizeof(newDevice.m_ddCaps);
 		result = lpDD->GetCaps(&newDevice.m_ddCaps, NULL);
 
-		if (result != DD_OK)
+		if (result != DD_OK) {
 			BuildErrorString("GetCaps failed: %s\n", EnumerateErrorToString(result));
+		}
 		else {
 			result = lpDD->QueryInterface(IID_IDirect3D2, (LPVOID*) &lpDirect3d2);
 
-			if (result != DD_OK)
+			if (result != DD_OK) {
 				BuildErrorString("D3D creation failed: %s\n", EnumerateErrorToString(result));
+			}
 			else {
 				result = lpDirect3d2->EnumDevices(DevicesEnumerateCallback, this);
 
-				if (result != DD_OK)
+				if (result != DD_OK) {
 					BuildErrorString("D3D enum devices failed: %s\n", EnumerateErrorToString(result));
+				}
 				else {
 					if (newDevice.m_devices.empty()) {
 						m_list.pop_back();
@@ -484,11 +514,13 @@ BOOL MxDeviceEnumerate::EnumDirectDrawCallback(LPGUID p_guid, LPSTR p_driverDesc
 		}
 	}
 
-	if (lpDirect3d2)
+	if (lpDirect3d2) {
 		lpDirect3d2->Release();
+	}
 
-	if (lpDD)
+	if (lpDD) {
 		lpDD->Release();
+	}
 
 	return DDENUMRET_OK;
 }
@@ -557,8 +589,9 @@ HRESULT MxDeviceEnumerate::EnumDevicesCallback(
 // FUNCTION: LEGO1 0x1009c6c0
 int MxDeviceEnumerate::DoEnumerate()
 {
-	if (m_initialized)
+	if (m_initialized) {
 		return -1;
+	}
 
 	HRESULT ret = DirectDrawEnumerate(DirectDrawEnumerateCallback, this);
 	if (ret != DD_OK) {
@@ -590,33 +623,38 @@ const char* MxDeviceEnumerate::EnumerateErrorToString(HRESULT p_error)
 // FUNCTION: LEGO1 0x1009ce60
 int MxDeviceEnumerate::ParseDeviceName(const char* p_deviceId)
 {
-	if (!m_initialized)
+	if (!m_initialized) {
 		return -1;
+	}
 
 	int num = -1;
 	int hex[4];
 
-	if (sscanf(p_deviceId, "%d 0x%x 0x%x 0x%x 0x%x", &num, &hex[0], &hex[1], &hex[2], &hex[3]) != 5)
+	if (sscanf(p_deviceId, "%d 0x%x 0x%x 0x%x 0x%x", &num, &hex[0], &hex[1], &hex[2], &hex[3]) != 5) {
 		return -1;
+	}
 
-	if (num < 0)
+	if (num < 0) {
 		return -1;
+	}
 
 	GUID guid;
 	memcpy(&guid, hex, sizeof(guid));
 
 	int result = ProcessDeviceBytes(num, guid);
 
-	if (result < 0)
+	if (result < 0) {
 		return ProcessDeviceBytes(-1, guid);
+	}
 	return result;
 }
 
 // FUNCTION: LEGO1 0x1009cf20
 int MxDeviceEnumerate::ProcessDeviceBytes(int p_deviceNum, GUID& p_guid)
 {
-	if (!m_initialized)
+	if (!m_initialized) {
 		return -1;
+	}
 
 	int i = 0;
 	int j = 0;
@@ -634,8 +672,9 @@ int MxDeviceEnumerate::ProcessDeviceBytes(int p_deviceNum, GUID& p_guid)
 	memcpy(&deviceGuid, &p_guid, sizeof(GUID4));
 
 	for (list<MxDriver>::iterator it = m_list.begin(); it != m_list.end(); it++) {
-		if (p_deviceNum >= 0 && p_deviceNum < i)
+		if (p_deviceNum >= 0 && p_deviceNum < i) {
 			return -1;
+		}
 
 		GUID4 compareGuid;
 		MxDriver& driver = *it;
@@ -644,8 +683,9 @@ int MxDeviceEnumerate::ProcessDeviceBytes(int p_deviceNum, GUID& p_guid)
 
 			if (compareGuid.m_data1 == deviceGuid.m_data1 && compareGuid.m_data2 == deviceGuid.m_data2 &&
 				compareGuid.m_data3 == deviceGuid.m_data3 && compareGuid.m_data4 == deviceGuid.m_data4 &&
-				i == p_deviceNum)
+				i == p_deviceNum) {
 				return j;
+			}
 
 			j++;
 		}
@@ -683,11 +723,13 @@ int MxDeviceEnumerate::GetDevice(int p_deviceNum, MxDriver*& p_driver, MxDevice*
 // FUNCTION: LEGO1 0x1009d0d0
 int MxDeviceEnumerate::FUN_1009d0d0()
 {
-	if (!m_initialized)
+	if (!m_initialized) {
 		return -1;
+	}
 
-	if (m_list.empty())
+	if (m_list.empty()) {
 		return -1;
+	}
 
 	int i = 0;
 	int j = 0;
@@ -695,16 +737,19 @@ int MxDeviceEnumerate::FUN_1009d0d0()
 	unsigned int und = FUN_1009d1a0();
 
 	for (list<MxDriver>::iterator it = m_list.begin();; it++) {
-		if (it == m_list.end())
+		if (it == m_list.end()) {
 			return k;
+		}
 
 		for (list<MxDevice>::iterator it2 = (*it).m_devices.begin(); it2 != (*it).m_devices.end(); it2++) {
-			if ((*it2).m_HWDesc.dcmColorModel)
+			if ((*it2).m_HWDesc.dcmColorModel) {
 				return j;
+			}
 
 			if ((und && (*it2).m_HELDesc.dcmColorModel == D3DCOLOR_RGB && i == 0) ||
-				(*it2).m_HELDesc.dcmColorModel == D3DCOLOR_MONO && i == 0 && k < 0)
+				((*it2).m_HELDesc.dcmColorModel == D3DCOLOR_MONO && i == 0 && k < 0)) {
 				k = j;
+			}
 
 			j++;
 		}
@@ -730,28 +775,34 @@ undefined4 MxDeviceEnumerate::FUN_1009d1e0()
 // FUNCTION: LEGO1 0x1009d210
 int MxDeviceEnumerate::FUN_1009d210()
 {
-	if (!m_initialized)
+	if (!m_initialized) {
 		return -1;
+	}
 
 	for (list<MxDriver>::iterator it = m_list.begin(); it != m_list.end();) {
 		MxDriver& driver = *it;
 
-		if (!FUN_1009d370(driver))
+		if (!FUN_1009d370(driver)) {
 			m_list.erase(it++);
+		}
 		else {
 			for (list<MxDevice>::iterator it2 = driver.m_devices.begin(); it2 != driver.m_devices.end();) {
 				MxDevice& device = *it2;
 
-				if (!FUN_1009d3d0(device))
+				if (!FUN_1009d3d0(device)) {
 					driver.m_devices.erase(it2++);
-				else
+				}
+				else {
 					it2++;
+				}
 			}
 
-			if (driver.m_devices.empty())
+			if (driver.m_devices.empty()) {
 				m_list.erase(it++);
-			else
+			}
+			else {
 				it++;
+			}
 		}
 	}
 
@@ -764,8 +815,9 @@ unsigned char MxDeviceEnumerate::FUN_1009d370(MxDriver& p_driver)
 	for (list<MxDisplayMode>::iterator it = p_driver.m_displayModes.begin(); it != p_driver.m_displayModes.end();
 		 it++) {
 		if ((*it).m_width == 640 && (*it).m_height == 480) {
-			if ((*it).m_bitsPerPixel == 8 || (*it).m_bitsPerPixel == 16)
+			if ((*it).m_bitsPerPixel == 8 || (*it).m_bitsPerPixel == 16) {
 				return TRUE;
+			}
 		}
 	}
 
@@ -775,15 +827,18 @@ unsigned char MxDeviceEnumerate::FUN_1009d370(MxDriver& p_driver)
 // FUNCTION: LEGO1 0x1009d3d0
 unsigned char MxDeviceEnumerate::FUN_1009d3d0(MxDevice& p_device)
 {
-	if (m_list.size() <= 0)
+	if (m_list.size() <= 0) {
 		return FALSE;
+	}
 
-	if (p_device.m_HWDesc.dcmColorModel)
+	if (p_device.m_HWDesc.dcmColorModel) {
 		return p_device.m_HWDesc.dwDeviceZBufferBitDepth & DDBD_16 && p_device.m_HWDesc.dpcTriCaps.dwTextureCaps & 1;
+	}
 
 	for (list<MxDevice>::iterator it = m_list.front().m_devices.begin(); it != m_list.front().m_devices.end(); it++) {
-		if ((&*it) == &p_device)
+		if ((&*it) == &p_device) {
 			return TRUE;
+		}
 	}
 
 	return FALSE;
diff --git a/LEGO1/mxdirectx/mxdirect3d.h b/LEGO1/mxdirectx/mxdirect3d.h
index 4de9f058..6ebf46f9 100644
--- a/LEGO1/mxdirectx/mxdirect3d.h
+++ b/LEGO1/mxdirectx/mxdirect3d.h
@@ -41,9 +41,9 @@ struct MxDevice;
 class MxDirect3D : public MxDirectDraw {
 public:
 	MxDirect3D();
-	virtual ~MxDirect3D();
+	~MxDirect3D() override;
 
-	virtual BOOL Create(
+	BOOL Create(
 		HWND hWnd,
 		BOOL fullscreen_1,
 		BOOL surface_fullscreen,
@@ -53,9 +53,9 @@ class MxDirect3D : public MxDirectDraw {
 		int bpp,
 		const PALETTEENTRY* pPaletteEntries,
 		int paletteEntryCount
-	) override;                                      // vtable+0x04
-	virtual void Destroy() override;                 // vtable+0x08
-	virtual void DestroyButNotDirectDraw() override; // vtable+0x0c
+	) override;                              // vtable+0x04
+	void Destroy() override;                 // vtable+0x08
+	void DestroyButNotDirectDraw() override; // vtable+0x0c
 
 	BOOL CreateIDirect3D();
 	BOOL D3DSetMode();
diff --git a/LEGO1/mxdirectx/mxdirectdraw.cpp b/LEGO1/mxdirectx/mxdirectdraw.cpp
index 7e78cf69..7b64afe3 100644
--- a/LEGO1/mxdirectx/mxdirectdraw.cpp
+++ b/LEGO1/mxdirectx/mxdirectdraw.cpp
@@ -510,8 +510,9 @@ BOOL MxDirectDraw::DDCreateSurfaces()
 		ddsd.dwWidth = m_currentMode.width;
 		ddsd.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_CAPS;
 		ddsd.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE;
-		if (m_bOnlySystemMemory)
+		if (m_bOnlySystemMemory) {
 			ddsd.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE | DDSCAPS_SYSTEMMEMORY;
+		}
 		result = CreateDDSurface(&ddsd, &m_pBackBuffer, NULL);
 		if (result != DD_OK) {
 			Error("CreateSurface for window back buffer failed", result);
@@ -666,8 +667,9 @@ BOOL MxDirectDraw::CreateTextSurfaces()
 	ddsd.dwSize = sizeof(ddsd);
 	ddsd.dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH;
 	ddsd.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN;
-	if (m_bOnlySystemMemory)
+	if (m_bOnlySystemMemory) {
 		ddsd.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY | DDSCAPS_OFFSCREENPLAIN;
+	}
 	ddsd.dwHeight = m_text1SizeOnSurface.cy;
 	ddsd.dwWidth = m_text1SizeOnSurface.cx;
 
@@ -687,8 +689,9 @@ BOOL MxDirectDraw::CreateTextSurfaces()
 	ddsd.dwSize = sizeof(ddsd);
 	ddsd.dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH;
 	ddsd.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN;
-	if (m_bOnlySystemMemory)
+	if (m_bOnlySystemMemory) {
 		ddsd.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY | DDSCAPS_OFFSCREENPLAIN;
+	}
 	ddsd.dwHeight = m_text2SizeOnSurface.cy;
 	ddsd.dwWidth = m_text2SizeOnSurface.cx;
 
diff --git a/LEGO1/mxgeometry/mxgeometry3d.h b/LEGO1/mxgeometry/mxgeometry3d.h
index d96d302a..837a5b3a 100644
--- a/LEGO1/mxgeometry/mxgeometry3d.h
+++ b/LEGO1/mxgeometry/mxgeometry3d.h
@@ -28,8 +28,9 @@ class Mx3DPointFloat : public Vector3 {
 
 		float* dest = m_elements;
 		const float* src = p_other.m_elements;
-		for (size_t i = sizeof(m_elements) / sizeof(float); i > 0; --i)
+		for (size_t i = sizeof(m_elements) / sizeof(float); i > 0; --i) {
 			*dest++ = *src++;
+		}
 	}
 
 	inline void EqualsCross(Mx3DPointFloat& p_a, Mx3DPointFloat& p_b) { EqualsCrossImpl(p_a.m_data, p_b.m_data); }
diff --git a/LEGO1/mxgeometry/mxmatrix.h b/LEGO1/mxgeometry/mxmatrix.h
index 3ae03404..81cdaa2c 100644
--- a/LEGO1/mxgeometry/mxmatrix.h
+++ b/LEGO1/mxgeometry/mxmatrix.h
@@ -11,7 +11,7 @@ class MxMatrix : public Matrix4 {
 	inline MxMatrix(const MxMatrix& p_matrix) : Matrix4(m_elements) { Equals(p_matrix); }
 
 	// FUNCTION: LEGO1 0x10002850
-	virtual void operator=(const Matrix4& p_matrix) { Equals(p_matrix); } // vtable+0x28
+	void operator=(const Matrix4& p_matrix) override { Equals(p_matrix); } // vtable+0x28
 
 	// No idea why there's another equals. Maybe to some other type like the
 	// DirectX Retained Mode Matrix type which is also a float* alias?
diff --git a/LEGO1/omni/include/mxactionnotificationparam.h b/LEGO1/omni/include/mxactionnotificationparam.h
index f53ac728..96c44a93 100644
--- a/LEGO1/omni/include/mxactionnotificationparam.h
+++ b/LEGO1/omni/include/mxactionnotificationparam.h
@@ -21,8 +21,9 @@ class MxActionNotificationParam : public MxNotificationParam {
 		MxDSAction* oldAction = p_action;
 		this->m_realloc = p_reallocAction;
 
-		if (p_reallocAction)
+		if (p_reallocAction) {
 			this->m_action = new MxDSAction();
+		}
 		else {
 			this->m_action = oldAction;
 			return;
@@ -34,17 +35,19 @@ class MxActionNotificationParam : public MxNotificationParam {
 	}
 
 	// FUNCTION: LEGO1 0x10051050
-	inline virtual ~MxActionNotificationParam() override
+	inline ~MxActionNotificationParam() override
 	{
-		if (!this->m_realloc)
+		if (!this->m_realloc) {
 			return;
+		}
 
-		if (this->m_action)
+		if (this->m_action) {
 			delete this->m_action;
+		}
 	}
 
 	// FUNCTION: LEGO1 0x100510c0
-	virtual MxNotificationParam* Clone() override
+	MxNotificationParam* Clone() override
 	{
 		return new MxActionNotificationParam(this->m_type, this->m_sender, this->m_action, this->m_realloc);
 	} // vtable+0x04
@@ -70,7 +73,7 @@ class MxStartActionNotificationParam : public MxActionNotificationParam {
 	{
 	}
 
-	virtual MxNotificationParam* Clone() override; // vtable+0x04
+	MxNotificationParam* Clone() override; // vtable+0x04
 };
 
 // VTABLE: LEGO1 0x100d8358
@@ -88,7 +91,7 @@ class MxEndActionNotificationParam : public MxActionNotificationParam {
 	}
 
 	// FUNCTION: LEGO1 0x10051270
-	virtual MxNotificationParam* Clone() override
+	MxNotificationParam* Clone() override
 	{
 		return new MxEndActionNotificationParam(
 			c_notificationEndAction,
@@ -109,7 +112,7 @@ class MxType4NotificationParam : public MxActionNotificationParam {
 		m_unk0x14 = p_unk0x14;
 	}
 
-	virtual MxNotificationParam* Clone() override; // vtable+0x04
+	MxNotificationParam* Clone() override; // vtable+0x04
 
 private:
 	MxPresenter* m_unk0x14; // 0x14
diff --git a/LEGO1/omni/include/mxaudiomanager.h b/LEGO1/omni/include/mxaudiomanager.h
index d2b97d1a..020bda54 100644
--- a/LEGO1/omni/include/mxaudiomanager.h
+++ b/LEGO1/omni/include/mxaudiomanager.h
@@ -9,10 +9,10 @@
 class MxAudioManager : public MxMediaManager {
 public:
 	MxAudioManager();
-	virtual ~MxAudioManager() override;
+	~MxAudioManager() override;
 
-	virtual MxResult InitPresenters() override; // vtable+14
-	virtual void Destroy() override;            // vtable+18
+	MxResult InitPresenters() override; // vtable+14
+	void Destroy() override;            // vtable+18
 
 	// FUNCTION: LEGO1 0x10029910
 	virtual MxS32 GetVolume() { return this->m_volume; } // vtable+28
diff --git a/LEGO1/omni/include/mxaudiopresenter.h b/LEGO1/omni/include/mxaudiopresenter.h
index bf127d2b..873871ec 100644
--- a/LEGO1/omni/include/mxaudiopresenter.h
+++ b/LEGO1/omni/include/mxaudiopresenter.h
@@ -11,14 +11,14 @@ class MxAudioPresenter : public MxMediaPresenter {
 	MxAudioPresenter() { m_volume = 100; }
 
 	// FUNCTION: LEGO1 0x1000d280
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f078c
 		return "MxAudioPresenter";
 	}
 
 	// FUNCTION: LEGO1 0x1000d290
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, MxAudioPresenter::ClassName()) || MxMediaPresenter::IsA(p_name);
 	}
diff --git a/LEGO1/omni/include/mxbitmap.h b/LEGO1/omni/include/mxbitmap.h
index 7045c01e..465b2026 100644
--- a/LEGO1/omni/include/mxbitmap.h
+++ b/LEGO1/omni/include/mxbitmap.h
@@ -35,7 +35,7 @@ struct MxBITMAPINFO {
 class MxBitmap : public MxCore {
 public:
 	MxBitmap();
-	virtual ~MxBitmap(); // vtable+00
+	~MxBitmap() override; // vtable+00
 
 	virtual MxResult ImportBitmap(MxBitmap* p_bitmap);                                     // vtable+14
 	virtual MxResult ImportBitmapInfo(MxBITMAPINFO* p_info);                               // vtable+18
@@ -102,30 +102,37 @@ class MxBitmap : public MxCore {
 	}
 	inline MxLong GetAdjustedStride()
 	{
-		if (m_bmiHeader->biCompression == BI_RGB_TOPDOWN || m_bmiHeader->biHeight < 0)
+		if (m_bmiHeader->biCompression == BI_RGB_TOPDOWN || m_bmiHeader->biHeight < 0) {
 			return GetBmiStride();
-		else
+		}
+		else {
 			return -GetBmiStride();
+		}
 	}
 
 	inline MxLong GetLine(MxS32 p_top)
 	{
 		MxS32 height;
-		if (m_bmiHeader->biCompression == BI_RGB_TOPDOWN || m_bmiHeader->biHeight < 0)
+		if (m_bmiHeader->biCompression == BI_RGB_TOPDOWN || m_bmiHeader->biHeight < 0) {
 			height = p_top;
-		else
+		}
+		else {
 			height = GetBmiHeightAbs() - p_top - 1;
+		}
 		return GetBmiStride() * height;
 	}
 
 	inline MxU8* GetStart(MxS32 p_left, MxS32 p_top)
 	{
-		if (m_bmiHeader->biCompression == BI_RGB)
+		if (m_bmiHeader->biCompression == BI_RGB) {
 			return GetLine(p_top) + m_data + p_left;
-		else if (m_bmiHeader->biCompression == BI_RGB_TOPDOWN)
+		}
+		else if (m_bmiHeader->biCompression == BI_RGB_TOPDOWN) {
 			return m_data;
-		else
+		}
+		else {
 			return GetLine(0) + m_data;
+		}
 	}
 
 	// SYNTHETIC: LEGO1 0x100bc9f0
diff --git a/LEGO1/omni/include/mxcollection.h b/LEGO1/omni/include/mxcollection.h
index 58647ed4..84acdeef 100644
--- a/LEGO1/omni/include/mxcollection.h
+++ b/LEGO1/omni/include/mxcollection.h
@@ -16,7 +16,7 @@ class MxCollection : public MxCore {
 
 	void SetDestroy(void (*p_customDestructor)(T)) { this->m_customDestructor = p_customDestructor; }
 
-	virtual ~MxCollection() {}
+	~MxCollection() override {}
 	virtual MxS8 Compare(T, T) { return 0; }
 
 protected:
diff --git a/LEGO1/omni/include/mxcompositepresenter.h b/LEGO1/omni/include/mxcompositepresenter.h
index 122778d6..a39507c0 100644
--- a/LEGO1/omni/include/mxcompositepresenter.h
+++ b/LEGO1/omni/include/mxcompositepresenter.h
@@ -12,37 +12,38 @@ class MxCompositePresenterList : public list<MxPresenter*> {};
 class MxCompositePresenter : public MxPresenter {
 public:
 	MxCompositePresenter();
-	virtual ~MxCompositePresenter() override; // vtable+0x00
+	~MxCompositePresenter() override; // vtable+0x00
 
-	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x04
+	MxLong Notify(MxParam& p_param) override; // vtable+0x04
 
 	// FUNCTION: LEGO1 0x100b6210
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f0774
 		return "MxCompositePresenter";
 	}
 
 	// FUNCTION: LEGO1 0x100b6220
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, MxCompositePresenter::ClassName()) || MxPresenter::IsA(p_name);
 	}
 
-	virtual MxResult StartAction(MxStreamController* p_controller, MxDSAction* p_action) override; // vtable+0x3c
-	virtual void EndAction() override;                                                             // vtable+0x40
-	virtual void SetTickleState(TickleState p_tickleState) override;                               // vtable+0x44
-	virtual MxBool HasTickleStatePassed(TickleState p_tickleState) override;                       // vtable+0x48
-	virtual void Enable(MxBool p_enable) override;                                                 // vtable+0x54
-	virtual void VTable0x58(MxEndActionNotificationParam& p_param);                                // vtable+0x58
-	virtual void VTable0x5c(MxNotificationParam& p_param);                                         // vtable+0x5c
-	virtual void VTable0x60(MxPresenter* p_presenter);                                             // vtable+0x60
+	MxResult StartAction(MxStreamController* p_controller, MxDSAction* p_action) override; // vtable+0x3c
+	void EndAction() override;                                                             // vtable+0x40
+	void SetTickleState(TickleState p_tickleState) override;                               // vtable+0x44
+	MxBool HasTickleStatePassed(TickleState p_tickleState) override;                       // vtable+0x48
+	void Enable(MxBool p_enable) override;                                                 // vtable+0x54
+	virtual void VTable0x58(MxEndActionNotificationParam& p_param);                        // vtable+0x58
+	virtual void VTable0x5c(MxNotificationParam& p_param);                                 // vtable+0x5c
+	virtual void VTable0x60(MxPresenter* p_presenter);                                     // vtable+0x60
 
 	// FUNCTION: LEGO1 0x1000caf0
 	virtual MxBool VTable0x64(undefined4 p_undefined)
 	{
-		if (m_compositePresenter)
+		if (m_compositePresenter) {
 			return m_compositePresenter->VTable0x64(p_undefined);
+		}
 		return TRUE;
 	} // vtable+0x64
 
diff --git a/LEGO1/omni/include/mxdiskstreamcontroller.h b/LEGO1/omni/include/mxdiskstreamcontroller.h
index c571882a..ab13c73d 100644
--- a/LEGO1/omni/include/mxdiskstreamcontroller.h
+++ b/LEGO1/omni/include/mxdiskstreamcontroller.h
@@ -15,30 +15,30 @@
 class MxDiskStreamController : public MxStreamController {
 public:
 	MxDiskStreamController();
-	virtual ~MxDiskStreamController() override;
+	~MxDiskStreamController() override;
 
-	virtual MxResult Tickle() override; // vtable+0x08
+	MxResult Tickle() override; // vtable+0x08
 
 	// FUNCTION: LEGO1 0x100c7360
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x10102144
 		return "MxDiskStreamController";
 	}
 
 	// FUNCTION: LEGO1 0x100c7370
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, MxDiskStreamController::ClassName()) || MxStreamController::IsA(p_name);
 	}
 
-	virtual MxResult Open(const char* p_filename) override;       // vtable+0x14
-	virtual MxResult VTable0x18(undefined4, undefined4) override; // vtable+0x18
-	virtual MxResult VTable0x20(MxDSAction* p_action) override;   // vtable+0x20
-	virtual MxResult VTable0x24(MxDSAction* p_action) override;   // vtable+0x24
-	virtual MxDSStreamingAction* VTable0x28() override;           // vtable+0x28
-	virtual MxResult VTable0x30(MxDSAction* p_action) override;   // vtable+0x30
-	virtual MxResult VTable0x34(undefined4);                      // vtable+0x34
+	MxResult Open(const char* p_filename) override;       // vtable+0x14
+	MxResult VTable0x18(undefined4, undefined4) override; // vtable+0x18
+	MxResult VTable0x20(MxDSAction* p_action) override;   // vtable+0x20
+	MxResult VTable0x24(MxDSAction* p_action) override;   // vtable+0x24
+	MxDSStreamingAction* VTable0x28() override;           // vtable+0x28
+	MxResult VTable0x30(MxDSAction* p_action) override;   // vtable+0x30
+	virtual MxResult VTable0x34(undefined4);              // vtable+0x34
 
 	inline MxBool GetUnk0xc4() const { return m_unk0xc4; }
 
diff --git a/LEGO1/omni/include/mxdiskstreamprovider.h b/LEGO1/omni/include/mxdiskstreamprovider.h
index 517fa463..7bac3a0b 100644
--- a/LEGO1/omni/include/mxdiskstreamprovider.h
+++ b/LEGO1/omni/include/mxdiskstreamprovider.h
@@ -27,17 +27,17 @@ class MxDiskStreamProviderThread : public MxThread {
 class MxDiskStreamProvider : public MxStreamProvider {
 public:
 	MxDiskStreamProvider();
-	virtual ~MxDiskStreamProvider() override;
+	~MxDiskStreamProvider() override;
 
 	// FUNCTION: LEGO1 0x100d1160
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x1010287c
 		return "MxDiskStreamProvider";
 	}
 
 	// FUNCTION: LEGO1 0x100d1170
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, MxDiskStreamProvider::ClassName()) || MxStreamProvider::IsA(p_name);
 	}
@@ -48,12 +48,12 @@ class MxDiskStreamProvider : public MxStreamProvider {
 	static MxBool FUN_100d1af0(MxDSStreamingAction* p_action);
 	MxResult FUN_100d1b20(MxDSStreamingAction* p_action);
 
-	virtual MxResult SetResourceToGet(MxStreamController* p_resource) override; // vtable+0x14
-	virtual MxU32 GetFileSize() override;                                       // vtable+0x18
-	virtual MxS32 GetStreamBuffersNum() override;                               // vtable+0x1c
-	virtual void VTable0x20(MxDSAction* p_action) override;                     // vtable+0x20
-	virtual MxU32 GetLengthInDWords() override;                                 // vtable+0x24
-	virtual MxU32* GetBufferForDWords() override;                               // vtable+0x28
+	MxResult SetResourceToGet(MxStreamController* p_resource) override; // vtable+0x14
+	MxU32 GetFileSize() override;                                       // vtable+0x18
+	MxS32 GetStreamBuffersNum() override;                               // vtable+0x1c
+	void VTable0x20(MxDSAction* p_action) override;                     // vtable+0x20
+	MxU32 GetLengthInDWords() override;                                 // vtable+0x24
+	MxU32* GetBufferForDWords() override;                               // vtable+0x28
 
 private:
 	MxDiskStreamProviderThread m_thread; // 0x10
diff --git a/LEGO1/omni/include/mxdisplaysurface.h b/LEGO1/omni/include/mxdisplaysurface.h
index 69706126..4e107f60 100644
--- a/LEGO1/omni/include/mxdisplaysurface.h
+++ b/LEGO1/omni/include/mxdisplaysurface.h
@@ -14,7 +14,7 @@
 class MxDisplaySurface : public MxCore {
 public:
 	MxDisplaySurface();
-	virtual ~MxDisplaySurface() override;
+	~MxDisplaySurface() override;
 
 	virtual MxResult Init(
 		MxVideoParam& p_videoParam,
diff --git a/LEGO1/omni/include/mxdsaction.h b/LEGO1/omni/include/mxdsaction.h
index 75b3cc2c..0146ba04 100644
--- a/LEGO1/omni/include/mxdsaction.h
+++ b/LEGO1/omni/include/mxdsaction.h
@@ -25,35 +25,35 @@ class MxDSAction : public MxDSObject {
 	};
 
 	MxDSAction();
-	virtual ~MxDSAction();
+	~MxDSAction() override;
 
 	void CopyFrom(MxDSAction& p_dsAction);
 	MxDSAction& operator=(MxDSAction& p_dsAction);
 
 	// FUNCTION: LEGO1 0x100ad980
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x101013f4
 		return "MxDSAction";
 	}
 
 	// FUNCTION: LEGO1 0x100ad990
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		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;
-	virtual void SetDuration(MxLong p_duration);                         // vtable+28;
-	virtual MxDSAction* Clone();                                         // vtable+2c;
-	virtual void MergeFrom(MxDSAction& p_dsAction);                      // vtable+30;
-	virtual MxBool HasId(MxU32 p_objectId);                              // vtable+34;
-	virtual void SetUnknown90(MxLong p_unk0x90);                         // vtable+38;
-	virtual MxLong GetUnknown90();                                       // vtable+3c;
-	virtual MxLong GetElapsedTime();                                     // vtable+40;
+	undefined4 VTable0x14() override;                            // vtable+14;
+	MxU32 GetSizeOnDisk() override;                              // vtable+18;
+	void Deserialize(MxU8** p_source, MxS16 p_unk0x24) override; // vtable+1c;
+	virtual MxLong GetDuration();                                // vtable+24;
+	virtual void SetDuration(MxLong p_duration);                 // vtable+28;
+	virtual MxDSAction* Clone();                                 // vtable+2c;
+	virtual void MergeFrom(MxDSAction& p_dsAction);              // vtable+30;
+	virtual MxBool HasId(MxU32 p_objectId);                      // vtable+34;
+	virtual void SetUnknown90(MxLong p_unk0x90);                 // vtable+38;
+	virtual MxLong GetUnknown90();                               // vtable+3c;
+	virtual MxLong GetElapsedTime();                             // vtable+40;
 
 	void AppendData(MxU16 p_extraLength, const char* p_extraData);
 
@@ -77,10 +77,12 @@ class MxDSAction : public MxDSObject {
 
 	inline void CopyFlags(MxU32 p_flags)
 	{
-		if (p_flags & MxDSAction::c_looping)
+		if (p_flags & MxDSAction::c_looping) {
 			SetFlags(GetFlags() | MxDSAction::c_looping);
-		else if (p_flags & MxDSAction::c_bit3)
+		}
+		else if (p_flags & MxDSAction::c_bit3) {
 			SetFlags(GetFlags() | MxDSAction::c_bit3);
+		}
 	}
 
 	// SYNTHETIC: LEGO1 0x100ada60
diff --git a/LEGO1/omni/include/mxdsactionlist.h b/LEGO1/omni/include/mxdsactionlist.h
index 75d96842..b413cd2b 100644
--- a/LEGO1/omni/include/mxdsactionlist.h
+++ b/LEGO1/omni/include/mxdsactionlist.h
@@ -19,7 +19,7 @@ class MxDSActionList : public MxList<MxDSAction*> {
 	MxDSActionList() { this->m_unk0x18 = 0; }
 
 	// FUNCTION: LEGO1 0x100c9c90
-	virtual MxS8 Compare(MxDSAction* p_a, MxDSAction* p_b) override
+	MxS8 Compare(MxDSAction* p_a, MxDSAction* p_b) override
 	{
 		return p_a == p_b ? 0 : p_a < p_b ? -1 : 1;
 	} // vtable+0x14
diff --git a/LEGO1/omni/include/mxdsanim.h b/LEGO1/omni/include/mxdsanim.h
index 0e5b9a0c..09f9c72c 100644
--- a/LEGO1/omni/include/mxdsanim.h
+++ b/LEGO1/omni/include/mxdsanim.h
@@ -8,25 +8,25 @@
 class MxDSAnim : public MxDSMediaAction {
 public:
 	MxDSAnim();
-	virtual ~MxDSAnim() override;
+	~MxDSAnim() override;
 
 	void CopyFrom(MxDSAnim& p_dsAnim);
 	MxDSAnim& operator=(MxDSAnim& p_dsAnim);
 
 	// FUNCTION: LEGO1 0x100c9060
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x101025d8
 		return "MxDSAnim";
 	}
 
 	// FUNCTION: LEGO1 0x100c9070
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, MxDSAnim::ClassName()) || MxDSMediaAction::IsA(p_name);
 	}
 
-	virtual MxDSAction* Clone() override; // vtable+2c;
+	MxDSAction* Clone() override; // vtable+2c;
 
 	// SYNTHETIC: LEGO1 0x100c9180
 	// MxDSAnim::`scalar deleting destructor'
diff --git a/LEGO1/omni/include/mxdsbuffer.h b/LEGO1/omni/include/mxdsbuffer.h
index 01696471..79dee7d7 100644
--- a/LEGO1/omni/include/mxdsbuffer.h
+++ b/LEGO1/omni/include/mxdsbuffer.h
@@ -22,10 +22,10 @@ class MxDSBuffer : public MxCore {
 	};
 
 	MxDSBuffer();
-	virtual ~MxDSBuffer() override;
+	~MxDSBuffer() override;
 
 	// FUNCTION: LEGO1 0x100c6500
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x101025b8
 		return "MxDSBuffer";
diff --git a/LEGO1/omni/include/mxdschunk.h b/LEGO1/omni/include/mxdschunk.h
index 1933df93..c21816e6 100644
--- a/LEGO1/omni/include/mxdschunk.h
+++ b/LEGO1/omni/include/mxdschunk.h
@@ -18,17 +18,17 @@ class MxDSChunk : public MxCore {
 	};
 
 	MxDSChunk();
-	virtual ~MxDSChunk() override;
+	~MxDSChunk() override;
 
 	// FUNCTION: LEGO1 0x100be0c0
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x10101e6c
 		return "MxDSChunk";
 	}
 
 	// FUNCTION: LEGO1 0x100be0d0
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, MxDSChunk::ClassName()) || MxCore::IsA(p_name);
 	}
@@ -53,8 +53,9 @@ class MxDSChunk : public MxCore {
 
 	inline void Release()
 	{
-		if (m_data)
+		if (m_data) {
 			delete[] m_data;
+		}
 	}
 
 	// SYNTHETIC: LEGO1 0x100be150
diff --git a/LEGO1/omni/include/mxdsevent.h b/LEGO1/omni/include/mxdsevent.h
index 1a197496..492cfd10 100644
--- a/LEGO1/omni/include/mxdsevent.h
+++ b/LEGO1/omni/include/mxdsevent.h
@@ -7,25 +7,25 @@
 class MxDSEvent : public MxDSMediaAction {
 public:
 	MxDSEvent();
-	virtual ~MxDSEvent() override;
+	~MxDSEvent() override;
 
 	void CopyFrom(MxDSEvent& p_dsEvent);
 	MxDSEvent& operator=(MxDSEvent& p_dsEvent);
 
 	// FUNCTION: LEGO1 0x100c9660
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x101025f0
 		return "MxDSEvent";
 	}
 
 	// FUNCTION: LEGO1 0x100c9670
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, MxDSEvent::ClassName()) || MxDSMediaAction::IsA(p_name);
 	}
 
-	virtual MxDSAction* Clone() override; // vtable+2c;
+	MxDSAction* Clone() override; // vtable+2c;
 
 	// SYNTHETIC: LEGO1 0x100c9780
 	// MxDSEvent::`scalar deleting destructor'
diff --git a/LEGO1/omni/include/mxdsfile.h b/LEGO1/omni/include/mxdsfile.h
index 4242fe0d..d1c93771 100644
--- a/LEGO1/omni/include/mxdsfile.h
+++ b/LEGO1/omni/include/mxdsfile.h
@@ -12,27 +12,27 @@
 class MxDSFile : public MxDSSource {
 public:
 	MxDSFile(const char* p_filename, MxULong p_skipReadingChunks);
-	virtual ~MxDSFile(); // vtable+0x00
+	~MxDSFile() override; // vtable+0x00
 
 	// FUNCTION: LEGO1 0x100c0120
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x10102594
 		return "MxDSFile";
 	}
 
 	// FUNCTION: LEGO1 0x100c0130
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, MxDSFile::ClassName()) || MxDSSource::IsA(p_name);
 	}
 
-	virtual MxLong Open(MxULong);                   // vtable+0x14
-	virtual MxLong Close();                         // vtable+0x18
-	virtual MxResult Read(unsigned char*, MxULong); // vtable+0x20
-	virtual MxLong Seek(MxLong, int);               // vtable+0x24
-	virtual MxULong GetBufferSize();                // vtable+0x28
-	virtual MxULong GetStreamBuffersNum();          // vtable+0x2c
+	MxLong Open(MxULong) override;                   // vtable+0x14
+	MxLong Close() override;                         // vtable+0x18
+	MxResult Read(unsigned char*, MxULong) override; // vtable+0x20
+	MxLong Seek(MxLong, int) override;               // vtable+0x24
+	MxULong GetBufferSize() override;                // vtable+0x28
+	MxULong GetStreamBuffersNum() override;          // vtable+0x2c
 
 	inline void SetFileName(const char* p_filename) { m_filename = p_filename; }
 
diff --git a/LEGO1/omni/include/mxdsmediaaction.h b/LEGO1/omni/include/mxdsmediaaction.h
index 7422ec2d..32664156 100644
--- a/LEGO1/omni/include/mxdsmediaaction.h
+++ b/LEGO1/omni/include/mxdsmediaaction.h
@@ -10,20 +10,20 @@
 class MxDSMediaAction : public MxDSAction {
 public:
 	MxDSMediaAction();
-	virtual ~MxDSMediaAction() override;
+	~MxDSMediaAction() override;
 
 	void CopyFrom(MxDSMediaAction& p_dsMediaAction);
 	MxDSMediaAction& operator=(MxDSMediaAction& p_dsMediaAction);
 
 	// FUNCTION: LEGO1 0x100c8be0
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f7624
 		return "MxDSMediaAction";
 	}
 
 	// FUNCTION: LEGO1 0x100c8bf0
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, MxDSMediaAction::ClassName()) || MxDSAction::IsA(p_name);
 	}
@@ -31,10 +31,10 @@ class MxDSMediaAction : public MxDSAction {
 	// SYNTHETIC: LEGO1 0x100c8cd0
 	// MxDSMediaAction::`scalar deleting destructor'
 
-	virtual undefined4 VTable0x14();                                     // vtable+14;
-	virtual MxU32 GetSizeOnDisk() override;                              // vtable+18;
-	virtual void Deserialize(MxU8** p_source, MxS16 p_unk0x24) override; // vtable+1c;
-	virtual MxDSAction* Clone() override;                                // vtable+2c;
+	undefined4 VTable0x14() override;                            // vtable+14;
+	MxU32 GetSizeOnDisk() override;                              // vtable+18;
+	void Deserialize(MxU8** p_source, MxS16 p_unk0x24) override; // vtable+1c;
+	MxDSAction* Clone() override;                                // vtable+2c;
 
 	void CopyMediaSrcPath(const char* p_mediaSrcPath);
 
diff --git a/LEGO1/omni/include/mxdsmultiaction.h b/LEGO1/omni/include/mxdsmultiaction.h
index 22a04feb..d97e6116 100644
--- a/LEGO1/omni/include/mxdsmultiaction.h
+++ b/LEGO1/omni/include/mxdsmultiaction.h
@@ -9,32 +9,32 @@
 class MxDSMultiAction : public MxDSAction {
 public:
 	MxDSMultiAction();
-	virtual ~MxDSMultiAction() override;
+	~MxDSMultiAction() override;
 
 	void CopyFrom(MxDSMultiAction& p_dsMultiAction);
 	MxDSMultiAction& operator=(MxDSMultiAction& p_dsMultiAction);
 
 	// FUNCTION: LEGO1 0x100c9f50
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x10101dbc
 		return "MxDSMultiAction";
 	}
 
 	// FUNCTION: LEGO1 0x100c9f60
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, MxDSMultiAction::ClassName()) || MxDSAction::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 void SetAtomId(MxAtomId p_atomId) override;                  // vtable+20;
-	virtual MxDSAction* Clone() override;                                // vtable+2c;
-	virtual void MergeFrom(MxDSAction& p_dsAction) override;             // vtable+30;
-	virtual MxBool HasId(MxU32 p_objectId) override;                     // vtable+34;
-	virtual void SetUnknown90(MxLong p_unk0x90) override;                // vtable+38;
+	undefined4 VTable0x14() override;                            // vtable+14;
+	MxU32 GetSizeOnDisk() override;                              // vtable+18;
+	void Deserialize(MxU8** p_source, MxS16 p_unk0x24) override; // vtable+1c;
+	void SetAtomId(MxAtomId p_atomId) override;                  // vtable+20;
+	MxDSAction* Clone() override;                                // vtable+2c;
+	void MergeFrom(MxDSAction& p_dsAction) override;             // vtable+30;
+	MxBool HasId(MxU32 p_objectId) override;                     // vtable+34;
+	void SetUnknown90(MxLong p_unk0x90) override;                // vtable+38;
 
 	inline MxDSActionList* GetActionList() const { return m_actions; }
 
diff --git a/LEGO1/omni/include/mxdsobject.h b/LEGO1/omni/include/mxdsobject.h
index 9ede2f11..c7156004 100644
--- a/LEGO1/omni/include/mxdsobject.h
+++ b/LEGO1/omni/include/mxdsobject.h
@@ -27,7 +27,7 @@ class MxDSObject : public MxCore {
 	};
 
 	MxDSObject();
-	virtual ~MxDSObject() override;
+	~MxDSObject() override;
 
 	void CopyFrom(MxDSObject& p_dsObject);
 	MxDSObject& operator=(MxDSObject& p_dsObject);
@@ -36,10 +36,10 @@ class MxDSObject : public MxCore {
 	void SetSourceName(const char* p_sourceName);
 
 	// FUNCTION: LEGO1 0x100bf730
-	inline virtual const char* ClassName() const override { return "MxDSObject"; } // vtable+0c
+	inline const char* ClassName() const override { return "MxDSObject"; } // vtable+0c
 
 	// FUNCTION: LEGO1 0x100bf740
-	inline virtual MxBool IsA(const char* p_name) const override
+	inline MxBool IsA(const char* p_name) const override
 	{
 		return !strcmp(p_name, MxDSObject::ClassName()) || MxCore::IsA(p_name);
 	} // vtable+10;
diff --git a/LEGO1/omni/include/mxdsobjectaction.h b/LEGO1/omni/include/mxdsobjectaction.h
index 77480452..205c6d81 100644
--- a/LEGO1/omni/include/mxdsobjectaction.h
+++ b/LEGO1/omni/include/mxdsobjectaction.h
@@ -8,24 +8,24 @@
 class MxDSObjectAction : public MxDSMediaAction {
 public:
 	MxDSObjectAction();
-	virtual ~MxDSObjectAction() override;
+	~MxDSObjectAction() override;
 
 	MxDSObjectAction& operator=(MxDSObjectAction& p_dsObjectAction);
 
 	// FUNCTION: LEGO1 0x100c88e0
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x101025c4
 		return "MxDSObjectAction";
 	}
 
 	// FUNCTION: LEGO1 0x100c88f0
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, MxDSObjectAction::ClassName()) || MxDSMediaAction::IsA(p_name);
 	}
 
-	virtual MxDSAction* Clone() override;                      // vtable+2c;
+	MxDSAction* Clone() override;                              // vtable+2c;
 	virtual void CopyFrom(MxDSObjectAction& p_dsObjectAction); // vtable+44;
 
 	// SYNTHETIC: LEGO1 0x100c8a00
diff --git a/LEGO1/omni/include/mxdsparallelaction.h b/LEGO1/omni/include/mxdsparallelaction.h
index 0386de7f..212fb8f0 100644
--- a/LEGO1/omni/include/mxdsparallelaction.h
+++ b/LEGO1/omni/include/mxdsparallelaction.h
@@ -8,20 +8,20 @@
 class MxDSParallelAction : public MxDSMultiAction {
 public:
 	MxDSParallelAction();
-	virtual ~MxDSParallelAction() override;
+	~MxDSParallelAction() override;
 
 	void CopyFrom(MxDSParallelAction& p_dsParallelAction);
 	MxDSParallelAction& operator=(MxDSParallelAction& p_dsParallelAction);
 
 	// FUNCTION: LEGO1 0x100caf00
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x10102608
 		return "MxDSParallelAction";
 	}
 
 	// FUNCTION: LEGO1 0x100caf10
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, MxDSParallelAction::ClassName()) || MxDSMultiAction::IsA(p_name);
 	}
@@ -29,12 +29,12 @@ class MxDSParallelAction : public MxDSMultiAction {
 	// SYNTHETIC: LEGO1 0x100cb020
 	// MxDSParallelAction::`scalar deleting destructor'
 
-	virtual MxLong GetDuration() override; // vtable+24;
+	MxLong GetDuration() override; // vtable+24;
 
 	// FUNCTION: LEGO1 0x100caef0
-	virtual void SetDuration(MxLong p_duration) override { m_duration = p_duration; } // vtable+0x28
+	void SetDuration(MxLong p_duration) override { m_duration = p_duration; } // vtable+0x28
 
-	virtual MxDSAction* Clone() override; // vtable+2c;
+	MxDSAction* Clone() override; // vtable+2c;
 };
 
 #endif // MXDSPARALLELACTION_H
diff --git a/LEGO1/omni/include/mxdsselectaction.h b/LEGO1/omni/include/mxdsselectaction.h
index f7c6a148..ab2e6609 100644
--- a/LEGO1/omni/include/mxdsselectaction.h
+++ b/LEGO1/omni/include/mxdsselectaction.h
@@ -10,27 +10,27 @@
 class MxDSSelectAction : public MxDSParallelAction {
 public:
 	MxDSSelectAction();
-	virtual ~MxDSSelectAction() override;
+	~MxDSSelectAction() override;
 
 	void CopyFrom(MxDSSelectAction& p_dsSelectAction);
 	MxDSSelectAction& operator=(MxDSSelectAction& p_dsSelectAction);
 
 	// FUNCTION: LEGO1 0x100cb6f0
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x1010261c
 		return "MxDSSelectAction";
 	}
 
 	// FUNCTION: LEGO1 0x100cb700
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, MxDSSelectAction::ClassName()) || MxDSParallelAction::IsA(p_name);
 	}
 
-	virtual MxU32 GetSizeOnDisk() override;                              // vtable+18;
-	virtual void Deserialize(MxU8** p_source, MxS16 p_unk0x24) override; // vtable+1c;
-	virtual MxDSAction* Clone() override;                                // vtable+2c;
+	MxU32 GetSizeOnDisk() override;                              // vtable+18;
+	void Deserialize(MxU8** p_source, MxS16 p_unk0x24) override; // vtable+1c;
+	MxDSAction* Clone() override;                                // vtable+2c;
 
 	// SYNTHETIC: LEGO1 0x100cb840
 	// MxDSSelectAction::`scalar deleting destructor'
diff --git a/LEGO1/omni/include/mxdsserialaction.h b/LEGO1/omni/include/mxdsserialaction.h
index 694c9afa..b1c2a695 100644
--- a/LEGO1/omni/include/mxdsserialaction.h
+++ b/LEGO1/omni/include/mxdsserialaction.h
@@ -9,27 +9,27 @@
 class MxDSSerialAction : public MxDSMultiAction {
 public:
 	MxDSSerialAction();
-	virtual ~MxDSSerialAction() override;
+	~MxDSSerialAction() override;
 
 	void CopyFrom(MxDSSerialAction& p_dsSerialAction);
 	MxDSSerialAction& operator=(MxDSSerialAction& p_dsSerialAction);
 
 	// FUNCTION: LEGO1 0x100caad0
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f75dc
 		return "MxDSSerialAction";
 	}
 
 	// FUNCTION: LEGO1 0x100caae0
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, MxDSSerialAction::ClassName()) || MxDSMultiAction::IsA(p_name);
 	}
 
-	virtual MxLong GetDuration() override;                // vtable+24;
-	virtual void SetDuration(MxLong p_duration) override; // vtable+28;
-	virtual MxDSAction* Clone() override;                 // vtable+2c;
+	MxLong GetDuration() override;                // vtable+24;
+	void SetDuration(MxLong p_duration) override; // vtable+28;
+	MxDSAction* Clone() override;                 // vtable+2c;
 
 	// SYNTHETIC: LEGO1 0x100cabf0
 	// MxDSSerialAction::`scalar deleting destructor'
diff --git a/LEGO1/omni/include/mxdssound.h b/LEGO1/omni/include/mxdssound.h
index 3d1fa31d..193fde3a 100644
--- a/LEGO1/omni/include/mxdssound.h
+++ b/LEGO1/omni/include/mxdssound.h
@@ -8,27 +8,27 @@
 class MxDSSound : public MxDSMediaAction {
 public:
 	MxDSSound();
-	virtual ~MxDSSound() override;
+	~MxDSSound() override;
 
 	void CopyFrom(MxDSSound& p_dsSound);
 	MxDSSound& operator=(MxDSSound& p_dsSound);
 
 	// FUNCTION: LEGO1 0x100c9330
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x101025e4
 		return "MxDSSound";
 	}
 
 	// FUNCTION: LEGO1 0x100c9340
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, MxDSSound::ClassName()) || MxDSMediaAction::IsA(p_name);
 	}
 
-	virtual MxU32 GetSizeOnDisk() override;                              // vtable+18;
-	virtual void Deserialize(MxU8** p_source, MxS16 p_unk0x24) override; // vtable+1c;
-	virtual MxDSAction* Clone() override;                                // vtable+2c;
+	MxU32 GetSizeOnDisk() override;                              // vtable+18;
+	void Deserialize(MxU8** p_source, MxS16 p_unk0x24) override; // vtable+1c;
+	MxDSAction* Clone() override;                                // vtable+2c;
 
 	inline MxS32 GetVolume() const { return m_volume; }
 
diff --git a/LEGO1/omni/include/mxdssource.h b/LEGO1/omni/include/mxdssource.h
index 143b9c78..d3b9474b 100644
--- a/LEGO1/omni/include/mxdssource.h
+++ b/LEGO1/omni/include/mxdssource.h
@@ -12,17 +12,17 @@ class MxDSSource : public MxCore {
 	MxDSSource() : m_lengthInDWords(0), m_pBuffer(NULL), m_position(-1) {}
 
 	// FUNCTION: LEGO1 0x100bff60
-	virtual ~MxDSSource() override { delete[] m_pBuffer; }
+	~MxDSSource() override { delete[] m_pBuffer; }
 
 	// FUNCTION: LEGO1 0x100c0010
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x10102588
 		return "MxDSSource";
 	}
 
 	// FUNCTION: LEGO1 0x100c0020
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, MxDSSource::ClassName()) || MxCore::IsA(p_name);
 	}
diff --git a/LEGO1/omni/include/mxdsstill.h b/LEGO1/omni/include/mxdsstill.h
index 4de69475..f46fff32 100644
--- a/LEGO1/omni/include/mxdsstill.h
+++ b/LEGO1/omni/include/mxdsstill.h
@@ -8,25 +8,25 @@
 class MxDSStill : public MxDSMediaAction {
 public:
 	MxDSStill();
-	virtual ~MxDSStill() override;
+	~MxDSStill() override;
 
 	void CopyFrom(MxDSStill& p_dsStill);
 	MxDSStill& operator=(MxDSStill& p_dsStill);
 
 	// FUNCTION: LEGO1 0x100c9930
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x101025fc
 		return "MxDSStill";
 	}
 
 	// FUNCTION: LEGO1 0x100c9940
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, MxDSStill::ClassName()) || MxDSMediaAction::IsA(p_name);
 	}
 
-	virtual MxDSAction* Clone() override; // vtable+2c;
+	MxDSAction* Clone() override; // vtable+2c;
 
 	// SYNTHETIC: LEGO1 0x100c9a50
 	// MxDSStill::`scalar deleting destructor'
diff --git a/LEGO1/omni/include/mxdsstreamingaction.h b/LEGO1/omni/include/mxdsstreamingaction.h
index 074bd5ed..94e652ae 100644
--- a/LEGO1/omni/include/mxdsstreamingaction.h
+++ b/LEGO1/omni/include/mxdsstreamingaction.h
@@ -11,7 +11,7 @@ class MxDSStreamingAction : public MxDSAction {
 public:
 	MxDSStreamingAction(MxDSAction& p_dsAction, MxU32 p_offset);
 	MxDSStreamingAction(MxDSStreamingAction& p_dsStreamingAction);
-	virtual ~MxDSStreamingAction();
+	~MxDSStreamingAction() override;
 
 	MxDSStreamingAction* CopyFrom(MxDSStreamingAction& p_dsStreamingAction);
 	MxDSStreamingAction& operator=(MxDSAction& p_dsAction)
@@ -25,7 +25,7 @@ class MxDSStreamingAction : public MxDSAction {
 		return *this;
 	}
 
-	virtual MxBool HasId(MxU32 p_objectId) override; // vtable+34;
+	MxBool HasId(MxU32 p_objectId) override; // vtable+34;
 
 	MxResult Init();
 	void SetInternalAction(MxDSAction* p_dsAction);
diff --git a/LEGO1/omni/include/mxdssubscriber.h b/LEGO1/omni/include/mxdssubscriber.h
index 1156be36..4f8d0843 100644
--- a/LEGO1/omni/include/mxdssubscriber.h
+++ b/LEGO1/omni/include/mxdssubscriber.h
@@ -14,17 +14,17 @@ class MxStreamController;
 class MxDSSubscriber : public MxCore {
 public:
 	MxDSSubscriber();
-	virtual ~MxDSSubscriber() override;
+	~MxDSSubscriber() override;
 
 	// FUNCTION: LEGO1 0x100b7d50
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x101020f8
 		return "MxDSSubscriber";
 	}
 
 	// FUNCTION: LEGO1 0x100b7d60
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, MxDSSubscriber::ClassName()) || MxCore::IsA(p_name);
 	}
diff --git a/LEGO1/omni/include/mxentity.h b/LEGO1/omni/include/mxentity.h
index df36ea37..ed75d148 100644
--- a/LEGO1/omni/include/mxentity.h
+++ b/LEGO1/omni/include/mxentity.h
@@ -15,17 +15,17 @@ class MxEntity : public MxCore {
 	MxEntity() { this->m_mxEntityId = -1; }
 
 	// FUNCTION: LEGO1 0x1000c110
-	virtual ~MxEntity() override{};
+	~MxEntity() override{};
 
 	// FUNCTION: LEGO1 0x1000c180
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f0070
 		return "MxEntity";
 	}
 
 	// FUNCTION: LEGO1 0x1000c190
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, MxEntity::ClassName()) || MxCore::IsA(p_name);
 	}
diff --git a/LEGO1/omni/include/mxeventmanager.h b/LEGO1/omni/include/mxeventmanager.h
index c21e92bc..b23a2ad0 100644
--- a/LEGO1/omni/include/mxeventmanager.h
+++ b/LEGO1/omni/include/mxeventmanager.h
@@ -9,9 +9,9 @@
 class MxEventManager : public MxMediaManager {
 public:
 	MxEventManager();
-	virtual ~MxEventManager() override;
+	~MxEventManager() override;
 
-	virtual void Destroy() override;                                     // vtable+18
+	void Destroy() override;                                             // vtable+18
 	virtual MxResult Create(MxU32 p_frequencyMS, MxBool p_createThread); // vtable+28
 
 	// SYNTHETIC: LEGO1 0x100c03d0
diff --git a/LEGO1/omni/include/mxeventpresenter.h b/LEGO1/omni/include/mxeventpresenter.h
index 06599693..1812280f 100644
--- a/LEGO1/omni/include/mxeventpresenter.h
+++ b/LEGO1/omni/include/mxeventpresenter.h
@@ -9,26 +9,26 @@
 class MxEventPresenter : public MxMediaPresenter {
 public:
 	MxEventPresenter();
-	virtual ~MxEventPresenter() override;
+	~MxEventPresenter() override;
 
 	// FUNCTION: LEGO1 0x100c2c30
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x10101dcc
 		return "MxEventPresenter";
 	}
 
 	// FUNCTION: LEGO1 0x100c2c40
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, MxEventPresenter::ClassName()) || MxMediaPresenter::IsA(p_name);
 	}
 
-	virtual void ReadyTickle() override;           // vtable+0x18
-	virtual void StartingTickle() override;        // vtable+0x1c
-	virtual MxResult AddToManager() override;      // vtable+0x34
-	virtual void Destroy() override;               // vtable+0x38
-	virtual MxResult PutData() override;           // vtable+0x4c
+	void ReadyTickle() override;                   // vtable+0x18
+	void StartingTickle() override;                // vtable+0x1c
+	MxResult AddToManager() override;              // vtable+0x34
+	void Destroy() override;                       // vtable+0x38
+	MxResult PutData() override;                   // vtable+0x4c
 	virtual void CopyData(MxStreamChunk* p_chunk); // vtable+0x5c
 
 	// SYNTHETIC: LEGO1 0x100c2d20
diff --git a/LEGO1/omni/include/mxflcpresenter.h b/LEGO1/omni/include/mxflcpresenter.h
index 2c4063f9..569fa06c 100644
--- a/LEGO1/omni/include/mxflcpresenter.h
+++ b/LEGO1/omni/include/mxflcpresenter.h
@@ -11,25 +11,25 @@
 class MxFlcPresenter : public MxVideoPresenter {
 public:
 	MxFlcPresenter();
-	virtual ~MxFlcPresenter() override;
+	~MxFlcPresenter() override;
 
 	// FUNCTION: LEGO1 0x1004e200
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, MxFlcPresenter::ClassName()) || MxVideoPresenter::IsA(p_name);
 	}
 
 	// FUNCTION: LEGO1 0x100b33f0
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f43c8
 		return "MxFlcPresenter";
 	}
 
-	virtual void LoadHeader(MxStreamChunk* p_chunk) override; // vtable+0x5c
-	virtual void CreateBitmap() override;                     // vtable+0x60
-	virtual void LoadFrame(MxStreamChunk* p_chunk) override;  // vtable+0x68
-	virtual void RealizePalette() override;                   // vtable+0x70
+	void LoadHeader(MxStreamChunk* p_chunk) override; // vtable+0x5c
+	void CreateBitmap() override;                     // vtable+0x60
+	void LoadFrame(MxStreamChunk* p_chunk) override;  // vtable+0x68
+	void RealizePalette() override;                   // vtable+0x70
 
 	// SYNTHETIC: LEGO1 0x100b3400
 	// MxFlcPresenter::`scalar deleting destructor'
diff --git a/LEGO1/omni/include/mxhashtable.h b/LEGO1/omni/include/mxhashtable.h
index 056ff402..f2506758 100644
--- a/LEGO1/omni/include/mxhashtable.h
+++ b/LEGO1/omni/include/mxhashtable.h
@@ -46,7 +46,7 @@ class MxHashTable : protected MxCollection<T> {
 		m_resizeOption = e_noExpand;
 	}
 
-	virtual ~MxHashTable() override;
+	~MxHashTable() override;
 
 	void Resize();
 	void Add(T);
@@ -99,8 +99,9 @@ MxBool MxHashTableCursor<T>::Find(T p_obj)
 	MxHashTableNode<T>* t = m_table->m_slots[bucket];
 
 	while (t) {
-		if (t->m_hash == hash && !m_table->Compare(t->m_obj, p_obj))
+		if (t->m_hash == hash && !m_table->Compare(t->m_obj, p_obj)) {
 			m_match = t;
+		}
 		t = t->m_next;
 	}
 
@@ -122,8 +123,9 @@ void MxHashTableCursor<T>::DeleteMatch()
 {
 	// Cut the matching node out of the linked list
 	// by updating pointer references.
-	if (m_match == NULL)
+	if (m_match == NULL) {
 		return;
+	}
 
 	if (m_match->m_prev) {
 		m_match->m_prev->m_next = m_match->m_next;
@@ -134,8 +136,9 @@ void MxHashTableCursor<T>::DeleteMatch()
 		m_table->m_slots[bucket] = m_match->m_next;
 	}
 
-	if (m_match->m_next)
+	if (m_match->m_next) {
 		m_match->m_next->m_prev = m_match->m_prev;
+	}
 
 	m_table->m_customDestructor(m_match->m_obj);
 	delete m_match;
@@ -210,8 +213,9 @@ inline void MxHashTable<T>::NodeInsert(MxHashTableNode<T>* p_node)
 
 	p_node->m_next = m_slots[bucket];
 
-	if (m_slots[bucket])
+	if (m_slots[bucket]) {
 		m_slots[bucket]->m_prev = p_node;
+	}
 
 	m_slots[bucket] = p_node;
 	this->m_count++;
@@ -220,8 +224,9 @@ inline void MxHashTable<T>::NodeInsert(MxHashTableNode<T>* p_node)
 template <class T>
 inline void MxHashTable<T>::Add(T p_newobj)
 {
-	if (m_resizeOption && ((this->m_count + 1) / m_numSlots) > m_autoResizeRatio)
+	if (m_resizeOption && ((this->m_count + 1) / m_numSlots) > m_autoResizeRatio) {
 		MxHashTable<T>::Resize();
+	}
 
 	MxU32 hash = Hash(p_newobj);
 	MxHashTableNode<T>* node = new MxHashTableNode<T>(p_newobj, hash);
diff --git a/LEGO1/omni/include/mxlist.h b/LEGO1/omni/include/mxlist.h
index b25c1ce2..5ad02492 100644
--- a/LEGO1/omni/include/mxlist.h
+++ b/LEGO1/omni/include/mxlist.h
@@ -51,7 +51,7 @@ class MxList : protected MxCollection<T> {
 		m_first = NULL;
 	}
 
-	virtual ~MxList() override;
+	~MxList() override;
 
 	void Append(T p_obj) { InsertEntry(p_obj, this->m_last, NULL); }
 	void Prepend(T p_obj) { InsertEntry(p_obj, NULL, this->m_first); }
@@ -121,8 +121,9 @@ class MxListCursor : public MxCore {
 	// TODO: Probably shouldn't exist
 	void NextFragment()
 	{
-		if (m_match)
+		if (m_match) {
 			m_match = m_match->GetNext();
+		}
 	}
 
 private:
@@ -147,13 +148,15 @@ template <class T>
 inline void MxList<T>::DeleteAll(MxBool p_destroy)
 {
 	for (MxListEntry<T>* t = m_first;;) {
-		if (!t)
+		if (!t) {
 			break;
+		}
 
 		MxListEntry<T>* next = t->GetNext();
 
-		if (p_destroy)
+		if (p_destroy) {
 			this->m_customDestructor(t->GetValue());
+		}
 
 		delete t;
 		t = next;
@@ -169,15 +172,19 @@ inline MxListEntry<T>* MxList<T>::InsertEntry(T p_newobj, MxListEntry<T>* p_prev
 {
 	MxListEntry<T>* newEntry = new MxListEntry<T>(p_newobj, p_prev, p_next);
 
-	if (p_prev)
+	if (p_prev) {
 		p_prev->SetNext(newEntry);
-	else
+	}
+	else {
 		this->m_first = newEntry;
+	}
 
-	if (p_next)
+	if (p_next) {
 		p_next->SetPrev(newEntry);
-	else
+	}
+	else {
 		this->m_last = newEntry;
+	}
 
 	this->m_count++;
 	return newEntry;
@@ -186,15 +193,19 @@ inline MxListEntry<T>* MxList<T>::InsertEntry(T p_newobj, MxListEntry<T>* p_prev
 template <class T>
 inline void MxList<T>::DeleteEntry(MxListEntry<T>* p_match)
 {
-	if (p_match->GetPrev())
+	if (p_match->GetPrev()) {
 		p_match->GetPrev()->SetNext(p_match->GetNext());
-	else
+	}
+	else {
 		m_first = p_match->GetNext();
+	}
 
-	if (p_match->GetNext())
+	if (p_match->GetNext()) {
 		p_match->GetNext()->SetPrev(p_match->GetPrev());
-	else
+	}
+	else {
 		m_last = p_match->GetPrev();
+	}
 
 	delete p_match;
 	this->m_count--;
@@ -204,8 +215,9 @@ template <class T>
 inline MxBool MxListCursor<T>::Find(T p_obj)
 {
 	for (m_match = m_list->m_first; m_match && m_list->Compare(m_match->GetValue(), p_obj);
-		 m_match = m_match->GetNext())
+		 m_match = m_match->GetNext()) {
 		;
+	}
 
 	return m_match != NULL;
 }
@@ -232,10 +244,12 @@ inline void MxListCursor<T>::Destroy()
 template <class T>
 inline MxBool MxListCursor<T>::Next()
 {
-	if (!m_match)
+	if (!m_match) {
 		m_match = m_list->m_first;
-	else
+	}
+	else {
 		m_match = m_match->GetNext();
+	}
 
 	return m_match != NULL;
 }
@@ -243,13 +257,16 @@ inline MxBool MxListCursor<T>::Next()
 template <class T>
 inline MxBool MxListCursor<T>::Next(T& p_obj)
 {
-	if (!m_match)
+	if (!m_match) {
 		m_match = m_list->m_first;
-	else
+	}
+	else {
 		m_match = m_match->GetNext();
+	}
 
-	if (m_match)
+	if (m_match) {
 		p_obj = m_match->GetValue();
+	}
 
 	return m_match != NULL;
 }
@@ -257,10 +274,12 @@ inline MxBool MxListCursor<T>::Next(T& p_obj)
 template <class T>
 inline MxBool MxListCursor<T>::Prev()
 {
-	if (!m_match)
+	if (!m_match) {
 		m_match = m_list->m_last;
-	else
+	}
+	else {
 		m_match = m_match->GetPrev();
+	}
 
 	return m_match != NULL;
 }
@@ -268,13 +287,16 @@ inline MxBool MxListCursor<T>::Prev()
 template <class T>
 inline MxBool MxListCursor<T>::Prev(T& p_obj)
 {
-	if (!m_match)
+	if (!m_match) {
 		m_match = m_list->m_last;
-	else
+	}
+	else {
 		m_match = m_match->GetPrev();
+	}
 
-	if (m_match)
+	if (m_match) {
 		p_obj = m_match->GetValue();
+	}
 
 	return m_match != NULL;
 }
@@ -282,8 +304,9 @@ inline MxBool MxListCursor<T>::Prev(T& p_obj)
 template <class T>
 inline MxBool MxListCursor<T>::Current(T& p_obj)
 {
-	if (m_match)
+	if (m_match) {
 		p_obj = m_match->GetValue();
+	}
 
 	return m_match != NULL;
 }
@@ -292,8 +315,9 @@ template <class T>
 inline MxBool MxListCursor<T>::First(T& p_obj)
 {
 	m_match = m_list->m_first;
-	if (m_match)
+	if (m_match) {
 		p_obj = m_match->GetValue();
+	}
 
 	return m_match != NULL;
 }
@@ -302,8 +326,9 @@ template <class T>
 inline MxBool MxListCursor<T>::Last(T& p_obj)
 {
 	m_match = m_list->m_last;
-	if (m_match)
+	if (m_match) {
 		p_obj = m_match->GetValue();
+	}
 
 	return m_match != NULL;
 }
@@ -311,15 +336,17 @@ inline MxBool MxListCursor<T>::Last(T& p_obj)
 template <class T>
 inline void MxListCursor<T>::SetValue(T p_obj)
 {
-	if (m_match)
+	if (m_match) {
 		m_match->SetValue(p_obj);
+	}
 }
 
 template <class T>
 inline void MxListCursor<T>::Prepend(T p_newobj)
 {
-	if (m_match)
+	if (m_match) {
 		m_list->InsertEntry(p_newobj, m_match->GetPrev(), m_match);
+	}
 }
 
 #endif // MXLIST_H
diff --git a/LEGO1/omni/include/mxloopingflcpresenter.h b/LEGO1/omni/include/mxloopingflcpresenter.h
index e9cfac1a..1bc76e18 100644
--- a/LEGO1/omni/include/mxloopingflcpresenter.h
+++ b/LEGO1/omni/include/mxloopingflcpresenter.h
@@ -9,20 +9,20 @@
 class MxLoopingFlcPresenter : public MxFlcPresenter {
 public:
 	MxLoopingFlcPresenter();
-	virtual ~MxLoopingFlcPresenter() override;
+	~MxLoopingFlcPresenter() override;
 
 	// FUNCTION: LEGO1 0x100b4380
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x10101e20
 		return "MxLoopingFlcPresenter";
 	}
 
-	virtual void RepeatingTickle() override;  // vtable+0x24
-	virtual MxResult AddToManager() override; // vtable+0x34
-	virtual void Destroy() override;          // vtable+0x38
-	virtual void NextFrame() override;        // vtable+0x64
-	virtual void VTable0x88();                // vtable+0x88
+	void RepeatingTickle() override;  // vtable+0x24
+	MxResult AddToManager() override; // vtable+0x34
+	void Destroy() override;          // vtable+0x38
+	void NextFrame() override;        // vtable+0x64
+	virtual void VTable0x88();        // vtable+0x88
 
 	// SYNTHETIC: LEGO1 0x100b4390
 	// MxLoopingFlcPresenter::`scalar deleting destructor'
diff --git a/LEGO1/omni/include/mxloopingmidipresenter.h b/LEGO1/omni/include/mxloopingmidipresenter.h
index 81ccab74..1a9eff73 100644
--- a/LEGO1/omni/include/mxloopingmidipresenter.h
+++ b/LEGO1/omni/include/mxloopingmidipresenter.h
@@ -8,21 +8,21 @@
 class MxLoopingMIDIPresenter : public MxMIDIPresenter {
 public:
 	// FUNCTION: LEGO1 0x100b1830
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x10101de0
 		return "MxLoopingMIDIPresenter";
 	}
 
 	// FUNCTION: LEGO1 0x100b1840
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, MxLoopingMIDIPresenter::ClassName()) || MxMIDIPresenter::IsA(p_name);
 	}
 
-	virtual void StreamingTickle() override; // vtable+0x20
-	virtual void DoneTickle() override;      // vtable+0x2c
-	virtual MxResult PutData() override;     // vtable+0x4c
+	void StreamingTickle() override; // vtable+0x20
+	void DoneTickle() override;      // vtable+0x2c
+	MxResult PutData() override;     // vtable+0x4c
 };
 
 // SYNTHETIC: LEGO1 0x100b19c0
diff --git a/LEGO1/omni/include/mxloopingsmkpresenter.h b/LEGO1/omni/include/mxloopingsmkpresenter.h
index 832b4263..de0f506f 100644
--- a/LEGO1/omni/include/mxloopingsmkpresenter.h
+++ b/LEGO1/omni/include/mxloopingsmkpresenter.h
@@ -9,21 +9,21 @@
 class MxLoopingSmkPresenter : public MxSmkPresenter {
 public:
 	MxLoopingSmkPresenter();
-	virtual ~MxLoopingSmkPresenter() override; // vtable+0x00
+	~MxLoopingSmkPresenter() override; // vtable+0x00
 
 	// FUNCTION: LEGO1 0x100b4920
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x10101e08
 		return "MxLoopingSmkPresenter";
 	}
 
-	virtual void RepeatingTickle() override;  // vtable+0x24
-	virtual MxResult AddToManager() override; // vtable+0x34
-	virtual void Destroy() override;          // vtable+0x38
-	virtual void NextFrame() override;        // vtable+0x64
-	virtual void VTable0x88() override;       // vtable+0x88
-	virtual void VTable0x8c();                // vtable+0x8c
+	void RepeatingTickle() override;  // vtable+0x24
+	MxResult AddToManager() override; // vtable+0x34
+	void Destroy() override;          // vtable+0x38
+	void NextFrame() override;        // vtable+0x64
+	void VTable0x88() override;       // vtable+0x88
+	virtual void VTable0x8c();        // vtable+0x8c
 
 private:
 	void Init();
diff --git a/LEGO1/omni/include/mxmediamanager.h b/LEGO1/omni/include/mxmediamanager.h
index d531e5c7..77720bf3 100644
--- a/LEGO1/omni/include/mxmediamanager.h
+++ b/LEGO1/omni/include/mxmediamanager.h
@@ -12,9 +12,9 @@
 class MxMediaManager : public MxCore {
 public:
 	MxMediaManager();
-	virtual ~MxMediaManager() override;
+	~MxMediaManager() override;
 
-	virtual MxResult Tickle() override;                         // vtable+08
+	MxResult Tickle() override;                                 // vtable+08
 	virtual MxResult InitPresenters();                          // vtable+14
 	virtual void Destroy();                                     // vtable+18
 	virtual void RegisterPresenter(MxPresenter& p_presenter);   // vtable+1c
diff --git a/LEGO1/omni/include/mxmediapresenter.h b/LEGO1/omni/include/mxmediapresenter.h
index f73cf2bf..fba44880 100644
--- a/LEGO1/omni/include/mxmediapresenter.h
+++ b/LEGO1/omni/include/mxmediapresenter.h
@@ -13,34 +13,34 @@ class MxMediaPresenter : public MxPresenter {
 	inline MxMediaPresenter() { Init(); }
 
 	// FUNCTION: LEGO1 0x1000c550
-	virtual ~MxMediaPresenter() override { Destroy(TRUE); }
+	~MxMediaPresenter() override { Destroy(TRUE); }
 
-	virtual MxResult Tickle() override; // vtable+0x08
+	MxResult Tickle() override; // vtable+0x08
 
 	// FUNCTION: LEGO1 0x1000c5c0
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f074c
 		return "MxMediaPresenter";
 	}
 
 	// FUNCTION: LEGO1 0x1000c5d0
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, MxMediaPresenter::ClassName()) || MxPresenter::IsA(p_name);
 	}
 
-	virtual void StreamingTickle() override; // vtable+0x20
-	virtual void RepeatingTickle() override; // vtable+0x24
-	virtual void DoneTickle() override;      // vtable+0x2c
+	void StreamingTickle() override; // vtable+0x20
+	void RepeatingTickle() override; // vtable+0x24
+	void DoneTickle() override;      // vtable+0x2c
 
 	// FUNCTION: LEGO1 0x1000c5b0
-	virtual void Destroy() override { Destroy(FALSE); } // vtable+0x38
+	void Destroy() override { Destroy(FALSE); } // vtable+0x38
 
-	virtual MxResult StartAction(MxStreamController*, MxDSAction*) override; // vtable+0x3c
-	virtual void EndAction() override;                                       // vtable+0x40
-	virtual void Enable(MxBool p_enable) override;                           // vtable+0x54
-	virtual void LoopChunk(MxStreamChunk* p_chunk);                          // vtable+0x58
+	MxResult StartAction(MxStreamController*, MxDSAction*) override; // vtable+0x3c
+	void EndAction() override;                                       // vtable+0x40
+	void Enable(MxBool p_enable) override;                           // vtable+0x54
+	virtual void LoopChunk(MxStreamChunk* p_chunk);                  // vtable+0x58
 
 	// SYNTHETIC: LEGO1 0x1000c680
 	// MxMediaPresenter::`scalar deleting destructor'
diff --git a/LEGO1/omni/include/mxmidipresenter.h b/LEGO1/omni/include/mxmidipresenter.h
index 1abab9d1..3dabbc0e 100644
--- a/LEGO1/omni/include/mxmidipresenter.h
+++ b/LEGO1/omni/include/mxmidipresenter.h
@@ -9,29 +9,29 @@
 class MxMIDIPresenter : public MxMusicPresenter {
 public:
 	MxMIDIPresenter();
-	virtual ~MxMIDIPresenter() override;
+	~MxMIDIPresenter() override;
 
 	// FUNCTION: LEGO1 0x100c2650
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x10101df8
 		return "MxMIDIPresenter";
 	}
 
 	// FUNCTION: LEGO1 0x100c2660
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, MxMIDIPresenter::ClassName()) || MxMusicPresenter::IsA(p_name);
 	}
 
-	virtual void ReadyTickle() override;             // vtable+0x18
-	virtual void StartingTickle() override;          // vtable+0x1c
-	virtual void StreamingTickle() override;         // vtable+0x20
-	virtual void DoneTickle() override;              // vtable+0x2c
-	virtual void Destroy() override;                 // vtable+0x38
-	virtual void EndAction() override;               // vtable+0x40
-	virtual MxResult PutData() override;             // vtable+0x4c
-	virtual void SetVolume(MxS32 p_volume) override; // vtable+0x60
+	void ReadyTickle() override;             // vtable+0x18
+	void StartingTickle() override;          // vtable+0x1c
+	void StreamingTickle() override;         // vtable+0x20
+	void DoneTickle() override;              // vtable+0x2c
+	void Destroy() override;                 // vtable+0x38
+	void EndAction() override;               // vtable+0x40
+	MxResult PutData() override;             // vtable+0x4c
+	void SetVolume(MxS32 p_volume) override; // vtable+0x60
 
 	// SYNTHETIC: LEGO1 0x100c27a0
 	// MxMIDIPresenter::`scalar deleting destructor'
diff --git a/LEGO1/omni/include/mxmusicmanager.h b/LEGO1/omni/include/mxmusicmanager.h
index 2a8b30e5..1107e7e3 100644
--- a/LEGO1/omni/include/mxmusicmanager.h
+++ b/LEGO1/omni/include/mxmusicmanager.h
@@ -11,10 +11,10 @@
 class MxMusicManager : public MxAudioManager {
 public:
 	MxMusicManager();
-	virtual ~MxMusicManager() override;
+	~MxMusicManager() override;
 
-	virtual void Destroy() override;                                     // vtable+18
-	virtual void SetVolume(MxS32 p_volume) override;                     // vtable+2c
+	void Destroy() override;                                             // vtable+18
+	void SetVolume(MxS32 p_volume) override;                             // vtable+2c
 	virtual MxResult Create(MxU32 p_frequencyMS, MxBool p_createThread); // vtable+30
 
 	inline MxBool GetMIDIInitialized() { return m_midiInitialized; }
diff --git a/LEGO1/omni/include/mxmusicpresenter.h b/LEGO1/omni/include/mxmusicpresenter.h
index 7b8948cd..a66afa78 100644
--- a/LEGO1/omni/include/mxmusicpresenter.h
+++ b/LEGO1/omni/include/mxmusicpresenter.h
@@ -8,23 +8,23 @@
 class MxMusicPresenter : public MxAudioPresenter {
 public:
 	MxMusicPresenter();
-	virtual ~MxMusicPresenter() override;
+	~MxMusicPresenter() override;
 
 	// FUNCTION: LEGO1 0x100c23a0
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x10101e48
 		return "MxMusicPresenter";
 	}
 
 	// FUNCTION: LEGO1 0x100c23b0
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, MxMusicPresenter::ClassName()) || MxAudioPresenter::IsA(p_name);
 	}
 
-	virtual MxResult AddToManager() override; // vtable+0x34
-	virtual void Destroy() override;          // vtable+0x38
+	MxResult AddToManager() override; // vtable+0x34
+	void Destroy() override;          // vtable+0x38
 
 	// SYNTHETIC: LEGO1 0x100c24c0
 	// MxMusicPresenter::`scalar deleting destructor'
diff --git a/LEGO1/omni/include/mxnextactiondatastart.h b/LEGO1/omni/include/mxnextactiondatastart.h
index de425989..0f08ec75 100644
--- a/LEGO1/omni/include/mxnextactiondatastart.h
+++ b/LEGO1/omni/include/mxnextactiondatastart.h
@@ -16,14 +16,14 @@ class MxNextActionDataStart : public MxCore {
 	}
 
 	// FUNCTION: LEGO1 0x100c1900
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x101025a0
 		return "MxNextActionDataStart";
 	}
 
 	// FUNCTION: LEGO1 0x100c1910
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, MxNextActionDataStart::ClassName()) || MxCore::IsA(p_name);
 	}
diff --git a/LEGO1/omni/include/mxnotificationmanager.h b/LEGO1/omni/include/mxnotificationmanager.h
index 829473b8..287ae40b 100644
--- a/LEGO1/omni/include/mxnotificationmanager.h
+++ b/LEGO1/omni/include/mxnotificationmanager.h
@@ -36,9 +36,9 @@ class MxNotificationManager : public MxCore {
 
 public:
 	MxNotificationManager();
-	virtual ~MxNotificationManager(); // vtable+0x00 (scalar deleting destructor)
+	~MxNotificationManager() override; // vtable+0x00 (scalar deleting destructor)
 
-	virtual MxResult Tickle(); // vtable+0x08
+	MxResult Tickle() override; // vtable+0x08
 	// TODO: Where does this method come from?
 	virtual MxResult Create(MxU32 p_frequencyMS, MxBool p_createThread); // vtable+0x14
 	void Register(MxCore* p_listener);
diff --git a/LEGO1/omni/include/mxobjectfactory.h b/LEGO1/omni/include/mxobjectfactory.h
index 3f74f1c4..aed354c4 100644
--- a/LEGO1/omni/include/mxobjectfactory.h
+++ b/LEGO1/omni/include/mxobjectfactory.h
@@ -24,14 +24,14 @@ class MxObjectFactory : public MxCore {
 	MxObjectFactory();
 
 	// FUNCTION: LEGO1 0x10008f70
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f0730
 		return "MxObjectFactory";
 	}
 
 	// FUNCTION: LEGO1 0x10008f80
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, MxObjectFactory::ClassName()) || MxCore::IsA(p_name);
 	}
diff --git a/LEGO1/omni/include/mxomni.h b/LEGO1/omni/include/mxomni.h
index a2092168..7f0a0362 100644
--- a/LEGO1/omni/include/mxomni.h
+++ b/LEGO1/omni/include/mxomni.h
@@ -38,9 +38,9 @@ class MxOmni : public MxCore {
 	static void SetSound3D(MxBool p_use3dSound);
 
 	MxOmni();
-	virtual ~MxOmni() override;
+	~MxOmni() override;
 
-	virtual MxLong Notify(MxParam& p_param) override;                                         // vtable+04
+	MxLong Notify(MxParam& p_param) override;                                                 // vtable+04
 	virtual void Init();                                                                      // vtable+14
 	virtual MxResult Create(MxOmniCreateParam& p_param);                                      // vtable+18
 	virtual void Destroy();                                                                   // vtable+1c
diff --git a/LEGO1/omni/include/mxpalette.h b/LEGO1/omni/include/mxpalette.h
index 4a1eebf0..4f38c91b 100644
--- a/LEGO1/omni/include/mxpalette.h
+++ b/LEGO1/omni/include/mxpalette.h
@@ -15,7 +15,7 @@ class MxPalette : public MxCore {
 
 	MxPalette();
 	MxPalette(const RGBQUAD*);
-	virtual ~MxPalette();
+	~MxPalette() override;
 
 	void ApplySystemEntriesToPalette(LPPALETTEENTRY p_entries);
 	MxPalette* Clone();
diff --git a/LEGO1/omni/include/mxpresenter.h b/LEGO1/omni/include/mxpresenter.h
index 6198cd09..cd403949 100644
--- a/LEGO1/omni/include/mxpresenter.h
+++ b/LEGO1/omni/include/mxpresenter.h
@@ -29,19 +29,19 @@ class MxPresenter : public MxCore {
 	MxPresenter() { Init(); }
 
 	// FUNCTION: LEGO1 0x1000bf00
-	virtual ~MxPresenter() override{}; // vtable+0x00
+	~MxPresenter() override{}; // vtable+0x00
 
-	virtual MxResult Tickle() override; // vtable+0x08
+	MxResult Tickle() override; // vtable+0x08
 
 	// FUNCTION: LEGO1 0x1000bfe0
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f0740
 		return "MxPresenter";
 	}
 
 	// FUNCTION: LEGO1 0x1000bff0
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, MxPresenter::ClassName()) || MxCore::IsA(p_name);
 	}
diff --git a/LEGO1/omni/include/mxpresenterlist.h b/LEGO1/omni/include/mxpresenterlist.h
index dd119621..1c52f360 100644
--- a/LEGO1/omni/include/mxpresenterlist.h
+++ b/LEGO1/omni/include/mxpresenterlist.h
@@ -14,7 +14,7 @@ class MxPresenterList : public MxPtrList<MxPresenter> {
 	MxPresenterList(MxBool p_ownership = FALSE) : MxPtrList<MxPresenter>(p_ownership) {}
 
 	// FUNCTION: LEGO1 0x1001cd00
-	virtual MxS8 Compare(MxPresenter* p_a, MxPresenter* p_b) override
+	MxS8 Compare(MxPresenter* p_a, MxPresenter* p_b) override
 	{
 		return p_a == p_b ? 0 : p_a < p_b ? -1 : 1;
 	} // vtable+0x14
diff --git a/LEGO1/omni/include/mxramstreamcontroller.h b/LEGO1/omni/include/mxramstreamcontroller.h
index 00e1b06d..820fc3f7 100644
--- a/LEGO1/omni/include/mxramstreamcontroller.h
+++ b/LEGO1/omni/include/mxramstreamcontroller.h
@@ -12,22 +12,22 @@ class MxRAMStreamController : public MxStreamController {
 	inline MxRAMStreamController() {}
 
 	// FUNCTION: LEGO1 0x100b9430
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x10102118
 		return "MxRAMStreamController";
 	}
 
 	// FUNCTION: LEGO1 0x100b9440
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, MxRAMStreamController::ClassName()) ||
 			   !strcmp(p_name, MxStreamController::ClassName()) || MxCore::IsA(p_name);
 	}
 
-	virtual MxResult Open(const char* p_filename) override;
-	virtual MxResult VTable0x20(MxDSAction* p_action) override;
-	virtual MxResult VTable0x24(MxDSAction* p_action) override;
+	MxResult Open(const char* p_filename) override;
+	MxResult VTable0x20(MxDSAction* p_action) override;
+	MxResult VTable0x24(MxDSAction* p_action) override;
 
 private:
 	MxDSBuffer m_buffer; // 0x64
diff --git a/LEGO1/omni/include/mxramstreamprovider.h b/LEGO1/omni/include/mxramstreamprovider.h
index c994b848..08c1ea95 100644
--- a/LEGO1/omni/include/mxramstreamprovider.h
+++ b/LEGO1/omni/include/mxramstreamprovider.h
@@ -8,26 +8,26 @@
 class MxRAMStreamProvider : public MxStreamProvider {
 public:
 	MxRAMStreamProvider();
-	virtual ~MxRAMStreamProvider() override;
+	~MxRAMStreamProvider() override;
 
 	// FUNCTION: LEGO1 0x100d0970
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x10102864
 		return "MxRAMStreamProvider";
 	}
 
 	// FUNCTION: LEGO1 0x100d0980
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, MxRAMStreamProvider::ClassName()) || MxStreamProvider::IsA(p_name);
 	}
 
-	virtual MxResult SetResourceToGet(MxStreamController* p_resource) override; // vtable+0x14
-	virtual MxU32 GetFileSize() override;                                       // vtable+0x18
-	virtual MxS32 GetStreamBuffersNum() override;                               // vtable+0x1c
-	virtual MxU32 GetLengthInDWords() override;                                 // vtable+0x24
-	virtual MxU32* GetBufferForDWords() override;                               // vtable+0x28
+	MxResult SetResourceToGet(MxStreamController* p_resource) override; // vtable+0x14
+	MxU32 GetFileSize() override;                                       // vtable+0x18
+	MxS32 GetStreamBuffersNum() override;                               // vtable+0x1c
+	MxU32 GetLengthInDWords() override;                                 // vtable+0x24
+	MxU32* GetBufferForDWords() override;                               // vtable+0x28
 
 	inline MxU8* GetBufferOfFileSize() { return m_pBufferOfFileSize; }
 
diff --git a/LEGO1/omni/include/mxregion.h b/LEGO1/omni/include/mxregion.h
index 5659ba81..3bf639e1 100644
--- a/LEGO1/omni/include/mxregion.h
+++ b/LEGO1/omni/include/mxregion.h
@@ -11,7 +11,7 @@
 class MxRegion : public MxCore {
 public:
 	MxRegion();
-	virtual ~MxRegion() override;
+	~MxRegion() override;
 
 	virtual void Reset();                        // vtable+0x14
 	virtual void VTable0x18(MxRect32& p_rect);   // vtable+0x18
diff --git a/LEGO1/omni/include/mxregioncursor.h b/LEGO1/omni/include/mxregioncursor.h
index 5f4a24b8..e114c7ed 100644
--- a/LEGO1/omni/include/mxregioncursor.h
+++ b/LEGO1/omni/include/mxregioncursor.h
@@ -8,7 +8,7 @@
 class MxRegionCursor : public MxCore {
 public:
 	MxRegionCursor(MxRegion* p_region);
-	virtual ~MxRegionCursor() override;
+	~MxRegionCursor() override;
 
 	virtual MxRect32* VTable0x14(MxRect32& p_rect); // vtable+0x14
 	virtual MxRect32* VTable0x18();                 // vtable+0x18
diff --git a/LEGO1/omni/include/mxsmkpresenter.h b/LEGO1/omni/include/mxsmkpresenter.h
index b9dcc341..d17ce59d 100644
--- a/LEGO1/omni/include/mxsmkpresenter.h
+++ b/LEGO1/omni/include/mxsmkpresenter.h
@@ -10,28 +10,28 @@
 class MxSmkPresenter : public MxVideoPresenter {
 public:
 	MxSmkPresenter();
-	virtual ~MxSmkPresenter() override;
+	~MxSmkPresenter() override;
 
 	// FUNCTION: LEGO1 0x100b3730
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x10101e38
 		return "MxSmkPresenter";
 	}
 
 	// FUNCTION: LEGO1 0x100b3740
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, MxSmkPresenter::ClassName()) || MxVideoPresenter::IsA(p_name);
 	}
 
-	virtual MxResult AddToManager() override;                 // vtable+0x34
-	virtual void Destroy() override;                          // vtable+0x38
-	virtual void LoadHeader(MxStreamChunk* p_chunk) override; // vtable+0x5c
-	virtual void CreateBitmap() override;                     // vtable+0x60
-	virtual void LoadFrame(MxStreamChunk* p_chunk) override;  // vtable+0x68
-	virtual void RealizePalette() override;                   // vtable+0x70
-	virtual void VTable0x88();                                // vtable+0x88
+	MxResult AddToManager() override;                 // vtable+0x34
+	void Destroy() override;                          // vtable+0x38
+	void LoadHeader(MxStreamChunk* p_chunk) override; // vtable+0x5c
+	void CreateBitmap() override;                     // vtable+0x60
+	void LoadFrame(MxStreamChunk* p_chunk) override;  // vtable+0x68
+	void RealizePalette() override;                   // vtable+0x70
+	virtual void VTable0x88();                        // vtable+0x88
 
 	// SYNTHETIC: LEGO1 0x100b3850
 	// MxSmkPresenter::`scalar deleting destructor'
diff --git a/LEGO1/omni/include/mxsoundmanager.h b/LEGO1/omni/include/mxsoundmanager.h
index c0bec1bb..9e065ef0 100644
--- a/LEGO1/omni/include/mxsoundmanager.h
+++ b/LEGO1/omni/include/mxsoundmanager.h
@@ -12,10 +12,10 @@
 class MxSoundManager : public MxAudioManager {
 public:
 	MxSoundManager();
-	virtual ~MxSoundManager() override; // vtable+0x00
+	~MxSoundManager() override; // vtable+0x00
 
-	virtual void Destroy() override;                                     // vtable+0x18
-	virtual void SetVolume(MxS32 p_volume) override;                     // vtable+0x2c
+	void Destroy() override;                                             // vtable+0x18
+	void SetVolume(MxS32 p_volume) override;                             // vtable+0x2c
 	virtual MxResult Create(MxU32 p_frequencyMS, MxBool p_createThread); // vtable+0x30
 	virtual void Pause();                                                // vtable+0x34
 	virtual void Resume();                                               // vtable+0x38
diff --git a/LEGO1/omni/include/mxsoundpresenter.h b/LEGO1/omni/include/mxsoundpresenter.h
index 4d1ab300..1281b2be 100644
--- a/LEGO1/omni/include/mxsoundpresenter.h
+++ b/LEGO1/omni/include/mxsoundpresenter.h
@@ -9,25 +9,25 @@
 class MxSoundPresenter : public MxAudioPresenter {
 public:
 	// FUNCTION: LEGO1 0x1000d430
-	virtual ~MxSoundPresenter() override { Destroy(TRUE); }
+	~MxSoundPresenter() override { Destroy(TRUE); }
 
 	// FUNCTION: LEGO1 0x1000d4a0
-	inline virtual const char* ClassName() const // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f07a0
 		return "MxSoundPresenter";
 	}
 
 	// FUNCTION: LEGO1 0x1000d4b0
-	inline virtual MxBool IsA(const char* p_name) const // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, MxSoundPresenter::ClassName()) || MxAudioPresenter::IsA(p_name);
 	}
 
-	virtual MxResult AddToManager() override; // vtable+0x34
+	MxResult AddToManager() override; // vtable+0x34
 
 	// FUNCTION: LEGO1 0x1000d490
-	virtual void Destroy() override { Destroy(FALSE); } // vtable+0x38
+	void Destroy() override { Destroy(FALSE); } // vtable+0x38
 
 	// SYNTHETIC: LEGO1 0x1000d5c0
 	// MxSoundPresenter::`scalar deleting destructor'
diff --git a/LEGO1/omni/include/mxstillpresenter.h b/LEGO1/omni/include/mxstillpresenter.h
index a559b7e5..2a64aa09 100644
--- a/LEGO1/omni/include/mxstillpresenter.h
+++ b/LEGO1/omni/include/mxstillpresenter.h
@@ -11,37 +11,37 @@ class MxStillPresenter : public MxVideoPresenter {
 	MxStillPresenter() { m_bitmapInfo = NULL; }
 
 	// FUNCTION: LEGO1 0x10043550
-	virtual ~MxStillPresenter() override { Destroy(TRUE); } // vtable+0x00
+	~MxStillPresenter() override { Destroy(TRUE); } // vtable+0x00
 
 	// FUNCTION: LEGO1 0x100435c0
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f0184
 		return "MxStillPresenter";
 	}
 
 	// FUNCTION: LEGO1 0x100435d0
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, MxStillPresenter::ClassName()) || MxVideoPresenter::IsA(p_name);
 	}
 
-	virtual void StartingTickle() override;  // vtable+0x1c
-	virtual void StreamingTickle() override; // vtable+0x20
-	virtual void RepeatingTickle() override; // vtable+0x24
-	virtual void ParseExtra() override;      // vtable+0x30
+	void StartingTickle() override;  // vtable+0x1c
+	void StreamingTickle() override; // vtable+0x20
+	void RepeatingTickle() override; // vtable+0x24
+	void ParseExtra() override;      // vtable+0x30
 
 	// FUNCTION: LEGO1 0x100435b0
-	virtual void Destroy() override { Destroy(FALSE); } // vtable+0x38
+	void Destroy() override { Destroy(FALSE); } // vtable+0x38
 
-	virtual void Enable(MxBool p_enable) override;            // vtable+0x54
-	virtual void LoadHeader(MxStreamChunk* p_chunk) override; // vtable+0x5c
-	virtual void CreateBitmap() override;                     // vtable+0x60
-	virtual void NextFrame() override;                        // vtable+0x64
-	virtual void LoadFrame(MxStreamChunk* p_chunk) override;  // vtable+0x68
-	virtual void RealizePalette() override;                   // vtable+0x70
-	virtual void VTable0x88(MxS32 p_x, MxS32 p_y);            // vtable+0x88
-	virtual MxStillPresenter* Clone();                        // vtable+0x8c
+	void Enable(MxBool p_enable) override;            // vtable+0x54
+	void LoadHeader(MxStreamChunk* p_chunk) override; // vtable+0x5c
+	void CreateBitmap() override;                     // vtable+0x60
+	void NextFrame() override;                        // vtable+0x64
+	void LoadFrame(MxStreamChunk* p_chunk) override;  // vtable+0x68
+	void RealizePalette() override;                   // vtable+0x70
+	virtual void VTable0x88(MxS32 p_x, MxS32 p_y);    // vtable+0x88
+	virtual MxStillPresenter* Clone();                // vtable+0x8c
 
 private:
 	void Destroy(MxBool p_fromDestructor);
diff --git a/LEGO1/omni/include/mxstreamchunk.h b/LEGO1/omni/include/mxstreamchunk.h
index baa5edda..00e242d0 100644
--- a/LEGO1/omni/include/mxstreamchunk.h
+++ b/LEGO1/omni/include/mxstreamchunk.h
@@ -12,17 +12,17 @@ class MxStreamListMxDSSubscriber;
 class MxStreamChunk : public MxDSChunk {
 public:
 	inline MxStreamChunk() : m_buffer(NULL) {}
-	virtual ~MxStreamChunk() override;
+	~MxStreamChunk() override;
 
 	// FUNCTION: LEGO1 0x100b1fe0
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x10101e5c
 		return "MxStreamChunk";
 	}
 
 	// FUNCTION: LEGO1 0x100b1ff0
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, MxStreamChunk::ClassName()) || MxDSChunk::IsA(p_name);
 	}
diff --git a/LEGO1/omni/include/mxstreamchunklist.h b/LEGO1/omni/include/mxstreamchunklist.h
index 9d8aec0e..defdd4a0 100644
--- a/LEGO1/omni/include/mxstreamchunklist.h
+++ b/LEGO1/omni/include/mxstreamchunklist.h
@@ -19,7 +19,7 @@ class MxStreamChunkList : public MxList<MxStreamChunk*> {
 	MxStreamChunkList() { m_customDestructor = Destroy; }
 
 	// FUNCTION: LEGO1 0x100b5900
-	virtual MxS8 Compare(MxStreamChunk* p_a, MxStreamChunk* p_b) override
+	MxS8 Compare(MxStreamChunk* p_a, MxStreamChunk* p_b) override
 	{
 		return p_a == p_b ? 0 : p_a < p_b ? -1 : 1;
 	} // vtable+0x14
diff --git a/LEGO1/omni/include/mxstreamcontroller.h b/LEGO1/omni/include/mxstreamcontroller.h
index a23c2537..f4bd328f 100644
--- a/LEGO1/omni/include/mxstreamcontroller.h
+++ b/LEGO1/omni/include/mxstreamcontroller.h
@@ -19,17 +19,17 @@ class MxDSStreamingAction;
 class MxStreamController : public MxCore {
 public:
 	MxStreamController();
-	virtual ~MxStreamController() override; // vtable+0x00
+	~MxStreamController() override; // vtable+0x00
 
 	// FUNCTION: LEGO1 0x100c0f10
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x10102130
 		return "MxStreamController";
 	}
 
 	// FUNCTION: LEGO1 0x100c0f20
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, MxStreamController::ClassName()) || MxCore::IsA(p_name);
 	}
diff --git a/LEGO1/omni/include/mxstreamer.h b/LEGO1/omni/include/mxstreamer.h
index 86c8956e..2308981d 100644
--- a/LEGO1/omni/include/mxstreamer.h
+++ b/LEGO1/omni/include/mxstreamer.h
@@ -58,7 +58,7 @@ class MxStreamerNotification : public MxNotificationParam {
 		m_controller = p_ctrlr;
 	}
 
-	virtual MxNotificationParam* Clone() override;
+	MxNotificationParam* Clone() override;
 
 	MxStreamController* GetController() { return m_controller; }
 
@@ -76,22 +76,22 @@ class MxStreamer : public MxCore {
 	};
 
 	MxStreamer();
-	virtual ~MxStreamer() override; // vtable+0x00
+	~MxStreamer() override; // vtable+0x00
 
 	MxStreamController* Open(const char* p_name, MxU16 p_openMode);
 	MxLong Close(const char* p_name);
 
-	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x04
+	MxLong Notify(MxParam& p_param) override; // vtable+0x04
 
 	// FUNCTION: LEGO1 0x100b9000
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x1010210c
 		return "MxStreamer";
 	}
 
 	// FUNCTION: LEGO1 0x100b9010
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, MxStreamer::ClassName()) || MxCore::IsA(p_name);
 	}
diff --git a/LEGO1/omni/include/mxstreamlist.h b/LEGO1/omni/include/mxstreamlist.h
index 08cee5bc..0e0f1e9f 100644
--- a/LEGO1/omni/include/mxstreamlist.h
+++ b/LEGO1/omni/include/mxstreamlist.h
@@ -11,8 +11,9 @@ class MxStreamList : public list<T> {
 public:
 	MxBool PopFront(T& p_obj)
 	{
-		if (this->empty())
+		if (this->empty()) {
 			return FALSE;
+		}
 
 		p_obj = this->front();
 		this->pop_front();
@@ -29,8 +30,9 @@ class MxStreamListMxDSAction : public MxStreamList<MxDSAction*> {
 	// instead of MxDSAction. Until then, we use this helper.
 	MxBool PopFrontStreamingAction(MxDSStreamingAction*& p_obj)
 	{
-		if (empty())
+		if (empty()) {
 			return FALSE;
+		}
 
 		p_obj = (MxDSStreamingAction*) front();
 		pop_front();
diff --git a/LEGO1/omni/include/mxstreamprovider.h b/LEGO1/omni/include/mxstreamprovider.h
index 803038e3..1082fffe 100644
--- a/LEGO1/omni/include/mxstreamprovider.h
+++ b/LEGO1/omni/include/mxstreamprovider.h
@@ -15,13 +15,13 @@ class MxStreamProvider : public MxCore {
 	inline MxStreamProvider() : m_pLookup(NULL), m_pFile(NULL) {}
 
 	// FUNCTION: LEGO1 0x100d07e0
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		return "MxStreamProvider";
 	}
 
 	// FUNCTION: LEGO1 0x100d07f0
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, MxStreamProvider::ClassName()) || MxCore::IsA(p_name);
 	}
diff --git a/LEGO1/omni/include/mxstring.h b/LEGO1/omni/include/mxstring.h
index 1c745845..3ad5ac4e 100644
--- a/LEGO1/omni/include/mxstring.h
+++ b/LEGO1/omni/include/mxstring.h
@@ -8,7 +8,7 @@
 class MxString : public MxCore {
 public:
 	MxString(const MxString& p_str);
-	virtual ~MxString();
+	~MxString() override;
 	const MxString& operator=(const char* p_data);
 
 	MxString();
diff --git a/LEGO1/omni/include/mxthread.h b/LEGO1/omni/include/mxthread.h
index 5ab80041..93b14fb1 100644
--- a/LEGO1/omni/include/mxthread.h
+++ b/LEGO1/omni/include/mxthread.h
@@ -47,7 +47,7 @@ class MxThread {
 class MxTickleThread : public MxThread {
 public:
 	MxTickleThread(MxCore* p_target, MxS32 p_frequencyMS);
-	virtual ~MxTickleThread() {}
+	~MxTickleThread() override {}
 
 	MxResult Run() override;
 
diff --git a/LEGO1/omni/include/mxticklemanager.h b/LEGO1/omni/include/mxticklemanager.h
index dba9b029..f07d0dc3 100644
--- a/LEGO1/omni/include/mxticklemanager.h
+++ b/LEGO1/omni/include/mxticklemanager.h
@@ -36,9 +36,9 @@ typedef list<MxTickleClient*> MxTickleClientPtrList;
 class MxTickleManager : public MxCore {
 public:
 	inline MxTickleManager() {}
-	virtual ~MxTickleManager(); // vtable+0x00 (scalar deleting destructor)
+	~MxTickleManager() override; // vtable+0x00 (scalar deleting destructor)
 
-	virtual MxResult Tickle();                                                 // vtable+0x08
+	MxResult Tickle() override;                                                // vtable+0x08
 	virtual void RegisterClient(MxCore* p_client, MxTime p_interval);          // vtable+0x14
 	virtual void UnregisterClient(MxCore* p_client);                           // vtable+0x18
 	virtual void SetClientTickleInterval(MxCore* p_client, MxTime p_interval); // vtable+0x1c
diff --git a/LEGO1/omni/include/mxtimer.h b/LEGO1/omni/include/mxtimer.h
index f9851c44..468cd602 100644
--- a/LEGO1/omni/include/mxtimer.h
+++ b/LEGO1/omni/include/mxtimer.h
@@ -16,10 +16,12 @@ class MxTimer : public MxCore {
 
 	inline MxLong GetTime()
 	{
-		if (this->m_isRunning)
+		if (this->m_isRunning) {
 			return g_lastTimeTimerStarted;
-		else
+		}
+		else {
 			return g_lastTimeCalculated - this->m_startTime;
+		}
 	}
 
 	// SYNTHETIC: LEGO1 0x100ae0d0
diff --git a/LEGO1/omni/include/mxvariabletable.h b/LEGO1/omni/include/mxvariabletable.h
index 1eec195f..81059f9d 100644
--- a/LEGO1/omni/include/mxvariabletable.h
+++ b/LEGO1/omni/include/mxvariabletable.h
@@ -16,8 +16,8 @@ class MxVariableTable : public MxHashTable<MxVariable*> {
 
 	static void Destroy(MxVariable* p_obj) { p_obj->Destroy(); }
 
-	virtual MxS8 Compare(MxVariable*, MxVariable*) override; // vtable+0x14
-	virtual MxU32 Hash(MxVariable*) override;                // vtable+0x18
+	MxS8 Compare(MxVariable*, MxVariable*) override; // vtable+0x14
+	MxU32 Hash(MxVariable*) override;                // vtable+0x18
 
 	// SYNTHETIC: LEGO1 0x100afdd0
 	// MxVariableTable::`scalar deleting destructor'
diff --git a/LEGO1/omni/include/mxvideomanager.h b/LEGO1/omni/include/mxvideomanager.h
index b2719529..a915f5f5 100644
--- a/LEGO1/omni/include/mxvideomanager.h
+++ b/LEGO1/omni/include/mxvideomanager.h
@@ -14,10 +14,10 @@
 class MxVideoManager : public MxMediaManager {
 public:
 	MxVideoManager();
-	virtual ~MxVideoManager() override;
+	~MxVideoManager() override;
 
-	virtual MxResult Tickle() override; // vtable+0x08
-	virtual void Destroy() override;    // vtable+0x18
+	MxResult Tickle() override; // vtable+0x08
+	void Destroy() override;    // vtable+0x18
 	virtual MxResult VTable0x28(
 		MxVideoParam& p_videoParam,
 		LPDIRECTDRAW p_pDirectDraw,
diff --git a/LEGO1/omni/include/mxvideopresenter.h b/LEGO1/omni/include/mxvideopresenter.h
index 2fc3b1f4..06436163 100644
--- a/LEGO1/omni/include/mxvideopresenter.h
+++ b/LEGO1/omni/include/mxvideopresenter.h
@@ -13,34 +13,34 @@ class MxVideoPresenter : public MxMediaPresenter {
 	MxVideoPresenter() { Init(); }
 
 	// FUNCTION: LEGO1 0x1000c740
-	virtual ~MxVideoPresenter() override { Destroy(TRUE); } // vtable+0x00
+	~MxVideoPresenter() override { Destroy(TRUE); } // vtable+0x00
 
 	// FUNCTION: LEGO1 0x1000c820
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f0760
 		return "MxVideoPresenter";
 	}
 
 	// FUNCTION: LEGO1 0x1000c830
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, MxVideoPresenter::ClassName()) || MxMediaPresenter::IsA(p_name);
 	}
 
-	virtual void ReadyTickle() override;      // vtable+0x18
-	virtual void StartingTickle() override;   // vtable+0x1c
-	virtual void StreamingTickle() override;  // vtable+0x20
-	virtual void RepeatingTickle() override;  // vtable+0x24
-	virtual void Unk5Tickle() override;       // vtable+0x28
-	virtual MxResult AddToManager() override; // vtable+0x34
+	void ReadyTickle() override;      // vtable+0x18
+	void StartingTickle() override;   // vtable+0x1c
+	void StreamingTickle() override;  // vtable+0x20
+	void RepeatingTickle() override;  // vtable+0x24
+	void Unk5Tickle() override;       // vtable+0x28
+	MxResult AddToManager() override; // vtable+0x34
 
 	// FUNCTION: LEGO1 0x1000c7a0
-	virtual void Destroy() override { Destroy(FALSE); } // vtable+0x38
+	void Destroy() override { Destroy(FALSE); } // vtable+0x38
 
-	virtual void EndAction() override;                   // vtable+0x40
-	virtual MxResult PutData() override;                 // vtable+0x4c
-	virtual MxBool IsHit(MxS32 p_x, MxS32 p_y) override; // vtable+0x50
+	void EndAction() override;                   // vtable+0x40
+	MxResult PutData() override;                 // vtable+0x4c
+	MxBool IsHit(MxS32 p_x, MxS32 p_y) override; // vtable+0x50
 
 	// FUNCTION: LEGO1 0x1000c700
 	virtual void LoadHeader(MxStreamChunk* p_chunk){}; // vtable+0x5c
diff --git a/LEGO1/omni/include/mxwavepresenter.h b/LEGO1/omni/include/mxwavepresenter.h
index 8976b458..982914bf 100644
--- a/LEGO1/omni/include/mxwavepresenter.h
+++ b/LEGO1/omni/include/mxwavepresenter.h
@@ -13,38 +13,38 @@ class MxWavePresenter : public MxSoundPresenter {
 	MxWavePresenter() { Init(); }
 
 	// FUNCTION: LEGO1 0x1000d640
-	virtual ~MxWavePresenter() override { Destroy(TRUE); } // vtable+0x00
+	~MxWavePresenter() override { Destroy(TRUE); } // vtable+0x00
 
 	// FUNCTION: LEGO1 0x1000d6c0
-	inline virtual const char* ClassName() const override // vtable+0x0c
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f07b4
 		return "MxWavePresenter";
 	}
 
 	// FUNCTION: LEGO1 0x1000d6d0
-	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
+	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, MxWavePresenter::ClassName()) || MxSoundPresenter::IsA(p_name);
 	}
 
-	virtual void ReadyTickle() override;      // vtable+0x18
-	virtual void StartingTickle() override;   // vtable+0x1c
-	virtual void StreamingTickle() override;  // vtable+0x20
-	virtual void DoneTickle() override;       // vtable+0x2c
-	virtual void ParseExtra() override;       // vtable+0x30
-	virtual MxResult AddToManager() override; // vtable+0x34
+	void ReadyTickle() override;      // vtable+0x18
+	void StartingTickle() override;   // vtable+0x1c
+	void StreamingTickle() override;  // vtable+0x20
+	void DoneTickle() override;       // vtable+0x2c
+	void ParseExtra() override;       // vtable+0x30
+	MxResult AddToManager() override; // vtable+0x34
 
 	// FUNCTION: LEGO1 0x1000d6a0
-	virtual void Destroy() override { Destroy(FALSE); } // vtable+0x38
+	void Destroy() override { Destroy(FALSE); } // vtable+0x38
 
-	virtual void EndAction() override;                       // vtable+0x40
-	virtual MxResult PutData() override;                     // vtable+0x4c
-	virtual void Enable(MxBool p_enable) override;           // vtable+0x54
-	virtual void LoopChunk(MxStreamChunk* p_chunk) override; // vtable+0x58
-	virtual void SetVolume(MxS32 p_volume) override;         // vtable+0x60
-	virtual void Pause();                                    // vtable+0x64
-	virtual void Resume();                                   // vtable+0x68
+	void EndAction() override;                       // vtable+0x40
+	MxResult PutData() override;                     // vtable+0x4c
+	void Enable(MxBool p_enable) override;           // vtable+0x54
+	void LoopChunk(MxStreamChunk* p_chunk) override; // vtable+0x58
+	void SetVolume(MxS32 p_volume) override;         // vtable+0x60
+	virtual void Pause();                            // vtable+0x64
+	virtual void Resume();                           // vtable+0x68
 
 	// FUNCTION: LEGO1 0x1000d6b0
 	virtual MxBool IsPaused() { return m_paused; } // vtable+0x6c
diff --git a/LEGO1/omni/src/action/mxdsaction.cpp b/LEGO1/omni/src/action/mxdsaction.cpp
index cea02696..49f40561 100644
--- a/LEGO1/omni/src/action/mxdsaction.cpp
+++ b/LEGO1/omni/src/action/mxdsaction.cpp
@@ -108,8 +108,9 @@ MxU32 MxDSAction::GetSizeOnDisk()
 // FUNCTION: LEGO1 0x100adc10
 MxDSAction& MxDSAction::operator=(MxDSAction& p_dsAction)
 {
-	if (this == &p_dsAction)
+	if (this == &p_dsAction) {
 		return *this;
+	}
 
 	MxDSObject::operator=(p_dsAction);
 	this->CopyFrom(p_dsAction);
@@ -121,8 +122,9 @@ MxDSAction* MxDSAction::Clone()
 {
 	MxDSAction* clone = new MxDSAction();
 
-	if (clone)
+	if (clone) {
 		*clone = *this;
+	}
 
 	return clone;
 }
@@ -136,35 +138,47 @@ MxLong MxDSAction::GetElapsedTime()
 // FUNCTION: LEGO1 0x100add00
 void MxDSAction::MergeFrom(MxDSAction& p_dsAction)
 {
-	if (p_dsAction.m_startTime != INT_MIN)
+	if (p_dsAction.m_startTime != INT_MIN) {
 		this->m_startTime = p_dsAction.m_startTime;
+	}
 
-	if (p_dsAction.GetDuration() != INT_MIN)
+	if (p_dsAction.GetDuration() != INT_MIN) {
 		this->m_duration = p_dsAction.GetDuration();
+	}
 
-	if (p_dsAction.m_loopCount != -1)
+	if (p_dsAction.m_loopCount != -1) {
 		this->m_loopCount = p_dsAction.m_loopCount;
+	}
 
-	if (p_dsAction.m_location[0] != FLT_MAX)
+	if (p_dsAction.m_location[0] != FLT_MAX) {
 		this->m_location[0] = p_dsAction.m_location[0];
-	if (p_dsAction.m_location[1] != FLT_MAX)
+	}
+	if (p_dsAction.m_location[1] != FLT_MAX) {
 		this->m_location[1] = p_dsAction.m_location[1];
-	if (p_dsAction.m_location[2] != FLT_MAX)
+	}
+	if (p_dsAction.m_location[2] != FLT_MAX) {
 		this->m_location[2] = p_dsAction.m_location[2];
+	}
 
-	if (p_dsAction.m_direction[0] != FLT_MAX)
+	if (p_dsAction.m_direction[0] != FLT_MAX) {
 		this->m_direction[0] = p_dsAction.m_direction[0];
-	if (p_dsAction.m_direction[1] != FLT_MAX)
+	}
+	if (p_dsAction.m_direction[1] != FLT_MAX) {
 		this->m_direction[1] = p_dsAction.m_direction[1];
-	if (p_dsAction.m_direction[2] != FLT_MAX)
+	}
+	if (p_dsAction.m_direction[2] != FLT_MAX) {
 		this->m_direction[2] = p_dsAction.m_up[2]; // This is correct
+	}
 
-	if (p_dsAction.m_up[0] != FLT_MAX)
+	if (p_dsAction.m_up[0] != FLT_MAX) {
 		this->m_up[0] = p_dsAction.m_up[0];
-	if (p_dsAction.m_up[1] != FLT_MAX)
+	}
+	if (p_dsAction.m_up[1] != FLT_MAX) {
 		this->m_up[1] = p_dsAction.m_up[1];
-	if (p_dsAction.m_up[2] != FLT_MAX)
+	}
+	if (p_dsAction.m_up[2] != FLT_MAX) {
 		this->m_up[2] = p_dsAction.m_up[2];
+	}
 
 	MxU16 extraLength = p_dsAction.m_extraLength;
 	char* extraData = p_dsAction.m_extraData;
@@ -185,8 +199,9 @@ void MxDSAction::MergeFrom(MxDSAction& p_dsAction)
 // FUNCTION: LEGO1 0x100ade60
 void MxDSAction::AppendData(MxU16 p_extraLength, const char* p_extraData)
 {
-	if (this->m_extraData == p_extraData || !p_extraData)
+	if (this->m_extraData == p_extraData || !p_extraData) {
 		return;
+	}
 
 	if (this->m_extraLength) {
 		char* concat = new char[p_extraLength + this->m_extraLength + sizeof(g_sep)];
diff --git a/LEGO1/omni/src/action/mxdsanim.cpp b/LEGO1/omni/src/action/mxdsanim.cpp
index cef2321c..c90933b1 100644
--- a/LEGO1/omni/src/action/mxdsanim.cpp
+++ b/LEGO1/omni/src/action/mxdsanim.cpp
@@ -21,8 +21,9 @@ void MxDSAnim::CopyFrom(MxDSAnim& p_dsAnim)
 // FUNCTION: LEGO1 0x100c9200
 MxDSAnim& MxDSAnim::operator=(MxDSAnim& p_dsAnim)
 {
-	if (this == &p_dsAnim)
+	if (this == &p_dsAnim) {
 		return *this;
+	}
 
 	MxDSMediaAction::operator=(p_dsAnim);
 	this->CopyFrom(p_dsAnim);
@@ -34,8 +35,9 @@ MxDSAction* MxDSAnim::Clone()
 {
 	MxDSAnim* clone = new MxDSAnim();
 
-	if (clone)
+	if (clone) {
 		*clone = *this;
+	}
 
 	return clone;
 }
diff --git a/LEGO1/omni/src/action/mxdsevent.cpp b/LEGO1/omni/src/action/mxdsevent.cpp
index bc925369..64702e65 100644
--- a/LEGO1/omni/src/action/mxdsevent.cpp
+++ b/LEGO1/omni/src/action/mxdsevent.cpp
@@ -21,8 +21,9 @@ void MxDSEvent::CopyFrom(MxDSEvent& p_dsEvent)
 // FUNCTION: LEGO1 0x100c9800
 MxDSEvent& MxDSEvent::operator=(MxDSEvent& p_dsEvent)
 {
-	if (this == &p_dsEvent)
+	if (this == &p_dsEvent) {
 		return *this;
+	}
 
 	MxDSMediaAction::operator=(p_dsEvent);
 	this->CopyFrom(p_dsEvent);
@@ -34,8 +35,9 @@ MxDSAction* MxDSEvent::Clone()
 {
 	MxDSEvent* clone = new MxDSEvent();
 
-	if (clone)
+	if (clone) {
 		*clone = *this;
+	}
 
 	return clone;
 }
diff --git a/LEGO1/omni/src/action/mxdsmediaaction.cpp b/LEGO1/omni/src/action/mxdsmediaaction.cpp
index fda2721a..c563b380 100644
--- a/LEGO1/omni/src/action/mxdsmediaaction.cpp
+++ b/LEGO1/omni/src/action/mxdsmediaaction.cpp
@@ -39,8 +39,9 @@ void MxDSMediaAction::CopyFrom(MxDSMediaAction& p_dsMediaAction)
 // FUNCTION: LEGO1 0x100c8dc0
 MxDSMediaAction& MxDSMediaAction::operator=(MxDSMediaAction& p_dsMediaAction)
 {
-	if (this == &p_dsMediaAction)
+	if (this == &p_dsMediaAction) {
 		return *this;
+	}
 
 	MxDSAction::operator=(p_dsMediaAction);
 	this->CopyFrom(p_dsMediaAction);
@@ -52,8 +53,9 @@ MxDSAction* MxDSMediaAction::Clone()
 {
 	MxDSMediaAction* clone = new MxDSMediaAction();
 
-	if (clone)
+	if (clone) {
 		*clone = *this;
+	}
 
 	return clone;
 }
@@ -61,18 +63,21 @@ MxDSAction* MxDSMediaAction::Clone()
 // FUNCTION: LEGO1 0x100c8e80
 void MxDSMediaAction::CopyMediaSrcPath(const char* p_mediaSrcPath)
 {
-	if (this->m_mediaSrcPath == p_mediaSrcPath)
+	if (this->m_mediaSrcPath == p_mediaSrcPath) {
 		return;
+	}
 
 	delete[] this->m_mediaSrcPath;
 
 	if (p_mediaSrcPath) {
 		this->m_mediaSrcPath = new char[strlen(p_mediaSrcPath) + 1];
-		if (this->m_mediaSrcPath)
+		if (this->m_mediaSrcPath) {
 			strcpy(this->m_mediaSrcPath, p_mediaSrcPath);
+		}
 	}
-	else
+	else {
 		this->m_mediaSrcPath = NULL;
+	}
 }
 
 // FUNCTION: LEGO1 0x100c8f00
@@ -86,10 +91,12 @@ MxU32 MxDSMediaAction::GetSizeOnDisk()
 {
 	MxU32 totalSizeOnDisk = MxDSAction::GetSizeOnDisk();
 
-	if (this->m_mediaSrcPath)
+	if (this->m_mediaSrcPath) {
 		totalSizeOnDisk += strlen(this->m_mediaSrcPath) + 1;
-	else
+	}
+	else {
 		totalSizeOnDisk++;
+	}
 
 	totalSizeOnDisk += 24;
 	this->m_sizeOnDisk = totalSizeOnDisk - MxDSAction::GetSizeOnDisk();
diff --git a/LEGO1/omni/src/action/mxdsmultiaction.cpp b/LEGO1/omni/src/action/mxdsmultiaction.cpp
index 64e20a55..40216ae7 100644
--- a/LEGO1/omni/src/action/mxdsmultiaction.cpp
+++ b/LEGO1/omni/src/action/mxdsmultiaction.cpp
@@ -15,8 +15,9 @@ MxDSMultiAction::MxDSMultiAction()
 // FUNCTION: LEGO1 0x100ca060
 MxDSMultiAction::~MxDSMultiAction()
 {
-	if (this->m_actions)
+	if (this->m_actions) {
 		delete this->m_actions;
+	}
 }
 
 // FUNCTION: LEGO1 0x100ca0d0
@@ -26,15 +27,17 @@ void MxDSMultiAction::CopyFrom(MxDSMultiAction& p_dsMultiAction)
 
 	MxDSActionListCursor cursor(p_dsMultiAction.m_actions);
 	MxDSAction* action;
-	while (cursor.Next(action))
+	while (cursor.Next(action)) {
 		this->m_actions->Append(action->Clone());
+	}
 }
 
 // FUNCTION: LEGO1 0x100ca260
 MxDSMultiAction& MxDSMultiAction::operator=(MxDSMultiAction& p_dsMultiAction)
 {
-	if (this == &p_dsMultiAction)
+	if (this == &p_dsMultiAction) {
 		return *this;
+	}
 
 	MxDSAction::operator=(p_dsMultiAction);
 	this->CopyFrom(p_dsMultiAction);
@@ -48,8 +51,9 @@ void MxDSMultiAction::SetUnknown90(MxLong p_unk0x90)
 
 	MxDSActionListCursor cursor(this->m_actions);
 	MxDSAction* action;
-	while (cursor.Next(action))
+	while (cursor.Next(action)) {
 		action->SetUnknown90(p_unk0x90);
+	}
 }
 
 // FUNCTION: LEGO1 0x100ca370
@@ -59,21 +63,24 @@ void MxDSMultiAction::MergeFrom(MxDSAction& p_dsMultiAction)
 
 	MxDSActionListCursor cursor(this->m_actions);
 	MxDSAction* action;
-	while (cursor.Next(action))
+	while (cursor.Next(action)) {
 		action->MergeFrom(p_dsMultiAction);
+	}
 }
 
 // FUNCTION: LEGO1 0x100ca450
 MxBool MxDSMultiAction::HasId(MxU32 p_objectId)
 {
-	if (this->GetObjectId() == p_objectId)
+	if (this->GetObjectId() == p_objectId) {
 		return TRUE;
+	}
 
 	MxDSActionListCursor cursor(this->m_actions);
 	MxDSAction* action;
 	while (cursor.Next(action)) {
-		if (action->HasId(p_objectId))
+		if (action->HasId(p_objectId)) {
 			return TRUE;
+		}
 	}
 
 	return FALSE;
@@ -84,8 +91,9 @@ MxDSAction* MxDSMultiAction::Clone()
 {
 	MxDSMultiAction* clone = new MxDSMultiAction();
 
-	if (clone)
+	if (clone) {
 		*clone = *this;
+	}
 
 	return clone;
 }
@@ -97,8 +105,9 @@ undefined4 MxDSMultiAction::VTable0x14()
 
 	MxDSActionListCursor cursor(this->m_actions);
 	MxDSAction* action;
-	while (cursor.Next(action))
+	while (cursor.Next(action)) {
 		result += action->VTable0x14();
+	}
 
 	return result;
 }
@@ -110,8 +119,9 @@ MxU32 MxDSMultiAction::GetSizeOnDisk()
 
 	MxDSActionListCursor cursor(this->m_actions);
 	MxDSAction* action;
-	while (cursor.Next(action))
+	while (cursor.Next(action)) {
 		totalSizeOnDisk += action->GetSizeOnDisk();
+	}
 
 	this->m_sizeOnDisk = totalSizeOnDisk - MxDSAction::GetSizeOnDisk();
 
@@ -151,6 +161,7 @@ void MxDSMultiAction::SetAtomId(MxAtomId p_atomId)
 
 	MxDSActionListCursor cursor(this->m_actions);
 	MxDSAction* action;
-	while (cursor.Next(action))
+	while (cursor.Next(action)) {
 		action->SetAtomId(p_atomId);
+	}
 }
diff --git a/LEGO1/omni/src/action/mxdsobject.cpp b/LEGO1/omni/src/action/mxdsobject.cpp
index 6d11476d..9bbdf195 100644
--- a/LEGO1/omni/src/action/mxdsobject.cpp
+++ b/LEGO1/omni/src/action/mxdsobject.cpp
@@ -52,8 +52,9 @@ void MxDSObject::CopyFrom(MxDSObject& p_dsObject)
 // FUNCTION: LEGO1 0x100bf8c0
 MxDSObject& MxDSObject::operator=(MxDSObject& p_dsObject)
 {
-	if (this == &p_dsObject)
+	if (this == &p_dsObject) {
 		return *this;
+	}
 
 	this->CopyFrom(p_dsObject);
 	return *this;
@@ -108,17 +109,21 @@ MxU32 MxDSObject::GetSizeOnDisk()
 {
 	MxU32 sizeOnDisk;
 
-	if (this->m_sourceName)
+	if (this->m_sourceName) {
 		sizeOnDisk = strlen(this->m_sourceName) + 3;
-	else
+	}
+	else {
 		sizeOnDisk = 3;
+	}
 
 	sizeOnDisk += 4;
 
-	if (this->m_objectName)
+	if (this->m_objectName) {
 		sizeOnDisk += strlen(this->m_objectName) + 1;
-	else
+	}
+	else {
 		sizeOnDisk++;
+	}
 
 	sizeOnDisk += 4;
 	this->m_sizeOnDisk = sizeOnDisk;
diff --git a/LEGO1/omni/src/action/mxdsobjectaction.cpp b/LEGO1/omni/src/action/mxdsobjectaction.cpp
index db8b149f..40eadec3 100644
--- a/LEGO1/omni/src/action/mxdsobjectaction.cpp
+++ b/LEGO1/omni/src/action/mxdsobjectaction.cpp
@@ -21,8 +21,9 @@ void MxDSObjectAction::CopyFrom(MxDSObjectAction& p_dsObjectAction)
 // FUNCTION: LEGO1 0x100c8a80
 MxDSObjectAction& MxDSObjectAction::operator=(MxDSObjectAction& p_dsObjectAction)
 {
-	if (this == &p_dsObjectAction)
+	if (this == &p_dsObjectAction) {
 		return *this;
+	}
 
 	MxDSMediaAction::operator=(p_dsObjectAction);
 	this->CopyFrom(p_dsObjectAction);
@@ -34,8 +35,9 @@ MxDSAction* MxDSObjectAction::Clone()
 {
 	MxDSObjectAction* clone = new MxDSObjectAction();
 
-	if (clone)
+	if (clone) {
 		*clone = *this;
+	}
 
 	return clone;
 }
diff --git a/LEGO1/omni/src/action/mxdsparallelaction.cpp b/LEGO1/omni/src/action/mxdsparallelaction.cpp
index a14a326f..f4e61245 100644
--- a/LEGO1/omni/src/action/mxdsparallelaction.cpp
+++ b/LEGO1/omni/src/action/mxdsparallelaction.cpp
@@ -23,8 +23,9 @@ void MxDSParallelAction::CopyFrom(MxDSParallelAction& p_dsParallelAction)
 // FUNCTION: LEGO1 0x100cb0a0
 MxDSParallelAction& MxDSParallelAction::operator=(MxDSParallelAction& p_dsParallelAction)
 {
-	if (this == &p_dsParallelAction)
+	if (this == &p_dsParallelAction) {
 		return *this;
+	}
 
 	MxDSMultiAction::operator=(p_dsParallelAction);
 	this->CopyFrom(p_dsParallelAction);
@@ -36,8 +37,9 @@ MxDSAction* MxDSParallelAction::Clone()
 {
 	MxDSParallelAction* clone = new MxDSParallelAction();
 
-	if (clone)
+	if (clone) {
 		*clone = *this;
+	}
 
 	return clone;
 }
@@ -45,15 +47,17 @@ MxDSAction* MxDSParallelAction::Clone()
 // FUNCTION: LEGO1 0x100cb160
 MxLong MxDSParallelAction::GetDuration()
 {
-	if (this->m_duration)
+	if (this->m_duration) {
 		return this->m_duration;
+	}
 
 	MxDSActionListCursor cursor(this->m_actions);
 	MxDSAction* action;
 
 	while (cursor.Next(action)) {
-		if (!action)
+		if (!action) {
 			continue;
+		}
 
 		MxLong duration = action->GetDuration();
 		if (duration == -1) {
@@ -65,10 +69,12 @@ MxLong MxDSParallelAction::GetDuration()
 		if (action->IsA("MxDSMediaAction")) {
 			MxLong sustainTime = ((MxDSMediaAction*) action)->GetSustainTime();
 
-			if (sustainTime == -1)
+			if (sustainTime == -1) {
 				duration = -1;
-			else if (sustainTime)
+			}
+			else if (sustainTime) {
 				duration += sustainTime;
+			}
 		}
 
 		if (duration == -1) {
@@ -76,12 +82,14 @@ MxLong MxDSParallelAction::GetDuration()
 			break;
 		}
 
-		if (this->m_duration < duration)
+		if (this->m_duration < duration) {
 			this->m_duration = duration;
+		}
 	}
 
-	if (this->IsBit3())
+	if (this->IsBit3()) {
 		this->m_duration *= this->m_loopCount;
+	}
 
 	return this->m_duration;
 }
diff --git a/LEGO1/omni/src/action/mxdsselectaction.cpp b/LEGO1/omni/src/action/mxdsselectaction.cpp
index ddadde84..97e9ff73 100644
--- a/LEGO1/omni/src/action/mxdsselectaction.cpp
+++ b/LEGO1/omni/src/action/mxdsselectaction.cpp
@@ -19,8 +19,9 @@ MxDSSelectAction::MxDSSelectAction()
 // FUNCTION: LEGO1 0x100cb8d0
 MxDSSelectAction::~MxDSSelectAction()
 {
-	if (this->m_unk0xac)
+	if (this->m_unk0xac) {
 		delete this->m_unk0xac;
+	}
 }
 
 // FUNCTION: LEGO1 0x100cb950
@@ -32,8 +33,9 @@ void MxDSSelectAction::CopyFrom(MxDSSelectAction& p_dsSelectAction)
 
 	MxStringListCursor cursor(p_dsSelectAction.m_unk0xac);
 	MxString string;
-	while (cursor.Next(string))
+	while (cursor.Next(string)) {
 		this->m_unk0xac->Append(string);
+	}
 }
 
 // FUNCTION: LEGO1 0x100cbd50
@@ -51,8 +53,9 @@ MxDSAction* MxDSSelectAction::Clone()
 {
 	MxDSSelectAction* clone = new MxDSSelectAction();
 
-	if (clone)
+	if (clone) {
 		*clone = *this;
+	}
 
 	return clone;
 }
@@ -66,8 +69,9 @@ MxU32 MxDSSelectAction::GetSizeOnDisk()
 
 	MxStringListCursor cursor(this->m_unk0xac);
 	MxString string;
-	while (cursor.Next(string))
+	while (cursor.Next(string)) {
 		totalSizeOnDisk += strlen(string.GetData()) + 1;
+	}
 
 	// Note: unlike the other classes, MxDSSelectAction does not have its own
 	// sizeOnDisk member. Instead, it overrides the one from MxDSMultiAction.
@@ -95,8 +99,9 @@ void MxDSSelectAction::Deserialize(MxU8** p_source, MxS16 p_unk0x24)
 		MxS32 random = rand() % value;
 		string = itoa((MxS16) random, buffer, 10);
 	}
-	else
+	else {
 		string = VariableTable()->GetVariable((char*) *p_source);
+	}
 
 	*p_source += strlen((char*) *p_source) + 1;
 
@@ -109,8 +114,9 @@ void MxDSSelectAction::Deserialize(MxU8** p_source, MxS16 p_unk0x24)
 
 		MxU32 i;
 		for (i = 0; i < count; i++) {
-			if (!strcmp(string.GetData(), (char*) *p_source))
+			if (!strcmp(string.GetData(), (char*) *p_source)) {
 				index = i;
+			}
 
 			this->m_unk0xac->Append((char*) *p_source);
 			*p_source += strlen((char*) *p_source) + 1;
@@ -122,10 +128,12 @@ void MxDSSelectAction::Deserialize(MxU8** p_source, MxS16 p_unk0x24)
 
 			MxDSAction* action = (MxDSAction*) DeserializeDSObjectDispatch(p_source, p_unk0x24);
 
-			if (index == i)
+			if (index == i) {
 				this->m_actions->Append(action);
-			else
+			}
+			else {
 				delete action;
+			}
 
 			*p_source += extraFlag;
 		}
diff --git a/LEGO1/omni/src/action/mxdsserialaction.cpp b/LEGO1/omni/src/action/mxdsserialaction.cpp
index 24513f48..b03efdf0 100644
--- a/LEGO1/omni/src/action/mxdsserialaction.cpp
+++ b/LEGO1/omni/src/action/mxdsserialaction.cpp
@@ -21,8 +21,9 @@ void MxDSSerialAction::SetDuration(MxLong p_duration)
 // FUNCTION: LEGO1 0x100cac10
 MxDSSerialAction::~MxDSSerialAction()
 {
-	if (this->m_cursor)
+	if (this->m_cursor) {
 		delete this->m_cursor;
+	}
 
 	this->m_cursor = NULL;
 }
@@ -35,8 +36,9 @@ void MxDSSerialAction::CopyFrom(MxDSSerialAction& p_dsSerialAction)
 // FUNCTION: LEGO1 0x100caca0
 MxDSSerialAction& MxDSSerialAction::operator=(MxDSSerialAction& p_dsSerialAction)
 {
-	if (this == &p_dsSerialAction)
+	if (this == &p_dsSerialAction) {
 		return *this;
+	}
 
 	MxDSMultiAction::operator=(p_dsSerialAction);
 	this->CopyFrom(p_dsSerialAction);
@@ -48,8 +50,9 @@ MxDSAction* MxDSSerialAction::Clone()
 {
 	MxDSSerialAction* clone = new MxDSSerialAction();
 
-	if (clone)
+	if (clone) {
 		*clone = *this;
+	}
 
 	return clone;
 }
@@ -57,23 +60,26 @@ MxDSAction* MxDSSerialAction::Clone()
 // FUNCTION: LEGO1 0x100cad60
 MxLong MxDSSerialAction::GetDuration()
 {
-	if (this->m_duration)
+	if (this->m_duration) {
 		return this->m_duration;
+	}
 
 	MxDSActionListCursor cursor(this->m_actions);
 	MxDSAction* action;
 
 	while (cursor.Next(action)) {
-		if (!action)
+		if (!action) {
 			continue;
+		}
 
 		this->m_duration += action->GetDuration() + action->GetStartTime();
 
 		if (action->IsA("MxDSMediaAction")) {
 			MxLong sustainTime = ((MxDSMediaAction*) action)->GetSustainTime();
 
-			if (sustainTime && sustainTime != -1)
+			if (sustainTime && sustainTime != -1) {
 				this->m_duration += sustainTime;
+			}
 		}
 	}
 
diff --git a/LEGO1/omni/src/action/mxdssound.cpp b/LEGO1/omni/src/action/mxdssound.cpp
index 61022cab..e75ad0c9 100644
--- a/LEGO1/omni/src/action/mxdssound.cpp
+++ b/LEGO1/omni/src/action/mxdssound.cpp
@@ -26,8 +26,9 @@ void MxDSSound::CopyFrom(MxDSSound& p_dsSound)
 // FUNCTION: LEGO1 0x100c94e0
 MxDSSound& MxDSSound::operator=(MxDSSound& p_dsSound)
 {
-	if (this == &p_dsSound)
+	if (this == &p_dsSound) {
 		return *this;
+	}
 
 	MxDSMediaAction::operator=(p_dsSound);
 	this->CopyFrom(p_dsSound);
@@ -39,8 +40,9 @@ MxDSAction* MxDSSound::Clone()
 {
 	MxDSSound* clone = new MxDSSound();
 
-	if (clone)
+	if (clone) {
 		*clone = *this;
+	}
 
 	return clone;
 }
diff --git a/LEGO1/omni/src/action/mxdsstill.cpp b/LEGO1/omni/src/action/mxdsstill.cpp
index 59a78ffc..c044a2e6 100644
--- a/LEGO1/omni/src/action/mxdsstill.cpp
+++ b/LEGO1/omni/src/action/mxdsstill.cpp
@@ -21,8 +21,9 @@ void MxDSStill::CopyFrom(MxDSStill& p_dsStill)
 // FUNCTION: LEGO1 0x100c9ad0
 MxDSStill& MxDSStill::operator=(MxDSStill& p_dsStill)
 {
-	if (this == &p_dsStill)
+	if (this == &p_dsStill) {
 		return *this;
+	}
 
 	MxDSMediaAction::operator=(p_dsStill);
 	this->CopyFrom(p_dsStill);
@@ -34,8 +35,9 @@ MxDSAction* MxDSStill::Clone()
 {
 	MxDSStill* clone = new MxDSStill();
 
-	if (clone)
+	if (clone) {
 		*clone = *this;
+	}
 
 	return clone;
 }
diff --git a/LEGO1/omni/src/action/mxdsstreamingaction.cpp b/LEGO1/omni/src/action/mxdsstreamingaction.cpp
index e8eb4dc1..85759897 100644
--- a/LEGO1/omni/src/action/mxdsstreamingaction.cpp
+++ b/LEGO1/omni/src/action/mxdsstreamingaction.cpp
@@ -17,8 +17,9 @@ MxDSStreamingAction::MxDSStreamingAction(MxDSAction& p_dsAction, MxU32 p_offset)
 // FUNCTION: LEGO1 0x100cd090
 MxBool MxDSStreamingAction::HasId(MxU32 p_objectId)
 {
-	if (this->m_internalAction)
+	if (this->m_internalAction) {
 		return this->m_internalAction->HasId(p_objectId);
+	}
 	return FALSE;
 }
 
@@ -32,12 +33,15 @@ MxDSStreamingAction::MxDSStreamingAction(MxDSStreamingAction& p_dsStreamingActio
 // FUNCTION: LEGO1 0x100cd150
 MxDSStreamingAction::~MxDSStreamingAction()
 {
-	if (this->m_unk0xa0)
+	if (this->m_unk0xa0) {
 		delete this->m_unk0xa0;
-	if (this->m_unk0xa4)
+	}
+	if (this->m_unk0xa4) {
 		delete this->m_unk0xa4;
-	if (this->m_internalAction)
+	}
+	if (this->m_internalAction) {
 		delete this->m_internalAction;
+	}
 }
 
 // FUNCTION: LEGO1 0x100cd1e0
@@ -73,16 +77,18 @@ MxDSStreamingAction* MxDSStreamingAction::CopyFrom(MxDSStreamingAction& p_dsStre
 // FUNCTION: LEGO1 0x100cd2a0
 void MxDSStreamingAction::SetInternalAction(MxDSAction* p_dsAction)
 {
-	if (this->m_internalAction)
+	if (this->m_internalAction) {
 		delete this->m_internalAction;
+	}
 	this->m_internalAction = p_dsAction;
 }
 
 // FUNCTION: LEGO1 0x100cd2d0
 void MxDSStreamingAction::FUN_100cd2d0()
 {
-	if (this->m_duration == -1)
+	if (this->m_duration == -1) {
 		return;
+	}
 
 	MxLong duration = this->m_duration / this->m_loopCount;
 	this->m_loopCount--;
diff --git a/LEGO1/omni/src/audio/mxaudiomanager.cpp b/LEGO1/omni/src/audio/mxaudiomanager.cpp
index a2d6072a..0be79a24 100644
--- a/LEGO1/omni/src/audio/mxaudiomanager.cpp
+++ b/LEGO1/omni/src/audio/mxaudiomanager.cpp
@@ -31,8 +31,9 @@ void MxAudioManager::Destroy(MxBool p_fromDestructor)
 	Init();
 	this->m_criticalSection.Leave();
 
-	if (!p_fromDestructor)
+	if (!p_fromDestructor) {
 		MxMediaManager::Destroy();
+	}
 }
 
 // FUNCTION: LEGO1 0x100b8e40
@@ -48,11 +49,13 @@ MxResult MxAudioManager::InitPresenters()
 		g_count++;
 	}
 
-	if (result)
+	if (result) {
 		Destroy();
+	}
 
-	if (success)
+	if (success) {
 		this->m_criticalSection.Leave();
+	}
 
 	return result;
 }
diff --git a/LEGO1/omni/src/audio/mxloopingmidipresenter.cpp b/LEGO1/omni/src/audio/mxloopingmidipresenter.cpp
index 77b32506..c7f4ea1c 100644
--- a/LEGO1/omni/src/audio/mxloopingmidipresenter.cpp
+++ b/LEGO1/omni/src/audio/mxloopingmidipresenter.cpp
@@ -20,17 +20,20 @@ void MxLoopingMIDIPresenter::StreamingTickle()
 		return;
 	}
 
-	if (m_chunk->GetTime() + m_action->GetDuration() <= m_action->GetElapsedTime())
+	if (m_chunk->GetTime() + m_action->GetDuration() <= m_action->GetElapsedTime()) {
 		ProgressTickleState(e_done);
+	}
 }
 
 // FUNCTION: LEGO1 0x100c2ae0
 void MxLoopingMIDIPresenter::DoneTickle()
 {
-	if (m_action->GetLoopCount())
+	if (m_action->GetLoopCount()) {
 		MxMIDIPresenter::DoneTickle();
-	else
+	}
+	else {
 		EndAction();
+	}
 }
 
 // FUNCTION: LEGO1 0x100c2b00
diff --git a/LEGO1/omni/src/audio/mxmidipresenter.cpp b/LEGO1/omni/src/audio/mxmidipresenter.cpp
index 5796fb67..b281ac64 100644
--- a/LEGO1/omni/src/audio/mxmidipresenter.cpp
+++ b/LEGO1/omni/src/audio/mxmidipresenter.cpp
@@ -34,14 +34,16 @@ void MxMIDIPresenter::Destroy(MxBool p_fromDestructor)
 
 	m_criticalSection.Enter();
 
-	if (m_subscriber && m_chunk)
+	if (m_subscriber && m_chunk) {
 		m_subscriber->DestroyChunk(m_chunk);
+	}
 	Init();
 
 	m_criticalSection.Leave();
 
-	if (!p_fromDestructor)
+	if (!p_fromDestructor) {
 		MxMusicPresenter::Destroy();
+	}
 }
 
 // FUNCTION: LEGO1 0x100c2890
@@ -61,24 +63,28 @@ void MxMIDIPresenter::StartingTickle()
 {
 	MxStreamChunk* chunk = CurrentChunk();
 
-	if (chunk && m_action->GetElapsedTime() >= chunk->GetTime())
+	if (chunk && m_action->GetElapsedTime() >= chunk->GetTime()) {
 		ProgressTickleState(e_streaming);
+	}
 }
 
 // FUNCTION: LEGO1 0x100c2910
 void MxMIDIPresenter::StreamingTickle()
 {
-	if (m_chunk)
+	if (m_chunk) {
 		ProgressTickleState(e_done);
-	else
+	}
+	else {
 		m_chunk = NextChunk();
+	}
 }
 
 // FUNCTION: LEGO1 0x100c2940
 void MxMIDIPresenter::DoneTickle()
 {
-	if (!MusicManager()->GetMIDIInitialized())
+	if (!MusicManager()->GetMIDIInitialized()) {
 		EndAction();
+	}
 }
 
 // FUNCTION: LEGO1 0x100c2960
@@ -95,8 +101,9 @@ MxResult MxMIDIPresenter::PutData()
 	if (m_currentTickleState == e_streaming && m_chunk && !MusicManager()->GetMIDIInitialized()) {
 		SetVolume(((MxDSSound*) m_action)->GetVolume());
 
-		if (MusicManager()->InitializeMIDI(m_chunk->GetData(), 1) != SUCCESS)
+		if (MusicManager()->InitializeMIDI(m_chunk->GetData(), 1) != SUCCESS) {
 			EndAction();
+		}
 	}
 
 	m_criticalSection.Leave();
diff --git a/LEGO1/omni/src/audio/mxmusicmanager.cpp b/LEGO1/omni/src/audio/mxmusicmanager.cpp
index 7a0684f8..23562678 100644
--- a/LEGO1/omni/src/audio/mxmusicmanager.cpp
+++ b/LEGO1/omni/src/audio/mxmusicmanager.cpp
@@ -82,8 +82,9 @@ MxResult MxMusicManager::ResetStream()
 		}
 
 		if (m_midiHdrP->dwFlags & MHDR_DONE || m_midiHdrP->dwFlags & MHDR_PREPARED) {
-			if (midiOutUnprepareHeader((HMIDIOUT) m_midiStreamH, m_midiHdrP, sizeof(MIDIHDR)) != MMSYSERR_NOERROR)
+			if (midiOutUnprepareHeader((HMIDIOUT) m_midiStreamH, m_midiHdrP, sizeof(MIDIHDR)) != MMSYSERR_NOERROR) {
 				goto done;
+			}
 
 			memset(m_midiHdrP, 0, sizeof(MIDIHDR));
 		}
@@ -131,8 +132,9 @@ void MxMusicManager::SetMIDIVolume()
 // FUNCTION: LEGO1 0x100c0820
 void CALLBACK MxMusicManager::MidiCallbackProc(HDRVR p_hdrvr, UINT p_uMsg, DWORD p_dwUser, DWORD p_dw1, DWORD p_dw2)
 {
-	if (p_uMsg == MOM_DONE)
+	if (p_uMsg == MOM_DONE) {
 		((MxMusicManager*) p_dwUser)->ResetStream();
+	}
 }
 
 // FUNCTION: LEGO1 0x100c0840
@@ -147,21 +149,25 @@ MxResult MxMusicManager::Create(MxU32 p_frequencyMS, MxBool p_createThread)
 			locked = TRUE;
 			m_thread = new MxTickleThread(this, p_frequencyMS);
 
-			if (!m_thread || m_thread->Start(0, 0) != SUCCESS)
+			if (!m_thread || m_thread->Start(0, 0) != SUCCESS) {
 				goto done;
+			}
 		}
-		else
+		else {
 			TickleManager()->RegisterClient(this, p_frequencyMS);
+		}
 
 		status = SUCCESS;
 	}
 
 done:
-	if (status != SUCCESS)
+	if (status != SUCCESS) {
 		Destroy();
+	}
 
-	if (locked)
+	if (locked) {
 		m_criticalSection.Leave();
+	}
 
 	return status;
 }
@@ -211,22 +217,26 @@ MxResult MxMusicManager::InitializeMIDI(MxU8* p_data, MxS32 p_loopCount)
 		for (; device < total; device++) {
 			MIDIOUTCAPSA caps;
 			midiOutGetDevCapsA(device, &caps, sizeof(MIDIOUTCAPSA));
-			if (caps.wTechnology == MOD_FMSYNTH)
+			if (caps.wTechnology == MOD_FMSYNTH) {
 				break;
+			}
 		}
 
-		if (device >= total)
+		if (device >= total) {
 			device = -1;
+		}
 
 		if (midiStreamOpen(&m_midiStreamH, &device, 1, (DWORD) MidiCallbackProc, (DWORD) this, CALLBACK_FUNCTION) !=
-			MMSYSERR_NOERROR)
+			MMSYSERR_NOERROR) {
 			goto done;
+		}
 
 		GetMIDIVolume(m_midiVolume);
 
 		m_midiHdrP = new MIDIHDR();
-		if (!m_midiHdrP)
+		if (!m_midiHdrP) {
 			goto done;
+		}
 
 		memset(m_midiHdrP, 0, sizeof(MIDIHDR));
 
@@ -236,8 +246,9 @@ MxResult MxMusicManager::InitializeMIDI(MxU8* p_data, MxS32 p_loopCount)
 		m_bufferOffset += 0x14;
 		timediv.dwTimeDiv = *((DWORD*) m_bufferOffset);
 
-		if (midiStreamProperty(m_midiStreamH, (LPBYTE) &timediv, MIDIPROP_SET | MIDIPROP_TIMEDIV) != MMSYSERR_NOERROR)
+		if (midiStreamProperty(m_midiStreamH, (LPBYTE) &timediv, MIDIPROP_SET | MIDIPROP_TIMEDIV) != MMSYSERR_NOERROR) {
 			goto done;
+		}
 
 		m_bufferOffset += 0x14;
 		m_bufferSize = *((MxU32*) m_bufferOffset);
@@ -246,12 +257,14 @@ MxResult MxMusicManager::InitializeMIDI(MxU8* p_data, MxS32 p_loopCount)
 		m_midiInitialized = TRUE;
 
 		ResetBuffer();
-		if (ResetStream() != SUCCESS)
+		if (ResetStream() != SUCCESS) {
 			goto done;
+		}
 
 		SetMIDIVolume();
-		if (midiStreamRestart(m_midiStreamH) != MMSYSERR_NOERROR)
+		if (midiStreamRestart(m_midiStreamH) != MMSYSERR_NOERROR) {
 			goto done;
+		}
 
 		result = SUCCESS;
 	}
diff --git a/LEGO1/omni/src/audio/mxsoundmanager.cpp b/LEGO1/omni/src/audio/mxsoundmanager.cpp
index b06c5e37..55055107 100644
--- a/LEGO1/omni/src/audio/mxsoundmanager.cpp
+++ b/LEGO1/omni/src/audio/mxsoundmanager.cpp
@@ -59,46 +59,55 @@ MxResult MxSoundManager::Create(MxU32 p_frequencyMS, MxBool p_createThread)
 	MxResult status = FAILURE;
 	MxBool locked = FALSE;
 
-	if (MxAudioManager::InitPresenters() != SUCCESS)
+	if (MxAudioManager::InitPresenters() != SUCCESS) {
 		goto done;
+	}
 
 	m_criticalSection.Enter();
 	locked = TRUE;
 
-	if (DirectSoundCreate(NULL, &m_directSound, NULL) != DS_OK)
+	if (DirectSoundCreate(NULL, &m_directSound, NULL) != DS_OK) {
 		goto done;
+	}
 
-	if (m_directSound->SetCooperativeLevel(MxOmni::GetInstance()->GetWindowHandle(), DSSCL_PRIORITY) != DS_OK)
+	if (m_directSound->SetCooperativeLevel(MxOmni::GetInstance()->GetWindowHandle(), DSSCL_PRIORITY) != DS_OK) {
 		goto done;
+	}
 
 	DSBUFFERDESC desc;
 	memset(&desc, 0, sizeof(desc));
 	desc.dwSize = sizeof(desc);
 
-	if (MxOmni::IsSound3D())
+	if (MxOmni::IsSound3D()) {
 		desc.dwFlags = DSBCAPS_PRIMARYBUFFER | DSBCAPS_CTRL3D;
-	else
+	}
+	else {
 		desc.dwFlags = DSBCAPS_PRIMARYBUFFER | DSBCAPS_CTRLVOLUME;
+	}
 
 	if (m_directSound->CreateSoundBuffer(&desc, &m_dsBuffer, NULL) != DS_OK) {
-		if (!MxOmni::IsSound3D())
+		if (!MxOmni::IsSound3D()) {
 			goto done;
+		}
 
 		MxOmni::SetSound3D(FALSE);
 		desc.dwFlags = DSBCAPS_PRIMARYBUFFER | DSBCAPS_CTRLVOLUME;
 
-		if (m_directSound->CreateSoundBuffer(&desc, &m_dsBuffer, NULL) != DS_OK)
+		if (m_directSound->CreateSoundBuffer(&desc, &m_dsBuffer, NULL) != DS_OK) {
 			goto done;
+		}
 	}
 
 	WAVEFORMATEX format;
 
 	format.wFormatTag = WAVE_FORMAT_PCM;
 
-	if (MxOmni::IsSound3D())
+	if (MxOmni::IsSound3D()) {
 		format.nChannels = 2;
-	else
+	}
+	else {
 		format.nChannels = 1;
+	}
 
 	format.nSamplesPerSec = 11025; // KHz
 	format.wBitsPerSample = 16;
@@ -111,20 +120,24 @@ MxResult MxSoundManager::Create(MxU32 p_frequencyMS, MxBool p_createThread)
 	if (p_createThread) {
 		m_thread = new MxTickleThread(this, p_frequencyMS);
 
-		if (!m_thread || m_thread->Start(0, 0) != SUCCESS)
+		if (!m_thread || m_thread->Start(0, 0) != SUCCESS) {
 			goto done;
+		}
 	}
-	else
+	else {
 		TickleManager()->RegisterClient(this, p_frequencyMS);
+	}
 
 	status = SUCCESS;
 
 done:
-	if (status != SUCCESS)
+	if (status != SUCCESS) {
 		Destroy();
+	}
 
-	if (locked)
+	if (locked) {
 		m_criticalSection.Leave();
+	}
 	return status;
 }
 
@@ -144,8 +157,9 @@ void MxSoundManager::SetVolume(MxS32 p_volume)
 	MxPresenter* presenter;
 	MxPresenterListCursor cursor(m_presenters);
 
-	while (cursor.Next(presenter))
+	while (cursor.Next(presenter)) {
 		((MxAudioPresenter*) presenter)->SetVolume(((MxAudioPresenter*) presenter)->GetVolume());
+	}
 
 	m_criticalSection.Leave();
 }
@@ -160,8 +174,9 @@ MxPresenter* MxSoundManager::FUN_100aebd0(const MxAtomId& p_atomId, MxU32 p_obje
 
 	while (cursor.Next(presenter)) {
 		if (presenter->GetAction()->GetAtomId().GetInternal() == p_atomId.GetInternal() &&
-			presenter->GetAction()->GetObjectId() == p_objectId)
+			presenter->GetAction()->GetObjectId() == p_objectId) {
 			return presenter;
+		}
 	}
 
 	return NULL;
@@ -170,8 +185,9 @@ MxPresenter* MxSoundManager::FUN_100aebd0(const MxAtomId& p_atomId, MxU32 p_obje
 // FUNCTION: LEGO1 0x100aecf0
 MxS32 MxSoundManager::FUN_100aecf0(MxU32 p_undefined)
 {
-	if (!p_undefined)
+	if (!p_undefined) {
 		return -10000;
+	}
 	return g_mxcoreCount[p_undefined];
 }
 
@@ -183,9 +199,11 @@ void MxSoundManager::Pause()
 	MxPresenter* presenter;
 	MxPresenterListCursor cursor(m_presenters);
 
-	while (cursor.Next(presenter))
-		if (presenter->IsA("MxWavePresenter"))
+	while (cursor.Next(presenter)) {
+		if (presenter->IsA("MxWavePresenter")) {
 			((MxWavePresenter*) presenter)->Pause();
+		}
+	}
 }
 
 // FUNCTION: LEGO1 0x100aee10
@@ -196,7 +214,9 @@ void MxSoundManager::Resume()
 	MxPresenter* presenter;
 	MxPresenterListCursor cursor(m_presenters);
 
-	while (cursor.Next(presenter))
-		if (presenter->IsA("MxWavePresenter"))
+	while (cursor.Next(presenter)) {
+		if (presenter->IsA("MxWavePresenter")) {
 			((MxWavePresenter*) presenter)->Resume();
+		}
+	}
 }
diff --git a/LEGO1/omni/src/audio/mxsoundpresenter.cpp b/LEGO1/omni/src/audio/mxsoundpresenter.cpp
index b0376331..60459d2c 100644
--- a/LEGO1/omni/src/audio/mxsoundpresenter.cpp
+++ b/LEGO1/omni/src/audio/mxsoundpresenter.cpp
@@ -8,15 +8,17 @@ DECOMP_SIZE_ASSERT(MxSoundPresenter, 0x54)
 // FUNCTION: LEGO1 0x100b1a50
 void MxSoundPresenter::Destroy(MxBool p_fromDestructor)
 {
-	if (MSoundManager())
+	if (MSoundManager()) {
 		MSoundManager()->UnregisterPresenter(*this);
+	}
 
 	this->m_criticalSection.Enter();
 	MxMediaPresenter::Init();
 	this->m_criticalSection.Leave();
 
-	if (!p_fromDestructor)
+	if (!p_fromDestructor) {
 		MxMediaPresenter::Destroy(FALSE);
+	}
 }
 
 // FUNCTION: LEGO1 0x100b1aa0
diff --git a/LEGO1/omni/src/audio/mxwavepresenter.cpp b/LEGO1/omni/src/audio/mxwavepresenter.cpp
index c0aaca7c..cb9f4d56 100644
--- a/LEGO1/omni/src/audio/mxwavepresenter.cpp
+++ b/LEGO1/omni/src/audio/mxwavepresenter.cpp
@@ -40,13 +40,15 @@ void MxWavePresenter::Destroy(MxBool p_fromDestructor)
 		m_dsBuffer->Release();
 	}
 
-	if (m_waveFormat)
+	if (m_waveFormat) {
 		delete[] ((MxU8*) m_waveFormat);
+	}
 
 	Init();
 
-	if (!p_fromDestructor)
+	if (!p_fromDestructor) {
 		MxSoundPresenter::Destroy(FALSE);
+	}
 }
 
 // FUNCTION: LEGO1 0x100b1b60
@@ -55,8 +57,9 @@ MxS8 MxWavePresenter::GetPlayedChunks()
 	DWORD dwCurrentPlayCursor, dwCurrentWriteCursor;
 	MxS8 playedChunks = -1;
 
-	if (m_dsBuffer->GetCurrentPosition(&dwCurrentPlayCursor, &dwCurrentWriteCursor) == DS_OK)
+	if (m_dsBuffer->GetCurrentPosition(&dwCurrentPlayCursor, &dwCurrentWriteCursor) == DS_OK) {
 		playedChunks = dwCurrentPlayCursor / m_chunkLength;
+	}
 
 	return playedChunks;
 }
@@ -141,26 +144,32 @@ void MxWavePresenter::StartingTickle()
 		waveFormatEx.nBlockAlign = m_waveFormat->m_pcmWaveFormat.wf.nBlockAlign;
 		waveFormatEx.wBitsPerSample = m_waveFormat->m_pcmWaveFormat.wBitsPerSample;
 
-		if (waveFormatEx.wBitsPerSample == 8)
+		if (waveFormatEx.wBitsPerSample == 8) {
 			m_silenceData = 0x7F;
+		}
 
-		if (waveFormatEx.wBitsPerSample == 16)
+		if (waveFormatEx.wBitsPerSample == 16) {
 			m_silenceData = 0;
+		}
 
 		DSBUFFERDESC desc;
 		memset(&desc, 0, sizeof(desc));
 		desc.dwSize = sizeof(desc);
 
-		if (m_unk0x66)
+		if (m_unk0x66) {
 			desc.dwFlags = DSBCAPS_CTRLFREQUENCY | DSBCAPS_CTRL3D | DSBCAPS_CTRLVOLUME;
-		else
+		}
+		else {
 			desc.dwFlags = DSBCAPS_CTRLFREQUENCY | DSBCAPS_CTRLPAN | DSBCAPS_CTRLVOLUME;
+		}
 
-		if (m_action->GetFlags() & MxDSAction::c_looping)
+		if (m_action->GetFlags() & MxDSAction::c_looping) {
 			desc.dwBufferBytes = m_waveFormat->m_pcmWaveFormat.wf.nAvgBytesPerSec *
 								 (m_action->GetDuration() / m_action->GetLoopCount()) / 1000;
-		else
+		}
+		else {
 			desc.dwBufferBytes = 2 * length;
+		}
 
 		desc.lpwfxFormat = &waveFormatEx;
 
@@ -209,19 +218,22 @@ void MxWavePresenter::DoneTickle()
 
 		MxS8 playedChunks = dwCurrentPlayCursor / m_chunkLength;
 		if (m_action->GetFlags() & MxDSAction::c_bit7 || m_action->GetFlags() & MxDSAction::c_looping ||
-			m_writtenChunks != playedChunks || m_lockSize + (m_chunkLength * playedChunks) <= dwCurrentPlayCursor)
+			m_writtenChunks != playedChunks || m_lockSize + (m_chunkLength * playedChunks) <= dwCurrentPlayCursor) {
 			MxMediaPresenter::DoneTickle();
+		}
 	}
-	else
+	else {
 		MxMediaPresenter::DoneTickle();
+	}
 }
 
 // FUNCTION: LEGO1 0x100b2130
 void MxWavePresenter::LoopChunk(MxStreamChunk* p_chunk)
 {
 	WriteToSoundBuffer(p_chunk->GetData(), p_chunk->GetLength());
-	if (IsEnabled())
+	if (IsEnabled()) {
 		m_subscriber->DestroyChunk(p_chunk);
+	}
 }
 
 // FUNCTION: LEGO1 0x100b2160
@@ -241,18 +253,21 @@ MxResult MxWavePresenter::PutData()
 			if (!m_started) {
 				m_dsBuffer->SetCurrentPosition(0);
 
-				if (m_dsBuffer->Play(0, 0, DSBPLAY_LOOPING) == DS_OK)
+				if (m_dsBuffer->Play(0, 0, DSBPLAY_LOOPING) == DS_OK) {
 					m_started = TRUE;
+				}
 			}
 			break;
 		case e_repeating:
-			if (m_started)
+			if (m_started) {
 				break;
+			}
 
 			m_dsBuffer->SetCurrentPosition(0);
 
-			if (m_dsBuffer->Play(0, 0, m_action->GetLoopCount() > 1) == DS_OK)
+			if (m_dsBuffer->Play(0, 0, m_action->GetLoopCount() > 1) == DS_OK) {
 				m_started = TRUE;
+			}
 		}
 	}
 
@@ -266,8 +281,9 @@ void MxWavePresenter::EndAction()
 		MxAutoLocker lock(&m_criticalSection);
 		MxMediaPresenter::EndAction();
 
-		if (m_dsBuffer)
+		if (m_dsBuffer) {
 			m_dsBuffer->Stop();
+		}
 	}
 }
 
@@ -296,8 +312,9 @@ void MxWavePresenter::Enable(MxBool p_enable)
 			m_writtenChunks = 0;
 			m_started = FALSE;
 		}
-		else if (m_dsBuffer)
+		else if (m_dsBuffer) {
 			m_dsBuffer->Stop();
+		}
 	}
 }
 
@@ -317,8 +334,9 @@ void MxWavePresenter::ParseExtra()
 
 		char soundValue[512];
 		if (KeyValueStringParse(soundValue, g_strSOUND, extraCopy)) {
-			if (!strcmpi(soundValue, "FALSE"))
+			if (!strcmpi(soundValue, "FALSE")) {
 				Enable(FALSE);
+			}
 		}
 	}
 }
@@ -327,8 +345,9 @@ void MxWavePresenter::ParseExtra()
 void MxWavePresenter::Pause()
 {
 	if (!m_paused && m_started) {
-		if (m_dsBuffer)
+		if (m_dsBuffer) {
 			m_dsBuffer->Stop();
+		}
 		m_paused = TRUE;
 	}
 }
diff --git a/LEGO1/omni/src/common/mxatomid.cpp b/LEGO1/omni/src/common/mxatomid.cpp
index 6c400eed..c5b7412c 100644
--- a/LEGO1/omni/src/common/mxatomid.cpp
+++ b/LEGO1/omni/src/common/mxatomid.cpp
@@ -5,11 +5,13 @@
 // FUNCTION: LEGO1 0x100acf90
 MxAtomId::MxAtomId(const char* p_str, LookupMode p_mode)
 {
-	if (!MxOmni::GetInstance())
+	if (!MxOmni::GetInstance()) {
 		return;
+	}
 
-	if (!AtomIdCounterSet())
+	if (!AtomIdCounterSet()) {
 		return;
+	}
 
 	MxAtomIdCounter* counter = GetCounter(p_str, p_mode);
 	m_internal = counter->GetKey()->GetData();
@@ -25,14 +27,17 @@ MxAtomId::~MxAtomId()
 // FUNCTION: LEGO1 0x100acfe0
 void MxAtomId::Destroy()
 {
-	if (!m_internal)
+	if (!m_internal) {
 		return;
+	}
 
-	if (!MxOmni::GetInstance())
+	if (!MxOmni::GetInstance()) {
 		return;
+	}
 
-	if (!AtomIdCounterSet())
+	if (!AtomIdCounterSet()) {
 		return;
+	}
 
 #ifdef COMPAT_MODE
 	MxAtomIdCounterSet::iterator it;
@@ -51,8 +56,9 @@ void MxAtomId::Destroy()
 // FUNCTION: LEGO1 0x100ad1c0
 MxAtomId& MxAtomId::operator=(const MxAtomId& p_atomId)
 {
-	if (m_internal)
+	if (m_internal) {
 		Destroy();
+	}
 
 	if (p_atomId.m_internal && MxOmni::GetInstance() && AtomIdCounterSet()) {
 		MxAtomIdCounter* counter = GetCounter(p_atomId.m_internal, e_exact);
diff --git a/LEGO1/omni/src/common/mxatomidcounter.cpp b/LEGO1/omni/src/common/mxatomidcounter.cpp
index f3be8764..cfec47b1 100644
--- a/LEGO1/omni/src/common/mxatomidcounter.cpp
+++ b/LEGO1/omni/src/common/mxatomidcounter.cpp
@@ -14,6 +14,7 @@ void MxAtomIdCounter::Inc()
 // FUNCTION: LEGO1 0x100ad800
 void MxAtomIdCounter::Dec()
 {
-	if (m_value)
+	if (m_value) {
 		m_value--;
+	}
 }
diff --git a/LEGO1/omni/src/common/mxcompositepresenter.cpp b/LEGO1/omni/src/common/mxcompositepresenter.cpp
index 5c5b612e..5996f634 100644
--- a/LEGO1/omni/src/common/mxcompositepresenter.cpp
+++ b/LEGO1/omni/src/common/mxcompositepresenter.cpp
@@ -50,16 +50,18 @@ MxResult MxCompositePresenter::StartAction(MxStreamController* p_controller, MxD
 
 			if (presenter && presenter->AddToManager() == SUCCESS) {
 				presenter->SetCompositePresenter(this);
-				if (presenter->StartAction(p_controller, action) == SUCCESS)
+				if (presenter->StartAction(p_controller, action) == SUCCESS) {
 					success = TRUE;
+				}
 			}
 
 			if (success) {
 				action->SetOrigin(this);
 				m_list.push_back(presenter);
 			}
-			else if (presenter)
+			else if (presenter) {
 				delete presenter;
+			}
 		}
 
 		result = SUCCESS;
@@ -73,8 +75,9 @@ void MxCompositePresenter::EndAction()
 {
 	MxAutoLocker lock(&m_criticalSection);
 
-	if (!m_action)
+	if (!m_action) {
 		return;
+	}
 
 	((MxDSMultiAction*) m_action)->GetActionList()->DeleteAll(FALSE);
 
@@ -139,15 +142,18 @@ void MxCompositePresenter::VTable0x58(MxEndActionNotificationParam& p_param)
 		MxDSActionList* actions = ((MxDSMultiAction*) m_action)->GetActionList();
 		MxDSActionListCursor cursor(actions);
 
-		if (cursor.Find(action))
+		if (cursor.Find(action)) {
 			cursor.Detach();
+		}
 	}
 
-	if (presenter)
+	if (presenter) {
 		delete presenter;
+	}
 
-	if (action)
+	if (action) {
 		delete action;
+	}
 
 	if (m_list.empty()) {
 		EndAction();
@@ -155,8 +161,9 @@ void MxCompositePresenter::VTable0x58(MxEndActionNotificationParam& p_param)
 	else {
 		if (m_action->IsA("MxDSSerialAction") && it != m_list.end()) {
 			MxPresenter* presenter = *it;
-			if (presenter->GetCurrentTickleState() == e_idle)
+			if (presenter->GetCurrentTickleState() == e_idle) {
 				presenter->SetTickleState(e_ready);
+			}
 		}
 	}
 }
@@ -171,14 +178,16 @@ void MxCompositePresenter::VTable0x5c(MxNotificationParam& p_param)
 			if (*it == presenter) {
 				m_list.erase(it++);
 
-				if (presenter->GetCurrentTickleState() == e_idle)
+				if (presenter->GetCurrentTickleState() == e_idle) {
 					presenter->SetTickleState(e_ready);
+				}
 
 				MxDSActionList* actions = ((MxDSMultiAction*) m_action)->GetActionList();
 				MxDSActionListCursor cursor(actions);
 
-				if (cursor.Find(presenter->GetAction()))
+				if (cursor.Find(presenter->GetAction())) {
 					cursor.Detach();
+				}
 
 				if (m_list.empty()) {
 					EndAction();
@@ -186,8 +195,9 @@ void MxCompositePresenter::VTable0x5c(MxNotificationParam& p_param)
 				else {
 					if (m_action->IsA("MxDSSerialAction")) {
 						MxPresenter* presenter = *it;
-						if (presenter->GetCurrentTickleState() == e_idle)
+						if (presenter->GetCurrentTickleState() == e_idle) {
 							presenter->SetTickleState(e_ready);
+						}
 					}
 				}
 
@@ -205,13 +215,15 @@ void MxCompositePresenter::VTable0x60(MxPresenter* p_presenter)
 	for (MxCompositePresenterList::iterator it = m_list.begin(); it != m_list.end(); it++) {
 		if (*it == p_presenter) {
 			if (++it == m_list.end()) {
-				if (m_compositePresenter)
+				if (m_compositePresenter) {
 					m_compositePresenter->VTable0x60(this);
+				}
 			}
 			else if (m_action->IsA("MxDSSerialAction")) {
 				MxPresenter* presenter = *it;
-				if (presenter->GetCurrentTickleState() == e_idle)
+				if (presenter->GetCurrentTickleState() == e_idle) {
 					presenter->SetTickleState(e_ready);
+				}
 			}
 			return;
 		}
@@ -227,8 +239,9 @@ void MxCompositePresenter::SetTickleState(TickleState p_tickleState)
 		MxPresenter* presenter = *it;
 		presenter->SetTickleState(p_tickleState);
 
-		if (m_action->IsA("MxDSSerialAction") && p_tickleState == e_ready)
+		if (m_action->IsA("MxDSSerialAction") && p_tickleState == e_ready) {
 			return;
+		}
 	}
 }
 
@@ -248,8 +261,9 @@ MxBool MxCompositePresenter::HasTickleStatePassed(TickleState p_tickleState)
 {
 	for (MxCompositePresenterList::iterator it = m_list.begin(); it != m_list.end(); it++) {
 		MxPresenter* presenter = *it;
-		if (!presenter->HasTickleStatePassed(p_tickleState))
+		if (!presenter->HasTickleStatePassed(p_tickleState)) {
 			return FALSE;
+		}
 	}
 
 	return TRUE;
diff --git a/LEGO1/omni/src/common/mxmediamanager.cpp b/LEGO1/omni/src/common/mxmediamanager.cpp
index 778d7f86..6a9d99c5 100644
--- a/LEGO1/omni/src/common/mxmediamanager.cpp
+++ b/LEGO1/omni/src/common/mxmediamanager.cpp
@@ -50,8 +50,9 @@ void MxMediaManager::Destroy()
 {
 	MxAutoLocker lock(&this->m_criticalSection);
 
-	if (this->m_presenters)
+	if (this->m_presenters) {
 		delete this->m_presenters;
+	}
 
 	Init();
 }
@@ -63,13 +64,15 @@ MxResult MxMediaManager::Tickle()
 	MxPresenter* presenter;
 	MxPresenterListCursor cursor(this->m_presenters);
 
-	while (cursor.Next(presenter))
+	while (cursor.Next(presenter)) {
 		presenter->Tickle();
+	}
 
 	cursor.Reset();
 
-	while (cursor.Next(presenter))
+	while (cursor.Next(presenter)) {
 		presenter->PutData();
+	}
 
 	return SUCCESS;
 }
@@ -88,8 +91,9 @@ void MxMediaManager::UnregisterPresenter(MxPresenter& p_presenter)
 	MxAutoLocker lock(&this->m_criticalSection);
 	MxPresenterListCursor cursor(this->m_presenters);
 
-	if (cursor.Find(&p_presenter))
+	if (cursor.Find(&p_presenter)) {
 		cursor.Detach();
+	}
 }
 
 // FUNCTION: LEGO1 0x100b8ac0
@@ -99,6 +103,7 @@ void MxMediaManager::StopPresenters()
 	MxPresenter* presenter;
 	MxPresenterListCursor cursor(this->m_presenters);
 
-	while (cursor.Next(presenter))
+	while (cursor.Next(presenter)) {
 		presenter->EndAction();
+	}
 }
diff --git a/LEGO1/omni/src/common/mxmediapresenter.cpp b/LEGO1/omni/src/common/mxmediapresenter.cpp
index 2abc5007..17caece5 100644
--- a/LEGO1/omni/src/common/mxmediapresenter.cpp
+++ b/LEGO1/omni/src/common/mxmediapresenter.cpp
@@ -26,21 +26,25 @@ void MxMediaPresenter::Destroy(MxBool p_fromDestructor)
 	{
 		MxAutoLocker lock(&m_criticalSection);
 
-		if (m_currentChunk && m_subscriber)
+		if (m_currentChunk && m_subscriber) {
 			m_subscriber->DestroyChunk(m_currentChunk);
+		}
 
-		if (m_subscriber)
+		if (m_subscriber) {
 			delete m_subscriber;
+		}
 
-		if (m_loopingChunkCursor)
+		if (m_loopingChunkCursor) {
 			delete m_loopingChunkCursor;
+		}
 
 		if (m_loopingChunks) {
 			MxStreamChunkListCursor cursor(m_loopingChunks);
 			MxStreamChunk* chunk;
 
-			while (cursor.Next(chunk))
+			while (cursor.Next(chunk)) {
 				chunk->Release();
+			}
 
 			delete m_loopingChunks;
 		}
@@ -48,8 +52,9 @@ void MxMediaPresenter::Destroy(MxBool p_fromDestructor)
 		Init();
 	}
 
-	if (!p_fromDestructor)
+	if (!p_fromDestructor) {
 		MxPresenter::Destroy();
+	}
 }
 
 // FUNCTION: LEGO1 0x100b5650
@@ -102,16 +107,18 @@ MxResult MxMediaPresenter::StartAction(MxStreamController* p_controller, MxDSAct
 			m_loopingChunks = new MxStreamChunkList;
 			m_loopingChunkCursor = new MxStreamChunkListCursor(m_loopingChunks);
 
-			if (!m_loopingChunks && !m_loopingChunkCursor)
+			if (!m_loopingChunks && !m_loopingChunkCursor) {
 				goto done;
+			}
 		}
 
 		if (p_controller) {
 			m_subscriber = new MxDSSubscriber;
 
 			if (!m_subscriber ||
-				m_subscriber->Create(p_controller, p_action->GetObjectId(), p_action->GetUnknown24()) != SUCCESS)
+				m_subscriber->Create(p_controller, p_action->GetObjectId(), p_action->GetUnknown24()) != SUCCESS) {
 				goto done;
+			}
 		}
 
 		result = SUCCESS;
@@ -126,8 +133,9 @@ void MxMediaPresenter::EndAction()
 {
 	MxAutoLocker lock(&m_criticalSection);
 
-	if (!m_action)
+	if (!m_action) {
 		return;
+	}
 
 	m_currentChunk = NULL;
 
@@ -198,18 +206,22 @@ void MxMediaPresenter::StreamingTickle()
 void MxMediaPresenter::RepeatingTickle()
 {
 	if (IsEnabled() && !m_currentChunk) {
-		if (m_loopingChunkCursor)
-			if (!m_loopingChunkCursor->Next(m_currentChunk))
+		if (m_loopingChunkCursor) {
+			if (!m_loopingChunkCursor->Next(m_currentChunk)) {
 				m_loopingChunkCursor->Next(m_currentChunk);
+			}
+		}
 
 		if (m_currentChunk) {
 			MxLong time = m_currentChunk->GetTime();
-			if (time <= m_action->GetElapsedTime() % m_action->GetLoopCount())
+			if (time <= m_action->GetElapsedTime() % m_action->GetLoopCount()) {
 				ProgressTickleState(e_unk5);
+			}
 		}
 		else {
-			if (m_action->GetElapsedTime() >= m_action->GetStartTime() + m_action->GetDuration())
+			if (m_action->GetElapsedTime() >= m_action->GetStartTime() + m_action->GetDuration()) {
 				ProgressTickleState(e_unk5);
+			}
 		}
 	}
 }
@@ -248,8 +260,9 @@ void MxMediaPresenter::Enable(MxBool p_enable)
 			SetTickleState(e_repeating);
 		}
 		else {
-			if (m_loopingChunkCursor)
+			if (m_loopingChunkCursor) {
 				m_loopingChunkCursor->Reset();
+			}
 			m_currentChunk = NULL;
 			SetTickleState(e_done);
 		}
diff --git a/LEGO1/omni/src/common/mxpresenter.cpp b/LEGO1/omni/src/common/mxpresenter.cpp
index ab803493..794d1227 100644
--- a/LEGO1/omni/src/common/mxpresenter.cpp
+++ b/LEGO1/omni/src/common/mxpresenter.cpp
@@ -49,8 +49,9 @@ MxResult MxPresenter::StartAction(MxStreamController*, MxDSAction* p_action)
 // FUNCTION: LEGO1 0x100b4e40
 void MxPresenter::EndAction()
 {
-	if (this->m_action == NULL)
+	if (this->m_action == NULL) {
 		return;
+	}
 
 	MxAutoLocker lock(&this->m_criticalSection);
 
@@ -98,8 +99,9 @@ void MxPresenter::ParseExtra()
 
 			m_action->SetFlags(m_action->GetFlags() | MxDSAction::c_world);
 
-			if (result)
+			if (result) {
 				SendToCompositePresenter(MxOmni::GetInstance());
+			}
 		}
 	}
 }
@@ -133,28 +135,33 @@ MxResult MxPresenter::Tickle()
 	case e_ready:
 		this->ReadyTickle();
 
-		if (m_currentTickleState != e_starting)
+		if (m_currentTickleState != e_starting) {
 			break;
+		}
 	case e_starting:
 		this->StartingTickle();
 
-		if (m_currentTickleState != e_streaming)
+		if (m_currentTickleState != e_streaming) {
 			break;
+		}
 	case e_streaming:
 		this->StreamingTickle();
 
-		if (m_currentTickleState != e_repeating)
+		if (m_currentTickleState != e_repeating) {
 			break;
+		}
 	case e_repeating:
 		this->RepeatingTickle();
 
-		if (m_currentTickleState != e_unk5)
+		if (m_currentTickleState != e_unk5) {
 			break;
+		}
 	case e_unk5:
 		this->Unk5Tickle();
 
-		if (m_currentTickleState != e_done)
+		if (m_currentTickleState != e_done) {
 			break;
+		}
 	case e_done:
 		this->DoneTickle();
 	default:
@@ -170,10 +177,12 @@ void MxPresenter::Enable(MxBool p_enable)
 	if (this->m_action && this->IsEnabled() != p_enable) {
 		MxU32 flags = this->m_action->GetFlags();
 
-		if (p_enable)
+		if (p_enable) {
 			this->m_action->SetFlags(flags | MxDSAction::c_enabled);
-		else
+		}
+		else {
 			this->m_action->SetFlags(flags & ~MxDSAction::c_enabled);
+		}
 	}
 }
 
diff --git a/LEGO1/omni/src/common/mxticklemanager.cpp b/LEGO1/omni/src/common/mxticklemanager.cpp
index 667902c8..e8b0d410 100644
--- a/LEGO1/omni/src/common/mxticklemanager.cpp
+++ b/LEGO1/omni/src/common/mxticklemanager.cpp
@@ -45,8 +45,9 @@ MxResult MxTickleManager::Tickle()
 		else {
 			it++;
 
-			if (client->GetLastUpdateTime() > time)
+			if (client->GetLastUpdateTime() > time) {
 				client->SetLastUpdateTime(-client->GetTickleInterval());
+			}
 
 			if ((client->GetTickleInterval() + client->GetLastUpdateTime()) < time) {
 				client->GetClient()->Tickle();
@@ -64,8 +65,9 @@ void MxTickleManager::RegisterClient(MxCore* p_client, MxTime p_interval)
 	MxTime interval = GetClientTickleInterval(p_client);
 	if (interval == TICKLE_MANAGER_NOT_FOUND) {
 		MxTickleClient* client = new MxTickleClient(p_client, p_interval);
-		if (client != NULL)
+		if (client != NULL) {
 			m_clients.push_back(client);
+		}
 	}
 }
 
@@ -102,8 +104,9 @@ MxTime MxTickleManager::GetClientTickleInterval(MxCore* p_client)
 	MxTickleClientPtrList::iterator it = m_clients.begin();
 	while (it != m_clients.end()) {
 		MxTickleClient* client = *it;
-		if ((client->GetClient() == p_client) && ((client->GetFlags() & TICKLE_MANAGER_FLAG_DESTROY) == 0))
+		if ((client->GetClient() == p_client) && ((client->GetFlags() & TICKLE_MANAGER_FLAG_DESTROY) == 0)) {
 			return client->GetTickleInterval();
+		}
 
 		it++;
 	}
diff --git a/LEGO1/omni/src/common/mxutil.cpp b/LEGO1/omni/src/common/mxutil.cpp
index d06b2653..5ffab77c 100644
--- a/LEGO1/omni/src/common/mxutil.cpp
+++ b/LEGO1/omni/src/common/mxutil.cpp
@@ -35,15 +35,17 @@ MxBool GetRectIntersection(
 	MxRect32 rect(0, 0, *p_width, *p_height);
 	rect.AddPoint(rect1Origin);
 
-	if (!rect.IntersectsWith(rect1))
+	if (!rect.IntersectsWith(rect1)) {
 		return FALSE;
+	}
 
 	rect.Intersect(rect1);
 	rect.SubtractPoint(rect1Origin);
 	rect.AddPoint(rect2Origin);
 
-	if (!rect.IntersectsWith(rect2))
+	if (!rect.IntersectsWith(rect2)) {
 		return FALSE;
+	}
 
 	rect.Intersect(rect2);
 	rect.SubtractPoint(rect2Origin);
@@ -93,8 +95,9 @@ MxBool KeyValueStringParse(char* p_outputValue, const char* p_key, const char* p
 				char* cur = &token[strlen(p_key)];
 				cur++;
 				while (*cur != ',') {
-					if (*cur == ' ' || *cur == '\0' || *cur == '\t' || *cur == '\n' || *cur == '\r')
+					if (*cur == ' ' || *cur == '\0' || *cur == '\t' || *cur == '\n' || *cur == '\r') {
 						break;
+					}
 					*p_outputValue++ = *cur++;
 				}
 				*p_outputValue = '\0';
@@ -115,8 +118,8 @@ MxBool KeyValueStringParse(char* p_outputValue, const char* p_key, const char* p
 MxBool ContainsPresenter(MxCompositePresenterList& p_presenterList, MxPresenter* p_presenter)
 {
 	for (MxCompositePresenterList::iterator it = p_presenterList.begin(); it != p_presenterList.end(); it++) {
-		if (p_presenter == *it || (*it)->IsA("MxCompositePresenter") &&
-									  ContainsPresenter(((MxCompositePresenter*) *it)->GetList(), p_presenter)) {
+		if (p_presenter == *it || ((*it)->IsA("MxCompositePresenter") &&
+								   ContainsPresenter(((MxCompositePresenter*) *it)->GetList(), p_presenter))) {
 			return TRUE;
 		}
 	}
diff --git a/LEGO1/omni/src/common/mxvariabletable.cpp b/LEGO1/omni/src/common/mxvariabletable.cpp
index 9503ee5e..94bdbacb 100644
--- a/LEGO1/omni/src/common/mxvariabletable.cpp
+++ b/LEGO1/omni/src/common/mxvariabletable.cpp
@@ -41,8 +41,9 @@ void MxVariableTable::SetVariable(MxVariable* p_var)
 	MxHashTableCursor<MxVariable*> cursor(this);
 	MxBool found = cursor.Find(p_var);
 
-	if (found)
+	if (found) {
 		cursor.DeleteMatch();
+	}
 
 	MxHashTable<MxVariable*>::Add(p_var);
 }
diff --git a/LEGO1/omni/src/event/mxeventmanager.cpp b/LEGO1/omni/src/event/mxeventmanager.cpp
index 7819c38f..c0ee3229 100644
--- a/LEGO1/omni/src/event/mxeventmanager.cpp
+++ b/LEGO1/omni/src/event/mxeventmanager.cpp
@@ -30,11 +30,13 @@ void MxEventManager::Destroy(MxBool p_fromDestructor)
 		m_thread->Terminate();
 		delete m_thread;
 	}
-	else
+	else {
 		TickleManager()->UnregisterClient(this);
+	}
 
-	if (!p_fromDestructor)
+	if (!p_fromDestructor) {
 		MxMediaManager::Destroy();
+	}
 }
 
 // FUNCTION: LEGO1 0x100c04a0
@@ -50,21 +52,25 @@ MxResult MxEventManager::Create(MxU32 p_frequencyMS, MxBool p_createThread)
 			locked = TRUE;
 			this->m_thread = new MxTickleThread(this, p_frequencyMS);
 
-			if (!this->m_thread || this->m_thread->Start(0, 0) != SUCCESS)
+			if (!this->m_thread || this->m_thread->Start(0, 0) != SUCCESS) {
 				goto done;
+			}
 		}
-		else
+		else {
 			TickleManager()->RegisterClient(this, p_frequencyMS);
+		}
 
 		status = SUCCESS;
 	}
 
 done:
-	if (status != SUCCESS)
+	if (status != SUCCESS) {
 		Destroy();
+	}
 
-	if (locked)
+	if (locked) {
 		this->m_criticalSection.Leave();
+	}
 
 	return status;
 }
diff --git a/LEGO1/omni/src/event/mxeventpresenter.cpp b/LEGO1/omni/src/event/mxeventpresenter.cpp
index 03b0de14..6072bdd5 100644
--- a/LEGO1/omni/src/event/mxeventpresenter.cpp
+++ b/LEGO1/omni/src/event/mxeventpresenter.cpp
@@ -42,13 +42,15 @@ MxResult MxEventPresenter::AddToManager()
 // FUNCTION: LEGO1 0x100c2de0
 void MxEventPresenter::Destroy()
 {
-	if (EventManager())
+	if (EventManager()) {
 		EventManager()->UnregisterPresenter(*this);
+	}
 
 	m_criticalSection.Enter();
 
-	if (m_data)
+	if (m_data) {
 		delete[] m_data;
+	}
 
 	Init();
 
@@ -80,8 +82,9 @@ void MxEventPresenter::StartingTickle()
 {
 	MxStreamChunk* chunk = CurrentChunk();
 
-	if (chunk && m_action->GetElapsedTime() >= chunk->GetTime())
+	if (chunk && m_action->GetElapsedTime() >= chunk->GetTime()) {
 		ProgressTickleState(e_streaming);
+	}
 }
 
 // FUNCTION: LEGO1 0x100c2ef0
@@ -103,8 +106,9 @@ MxResult MxEventPresenter::PutData()
 					variableTable->SetVariable(key, value);
 				}
 
-				if (m_currentTickleState == e_streaming)
+				if (m_currentTickleState == e_streaming) {
 					m_subscriber->DestroyChunk(m_currentChunk);
+				}
 				m_currentChunk = NULL;
 			}
 		}
diff --git a/LEGO1/omni/src/main/mxomni.cpp b/LEGO1/omni/src/main/mxomni.cpp
index 2b266b3b..c04425b1 100644
--- a/LEGO1/omni/src/main/mxomni.cpp
+++ b/LEGO1/omni/src/main/mxomni.cpp
@@ -158,48 +158,56 @@ MxResult MxOmni::Create(MxOmniCreateParam& p_param)
 {
 	MxResult result = FAILURE;
 
-	if (!(m_atomIdCounterSet = new MxAtomIdCounterSet()))
+	if (!(m_atomIdCounterSet = new MxAtomIdCounterSet())) {
 		goto done;
+	}
 
 	m_mediaPath = p_param.GetMediaPath();
 	m_windowHandle = p_param.GetWindowHandle();
 
 	if (p_param.CreateFlags().CreateObjectFactory()) {
-		if (!(m_objectFactory = new MxObjectFactory()))
+		if (!(m_objectFactory = new MxObjectFactory())) {
 			goto done;
+		}
 	}
 
 	if (p_param.CreateFlags().CreateVariableTable()) {
-		if (!(m_variableTable = new MxVariableTable()))
+		if (!(m_variableTable = new MxVariableTable())) {
 			goto done;
+		}
 	}
 
 	if (p_param.CreateFlags().CreateTimer()) {
-		if (!(m_timer = new MxTimer()))
+		if (!(m_timer = new MxTimer())) {
 			goto done;
+		}
 	}
 
 	if (p_param.CreateFlags().CreateTickleManager()) {
-		if (!(m_tickleManager = new MxTickleManager()))
+		if (!(m_tickleManager = new MxTickleManager())) {
 			goto done;
+		}
 	}
 
 	if (p_param.CreateFlags().CreateNotificationManager()) {
-		if (m_notificationManager = new MxNotificationManager()) {
-			if (m_notificationManager->Create(100, 0) != SUCCESS)
+		if ((m_notificationManager = new MxNotificationManager())) {
+			if (m_notificationManager->Create(100, 0) != SUCCESS) {
 				goto done;
+			}
 		}
-		else
+		else {
 			goto done;
+		}
 	}
 
 	if (p_param.CreateFlags().CreateStreamer()) {
-		if (!(m_streamer = new MxStreamer()) || m_streamer->Create() != SUCCESS)
+		if (!(m_streamer = new MxStreamer()) || m_streamer->Create() != SUCCESS) {
 			goto done;
+		}
 	}
 
 	if (p_param.CreateFlags().CreateVideoManager()) {
-		if (m_videoManager = new MxVideoManager()) {
+		if ((m_videoManager = new MxVideoManager())) {
 			if (m_videoManager->Create(p_param.GetVideoParam(), 100, 0) != SUCCESS) {
 				delete m_videoManager;
 				m_videoManager = NULL;
@@ -208,7 +216,7 @@ MxResult MxOmni::Create(MxOmniCreateParam& p_param)
 	}
 
 	if (p_param.CreateFlags().CreateSoundManager()) {
-		if (m_soundManager = new MxSoundManager()) {
+		if ((m_soundManager = new MxSoundManager())) {
 			if (m_soundManager->Create(10, 0) != SUCCESS) {
 				delete m_soundManager;
 				m_soundManager = NULL;
@@ -217,7 +225,7 @@ MxResult MxOmni::Create(MxOmniCreateParam& p_param)
 	}
 
 	if (p_param.CreateFlags().CreateMusicManager()) {
-		if (m_musicManager = new MxMusicManager()) {
+		if ((m_musicManager = new MxMusicManager())) {
 			if (m_musicManager->Create(50, 0) != SUCCESS) {
 				delete m_musicManager;
 				m_musicManager = NULL;
@@ -226,7 +234,7 @@ MxResult MxOmni::Create(MxOmniCreateParam& p_param)
 	}
 
 	if (p_param.CreateFlags().CreateEventManager()) {
-		if (m_eventManager = new MxEventManager()) {
+		if ((m_eventManager = new MxEventManager())) {
 			if (m_eventManager->Create(50, 0) != SUCCESS) {
 				delete m_eventManager;
 				m_eventManager = NULL;
@@ -235,9 +243,11 @@ MxResult MxOmni::Create(MxOmniCreateParam& p_param)
 	}
 
 	result = SUCCESS;
+
 done:
-	if (result != SUCCESS)
+	if (result != SUCCESS) {
 		Destroy();
+	}
 
 	return result;
 }
@@ -255,8 +265,9 @@ void MxOmni::Destroy()
 	// TODO: private members
 	if (m_notificationManager) {
 		while (m_notificationManager->GetQueue()) {
-			if (m_notificationManager->GetQueue()->size() == 0)
+			if (m_notificationManager->GetQueue()->size() == 0) {
 				break;
+			}
 			m_notificationManager->Tickle();
 		}
 
@@ -317,16 +328,18 @@ MxResult MxOmni::CreatePresenter(MxStreamController* p_controller, MxDSAction& p
 	if (object) {
 		if (object->AddToManager() == SUCCESS) {
 			MxPresenter* sender = p_action.GetUnknown28();
-			if (!sender)
+			if (!sender) {
 				sender = p_controller->FUN_100c1e70(p_action);
+			}
 
 			if (sender) {
 				p_action.SetOrigin(sender);
 				object->SetCompositePresenter((MxCompositePresenter*) sender);
 			}
 			else {
-				if (!p_action.GetOrigin())
+				if (!p_action.GetOrigin()) {
 					p_action.SetOrigin(this);
+				}
 				object->SetCompositePresenter(NULL);
 			}
 
@@ -381,16 +394,18 @@ void MxOmni::DestroyInstance()
 // FUNCTION: LEGO1 0x100b06b0
 MxBool MxOmni::ActionSourceEquals(MxDSAction* p_action, const char* p_name)
 {
-	if (!strcmp(p_action->GetSourceName(), p_name))
+	if (!strcmp(p_action->GetSourceName(), p_name)) {
 		return TRUE;
+	}
 
 	if (p_action->IsA("MxDSMultiAction")) {
 		MxDSActionListCursor cursor(((MxDSMultiAction*) p_action)->GetActionList());
 		MxDSAction* action;
 
 		while (cursor.Next(action)) {
-			if (ActionSourceEquals(action, p_name))
+			if (ActionSourceEquals(action, p_name)) {
 				return TRUE;
+			}
 		}
 	}
 
@@ -402,8 +417,9 @@ MxLong MxOmni::Notify(MxParam& p_param)
 {
 	MxAutoLocker lock(&this->m_criticalsection);
 
-	if (((MxNotificationParam&) p_param).GetNotification() != c_notificationEndAction)
+	if (((MxNotificationParam&) p_param).GetNotification() != c_notificationEndAction) {
 		return 0;
+	}
 
 	return HandleActionEnd(p_param);
 }
@@ -476,8 +492,9 @@ MxBool MxOmni::DoesEntityExist(MxDSAction& p_dsAction)
 	if (m_streamer->FUN_100b9b30(p_dsAction)) {
 		MxNotificationPtrList* queue = m_notificationManager->GetQueue();
 
-		if (!queue || queue->size() == 0)
+		if (!queue || queue->size() == 0) {
 			return TRUE;
+		}
 	}
 	return FALSE;
 }
diff --git a/LEGO1/omni/src/notify/mxnotificationmanager.cpp b/LEGO1/omni/src/notify/mxnotificationmanager.cpp
index 9e4858df..fe10a82c 100644
--- a/LEGO1/omni/src/notify/mxnotificationmanager.cpp
+++ b/LEGO1/omni/src/notify/mxnotificationmanager.cpp
@@ -128,9 +128,9 @@ void MxNotificationManager::FlushPending(MxCore* p_listener)
 			MxNotificationPtrList::iterator it = m_sendList->begin();
 			while (it != m_sendList->end()) {
 				notif = *it;
-				if ((notif->GetTarget()->GetId() == p_listener->GetId()) ||
-					(notif->GetParam()->GetSender()) &&
-						(notif->GetParam()->GetSender()->GetId() == p_listener->GetId())) {
+				if (notif->GetTarget()->GetId() == p_listener->GetId() ||
+					(notif->GetParam()->GetSender() && notif->GetParam()->GetSender()->GetId() == p_listener->GetId()
+					)) {
 					m_sendList->erase(it++);
 					pending.push_back(notif);
 				}
@@ -143,8 +143,8 @@ void MxNotificationManager::FlushPending(MxCore* p_listener)
 		MxNotificationPtrList::iterator it = m_queue->begin();
 		while (it != m_queue->end()) {
 			notif = *it;
-			if ((notif->GetTarget()->GetId() == p_listener->GetId()) ||
-				(notif->GetParam()->GetSender()) && (notif->GetParam()->GetSender()->GetId() == p_listener->GetId())) {
+			if (notif->GetTarget()->GetId() == p_listener->GetId() ||
+				(notif->GetParam()->GetSender() && notif->GetParam()->GetSender()->GetId() == p_listener->GetId())) {
 				m_queue->erase(it++);
 				pending.push_back(notif);
 			}
@@ -169,8 +169,9 @@ void MxNotificationManager::Register(MxCore* p_listener)
 	MxAutoLocker lock(&m_lock);
 
 	MxIdList::iterator it = find(m_listenerIds.begin(), m_listenerIds.end(), p_listener->GetId());
-	if (it != m_listenerIds.end())
+	if (it != m_listenerIds.end()) {
 		return;
+	}
 
 	m_listenerIds.push_back(p_listener->GetId());
 }
diff --git a/LEGO1/omni/src/stream/mxdiskstreamcontroller.cpp b/LEGO1/omni/src/stream/mxdiskstreamcontroller.cpp
index 5833d18f..a2b2edf9 100644
--- a/LEGO1/omni/src/stream/mxdiskstreamcontroller.cpp
+++ b/LEGO1/omni/src/stream/mxdiskstreamcontroller.cpp
@@ -35,8 +35,9 @@ MxDiskStreamController::~MxDiskStreamController()
 	}
 
 	MxDSAction* action;
-	while (m_unk0x3c.PopFront(action))
+	while (m_unk0x3c.PopFront(action)) {
 		delete action;
+	}
 
 	if (m_provider) {
 		delete m_provider;
@@ -45,11 +46,13 @@ MxDiskStreamController::~MxDiskStreamController()
 
 	FUN_100c8720();
 
-	while (m_list0x80.PopFront(action))
+	while (m_list0x80.PopFront(action)) {
 		FUN_100c7cb0((MxDSStreamingAction*) action);
+	}
 
-	while (m_list0x64.PopFront(action))
+	while (m_list0x64.PopFront(action)) {
 		FUN_100c7cb0((MxDSStreamingAction*) action);
+	}
 
 	while (!m_list0x74.empty()) {
 		MxDSBuffer* buffer = m_list0x74.front();
@@ -130,15 +133,17 @@ void MxDiskStreamController::FUN_100c7980()
 			buffer = new MxDSBuffer();
 
 			if (buffer->AllocateBuffer(m_provider->GetFileSize(), MxDSBuffer::e_chunk) != SUCCESS) {
-				if (buffer)
+				if (buffer) {
 					delete buffer;
+				}
 				return;
 			}
 
 			action = VTable0x28();
 			if (!action) {
-				if (buffer)
+				if (buffer) {
 					delete buffer;
+				}
 				return;
 			}
 
@@ -228,8 +233,9 @@ MxResult MxDiskStreamController::FUN_100c7d10()
 	MxAutoLocker lock(&this->m_criticalSection);
 	MxDSStreamingAction* action = FUN_100c7db0();
 
-	if (!action)
+	if (!action) {
 		return FAILURE;
+	}
 
 	if (FUN_100c8360(action) != SUCCESS) {
 		VTable0x24(action);
@@ -290,11 +296,13 @@ MxResult MxDiskStreamController::VTable0x20(MxDSAction* p_action)
 
 		FUN_100c7f40(action);
 
-		if (VTable0x2c(p_action, entry->GetUnknown94()) != SUCCESS)
+		if (VTable0x2c(p_action, entry->GetUnknown94()) != SUCCESS) {
 			return FAILURE;
+		}
 	}
-	else if (MxStreamController::VTable0x20(p_action) != SUCCESS)
+	else if (MxStreamController::VTable0x20(p_action) != SUCCESS) {
 		return FAILURE;
+	}
 
 	m_unk0x70 = TRUE;
 	m_unk0xc4 = TRUE;
@@ -312,8 +320,9 @@ void MxDiskStreamController::FUN_100c8120(MxDSAction* p_action)
 
 	while (TRUE) {
 		MxDSAction* found = m_unk0x54.Find(p_action, TRUE);
-		if (!found)
+		if (!found) {
 			break;
+		}
 		delete found;
 	}
 }
@@ -408,8 +417,9 @@ void MxDiskStreamController::FUN_100c8540()
 			m_list0x74.erase(it++);
 			FUN_100c7ce0(buf);
 		}
-		else
+		else {
 			it++;
+		}
 	}
 
 	if (m_nextActionList.empty()) {
diff --git a/LEGO1/omni/src/stream/mxdiskstreamprovider.cpp b/LEGO1/omni/src/stream/mxdiskstreamprovider.cpp
index 7b4b6ef5..88f70c7d 100644
--- a/LEGO1/omni/src/stream/mxdiskstreamprovider.cpp
+++ b/LEGO1/omni/src/stream/mxdiskstreamprovider.cpp
@@ -19,8 +19,9 @@ MxU32 g_unk0x10102878 = 0;
 // FUNCTION: LEGO1 0x100d0f30
 MxResult MxDiskStreamProviderThread::Run()
 {
-	if (m_target)
+	if (m_target) {
 		((MxDiskStreamProvider*) m_target)->WaitForWorkToComplete();
+	}
 	MxThread::Run();
 	// They should probably have writen "return MxThread::Run()" but they didn't.
 	return SUCCESS;
@@ -55,11 +56,13 @@ MxDiskStreamProvider::~MxDiskStreamProvider()
 			m_list.PopFrontStreamingAction(action);
 		}
 
-		if (!action)
+		if (!action) {
 			break;
+		}
 
-		if (action->GetUnknowna0()->GetWriteOffset() < 0x20000)
+		if (action->GetUnknowna0()->GetWriteOffset() < 0x20000) {
 			g_unk0x10102878--;
+		}
 
 		((MxDiskStreamController*) m_pLookup)->FUN_100c8670(action);
 	} while (action);
@@ -70,8 +73,9 @@ MxDiskStreamProvider::~MxDiskStreamProvider()
 		m_thread.Terminate();
 	}
 
-	if (m_pFile)
+	if (m_pFile) {
 		delete m_pFile;
+	}
 
 	m_pFile = NULL;
 }
@@ -91,8 +95,9 @@ MxResult MxDiskStreamProvider::SetResourceToGet(MxStreamController* p_resource)
 			path = MxString(MxOmni::GetCD()) + p_resource->GetAtom().GetInternal() + ".si";
 			m_pFile->SetFileName(path.GetData());
 
-			if (m_pFile->Open(0) != 0)
+			if (m_pFile->Open(0) != 0) {
 				goto done;
+			}
 		}
 
 		m_remainingWork = TRUE;
@@ -123,11 +128,13 @@ void MxDiskStreamProvider::VTable0x20(MxDSAction* p_action)
 				m_list.PopFrontStreamingAction(action);
 			}
 
-			if (!action)
+			if (!action) {
 				return;
+			}
 
-			if (action->GetUnknowna0()->GetWriteOffset() < 0x20000)
+			if (action->GetUnknowna0()->GetWriteOffset() < 0x20000) {
 				g_unk0x10102878--;
+			}
 
 			((MxDiskStreamController*) m_pLookup)->FUN_100c8670(action);
 		} while (action);
@@ -139,11 +146,13 @@ void MxDiskStreamProvider::VTable0x20(MxDSAction* p_action)
 				action = (MxDSStreamingAction*) m_list.Find(p_action, TRUE);
 			}
 
-			if (!action)
+			if (!action) {
 				return;
+			}
 
-			if (action->GetUnknowna0()->GetWriteOffset() < 0x20000)
+			if (action->GetUnknowna0()->GetWriteOffset() < 0x20000) {
 				g_unk0x10102878--;
+			}
 
 			((MxDiskStreamController*) m_pLookup)->FUN_100c8670(action);
 		} while (action);
@@ -155,8 +164,9 @@ MxResult MxDiskStreamProvider::WaitForWorkToComplete()
 {
 	while (m_remainingWork) {
 		m_busySemaphore.Wait(INFINITE);
-		if (m_unk0x35)
+		if (m_unk0x35) {
 			PerformWork();
+		}
 	}
 
 	return SUCCESS;
@@ -165,14 +175,16 @@ MxResult MxDiskStreamProvider::WaitForWorkToComplete()
 // FUNCTION: LEGO1 0x100d1780
 MxResult MxDiskStreamProvider::FUN_100d1780(MxDSStreamingAction* p_action)
 {
-	if (!m_remainingWork)
+	if (!m_remainingWork) {
 		return FAILURE;
+	}
 
 	if (p_action->GetUnknown9c() > 0 && !p_action->GetUnknowna0()) {
 		MxDSBuffer* buffer = new MxDSBuffer();
 
-		if (!buffer)
+		if (!buffer) {
 			return FAILURE;
+		}
 
 		if (buffer->AllocateBuffer(GetFileSize(), MxDSBuffer::e_allocate) != SUCCESS) {
 			delete buffer;
@@ -220,8 +232,9 @@ void MxDiskStreamProvider::PerformWork()
 	{
 		MxAutoLocker lock(&m_criticalSection);
 
-		if (!m_list.PopFrontStreamingAction(streamingAction))
+		if (!m_list.PopFrontStreamingAction(streamingAction)) {
 			goto done;
+		}
 	}
 
 	if (streamingAction->GetUnknowna0()->GetWriteOffset() < 0x20000) {
@@ -276,15 +289,17 @@ MxResult MxDiskStreamProvider::FUN_100d1b20(MxDSStreamingAction* p_action)
 {
 	MxDSBuffer* buffer = new MxDSBuffer();
 
-	if (!buffer)
+	if (!buffer) {
 		return FAILURE;
+	}
 
 	MxU32 size = p_action->GetUnknowna0()->GetWriteOffset() - p_action->GetUnknown94() + p_action->GetBufferOffset() +
 				 (p_action->GetUnknowna4() ? p_action->GetUnknowna4()->GetWriteOffset() : 0);
 
 	if (buffer->AllocateBuffer(size, MxDSBuffer::e_allocate) != SUCCESS) {
-		if (!buffer)
+		if (!buffer) {
 			return FAILURE;
+		}
 
 		delete buffer;
 		return FAILURE;
@@ -327,8 +342,9 @@ MxResult MxDiskStreamProvider::FUN_100d1b20(MxDSStreamingAction* p_action)
 				size = ReadData(*pdata, buffer->GetWriteOffset());
 
 				MxDSBuffer* buffer3 = new MxDSBuffer();
-				if (!buffer3)
+				if (!buffer3) {
 					return FAILURE;
+				}
 
 				if (buffer3->AllocateBuffer(size, MxDSBuffer::e_allocate) == SUCCESS) {
 					memcpy(buffer3->GetBuffer(), p_action->GetUnknowna4()->GetBuffer(), size);
@@ -342,8 +358,9 @@ MxResult MxDiskStreamProvider::FUN_100d1b20(MxDSStreamingAction* p_action)
 					MxU8* data2 = buffer4->GetBuffer();
 
 					while (TRUE) {
-						if (*MxStreamChunk::IntoTime(data2) > p_action->GetUnknown9c())
+						if (*MxStreamChunk::IntoTime(data2) > p_action->GetUnknown9c()) {
 							break;
+						}
 
 						data += MxDSChunk::Size(*MxDSChunk::IntoLength(data));
 						unk0x14 += MxDSChunk::Size(*MxDSChunk::IntoLength(data));
diff --git a/LEGO1/omni/src/stream/mxdsbuffer.cpp b/LEGO1/omni/src/stream/mxdsbuffer.cpp
index 380cc1e0..106964b2 100644
--- a/LEGO1/omni/src/stream/mxdsbuffer.cpp
+++ b/LEGO1/omni/src/stream/mxdsbuffer.cpp
@@ -164,19 +164,22 @@ MxResult MxDSBuffer::FUN_100c67b0(
 	MxResult result = FAILURE;
 
 	m_unk0x30 = (MxDSStreamingAction*) p_controller->GetUnk0x3c().Find(p_action, FALSE);
-	if (m_unk0x30 == NULL)
+	if (m_unk0x30 == NULL) {
 		return FAILURE;
+	}
 
 	MxU8* data;
-	while (data = (MxU8*) SkipToData()) {
+	while ((data = (MxU8*) SkipToData())) {
 		if (*p_streamingAction == NULL) {
 			result = CreateObject(p_controller, (MxU32*) data, p_action, p_streamingAction);
 
-			if (result == FAILURE)
+			if (result == FAILURE) {
 				return result;
+			}
 			// TODO: Not a MxResult value?
-			if (result == 1)
+			if (result == 1) {
 				break;
+			}
 		}
 		else {
 			MxDSBuffer* buffer = (*p_streamingAction)->GetUnknowna0();
@@ -226,8 +229,9 @@ MxResult MxDSBuffer::CreateObject(
 		return FAILURE;
 	}
 
-	if (*p_data == FOURCC('M', 'x', 'O', 'b'))
+	if (*p_data == FOURCC('M', 'x', 'O', 'b')) {
 		return StartPresenterFromAction(p_controller, p_action, (MxDSAction*) header);
+	}
 	else if (*p_data == FOURCC('M', 'x', 'C', 'h')) {
 		MxStreamChunk* chunk = (MxStreamChunk*) header;
 		if (!m_unk0x30->HasId((chunk)->GetObjectId())) {
@@ -316,8 +320,9 @@ MxResult MxDSBuffer::ParseChunk(
 			}
 		}
 
-		if (buffer)
+		if (buffer) {
 			delete buffer;
+		}
 
 		delete p_header;
 		return FAILURE;
@@ -337,8 +342,9 @@ MxResult MxDSBuffer::ParseChunk(
 						MxNextActionDataStart* data =
 							p_controller->FindNextActionDataStartFromStreamingAction(m_unk0x30);
 
-						if (data)
+						if (data) {
 							data->SetData(m_unk0x30->GetBufferOffset());
+						}
 
 						m_unk0x30->FUN_100cd2d0();
 					}
@@ -472,8 +478,9 @@ MxResult MxDSBuffer::CalcBytesRemaining(MxU8* p_data)
 		if (bytesRead <= m_bytesRemaining) {
 			memcpy(m_pBuffer + m_writeOffset - m_bytesRemaining, ptr, bytesRead);
 
-			if (m_writeOffset == m_bytesRemaining)
+			if (m_writeOffset == m_bytesRemaining) {
 				*(MxU32*) (m_pBuffer + 4) = *MxStreamChunk::IntoLength(m_pBuffer) + MxStreamChunk::GetHeaderSize();
+			}
 
 			m_bytesRemaining -= bytesRead;
 			result = SUCCESS;
@@ -510,8 +517,9 @@ MxU8* MxDSBuffer::FUN_100c6fa0(MxU8* p_data)
 			break;
 		case FOURCC('M', 'x', 'O', 'b'):
 		case FOURCC('M', 'x', 'C', 'h'):
-			if (current != p_data)
+			if (current != p_data) {
 				return current;
+			}
 			current = ((MxU32) current & 1) + current;
 			current += 8;
 			break;
diff --git a/LEGO1/omni/src/stream/mxdschunk.cpp b/LEGO1/omni/src/stream/mxdschunk.cpp
index fede0762..a964d0fa 100644
--- a/LEGO1/omni/src/stream/mxdschunk.cpp
+++ b/LEGO1/omni/src/stream/mxdschunk.cpp
@@ -15,8 +15,9 @@ MxDSChunk::MxDSChunk()
 // FUNCTION: LEGO1 0x100be170
 MxDSChunk::~MxDSChunk()
 {
-	if (m_flags & c_bit1)
+	if (m_flags & c_bit1) {
 		delete[] m_data;
+	}
 }
 
 // FUNCTION: LEGO1 0x100be1e0
diff --git a/LEGO1/omni/src/stream/mxdsfile.cpp b/LEGO1/omni/src/stream/mxdsfile.cpp
index 33b85929..b422f45e 100644
--- a/LEGO1/omni/src/stream/mxdsfile.cpp
+++ b/LEGO1/omni/src/stream/mxdsfile.cpp
@@ -98,8 +98,9 @@ MxLong MxDSFile::Close()
 // FUNCTION: LEGO1 0x100cc780
 MxResult MxDSFile::Read(unsigned char* p_buf, MxULong p_nbytes)
 {
-	if (m_io.Read(p_buf, p_nbytes) != p_nbytes)
+	if (m_io.Read(p_buf, p_nbytes) != p_nbytes) {
 		return FAILURE;
+	}
 
 	m_position += p_nbytes;
 	return SUCCESS;
diff --git a/LEGO1/omni/src/stream/mxdssubscriber.cpp b/LEGO1/omni/src/stream/mxdssubscriber.cpp
index 82ca1730..488ff02c 100644
--- a/LEGO1/omni/src/stream/mxdssubscriber.cpp
+++ b/LEGO1/omni/src/stream/mxdssubscriber.cpp
@@ -16,17 +16,20 @@ MxDSSubscriber::MxDSSubscriber()
 // FUNCTION: LEGO1 0x100b7e00
 MxDSSubscriber::~MxDSSubscriber()
 {
-	if (m_controller)
+	if (m_controller) {
 		m_controller->RemoveSubscriber(this);
+	}
 
 	DeleteChunks();
 
-	if (m_pendingChunkCursor)
+	if (m_pendingChunkCursor) {
 		delete m_pendingChunkCursor;
+	}
 	m_pendingChunkCursor = NULL;
 
-	if (m_consumedChunkCursor)
+	if (m_consumedChunkCursor) {
 		delete m_consumedChunkCursor;
+	}
 	m_consumedChunkCursor = NULL;
 }
 
@@ -36,17 +39,20 @@ MxResult MxDSSubscriber::Create(MxStreamController* p_controller, MxU32 p_object
 	m_objectId = p_objectId;
 	m_unk0x48 = p_unk0x48;
 
-	if (!p_controller)
+	if (!p_controller) {
 		return FAILURE;
+	}
 	m_controller = p_controller;
 
 	m_pendingChunkCursor = new MxStreamChunkListCursor(&m_pendingChunks);
-	if (!m_pendingChunkCursor)
+	if (!m_pendingChunkCursor) {
 		return FAILURE;
+	}
 
 	m_consumedChunkCursor = new MxStreamChunkListCursor(&m_consumedChunks);
-	if (!m_consumedChunkCursor)
+	if (!m_consumedChunkCursor) {
 		return FAILURE;
+	}
 
 	m_controller->AddSubscriber(this);
 	return SUCCESS;
@@ -74,10 +80,12 @@ void MxDSSubscriber::DeleteChunks()
 MxResult MxDSSubscriber::AddChunk(MxStreamChunk* p_chunk, MxBool p_append)
 {
 	if (m_pendingChunkCursor) {
-		if (p_append)
+		if (p_append) {
 			m_pendingChunks.Append(p_chunk);
-		else
+		}
+		else {
 			m_pendingChunks.Prepend(p_chunk);
+		}
 	}
 
 	return SUCCESS;
@@ -88,8 +96,9 @@ MxStreamChunk* MxDSSubscriber::NextChunk()
 {
 	MxStreamChunk* chunk = NULL;
 
-	if (m_pendingChunkCursor)
+	if (m_pendingChunkCursor) {
 		m_pendingChunkCursor->First(chunk);
+	}
 
 	if (chunk) {
 		m_pendingChunkCursor->Detach();
@@ -104,8 +113,9 @@ MxStreamChunk* MxDSSubscriber::CurrentChunk()
 {
 	MxStreamChunk* chunk = NULL;
 
-	if (m_pendingChunkCursor)
+	if (m_pendingChunkCursor) {
 		m_pendingChunkCursor->First(chunk);
+	}
 
 	return chunk;
 }
@@ -116,10 +126,12 @@ void MxDSSubscriber::DestroyChunk(MxStreamChunk* p_chunk)
 	if (p_chunk) {
 		if (m_consumedChunkCursor->Find(p_chunk)) {
 			m_consumedChunkCursor->Detach();
-			if (p_chunk)
+			if (p_chunk) {
 				delete p_chunk;
+			}
 		}
-		else if (p_chunk->GetFlags() & MxDSChunk::c_bit1 && p_chunk)
+		else if (p_chunk->GetFlags() & MxDSChunk::c_bit1 && p_chunk) {
 			delete p_chunk;
+		}
 	}
 }
diff --git a/LEGO1/omni/src/stream/mxioinfo.cpp b/LEGO1/omni/src/stream/mxioinfo.cpp
index 9951c174..a040bc41 100644
--- a/LEGO1/omni/src/stream/mxioinfo.cpp
+++ b/LEGO1/omni/src/stream/mxioinfo.cpp
@@ -72,8 +72,9 @@ MxU16 MXIOINFO::Close(MxLong p_unused)
 		_lclose((HFILE) m_info.hmmio);
 		m_info.hmmio = 0;
 
-		if (m_info.dwFlags & MMIO_ALLOCBUF)
+		if (m_info.dwFlags & MMIO_ALLOCBUF) {
 			delete[] m_info.pchBuffer;
+		}
 
 		m_info.pchEndWrite = 0;
 		m_info.pchEndRead = 0;
@@ -95,8 +96,9 @@ MxLong MXIOINFO::Read(void* p_buf, MxLong p_len)
 		while (p_len > 0) {
 
 			if (bytesLeft > 0) {
-				if (p_len < bytesLeft)
+				if (p_len < bytesLeft) {
 					bytesLeft = p_len;
+				}
 
 				memcpy(p_buf, m_info.pchNext, bytesLeft);
 				p_len -= bytesLeft;
@@ -105,12 +107,14 @@ MxLong MXIOINFO::Read(void* p_buf, MxLong p_len)
 				bytesRead += bytesLeft;
 			}
 
-			if (p_len <= 0 || Advance(0))
+			if (p_len <= 0 || Advance(0)) {
 				break;
+			}
 
 			bytesLeft = m_info.pchEndRead - m_info.pchNext;
-			if (bytesLeft <= 0)
+			if (bytesLeft <= 0) {
 				break;
+			}
 		}
 	}
 	else if (m_info.hmmio && p_len > 0) {
@@ -381,8 +385,9 @@ MxU16 MXIOINFO::Descend(MMCKINFO* p_chunkInfo, const MMCKINFO* p_parentInfo, MxU
 {
 	MxU16 result = 0;
 
-	if (!p_chunkInfo)
+	if (!p_chunkInfo) {
 		return MMIOERR_BASE; // ?
+	}
 
 	if (!p_descend) {
 		p_chunkInfo->dwFlags = 0;
@@ -406,8 +411,9 @@ MxU16 MXIOINFO::Descend(MMCKINFO* p_chunkInfo, const MMCKINFO* p_parentInfo, MxU
 	else {
 		MxULong ofs = MAXLONG;
 
-		if (p_parentInfo)
+		if (p_parentInfo) {
 			ofs = p_parentInfo->cksize + p_parentInfo->dwDataOffset;
+		}
 
 		BOOL running = TRUE;
 		BOOL readOk = FALSE;
@@ -452,8 +458,9 @@ MxU16 MXIOINFO::Descend(MMCKINFO* p_chunkInfo, const MMCKINFO* p_parentInfo, MxU
 			}
 		}
 
-		if (!result)
+		if (!result) {
 			memcpy(p_chunkInfo, &tmp, sizeof(MMCKINFO));
+		}
 	}
 
 	return result;
diff --git a/LEGO1/omni/src/stream/mxramstreamprovider.cpp b/LEGO1/omni/src/stream/mxramstreamprovider.cpp
index ca091d12..472930c7 100644
--- a/LEGO1/omni/src/stream/mxramstreamprovider.cpp
+++ b/LEGO1/omni/src/stream/mxramstreamprovider.cpp
@@ -71,8 +71,9 @@ MxResult MxRAMStreamProvider::SetResourceToGet(MxStreamController* p_resource)
 			path = MxString(MxOmni::GetCD()) + p_resource->GetAtom().GetInternal() + ".si";
 			m_pFile->SetFileName(path.GetData());
 
-			if (m_pFile->Open(0) != 0)
+			if (m_pFile->Open(0) != 0) {
 				goto done;
+			}
 		}
 
 		m_fileSize = m_pFile->CalcFileSize();
@@ -131,23 +132,27 @@ MxU32 ReadData(MxU8* p_buffer, MxU32 p_size)
 								MxDSBuffer::Append(data2, data3);
 								continue;
 							}
-							else
+							else {
 								*MxStreamChunk::IntoFlags(data2) &= ~MxDSChunk::c_split;
+							}
 						}
 
 						data2 += MxDSChunk::Size(*MxDSChunk::IntoLength(data2));
 						memcpy(data2, data3, MxDSChunk::Size(*psize));
 
 						if (*MxStreamChunk::IntoObjectId(data2) == id &&
-							(*MxStreamChunk::IntoFlags(data2) & MxDSChunk::c_end))
+							(*MxStreamChunk::IntoFlags(data2) & MxDSChunk::c_end)) {
 							break;
+						}
 					}
-					else
+					else {
 						data++;
+					}
 				}
 			}
-			else
+			else {
 				data++;
+			}
 		} while (data < end);
 	}
 
diff --git a/LEGO1/omni/src/stream/mxstreamcontroller.cpp b/LEGO1/omni/src/stream/mxstreamcontroller.cpp
index 204bdab8..977db130 100644
--- a/LEGO1/omni/src/stream/mxstreamcontroller.cpp
+++ b/LEGO1/omni/src/stream/mxstreamcontroller.cpp
@@ -45,12 +45,14 @@ MxStreamController::~MxStreamController()
 	MxAutoLocker lock(&m_criticalSection);
 
 	MxDSSubscriber* subscriber;
-	while (m_subscriberList.PopFront(subscriber))
+	while (m_subscriberList.PopFront(subscriber)) {
 		delete subscriber;
+	}
 
 	MxDSAction* action;
-	while (m_unk0x3c.PopFront(action))
+	while (m_unk0x3c.PopFront(action)) {
 		delete action;
+	}
 
 	if (m_provider) {
 		MxStreamProvider* provider = m_provider;
@@ -71,8 +73,9 @@ MxStreamController::~MxStreamController()
 		m_unk0x2c = NULL;
 	}
 
-	while (m_unk0x54.PopFront(action))
+	while (m_unk0x54.PopFront(action)) {
 		delete action;
+	}
 }
 
 // FUNCTION: LEGO1 0x100c1520
@@ -109,13 +112,16 @@ MxResult MxStreamController::VTable0x20(MxDSAction* p_action)
 	MxS32 objectId = p_action->GetObjectId();
 	MxStreamProvider* provider = m_provider;
 
-	if ((MxS32) provider->GetLengthInDWords() > objectId)
+	if ((MxS32) provider->GetLengthInDWords() > objectId) {
 		offset = provider->GetBufferForDWords()[objectId];
+	}
 
-	if (offset)
+	if (offset) {
 		result = VTable0x2c(p_action, offset);
-	else
+	}
+	else {
 		result = FAILURE;
+	}
 
 	return result;
 }
@@ -159,16 +165,18 @@ MxResult MxStreamController::FUN_100c1a00(MxDSAction* p_action, MxU32 p_offset)
 		for (MxStreamListMxDSAction::iterator it = m_unk0x54.begin(); it != m_unk0x54.end(); it++) {
 			MxDSAction* action = *it;
 
-			if (action->GetObjectId() == p_action->GetObjectId())
+			if (action->GetObjectId() == p_action->GetObjectId()) {
 				newUnknown24 = Max(newUnknown24, action->GetUnknown24());
+			}
 		}
 
 		if (newUnknown24 == -1) {
 			for (MxStreamListMxDSAction::iterator it = m_unk0x3c.begin(); it != m_unk0x3c.end(); it++) {
 				MxDSAction* action = *it;
 
-				if (action->GetObjectId() == p_action->GetObjectId())
+				if (action->GetObjectId() == p_action->GetObjectId()) {
 					newUnknown24 = Max(newUnknown24, action->GetUnknown24());
+				}
 			}
 
 			if (newUnknown24 == -1) {
@@ -176,8 +184,9 @@ MxResult MxStreamController::FUN_100c1a00(MxDSAction* p_action, MxU32 p_offset)
 					 it++) {
 					MxDSSubscriber* subscriber = *it;
 
-					if (subscriber->GetObjectId() == p_action->GetObjectId())
+					if (subscriber->GetObjectId() == p_action->GetObjectId()) {
 						newUnknown24 = Max(newUnknown24, subscriber->GetUnknown48());
+					}
 				}
 			}
 		}
@@ -185,14 +194,16 @@ MxResult MxStreamController::FUN_100c1a00(MxDSAction* p_action, MxU32 p_offset)
 		p_action->SetUnknown24(newUnknown24 + 1);
 	}
 	else {
-		if (m_unk0x3c.Find(p_action, FALSE))
+		if (m_unk0x3c.Find(p_action, FALSE)) {
 			return FAILURE;
+		}
 	}
 
 	MxDSStreamingAction* streamingAction = new MxDSStreamingAction(*p_action, p_offset);
 
-	if (!streamingAction)
+	if (!streamingAction) {
 		return FAILURE;
+	}
 
 	MxU32 fileSize = m_provider->GetFileSize();
 	streamingAction->SetBufferOffset(fileSize * (p_offset / fileSize));
@@ -268,14 +279,16 @@ MxResult MxStreamController::FUN_100c1f00(MxDSAction* p_action)
 	MxU32 objectId = p_action->GetObjectId();
 	MxStreamChunk* chunk = new MxStreamChunk;
 
-	if (!chunk)
+	if (!chunk) {
 		return FAILURE;
+	}
 
 	chunk->SetFlags(MxDSChunk::c_bit3);
 	chunk->SetObjectId(objectId);
 
-	if (chunk->SendChunk(m_subscriberList, FALSE, p_action->GetUnknown24()) != SUCCESS)
+	if (chunk->SendChunk(m_subscriberList, FALSE, p_action->GetUnknown24()) != SUCCESS) {
 		delete chunk;
+	}
 
 	if (p_action->IsA("MxDSMultiAction")) {
 		MxDSActionList* actions = ((MxDSMultiAction*) p_action)->GetActionList();
@@ -283,8 +296,9 @@ MxResult MxStreamController::FUN_100c1f00(MxDSAction* p_action)
 		MxDSAction* action;
 
 		while (cursor.Next(action)) {
-			if (FUN_100c1f00(action) != SUCCESS)
+			if (FUN_100c1f00(action) != SUCCESS) {
 				return FAILURE;
+			}
 		}
 	}
 
@@ -300,8 +314,9 @@ MxNextActionDataStart* MxStreamController::FindNextActionDataStartFromStreamingA
 // FUNCTION: LEGO1 0x100c20d0
 MxBool MxStreamController::FUN_100c20d0(MxDSObject& p_obj)
 {
-	if (m_subscriberList.Find(&p_obj))
+	if (m_subscriberList.Find(&p_obj)) {
 		return FALSE;
+	}
 
 	if (p_obj.IsA("MxDSMultiAction")) {
 		MxDSActionList* actions = ((MxDSMultiAction&) p_obj).GetActionList();
@@ -309,8 +324,9 @@ MxBool MxStreamController::FUN_100c20d0(MxDSObject& p_obj)
 		MxDSAction* action;
 
 		while (cursor.Next(action)) {
-			if (!FUN_100c20d0(*action))
+			if (!FUN_100c20d0(*action)) {
 				return FALSE;
+			}
 		}
 	}
 
diff --git a/LEGO1/omni/src/stream/mxstreamer.cpp b/LEGO1/omni/src/stream/mxstreamer.cpp
index d8d64fb5..76aa7862 100644
--- a/LEGO1/omni/src/stream/mxstreamer.cpp
+++ b/LEGO1/omni/src/stream/mxstreamer.cpp
@@ -79,8 +79,9 @@ MxLong MxStreamer::Close(const char* p_name)
 		if (!p_name || !strcmp(p_name, c->GetAtom().GetInternal())) {
 			m_openStreams.erase(it);
 
-			if (c->FUN_100c20d0(ds))
+			if (c->FUN_100c20d0(ds)) {
 				delete c;
+			}
 			else {
 #ifdef COMPAT_MODE
 				{
@@ -185,8 +186,9 @@ MxResult MxStreamer::DeleteObject(MxDSAction* p_dsAction)
 MxBool MxStreamer::FUN_100b9b30(MxDSObject& p_dsObject)
 {
 	MxStreamController* controller = GetOpenStream(p_dsObject.GetAtomId().GetInternal());
-	if (controller)
+	if (controller) {
 		return controller->FUN_100c20d0(p_dsObject);
+	}
 	return TRUE;
 }
 
@@ -200,8 +202,9 @@ MxLong MxStreamer::Notify(MxParam& p_param)
 
 		MxStreamController* c = static_cast<MxStreamerNotification&>(p_param).GetController();
 
-		if (c->FUN_100c20d0(ds))
+		if (c->FUN_100c20d0(ds)) {
 			delete c;
+		}
 		else {
 #ifdef COMPAT_MODE
 			{
diff --git a/LEGO1/omni/src/stream/mxstreamlist.cpp b/LEGO1/omni/src/stream/mxstreamlist.cpp
index 531d0446..effa987a 100644
--- a/LEGO1/omni/src/stream/mxstreamlist.cpp
+++ b/LEGO1/omni/src/stream/mxstreamlist.cpp
@@ -36,8 +36,9 @@ MxDSAction* MxStreamListMxDSAction::Find(MxDSAction* p_action, MxBool p_delete)
 			if (p_action->GetUnknown24() == -2 || p_action->GetUnknown24() == -3 ||
 				p_action->GetUnknown24() == (*it)->GetUnknown24()) {
 				found = *it;
-				if (p_action->GetUnknown24() != -3)
+				if (p_action->GetUnknown24() != -3) {
 					break;
+				}
 			}
 		}
 	}
@@ -53,8 +54,9 @@ MxDSAction* MxStreamListMxDSAction::Find(MxDSAction* p_action, MxBool p_delete)
 MxNextActionDataStart* MxStreamListMxNextActionDataStart::Find(MxU32 p_id, MxS16 p_value)
 {
 	for (iterator it = begin(); it != end(); it++) {
-		if (p_id == (*it)->GetObjectId() && p_value == (*it)->GetUnknown24())
+		if (p_id == (*it)->GetObjectId() && p_value == (*it)->GetUnknown24()) {
 			return *it;
+		}
 	}
 
 	return NULL;
diff --git a/LEGO1/omni/src/system/mxautolocker.cpp b/LEGO1/omni/src/system/mxautolocker.cpp
index d5749ad5..3c5a2afb 100644
--- a/LEGO1/omni/src/system/mxautolocker.cpp
+++ b/LEGO1/omni/src/system/mxautolocker.cpp
@@ -4,13 +4,15 @@
 MxAutoLocker::MxAutoLocker(MxCriticalSection* p_criticalSection)
 {
 	this->m_criticalSection = p_criticalSection;
-	if (this->m_criticalSection != 0)
+	if (this->m_criticalSection != 0) {
 		this->m_criticalSection->Enter();
+	}
 }
 
 // FUNCTION: LEGO1 0x100b8ef0
 MxAutoLocker::~MxAutoLocker()
 {
-	if (this->m_criticalSection != 0)
+	if (this->m_criticalSection != 0) {
 		this->m_criticalSection->Leave();
+	}
 }
diff --git a/LEGO1/omni/src/system/mxsemaphore.cpp b/LEGO1/omni/src/system/mxsemaphore.cpp
index 5692a888..daba60f4 100644
--- a/LEGO1/omni/src/system/mxsemaphore.cpp
+++ b/LEGO1/omni/src/system/mxsemaphore.cpp
@@ -15,8 +15,9 @@ MxSemaphore::MxSemaphore()
 MxResult MxSemaphore::Init(MxU32 p_initialCount, MxU32 p_maxCount)
 {
 	MxResult result = FAILURE;
-	if (m_hSemaphore = CreateSemaphoreA(NULL, p_initialCount, p_maxCount, NULL))
+	if ((m_hSemaphore = CreateSemaphoreA(NULL, p_initialCount, p_maxCount, NULL))) {
 		result = SUCCESS;
+	}
 	return result;
 }
 
diff --git a/LEGO1/omni/src/system/mxthread.cpp b/LEGO1/omni/src/system/mxthread.cpp
index 158c0cf6..14c4ea82 100644
--- a/LEGO1/omni/src/system/mxthread.cpp
+++ b/LEGO1/omni/src/system/mxthread.cpp
@@ -51,8 +51,9 @@ MxThread::MxThread()
 // FUNCTION: LEGO1 0x100bf5a0
 MxThread::~MxThread()
 {
-	if (m_hThread)
+	if (m_hThread) {
 		CloseHandle((HANDLE) m_hThread);
+	}
 }
 
 typedef unsigned(__stdcall* ThreadFunc)(void*);
@@ -62,9 +63,10 @@ MxResult MxThread::Start(MxS32 p_stack, MxS32 p_flag)
 {
 	MxResult result = FAILURE;
 	if (m_semaphore.Init(0, 1) == SUCCESS) {
-		if (m_hThread =
-				_beginthreadex(NULL, p_stack << 2, (ThreadFunc) &MxThread::ThreadProc, this, p_flag, &m_threadId))
+		if ((m_hThread =
+				 _beginthreadex(NULL, p_stack << 2, (ThreadFunc) &MxThread::ThreadProc, this, p_flag, &m_threadId))) {
 			result = SUCCESS;
+		}
 	}
 	return result;
 }
diff --git a/LEGO1/omni/src/video/mxbitmap.cpp b/LEGO1/omni/src/video/mxbitmap.cpp
index 0d83bba2..98f1f6b2 100644
--- a/LEGO1/omni/src/video/mxbitmap.cpp
+++ b/LEGO1/omni/src/video/mxbitmap.cpp
@@ -25,12 +25,15 @@ MxBitmap::MxBitmap()
 // FUNCTION: LEGO1 0x100bca10
 MxBitmap::~MxBitmap()
 {
-	if (this->m_info)
+	if (this->m_info) {
 		delete m_info;
-	if (this->m_data)
+	}
+	if (this->m_data) {
 		delete m_data;
-	if (this->m_palette)
+	}
+	if (this->m_palette) {
 		delete m_palette;
+	}
 }
 
 // FUNCTION: LEGO1 0x100bcaa0
@@ -152,11 +155,13 @@ MxLong MxBitmap::Read(const char* p_filename)
 	HANDLE handle =
 		CreateFileA(p_filename, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
 
-	if (handle != INVALID_HANDLE_VALUE && !LoadFile(handle))
+	if (handle != INVALID_HANDLE_VALUE && !LoadFile(handle)) {
 		result = SUCCESS;
+	}
 
-	if (handle)
+	if (handle) {
 		CloseHandle(handle);
+	}
 
 	return result;
 }
@@ -280,8 +285,9 @@ void MxBitmap::BitBltTransparent(
 
 		for (MxS32 h = 0; h < p_height; h++) {
 			for (MxS32 w = 0; w < p_width; w++) {
-				if (*srcStart)
+				if (*srcStart) {
 					*dstStart = *srcStart;
+				}
 				srcStart++;
 				dstStart++;
 			}
@@ -302,15 +308,17 @@ MxPalette* MxBitmap::CreatePalette()
 	case FALSE:
 		palette = new MxPalette(this->m_paletteData);
 
-		if (!palette)
+		if (!palette) {
 			goto done;
+		}
 
 		break;
 	case TRUE:
 		palette = this->m_palette->Clone();
 
-		if (!palette)
+		if (!palette) {
 			goto done;
+		}
 
 		break;
 	default:
@@ -361,8 +369,9 @@ MxResult MxBitmap::SetBitDepth(MxBool p_isHighColor)
 	switch (p_isHighColor) {
 	case FALSE:
 		ImportColorsToPalette(m_paletteData, m_palette);
-		if (m_palette)
+		if (m_palette) {
 			delete m_palette;
+		}
 
 		m_palette = NULL;
 		break;
@@ -370,8 +379,9 @@ MxResult MxBitmap::SetBitDepth(MxBool p_isHighColor)
 		pal = NULL;
 		pal = new MxPalette(m_paletteData);
 
-		if (!pal)
+		if (!pal) {
 			goto done;
+		}
 
 		m_palette = pal;
 
@@ -392,8 +402,9 @@ MxResult MxBitmap::SetBitDepth(MxBool p_isHighColor)
 done:
 	// If we were unsuccessful overall but did manage to alloc
 	// the MxPalette, free it.
-	if (ret && pal)
+	if (ret && pal) {
 		delete pal;
+	}
 
 	return ret;
 }
@@ -438,13 +449,15 @@ MxResult MxBitmap::ImportColorsToPalette(RGBQUAD* p_rgbquad, MxPalette* p_palett
 	PALETTEENTRY entries[256];
 
 	if (p_palette) {
-		if (p_palette->GetEntries(entries))
+		if (p_palette->GetEntries(entries)) {
 			goto done;
+		}
 	}
 	else {
 		MxPalette palette;
-		if (palette.GetEntries(entries))
+		if (palette.GetEntries(entries)) {
 			goto done;
+		}
 	}
 
 	MxS32 i;
diff --git a/LEGO1/omni/src/video/mxdisplaysurface.cpp b/LEGO1/omni/src/video/mxdisplaysurface.cpp
index e2965826..0cb88f6d 100644
--- a/LEGO1/omni/src/video/mxdisplaysurface.cpp
+++ b/LEGO1/omni/src/video/mxdisplaysurface.cpp
@@ -81,8 +81,9 @@ MxU8 MxDisplaySurface::CountTotalBitsSetTo1(MxU32 p_param)
 {
 	MxU8 count = 0;
 
-	for (; p_param; p_param >>= 1)
+	for (; p_param; p_param >>= 1) {
 		count += ((MxU8) p_param & 1);
+	}
 
 	return count;
 }
@@ -92,8 +93,9 @@ MxU8 MxDisplaySurface::CountContiguousBitsSetTo1(MxU32 p_param)
 {
 	MxU8 count = 0;
 
-	for (; (p_param & 1) == 0; p_param >>= 1)
+	for (; (p_param & 1) == 0; p_param >>= 1) {
 		count++;
+	}
 
 	return count;
 }
@@ -117,8 +119,9 @@ MxResult MxDisplaySurface::Init(
 	memset(&this->m_surfaceDesc, 0, sizeof(this->m_surfaceDesc));
 	this->m_surfaceDesc.dwSize = sizeof(this->m_surfaceDesc);
 
-	if (this->m_ddSurface2->GetSurfaceDesc(&this->m_surfaceDesc))
+	if (this->m_ddSurface2->GetSurfaceDesc(&this->m_surfaceDesc)) {
 		result = FAILURE;
+	}
 
 	return result;
 }
@@ -134,8 +137,9 @@ MxResult MxDisplaySurface::Create(MxVideoParam& p_videoParam)
 	this->m_initialized = TRUE;
 	this->m_videoParam = p_videoParam;
 
-	if (!this->m_videoParam.Flags().GetFullScreen())
+	if (!this->m_videoParam.Flags().GetFullScreen()) {
 		this->m_videoParam.Flags().SetFlipSurfaces(FALSE);
+	}
 
 	if (!this->m_videoParam.Flags().GetFlipSurfaces()) {
 		this->m_videoParam.SetBackBuffers(1);
@@ -143,10 +147,12 @@ MxResult MxDisplaySurface::Create(MxVideoParam& p_videoParam)
 	else {
 		MxU32 backBuffers = this->m_videoParam.GetBackBuffers();
 
-		if (backBuffers < 1)
+		if (backBuffers < 1) {
 			this->m_videoParam.SetBackBuffers(1);
-		else if (backBuffers > 2)
+		}
+		else if (backBuffers > 2) {
 			this->m_videoParam.SetBackBuffers(2);
+		}
 
 		this->m_videoParam.Flags().SetBackBuffers(TRUE);
 	}
@@ -155,20 +161,23 @@ MxResult MxDisplaySurface::Create(MxVideoParam& p_videoParam)
 		MxS32 width = this->m_videoParam.GetRect().GetWidth();
 		MxS32 height = this->m_videoParam.GetRect().GetHeight();
 
-		if (lpDirectDraw->SetCooperativeLevel(hWnd, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN))
+		if (lpDirectDraw->SetCooperativeLevel(hWnd, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN)) {
 			goto done;
+		}
 
 		memset(&ddsd, 0, sizeof(ddsd));
 		ddsd.dwSize = sizeof(ddsd);
 
-		if (lpDirectDraw->GetDisplayMode(&ddsd))
+		if (lpDirectDraw->GetDisplayMode(&ddsd)) {
 			goto done;
+		}
 
 		MxS32 bitdepth = !this->m_videoParam.Flags().Get16Bit() ? 8 : 16;
 
 		if (ddsd.dwWidth != width || ddsd.dwHeight != height || ddsd.ddpfPixelFormat.dwRGBBitCount != bitdepth) {
-			if (lpDirectDraw->SetDisplayMode(width, height, bitdepth))
+			if (lpDirectDraw->SetDisplayMode(width, height, bitdepth)) {
 				goto done;
+			}
 		}
 	}
 
@@ -179,13 +188,15 @@ MxResult MxDisplaySurface::Create(MxVideoParam& p_videoParam)
 		ddsd.dwFlags = DDSD_CAPS | DDSD_BACKBUFFERCOUNT;
 		ddsd.ddsCaps.dwCaps = DDSCAPS_3DDEVICE | DDSCAPS_PRIMARYSURFACE | DDSCAPS_FLIP | DDSCAPS_COMPLEX;
 
-		if (lpDirectDraw->CreateSurface(&ddsd, &this->m_ddSurface1, NULL))
+		if (lpDirectDraw->CreateSurface(&ddsd, &this->m_ddSurface1, NULL)) {
 			goto done;
+		}
 
 		ddsd.ddsCaps.dwCaps = DDSCAPS_BACKBUFFER;
 
-		if (this->m_ddSurface1->GetAttachedSurface(&ddsd.ddsCaps, &this->m_ddSurface2))
+		if (this->m_ddSurface1->GetAttachedSurface(&ddsd.ddsCaps, &this->m_ddSurface2)) {
 			goto done;
+		}
 	}
 	else {
 		memset(&ddsd, 0, sizeof(ddsd));
@@ -193,8 +204,9 @@ MxResult MxDisplaySurface::Create(MxVideoParam& p_videoParam)
 		ddsd.dwFlags = DDSD_CAPS;
 		ddsd.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE;
 
-		if (lpDirectDraw->CreateSurface(&ddsd, &this->m_ddSurface1, NULL))
+		if (lpDirectDraw->CreateSurface(&ddsd, &this->m_ddSurface1, NULL)) {
 			goto done;
+		}
 
 		memset(&ddsd, 0, sizeof(ddsd));
 		ddsd.dwSize = sizeof(ddsd);
@@ -203,11 +215,13 @@ MxResult MxDisplaySurface::Create(MxVideoParam& p_videoParam)
 		ddsd.dwHeight = this->m_videoParam.GetRect().GetHeight();
 		ddsd.ddsCaps.dwCaps = DDSCAPS_VIDEOMEMORY | DDSCAPS_3DDEVICE | DDSCAPS_OFFSCREENPLAIN;
 
-		if (!this->m_videoParam.Flags().GetBackBuffers())
+		if (!this->m_videoParam.Flags().GetBackBuffers()) {
 			ddsd.ddsCaps.dwCaps = DDSCAPS_3DDEVICE | DDSCAPS_SYSTEMMEMORY | DDSCAPS_OFFSCREENPLAIN;
+		}
 
-		if (lpDirectDraw->CreateSurface(&ddsd, &this->m_ddSurface2, NULL))
+		if (lpDirectDraw->CreateSurface(&ddsd, &this->m_ddSurface2, NULL)) {
 			goto done;
+		}
 	}
 
 	memset(&this->m_surfaceDesc, 0, sizeof(this->m_surfaceDesc));
@@ -215,8 +229,9 @@ MxResult MxDisplaySurface::Create(MxVideoParam& p_videoParam)
 
 	if (!this->m_ddSurface2->GetSurfaceDesc(&this->m_surfaceDesc)) {
 		if (!lpDirectDraw->CreateClipper(0, &this->m_ddClipper, NULL) && !this->m_ddClipper->SetHWnd(0, hWnd) &&
-			!this->m_ddSurface1->SetClipper(this->m_ddClipper))
+			!this->m_ddSurface1->SetClipper(this->m_ddClipper)) {
 			result = SUCCESS;
+		}
 	}
 
 done:
@@ -227,18 +242,22 @@ MxResult MxDisplaySurface::Create(MxVideoParam& p_videoParam)
 void MxDisplaySurface::Destroy()
 {
 	if (this->m_initialized) {
-		if (this->m_ddSurface2)
+		if (this->m_ddSurface2) {
 			this->m_ddSurface2->Release();
+		}
 
-		if (this->m_ddSurface1)
+		if (this->m_ddSurface1) {
 			this->m_ddSurface1->Release();
+		}
 
-		if (this->m_ddClipper)
+		if (this->m_ddClipper) {
 			this->m_ddClipper->Release();
+		}
 	}
 
-	if (this->m_16bitPal)
+	if (this->m_16bitPal) {
 		delete[] this->m_16bitPal;
+	}
 
 	this->Init();
 }
@@ -273,8 +292,9 @@ void MxDisplaySurface::SetPalette(MxPalette* p_palette)
 	}
 
 	if (m_surfaceDesc.ddpfPixelFormat.dwRGBBitCount == 16) {
-		if (!m_16bitPal)
+		if (!m_16bitPal) {
 			m_16bitPal = new MxU16[256];
+		}
 
 		PALETTEENTRY palette[256];
 		p_palette->GetEntries(palette);
@@ -287,9 +307,9 @@ void MxDisplaySurface::SetPalette(MxPalette* p_palette)
 		MxU8 totalBitsBlue = CountTotalBitsSetTo1(m_surfaceDesc.ddpfPixelFormat.dwBBitMask);
 
 		for (MxS32 i = 0; i < 256; i++) {
-			m_16bitPal[i] = (((palette[i].peRed >> (8 - totalBitsRed & 0x1f)) << (contiguousBitsRed & 0x1f))) |
-							(((palette[i].peGreen >> (8 - totalBitsGreen & 0x1f)) << (contiguousBitsGreen & 0x1f))) |
-							(((palette[i].peBlue >> (8 - totalBitsBlue & 0x1f)) << (contiguousBitsBlue & 0x1f)));
+			m_16bitPal[i] = (((palette[i].peRed >> ((8 - totalBitsRed) & 0x1f)) << (contiguousBitsRed & 0x1f))) |
+							(((palette[i].peGreen >> ((8 - totalBitsGreen) & 0x1f)) << (contiguousBitsGreen & 0x1f))) |
+							(((palette[i].peBlue >> ((8 - totalBitsBlue) & 0x1f)) << (contiguousBitsBlue & 0x1f)));
 		}
 	}
 }
@@ -528,8 +548,9 @@ void MxDisplaySurface::Display(MxS32 p_left, MxS32 p_top, MxS32 p_left2, MxS32 p
 // FUNCTION: LEGO1 0x100bbc10
 void MxDisplaySurface::GetDC(HDC* p_hdc)
 {
-	if (this->m_ddSurface2 && !this->m_ddSurface2->GetDC(p_hdc))
+	if (this->m_ddSurface2 && !this->m_ddSurface2->GetDC(p_hdc)) {
 		return;
+	}
 
 	*p_hdc = NULL;
 }
@@ -537,8 +558,9 @@ void MxDisplaySurface::GetDC(HDC* p_hdc)
 // FUNCTION: LEGO1 0x100bbc40
 void MxDisplaySurface::ReleaseDC(HDC p_hdc)
 {
-	if (this->m_ddSurface2 && p_hdc)
+	if (this->m_ddSurface2 && p_hdc) {
 		this->m_ddSurface2->ReleaseDC(p_hdc);
+	}
 }
 
 // FUNCTION: LEGO1 0x100bbc60
@@ -557,8 +579,9 @@ LPDIRECTDRAWSURFACE MxDisplaySurface::VTable0x44(
 	memset(&ddsd, 0, sizeof(ddsd));
 	ddsd.dwSize = sizeof(ddsd);
 
-	if (draw->GetDisplayMode(&ddsd))
+	if (draw->GetDisplayMode(&ddsd)) {
 		return NULL;
+	}
 
 	ddsd.dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH | DDSD_PIXELFORMAT;
 	ddsd.dwWidth = p_bitmap->GetBmiWidth();
@@ -579,8 +602,9 @@ LPDIRECTDRAWSURFACE MxDisplaySurface::VTable0x44(
 				surface = NULL;
 			}
 		}
-		else
+		else {
 			surface = NULL;
+		}
 	}
 
 	if (surface) {
@@ -604,8 +628,9 @@ LPDIRECTDRAWSURFACE MxDisplaySurface::VTable0x44(
 
 		// TODO: Probably p_bitmap->GetAdjustedStride()
 		MxS32 rowSeek = p_bitmap->GetBmiStride();
-		if (p_bitmap->GetBmiHeader()->biCompression != BI_RGB_TOPDOWN && p_bitmap->GetBmiHeight() >= 0)
+		if (p_bitmap->GetBmiHeader()->biCompression != BI_RGB_TOPDOWN && p_bitmap->GetBmiHeight() >= 0) {
 			rowSeek = -rowSeek;
+		}
 
 		MxLong newPitch = ddsd.lPitch;
 		switch (ddsd.ddpfPixelFormat.dwRGBBitCount) {
@@ -714,15 +739,17 @@ LPDIRECTDRAWSURFACE MxDisplaySurface::CreateCursorSurface()
 		ddsd.ddsCaps.dwCaps &= ~DDSCAPS_VIDEOMEMORY;
 		ddsd.ddsCaps.dwCaps |= DDSCAPS_SYSTEMMEMORY;
 
-		if (draw->CreateSurface(&ddsd, &newSurface, NULL) != DD_OK)
+		if (draw->CreateSurface(&ddsd, &newSurface, NULL) != DD_OK) {
 			goto done;
+		}
 	}
 
 	memset(&ddsd, 0, sizeof(ddsd));
 	ddsd.dwSize = sizeof(ddsd);
 
-	if (newSurface->Lock(NULL, &ddsd, DDLOCK_WAIT, NULL) != DD_OK)
+	if (newSurface->Lock(NULL, &ddsd, DDLOCK_WAIT, NULL) != DD_OK) {
 		goto done;
+	}
 	else {
 		MxU16* surface = (MxU16*) ddsd.lpSurface;
 		MxLong pitch = ddsd.lPitch;
@@ -732,10 +759,12 @@ LPDIRECTDRAWSURFACE MxDisplaySurface::CreateCursorSurface()
 			MxU16* surface2 = surface;
 			for (MxS32 y = 0; y < 16; y++) {
 				if ((y > 10 || x) && (x > 10 || y) && x + y != 10) {
-					if (x + y > 10)
+					if (x + y > 10) {
 						*surface2 = 31775;
-					else
+					}
+					else {
 						*surface2 = -1;
+					}
 				}
 				else {
 					*surface2 = 0;
diff --git a/LEGO1/omni/src/video/mxflcpresenter.cpp b/LEGO1/omni/src/video/mxflcpresenter.cpp
index ff82aa60..5cc4ee6a 100644
--- a/LEGO1/omni/src/video/mxflcpresenter.cpp
+++ b/LEGO1/omni/src/video/mxflcpresenter.cpp
@@ -35,8 +35,9 @@ void MxFlcPresenter::LoadHeader(MxStreamChunk* p_chunk)
 // FUNCTION: LEGO1 0x100b34d0
 void MxFlcPresenter::CreateBitmap()
 {
-	if (m_bitmap)
+	if (m_bitmap) {
 		delete m_bitmap;
+	}
 
 	m_bitmap = new MxBitmap;
 	m_bitmap->SetSize(m_flcHeader->width, m_flcHeader->height, NULL, FALSE);
@@ -62,8 +63,9 @@ void MxFlcPresenter::LoadFrame(MxStreamChunk* p_chunk)
 		&decodedColorMap
 	);
 
-	if (((MxDSMediaAction*) m_action)->GetPaletteManagement() && decodedColorMap)
+	if (((MxDSMediaAction*) m_action)->GetPaletteManagement() && decodedColorMap) {
 		RealizePalette();
+	}
 
 	for (MxS32 i = 0; i < rectCount; i++) {
 		MxRect32 rect(rects[i]);
diff --git a/LEGO1/omni/src/video/mxloopingflcpresenter.cpp b/LEGO1/omni/src/video/mxloopingflcpresenter.cpp
index cc36792d..6d70842c 100644
--- a/LEGO1/omni/src/video/mxloopingflcpresenter.cpp
+++ b/LEGO1/omni/src/video/mxloopingflcpresenter.cpp
@@ -31,8 +31,9 @@ void MxLoopingFlcPresenter::Destroy(MxBool p_fromDestructor)
 	Init();
 	m_criticalSection.Leave();
 
-	if (!p_fromDestructor)
+	if (!p_fromDestructor) {
 		MxFlcPresenter::Destroy(FALSE);
+	}
 }
 
 // FUNCTION: LEGO1 0x100b4470
@@ -40,8 +41,9 @@ void MxLoopingFlcPresenter::NextFrame()
 {
 	MxStreamChunk* chunk = NextChunk();
 
-	if (chunk->GetFlags() & MxDSChunk::c_end)
+	if (chunk->GetFlags() & MxDSChunk::c_end) {
 		ProgressTickleState(e_repeating);
+	}
 	else {
 		LoadFrame(chunk);
 		LoopChunk(chunk);
@@ -54,8 +56,9 @@ void MxLoopingFlcPresenter::NextFrame()
 // FUNCTION: LEGO1 0x100b44c0
 void MxLoopingFlcPresenter::VTable0x88()
 {
-	if (m_action->GetDuration() < m_elapsedDuration)
+	if (m_action->GetDuration() < m_elapsedDuration) {
 		ProgressTickleState(e_unk5);
+	}
 	else {
 		MxStreamChunk* chunk;
 		m_loopingChunkCursor->Current(chunk);
@@ -81,8 +84,9 @@ void MxLoopingFlcPresenter::RepeatingTickle()
 			time += m_flcHeader->speed;
 
 			cursor.Reset();
-			while (cursor.Next(chunk))
+			while (cursor.Next(chunk)) {
 				chunk->SetTime(chunk->GetTime() + time);
+			}
 
 			m_loopingChunkCursor->Next();
 		}
@@ -90,15 +94,17 @@ void MxLoopingFlcPresenter::RepeatingTickle()
 		MxStreamChunk* chunk;
 		m_loopingChunkCursor->Current(chunk);
 
-		if (m_action->GetElapsedTime() < chunk->GetTime())
+		if (m_action->GetElapsedTime() < chunk->GetTime()) {
 			break;
+		}
 
 		VTable0x88();
 
 		m_loopingChunkCursor->Next(chunk);
 
-		if (m_currentTickleState != e_repeating)
+		if (m_currentTickleState != e_repeating) {
 			break;
+		}
 	}
 }
 
@@ -114,8 +120,9 @@ MxResult MxLoopingFlcPresenter::AddToManager()
 		result = SUCCESS;
 	}
 
-	if (locked)
+	if (locked) {
 		m_criticalSection.Leave();
+	}
 
 	return result;
 }
diff --git a/LEGO1/omni/src/video/mxloopingsmkpresenter.cpp b/LEGO1/omni/src/video/mxloopingsmkpresenter.cpp
index 86b93544..2f4a5087 100644
--- a/LEGO1/omni/src/video/mxloopingsmkpresenter.cpp
+++ b/LEGO1/omni/src/video/mxloopingsmkpresenter.cpp
@@ -32,8 +32,9 @@ void MxLoopingSmkPresenter::Destroy(MxBool p_fromDestructor)
 	Init();
 	m_criticalSection.Leave();
 
-	if (!p_fromDestructor)
+	if (!p_fromDestructor) {
 		MxSmkPresenter::Destroy();
+	}
 }
 
 // FUNCTION: LEGO1 0x100b4a00
@@ -51,8 +52,9 @@ void MxLoopingSmkPresenter::NextFrame()
 {
 	MxStreamChunk* chunk = NextChunk();
 
-	if (chunk->GetFlags() & MxDSChunk::c_end)
+	if (chunk->GetFlags() & MxDSChunk::c_end) {
 		ProgressTickleState(e_repeating);
+	}
 	else {
 		LoadFrame(chunk);
 		LoopChunk(chunk);
@@ -65,8 +67,9 @@ void MxLoopingSmkPresenter::NextFrame()
 // FUNCTION: LEGO1 0x100b4a90
 void MxLoopingSmkPresenter::VTable0x8c()
 {
-	if (m_action->GetDuration() < m_elapsedDuration)
+	if (m_action->GetDuration() < m_elapsedDuration) {
 		ProgressTickleState(e_unk5);
+	}
 	else {
 		MxStreamChunk* chunk;
 		m_loopingChunkCursor->Current(chunk);
@@ -92,8 +95,9 @@ void MxLoopingSmkPresenter::RepeatingTickle()
 			time += 1000 / ((MxDSMediaAction*) m_action)->GetFramesPerSecond();
 
 			cursor.Reset();
-			while (cursor.Next(chunk))
+			while (cursor.Next(chunk)) {
 				chunk->SetTime(chunk->GetTime() + time);
+			}
 
 			m_loopingChunkCursor->Next();
 		}
@@ -101,15 +105,17 @@ void MxLoopingSmkPresenter::RepeatingTickle()
 		MxStreamChunk* chunk;
 		m_loopingChunkCursor->Current(chunk);
 
-		if (m_action->GetElapsedTime() < chunk->GetTime())
+		if (m_action->GetElapsedTime() < chunk->GetTime()) {
 			break;
+		}
 
 		VTable0x8c();
 
 		m_loopingChunkCursor->Next(chunk);
 
-		if (m_currentTickleState != e_repeating)
+		if (m_currentTickleState != e_repeating) {
 			break;
+		}
 	}
 }
 
diff --git a/LEGO1/omni/src/video/mxpalette.cpp b/LEGO1/omni/src/video/mxpalette.cpp
index 8431fb76..76b9a779 100644
--- a/LEGO1/omni/src/video/mxpalette.cpp
+++ b/LEGO1/omni/src/video/mxpalette.cpp
@@ -110,18 +110,23 @@ LPDIRECTDRAWPALETTE MxPalette::CreateNativePalette()
 {
 	MxS32 i;
 	if (this->m_palette == NULL) {
-		for (i = 0; i < 10; i++)
+		for (i = 0; i < 10; i++) {
 			this->m_entries[i].peFlags = 0x80;
-		for (i = 10; i < 136; i++)
+		}
+		for (i = 10; i < 136; i++) {
 			this->m_entries[i].peFlags = 0x44;
-		for (i = 136; i < 140; i++)
+		}
+		for (i = 136; i < 140; i++) {
 			this->m_entries[i].peFlags = 0x84;
+		}
 		this->m_entries[140].peFlags = 0x84;
 		this->m_entries[141].peFlags = 0x44;
-		for (i = 142; i < 246; i++)
+		for (i = 142; i < 246; i++) {
 			this->m_entries[i].peFlags = 0x84;
-		for (i = 246; i < 256; i++)
+		}
+		for (i = 246; i < 256; i++) {
 			this->m_entries[i].peFlags = 0x80;
+		}
 
 		if (MVideoManager() && MVideoManager()->GetDirectDraw()) {
 			MVideoManager()->GetDirectDraw()->CreatePalette(4, this->m_entries, &this->m_palette, NULL);
@@ -154,8 +159,9 @@ MxResult MxPalette::SetEntries(LPPALETTEENTRY p_entries)
 	MxResult status = SUCCESS;
 
 	if (this->m_palette) {
-		for (i = 0; i < 10; i++)
+		for (i = 0; i < 10; i++) {
 			this->m_entries[i].peFlags = 0x80;
+		}
 		for (i = 10; i < 136; i++) {
 			this->m_entries[i].peFlags = 68;
 			this->m_entries[i].peRed = p_entries[i].peRed;
@@ -186,11 +192,13 @@ MxResult MxPalette::SetEntries(LPPALETTEENTRY p_entries)
 			this->m_entries[i].peBlue = p_entries[i].peBlue;
 		}
 
-		for (i = 246; i < 256; i++)
+		for (i = 246; i < 256; i++) {
 			this->m_entries[i].peFlags = 0x80;
+		}
 
-		if (this->m_palette->SetEntries(0, 0, 256, this->m_entries))
+		if (this->m_palette->SetEntries(0, 0, 256, this->m_entries)) {
 			status = FAILURE;
+		}
 	}
 
 	return status;
@@ -222,12 +230,15 @@ void MxPalette::Detach()
 MxBool MxPalette::operator==(MxPalette& p_other)
 {
 	for (MxS32 i = 0; i < 256; i++) {
-		if (this->m_entries[i].peRed != p_other.m_entries[i].peRed)
+		if (this->m_entries[i].peRed != p_other.m_entries[i].peRed) {
 			return FALSE;
-		if (this->m_entries[i].peGreen != p_other.m_entries[i].peGreen)
+		}
+		if (this->m_entries[i].peGreen != p_other.m_entries[i].peGreen) {
 			return FALSE;
-		if (this->m_entries[i].peBlue != p_other.m_entries[i].peBlue)
+		}
+		if (this->m_entries[i].peBlue != p_other.m_entries[i].peBlue) {
 			return FALSE;
+		}
 	}
 	return TRUE;
 }
diff --git a/LEGO1/omni/src/video/mxregion.cpp b/LEGO1/omni/src/video/mxregion.cpp
index ea7fab55..ca3698e9 100644
--- a/LEGO1/omni/src/video/mxregion.cpp
+++ b/LEGO1/omni/src/video/mxregion.cpp
@@ -22,8 +22,9 @@ MxBool MxRegion::VTable0x20()
 // FUNCTION: LEGO1 0x100c3690
 MxRegion::~MxRegion()
 {
-	if (m_list)
+	if (m_list) {
 		delete m_list;
+	}
 }
 
 // FUNCTION: LEGO1 0x100c3700
@@ -88,17 +89,20 @@ void MxRegion::VTable0x18(MxRect32& p_rect)
 // FUNCTION: LEGO1 0x100c3e20
 MxBool MxRegion::VTable0x1c(MxRect32& p_rect)
 {
-	if (!m_rect.IntersectsWith(p_rect))
+	if (!m_rect.IntersectsWith(p_rect)) {
 		return FALSE;
+	}
 
 	MxRegionTopBottomListCursor cursor(m_list);
 	MxRegionTopBottom* topBottom;
 
 	while (cursor.Next(topBottom)) {
-		if (topBottom->GetTop() >= p_rect.GetBottom())
+		if (topBottom->GetTop() >= p_rect.GetBottom()) {
 			return FALSE;
-		if (topBottom->GetBottom() > p_rect.GetTop() && topBottom->FUN_100c57b0(p_rect))
+		}
+		if (topBottom->GetBottom() > p_rect.GetTop() && topBottom->FUN_100c57b0(p_rect)) {
 			return TRUE;
+		}
 	}
 
 	return FALSE;
@@ -130,27 +134,31 @@ void MxRegionTopBottom::FUN_100c5280(MxS32 p_left, MxS32 p_right)
 	MxRegionLeftRightListCursor b(m_leftRightList);
 
 	MxRegionLeftRight* leftRight;
-	while (a.Next(leftRight) && leftRight->GetRight() < p_left)
+	while (a.Next(leftRight) && leftRight->GetRight() < p_left) {
 		;
+	}
 
 	if (!a.HasMatch()) {
 		MxRegionLeftRight* copy = new MxRegionLeftRight(p_left, p_right);
 		m_leftRightList->Append(copy);
 	}
 	else {
-		if (p_left > leftRight->GetLeft())
+		if (p_left > leftRight->GetLeft()) {
 			p_left = leftRight->GetLeft();
+		}
 
 		while (leftRight->GetLeft() < p_right) {
-			if (p_right < leftRight->GetRight())
+			if (p_right < leftRight->GetRight()) {
 				p_right = leftRight->GetRight();
+			}
 
 			b = a;
 			b.Next();
 			a.Destroy();
 
-			if (!b.Current(leftRight))
+			if (!b.Current(leftRight)) {
 				break;
+			}
 
 			a = b;
 		}
@@ -174,8 +182,9 @@ MxRegionTopBottom* MxRegionTopBottom::Clone()
 	MxRegionLeftRightListCursor cursor(m_leftRightList);
 	MxRegionLeftRight* leftRight;
 
-	while (cursor.Next(leftRight))
+	while (cursor.Next(leftRight)) {
 		clone->m_leftRightList->Append(leftRight->Clone());
+	}
 
 	return clone;
 }
@@ -187,10 +196,12 @@ MxBool MxRegionTopBottom::FUN_100c57b0(MxRect32& p_rect)
 	MxRegionLeftRight* leftRight;
 
 	while (cursor.Next(leftRight)) {
-		if (p_rect.GetRight() <= leftRight->GetLeft())
+		if (p_rect.GetRight() <= leftRight->GetLeft()) {
 			return FALSE;
-		if (leftRight->GetRight() > p_rect.GetLeft())
+		}
+		if (leftRight->GetRight() > p_rect.GetLeft()) {
 			return TRUE;
+		}
 	}
 
 	return FALSE;
diff --git a/LEGO1/omni/src/video/mxregioncursor.cpp b/LEGO1/omni/src/video/mxregioncursor.cpp
index 89c90403..6b74ee3f 100644
--- a/LEGO1/omni/src/video/mxregioncursor.cpp
+++ b/LEGO1/omni/src/video/mxregioncursor.cpp
@@ -14,14 +14,17 @@ MxRegionCursor::MxRegionCursor(MxRegion* p_region)
 // FUNCTION: LEGO1 0x100c40b0
 MxRegionCursor::~MxRegionCursor()
 {
-	if (m_rect)
+	if (m_rect) {
 		delete m_rect;
+	}
 
-	if (m_topBottomCursor)
+	if (m_topBottomCursor) {
 		delete m_topBottomCursor;
+	}
 
-	if (m_leftRightCursor)
+	if (m_leftRightCursor) {
 		delete m_leftRightCursor;
+	}
 }
 
 // FUNCTION: LEGO1 0x100c4140
@@ -38,8 +41,9 @@ MxRect32* MxRegionCursor::VTable0x18()
 
 		UpdateRect(leftRight->GetLeft(), topBottom->GetTop(), leftRight->GetRight(), topBottom->GetBottom());
 	}
-	else
+	else {
 		Reset();
+	}
 
 	return m_rect;
 }
@@ -58,8 +62,9 @@ MxRect32* MxRegionCursor::VTable0x20()
 
 		UpdateRect(leftRight->GetLeft(), topBottom->GetTop(), leftRight->GetRight(), topBottom->GetBottom());
 	}
-	else
+	else {
 		Reset();
+	}
 
 	return m_rect;
 }
@@ -144,11 +149,13 @@ MxRect32* MxRegionCursor::VTable0x24(MxRect32& p_rect)
 			UpdateRect(leftRight->GetLeft(), topBottom->GetTop(), leftRight->GetRight(), topBottom->GetBottom());
 			m_rect->Intersect(p_rect);
 		}
-		else
+		else {
 			FUN_100c4a20(p_rect);
+		}
 	}
-	else
+	else {
 		FUN_100c4a20(p_rect);
+	}
 
 	return m_rect;
 }
@@ -167,11 +174,13 @@ MxRect32* MxRegionCursor::VTable0x2c(MxRect32& p_rect)
 			UpdateRect(leftRight->GetLeft(), topBottom->GetTop(), leftRight->GetRight(), topBottom->GetBottom());
 			m_rect->Intersect(p_rect);
 		}
-		else
+		else {
 			FUN_100c4b50(p_rect);
+		}
 	}
-	else
+	else {
 		FUN_100c4b50(p_rect);
+	}
 
 	return m_rect;
 }
@@ -195,8 +204,9 @@ void MxRegionCursor::Reset()
 // FUNCTION: LEGO1 0x100c46c0
 void MxRegionCursor::FUN_100c46c0(MxRegionLeftRightList& p_leftRightList)
 {
-	if (m_leftRightCursor)
+	if (m_leftRightCursor) {
 		delete m_leftRightCursor;
+	}
 
 	m_leftRightCursor = new MxRegionLeftRightListCursor(&p_leftRightList);
 }
@@ -204,8 +214,9 @@ void MxRegionCursor::FUN_100c46c0(MxRegionLeftRightList& p_leftRightList)
 // FUNCTION: LEGO1 0x100c4980
 void MxRegionCursor::UpdateRect(MxS32 p_left, MxS32 p_top, MxS32 p_right, MxS32 p_bottom)
 {
-	if (!m_rect)
+	if (!m_rect) {
 		m_rect = new MxRect32;
+	}
 
 	m_rect->SetLeft(p_left);
 	m_rect->SetTop(p_top);
@@ -228,8 +239,9 @@ void MxRegionCursor::FUN_100c4a20(MxRect32& p_rect)
 
 			MxRegionLeftRight* leftRight;
 			while (m_leftRightCursor->Next(leftRight)) {
-				if (p_rect.GetRight() <= leftRight->GetLeft())
+				if (p_rect.GetRight() <= leftRight->GetLeft()) {
 					break;
+				}
 
 				if (p_rect.GetLeft() < leftRight->GetRight()) {
 					UpdateRect(
@@ -263,8 +275,9 @@ void MxRegionCursor::FUN_100c4b50(MxRect32& p_rect)
 
 			MxRegionLeftRight* leftRight;
 			while (m_leftRightCursor->Prev(leftRight)) {
-				if (leftRight->GetRight() <= p_rect.GetLeft())
+				if (leftRight->GetRight() <= p_rect.GetLeft()) {
 					break;
+				}
 
 				if (leftRight->GetLeft() < p_rect.GetRight()) {
 					UpdateRect(
diff --git a/LEGO1/omni/src/video/mxsmack.cpp b/LEGO1/omni/src/video/mxsmack.cpp
index 551b87c9..8d1835fe 100644
--- a/LEGO1/omni/src/video/mxsmack.cpp
+++ b/LEGO1/omni/src/video/mxsmack.cpp
@@ -40,8 +40,9 @@ MxResult MxSmack::LoadHeader(MxU8* p_data, MxSmack* p_mxSmack)
 
 			// TODO
 			for (MxU32 i = 0; i < FRAME_COUNT(p_mxSmack); i++) {
-				if (p_mxSmack->m_maxFrameSize < frameSizes[i])
+				if (p_mxSmack->m_maxFrameSize < frameSizes[i]) {
 					p_mxSmack->m_maxFrameSize = frameSizes[i];
+				}
 			}
 
 			frameTypes = new MxU8[FRAME_COUNT(p_mxSmack)];
@@ -54,8 +55,9 @@ MxResult MxSmack::LoadHeader(MxU8* p_data, MxSmack* p_mxSmack)
 				p_data += FRAME_COUNT(p_mxSmack);
 
 				MxU32 treeSize = p_mxSmack->m_smackTag.tablesize + 0x1000;
-				if (treeSize <= 0x2000)
+				if (treeSize <= 0x2000) {
 					treeSize = 0x2000;
+				}
 
 				huffmanTrees = new MxU8[treeSize];
 
@@ -127,16 +129,21 @@ MxResult MxSmack::LoadHeader(MxU8* p_data, MxSmack* p_mxSmack)
 // FUNCTION: LEGO1 0x100c5d40
 void MxSmack::Destroy(MxSmack* p_mxSmack)
 {
-	if (p_mxSmack->m_frameSizes)
+	if (p_mxSmack->m_frameSizes) {
 		delete[] p_mxSmack->m_frameSizes;
-	if (p_mxSmack->m_frameTypes)
+	}
+	if (p_mxSmack->m_frameTypes) {
 		delete[] p_mxSmack->m_frameTypes;
-	if (p_mxSmack->m_huffmanTrees)
+	}
+	if (p_mxSmack->m_huffmanTrees) {
 		delete[] p_mxSmack->m_huffmanTrees;
-	if (p_mxSmack->m_huffmanTables)
+	}
+	if (p_mxSmack->m_huffmanTables) {
 		delete[] p_mxSmack->m_huffmanTables;
-	if (p_mxSmack->m_unk0x6b4)
+	}
+	if (p_mxSmack->m_unk0x6b4) {
 		delete[] p_mxSmack->m_unk0x6b4;
+	}
 }
 
 // This should be refactored to somewhere else
@@ -223,12 +230,14 @@ MxBool MxSmack::GetRect(MxU8* p_unk0x6b4, MxU16* p_und, u32* p_smackRect, MxRect
 {
 	u32 left, bottom, top, right;
 
-	if (!*p_und)
+	if (!*p_und) {
 		return FALSE;
+	}
 
 	if (*p_und == 1) {
-		if (!SmackGetRect(p_unk0x6b4, p_smackRect))
+		if (!SmackGetRect(p_unk0x6b4, p_smackRect)) {
 			return FALSE;
+		}
 		*p_und = 2;
 	}
 
@@ -238,10 +247,12 @@ MxBool MxSmack::GetRect(MxU8* p_unk0x6b4, MxU16* p_und, u32* p_smackRect, MxRect
 	bottom = p_smackRect[3] + p_smackRect[1];
 
 	while (SmackGetRect(p_unk0x6b4, p_smackRect)) {
-		if (left > p_smackRect[0])
+		if (left > p_smackRect[0]) {
 			left = p_smackRect[0];
-		if (right < p_smackRect[0] + p_smackRect[2])
+		}
+		if (right < p_smackRect[0] + p_smackRect[2]) {
 			right = p_smackRect[0] + p_smackRect[2];
+		}
 
 		bottom = p_smackRect[1] + p_smackRect[3];
 	}
diff --git a/LEGO1/omni/src/video/mxsmkpresenter.cpp b/LEGO1/omni/src/video/mxsmkpresenter.cpp
index 1779fe82..8bb2ed6f 100644
--- a/LEGO1/omni/src/video/mxsmkpresenter.cpp
+++ b/LEGO1/omni/src/video/mxsmkpresenter.cpp
@@ -51,8 +51,9 @@ void MxSmkPresenter::LoadHeader(MxStreamChunk* p_chunk)
 // FUNCTION: LEGO1 0x100b3960
 void MxSmkPresenter::CreateBitmap()
 {
-	if (m_bitmap)
+	if (m_bitmap) {
 		delete m_bitmap;
+	}
 
 	m_bitmap = new MxBitmap;
 	m_bitmap->SetSize(m_mxSmack.m_smackTag.Width, m_mxSmack.m_smackTag.Height, NULL, FALSE);
@@ -72,8 +73,9 @@ void MxSmkPresenter::LoadFrame(MxStreamChunk* p_chunk)
 	MxRectList list(TRUE);
 	MxSmack::LoadFrame(bitmapInfo, bitmapData, &m_mxSmack, chunkData, paletteChanged, &list);
 
-	if (((MxDSMediaAction*) m_action)->GetPaletteManagement() && paletteChanged)
+	if (((MxDSMediaAction*) m_action)->GetPaletteManagement() && paletteChanged) {
 		RealizePalette();
+	}
 
 	MxRect32 invalidateRect;
 	MxRectListCursor cursor(&list);
@@ -91,8 +93,9 @@ void MxSmkPresenter::VTable0x88()
 {
 	if ((m_mxSmack.m_smackTag.SmackerType & 1) != 0) {
 		MxU32 und = (m_currentFrame % m_mxSmack.m_smackTag.Frames);
-		if (1 < m_currentFrame && und == 1)
+		if (1 < m_currentFrame && und == 1) {
 			m_currentFrame = 1;
+		}
 	}
 	else {
 		if (m_mxSmack.m_smackTag.Frames == m_currentFrame) {
diff --git a/LEGO1/omni/src/video/mxstillpresenter.cpp b/LEGO1/omni/src/video/mxstillpresenter.cpp
index 83b1a87e..ca749578 100644
--- a/LEGO1/omni/src/video/mxstillpresenter.cpp
+++ b/LEGO1/omni/src/video/mxstillpresenter.cpp
@@ -19,21 +19,24 @@ void MxStillPresenter::Destroy(MxBool p_fromDestructor)
 {
 	m_criticalSection.Enter();
 
-	if (m_bitmapInfo)
+	if (m_bitmapInfo) {
 		delete m_bitmapInfo;
+	}
 	m_bitmapInfo = NULL;
 
 	m_criticalSection.Leave();
 
-	if (!p_fromDestructor)
+	if (!p_fromDestructor) {
 		MxVideoPresenter::Destroy(FALSE);
+	}
 }
 
 // FUNCTION: LEGO1 0x100b9cc0
 void MxStillPresenter::LoadHeader(MxStreamChunk* p_chunk)
 {
-	if (m_bitmapInfo)
+	if (m_bitmapInfo) {
 		delete m_bitmapInfo;
+	}
 
 	MxU8* data = new MxU8[p_chunk->GetLength()];
 	m_bitmapInfo = (MxBITMAPINFO*) data;
@@ -43,8 +46,9 @@ void MxStillPresenter::LoadHeader(MxStreamChunk* p_chunk)
 // FUNCTION: LEGO1 0x100b9d10
 void MxStillPresenter::CreateBitmap()
 {
-	if (m_bitmap)
+	if (m_bitmap) {
 		delete m_bitmap;
+	}
 
 	m_bitmap = new MxBitmap;
 	m_bitmap->ImportBitmapInfo(m_bitmapInfo);
@@ -90,10 +94,12 @@ void MxStillPresenter::LoadFrame(MxStreamChunk* p_chunk)
 		delete m_bitmap;
 		m_bitmap = NULL;
 
-		if (m_unk0x58 && und)
+		if (m_unk0x58 && und) {
 			SetBit2(TRUE);
-		else
+		}
+		else {
 			SetBit2(FALSE);
+		}
 	}
 }
 
@@ -110,8 +116,9 @@ void MxStillPresenter::StartingTickle()
 {
 	MxVideoPresenter::StartingTickle();
 
-	if (m_currentTickleState == e_streaming && ((MxDSMediaAction*) m_action)->GetPaletteManagement())
+	if (m_currentTickleState == e_streaming && ((MxDSMediaAction*) m_action)->GetPaletteManagement()) {
 		RealizePalette();
+	}
 }
 
 // FUNCTION: LEGO1 0x100b9f90
@@ -124,8 +131,9 @@ void MxStillPresenter::StreamingTickle()
 		NextFrame();
 		ProgressTickleState(e_repeating);
 
-		if (m_action->GetDuration() == -1 && m_compositePresenter)
+		if (m_action->GetDuration() == -1 && m_compositePresenter) {
 			m_compositePresenter->VTable0x60(this);
+		}
 	}
 }
 
@@ -133,8 +141,9 @@ void MxStillPresenter::StreamingTickle()
 void MxStillPresenter::RepeatingTickle()
 {
 	if (m_action->GetDuration() != -1) {
-		if (m_action->GetElapsedTime() >= m_action->GetStartTime() + m_action->GetDuration())
+		if (m_action->GetElapsedTime() >= m_action->GetStartTime() + m_action->GetDuration()) {
 			ProgressTickleState(e_unk5);
+		}
 	}
 }
 
@@ -185,13 +194,15 @@ void MxStillPresenter::ParseExtra()
 {
 	MxPresenter::ParseExtra();
 
-	if (m_action->GetFlags() & MxDSAction::c_bit5)
+	if (m_action->GetFlags() & MxDSAction::c_bit5) {
 		SetBit3(TRUE);
+	}
 
 	MxU32 len = m_action->GetExtraLength();
 
-	if (len == 0)
+	if (len == 0) {
 		return;
+	}
 
 	len &= MAXWORD;
 
@@ -233,15 +244,18 @@ MxStillPresenter* MxStillPresenter::Clone()
 				if (m_bitmap) {
 					presenter->m_bitmap = new MxBitmap;
 
-					if (!presenter->m_bitmap || presenter->m_bitmap->ImportBitmap(m_bitmap) != SUCCESS)
+					if (!presenter->m_bitmap || presenter->m_bitmap->ImportBitmap(m_bitmap) != SUCCESS) {
 						goto done;
+					}
 				}
 
-				if (m_unk0x58)
+				if (m_unk0x58) {
 					presenter->m_unk0x58 = MxDisplaySurface::FUN_100bbfb0(m_unk0x58);
+				}
 
-				if (m_alpha)
+				if (m_alpha) {
 					presenter->m_alpha = new MxVideoPresenter::AlphaMask(*m_alpha);
+				}
 
 				result = SUCCESS;
 			}
diff --git a/LEGO1/omni/src/video/mxvideomanager.cpp b/LEGO1/omni/src/video/mxvideomanager.cpp
index 9a2a6cee..f2c9ddfa 100644
--- a/LEGO1/omni/src/video/mxvideomanager.cpp
+++ b/LEGO1/omni/src/video/mxvideomanager.cpp
@@ -42,32 +42,39 @@ void MxVideoManager::Destroy(MxBool p_fromDestructor)
 		m_thread->Terminate();
 		delete m_thread;
 	}
-	else
+	else {
 		TickleManager()->UnregisterClient(this);
+	}
 
 	m_criticalSection.Enter();
 
-	if (m_displaySurface)
+	if (m_displaySurface) {
 		delete m_displaySurface;
+	}
 
-	if (m_region)
+	if (m_region) {
 		delete m_region;
+	}
 
-	if (m_videoParam.GetPalette())
+	if (m_videoParam.GetPalette()) {
 		delete m_videoParam.GetPalette();
+	}
 
 	if (m_unk0x60) {
-		if (m_pDirectDraw)
+		if (m_pDirectDraw) {
 			m_pDirectDraw->Release();
-		if (m_pDirect3D)
+		}
+		if (m_pDirect3D) {
 			m_pDirect3D->Release();
+		}
 	}
 
 	Init();
 	m_criticalSection.Leave();
 
-	if (!p_fromDestructor)
+	if (!p_fromDestructor) {
 		MxMediaManager::Destroy();
+	}
 }
 
 // FUNCTION: LEGO1 0x100be3e0
@@ -85,8 +92,9 @@ void MxVideoManager::UpdateRegion()
 // FUNCTION: LEGO1 0x100be440
 void MxVideoManager::SortPresenterList()
 {
-	if (this->m_presenters->GetCount() <= 1)
+	if (this->m_presenters->GetCount() <= 1) {
 		return;
+	}
 
 	MxPresenterListCursor a(this->m_presenters);
 	MxPresenterListCursor b(this->m_presenters);
@@ -132,8 +140,9 @@ MxResult MxVideoManager::VTable0x28(
 
 	m_unk0x60 = FALSE;
 
-	if (MxMediaManager::InitPresenters() != SUCCESS)
+	if (MxMediaManager::InitPresenters() != SUCCESS) {
 		goto done;
+	}
 
 	m_criticalSection.Enter();
 	locked = TRUE;
@@ -141,8 +150,9 @@ MxResult MxVideoManager::VTable0x28(
 	m_videoParam = p_videoParam;
 	m_region = new MxRegion();
 
-	if (!m_region)
+	if (!m_region) {
 		goto done;
+	}
 
 	m_pDirectDraw = p_pDirectDraw;
 	m_pDirect3D = p_pDirect3D;
@@ -152,15 +162,17 @@ MxResult MxVideoManager::VTable0x28(
 		palette = new MxPalette();
 		m_videoParam.SetPalette(palette);
 
-		if (!palette)
+		if (!palette) {
 			goto done;
+		}
 	}
 	else {
 		palette = p_videoParam.GetPalette()->Clone();
 		m_videoParam.SetPalette(palette);
 
-		if (!palette)
+		if (!palette) {
 			goto done;
+		}
 	}
 
 	m_displaySurface = new MxDisplaySurface();
@@ -170,21 +182,25 @@ MxResult MxVideoManager::VTable0x28(
 		if (p_createThread) {
 			m_thread = new MxTickleThread(this, p_frequencyMS);
 
-			if (!m_thread || m_thread->Start(0, 0) != SUCCESS)
+			if (!m_thread || m_thread->Start(0, 0) != SUCCESS) {
 				goto done;
+			}
 		}
-		else
+		else {
 			TickleManager()->RegisterClient(this, p_frequencyMS);
+		}
 
 		status = SUCCESS;
 	}
 
 done:
-	if (status != SUCCESS)
+	if (status != SUCCESS) {
 		Destroy();
+	}
 
-	if (locked)
+	if (locked) {
 		m_criticalSection.Leave();
+	}
 
 	return status;
 }
@@ -197,8 +213,9 @@ MxResult MxVideoManager::Create(MxVideoParam& p_videoParam, MxU32 p_frequencyMS,
 
 	m_unk0x60 = TRUE;
 
-	if (MxMediaManager::InitPresenters() != SUCCESS)
+	if (MxMediaManager::InitPresenters() != SUCCESS) {
 		goto done;
+	}
 
 	m_criticalSection.Enter();
 	locked = TRUE;
@@ -206,29 +223,34 @@ MxResult MxVideoManager::Create(MxVideoParam& p_videoParam, MxU32 p_frequencyMS,
 	m_videoParam = p_videoParam;
 	m_region = new MxRegion();
 
-	if (!m_region)
+	if (!m_region) {
 		goto done;
+	}
 
-	if (DirectDrawCreate(NULL, &m_pDirectDraw, NULL) != DD_OK)
+	if (DirectDrawCreate(NULL, &m_pDirectDraw, NULL) != DD_OK) {
 		goto done;
+	}
 
-	if (m_pDirectDraw->SetCooperativeLevel(MxOmni::GetInstance()->GetWindowHandle(), DDSCL_NORMAL) != DD_OK)
+	if (m_pDirectDraw->SetCooperativeLevel(MxOmni::GetInstance()->GetWindowHandle(), DDSCL_NORMAL) != DD_OK) {
 		goto done;
+	}
 
 	MxPalette* palette;
 	if (p_videoParam.GetPalette() == NULL) {
 		palette = new MxPalette();
 		m_videoParam.SetPalette(palette);
 
-		if (!palette)
+		if (!palette) {
 			goto done;
+		}
 	}
 	else {
 		palette = p_videoParam.GetPalette()->Clone();
 		m_videoParam.SetPalette(palette);
 
-		if (!palette)
+		if (!palette) {
 			goto done;
+		}
 	}
 
 	m_displaySurface = new MxDisplaySurface();
@@ -238,21 +260,25 @@ MxResult MxVideoManager::Create(MxVideoParam& p_videoParam, MxU32 p_frequencyMS,
 		if (p_createThread) {
 			m_thread = new MxTickleThread(this, p_frequencyMS);
 
-			if (!m_thread || m_thread->Start(0, 0) != SUCCESS)
+			if (!m_thread || m_thread->Start(0, 0) != SUCCESS) {
 				goto done;
+			}
 		}
-		else
+		else {
 			TickleManager()->RegisterClient(this, p_frequencyMS);
+		}
 
 		status = SUCCESS;
 	}
 
 done:
-	if (status != SUCCESS)
+	if (status != SUCCESS) {
 		Destroy();
+	}
 
-	if (locked)
+	if (locked) {
 		m_criticalSection.Leave();
+	}
 
 	return status;
 }
@@ -268,8 +294,9 @@ void MxVideoManager::InvalidateRect(MxRect32& p_rect)
 {
 	m_criticalSection.Enter();
 
-	if (m_region)
+	if (m_region) {
 		m_region->VTable0x18(p_rect);
+	}
 
 	m_criticalSection.Leave();
 }
@@ -284,13 +311,15 @@ MxResult MxVideoManager::Tickle()
 	MxPresenter* presenter;
 	MxPresenterListCursor cursor(this->m_presenters);
 
-	while (cursor.Next(presenter))
+	while (cursor.Next(presenter)) {
 		presenter->Tickle();
+	}
 
 	cursor.Reset();
 
-	while (cursor.Next(presenter))
+	while (cursor.Next(presenter)) {
 		presenter->PutData();
+	}
 
 	UpdateRegion();
 	m_region->Reset();
diff --git a/LEGO1/omni/src/video/mxvideoparam.cpp b/LEGO1/omni/src/video/mxvideoparam.cpp
index cc833727..8e48773f 100644
--- a/LEGO1/omni/src/video/mxvideoparam.cpp
+++ b/LEGO1/omni/src/video/mxvideoparam.cpp
@@ -46,15 +46,17 @@ MxVideoParam::MxVideoParam(MxVideoParam& p_videoParam)
 // FUNCTION: LEGO1 0x100bed50
 MxVideoParam::~MxVideoParam()
 {
-	if (this->m_deviceId != NULL)
+	if (this->m_deviceId != NULL) {
 		delete[] this->m_deviceId;
+	}
 }
 
 // FUNCTION: LEGO1 0x100bed70
 void MxVideoParam::SetDeviceName(char* p_deviceId)
 {
-	if (this->m_deviceId != NULL)
+	if (this->m_deviceId != NULL) {
 		delete[] this->m_deviceId;
+	}
 
 	if (p_deviceId != NULL) {
 		this->m_deviceId = new char[strlen(p_deviceId) + 1];
diff --git a/LEGO1/omni/src/video/mxvideopresenter.cpp b/LEGO1/omni/src/video/mxvideopresenter.cpp
index 546b7ea4..dcccf8f6 100644
--- a/LEGO1/omni/src/video/mxvideopresenter.cpp
+++ b/LEGO1/omni/src/video/mxvideopresenter.cpp
@@ -33,10 +33,12 @@ MxVideoPresenter::AlphaMask::AlphaMask(const MxBitmap& p_bitmap)
 
 	switch (p_bitmap.GetBmiHeader()->biCompression) {
 	case BI_RGB: {
-		if (p_bitmap.GetBmiHeight() < 0)
+		if (p_bitmap.GetBmiHeight() < 0) {
 			rowsBeforeTop = 0;
-		else
+		}
+		else {
 			rowsBeforeTop = p_bitmap.GetBmiHeightAbs() - 1;
+		}
 		bitmapSrcPtr = p_bitmap.GetBitmapData() + (p_bitmap.GetBmiStride() * rowsBeforeTop);
 		break;
 	}
@@ -44,10 +46,12 @@ MxVideoPresenter::AlphaMask::AlphaMask(const MxBitmap& p_bitmap)
 		bitmapSrcPtr = p_bitmap.GetBitmapData();
 		break;
 	default: {
-		if (p_bitmap.GetBmiHeight() < 0)
+		if (p_bitmap.GetBmiHeight() < 0) {
 			rowsBeforeTop = 0;
-		else
+		}
+		else {
 			rowsBeforeTop = p_bitmap.GetBmiHeightAbs() - 1;
+		}
 		bitmapSrcPtr = p_bitmap.GetBitmapData() + (p_bitmap.GetBmiStride() * rowsBeforeTop);
 	}
 	}
@@ -57,8 +61,9 @@ MxVideoPresenter::AlphaMask::AlphaMask(const MxBitmap& p_bitmap)
 	// If this is a bottom-up DIB, we will walk it in reverse.
 	// TODO: Same rounding trick as in MxBitmap
 	MxS32 rowSeek = ((m_width + 3) & -4);
-	if (p_bitmap.GetBmiHeader()->biCompression != BI_RGB_TOPDOWN && p_bitmap.GetBmiHeight() > 0)
+	if (p_bitmap.GetBmiHeader()->biCompression != BI_RGB_TOPDOWN && p_bitmap.GetBmiHeight() > 0) {
 		rowSeek = -rowSeek;
+	}
 
 	// The actual offset into the m_bitmask array. The two for-loops
 	// are just for counting the pixels.
@@ -95,15 +100,17 @@ MxVideoPresenter::AlphaMask::AlphaMask(const MxVideoPresenter::AlphaMask& p_alph
 // FUNCTION: LEGO1 0x100b26d0
 MxVideoPresenter::AlphaMask::~AlphaMask()
 {
-	if (m_bitmask)
+	if (m_bitmask) {
 		delete[] m_bitmask;
+	}
 }
 
 // FUNCTION: LEGO1 0x100b26f0
 MxS32 MxVideoPresenter::AlphaMask::IsHit(MxU32 p_x, MxU32 p_y)
 {
-	if (p_x >= m_width || p_y >= m_height)
+	if (p_x >= m_width || p_y >= m_height) {
 		return 0;
+	}
 
 	MxS32 pos = p_y * m_width + p_x;
 	return m_bitmask[pos / 8] & (1 << abs(abs(pos) & 7)) ? 1 : 0;
@@ -132,8 +139,9 @@ void MxVideoPresenter::Init()
 // FUNCTION: LEGO1 0x100b27b0
 void MxVideoPresenter::Destroy(MxBool p_fromDestructor)
 {
-	if (MVideoManager() != NULL)
+	if (MVideoManager() != NULL) {
 		MVideoManager()->UnregisterPresenter(*this);
+	}
 
 	if (m_unk0x58) {
 		m_unk0x58->Release();
@@ -159,8 +167,9 @@ void MxVideoPresenter::Destroy(MxBool p_fromDestructor)
 
 	Init();
 
-	if (!p_fromDestructor)
+	if (!p_fromDestructor) {
 		MxMediaPresenter::Destroy(FALSE);
+	}
 }
 
 // FUNCTION: LEGO1 0x100b28b0
@@ -183,11 +192,13 @@ MxBool MxVideoPresenter::IsHit(MxS32 p_x, MxS32 p_y)
 {
 	MxDSAction* action = GetAction();
 	if ((action == NULL) || (((action->GetFlags() & MxDSAction::c_bit11) == 0) && !IsEnabled()) ||
-		(!m_bitmap && !m_alpha))
+		(!m_bitmap && !m_alpha)) {
 		return FALSE;
+	}
 
-	if (!m_bitmap)
+	if (!m_bitmap) {
 		return m_alpha->IsHit(p_x - m_location.GetX(), p_y - m_location.GetY());
+	}
 
 	MxLong heightAbs = m_bitmap->GetBmiHeightAbs();
 
@@ -197,8 +208,9 @@ MxBool MxVideoPresenter::IsHit(MxS32 p_x, MxS32 p_y)
 	MxLong maxY = minY + heightAbs;
 	MxLong maxX = minX + m_bitmap->GetBmiWidth();
 
-	if (p_x < minX || p_x >= maxX || p_y < minY || p_y >= maxY)
+	if (p_x < minX || p_x >= maxX || p_y < minY || p_y >= maxY) {
 		return FALSE;
+	}
 
 	MxU8* pixel;
 
@@ -230,11 +242,13 @@ MxBool MxVideoPresenter::IsHit(MxS32 p_x, MxS32 p_y)
 		pixel = m_bitmap->GetBmiStride() * height + m_bitmap->GetBitmapData();
 	}
 
-	if (GetBit4())
+	if (GetBit4()) {
 		return (MxBool) *pixel;
+	}
 
-	if ((GetAction()->GetFlags() & MxDSAction::c_bit4) && *pixel == 0)
+	if ((GetAction()->GetFlags() & MxDSAction::c_bit4) && *pixel == 0) {
 		return FALSE;
+	}
 
 	return TRUE;
 }
@@ -242,32 +256,40 @@ MxBool MxVideoPresenter::IsHit(MxS32 p_x, MxS32 p_y)
 inline MxS32 MxVideoPresenter::PrepareRects(MxRect32& p_rectDest, MxRect32& p_rectSrc)
 {
 	if (p_rectDest.GetTop() > 480 || p_rectDest.GetLeft() > 640 || p_rectSrc.GetTop() > 480 ||
-		p_rectSrc.GetLeft() > 640)
+		p_rectSrc.GetLeft() > 640) {
 		return -1;
+	}
 
-	if (p_rectDest.GetBottom() > 480)
+	if (p_rectDest.GetBottom() > 480) {
 		p_rectDest.SetBottom(480);
+	}
 
-	if (p_rectDest.GetRight() > 640)
+	if (p_rectDest.GetRight() > 640) {
 		p_rectDest.SetRight(640);
+	}
 
-	if (p_rectSrc.GetBottom() > 480)
+	if (p_rectSrc.GetBottom() > 480) {
 		p_rectSrc.SetBottom(480);
+	}
 
-	if (p_rectSrc.GetRight() > 640)
+	if (p_rectSrc.GetRight() > 640) {
 		p_rectSrc.SetRight(640);
+	}
 
 	MxS32 height = p_rectDest.GetHeight();
-	if (height <= 1)
+	if (height <= 1) {
 		return -1;
+	}
 
 	MxS32 width = p_rectDest.GetWidth();
-	if (width <= 1)
+	if (width <= 1) {
 		return -1;
+	}
 
 	if (p_rectSrc.GetRight() - width - p_rectSrc.GetLeft() == -1 &&
-		p_rectSrc.GetBottom() - height - p_rectSrc.GetTop() == -1)
+		p_rectSrc.GetBottom() - height - p_rectSrc.GetTop() == -1) {
 		return 1;
+	}
 
 	p_rectSrc.SetRight(p_rectSrc.GetLeft() + width - 1);
 	p_rectSrc.SetBottom(p_rectSrc.GetTop() + height - 1);
@@ -325,7 +347,7 @@ void MxVideoPresenter::PutFrame()
 		MxRegionCursor cursor(region);
 		MxRect32* regionRect;
 
-		while (regionRect = cursor.VTable0x24(rect)) {
+		while ((regionRect = cursor.VTable0x24(rect))) {
 			if (regionRect->GetWidth() >= 1 && regionRect->GetHeight() >= 1) {
 				if (m_unk0x58) {
 					rectSrc.SetLeft(regionRect->GetLeft() - m_location.GetX());
@@ -341,8 +363,9 @@ void MxVideoPresenter::PutFrame()
 
 				if (m_action->GetFlags() & MxDSAction::c_bit4) {
 					if (m_unk0x58) {
-						if (PrepareRects(rectDest, rectSrc) >= 0)
+						if (PrepareRects(rectDest, rectSrc) >= 0) {
 							ddSurface->Blt((LPRECT) &rectDest, m_unk0x58, (LPRECT) &rectSrc, DDBLT_KEYSRC, NULL);
+						}
 					}
 					else {
 						displaySurface->VTable0x30(
@@ -358,8 +381,9 @@ void MxVideoPresenter::PutFrame()
 					}
 				}
 				else if (m_unk0x58) {
-					if (PrepareRects(rectDest, rectSrc) >= 0)
+					if (PrepareRects(rectDest, rectSrc) >= 0) {
 						ddSurface->Blt((LPRECT) &rectDest, m_unk0x58, (LPRECT) &rectSrc, 0, NULL);
+					}
 				}
 				else {
 					displaySurface->VTable0x28(
@@ -405,8 +429,9 @@ void MxVideoPresenter::StartingTickle()
 void MxVideoPresenter::StreamingTickle()
 {
 	if (m_action->GetFlags() & MxDSAction::c_bit10) {
-		if (!m_currentChunk)
+		if (!m_currentChunk) {
 			MxMediaPresenter::StreamingTickle();
+		}
 
 		if (m_currentChunk) {
 			LoadFrame(m_currentChunk);
@@ -418,24 +443,28 @@ void MxVideoPresenter::StreamingTickle()
 			if (!m_currentChunk) {
 				MxMediaPresenter::StreamingTickle();
 
-				if (!m_currentChunk)
+				if (!m_currentChunk) {
 					break;
+				}
 			}
 
-			if (m_action->GetElapsedTime() < m_currentChunk->GetTime())
+			if (m_action->GetElapsedTime() < m_currentChunk->GetTime()) {
 				break;
+			}
 
 			LoadFrame(m_currentChunk);
 			m_subscriber->DestroyChunk(m_currentChunk);
 			m_currentChunk = NULL;
 			SetBit0(TRUE);
 
-			if (m_currentTickleState != e_streaming)
+			if (m_currentTickleState != e_streaming) {
 				break;
+			}
 		}
 
-		if (GetBit0())
+		if (GetBit0()) {
 			m_unk0x5c = 5;
+		}
 	}
 }
 
@@ -444,8 +473,9 @@ void MxVideoPresenter::RepeatingTickle()
 {
 	if (IsEnabled()) {
 		if (m_action->GetFlags() & MxDSAction::c_bit10) {
-			if (!m_currentChunk)
+			if (!m_currentChunk) {
 				MxMediaPresenter::RepeatingTickle();
+			}
 
 			if (m_currentChunk) {
 				LoadFrame(m_currentChunk);
@@ -457,23 +487,27 @@ void MxVideoPresenter::RepeatingTickle()
 				if (!m_currentChunk) {
 					MxMediaPresenter::RepeatingTickle();
 
-					if (!m_currentChunk)
+					if (!m_currentChunk) {
 						break;
+					}
 				}
 
-				if (m_action->GetElapsedTime() % m_action->GetLoopCount() < m_currentChunk->GetTime())
+				if (m_action->GetElapsedTime() % m_action->GetLoopCount() < m_currentChunk->GetTime()) {
 					break;
+				}
 
 				LoadFrame(m_currentChunk);
 				m_currentChunk = NULL;
 				SetBit0(TRUE);
 
-				if (m_currentTickleState != e_repeating)
+				if (m_currentTickleState != e_repeating) {
 					break;
+				}
 			}
 
-			if (GetBit0())
+			if (GetBit0()) {
 				m_unk0x5c = 5;
+			}
 		}
 	}
 }
@@ -485,14 +519,17 @@ void MxVideoPresenter::Unk5Tickle()
 
 	if (sustainTime != -1) {
 		if (sustainTime) {
-			if (m_unk0x60 == -1)
+			if (m_unk0x60 == -1) {
 				m_unk0x60 = m_action->GetElapsedTime();
+			}
 
-			if (m_action->GetElapsedTime() >= m_unk0x60 + ((MxDSMediaAction*) m_action)->GetSustainTime())
+			if (m_action->GetElapsedTime() >= m_unk0x60 + ((MxDSMediaAction*) m_action)->GetSustainTime()) {
 				ProgressTickleState(e_done);
+			}
 		}
-		else
+		else {
 			ProgressTickleState(e_done);
+		}
 	}
 }
 
@@ -534,8 +571,9 @@ MxResult MxVideoPresenter::PutData()
 {
 	MxAutoLocker lock(&m_criticalSection);
 
-	if (IsEnabled() && m_currentTickleState >= e_streaming && m_currentTickleState <= e_unk5)
+	if (IsEnabled() && m_currentTickleState >= e_streaming && m_currentTickleState <= e_unk5) {
 		PutFrame();
+	}
 
 	return SUCCESS;
 }
diff --git a/LEGO1/realtime/matrix.h b/LEGO1/realtime/matrix.h
index edca5395..266b2fa6 100644
--- a/LEGO1/realtime/matrix.h
+++ b/LEGO1/realtime/matrix.h
@@ -64,8 +64,9 @@ class Matrix4 {
 	// FUNCTION: LEGO1 0x10002430
 	virtual Matrix4& operator+=(float (*p_data)[4])
 	{
-		for (int i = 0; i < 16; i++)
+		for (int i = 0; i < 16; i++) {
 			((float*) m_data)[i] += ((float*) p_data)[i];
+		}
 		return *this;
 	} // vtable+0x2c
 
diff --git a/LEGO1/realtime/orientableroi.cpp b/LEGO1/realtime/orientableroi.cpp
index 4f48c333..4a2c979b 100644
--- a/LEGO1/realtime/orientableroi.cpp
+++ b/LEGO1/realtime/orientableroi.cpp
@@ -53,11 +53,12 @@ void OrientableROI::UpdateWorldData(const MxMatrix& p_transform)
 	UpdateWorldVelocity();
 
 	// iterate over comps
-	if (m_comp)
+	if (m_comp) {
 		for (CompoundObject::iterator iter = m_comp->begin(); !(iter == m_comp->end()); iter++) {
 			ROI* child = *iter;
 			static_cast<OrientableROI*>(child)->UpdateWorldData(p_transform);
 		}
+	}
 }
 
 // FUNCTION: LEGO1 0x100a5a50
diff --git a/LEGO1/realtime/orientableroi.h b/LEGO1/realtime/orientableroi.h
index f218cdf4..005ec4dc 100644
--- a/LEGO1/realtime/orientableroi.h
+++ b/LEGO1/realtime/orientableroi.h
@@ -16,9 +16,9 @@ class OrientableROI : public ROI {
 
 	OrientableROI();
 
-	virtual const float* GetWorldVelocity() const override;                // vtable+0x08
-	virtual const BoundingBox& GetWorldBoundingBox() const override;       // vtable+0x0c
-	virtual const BoundingSphere& GetWorldBoundingSphere() const override; // vtable+0x10
+	const float* GetWorldVelocity() const override;                // vtable+0x08
+	const BoundingBox& GetWorldBoundingBox() const override;       // vtable+0x0c
+	const BoundingSphere& GetWorldBoundingSphere() const override; // vtable+0x10
 	// FUNCTION: LEGO1 0x100a5db0
 	virtual void VTable0x14() { VTable0x1c(); }                 // vtable+0x14
 	virtual void UpdateWorldBoundingVolumes() = 0;              // vtable+0x18
diff --git a/LEGO1/realtime/vector.h b/LEGO1/realtime/vector.h
index 91403ee8..a28a9874 100644
--- a/LEGO1/realtime/vector.h
+++ b/LEGO1/realtime/vector.h
@@ -192,7 +192,7 @@ class Vector3 : public Vector2 {
 	// Vector2 overrides
 
 	// FUNCTION: LEGO1 0x10003a60
-	virtual void AddImpl(float* p_value) override
+	void AddImpl(float* p_value) override
 	{
 		m_data[0] += p_value[0];
 		m_data[1] += p_value[1];
@@ -200,7 +200,7 @@ class Vector3 : public Vector2 {
 	} // vtable+0x04
 
 	// FUNCTION: LEGO1 0x10003a90
-	virtual void AddImpl(float p_value) override
+	void AddImpl(float p_value) override
 	{
 		m_data[0] += p_value;
 		m_data[1] += p_value;
@@ -208,7 +208,7 @@ class Vector3 : public Vector2 {
 	} // vtable+0x00
 
 	// FUNCTION: LEGO1 0x10003ac0
-	virtual void SubImpl(float* p_value) override
+	void SubImpl(float* p_value) override
 	{
 		m_data[0] -= p_value[0];
 		m_data[1] -= p_value[1];
@@ -216,7 +216,7 @@ class Vector3 : public Vector2 {
 	} // vtable+0x08
 
 	// FUNCTION: LEGO1 0x10003b20
-	virtual void MulScalarImpl(float* p_value) override
+	void MulScalarImpl(float* p_value) override
 	{
 		m_data[0] *= *p_value;
 		m_data[1] *= *p_value;
@@ -224,7 +224,7 @@ class Vector3 : public Vector2 {
 	} // vtable+0x0c
 
 	// FUNCTION: LEGO1 0x10003af0
-	virtual void MulVectorImpl(float* p_value) override
+	void MulVectorImpl(float* p_value) override
 	{
 		m_data[0] *= p_value[0];
 		m_data[1] *= p_value[1];
@@ -232,7 +232,7 @@ class Vector3 : public Vector2 {
 	} // vtable+0x10
 
 	// FUNCTION: LEGO1 0x10003b50
-	virtual void DivScalarImpl(float* p_value) override
+	void DivScalarImpl(float* p_value) override
 	{
 		m_data[0] /= *p_value;
 		m_data[1] /= *p_value;
@@ -240,19 +240,19 @@ class Vector3 : public Vector2 {
 	} // vtable+0x14
 
 	// FUNCTION: LEGO1 0x10003b80
-	virtual float DotImpl(float* p_a, float* p_b) const override
+	float DotImpl(float* p_a, float* p_b) const override
 	{
 		return p_a[0] * p_b[0] + p_a[2] * p_b[2] + p_a[1] * p_b[1];
 	} // vtable+0x18
 
 	// FUNCTION: LEGO1 0x10003ba0
-	virtual void EqualsImpl(float* p_data) override { memcpy(m_data, p_data, sizeof(float) * 3); } // vtable+0x20
+	void EqualsImpl(float* p_data) override { memcpy(m_data, p_data, sizeof(float) * 3); } // vtable+0x20
 
 	// FUNCTION: LEGO1 0x10003bc0
-	virtual void Clear() override { memset(m_data, 0, sizeof(float) * 3); } // vtable+0x2c
+	void Clear() override { memset(m_data, 0, sizeof(float) * 3); } // vtable+0x2c
 
 	// FUNCTION: LEGO1 0x10003bd0
-	virtual float LenSquared() const override
+	float LenSquared() const override
 	{
 		return m_data[1] * m_data[1] + m_data[0] * m_data[0] + m_data[2] * m_data[2];
 	} // vtable+0x40
@@ -289,7 +289,7 @@ class Vector4 : public Vector3 {
 	// Vector3 overrides
 
 	// FUNCTION: LEGO1 0x10002870
-	virtual void AddImpl(float* p_value) override
+	void AddImpl(float* p_value) override
 	{
 		m_data[0] += p_value[0];
 		m_data[1] += p_value[1];
@@ -298,7 +298,7 @@ class Vector4 : public Vector3 {
 	} // vtable+0x04
 
 	// FUNCTION: LEGO1 0x100028b0
-	virtual void AddImpl(float p_value) override
+	void AddImpl(float p_value) override
 	{
 		m_data[0] += p_value;
 		m_data[1] += p_value;
@@ -307,7 +307,7 @@ class Vector4 : public Vector3 {
 	} // vtable+0x00
 
 	// FUNCTION: LEGO1 0x100028f0
-	virtual void SubImpl(float* p_value) override
+	void SubImpl(float* p_value) override
 	{
 		m_data[0] -= p_value[0];
 		m_data[1] -= p_value[1];
@@ -316,7 +316,7 @@ class Vector4 : public Vector3 {
 	} // vtable+0x08
 
 	// FUNCTION: LEGO1 0x10002970
-	virtual void MulScalarImpl(float* p_value) override
+	void MulScalarImpl(float* p_value) override
 	{
 		m_data[0] *= *p_value;
 		m_data[1] *= *p_value;
@@ -325,7 +325,7 @@ class Vector4 : public Vector3 {
 	} // vtable+0x0c
 
 	// FUNCTION: LEGO1 0x10002930
-	virtual void MulVectorImpl(float* p_value) override
+	void MulVectorImpl(float* p_value) override
 	{
 		m_data[0] *= p_value[0];
 		m_data[1] *= p_value[1];
@@ -334,7 +334,7 @@ class Vector4 : public Vector3 {
 	} // vtable+0x10
 
 	// FUNCTION: LEGO1 0x100029b0
-	virtual void DivScalarImpl(float* p_value) override
+	void DivScalarImpl(float* p_value) override
 	{
 		m_data[0] /= *p_value;
 		m_data[1] /= *p_value;
@@ -343,25 +343,25 @@ class Vector4 : public Vector3 {
 	} // vtable+0x14
 
 	// FUNCTION: LEGO1 0x100029f0
-	virtual float DotImpl(float* p_a, float* p_b) const override
+	float DotImpl(float* p_a, float* p_b) const override
 	{
 		return p_a[0] * p_b[0] + p_a[2] * p_b[2] + (p_a[1] * p_b[1] + p_a[3] * p_b[3]);
 	} // vtable+0x18
 
 	// FUNCTION: LEGO1 0x10002a20
-	virtual void EqualsImpl(float* p_data) override { memcpy(m_data, p_data, sizeof(float) * 4); } // vtable+0x20
+	void EqualsImpl(float* p_data) override { memcpy(m_data, p_data, sizeof(float) * 4); } // vtable+0x20
 
 	// FUNCTION: LEGO1 0x10002b00
-	virtual void Clear() override { memset(m_data, 0, sizeof(float) * 4); } // vtable+0x2c
+	void Clear() override { memset(m_data, 0, sizeof(float) * 4); } // vtable+0x2c
 
 	// FUNCTION: LEGO1 0x10002b20
-	virtual float LenSquared() const override
+	float LenSquared() const override
 	{
 		return m_data[1] * m_data[1] + m_data[0] * m_data[0] + m_data[2] * m_data[2] + m_data[3] * m_data[3];
 	} // vtable+0x40
 
 	// FUNCTION: LEGO1 0x10002b40
-	virtual void EqualsScalar(float* p_value) override
+	void EqualsScalar(float* p_value) override
 	{
 		m_data[0] = *p_value;
 		m_data[1] = *p_value;
diff --git a/LEGO1/tgl/d3drm/impl.h b/LEGO1/tgl/d3drm/impl.h
index 002ee7e9..d1e2e7fc 100644
--- a/LEGO1/tgl/d3drm/impl.h
+++ b/LEGO1/tgl/d3drm/impl.h
@@ -40,16 +40,16 @@ class UnkImpl;
 class RendererImpl : public Renderer {
 public:
 	RendererImpl() : m_data(0) {}
-	~RendererImpl() { Destroy(); }
+	~RendererImpl() override { Destroy(); }
 
-	virtual void* ImplementationDataPtr() override;
+	void* ImplementationDataPtr() override;
 
 	// vtable+0x08
-	virtual Device* CreateDevice(const DeviceDirectDrawCreateData&) override;
-	virtual Device* CreateDevice(const DeviceDirect3DCreateData&) override;
+	Device* CreateDevice(const DeviceDirectDrawCreateData&) override;
+	Device* CreateDevice(const DeviceDirect3DCreateData&) override;
 
 	// vtable+0x10
-	virtual View* CreateView(
+	View* CreateView(
 		const Device*,
 		const Camera*,
 		unsigned long x,
@@ -57,13 +57,13 @@ class RendererImpl : public Renderer {
 		unsigned long width,
 		unsigned long height
 	) override;
-	virtual Camera* CreateCamera() override;
-	virtual Light* CreateLight(LightType, float r, float g, float b) override;
-	virtual Group* CreateGroup(const Group* pParent) override;
+	Camera* CreateCamera() override;
+	Light* CreateLight(LightType, float r, float g, float b) override;
+	Group* CreateGroup(const Group* pParent) override;
 
 	// vtable+0x20
-	virtual Unk* CreateUnk() override;
-	virtual Texture* CreateTexture(
+	Unk* CreateUnk() override;
+	Texture* CreateTexture(
 		int width,
 		int height,
 		int bitsPerTexel,
@@ -72,12 +72,12 @@ class RendererImpl : public Renderer {
 		int paletteEntryCount,
 		const PaletteEntry* pEntries
 	) override;
-	virtual Texture* CreateTexture() override;
+	Texture* CreateTexture() override;
 
-	virtual Result SetTextureDefaultShadeCount(unsigned long) override;
+	Result SetTextureDefaultShadeCount(unsigned long) override;
 
 	// vtable+0x30
-	virtual Result SetTextureDefaultColorCount(unsigned long) override;
+	Result SetTextureDefaultColorCount(unsigned long) override;
 
 public:
 	inline Result Create();
@@ -110,7 +110,7 @@ void RendererImpl::Destroy()
 class DeviceImpl : public Device {
 public:
 	DeviceImpl() : m_data(0) {}
-	~DeviceImpl()
+	~DeviceImpl() override
 	{
 		if (m_data) {
 			m_data->Release();
@@ -118,22 +118,22 @@ class DeviceImpl : public Device {
 		}
 	}
 
-	virtual void* ImplementationDataPtr();
+	void* ImplementationDataPtr() override;
 
 	// vtable+0x08
-	virtual unsigned long GetWidth();
-	virtual unsigned long GetHeight();
+	unsigned long GetWidth() override;
+	unsigned long GetHeight() override;
 
 	// vtable+0x10
-	virtual Result SetColorModel(ColorModel);
-	virtual Result SetShadingModel(ShadingModel);
-	virtual Result SetShadeCount(unsigned long);
-	virtual Result SetDither(int);
+	Result SetColorModel(ColorModel) override;
+	Result SetShadingModel(ShadingModel) override;
+	Result SetShadeCount(unsigned long) override;
+	Result SetDither(int) override;
 
 	// vtable+0x20
-	virtual Result Update();
-	virtual void InitFromD3DDevice(Device*);
-	virtual void InitFromWindowsDevice(Device*);
+	Result Update() override;
+	void InitFromD3DDevice(Device*) override;
+	void InitFromWindowsDevice(Device*) override;
 
 	inline IDirect3DRMDevice2* ImplementationData() const { return m_data; }
 
@@ -147,7 +147,7 @@ class DeviceImpl : public Device {
 class ViewImpl : public View {
 public:
 	ViewImpl() : m_data(0) {}
-	~ViewImpl()
+	~ViewImpl() override
 	{
 		if (m_data) {
 			m_data->Release();
@@ -155,35 +155,35 @@ class ViewImpl : public View {
 		}
 	}
 
-	virtual void* ImplementationDataPtr();
+	void* ImplementationDataPtr() override;
 
 	// vtable+0x08
-	virtual Result Add(const Light*);
-	virtual Result Remove(const Light*);
+	Result Add(const Light*) override;
+	Result Remove(const Light*) override;
 
 	// vtable+0x10
-	virtual Result SetCamera(const Camera*);
-	virtual Result SetProjection(ProjectionType);
-	virtual Result SetFrustrum(float frontClippingDistance, float backClippingDistance, float degrees);
-	virtual Result SetBackgroundColor(float r, float g, float b);
+	Result SetCamera(const Camera*) override;
+	Result SetProjection(ProjectionType) override;
+	Result SetFrustrum(float frontClippingDistance, float backClippingDistance, float degrees) override;
+	Result SetBackgroundColor(float r, float g, float b) override;
 
 	// vtable+0x20
-	virtual Result GetBackgroundColor(float* r, float* g, float* b);
-	virtual Result Clear();
-	virtual Result Render(const Light*);
-	virtual Result ForceUpdate(unsigned long x, unsigned long y, unsigned long width, unsigned long height);
+	Result GetBackgroundColor(float* r, float* g, float* b) override;
+	Result Clear() override;
+	Result Render(const Light*) override;
+	Result ForceUpdate(unsigned long x, unsigned long y, unsigned long width, unsigned long height) override;
 
 	// vtable+0x30
-	virtual Result TransformWorldToScreen(const float world[3], float screen[4]);
-	virtual Result TransformScreenToWorld(const float screen[4], float world[3]);
-	virtual Result Pick(
+	Result TransformWorldToScreen(const float world[3], float screen[4]) override;
+	Result TransformScreenToWorld(const float screen[4], float world[3]) override;
+	Result Pick(
 		unsigned long x,
 		unsigned long y,
 		const Group** ppGroupsToPickFrom,
 		int groupsToPickFromCount,
 		const Group**& rppPickedGroups,
 		int& rPickedGroupCount
-	);
+	) override;
 
 	inline IDirect3DRMViewport* ImplementationData() const { return m_data; }
 
@@ -199,7 +199,7 @@ class ViewImpl : public View {
 class CameraImpl : public Camera {
 public:
 	CameraImpl() : m_data(0) {}
-	~CameraImpl()
+	~CameraImpl() override
 	{
 		if (m_data) {
 			m_data->Release();
@@ -207,10 +207,10 @@ class CameraImpl : public Camera {
 		}
 	}
 
-	virtual void* ImplementationDataPtr();
+	void* ImplementationDataPtr() override;
 
 	// vtable+0x08
-	virtual Result SetTransformation(FloatMatrix4&);
+	Result SetTransformation(FloatMatrix4&) override;
 
 	inline IDirect3DRMFrame2* ImplementationData() const { return m_data; }
 
@@ -224,7 +224,7 @@ class CameraImpl : public Camera {
 class LightImpl : public Light {
 public:
 	LightImpl() : m_data(0) {}
-	~LightImpl()
+	~LightImpl() override
 	{
 		if (m_data) {
 			m_data->Release();
@@ -232,11 +232,11 @@ class LightImpl : public Light {
 		}
 	}
 
-	virtual void* ImplementationDataPtr();
+	void* ImplementationDataPtr() override;
 
 	// vtable+0x08
-	virtual Result SetTransformation(FloatMatrix4&);
-	virtual Result SetColor(float r, float g, float b);
+	Result SetTransformation(FloatMatrix4&) override;
+	Result SetColor(float r, float g, float b) override;
 
 	inline IDirect3DRMFrame2* ImplementationData() const { return m_data; }
 
@@ -250,7 +250,7 @@ class LightImpl : public Light {
 class MeshImpl : public Mesh {
 public:
 	MeshImpl() : m_data(0) {}
-	~MeshImpl()
+	~MeshImpl() override
 	{
 		if (m_data) {
 			delete m_data;
@@ -258,20 +258,20 @@ class MeshImpl : public Mesh {
 		}
 	}
 
-	virtual void* ImplementationDataPtr();
+	void* ImplementationDataPtr() override;
 
 	// vtable+0x08
-	virtual Result SetColor(float r, float g, float b, float a);
-	virtual Result SetTexture(const Texture*);
+	Result SetColor(float r, float g, float b, float a) override;
+	Result SetTexture(const Texture*) override;
 
 	// vtable+0x10
-	virtual Result GetTexture(Texture*&);
-	virtual Result SetTextureMappingMode(ProjectionType);
-	virtual Result SetShadingModel(ShadingModel);
-	virtual Mesh* DeepClone(Unk*);
+	Result GetTexture(Texture*&) override;
+	Result SetTextureMappingMode(ProjectionType) override;
+	Result SetShadingModel(ShadingModel) override;
+	Mesh* DeepClone(Unk*) override;
 
 	// vtable+0x20
-	virtual Mesh* ShallowClone(Unk*);
+	Mesh* ShallowClone(Unk*) override;
 
 	struct MeshData {
 		IDirect3DRMMesh* groupMesh;
@@ -290,7 +290,7 @@ class MeshImpl : public Mesh {
 class GroupImpl : public Group {
 public:
 	GroupImpl() : m_data(0) {}
-	~GroupImpl()
+	~GroupImpl() override
 	{
 		if (m_data) {
 			m_data->Release();
@@ -298,26 +298,26 @@ class GroupImpl : public Group {
 		}
 	}
 
-	virtual void* ImplementationDataPtr();
+	void* ImplementationDataPtr() override;
 
 	// vtable+0x08
-	virtual Result SetTransformation(FloatMatrix4&);
-	virtual Result SetColor(float r, float g, float b, float a);
+	Result SetTransformation(FloatMatrix4&) override;
+	Result SetColor(float r, float g, float b, float a) override;
 
 	// vtable+0x10
-	virtual Result SetTexture(const Texture*);
-	virtual Result GetTexture(Texture*&);
-	virtual Result SetMaterialMode(MaterialMode);
-	virtual Result Add(const Mesh*);
+	Result SetTexture(const Texture*) override;
+	Result GetTexture(Texture*&) override;
+	Result SetMaterialMode(MaterialMode) override;
+	Result Add(const Mesh*) override;
 
 	// vtable+0x20
-	virtual Result Add(const Group*);
-	virtual Result Remove(const Mesh*);
-	virtual Result Remove(const Group*);
-	virtual Result RemoveAll();
+	Result Add(const Group*) override;
+	Result Remove(const Mesh*) override;
+	Result Remove(const Group*) override;
+	Result RemoveAll() override;
 
 	// vtable+0x30
-	virtual Result Unknown();
+	Result Unknown() override;
 
 	friend class RendererImpl;
 
@@ -329,7 +329,7 @@ class GroupImpl : public Group {
 class UnkImpl : public Unk {
 public:
 	UnkImpl() : m_data(0) {}
-	~UnkImpl()
+	~UnkImpl() override
 	{
 		if (m_data) {
 			m_data->Release();
@@ -337,10 +337,10 @@ class UnkImpl : public Unk {
 		}
 	}
 
-	virtual void* ImplementationDataPtr();
+	void* ImplementationDataPtr() override;
 
 	// vtable+0x08
-	virtual Result SetMeshData(
+	Result SetMeshData(
 		unsigned long faceCount,
 		unsigned long vertexCount,
 		const float (*pPositions)[3],
@@ -348,11 +348,11 @@ class UnkImpl : public Unk {
 		const float (*pTextureCoordinates)[2],
 		unsigned long vertexPerFaceCount,
 		unsigned long* pFaceData
-	);
-	virtual Result GetBoundingBox(float min[3], float max[3]);
+	) override;
+	Result GetBoundingBox(float min[3], float max[3]) override;
 
 	// vtable+0x10
-	virtual Unk* Clone();
+	Unk* Clone() override;
 
 	inline IDirect3DRMMesh* ImplementationData() const { return m_data; }
 
@@ -389,7 +389,7 @@ class TglD3DRMIMAGE {
 class TextureImpl : public Texture {
 public:
 	TextureImpl() : m_data(0) {}
-	~TextureImpl()
+	~TextureImpl() override
 	{
 		if (m_data) {
 			m_data->Release();
@@ -397,23 +397,23 @@ class TextureImpl : public Texture {
 		}
 	}
 
-	virtual void* ImplementationDataPtr();
+	void* ImplementationDataPtr() override;
 
 	// vtable+0x08
-	virtual Result SetTexels(int width, int height, int bitsPerTexel, void* pTexels);
-	virtual void FillRowsOfTexture(int y, int height, void* pBuffer);
+	Result SetTexels(int width, int height, int bitsPerTexel, void* pTexels) override;
+	void FillRowsOfTexture(int y, int height, void* pBuffer) override;
 
 	// vtable+0x10
-	virtual Result Changed(int texelsChanged, int paletteChanged);
-	virtual Result GetBufferAndPalette(
+	Result Changed(int texelsChanged, int paletteChanged) override;
+	Result GetBufferAndPalette(
 		int* pWidth,
 		int* pHeight,
 		int* pDepth,
 		void** ppBuffer,
 		int* ppPaletteSize,
 		PaletteEntry** ppPalette
-	);
-	virtual Result SetPalette(int entryCount, PaletteEntry* entries);
+	) override;
+	Result SetPalette(int entryCount, PaletteEntry* entries) override;
 
 	inline IDirect3DRMTexture* ImplementationData() const { return m_data; }
 	inline void SetImplementation(IDirect3DRMTexture* pData) { m_data = pData; }
diff --git a/LEGO1/viewmanager/viewlodlist.h b/LEGO1/viewmanager/viewlodlist.h
index df918350..d8516955 100644
--- a/LEGO1/viewmanager/viewlodlist.h
+++ b/LEGO1/viewmanager/viewlodlist.h
@@ -27,7 +27,7 @@ class ViewLODList : public LODList<ViewLOD> {
 
 protected:
 	ViewLODList(size_t capacity);
-	~ViewLODList();
+	~ViewLODList() override;
 
 public:
 	inline int AddRef();
@@ -133,8 +133,9 @@ inline int ViewLODList::AddRef()
 inline int ViewLODList::Release()
 {
 	assert(m_refCount > 0);
-	if (!--m_refCount)
+	if (!--m_refCount) {
 		m_owner->Destroy(this);
+	}
 	return m_refCount;
 }
 
diff --git a/LEGO1/viewmanager/viewroi.h b/LEGO1/viewmanager/viewroi.h
index 8e6d78a9..cec1ba0e 100644
--- a/LEGO1/viewmanager/viewroi.h
+++ b/LEGO1/viewmanager/viewroi.h
@@ -21,7 +21,7 @@ class ViewROI : public OrientableROI {
 		SetLODList(lodList);
 		geometry = pRenderer->CreateGroup();
 	}
-	inline ~ViewROI()
+	inline ~ViewROI() override
 	{
 		// SetLODList() will decrease refCount of LODList
 		SetLODList(0);
@@ -44,18 +44,18 @@ class ViewROI : public OrientableROI {
 			reinterpret_cast<ViewLODList*>(m_lods)->AddRef();
 		}
 	}
-	virtual float IntrinsicImportance() const override;                  // vtable+0x04
-	virtual void VTable0x1c() override;                                  // vtable+0x1c
-	virtual void SetLocalTransform(const Matrix4& p_transform) override; // vtable+0x20
-	virtual void VTable0x24(const MxMatrix& p_transform) override;       // vtable+0x24
-	virtual const Tgl::Group* GetGeometry() const;                       // vtable+0x34
-	virtual Tgl::Group* GetGeometry();                                   // vtable+0x30
+	float IntrinsicImportance() const override;                  // vtable+0x04
+	void VTable0x1c() override;                                  // vtable+0x1c
+	void SetLocalTransform(const Matrix4& p_transform) override; // vtable+0x20
+	void VTable0x24(const MxMatrix& p_transform) override;       // vtable+0x24
+	virtual const Tgl::Group* GetGeometry() const;               // vtable+0x34
+	virtual Tgl::Group* GetGeometry();                           // vtable+0x30
 
 	static undefined SetUnk101013d8(undefined p_flag);
 
 protected:
 	Tgl::Group* geometry;
-	void UpdateWorldData(const MxMatrix& parent2world);
+	void UpdateWorldData(const MxMatrix& parent2world) override;
 };
 
 // SYNTHETIC: LEGO1 0x100aa250

From 17252b95f49ee7b84b48d7c68afb6106a73c01eb Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Thu, 1 Feb 2024 15:56:27 -0500
Subject: [PATCH 202/210] Implement Infocenter::HandleNotification0 (#514)

* Implement Infocenter::HandleNotification0

* Match

* Match

* Match

* Match

* Braces

* Add enum constants
---
 LEGO1/lego/legoomni/include/infocenter.h      | 13 ++-
 LEGO1/lego/legoomni/include/infocenterstate.h |  5 +-
 LEGO1/lego/legoomni/include/radio.h           |  2 +
 .../legoomni/src/infocenter/infocenter.cpp    | 84 ++++++++++++++++---
 4 files changed, 91 insertions(+), 13 deletions(-)

diff --git a/LEGO1/lego/legoomni/include/infocenter.h b/LEGO1/lego/legoomni/include/infocenter.h
index bd06f5bf..3c0d04d6 100644
--- a/LEGO1/lego/legoomni/include/infocenter.h
+++ b/LEGO1/lego/legoomni/include/infocenter.h
@@ -61,9 +61,17 @@ class Infocenter : public LegoWorld {
 		c_nickSelected = 33,
 		c_lauraSelected = 34,
 
+		c_unk40 = 40,
+		c_unk41 = 41,
+		c_unk42 = 42,
+		c_unk43 = 43,
+		c_unk44 = 44,
+
 		c_goToRegBook = 70,
 		c_goToRegBookRed = 71,
 
+		c_unk499 = 499,
+
 		c_welcomeDialogue = 500,
 		c_goodJobDialogue = 501,
 
@@ -127,6 +135,7 @@ class Infocenter : public LegoWorld {
 
 		c_gasCtlDescription = 555,
 		c_medCtlDescription = 556,
+		c_unk557 = 557,
 		c_boatCtlDescription = 558,
 		c_copCtlDescription = 559,
 		c_pizzaCtlDescription = 560,
@@ -182,8 +191,8 @@ class Infocenter : public LegoWorld {
 	MxU8 HandleMouseMove(MxS32 p_x, MxS32 p_y);
 	MxU8 HandleButtonUp(MxS32 p_x, MxS32 p_y);
 	MxU8 HandleClick(LegoControlManagerEvent& p_param);
-	MxLong HandleEndAction(MxParam& p_param);
-	MxLong HandleNotification0(MxParam&);
+	MxLong HandleEndAction(MxEndActionNotificationParam& p_param);
+	MxLong HandleNotification0(MxNotificationParam& p_param);
 
 	void UpdateFrameHot(MxBool p_display);
 	void FUN_10070e90();
diff --git a/LEGO1/lego/legoomni/include/infocenterstate.h b/LEGO1/lego/legoomni/include/infocenterstate.h
index 49ca0988..7e651740 100644
--- a/LEGO1/lego/legoomni/include/infocenterstate.h
+++ b/LEGO1/lego/legoomni/include/infocenterstate.h
@@ -30,6 +30,8 @@ class InfocenterState : public LegoState {
 
 	inline MxS16 GetInfocenterBufferSize() { return sizeof(m_buffer) / sizeof(m_buffer[0]); }
 	inline MxStillPresenter* GetInfocenterBufferElement(MxS32 p_index) { return m_buffer[p_index]; }
+	inline StateStruct& GetUnknown0x08() { return m_unk0x08; }
+	inline StateStruct& GetUnknown0x14() { return m_unk0x14; }
 	inline StateStruct& GetUnknown0x68() { return m_unk0x68; }
 	inline MxU32 GetUnknown0x74() { return m_unk0x74; }
 
@@ -39,7 +41,8 @@ class InfocenterState : public LegoState {
 	// InfocenterState::`scalar deleting destructor'
 
 private:
-	undefined m_unk0x08[0x18];     // 0x08
+	StateStruct m_unk0x08;         // 0x08
+	StateStruct m_unk0x14;         // 0x14
 	StateStruct m_unk0x20[3];      // 0x20
 	StateStruct m_unk0x44[3];      // 0x44
 	StateStruct m_unk0x68;         // 0x68
diff --git a/LEGO1/lego/legoomni/include/radio.h b/LEGO1/lego/legoomni/include/radio.h
index fe06be9b..23ddb276 100644
--- a/LEGO1/lego/legoomni/include/radio.h
+++ b/LEGO1/lego/legoomni/include/radio.h
@@ -32,6 +32,8 @@ class Radio : public MxCore {
 	void Play();
 	void Stop();
 
+	inline RadioState* GetState() { return m_state; }
+
 	// SYNTHETIC: LEGO1 0x1002c970
 	// Radio::`scalar deleting destructor'
 
diff --git a/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp b/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp
index 0e90c761..0a262819 100644
--- a/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp
+++ b/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp
@@ -106,10 +106,10 @@ MxLong Infocenter::Notify(MxParam& p_param)
 	if (m_worldStarted) {
 		switch (((MxNotificationParam&) p_param).GetNotification()) {
 		case c_notificationType0:
-			result = HandleNotification0(p_param);
+			result = HandleNotification0((MxNotificationParam&) p_param);
 			break;
 		case c_notificationEndAction:
-			result = HandleEndAction(p_param);
+			result = HandleEndAction((MxEndActionNotificationParam&) p_param);
 			break;
 		case c_notificationKeyPress:
 			result = HandleKeyPress(((LegoEventNotificationParam&) p_param).GetKey());
@@ -150,17 +150,17 @@ MxLong Infocenter::Notify(MxParam& p_param)
 }
 
 // FUNCTION: LEGO1 0x1006f080
-MxLong Infocenter::HandleEndAction(MxParam& p_param)
+MxLong Infocenter::HandleEndAction(MxEndActionNotificationParam& p_param)
 {
-	MxDSAction* action = ((MxEndActionNotificationParam&) p_param).GetAction();
-	if (action->GetAtomId() == *g_creditsScript && action->GetObjectId() == 499) {
+	MxDSAction* action = p_param.GetAction();
+	if (action->GetAtomId() == *g_creditsScript && action->GetObjectId() == c_unk499) {
 		Lego()->CloseMainWindow();
 		return 1;
 	}
 
 	if (action->GetAtomId() == m_atom &&
-		(action->GetObjectId() == 40 || action->GetObjectId() == 41 || action->GetObjectId() == 42 ||
-		 action->GetObjectId() == 43 || action->GetObjectId() == 44)) {
+		(action->GetObjectId() == c_unk40 || action->GetObjectId() == c_unk41 || action->GetObjectId() == c_unk42 ||
+		 action->GetObjectId() == c_unk43 || action->GetObjectId() == c_unk44)) {
 		if (m_unk0x1d4) {
 			m_unk0x1d4--;
 		}
@@ -260,7 +260,7 @@ MxLong Infocenter::HandleEndAction(MxParam& p_param)
 		BackgroundAudioManager()->RaiseVolume();
 		return 1;
 	case 4:
-		if (action->GetObjectId() == 70 || action->GetObjectId() == 71) {
+		if (action->GetObjectId() == c_goToRegBook || action->GetObjectId() == c_goToRegBookRed) {
 			TransitionManager()->StartTransition(MxTransitionManager::e_pixelation, 50, FALSE, FALSE);
 			m_infocenterState->SetUnknown0x74(14);
 			return 1;
@@ -638,9 +638,73 @@ MxU8 Infocenter::HandleClick(LegoControlManagerEvent& p_param)
 	return 1;
 }
 
-// STUB: LEGO1 0x10070870
-MxLong Infocenter::HandleNotification0(MxParam&)
+// FUNCTION: LEGO1 0x10070870
+MxLong Infocenter::HandleNotification0(MxNotificationParam& p_param)
 {
+	// MxLong result
+	MxCore* sender = p_param.GetSender();
+
+	if (sender == NULL) {
+		if (m_infocenterState->GetUnknown0x74() == 8) {
+			m_infoManDialogueTimer = 0;
+			StopCutscene();
+			PlayAction(c_exitConfirmationDialogue);
+		}
+	}
+	else if (sender->IsA("MxEntity") && m_infocenterState->GetUnknown0x74() != 5 && m_infocenterState->GetUnknown0x74() != 12) {
+		switch (((MxEntity*) sender)->GetEntityId()) {
+		case 5: {
+			m_infoManDialogueTimer = 0;
+
+			InfomainScript objectId;
+			if (GameState()->GetUnknown10()) {
+				objectId = (InfomainScript) m_infocenterState->GetUnknown0x14().FUN_10014d00();
+			}
+			else {
+				objectId = (InfomainScript) m_infocenterState->GetUnknown0x08().FUN_10014d00();
+			}
+
+			PlayAction(objectId);
+			FUN_10015860(g_object2x4red, 0);
+			FUN_10015860(g_object2x4grn, 0);
+			return 1;
+		}
+		case 6:
+			if (m_infocenterState->GetUnknown0x74() == 8) {
+				StopCurrentAction();
+				FUN_10015860(g_object2x4red, 0);
+				FUN_10015860(g_object2x4grn, 0);
+				m_infocenterState->SetUnknown0x74(2);
+				PlayAction(c_infomanSneeze);
+				return 1;
+			}
+		case 7:
+			if (m_infocenterState->GetUnknown0x74() == 8) {
+				if (m_infocenterState->GetInfocenterBufferElement(0)) {
+					GameState()->Save(0);
+				}
+
+				m_infocenterState->SetUnknown0x74(12);
+				PlayAction(c_exitGameDialogue);
+				InputManager()->DisableInputProcessing();
+				InputManager()->SetUnknown336(TRUE);
+				return 1;
+			}
+		}
+	}
+	else {
+		if (sender->IsA("Radio") && m_radio.GetState()->IsActive()) {
+			if (m_currentInfomainScript == c_unk40 || m_currentInfomainScript == c_unk41 ||
+				m_currentInfomainScript == c_unk42 || m_currentInfomainScript == c_unk43 ||
+				m_currentInfomainScript == c_unk44 || m_currentInfomainScript == c_unk557 ||
+				m_currentInfomainScript == c_boatCtlDescription || m_currentInfomainScript == c_raceCtlDescription ||
+				m_currentInfomainScript == c_pizzaCtlDescription || m_currentInfomainScript == c_gasCtlDescription ||
+				m_currentInfomainScript == c_medCtlDescription || m_currentInfomainScript == c_copCtlDescription) {
+				StopCurrentAction();
+			}
+		}
+	}
+
 	return 1;
 }
 

From bfaa28745c50525476fb3aa70457f9e20860100c Mon Sep 17 00:00:00 2001
From: Ramen2X <64166386+Ramen2X@users.noreply.github.com>
Date: Thu, 1 Feb 2024 17:04:25 -0500
Subject: [PATCH 203/210] update contributing guidelines

---
 CONTRIBUTING.md | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 0d2c6894..1fd85cbd 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,8 +1,10 @@
 # Contributing
 
-## Learning Decompilation
+## Important Note
 
-Generally, decompilation is a fairly advanced skill. If you aren't already familiar with it, it will likely take you months, or even years, to learn the skills necessary to do it (depending on your current proficiency with C/C++ and x86 assembly). If you're still interested, [part 1 of the decompilation vlog](https://www.youtube.com/watch?v=MToTEqoVv3I) covers the overall process and should give you a starting point that you can dive in from.
+While we're thrilled that there is so much interest in reverse engineering LEGO Island and are happy to accept contributions from anyone who would like to help progress us further to our goal of a complete codebase, proposed changes to this repository must adhere to a certain degree of engineering quality. While the established contributors here are more than happy to provide code reviews and constructive criticism, it is not their job to teach potential contributors C++ or decompilation fundamentals. As a project that is largely an artifact of the free time of its contributors, the more of that (often scarce) resource that can be dedicated to efficient work, the faster the decompilation will progess. Unfortunately, this results in well-intentioned but poorly constructed contributions actually hurting progress in the long-term. While we are greatly appreciative of the sentiment, if you aren't very confident in your decompilation abilities, it is generally in the project's best interest that you return when you have a better grasp over the process.
+
+Generally, decompilation is a fairly advanced skill. Depending on your current proficiency with C/C++ and x86 assembly, it could take you months or even years to learn the skills necessary to do it adequately. If you're still interested in learning, [part 1 of the decompilation vlog](https://www.youtube.com/watch?v=MToTEqoVv3I) covers the overall process and should give you a starting point that you can dive in from. Once again, please make yourself familiar with this process before attempting to contribute code to this project.
 
 ## Ghidra Server
 
@@ -15,7 +17,7 @@ To access the Ghidra repository, use the following details:
 
 ## General Guidelines
 
-If you have contributions, feel free to create a pull request! Someone will review and merge it (or provide feedback) as soon as possible.
+If you feel fit to contribute, feel free to create a pull request! Someone will review and merge it (or provide feedback) as soon as possible.
 
 Please keep your pull requests small and understandable; you may be able to shoot ahead and make a lot of progress in a short amount of time, but this is a collaborative project, so you must allow others to catch up and follow along. Large pull requests become significantly more unwieldy to review, and as such make it exponentially more likely for a mistake or error to go undetected. They also make it harder to merge other pull requests because the more files you modify, the more likely it is for a merge conflict to occur. A general guideline is to keep submissions limited to one class at a time. Sometimes two or more classes may be too interlinked for this to be feasible, so this is not a hard rule, however if your PR is starting to modify more than 10 or so files, it's probably getting too big.
 

From fce90ed8d8c0e56cc8796d33e4258c9f8d7b6858 Mon Sep 17 00:00:00 2001
From: Ramen2X <64166386+Ramen2X@users.noreply.github.com>
Date: Thu, 1 Feb 2024 17:08:15 -0500
Subject: [PATCH 204/210] fix typo [skip ci]

---
 CONTRIBUTING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 1fd85cbd..23e25faf 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -2,7 +2,7 @@
 
 ## Important Note
 
-While we're thrilled that there is so much interest in reverse engineering LEGO Island and are happy to accept contributions from anyone who would like to help progress us further to our goal of a complete codebase, proposed changes to this repository must adhere to a certain degree of engineering quality. While the established contributors here are more than happy to provide code reviews and constructive criticism, it is not their job to teach potential contributors C++ or decompilation fundamentals. As a project that is largely an artifact of the free time of its contributors, the more of that (often scarce) resource that can be dedicated to efficient work, the faster the decompilation will progess. Unfortunately, this results in well-intentioned but poorly constructed contributions actually hurting progress in the long-term. While we are greatly appreciative of the sentiment, if you aren't very confident in your decompilation abilities, it is generally in the project's best interest that you return when you have a better grasp over the process.
+While we're thrilled that there is so much interest in reverse engineering LEGO Island and are happy to accept contributions from anyone who would like to help progress us further to our goal of a complete codebase, proposed changes to this repository must adhere to a certain degree of engineering quality. While the established contributors here are more than happy to provide code reviews and constructive criticism, it is not their job to teach potential contributors C++ or decompilation fundamentals. As a project that is largely an artifact of the free time of its contributors, the more of that (often scarce) resource that can be dedicated to efficient work, the faster the decompilation will progress. Unfortunately, this results in well-intentioned but poorly constructed contributions actually hurting progress in the long-term. While we are greatly appreciative of the sentiment, if you aren't very confident in your decompilation abilities, it is generally in the project's best interest that you return when you have a better grasp over the process.
 
 Generally, decompilation is a fairly advanced skill. Depending on your current proficiency with C/C++ and x86 assembly, it could take you months or even years to learn the skills necessary to do it adequately. If you're still interested in learning, [part 1 of the decompilation vlog](https://www.youtube.com/watch?v=MToTEqoVv3I) covers the overall process and should give you a starting point that you can dive in from. Once again, please make yourself familiar with this process before attempting to contribute code to this project.
 

From a7acf8c607d7b62e76a42f9850bb9ca6353a9cb5 Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Thu, 1 Feb 2024 18:08:56 -0500
Subject: [PATCH 205/210] Implement/match InfocenterState::InfocenterState
 (#515)

* Implement LegoState::Shuffle

* Remove unused params

* Move ctor

* Asm generate hotfix

---------

Co-authored-by: MS <disinvite@users.noreply.github.com>
---
 LEGO1/lego/legoomni/include/infocenter.h      |   9 ++
 LEGO1/lego/legoomni/include/infocenterstate.h |  16 +--
 LEGO1/lego/legoomni/include/legostate.h       |  40 +++++--
 .../legoomni/include/legovehiclebuildstate.h  |   2 +-
 LEGO1/lego/legoomni/include/radiostate.h      |   6 +-
 LEGO1/lego/legoomni/src/common/legostate.cpp  |   6 +-
 .../src/infocenter/infocenterstate.cpp        | 101 +++++++++++++++++-
 LEGO1/lego/legoomni/src/isle/radiostate.cpp   |  30 ++----
 .../isledecomp/compare/asm/parse.py           |   7 +-
 9 files changed, 167 insertions(+), 50 deletions(-)

diff --git a/LEGO1/lego/legoomni/include/infocenter.h b/LEGO1/lego/legoomni/include/infocenter.h
index 3c0d04d6..cd033c03 100644
--- a/LEGO1/lego/legoomni/include/infocenter.h
+++ b/LEGO1/lego/legoomni/include/infocenter.h
@@ -146,6 +146,15 @@ class Infocenter : public LegoWorld {
 		c_leaveInfoCenterDialogue3 = 564,
 		c_leaveInfoCenterDialogue4 = 565,
 
+		c_unk566 = 566,
+		c_unk567 = 567,
+		c_unk568 = 568,
+
+		c_unk569 = 569,
+		c_unk570 = 570,
+		c_unk571 = 571,
+		c_unk572 = 572,
+
 		c_registerToContinueDialogue = 573,
 
 		c_bricksterDialogue = 574,
diff --git a/LEGO1/lego/legoomni/include/infocenterstate.h b/LEGO1/lego/legoomni/include/infocenterstate.h
index 7e651740..977ea3d1 100644
--- a/LEGO1/lego/legoomni/include/infocenterstate.h
+++ b/LEGO1/lego/legoomni/include/infocenterstate.h
@@ -30,9 +30,9 @@ class InfocenterState : public LegoState {
 
 	inline MxS16 GetInfocenterBufferSize() { return sizeof(m_buffer) / sizeof(m_buffer[0]); }
 	inline MxStillPresenter* GetInfocenterBufferElement(MxS32 p_index) { return m_buffer[p_index]; }
-	inline StateStruct& GetUnknown0x08() { return m_unk0x08; }
-	inline StateStruct& GetUnknown0x14() { return m_unk0x14; }
-	inline StateStruct& GetUnknown0x68() { return m_unk0x68; }
+	inline Shuffle& GetUnknown0x08() { return m_unk0x08; }
+	inline Shuffle& GetUnknown0x14() { return m_unk0x14; }
+	inline Shuffle& GetUnknown0x68() { return m_unk0x68; }
 	inline MxU32 GetUnknown0x74() { return m_unk0x74; }
 
 	inline void SetUnknown0x74(MxU32 p_unk0x74) { m_unk0x74 = p_unk0x74; }
@@ -41,11 +41,11 @@ class InfocenterState : public LegoState {
 	// InfocenterState::`scalar deleting destructor'
 
 private:
-	StateStruct m_unk0x08;         // 0x08
-	StateStruct m_unk0x14;         // 0x14
-	StateStruct m_unk0x20[3];      // 0x20
-	StateStruct m_unk0x44[3];      // 0x44
-	StateStruct m_unk0x68;         // 0x68
+	Shuffle m_unk0x08;             // 0x08
+	Shuffle m_unk0x14;             // 0x14
+	Shuffle m_unk0x20[3];          // 0x20
+	Shuffle m_unk0x44[3];          // 0x44
+	Shuffle m_unk0x68;             // 0x68
 	MxU32 m_unk0x74;               // 0x74
 	MxStillPresenter* m_buffer[7]; // 0x78
 };
diff --git a/LEGO1/lego/legoomni/include/legostate.h b/LEGO1/lego/legoomni/include/legostate.h
index 8aa55226..42fd0fe9 100644
--- a/LEGO1/lego/legoomni/include/legostate.h
+++ b/LEGO1/lego/legoomni/include/legostate.h
@@ -45,23 +45,45 @@ class LegoState : public MxCore {
 	// LegoState::`scalar deleting destructor'
 
 	// SIZE 0x0c
-	struct StateStruct {
-		void* m_unk0x00;      // 0x00
-		undefined2 m_unk0x04; // 0x04
-		undefined2 m_unk0x06; // 0x06
-		MxU16 m_unk0x08;      // 0x08
-
+	class Shuffle {
+	public:
 		// FUNCTION: LEGO1 0x10017c00
-		StateStruct()
+		Shuffle()
 		{
-			m_unk0x04 = 0;
-			m_unk0x00 = NULL;
+			m_objectIds = NULL;
+			m_length = 0;
 			m_unk0x06 = 0;
 			m_unk0x08 = 0;
 		}
 
+		Shuffle(MxU32* p_objectIds, MxU16 p_length)
+		{
+			m_objectIds = p_objectIds;
+			m_length = p_length;
+			m_unk0x06 = 0;
+			m_unk0x08 = 0;
+		}
+
+		// FUNCTION: LEGO1 0x10071800
+		Shuffle& operator=(const Shuffle& p_shuffle)
+		{
+			m_objectIds = p_shuffle.m_objectIds;
+			m_length = p_shuffle.m_length;
+			m_unk0x08 = p_shuffle.m_unk0x08;
+			m_unk0x06 = p_shuffle.m_unk0x06;
+			return *this;
+		}
+
 		MxU32 FUN_10014d00();
 		MxBool FUN_10014de0(MxU32 p_objectId);
+
+		inline void SetUnknown0x08(MxU16 p_unk0x08) { m_unk0x08 = p_unk0x08; }
+
+	private:
+		MxU32* m_objectIds;   // 0x00
+		MxU16 m_length;       // 0x04
+		undefined2 m_unk0x06; // 0x06
+		MxU16 m_unk0x08;      // 0x08
 	};
 };
 
diff --git a/LEGO1/lego/legoomni/include/legovehiclebuildstate.h b/LEGO1/lego/legoomni/include/legovehiclebuildstate.h
index 83032325..03e72ae9 100644
--- a/LEGO1/lego/legoomni/include/legovehiclebuildstate.h
+++ b/LEGO1/lego/legoomni/include/legovehiclebuildstate.h
@@ -29,7 +29,7 @@ class LegoVehicleBuildState : public LegoState {
 	// LegoVehicleBuildState::`scalar deleting destructor'
 
 private:
-	StateStruct m_unk0x08[4]; // 0x08
+	Shuffle m_unk0x08[4]; // 0x08
 
 	// This can be one of the following:
 	// * LegoRaceCarBuildState
diff --git a/LEGO1/lego/legoomni/include/radiostate.h b/LEGO1/lego/legoomni/include/radiostate.h
index cffef003..5ffd0176 100644
--- a/LEGO1/lego/legoomni/include/radiostate.h
+++ b/LEGO1/lego/legoomni/include/radiostate.h
@@ -36,9 +36,9 @@ class RadioState : public LegoState {
 	MxBool FUN_1002d0c0(const MxAtomId& p_atom, MxU32 p_objectId);
 
 private:
-	StateStruct m_unk0x08[3]; // 0x08
-	MxS16 m_unk0x2c;          // 0x2c
-	MxBool m_active;          // 0x2e
+	Shuffle m_unk0x08[3]; // 0x08
+	MxS16 m_unk0x2c;      // 0x2c
+	MxBool m_active;      // 0x2e
 };
 
 #endif // RADIOSTATE_H
diff --git a/LEGO1/lego/legoomni/src/common/legostate.cpp b/LEGO1/lego/legoomni/src/common/legostate.cpp
index 96a08dbe..4cc7622f 100644
--- a/LEGO1/lego/legoomni/src/common/legostate.cpp
+++ b/LEGO1/lego/legoomni/src/common/legostate.cpp
@@ -1,17 +1,17 @@
 #include "legostate.h"
 
 DECOMP_SIZE_ASSERT(LegoState, 0x08)
-DECOMP_SIZE_ASSERT(LegoState::StateStruct, 0x0c)
+DECOMP_SIZE_ASSERT(LegoState::Shuffle, 0x0c)
 
 // STUB: LEGO1 0x10014d00
-MxU32 LegoState::StateStruct::FUN_10014d00()
+MxU32 LegoState::Shuffle::FUN_10014d00()
 {
 	// TODO
 	return 0;
 }
 
 // STUB: LEGO1 0x10014de0
-MxBool LegoState::StateStruct::FUN_10014de0(MxU32 p_objectId)
+MxBool LegoState::Shuffle::FUN_10014de0(MxU32 p_objectId)
 {
 	// TODO
 	return FALSE;
diff --git a/LEGO1/lego/legoomni/src/infocenter/infocenterstate.cpp b/LEGO1/lego/legoomni/src/infocenter/infocenterstate.cpp
index 76ffd3ea..a6de4a6f 100644
--- a/LEGO1/lego/legoomni/src/infocenter/infocenterstate.cpp
+++ b/LEGO1/lego/legoomni/src/infocenter/infocenterstate.cpp
@@ -1,11 +1,110 @@
 #include "infocenterstate.h"
 
+#include "infocenter.h"
+
 DECOMP_SIZE_ASSERT(InfocenterState, 0x94);
 
+// GLOBAL: LEGO1 0x100f76a8
+Infocenter::InfomainScript g_unk0x100f76a8[14] = {
+	Infocenter::c_clickOnObjectsGuidanceDialogue,
+	Infocenter::c_arrowNavigationGuidanceDialogue,
+	Infocenter::c_elevatorGuidanceDialogue,
+	Infocenter::c_radioGuidanceDialogue,
+	Infocenter::c_exitGuidanceDialogue1,
+	Infocenter::c_goOutsideGuidanceDialogue,
+	Infocenter::c_experimentGuidanceDialogue,
+	Infocenter::c_returnBackGuidanceDialogue1,
+	Infocenter::c_bricksterWarningDialogue,
+	Infocenter::c_infomanHiccup,
+	Infocenter::c_infomanSneeze,
+	Infocenter::c_infomanLaughs,
+	Infocenter::c_newGameGuidanceDialogue,
+	Infocenter::c_returnBackGuidanceDialogue3
+};
+
+// GLOBAL: LEGO1 0x100f76e0
+Infocenter::InfomainScript g_unk0x100f76e0[6] = {
+	Infocenter::c_bricksterWarningDialogue,
+	Infocenter::c_newGameGuidanceDialogue,
+	Infocenter::c_bricksterEscapedDialogue1,
+	Infocenter::c_bricksterEscapedDialogue5,
+	Infocenter::c_exitGuidanceDialogue2
+	// Zero-terminated
+};
+
+// GLOBAL: LEGO1 0x100f76f8
+Infocenter::InfomainScript g_unk0x100f76f8[6] = {
+	Infocenter::c_returnBackGuidanceDialogue2,
+	Infocenter::c_reenterInfoCenterDialogue1,
+	Infocenter::c_reenterInfoCenterDialogue2,
+	Infocenter::c_reenterInfoCenterDialogue3,
+	Infocenter::c_reenterInfoCenterDialogue4
+	// Zero-terminated
+};
+
+// GLOBAL: LEGO1 0x100f7710
+Infocenter::InfomainScript g_unk0x100f7710[4] = {
+	Infocenter::c_bricksterEscapedDialogue1,
+	Infocenter::c_bricksterEscapedDialogue2,
+	Infocenter::c_bricksterEscapedDialogue3,
+	// Zero-terminated
+};
+
+// GLOBAL: LEGO1 0x100f7720
+Infocenter::InfomainScript g_unk0x100f7720[4] = {
+	Infocenter::c_bricksterEscapedDialogue4,
+	Infocenter::c_bricksterEscapedDialogue5,
+	Infocenter::c_bricksterEscapedDialogue6,
+	Infocenter::c_bricksterEscapedDialogue7
+};
+
+// GLOBAL: LEGO1 0x100f7730
+Infocenter::InfomainScript g_unk0x100f7730[4] = {
+	Infocenter::c_leaveInfoCenterDialogue1,
+	Infocenter::c_leaveInfoCenterDialogue2,
+	Infocenter::c_leaveInfoCenterDialogue3,
+	Infocenter::c_leaveInfoCenterDialogue4
+};
+
+// GLOBAL: LEGO1 0x100f7740
+Infocenter::InfomainScript g_unk0x100f7740[4] =
+	{Infocenter::c_unk569, Infocenter::c_unk570, Infocenter::c_unk571, Infocenter::c_unk572};
+
+// GLOBAL: LEGO1 0x100f7750
+Infocenter::InfomainScript g_unk0x100f7750[4] = {
+	Infocenter::c_unk566,
+	Infocenter::c_unk567,
+	Infocenter::c_unk568,
+	// Zero-terminated
+};
+
+// GLOBAL: LEGO1 0x100f7760
+Infocenter::InfomainScript g_unk0x100f7760[2] = {Infocenter::c_bricksterDialogue, Infocenter::c_bricksterLaughs};
+
 // FUNCTION: LEGO1 0x10071600
 InfocenterState::InfocenterState()
 {
-	// TODO
+	m_unk0x08 = LegoState::Shuffle((MxU32*) g_unk0x100f76a8, sizeof(g_unk0x100f76a8) / sizeof(g_unk0x100f76a8[0]));
+
+	m_unk0x14 = LegoState::Shuffle((MxU32*) g_unk0x100f76e0, sizeof(g_unk0x100f76e0) / sizeof(g_unk0x100f76e0[0]) - 1);
+
+	m_unk0x20[0] =
+		LegoState::Shuffle((MxU32*) g_unk0x100f76f8, sizeof(g_unk0x100f76f8) / sizeof(g_unk0x100f76f8[0]) - 1);
+
+	m_unk0x20[1] =
+		LegoState::Shuffle((MxU32*) g_unk0x100f7710, sizeof(g_unk0x100f7710) / sizeof(g_unk0x100f7710[0]) - 1);
+
+	m_unk0x20[2] = LegoState::Shuffle((MxU32*) g_unk0x100f7720, sizeof(g_unk0x100f7720) / sizeof(g_unk0x100f7720[0]));
+
+	m_unk0x44[0] = LegoState::Shuffle((MxU32*) g_unk0x100f7730, sizeof(g_unk0x100f7730) / sizeof(g_unk0x100f7730[0]));
+
+	m_unk0x44[1] = LegoState::Shuffle((MxU32*) g_unk0x100f7740, sizeof(g_unk0x100f7740) / sizeof(g_unk0x100f7740[0]));
+
+	m_unk0x44[2] =
+		LegoState::Shuffle((MxU32*) g_unk0x100f7750, sizeof(g_unk0x100f7750) / sizeof(g_unk0x100f7750[0]) - 1);
+
+	m_unk0x68 = LegoState::Shuffle((MxU32*) g_unk0x100f7760, sizeof(g_unk0x100f7760) / sizeof(g_unk0x100f7760[0]));
+
 	memset(m_buffer, 0, sizeof(m_buffer));
 }
 
diff --git a/LEGO1/lego/legoomni/src/isle/radiostate.cpp b/LEGO1/lego/legoomni/src/isle/radiostate.cpp
index 74094c2c..676bd753 100644
--- a/LEGO1/lego/legoomni/src/isle/radiostate.cpp
+++ b/LEGO1/lego/legoomni/src/isle/radiostate.cpp
@@ -53,32 +53,14 @@ RadioState::RadioState()
 	MxS32 random = rand();
 	m_unk0x2c = random % 3;
 
-	// TODO: Most likely inline function
+	m_unk0x08[0] = LegoState::Shuffle((MxU32*) g_unk0x100f3218, sizeof(g_unk0x100f3218) / sizeof(g_unk0x100f3218[0]));
+	m_unk0x08[0].SetUnknown0x08(rand() % (sizeof(g_unk0x100f3218) / sizeof(g_unk0x100f3218[0])));
 
-	m_unk0x08[0].m_unk0x04 = sizeof(g_unk0x100f3218) / sizeof(g_unk0x100f3218[0]);
-	m_unk0x08[0].m_unk0x00 = g_unk0x100f3218;
-	m_unk0x08[0].m_unk0x08 = 0;
-	m_unk0x08[0].m_unk0x06 = 0;
+	m_unk0x08[1] = LegoState::Shuffle((MxU32*) g_unk0x100f3230, sizeof(g_unk0x100f3230) / sizeof(g_unk0x100f3230[0]));
+	m_unk0x08[1].SetUnknown0x08(rand() % (sizeof(g_unk0x100f3230) / sizeof(g_unk0x100f3230[0])));
 
-	random = rand();
-
-	m_unk0x08[1].m_unk0x08 = 0;
-	m_unk0x08[1].m_unk0x06 = 0;
-	m_unk0x08[1].m_unk0x04 = sizeof(g_unk0x100f3230) / sizeof(g_unk0x100f3230[0]);
-	m_unk0x08[1].m_unk0x00 = g_unk0x100f3230;
-
-	m_unk0x08[0].m_unk0x08 = (MxU32) random % (sizeof(g_unk0x100f3218) / sizeof(g_unk0x100f3218[0]));
-	random = rand();
-
-	m_unk0x08[2].m_unk0x08 = 0;
-	m_unk0x08[2].m_unk0x06 = 0;
-	m_unk0x08[2].m_unk0x04 = sizeof(g_unk0x100f3268) / sizeof(g_unk0x100f3268[0]);
-	m_unk0x08[2].m_unk0x00 = g_unk0x100f3268;
-
-	m_unk0x08[1].m_unk0x08 = (MxU32) random % (sizeof(g_unk0x100f3230) / sizeof(g_unk0x100f3230[0]));
-	random = rand();
-
-	m_unk0x08[2].m_unk0x08 = (MxU32) random % (sizeof(g_unk0x100f3268) / sizeof(g_unk0x100f3268[0]));
+	m_unk0x08[2] = LegoState::Shuffle((MxU32*) g_unk0x100f3268, sizeof(g_unk0x100f3268) / sizeof(g_unk0x100f3268[0]));
+	m_unk0x08[2].SetUnknown0x08(rand() % (sizeof(g_unk0x100f3268) / sizeof(g_unk0x100f3268[0])));
 
 	m_active = FALSE;
 }
diff --git a/tools/isledecomp/isledecomp/compare/asm/parse.py b/tools/isledecomp/isledecomp/compare/asm/parse.py
index ef1ad2c2..f8323165 100644
--- a/tools/isledecomp/isledecomp/compare/asm/parse.py
+++ b/tools/isledecomp/isledecomp/compare/asm/parse.py
@@ -9,6 +9,7 @@
 import re
 from typing import Callable, List, Optional, Tuple
 from collections import namedtuple
+from isledecomp.bin import InvalidVirtualAddressError
 from capstone import Cs, CS_ARCH_X86, CS_MODE_32
 
 disassembler = Cs(CS_ARCH_X86, CS_MODE_32)
@@ -55,7 +56,11 @@ def is_relocated(self, addr: int) -> bool:
 
     def float_replace(self, addr: int, data_size: int) -> Optional[str]:
         if callable(self.float_lookup):
-            float_str = self.float_lookup(addr, data_size)
+            try:
+                float_str = self.float_lookup(addr, data_size)
+            except InvalidVirtualAddressError:
+                # probably caused by reading an invalid instruction
+                return None
             if float_str is not None:
                 return f"{float_str} (FLOAT)"
 

From 558bda4dd2915942c9644524c7fe31d625c238da Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Fri, 2 Feb 2024 12:18:46 -0500
Subject: [PATCH 206/210] Implement LegoWorld::Enable (#516)

* WIP VTable0x68

* Improve match

* Match

* Fix

* Fix

* Move vars

* Match

* Add call to Isle

* Rename functions

* Fix style
---
 LEGO1/lego/legoomni/include/act3.h            |   2 +-
 LEGO1/lego/legoomni/include/elevatorbottom.h  |   4 +-
 LEGO1/lego/legoomni/include/gasstation.h      |   2 +-
 LEGO1/lego/legoomni/include/hospital.h        |   2 +-
 LEGO1/lego/legoomni/include/infocenter.h      |   2 +-
 LEGO1/lego/legoomni/include/infocenterdoor.h  |   4 +-
 LEGO1/lego/legoomni/include/isle.h            |   2 +-
 LEGO1/lego/legoomni/include/jukebox.h         |   2 +-
 LEGO1/lego/legoomni/include/legoact2.h        |   2 +-
 .../legoomni/include/legoanimationmanager.h   |   3 +
 LEGO1/lego/legoomni/include/legocarbuild.h    |   2 +-
 LEGO1/lego/legoomni/include/legoentitylist.h  |   4 +-
 LEGO1/lego/legoomni/include/legogamestate.h   |   1 +
 LEGO1/lego/legoomni/include/legoomni.h        |  12 +-
 .../legoomni/include/legopathcontroller.h     |   2 +
 .../legoomni/include/legopathcontrollerlist.h |  45 ++++++-
 .../include/legopointofviewcontroller.h       |   1 +
 LEGO1/lego/legoomni/include/legorace.h        |   2 +-
 LEGO1/lego/legoomni/include/legoworld.h       |   4 +-
 LEGO1/lego/legoomni/include/police.h          |   2 +-
 .../lego/legoomni/include/registrationbook.h  |   2 +-
 LEGO1/lego/legoomni/include/score.h           |   2 +-
 LEGO1/lego/legoomni/src/act2/legoact2.cpp     |   2 +-
 LEGO1/lego/legoomni/src/act3/act3.cpp         |   2 +-
 LEGO1/lego/legoomni/src/build/helicopter.cpp  |  22 ++--
 .../lego/legoomni/src/build/legocarbuild.cpp  |   2 +-
 .../legoomni/src/common/legogamestate.cpp     |   6 +
 LEGO1/lego/legoomni/src/common/legostate.cpp  |   2 +-
 LEGO1/lego/legoomni/src/common/legoutil.cpp   |   2 +-
 .../src/entity/legoactorpresenter.cpp         |   2 +-
 LEGO1/lego/legoomni/src/entity/legoentity.cpp |   6 +-
 .../src/entity/legoentitypresenter.cpp        |   2 +-
 LEGO1/lego/legoomni/src/entity/legorace.cpp   |   2 +-
 LEGO1/lego/legoomni/src/entity/legoworld.cpp  | 124 +++++++++++++++++-
 .../legoomni/src/gasstation/gasstation.cpp    |   2 +-
 LEGO1/lego/legoomni/src/hospital/hospital.cpp |   2 +-
 .../src/infocenter/elevatorbottom.cpp         |   6 +-
 .../legoomni/src/infocenter/infocenter.cpp    |   6 +-
 .../src/infocenter/infocenterdoor.cpp         |   6 +-
 .../src/infocenter/registrationbook.cpp       |   2 +-
 LEGO1/lego/legoomni/src/infocenter/score.cpp  |   6 +-
 LEGO1/lego/legoomni/src/isle/isle.cpp         |  26 +++-
 LEGO1/lego/legoomni/src/isle/jukebox.cpp      |   2 +-
 LEGO1/lego/legoomni/src/isle/radio.cpp        |  10 +-
 LEGO1/lego/legoomni/src/main/legoomni.cpp     |  19 ++-
 .../legoomni/src/paths/legopathcontroller.cpp |   6 +
 LEGO1/lego/legoomni/src/police/police.cpp     |   2 +-
 .../src/video/legoanimationmanager.cpp        |  19 +++
 .../legoomni/src/video/legoanimpresenter.cpp  |   2 +-
 .../src/video/mxtransitionmanager.cpp         |   2 +-
 LEGO1/viewmanager/viewmanager.cpp             |   4 +
 LEGO1/viewmanager/viewmanager.h               |   9 +-
 52 files changed, 312 insertions(+), 97 deletions(-)

diff --git a/LEGO1/lego/legoomni/include/act3.h b/LEGO1/lego/legoomni/include/act3.h
index 1d109052..46ae4e4f 100644
--- a/LEGO1/lego/legoomni/include/act3.h
+++ b/LEGO1/lego/legoomni/include/act3.h
@@ -33,7 +33,7 @@ class Act3 : public LegoWorld {
 	MxBool VTable0x5c() override;                     // vtable+0x5c
 	void VTable0x60() override;                       // vtable+0x60
 	MxBool VTable0x64() override;                     // vtable+0x64
-	void VTable0x68(MxBool p_add) override;           // vtable+0x68
+	void Enable(MxBool p_enable) override;            // vtable+0x68
 
 	inline void SetUnkown420c(MxEntity* p_entity) { m_unk0x420c = p_entity; }
 	inline void SetUnkown4270(MxU32 p_unk0x4270) { m_unk0x4270 = p_unk0x4270; }
diff --git a/LEGO1/lego/legoomni/include/elevatorbottom.h b/LEGO1/lego/legoomni/include/elevatorbottom.h
index 80ea3fe0..8057b993 100644
--- a/LEGO1/lego/legoomni/include/elevatorbottom.h
+++ b/LEGO1/lego/legoomni/include/elevatorbottom.h
@@ -34,8 +34,8 @@ class ElevatorBottom : public LegoWorld {
 	// FUNCTION: LEGO1 0x10017f10
 	MxBool VTable0x5c() override { return TRUE; } // vtable+0x5c
 
-	MxBool VTable0x64() override;           // vtable+0x64
-	void VTable0x68(MxBool p_add) override; // vtable+0x68
+	MxBool VTable0x64() override;          // vtable+0x64
+	void Enable(MxBool p_enable) override; // vtable+0x68
 
 	// SYNTHETIC: LEGO1 0x10018040
 	// ElevatorBottom::`scalar deleting destructor'
diff --git a/LEGO1/lego/legoomni/include/gasstation.h b/LEGO1/lego/legoomni/include/gasstation.h
index f8115487..2d32bd81 100644
--- a/LEGO1/lego/legoomni/include/gasstation.h
+++ b/LEGO1/lego/legoomni/include/gasstation.h
@@ -33,7 +33,7 @@ class GasStation : public LegoWorld {
 	void ReadyWorld() override;                       // vtable+0x50
 	MxBool VTable0x5c() override;                     // vtable+0x5c
 	MxBool VTable0x64() override;                     // vtable+0x64
-	void VTable0x68(MxBool p_add) override;           // vtable+0x68
+	void Enable(MxBool p_enable) override;            // vtable+0x68
 
 	// SYNTHETIC: LEGO1 0x100048a0
 	// GasStation::`scalar deleting destructor'
diff --git a/LEGO1/lego/legoomni/include/hospital.h b/LEGO1/lego/legoomni/include/hospital.h
index ebf802a9..809e64e2 100644
--- a/LEGO1/lego/legoomni/include/hospital.h
+++ b/LEGO1/lego/legoomni/include/hospital.h
@@ -31,7 +31,7 @@ class Hospital : public LegoWorld {
 	void ReadyWorld() override;                       // vtable+0x50
 	MxBool VTable0x5c() override;                     // vtable+0x5c
 	MxBool VTable0x64() override;                     // vtable+0x64
-	void VTable0x68(MxBool p_add) override;           // vtable+0x68
+	void Enable(MxBool p_enable) override;            // vtable+0x68
 
 	// SYNTHETIC: LEGO1 0x100747d0
 	// Hospital::`scalar deleting destructor'
diff --git a/LEGO1/lego/legoomni/include/infocenter.h b/LEGO1/lego/legoomni/include/infocenter.h
index cd033c03..871fc1e9 100644
--- a/LEGO1/lego/legoomni/include/infocenter.h
+++ b/LEGO1/lego/legoomni/include/infocenter.h
@@ -188,7 +188,7 @@ class Infocenter : public LegoWorld {
 	void ReadyWorld() override;                       // vtable+0x50
 	MxBool VTable0x5c() override;                     // vtable+0x5c
 	MxBool VTable0x64() override;                     // vtable+0x64
-	void VTable0x68(MxBool p_add) override;           // vtable+0x68
+	void Enable(MxBool p_enable) override;            // vtable+0x68
 
 	// SYNTHETIC: LEGO1 0x1006ec60
 	// Infocenter::`scalar deleting destructor'
diff --git a/LEGO1/lego/legoomni/include/infocenterdoor.h b/LEGO1/lego/legoomni/include/infocenterdoor.h
index 3335731c..84be246a 100644
--- a/LEGO1/lego/legoomni/include/infocenterdoor.h
+++ b/LEGO1/lego/legoomni/include/infocenterdoor.h
@@ -33,8 +33,8 @@ class InfocenterDoor : public LegoWorld {
 	// FUNCTION: LEGO1 0x100377a0
 	MxBool VTable0x5c() override { return TRUE; } // vtable+0x5c
 
-	MxBool VTable0x64() override;           // vtable+0x64
-	void VTable0x68(MxBool p_add) override; // vtable+0x68
+	MxBool VTable0x64() override;          // vtable+0x64
+	void Enable(MxBool p_enable) override; // vtable+0x68
 
 	// SYNTHETIC: LEGO1 0x100378d0
 	// InfocenterDoor::`scalar deleting destructor'
diff --git a/LEGO1/lego/legoomni/include/isle.h b/LEGO1/lego/legoomni/include/isle.h
index e62577d6..f94e6832 100644
--- a/LEGO1/lego/legoomni/include/isle.h
+++ b/LEGO1/lego/legoomni/include/isle.h
@@ -47,7 +47,7 @@ class Isle : public LegoWorld {
 	// FUNCTION: LEGO1 0x10033170
 	void VTable0x60() override {}                    // vtable+60
 	MxBool VTable0x64() override;                    // vtable+64
-	void VTable0x68(MxBool p_add) override;          // vtable+68
+	void Enable(MxBool p_enable) override;           // vtable+68
 	virtual void VTable0x6c(IslePathActor* p_actor); // vtable+6c
 
 	inline void SetUnknown13c(MxU32 p_unk0x13c) { m_unk0x13c = p_unk0x13c; }
diff --git a/LEGO1/lego/legoomni/include/jukebox.h b/LEGO1/lego/legoomni/include/jukebox.h
index f1335262..94728ee2 100644
--- a/LEGO1/lego/legoomni/include/jukebox.h
+++ b/LEGO1/lego/legoomni/include/jukebox.h
@@ -30,7 +30,7 @@ class JukeBox : public LegoWorld {
 	void ReadyWorld() override;                       // vtable+0x50
 	MxBool VTable0x5c() override;                     // vtable+0x5c
 	MxBool VTable0x64() override;                     // vtable+0x64
-	void VTable0x68(MxBool p_add) override;           // vtable+0x68
+	void Enable(MxBool p_enable) override;            // vtable+0x68
 
 	// SYNTHETIC: LEGO1 0x1005d810
 	// JukeBox::`scalar deleting destructor'
diff --git a/LEGO1/lego/legoomni/include/legoact2.h b/LEGO1/lego/legoomni/include/legoact2.h
index 5e89e06e..dfedc85d 100644
--- a/LEGO1/lego/legoomni/include/legoact2.h
+++ b/LEGO1/lego/legoomni/include/legoact2.h
@@ -16,7 +16,7 @@ class LegoAct2 : public LegoWorld {
 	MxBool VTable0x5c() override;                     // vtable+0x5c
 	void VTable0x60() override;                       // vtable+0x60
 	MxBool VTable0x64() override;                     // vtable+0x64
-	void VTable0x68(MxBool p_add) override;           // vtable+0x68
+	void Enable(MxBool p_enable) override;            // vtable+0x68
 
 	// SYNTHETIC: LEGO1 0x1004fe20
 	// LegoAct2::`scalar deleting destructor'
diff --git a/LEGO1/lego/legoomni/include/legoanimationmanager.h b/LEGO1/lego/legoomni/include/legoanimationmanager.h
index 85f1d8ec..94cb5b86 100644
--- a/LEGO1/lego/legoomni/include/legoanimationmanager.h
+++ b/LEGO1/lego/legoomni/include/legoanimationmanager.h
@@ -27,9 +27,12 @@ class LegoAnimationManager : public MxCore {
 		return !strcmp(p_name, ClassName()) || MxCore::IsA(p_name);
 	}
 
+	void FUN_1005ee80(MxBool);
 	void FUN_1005ef10();
+	void FUN_1005f0b0();
 	void FUN_1005f6d0(MxBool);
 	void FUN_1005f720(undefined4);
+	void FUN_10061010(undefined4);
 	void FUN_10064670(MxBool);
 
 	static void configureLegoAnimationManager(MxS32 p_legoAnimationManagerConfig);
diff --git a/LEGO1/lego/legoomni/include/legocarbuild.h b/LEGO1/lego/legoomni/include/legocarbuild.h
index 8314b149..03d0484d 100644
--- a/LEGO1/lego/legoomni/include/legocarbuild.h
+++ b/LEGO1/lego/legoomni/include/legocarbuild.h
@@ -30,7 +30,7 @@ class LegoCarBuild : public LegoWorld {
 	void ReadyWorld() override;                       // vtable+0x50
 	MxBool VTable0x5c() override;                     // vtable+0x5c
 	MxBool VTable0x64() override;                     // vtable+0x64
-	void VTable0x68(MxBool p_add) override;           // vtable+0x68
+	void Enable(MxBool p_enable) override;            // vtable+0x68
 
 	// SYNTHETIC: LEGO1 0x10022a60
 	// LegoCarBuild::`scalar deleting destructor'
diff --git a/LEGO1/lego/legoomni/include/legoentitylist.h b/LEGO1/lego/legoomni/include/legoentitylist.h
index ef64b06c..938c85d4 100644
--- a/LEGO1/lego/legoomni/include/legoentitylist.h
+++ b/LEGO1/lego/legoomni/include/legoentitylist.h
@@ -74,7 +74,7 @@ class LegoEntityListCursor : public MxPtrListCursor<LegoEntity> {
 // SYNTHETIC: LEGO1 0x1001f110
 // LegoEntityListCursor::`scalar deleting destructor'
 
-// FUNCTION: LEGO1 0x1001f180
+// TEMPLATE: LEGO1 0x1001f180
 // MxPtrListCursor<LegoEntity>::~MxPtrListCursor<LegoEntity>
 
 // SYNTHETIC: LEGO1 0x1001f1d0
@@ -83,7 +83,7 @@ class LegoEntityListCursor : public MxPtrListCursor<LegoEntity> {
 // SYNTHETIC: LEGO1 0x1001f240
 // MxPtrListCursor<LegoEntity>::`scalar deleting destructor'
 
-// FUNCTION: LEGO1 0x1001f2b0
+// TEMPLATE: LEGO1 0x1001f2b0
 // MxListCursor<LegoEntity *>::~MxListCursor<LegoEntity *>
 
 // FUNCTION: LEGO1 0x1001f300
diff --git a/LEGO1/lego/legoomni/include/legogamestate.h b/LEGO1/lego/legoomni/include/legogamestate.h
index 1af22e55..a799c570 100644
--- a/LEGO1/lego/legoomni/include/legogamestate.h
+++ b/LEGO1/lego/legoomni/include/legogamestate.h
@@ -47,6 +47,7 @@ class LegoGameState {
 	void SetSomeEnumState(undefined4 p_state);
 	void FUN_1003ceb0();
 	void FUN_10039780(MxU8);
+	void FUN_10039940();
 
 	struct ScoreStruct {
 		void WriteScoreHistory();
diff --git a/LEGO1/lego/legoomni/include/legoomni.h b/LEGO1/lego/legoomni/include/legoomni.h
index 33fc6a46..ff973f95 100644
--- a/LEGO1/lego/legoomni/include/legoomni.h
+++ b/LEGO1/lego/legoomni/include/legoomni.h
@@ -28,6 +28,7 @@ class MxBackgroundAudioManager;
 class MxDSFile;
 class MxTransitionManager;
 class ViewLODListManager;
+class ViewManager;
 
 extern MxAtomId* g_copterScript;
 extern MxAtomId* g_dunecarScript;
@@ -125,7 +126,7 @@ class LegoOmni : public MxOmni {
 	LegoUnkSaveDataWriter* GetUnkSaveDataWriter() { return m_saveDataWriter; }
 
 	inline void SetNavController(LegoNavController* p_navController) { m_navController = p_navController; }
-	inline void SetWorld(LegoWorld* p_currentWorld) { m_currentWorld = p_currentWorld; }
+	inline void SetCurrentWorld(LegoWorld* p_currentWorld) { m_currentWorld = p_currentWorld; }
 	inline void SetExit(MxBool p_exit) { m_exit = p_exit; }
 
 	inline void CloseMainWindow() { PostMessageA(m_windowHandle, WM_CLOSE, 0, 0); }
@@ -164,14 +165,15 @@ LegoROI* PickROI(MxLong, MxLong);
 LegoSoundManager* SoundManager();
 MxTransitionManager* TransitionManager();
 LegoVideoManager* VideoManager();
-
 LegoAnimationManager* AnimationManager();
+LegoNavController* NavController();
 LegoBuildingManager* BuildingManager();
 LegoControlManager* ControlManager();
-IslePathActor* GetCurrentVehicle();
+IslePathActor* CurrentVehicle();
+ViewManager* GetViewManager();
 LegoPlantManager* PlantManager();
-LegoWorld* GetCurrentWorld();
-LegoUnkSaveDataWriter* GetUnkSaveDataWriter();
+LegoWorld* CurrentWorld();
+LegoUnkSaveDataWriter* UnkSaveDataWriter();
 GifManager* GetGifManager();
 void FUN_10015820(MxBool p_disable, MxU16 p_flags);
 void FUN_10015860(const char*, MxU8);
diff --git a/LEGO1/lego/legoomni/include/legopathcontroller.h b/LEGO1/lego/legoomni/include/legopathcontroller.h
index 8363ee7a..4ad0b03f 100644
--- a/LEGO1/lego/legoomni/include/legopathcontroller.h
+++ b/LEGO1/lego/legoomni/include/legopathcontroller.h
@@ -30,6 +30,8 @@ class LegoPathController : public MxCore {
 
 	virtual void VTable0x14(); // vtable+0x14
 	virtual void Destroy();    // vtable+0x18
+
+	void Enable(MxBool p_enable);
 };
 
 #endif // LEGOPATHCONTROLLER_H
diff --git a/LEGO1/lego/legoomni/include/legopathcontrollerlist.h b/LEGO1/lego/legoomni/include/legopathcontrollerlist.h
index 0bcd9c09..af2642a2 100644
--- a/LEGO1/lego/legoomni/include/legopathcontrollerlist.h
+++ b/LEGO1/lego/legoomni/include/legopathcontrollerlist.h
@@ -5,6 +5,12 @@
 #include "mxlist.h"
 #include "mxtypes.h"
 
+// VTABLE: LEGO1 0x100d6380
+// class MxCollection<LegoPathController *>
+
+// VTABLE: LEGO1 0x100d6398
+// class MxList<LegoPathController *>
+
 // VTABLE: LEGO1 0x100d6320
 // class MxPtrList<LegoPathController>
 
@@ -19,16 +25,20 @@ class LegoPathControllerList : public MxPtrList<LegoPathController> {
 	{
 		return p_a == p_b ? 0 : p_a < p_b ? -1 : 1;
 	} // vtable+0x14
-
-	// SYNTHETIC: LEGO1 0x1001d3d0
-	// LegoPathControllerList::`scalar deleting destructor'
 };
 
-// VTABLE: LEGO1 0x100d6380
-// class MxCollection<LegoPathController *>
+// VTABLE: LEGO1 0x100d6578
+// class MxListCursor<LegoPathController *>
 
-// VTABLE: LEGO1 0x100d6398
-// class MxList<LegoPathController *>
+// VTABLE: LEGO1 0x100d6548
+// class MxPtrListCursor<LegoPathController>
+
+// VTABLE: LEGO1 0x100d6560
+// SIZE 0x10
+class LegoPathControllerListCursor : public MxPtrListCursor<LegoPathController> {
+public:
+	LegoPathControllerListCursor(LegoPathControllerList* p_list) : MxPtrListCursor<LegoPathController>(p_list){};
+};
 
 // TEMPLATE: LEGO1 0x1001d230
 // MxCollection<LegoPathController *>::Compare
@@ -48,6 +58,9 @@ class LegoPathControllerList : public MxPtrList<LegoPathController> {
 // TEMPLATE: LEGO1 0x1001d3c0
 // MxPtrList<LegoPathController>::Destroy
 
+// SYNTHETIC: LEGO1 0x1001d3d0
+// LegoPathControllerList::`scalar deleting destructor'
+
 // TEMPLATE: LEGO1 0x1001d440
 // MxPtrList<LegoPathController>::~MxPtrList<LegoPathController>
 
@@ -63,4 +76,22 @@ class LegoPathControllerList : public MxPtrList<LegoPathController> {
 // SYNTHETIC: LEGO1 0x1001d620
 // LegoPathControllerList::~LegoPathControllerList
 
+// SYNTHETIC: LEGO1 0x1001f830
+// LegoPathControllerListCursor::`scalar deleting destructor'
+
+// TEMPLATE: LEGO1 0x1001f8a0
+// MxPtrListCursor<LegoPathController>::~MxPtrListCursor<LegoPathController>
+
+// SYNTHETIC: LEGO1 0x1001f8f0
+// MxListCursor<LegoPathController *>::`scalar deleting destructor'
+
+// SYNTHETIC: LEGO1 0x1001f960
+// MxPtrListCursor<LegoPathController>::`scalar deleting destructor'
+
+// TEMPLATE: LEGO1 0x1001f9d0
+// MxListCursor<LegoPathController *>::~MxListCursor<LegoPathController *>
+
+// FUNCTION: LEGO1 0x1001fa20
+// LegoPathControllerListCursor::~LegoPathControllerListCursor
+
 #endif // LEGOPATHCONTROLLERLIST_H
diff --git a/LEGO1/lego/legoomni/include/legopointofviewcontroller.h b/LEGO1/lego/legoomni/include/legopointofviewcontroller.h
index 650ca90b..b6db3014 100644
--- a/LEGO1/lego/legoomni/include/legopointofviewcontroller.h
+++ b/LEGO1/lego/legoomni/include/legopointofviewcontroller.h
@@ -86,6 +86,7 @@ class LegoPointOfViewController : public LegoMouseController {
 	void OnViewSize(int p_width, int p_height);
 
 	inline LegoEntity* GetEntity() { return m_entity; }
+	inline LegoNavController* GetNavController() { return m_nav; }
 
 protected:
 	void AffectPointOfView();
diff --git a/LEGO1/lego/legoomni/include/legorace.h b/LEGO1/lego/legoomni/include/legorace.h
index 8a6eed8a..c8b02f2e 100644
--- a/LEGO1/lego/legoomni/include/legorace.h
+++ b/LEGO1/lego/legoomni/include/legorace.h
@@ -31,7 +31,7 @@ class LegoRace : public LegoWorld {
 	MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
 	MxBool VTable0x5c() override;                     // vtable+0x5c
 	MxBool VTable0x64() override;                     // vtable+0x64
-	void VTable0x68(MxBool p_add) override;           // vtable+0x68
+	void Enable(MxBool p_enable) override;            // vtable+0x68
 	virtual undefined4 VTable0x6c(undefined4) = 0;    // vtable+0x6c
 	virtual undefined4 VTable0x70(undefined4);        // vtable+0x70
 	virtual undefined4 VTable0x74(undefined4);        // vtable+0x74
diff --git a/LEGO1/lego/legoomni/include/legoworld.h b/LEGO1/lego/legoomni/include/legoworld.h
index 0690f570..98dbbd5c 100644
--- a/LEGO1/lego/legoomni/include/legoworld.h
+++ b/LEGO1/lego/legoomni/include/legoworld.h
@@ -61,8 +61,8 @@ class LegoWorld : public LegoEntity {
 	// FUNCTION: LEGO1 0x100010a0
 	virtual void VTable0x60() {} // vtable+0x60
 
-	virtual MxBool VTable0x64();           // vtable+0x64
-	virtual void VTable0x68(MxBool p_add); // vtable+0x68
+	virtual MxBool VTable0x64();          // vtable+0x64
+	virtual void Enable(MxBool p_enable); // vtable+0x68
 
 	inline LegoCameraController* GetCamera() { return m_cameraController; }
 	inline undefined4 GetUnknown0xec() { return m_unk0xec; }
diff --git a/LEGO1/lego/legoomni/include/police.h b/LEGO1/lego/legoomni/include/police.h
index dd5c10e6..595f5ede 100644
--- a/LEGO1/lego/legoomni/include/police.h
+++ b/LEGO1/lego/legoomni/include/police.h
@@ -34,7 +34,7 @@ class Police : public LegoWorld {
 	void ReadyWorld() override;                       // vtable+0x50
 	MxBool VTable0x5c() override;                     // vtable+0x5c
 	MxBool VTable0x64() override;                     // vtable+0x64
-	void VTable0x68(MxBool p_add) override;           // vtable+0x68
+	void Enable(MxBool p_enable) override;            // vtable+0x68
 
 	// SYNTHETIC: LEGO1 0x1005e300
 	// Police::`scalar deleting destructor'
diff --git a/LEGO1/lego/legoomni/include/registrationbook.h b/LEGO1/lego/legoomni/include/registrationbook.h
index a712fdc6..4a7f3ee8 100644
--- a/LEGO1/lego/legoomni/include/registrationbook.h
+++ b/LEGO1/lego/legoomni/include/registrationbook.h
@@ -29,7 +29,7 @@ class RegistrationBook : public LegoWorld {
 	MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
 	void ReadyWorld() override;                       // vtable+0x50
 	MxBool VTable0x64() override;                     // vtable+0x64
-	void VTable0x68(MxBool p_add) override;           // vtable+0x68
+	void Enable(MxBool p_enable) override;            // vtable+0x68
 
 	// SYNTHETIC: LEGO1 0x10076f30
 	// RegistrationBook::`scalar deleting destructor'
diff --git a/LEGO1/lego/legoomni/include/score.h b/LEGO1/lego/legoomni/include/score.h
index 98774249..2f03abe5 100644
--- a/LEGO1/lego/legoomni/include/score.h
+++ b/LEGO1/lego/legoomni/include/score.h
@@ -35,7 +35,7 @@ class Score : public LegoWorld {
 	void ReadyWorld() override;                       // vtable+50
 	MxBool VTable0x5c() override;                     // vtable+5c
 	MxBool VTable0x64() override;                     // vtable+64
-	void VTable0x68(MxBool p_add) override;           // vtable+68
+	void Enable(MxBool p_enable) override;            // vtable+68
 
 	void Paint();
 	MxLong FUN_10001510(MxEndActionNotificationParam& p_param);
diff --git a/LEGO1/lego/legoomni/src/act2/legoact2.cpp b/LEGO1/lego/legoomni/src/act2/legoact2.cpp
index 3aafe018..c32f407c 100644
--- a/LEGO1/lego/legoomni/src/act2/legoact2.cpp
+++ b/LEGO1/lego/legoomni/src/act2/legoact2.cpp
@@ -35,7 +35,7 @@ void LegoAct2::ReadyWorld()
 }
 
 // STUB: LEGO1 0x10050cf0
-void LegoAct2::VTable0x68(MxBool p_add)
+void LegoAct2::Enable(MxBool p_enable)
 {
 	// TODO
 }
diff --git a/LEGO1/lego/legoomni/src/act3/act3.cpp b/LEGO1/lego/legoomni/src/act3/act3.cpp
index 02a13c60..b0971ec4 100644
--- a/LEGO1/lego/legoomni/src/act3/act3.cpp
+++ b/LEGO1/lego/legoomni/src/act3/act3.cpp
@@ -77,7 +77,7 @@ void Act3::FUN_10073430()
 }
 
 // STUB: LEGO1 0x10073a90
-void Act3::VTable0x68(MxBool p_add)
+void Act3::Enable(MxBool p_enable)
 {
 	// TODO
 }
diff --git a/LEGO1/lego/legoomni/src/build/helicopter.cpp b/LEGO1/lego/legoomni/src/build/helicopter.cpp
index 2b7be890..7e836fcf 100644
--- a/LEGO1/lego/legoomni/src/build/helicopter.cpp
+++ b/LEGO1/lego/legoomni/src/build/helicopter.cpp
@@ -34,7 +34,7 @@ Helicopter::~Helicopter()
 MxResult Helicopter::Create(MxDSAction& p_dsAction)
 {
 	MxResult result = IslePathActor::Create(p_dsAction);
-	LegoWorld* world = GetCurrentWorld();
+	LegoWorld* world = CurrentWorld();
 	SetWorld(world);
 	if (world->IsA("Act3")) {
 		((Act3*) GetWorld())->SetUnkown420c(this);
@@ -65,9 +65,9 @@ void Helicopter::VTable0xe4()
 	IslePathActor::VTable0xe4();
 	if (!GameState()->GetUnknown10()) {
 		GameState()->SetCurrentArea(0x3c);
-		if (GetCurrentVehicle()) {
-			if (GetCurrentVehicle()->IsA("IslePathActor")) {
-				((IslePathActor*) GetCurrentVehicle())->VTable0xe8(0x37, TRUE, 7);
+		if (CurrentVehicle()) {
+			if (CurrentVehicle()->IsA("IslePathActor")) {
+				((IslePathActor*) CurrentVehicle())->VTable0xe8(0x37, TRUE, 7);
 			}
 		}
 	}
@@ -93,12 +93,12 @@ MxU32 Helicopter::VTable0xcc()
 		return 1;
 	}
 	if (!m_world) {
-		m_world = GetCurrentWorld();
+		m_world = CurrentWorld();
 	}
 	AnimationManager()->FUN_1005f6d0(FALSE);
-	if (GetCurrentVehicle()) {
-		if (GetCurrentVehicle()->VTable0x60() != GameState()->GetUnknownC()) {
-			GetCurrentVehicle()->VTable0xe4();
+	if (CurrentVehicle()) {
+		if (CurrentVehicle()->VTable0x60() != GameState()->GetUnknownC()) {
+			CurrentVehicle()->VTable0xe4();
 		}
 	}
 	switch (GameState()->GetUnknown10()) {
@@ -106,7 +106,7 @@ MxU32 Helicopter::VTable0xcc()
 		m_script = *g_isleScript;
 		AnimationManager()->FUN_10064670(FALSE);
 		VTable0xe8(0x29, TRUE, 7);
-		((Isle*) GetCurrentWorld())->SetUnknown13c(0x3c);
+		((Isle*) CurrentWorld())->SetUnknown13c(0x3c);
 		FUN_10015820(TRUE, 0);
 		TransitionManager()->StartTransition(MxTransitionManager::e_pixelation, 50, FALSE, TRUE);
 		SetUnknownDC(4);
@@ -146,7 +146,7 @@ MxU32 Helicopter::VTable0xd4(LegoControlManagerEvent& p_param)
 		switch (p_param.GetClickedObjectId()) {
 		case 0x17:
 			if (*g_act3Script == script) {
-				((Act3*) GetCurrentWorld())->SetUnkown4270(2);
+				((Act3*) CurrentWorld())->SetUnkown4270(2);
 				TransitionManager()->StartTransition(MxTransitionManager::e_pixelation, 50, FALSE, FALSE);
 			}
 			else if (m_state->GetUnkown8() != 0) {
@@ -218,7 +218,7 @@ MxU32 Helicopter::VTable0xd4(LegoControlManagerEvent& p_param)
 			break;
 		case 0x1c:
 			if (GameState()->GetUnknown10() == 0) {
-				((Isle*) GetCurrentWorld())->SetUnknown13c(2);
+				((Isle*) CurrentWorld())->SetUnknown13c(2);
 				TransitionManager()->StartTransition(MxTransitionManager::e_pixelation, 50, FALSE, FALSE);
 				VTable0xe4();
 			}
diff --git a/LEGO1/lego/legoomni/src/build/legocarbuild.cpp b/LEGO1/lego/legoomni/src/build/legocarbuild.cpp
index 9aba409b..09651ba2 100644
--- a/LEGO1/lego/legoomni/src/build/legocarbuild.cpp
+++ b/LEGO1/lego/legoomni/src/build/legocarbuild.cpp
@@ -49,7 +49,7 @@ void LegoCarBuild::ReadyWorld()
 }
 
 // STUB: LEGO1 0x100256c0
-void LegoCarBuild::VTable0x68(MxBool p_add)
+void LegoCarBuild::Enable(MxBool p_enable)
 {
 	// TODO
 }
diff --git a/LEGO1/lego/legoomni/src/common/legogamestate.cpp b/LEGO1/lego/legoomni/src/common/legogamestate.cpp
index 28453d61..0637a22c 100644
--- a/LEGO1/lego/legoomni/src/common/legogamestate.cpp
+++ b/LEGO1/lego/legoomni/src/common/legogamestate.cpp
@@ -113,6 +113,12 @@ void LegoGameState::FUN_10039780(MxU8)
 	// TODO
 }
 
+// STUB: LEGO1 0x10039940
+void LegoGameState::FUN_10039940()
+{
+	// TODO
+}
+
 // FUNCTION: LEGO1 0x10039980
 MxResult LegoGameState::Save(MxULong p_slot)
 {
diff --git a/LEGO1/lego/legoomni/src/common/legostate.cpp b/LEGO1/lego/legoomni/src/common/legostate.cpp
index 4cc7622f..fe418e50 100644
--- a/LEGO1/lego/legoomni/src/common/legostate.cpp
+++ b/LEGO1/lego/legoomni/src/common/legostate.cpp
@@ -7,7 +7,7 @@ DECOMP_SIZE_ASSERT(LegoState::Shuffle, 0x0c)
 MxU32 LegoState::Shuffle::FUN_10014d00()
 {
 	// TODO
-	return 0;
+	return m_objectIds[0];
 }
 
 // STUB: LEGO1 0x10014de0
diff --git a/LEGO1/lego/legoomni/src/common/legoutil.cpp b/LEGO1/lego/legoomni/src/common/legoutil.cpp
index 251942fb..51cf4342 100644
--- a/LEGO1/lego/legoomni/src/common/legoutil.cpp
+++ b/LEGO1/lego/legoomni/src/common/legoutil.cpp
@@ -118,7 +118,7 @@ MxBool CheckIfEntityExists(MxBool p_enable, const char* p_filename, MxS32 p_enti
 	LegoWorld* world = FindWorld(MxAtomId(p_filename, e_lowerCase2), p_entityId);
 
 	if (world) {
-		world->VTable0x68(p_enable);
+		world->Enable(p_enable);
 		return TRUE;
 	}
 	else {
diff --git a/LEGO1/lego/legoomni/src/entity/legoactorpresenter.cpp b/LEGO1/lego/legoomni/src/entity/legoactorpresenter.cpp
index 927677fe..076333a6 100644
--- a/LEGO1/lego/legoomni/src/entity/legoactorpresenter.cpp
+++ b/LEGO1/lego/legoomni/src/entity/legoactorpresenter.cpp
@@ -6,7 +6,7 @@
 // FUNCTION: LEGO1 0x10076c30
 void LegoActorPresenter::ReadyTickle()
 {
-	if (GetCurrentWorld()) {
+	if (CurrentWorld()) {
 		m_entity = (LegoEntity*) CreateEntity("LegoActor");
 		if (m_entity) {
 			SetEntityLocation(m_action->GetLocation(), m_action->GetDirection(), m_action->GetUp());
diff --git a/LEGO1/lego/legoomni/src/entity/legoentity.cpp b/LEGO1/lego/legoomni/src/entity/legoentity.cpp
index 3057a71f..86ccf923 100644
--- a/LEGO1/lego/legoomni/src/entity/legoentity.cpp
+++ b/LEGO1/lego/legoomni/src/entity/legoentity.cpp
@@ -55,7 +55,7 @@ void LegoEntity::Destroy(MxBool p_fromDestructor)
 				m_roi->SetUnknown0x104(NULL);
 			}
 
-			GetUnkSaveDataWriter()->FUN_10083db0(m_roi);
+			UnkSaveDataWriter()->FUN_10083db0(m_roi);
 		}
 		else {
 			VideoManager()->Get3DManager()->GetLego3DView()->Remove(*m_roi);
@@ -70,7 +70,7 @@ void LegoEntity::Destroy(MxBool p_fromDestructor)
 // FUNCTION: LEGO1 0x10010880
 void LegoEntity::SetWorld()
 {
-	LegoWorld* world = GetCurrentWorld();
+	LegoWorld* world = CurrentWorld();
 	if (world != NULL && world != (LegoWorld*) this) {
 		world->Add(this);
 	}
@@ -91,7 +91,7 @@ void LegoEntity::SetLocation(Mx3DPointFloat& p_location, Mx3DPointFloat& p_direc
 // FUNCTION: LEGO1 0x10010c30
 void LegoEntity::FUN_10010c30()
 {
-	LegoWorld* world = GetCurrentWorld();
+	LegoWorld* world = CurrentWorld();
 
 	if (m_cameraFlag && world && world->GetCamera() && m_roi) {
 		world->GetCamera()->FUN_100123e0(m_roi->GetLocal2World(), 1);
diff --git a/LEGO1/lego/legoomni/src/entity/legoentitypresenter.cpp b/LEGO1/lego/legoomni/src/entity/legoentitypresenter.cpp
index 0da082cd..f43f1aa9 100644
--- a/LEGO1/lego/legoomni/src/entity/legoentitypresenter.cpp
+++ b/LEGO1/lego/legoomni/src/entity/legoentitypresenter.cpp
@@ -62,7 +62,7 @@ MxResult LegoEntityPresenter::StartAction(MxStreamController* p_controller, MxDS
 // FUNCTION: LEGO1 0x100536c0
 void LegoEntityPresenter::ReadyTickle()
 {
-	if (GetCurrentWorld()) {
+	if (CurrentWorld()) {
 		m_entity = (LegoEntity*) MxPresenter::CreateEntity("LegoEntity");
 		if (m_entity) {
 			m_entity->Create(*m_action);
diff --git a/LEGO1/lego/legoomni/src/entity/legorace.cpp b/LEGO1/lego/legoomni/src/entity/legorace.cpp
index 79565966..7c65c4da 100644
--- a/LEGO1/lego/legoomni/src/entity/legorace.cpp
+++ b/LEGO1/lego/legoomni/src/entity/legorace.cpp
@@ -82,7 +82,7 @@ MxLong LegoRace::Notify(MxParam& p_param)
 }
 
 // STUB: LEGO1 0x10015ed0
-void LegoRace::VTable0x68(MxBool p_add)
+void LegoRace::Enable(MxBool p_enable)
 {
 	// TODO
 }
diff --git a/LEGO1/lego/legoomni/src/entity/legoworld.cpp b/LEGO1/lego/legoomni/src/entity/legoworld.cpp
index a8111dc8..f9c0b63c 100644
--- a/LEGO1/lego/legoomni/src/entity/legoworld.cpp
+++ b/LEGO1/lego/legoomni/src/entity/legoworld.cpp
@@ -1,10 +1,13 @@
 #include "legoworld.h"
 
+#include "legoanimationmanager.h"
 #include "legoanimpresenter.h"
 #include "legobuildingmanager.h"
 #include "legocontrolmanager.h"
+#include "legogamestate.h"
 #include "legoinputmanager.h"
 #include "legolocomotionanimpresenter.h"
+#include "legonavcontroller.h"
 #include "legoomni.h"
 #include "legoplantmanager.h"
 #include "legosoundmanager.h"
@@ -80,8 +83,8 @@ MxResult LegoWorld::Create(MxDSAction& p_dsAction)
 	}
 
 	if (p_dsAction.GetFlags() & MxDSAction::c_enabled) {
-		if (GetCurrentWorld()) {
-			GetCurrentWorld()->VTable0x68(0);
+		if (CurrentWorld()) {
+			CurrentWorld()->Enable(0);
 		}
 
 		SetCurrentWorld(this);
@@ -99,7 +102,7 @@ void LegoWorld::Destroy(MxBool p_fromDestructor)
 {
 	m_destroyed = TRUE;
 
-	if (GetCurrentWorld() == this) {
+	if (CurrentWorld() == this) {
 		ControlManager()->FUN_10028df0(NULL);
 		SetCurrentWorld(NULL);
 	}
@@ -513,10 +516,119 @@ MxCore* LegoWorld::Find(const MxAtomId& p_atom, MxS32 p_entityId)
 	return NULL;
 }
 
-// STUB: LEGO1 0x10021a70
-void LegoWorld::VTable0x68(MxBool p_add)
+// FUNCTION: LEGO1 0x10021a70
+void LegoWorld::Enable(MxBool p_enable)
 {
-	// TODO
+	if (p_enable && !m_set0xd0.empty()) {
+		if (CurrentWorld() != this) {
+			if (CurrentWorld()) {
+				AnimationManager()->FUN_10061010(0);
+				CurrentWorld()->Enable(FALSE);
+
+				LegoEntityListCursor cursor(m_entityList);
+				LegoEntity* entity;
+
+				while (cursor.Next(entity)) {
+					if (entity->GetROI()) {
+						entity->GetROI()->SetUnknown0x104(entity);
+						GetViewManager()->AddToUnknown0x08(entity->GetROI());
+					}
+				}
+			}
+
+			while (!m_set0xd0.empty()) {
+				MxCoreSet::iterator it = m_set0xd0.begin();
+
+				if ((*it)->IsA("MxPresenter")) {
+					((MxPresenter*) *it)->Enable(TRUE);
+				}
+				else if ((*it)->IsA("LegoPathController")) {
+					((LegoPathController*) *it)->Enable(TRUE);
+				}
+
+				m_set0xd0.erase(it);
+			}
+
+			SetCurrentWorld(this);
+			ControlManager()->FUN_10028df0(&m_controlPresenters);
+			InputManager()->SetCamera(m_cameraController);
+
+			if (m_cameraController) {
+				InputManager()->Register(m_cameraController->GetNavController());
+				Lego()->SetNavController(m_cameraController->GetNavController());
+			}
+
+			if (m_unk0xec != -1) {
+				PlantManager()->FUN_10026360(m_unk0xec);
+				AnimationManager()->FUN_1005f720(m_unk0xec);
+				BuildingManager()->FUN_1002fa00();
+				AnimationManager()->FUN_1005f0b0();
+			}
+
+			GameState()->FUN_10039940();
+			SetIsWorldActive(TRUE);
+		}
+	}
+	else if (!p_enable && m_set0xd0.empty()) {
+		MxPresenter* presenter;
+		LegoPathController* controller;
+		IslePathActor* vehicle = CurrentVehicle();
+
+		if (vehicle) {
+			FUN_1001fc80(vehicle);
+		}
+
+		AnimationManager()->FUN_1005ee80(FALSE);
+		m_set0xd0.insert(this);
+
+		if (m_unk0xec != -1) {
+			PlantManager()->FUN_100263a0(m_unk0xec);
+			BuildingManager()->FUN_1002fb30();
+		}
+
+		MxPresenterListCursor controlPresenterCursor(&m_controlPresenters);
+
+		while (controlPresenterCursor.Next(presenter)) {
+			if (presenter->IsEnabled()) {
+				m_set0xd0.insert(presenter);
+				presenter->Enable(FALSE);
+			}
+		}
+
+		for (MxCoreSet::iterator it = m_set0xa8.begin(); it != m_set0xa8.end(); it++) {
+			if ((*it)->IsA("LegoActionControlPresenter") ||
+				((*it)->IsA("MxPresenter") && ((MxPresenter*) *it)->IsEnabled())) {
+				m_set0xd0.insert(*it);
+				((MxPresenter*) *it)->Enable(FALSE);
+			}
+		}
+
+		if (CurrentWorld() && CurrentWorld() == this) {
+			ControlManager()->FUN_10028df0(NULL);
+			Lego()->SetCurrentWorld(NULL);
+		}
+
+		if (InputManager()->GetCamera() == m_cameraController) {
+			InputManager()->ClearCamera();
+		}
+
+		if (m_cameraController) {
+			InputManager()->UnRegister(m_cameraController->GetNavController());
+
+			if (NavController() == m_cameraController->GetNavController()) {
+				Lego()->SetNavController(NULL);
+			}
+		}
+
+		LegoPathControllerListCursor pathControllerCursor(&m_list0x68);
+
+		while (pathControllerCursor.Next(controller)) {
+			controller->Enable(FALSE);
+			m_set0xd0.insert(controller);
+		}
+
+		GetViewManager()->RemoveAll(NULL);
+	}
 }
 
 // FUNCTION: LEGO1 0x10022080
diff --git a/LEGO1/lego/legoomni/src/gasstation/gasstation.cpp b/LEGO1/lego/legoomni/src/gasstation/gasstation.cpp
index c7a695a8..37ff261e 100644
--- a/LEGO1/lego/legoomni/src/gasstation/gasstation.cpp
+++ b/LEGO1/lego/legoomni/src/gasstation/gasstation.cpp
@@ -54,7 +54,7 @@ void GasStation::ReadyWorld()
 }
 
 // STUB: LEGO1 0x10005c40
-void GasStation::VTable0x68(MxBool p_add)
+void GasStation::Enable(MxBool p_enable)
 {
 	// TODO
 }
diff --git a/LEGO1/lego/legoomni/src/hospital/hospital.cpp b/LEGO1/lego/legoomni/src/hospital/hospital.cpp
index b141956d..8412cee5 100644
--- a/LEGO1/lego/legoomni/src/hospital/hospital.cpp
+++ b/LEGO1/lego/legoomni/src/hospital/hospital.cpp
@@ -58,7 +58,7 @@ void Hospital::ReadyWorld()
 }
 
 // STUB: LEGO1 0x10076220
-void Hospital::VTable0x68(MxBool p_add)
+void Hospital::Enable(MxBool p_enable)
 {
 	// TODO
 }
diff --git a/LEGO1/lego/legoomni/src/infocenter/elevatorbottom.cpp b/LEGO1/lego/legoomni/src/infocenter/elevatorbottom.cpp
index 08f2cf50..98e7d1b9 100644
--- a/LEGO1/lego/legoomni/src/infocenter/elevatorbottom.cpp
+++ b/LEGO1/lego/legoomni/src/infocenter/elevatorbottom.cpp
@@ -116,11 +116,11 @@ MxLong ElevatorBottom::HandleClick(LegoControlManagerEvent& p_param)
 }
 
 // FUNCTION: LEGO1 0x100182c0
-void ElevatorBottom::VTable0x68(MxBool p_add)
+void ElevatorBottom::Enable(MxBool p_enable)
 {
-	LegoWorld::VTable0x68(p_add);
+	LegoWorld::Enable(p_enable);
 
-	if (p_add) {
+	if (p_enable) {
 		InputManager()->SetWorld(this);
 		SetIsWorldActive(FALSE);
 	}
diff --git a/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp b/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp
index 0a262819..3913d355 100644
--- a/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp
+++ b/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp
@@ -709,11 +709,11 @@ MxLong Infocenter::HandleNotification0(MxNotificationParam& p_param)
 }
 
 // FUNCTION: LEGO1 0x10070aa0
-void Infocenter::VTable0x68(MxBool p_add)
+void Infocenter::Enable(MxBool p_enable)
 {
-	LegoWorld::VTable0x68(p_add);
+	LegoWorld::Enable(p_enable);
 
-	if (p_add) {
+	if (p_enable) {
 		InputManager()->SetWorld(this);
 		SetIsWorldActive(FALSE);
 	}
diff --git a/LEGO1/lego/legoomni/src/infocenter/infocenterdoor.cpp b/LEGO1/lego/legoomni/src/infocenter/infocenterdoor.cpp
index 47ab29ac..eaf1ba98 100644
--- a/LEGO1/lego/legoomni/src/infocenter/infocenterdoor.cpp
+++ b/LEGO1/lego/legoomni/src/infocenter/infocenterdoor.cpp
@@ -140,11 +140,11 @@ MxLong InfocenterDoor::HandleClick(LegoControlManagerEvent& p_param)
 }
 
 // FUNCTION: LEGO1 0x10037c80
-void InfocenterDoor::VTable0x68(MxBool p_add)
+void InfocenterDoor::Enable(MxBool p_enable)
 {
-	LegoWorld::VTable0x68(p_add);
+	LegoWorld::Enable(p_enable);
 
-	if (p_add) {
+	if (p_enable) {
 		InputManager()->SetWorld(this);
 		SetIsWorldActive(FALSE);
 	}
diff --git a/LEGO1/lego/legoomni/src/infocenter/registrationbook.cpp b/LEGO1/lego/legoomni/src/infocenter/registrationbook.cpp
index a2ee09b3..5d5c6d94 100644
--- a/LEGO1/lego/legoomni/src/infocenter/registrationbook.cpp
+++ b/LEGO1/lego/legoomni/src/infocenter/registrationbook.cpp
@@ -42,7 +42,7 @@ MxResult RegistrationBook::Tickle()
 }
 
 // STUB: LEGO1 0x10078180
-void RegistrationBook::VTable0x68(MxBool p_add)
+void RegistrationBook::Enable(MxBool p_enable)
 {
 	// TODO
 }
diff --git a/LEGO1/lego/legoomni/src/infocenter/score.cpp b/LEGO1/lego/legoomni/src/infocenter/score.cpp
index 197cd7ae..74744fbf 100644
--- a/LEGO1/lego/legoomni/src/infocenter/score.cpp
+++ b/LEGO1/lego/legoomni/src/infocenter/score.cpp
@@ -217,11 +217,11 @@ MxLong Score::FUN_100016d0(LegoControlManagerEvent& p_param)
 }
 
 // FUNCTION: LEGO1 0x10001980
-void Score::VTable0x68(MxBool p_add)
+void Score::Enable(MxBool p_enable)
 {
-	LegoWorld::VTable0x68(p_add);
+	LegoWorld::Enable(p_enable);
 
-	if (p_add) {
+	if (p_enable) {
 		InputManager()->SetWorld(this);
 		SetIsWorldActive(FALSE);
 	}
diff --git a/LEGO1/lego/legoomni/src/isle/isle.cpp b/LEGO1/lego/legoomni/src/isle/isle.cpp
index c8c67570..c5c9ae1f 100644
--- a/LEGO1/lego/legoomni/src/isle/isle.cpp
+++ b/LEGO1/lego/legoomni/src/isle/isle.cpp
@@ -46,8 +46,8 @@ Isle::~Isle()
 		InputManager()->ClearWorld();
 	}
 
-	if (GetCurrentVehicle() != NULL) {
-		VTable0x6c(GetCurrentVehicle());
+	if (CurrentVehicle() != NULL) {
+		VTable0x6c(CurrentVehicle());
 	}
 
 	NotificationManager()->Unregister(this);
@@ -121,7 +121,7 @@ MxLong Isle::Notify(MxParam& p_param)
 		case c_notificationType18:
 			switch (m_act1state->GetUnknown18()) {
 			case 4:
-				result = GetCurrentVehicle()->Notify(p_param);
+				result = CurrentVehicle()->Notify(p_param);
 				break;
 			case 8:
 				result = m_towtrack->Notify(p_param);
@@ -135,7 +135,7 @@ MxLong Isle::Notify(MxParam& p_param)
 			result = HandleType19Notification(p_param);
 			break;
 		case c_notificationType20:
-			VTable0x68(TRUE);
+			Enable(TRUE);
 			break;
 		case c_notificationTransitioned:
 			result = HandleTransitionEnd();
@@ -183,9 +183,23 @@ MxLong Isle::HandleType19Notification(MxParam& p_param)
 }
 
 // STUB: LEGO1 0x10031820
-void Isle::VTable0x68(MxBool p_add)
+void Isle::Enable(MxBool p_enable)
 {
-	// TODO
+	if (m_set0xd0.empty() == p_enable) {
+		return;
+	}
+
+	LegoWorld::Enable(p_enable);
+	m_radio.Initialize(p_enable);
+
+	if (p_enable) {
+		// TODO
+	}
+	else {
+		if (InputManager()->GetWorld() == this) {
+			InputManager()->ClearWorld();
+		}
+	}
 }
 
 // STUB: LEGO1 0x10032620
diff --git a/LEGO1/lego/legoomni/src/isle/jukebox.cpp b/LEGO1/lego/legoomni/src/isle/jukebox.cpp
index c969754f..ed937aeb 100644
--- a/LEGO1/lego/legoomni/src/isle/jukebox.cpp
+++ b/LEGO1/lego/legoomni/src/isle/jukebox.cpp
@@ -41,7 +41,7 @@ void JukeBox::ReadyWorld()
 }
 
 // STUB: LEGO1 0x1005dde0
-void JukeBox::VTable0x68(MxBool p_add)
+void JukeBox::Enable(MxBool p_enable)
 {
 	// TODO
 }
diff --git a/LEGO1/lego/legoomni/src/isle/radio.cpp b/LEGO1/lego/legoomni/src/isle/radio.cpp
index 86561c16..52bda8f2 100644
--- a/LEGO1/lego/legoomni/src/isle/radio.cpp
+++ b/LEGO1/lego/legoomni/src/isle/radio.cpp
@@ -54,7 +54,7 @@ MxLong Radio::Notify(MxParam& p_param)
 void Radio::Play()
 {
 	if (!m_state->IsActive()) {
-		GetCurrentWorld();
+		CurrentWorld();
 
 		MxDSAction action;
 		action.SetObjectId(m_state->FUN_1002d090());
@@ -75,7 +75,7 @@ void Radio::Play()
 void Radio::Stop()
 {
 	if (m_state->IsActive()) {
-		LegoWorld* world = GetCurrentWorld();
+		LegoWorld* world = CurrentWorld();
 
 		MxControlPresenter* presenter = (MxControlPresenter*) world->Find(world->GetAtom(), 18);
 
@@ -103,12 +103,12 @@ MxLong Radio::HandleClick(LegoControlManagerEvent& p_param)
 			Play();
 		}
 
-		if (GetCurrentWorld()) {
+		if (CurrentWorld()) {
 #ifdef COMPAT_MODE
 			MxNotificationParam param(c_notificationEndAction, this);
-			GetCurrentWorld()->Notify(param);
+			CurrentWorld()->Notify(param);
 #else
-			GetCurrentWorld()->Notify(MxNotificationParam(c_notificationType0, this));
+			CurrentWorld()->Notify(MxNotificationParam(c_notificationType0, this));
 #endif
 		}
 
diff --git a/LEGO1/lego/legoomni/src/main/legoomni.cpp b/LEGO1/lego/legoomni/src/main/legoomni.cpp
index 153d5522..7384da72 100644
--- a/LEGO1/lego/legoomni/src/main/legoomni.cpp
+++ b/LEGO1/lego/legoomni/src/main/legoomni.cpp
@@ -22,6 +22,7 @@
 #include "mxstreamer.h"
 #include "mxticklemanager.h"
 #include "mxtransitionmanager.h"
+#include "viewmanager/viewmanager.h"
 
 DECOMP_SIZE_ASSERT(LegoWorldList, 0x18);
 DECOMP_SIZE_ASSERT(LegoWorldListCursor, 0x10);
@@ -172,23 +173,29 @@ LegoNavController* NavController()
 }
 
 // FUNCTION: LEGO1 0x10015790
-IslePathActor* GetCurrentVehicle()
+IslePathActor* CurrentVehicle()
 {
 	return LegoOmni::GetInstance()->GetCurrentVehicle();
 }
 
 // FUNCTION: LEGO1 0x100157a0
-LegoWorld* GetCurrentWorld()
+LegoWorld* CurrentWorld()
 {
 	return LegoOmni::GetInstance()->GetCurrentWorld();
 }
 
 // FUNCTION: LEGO1 0x100157b0
-LegoUnkSaveDataWriter* GetUnkSaveDataWriter()
+LegoUnkSaveDataWriter* UnkSaveDataWriter()
 {
 	return LegoOmni::GetInstance()->GetUnkSaveDataWriter();
 }
 
+// FUNCTION: LEGO1 0x100157c0
+ViewManager* GetViewManager()
+{
+	return VideoManager()->Get3DManager()->GetLego3DView()->GetViewManager();
+}
+
 // FUNCTION: LEGO1 0x100157e0
 LegoPlantManager* PlantManager()
 {
@@ -234,7 +241,7 @@ MxDSAction& GetCurrentAction()
 // FUNCTION: LEGO1 0x100158f0
 void SetCurrentWorld(LegoWorld* p_world)
 {
-	LegoOmni::GetInstance()->SetWorld(p_world);
+	LegoOmni::GetInstance()->SetCurrentWorld(p_world);
 }
 
 // FUNCTION: LEGO1 0x10015900
@@ -740,11 +747,11 @@ MxBool LegoOmni::DoesEntityExist(MxDSAction& p_dsAction)
 // FUNCTION: LEGO1 0x1005b400
 MxS32 LegoOmni::GetCurrPathInfo(LegoPathBoundary** p_path, MxS32& p_value)
 {
-	if (::GetCurrentWorld() == NULL) {
+	if (::CurrentWorld() == NULL) {
 		return -1;
 	}
 
-	return ::GetCurrentWorld()->GetCurrPathInfo(p_path, p_value);
+	return ::CurrentWorld()->GetCurrPathInfo(p_path, p_value);
 }
 
 // FUNCTION: LEGO1 0x1005b4f0
diff --git a/LEGO1/lego/legoomni/src/paths/legopathcontroller.cpp b/LEGO1/lego/legoomni/src/paths/legopathcontroller.cpp
index c187344c..f2b4d0bb 100644
--- a/LEGO1/lego/legoomni/src/paths/legopathcontroller.cpp
+++ b/LEGO1/lego/legoomni/src/paths/legopathcontroller.cpp
@@ -24,3 +24,9 @@ MxResult LegoPathController::Tickle()
 	// TODO
 	return SUCCESS;
 }
+
+// STUB: LEGO1 0x10046be0
+void LegoPathController::Enable(MxBool p_enable)
+{
+	// TODO
+}
diff --git a/LEGO1/lego/legoomni/src/police/police.cpp b/LEGO1/lego/legoomni/src/police/police.cpp
index c8c29486..c14c482b 100644
--- a/LEGO1/lego/legoomni/src/police/police.cpp
+++ b/LEGO1/lego/legoomni/src/police/police.cpp
@@ -77,7 +77,7 @@ void Police::ReadyWorld()
 }
 
 // STUB: LEGO1 0x1005e740
-void Police::VTable0x68(MxBool p_add)
+void Police::Enable(MxBool p_enable)
 {
 	// TODO
 }
diff --git a/LEGO1/lego/legoomni/src/video/legoanimationmanager.cpp b/LEGO1/lego/legoomni/src/video/legoanimationmanager.cpp
index 476c6291..0b10ed24 100644
--- a/LEGO1/lego/legoomni/src/video/legoanimationmanager.cpp
+++ b/LEGO1/lego/legoomni/src/video/legoanimationmanager.cpp
@@ -21,9 +21,22 @@ LegoAnimationManager::~LegoAnimationManager()
 	// TODO
 }
 
+// STUB: LEGO1 0x1005ee80
+void LegoAnimationManager::FUN_1005ee80(MxBool)
+{
+	// TODO
+}
+
 // STUB: LEGO1 0x1005ef10
 void LegoAnimationManager::FUN_1005ef10()
 {
+	// TODO
+}
+
+// STUB: LEGO1 0x1005f0b0
+void LegoAnimationManager::FUN_1005f0b0()
+{
+	// TODO
 }
 
 // STUB: LEGO1 0x1005f130
@@ -44,6 +57,12 @@ void LegoAnimationManager::FUN_1005f720(undefined4)
 	// TODO
 }
 
+// STUB: LEGO1 0x10061010
+void LegoAnimationManager::FUN_10061010(undefined4)
+{
+	// TODO
+}
+
 // STUB: LEGO1 0x100619f0
 MxLong LegoAnimationManager::Notify(MxParam& p_param)
 {
diff --git a/LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp b/LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp
index f01d3ae1..68c664de 100644
--- a/LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp
+++ b/LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp
@@ -102,7 +102,7 @@ void LegoAnimPresenter::PutFrame()
 // FUNCTION: LEGO1 0x1006b550
 void LegoAnimPresenter::ReadyTickle()
 {
-	m_currentWorld = GetCurrentWorld();
+	m_currentWorld = CurrentWorld();
 
 	if (m_currentWorld) {
 		MxStreamChunk* chunk = m_subscriber->CurrentChunk();
diff --git a/LEGO1/lego/legoomni/src/video/mxtransitionmanager.cpp b/LEGO1/lego/legoomni/src/video/mxtransitionmanager.cpp
index 56fc3c9a..8672cdaa 100644
--- a/LEGO1/lego/legoomni/src/video/mxtransitionmanager.cpp
+++ b/LEGO1/lego/legoomni/src/video/mxtransitionmanager.cpp
@@ -137,7 +137,7 @@ void MxTransitionManager::EndTransition(MxBool p_notifyWorld)
 		TickleManager()->UnregisterClient(this);
 
 		if (p_notifyWorld) {
-			LegoWorld* world = GetCurrentWorld();
+			LegoWorld* world = CurrentWorld();
 
 			if (world) {
 #ifdef COMPAT_MODE
diff --git a/LEGO1/viewmanager/viewmanager.cpp b/LEGO1/viewmanager/viewmanager.cpp
index 3e7344d2..3e68f78e 100644
--- a/LEGO1/viewmanager/viewmanager.cpp
+++ b/LEGO1/viewmanager/viewmanager.cpp
@@ -1,5 +1,9 @@
 #include "viewmanager.h"
 
+#include "decomp.h"
+
+DECOMP_SIZE_ASSERT(ViewManager, 0x1bc)
+
 // STUB: LEGO1 0x100a5eb0
 ViewManager::ViewManager(Tgl::Renderer* pRenderer, Tgl::Group* scene, const OrientableROI* point_of_view)
 {
diff --git a/LEGO1/viewmanager/viewmanager.h b/LEGO1/viewmanager/viewmanager.h
index d89b7cef..625722b5 100644
--- a/LEGO1/viewmanager/viewmanager.h
+++ b/LEGO1/viewmanager/viewmanager.h
@@ -20,8 +20,15 @@ class ViewManager {
 	// SYNTHETIC: LEGO1 0x100a6000
 	// ViewManager::`scalar deleting destructor'
 
+	inline void AddToUnknown0x08(ViewROI* p_roi) { m_unk0x08.push_back(p_roi); }
+
 private:
-	undefined m_pad[0x1b8];
+	undefined4 m_unk0x04;     // 0x04
+	CompoundObject m_unk0x08; // 0x08
+	undefined m_pad[0x1c8];   // 0x14
 };
 
+// TEMPLATE: LEGO1 0x10022030
+// list<ROI *,allocator<ROI *> >::insert
+
 #endif // VIEWMANAGER_H

From b7e274f902e8fcba342fe750f7fb94ead919ea63 Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Fri, 2 Feb 2024 14:09:45 -0500
Subject: [PATCH 207/210] Implement LegoState::Playlist (#517)

---
 LEGO1/lego/legoomni/include/infocenterstate.h | 16 ++---
 LEGO1/lego/legoomni/include/legostate.h       | 41 +++++++------
 .../legoomni/include/legovehiclebuildstate.h  |  2 +-
 LEGO1/lego/legoomni/include/radiostate.h      |  6 +-
 LEGO1/lego/legoomni/src/common/legostate.cpp  | 59 ++++++++++++++++---
 .../legoomni/src/infocenter/infocenter.cpp    |  8 +--
 .../src/infocenter/infocenterstate.cpp        | 18 +++---
 LEGO1/lego/legoomni/src/isle/radiostate.cpp   | 10 ++--
 8 files changed, 104 insertions(+), 56 deletions(-)

diff --git a/LEGO1/lego/legoomni/include/infocenterstate.h b/LEGO1/lego/legoomni/include/infocenterstate.h
index 977ea3d1..1bf64cc9 100644
--- a/LEGO1/lego/legoomni/include/infocenterstate.h
+++ b/LEGO1/lego/legoomni/include/infocenterstate.h
@@ -30,9 +30,9 @@ class InfocenterState : public LegoState {
 
 	inline MxS16 GetInfocenterBufferSize() { return sizeof(m_buffer) / sizeof(m_buffer[0]); }
 	inline MxStillPresenter* GetInfocenterBufferElement(MxS32 p_index) { return m_buffer[p_index]; }
-	inline Shuffle& GetUnknown0x08() { return m_unk0x08; }
-	inline Shuffle& GetUnknown0x14() { return m_unk0x14; }
-	inline Shuffle& GetUnknown0x68() { return m_unk0x68; }
+	inline Playlist& GetUnknown0x08() { return m_unk0x08; }
+	inline Playlist& GetUnknown0x14() { return m_unk0x14; }
+	inline Playlist& GetUnknown0x68() { return m_unk0x68; }
 	inline MxU32 GetUnknown0x74() { return m_unk0x74; }
 
 	inline void SetUnknown0x74(MxU32 p_unk0x74) { m_unk0x74 = p_unk0x74; }
@@ -41,11 +41,11 @@ class InfocenterState : public LegoState {
 	// InfocenterState::`scalar deleting destructor'
 
 private:
-	Shuffle m_unk0x08;             // 0x08
-	Shuffle m_unk0x14;             // 0x14
-	Shuffle m_unk0x20[3];          // 0x20
-	Shuffle m_unk0x44[3];          // 0x44
-	Shuffle m_unk0x68;             // 0x68
+	Playlist m_unk0x08;            // 0x08
+	Playlist m_unk0x14;            // 0x14
+	Playlist m_unk0x20[3];         // 0x20
+	Playlist m_unk0x44[3];         // 0x44
+	Playlist m_unk0x68;            // 0x68
 	MxU32 m_unk0x74;               // 0x74
 	MxStillPresenter* m_buffer[7]; // 0x78
 };
diff --git a/LEGO1/lego/legoomni/include/legostate.h b/LEGO1/lego/legoomni/include/legostate.h
index 42fd0fe9..2ed94a3e 100644
--- a/LEGO1/lego/legoomni/include/legostate.h
+++ b/LEGO1/lego/legoomni/include/legostate.h
@@ -45,45 +45,52 @@ class LegoState : public MxCore {
 	// LegoState::`scalar deleting destructor'
 
 	// SIZE 0x0c
-	class Shuffle {
+	class Playlist {
 	public:
+		enum Mode {
+			e_loop,
+			e_once,
+			e_random,
+			e_loopSkipFirst
+		};
+
 		// FUNCTION: LEGO1 0x10017c00
-		Shuffle()
+		Playlist()
 		{
 			m_objectIds = NULL;
 			m_length = 0;
-			m_unk0x06 = 0;
-			m_unk0x08 = 0;
+			m_mode = e_loop;
+			m_nextIndex = 0;
 		}
 
-		Shuffle(MxU32* p_objectIds, MxU16 p_length)
+		Playlist(MxU32* p_objectIds, MxS16 p_length)
 		{
 			m_objectIds = p_objectIds;
 			m_length = p_length;
-			m_unk0x06 = 0;
-			m_unk0x08 = 0;
+			m_mode = e_loop;
+			m_nextIndex = 0;
 		}
 
 		// FUNCTION: LEGO1 0x10071800
-		Shuffle& operator=(const Shuffle& p_shuffle)
+		Playlist& operator=(const Playlist& p_shuffle)
 		{
 			m_objectIds = p_shuffle.m_objectIds;
 			m_length = p_shuffle.m_length;
-			m_unk0x08 = p_shuffle.m_unk0x08;
-			m_unk0x06 = p_shuffle.m_unk0x06;
+			m_nextIndex = p_shuffle.m_nextIndex;
+			m_mode = p_shuffle.m_mode;
 			return *this;
 		}
 
-		MxU32 FUN_10014d00();
-		MxBool FUN_10014de0(MxU32 p_objectId);
+		MxU32 Next();
+		MxBool Contains(MxU32 p_objectId);
 
-		inline void SetUnknown0x08(MxU16 p_unk0x08) { m_unk0x08 = p_unk0x08; }
+		inline void SetUnknown0x08(MxS16 p_unk0x08) { m_nextIndex = p_unk0x08; }
 
 	private:
-		MxU32* m_objectIds;   // 0x00
-		MxU16 m_length;       // 0x04
-		undefined2 m_unk0x06; // 0x06
-		MxU16 m_unk0x08;      // 0x08
+		MxU32* m_objectIds; // 0x00
+		MxS16 m_length;     // 0x04
+		MxS16 m_mode;       // 0x06
+		MxS16 m_nextIndex;  // 0x08
 	};
 };
 
diff --git a/LEGO1/lego/legoomni/include/legovehiclebuildstate.h b/LEGO1/lego/legoomni/include/legovehiclebuildstate.h
index 03e72ae9..229fdcfb 100644
--- a/LEGO1/lego/legoomni/include/legovehiclebuildstate.h
+++ b/LEGO1/lego/legoomni/include/legovehiclebuildstate.h
@@ -29,7 +29,7 @@ class LegoVehicleBuildState : public LegoState {
 	// LegoVehicleBuildState::`scalar deleting destructor'
 
 private:
-	Shuffle m_unk0x08[4]; // 0x08
+	Playlist m_unk0x08[4]; // 0x08
 
 	// This can be one of the following:
 	// * LegoRaceCarBuildState
diff --git a/LEGO1/lego/legoomni/include/radiostate.h b/LEGO1/lego/legoomni/include/radiostate.h
index 5ffd0176..6dcdafd9 100644
--- a/LEGO1/lego/legoomni/include/radiostate.h
+++ b/LEGO1/lego/legoomni/include/radiostate.h
@@ -36,9 +36,9 @@ class RadioState : public LegoState {
 	MxBool FUN_1002d0c0(const MxAtomId& p_atom, MxU32 p_objectId);
 
 private:
-	Shuffle m_unk0x08[3]; // 0x08
-	MxS16 m_unk0x2c;      // 0x2c
-	MxBool m_active;      // 0x2e
+	Playlist m_unk0x08[3]; // 0x08
+	MxS16 m_unk0x2c;       // 0x2c
+	MxBool m_active;       // 0x2e
 };
 
 #endif // RADIOSTATE_H
diff --git a/LEGO1/lego/legoomni/src/common/legostate.cpp b/LEGO1/lego/legoomni/src/common/legostate.cpp
index fe418e50..a8c2cc6b 100644
--- a/LEGO1/lego/legoomni/src/common/legostate.cpp
+++ b/LEGO1/lego/legoomni/src/common/legostate.cpp
@@ -1,18 +1,59 @@
 #include "legostate.h"
 
-DECOMP_SIZE_ASSERT(LegoState, 0x08)
-DECOMP_SIZE_ASSERT(LegoState::Shuffle, 0x0c)
+#include <stdlib.h>
 
-// STUB: LEGO1 0x10014d00
-MxU32 LegoState::Shuffle::FUN_10014d00()
+DECOMP_SIZE_ASSERT(LegoState, 0x08)
+DECOMP_SIZE_ASSERT(LegoState::Playlist, 0x0c)
+
+// FUNCTION: LEGO1 0x10014d00
+MxU32 LegoState::Playlist::Next()
 {
-	// TODO
-	return m_objectIds[0];
+	MxU32 objectId;
+
+	switch (m_mode) {
+	case e_loop:
+		objectId = m_objectIds[m_nextIndex];
+		if (m_nextIndex - m_length == -1) {
+			m_nextIndex = 0;
+		}
+		else {
+			m_nextIndex++;
+		}
+		break;
+
+	case e_once:
+		objectId = m_objectIds[m_nextIndex];
+		if (m_length > m_nextIndex + 1) {
+			m_nextIndex++;
+		}
+		break;
+
+	case e_random:
+		m_nextIndex = rand() % m_length;
+		objectId = m_objectIds[m_nextIndex];
+		break;
+
+	case e_loopSkipFirst:
+		objectId = m_objectIds[m_nextIndex];
+		if (m_nextIndex - m_length == -1) {
+			m_nextIndex = 1;
+		}
+		else {
+			m_nextIndex++;
+		}
+	}
+
+	return objectId;
 }
 
-// STUB: LEGO1 0x10014de0
-MxBool LegoState::Shuffle::FUN_10014de0(MxU32 p_objectId)
+// FUNCTION: LEGO1 0x10014de0
+MxBool LegoState::Playlist::Contains(MxU32 p_objectId)
 {
-	// TODO
+	for (MxS16 i = 0; i < m_length; i++) {
+		if (m_objectIds[i] == p_objectId) {
+			return TRUE;
+		}
+	}
+
 	return FALSE;
 }
diff --git a/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp b/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp
index 3913d355..ba357dc3 100644
--- a/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp
+++ b/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp
@@ -538,7 +538,7 @@ MxU8 Infocenter::HandleClick(LegoControlManagerEvent& p_param)
 				m_transitionDestination = 5;
 			}
 			else {
-				MxU32 objectId = m_infocenterState->GetUnknown0x68().FUN_10014d00();
+				MxU32 objectId = m_infocenterState->GetUnknown0x68().Next();
 				PlayAction((InfomainScript) objectId);
 			}
 
@@ -553,7 +553,7 @@ MxU8 Infocenter::HandleClick(LegoControlManagerEvent& p_param)
 				m_transitionDestination = 13;
 			}
 			else {
-				MxU32 objectId = m_infocenterState->GetUnknown0x68().FUN_10014d00();
+				MxU32 objectId = m_infocenterState->GetUnknown0x68().Next();
 				PlayAction((InfomainScript) objectId);
 			}
 
@@ -658,10 +658,10 @@ MxLong Infocenter::HandleNotification0(MxNotificationParam& p_param)
 
 			InfomainScript objectId;
 			if (GameState()->GetUnknown10()) {
-				objectId = (InfomainScript) m_infocenterState->GetUnknown0x14().FUN_10014d00();
+				objectId = (InfomainScript) m_infocenterState->GetUnknown0x14().Next();
 			}
 			else {
-				objectId = (InfomainScript) m_infocenterState->GetUnknown0x08().FUN_10014d00();
+				objectId = (InfomainScript) m_infocenterState->GetUnknown0x08().Next();
 			}
 
 			PlayAction(objectId);
diff --git a/LEGO1/lego/legoomni/src/infocenter/infocenterstate.cpp b/LEGO1/lego/legoomni/src/infocenter/infocenterstate.cpp
index a6de4a6f..55f4f4d8 100644
--- a/LEGO1/lego/legoomni/src/infocenter/infocenterstate.cpp
+++ b/LEGO1/lego/legoomni/src/infocenter/infocenterstate.cpp
@@ -84,26 +84,26 @@ Infocenter::InfomainScript g_unk0x100f7760[2] = {Infocenter::c_bricksterDialogue
 // FUNCTION: LEGO1 0x10071600
 InfocenterState::InfocenterState()
 {
-	m_unk0x08 = LegoState::Shuffle((MxU32*) g_unk0x100f76a8, sizeof(g_unk0x100f76a8) / sizeof(g_unk0x100f76a8[0]));
+	m_unk0x08 = LegoState::Playlist((MxU32*) g_unk0x100f76a8, sizeof(g_unk0x100f76a8) / sizeof(g_unk0x100f76a8[0]));
 
-	m_unk0x14 = LegoState::Shuffle((MxU32*) g_unk0x100f76e0, sizeof(g_unk0x100f76e0) / sizeof(g_unk0x100f76e0[0]) - 1);
+	m_unk0x14 = LegoState::Playlist((MxU32*) g_unk0x100f76e0, sizeof(g_unk0x100f76e0) / sizeof(g_unk0x100f76e0[0]) - 1);
 
 	m_unk0x20[0] =
-		LegoState::Shuffle((MxU32*) g_unk0x100f76f8, sizeof(g_unk0x100f76f8) / sizeof(g_unk0x100f76f8[0]) - 1);
+		LegoState::Playlist((MxU32*) g_unk0x100f76f8, sizeof(g_unk0x100f76f8) / sizeof(g_unk0x100f76f8[0]) - 1);
 
 	m_unk0x20[1] =
-		LegoState::Shuffle((MxU32*) g_unk0x100f7710, sizeof(g_unk0x100f7710) / sizeof(g_unk0x100f7710[0]) - 1);
+		LegoState::Playlist((MxU32*) g_unk0x100f7710, sizeof(g_unk0x100f7710) / sizeof(g_unk0x100f7710[0]) - 1);
 
-	m_unk0x20[2] = LegoState::Shuffle((MxU32*) g_unk0x100f7720, sizeof(g_unk0x100f7720) / sizeof(g_unk0x100f7720[0]));
+	m_unk0x20[2] = LegoState::Playlist((MxU32*) g_unk0x100f7720, sizeof(g_unk0x100f7720) / sizeof(g_unk0x100f7720[0]));
 
-	m_unk0x44[0] = LegoState::Shuffle((MxU32*) g_unk0x100f7730, sizeof(g_unk0x100f7730) / sizeof(g_unk0x100f7730[0]));
+	m_unk0x44[0] = LegoState::Playlist((MxU32*) g_unk0x100f7730, sizeof(g_unk0x100f7730) / sizeof(g_unk0x100f7730[0]));
 
-	m_unk0x44[1] = LegoState::Shuffle((MxU32*) g_unk0x100f7740, sizeof(g_unk0x100f7740) / sizeof(g_unk0x100f7740[0]));
+	m_unk0x44[1] = LegoState::Playlist((MxU32*) g_unk0x100f7740, sizeof(g_unk0x100f7740) / sizeof(g_unk0x100f7740[0]));
 
 	m_unk0x44[2] =
-		LegoState::Shuffle((MxU32*) g_unk0x100f7750, sizeof(g_unk0x100f7750) / sizeof(g_unk0x100f7750[0]) - 1);
+		LegoState::Playlist((MxU32*) g_unk0x100f7750, sizeof(g_unk0x100f7750) / sizeof(g_unk0x100f7750[0]) - 1);
 
-	m_unk0x68 = LegoState::Shuffle((MxU32*) g_unk0x100f7760, sizeof(g_unk0x100f7760) / sizeof(g_unk0x100f7760[0]));
+	m_unk0x68 = LegoState::Playlist((MxU32*) g_unk0x100f7760, sizeof(g_unk0x100f7760) / sizeof(g_unk0x100f7760[0]));
 
 	memset(m_buffer, 0, sizeof(m_buffer));
 }
diff --git a/LEGO1/lego/legoomni/src/isle/radiostate.cpp b/LEGO1/lego/legoomni/src/isle/radiostate.cpp
index 676bd753..077864a7 100644
--- a/LEGO1/lego/legoomni/src/isle/radiostate.cpp
+++ b/LEGO1/lego/legoomni/src/isle/radiostate.cpp
@@ -53,13 +53,13 @@ RadioState::RadioState()
 	MxS32 random = rand();
 	m_unk0x2c = random % 3;
 
-	m_unk0x08[0] = LegoState::Shuffle((MxU32*) g_unk0x100f3218, sizeof(g_unk0x100f3218) / sizeof(g_unk0x100f3218[0]));
+	m_unk0x08[0] = LegoState::Playlist((MxU32*) g_unk0x100f3218, sizeof(g_unk0x100f3218) / sizeof(g_unk0x100f3218[0]));
 	m_unk0x08[0].SetUnknown0x08(rand() % (sizeof(g_unk0x100f3218) / sizeof(g_unk0x100f3218[0])));
 
-	m_unk0x08[1] = LegoState::Shuffle((MxU32*) g_unk0x100f3230, sizeof(g_unk0x100f3230) / sizeof(g_unk0x100f3230[0]));
+	m_unk0x08[1] = LegoState::Playlist((MxU32*) g_unk0x100f3230, sizeof(g_unk0x100f3230) / sizeof(g_unk0x100f3230[0]));
 	m_unk0x08[1].SetUnknown0x08(rand() % (sizeof(g_unk0x100f3230) / sizeof(g_unk0x100f3230[0])));
 
-	m_unk0x08[2] = LegoState::Shuffle((MxU32*) g_unk0x100f3268, sizeof(g_unk0x100f3268) / sizeof(g_unk0x100f3268[0]));
+	m_unk0x08[2] = LegoState::Playlist((MxU32*) g_unk0x100f3268, sizeof(g_unk0x100f3268) / sizeof(g_unk0x100f3268[0]));
 	m_unk0x08[2].SetUnknown0x08(rand() % (sizeof(g_unk0x100f3268) / sizeof(g_unk0x100f3268[0])));
 
 	m_active = FALSE;
@@ -81,7 +81,7 @@ MxU32 RadioState::FUN_1002d090()
 		m_unk0x2c++;
 	}
 
-	return m_unk0x08[m_unk0x2c].FUN_10014d00();
+	return m_unk0x08[m_unk0x2c].Next();
 }
 
 // FUNCTION: LEGO1 0x1002d0c0
@@ -89,7 +89,7 @@ MxBool RadioState::FUN_1002d0c0(const MxAtomId& p_atom, MxU32 p_objectId)
 {
 	if (*g_jukeboxScript == p_atom) {
 		for (MxS16 i = 0; i < 3; i++) {
-			if (m_unk0x08[i].FUN_10014de0(p_objectId)) {
+			if (m_unk0x08[i].Contains(p_objectId)) {
 				return TRUE;
 			}
 		}

From a28113a26fc559ebce01e360697fd4c6c8ccafc9 Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Fri, 2 Feb 2024 15:00:44 -0500
Subject: [PATCH 208/210] Fix/match MxBackgroundAudioManager::FUN_1007ef40
 (#518)

* Fix

* Match
---
 .../include/mxbackgroundaudiomanager.h        | 20 +++++------
 .../src/audio/mxbackgroundaudiomanager.cpp    | 35 +++++++++++--------
 2 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/LEGO1/lego/legoomni/include/mxbackgroundaudiomanager.h b/LEGO1/lego/legoomni/include/mxbackgroundaudiomanager.h
index 31fa01e5..3e7793f6 100644
--- a/LEGO1/lego/legoomni/include/mxbackgroundaudiomanager.h
+++ b/LEGO1/lego/legoomni/include/mxbackgroundaudiomanager.h
@@ -56,16 +56,16 @@ class MxBackgroundAudioManager : public MxCore {
 	MxResult OpenMusic(MxAtomId& p_script);
 	void DestroyMusic();
 
-	MxBool m_musicEnabled; // 0x08
-	MxDSAction m_action1;  // 0x0c
-	MxAudioPresenter* m_unk0xa0;
-	MxDSAction m_action2; // 0xa4
-	MxAudioPresenter* m_unk0x138;
-	MxS32 m_unk0x13c;
-	MxS32 m_unk0x140;
-	MxS32 m_targetVolume;
-	MxS16 m_unk0x148;
-	MxAtomId m_script;
+	MxBool m_musicEnabled;        // 0x08
+	MxDSAction m_action1;         // 0x0c
+	MxAudioPresenter* m_unk0xa0;  // 0xa0
+	MxDSAction m_action2;         // 0xa4
+	MxAudioPresenter* m_unk0x138; // 0x138
+	MxS32 m_unk0x13c;             // 0x13c
+	MxS32 m_unk0x140;             // 0x140
+	MxS32 m_targetVolume;         // 0x144
+	MxS16 m_unk0x148;             // 0x148
+	MxAtomId m_script;            // 0x14c
 };
 
 #endif // MXBACKGROUNDAUDIOMANAGER_H
diff --git a/LEGO1/lego/legoomni/src/audio/mxbackgroundaudiomanager.cpp b/LEGO1/lego/legoomni/src/audio/mxbackgroundaudiomanager.cpp
index e51e2519..581d97c5 100644
--- a/LEGO1/lego/legoomni/src/audio/mxbackgroundaudiomanager.cpp
+++ b/LEGO1/lego/legoomni/src/audio/mxbackgroundaudiomanager.cpp
@@ -80,16 +80,15 @@ MxResult MxBackgroundAudioManager::Tickle()
 	switch (m_unk0x13c) {
 	case MxPresenter::e_starting:
 		FadeInOrFadeOut();
-		return SUCCESS;
+		break;
 	case MxPresenter::e_streaming:
 		FUN_1007ee70();
-		return SUCCESS;
+		break;
 	case MxPresenter::e_repeating:
 		FUN_1007ef40();
-		return SUCCESS;
-	default:
-		return SUCCESS;
 	}
+
+	return SUCCESS;
 }
 
 // FUNCTION: LEGO1 0x1007ee70
@@ -112,19 +111,23 @@ void MxBackgroundAudioManager::FUN_1007ee70()
 // FUNCTION: LEGO1 0x1007ef40
 void MxBackgroundAudioManager::FUN_1007ef40()
 {
-	MxU32 compare;
-	MxU32 volume;
+	MxS32 compare, volume;
+
 	if (m_unk0xa0 == NULL) {
 		if (m_unk0x138) {
-			compare = 30;
-			if (m_unk0x148 == 0) {
-				compare = m_unk0x148;
+			if (m_unk0x148 != 0) {
+				compare = 30;
 			}
+			else {
+				compare = m_targetVolume;
+			}
+
 			volume = m_unk0x138->GetVolume();
 			if (volume < compare) {
 				if (m_unk0x140 + m_unk0x138->GetVolume() <= compare) {
-					compare = m_unk0x140 + compare;
+					compare = m_unk0x140 + m_unk0x138->GetVolume();
 				}
+
 				m_unk0x138->SetVolume(compare);
 			}
 			else {
@@ -143,12 +146,14 @@ void MxBackgroundAudioManager::FUN_1007ef40()
 			DeleteObject(*m_unk0xa0->GetAction());
 		}
 		else {
-			compare = m_unk0xa0->GetVolume();
-			volume = 0;
-			if (compare != m_unk0x140 && -1 < compare - m_unk0x140) {
+			if (m_unk0xa0->GetVolume() - m_unk0x140 > 0) {
 				volume = m_unk0xa0->GetVolume() - m_unk0x140;
 			}
-			m_unk0x138->SetVolume(volume);
+			else {
+				volume = 0;
+			}
+
+			m_unk0xa0->SetVolume(volume);
 		}
 	}
 }

From 0c47ed5056d9564829e619fed1ca5ff0c3455c63 Mon Sep 17 00:00:00 2001
From: Misha <106913236+MishaProductions@users.noreply.github.com>
Date: Fri, 2 Feb 2024 16:32:50 -0500
Subject: [PATCH 209/210] Implement more infocenter methods (#519)

* push changes

* format fix

* Update legogamestate.cpp

* Update legogamestate.cpp

* Fixes

* Match Infocenter::Create

* Style

* Fix InfocenterDoor::HandleClick

---------

Co-authored-by: Christian Semmler <mail@csemmler.com>
---
 LEGO1/lego/legoomni/include/infocenter.h      |  10 +-
 LEGO1/lego/legoomni/include/infocenterstate.h |   1 +
 .../legoomni/include/legocontrolmanager.h     |   4 +-
 LEGO1/lego/legoomni/include/legogamestate.h   |   3 +
 .../legoomni/include/mxcontrolpresenter.h     |   3 +-
 .../legoomni/src/common/legogamestate.cpp     |  21 ++
 .../src/control/legocontrolmanager.cpp        |  21 +-
 .../legoomni/src/infocenter/infocenter.cpp    | 243 ++++++++++++++++--
 .../src/infocenter/infocenterdoor.cpp         |   4 +
 LEGO1/omni/src/common/mxmediapresenter.cpp    |   3 +-
 10 files changed, 286 insertions(+), 27 deletions(-)

diff --git a/LEGO1/lego/legoomni/include/infocenter.h b/LEGO1/lego/legoomni/include/infocenter.h
index 871fc1e9..46e6b463 100644
--- a/LEGO1/lego/legoomni/include/infocenter.h
+++ b/LEGO1/lego/legoomni/include/infocenter.h
@@ -61,11 +61,11 @@ class Infocenter : public LegoWorld {
 		c_nickSelected = 33,
 		c_lauraSelected = 34,
 
-		c_unk40 = 40,
-		c_unk41 = 41,
-		c_unk42 = 42,
-		c_unk43 = 43,
-		c_unk44 = 44,
+		c_mamaMovie = 40,
+		c_papaMovie = 41,
+		c_pepperMovie = 42,
+		c_nickMovie = 43,
+		c_lauraMovie = 44,
 
 		c_goToRegBook = 70,
 		c_goToRegBookRed = 71,
diff --git a/LEGO1/lego/legoomni/include/infocenterstate.h b/LEGO1/lego/legoomni/include/infocenterstate.h
index 1bf64cc9..171e3c0b 100644
--- a/LEGO1/lego/legoomni/include/infocenterstate.h
+++ b/LEGO1/lego/legoomni/include/infocenterstate.h
@@ -34,6 +34,7 @@ class InfocenterState : public LegoState {
 	inline Playlist& GetUnknown0x14() { return m_unk0x14; }
 	inline Playlist& GetUnknown0x68() { return m_unk0x68; }
 	inline MxU32 GetUnknown0x74() { return m_unk0x74; }
+	inline Playlist* GetUnknown0x44() { return m_unk0x44; }
 
 	inline void SetUnknown0x74(MxU32 p_unk0x74) { m_unk0x74 = p_unk0x74; }
 
diff --git a/LEGO1/lego/legoomni/include/legocontrolmanager.h b/LEGO1/lego/legoomni/include/legocontrolmanager.h
index b4222164..46719167 100644
--- a/LEGO1/lego/legoomni/include/legocontrolmanager.h
+++ b/LEGO1/lego/legoomni/include/legocontrolmanager.h
@@ -6,6 +6,8 @@
 #include "mxcore.h"
 #include "mxpresenterlist.h"
 
+class MxControlPresenter;
+
 // VTABLE: LEGO1 0x100d6a98
 // SIZE 0x2c
 class LegoControlManagerEvent : public LegoEventNotificationParam {
@@ -62,7 +64,7 @@ class LegoControlManager : public MxCore {
 	void Unregister(MxCore* p_listener);
 	MxBool FUN_10029210(LegoEventNotificationParam& p_param, MxPresenter* p_presenter);
 	void FUN_100293c0(undefined4, const char*, undefined2);
-	void FUN_100294e0(MxS32 p_x, MxS32 p_y);
+	MxControlPresenter* FUN_100294e0(MxS32 p_x, MxS32 p_y);
 	MxBool FUN_10029630();
 	MxBool FUN_10029750();
 	void FUN_100292e0();
diff --git a/LEGO1/lego/legoomni/include/legogamestate.h b/LEGO1/lego/legoomni/include/legogamestate.h
index a799c570..0b45f11c 100644
--- a/LEGO1/lego/legoomni/include/legogamestate.h
+++ b/LEGO1/lego/legoomni/include/legogamestate.h
@@ -40,9 +40,12 @@ class LegoGameState {
 	inline MxS32 GetCurrentAct() { return m_currentAct; }
 	inline MxU32 GetCurrentArea() { return m_currentArea; }
 	inline MxU32 GetPreviousArea() { return m_previousArea; }
+	inline MxU32 GetUnknown0x42c() { return m_unk0x42c; }
 
 	inline void SetDirty(MxBool p_dirty) { m_isDirty = p_dirty; }
 	inline void SetCurrentArea(MxU32 p_currentArea) { m_currentArea = p_currentArea; }
+	inline void SetPreviousArea(MxU32 p_previousArea) { m_previousArea = p_previousArea; }
+	inline void SetUnknown0x0c(MxU8 p_unk0x0c) { m_unk0x0c = p_unk0x0c; }
 
 	void SetSomeEnumState(undefined4 p_state);
 	void FUN_1003ceb0();
diff --git a/LEGO1/lego/legoomni/include/mxcontrolpresenter.h b/LEGO1/lego/legoomni/include/mxcontrolpresenter.h
index b1c01fab..e12c1a25 100644
--- a/LEGO1/lego/legoomni/include/mxcontrolpresenter.h
+++ b/LEGO1/lego/legoomni/include/mxcontrolpresenter.h
@@ -40,10 +40,9 @@ class MxControlPresenter : public MxCompositePresenter {
 	virtual void VTable0x6c(MxS16);                                  // vtable+0x6c
 
 	MxBool FUN_10044480(LegoControlManagerEvent* p_event, MxPresenter* p_presenter);
-
-private:
 	MxBool FUN_10044270(MxS32 p_x, MxS32 p_y, MxVideoPresenter* p_presenter);
 
+private:
 	undefined2 m_unk0x4c; // 0x4c
 	MxS16 m_unk0x4e;      // 0x4e
 	MxBool m_unk0x50;     // 0x50
diff --git a/LEGO1/lego/legoomni/src/common/legogamestate.cpp b/LEGO1/lego/legoomni/src/common/legogamestate.cpp
index 0637a22c..864bb258 100644
--- a/LEGO1/lego/legoomni/src/common/legogamestate.cpp
+++ b/LEGO1/lego/legoomni/src/common/legogamestate.cpp
@@ -6,6 +6,7 @@
 #include "legostate.h"
 #include "legoutil.h"
 #include "legovideomanager.h"
+#include "legoworld.h"
 #include "mxbackgroundaudiomanager.h"
 #include "mxobjectfactory.h"
 #include "mxstring.h"
@@ -446,6 +447,8 @@ void LegoGameState::SwitchArea(MxU32 p_area)
 	VideoManager()->SetUnk0x554(FALSE);
 
 	MxAtomId* script = g_isleScript;
+	LegoWorld* world;
+
 	switch (p_area) {
 	case 1:
 		break;
@@ -461,6 +464,24 @@ void LegoGameState::SwitchArea(MxU32 p_area)
 	case 5:
 		script = g_elevbottScript;
 		break;
+	case 6:
+	case 7:
+		world = FindWorld(*g_isleScript, 0);
+
+		if (world == NULL) {
+			InvokeAction(Extra::ActionType::e_opendisk, *g_isleScript, 0, NULL);
+		}
+		else {
+#ifdef COMPAT_MODE
+			{
+				MxNotificationParam param(c_notificationType20, NULL);
+				NotificationManager()->Send(world, &param);
+			}
+#else
+			NotificationManager()->Send(world, &MxNotificationParam(c_notificationType20, NULL));
+#endif
+		}
+		break;
 	case 12:
 		VideoManager()->SetUnk0x554(TRUE);
 		script = g_regbookScript;
diff --git a/LEGO1/lego/legoomni/src/control/legocontrolmanager.cpp b/LEGO1/lego/legoomni/src/control/legocontrolmanager.cpp
index 8bcf9999..01d5bb3a 100644
--- a/LEGO1/lego/legoomni/src/control/legocontrolmanager.cpp
+++ b/LEGO1/lego/legoomni/src/control/legocontrolmanager.cpp
@@ -1,6 +1,8 @@
 #include "legocontrolmanager.h"
 
 #include "legoeventnotificationparam.h"
+#include "legoomni.h"
+#include "legovideomanager.h"
 #include "mxcontrolpresenter.h"
 #include "mxpresenter.h"
 #include "mxticklemanager.h"
@@ -121,9 +123,24 @@ void LegoControlManager::FUN_100293c0(undefined4, const char*, undefined2)
 {
 }
 
-// STUB: LEGO1 0x100294e0
-void LegoControlManager::FUN_100294e0(MxS32 p_x, MxS32 p_y)
+// FUNCTION: LEGO1 0x100294e0
+MxControlPresenter* LegoControlManager::FUN_100294e0(MxS32 p_x, MxS32 p_y)
 {
+	if (m_presenterList) {
+		MxPresenterListCursor cursor(m_presenterList);
+		MxPresenter* control;
+		MxVideoPresenter* presenter = (MxVideoPresenter*) VideoManager()->GetPresenterAt(p_x, p_y);
+
+		if (presenter) {
+			while (cursor.Next(control)) {
+				if (((MxControlPresenter*) control)->FUN_10044270(p_x, p_y, presenter)) {
+					return (MxControlPresenter*) control;
+				}
+			}
+		}
+	}
+
+	return NULL;
 }
 
 // FUNCTION: LEGO1 0x10029600
diff --git a/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp b/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp
index ba357dc3..71bfef9b 100644
--- a/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp
+++ b/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp
@@ -10,6 +10,7 @@
 #include "legovideomanager.h"
 #include "mxactionnotificationparam.h"
 #include "mxbackgroundaudiomanager.h"
+#include "mxcontrolpresenter.h"
 #include "mxnotificationmanager.h"
 #include "mxstillpresenter.h"
 #include "mxticklemanager.h"
@@ -73,28 +74,54 @@ Infocenter::~Infocenter()
 	TickleManager()->UnregisterClient(this);
 }
 
-// STUB: LEGO1 0x1006ed90
+// FUNCTION: LEGO1 0x1006ed90
 MxResult Infocenter::Create(MxDSAction& p_dsAction)
 {
-	if (LegoWorld::Create(p_dsAction) == SUCCESS) {
+	MxResult result = LegoWorld::Create(p_dsAction);
+	if (result == SUCCESS) {
 		InputManager()->SetWorld(this);
 		ControlManager()->Register(this);
 	}
 
-	LegoGameState* gs = GameState();
-	m_infocenterState = (InfocenterState*) gs->GetState("InfocenterState");
+	m_infocenterState = (InfocenterState*) GameState()->GetState("InfocenterState");
 	if (!m_infocenterState) {
-		m_infocenterState = (InfocenterState*) gs->CreateState("InfocenterState");
+		m_infocenterState = (InfocenterState*) GameState()->CreateState("InfocenterState");
 		m_infocenterState->SetUnknown0x74(3);
 	}
 	else {
-		// TODO
+		if (m_infocenterState->GetUnknown0x74() != 8 && m_infocenterState->GetUnknown0x74() != 4 &&
+			m_infocenterState->GetUnknown0x74() != 15) {
+			m_infocenterState->SetUnknown0x74(2);
+		}
+
+		MxS16 count, i;
+		for (count = 0; count < m_infocenterState->GetInfocenterBufferSize(); count++) {
+			if (m_infocenterState->GetInfocenterBufferElement(count) == NULL) {
+				break;
+			}
+		}
+
+		for (i = 0; i < count; i++) {
+			if (m_infocenterState->GetInfocenterBufferElement(i)) {
+				m_infocenterState->GetInfocenterBufferElement(i)->Enable(TRUE);
+				m_infocenterState->GetInfocenterBufferElement(i)->SetTickleState(MxPresenter::e_repeating);
+				m_infocenterState->GetInfocenterBufferElement(i)->VTable0x88(((7 - count) / 2 + i) * 29 + 223, 45);
+			}
+		}
+	}
+
+	GameState()->SetCurrentArea(2);
+	GameState()->StopArea(0);
+
+	if (m_infocenterState->GetUnknown0x74() == 4) {
+		LegoGameState* state = GameState();
+		state->SetPreviousArea(GameState()->GetUnknown0x42c());
 	}
 
-	// TODO
 	InputManager()->Register(this);
 	SetIsWorldActive(FALSE);
-	return SUCCESS;
+
+	return result;
 }
 
 // FUNCTION: LEGO1 0x1006ef10
@@ -159,8 +186,9 @@ MxLong Infocenter::HandleEndAction(MxEndActionNotificationParam& p_param)
 	}
 
 	if (action->GetAtomId() == m_atom &&
-		(action->GetObjectId() == c_unk40 || action->GetObjectId() == c_unk41 || action->GetObjectId() == c_unk42 ||
-		 action->GetObjectId() == c_unk43 || action->GetObjectId() == c_unk44)) {
+		(action->GetObjectId() == c_mamaMovie || action->GetObjectId() == c_papaMovie ||
+		 action->GetObjectId() == c_pepperMovie || action->GetObjectId() == c_nickMovie ||
+		 action->GetObjectId() == c_lauraMovie)) {
 		if (m_unk0x1d4) {
 			m_unk0x1d4--;
 		}
@@ -509,9 +537,194 @@ MxLong Infocenter::HandleKeyPress(MxS8 p_key)
 	return result;
 }
 
-// STUB: LEGO1 0x1006feb0
+// FUNCTION: LEGO1 0x1006feb0
 MxU8 Infocenter::HandleButtonUp(MxS32 p_x, MxS32 p_y)
 {
+	if (m_unk0x11c) {
+		MxControlPresenter* control = InputManager()->GetControlManager()->FUN_100294e0(p_x - 1, p_y - 1);
+
+		switch (m_unk0x11c->GetAction()->GetObjectId()) {
+		case c_mamaSelected:
+			m_unk0xfc = 2;
+			break;
+		case c_papaSelected:
+			m_unk0xfc = 3;
+			break;
+		case c_pepperSelected:
+			m_unk0xfc = 1;
+			break;
+		case c_nickSelected:
+			m_unk0xfc = 4;
+			break;
+		case c_lauraSelected:
+			m_unk0xfc = 5;
+			break;
+		}
+
+		if (control != NULL) {
+			m_infoManDialogueTimer = 0;
+
+			switch (control->GetAction()->GetObjectId()) {
+			case c_mamaCtl:
+				if (m_unk0xfc == 2) {
+					m_radio.Stop();
+					BackgroundAudioManager()->Stop();
+					PlayAction(c_mamaMovie);
+					m_unk0x1d4++;
+				}
+				break;
+			case c_papaCtl:
+				if (m_unk0xfc == 3) {
+					m_radio.Stop();
+					BackgroundAudioManager()->Stop();
+					PlayAction(c_papaMovie);
+					m_unk0x1d4++;
+				}
+				break;
+			case c_pepperCtl:
+				if (m_unk0xfc == 1) {
+					m_radio.Stop();
+					BackgroundAudioManager()->Stop();
+					PlayAction(c_pepperMovie);
+					m_unk0x1d4++;
+				}
+				break;
+			case c_nickCtl:
+				if (m_unk0xfc == 4) {
+					m_radio.Stop();
+					BackgroundAudioManager()->Stop();
+					PlayAction(c_nickMovie);
+					m_unk0x1d4++;
+				}
+				break;
+			case c_lauraCtl:
+				if (m_unk0xfc == 5) {
+					m_radio.Stop();
+					BackgroundAudioManager()->Stop();
+					PlayAction(c_lauraMovie);
+					m_unk0x1d4++;
+				}
+				break;
+			}
+		}
+		else {
+			if (m_unk0x1c8 != -1) {
+				m_infoManDialogueTimer = 0;
+
+				switch (m_mapAreas[m_unk0x1c8].m_unk0x04) {
+				case 3:
+					GameState()->FUN_10039780(m_unk0xfc);
+
+					switch (m_unk0xfc) {
+					case 1:
+						PlayAction(c_pepperCharacterSelect);
+						break;
+					case 2:
+						PlayAction(c_mamaCharacterSelect);
+						break;
+					case 3:
+						PlayAction(c_papaCharacterSelect);
+						break;
+					case 4:
+						PlayAction(c_nickCharacterSelect);
+						break;
+					case 5:
+						PlayAction(c_lauraCharacterSelect);
+						break;
+					}
+					break;
+				case 10:
+					if (m_unk0xfc) {
+						m_transitionDestination = 16;
+						m_infocenterState->SetUnknown0x74(5);
+					}
+					break;
+				case 11:
+					if (m_unk0xfc) {
+						m_transitionDestination = 19;
+						m_infocenterState->SetUnknown0x74(5);
+					}
+					break;
+				case 12:
+					if (m_unk0xfc) {
+						m_transitionDestination = 22;
+						m_infocenterState->SetUnknown0x74(5);
+					}
+					break;
+				case 13:
+					if (m_unk0xfc) {
+						m_transitionDestination = 25;
+						m_infocenterState->SetUnknown0x74(5);
+					}
+					break;
+				case 14:
+					if (m_unk0xfc) {
+						m_transitionDestination = 29;
+						m_infocenterState->SetUnknown0x74(5);
+					}
+					break;
+				case 15:
+					if (m_unk0xfc) {
+						m_transitionDestination = 32;
+						m_infocenterState->SetUnknown0x74(5);
+					}
+					break;
+				}
+			}
+		}
+
+		m_unk0x11c->Enable(FALSE);
+		m_unk0x11c = NULL;
+
+		if (m_infocenterState->GetUnknown0x74() == 5) {
+			InfomainScript dialogueToPlay;
+
+			if (GameState()->GetUnknown10() == 0) {
+				if (m_infocenterState->GetInfocenterBufferElement(0) == NULL) {
+					m_infocenterState->SetUnknown0x74(2);
+					m_transitionDestination = 0;
+					dialogueToPlay = c_registerToContinueDialogue;
+				}
+				else {
+					switch (m_unk0xfc) {
+					case 1:
+						dialogueToPlay = c_pepperCharacterSelect;
+						break;
+					case 2:
+						dialogueToPlay = c_mamaCharacterSelect;
+						break;
+					case 3:
+						dialogueToPlay = c_papaCharacterSelect;
+						break;
+					case 4:
+						dialogueToPlay = c_nickCharacterSelect;
+						break;
+					case 5:
+						dialogueToPlay = c_lauraCharacterSelect;
+						GameState()->SetUnknown0x0c(m_unk0xfc);
+						break;
+					default:
+						dialogueToPlay =
+							(InfomainScript) m_infocenterState->GetUnknown0x44()[GameState()->GetUnknown10()].Next();
+						break;
+					}
+
+					InputManager()->DisableInputProcessing();
+					InputManager()->SetUnknown336(TRUE);
+				}
+			}
+			else {
+				dialogueToPlay =
+					(InfomainScript) m_infocenterState->GetUnknown0x44()[GameState()->GetUnknown10()].Next();
+			}
+
+			PlayAction(dialogueToPlay);
+		}
+
+		UpdateFrameHot(TRUE);
+		FUN_10070d10(0, 0);
+	}
+
 	return FALSE;
 }
 
@@ -694,9 +907,9 @@ MxLong Infocenter::HandleNotification0(MxNotificationParam& p_param)
 	}
 	else {
 		if (sender->IsA("Radio") && m_radio.GetState()->IsActive()) {
-			if (m_currentInfomainScript == c_unk40 || m_currentInfomainScript == c_unk41 ||
-				m_currentInfomainScript == c_unk42 || m_currentInfomainScript == c_unk43 ||
-				m_currentInfomainScript == c_unk44 || m_currentInfomainScript == c_unk557 ||
+			if (m_currentInfomainScript == c_mamaMovie || m_currentInfomainScript == c_papaMovie ||
+				m_currentInfomainScript == c_pepperMovie || m_currentInfomainScript == c_nickMovie ||
+				m_currentInfomainScript == c_lauraMovie || m_currentInfomainScript == c_unk557 ||
 				m_currentInfomainScript == c_boatCtlDescription || m_currentInfomainScript == c_raceCtlDescription ||
 				m_currentInfomainScript == c_pizzaCtlDescription || m_currentInfomainScript == c_gasCtlDescription ||
 				m_currentInfomainScript == c_medCtlDescription || m_currentInfomainScript == c_copCtlDescription) {
@@ -823,7 +1036,7 @@ void Infocenter::FUN_10070d10(MxS32 p_x, MxS32 p_y)
 
 	if (i != m_unk0x1c8) {
 		if (m_unk0x1c8 != -1) {
-			m_mapAreas[i].m_presenter->Enable(FALSE);
+			m_mapAreas[m_unk0x1c8].m_presenter->Enable(FALSE);
 		}
 
 		m_unk0x1c8 = i;
diff --git a/LEGO1/lego/legoomni/src/infocenter/infocenterdoor.cpp b/LEGO1/lego/legoomni/src/infocenter/infocenterdoor.cpp
index eaf1ba98..325b5eb0 100644
--- a/LEGO1/lego/legoomni/src/infocenter/infocenterdoor.cpp
+++ b/LEGO1/lego/legoomni/src/infocenter/infocenterdoor.cpp
@@ -120,6 +120,7 @@ MxLong InfocenterDoor::HandleClick(LegoControlManagerEvent& p_param)
 					action.SetAtomId(*g_infodoorScript);
 					BackgroundAudioManager()->LowerVolume();
 					Start(&action);
+					goto done;
 				}
 			}
 			else {
@@ -128,9 +129,12 @@ MxLong InfocenterDoor::HandleClick(LegoControlManagerEvent& p_param)
 				action.SetAtomId(*g_infodoorScript);
 				BackgroundAudioManager()->LowerVolume();
 				Start(&action);
+				goto done;
 			}
 
 			TransitionManager()->StartTransition(MxTransitionManager::e_pixelation, 50, FALSE, FALSE);
+
+		done:
 			result = 1;
 			break;
 		}
diff --git a/LEGO1/omni/src/common/mxmediapresenter.cpp b/LEGO1/omni/src/common/mxmediapresenter.cpp
index 17caece5..48450b58 100644
--- a/LEGO1/omni/src/common/mxmediapresenter.cpp
+++ b/LEGO1/omni/src/common/mxmediapresenter.cpp
@@ -229,8 +229,7 @@ void MxMediaPresenter::RepeatingTickle()
 // FUNCTION: LEGO1 0x100b5ef0
 void MxMediaPresenter::DoneTickle()
 {
-	m_previousTickleStates |= 1 << m_currentTickleState;
-	m_currentTickleState = e_idle;
+	ProgressTickleState(e_idle);
 	EndAction();
 }
 

From 6653533b1fd6ee8475966c945849401e3c3a66cf Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Fri, 2 Feb 2024 16:58:33 -0500
Subject: [PATCH 210/210] Hotfix Laura selected

---
 LEGO1/lego/legoomni/src/infocenter/infocenter.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp b/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp
index 71bfef9b..38af048d 100644
--- a/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp
+++ b/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp
@@ -29,10 +29,9 @@ const char* g_object2x4grn = "2x4grn";
 Infocenter::Infocenter()
 {
 	m_unk0xfc = 0;
-	m_unk0x11c = 0;
+	m_unk0x11c = NULL;
 	m_infocenterState = NULL;
-	m_frameHotBitmap = 0;
-	m_unk0x11c = 0;
+	m_frameHotBitmap = NULL;
 	m_transitionDestination = 0;
 	m_currentInfomainScript = c_noInfomain;
 	m_currentCutscene = e_noIntro;
@@ -834,7 +833,7 @@ MxU8 Infocenter::HandleClick(LegoControlManagerEvent& p_param)
 			UpdateFrameHot(FALSE);
 			break;
 		case c_lauraCtl:
-			characterBitmap = c_lauraCtl;
+			characterBitmap = c_lauraSelected;
 			UpdateFrameHot(FALSE);
 			break;
 		}