From 46c44e86a0b0647b744df0b609a1881056f187b2 Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Sat, 13 Jan 2024 18:14:52 -0500
Subject: [PATCH] More fixes

---
 LEGO1/lego/legoomni/include/legoeventnotificationparam.h | 8 +++++++-
 LEGO1/lego/legoomni/src/main/legoomni.cpp                | 2 +-
 LEGO1/omni/include/mxactionnotificationparam.h           | 3 +++
 LEGO1/omni/include/mxnotificationparam.h                 | 5 +++--
 LEGO1/omni/include/mxparam.h                             | 4 ++++
 5 files changed, 18 insertions(+), 4 deletions(-)

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/src/main/legoomni.cpp b/LEGO1/lego/legoomni/src/main/legoomni.cpp
index f01f3fe1..33b7957f 100644
--- a/LEGO1/lego/legoomni/src/main/legoomni.cpp
+++ b/LEGO1/lego/legoomni/src/main/legoomni.cpp
@@ -99,7 +99,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
diff --git a/LEGO1/omni/include/mxactionnotificationparam.h b/LEGO1/omni/include/mxactionnotificationparam.h
index 750abd6d..cec34a4d 100644
--- a/LEGO1/omni/include/mxactionnotificationparam.h
+++ b/LEGO1/omni/include/mxactionnotificationparam.h
@@ -115,6 +115,9 @@ class MxType4NotificationParam : public MxActionNotificationParam {
 	MxPresenter* m_unk0x14; // 0x14
 };
 
+// SYNTHETIC: LEGO1 0x100511e0
+// MxActionNotificationParam::`scalar deleting destructor'
+
 // SYNTHETIC: LEGO1 0x100513a0
 // MxEndActionNotificationParam::`scalar deleting destructor'
 
diff --git a/LEGO1/omni/include/mxnotificationparam.h b/LEGO1/omni/include/mxnotificationparam.h
index a8b0c243..0a8b681c 100644
--- a/LEGO1/omni/include/mxnotificationparam.h
+++ b/LEGO1/omni/include/mxnotificationparam.h
@@ -34,6 +34,7 @@ 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)
@@ -48,8 +49,8 @@ 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
diff --git a/LEGO1/omni/include/mxparam.h b/LEGO1/omni/include/mxparam.h
index 461a38ec..e7e916a9 100644
--- a/LEGO1/omni/include/mxparam.h
+++ b/LEGO1/omni/include/mxparam.h
@@ -2,10 +2,14 @@
 #define MXPARAM_H
 
 // VTABLE: LEGO1 0x100d56e8
+// SIZE 0x04
 class MxParam {
 public:
 	// FUNCTION: LEGO1 0x10010360
 	virtual ~MxParam() {}
 };
 
+// SYNTHETIC: LEGO1 0x10010370
+// MxParam::`scalar deleting destructor'
+
 #endif // MXPARAM_H