From 4522b54479becd56dd8c663a72ad20fd32f155ff Mon Sep 17 00:00:00 2001
From: disinvite <disinvite@users.noreply.github.com>
Date: Sun, 17 Dec 2023 17:23:28 -0500
Subject: [PATCH] Fix repeated offset problems

---
 LEGO1/isle.cpp                | 2 +-
 LEGO1/legogamestate.cpp       | 1 -
 LEGO1/legoomni.cpp            | 4 ++--
 LEGO1/legoworld.cpp           | 2 +-
 LEGO1/motorcycle.h            | 2 +-
 LEGO1/mxdsbuffer.h            | 2 +-
 LEGO1/mxdsselectaction.h      | 3 ---
 LEGO1/mxramstreamcontroller.h | 2 +-
 LEGO1/score.h                 | 2 +-
 9 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/LEGO1/isle.cpp b/LEGO1/isle.cpp
index cefd6009..2d1d856a 100644
--- a/LEGO1/isle.cpp
+++ b/LEGO1/isle.cpp
@@ -176,7 +176,7 @@ void Isle::VTable0x68(MxBool p_add)
 	// TODO
 }
 
-// STUB: LEGO1 0x10031820
+// STUB: LEGO1 0x100327a0
 MxLong Isle::HandleTransitionEnd()
 {
 	return 0;
diff --git a/LEGO1/legogamestate.cpp b/LEGO1/legogamestate.cpp
index 29f539ac..62a30db4 100644
--- a/LEGO1/legogamestate.cpp
+++ b/LEGO1/legogamestate.cpp
@@ -43,7 +43,6 @@ ColorStringStruct g_colorSaveData[43] = {
 
 // NOTE: This offset = the end of the variables table, the last entry
 // in that table is a special entry, the string "END_OF_VARIABLES"
-// GLOBAL: LEGO1 0x100f3e50
 extern const char* g_endOfVariables;
 
 // FUNCTION: LEGO1 0x10039550
diff --git a/LEGO1/legoomni.cpp b/LEGO1/legoomni.cpp
index ff695c63..e401f51a 100644
--- a/LEGO1/legoomni.cpp
+++ b/LEGO1/legoomni.cpp
@@ -112,8 +112,8 @@ const char* g_current = "current";
 // GLOBAL: LEGO1 0x101020e8
 void (*g_omniUserMessage)(const char*, int);
 
-// GLOBAL: LEGO1 0x100f4c54
-MxBool g_isWorldActive;
+// GLOBAL: LEGO1 0x100f4c58
+MxBool g_isWorldActive = TRUE;
 
 // FUNCTION: LEGO1 0x10015700
 LegoOmni* Lego()
diff --git a/LEGO1/legoworld.cpp b/LEGO1/legoworld.cpp
index 11467954..48c95c4f 100644
--- a/LEGO1/legoworld.cpp
+++ b/LEGO1/legoworld.cpp
@@ -122,7 +122,7 @@ void LegoWorld::FUN_10073400()
 {
 }
 
-// STUB: LEGO1 0x10073400
+// STUB: LEGO1 0x10073430
 void LegoWorld::FUN_10073430()
 {
 }
diff --git a/LEGO1/motorcycle.h b/LEGO1/motorcycle.h
index 3b847873..a698fcd8 100644
--- a/LEGO1/motorcycle.h
+++ b/LEGO1/motorcycle.h
@@ -13,7 +13,7 @@ class Motorcycle : public IslePathActor {
 	// FUNCTION: LEGO1 0x10035840
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// GLOBAL: LEGO1 0x10035840
+		// GLOBAL: LEGO1 0x100f38e8
 		return "Motorcycle";
 	}
 
diff --git a/LEGO1/mxdsbuffer.h b/LEGO1/mxdsbuffer.h
index 1a37ba2a..af9b466f 100644
--- a/LEGO1/mxdsbuffer.h
+++ b/LEGO1/mxdsbuffer.h
@@ -27,7 +27,7 @@ class MxDSBuffer : public MxCore {
 	// FUNCTION: LEGO1 0x100c6500
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// GLOBAL: LEGO1 0x100f0568
+		// GLOBAL: LEGO1 0x101025b8
 		return "MxDSBuffer";
 	}
 
diff --git a/LEGO1/mxdsselectaction.h b/LEGO1/mxdsselectaction.h
index e4f09433..187e3a72 100644
--- a/LEGO1/mxdsselectaction.h
+++ b/LEGO1/mxdsselectaction.h
@@ -49,7 +49,4 @@ class MxDSSelectAction : public MxDSParallelAction {
 // FUNCTION: LEGO1 0x100cbd00
 // MxStringListCursor::~MxStringListCursor
 
-// TEMPLATE: LEGO1 0x100cc450
-// MxListEntry<MxString>::GetValue
-
 #endif // MXDSSELECTACTION_H
diff --git a/LEGO1/mxramstreamcontroller.h b/LEGO1/mxramstreamcontroller.h
index df7f12a9..008fe458 100644
--- a/LEGO1/mxramstreamcontroller.h
+++ b/LEGO1/mxramstreamcontroller.h
@@ -14,7 +14,7 @@ class MxRAMStreamController : public MxStreamController {
 	// FUNCTION: LEGO1 0x100b9430
 	inline virtual const char* ClassName() const override // vtable+0xc
 	{
-		// GLOBAL: LEGO1 0x10102130
+		// GLOBAL: LEGO1 0x10102118
 		return "MxRAMStreamController";
 	}
 
diff --git a/LEGO1/score.h b/LEGO1/score.h
index 03a20a0a..89d9608d 100644
--- a/LEGO1/score.h
+++ b/LEGO1/score.h
@@ -18,7 +18,7 @@ class Score : public LegoWorld {
 	// FUNCTION: LEGO1 0x100010c0
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
-		// GLOBAL: LEGO1 0x100f0058
+		// GLOBAL: LEGO1 0x100f0050
 		return "Score";
 	}