From d511461bb009b3ce9a4512898c8cdd098a1f3223 Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Tue, 12 Dec 2023 06:15:58 -0500
Subject: [PATCH] Fix MxParam p

---
 LEGO1/act2brick.cpp                |  2 +-
 LEGO1/act2brick.h                  |  4 ++--
 LEGO1/act2policestation.cpp        |  2 +-
 LEGO1/act2policestation.h          |  2 +-
 LEGO1/beachhouseentity.cpp         |  2 +-
 LEGO1/beachhouseentity.h           |  2 +-
 LEGO1/elevatorbottom.cpp           |  2 +-
 LEGO1/elevatorbottom.h             |  2 +-
 LEGO1/gasstation.cpp               |  2 +-
 LEGO1/gasstation.h                 |  4 ++--
 LEGO1/historybook.cpp              |  2 +-
 LEGO1/historybook.h                |  2 +-
 LEGO1/hospital.cpp                 |  2 +-
 LEGO1/hospital.h                   |  2 +-
 LEGO1/infocenter.cpp               |  2 +-
 LEGO1/infocenter.h                 |  4 ++--
 LEGO1/infocenterdoor.cpp           |  2 +-
 LEGO1/infocenterdoor.h             |  2 +-
 LEGO1/legoanimationmanager.cpp     |  2 +-
 LEGO1/legoanimationmanager.h       |  4 ++--
 LEGO1/legocarbuild.cpp             |  2 +-
 LEGO1/legocarbuild.h               |  4 ++--
 LEGO1/legoentity.cpp               |  2 +-
 LEGO1/legoentity.h                 |  2 +-
 LEGO1/legoomni.cpp                 |  2 +-
 LEGO1/legoomni.h                   |  2 +-
 LEGO1/legorace.cpp                 |  2 +-
 LEGO1/legorace.h                   |  2 +-
 LEGO1/legoworld.h                  |  2 +-
 LEGO1/mxbackgroundaudiomanager.cpp | 20 ++++++++++----------
 LEGO1/mxbackgroundaudiomanager.h   |  8 ++++----
 LEGO1/mxcompositepresenter.cpp     | 12 ++++++------
 LEGO1/mxcompositepresenter.h       |  6 +++---
 LEGO1/mxcore.cpp                   |  2 +-
 LEGO1/mxcore.h                     |  6 +++---
 LEGO1/mxomni.cpp                   |  6 +++---
 LEGO1/mxomni.h                     |  2 +-
 LEGO1/mxstreamer.cpp               |  6 +++---
 LEGO1/mxstreamer.h                 |  2 +-
 LEGO1/police.cpp                   |  2 +-
 LEGO1/police.h                     |  2 +-
 LEGO1/registrationbook.cpp         |  2 +-
 LEGO1/registrationbook.h           |  2 +-
 LEGO1/score.cpp                    | 12 ++++++------
 LEGO1/score.h                      |  4 ++--
 45 files changed, 81 insertions(+), 81 deletions(-)

diff --git a/LEGO1/act2brick.cpp b/LEGO1/act2brick.cpp
index 01face28..77e46622 100644
--- a/LEGO1/act2brick.cpp
+++ b/LEGO1/act2brick.cpp
@@ -21,7 +21,7 @@ MxResult Act2Brick::Tickle()
 }
 
 // STUB: LEGO1 0x1007a8c0
