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

include/global.h

@@ -1,7 +1,6 @@
 #ifndef GLOBAL_H
 #define GLOBAL_H
 
-#include "variables.h"
 #include "macros.h"
 #include "versions.h"
 

include/macros.h

@@ -89,14 +89,6 @@
 #define PRINTF_RST()            (void)0
 #endif
 
-#if DEBUG_FEATURES
-#define DMA_REQUEST_SYNC(ram, vrom, size, file, line) DmaMgr_RequestSyncDebug(ram, vrom, size, file, line)
-#define DMA_REQUEST_ASYNC(req, ram, vrom, size, unk5, queue, msg, file, line) DmaMgr_RequestAsyncDebug(req, ram, vrom, size, unk5, queue, msg, file, line)
-#else
-#define DMA_REQUEST_SYNC(ram, vrom, size, file, line) DmaMgr_RequestSync(ram, vrom, size)
-#define DMA_REQUEST_ASYNC(req, ram, vrom, size, unk5, queue, msg, file, line) DmaMgr_RequestAsync(req, ram, vrom, size, unk5, queue, msg)
-#endif
-
 #if PLATFORM_N64 || DEBUG_FEATURES
 #define HUNGUP_AND_CRASH(file, line) Fault_AddHungupAndCrash(file, line)
 #else

include/ultra64/gbi.h

@@ -1,8 +1,10 @@
-#include "mbi.h"
 
 #ifndef ULTRA64_GBI_H
 #define ULTRA64_GBI_H
 
+#include "mbi.h"
+#include "ultratypes.h"
+
 #ifdef GBI_DOWHILE
 /* Private macro to wrap other macros in do {...} while (0) */
 #define _DW(macro) do { macro } while (0)

include/ultra64/gs2dex.h

@@ -1,6 +1,8 @@
 #ifndef	GS2DEX_H
 #define	GS2DEX_H
 
