diff --git a/LEGO1/define.cpp b/LEGO1/define.cpp
index 4e592157..31f1e521 100644
--- a/LEGO1/define.cpp
+++ b/LEGO1/define.cpp
@@ -1,6 +1,6 @@
 #include "define.h"
 
-// 0x1010141c
+// GLOBAL: LEGO1 0x1010141c
 MxU32 g_mxcoreCount[101] = {0,     -6643, -5643, -5058, -4643, -4321, -4058, -3836, -3643, -3473, -3321, -3184, -3058,
 							-2943, -2836, -2736, -2643, -2556, -2473, -2395, -2321, -2251, -2184, -2120, -2058, -2000,
 							-1943, -1888, -1836, -1785, -1736, -1689, -1643, -1599, -1556, -1514, -1473, -1434, -1395,
@@ -10,17 +10,17 @@ MxU32 g_mxcoreCount[101] = {0,     -6643, -5643, -5058, -4643, -4321, -4058, -38
 							-358,  -340,  -321,  -304,  -286,  -268,  -251,  -234,  -217,  -200,  -184,  -168,  -152,
 							-136,  -120,  -104,  -89,   -74,   -58,   -43,   -29,   -14,   0};
 
-// 0x10101eac
+// GLOBAL: LEGO1 0x10101eac
 const char* g_parseExtraTokens = ":;";
 
-// 0x10101edc
+// GLOBAL: LEGO1 0x10101edc
 const char* g_strWORLD = "WORLD";
 
-// 0x10101f20
+// GLOBAL: LEGO1 0x10101f20
 const char* g_strSOUND = "SOUND";
 
-// 0x10102040
+// GLOBAL: LEGO1 0x10102040
 const char* g_strACTION = "ACTION";
 
-// 0x101020cc
+// GLOBAL: LEGO1 0x101020cc
 const char* g_strVISIBILITY = "VISIBILITY";
diff --git a/LEGO1/legoomni.cpp b/LEGO1/legoomni.cpp
index 2fb9cc3b..887b8cad 100644
--- a/LEGO1/legoomni.cpp
+++ b/LEGO1/legoomni.cpp
@@ -106,7 +106,7 @@ MxAtomId* g_nocdSourceName = NULL;
 // GLOBAL: LEGO1 0x100f6718
 const char* g_current = "current";
 
-// 0x101020e8
+// GLOBAL: LEGO1 0x101020e8
 void (*g_omniUserMessage)(const char*, int);
 
 // FUNCTION: LEGO1 0x10015700
diff --git a/LEGO1/legoroi.cpp b/LEGO1/legoroi.cpp
index b2c6aa90..70cb1faf 100644
--- a/LEGO1/legoroi.cpp
+++ b/LEGO1/legoroi.cpp
@@ -14,7 +14,7 @@ typedef struct {
 // GLOBAL: LEGO1 0x100dbe28
 const double g_normalizeByteToFloat = 1.0 / 255;
 
-// 0x101011b0
+// GLOBAL: LEGO1 0x101011b0
 ROIColorAlias g_roiColorAliases[22] = {
 	{"lego black", 0x21, 0x21, 0x21, 0},       {"lego black f", 0x21, 0x21, 0x21, 0},
 	{"lego black flat", 0x21, 0x21, 0x21, 0},  {"lego blue", 0x00, 0x54, 0x8c, 0},
@@ -29,10 +29,10 @@ ROIColorAlias g_roiColorAliases[22] = {
 	{"lego yellow", 0xff, 0xb9, 0x00, 0},      {"lego yellow flat", 0xff, 0xb9, 0x00, 0},
 };
 
-// 0x10101368
+// GLOBAL: LEGO1 0x10101368
 MxS32 g_roiConfig = 100;
 
-// 0x101013ac
+// GLOBAL: LEGO1 0x101013ac
 ROIHandler g_someHandlerFunction = NULL;
 
 // FUNCTION: LEGO1 0x100a81c0
diff --git a/LEGO1/mxcriticalsection.cpp b/LEGO1/mxcriticalsection.cpp
index 93793081..1038f7ad 100644
--- a/LEGO1/mxcriticalsection.cpp
+++ b/LEGO1/mxcriticalsection.cpp
@@ -6,7 +6,7 @@
 
 DECOMP_SIZE_ASSERT(MxCriticalSection, 0x1c);
 
-// 0x10101e78
+// GLOBAL: LEGO1 0x10101e78
 int g_useMutex = 0;
 
 // FUNCTION: LEGO1 0x100b6d20
diff --git a/LEGO1/mxdirectdraw.cpp b/LEGO1/mxdirectdraw.cpp
index 6f7421c1..adba7ac1 100644
--- a/LEGO1/mxdirectdraw.cpp
+++ b/LEGO1/mxdirectdraw.cpp
@@ -891,7 +891,7 @@ int MxDirectDraw::FlipToGDISurface()
 // FUNCTION: LEGO1 0x1009e830
 void MxDirectDraw::Error(const char* message, int error)
 {
-	// 0x10100c70
+	// GLOBAL: LEGO1 0x10100c70
 	static BOOL isInsideError = FALSE;
 	if (!isInsideError) {
 		isInsideError = TRUE;
diff --git a/LEGO1/mxdiskstreamcontroller.h b/LEGO1/mxdiskstreamcontroller.h
index 9a768848..bed571f4 100644
--- a/LEGO1/mxdiskstreamcontroller.h
+++ b/LEGO1/mxdiskstreamcontroller.h
@@ -28,7 +28,7 @@ public:
 	// FUNCTION: LEGO1 0x100c7360
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// 0x10102144
+		// GLOBAL: LEGO1 0x10102144
 		return "MxDiskStreamController";
 	}
 
diff --git a/LEGO1/mxdiskstreamprovider.h b/LEGO1/mxdiskstreamprovider.h
index ba14c207..d6bc68a1 100644
--- a/LEGO1/mxdiskstreamprovider.h
+++ b/LEGO1/mxdiskstreamprovider.h
@@ -32,7 +32,7 @@ public:
 	// FUNCTION: LEGO1 0x100d1160
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// 0x1010287c
+		// GLOBAL: LEGO1 0x1010287c
 		return "MxDiskStreamProvider";
 	}
 
diff --git a/LEGO1/mxdsaction.h b/LEGO1/mxdsaction.h
index 8e8f4e19..e3c6f171 100644
--- a/LEGO1/mxdsaction.h
+++ b/LEGO1/mxdsaction.h
@@ -32,7 +32,7 @@ public:
 	// FUNCTION: LEGO1 0x100ad980
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// 0x101013f4
+		// GLOBAL: LEGO1 0x101013f4
 		return "MxDSAction";
 	}
 
diff --git a/LEGO1/mxdsanim.h b/LEGO1/mxdsanim.h
index be351c21..41b8cfa5 100644
--- a/LEGO1/mxdsanim.h
+++ b/LEGO1/mxdsanim.h
@@ -16,7 +16,7 @@ public:
 	// FUNCTION: LEGO1 0x100c9060
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// 0x101025d8
+		// GLOBAL: LEGO1 0x101025d8
 		return "MxDSAnim";
 	}
 
diff --git a/LEGO1/mxdschunk.h b/LEGO1/mxdschunk.h
index 91398c31..33836860 100644
--- a/LEGO1/mxdschunk.h
+++ b/LEGO1/mxdschunk.h
@@ -23,7 +23,7 @@ public:
 	// FUNCTION: LEGO1 0x100be0c0
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// 0x10101e6c
+		// GLOBAL: LEGO1 0x10101e6c
 		return "MxDSChunk";
 	}
 
