Adjustments based on new suggestions

ISLE/isleapp.cpp

@@ -281,7 +281,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
 	return msg.wParam;
 }
 
-// FUNCTION: ISLE 0x401c40 SYNTHETIC
+// FUNCTION: ISLE 0x401c40
 // MxDSObject::SetAtomId
 
 // FUNCTION: ISLE 0x401ca0

LEGO1/act1state.cpp

@@ -1,6 +1,6 @@
 #include "act1state.h"
 
-// FUNCTION: LEGO1 0x100334b0 STUB
+// STUB: LEGO1 0x100334b0
 Act1State::Act1State()
 {
 	// TODO

LEGO1/act2brick.cpp

@@ -1,18 +1,18 @@
 #include "act2brick.h"
 
-// FUNCTION: LEGO1 0x1007a2b0 STUB
+// STUB: LEGO1 0x1007a2b0
 Act2Brick::Act2Brick()
 {
 	// TODO
 }
 
-// FUNCTION: LEGO1 0x1007a470 STUB
+// STUB: LEGO1 0x1007a470
 Act2Brick::~Act2Brick()
 {
 	// TODO
 }
 
-// FUNCTION: LEGO1 0x1007a7f0 STUB
+// STUB: LEGO1 0x1007a7f0
 MxResult Act2Brick::Tickle()
 {
 	// TODO
@@ -20,7 +20,7 @@ MxResult Act2Brick::Tickle()
 	return SUCCESS;
 }
 
-// FUNCTION: LEGO1 0x1007a8c0 STUB
+// STUB: LEGO1 0x1007a8c0
 MxLong Act2Brick::Notify(MxParam& p)
 {
 	// TODO

LEGO1/act2policestation.cpp

@@ -1,6 +1,6 @@
 #include "act2policestation.h"
 
-// FUNCTION: LEGO1 0x1004e0e0 STUB
+// STUB: LEGO1 0x1004e0e0
 MxLong Act2PoliceStation::Notify(MxParam& p)
 {
 	// TODO

LEGO1/act3.cpp

@@ -2,13 +2,13 @@
 
 DECOMP_SIZE_ASSERT(Act3, 0x4274)
 
-// FUNCTION: LEGO1 0x10072270 STUB
+// STUB: LEGO1 0x10072270
 Act3::Act3()
 {
 	// TODO
 }
 
-// FUNCTION: LEGO1 0x100726a0 STUB
+// STUB: LEGO1 0x100726a0
 Act3::~Act3()
 {
 	// TODO

LEGO1/ambulancemissionstate.cpp

@@ -2,7 +2,7 @@
 
 DECOMP_SIZE_ASSERT(AmbulanceMissionState, 0x24);
 
-// FUNCTION: LEGO1 0x100373a0 STUB
+// STUB: LEGO1 0x100373a0
 AmbulanceMissionState::AmbulanceMissionState()
 {
 	// TODO

LEGO1/animstate.cpp

@@ -1,12 +1,12 @@
 #include "animstate.h"
 
-// FUNCTION: LEGO1 0x10064ff0 STUB
+// STUB: LEGO1 0x10064ff0
 AnimState::AnimState()
 {
 	// TODO
 }
 
-// FUNCTION: LEGO1 0x10065150 STUB
+// STUB: LEGO1 0x10065150
 AnimState::~AnimState()
 {
 	// TODO

LEGO1/beachhouseentity.cpp

@@ -1,6 +1,6 @@
 #include "beachhouseentity.h"
 
-// FUNCTION: LEGO1 0x100150a0 STUB
+// STUB: LEGO1 0x100150a0
 MxLong BeachHouseEntity::Notify(MxParam& p)
 {
 	// TODO

LEGO1/buildingentity.cpp

@@ -1,12 +1,12 @@
 #include "buildingentity.h"
 
-// FUNCTION: LEGO1 0x10014e20 STUB
+// STUB: LEGO1 0x10014e20
 BuildingEntity::BuildingEntity()
 {
 	// TODO
 }
 
-// FUNCTION: LEGO1 0x10015030 STUB
+// STUB: LEGO1 0x10015030
 BuildingEntity::~BuildingEntity()
 {
 	// TODO

LEGO1/carrace.cpp

@@ -1,6 +1,6 @@
 #include "carrace.h"
 
-// FUNCTION: LEGO1 0x10016a90 STUB
+// STUB: LEGO1 0x10016a90
 CarRace::CarRace()
 {
 	// TODO

LEGO1/elevatorbottom.cpp

@@ -1,18 +1,18 @@
 #include "elevatorbottom.h"
 
-// FUNCTION: LEGO1 0x10017e90 STUB
+// STUB: LEGO1 0x10017e90
 ElevatorBottom::ElevatorBottom()
 {
 	// TODO
 }
 
-// FUNCTION: LEGO1 0x10018060 STUB
+// STUB: LEGO1 0x10018060
 ElevatorBottom::~ElevatorBottom()
 {
 	// TODO
 }
 
-// FUNCTION: LEGO1 0x10018150 STUB
+// STUB: LEGO1 0x10018150
 MxLong ElevatorBottom::Notify(MxParam& p)
 {
 	// TODO

LEGO1/gasstation.cpp

@@ -1,18 +1,18 @@
 #include "gasstation.h"
 
-// FUNCTION: LEGO1 0x100046a0 STUB
+// STUB: LEGO1 0x100046a0
 GasStation::GasStation()
 {
 	// TODO
 }
 
-// FUNCTION: LEGO1 0x100048c0 STUB
+// STUB: LEGO1 0x100048c0
 GasStation::~GasStation()
 {
 	// TODO
 }
 
-// FUNCTION: LEGO1 0x10004a60 STUB
+// STUB: LEGO1 0x10004a60
 MxLong GasStation::Notify(MxParam& p)
 {
 	// TODO
@@ -20,7 +20,7 @@ MxLong GasStation::Notify(MxParam& p)
 	return 0;
 }
 
-// FUNCTION: LEGO1 0x10005c90 STUB
+// STUB: LEGO1 0x10005c90
 MxResult GasStation::Tickle()
 {
 	// TODO

LEGO1/gifmanager.h

@@ -45,7 +45,7 @@ public:
 // VTABLE: LEGO1 0x100d86d4
 class GifManagerBase {
 public:
-	// FUNCTION: LEGO1 0x1005a310 STUB
+	// STUB: LEGO1 0x1005a310
 	virtual ~GifManagerBase() {} // vtable+00
 
 	inline GifData* Get(const char* name) { return m_unk8.Get(name); }
@@ -59,7 +59,7 @@ protected:
 // VTABLE: LEGO1 0x100d86fc
 class GifManager : public GifManagerBase {
 public:
-	// FUNCTION: LEGO1 0x1005a580 STUB
+	// STUB: LEGO1 0x1005a580
 	virtual ~GifManager() {} // vtable+00
 
 protected:

LEGO1/helicopter.h

@@ -27,7 +27,7 @@ public:
 	virtual MxResult Create(MxDSObject& p_dsObject) override; // vtable+0x18
 	virtual void VTable0xe4() override;
 
-	// FUNCTION: LEGO1 0x10003210 SYNTHETIC
+	// SYNTHETIC: LEGO1 0x10003210
 	// Helicopter::`scalar deleting destructor'
 	virtual ~Helicopter() override; // vtable+0x0
 

LEGO1/historybook.cpp

@@ -1,18 +1,18 @@
 #include "historybook.h"
 
-// FUNCTION: LEGO1 0x100822f0 STUB
+// STUB: LEGO1 0x100822f0
 HistoryBook::HistoryBook()
 {
 	// TODO
 }
 
-// FUNCTION: LEGO1 0x100824d0 STUB
+// STUB: LEGO1 0x100824d0
 HistoryBook::~HistoryBook()
 {
 	// TODO
 }
 
-// FUNCTION: LEGO1 0x10082680 STUB
+// STUB: LEGO1 0x10082680
 MxLong HistoryBook::Notify(MxParam& p)
 {
 	// TODO

LEGO1/hospital.cpp

@@ -1,18 +1,18 @@
 #include "hospital.h"
 
-// FUNCTION: LEGO1 0x100745e0 STUB
+// STUB: LEGO1 0x100745e0
 Hospital::Hospital()
 {
 	// TODO
 }
 
-// FUNCTION: LEGO1 0x100747f0 STUB
+// STUB: LEGO1 0x100747f0
 Hospital::~Hospital()
 {
 	// TODO
 }
 
-// FUNCTION: LEGO1 0x10074990 STUB
+// STUB: LEGO1 0x10074990
 MxLong Hospital::Notify(MxParam& p)
 {
 	// TODO

LEGO1/hospitalstate.cpp

@@ -1,6 +1,6 @@
 #include "hospitalstate.h"
 
-// FUNCTION: LEGO1 0x10076370 STUB
+// STUB: LEGO1 0x10076370
 HospitalState::HospitalState()
 {
 	// TODO

LEGO1/infocenter.cpp

@@ -1,18 +1,18 @@
 #include "infocenter.h"
 
-// FUNCTION: LEGO1 0x1006ea20 STUB
+// STUB: LEGO1 0x1006ea20
 Infocenter::Infocenter()
 {
 	// TODO
 }
 
-// FUNCTION: LEGO1 0x1006ec90 STUB
+// STUB: LEGO1 0x1006ec90
 Infocenter::~Infocenter()
 {
 	// TODO
 }
 
-// FUNCTION: LEGO1 0x1006ef10 STUB
+// STUB: LEGO1 0x1006ef10
 MxLong Infocenter::Notify(MxParam& p)
 {
 	// TODO
@@ -20,7 +20,7 @@ MxLong Infocenter::Notify(MxParam& p)
 	return 0;
 }
 
-// FUNCTION: LEGO1 0x10070af0 STUB
+// STUB: LEGO1 0x10070af0
 MxResult Infocenter::Tickle()
 {
 	// TODO

LEGO1/infocenterdoor.cpp

@@ -1,18 +1,18 @@
 #include "infocenterdoor.h"
 
-// FUNCTION: LEGO1 0x10037730 STUB
+// STUB: LEGO1 0x10037730
 InfocenterDoor::InfocenterDoor()
 {
 	// TODO
 }
 
-// FUNCTION: LEGO1 0x100378f0 STUB
+// STUB: LEGO1 0x100378f0
 InfocenterDoor::~InfocenterDoor()
 {
 	// TODO
 }
 
-// FUNCTION: LEGO1 0x100379e0 STUB
+// STUB: LEGO1 0x100379e0
 MxLong InfocenterDoor::Notify(MxParam& p)
 {
 	// TODO

LEGO1/infocenterstate.cpp

@@ -2,13 +2,13 @@
 
 DECOMP_SIZE_ASSERT(InfocenterState, 0x94);
 
-// FUNCTION: LEGO1 0x10071600 STUB
+// STUB: LEGO1 0x10071600
 InfocenterState::InfocenterState()
 {
 	// TODO
 }
 
-// FUNCTION: LEGO1 0x10071920 STUB
+// STUB: LEGO1 0x10071920
 InfocenterState::~InfocenterState()
 {
 	// TODO

LEGO1/isle.cpp

@@ -1,6 +1,6 @@
 #include "isle.h"
 
-// FUNCTION: LEGO1 0x10030820 STUB
+// STUB: LEGO1 0x10030820
 Isle::Isle()
 {
 	// TODO

LEGO1/islepathactor.cpp

@@ -3,31 +3,31 @@
 DECOMP_SIZE_ASSERT(IslePathActor, 0x160)
 
 // Probably in header
-// FUNCTION: LEGO1 0x10002df0 STUB
+// STUB: LEGO1 0x10002df0
 void IslePathActor::VTable0xd0()
 {
 	// TODO
 }
 
-// FUNCTION: LEGO1 0x10002e00 STUB
+// STUB: LEGO1 0x10002e00
 void IslePathActor::VTable0xdc()
 {
 	// TODO
 }
 
-// FUNCTION: LEGO1 0x10002e70 STUB
+// STUB: LEGO1 0x10002e70
 void IslePathActor::VTable0xcc()
 {
 	// TODO
 }
 
-// FUNCTION: LEGO1 0x10002e80 STUB
+// STUB: LEGO1 0x10002e80
 void IslePathActor::VTable0xd4()
 {
 	// TODO
 }
 
-// FUNCTION: LEGO1 0x10002e90 STUB
+// STUB: LEGO1 0x10002e90
 void IslePathActor::VTable0xd8()
 {
 	// TODO
@@ -49,25 +49,25 @@ MxResult IslePathActor::Create(MxDSObject& p_dsObject)
 	return MxEntity::Create(p_dsObject);
 }
 
-// FUNCTION: LEGO1 0x1001a350 STUB
+// STUB: LEGO1 0x1001a350
 void IslePathActor::VTable0xe0()
 {
 	// TODO
 }
 
-// FUNCTION: LEGO1 0x1001a3f0 STUB
+// STUB: LEGO1 0x1001a3f0
 void IslePathActor::VTable0xe4()
 {
 	// TODO
 }
 
-// FUNCTION: LEGO1 0x1001b2a0 STUB
+// STUB: LEGO1 0x1001b2a0
 void IslePathActor::VTable0xe8(MxU32 p_1, MxBool p_2, MxU8 p_3)
 {
 	// TODO
 }
 
-// FUNCTION: LEGO1 0x1001b5b0 STUB
+// STUB: LEGO1 0x1001b5b0
 void IslePathActor::VTable0xec()
 {
 	// TODO

LEGO1/islepathactor.h

@@ -24,7 +24,7 @@ public:
 		return !strcmp(name, IslePathActor::ClassName()) || LegoPathActor::IsA(name);
 	}
 
-	// FUNCTION: LEGO1 0x10002ff0 SYNTHETIC
+	// SYNTHETIC: LEGO1 0x10002ff0
 	// IslePathActor::`scalar deleting destructor'
 	inline virtual ~IslePathActor() override { IslePathActor::Destroy(TRUE); }
 

LEGO1/jukebox.cpp

@@ -1,6 +1,6 @@
 #include "jukebox.h"
 
-// FUNCTION: LEGO1 0x1005d660 STUB
+// STUB: LEGO1 0x1005d660
 JukeBox::JukeBox()
 {
 	// TODO

LEGO1/jukeboxentity.cpp

@@ -1,12 +1,12 @@
 #include "jukeboxentity.h"
 
-// FUNCTION: LEGO1 0x10085bc0 STUB
+// STUB: LEGO1 0x10085bc0
 JukeBoxEntity::JukeBoxEntity()
 {
 	// TODO
 }
 
-// FUNCTION: LEGO1 0x10085dd0 STUB
+// STUB: LEGO1 0x10085dd0
 JukeBoxEntity::~JukeBoxEntity()
 {
 	// TODO

LEGO1/legoactioncontrolpresenter.cpp

@@ -10,13 +10,13 @@
 
 DECOMP_SIZE_ASSERT(LegoActionControlPresenter, 0x68)
 
-// FUNCTION: LEGO1 0x10043ce0 STUB
+// STUB: LEGO1 0x10043ce0
 void LegoActionControlPresenter::ReadyTickle()
 {
 	// TODO
 }
 
-// FUNCTION: LEGO1 0x10043d40 STUB
+// STUB: LEGO1 0x10043d40
 void LegoActionControlPresenter::RepeatingTickle()
 {
 	// TODO

LEGO1/legoactioncontrolpresenter.h

@@ -26,7 +26,7 @@ public:
 	}
 
 	// TODO: Find proper compilation unit to put this
-	// FUNCTION: LEGO1 0x1000d1d0 SYNTHETIC
+	// SYNTHETIC: LEGO1 0x1000d1d0
 	// LegoActionControlPresenter::`scalar deleting destructor'
 
 	virtual void ReadyTickle() override;           // vtable+0x18

LEGO1/legoanimationmanager.cpp

@@ -9,31 +9,31 @@ void LegoAnimationManager::configureLegoAnimationManager(int param_1)
 	g_legoAnimationManagerConfig = param_1;
 }
 
-// FUNCTION: LEGO1 0x1005eb60 STUB
+// STUB: LEGO1 0x1005eb60
 LegoAnimationManager::LegoAnimationManager()
 {
 	// TODO
 }
 
-// FUNCTION: LEGO1 0x1005ed30 STUB
+// STUB: LEGO1 0x1005ed30
 LegoAnimationManager::~LegoAnimationManager()
 {
 	// TODO
 }
 
-// FUNCTION: LEGO1 0x1005f130 STUB
+// STUB: LEGO1 0x1005f130
 void LegoAnimationManager::Init()
 {
 	// TODO
 }
 
-// FUNCTION: LEGO1 0x1005f6d0 STUB
+// STUB: LEGO1 0x1005f6d0
 void LegoAnimationManager::FUN_1005f6d0(MxBool p)
 {
 	// TODO
 }
 
-// FUNCTION: LEGO1 0x100619f0 STUB
+// STUB: LEGO1 0x100619f0
 MxLong LegoAnimationManager::Notify(MxParam& p)
 {
 	// TODO
@@ -41,7 +41,7 @@ MxLong LegoAnimationManager::Notify(MxParam& p)
 	return 0;
 }
 
-// FUNCTION: LEGO1 0x10061cc0 STUB
+// STUB: LEGO1 0x10061cc0
 MxResult LegoAnimationManager::Tickle()
 {
 	// TODO

LEGO1/legoanimmmpresenter.cpp

@@ -1,6 +1,6 @@
 #include "legoanimmmpresenter.h"
 
-// FUNCTION: LEGO1 0x1004a8d0 STUB
+// STUB: LEGO1 0x1004a8d0
 LegoAnimMMPresenter::LegoAnimMMPresenter()
 {
 	// TODO

LEGO1/legoanimpresenter.cpp

@@ -1,12 +1,12 @@
 #include "legoanimpresenter.h"
 
-// FUNCTION: LEGO1 0x10068420 STUB
+// STUB: LEGO1 0x10068420
 LegoAnimPresenter::LegoAnimPresenter()
 {
 	// TODO
 }
 
-// FUNCTION: LEGO1 0x100686f0 STUB
+// STUB: LEGO1 0x100686f0
 void LegoAnimPresenter::Init()
 {
 	// TODO

LEGO1/legobuildingmanager.cpp

@@ -15,13 +15,13 @@ LegoBuildingManager::LegoBuildingManager()
 	Init();
 }
 
-// FUNCTION: LEGO1 0x1002f960 STUB
+// STUB: LEGO1 0x1002f960
 LegoBuildingManager::~LegoBuildingManager()
 {
 	// TODO
 }
 
-// FUNCTION: LEGO1 0x1002f9d0 STUB
+// STUB: LEGO1 0x1002f9d0
 void LegoBuildingManager::Init()
 {
 	// TODO

LEGO1/legocachesound.cpp

@@ -6,13 +6,13 @@ LegoCacheSound::LegoCacheSound()
 	Init();
 }
 
-// FUNCTION: LEGO1 0x10006630 STUB
+// STUB: LEGO1 0x10006630
 LegoCacheSound::~LegoCacheSound()
 {
 	// TODO
 }
 
-// FUNCTION: LEGO1 0x100066d0 STUB
+// STUB: LEGO1 0x100066d0
 void LegoCacheSound::Init()
 {
 	// TODO

LEGO1/legocameracontroller.cpp

@@ -1,12 +1,12 @@
 #include "legocameracontroller.h"
 
-// FUNCTION: LEGO1 0x10011d50 STUB
+// STUB: LEGO1 0x10011d50
 LegoCameraController::LegoCameraController()
 {
 	// TODO
 }
 
-// FUNCTION: LEGO1 0x10011f70 STUB
+// STUB: LEGO1 0x10011f70
 LegoCameraController::~LegoCameraController()
 {
 	// TODO

LEGO1/legocarbuild.cpp

@@ -1,18 +1,18 @@
 #include "legocarbuild.h"
 
-// FUNCTION: LEGO1 0x100226d0 STUB
+// STUB: LEGO1 0x100226d0
 LegoCarBuild::LegoCarBuild()
 {
 	// TODO
 }
 
-// FUNCTION: LEGO1 0x10022a80 STUB
+// STUB: LEGO1 0x10022a80
 LegoCarBuild::~LegoCarBuild()
 {
 	// TODO
 }
 
-// FUNCTION: LEGO1 0x100238b0 STUB
+// STUB: LEGO1 0x100238b0
 MxResult LegoCarBuild::Tickle()
 {
 	// TODO
@@ -20,7 +20,7 @@ MxResult LegoCarBuild::Tickle()
 	return 0;
 }
 
-// FUNCTION: LEGO1 0x10024050 STUB
+// STUB: LEGO1 0x10024050
 MxLong LegoCarBuild::Notify(MxParam& p)
 {
 	// TODO

LEGO1/legocarbuildanimpresenter.cpp

@@ -1,12 +1,12 @@
 #include "legocarbuildanimpresenter.h"
 
-// FUNCTION: LEGO1 0x10078400 STUB
+// STUB: LEGO1 0x10078400
 LegoCarBuildAnimPresenter::LegoCarBuildAnimPresenter()
 {
 	// TODO
 }
 
-// FUNCTION: LEGO1 0x10078680 STUB
+// STUB: LEGO1 0x10078680
 LegoCarBuildAnimPresenter::~LegoCarBuildAnimPresenter()
 {
 	// TODO

LEGO1/legocontrolmanager.cpp

@@ -1,30 +1,30 @@
 #include "legocontrolmanager.h"
 
-// FUNCTION: LEGO1 0x10028520 STUB
+// STUB: LEGO1 0x10028520
 LegoControlManager::LegoControlManager()
 {
 	// TODO
 }
 
-// FUNCTION: LEGO1 0x10028d60 STUB
+// STUB: LEGO1 0x10028d60
 LegoControlManager::~LegoControlManager()
 {
 	// TODO
 }
 
-// FUNCTION: LEGO1 0x10028e10 STUB
+// STUB: LEGO1 0x10028e10
 void LegoControlManager::Register(MxCore* p_listener)
 {
 	// TODO
 }
 
-// FUNCTION: LEGO1 0x10028ea0 STUB
+// STUB: LEGO1 0x10028ea0
 void LegoControlManager::Unregister(MxCore* p_listener)
 {
 	// TODO
 }
 
-// FUNCTION: LEGO1 0x10029600 STUB
+// STUB: LEGO1 0x10029600
 MxResult LegoControlManager::Tickle()
 {
 	// TODO

LEGO1/legoentity.cpp

@@ -7,7 +7,7 @@
 
 DECOMP_SIZE_ASSERT(LegoEntity, 0x68)
 
-// FUNCTION: LEGO1 0x10001090 SYNTHETIC
+// FUNCTION: LEGO1 0x10001090
 // LegoEntity::SetWorldSpeed
 
 // FUNCTION: LEGO1 0x1000c290
@@ -32,13 +32,13 @@ void LegoEntity::Init()
 	m_unk59 = 4;
 }
 
-// FUNCTION: LEGO1 0x10010650 STUB
+// STUB: LEGO1 0x10010650
 void LegoEntity::ResetWorldTransform(MxBool p_inVehicle)
 {
 	// TODO
 }
 
-// FUNCTION: LEGO1 0x10010790 STUB
+// STUB: LEGO1 0x10010790
 void LegoEntity::SetWorldTransform(Vector3Impl& p_loc, Vector3Impl& p_dir, Vector3Impl& p_up)
 {
 	// TODO
@@ -53,7 +53,7 @@ MxResult LegoEntity::Create(MxDSObject& p_dsObject)
 	return SUCCESS;
 }
 
-// FUNCTION: LEGO1 0x10010810 STUB
+// STUB: LEGO1 0x10010810
 void LegoEntity::Destroy(MxBool p_fromDestructor)
 {
 	if (m_roi) {
@@ -73,7 +73,7 @@ void LegoEntity::SetWorld()
 	}
 }
 
-// FUNCTION: LEGO1 0x100108a0 STUB
+// STUB: LEGO1 0x100108a0
 void LegoEntity::SetROI(LegoROI* p_roi, MxBool p_bool1, MxBool p_bool2)
 {
 	// TODO
@@ -102,49 +102,49 @@ void LegoEntity::ParseAction(char* p_extra)
 	}
 }
 
-// FUNCTION: LEGO1 0x10010f10 STUB
+// STUB: LEGO1 0x10010f10
 void LegoEntity::VTable0x34()
 {
 	// TODO
 }
 
-// FUNCTION: LEGO1 0x10011070 STUB
+// STUB: LEGO1 0x10011070
 void LegoEntity::VTable0x38()
 {
 	// TODO
 }
 
-// FUNCTION: LEGO1 0x10011300 STUB
+// STUB: LEGO1 0x10011300
 void LegoEntity::VTable0x3c()
 {
 	// TODO
 }
 
-// FUNCTION: LEGO1 0x10011360 STUB
+// STUB: LEGO1 0x10011360
 void LegoEntity::VTable0x40()
 {
 	// TODO
 }
 
-// FUNCTION: LEGO1 0x100113c0 STUB
+// STUB: LEGO1 0x100113c0
 void LegoEntity::VTable0x44()
 {
 	// TODO
 }
 
-// FUNCTION: LEGO1 0x10011420 STUB
+// STUB: LEGO1 0x10011420
 void LegoEntity::VTable0x48()
 {
 	// TODO
 }
 
-// FUNCTION: LEGO1 0x10011470 STUB
+// STUB: LEGO1 0x10011470
 void LegoEntity::VTable0x4c()
 {
 	// TODO
 }
 
-// FUNCTION: LEGO1 0x100114f0 STUB
+// STUB: LEGO1 0x100114f0
 MxLong LegoEntity::Notify(MxParam& p)
 {
 	// TODO

LEGO1/legoflctexturepresenter.cpp

@@ -1,6 +1,6 @@
 #include "legoflctexturepresenter.h"
 
-// FUNCTION: LEGO1 0x1005de80 STUB
+// STUB: LEGO1 0x1005de80
 LegoFlcTexturePresenter::LegoFlcTexturePresenter()
 {
 	// TODO

LEGO1/legogamestate.cpp

@@ -116,7 +116,7 @@ MxResult LegoGameState::Save(MxULong p_slot)
 	return result;
 }
 
-// FUNCTION: LEGO1 0x10039c60 STUB
+// STUB: LEGO1 0x10039c60
 MxResult LegoGameState::Load(MxULong)
 {
 	// TODO
@@ -166,19 +166,19 @@ void LegoGameState::GetFileSavePath(MxString* p_outPath, MxULong p_slotn)
 	*p_outPath = MxString(path);
 }
 
-// FUNCTION: LEGO1 0x1003a2e0 STUB
+// STUB: LEGO1 0x1003a2e0
 void LegoGameState::SerializePlayersInfo(MxS16 p)
 {
 	// TODO
 }
 
-// FUNCTION: LEGO1 0x1003a720 STUB
+// STUB: LEGO1 0x1003a720
 void LegoGameState::FUN_1003a720(MxU32 p_unk)
 {
 	// TODO
 }
 
-// FUNCTION: LEGO1 0x1003b060 STUB
+// STUB: LEGO1 0x1003b060
 void LegoGameState::HandleAction(MxU32 p_unk)
 {
 	// TODO
@@ -255,7 +255,7 @@ void LegoGameState::RegisterState(LegoState* p_state)
 	m_stateArray[targetIndex] = p_state;
 }
 
-// FUNCTION: LEGO1 0x1003cdd0 STUB
+// STUB: LEGO1 0x1003cdd0
 void LegoGameState::SerializeScoreHistory(MxS16 p)
 {
 	// TODO

LEGO1/legohideanimpresenter.cpp

@@ -6,7 +6,7 @@ LegoHideAnimPresenter::LegoHideAnimPresenter()
 	Init();
 }
 
-// FUNCTION: LEGO1 0x1006da50 STUB
+// STUB: LEGO1 0x1006da50
 void LegoHideAnimPresenter::Init()
 {
 }

LEGO1/legoinputmanager.cpp

@@ -34,7 +34,7 @@ LegoInputManager::LegoInputManager()
 	m_timeout = 1000;
 }
 
-// FUNCTION: LEGO1 0x1005b8b0 STUB
+// STUB: LEGO1 0x1005b8b0
 MxResult LegoInputManager::Tickle()
 {
 	ProcessEvents();
@@ -56,25 +56,25 @@ MxResult LegoInputManager::Create(HWND p_hwnd)
 	return SUCCESS;
 }
 
-// FUNCTION: LEGO1 0x1005bb80 SYNTHETIC
+// TEMPLATE: LEGO1 0x1005bb80
 // MxCollection<LegoEventNotificationParam>::Compare
 
-// FUNCTION: LEGO1 0x1005bc30 SYNTHETIC
+// TEMPLATE: LEGO1 0x1005bc30
 // MxCollection<LegoEventNotificationParam>::Destroy
 
-// FUNCTION: LEGO1 0x1005bc80 SYNTHETIC
+// TEMPLATE: LEGO1 0x1005bc80
 // MxList<LegoEventNotificationParam>::~MxList<LegoEventNotificationParam>
 
-// FUNCTION: LEGO1 0x1005bd50 SYNTHETIC
+// SYNTHETIC: LEGO1 0x1005bd50
 // MxCollection<LegoEventNotificationParam>::`scalar deleting destructor'
 
-// FUNCTION: LEGO1 0x1005bdc0 SYNTHETIC
+// SYNTHETIC: LEGO1 0x1005bdc0
 // MxList<LegoEventNotificationParam>::`scalar deleting destructor'
 
-// FUNCTION: LEGO1 0x1005beb0 SYNTHETIC
+// SYNTHETIC: LEGO1 0x1005beb0
 // LegoEventQueue::`scalar deleting destructor'
 
-// FUNCTION: LEGO1 0x1005bf70 SYNTHETIC
+// SYNTHETIC: LEGO1 0x1005bf70
 // MxQueue<LegoEventNotificationParam>::`scalar deleting destructor'
 
 // FUNCTION: LEGO1 0x1005bfe0
@@ -210,13 +210,13 @@ MxResult LegoInputManager::GetJoystickState(
 	return FAILURE;
 }
 
-// FUNCTION: LEGO1 0x1005c470 STUB
+// STUB: LEGO1 0x1005c470
 void LegoInputManager::Register(MxCore*)
 {
 	// TODO
 }
 
-// FUNCTION: LEGO1 0x1005c5c0 STUB
+// STUB: LEGO1 0x1005c5c0
 void LegoInputManager::UnRegister(MxCore*)
 {
 	// TODO
@@ -269,7 +269,7 @@ void LegoInputManager::ProcessEvents()
 	}
 }
 
-// FUNCTION: LEGO1 0x1005c9c0 STUB
+// STUB: LEGO1 0x1005c9c0
 MxBool LegoInputManager::ProcessOneEvent(LegoEventNotificationParam& p_param)
 {
 	// TODO
@@ -293,5 +293,5 @@ void LegoInputManager::KillTimer()
 	}
 }
 
-// FUNCTION: LEGO1 0x1005d010 SYNTHETIC
+// TEMPLATE: LEGO1 0x1005d010
 // MxListEntry<LegoEventNotificationParam>::GetValue

LEGO1/legoloadcachesoundpresenter.cpp

@@ -6,13 +6,13 @@ LegoLoadCacheSoundPresenter::LegoLoadCacheSoundPresenter()
 	Init();
 }
 
-// FUNCTION: LEGO1 0x10018480 STUB
+// STUB: LEGO1 0x10018480
 LegoLoadCacheSoundPresenter::~LegoLoadCacheSoundPresenter()
 {
 	// TODO
 }
 
-// FUNCTION: LEGO1 0x100184e0 STUB
+// STUB: LEGO1 0x100184e0
 void LegoLoadCacheSoundPresenter::Init()
 {
 	// TODO

LEGO1/legolocomotionanimpresenter.cpp

@@ -6,7 +6,7 @@ LegoLocomotionAnimPresenter::LegoLocomotionAnimPresenter()
 	Init();
 }
 
-// FUNCTION: LEGO1 0x1006d0b0 STUB
+// STUB: LEGO1 0x1006d0b0
 void LegoLocomotionAnimPresenter::Init()
 {
 	// TODO

LEGO1/legoomni.cpp

@@ -216,20 +216,20 @@ void PlayMusic(MxU32 p_index)
 	LegoOmni::GetInstance()->GetBackgroundAudioManager()->PlayMusic(action, 5, 4);
 }
 
-// FUNCTION: LEGO1 0x1001a700 STUB
+// STUB: LEGO1 0x1001a700
 void FUN_1001a700()
 {
 	// TODO
 }
 
-// FUNCTION: LEGO1 0x1003dd70 STUB
+// STUB: LEGO1 0x1003dd70
 LegoROI* PickROI(MxLong, MxLong)
 {
 	// TODO
 	return NULL;
 }
 
-// FUNCTION: LEGO1 0x1003ddc0 STUB
+// STUB: LEGO1 0x1003ddc0
 LegoEntity* PickEntity(MxLong, MxLong)
 {
 	// TODO
@@ -372,7 +372,7 @@ void LegoOmni::Init()
 	m_transitionManager = NULL;
 }
 
-// FUNCTION: LEGO1 0x10058c30 STUB
+// STUB: LEGO1 0x10058c30
 void LegoOmni::Destroy()
 {
 	// TODO
@@ -464,20 +464,20 @@ LegoOmni* LegoOmni::GetInstance()
 	return (LegoOmni*) MxOmni::GetInstance();
 }
 
-// FUNCTION: LEGO1 0x1005af10 STUB
+// STUB: LEGO1 0x1005af10
 void LegoOmni::RemoveWorld(const MxAtomId& p1, MxLong p2)
 {
 	// TODO
 }
 
-// FUNCTION: LEGO1 0x1005b0c0 STUB
+// STUB: LEGO1 0x1005b0c0
 LegoEntity* LegoOmni::FindByEntityIdOrAtomId(const MxAtomId& p_atom, MxS32 p_entityid)
 {
 	// TODO
 	return NULL;
 }
 
-// FUNCTION: LEGO1 0x1005b1d0 STUB
+// STUB: LEGO1 0x1005b1d0
 MxResult LegoOmni::DeleteObject(MxDSAction& ds)
 {
 	// TODO
@@ -520,7 +520,7 @@ MxBool LegoOmni::DoesEntityExist(MxDSAction& ds)
 	return FALSE;
 }
 
-// FUNCTION: LEGO1 0x1005b400 STUB
+// STUB: LEGO1 0x1005b400
 int LegoOmni::GetCurrPathInfo(LegoPathBoundary**, int&)
 {
 	// TODO
@@ -544,7 +544,7 @@ MxResult LegoOmni::Start(MxDSAction* action)
 	return result;
 }
 
-// FUNCTION: LEGO1 0x1005b5f0 STUB
+// STUB: LEGO1 0x1005b5f0
 MxLong LegoOmni::Notify(MxParam& p)
 {
 	// TODO

LEGO1/legopathactor.cpp

@@ -3,164 +3,164 @@
 DECOMP_SIZE_ASSERT(LegoPathActor, 0x154)
 
 // Probably in header
-// FUNCTION: LEGO1 0x10002d20 STUB
+// STUB: LEGO1 0x10002d20
 void LegoPathActor::VTable0x78()
 {
 	// TODO
 }
 
-// FUNCTION: LEGO1 0x10002d30 STUB
+// STUB: LEGO1 0x10002d30
 void LegoPathActor::VTable0x7c()
 {
 	// TODO
 }
 
-// FUNCTION: LEGO1 0x10002d40 STUB
+// STUB: LEGO1 0x10002d40
 void LegoPathActor::VTable0x90()
 {
 	// TODO
 }
 
-// FUNCTION: LEGO1 0x10002d50 STUB
+// STUB: LEGO1 0x10002d50
 void LegoPathActor::VTable0x94()
 {
 	// TODO
 }
 
-// FUNCTION: LEGO1 0x10002d60 STUB
+// STUB: LEGO1 0x10002d60
 void LegoPathActor::VTable0xa0()
 {
 	// TODO
 }
 
-// FUNCTION: LEGO1 0x10002d70 STUB
+// STUB: LEGO1 0x10002d70
 void LegoPathActor::VTable0xac()
 {
 	// TODO
 }
 
-// FUNCTION: LEGO1 0x10002d80 STUB
+// STUB: LEGO1 0x10002d80
 void LegoPathActor::VTable0xb0()
 {
 	// TODO
 }
 
-// FUNCTION: LEGO1 0x10002d90 STUB
+// STUB: LEGO1 0x10002d90
 void LegoPathActor::VTable0xb4()
 {
 	// TODO
 }
 
-// FUNCTION: LEGO1 0x10002da0 STUB
+// STUB: LEGO1 0x10002da0
 void LegoPathActor::VTable0xb8()
 {
 	// TODO
 }
 
-// FUNCTION: LEGO1 0x10002db0 STUB
+// STUB: LEGO1 0x10002db0
 void LegoPathActor::VTable0xbc()
 {
 	// TODO
 }
 
-// FUNCTION: LEGO1 0x10002dc0 STUB
+// STUB: LEGO1 0x10002dc0
 void LegoPathActor::VTable0xc0()
 {
 	// TODO
 }
 
-// FUNCTION: LEGO1 0x10002dd0 STUB
+// STUB: LEGO1 0x10002dd0
 void LegoPathActor::VTable0xc4()
 {
 	// TODO
 }
 
-// FUNCTION: LEGO1 0x10002de0 STUB
+// STUB: LEGO1 0x10002de0
 void LegoPathActor::VTable0xc8()
 {
 	// TODO
 }
 // End header
 
-// FUNCTION: LEGO1 0x1002d700 STUB
+// STUB: LEGO1 0x1002d700
 LegoPathActor::LegoPathActor()
 {
 	// TODO
 }
 
-// FUNCTION: LEGO1 0x1002d820 STUB
+// STUB: LEGO1 0x1002d820
 LegoPathActor::~LegoPathActor()
 {
 	// TODO
 }
 
-// FUNCTION: LEGO1 0x1002d8d0 STUB
+// STUB: LEGO1 0x1002d8d0
 void LegoPathActor::VTable0x80()
 {
 	// TODO
 }
 
-// FUNCTION: LEGO1 0x1002d9c0 STUB
+// STUB: LEGO1 0x1002d9c0
 void LegoPathActor::VTable0x88()
 {
 	// TODO
 }
 
-// FUNCTION: LEGO1 0x1002de10 STUB
+// STUB: LEGO1 0x1002de10
 void LegoPathActor::VTable0x84()
 {
 	// TODO
 }
 
-// FUNCTION: LEGO1 0x1002e100 STUB
+// STUB: LEGO1 0x1002e100
 void LegoPathActor::VTable0x8c()
 {
 	// TODO
 }
 
-// FUNCTION: LEGO1 0x1002e740 STUB
+// STUB: LEGO1 0x1002e740
 void LegoPathActor::VTable0x74()
 {
 	// TODO
 }
 
-// FUNCTION: LEGO1 0x1002e790 STUB
+// STUB: LEGO1 0x1002e790
 void LegoPathActor::VTable0x70()
 {
 	// TODO
 }
 
-// FUNCTION: LEGO1 0x1002e8b0 STUB
+// STUB: LEGO1 0x1002e8b0
 void LegoPathActor::VTable0x98()
 {
 	// TODO
 }
 
-// FUNCTION: LEGO1 0x1002e8d0 STUB
+// STUB: LEGO1 0x1002e8d0
 void LegoPathActor::VTable0x6c()
 {
 	// TODO
 }
 
-// FUNCTION: LEGO1 0x1002ebe0 STUB
+// STUB: LEGO1 0x1002ebe0
 void LegoPathActor::VTable0x68()
 {
 	// TODO
 }
 
-// FUNCTION: LEGO1 0x1002f1b0 STUB
+// STUB: LEGO1 0x1002f1b0
 void LegoPathActor::VTable0x9c()
 {
 	// TODO
 }
 
-// FUNCTION: LEGO1 0x1002f650 STUB
+// STUB: LEGO1 0x1002f650
 void LegoPathActor::VTable0xa4()
 {
 	// TODO
 }
 
-// FUNCTION: LEGO1 0x1002f700 STUB
+// STUB: LEGO1 0x1002f700
 void LegoPathActor::VTable0xa8()
 {
 	// TODO

LEGO1/legopathcontroller.cpp

@@ -1,18 +1,18 @@
 #include "legopathcontroller.h"
 
-// FUNCTION: LEGO1 0x10044f40 STUB
+// STUB: LEGO1 0x10044f40
 LegoPathController::LegoPathController()
 {
 	// TODO
 }
 
-// FUNCTION: LEGO1 0x10045740 STUB
+// STUB: LEGO1 0x10045740
 LegoPathController::~LegoPathController()
 {
 	// TODO
 }
 
-// FUNCTION: LEGO1 0x10045c10 STUB
+// STUB: LEGO1 0x10045c10
 MxResult LegoPathController::Tickle()
 {
 	// TODO

LEGO1/legopathcontrollerlist.cpp

@@ -11,19 +11,19 @@ MxS8 LegoPathControllerList::Compare(LegoPathController* p_a, LegoPathController
 	return p_a == p_b ? 0 : p_a < p_b ? -1 : 1;
 }
 
-// FUNCTION: LEGO1 0x1001d230 SYNTHETIC
+// TEMPLATE: LEGO1 0x1001d230
 // MxCollection<LegoPathController *>::Compare
 
-// FUNCTION: LEGO1 0x1001d240 SYNTHETIC
+// TEMPLATE: LEGO1 0x1001d240
 // MxList<LegoPathController *>::MxList<LegoPathController *>
 
-// FUNCTION: LEGO1 0x1001d2d0 SYNTHETIC
+// TEMPLATE: LEGO1 0x1001d2d0
 // MxCollection<LegoPathController *>::~MxCollection<LegoPathController *>
 
-// FUNCTION: LEGO1 0x1001d320 SYNTHETIC
+// TEMPLATE: LEGO1 0x1001d320
 // MxCollection<LegoPathController *>::Destroy
 
-// FUNCTION: LEGO1 0x1001d330 SYNTHETIC
+// TEMPLATE: LEGO1 0x1001d330
 // MxList<LegoPathController *>::~MxList<LegoPathController *>
 
 // FUNCTION: LEGO1 0x1001d3c0
@@ -32,11 +32,11 @@ void LegoPathControllerList::Destroy(LegoPathController* p_controller)
 	delete p_controller;
 }
 
-// FUNCTION: LEGO1 0x1001d490 SYNTHETIC
+// SYNTHETIC: LEGO1 0x1001d490
 // MxCollection<LegoPathController *>::`scalar deleting destructor'
 
-// FUNCTION: LEGO1 0x1001d500 SYNTHETIC
+// SYNTHETIC: LEGO1 0x1001d500
 // MxList<LegoPathController *>::`scalar deleting destructor'
 
-// FUNCTION: LEGO1 0x1001d5b0 SYNTHETIC
+// SYNTHETIC: LEGO1 0x1001d5b0
 // MxPtrList<LegoPathController>::`scalar deleting destructor'

LEGO1/legopathpresenter.cpp

@@ -60,7 +60,7 @@ void LegoPathPresenter::RepeatingTickle()
 	EndAction();
 }
 
-// FUNCTION: LEGO1 0x10044d60 STUB
+// STUB: LEGO1 0x10044d60
 void LegoPathPresenter::ParseExtra()
 {
 	// TODO

LEGO1/legoplantmanager.cpp

@@ -6,19 +6,19 @@ LegoPlantManager::LegoPlantManager()
 	Init();
 }
 
-// FUNCTION: LEGO1 0x100262c0 STUB
+// STUB: LEGO1 0x100262c0
 LegoPlantManager::~LegoPlantManager()
 {
 	// TODO
 }
 
-// FUNCTION: LEGO1 0x10026330 STUB
+// STUB: LEGO1 0x10026330
 void LegoPlantManager::Init()
 {
 	// TODO
 }
 
-// FUNCTION: LEGO1 0x10026e00 STUB
+// STUB: LEGO1 0x10026e00
 MxResult LegoPlantManager::Tickle()
 {
 	// TODO

LEGO1/legorace.cpp

@@ -10,7 +10,7 @@ undefined4 LegoRace::VTable0x78(undefined4)
 	return 0;
 }
 
-// FUNCTION: LEGO1 0x1000dac0 STUB
+// STUB: LEGO1 0x1000dac0
 void LegoRace::VTable0x7c(undefined4, undefined4)
 {
 	// TODO
@@ -61,27 +61,27 @@ MxBool LegoRace::VTable0x64()
 	return FALSE;
 }
 
-// FUNCTION: LEGO1 0x10015ce0 STUB
+// STUB: LEGO1 0x10015ce0
 MxResult LegoRace::Create(MxDSObject& p_dsObject)
 {
 	// TODO
 	return SUCCESS;
 }
 
-// FUNCTION: LEGO1 0x10015d40 STUB
+// STUB: LEGO1 0x10015d40
 LegoRace::~LegoRace()
 {
 	// TODO
 }
 
-// FUNCTION: LEGO1 0x10015e00 STUB
+// STUB: LEGO1 0x10015e00
 MxLong LegoRace::Notify(MxParam& p)
 {
 	// TODO
 	return 0;
 }
 
-// FUNCTION: LEGO1 0x10015ed0 STUB
+// STUB: LEGO1 0x10015ed0
 void LegoRace::VTable0x68(MxBool p_add)
 {
 	// TODO

LEGO1/legosoundmanager.cpp

@@ -21,12 +21,12 @@ void LegoSoundManager::Init()
 	unk0x3c = 0;
 }
 
-// FUNCTION: LEGO1 0x100299b0 STUB
+// STUB: LEGO1 0x100299b0
 void LegoSoundManager::Destroy(MxBool p_fromDestructor)
 {
 }
 
-// FUNCTION: LEGO1 0x100299f0 STUB
+// STUB: LEGO1 0x100299f0
 MxResult LegoSoundManager::Create(MxU32 p_frequencyMS, MxBool p_createThread)
 {
 	return FAILURE;
@@ -38,7 +38,7 @@ void LegoSoundManager::Destroy()
 	Destroy(FALSE);
 }
 
-// FUNCTION: LEGO1 0x1002a3a0 STUB
+// STUB: LEGO1 0x1002a3a0
 MxResult LegoSoundManager::Tickle()
 {
 	MxMediaManager::Tickle();

LEGO1/legoutil.cpp

@@ -102,7 +102,7 @@ void ConvertHSVToRGB(float h, float s, float v, float* r_out, float* b_out, floa
 	}
 }
 
-// FUNCTION: LEGO1 0x1003ee00 STUB
+// STUB: LEGO1 0x1003ee00
 void FUN_1003ee00(MxAtomId& p_atomId, MxS32 p_id)
 {
 }

LEGO1/legovideomanager.cpp

@@ -75,7 +75,7 @@ void LegoVideoManager::EnableFullScreenMovie(MxBool p_enable)
 	EnableFullScreenMovie(p_enable, TRUE);
 }
 
-// FUNCTION: LEGO1 0x1007c310 STUB
+// STUB: LEGO1 0x1007c310
 void LegoVideoManager::EnableFullScreenMovie(MxBool p_enable, MxBool p_scale)
 {
 	// TODO
@@ -97,14 +97,14 @@ void LegoVideoManager::SetSkyColor(float p_red, float p_green, float p_blue)
 	// m_3dManager->m_pViewport->vtable1c(red, green, blue)
 }
 
-// FUNCTION: LEGO1 0x1007c560 STUB
+// STUB: LEGO1 0x1007c560
 int LegoVideoManager::EnableRMDevice()
 {
 	// TODO
 	return 0;
 }
 
-// FUNCTION: LEGO1 0x1007c740 STUB
+// STUB: LEGO1 0x1007c740
 int LegoVideoManager::DisableRMDevice()
 {
 	// TODO

LEGO1/legoworld.cpp

@@ -16,13 +16,13 @@ void LegoWorld::VTable0x60()
 {
 }
 
-// FUNCTION: LEGO1 0x10015820 STUB
+// STUB: LEGO1 0x10015820
 void FUN_10015820(MxU32 p_unk1, MxU32 p_unk2)
 {
 	// TODO
 }
 
-// FUNCTION: LEGO1 0x10015910 STUB
+// STUB: LEGO1 0x10015910
 void FUN_10015910(MxU32 p_unk1)
 {
 	// TODO
@@ -36,7 +36,7 @@ void SetIsWorldActive(MxBool p_isWorldActive)
 	g_isWorldActive = p_isWorldActive;
 }
 
-// FUNCTION: LEGO1 0x1001ca40 STUB
+// STUB: LEGO1 0x1001ca40
 LegoWorld::LegoWorld()
 {
 	// TODO
@@ -54,13 +54,13 @@ MxBool LegoWorld::VTable0x64()
 	return FALSE;
 }
 
-// FUNCTION: LEGO1 0x1001dfa0 STUB
+// STUB: LEGO1 0x1001dfa0
 LegoWorld::~LegoWorld()
 {
 	// TODO
 }
 
-// FUNCTION: LEGO1 0x1001e0b0 STUB
+// STUB: LEGO1 0x1001e0b0
 MxResult LegoWorld::SetAsCurrentWorld(MxDSObject& p_dsObject)
 {
 	// TODO
@@ -85,24 +85,24 @@ MxLong LegoWorld::Notify(MxParam& p_param)
 	return ret;
 }
 
-// FUNCTION: LEGO1 0x1001f630 STUB
+// STUB: LEGO1 0x1001f630
 void LegoWorld::VTable0x54()
 {
 	// TODO
 }
 
-// FUNCTION: LEGO1 0x10020220 STUB
+// STUB: LEGO1 0x10020220
 void LegoWorld::VTable0x58(MxCore* p_object)
 {
 	// TODO
 }
 
-// FUNCTION: LEGO1 0x10020f10 STUB
+// STUB: LEGO1 0x10020f10
 void LegoWorld::EndAction(MxPresenter* p_presenter)
 {
 }
 
-// FUNCTION: LEGO1 0x10021a70 STUB
+// STUB: LEGO1 0x10021a70
 void LegoWorld::VTable0x68(MxBool p_add)
 {
 	// TODO

LEGO1/legoworldpresenter.cpp

@@ -15,7 +15,7 @@ LegoWorldPresenter::LegoWorldPresenter()
 	m_unk50 = 50000;
 }
 
-// FUNCTION: LEGO1 0x10066770 STUB
+// STUB: LEGO1 0x10066770
 LegoWorldPresenter::~LegoWorldPresenter()
 {
 	// TODO

LEGO1/mxbitmap.cpp

@@ -231,12 +231,12 @@ MxResult MxBitmap::LoadFile(HANDLE p_handle)
 	return result;
 }
 
-// FUNCTION: LEGO1 0x100bce70 STUB
+// STUB: LEGO1 0x100bce70
 void MxBitmap::vtable2c(int, int, int, int, int, int, int)
 {
 }
 
-// FUNCTION: LEGO1 0x100bd020 STUB
+// STUB: LEGO1 0x100bd020
 void MxBitmap::vtable30(int, int, int, int, int, int, int)
 {
 }

LEGO1/mxcompositemediapresenter.cpp

@@ -1,6 +1,6 @@
 #include "mxcompositemediapresenter.h"
 
-// FUNCTION: LEGO1 0x10073ea0 STUB
+// STUB: LEGO1 0x10073ea0
 MxCompositeMediaPresenter::MxCompositeMediaPresenter()
 {
 	// TODO

LEGO1/mxcompositepresenter.cpp

@@ -25,19 +25,19 @@ MxCompositePresenter::~MxCompositePresenter()
 	NotificationManager()->Unregister(this);
 }
 
-// FUNCTION: LEGO1 0x100b67f0 STUB
+// STUB: LEGO1 0x100b67f0
 void MxCompositePresenter::VTable0x58()
 {
 	// TODO
 }
 
-// FUNCTION: LEGO1 0x100b69b0 STUB
+// STUB: LEGO1 0x100b69b0
 void MxCompositePresenter::VTable0x5c()
 {
 	// TODO
 }
 
-// FUNCTION: LEGO1 0x100b6b40 STUB
+// STUB: LEGO1 0x100b6b40
 void MxCompositePresenter::VTable0x60(undefined4 p_unknown)
 {
 	// TODO

LEGO1/mxcore.h

@@ -9,10 +9,10 @@
 class MxParam;
 
 // TODO: Find proper compilation unit to put these
-// FUNCTION: LEGO1 0x100140d0 SYNTHETIC
+// FUNCTION: LEGO1 0x100140d0
 // MxCore::IsA
 
-// FUNCTION: LEGO1 0x100144c0 SYNTHETIC
+// FUNCTION: LEGO1 0x100144c0
 // MxCore::ClassName
 
 // VTABLE: LEGO1 0x100dc0f8

LEGO1/mxdirect3d.cpp

@@ -111,7 +111,7 @@ BOOL MxDirect3D::CreateIDirect3D()
 	return TRUE;
 }
 
-// FUNCTION: LEGO1 0x1009b310 STUB
+// STUB: LEGO1 0x1009b310
 BOOL MxDirect3D::D3DSetMode()
 {
 	// TODO
@@ -137,7 +137,7 @@ MxDeviceModeFinder::~MxDeviceModeFinder()
 	}
 }
 
-// FUNCTION: LEGO1 0x1009c070 STUB
+// STUB: LEGO1 0x1009c070
 BOOL MxDeviceEnumerate::FUN_1009c070()
 {
 	// TODO
@@ -180,14 +180,14 @@ MxResult MxDeviceEnumerate::_DoEnumerate()
 	return SUCCESS;
 }
 
-// FUNCTION: LEGO1 0x1009c710 STUB
+// STUB: LEGO1 0x1009c710
 BOOL FAR PASCAL EnumerateCallback(GUID FAR*, LPSTR, LPSTR, LPVOID)
 {
 	// TODO
 	return FALSE;
 }
 
-// FUNCTION: LEGO1 0x1009c730 STUB
+// STUB: LEGO1 0x1009c730
 const char* MxDeviceEnumerate::EnumerateErrorToString(HRESULT p_error)
 {
 	// TODO: This is a list of error messages, similar to the function in

LEGO1/mxdiskstreamcontroller.cpp

@@ -13,19 +13,19 @@ MxDiskStreamController::MxDiskStreamController()
 	m_unk8c = 0;
 }
 
-// FUNCTION: LEGO1 0x100c7330 SYNTHETIC
+// TEMPLATE: LEGO1 0x100c7330
 // list<MxDSAction *,allocator<MxDSAction *> >::_Buynode
 
-// FUNCTION: LEGO1 0x100c7420 SYNTHETIC
+// TEMPLATE: LEGO1 0x100c7420
 // list<MxDSBuffer *,allocator<MxDSBuffer *> >::~list<MxDSBuffer *,allocator<MxDSBuffer *> >
 
-// FUNCTION: LEGO1 0x100c7490 SYNTHETIC
+// TEMPLATE: LEGO1 0x100c7490
 // list<MxDSBuffer *,allocator<MxDSBuffer *> >::_Buynode
 
-// FUNCTION: LEGO1 0x100c74e0 SYNTHETIC
+// TEMPLATE: LEGO1 0x100c74e0
 // List<MxDSBuffer *>::~List<MxDSBuffer *>
 
-// FUNCTION: LEGO1 0x100c7530 STUB
+// STUB: LEGO1 0x100c7530
 MxDiskStreamController::~MxDiskStreamController()
 {
 	// TODO
@@ -69,35 +69,35 @@ MxResult MxDiskStreamController::vtable0x34(undefined4 p_unknown)
 	return FAILURE;
 }
 
-// FUNCTION: LEGO1 0x100c7ac0 STUB
+// STUB: LEGO1 0x100c7ac0
 MxResult MxDiskStreamController::vtable0x28()
 {
 	// TODO
 	return FAILURE;
 }
 
-// FUNCTION: LEGO1 0x100c7c00 STUB
+// STUB: LEGO1 0x100c7c00
 MxResult MxDiskStreamController::vtable0x30(undefined4 p_unknown)
 {
 	// TODO
 	return FAILURE;
 }
 
-// FUNCTION: LEGO1 0x100c7ff0 STUB
+// STUB: LEGO1 0x100c7ff0
 MxResult MxDiskStreamController::vtable0x20(MxDSAction* p_action)
 {
 	// TODO
 	return FAILURE;
 }
 
-// FUNCTION: LEGO1 0x100c8160 STUB
+// STUB: LEGO1 0x100c8160
 MxResult MxDiskStreamController::vtable0x24(undefined4 p_unknown)
 {
 	// TODO
 	return FAILURE;
 }
 
-// FUNCTION: LEGO1 0x100c8640 STUB
+// STUB: LEGO1 0x100c8640
 MxResult MxDiskStreamController::Tickle()
 {
 	// TODO

LEGO1/mxdiskstreamprovider.cpp

@@ -32,7 +32,7 @@ MxDiskStreamProvider::MxDiskStreamProvider()
 	this->m_unk35 = 0;
 }
 
-// FUNCTION: LEGO1 0x100d1240 STUB
+// STUB: LEGO1 0x100d1240
 MxDiskStreamProvider::~MxDiskStreamProvider()
 {
 	// TODO
@@ -70,7 +70,7 @@ done:
 	return result;
 }
 
-// FUNCTION: LEGO1 0x100d15e0 STUB
+// STUB: LEGO1 0x100d15e0
 void MxDiskStreamProvider::vtable0x20(undefined4 p_unknown1)
 {
 	// TODO
@@ -87,7 +87,7 @@ MxResult MxDiskStreamProvider::WaitForWorkToComplete()
 	return SUCCESS;
 }
 
-// FUNCTION: LEGO1 0x100d18f0 STUB
+// STUB: LEGO1 0x100d18f0
 void MxDiskStreamProvider::PerformWork()
 {
 	// TODO

LEGO1/mxdisplaysurface.cpp

@@ -28,7 +28,7 @@ void MxDisplaySurface::Reset()
 	memset(&this->m_surfaceDesc, 0, sizeof(this->m_surfaceDesc));
 }
 
-// FUNCTION: LEGO1 0x100ba640 STUB
+// STUB: LEGO1 0x100ba640
 void MxDisplaySurface::FUN_100ba640()
 {
 	// TODO
@@ -179,18 +179,18 @@ void MxDisplaySurface::Clear()
 	this->Reset();
 }
 
-// FUNCTION: LEGO1 0x100baae0 STUB
+// STUB: LEGO1 0x100baae0
 void MxDisplaySurface::SetPalette(MxPalette* p_palette)
 {
 }
 
-// FUNCTION: LEGO1 0x100bacc0 STUB
+// STUB: LEGO1 0x100bacc0
 MxBool MxDisplaySurface::vtable28(undefined4, undefined4, undefined4, undefined4, undefined4, undefined4, undefined4)
 {
 	return 0;
 }
 
-// FUNCTION: LEGO1 0x100bb1d0 STUB
+// STUB: LEGO1 0x100bb1d0
 MxBool MxDisplaySurface::vtable30(
 	undefined4,
 	undefined4,
@@ -205,13 +205,13 @@ MxBool MxDisplaySurface::vtable30(
 	return 0;
 }
 
-// FUNCTION: LEGO1 0x100bb850 STUB
+// STUB: LEGO1 0x100bb850
 undefined4 MxDisplaySurface::vtable34(undefined4, undefined4, undefined4, undefined4, undefined4, undefined4)
 {
 	return 0;
 }
 
-// FUNCTION: LEGO1 0x100bba50 STUB
+// STUB: LEGO1 0x100bba50
 void MxDisplaySurface::Display(undefined4, undefined4, undefined4, undefined4, undefined4, undefined4)
 {
 }
@@ -232,13 +232,13 @@ void MxDisplaySurface::ReleaseDC(HDC p_hdc)
 		this->m_ddSurface2->ReleaseDC(p_hdc);
 }
 
-// FUNCTION: LEGO1 0x100bbc60 STUB
+// STUB: LEGO1 0x100bbc60
 undefined4 MxDisplaySurface::vtable44(undefined4, undefined4*, undefined4, undefined4)
 {
 	return 0;
 }
 
-// FUNCTION: LEGO1 0x100bc200 STUB
+// STUB: LEGO1 0x100bc200
 void MxDisplaySurface::vtable24(
 	LPDDSURFACEDESC,
 	MxBitmap*,
@@ -252,7 +252,7 @@ void MxDisplaySurface::vtable24(
 {
 }
 
-// FUNCTION: LEGO1 0x100bc630 STUB
+// STUB: LEGO1 0x100bc630
 MxBool MxDisplaySurface::
 	vtable2c(LPDDSURFACEDESC, MxBitmap*, undefined4, undefined4, undefined4, undefined4, undefined4, undefined4, MxBool)
 {

LEGO1/mxdsactionlist.cpp

@@ -18,17 +18,17 @@ void MxDSActionList::Destroy(MxDSAction* p_action)
 		delete p_action;
 }
 
-// FUNCTION: LEGO1 0x100c9cc0 SYNTHETIC
+// TEMPLATE: LEGO1 0x100c9cc0
 // MxCollection<MxDSAction *>::Compare
 
-// FUNCTION: LEGO1 0x100c9d20 SYNTHETIC
+// TEMPLATE: LEGO1 0x100c9d20
 // MxCollection<MxDSAction *>::Destroy
 
-// FUNCTION: LEGO1 0x100c9d30 SYNTHETIC
+// TEMPLATE: LEGO1 0x100c9d30
 // MxList<MxDSAction *>::~MxList<MxDSAction *>
 
-// FUNCTION: LEGO1 0x100c9e30 SYNTHETIC
+// SYNTHETIC: LEGO1 0x100c9e30
 // MxCollection<MxDSAction *>::`scalar deleting destructor'
 
-// FUNCTION: LEGO1 0x100c9ea0 SYNTHETIC
+// SYNTHETIC: LEGO1 0x100c9ea0
 // MxList<MxDSAction *>::`scalar deleting destructor'

LEGO1/mxdsobject.h

@@ -7,7 +7,7 @@
 #include "mxdstypes.h"
 
 // TODO: Find proper compilation unit to put this
-// FUNCTION: LEGO1 0x10005530 SYNTHETIC
+// FUNCTION: LEGO1 0x10005530
 // MxDSObject::SetAtomId
 
 // VTABLE: LEGO1 0x100dc868

LEGO1/mxdssubscriber.cpp

@@ -2,40 +2,40 @@
 
 DECOMP_SIZE_ASSERT(MxDSSubscriber, 0x4c);
 
-// FUNCTION: LEGO1 0x100b7bb0 STUB
+// STUB: LEGO1 0x100b7bb0
 MxDSSubscriber::MxDSSubscriber()
 {
 	// TODO
 }
 
-// FUNCTION: LEGO1 0x100b7e00 STUB
+// STUB: LEGO1 0x100b7e00
 MxDSSubscriber::~MxDSSubscriber()
 {
 	// TODO
 }
 
-// FUNCTION: LEGO1 0x100b7ed0 STUB
+// STUB: LEGO1 0x100b7ed0
 MxResult MxDSSubscriber::FUN_100b7ed0(MxStreamController*, MxU32, MxS16)
 {
 	// TODO
 	return SUCCESS;
 }
 
-// FUNCTION: LEGO1 0x100b8250 STUB
+// STUB: LEGO1 0x100b8250
 MxStreamChunk* MxDSSubscriber::FUN_100b8250()
 {
 	// TODO
 	return NULL;
 }
 
-// FUNCTION: LEGO1 0x100b8360 STUB
+// STUB: LEGO1 0x100b8360
 MxStreamChunk* MxDSSubscriber::FUN_100b8360()
 {
 	// TODO
 	return NULL;
 }
 
-// FUNCTION: LEGO1 0x100b8390 STUB
+// STUB: LEGO1 0x100b8390
 void MxDSSubscriber::FUN_100b8390(MxStreamChunk*)
 {
 	// TODO

LEGO1/mxloopingflcpresenter.cpp

@@ -24,7 +24,7 @@ void MxLoopingFlcPresenter::Init()
 	this->m_flags &= 0xfb;
 }
 
-// FUNCTION: LEGO1 0x100b4432 STUB
+// STUB: LEGO1 0x100b4432
 void MxLoopingFlcPresenter::Destroy(MxBool p_fromDestructor)
 {
 	// TODO

LEGO1/mxloopingmidipresenter.cpp

@@ -7,13 +7,13 @@
 
 DECOMP_SIZE_ASSERT(MxLoopingMIDIPresenter, 0x58);
 
-// FUNCTION: LEGO1 0x100b1830 SYNTHETIC
+// FUNCTION: LEGO1 0x100b1830
 // MxLoopingMIDIPresenter::ClassName
 
-// FUNCTION: LEGO1 0x100b1840 SYNTHETIC
+// FUNCTION: LEGO1 0x100b1840
 // MxLoopingMIDIPresenter::IsA
 
-// FUNCTION: LEGO1 0x100b19c0 SYNTHETIC
+// SYNTHETIC: LEGO1 0x100b19c0
 // MxLoopingMIDIPresenter::`scalar deleting destructor'
 
 // FUNCTION: LEGO1 0x100c2a80

LEGO1/mxloopingsmkpresenter.cpp

@@ -24,7 +24,7 @@ void MxLoopingSmkPresenter::Init()
 	this->m_flags &= 0xfb;
 }
 
-// FUNCTION: LEGO1 0x100b49d0 STUB
+// STUB: LEGO1 0x100b49d0
 void MxLoopingSmkPresenter::Destroy(MxBool p_fromDestructor)
 {
 }

LEGO1/mxmusicmanager.cpp

@@ -136,7 +136,7 @@ MxS32 MxMusicManager::CalculateVolume(MxS32 p_volume)
 	return (result << 0x10) | result;
 }
 
-// FUNCTION: LEGO1 0x100c09c0 STUB
+// STUB: LEGO1 0x100c09c0
 undefined4 MxMusicManager::FUN_100c09c0(MxU8* p_data, MxS32 p_loopCount)
 {
 	// TODO

LEGO1/mxomni.cpp

@@ -310,14 +310,14 @@ MxResult MxOmni::Start(MxDSAction* p_dsAction)
 	return result;
 }
 
-// FUNCTION: LEGO1 0x100b00c0 STUB
+// STUB: LEGO1 0x100b00c0
 MxResult MxOmni::DeleteObject(MxDSAction& p_dsAction)
 {
 	// TODO
 	return FAILURE;
 }
 
-// FUNCTION: LEGO1 0x100b00e0 STUB
+// STUB: LEGO1 0x100b00e0
 void MxOmni::Vtable0x2c()
 {
 	// TODO
@@ -349,7 +349,7 @@ MxLong MxOmni::Notify(MxParam& p)
 	return HandleNotificationType2(p);
 }
 
-// FUNCTION: LEGO1 0x100b0880 STUB
+// STUB: LEGO1 0x100b0880
 MxResult MxOmni::HandleNotificationType2(MxParam& p_param)
 {
 	// TODO STUB

LEGO1/mxpresenterlist.cpp

@@ -11,26 +11,26 @@ MxS8 MxPresenterList::Compare(MxPresenter* p_a, MxPresenter* p_b)
 	return p_a == p_b ? 0 : p_a < p_b ? -1 : 1;
 }
 
-// FUNCTION: LEGO1 0x1001cd20 SYNTHETIC
+// TEMPLATE: LEGO1 0x1001cd20
 // MxCollection<MxPresenter *>::Compare
 
-// FUNCTION: LEGO1 0x1001cd30 SYNTHETIC
+// TEMPLATE: LEGO1 0x1001cd30
 // MxCollection<MxPresenter *>::Destroy
 
-// FUNCTION: LEGO1 0x1001cd40 SYNTHETIC
+// TEMPLATE: LEGO1 0x1001cd40
 // MxList<MxPresenter *>::MxList<MxPresenter *>
 
-// FUNCTION: LEGO1 0x1001cdd0 SYNTHETIC
+// TEMPLATE: LEGO1 0x1001cdd0
 // MxCollection<MxPresenter *>::~MxCollection<MxPresenter *>
 
-// FUNCTION: LEGO1 0x1001ce20 SYNTHETIC
+// TEMPLATE: LEGO1 0x1001ce20
 // MxList<MxPresenter *>::~MxList<MxPresenter *>
 
-// FUNCTION: LEGO1 0x1001cf70 SYNTHETIC
+// SYNTHETIC: LEGO1 0x1001cf70
 // MxCollection<MxPresenter *>::`scalar deleting destructor'
 
-// FUNCTION: LEGO1 0x1001cfe0 SYNTHETIC
+// SYNTHETIC: LEGO1 0x1001cfe0
 // MxList<MxPresenter *>::`scalar deleting destructor'
 
-// FUNCTION: LEGO1 0x1001d090 SYNTHETIC
+// SYNTHETIC: LEGO1 0x1001d090
 // MxPtrList<MxPresenter>::`scalar deleting destructor'

LEGO1/mxramstreamcontroller.cpp

@@ -35,21 +35,21 @@ MxResult MxRAMStreamController::Open(const char* p_filename)
 	return FAILURE;
 }
 
-// FUNCTION: LEGO1 0x100c6210 STUB
+// STUB: LEGO1 0x100c6210
 MxResult MxRAMStreamController::vtable0x20(MxDSAction* p_action)
 {
 	// TODO STUB
 	return FAILURE;
 }
 
-// FUNCTION: LEGO1 0x100c6320 STUB
+// STUB: LEGO1 0x100c6320
 MxResult MxRAMStreamController::vtable0x24(undefined4 p_unknown)
 {
 	// TODO STUB
 	return FAILURE;
 }
 
-// FUNCTION: LEGO1 0x100d0d80 STUB
+// STUB: LEGO1 0x100d0d80
 undefined* __cdecl FUN_100d0d80(MxU32* p_fileSizeBuffer, MxU32 p_fileSize)
 {
 	return NULL;

LEGO1/mxramstreamprovider.cpp

@@ -53,7 +53,7 @@ MxRAMStreamProvider::~MxRAMStreamProvider()
 	m_bufferForDWords = NULL;
 }
 
-// FUNCTION: LEGO1 0x100d0ae0 STUB
+// STUB: LEGO1 0x100d0ae0
 MxResult MxRAMStreamProvider::SetResourceToGet(MxStreamController* p_resource)
 {
 	return FAILURE;

LEGO1/mxregionlist.cpp

@@ -2,10 +2,10 @@
 
 #include "mxregion.h"
 
-// FUNCTION: LEGO1 0x100c32e0 SYNTHETIC
+// TEMPLATE: LEGO1 0x100c32e0
 // MxCollection<MxRegionTopBottom *>::Compare
 
-// FUNCTION: LEGO1 0x100c3340 SYNTHETIC
+// TEMPLATE: LEGO1 0x100c3340
 // MxCollection<MxRegionTopBottom *>::Destroy
 
 // FUNCTION: LEGO1 0x100c33e0
@@ -18,19 +18,19 @@ void MxRegionList::Destroy(MxRegionTopBottom* p_topBottom)
 	}
 }
 
-// FUNCTION: LEGO1 0x100c34d0 SYNTHETIC
+// SYNTHETIC: LEGO1 0x100c34d0
 // MxCollection<MxRegionTopBottom *>::`scalar deleting destructor'
 
-// FUNCTION: LEGO1 0x100c3540 SYNTHETIC
+// SYNTHETIC: LEGO1 0x100c3540
 // MxList<MxRegionTopBottom *>::`scalar deleting destructor'
 
-// FUNCTION: LEGO1 0x100c35f0 SYNTHETIC
+// SYNTHETIC: LEGO1 0x100c35f0
 // MxPtrList<MxRegionTopBottom>::`scalar deleting destructor'
 
-// FUNCTION: LEGO1 0x100c4d80 SYNTHETIC
+// TEMPLATE: LEGO1 0x100c4d80
 // MxCollection<MxRegionLeftRight *>::Compare
 
-// FUNCTION: LEGO1 0x100c4de0 SYNTHETIC
+// TEMPLATE: LEGO1 0x100c4de0
 // MxCollection<MxRegionLeftRight *>::Destroy
 
 // FUNCTION: LEGO1 0x100c4e80
@@ -39,26 +39,26 @@ void MxRegionLeftRightList::Destroy(MxRegionLeftRight* p_leftRight)
 	delete p_leftRight;
 }
 
-// FUNCTION: LEGO1 0x100c4f50 SYNTHETIC
+// SYNTHETIC: LEGO1 0x100c4f50
 // MxCollection<MxRegionLeftRight *>::`scalar deleting destructor'
 
-// FUNCTION: LEGO1 0x100c4fc0 SYNTHETIC
+// SYNTHETIC: LEGO1 0x100c4fc0
 // MxList<MxRegionLeftRight *>::`scalar deleting destructor'
 
-// FUNCTION: LEGO1 0x100c5070 SYNTHETIC
+// SYNTHETIC: LEGO1 0x100c5070
 // MxPtrList<MxRegionLeftRight>::`scalar deleting destructor'
 
-// FUNCTION: LEGO1 0x100c54f0 SYNTHETIC
+// TEMPLATE: LEGO1 0x100c54f0
 // MxListCursor<MxRegionLeftRight *>::MxListCursor<MxRegionLeftRight *>
 
-// FUNCTION: LEGO1 0x100c58c0 SYNTHETIC
+// TEMPLATE: LEGO1 0x100c58c0
 // MxList<MxRegionLeftRight *>::_InsertEntry
 
-// FUNCTION: LEGO1 0x100c5970 SYNTHETIC
+// TEMPLATE: LEGO1 0x100c5970
 // MxList<MxRegionTopBottom *>::_InsertEntry
 
-// FUNCTION: LEGO1 0x100c5a20 SYNTHETIC
+// TEMPLATE: LEGO1 0x100c5a20
 // MxListEntry<MxRegionTopBottom *>::MxListEntry<MxRegionTopBottom *>
 
-// FUNCTION: LEGO1 0x100c5a40 SYNTHETIC
+// TEMPLATE: LEGO1 0x100c5a40
 // MxList<MxRegionLeftRight *>::_DeleteEntry

LEGO1/mxsmkpresenter.cpp

@@ -41,7 +41,7 @@ void MxSmkPresenter::Destroy(MxBool p_fromDestructor)
 	}
 }
 
-// FUNCTION: LEGO1 0x100b3940 STUB
+// STUB: LEGO1 0x100b3940
 void MxSmkPresenter::LoadHeader(MxStreamChunk* p_chunk)
 {
 	// TODO
@@ -57,7 +57,7 @@ void MxSmkPresenter::CreateBitmap()
 	m_bitmap->SetSize(m_mxSmack.m_smack.m_width, m_mxSmack.m_smack.m_height, NULL, FALSE);
 }
 
-// FUNCTION: LEGO1 0x100b3a00 STUB
+// STUB: LEGO1 0x100b3a00
 void MxSmkPresenter::LoadFrame(MxStreamChunk* p_chunk)
 {
 	// TODO

LEGO1/mxsoundmanager.cpp

@@ -15,7 +15,7 @@ MxSoundManager::MxSoundManager()
 	Init();
 }
 
-// FUNCTION: LEGO1 0x100ae7b0 SYNTHETIC
+// SYNTHETIC: LEGO1 0x100ae7b0
 // MxSoundManager::`scalar deleting destructor'
 
 // FUNCTION: LEGO1 0x100ae7d0

LEGO1/mxstillpresenter.cpp

@@ -9,7 +9,7 @@ DECOMP_SIZE_ASSERT(MxStillPresenter, 0x6c);
 // 0x10101eb0
 const char* g_strBMP_ISMAP = "BMP_ISMAP";
 
-// FUNCTION: LEGO1 0x10043550 SYNTHETIC
+// FUNCTION: LEGO1 0x10043550
 // MxStillPresenter::~MxStillPresenter
 
 // FUNCTION: LEGO1 0x100435b0
@@ -18,13 +18,13 @@ void MxStillPresenter::Destroy()
 	Destroy(FALSE);
 }
 
-// FUNCTION: LEGO1 0x100435c0 SYNTHETIC
+// FUNCTION: LEGO1 0x100435c0
 // MxStillPresenter::ClassName
 
-// FUNCTION: LEGO1 0x100435d0 SYNTHETIC
+// FUNCTION: LEGO1 0x100435d0
 // MxStillPresenter::IsA
 
-// FUNCTION: LEGO1 0x100436e0 SYNTHETIC
+// SYNTHETIC: LEGO1 0x100436e0
 // MxStillPresenter::`scalar deleting destructor'
 
 // FUNCTION: LEGO1 0x100b9c70
@@ -74,43 +74,43 @@ void MxStillPresenter::NextFrame()
 	m_subscriber->FUN_100b8390(chunk);
 }
 
-// FUNCTION: LEGO1 0x100b9dd0 STUB
+// STUB: LEGO1 0x100b9dd0
 void MxStillPresenter::LoadFrame(MxStreamChunk* p_chunk)
 {
 	// TODO
 }
 
-// FUNCTION: LEGO1 0x100b9f30 STUB
+// STUB: LEGO1 0x100b9f30
 void MxStillPresenter::VTable0x70()
 {
 	// TODO
 }
 
-// FUNCTION: LEGO1 0x100b9f60 STUB
+// STUB: LEGO1 0x100b9f60
 void MxStillPresenter::StartingTickle()
 {
 	// TODO
 }
 
-// FUNCTION: LEGO1 0x100b9f90 STUB
+// STUB: LEGO1 0x100b9f90
 void MxStillPresenter::StreamingTickle()
 {
 	// TODO
 }
 
-// FUNCTION: LEGO1 0x100b9ff0 STUB
+// STUB: LEGO1 0x100b9ff0
 void MxStillPresenter::RepeatingTickle()
 {
 	// TODO
 }
 
-// FUNCTION: LEGO1 0x100ba040 STUB
+// STUB: LEGO1 0x100ba040
 void MxStillPresenter::VTable0x88(undefined4, undefined4)
 {
 	// TODO
 }
 
-// FUNCTION: LEGO1 0x100ba140 STUB
+// STUB: LEGO1 0x100ba140
 void MxStillPresenter::Enable(MxBool p_enable)
 {
 	// TODO
@@ -149,7 +149,7 @@ void MxStillPresenter::ParseExtra()
 	}
 }
 
-// FUNCTION: LEGO1 0x100ba2c0 STUB
+// STUB: LEGO1 0x100ba2c0
 MxStillPresenter* MxStillPresenter::Clone()
 {
 	// TODO

LEGO1/mxstreamchunklist.cpp

@@ -18,17 +18,17 @@ void MxStreamChunkList::Destroy(MxStreamChunk* p_chunk)
 		delete p_chunk;
 }
 
-// FUNCTION: LEGO1 0x100b5930 SYNTHETIC
+// TEMPLATE: LEGO1 0x100b5930
 // MxCollection<MxStreamChunk *>::Compare
 
-// FUNCTION: LEGO1 0x100b5990 SYNTHETIC
+// TEMPLATE: LEGO1 0x100b5990
 // MxCollection<MxStreamChunk *>::Destroy
 
-// FUNCTION: LEGO1 0x100b59a0 SYNTHETIC
+// TEMPLATE: LEGO1 0x100b59a0
 // MxList<MxStreamChunk *>::~MxList<MxStreamChunk *>
 
-// FUNCTION: LEGO1 0x100b5aa0 SYNTHETIC
+// SYNTHETIC: LEGO1 0x100b5aa0
 // MxCollection<MxStreamChunk *>::`scalar deleting destructor'
 
-// FUNCTION: LEGO1 0x100b5b10 SYNTHETIC
+// SYNTHETIC: LEGO1 0x100b5b10
 // MxList<MxStreamChunk *>::`scalar deleting destructor'

LEGO1/mxstreamcontroller.cpp

@@ -34,51 +34,51 @@ MxStreamController::MxStreamController()
 	m_action0x60 = NULL;
 }
 
-// FUNCTION: LEGO1 0x100c0d60 SYNTHETIC
+// TEMPLATE: LEGO1 0x100c0d60
 // list<MxDSAction *,allocator<MxDSAction *> >::~list<MxDSAction *,allocator<MxDSAction *> >
 
-// FUNCTION: LEGO1 0x100c0dd0 SYNTHETIC
+// TEMPLATE: LEGO1 0x100c0dd0
 // list<MxDSSubscriber *,allocator<MxDSSubscriber *> >::~list<MxDSSubscriber *,allocator<MxDSSubscriber *> >
 
-// FUNCTION: LEGO1 0x100c0e40 SYNTHETIC
+// TEMPLATE: LEGO1 0x100c0e40
 // list<MxDSSubscriber *,allocator<MxDSSubscriber *> >::_Buynode
 
 // clang-format off
-// FUNCTION: LEGO1 0x100c0e70 SYNTHETIC
+// TEMPLATE: LEGO1 0x100c0e70
 // list<MxNextActionDataStart *,allocator<MxNextActionDataStart *> >::~list<MxNextActionDataStart *,allocator<MxNextActionDataStart *> >
 // clang-format on
 
-// FUNCTION: LEGO1 0x100c0ee0 SYNTHETIC
+// TEMPLATE: LEGO1 0x100c0ee0
 // list<MxNextActionDataStart *,allocator<MxNextActionDataStart *> >::_Buynode
 
-// FUNCTION: LEGO1 0x100c0fc0 SYNTHETIC
+// TEMPLATE: LEGO1 0x100c0fc0
 // MxStreamListMxDSSubscriber::~MxStreamListMxDSSubscriber
 
-// FUNCTION: LEGO1 0x100c1010 SYNTHETIC
+// TEMPLATE: LEGO1 0x100c1010
 // MxStreamListMxDSAction::~MxStreamListMxDSAction
 
-// FUNCTION: LEGO1 0x100c1060 SYNTHETIC
+// TEMPLATE: LEGO1 0x100c1060
 // MxStreamListMxNextActionDataStart::~MxStreamListMxNextActionDataStart
 
-// FUNCTION: LEGO1 0x100c10b0 SYNTHETIC
+// TEMPLATE: LEGO1 0x100c10b0
 // MxStreamList<MxDSSubscriber *>::~MxStreamList<MxDSSubscriber *>
 
-// FUNCTION: LEGO1 0x100c1100 SYNTHETIC
+// TEMPLATE: LEGO1 0x100c1100
 // MxStreamList<MxDSAction *>::~MxStreamList<MxDSAction *>
 
-// FUNCTION: LEGO1 0x100c1150 SYNTHETIC
+// TEMPLATE: LEGO1 0x100c1150
 // MxStreamList<MxNextActionDataStart *>::~MxStreamList<MxNextActionDataStart *>
 
-// FUNCTION: LEGO1 0x100c11a0 SYNTHETIC
+// TEMPLATE: LEGO1 0x100c11a0
 // List<MxDSSubscriber *>::~List<MxDSSubscriber *>
 
-// FUNCTION: LEGO1 0x100c11f0 SYNTHETIC
+// TEMPLATE: LEGO1 0x100c11f0
 // List<MxDSAction *>::~List<MxDSAction *>
 
-// FUNCTION: LEGO1 0x100c1240 SYNTHETIC
+// TEMPLATE: LEGO1 0x100c1240
 // List<MxNextActionDataStart *>::~List<MxNextActionDataStart *>
 
-// FUNCTION: LEGO1 0x100c1290 STUB
+// STUB: LEGO1 0x100c1290
 MxStreamController::~MxStreamController()
 {
 	// TODO
@@ -117,7 +117,7 @@ MxResult MxStreamController::vtable0x20(MxDSAction* p_action)
 	return result;
 }
 
-// FUNCTION: LEGO1 0x100c1740 STUB
+// STUB: LEGO1 0x100c1740
 MxResult MxStreamController::vtable0x24(undefined4 p_unknown)
 {
 	// TODO STUB
@@ -137,7 +137,7 @@ MxResult MxStreamController::FUN_100c1800(MxDSAction* p_action, MxU32 p_val)
 	return SUCCESS;
 }
 
-// FUNCTION: LEGO1 0x100c1a00 STUB
+// STUB: LEGO1 0x100c1a00
 MxResult MxStreamController::FUN_100c1a00(MxDSAction* p_action, MxU32 p_bufferval)
 {
 	return FAILURE;
@@ -153,13 +153,13 @@ MxResult MxStreamController::vtable0x2c(MxDSAction* p_action, MxU32 p_bufferval)
 	return FUN_100c1800(p_action, (p_bufferval / m_provider->GetFileSize()) * m_provider->GetFileSize());
 }
 
-// FUNCTION: LEGO1 0x100c1ce0 STUB
+// STUB: LEGO1 0x100c1ce0
 MxResult MxStreamController::vtable0x30(undefined4 p_unknown)
 {
 	return FAILURE;
 }
 
-// FUNCTION: LEGO1 0x100c20d0 STUB
+// STUB: LEGO1 0x100c20d0
 MxBool MxStreamController::FUN_100c20d0(MxDSObject& p_obj)
 {
 	// TODO

LEGO1/mxstringlist.cpp

@@ -4,23 +4,23 @@
 
 DECOMP_SIZE_ASSERT(MxListEntry<MxString>, 0x18)
 
-// FUNCTION: LEGO1 0x100cb3c0 SYNTHETIC
+// TEMPLATE: LEGO1 0x100cb3c0
 // MxCollection<MxString>::Compare
 
-// FUNCTION: LEGO1 0x100cb470 SYNTHETIC
+// TEMPLATE: LEGO1 0x100cb470
 // MxCollection<MxString>::Destroy
 
-// FUNCTION: LEGO1 0x100cb4c0 SYNTHETIC
+// TEMPLATE: LEGO1 0x100cb4c0
 // MxList<MxString>::~MxList<MxString>
 
-// FUNCTION: LEGO1 0x100cbb40 SYNTHETIC
+// TEMPLATE: LEGO1 0x100cbb40
 // MxList<MxString>::Append
 
-// FUNCTION: LEGO1 0x100cc2d0 SYNTHETIC
+// TEMPLATE: LEGO1 0x100cc2d0
 // MxList<MxString>::_InsertEntry
 
-// FUNCTION: LEGO1 0x100cc3c0 SYNTHETIC
+// TEMPLATE: LEGO1 0x100cc3c0
 // MxListEntry<MxString>::MxListEntry<MxString>
 
-// FUNCTION: LEGO1 0x100cc450 SYNTHETIC
+// TEMPLATE: LEGO1 0x100cc450
 // MxListEntry<MxString>::GetValue

LEGO1/mxvariabletable.cpp

@@ -1,27 +1,27 @@
 #include "mxvariabletable.h"
 
-// FUNCTION: LEGO1 0x100afcd0 SYNTHETIC
+// TEMPLATE: LEGO1 0x100afcd0
 // MxCollection<MxVariable *>::Compare
 
-// FUNCTION: LEGO1 0x100afce0 SYNTHETIC
+// TEMPLATE: LEGO1 0x100afce0
 // MxCollection<MxVariable *>::~MxCollection<MxVariable *>
 
-// FUNCTION: LEGO1 0x100afd30 SYNTHETIC
+// TEMPLATE: LEGO1 0x100afd30
 // MxCollection<MxVariable *>::Destroy
 
-// FUNCTION: LEGO1 0x100afd40 SYNTHETIC
+// SYNTHETIC: LEGO1 0x100afd40
 // MxCollection<MxVariable *>::`scalar deleting destructor'
 
-// FUNCTION: LEGO1 0x100afdb0 SYNTHETIC
+// TEMPLATE: LEGO1 0x100afdb0
 // MxVariableTable::Destroy
 
-// FUNCTION: LEGO1 0x100afdc0 SYNTHETIC
+// TEMPLATE: LEGO1 0x100afdc0
 // MxHashTable<MxVariable *>::Hash
 
-// FUNCTION: LEGO1 0x100b0bd0 SYNTHETIC
+// TEMPLATE: LEGO1 0x100b0bd0
 // MxHashTable<MxVariable *>::~MxHashTable<MxVariable *>
 
-// FUNCTION: LEGO1 0x100b0ca0 SYNTHETIC
+// SYNTHETIC: LEGO1 0x100b0ca0
 // MxHashTable<MxVariable *>::`scalar deleting destructor'
 
 // FUNCTION: LEGO1 0x100b7330
@@ -89,8 +89,8 @@ const char* MxVariableTable::GetVariable(const char* p_key)
 	return value;
 }
 
-// FUNCTION: LEGO1 0x100b7ab0 SYNTHETIC
+// TEMPLATE: LEGO1 0x100b7ab0
 // MxHashTable<MxVariable *>::Resize
 
-// FUNCTION: LEGO1 0x100b7b80 SYNTHETIC
+// TEMPLATE: LEGO1 0x100b7b80
 // MxHashTable<MxVariable *>::_NodeInsert

LEGO1/mxvideopresenter.cpp

@@ -312,7 +312,7 @@ MxBool MxVideoPresenter::IsHit(MxS32 p_x, MxS32 p_y)
 	return TRUE;
 }
 
-// FUNCTION: LEGO1 0x100b2a70 STUB
+// STUB: LEGO1 0x100b2a70
 void MxVideoPresenter::VTable0x6c()
 {
 	// TODO

LEGO1/pizza.cpp

@@ -20,7 +20,7 @@ Pizza::~Pizza()
 	TickleManager()->UnregisterClient(this);
 }
 
-// FUNCTION: LEGO1 0x100388a0 STUB
+// STUB: LEGO1 0x100388a0
 MxResult Pizza::Tickle()
 {
 	// TODO

LEGO1/pizzeriastate.cpp

@@ -1,6 +1,6 @@
 #include "pizzeriastate.h"
 
-// FUNCTION: LEGO1 0x10017af0 STUB
+// STUB: LEGO1 0x10017af0
 PizzeriaState::PizzeriaState()
 {
 	// TODO

LEGO1/police.cpp

@@ -1,18 +1,18 @@
 #include "police.h"
 
-// FUNCTION: LEGO1 0x1005e130 STUB
+// STUB: LEGO1 0x1005e130
 Police::Police()
 {
 	// TODO
 }
 
-// FUNCTION: LEGO1 0x1005e320 STUB
+// STUB: LEGO1 0x1005e320
 Police::~Police()
 {
 	// TODO
 }
 
-// FUNCTION: LEGO1 0x1005e480 STUB
+// STUB: LEGO1 0x1005e480
 MxLong Police::Notify(MxParam& p)
 {
 	// TODO

LEGO1/policestate.cpp

@@ -1,6 +1,6 @@
 #include "policestate.h"
 
-// FUNCTION: LEGO1 0x1005e7c0 STUB
+// STUB: LEGO1 0x1005e7c0
 PoliceState::PoliceState()
 {
 	// TODO

LEGO1/racecar.cpp

@@ -8,7 +8,7 @@ RaceCar::RaceCar()
 	this->m_unk13c = 40.0;
 }
 
-// FUNCTION: LEGO1 0x10028420 STUB
+// STUB: LEGO1 0x10028420
 RaceCar::~RaceCar()
 {
 	// TODO

LEGO1/racestate.cpp

@@ -5,7 +5,7 @@ DECOMP_SIZE_ASSERT(RaceStateEntry, 0x06)
 // TODO: Must be 0x2c but current structure is incorrect
 // DECOMP_SIZE_ASSERT(RaceState, 0x2c)
 
-// FUNCTION: LEGO1 0x10015f30 STUB
+// STUB: LEGO1 0x10015f30
 RaceState::RaceState()
 {
 	// TODO

LEGO1/radio.cpp

@@ -1,6 +1,6 @@
 #include "radio.h"
 
-// FUNCTION: LEGO1 0x1002c990 STUB
+// STUB: LEGO1 0x1002c990
 Radio::~Radio()
 {
 	// TODO

LEGO1/radiostate.cpp

@@ -1,6 +1,6 @@
 #include "radiostate.h"
 
-// FUNCTION: LEGO1 0x1002ce10 STUB
+// STUB: LEGO1 0x1002ce10
 RadioState::RadioState()
 {
 	// TODO

LEGO1/realtime/matrix.cpp

@@ -124,7 +124,7 @@ void Matrix4Impl::EqualsMxProduct(const Matrix4Impl* p_a, const Matrix4Impl* p_b
 // 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.
-// FUNCTION: LEGO1 0x10002550 STUB
+// STUB: LEGO1 0x10002550
 void Matrix4Impl::ToQuaternion(Vector4Impl* p_outQuat)
 {
 	/*
@@ -167,7 +167,7 @@ void Matrix4Impl::ToQuaternion(Vector4Impl* p_outQuat)
 
 // No idea what this function is doing and it will be hard to tell until
 // we have a confirmed usage site.
-// FUNCTION: LEGO1 0x10002710 STUB
+// STUB: LEGO1 0x10002710
 int Matrix4Impl::FUN_10002710(const Vector3Impl* p_vec)
 {
 	return -1;

LEGO1/realtime/orientableroi.h

@@ -16,7 +16,7 @@ public:
 		ZEROVEC3(m_world_velocity);
 		IDENTMAT4(m_local2world.GetMatrix());
 	}
-	// FUNCTION: LEGO1 0x100a4630 SYNTHETIC
+	// SYNTHETIC: LEGO1 0x100a4630
 	// OrientableROI::`scalar deleting destructor'
 
 	virtual const Vector3& GetWorldVelocity() const;

LEGO1/realtime/vector.cpp

@@ -60,7 +60,7 @@ 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 0x10002060 SYNTHETIC
+// FUNCTION: LEGO1 0x10002060
 // Vector2Impl::SetData
 
 // FUNCTION: LEGO1 0x10002070
@@ -339,7 +339,7 @@ void Vector4Impl::EqualsScalar(float* p_value)
 
 // Note close yet, included because I'm at least confident I know what operation
 // it's trying to do.
-// FUNCTION: LEGO1 0x10002b70 STUB
+// STUB: LEGO1 0x10002b70
 int Vector4Impl::NormalizeQuaternion()
 {
 	float* v = m_data;

LEGO1/realtime/vector.h

@@ -4,7 +4,7 @@
 #include <vec.h>
 
 // TODO: Find proper compilation unit to put this
-// FUNCTION: LEGO1 0x1000c0f0 SYNTHETIC
+// FUNCTION: LEGO1 0x1000c0f0
 // Vector2Impl::Vector2Impl
 
 /*

LEGO1/registrationbook.cpp

@@ -1,18 +1,18 @@
 #include "registrationbook.h"
 
-// FUNCTION: LEGO1 0x10076d20 STUB
+// STUB: LEGO1 0x10076d20
 RegistrationBook::RegistrationBook()
 {
 	// TODO
 }
 
-// FUNCTION: LEGO1 0x10076f50 STUB
+// STUB: LEGO1 0x10076f50
 RegistrationBook::~RegistrationBook()
 {
 	// TODO
 }
 
-// FUNCTION: LEGO1 0x100770e0 STUB
+// STUB: LEGO1 0x100770e0
 MxLong RegistrationBook::Notify(MxParam& p)
 {
 	// TODO

LEGO1/score.h

@@ -28,7 +28,7 @@ public:
 		return !strcmp(name, Score::ClassName()) || LegoWorld::IsA(name);
 	}
 
-	// FUNCTION: LEGO1 0x100011e0 SYNTHETIC
+	// SYNTHETIC: LEGO1 0x100011e0
 	// Score::`scalar deleting destructor'
 
 	virtual MxResult Create(MxDSObject& p_dsObject) override; // vtable+18

LEGO1/towtrackmissionstate.cpp

@@ -2,7 +2,7 @@
 
 DECOMP_SIZE_ASSERT(TowTrackMissionState, 0x28)
 
-// FUNCTION: LEGO1 0x1004dd30 STUB
+// STUB: LEGO1 0x1004dd30
 TowTrackMissionState::TowTrackMissionState()
 {
 	// TODO

LEGO1/viewmanager/viewmanager.cpp

@@ -1,6 +1,6 @@
 #include "viewmanager.h"
 
-// FUNCTION: LEGO1 0x100a64d0 STUB
+// STUB: LEGO1 0x100a64d0
 void ViewManager::RemoveAll(ViewROI*)
 {
 	// TODO

LEGO1/viewmanager/viewroi.cpp

@@ -35,7 +35,7 @@ void ViewROI::UpdateWorldData(const Matrix4Data& parent2world)
 	}
 }
 
-// FUNCTION: LEGO1 0x100aa250 SYNTHETIC
+// SYNTHETIC: LEGO1 0x100aa250
 // ViewROI::`scalar deleting destructor'
 inline ViewROI::~ViewROI()
 {