[leak informed] Break apart gBacklightTop

4 files changed, 55 insertions, 37 deletions

diff --git a/arm9/global.inc b/arm9/global.inc
index 38ec47f4..4ed9aa74 100644
--- a/arm9/global.inc
+++ b/arm9/global.inc
@@ -7708,6 +7708,7 @@
 .extern MTX_TransApply44
 .extern NitroMain
 .extern gBacklightTop
+.extern UNK_02016FA4
 .extern OS_AllocFromArenaHi
 .extern OS_AllocFromArenaLo
 .extern OS_AllocFromHeap
diff --git a/arm9/modules/83/asm/module_83.s b/arm9/modules/83/asm/module_83.s
index 7e36aa68..8b006bca 100644
--- a/arm9/modules/83/asm/module_83.s
+++ b/arm9/modules/83/asm/module_83.s
@@ -18576,7 +18576,7 @@ MOD83_02236804: ; 0x02236804
 	bl CTRDG_IsPulledOut
 	cmp r0, #1
 	beq _02236822
-	ldr r0, _02236B3C ; =gBacklightTop + 4
+	ldr r0, _02236B3C ; =UNK_02016FA4
 	ldr r0, [r0]
 	cmp r0, #0
 	beq _02236828
@@ -18966,7 +18966,7 @@ _02236B2E:
 	str r0, [r5]
 	b _02236D90
 	.align 2, 0
-_02236B3C: .word gBacklightTop + 4
+_02236B3C: .word UNK_02016FA4
 _02236B40: .word 0x000004A8
 _02236B44: .word 0x000004AC
 _02236B48: .word 0x0000E880
diff --git a/arm9/src/main.c b/arm9/src/main.c
index 117535b2..dd806cf8 100644
--- a/arm9/src/main.c
+++ b/arm9/src/main.c
@@ -22,7 +22,9 @@ FS_EXTERN_OVERLAY(MODULE_63);
 
 #define SOFT_RESET_KEY (PAD_BUTTON_L | PAD_BUTTON_R | PAD_BUTTON_START | PAD_BUTTON_SELECT)
 
-struct Unk2106FA0 gBacklightTop;
+s32 UNK_02016FA4;
+PMBackLightSwitch gBacklightTop;
+struct UnkStruct_02016FA8 UNK_02016FA8;;
 
 extern void InitSystemForTheGame(void);
 extern void InitGraphicMemory(void);
@@ -52,6 +54,7 @@ extern u8 SDK_STATIC_BSS_START[];
 const int gGameLanguage = GAME_LANGUAGE;
 const int gGameVersion = GAME_VERSION;
 