diff --git a/LEGO1/mxdsevent.h b/LEGO1/mxdsevent.h
index d145e066..4a4e5202 100644
--- a/LEGO1/mxdsevent.h
+++ b/LEGO1/mxdsevent.h
@@ -14,7 +14,7 @@ public:
 	// FUNCTION: LEGO1 0x100c9660
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// 0x101025f0
+		// GLOBAL: LEGO1 0x101025f0
 		return "MxDSEvent";
 	}
 
diff --git a/LEGO1/mxdsfile.h b/LEGO1/mxdsfile.h
index 8235ec63..eb38975a 100644
--- a/LEGO1/mxdsfile.h
+++ b/LEGO1/mxdsfile.h
@@ -15,7 +15,7 @@ public:
 	// FUNCTION: LEGO1 0x100c0120
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// 0x10102594
+		// GLOBAL: LEGO1 0x10102594
 		return "MxDSFile";
 	}
 
diff --git a/LEGO1/mxdsmultiaction.h b/LEGO1/mxdsmultiaction.h
index 809c3281..267b7a9e 100644
--- a/LEGO1/mxdsmultiaction.h
+++ b/LEGO1/mxdsmultiaction.h
@@ -17,7 +17,7 @@ public:
 	// FUNCTION: LEGO1 0x100c9f50
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// 0x10101dbc
+		// GLOBAL: LEGO1 0x10101dbc
 		return "MxDSMultiAction";
 	}
 
