Cleanup `variables.h` (#1061)

* Cleanup `variables.h`

* `gSpeedMeterTimeEntryPtr` -> `sSpeedMeterTimeEntryPtr`

3 files changed, 9 insertions, 19 deletions

diff --git a/src/code/code_800EC960.c b/src/code/code_800EC960.c
index 64a1419da..4c0c7b5d8 100644
--- a/src/code/code_800EC960.c
+++ b/src/code/code_800EC960.c
@@ -636,8 +636,6 @@ OcarinaSongInfo gOcarinaSongNotes[OCARINA_SONG_MAX] = {
 
 extern u8 D_801333F0;
 extern u8 gAudioSfxSwapOff;
-extern u8 D_80133408;
-extern u8 D_80133418;
 
 /**
  * BSS
@@ -709,10 +707,6 @@ u32 sDebugPadPress;
 s32 sAudioUpdateTaskStart;
 s32 sAudioUpdateTaskEnd;
 
-extern u16 gAudioSfxSwapSource[];
-extern u16 gAudioSfxSwapTarget[];
-extern u8 gAudioSfxSwapMode[];
-
 void PadMgr_RequestPadData(PadMgr* padmgr, Input* inputs, s32 mode);
 
 void Audio_StepFreqLerp(FreqLerp* lerp);
diff --git a/src/code/code_800F9280.c b/src/code/code_800F9280.c
index 36857b0de..381cdf611 100644
--- a/src/code/code_800F9280.c
+++ b/src/code/code_800F9280.c
@@ -2,12 +2,8 @@
 #include "global.h"
 #include "ultra64/abi.h"
 
-extern u8 D_8016E348[4];
-extern u32 sAudioSeqCmds[0x100];
 extern u8 sSeqCmdRdPos;
 extern u8 sSeqCmdWrPos;
-extern u8 D_80133408;
-extern u8 D_80133418;
 extern u8 D_80133410[];
 
 // TODO: clean up these macros. They are similar to ones in code_800EC960.c but without casts.
diff --git a/src/code/speed_meter.c b/src/code/speed_meter.c
index 6e43ea2f9..7d768d090 100644
--- a/src/code/speed_meter.c
+++ b/src/code/speed_meter.c
@@ -14,7 +14,7 @@ volatile OSTime gRSPGFXTotalTime;
 volatile OSTime gRSPOtherTotalTime;
 volatile OSTime D_8016A578;
 volatile OSTime gRDPTotalTime;
-SpeedMeterTimeEntry* gSpeedMeterTimeEntryPtr;
+SpeedMeterTimeEntry* sSpeedMeterTimeEntryPtr;
 
 SpeedMeterTimeEntry sSpeedMeterTimeEntryArray[] = {
     { &D_8016A520, 0, 0, GPACK_RGBA5551(255, 0, 0, 1) }, { &D_8016A528, 0, 2, GPACK_RGBA5551(255, 255, 0, 1) },
@@ -62,11 +62,11 @@ void SpeedMeter_DrawTimeEntries(SpeedMeter* this, GraphicsContext* gfxCtx) {
         return;
     }
 
-    gSpeedMeterTimeEntryPtr = &sSpeedMeterTimeEntryArray[0];
+    sSpeedMeterTimeEntryPtr = &sSpeedMeterTimeEntryArray[0];
     for (i = 0; i < ARRAY_COUNT(sSpeedMeterTimeEntryArray); i++) {
-        temp = ((f64) * (gSpeedMeterTimeEntryPtr->time) / gIrqMgrRetraceTime) * 64.0;
-        gSpeedMeterTimeEntryPtr->x = temp + baseX;
-        gSpeedMeterTimeEntryPtr++;
+        temp = ((f64) * (sSpeedMeterTimeEntryPtr->time) / gIrqMgrRetraceTime) * 64.0;
+        sSpeedMeterTimeEntryPtr->x = temp + baseX;
+        sSpeedMeterTimeEntryPtr++;
     }
 
     View_Init(&view, gfxCtx);
@@ -88,11 +88,11 @@ void SpeedMeter_DrawTimeEntries(SpeedMeter* this, GraphicsContext* gfxCtx) {
     DrawRec(gfx++, GPACK_RGBA5551(255, 0, 0, 1), baseX + 64 * 2, uly, baseX + 64 * 3, lry);
     DrawRec(gfx++, GPACK_RGBA5551(255, 0, 255, 1), baseX + 64 * 3, uly, baseX + 64 * 4, lry);
 
-    gSpeedMeterTimeEntryPtr = &sSpeedMeterTimeEntryArray[0];
+    sSpeedMeterTimeEntryPtr = &sSpeedMeterTimeEntryArray[0];
     for (i = 0; i < ARRAY_COUNT(sSpeedMeterTimeEntryArray); i++) {
-        DrawRec(gfx++, gSpeedMeterTimeEntryPtr->color, baseX, lry + gSpeedMeterTimeEntryPtr->y,
-                gSpeedMeterTimeEntryPtr->x, lry + gSpeedMeterTimeEntryPtr->y + 1);
-        gSpeedMeterTimeEntryPtr++;
+        DrawRec(gfx++, sSpeedMeterTimeEntryPtr->color, baseX, lry + sSpeedMeterTimeEntryPtr->y,
+                sSpeedMeterTimeEntryPtr->x, lry + sSpeedMeterTimeEntryPtr->y + 1);
+        sSpeedMeterTimeEntryPtr++;
     }
     gDPPipeSync(gfx++);