+__declspec(noreturn)
 THUMB_FUNC void NitroMain(void)
 {
     InitSystemForTheGame();
@@ -68,13 +71,13 @@ THUMB_FUNC void NitroMain(void)
     FUN_02002C50(0, 3);
     FUN_02002C50(1, 3);
     FUN_02002C50(3, 3);
-    gBacklightTop.unk18 = -1;
-    gBacklightTop.unk20 = SaveBlock2_new();
-    InitSoundData(FUN_02029EF8(gBacklightTop.unk20), Sav2_PlayerData_GetOptionsAddr(gBacklightTop.unk20));
+    UNK_02016FA8.unk10 = -1;
+    UNK_02016FA8.unk18 = SaveBlock2_new();
+    InitSoundData(FUN_02029EF8(UNK_02016FA8.unk18), Sav2_PlayerData_GetOptionsAddr(UNK_02016FA8.unk18));
     Init_Timer3();
     if (FUN_020337E8(3) == 3)
         FUN_02034188(3, 0);
-    if (FUN_020227FC(gBacklightTop.unk20) == 0)
+    if (FUN_020227FC(UNK_02016FA8.unk18) == 0)
     {
         FUN_02089D90(0);
     }
@@ -84,12 +87,12 @@ THUMB_FUNC void NitroMain(void)
         {
         case 0:
             // Title Demo
-            gBacklightTop.unk1C = 0;
+            UNK_02016FA8.unk14 = 0;
             RegisterMainOverlay(FS_OVERLAY_ID(MODULE_63), &MOD63_021DBE18);
             break;
         case 1:
             // Reset transition?
-            gBacklightTop.unk1C = 1;
+            UNK_02016FA8.unk14 = 1;
             RegisterMainOverlay(FS_OVERLAY_ID(MODULE_52), &MOD52_021D76C8);
             break;
         default:
@@ -102,7 +105,7 @@ THUMB_FUNC void NitroMain(void)
     InitializeMainRNG();
     FUN_0200A2AC();
     FUN_02015E30();
-    gBacklightTop.unk4 = 0;
+    UNK_02016FA4 = 0;
     for (;;)
     {
         FUN_02000EE8();
@@ -141,40 +144,40 @@ THUMB_FUNC void NitroMain(void)
 
 THUMB_FUNC void FUN_02000DF4(void)
 {
-    gBacklightTop.unk8 = (FSOverlayID)-1;
-    gBacklightTop.unkC = 0;
-    gBacklightTop.unk10 = (FSOverlayID)-1; // overlay invalid
-    gBacklightTop.unk14 = NULL;
+    UNK_02016FA8.unk0 = SDK_OVERLAY_INVALID_ID;
+    UNK_02016FA8.unk4 = NULL;
+    UNK_02016FA8.unk8 = SDK_OVERLAY_INVALID_ID; // overlay invalid
+    UNK_02016FA8.unkC = NULL;
 }
 
 THUMB_FUNC void Main_RunOverlayManager(void)
 {
-    if (!gBacklightTop.unkC)
+    if (UNK_02016FA8.unk4 == NULL)
     {
-        if (gBacklightTop.unk14 == NULL)
+        if (UNK_02016FA8.unkC == NULL)
             return;
-        if (gBacklightTop.unk10 != SDK_OVERLAY_INVALID_ID)
-            HandleLoadOverlay(gBacklightTop.unk10, 0);
-        gBacklightTop.unk8 = gBacklightTop.unk10;
-        gBacklightTop.unkC = OverlayManager_new(gBacklightTop.unk14, &gBacklightTop.unk18, 0);
-        gBacklightTop.unk10 = SDK_OVERLAY_INVALID_ID;
-        gBacklightTop.unk14 = NULL;
+        if (UNK_02016FA8.unk8 != SDK_OVERLAY_INVALID_ID)
+            HandleLoadOverlay(UNK_02016FA8.unk8, 0);
+        UNK_02016FA8.unk0 = UNK_02016FA8.unk8;
+        UNK_02016FA8.unk4 = OverlayManager_new(UNK_02016FA8.unkC, &UNK_02016FA8.unk10, 0);
+        UNK_02016FA8.unk8 = SDK_OVERLAY_INVALID_ID;
+        UNK_02016FA8.unkC = NULL;
     }
-    if (OverlayManager_Run(gBacklightTop.unkC))
+    if (OverlayManager_Run(UNK_02016FA8.unk4))
     {
-        OverlayManager_delete(gBacklightTop.unkC);
-        gBacklightTop.unkC = 0;
-        if (gBacklightTop.unk8 != SDK_OVERLAY_INVALID_ID)
-            UnloadOverlayByID(gBacklightTop.unk8);
+        OverlayManager_delete(UNK_02016FA8.unk4);
+        UNK_02016FA8.unk4 = NULL;
+        if (UNK_02016FA8.unk0 != SDK_OVERLAY_INVALID_ID)
+            UnloadOverlayByID(UNK_02016FA8.unk0);
     }
 }
 
 THUMB_FUNC void RegisterMainOverlay(FSOverlayID id, const struct Unk21DBE18 * arg1)
 {
-    if (gBacklightTop.unk14 != NULL)
+    if (UNK_02016FA8.unkC != NULL)
         ErrorHandling();
-    gBacklightTop.unk10 = id;
-    gBacklightTop.unk14 = arg1;
+    UNK_02016FA8.unk8 = id;
+    UNK_02016FA8.unkC = arg1;
 }
 
 THUMB_FUNC void FUN_02000E9C(void)
@@ -215,7 +218,7 @@ THUMB_FUNC void FUN_02000EE8(void)
 
 extern void FUN_0200E3A0(PMLCDTarget, int);
 
-// No Return
+__declspec(noreturn)
 THUMB_FUNC void DoSoftReset(u32 parameter)
 {
     FUN_0200E3A0(PM_LCD_TOP, 0x7FFF);
@@ -289,10 +292,10 @@ THUMB_FUNC void HandleDSLidAction(void)
             FUN_0201CE04();
             if (CTRDG_IsPulledOut() == TRUE)
             {
-                gBacklightTop.unk4 = 1;
+                UNK_02016FA4 = 1;
             }
             {
-                int r1 = gBacklightTop.unk4;
+                int r1 = UNK_02016FA4;
                 while (1)
                 {
                     PMWakeUpTrigger trigger = PM_TRIGGER_COVER_OPEN | PM_TRIGGER_CARD;
@@ -306,7 +309,7 @@ THUMB_FUNC void HandleDSLidAction(void)
                     }
                     else if (PAD_DetectFold())
                     {
-                        r1 = gBacklightTop.unk4 = 1;
+                        r1 = UNK_02016FA4 = 1;
                     }
                     else
                         break;
@@ -326,6 +329,6 @@ THUMB_FUNC void HandleDSLidAction(void)
     {
         PM_GetBackLight(&top, &bottom);
         if (top == PM_BACKLIGHT_OFF)
-            PM_SetBackLight(PM_LCD_ALL, gBacklightTop.unk0);
+            PM_SetBackLight(PM_LCD_ALL, gBacklightTop);
     }
 }
diff --git a/include/main.h b/include/main.h
index 2e424e09..78e0fd76 100644
--- a/include/main.h
+++ b/include/main.h
@@ -104,8 +104,22 @@ struct Main
 
 //extern struct UnkStruct_021C4918 gMain + 0x60;
 
-extern struct Unk2106FA0 gBacklightTop;
-extern struct Unk2106FA0 gBacklightTop_2; // same as the first one, it's referenced twice in the constant pool...
+extern PMBackLightSwitch gBacklightTop;
+extern s32 UNK_02016FA4;
+
+struct UnkStruct_02016FA8
+{
+    FSOverlayID unk0;
+    struct UnkStruct_02006234 *unk4;
+    FSOverlayID unk8;
+    const struct Unk21DBE18 * unkC;
+    s32 unk10;
+    s32 unk14;
+    struct SaveBlock2 * unk18;
+
+};
+
+extern struct UnkStruct_02016FA8 UNK_02016FA8;
 
 void NitroMain(void);