diff --git a/LEGO1/mxdsobjectaction.h b/LEGO1/mxdsobjectaction.h
index a68be7fb..433dfa06 100644
--- a/LEGO1/mxdsobjectaction.h
+++ b/LEGO1/mxdsobjectaction.h
@@ -15,7 +15,7 @@ public:
 	// FUNCTION: LEGO1 0x100c88e0
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// 0x101025c4
+		// GLOBAL: LEGO1 0x101025c4
 		return "MxDSObjectAction";
 	}
 
diff --git a/LEGO1/mxdsparallelaction.h b/LEGO1/mxdsparallelaction.h
index 3a5869ad..c5e8ae4a 100644
--- a/LEGO1/mxdsparallelaction.h
+++ b/LEGO1/mxdsparallelaction.h
@@ -16,7 +16,7 @@ public:
 	// FUNCTION: LEGO1 0x100caf00
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// 0x10102608
+		// GLOBAL: LEGO1 0x10102608
 		return "MxDSParallelAction";
 	}
 
diff --git a/LEGO1/mxdsselectaction.h b/LEGO1/mxdsselectaction.h
index d75a29cc..7f57896b 100644
--- a/LEGO1/mxdsselectaction.h
+++ b/LEGO1/mxdsselectaction.h
@@ -18,7 +18,7 @@ public:
 	// FUNCTION: LEGO1 0x100cb6f0
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// 0x1010261c
+		// GLOBAL: LEGO1 0x1010261c
 		return "MxDSSelectAction";
 	}
 
diff --git a/LEGO1/mxdssound.h b/LEGO1/mxdssound.h
index 45c0856f..cb1d21d5 100644
--- a/LEGO1/mxdssound.h
+++ b/LEGO1/mxdssound.h
@@ -16,7 +16,7 @@ public:
 	// FUNCTION: LEGO1 0x100c9330
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// 0x101025e4
+		// GLOBAL: LEGO1 0x101025e4
 		return "MxDSSound";
 	}
 
diff --git a/LEGO1/mxdssource.h b/LEGO1/mxdssource.h
index e944ea63..2a0847e9 100644
--- a/LEGO1/mxdssource.h
+++ b/LEGO1/mxdssource.h
@@ -13,7 +13,7 @@ public:
 	// FUNCTION: LEGO1 0x100c0010
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// 0x10102588
+		// GLOBAL: LEGO1 0x10102588
 		return "MxDSSource";
 	}
 
