Idle + Main bss and cleanup (#1292)

* Idle bss and cleanup

* main bss and cleanup

* format

* Remove pad comment about sAudioMgr

* PR

* Missed a couple size_t changes

* unused pads

* static

20 files changed, 129 insertions, 124 deletions

diff --git a/src/boot_O2_g3/boot_main.c b/src/boot_O2_g3/boot_main.c
index ed16c34e0..dcb66fefd 100644
--- a/src/boot_O2_g3/boot_main.c
+++ b/src/boot_O2_g3/boot_main.c
@@ -1,5 +1,6 @@
 #include "prevent_bss_reordering.h"
 #include "global.h"
+#include "idle.h"
 #include "stack.h"
 #include "stackcheck.h"
 #include "z64thread.h"
diff --git a/src/boot_O2_g3/idle.c b/src/boot_O2_g3/idle.c
index f7c847449..ccdf98695 100644
--- a/src/boot_O2_g3/idle.c
+++ b/src/boot_O2_g3/idle.c
@@ -1,17 +1,10 @@
-#include "prevent_bss_reordering.h"
-#include "global.h"
+#include "irqmgr.h"
+#include "main.h"
 #include "stack.h"
-#include "buffers.h"
 #include "stackcheck.h"
 #include "z64thread.h"
 
-u8 D_80096B20 = 1;
-vu8 gViConfigUseDefault = 1;
-u8 gViConfigAdditionalScanLines = 0;
-u32 gViConfigFeatures = 0x42;
-f32 gViConfigXScale = 1.0f;
-f32 gViConfigYScale = 1.0f;
-
+// Variables are put before most headers as a hacky way to bypass bss reordering
 IrqMgr gIrqMgr;
 STACK(sIrqMgrStack, 0x500);
 StackEntry sIrqMgrStackInfo;
@@ -19,90 +12,101 @@ OSThread sMainThread;
 STACK(sMainStack, 0x900);
 StackEntry sMainStackInfo;
 OSMesg sPiMgrCmdBuff[50];
-OSMesgQueue gPiMgrCmdQ;
+OSMesgQueue gPiMgrCmdQueue;
+OSViMode gViConfigMode;
+u8 gViConfigModeType;
 
-void Idle_ClearMemory(void* begin, void* end) {
+#include "global.h"
+#include "buffers.h"
+#include "idle.h"
+
+u8 D_80096B20 = 1;
+vu8 gViConfigUseBlack = true;
+u8 gViConfigAdditionalScanLines = 0;
+u32 gViConfigFeatures = OS_VI_DITHER_FILTER_ON | OS_VI_GAMMA_OFF;
+f32 gViConfigXScale = 1.0f;
+f32 gViConfigYScale = 1.0f;
+
+void Main_ClearMemory(void* begin, void* end) {
     if (begin < end) {
         bzero(begin, (uintptr_t)end - (uintptr_t)begin);
     }
 }
 
-void Idle_InitFramebuffer(u32* ptr, size_t numBytes, u32 value) {
-    s32 temp = sizeof(u32);
-
-    while (numBytes) {
-        *ptr++ = value;
-        numBytes -= temp;
+void Main_InitFramebuffer(u32* framebuffer, size_t numBytes, u32 value) {
+    for (; numBytes > 0; numBytes -= sizeof(u32)) {
+        *framebuffer++ = value;
     }
 }
 
-void Idle_InitScreen(void) {
-    Idle_InitFramebuffer((u32*)gFramebuffer1, 0x25800, 0x00010001);
-    ViConfig_UpdateVi(0);
+void Main_InitScreen(void) {
+    Main_InitFramebuffer((u32*)gFramebuffer1, sizeof(gFramebuffer1),
+                         (GPACK_RGBA5551(0, 0, 0, 1) << 16) | GPACK_RGBA5551(0, 0, 0, 1));
+    ViConfig_UpdateVi(false);
     osViSwapBuffer(gFramebuffer1);
     osViBlack(false);
 }
 
-void Idle_InitMemory(void) {
-    u32 pad;
+void Main_InitMemory(void) {
+    void* memStart = (void*)0x80000400;
     void* memEnd = OS_PHYSICAL_TO_K0(osMemSize);
 
-    Idle_ClearMemory(0x80000400, gFramebuffer1);
-    Idle_ClearMemory(D_80025D00, bootproc);
-    Idle_ClearMemory(gGfxSPTaskYieldBuffer, memEnd);
+    Main_ClearMemory(memStart, gFramebuffer1);
+    Main_ClearMemory(D_80025D00, bootproc);
+    Main_ClearMemory(gGfxSPTaskYieldBuffer, memEnd);
 }
 
-void Idle_InitCodeAndMemory(void) {
+void Main_Init(void) {
     DmaRequest dmaReq;
-    OSMesgQueue queue;
-    OSMesg mesg;
-    size_t oldSize;
+    OSMesgQueue mq;
+    OSMesg msg[1];
+    size_t prevSize;
 
-    osCreateMesgQueue(&queue, &mesg, 1);
+    osCreateMesgQueue(&mq, msg, ARRAY_COUNT(msg));
 
-    oldSize = sDmaMgrDmaBuffSize;
-    sDmaMgrDmaBuffSize = 0;
+    prevSize = gDmaMgrDmaBuffSize;
+    gDmaMgrDmaBuffSize = 0;
 
     DmaMgr_SendRequestImpl(&dmaReq, SEGMENT_START(code), SEGMENT_ROM_START(code),
-                           SEGMENT_ROM_END(code) - SEGMENT_ROM_START(code), 0, &queue, 0);
-    Idle_InitScreen();
-    Idle_InitMemory();
-    osRecvMesg(&queue, NULL, OS_MESG_BLOCK);
+                           SEGMENT_ROM_END(code) - SEGMENT_ROM_START(code), 0, &mq, NULL);
+    Main_InitScreen();
+    Main_InitMemory();
+    osRecvMesg(&mq, NULL, OS_MESG_BLOCK);
 
-    sDmaMgrDmaBuffSize = oldSize;
+    gDmaMgrDmaBuffSize = prevSize;
 
-    Idle_ClearMemory(SEGMENT_BSS_START(code), SEGMENT_BSS_END(code));
+    Main_ClearMemory(SEGMENT_BSS_START(code), SEGMENT_BSS_END(code));
 }
 
 void Main_ThreadEntry(void* arg) {
     StackCheck_Init(&sIrqMgrStackInfo, sIrqMgrStack, STACK_TOP(sIrqMgrStack), 0, 0x100, "irqmgr");
     IrqMgr_Init(&gIrqMgr, STACK_TOP(sIrqMgrStack), Z_PRIORITY_IRQMGR, 1);
     DmaMgr_Start();
-    Idle_InitCodeAndMemory();
+    Main_Init();
     Main(arg);
     DmaMgr_Stop();
 }
 
 void Idle_InitVideo(void) {
-    osCreateViManager(254);
+    osCreateViManager(OS_PRIORITY_VIMGR);
 
-    gViConfigFeatures = 66;
-    gViConfigXScale = 1.0;
-    gViConfigYScale = 1.0;
+    gViConfigFeatures = OS_VI_DITHER_FILTER_ON | OS_VI_GAMMA_OFF;
+    gViConfigXScale = 1.0f;
+    gViConfigYScale = 1.0f;
 
     switch (osTvType) {
         case OS_TV_NTSC:
-            D_8009B290 = 2;
+            gViConfigModeType = OS_VI_NTSC_LAN1;
             gViConfigMode = osViModeNtscLan1;
             break;
 
         case OS_TV_MPAL:
-            D_8009B290 = 30;
+            gViConfigModeType = OS_VI_MPAL_LAN1;
             gViConfigMode = osViModeMpalLan1;
             break;
 
         case OS_TV_PAL:
-            D_8009B290 = 44;
+            gViConfigModeType = OS_VI_FPAL_LAN1;
             gViConfigMode = osViModeFpalLan1;
             gViConfigYScale = 0.833f;
             break;
@@ -113,10 +117,11 @@ void Idle_InitVideo(void) {
 
 void Idle_ThreadEntry(void* arg) {
     Idle_InitVideo();
-    osCreatePiManager(150, &gPiMgrCmdQ, sPiMgrCmdBuff, ARRAY_COUNT(sPiMgrCmdBuff));
+    osCreatePiManager(OS_PRIORITY_PIMGR, &gPiMgrCmdQueue, sPiMgrCmdBuff, ARRAY_COUNT(sPiMgrCmdBuff));
     StackCheck_Init(&sMainStackInfo, sMainStack, STACK_TOP(sMainStack), 0, 0x400, "main");
     osCreateThread(&sMainThread, Z_THREAD_ID_MAIN, Main_ThreadEntry, arg, STACK_TOP(sMainStack), Z_PRIORITY_MAIN);
     osStartThread(&sMainThread);
-    osSetThreadPri(NULL, 0);
+    osSetThreadPri(NULL, OS_PRIORITY_IDLE);
 
-    do { } while (true); }
+    for (;;) {}
+}
diff --git a/src/boot_O2_g3/idle_extra_bss.c b/src/boot_O2_g3/idle_extra_bss.c
deleted file mode 100644
index 24fc0083f..000000000
--- a/src/boot_O2_g3/idle_extra_bss.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "PR/ultratypes.h"
-#include "ultra64/vi.h"
-
-// This file is currently required to fix bss reordering in idle.c. It is not resolved by prevent_bss_reordering.h .
-// Hopefully it will not be permanent.
-
-OSViMode gViConfigMode;
-u8 D_8009B290;
diff --git a/src/boot_O2_g3/viconfig.c b/src/boot_O2_g3/viconfig.c
index 6539421e6..ccba4e932 100644
--- a/src/boot_O2_g3/viconfig.c
+++ b/src/boot_O2_g3/viconfig.c
@@ -1,14 +1,17 @@
 #include "global.h"
+#include "idle.h"
 
-void ViConfig_UpdateVi(u32 mode) {
-    if (mode != 0) {
+void ViConfig_UpdateVi(u32 black) {
+    if (black) {
         switch (osTvType) {
             case OS_TV_MPAL:
                 osViSetMode(&osViModeMpalLan1);
                 break;
+
             case OS_TV_PAL:
                 osViSetMode(&osViModePalLan1);
                 break;
+
             case OS_TV_NTSC:
             default:
                 osViSetMode(&osViModeNtscLan1);
@@ -42,11 +45,11 @@ void ViConfig_UpdateVi(u32 mode) {
         }
     }
 
-    gViConfigUseDefault = mode;
+    gViConfigUseBlack = black;
 }
 
 void ViConfig_UpdateBlack(void) {
-    if (gViConfigUseDefault != 0) {
+    if (gViConfigUseBlack) {
         osViBlack(true);
     } else {
         osViBlack(false);
diff --git a/src/boot_O2_g3/z_std_dma.c b/src/boot_O2_g3/z_std_dma.c
index 71b7ae846..477fd3f68 100644
--- a/src/boot_O2_g3/z_std_dma.c
+++ b/src/boot_O2_g3/z_std_dma.c
@@ -4,10 +4,10 @@
 #include "stackcheck.h"
 #include "z64thread.h"
 
-u32 sDmaMgrDmaBuffSize = 0x2000;
+size_t gDmaMgrDmaBuffSize = 0x2000;
 
 StackEntry sDmaMgrStackInfo;
-u16 numDmaEntries;
+u16 sNumDmaEntries;
 OSMesgQueue sDmaMgrMsgQueue;
 OSMesg sDmaMgrMsgs[32];
 OSThread sDmaMgrThread;
@@ -18,7 +18,7 @@ s32 DmaMgr_DmaRomToRam(uintptr_t rom, void* ram, size_t size) {
     OSMesgQueue queue;
     OSMesg msg[1];
     s32 ret;
-    size_t buffSize = sDmaMgrDmaBuffSize;
+    size_t buffSize = gDmaMgrDmaBuffSize;
 
     osInvalDCache(ram, size);
     osCreateMesgQueue(&queue, msg, ARRAY_COUNT(msg));
@@ -127,7 +127,7 @@ void DmaMgr_ProcessMsg(DmaRequest* req) {
 
     index = DmaMgr_FindDmaIndex(vrom);
 
-    if ((index >= 0) && (index < numDmaEntries)) {
+    if ((index >= 0) && (index < sNumDmaEntries)) {
         dmaEntry = &dmadata[index];
         if (dmaEntry->romEnd == 0) {
             if (dmaEntry->vromEnd < (vrom + size)) {
@@ -225,7 +225,7 @@ void DmaMgr_Start(void) {
             idx++;
         }
 
-        numDmaEntries = idx;
+        sNumDmaEntries = idx;
     }
 
     osCreateMesgQueue(&sDmaMgrMsgQueue, sDmaMgrMsgs, ARRAY_COUNT(sDmaMgrMsgs));
diff --git a/src/code/game.c b/src/code/game.c
index 685b2f492..50139348c 100644
--- a/src/code/game.c
+++ b/src/code/game.c
@@ -1,5 +1,6 @@
 #include "global.h"
 #include "audiomgr.h"
+#include "idle.h"
 #include "system_malloc.h"
 #include "z64debug_text.h"
 #include "z64rumble.h"
diff --git a/src/code/graph.c b/src/code/graph.c
index f4f04fc1f..6d4665b39 100644
--- a/src/code/graph.c
+++ b/src/code/graph.c
@@ -1,6 +1,7 @@
 #include "prevent_bss_reordering.h"
 #include "global.h"
 #include "buffers.h"
+#include "idle.h"
 #include "system_malloc.h"
 #include "overlays/gamestates/ovl_daytelop/z_daytelop.h"
 #include "overlays/gamestates/ovl_file_choose/z_file_select.h"
diff --git a/src/code/main.c b/src/code/main.c
index 381c42fac..f969df70d 100644
--- a/src/code/main.c
+++ b/src/code/main.c
@@ -1,34 +1,41 @@
-/**
- * This file has unmigrated bss. It is not practical to migrate it until we have a better way of dealing with bss
- * reordering than just prevent_bss_reordering.h: there is too much of it to control, and it cannot be split into
- * separate files since most of it is at addresses ending in 8.
- */
-
-#include "global.h"
 #include "audiomgr.h"
-#include "buffers.h"
+#include "idle.h"
+#include "irqmgr.h"
+#include "padmgr.h"
+#include "scheduler.h"
 #include "stack.h"
 #include "stackcheck.h"
 #include "system_heap.h"
 #include "z64thread.h"
 
-extern OSMesgQueue sSiIntMsgQ;
-extern OSMesg sSiIntMsgBuf[1];
-extern u32 gSegments[NUM_SEGMENTS];
-extern SchedContext gSchedContext;
-extern IrqMgrClient irqClient;
-extern OSMesgQueue irqMgrMsgQ;
-extern OSMesg irqMgrMsgBuf[60];
-extern OSThread gGraphThread;
-extern STACK(sGraphStack, 0x1800);
-extern STACK(sSchedStack, 0x600);
-extern STACK(sAudioStack, 0x800);
-extern STACK(sPadMgrStack, 0x500);
-extern StackEntry sGraphStackInfo;
-extern StackEntry sSchedStackInfo;
-extern StackEntry sAudioStackInfo;
-extern StackEntry sPadMgrStackInfo;
-extern AudioMgr sAudioMgr;
+// Variables are put before most headers as a hacky way to bypass bss reordering
+OSMesgQueue sSerialEventQueue;
+OSMesg sSerialMsgBuf[1];
+u32 gSegments[NUM_SEGMENTS];
+SchedContext gSchedContext;
+IrqMgrClient sIrqClient;
+OSMesgQueue sIrqMgrMsgQueue;
+OSMesg sIrqMgrMsgBuf[60];
+OSThread gGraphThread;
+STACK(sGraphStack, 0x1800);
+STACK(sSchedStack, 0x600);
+STACK(sAudioStack, 0x800);
+STACK(sPadMgrStack, 0x500);
+StackEntry sGraphStackInfo;
+StackEntry sSchedStackInfo;
+StackEntry sAudioStackInfo;
+StackEntry sPadMgrStackInfo;
+AudioMgr sAudioMgr;
+static s32 sBssPad;
+PadMgr gPadMgr;
+
+#include "main.h"
+#include "buffers.h"
+#include "global.h"
+
+s32 gScreenWidth = SCREEN_WIDTH;
+s32 gScreenHeight = SCREEN_HEIGHT;
+size_t gSystemHeapSize = 0;
 
 void Main(void* arg) {
     intptr_t fb;
@@ -46,30 +53,31 @@ void Main(void* arg) {
 
     sysHeap = gSystemHeap;
     fb = 0x80780000;
-    startHeapSize = fb - sysHeap;
-    SystemHeap_Init(sysHeap, startHeapSize);
+    gSystemHeapSize = fb - sysHeap;
+    SystemHeap_Init(sysHeap, gSystemHeapSize);
 
     Regs_Init();
 
     R_ENABLE_ARENA_DBG = 0;
 
-    osCreateMesgQueue(&sSiIntMsgQ, sSiIntMsgBuf, ARRAY_COUNT(sSiIntMsgBuf));
-    osSetEventMesg(OS_EVENT_SI, &sSiIntMsgQ, NULL);
+    osCreateMesgQueue(&sSerialEventQueue, sSerialMsgBuf, ARRAY_COUNT(sSerialMsgBuf));
+    osSetEventMesg(OS_EVENT_SI, &sSerialEventQueue, NULL);
 
-    osCreateMesgQueue(&irqMgrMsgQ, irqMgrMsgBuf, ARRAY_COUNT(irqMgrMsgBuf));
+    osCreateMesgQueue(&sIrqMgrMsgQueue, sIrqMgrMsgBuf, ARRAY_COUNT(sIrqMgrMsgBuf));
 
     StackCheck_Init(&sSchedStackInfo, sSchedStack, STACK_TOP(sSchedStack), 0, 0x100, "sched");
-    Sched_Init(&gSchedContext, STACK_TOP(sSchedStack), Z_PRIORITY_SCHED, D_8009B290, 1, &gIrqMgr);
+    Sched_Init(&gSchedContext, STACK_TOP(sSchedStack), Z_PRIORITY_SCHED, gViConfigModeType, 1, &gIrqMgr);
 
     CIC6105_AddRomInfoFaultPage();
 
-    IrqMgr_AddClient(&gIrqMgr, &irqClient, &irqMgrMsgQ);
+    IrqMgr_AddClient(&gIrqMgr, &sIrqClient, &sIrqMgrMsgQueue);
 
     StackCheck_Init(&sAudioStackInfo, sAudioStack, STACK_TOP(sAudioStack), 0, 0x100, "audio");
-    AudioMgr_Init(&sAudioMgr, STACK_TOP(sAudioStack), Z_PRIORITY_AUDIOMGR, 0xA, &gSchedContext, &gIrqMgr);
+    AudioMgr_Init(&sAudioMgr, STACK_TOP(sAudioStack), Z_PRIORITY_AUDIOMGR, Z_THREAD_ID_AUDIOMGR, &gSchedContext,
+                  &gIrqMgr);
 
     StackCheck_Init(&sPadMgrStackInfo, sPadMgrStack, STACK_TOP(sPadMgrStack), 0, 0x100, "padmgr");
-    PadMgr_Init(&sSiIntMsgQ, &gIrqMgr, 7, Z_PRIORITY_PADMGR, STACK_TOP(sPadMgrStack));
+    PadMgr_Init(&sSerialEventQueue, &gIrqMgr, Z_THREAD_ID_PADMGR, Z_PRIORITY_PADMGR, STACK_TOP(sPadMgrStack));
 
     AudioMgr_Unlock(&sAudioMgr);
 
@@ -81,7 +89,7 @@ void Main(void* arg) {
 
     while (!exit) {
         msg = NULL;
-        osRecvMesg(&irqMgrMsgQ, (OSMesg*)&msg, OS_MESG_BLOCK);
+        osRecvMesg(&sIrqMgrMsgQueue, (OSMesg*)&msg, OS_MESG_BLOCK);
         if (msg == NULL) {
             break;
         }
@@ -90,12 +98,13 @@ void Main(void* arg) {
             case OS_SC_PRE_NMI_MSG:
                 Nmi_SetPrenmiStart();
                 break;
+
             case OS_SC_NMI_MSG:
                 exit = true;
                 break;
         }
     }
 
-    IrqMgr_RemoveClient(&gIrqMgr, &irqClient);
+    IrqMgr_RemoveClient(&gIrqMgr, &sIrqClient);
     osDestroyThread(&gGraphThread);
 }
diff --git a/src/code/sched.c b/src/code/sched.c
index 29c558ea7..fb7a0073c 100644
--- a/src/code/sched.c
+++ b/src/code/sched.c
@@ -1,5 +1,6 @@
 #include "prevent_bss_reordering.h"
 #include "global.h"
+#include "idle.h"
 #include "stackcheck.h"
 #include "z64thread.h"
 
@@ -20,14 +21,12 @@ u64* gAudioSPDataPtr;
 u32 gAudioSPDataSize;
 
 void Sched_SwapFramebuffer(CfbInfo* cfbInfo) {
-    s32 one = 1;
-
     if (cfbInfo->swapBuffer != NULL) {
         osViSwapBuffer(cfbInfo->swapBuffer);
         cfbInfo->updateRate2 = cfbInfo->updateRate;
 
         if ((SREG(62) == 0) && (cfbInfo->viMode != NULL)) {
-            D_80096B20 = one;
+            D_80096B20 = 1;
             osViSetMode(cfbInfo->viMode);
             osViSetSpecialFeatures(cfbInfo->features);
             osViSetXScale(cfbInfo->xScale);
@@ -43,7 +42,7 @@ void Sched_RetraceUpdateFramebuffer(SchedContext* sched, CfbInfo* cfbInfo) {
         sched->shouldUpdateVi = false;
 
         if (gIrqMgrResetStatus == 0) {
-            ViConfig_UpdateVi(0);
+            ViConfig_UpdateVi(false);
         }
     }
     Sched_SwapFramebuffer(cfbInfo);
@@ -53,7 +52,7 @@ void Sched_HandleReset(SchedContext* sched) {
 }
 
 void Sched_HandleStop(SchedContext* sched) {
-    ViConfig_UpdateVi(1);
+    ViConfig_UpdateVi(true);
 }
 
 /**
@@ -600,7 +599,7 @@ void Sched_ThreadEntry(void* arg) {
  * Registers an IrqClient for the thread and fault client for the SchedContext.
  * Directs the OS to send SP and DP OS messages to interruptQ when the RSP or RDP signal task completion.
  */
-void Sched_Init(SchedContext* sched, void* stack, OSPri pri, UNK_TYPE arg3, UNK_TYPE arg4, IrqMgr* irqMgr) {
+void Sched_Init(SchedContext* sched, void* stack, OSPri pri, u8 viModeType, UNK_TYPE arg4, IrqMgr* irqMgr) {
     bzero(sched, sizeof(SchedContext));
 
     sched->shouldUpdateVi = true;
diff --git a/src/code/sys_ucode.c b/src/code/sys_ucode.c
index f9433eab2..df59275e2 100644
--- a/src/code/sys_ucode.c
+++ b/src/code/sys_ucode.c
@@ -4,12 +4,6 @@
  */
 #include "global.h"
 
-extern u64 rspbootTextStart[];
-extern u64 rspbootTextEnd[];
-
-extern u64 gspF3DZEX2_NoN_PosLight_fifoTextStart[];
-extern u64 gspF3DZEX2_NoN_PosLight_fifoDataStart[];
-
 u64* initialgspUcodeText = gspF3DZEX2_NoN_PosLight_fifoTextStart;
 u64* initialgspUcodeData = gspF3DZEX2_NoN_PosLight_fifoDataStart;
 
diff --git a/src/code/z_play.c b/src/code/z_play.c
index c19b3c277..ac9c1eacc 100644
--- a/src/code/z_play.c
+++ b/src/code/z_play.c
@@ -1,5 +1,6 @@
 #include "global.h"
 #include "buffers.h"
+#include "idle.h"
 #include "z64bombers_notebook.h"
 #include "z64debug_display.h"
 #include "z64quake.h"
diff --git a/src/code/z_prenmi.c b/src/code/z_prenmi.c
index 097d4d946..51f2d77f7 100644
--- a/src/code/z_prenmi.c
+++ b/src/code/z_prenmi.c
@@ -8,7 +8,7 @@ void PreNMI_Stop(PreNMIState* this) {
 
 void PreNMI_Update(PreNMIState* this) {
     if (this->timer == 0) {
-        ViConfig_UpdateVi(1);
+        ViConfig_UpdateVi(true);
         PreNMI_Stop(this);
     } else {
         this->timer--;
diff --git a/src/code/z_skin.c b/src/code/z_skin.c
index 0d3e0bf85..0b7c5d5a0 100644
--- a/src/code/z_skin.c
+++ b/src/code/z_skin.c
@@ -4,7 +4,7 @@
 // 60 is an arbitrary number which specifies the max amount of limbs per skeleton this system supports
 MtxF gSkinLimbMatrices[60];
 
-static s32 sUnused;
+static s32 sBssPad;
 
 void Skin_UpdateVertices(MtxF* mtx, SkinVertex* skinVertices, SkinLimbModif* modifEntry, Vtx* vtxBuf, Vec3f* pos) {
     SkinVertex* vertexEntry;
diff --git a/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c b/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c
index 09b34792b..1d8ca14b0 100644
--- a/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c
+++ b/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c
@@ -57,7 +57,7 @@ static InitChainEntry sInitChain[] = {
     ICHAIN_F32(uncullZoneForward, 2000, ICHAIN_STOP),
 };
 
-s32 sUnused;
+static s32 sBssPad;
 
 void ArrowFire_SetupAction(ArrowFire* this, ArrowFireActionFunc actionFunc) {
     this->actionFunc = actionFunc;
diff --git a/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c b/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c
index acfe454b8..b3df6c265 100644
--- a/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c
+++ b/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c
@@ -21,7 +21,7 @@ void ArrowIce_Fly(ArrowIce* this, PlayState* play);
 
 #include "overlays/ovl_Arrow_Ice/ovl_Arrow_Ice.c"
 
-s32 unused; // Needed for bss
+static s32 sBssPad;
 
 ActorInit Arrow_Ice_InitVars = {
     ACTOR_ARROW_ICE,
diff --git a/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c b/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c
index d0b9ce3ba..8b4f8cad9 100644
--- a/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c
+++ b/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c
@@ -37,7 +37,7 @@ static InitChainEntry sInitChain[] = {
     ICHAIN_F32(uncullZoneForward, 2000, ICHAIN_STOP),
 };
 
-static s32 sUnused;
+static s32 sBssPad;
 
 void ArrowLight_SetupAction(ArrowLight* this, ArrowLightActionFunc actionFunc) {
     this->actionFunc = actionFunc;
diff --git a/src/overlays/actors/ovl_Bg_Iknin_Susceil/z_bg_iknin_susceil.c b/src/overlays/actors/ovl_Bg_Iknin_Susceil/z_bg_iknin_susceil.c
index 4e4b9b9bc..18d670830 100644
--- a/src/overlays/actors/ovl_Bg_Iknin_Susceil/z_bg_iknin_susceil.c
+++ b/src/overlays/actors/ovl_Bg_Iknin_Susceil/z_bg_iknin_susceil.c
@@ -41,7 +41,7 @@ ActorInit Bg_Iknin_Susceil_InitVars = {
     (ActorFunc)BgIkninSusceil_Draw,
 };
 
-static s32 unused = 0;
+static s32 sPad = 0;
 static f32 D_80C0B0E4 = 960.0f;
 static Vec2f D_80C0B0E8 = { -320.0f, 0.0f };
 static s8 D_80C0B0F0[] = { 0x00, 0x00, 0x07, 0x0A, 0x0A, 0x0B, 0x0B, 0x00 };
diff --git a/src/overlays/actors/ovl_En_Sda/z_en_sda.c b/src/overlays/actors/ovl_En_Sda/z_en_sda.c
index 122415814..9334d2d29 100644
--- a/src/overlays/actors/ovl_En_Sda/z_en_sda.c
+++ b/src/overlays/actors/ovl_En_Sda/z_en_sda.c
@@ -68,7 +68,7 @@ Vec3f D_80947B10[] = {
     { -1.0f, -2.0f, -0.2f }, { 0.0f, -2.0f, -0.2f },  { 1.0f, -2.0f, -0.2f },  { 0.0f, -3.0f, -0.5f },
 };
 
-static s32 sPad[2] = { 0 };
+static s32 sPad = 0;
 
 #include "overlays/ovl_En_Sda/ovl_En_Sda.c"
 
diff --git a/src/overlays/actors/ovl_En_Tanron1/z_en_tanron1.c b/src/overlays/actors/ovl_En_Tanron1/z_en_tanron1.c
index 6920f11fd..69bfc8b7b 100644
--- a/src/overlays/actors/ovl_En_Tanron1/z_en_tanron1.c
+++ b/src/overlays/actors/ovl_En_Tanron1/z_en_tanron1.c
@@ -30,7 +30,7 @@ ActorInit En_Tanron1_InitVars = {
     (ActorFunc)EnTanron1_Draw,
 };
 
-static s32 sPad[2] = { 0 };
+static s32 sPad = 0;
 
 #include "overlays/ovl_En_Tanron1/ovl_En_Tanron1.c"
 
diff --git a/src/overlays/actors/ovl_Obj_Hunsui/z_obj_hunsui.c b/src/overlays/actors/ovl_Obj_Hunsui/z_obj_hunsui.c
index 64dbaa034..2354f9f62 100644
--- a/src/overlays/actors/ovl_Obj_Hunsui/z_obj_hunsui.c
+++ b/src/overlays/actors/ovl_Obj_Hunsui/z_obj_hunsui.c
@@ -3,7 +3,6 @@
  * Overlay: ovl_Obj_Hunsui
  * Description: Switch-Activated Geyser
  */
-#include "prevent_bss_reordering.h"
 #include "z_obj_hunsui.h"
 #include "objects/object_hunsui/object_hunsui.h"