3 files changed, 14 insertions, 12 deletions
diff --git a/src/code/main.c b/src/code/main.c
index b036123be..c4a80f1ea 100644
--- a/src/code/main.c
+++ b/src/code/main.c
@@ -46,7 +46,7 @@ void Main(void* arg) {
     startHeapSize = fb - sysHeap;
     SystemArena_Init(sysHeap, startHeapSize);
 
-    GameInfo_Init();
+    Regs_Init();
 
     R_ENABLE_ARENA_DBG = 0;
 
diff --git a/src/code/z_debug.c b/src/code/z_debug.c
index 46649a4ce..058d896a4 100644
--- a/src/code/z_debug.c
+++ b/src/code/z_debug.c
@@ -1,20 +1,21 @@
-#include "global.h"
+#include "regs.h"
 #include "system_malloc.h"
+#include "macros.h"
 
-GameInfo* gGameInfo;
+RegEditor* gRegEditor;
 
-void GameInfo_Init(void) {
+void Regs_Init(void) {
     s32 i;
 
-    gGameInfo = SystemArena_Malloc(sizeof(GameInfo));
+    gRegEditor = SystemArena_Malloc(sizeof(RegEditor));
     if (1) {}
-    gGameInfo->unk_00 = 0;
-    gGameInfo->unk_01 = 0;
-    gGameInfo->unk_02 = 0;
-    gGameInfo->unk_04 = 0;
-    gGameInfo->unk_03 = 0;
+    gRegEditor->regPage = 0;
+    gRegEditor->regGroup = 0;
+    gRegEditor->regCur = 0;
+    gRegEditor->inputRepeatTimer = 0;
+    gRegEditor->dPadInputPrev = 0;
 
-    for (i = 0; i < ARRAY_COUNT(gGameInfo->data); i++) {
-        gGameInfo->data[i] = 0;
+    for (i = 0; i < ARRAY_COUNT(gRegEditor->data); i++) {
+        gRegEditor->data[i] = 0;
     }
 }
diff --git a/src/overlays/actors/ovl_Obj_Nozoki/z_obj_nozoki.c b/src/overlays/actors/ovl_Obj_Nozoki/z_obj_nozoki.c
index 0a3f703fb..2307fe2c4 100644
--- a/src/overlays/actors/ovl_Obj_Nozoki/z_obj_nozoki.c
+++ b/src/overlays/actors/ovl_Obj_Nozoki/z_obj_nozoki.c
@@ -4,6 +4,7 @@
  * Description: Sakon's Hideout Objects (Sun's Mask, doors, etc)
  */
 
+#include "prevent_bss_reordering.h"
 #include "z_obj_nozoki.h"
 #include "objects/object_secom_obj/object_secom_obj.h"