diff --git a/LEGO1/mxdsstill.h b/LEGO1/mxdsstill.h
index f02e8a6b..2da2602e 100644
--- a/LEGO1/mxdsstill.h
+++ b/LEGO1/mxdsstill.h
@@ -16,7 +16,7 @@ public:
 	// FUNCTION: LEGO1 0x100c9930
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// 0x101025fc
+		// GLOBAL: LEGO1 0x101025fc
 		return "MxDSStill";
 	}
 
diff --git a/LEGO1/mxdssubscriber.h b/LEGO1/mxdssubscriber.h
index 49d3583f..112a38e1 100644
--- a/LEGO1/mxdssubscriber.h
+++ b/LEGO1/mxdssubscriber.h
@@ -18,7 +18,7 @@ public:
 	// FUNCTION: LEGO1 0x100b7d50
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// 0x101020f8
+		// GLOBAL: LEGO1 0x101020f8
 		return "MxDSSubscriber";
 	}
 
diff --git a/LEGO1/mxeventpresenter.h b/LEGO1/mxeventpresenter.h
index ec7406dd..6010c894 100644
--- a/LEGO1/mxeventpresenter.h
+++ b/LEGO1/mxeventpresenter.h
@@ -14,7 +14,7 @@ public:
 	// FUNCTION: LEGO1 0x100c2c30
 	inline virtual const char* ClassName() const override // vtable+0xc
 	{
-		// 0x10101dcc
+		// GLOBAL: LEGO1 0x10101dcc
 		return "MxEventPresenter";
 	}
 
diff --git a/LEGO1/mxloopingflcpresenter.h b/LEGO1/mxloopingflcpresenter.h
index ea43d9fa..d7c18546 100644
--- a/LEGO1/mxloopingflcpresenter.h
+++ b/LEGO1/mxloopingflcpresenter.h
@@ -14,7 +14,7 @@ public:
 	// FUNCTION: LEGO1 0x100b4380
 	inline virtual const char* ClassName() const override // vtable+0xc
 	{
-		// 0x10101e20
+		// GLOBAL: LEGO1 0x10101e20
 		return "MxLoopingFlcPresenter";
 	}
 
