diff --git a/LEGO1/define.cpp b/LEGO1/define.cpp
index d083988c..84073b9d 100644
--- a/LEGO1/define.cpp
+++ b/LEGO1/define.cpp
@@ -1,11 +1,5 @@
 #include "define.h"
 
-// 0x100f3be8
-const char *g_str_enable = "enable";
-
-// 0x100f3bf4
-const char *g_str_disable = "disable";
-
 // 0x10101eac
 const char *g_parseExtraTokens = ":;";
 
diff --git a/LEGO1/define.h b/LEGO1/define.h
index b0b447fc..ec41943e 100644
--- a/LEGO1/define.h
+++ b/LEGO1/define.h
@@ -1,8 +1,6 @@
 #ifndef DEFINE_H
 #define DEFINE_H
 
-extern const char *g_str_enable;
-extern const char *g_str_disable;
 extern const char *g_parseExtraTokens;
 extern const char *g_strWORLD;
 extern const char *g_strACTION;
diff --git a/LEGO1/legofullscreenmovie.cpp b/LEGO1/legofullscreenmovie.cpp
index 2fcb8474..f2a287f3 100644
--- a/LEGO1/legofullscreenmovie.cpp
+++ b/LEGO1/legofullscreenmovie.cpp
@@ -1,11 +1,16 @@
 #include "legofullscreenmovie.h"
 #include "mxtypes.h"
 #include "legoomni.h"
-#include "define.h"
 #include "decomp.h"
 
 DECOMP_SIZE_ASSERT(LegoFullScreenMovie, 0x24)
 
+// 0x100f3be8
+const char *g_str_enable = "enable";
+
+// 0x100f3bf4
+const char *g_str_disable = "disable";
+
 // OFFSET: LEGO1 0x1003c500
 LegoFullScreenMovie::LegoFullScreenMovie(const char *p_key, const char *p_value)
 {
diff --git a/LEGO1/legogamestate.cpp b/LEGO1/legogamestate.cpp
index 02f2e0d6..0f444f95 100644
--- a/LEGO1/legogamestate.cpp
+++ b/LEGO1/legogamestate.cpp
@@ -1,5 +1,10 @@
 #include "legogamestate.h"
 #include "legoomni.h"
+#include "decomp.h"
+
+// Based on the highest dword offset (0x42c) referenced in the constructor.
+// There may be other members that come after.
+DECOMP_SIZE_ASSERT(LegoGameState, 0x430)
 
 // OFFSET: LEGO1 0x10039550
 LegoGameState::LegoGameState()
diff --git a/LEGO1/legogamestate.h b/LEGO1/legogamestate.h
index 6939395d..b1cd8b60 100644
--- a/LEGO1/legogamestate.h
+++ b/LEGO1/legogamestate.h
@@ -6,6 +6,7 @@
 #include "legobackgroundcolor.h"
 #include "legofullscreenmovie.h"
 
+// SIZE 0x430 (at least)
 class LegoGameState
 {
 public:
@@ -18,11 +19,12 @@ class LegoGameState
   __declspec(dllexport) void SetSavePath(char *p);
 
 private:
-  char *m_savePath;
-  undefined m_unk[20];
+  char *m_savePath; // 0x0
+  undefined m_unk04[20];
   LegoBackgroundColor *m_backgroundColor; // 0x18
   LegoBackgroundColor *m_tempBackgroundColor; // 0x1c
   LegoFullScreenMovie *m_fullScreenMovie; // 0x20
+  undefined m_unk24[1036];
 };
 
 #endif // LEGOGAMESTATE_H
diff --git a/LEGO1/legovideomanager.cpp b/LEGO1/legovideomanager.cpp
index 3bba1aea..4105ef2a 100644
--- a/LEGO1/legovideomanager.cpp
+++ b/LEGO1/legovideomanager.cpp
@@ -30,7 +30,7 @@ int LegoVideoManager::DisableRMDevice()
 // OFFSET: LEGO1 0x1007c300
 void LegoVideoManager::EnableFullScreenMovie(MxBool p_enable)
 {
-  EnableFullScreenMovie(p_enable, 1);
+  EnableFullScreenMovie(p_enable, TRUE);
 }
 
 // OFFSET: LEGO1 0x1007c310 STUB