-MxLong Act2Brick::Notify(MxParam& p)
+MxLong Act2Brick::Notify(MxParam& p_param)
 {
 	// TODO
 
diff --git a/LEGO1/act2brick.h b/LEGO1/act2brick.h
index 856e02d2..adb3bf2f 100644
--- a/LEGO1/act2brick.h
+++ b/LEGO1/act2brick.h
@@ -10,8 +10,8 @@ class Act2Brick : public LegoPathActor {
 	Act2Brick();
 	virtual ~Act2Brick() override; // vtable+0x0
 
-	virtual MxLong Notify(MxParam& p) override; // vtable+0x4
-	virtual MxResult Tickle() override;         // vtable+0x08
+	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x4
+	virtual MxResult Tickle() override;               // vtable+0x08
 
 	// FUNCTION: LEGO1 0x1007a360
 	inline virtual const char* ClassName() const override // vtable+0x0c
diff --git a/LEGO1/act2policestation.cpp b/LEGO1/act2policestation.cpp
index aa6c024b..9116b70a 100644
--- a/LEGO1/act2policestation.cpp
+++ b/LEGO1/act2policestation.cpp
@@ -1,7 +1,7 @@
 #include "act2policestation.h"
 
 // STUB: LEGO1 0x1004e0e0
-MxLong Act2PoliceStation::Notify(MxParam& p)
+MxLong Act2PoliceStation::Notify(MxParam& p_param)
 {
 	// TODO
 
diff --git a/LEGO1/act2policestation.h b/LEGO1/act2policestation.h
index 46986cbd..2ca1a4e8 100644
--- a/LEGO1/act2policestation.h
+++ b/LEGO1/act2policestation.h
@@ -7,7 +7,7 @@
 // SIZE 0x68
 class Act2PoliceStation : public LegoEntity {
 public:
-	virtual MxLong Notify(MxParam& p) override; // vtable+0x4
+	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x4
 
 	// FUNCTION: LEGO1 0x1000e200
 	inline virtual const char* ClassName() const override // vtable+0x0c
diff --git a/LEGO1/beachhouseentity.cpp b/LEGO1/beachhouseentity.cpp
index 60d58285..66b07f60 100644
--- a/LEGO1/beachhouseentity.cpp
+++ b/LEGO1/beachhouseentity.cpp
@@ -1,7 +1,7 @@
 #include "beachhouseentity.h"
 
 // STUB: LEGO1 0x100150a0
-MxLong BeachHouseEntity::Notify(MxParam& p)
+MxLong BeachHouseEntity::Notify(MxParam& p_param)
 {
 	// TODO
 
diff --git a/LEGO1/beachhouseentity.h b/LEGO1/beachhouseentity.h
index d763999a..cf6a8909 100644
--- a/LEGO1/beachhouseentity.h
+++ b/LEGO1/beachhouseentity.h
@@ -7,7 +7,7 @@
 // SIZE 0x68
 class BeachHouseEntity : public BuildingEntity {
 public:
-	virtual MxLong Notify(MxParam& p) override; // vtable+04
+	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/elevatorbottom.cpp b/LEGO1/elevatorbottom.cpp
index 434db69e..247defb0 100644
--- a/LEGO1/elevatorbottom.cpp
+++ b/LEGO1/elevatorbottom.cpp
@@ -13,7 +13,7 @@ ElevatorBottom::~ElevatorBottom()
 }
 
 // STUB: LEGO1 0x10018150
-MxLong ElevatorBottom::Notify(MxParam& p)
+MxLong ElevatorBottom::Notify(MxParam& p_param)
 {
 	// TODO
 
diff --git a/LEGO1/elevatorbottom.h b/LEGO1/elevatorbottom.h
index b149acc6..2a0f2570 100644
--- a/LEGO1/elevatorbottom.h
+++ b/LEGO1/elevatorbottom.h
@@ -9,7 +9,7 @@ class ElevatorBottom : public LegoWorld {
 	ElevatorBottom();
 	virtual ~ElevatorBottom() override; // vtable+0x0
 
-	virtual MxLong Notify(MxParam& p) override; // vtable+0x4
+	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x4
 
 	// FUNCTION: LEGO1 0x10017f20
 	inline virtual const char* ClassName() const override // vtable+0x0c
diff --git a/LEGO1/gasstation.cpp b/LEGO1/gasstation.cpp
index dc5c441b..24325511 100644
--- a/LEGO1/gasstation.cpp
+++ b/LEGO1/gasstation.cpp
@@ -13,7 +13,7 @@ GasStation::~GasStation()
 }
 
 // STUB: LEGO1 0x10004a60
-MxLong GasStation::Notify(MxParam& p)
+MxLong GasStation::Notify(MxParam& p_param)
 {
 	// TODO
 
diff --git a/LEGO1/gasstation.h b/LEGO1/gasstation.h
index c8ca0576..d6761980 100644
--- a/LEGO1/gasstation.h
+++ b/LEGO1/gasstation.h
@@ -11,8 +11,8 @@ class GasStation : public LegoWorld {
 	GasStation();
 	virtual ~GasStation() override; // vtable+0x0
 
-	virtual MxLong Notify(MxParam& p) override; // vtable+0x4
-	virtual MxResult Tickle() override;         // vtable+0x8
+	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x4
+	virtual MxResult Tickle() override;               // vtable+0x8
 
 	// FUNCTION: LEGO1 0x10004780
 	inline virtual const char* ClassName() const override // vtable+0x0c
diff --git a/LEGO1/historybook.cpp b/LEGO1/historybook.cpp
index f41930e6..d00e8acd 100644
--- a/LEGO1/historybook.cpp
+++ b/LEGO1/historybook.cpp
@@ -13,7 +13,7 @@ HistoryBook::~HistoryBook()
 }
 
 // STUB: LEGO1 0x10082680
-MxLong HistoryBook::Notify(MxParam& p)
+MxLong HistoryBook::Notify(MxParam& p_param)
 {
 	// TODO
 
diff --git a/LEGO1/historybook.h b/LEGO1/historybook.h
index 2bd06755..18154c79 100644
--- a/LEGO1/historybook.h
+++ b/LEGO1/historybook.h
@@ -10,7 +10,7 @@ class HistoryBook : public LegoWorld {
 	HistoryBook();
 	virtual ~HistoryBook() override; // vtable+0x0
 
-	virtual MxLong Notify(MxParam& p) override; // vtable+0x4
+	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x4
 
 	// FUNCTION: LEGO1 0x10082390
 	inline virtual const char* ClassName() const override // vtable+0x0c
diff --git a/LEGO1/hospital.cpp b/LEGO1/hospital.cpp
index 09e9c1e0..3d8ff578 100644
--- a/LEGO1/hospital.cpp
+++ b/LEGO1/hospital.cpp
@@ -13,7 +13,7 @@ Hospital::~Hospital()
 }
 
 // STUB: LEGO1 0x10074990
-MxLong Hospital::Notify(MxParam& p)
+MxLong Hospital::Notify(MxParam& p_param)
 {
 	// TODO
 
diff --git a/LEGO1/hospital.h b/LEGO1/hospital.h
index 3d09bd28..014c301d 100644
--- a/LEGO1/hospital.h
+++ b/LEGO1/hospital.h
@@ -10,7 +10,7 @@ class Hospital : public LegoWorld {
 	Hospital();
 	virtual ~Hospital() override; // vtable+0x0
 
-	virtual MxLong Notify(MxParam& p) override; // vtable+0x04
+	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x04
 
 	// FUNCTION: LEGO1 0x100746b0
 	inline virtual const char* ClassName() const override // vtable+0x0c
diff --git a/LEGO1/infocenter.cpp b/LEGO1/infocenter.cpp
index 35968db9..f062f1e9 100644
--- a/LEGO1/infocenter.cpp
+++ b/LEGO1/infocenter.cpp
@@ -13,7 +13,7 @@ Infocenter::~Infocenter()
 }
 
 // STUB: LEGO1 0x1006ef10
-MxLong Infocenter::Notify(MxParam& p)
+MxLong Infocenter::Notify(MxParam& p_param)
 {
 	// TODO
 
diff --git a/LEGO1/infocenter.h b/LEGO1/infocenter.h
index 17d9fe10..3b4e7856 100644
--- a/LEGO1/infocenter.h
+++ b/LEGO1/infocenter.h
@@ -10,8 +10,8 @@ class Infocenter : public LegoWorld {
 	Infocenter();
 	virtual ~Infocenter() override;
 
-	virtual MxLong Notify(MxParam& p) override; // vtable+0x4
-	virtual MxResult Tickle() override;         // vtable+0x8
+	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x4
+	virtual MxResult Tickle() override;               // vtable+0x8
 
 	// FUNCTION: LEGO1 0x1006eb40
 	inline virtual const char* ClassName() const override // vtable+0x0c
diff --git a/LEGO1/infocenterdoor.cpp b/LEGO1/infocenterdoor.cpp
index ed23a6ac..c6d85394 100644
--- a/LEGO1/infocenterdoor.cpp
+++ b/LEGO1/infocenterdoor.cpp
@@ -13,7 +13,7 @@ InfocenterDoor::~InfocenterDoor()
 }
 
 // STUB: LEGO1 0x100379e0
-MxLong InfocenterDoor::Notify(MxParam& p)
+MxLong InfocenterDoor::Notify(MxParam& p_param)
 {
 	// TODO
 
diff --git a/LEGO1/infocenterdoor.h b/LEGO1/infocenterdoor.h
index a0886835..1586dbc8 100644
--- a/LEGO1/infocenterdoor.h
+++ b/LEGO1/infocenterdoor.h
@@ -10,7 +10,7 @@ class InfocenterDoor : public LegoWorld {
 	InfocenterDoor();
 	virtual ~InfocenterDoor(); // vtable+0x0
 
-	virtual MxLong Notify(MxParam& p) override; // vtable+0x4
+	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x4
 
 	// FUNCTION: LEGO1 0x100377b0
 	inline virtual const char* ClassName() const override // vtable+0x0c
diff --git a/LEGO1/legoanimationmanager.cpp b/LEGO1/legoanimationmanager.cpp
index ffb420f6..2c589138 100644
--- a/LEGO1/legoanimationmanager.cpp
+++ b/LEGO1/legoanimationmanager.cpp
@@ -34,7 +34,7 @@ void LegoAnimationManager::FUN_1005f6d0(MxBool p)
 }
 
 // STUB: LEGO1 0x100619f0
-MxLong LegoAnimationManager::Notify(MxParam& p)
+MxLong LegoAnimationManager::Notify(MxParam& p_param)
 {
 	// TODO
 
diff --git a/LEGO1/legoanimationmanager.h b/LEGO1/legoanimationmanager.h
index 81aff138..07360436 100644
--- a/LEGO1/legoanimationmanager.h
+++ b/LEGO1/legoanimationmanager.h
@@ -10,8 +10,8 @@ class LegoAnimationManager : public MxCore {
 	LegoAnimationManager();
 	virtual ~LegoAnimationManager() override; // vtable+0x0
 
-	virtual MxLong Notify(MxParam& p) override; // vtable+0x4
-	virtual MxResult Tickle() override;         // vtable+0x8
+	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x4
+	virtual MxResult Tickle() override;               // vtable+0x8
 
 	// FUNCTION: LEGO1 0x1005ec80
 	inline virtual const char* ClassName() const override // vtable+0x0c
diff --git a/LEGO1/legocarbuild.cpp b/LEGO1/legocarbuild.cpp
index 86c9ba09..f75e4653 100644
--- a/LEGO1/legocarbuild.cpp
+++ b/LEGO1/legocarbuild.cpp
@@ -21,7 +21,7 @@ MxResult LegoCarBuild::Tickle()
 }
 
 // STUB: LEGO1 0x10024050
-MxLong LegoCarBuild::Notify(MxParam& p)
+MxLong LegoCarBuild::Notify(MxParam& p_param)
 {
 	// TODO
 
diff --git a/LEGO1/legocarbuild.h b/LEGO1/legocarbuild.h
index 6f1e7992..b4a93e7c 100644
--- a/LEGO1/legocarbuild.h
+++ b/LEGO1/legocarbuild.h
@@ -10,8 +10,8 @@ class LegoCarBuild : public LegoWorld {
 	LegoCarBuild();
 	virtual ~LegoCarBuild() override;
 
-	virtual MxLong Notify(MxParam& p) override; // vtable+0x4
-	virtual MxResult Tickle() override;         // vtable+0x8
+	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x4
+	virtual MxResult Tickle() override;               // vtable+0x8
 
 	// FUNCTION: LEGO1 0x10022940
 	inline virtual const char* ClassName() const override // vtable+0x0c
diff --git a/LEGO1/legoentity.cpp b/LEGO1/legoentity.cpp
index 7e8a953f..94611218 100644
--- a/LEGO1/legoentity.cpp
+++ b/LEGO1/legoentity.cpp
@@ -145,7 +145,7 @@ void LegoEntity::VTable0x4c()
 }
 
 // STUB: LEGO1 0x100114f0
-MxLong LegoEntity::Notify(MxParam& p)
+MxLong LegoEntity::Notify(MxParam& p_param)
 {
 	// TODO
 
diff --git a/LEGO1/legoentity.h b/LEGO1/legoentity.h
index eee65234..faceb644 100644
--- a/LEGO1/legoentity.h
+++ b/LEGO1/legoentity.h
@@ -17,7 +17,7 @@ class LegoEntity : public MxEntity {
 
 	__declspec(dllexport) virtual ~LegoEntity() override; // vtable+0x0
 
-	virtual MxLong Notify(MxParam& p) override; // vtable+0x4
+	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x4
 
 	// FUNCTION: LEGO1 0x1000c2f0
 	inline const char* ClassName() const override // vtable+0xc
diff --git a/LEGO1/legoomni.cpp b/LEGO1/legoomni.cpp
index 51bb0c0a..c4069080 100644
--- a/LEGO1/legoomni.cpp
+++ b/LEGO1/legoomni.cpp
@@ -546,7 +546,7 @@ MxResult LegoOmni::Start(MxDSAction* action)
 }
 
 // STUB: LEGO1 0x1005b5f0
-MxLong LegoOmni::Notify(MxParam& p)
+MxLong LegoOmni::Notify(MxParam& p_param)
 {
 	// TODO
 	return 0;
diff --git a/LEGO1/legoomni.h b/LEGO1/legoomni.h
index 27b8ffed..4a4ca87a 100644
--- a/LEGO1/legoomni.h
+++ b/LEGO1/legoomni.h
@@ -69,7 +69,7 @@ class LegoOmni : public MxOmni {
 	LegoOmni();
 	virtual ~LegoOmni(); // vtable+00
 
-	virtual MxLong Notify(MxParam& p) override; // vtable+04
+	virtual MxLong Notify(MxParam& p_param) override; // vtable+04
 
 	// FUNCTION: LEGO1 0x10058aa0
 	inline virtual const char* ClassName() const override // vtable+0c
diff --git a/LEGO1/legorace.cpp b/LEGO1/legorace.cpp
index 2ff6ca01..0067495b 100644
--- a/LEGO1/legorace.cpp
+++ b/LEGO1/legorace.cpp
@@ -75,7 +75,7 @@ LegoRace::~LegoRace()
 }
 
 // STUB: LEGO1 0x10015e00
-MxLong LegoRace::Notify(MxParam& p)
+MxLong LegoRace::Notify(MxParam& p_param)
 {
 	// TODO
 	return 0;
diff --git a/LEGO1/legorace.h b/LEGO1/legorace.h
index 81096ce9..feee5efb 100644
--- a/LEGO1/legorace.h
+++ b/LEGO1/legorace.h
@@ -12,7 +12,7 @@ class LegoRace : public LegoWorld {
 	LegoRace();
 	virtual ~LegoRace() override; // vtable+0x0
 
-	virtual MxLong Notify(MxParam& p) override; // vtable+0x4
+	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x4
 
 	// FUNCTION: LEGO1 0x10015ba0
 	inline const char* ClassName() const override // vtable+0xc
diff --git a/LEGO1/legoworld.h b/LEGO1/legoworld.h
index 77cf21d4..2efb6150 100644
--- a/LEGO1/legoworld.h
+++ b/LEGO1/legoworld.h
@@ -14,7 +14,7 @@ class LegoWorld : public LegoEntity {
 	__declspec(dllexport) LegoWorld();
 	__declspec(dllexport) virtual ~LegoWorld(); // vtable+0x0
 
-	virtual MxLong Notify(MxParam& p) override; // vtable+0x4
+	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x4
 
 	// FUNCTION: LEGO1 0x1001d690
 	inline virtual const char* ClassName() const override // vtable+0x0c
diff --git a/LEGO1/mxbackgroundaudiomanager.cpp b/LEGO1/mxbackgroundaudiomanager.cpp
index b89b5cf4..572bcca7 100644
--- a/LEGO1/mxbackgroundaudiomanager.cpp
+++ b/LEGO1/mxbackgroundaudiomanager.cpp
@@ -188,24 +188,24 @@ void MxBackgroundAudioManager::FadeInOrFadeOut()
 }
 
 // FUNCTION: LEGO1 0x1007f170
-MxLong MxBackgroundAudioManager::Notify(MxParam& p)
+MxLong MxBackgroundAudioManager::Notify(MxParam& p_param)
 {
-	switch (((MxNotificationParam&) p).GetNotification()) {
+	switch (((MxNotificationParam&) p_param).GetNotification()) {
 	case c_notificationStartAction:
-		StartAction(p);
+		StartAction(p_param);
 		return 1;
 	case c_notificationEndAction:
-		StopAction(p);
+		StopAction(p_param);
 		return 1;
 	}
 	return 0;
 }
 
 // FUNCTION: LEGO1 0x1007f1b0
-void MxBackgroundAudioManager::StartAction(MxParam& p)
+void MxBackgroundAudioManager::StartAction(MxParam& p_param)
 {
 	// TODO: the sender is most likely a MxAudioPresenter?
-	m_unk138 = (MxAudioPresenter*) ((MxNotificationParam&) p).GetSender();
+	m_unk138 = (MxAudioPresenter*) ((MxNotificationParam&) p_param).GetSender();
 	m_action2.SetAtomId(m_unk138->GetAction()->GetAtomId());
 	m_action2.SetObjectId(m_unk138->GetAction()->GetObjectId());
 	m_targetVolume = ((MxDSSound*) (m_unk138->GetAction()))->GetVolume();
@@ -213,20 +213,20 @@ void MxBackgroundAudioManager::StartAction(MxParam& p)
 }
 
 // FUNCTION: LEGO1 0x1007f200
-void MxBackgroundAudioManager::StopAction(MxParam& p)
+void MxBackgroundAudioManager::StopAction(MxParam& p_param)
 {
-	if (((MxNotificationParam&) p).GetSender() == m_unka0) {
+	if (((MxNotificationParam&) p_param).GetSender() == m_unka0) {
 		m_unka0 = NULL;
 		m_action1.SetAtomId(MxAtomId());
 		m_action1.SetObjectId(-1);
 	}
-	else if (((MxNotificationParam&) p).GetSender() == m_unk138) {
+	else if (((MxNotificationParam&) p_param).GetSender() == m_unk138) {
 		m_unk138 = NULL;
 		m_action2.SetAtomId(MxAtomId());
 		m_action2.SetObjectId(-1);
 	}
 
-	Lego()->HandleNotificationType2(p);
+	Lego()->HandleNotificationType2(p_param);
 }
 
 // FUNCTION: LEGO1 0x1007f2f0
diff --git a/LEGO1/mxbackgroundaudiomanager.h b/LEGO1/mxbackgroundaudiomanager.h
index 07d9289a..f1029b3a 100644
--- a/LEGO1/mxbackgroundaudiomanager.h
+++ b/LEGO1/mxbackgroundaudiomanager.h
@@ -15,8 +15,8 @@ class MxBackgroundAudioManager : public MxCore {
 	MxBackgroundAudioManager();
 	virtual ~MxBackgroundAudioManager() override;
 
-	virtual MxLong Notify(MxParam& p) override; // vtable+0x04
-	virtual MxResult Tickle() override;         // vtable+0x08
+	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x04
+	virtual MxResult Tickle() override;               // vtable+0x08
 
 	// FUNCTION: LEGO1 0x1007eb70
 	inline virtual const char* ClassName() const override // vtable+0x0c
@@ -31,8 +31,8 @@ class MxBackgroundAudioManager : public MxCore {
 		return !strcmp(p_name, MxBackgroundAudioManager::ClassName()) || MxCore::IsA(p_name);
 	}
 
-	void StartAction(MxParam& p);
-	void StopAction(MxParam& p);
+	void StartAction(MxParam& p_param);
+	void StopAction(MxParam& p_param);
 	MxResult PlayMusic(MxDSAction& p_action, undefined4 p_unknown, undefined4 p_unknown2);
 
 	void FUN_1007ee70();
diff --git a/LEGO1/mxcompositepresenter.cpp b/LEGO1/mxcompositepresenter.cpp
index 6cf14956..39788286 100644
--- a/LEGO1/mxcompositepresenter.cpp
+++ b/LEGO1/mxcompositepresenter.cpp
@@ -127,29 +127,29 @@ void MxCompositePresenter::EndAction()
 }
 
 // FUNCTION: LEGO1 0x100b6760
-MxLong MxCompositePresenter::Notify(MxParam& p)
+MxLong MxCompositePresenter::Notify(MxParam& p_param)
 {
 	MxAutoLocker lock(&m_criticalSection);
 
-	switch (((MxNotificationParam&) p).GetNotification()) {
+	switch (((MxNotificationParam&) p_param).GetNotification()) {
 	case c_notificationEndAction:
-		VTable0x58(p);
+		VTable0x58(p_param);
 		break;
 	case MXPRESENTER_NOTIFICATION:
-		VTable0x5c(p);
+		VTable0x5c(p_param);
 	}
 
 	return 0;
 }
 
 // STUB: LEGO1 0x100b67f0
-void MxCompositePresenter::VTable0x58(MxParam& p)
+void MxCompositePresenter::VTable0x58(MxParam& p_param)
 {
 	// TODO
 }
 
 // STUB: LEGO1 0x100b69b0
-void MxCompositePresenter::VTable0x5c(MxParam& p)
+void MxCompositePresenter::VTable0x5c(MxParam& p_param)
 {
 	// TODO
 }
diff --git a/LEGO1/mxcompositepresenter.h b/LEGO1/mxcompositepresenter.h
index 06faa8b3..d24af860 100644
--- a/LEGO1/mxcompositepresenter.h
+++ b/LEGO1/mxcompositepresenter.h
@@ -13,7 +13,7 @@ class MxCompositePresenter : public MxPresenter {
 	MxCompositePresenter();
 	virtual ~MxCompositePresenter() override; // vtable+0x0
 
-	virtual MxLong Notify(MxParam& p) override; // vtable+0x04
+	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x04
 
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
@@ -31,8 +31,8 @@ class MxCompositePresenter : public MxPresenter {
 	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(MxParam& p);                                              // vtable+0x58
-	virtual void VTable0x5c(MxParam& p);                                              // vtable+0x5c
+	virtual void VTable0x58(MxParam& p_param);                                        // vtable+0x58
+	virtual void VTable0x5c(MxParam& p_param);                                        // vtable+0x5c
 	virtual void VTable0x60(MxPresenter* p_presenter);                                // vtable+0x60
 	virtual MxBool VTable0x64(undefined4 p_unknown);                                  // vtable+0x64
 
diff --git a/LEGO1/mxcore.cpp b/LEGO1/mxcore.cpp
index 3a8270df..18c37597 100644
--- a/LEGO1/mxcore.cpp
+++ b/LEGO1/mxcore.cpp
@@ -21,7 +21,7 @@ MxCore::~MxCore()
 }
 
 // FUNCTION: LEGO1 0x100ae1f0
-MxLong MxCore::Notify(MxParam& p)
+MxLong MxCore::Notify(MxParam& p_param)
 {
 	return 0;
 }
diff --git a/LEGO1/mxcore.h b/LEGO1/mxcore.h
index 1668d00b..97dd1f08 100644
--- a/LEGO1/mxcore.h
+++ b/LEGO1/mxcore.h
@@ -20,9 +20,9 @@ class MxParam;
 class MxCore {
 public:
 	__declspec(dllexport) MxCore();
-	__declspec(dllexport) virtual ~MxCore();                 // vtable+00
-	__declspec(dllexport) virtual MxLong Notify(MxParam& p); // vtable+04
-	virtual MxResult Tickle();                               // vtable+08
+	__declspec(dllexport) virtual ~MxCore();                       // vtable+00
+	__declspec(dllexport) virtual MxLong Notify(MxParam& p_param); // vtable+04
+	virtual MxResult Tickle();                                     // vtable+08
 
 	inline virtual const char* ClassName() const // vtable+0c
 	{
diff --git a/LEGO1/mxomni.cpp b/LEGO1/mxomni.cpp
index 9e4949f5..cbca99a6 100644
--- a/LEGO1/mxomni.cpp
+++ b/LEGO1/mxomni.cpp
@@ -339,14 +339,14 @@ void MxOmni::DestroyInstance()
 }
 
 // FUNCTION: LEGO1 0x100b07f0
-MxLong MxOmni::Notify(MxParam& p)
+MxLong MxOmni::Notify(MxParam& p_param)
 {
 	MxAutoLocker lock(&this->m_criticalsection);
 
-	if (((MxNotificationParam&) p).GetNotification() != c_notificationEndAction)
+	if (((MxNotificationParam&) p_param).GetNotification() != c_notificationEndAction)
 		return 0;
 
-	return HandleNotificationType2(p);
+	return HandleNotificationType2(p_param);
 }
 
 // STUB: LEGO1 0x100b0880
diff --git a/LEGO1/mxomni.h b/LEGO1/mxomni.h
index 246ae2fc..585b06f4 100644
--- a/LEGO1/mxomni.h
+++ b/LEGO1/mxomni.h
@@ -39,7 +39,7 @@ class MxOmni : public MxCore {
 	MxOmni();
 	virtual ~MxOmni() override;
 
-	virtual MxLong Notify(MxParam& p) override;                     // vtable+04
+	virtual MxLong Notify(MxParam& p_param) override;               // vtable+04
 	virtual void Init();                                            // vtable+14
 	virtual MxResult Create(MxOmniCreateParam& p);                  // vtable+18
 	virtual void Destroy();                                         // vtable+1c
diff --git a/LEGO1/mxstreamer.cpp b/LEGO1/mxstreamer.cpp
index 32180214..f00ba6e3 100644
--- a/LEGO1/mxstreamer.cpp
+++ b/LEGO1/mxstreamer.cpp
@@ -154,14 +154,14 @@ MxBool MxStreamer::FUN_100b9b30(MxDSObject& p_dsObject)
 }
 
 // FUNCTION: LEGO1 0x100b9b60
-MxLong MxStreamer::Notify(MxParam& p)
+MxLong MxStreamer::Notify(MxParam& p_param)
 {
-	if (((MxNotificationParam&) p).GetNotification() == MXSTREAMER_DELETE_NOTIFY) {
+	if (((MxNotificationParam&) p_param).GetNotification() == MXSTREAMER_DELETE_NOTIFY) {
 		MxDSAction ds;
 
 		ds.SetUnknown24(-2);
 
-		MxStreamController* c = static_cast<MxStreamerNotification&>(p).GetController();
+		MxStreamController* c = static_cast<MxStreamerNotification&>(p_param).GetController();
 
 		if (!c->FUN_100c20d0(ds)) {
 			MxStreamerNotification notif(MXSTREAMER_DELETE_NOTIFY, NULL, c);
diff --git a/LEGO1/mxstreamer.h b/LEGO1/mxstreamer.h
index 3b2af7e1..80b8ac5a 100644
--- a/LEGO1/mxstreamer.h
+++ b/LEGO1/mxstreamer.h
@@ -73,7 +73,7 @@ class MxStreamer : public MxCore {
 	__declspec(dllexport) MxStreamController* Open(const char* p_name, MxU16 p_openMode);
 	__declspec(dllexport) MxLong Close(const char* p_name);
 
-	virtual MxLong Notify(MxParam& p) override; // vtable+0x4
+	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x4
 
 	// FUNCTION: LEGO1 0x100b9000
 	inline virtual const char* ClassName() const override // vtable+0x0c
diff --git a/LEGO1/police.cpp b/LEGO1/police.cpp
index a8b409f3..67577ecc 100644
--- a/LEGO1/police.cpp
+++ b/LEGO1/police.cpp
@@ -13,7 +13,7 @@ Police::~Police()
 }
 
 // STUB: LEGO1 0x1005e480
-MxLong Police::Notify(MxParam& p)
+MxLong Police::Notify(MxParam& p_param)
 {
 	// TODO
 
diff --git a/LEGO1/police.h b/LEGO1/police.h
index 32b76cab..0da58828 100644
--- a/LEGO1/police.h
+++ b/LEGO1/police.h
@@ -11,7 +11,7 @@ class Police : public LegoWorld {
 	Police();
 	virtual ~Police() override; // vtable+0x0
 
-	virtual MxLong Notify(MxParam& p) override; // vtable+0x4
+	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x4
 
 	// FUNCTION: LEGO1 0x1005e1e0
 	inline virtual const char* ClassName() const override // vtable+0xc
diff --git a/LEGO1/registrationbook.cpp b/LEGO1/registrationbook.cpp
index fc7cf39b..eb7e099a 100644
--- a/LEGO1/registrationbook.cpp
+++ b/LEGO1/registrationbook.cpp
@@ -13,7 +13,7 @@ RegistrationBook::~RegistrationBook()
 }
 
 // STUB: LEGO1 0x100770e0
-MxLong RegistrationBook::Notify(MxParam& p)
+MxLong RegistrationBook::Notify(MxParam& p_param)
 {
 	// TODO
 
diff --git a/LEGO1/registrationbook.h b/LEGO1/registrationbook.h
index e386f58d..4f19a8dc 100644
--- a/LEGO1/registrationbook.h
+++ b/LEGO1/registrationbook.h
@@ -10,7 +10,7 @@ class RegistrationBook : public LegoWorld {
 	RegistrationBook();
 	virtual ~RegistrationBook() override; // vtable+0x0
 
-	virtual MxLong Notify(MxParam& p) override; // vtable+0x4
+	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x4
 
 	// FUNCTION: LEGO1 0x10076e10
 	inline virtual const char* ClassName() const override // vtable+0x0c
diff --git a/LEGO1/score.cpp b/LEGO1/score.cpp
index 62502e60..d3c48829 100644
--- a/LEGO1/score.cpp
+++ b/LEGO1/score.cpp
@@ -72,26 +72,26 @@ void Score::DeleteScript()
 }
 
 // FUNCTION: LEGO1 0x10001410
-MxLong Score::Notify(MxParam& p)
+MxLong Score::Notify(MxParam& p_param)
 {
 	MxLong ret = 0;
-	LegoWorld::Notify(p);
+	LegoWorld::Notify(p_param);
 	if (m_unkf6) {
-		switch (((MxNotificationParam&) p).GetNotification()) {
+		switch (((MxNotificationParam&) p_param).GetNotification()) {
 		case c_notificationStartAction:
 			ret = 1;
 			Paint();
 			break;
 		case c_notificationEndAction:
-			ret = FUN_10001510((MxEndActionNotificationParam&) p);
+			ret = FUN_10001510((MxEndActionNotificationParam&) p_param);
 			break;
 		case c_notificationKeyPress:
-			if (((LegoEventNotificationParam&) p).GetKey() == 0x20)
+			if (((LegoEventNotificationParam&) p_param).GetKey() == 0x20)
 				DeleteScript(); // Shutting down
 			ret = 1;
 			break;
 		case TYPE17:
-			ret = FUN_100016d0((MxType17NotificationParam&) p);
+			ret = FUN_100016d0((MxType17NotificationParam&) p_param);
 			break;
 		case MXTRANSITIONMANAGER_TRANSITIONENDED:
 			DeleteObjects(g_infoscorScript, 7, 9);
diff --git a/LEGO1/score.h b/LEGO1/score.h
index e68c2692..c5eb8f70 100644
--- a/LEGO1/score.h
+++ b/LEGO1/score.h
@@ -12,8 +12,8 @@
 class Score : public LegoWorld {
 public:
 	Score();
-	virtual ~Score() override;                  // vtable+0x0
-	virtual MxLong Notify(MxParam& p) override; // vtable+0x4
+	virtual ~Score() override;                        // vtable+0x0
+	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x4
 
 	// FUNCTION: LEGO1 0x100010c0
 	inline virtual const char* ClassName() const override // vtable+0x0c