diff --git a/LEGO1/mxloopingmidipresenter.h b/LEGO1/mxloopingmidipresenter.h
index ad4d1d97..3f393581 100644
--- a/LEGO1/mxloopingmidipresenter.h
+++ b/LEGO1/mxloopingmidipresenter.h
@@ -9,7 +9,7 @@ class MxLoopingMIDIPresenter : public MxMIDIPresenter {
 public:
 	inline virtual const char* ClassName() const override // vtable+0xc
 	{
-		// 0x10101de0
+		// GLOBAL: LEGO1 0x10101de0
 		return "MxLoopingMIDIPresenter";
 	}
 
diff --git a/LEGO1/mxloopingsmkpresenter.h b/LEGO1/mxloopingsmkpresenter.h
index 381bd5b9..16061cee 100644
--- a/LEGO1/mxloopingsmkpresenter.h
+++ b/LEGO1/mxloopingsmkpresenter.h
@@ -14,7 +14,7 @@ public:
 	// FUNCTION: LEGO1 0x100b4920
 	inline virtual const char* ClassName() const override // vtable+0xc
 	{
-		// 0x10101e08
+		// GLOBAL: LEGO1 0x10101e08
 		return "MxLoopingSmkPresenter";
 	}
 
diff --git a/LEGO1/mxmidipresenter.h b/LEGO1/mxmidipresenter.h
index 953069a2..7e642383 100644
--- a/LEGO1/mxmidipresenter.h
+++ b/LEGO1/mxmidipresenter.h
@@ -14,7 +14,7 @@ public:
 	// FUNCTION: LEGO1 0x100c2650
 	inline virtual const char* ClassName() const override // vtable+0xc
 	{
-		// 0x10101df8
+		// GLOBAL: LEGO1 0x10101df8
 		return "MxMIDIPresenter";
 	}
 
diff --git a/LEGO1/mxmusicpresenter.h b/LEGO1/mxmusicpresenter.h
index b74d2da6..c4587786 100644
--- a/LEGO1/mxmusicpresenter.h
+++ b/LEGO1/mxmusicpresenter.h
@@ -13,7 +13,7 @@ public:
 	// FUNCTION: LEGO1 0x100c23a0
 	inline virtual const char* ClassName() const override // vtable+0xc
 	{
-		// 0x10101e48
+		// GLOBAL: LEGO1 0x10101e48
 		return "MxMusicPresenter";
 	}
 
diff --git a/LEGO1/mxnextactiondatastart.h b/LEGO1/mxnextactiondatastart.h
index 539f51d6..ecad22e4 100644
--- a/LEGO1/mxnextactiondatastart.h
+++ b/LEGO1/mxnextactiondatastart.h
@@ -18,7 +18,7 @@ public:
 	// FUNCTION: LEGO1 0x100c1900
 	inline virtual const char* ClassName() const override // vtable+0xc
 	{
-		// 0x101025a0
+		// GLOBAL: LEGO1 0x101025a0
 		return "MxNextActionDataStart";
 	}
 
diff --git a/LEGO1/mxomni.cpp b/LEGO1/mxomni.cpp
index b17cae7c..9e4949f5 100644
--- a/LEGO1/mxomni.cpp
+++ b/LEGO1/mxomni.cpp
@@ -13,16 +13,16 @@
 #include "mxtimer.h"
 #include "mxvideomanager.h"
 
-// 0x101015b8
+// GLOBAL: LEGO1 0x101015b8
 char g_hdPath[1024];
 
-// 0x101019b8
+// GLOBAL: LEGO1 0x101019b8
 char g_cdPath[1024];
 
-// 0x10101db8
+// GLOBAL: LEGO1 0x10101db8
 MxBool g_use3dSound;
 
-// 0x101015b0
+// GLOBAL: LEGO1 0x101015b0
 MxOmni* MxOmni::g_instance = NULL;
 
 // FUNCTION: LEGO1 0x100159e0
diff --git a/LEGO1/mxramstreamcontroller.h b/LEGO1/mxramstreamcontroller.h
index b9c15d93..26e9a4e1 100644
--- a/LEGO1/mxramstreamcontroller.h
+++ b/LEGO1/mxramstreamcontroller.h
@@ -13,7 +13,7 @@ public:
 	// FUNCTION: LEGO1 0x100b9430
 	inline virtual const char* ClassName() const override // vtable+0xc
 	{
-		// 0x10102130
+		// GLOBAL: LEGO1 0x10102130
 		return "MxRAMStreamController";
 	}
 
diff --git a/LEGO1/mxramstreamprovider.h b/LEGO1/mxramstreamprovider.h
index b7602792..4e656214 100644
--- a/LEGO1/mxramstreamprovider.h
+++ b/LEGO1/mxramstreamprovider.h
@@ -12,7 +12,7 @@ public:
 	// FUNCTION: LEGO1 0x100d0970
 	inline virtual const char* ClassName() const override // vtable+0xc
 	{
-		// 0x10102864
+		// GLOBAL: LEGO1 0x10102864
 		return "MxRAMStreamProvider";
 	}
 
diff --git a/LEGO1/mxsmkpresenter.h b/LEGO1/mxsmkpresenter.h
index 1ff15e02..06966b9f 100644
--- a/LEGO1/mxsmkpresenter.h
+++ b/LEGO1/mxsmkpresenter.h
@@ -16,7 +16,7 @@ public:
 	// FUNCTION: LEGO1 0x100b3730
 	inline virtual const char* ClassName() const override // vtable+0xc
 	{
-		// 0x10101e38
+		// GLOBAL: LEGO1 0x10101e38
 		return "MxSmkPresenter";
 	}
 
diff --git a/LEGO1/mxstillpresenter.cpp b/LEGO1/mxstillpresenter.cpp
index 6ed20ea6..d51d870c 100644
--- a/LEGO1/mxstillpresenter.cpp
+++ b/LEGO1/mxstillpresenter.cpp
@@ -6,7 +6,7 @@
 
 DECOMP_SIZE_ASSERT(MxStillPresenter, 0x6c);
 
-// 0x10101eb0
+// GLOBAL: LEGO1 0x10101eb0
 const char* g_strBMP_ISMAP = "BMP_ISMAP";
 
 // FUNCTION: LEGO1 0x10043550
diff --git a/LEGO1/mxstreamchunk.h b/LEGO1/mxstreamchunk.h
index b4ffdda5..d06d4103 100644
--- a/LEGO1/mxstreamchunk.h
+++ b/LEGO1/mxstreamchunk.h
@@ -12,7 +12,7 @@ public:
 	// FUNCTION: LEGO1 0x100b1fe0
 	inline virtual const char* ClassName() const override // vtable+0xc
 	{
-		// 0x10101e5c
+		// GLOBAL: LEGO1 0x10101e5c
 		return "MxStreamChunk";
 	}
 
diff --git a/LEGO1/mxstreamcontroller.h b/LEGO1/mxstreamcontroller.h
index b3b529f9..80ff9e35 100644
--- a/LEGO1/mxstreamcontroller.h
+++ b/LEGO1/mxstreamcontroller.h
@@ -22,7 +22,7 @@ public:
 	// FUNCTION: LEGO1 0x100c0f10
 	inline virtual const char* ClassName() const override // vtable+0xc
 	{
-		// 0x10102130
+		// GLOBAL: LEGO1 0x10102130
 		return "MxStreamController";
 	}
 
diff --git a/LEGO1/mxstreamer.h b/LEGO1/mxstreamer.h
index 69cd1af7..3b2af7e1 100644
--- a/LEGO1/mxstreamer.h
+++ b/LEGO1/mxstreamer.h
@@ -78,7 +78,7 @@ public:
 	// FUNCTION: LEGO1 0x100b9000
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// 0x1010210c
+		// GLOBAL: LEGO1 0x1010210c
 		return "MxStreamer";
 	}
 