+#include "ultratypes.h"
+
 #ifdef _LANGUAGE_C_PLUS_PLUS
 extern "C" {
 #endif

include/variables.h

@@ -1,10 +0,0 @@
-#ifndef VARIABLES_H
-#define VARIABLES_H
-
-#include "z64.h"
-
-// TODO:
-// Plenty of files depend on this file to have access to z64.h.
-// Fix those cases and then delete this file.
-
-#endif

include/z64audio.h

@@ -1256,7 +1256,6 @@ extern AudioSpec gAudioSpecs[18];
 
 extern TempoData gTempoData;
 extern AudioHeapInitSizes gAudioHeapInitSizes;
-extern s16 gOcarinaSongItemMap[];
 
 extern AudioTable gSequenceTable;
 extern AudioTable gSoundFontTable;

include/z64curve.h

@@ -5,6 +5,7 @@
 #include "z64math.h"
 
 struct PlayState;
+struct Actor;
 
 typedef struct CurveInterpKnot {
     /* 0x0 */ u16 flags;         // Only the bottom two bits are used, although others are set in objects
@@ -56,7 +57,7 @@ void SkelCurve_Destroy(struct PlayState* play, SkelCurve* skelCurve);
 void SkelCurve_SetAnim(SkelCurve* skelCurve, CurveAnimationHeader* animation, f32 arg2, f32 endFrame, f32 curFrame,
                        f32 playSpeed);
 s32 SkelCurve_Update(struct PlayState* play, SkelCurve* skelCurve);
-void SkelCurve_Draw(Actor* actor, struct PlayState* play, SkelCurve* skelCurve, OverrideCurveLimbDraw overrideLimbDraw,
+void SkelCurve_Draw(struct Actor* actor, struct PlayState* play, SkelCurve* skelCurve, OverrideCurveLimbDraw overrideLimbDraw,
                     PostCurveLimbDraw postLimbDraw, s32 lod, void* data);
 
 #endif

include/z64dma.h

@@ -50,4 +50,12 @@ s32 DmaMgr_AudioDmaHandler(OSPiHandle* pihandle, OSIoMesg* mb, s32 direction);
 
 void DmaMgr_Init(void);
 
+#if DEBUG_FEATURES
+#define DMA_REQUEST_SYNC(ram, vrom, size, file, line) DmaMgr_RequestSyncDebug(ram, vrom, size, file, line)
+#define DMA_REQUEST_ASYNC(req, ram, vrom, size, unk5, queue, msg, file, line) DmaMgr_RequestAsyncDebug(req, ram, vrom, size, unk5, queue, msg, file, line)
+#else
+#define DMA_REQUEST_SYNC(ram, vrom, size, file, line) DmaMgr_RequestSync(ram, vrom, size)
+#define DMA_REQUEST_ASYNC(req, ram, vrom, size, unk5, queue, msg, file, line) DmaMgr_RequestAsync(req, ram, vrom, size, unk5, queue, msg)
+#endif
+
 #endif

include/z64message.h

@@ -203,4 +203,6 @@ void Message_Update(struct PlayState* play);
 void Message_SetTables(void);
 void Message_Init(struct PlayState* play);
 
+extern s16 gOcarinaSongItemMap[];
+
 #endif

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)            \

src/boot/driverominit.c

@@ -1,4 +1,4 @@
-#include "global.h"
+#include "ultra64.h"
 
 OSPiHandle __DriveRomHandle;
 

src/boot/idle.c

@@ -9,11 +9,12 @@
 #include "versions.h"
 #include "vi_mode.h"
 #include "z64thread.h"
+#include "z64dma.h"
 
 #include "global.h"
 
-#pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" \
-                               "ntsc-1.0:138 ntsc-1.1:138 ntsc-1.2:138 pal-1.0:136 pal-1.1:136"
+#pragma increment_block_number "gc-eu:192 gc-eu-mq:192 gc-jp:192 gc-jp-ce:192 gc-jp-mq:192 gc-us:192 gc-us-mq:192" \
+                               "ntsc-1.0:192 ntsc-1.1:192 ntsc-1.2:192 pal-1.0:192 pal-1.1:192"
 
 OSThread sMainThread;
 #if OOT_VERSION < PAL_1_0

src/boot/is_debug.c

@@ -1,6 +1,6 @@
 #include "is_debug.h"
 
-#include "global.h"
+#include "ultra64.h"
 
 typedef struct ISVDbg {
     /* 0x00 */ u32 magic; // "IS64"

src/boot/yaz0.c

@@ -1,4 +1,8 @@
-#include "global.h"
+#include "yaz0.h"
+
+#include "alignment.h"
+#include "ultra64.h"
+#include "z64dma.h"
 
 #pragma increment_block_number "gc-eu:0 gc-eu-mq:0 gc-jp:0 gc-jp-ce:0 gc-jp-mq:0 gc-us:0 gc-us-mq:0 ntsc-1.2:128" \
                                "pal-1.1:128"

src/boot/z_std_dma.c

@@ -39,12 +39,13 @@
 #if !PLATFORM_IQUE
 #include "yaz0.h"
 #endif
+#include "z64dma.h"
 #include "z64thread.h"
 
 #include "global.h"
 
-#pragma increment_block_number "gc-eu:0 gc-eu-mq:0 gc-jp:0 gc-jp-ce:0 gc-jp-mq:0 gc-us:0 gc-us-mq:0 ntsc-1.2:36" \
-                               "pal-1.0:34 pal-1.1:34"
+#pragma increment_block_number "gc-eu:0 gc-eu-mq:0 gc-jp:0 gc-jp-ce:0 gc-jp-mq:0 gc-us:0 gc-us-mq:0 ntsc-1.2:66" \
+                               "pal-1.0:64 pal-1.1:64"
 
 StackEntry sDmaMgrStackInfo;
 OSMesgQueue sDmaMgrMsgQueue;

src/code/TwoHeadArena.c

@@ -9,7 +9,7 @@
  * is to reset the entire arena, deallocating everything. This scheme is most applicable to allocating similar data
  * with identical lifetime.
  */
-#include "global.h"
+#include "tha.h"
 
 void* THA_GetHead(TwoHeadArena* tha) {
     return tha->head;

src/code/audio_stop_all_sfx.c

@@ -1,4 +1,7 @@
-#include "global.h"
+#include "sfx.h"
+
+#include "ultra64.h"
+#include "macros.h"
 
 u8 sSfxBankIds[] = {
     BANK_PLAYER, BANK_ITEM, BANK_ENV, BANK_ENEMY, BANK_SYSTEM, BANK_OCARINA, BANK_VOICE,

src/code/fault_gc.c

@@ -41,8 +41,8 @@
  * DPad-Down disables sending fault pages over osSyncPrintf.
  */
 
-#pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-eu-mq-dbg:128 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128" \
-                               "gc-us-mq:128 ique-cn:128"
+#pragma increment_block_number "gc-eu:192 gc-eu-mq:192 gc-eu-mq-dbg:192 gc-jp:192 gc-jp-ce:192 gc-jp-mq:192 gc-us:192" \
+                               "gc-us-mq:192 ique-cn:192"
 
 #include "libc64/sleep.h"
 #include "libc64/sprintf.h"

src/code/fault_n64.c

@@ -12,7 +12,7 @@
 
 #include "global.h"
 
-#pragma increment_block_number "ntsc-1.0:108 ntsc-1.1:108 ntsc-1.2:108 pal-1.0:108 pal-1.1:108"
+#pragma increment_block_number "ntsc-1.0:176 ntsc-1.1:176 ntsc-1.2:176 pal-1.0:176 pal-1.1:176"
 
 typedef struct FaultMgr {
     OSThread thread;

src/code/game.c

@@ -26,6 +26,7 @@
 #include "z64debug.h"
 #include "z64dma.h"
 #include "z64game.h"
+#include "z64play.h"
 #include "z64vis.h"
 
 #include "macros.h"

src/code/gfxalloc.c

@@ -1,4 +1,4 @@
-#include "global.h"
+#include "gfx.h"
 
 Gfx* Gfx_Open(Gfx* gfx) {
     return gfx + 1;

src/code/graph.c

@@ -35,7 +35,7 @@
 #define GFXPOOL_TAIL_MAGIC 0x5678
 
 #pragma increment_block_number "gc-eu:0 gc-eu-mq:0 gc-jp:0 gc-jp-ce:0 gc-jp-mq:0 gc-us:0 gc-us-mq:0 ique-cn:128" \
-                               "ntsc-1.0:96 ntsc-1.1:96 ntsc-1.2:96 pal-1.0:96 pal-1.1:96"
+                               "ntsc-1.0:0 ntsc-1.1:0 ntsc-1.2:0 pal-1.0:0 pal-1.1:0"
 
 /**
  * The time at which the previous `Graph_Update` ended.

src/code/main.c

@@ -43,7 +43,7 @@ extern struct IrqMgr gIrqMgr;
 #include "global.h"
 
 #pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" \
-                               "ique-cn:0 ntsc-1.0:56 ntsc-1.1:56 ntsc-1.2:56 pal-1.0:54 pal-1.1:54"
+                               "ique-cn:0 ntsc-1.0:35 ntsc-1.1:35 ntsc-1.2:35 pal-1.0:33 pal-1.1:33"
 
 extern u8 _buffersSegmentEnd[];
 

src/code/z_actor.c

@@ -17,6 +17,7 @@
 #include "z_lib.h"
 #include "zelda_arena.h"
 #include "z64actor.h"
+#include "z64audio.h"
 #include "z64effect.h"
 #include "z64light.h"
 #include "z64horse.h"

src/code/z_bg_collect.c

@@ -1,5 +1,9 @@
-#include "global.h"
 #include "terminal.h"
+#include "ultra64.h"
+#include "z64actor.h"
+#include "z64bgcheck.h"
+#include "z64player.h"
+#include "z64skin_matrix.h"
 
 /**
  * Update the `carriedActor`'s position based on the dynapoly actor identified by `bgId`.

src/code/z_camera.c

@@ -23,8 +23,8 @@
 #include "z64save.h"
 #include "overlays/actors/ovl_En_Horse/z_en_horse.h"
 
-#pragma increment_block_number "gc-eu:192 gc-eu-mq:192 gc-jp:192 gc-jp-ce:192 gc-jp-mq:192 gc-us:192 gc-us-mq:192" \
-                               "ique-cn:192 ntsc-1.0:0 ntsc-1.1:0 ntsc-1.2:0 pal-1.0:0 pal-1.1:0"
+#pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" \
+                               "ique-cn:128 ntsc-1.0:128 ntsc-1.1:128 ntsc-1.2:128 pal-1.0:128 pal-1.1:128"
 
 s16 Camera_RequestSettingImpl(Camera* camera, s16 requestedSetting, s16 flags);
 s32 Camera_RequestModeImpl(Camera* camera, s16 requestedMode, u8 forceModeChange);
@@ -3658,7 +3658,7 @@ s32 Camera_KeepOn3(Camera* camera) {
 }
 
 #pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" \
-                               "ique-cn:128 ntsc-1.0:70 ntsc-1.1:70 ntsc-1.2:70 pal-1.0:70 pal-1.1:70"
+                               "ique-cn:128 ntsc-1.0:128 ntsc-1.1:128 ntsc-1.2:128 pal-1.0:128 pal-1.1:128"
 
 s32 Camera_KeepOn4(Camera* camera) {
     static Vec3f D_8015BD50;

src/code/z_collision_btltbls.c

@@ -1,4 +1,5 @@
-#include "global.h"
+#include "z64collision_check.h"
+#include "macros.h"
 
 static DamageTable sDamageTablePresets[] = {
     { {

src/code/z_demo.c

@@ -1,5 +1,5 @@
-#pragma increment_block_number "gc-eu:0 gc-eu-mq:0 gc-jp:0 gc-jp-ce:0 gc-jp-mq:0 gc-us:0 gc-us-mq:0 ique-cn:0" \
-                               "ntsc-1.0:0 ntsc-1.1:0 ntsc-1.2:0 pal-1.0:0 pal-1.1:0"
+#pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" \
+                               "ique-cn:128 ntsc-1.0:0 ntsc-1.1:0 ntsc-1.2:0 pal-1.0:0 pal-1.1:0"
 #include "global.h"
 #include "libu64/gfxprint.h"
 #include "controller.h"
@@ -22,6 +22,7 @@
 #include "z64camera.h"
 #include "z64cutscene.h"
 #include "z64cutscene_flags.h"
+#include "z64ocarina.h"
 #include "z64play.h"
 #include "z64player.h"
 #include "z64save.h"
@@ -146,7 +147,7 @@ u16 gCamEyePointAppliedFrame;
 u16 gCamAtPointAppliedFrame;
 
 #pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" \
-                               "ique-cn:128 ntsc-1.0:0 ntsc-1.1:0 ntsc-1.2:0 pal-1.0:0 pal-1.1:0"
+                               "ique-cn:128 ntsc-1.0:128 ntsc-1.1:128 ntsc-1.2:128 pal-1.0:128 pal-1.1:128"
 
 // Cam ID to return to when a scripted cutscene is finished
 s16 sReturnToCamId;

src/code/z_eff_blure.c

@@ -10,6 +10,7 @@
 #include "macros.h"
 #include "global.h"
 
+#include "z64.h" // required for gameplay keep, the header doesnt include any external dependencies
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 
 void EffectBlure_AddVertex(EffectBlure* this, Vec3f* p1, Vec3f* p2) {

src/code/z_kaleido_scope_call.c

@@ -1,5 +1,5 @@
-#pragma increment_block_number "gc-eu:0 gc-eu-mq:0 gc-jp:0 gc-jp-ce:0 gc-jp-mq:0 gc-us:0 gc-us-mq:0 ique-cn:0" \
-                               "ntsc-1.0:0 ntsc-1.1:0 ntsc-1.2:0 pal-1.0:0 pal-1.1:0"
+#pragma increment_block_number "gc-eu:80 gc-eu-mq:80 gc-jp:80 gc-jp-ce:80 gc-jp-mq:80 gc-us:80 gc-us-mq:80 ique-cn:80" \
+                               "ntsc-1.0:96 ntsc-1.1:96 ntsc-1.2:96 pal-1.0:96 pal-1.1:96"
 
 #include "libu64/debug.h"
 #include "kaleido_manager.h"

src/code/z_message.c

@@ -24,8 +24,8 @@
 
 #include "assets/textures/parameter_static/parameter_static.h"
 
-#pragma increment_block_number "gc-eu:0 gc-eu-mq:0 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" \
-                               "ntsc-1.0:112 ntsc-1.1:112 ntsc-1.2:112 pal-1.0:128 pal-1.1:128"
+#pragma increment_block_number "gc-eu:0 gc-eu-mq:0 gc-jp:0 gc-jp-ce:0 gc-jp-mq:0 gc-us:0 gc-us-mq:0 ntsc-1.0:32" \
+                               "ntsc-1.1:32 ntsc-1.2:32 pal-1.0:128 pal-1.1:128"
 
 #if !PLATFORM_IQUE
 #define MSG_BUF_DECODED (msgCtx->msgBufDecoded)

src/code/z_play.c

@@ -32,6 +32,7 @@
 #include "versions.h"
 #include "z_actor_dlftbls.h"
 #include "zelda_arena.h"
+#include "z64audio.h"
 #include "z64cutscene_flags.h"
 #include "z64debug_display.h"
 #include "z64effect.h"
@@ -44,8 +45,8 @@
 
 #include "global.h"
 
-#pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" \
-                               "ique-cn:96 ntsc-1.0:240 ntsc-1.1:240 ntsc-1.2:240 pal-1.0:240 pal-1.1:240"
+#pragma increment_block_number "gc-eu:0 gc-eu-mq:0 gc-jp:0 gc-jp-ce:0 gc-jp-mq:0 gc-us:0 gc-us-mq:0 ique-cn:224" \
+                               "ntsc-1.0:240 ntsc-1.1:240 ntsc-1.2:240 pal-1.0:240 pal-1.1:240"
 
 TransitionTile gTransitionTile;
 s32 gTransitionTileState;

src/code/z_sfx_source.c

@@ -1,5 +1,9 @@
 #include "z64sfx_source.h"
 
+#include "sfx.h"
+#include "z64play.h"
+#include "z64skin_matrix.h"
+
 #include "global.h"
 
 void SfxSource_InitAll(PlayState* play) {

src/code/z_sram.c

@@ -3,8 +3,11 @@
 #include "memory_utils.h"
 #include "terminal.h"
 #include "versions.h"
+#include "z64audio.h"
 #include "z64game.h"
+#include "z64interface.h"
 #include "z64message.h"
+#include "z64ocarina.h"
 #include "z64save.h"
 #include "z64scene.h"
 #include "z64sram.h"

src/code/z_vr_box.c

@@ -1,6 +1,11 @@
+#include "z64skybox.h"
+
 #include "segment_symbols.h"
 #include "terminal.h"
+#include "ultra64.h"
 #include "z64environment.h"
+#include "z64game.h"
+#include "z64play.h"
 #include "z64save.h"
 
 #include "global.h"

src/gcc_fix/missing_gcc_functions.c

@@ -5,7 +5,7 @@
 /* This file is NOT a part of the original game and only exists to help gcc work.  */
 /* --------------------------------------------------------------------------------*/
 
-#include "global.h"
+#include "ultra64.h"
 
 // Self-hosted libc memory functions, gcc assumes these exist even in a freestanding
 // environment and there is no way to tell it otherwise.

src/libc64/__osMalloc_gc.c

@@ -1,8 +1,10 @@
-#include "global.h"
-#include "fault.h"
 #include "libc64/os_malloc.h"
+#include "alignment.h"
+#include "fault.h"
 #include "terminal.h"
 
+#include "global.h"
+
 #define FILL_ALLOC_BLOCK_FLAG (1 << 0)
 #define FILL_FREE_BLOCK_FLAG (1 << 1)
 #define CHECK_FREE_BLOCK_FLAG (1 << 2)

src/libc64/__osMalloc_n64.c

@@ -1,7 +1,10 @@
-#include "global.h"
-#include "fault.h"
 #include "libc64/os_malloc.h"
 
+#include "alignment.h"
+#include "fault.h"
+
+#include "global.h"
+
 #define NODE_MAGIC 0x7373
 
 #define NODE_IS_VALID(node) ((node)->magic == NODE_MAGIC)

src/libc64/sleep.c

@@ -1,4 +1,4 @@
-#include "global.h"
+#include "ultra64.h"
 
 void Sleep_Cycles(OSTime cycles) {
     OSMesgQueue mq;

src/libleo/api/bytetolba.c

@@ -1,4 +1,4 @@
-#include "global.h"
+#include "ultra64.h"
 #include "ultra64/leo.h"
 #include "ultra64/leoappli.h"
 #include "ultra64/leodrive.h"

src/libleo/api/cacreateleomanager.c

@@ -5,7 +5,7 @@
 #include "libc/stdint.h"
 #include "attributes.h"
 
-#include "global.h"
+#include "ultra64.h"
 
 s32 LeoCACreateLeoManager(s32 comPri, s32 intPri, OSMesg* cmdBuf, s32 cmdMsgCnt) {
     OSPiHandle* driveRomHandle;

src/libleo/api/cjcreateleomanager.c

@@ -5,7 +5,7 @@
 #include "libc/stdint.h"
 #include "attributes.h"
 
-#include "global.h"
+#include "ultra64.h"
 
 s32 LeoCJCreateLeoManager(s32 comPri, s32 intPri, OSMesg* cmdBuf, s32 cmdMsgCnt) {
     OSPiHandle* driveRomHandle;

src/libleo/api/clearqueue.c

@@ -1,4 +1,4 @@
-#include "global.h"
+#include "ultra64.h"
 #include "ultra64/leo.h"
 #include "ultra64/leoappli.h"
 #include "ultra64/leodrive.h"

src/libleo/api/driveexist.c

@@ -1,4 +1,4 @@
-#include "global.h"
+#include "ultra64.h"
 #include "ultra64/leo.h"
 #include "ultra64/leoappli.h"
 #include "ultra64/leodrive.h"

src/libleo/api/lbatobyte.c

@@ -1,4 +1,4 @@
-#include "global.h"
+#include "ultra64.h"
 #include "ultra64/leo.h"
 #include "ultra64/leoappli.h"
 #include "ultra64/leodrive.h"

src/libleo/api/readwrite.c

@@ -1,4 +1,4 @@
-#include "global.h"
+#include "ultra64.h"
 #include "ultra64/leo.h"
 #include "ultra64/leoappli.h"
 #include "ultra64/leodrive.h"

src/libleo/api/seek.c

@@ -1,4 +1,4 @@
-#include "global.h"
+#include "ultra64.h"
 #include "ultra64/leo.h"
 #include "ultra64/leoappli.h"
 #include "ultra64/leodrive.h"

src/libleo/api/spdlmotor.c

@@ -1,4 +1,4 @@
-#include "global.h"
+#include "ultra64.h"
 #include "ultra64/leo.h"
 #include "ultra64/leoappli.h"
 #include "ultra64/leodrive.h"

src/libleo/api/testunitready.c

@@ -1,4 +1,4 @@
-#include "global.h"
+#include "ultra64.h"
 #include "ultra64/leo.h"
 #include "ultra64/leoappli.h"
 #include "ultra64/leodrive.h"

src/libleo/leo/leo_tbl.c

@@ -1,4 +1,4 @@
-#include "global.h"
+#include "ultra64.h"
 #include "ultra64/leo.h"
 #include "ultra64/leoappli.h"
 #include "ultra64/leodrive.h"

src/libleo/leo/leoc2ecc.c

@@ -1,4 +1,4 @@
-#include "global.h"
+#include "ultra64.h"
 #include "ultra64/leo.h"
 #include "ultra64/leoappli.h"
 #include "ultra64/leodrive.h"

src/libleo/leo/leocmdex.c

@@ -3,7 +3,7 @@
 #include "ultra64/leodrive.h"
 #include "attributes.h"
 
-#include "global.h"
+#include "ultra64.h"
 
 extern vu16 LEOrw_flags;
 

src/libleo/leo/leodiskinit.c

@@ -1,4 +1,4 @@
-#include "global.h"
+#include "ultra64.h"
 #include "ultra64/leo.h"
 #include "ultra64/leoappli.h"
 #include "ultra64/leodrive.h"

src/libleo/leo/leofunc.c

@@ -1,7 +1,8 @@
-#include "global.h"
+#include "ultra64.h"
 #include "ultra64/leo.h"
 #include "ultra64/leoappli.h"
 #include "ultra64/leodrive.h"
+#include "macros.h"
 
 static s32 __leoResetCalled = false;
 static s32 __leoQueuesCreated = false;

src/libleo/leo/leoglobals.c

@@ -1,4 +1,4 @@
-#include "global.h"
+#include "ultra64.h"
 #include "ultra64/leo.h"
 #include "ultra64/leoappli.h"
 #include "ultra64/leodrive.h"

src/libleo/leo/leoinquiry.c

@@ -1,4 +1,4 @@
-#include "global.h"
+#include "ultra64.h"
 #include "ultra64/leo.h"
 #include "ultra64/leoappli.h"
 #include "ultra64/leodrive.h"

src/libleo/leo/leoint.c

@@ -1,4 +1,4 @@
-#include "global.h"
+#include "ultra64.h"
 #include "ultra64/leo.h"
 #include "ultra64/leoappli.h"
 #include "ultra64/leodrive.h"

src/libleo/leo/leointerrupt.c

@@ -1,4 +1,4 @@
-#include "global.h"
+#include "ultra64.h"
 #include "ultra64/leo.h"
 #include "ultra64/leoappli.h"
 #include "ultra64/leodrive.h"

src/libleo/leo/leomecha.c

@@ -3,7 +3,7 @@
 #include "ultra64/leodrive.h"
 #include "attributes.h"
 
-#include "global.h"
+#include "ultra64.h"
 
 extern s32 currentCommand;
 

src/libleo/leo/leomode_sel.c

@@ -1,4 +1,4 @@
-#include "global.h"
+#include "ultra64.h"
 #include "ultra64/leo.h"
 #include "ultra64/leoappli.h"
 #include "ultra64/leodrive.h"

src/libleo/leo/leomotor.c

@@ -1,4 +1,4 @@
-#include "global.h"
+#include "ultra64.h"
 #include "ultra64/leo.h"
 #include "ultra64/leoappli.h"
 #include "ultra64/leodrive.h"

src/libleo/leo/leomseq_tbl.c

@@ -1,4 +1,4 @@
-#include "global.h"
+#include "ultra64.h"
 #include "ultra64/leo.h"
 #include "ultra64/leoappli.h"
 #include "ultra64/leodrive.h"

src/libleo/leo/leoram.c

@@ -1,4 +1,4 @@
-#include "global.h"
+#include "ultra64.h"
 #include "ultra64/leo.h"
 #include "ultra64/leoappli.h"
 #include "ultra64/leodrive.h"

src/libleo/leo/leord_capa.c

@@ -1,4 +1,4 @@
-#include "global.h"
+#include "ultra64.h"
 #include "ultra64/leo.h"
 #include "ultra64/leoappli.h"
 #include "ultra64/leodrive.h"

src/libleo/leo/leord_diskid.c

@@ -1,4 +1,4 @@
-#include "global.h"
+#include "ultra64.h"
 #include "ultra64/leo.h"
 #include "ultra64/leoappli.h"
 #include "ultra64/leodrive.h"

src/libleo/leo/leoread.c

@@ -1,4 +1,4 @@
-#include "global.h"
+#include "ultra64.h"
 #include "ultra64/leo.h"
 #include "ultra64/leoappli.h"
 #include "ultra64/leodrive.h"

src/libleo/leo/leoreset.c

@@ -1,4 +1,4 @@
-#include "global.h"
+#include "ultra64.h"
 #include "ultra64/leo.h"
 #include "ultra64/leoappli.h"
 #include "ultra64/leodrive.h"

src/libleo/leo/leorezero.c

@@ -1,4 +1,4 @@
-#include "global.h"
+#include "ultra64.h"
 #include "ultra64/leo.h"
 #include "ultra64/leoappli.h"
 #include "ultra64/leodrive.h"

src/libleo/leo/leoseek.c

@@ -1,4 +1,4 @@
-#include "global.h"
+#include "ultra64.h"
 #include "ultra64/leo.h"
 #include "ultra64/leoappli.h"
 #include "ultra64/leodrive.h"

src/libleo/leo/leotestunit.c

@@ -1,4 +1,4 @@
-#include "global.h"
+#include "ultra64.h"
 #include "ultra64/leo.h"
 #include "ultra64/leoappli.h"
 #include "ultra64/leodrive.h"

src/libleo/leo/leotimer.c

@@ -3,7 +3,7 @@
 #include "ultra64/leodrive.h"
 #include "attributes.h"
 
-#include "global.h"
+#include "ultra64.h"
 
 typedef struct {
     /* 0x0 */ u8 year;

src/libleo/leo/leotranslat.c

@@ -1,4 +1,4 @@
-#include "global.h"
+#include "ultra64.h"
 #include "ultra64/leo.h"
 #include "ultra64/leoappli.h"
 #include "ultra64/leodrive.h"

src/libleo/leo/leoutil.c

@@ -1,8 +1,10 @@
-#include "global.h"
+#include "ultra64.h"
 #include "ultra64/leo.h"
 #include "ultra64/leoappli.h"
 #include "ultra64/leodrive.h"
 
+#include "macros.h"
+
 u16 leoLba_to_phys(u32 lba) {
     u16 vzone_num;
     u16 zone_slba;

src/libleo/leo/leowrite.c

@@ -1,4 +1,4 @@
-#include "global.h"
+#include "ultra64.h"
 #include "ultra64/leo.h"
 #include "ultra64/leoappli.h"
 #include "ultra64/leodrive.h"

src/libu64/rcp_utils.c

@@ -1,5 +1,5 @@
 #include "libu64/rcp_utils.h"
-
+#include "ultra64.h"
 #include "global.h"
 
 #if PLATFORM_N64 || DEBUG_FEATURES

src/libultra/gu/cosf.c

@@ -1,5 +1,5 @@
 #include "ultra64.h"
-#include "global.h"
+#include "z64math.h" // TODO: libultra should not have access to game-side headers
 
 static const du P[] = {
     { 0x3FF00000, 0x00000000 }, { 0xBFC55554, 0xBC83656D }, { 0x3F8110ED, 0x3804C2A0 },

src/libultra/gu/lookat.c

@@ -1,4 +1,5 @@
-#include "global.h"
+#include "ultra64.h"
+#include "z64math.h" // TODO: libultra should not have access to game-side headers
 
 void guLookAtF(f32 mf[4][4], f32 xEye, f32 yEye, f32 zEye, f32 xAt, f32 yAt, f32 zAt, f32 xUp, f32 yUp, f32 zUp) {
     f32 length;

src/libultra/gu/lookathil.c

@@ -1,4 +1,4 @@
-#include "global.h"
+#include "ultra64.h"
 
 #define FTOFRAC8(x) ((s32)MIN(((x) * (128.0f)), 127.0f) & 0xFF)
 

src/libultra/gu/mtxutil.c

@@ -1,4 +1,4 @@
-#include "global.h"
+#include "ultra64.h"
 
 void guMtxF2L(f32 mf[4][4], Mtx* m) {
     s32 i, j;

src/libultra/gu/normalize.c

@@ -1,4 +1,5 @@
-#include "global.h"
+#include "ultra64.h"
+#include "z64math.h" // TODO: libultra should not have access to game-side headers
 
 void guNormalize(f32* x, f32* y, f32* z) {
     f32 m = 1 / sqrtf(SQ(*x) + SQ(*y) + SQ(*z));

src/libultra/gu/ortho.c

@@ -1,4 +1,4 @@
-#include "global.h"
+#include "ultra64.h"
 
 void guOrthoF(f32 mf[4][4], f32 left, f32 right, f32 bottom, f32 top, f32 near, f32 far, f32 scale) {
     s32 i, j;

src/libultra/gu/perspective.c

@@ -1,4 +1,4 @@
-#include "global.h"
+#include "ultra64.h"
 
 void guPerspectiveF(f32 mf[4][4], u16* perspNorm, f32 fovy, f32 aspect, f32 near, f32 far, f32 scale) {
     f32 yscale;

src/libultra/gu/position.c

@@ -1,4 +1,4 @@
-#include "global.h"
+#include "ultra64.h"
 
 /**
  * guPositionF

src/libultra/gu/rotate.c

@@ -1,4 +1,4 @@
-#include "global.h"
+#include "ultra64.h"
 
 void guRotateF(f32 m[4][4], f32 a, f32 x, f32 y, f32 z) {
     static f32 dtor = M_PI / 180.0f;

src/libultra/gu/scale.c

@@ -1,4 +1,4 @@
-#include "global.h"
+#include "ultra64.h"
 
 void guScaleF(f32 m[4][4], f32 x, f32 y, f32 z) {
     guMtxIdentF(m);