Remove Variables.h; Decouple z64.h from global.h (#2507)

* progress

* z64.h issues sorted

* remove variables.h

* format

* n64 fix

* another fix

* did the wrong fix

* fix libleo

* fix bss

* review

* remove instead of comment

src/audio/data.c

@@ -1,5 +1,7 @@
 #include "ultra64.h"
-#include "global.h"
+#include "z64audio.h"
+#include "macros.h"
+#include "sfx.h"
 
 // sSfxRequests ring buffer endpoints. read index <= write index, wrapping around mod 256.
 u8 gSfxRequestWriteIndex = 0;

src/audio/general.c

@@ -1,11 +1,15 @@
 #include "libu64/gfxprint.h"
 #include "ultra64.h"
 #include "attributes.h"
+#include "audiothread_cmd.h"
 #include "controller.h"
 #include "padmgr.h"
 #include "seqcmd.h"
 #include "sequence.h"
+#include "sfx.h"
 #include "versions.h"
+#include "z64audio.h"
+#include "z64ocarina.h"
 
 #include "global.h"
 

src/audio/lib/aisetnextbuf.c

@@ -1,4 +1,4 @@
-#include "global.h"
+#include "ultra64.h"
 
 /**
  * Submits an audio buffer to be consumed by the Audio DAC. The audio interface can queue a second DMA while another

src/audio/lib/data.c

@@ -1,4 +1,6 @@
-#include "global.h"
+#include "alignment.h"
+#include "ultra64.h"
+#include "z64audio.h"
 
 // clang-format off
 ALIGNED(16) s16 gSawtoothWaveSample[] = {

src/audio/lib/dcache.c

@@ -1,4 +1,5 @@
-#include "global.h"
+#include "ultra64.h"
+#include "z64audio.h"
 
 void Audio_InvalDCache(void* buf, s32 size) {
     OSIntMask prevMask = osSetIntMask(OS_IM_NONE);

src/audio/lib/effects.c

@@ -1,7 +1,6 @@
 #include "ultra64.h"
 #include "attributes.h"
-
-#include "global.h"
+#include "z64audio.h"
 
 void Audio_SequenceChannelProcessSound(SequenceChannel* channel, s32 recalculateVolume, s32 applyBend) {
     f32 channelVolume;

src/audio/lib/heap.c

@@ -1,6 +1,7 @@
+#include "alignment.h"
 #include "ultra64.h"
-#include "global.h"
 #include "versions.h"
+#include "z64audio.h"
 
 void AudioHeap_InitSampleCaches(u32 persistentSampleCacheSize, u32 temporarySampleCacheSize);
 SampleCacheEntry* AudioHeap_AllocTemporarySampleCacheEntry(u32 size);

src/audio/lib/load.c

@@ -3,6 +3,7 @@
 #include "segment_symbols.h"
 #include "ultra64.h"
 #include "versions.h"
+#include "z64audio.h"
 
 #include "global.h"
 

src/audio/lib/playback.c

@@ -1,4 +1,6 @@
-#include "global.h"
+#include "ultra64.h"
+#include "macros.h"
+#include "z64audio.h"
 
 void Audio_InitNoteSub(Note* note, NoteSubEu* sub, NoteSubAttributes* attrs) {
     f32 volLeft;

src/audio/lib/seqplayer.c

@@ -13,12 +13,12 @@
  *   - All three sets share a common pool of control flow instructions (>= 0xF2).
  *     Otherwise, each set of instructions has its own command interpreter
  */
-#include "ultra64.h"
+#include "audio/aseq.h"
 #include "assert.h"
 #include "attributes.h"
-#include "audio/aseq.h"
-
-#include "global.h"
+#include "macros.h"
+#include "ultra64.h"
+#include "z64audio.h"
 
 static_assert(MML_VERSION == MML_VERSION_OOT, "This file implements the OoT version of the MML");
 

src/audio/lib/synthesis.c

@@ -1,5 +1,6 @@
+#include "alignment.h"
 #include "ultra64.h"
-#include "global.h"
+#include "z64audio.h"
 
 // DMEM Addresses for the RSP
 #define DMEM_TEMP 0x3C0

src/audio/lib/thread.c

@@ -1,5 +1,8 @@
-#include "global.h"
+#include "audiothread_cmd.h"
+#include "macros.h"
+#include "ultra64.h"
 #include "versions.h"
+#include "z64audio.h"
 
 #define SAMPLES_TO_OVERPRODUCE 0x10
 #define EXTRA_BUFFERED_AI_SAMPLES_TARGET 0x80

src/audio/sequence.c

@@ -17,10 +17,14 @@
  * Nor are these commands to be confused with the internal audio commands used to transfer requests from
  * the graph thread to the audio thread.
  */
+#include "audiothread_cmd.h"
 #include "ultra64.h"
-#include "global.h"
 #include "ultra64/abi.h"
 #include "seqcmd.h"
+#include "sfx.h"
+#include "z64audio.h"
+
+#include "macros.h"
 
 // Direct audio command (skips the queueing system)
 #define SEQCMD_SET_SEQPLAYER_VOLUME_NOW(seqPlayerIndex, duration, volume)                       \

src/audio/session_config.c

@@ -1,4 +1,4 @@
-#include "global.h"
+#include "z64audio.h"
 
 AudioContext gAudioCtx;
 AudioCustomUpdateFunction gAudioCustomUpdateFunction;

src/audio/sfx.c

@@ -1,6 +1,9 @@
-#include "ultra64.h"
-#include "global.h"
+#include "audiothread_cmd.h"
+#include "macros.h"
+#include "sfx.h"
 #include "terminal.h"
+#include "ultra64.h"
+#include "z64audio.h"
 
 typedef struct SfxRequest {
     /* 0x00 */ u16 sfxId;

src/audio/sfx_params.c

@@ -1,5 +1,5 @@
 #include "ultra64.h"
-#include "global.h"
+#include "sfx.h"
 #include "versions.h"
 
 #define DEFINE_SFX(_0, _1, importance, distParam, randParam, flags)            \