diff --git a/LEGO1/mxtimer.cpp b/LEGO1/mxtimer.cpp
index 50addd24..f46d570a 100644
--- a/LEGO1/mxtimer.cpp
+++ b/LEGO1/mxtimer.cpp
@@ -2,10 +2,10 @@
 
 #include <windows.h>
 
-// 0x10101414
+// GLOBAL: LEGO1 0x10101414
 MxLong MxTimer::s_LastTimeCalculated = 0;
 
-// 0x10101418
+// GLOBAL: LEGO1 0x10101418
 MxLong MxTimer::s_LastTimeTimerStarted = 0;
 
 // FUNCTION: LEGO1 0x100ae060
diff --git a/LEGO1/realtime/realtimeview.cpp b/LEGO1/realtime/realtimeview.cpp
index 09e1a3de..5d1fc1a6 100644
--- a/LEGO1/realtime/realtimeview.cpp
+++ b/LEGO1/realtime/realtimeview.cpp
@@ -2,16 +2,16 @@
 
 #include <math.h>
 
-// 0x10109598
+// GLOBAL: LEGO1 0x10109598
 float g_userMaxLodPower;
 
-// 0x10101044
+// GLOBAL: LEGO1 0x10101044
 float g_userMaxBase = 4.0f;
 
-// 0x10101048
+// GLOBAL: LEGO1 0x10101048
 float g_userMaxLod = 3.6f;
 
-// 0x1010104c
+// GLOBAL: LEGO1 0x1010104c
 float g_partsThreshold = 1000.0f;
 
 // FUNCTION: LEGO1 0x100a5de0