From 2278bcb2c3383553d136216a7fc1600cd86485f3 Mon Sep 17 00:00:00 2001 From: fig02 Date: Sat, 19 Apr 2025 22:04:08 -0400 Subject: [PATCH] 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 - include/macros.h | 8 -------- include/ultra64/gbi.h | 4 +++- include/ultra64/gs2dex.h | 2 ++ include/variables.h | 10 ---------- include/z64audio.h | 1 - include/z64curve.h | 3 ++- include/z64dma.h | 8 ++++++++ include/z64message.h | 2 ++ src/audio/data.c | 4 +++- src/audio/general.c | 4 ++++ src/audio/lib/aisetnextbuf.c | 2 +- src/audio/lib/data.c | 4 +++- src/audio/lib/dcache.c | 3 ++- src/audio/lib/effects.c | 3 +-- src/audio/lib/heap.c | 3 ++- src/audio/lib/load.c | 1 + src/audio/lib/playback.c | 4 +++- src/audio/lib/seqplayer.c | 8 ++++---- src/audio/lib/synthesis.c | 3 ++- src/audio/lib/thread.c | 5 ++++- src/audio/sequence.c | 6 +++++- src/audio/session_config.c | 2 +- src/audio/sfx.c | 7 +++++-- src/audio/sfx_params.c | 2 +- src/boot/driverominit.c | 2 +- src/boot/idle.c | 5 +++-- src/boot/is_debug.c | 2 +- src/boot/yaz0.c | 6 +++++- src/boot/z_std_dma.c | 5 +++-- src/code/TwoHeadArena.c | 2 +- src/code/audio_stop_all_sfx.c | 5 ++++- src/code/fault_gc.c | 4 ++-- src/code/fault_n64.c | 2 +- src/code/game.c | 1 + src/code/gfxalloc.c | 2 +- src/code/graph.c | 2 +- src/code/main.c | 2 +- src/code/z_actor.c | 1 + src/code/z_bg_collect.c | 6 +++++- src/code/z_camera.c | 6 +++--- src/code/z_collision_btltbls.c | 3 ++- src/code/z_demo.c | 7 ++++--- src/code/z_eff_blure.c | 1 + src/code/z_kaleido_scope_call.c | 4 ++-- src/code/z_message.c | 4 ++-- src/code/z_play.c | 5 +++-- src/code/z_sfx_source.c | 4 ++++ src/code/z_sram.c | 3 +++ src/code/z_vr_box.c | 5 +++++ src/gcc_fix/missing_gcc_functions.c | 2 +- src/libc64/__osMalloc_gc.c | 6 ++++-- src/libc64/__osMalloc_n64.c | 7 +++++-- src/libc64/sleep.c | 2 +- src/libleo/api/bytetolba.c | 2 +- src/libleo/api/cacreateleomanager.c | 2 +- src/libleo/api/cjcreateleomanager.c | 2 +- src/libleo/api/clearqueue.c | 2 +- src/libleo/api/driveexist.c | 2 +- src/libleo/api/lbatobyte.c | 2 +- src/libleo/api/readwrite.c | 2 +- src/libleo/api/seek.c | 2 +- src/libleo/api/spdlmotor.c | 2 +- src/libleo/api/testunitready.c | 2 +- src/libleo/leo/leo_tbl.c | 2 +- src/libleo/leo/leoc2ecc.c | 2 +- src/libleo/leo/leocmdex.c | 2 +- src/libleo/leo/leodiskinit.c | 2 +- src/libleo/leo/leofunc.c | 3 ++- src/libleo/leo/leoglobals.c | 2 +- src/libleo/leo/leoinquiry.c | 2 +- src/libleo/leo/leoint.c | 2 +- src/libleo/leo/leointerrupt.c | 2 +- src/libleo/leo/leomecha.c | 2 +- src/libleo/leo/leomode_sel.c | 2 +- src/libleo/leo/leomotor.c | 2 +- src/libleo/leo/leomseq_tbl.c | 2 +- src/libleo/leo/leoram.c | 2 +- src/libleo/leo/leord_capa.c | 2 +- src/libleo/leo/leord_diskid.c | 2 +- src/libleo/leo/leoread.c | 2 +- src/libleo/leo/leoreset.c | 2 +- src/libleo/leo/leorezero.c | 2 +- src/libleo/leo/leoseek.c | 2 +- src/libleo/leo/leotestunit.c | 2 +- src/libleo/leo/leotimer.c | 2 +- src/libleo/leo/leotranslat.c | 2 +- src/libleo/leo/leoutil.c | 4 +++- src/libleo/leo/leowrite.c | 2 +- src/libu64/rcp_utils.c | 2 +- src/libultra/gu/cosf.c | 2 +- src/libultra/gu/lookat.c | 3 ++- src/libultra/gu/lookathil.c | 2 +- src/libultra/gu/mtxutil.c | 2 +- src/libultra/gu/normalize.c | 3 ++- src/libultra/gu/ortho.c | 2 +- src/libultra/gu/perspective.c | 2 +- src/libultra/gu/position.c | 2 +- src/libultra/gu/rotate.c | 2 +- src/libultra/gu/scale.c | 2 +- src/libultra/gu/sinf.c | 2 +- src/libultra/gu/translate.c | 2 +- src/libultra/gu/us2dex.c | 4 +++- src/libultra/io/aigetlen.c | 2 +- src/libultra/io/aisetfreq.c | 2 +- src/libultra/io/cartrominit.c | 2 +- src/libultra/io/contpfs.c | 2 +- src/libultra/io/contquery.c | 2 +- src/libultra/io/contramread.c | 2 +- src/libultra/io/contramwrite.c | 1 - src/libultra/io/contreaddata.c | 3 ++- src/libultra/io/controller.c | 3 ++- src/libultra/io/contsetch.c | 1 - src/libultra/io/crc.c | 2 +- src/libultra/io/devmgr.c | 2 +- src/libultra/io/dpgetstat.c | 2 +- src/libultra/io/dpsetstat.c | 2 +- src/libultra/io/epidma.c | 2 +- src/libultra/io/epirawdma.c | 2 +- src/libultra/io/epirawread.c | 2 +- src/libultra/io/epirawwrite.c | 2 +- src/libultra/io/epiread.c | 2 +- src/libultra/io/epiwrite.c | 2 +- src/libultra/io/motor.c | 2 +- src/libultra/io/pfsallocatefile.c | 1 - src/libultra/io/pfschecker.c | 1 - src/libultra/io/pfsdeletefile.c | 2 +- src/libultra/io/pfsfilestate.c | 1 - src/libultra/io/pfsfindfile.c | 1 - src/libultra/io/pfsfreeblocks.c | 1 - src/libultra/io/pfsgetstatus.c | 1 - src/libultra/io/pfsinitpak.c | 1 - src/libultra/io/pfsisplug.c | 1 - src/libultra/io/pfsreadwritefile.c | 1 - src/libultra/io/pfsselectbank.c | 2 +- src/libultra/io/piacs.c | 3 ++- src/libultra/io/pigetcmdq.c | 2 +- src/libultra/io/pimgr.c | 2 +- src/libultra/io/pirawdma.c | 2 +- src/libultra/io/si.c | 2 +- src/libultra/io/siacs.c | 3 ++- src/libultra/io/sirawdma.c | 2 +- src/libultra/io/sirawread.c | 2 +- src/libultra/io/sirawwrite.c | 2 +- src/libultra/io/sp.c | 2 +- src/libultra/io/spgetstat.c | 2 +- src/libultra/io/sprawdma.c | 2 +- src/libultra/io/spsetpc.c | 2 +- src/libultra/io/spsetstat.c | 2 +- src/libultra/io/sptask.c | 2 +- src/libultra/io/sptaskyield.c | 2 +- src/libultra/io/sptaskyielded.c | 2 +- src/libultra/io/vi.c | 2 +- src/libultra/io/viblack.c | 2 +- src/libultra/io/vigetcurrcontext.c | 2 +- src/libultra/io/vigetcurrframebuf.c | 2 +- src/libultra/io/vigetnextframebuf.c | 2 +- src/libultra/io/vimgr.c | 3 ++- src/libultra/io/visetevent.c | 2 +- src/libultra/io/visetmode.c | 2 +- src/libultra/io/visetspecial.c | 2 +- src/libultra/io/visetxscale.c | 2 +- src/libultra/io/visetyscale.c | 2 +- src/libultra/io/viswapbuf.c | 2 +- src/libultra/io/viswapcontext.c | 2 +- src/libultra/os/afterprenmi.c | 1 - src/libultra/os/createmesgqueue.c | 2 +- src/libultra/os/createthread.c | 2 +- src/libultra/os/destroythread.c | 2 +- src/libultra/os/getactivequeue.c | 2 +- src/libultra/os/getcurrfaultedthread.c | 2 +- src/libultra/os/gethwintrroutine.c | 2 +- src/libultra/os/getmemsize.c | 2 +- src/libultra/os/getthreadid.c | 2 +- src/libultra/os/getthreadpri.c | 2 +- src/libultra/os/gettime.c | 2 +- src/libultra/os/initialize.c | 2 +- src/libultra/os/jammesg.c | 2 +- src/libultra/os/recvmesg.c | 2 +- src/libultra/os/resetglobalintmask.c | 2 +- src/libultra/os/sendmesg.c | 2 +- src/libultra/os/seteventmesg.c | 2 +- src/libultra/os/setglobalintmask.c | 2 +- src/libultra/os/sethwintrroutine.c | 2 +- src/libultra/os/setthreadpri.c | 2 +- src/libultra/os/settime.c | 2 +- src/libultra/os/settimer.c | 2 +- src/libultra/os/startthread.c | 2 +- src/libultra/os/stopthread.c | 2 +- src/libultra/os/stoptimer.c | 2 +- src/libultra/os/thread.c | 2 +- src/libultra/os/timerintr.c | 2 +- src/libultra/os/virtualtophysical.c | 2 +- src/libultra/os/yieldthread.c | 2 +- src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.c | 3 ++- tools/ZAPD/ZAPD/ZFile.cpp | 2 +- 196 files changed, 273 insertions(+), 218 deletions(-) delete mode 100644 include/variables.h diff --git a/include/global.h b/include/global.h index 902ddad84c..7dac123348 100644 --- a/include/global.h +++ b/include/global.h @@ -1,7 +1,6 @@ #ifndef GLOBAL_H #define GLOBAL_H -#include "variables.h" #include "macros.h" #include "versions.h" diff --git a/include/macros.h b/include/macros.h index aa81ef061b..813ceb6f26 100644 --- a/include/macros.h +++ b/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 diff --git a/include/ultra64/gbi.h b/include/ultra64/gbi.h index 55171076d6..fe248cdf69 100644 --- a/include/ultra64/gbi.h +++ b/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) diff --git a/include/ultra64/gs2dex.h b/include/ultra64/gs2dex.h index 031dcb9f7d..3e15c49d14 100644 --- a/include/ultra64/gs2dex.h +++ b/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 diff --git a/include/variables.h b/include/variables.h deleted file mode 100644 index e1fe4ad6e0..0000000000 --- a/include/variables.h +++ /dev/null @@ -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 diff --git a/include/z64audio.h b/include/z64audio.h index 1a40ac1bb6..308c220d7a 100644 --- a/include/z64audio.h +++ b/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; diff --git a/include/z64curve.h b/include/z64curve.h index 2f35aec967..8fb83242ba 100644 --- a/include/z64curve.h +++ b/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 diff --git a/include/z64dma.h b/include/z64dma.h index b9cbf6a42d..10968517bc 100755 --- a/include/z64dma.h +++ b/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 diff --git a/include/z64message.h b/include/z64message.h index 3758b690fd..3dfa196d97 100644 --- a/include/z64message.h +++ b/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 diff --git a/src/audio/data.c b/src/audio/data.c index 729af6aa34..bd072257b2 100644 --- a/src/audio/data.c +++ b/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; diff --git a/src/audio/general.c b/src/audio/general.c index 8e3b6a6e79..7dce7b54df 100644 --- a/src/audio/general.c +++ b/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" diff --git a/src/audio/lib/aisetnextbuf.c b/src/audio/lib/aisetnextbuf.c index 4cf5d1f7d9..bb6b0f0b73 100644 --- a/src/audio/lib/aisetnextbuf.c +++ b/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 diff --git a/src/audio/lib/data.c b/src/audio/lib/data.c index 8dc4729ff9..f2f1b2c94e 100644 --- a/src/audio/lib/data.c +++ b/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[] = { diff --git a/src/audio/lib/dcache.c b/src/audio/lib/dcache.c index caaaea3323..5c50a69979 100644 --- a/src/audio/lib/dcache.c +++ b/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); diff --git a/src/audio/lib/effects.c b/src/audio/lib/effects.c index e6d2324886..7e3d01d3a7 100644 --- a/src/audio/lib/effects.c +++ b/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; diff --git a/src/audio/lib/heap.c b/src/audio/lib/heap.c index d996b553ab..e78787027b 100644 --- a/src/audio/lib/heap.c +++ b/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); diff --git a/src/audio/lib/load.c b/src/audio/lib/load.c index 6ff8c6ee68..4a447ddc0f 100644 --- a/src/audio/lib/load.c +++ b/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" diff --git a/src/audio/lib/playback.c b/src/audio/lib/playback.c index b84fa31df4..03e749437b 100644 --- a/src/audio/lib/playback.c +++ b/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; diff --git a/src/audio/lib/seqplayer.c b/src/audio/lib/seqplayer.c index 1a1d40c4d2..e238418a69 100644 --- a/src/audio/lib/seqplayer.c +++ b/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"); diff --git a/src/audio/lib/synthesis.c b/src/audio/lib/synthesis.c index 72bec4390a..c7c3eefb04 100644 --- a/src/audio/lib/synthesis.c +++ b/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 diff --git a/src/audio/lib/thread.c b/src/audio/lib/thread.c index 6bc793e3f6..b79c1d97dc 100644 --- a/src/audio/lib/thread.c +++ b/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 diff --git a/src/audio/sequence.c b/src/audio/sequence.c index 208429eadf..f3b815a284 100644 --- a/src/audio/sequence.c +++ b/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) \ diff --git a/src/audio/session_config.c b/src/audio/session_config.c index a531d6c27b..c21a79c725 100644 --- a/src/audio/session_config.c +++ b/src/audio/session_config.c @@ -1,4 +1,4 @@ -#include "global.h" +#include "z64audio.h" AudioContext gAudioCtx; AudioCustomUpdateFunction gAudioCustomUpdateFunction; diff --git a/src/audio/sfx.c b/src/audio/sfx.c index 1c743e95ba..1ed7e6b594 100644 --- a/src/audio/sfx.c +++ b/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; diff --git a/src/audio/sfx_params.c b/src/audio/sfx_params.c index 7dc1bbd2c7..37b9971caa 100644 --- a/src/audio/sfx_params.c +++ b/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) \ diff --git a/src/boot/driverominit.c b/src/boot/driverominit.c index 5ed69abe07..72ab069d34 100644 --- a/src/boot/driverominit.c +++ b/src/boot/driverominit.c @@ -1,4 +1,4 @@ -#include "global.h" +#include "ultra64.h" OSPiHandle __DriveRomHandle; diff --git a/src/boot/idle.c b/src/boot/idle.c index 190130c02b..eaae7e1b9c 100644 --- a/src/boot/idle.c +++ b/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 diff --git a/src/boot/is_debug.c b/src/boot/is_debug.c index d520b262bb..6d63118853 100644 --- a/src/boot/is_debug.c +++ b/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" diff --git a/src/boot/yaz0.c b/src/boot/yaz0.c index 2d6a4ec7c5..eb3ce23317 100644 --- a/src/boot/yaz0.c +++ b/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" diff --git a/src/boot/z_std_dma.c b/src/boot/z_std_dma.c index 2e742ec920..db9559dcdc 100644 --- a/src/boot/z_std_dma.c +++ b/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; diff --git a/src/code/TwoHeadArena.c b/src/code/TwoHeadArena.c index 271c2ae7ff..490304a472 100644 --- a/src/code/TwoHeadArena.c +++ b/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; diff --git a/src/code/audio_stop_all_sfx.c b/src/code/audio_stop_all_sfx.c index ef84cd6fff..5ae65705c6 100644 --- a/src/code/audio_stop_all_sfx.c +++ b/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, diff --git a/src/code/fault_gc.c b/src/code/fault_gc.c index c8088f23fa..ee96a4c168 100644 --- a/src/code/fault_gc.c +++ b/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" diff --git a/src/code/fault_n64.c b/src/code/fault_n64.c index ae9d2ba4a9..4dbae9b84b 100644 --- a/src/code/fault_n64.c +++ b/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; diff --git a/src/code/game.c b/src/code/game.c index f08133fc99..933de55c18 100644 --- a/src/code/game.c +++ b/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" diff --git a/src/code/gfxalloc.c b/src/code/gfxalloc.c index 79d8bb04e5..9e2fe9bb99 100644 --- a/src/code/gfxalloc.c +++ b/src/code/gfxalloc.c @@ -1,4 +1,4 @@ -#include "global.h" +#include "gfx.h" Gfx* Gfx_Open(Gfx* gfx) { return gfx + 1; diff --git a/src/code/graph.c b/src/code/graph.c index 8fe664dec2..e2a35cd5e8 100644 --- a/src/code/graph.c +++ b/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. diff --git a/src/code/main.c b/src/code/main.c index 8a7c12a9e7..8a1fc820a0 100644 --- a/src/code/main.c +++ b/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[]; diff --git a/src/code/z_actor.c b/src/code/z_actor.c index 798d8a036a..28a98ef319 100644 --- a/src/code/z_actor.c +++ b/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" diff --git a/src/code/z_bg_collect.c b/src/code/z_bg_collect.c index bd349765de..c74adbc122 100644 --- a/src/code/z_bg_collect.c +++ b/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`. diff --git a/src/code/z_camera.c b/src/code/z_camera.c index b7a7d2fadd..8e835e1fd7 100644 --- a/src/code/z_camera.c +++ b/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; diff --git a/src/code/z_collision_btltbls.c b/src/code/z_collision_btltbls.c index 1039371f7a..a80182eb74 100644 --- a/src/code/z_collision_btltbls.c +++ b/src/code/z_collision_btltbls.c @@ -1,4 +1,5 @@ -#include "global.h" +#include "z64collision_check.h" +#include "macros.h" static DamageTable sDamageTablePresets[] = { { { diff --git a/src/code/z_demo.c b/src/code/z_demo.c index 9c990cb904..dc95fd5752 100644 --- a/src/code/z_demo.c +++ b/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; diff --git a/src/code/z_eff_blure.c b/src/code/z_eff_blure.c index d44007bb76..7b40b261fe 100644 --- a/src/code/z_eff_blure.c +++ b/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) { diff --git a/src/code/z_kaleido_scope_call.c b/src/code/z_kaleido_scope_call.c index 39101b3732..e6ff49f505 100644 --- a/src/code/z_kaleido_scope_call.c +++ b/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" diff --git a/src/code/z_message.c b/src/code/z_message.c index c13f5c4628..f544ccefab 100644 --- a/src/code/z_message.c +++ b/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) diff --git a/src/code/z_play.c b/src/code/z_play.c index 36928c9cb7..e5c3c3c4ab 100644 --- a/src/code/z_play.c +++ b/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; diff --git a/src/code/z_sfx_source.c b/src/code/z_sfx_source.c index 1dad386594..3d793c6174 100644 --- a/src/code/z_sfx_source.c +++ b/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) { diff --git a/src/code/z_sram.c b/src/code/z_sram.c index 534017d83a..2fb3124a7e 100644 --- a/src/code/z_sram.c +++ b/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" diff --git a/src/code/z_vr_box.c b/src/code/z_vr_box.c index f53da0df4a..a8c9bb587d 100644 --- a/src/code/z_vr_box.c +++ b/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" diff --git a/src/gcc_fix/missing_gcc_functions.c b/src/gcc_fix/missing_gcc_functions.c index 76bf8e9db6..615dd23549 100644 --- a/src/gcc_fix/missing_gcc_functions.c +++ b/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. diff --git a/src/libc64/__osMalloc_gc.c b/src/libc64/__osMalloc_gc.c index 025c21bff9..aa62d6b2c1 100644 --- a/src/libc64/__osMalloc_gc.c +++ b/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) diff --git a/src/libc64/__osMalloc_n64.c b/src/libc64/__osMalloc_n64.c index 56996feac9..13c2e958bf 100644 --- a/src/libc64/__osMalloc_n64.c +++ b/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) diff --git a/src/libc64/sleep.c b/src/libc64/sleep.c index 2b67088a1b..17fd3b1e24 100644 --- a/src/libc64/sleep.c +++ b/src/libc64/sleep.c @@ -1,4 +1,4 @@ -#include "global.h" +#include "ultra64.h" void Sleep_Cycles(OSTime cycles) { OSMesgQueue mq; diff --git a/src/libleo/api/bytetolba.c b/src/libleo/api/bytetolba.c index 9b28baf2f1..9b25ac840f 100644 --- a/src/libleo/api/bytetolba.c +++ b/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" diff --git a/src/libleo/api/cacreateleomanager.c b/src/libleo/api/cacreateleomanager.c index aa9c0feda7..d4f6f5100b 100644 --- a/src/libleo/api/cacreateleomanager.c +++ b/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; diff --git a/src/libleo/api/cjcreateleomanager.c b/src/libleo/api/cjcreateleomanager.c index 4cd6ab0018..23f9da8226 100644 --- a/src/libleo/api/cjcreateleomanager.c +++ b/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; diff --git a/src/libleo/api/clearqueue.c b/src/libleo/api/clearqueue.c index ed5b623280..1972b6080f 100644 --- a/src/libleo/api/clearqueue.c +++ b/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" diff --git a/src/libleo/api/driveexist.c b/src/libleo/api/driveexist.c index 314a67064e..f658817a3d 100644 --- a/src/libleo/api/driveexist.c +++ b/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" diff --git a/src/libleo/api/lbatobyte.c b/src/libleo/api/lbatobyte.c index dc5b1f5dbe..e260fced18 100644 --- a/src/libleo/api/lbatobyte.c +++ b/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" diff --git a/src/libleo/api/readwrite.c b/src/libleo/api/readwrite.c index a4c27d26f9..570b94b203 100644 --- a/src/libleo/api/readwrite.c +++ b/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" diff --git a/src/libleo/api/seek.c b/src/libleo/api/seek.c index dbbc4651ac..8abbb0f0a5 100644 --- a/src/libleo/api/seek.c +++ b/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" diff --git a/src/libleo/api/spdlmotor.c b/src/libleo/api/spdlmotor.c index 8c0ffa9ffa..21ef2b0223 100644 --- a/src/libleo/api/spdlmotor.c +++ b/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" diff --git a/src/libleo/api/testunitready.c b/src/libleo/api/testunitready.c index f5770f86b7..2116bc9e2a 100644 --- a/src/libleo/api/testunitready.c +++ b/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" diff --git a/src/libleo/leo/leo_tbl.c b/src/libleo/leo/leo_tbl.c index f4093fbd53..083fabb728 100644 --- a/src/libleo/leo/leo_tbl.c +++ b/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" diff --git a/src/libleo/leo/leoc2ecc.c b/src/libleo/leo/leoc2ecc.c index 4d268df51b..5b770b138d 100644 --- a/src/libleo/leo/leoc2ecc.c +++ b/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" diff --git a/src/libleo/leo/leocmdex.c b/src/libleo/leo/leocmdex.c index 7a678dc675..d7887d4944 100644 --- a/src/libleo/leo/leocmdex.c +++ b/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; diff --git a/src/libleo/leo/leodiskinit.c b/src/libleo/leo/leodiskinit.c index 6c11f728e2..92020029ea 100644 --- a/src/libleo/leo/leodiskinit.c +++ b/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" diff --git a/src/libleo/leo/leofunc.c b/src/libleo/leo/leofunc.c index 20809e55f6..d6f7dddcca 100644 --- a/src/libleo/leo/leofunc.c +++ b/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; diff --git a/src/libleo/leo/leoglobals.c b/src/libleo/leo/leoglobals.c index ca11ec6c4e..28a99f626d 100644 --- a/src/libleo/leo/leoglobals.c +++ b/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" diff --git a/src/libleo/leo/leoinquiry.c b/src/libleo/leo/leoinquiry.c index cfa4f1c27f..b23a9ab454 100644 --- a/src/libleo/leo/leoinquiry.c +++ b/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" diff --git a/src/libleo/leo/leoint.c b/src/libleo/leo/leoint.c index f337b15080..33ac3d2010 100644 --- a/src/libleo/leo/leoint.c +++ b/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" diff --git a/src/libleo/leo/leointerrupt.c b/src/libleo/leo/leointerrupt.c index 0d352e1237..fc547cfd5c 100644 --- a/src/libleo/leo/leointerrupt.c +++ b/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" diff --git a/src/libleo/leo/leomecha.c b/src/libleo/leo/leomecha.c index 98de987f71..d0804f033c 100644 --- a/src/libleo/leo/leomecha.c +++ b/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; diff --git a/src/libleo/leo/leomode_sel.c b/src/libleo/leo/leomode_sel.c index cd45fd8350..fe36bc16af 100644 --- a/src/libleo/leo/leomode_sel.c +++ b/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" diff --git a/src/libleo/leo/leomotor.c b/src/libleo/leo/leomotor.c index 251ac2a95b..652b626ee0 100644 --- a/src/libleo/leo/leomotor.c +++ b/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" diff --git a/src/libleo/leo/leomseq_tbl.c b/src/libleo/leo/leomseq_tbl.c index 4944e63336..f94979f623 100644 --- a/src/libleo/leo/leomseq_tbl.c +++ b/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" diff --git a/src/libleo/leo/leoram.c b/src/libleo/leo/leoram.c index 7600632482..159aaaae27 100644 --- a/src/libleo/leo/leoram.c +++ b/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" diff --git a/src/libleo/leo/leord_capa.c b/src/libleo/leo/leord_capa.c index d060a64936..86b71ac903 100644 --- a/src/libleo/leo/leord_capa.c +++ b/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" diff --git a/src/libleo/leo/leord_diskid.c b/src/libleo/leo/leord_diskid.c index fde59bcc9c..df4d6bf24b 100644 --- a/src/libleo/leo/leord_diskid.c +++ b/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" diff --git a/src/libleo/leo/leoread.c b/src/libleo/leo/leoread.c index 62017cd159..11dc28c41c 100644 --- a/src/libleo/leo/leoread.c +++ b/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" diff --git a/src/libleo/leo/leoreset.c b/src/libleo/leo/leoreset.c index ff6e0f9439..40eb56482c 100644 --- a/src/libleo/leo/leoreset.c +++ b/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" diff --git a/src/libleo/leo/leorezero.c b/src/libleo/leo/leorezero.c index 73b58df765..9e28bf13a3 100644 --- a/src/libleo/leo/leorezero.c +++ b/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" diff --git a/src/libleo/leo/leoseek.c b/src/libleo/leo/leoseek.c index 566866255e..2f530ac726 100644 --- a/src/libleo/leo/leoseek.c +++ b/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" diff --git a/src/libleo/leo/leotestunit.c b/src/libleo/leo/leotestunit.c index a6a6dbdb62..4c81d7970a 100644 --- a/src/libleo/leo/leotestunit.c +++ b/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" diff --git a/src/libleo/leo/leotimer.c b/src/libleo/leo/leotimer.c index c2c5d98b54..f6c7fdfc05 100644 --- a/src/libleo/leo/leotimer.c +++ b/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; diff --git a/src/libleo/leo/leotranslat.c b/src/libleo/leo/leotranslat.c index 1f297a792b..6eb2011367 100644 --- a/src/libleo/leo/leotranslat.c +++ b/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" diff --git a/src/libleo/leo/leoutil.c b/src/libleo/leo/leoutil.c index 08f88938cf..0a52e820e0 100644 --- a/src/libleo/leo/leoutil.c +++ b/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; diff --git a/src/libleo/leo/leowrite.c b/src/libleo/leo/leowrite.c index deeafc9ad8..91b2163f0b 100644 --- a/src/libleo/leo/leowrite.c +++ b/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" diff --git a/src/libu64/rcp_utils.c b/src/libu64/rcp_utils.c index c4f0cad53a..ef3d655e14 100644 --- a/src/libu64/rcp_utils.c +++ b/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 diff --git a/src/libultra/gu/cosf.c b/src/libultra/gu/cosf.c index 639084093f..f217eec13a 100644 --- a/src/libultra/gu/cosf.c +++ b/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 }, diff --git a/src/libultra/gu/lookat.c b/src/libultra/gu/lookat.c index e1c7500cf1..8d1df6bbe1 100644 --- a/src/libultra/gu/lookat.c +++ b/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; diff --git a/src/libultra/gu/lookathil.c b/src/libultra/gu/lookathil.c index e9cf650a6e..5d14e59aba 100644 --- a/src/libultra/gu/lookathil.c +++ b/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) diff --git a/src/libultra/gu/mtxutil.c b/src/libultra/gu/mtxutil.c index e9e327f740..a6a3defa00 100644 --- a/src/libultra/gu/mtxutil.c +++ b/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; diff --git a/src/libultra/gu/normalize.c b/src/libultra/gu/normalize.c index 6a0cac0200..8b20110c8c 100644 --- a/src/libultra/gu/normalize.c +++ b/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)); diff --git a/src/libultra/gu/ortho.c b/src/libultra/gu/ortho.c index 62b6d79503..4ed717acfd 100644 --- a/src/libultra/gu/ortho.c +++ b/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; diff --git a/src/libultra/gu/perspective.c b/src/libultra/gu/perspective.c index 3f700a814a..e7a6bad2f5 100644 --- a/src/libultra/gu/perspective.c +++ b/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; diff --git a/src/libultra/gu/position.c b/src/libultra/gu/position.c index 1b9a3525b2..b016c29a7c 100644 --- a/src/libultra/gu/position.c +++ b/src/libultra/gu/position.c @@ -1,4 +1,4 @@ -#include "global.h" +#include "ultra64.h" /** * guPositionF diff --git a/src/libultra/gu/rotate.c b/src/libultra/gu/rotate.c index dc50aba3c5..3f068f9417 100644 --- a/src/libultra/gu/rotate.c +++ b/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; diff --git a/src/libultra/gu/scale.c b/src/libultra/gu/scale.c index 525f2fb4c5..6bfcd98c30 100644 --- a/src/libultra/gu/scale.c +++ b/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); diff --git a/src/libultra/gu/sinf.c b/src/libultra/gu/sinf.c index 49929e8436..23013731c4 100644 --- a/src/libultra/gu/sinf.c +++ b/src/libultra/gu/sinf.c @@ -1,5 +1,5 @@ -#include "global.h" #include "ultra64.h" +#include "z64math.h" // TODO: libultra should not have access to game-side headers static const du P[] = { { 0x3FF00000, 0x00000000 }, { 0xBFC55554, 0xBC83656D }, { 0x3F8110ED, 0x3804C2A0 }, diff --git a/src/libultra/gu/translate.c b/src/libultra/gu/translate.c index 2753063d5d..9843890628 100644 --- a/src/libultra/gu/translate.c +++ b/src/libultra/gu/translate.c @@ -1,4 +1,4 @@ -#include "global.h" +#include "ultra64.h" void guTranslateF(f32 m[4][4], f32 x, f32 y, f32 z) { guMtxIdentF(m); diff --git a/src/libultra/gu/us2dex.c b/src/libultra/gu/us2dex.c index b8708c086c..bb2f50ae82 100644 --- a/src/libultra/gu/us2dex.c +++ b/src/libultra/gu/us2dex.c @@ -1,4 +1,6 @@ -#include "global.h" +#include "ultra64/ultratypes.h" +#include "ultra64/gbi.h" +#include "ultra64/gs2dex.h" void guS2DInitBg(uObjBg* bg) { u16 tmem = (bg->b.imageFmt == G_IM_FMT_CI) ? 0x100 : 0x200; diff --git a/src/libultra/io/aigetlen.c b/src/libultra/io/aigetlen.c index 45be442516..5787f10e33 100644 --- a/src/libultra/io/aigetlen.c +++ b/src/libultra/io/aigetlen.c @@ -1,4 +1,4 @@ -#include "global.h" +#include "ultra64.h" /** * Returns the number of bytes remaining in a currently ongoing audio DMA. diff --git a/src/libultra/io/aisetfreq.c b/src/libultra/io/aisetfreq.c index 140e524bc8..ce79191e11 100644 --- a/src/libultra/io/aisetfreq.c +++ b/src/libultra/io/aisetfreq.c @@ -1,4 +1,4 @@ -#include "global.h" +#include "ultra64.h" extern s32 osViClock; diff --git a/src/libultra/io/cartrominit.c b/src/libultra/io/cartrominit.c index b2cf1d1e17..22dd36e631 100644 --- a/src/libultra/io/cartrominit.c +++ b/src/libultra/io/cartrominit.c @@ -1,4 +1,4 @@ -#include "global.h" +#include "ultra64.h" OSPiHandle __CartRomHandle; diff --git a/src/libultra/io/contpfs.c b/src/libultra/io/contpfs.c index 20b2ea63ff..d92bc3eaec 100644 --- a/src/libultra/io/contpfs.c +++ b/src/libultra/io/contpfs.c @@ -1,5 +1,5 @@ #include "ultra64.h" -#include "global.h" +#include "macros.h" s32 __osPfsInodeCacheChannel = -1; u8 __osPfsInodeCacheBank = 250; diff --git a/src/libultra/io/contquery.c b/src/libultra/io/contquery.c index 9a8370af31..b90ea2ff68 100644 --- a/src/libultra/io/contquery.c +++ b/src/libultra/io/contquery.c @@ -1,4 +1,4 @@ -#include "global.h" +#include "ultra64.h" /** * osContStartQuery: diff --git a/src/libultra/io/contramread.c b/src/libultra/io/contramread.c index 01e0703da6..d631d2fb6a 100644 --- a/src/libultra/io/contramread.c +++ b/src/libultra/io/contramread.c @@ -1,4 +1,4 @@ -#include "global.h" +#include "ultra64.h" #define BLOCKSIZE 32 diff --git a/src/libultra/io/contramwrite.c b/src/libultra/io/contramwrite.c index 0db58163ef..b71a3d48b1 100644 --- a/src/libultra/io/contramwrite.c +++ b/src/libultra/io/contramwrite.c @@ -1,5 +1,4 @@ #include "ultra64.h" -#include "global.h" extern s32 __osPfsLastChannel; diff --git a/src/libultra/io/contreaddata.c b/src/libultra/io/contreaddata.c index f1f250e965..a0b2898121 100644 --- a/src/libultra/io/contreaddata.c +++ b/src/libultra/io/contreaddata.c @@ -1,4 +1,5 @@ -#include "global.h" +#include "ultra64.h" +#include "macros.h" s32 osContStartReadData(OSMesgQueue* mq) { s32 ret; diff --git a/src/libultra/io/controller.c b/src/libultra/io/controller.c index 3a2dc9a172..1ea5ecacd2 100644 --- a/src/libultra/io/controller.c +++ b/src/libultra/io/controller.c @@ -1,4 +1,5 @@ -#include "global.h" +#include "ultra64.h" +#include "macros.h" OSPifRam __osContPifRam; u8 __osContLastCmd; diff --git a/src/libultra/io/contsetch.c b/src/libultra/io/contsetch.c index 5ced5b6de4..c5002ce6ac 100644 --- a/src/libultra/io/contsetch.c +++ b/src/libultra/io/contsetch.c @@ -1,5 +1,4 @@ #include "ultra64.h" -#include "global.h" /* * s32 osContSetCh(u8 ch) diff --git a/src/libultra/io/crc.c b/src/libultra/io/crc.c index c1af0b12c5..485b6c0f54 100644 --- a/src/libultra/io/crc.c +++ b/src/libultra/io/crc.c @@ -1,4 +1,4 @@ -#include "global.h" +#include "ultra64.h" // Valid addr up to 0x7FF // It's the address of a block of 0x20 bytes in the mempak diff --git a/src/libultra/io/devmgr.c b/src/libultra/io/devmgr.c index 05dcb99519..7eb3197f81 100644 --- a/src/libultra/io/devmgr.c +++ b/src/libultra/io/devmgr.c @@ -1,4 +1,4 @@ -#include "global.h" +#include "ultra64.h" #include "ultra64/internal.h" #include "ultra64/leodrive.h" diff --git a/src/libultra/io/dpgetstat.c b/src/libultra/io/dpgetstat.c index 1a944b2c7a..1dbf5e09b8 100644 --- a/src/libultra/io/dpgetstat.c +++ b/src/libultra/io/dpgetstat.c @@ -1,4 +1,4 @@ -#include "global.h" +#include "ultra64.h" u32 osDpGetStatus(void) { return IO_READ(DPC_STATUS_REG); diff --git a/src/libultra/io/dpsetstat.c b/src/libultra/io/dpsetstat.c index 4275e1fde6..cfaa644b8d 100644 --- a/src/libultra/io/dpsetstat.c +++ b/src/libultra/io/dpsetstat.c @@ -1,4 +1,4 @@ -#include "global.h" +#include "ultra64.h" void osDpSetStatus(u32 status) { IO_WRITE(DPC_STATUS_REG, status); diff --git a/src/libultra/io/epidma.c b/src/libultra/io/epidma.c index ca57a9d170..f2a073cb48 100644 --- a/src/libultra/io/epidma.c +++ b/src/libultra/io/epidma.c @@ -1,4 +1,4 @@ -#include "global.h" +#include "ultra64.h" #include "ultra64/internal.h" s32 osEPiStartDma(OSPiHandle* handle, OSIoMesg* mb, s32 direction) { diff --git a/src/libultra/io/epirawdma.c b/src/libultra/io/epirawdma.c index dbc072fbb2..3f238dd3fc 100644 --- a/src/libultra/io/epirawdma.c +++ b/src/libultra/io/epirawdma.c @@ -1,4 +1,4 @@ -#include "global.h" +#include "ultra64.h" #include "ultra64/bcp.h" s32 __osEPiRawStartDma(OSPiHandle* handle, s32 direction, u32 cartAddr, void* dramAddr, size_t size) { diff --git a/src/libultra/io/epirawread.c b/src/libultra/io/epirawread.c index 41997df66d..77d558958c 100644 --- a/src/libultra/io/epirawread.c +++ b/src/libultra/io/epirawread.c @@ -1,4 +1,4 @@ -#include "global.h" +#include "ultra64.h" s32 __osEPiRawReadIo(OSPiHandle* handle, u32 devAddr, u32* data) { s32 status; diff --git a/src/libultra/io/epirawwrite.c b/src/libultra/io/epirawwrite.c index 4d704a1923..d9b1377656 100644 --- a/src/libultra/io/epirawwrite.c +++ b/src/libultra/io/epirawwrite.c @@ -1,4 +1,4 @@ -#include "global.h" +#include "ultra64.h" s32 __osEPiRawWriteIo(OSPiHandle* handle, u32 devAddr, u32 data) { s32 status; diff --git a/src/libultra/io/epiread.c b/src/libultra/io/epiread.c index d05604a589..a102bbc7e0 100644 --- a/src/libultra/io/epiread.c +++ b/src/libultra/io/epiread.c @@ -1,4 +1,4 @@ -#include "global.h" +#include "ultra64.h" s32 osEPiReadIo(OSPiHandle* handle, u32 devAddr, u32* data) { register s32 ret; diff --git a/src/libultra/io/epiwrite.c b/src/libultra/io/epiwrite.c index 0547e69991..c06e71f7a8 100644 --- a/src/libultra/io/epiwrite.c +++ b/src/libultra/io/epiwrite.c @@ -1,4 +1,4 @@ -#include "global.h" +#include "ultra64.h" s32 osEPiWriteIo(OSPiHandle* handle, u32 devAddr, u32 data) { register s32 ret; diff --git a/src/libultra/io/motor.c b/src/libultra/io/motor.c index 7350ef9210..78ce191b7b 100644 --- a/src/libultra/io/motor.c +++ b/src/libultra/io/motor.c @@ -1,4 +1,4 @@ -#include "global.h" +#include "ultra64.h" #define MOTOR_ID 0x80 diff --git a/src/libultra/io/pfsallocatefile.c b/src/libultra/io/pfsallocatefile.c index c20531224e..10684cc736 100644 --- a/src/libultra/io/pfsallocatefile.c +++ b/src/libultra/io/pfsallocatefile.c @@ -1,5 +1,4 @@ #include "ultra64.h" -#include "global.h" #include "ultra64/pfs.h" s32 osPfsAllocateFile(OSPfs* pfs, u16 companyCode, u32 gameCode, u8* gameName, u8* extName, s32 fileSize, s32* fileNo) { diff --git a/src/libultra/io/pfschecker.c b/src/libultra/io/pfschecker.c index b0a94f1ad4..fddb150d53 100644 --- a/src/libultra/io/pfschecker.c +++ b/src/libultra/io/pfschecker.c @@ -1,5 +1,4 @@ #include "ultra64.h" -#include "global.h" #include "ultra64/pfs.h" #define CHECK_IPAGE(p) \ diff --git a/src/libultra/io/pfsdeletefile.c b/src/libultra/io/pfsdeletefile.c index 573af6a724..864dbd6b81 100644 --- a/src/libultra/io/pfsdeletefile.c +++ b/src/libultra/io/pfsdeletefile.c @@ -1,5 +1,5 @@ #include "ultra64/pfs.h" -#include "global.h" +#include "ultra64.h" s32 osPfsDeleteFile(OSPfs* pfs, u16 companyCode, u32 gameCode, u8* gameName, u8* extName) { s32 file_no; diff --git a/src/libultra/io/pfsfilestate.c b/src/libultra/io/pfsfilestate.c index 367a7f27d6..489e4b300e 100644 --- a/src/libultra/io/pfsfilestate.c +++ b/src/libultra/io/pfsfilestate.c @@ -1,5 +1,4 @@ #include "ultra64.h" -#include "global.h" s32 osPfsFileState(OSPfs* pfs, s32 fileNo, OSPfsState* state) { s32 ret; diff --git a/src/libultra/io/pfsfindfile.c b/src/libultra/io/pfsfindfile.c index ad0bde885a..06e6d57f3f 100644 --- a/src/libultra/io/pfsfindfile.c +++ b/src/libultra/io/pfsfindfile.c @@ -1,5 +1,4 @@ #include "ultra64.h" -#include "global.h" s32 osPfsFindFile(OSPfs* pfs, u16 companyCode, u32 gameCode, u8* gameName, u8* extName, s32* fileNo) { s32 j; diff --git a/src/libultra/io/pfsfreeblocks.c b/src/libultra/io/pfsfreeblocks.c index 7210c65815..6bf8678bc1 100644 --- a/src/libultra/io/pfsfreeblocks.c +++ b/src/libultra/io/pfsfreeblocks.c @@ -1,5 +1,4 @@ #include "ultra64.h" -#include "global.h" #include "ultra64/pfs.h" s32 osPfsFreeBlocks(OSPfs* pfs, s32* leftoverBytes) { diff --git a/src/libultra/io/pfsgetstatus.c b/src/libultra/io/pfsgetstatus.c index aa9851e6e7..a6f09fa63b 100644 --- a/src/libultra/io/pfsgetstatus.c +++ b/src/libultra/io/pfsgetstatus.c @@ -1,5 +1,4 @@ #include "ultra64.h" -#include "global.h" s32 __osPfsGetStatus(OSMesgQueue* queue, s32 channel) { #ifndef BBPLAYER diff --git a/src/libultra/io/pfsinitpak.c b/src/libultra/io/pfsinitpak.c index 59fb8eda9b..9e03188dca 100644 --- a/src/libultra/io/pfsinitpak.c +++ b/src/libultra/io/pfsinitpak.c @@ -1,5 +1,4 @@ #include "ultra64.h" -#include "global.h" s32 osPfsInitPak(OSMesgQueue* queue, OSPfs* pfs, s32 channel) { s32 ret; diff --git a/src/libultra/io/pfsisplug.c b/src/libultra/io/pfsisplug.c index 9a144d0cb5..faa0752172 100644 --- a/src/libultra/io/pfsisplug.c +++ b/src/libultra/io/pfsisplug.c @@ -1,5 +1,4 @@ #include "ultra64.h" -#include "global.h" OSPifRam __osPfsPifRam; diff --git a/src/libultra/io/pfsreadwritefile.c b/src/libultra/io/pfsreadwritefile.c index b2c78a7464..b2579839ff 100644 --- a/src/libultra/io/pfsreadwritefile.c +++ b/src/libultra/io/pfsreadwritefile.c @@ -1,5 +1,4 @@ #include "ultra64.h" -#include "global.h" #define CHECK_IPAGE(p, pfs) \ (((p).ipage >= (pfs).inodeStartPage) && ((p).inode_t.bank < (pfs).banks) && ((p).inode_t.page >= 0x01) && \ diff --git a/src/libultra/io/pfsselectbank.c b/src/libultra/io/pfsselectbank.c index d257e04911..1c89138546 100644 --- a/src/libultra/io/pfsselectbank.c +++ b/src/libultra/io/pfsselectbank.c @@ -1,5 +1,5 @@ #include "ultra64/pfs.h" -#include "global.h" +#include "ultra64.h" s32 __osPfsSelectBank(OSPfs* pfs, u8 bank) { u8 temp[BLOCKSIZE]; diff --git a/src/libultra/io/piacs.c b/src/libultra/io/piacs.c index cff131f690..23fe343147 100644 --- a/src/libultra/io/piacs.c +++ b/src/libultra/io/piacs.c @@ -1,4 +1,5 @@ -#include "global.h" +#include "ultra64.h" +#include "macros.h" u32 __osPiAccessQueueEnabled = false; static OSMesg piAccessBuf[1]; diff --git a/src/libultra/io/pigetcmdq.c b/src/libultra/io/pigetcmdq.c index 3f6f173580..c0de3d088b 100644 --- a/src/libultra/io/pigetcmdq.c +++ b/src/libultra/io/pigetcmdq.c @@ -1,4 +1,4 @@ -#include "global.h" +#include "ultra64.h" #include "ultra64/internal.h" OSMesgQueue* osPiGetCmdQueue(void) { diff --git a/src/libultra/io/pimgr.c b/src/libultra/io/pimgr.c index 6b006d7aa8..58f5def6e9 100644 --- a/src/libultra/io/pimgr.c +++ b/src/libultra/io/pimgr.c @@ -1,4 +1,4 @@ -#include "global.h" +#include "ultra64.h" #include "stack.h" #include "ultra64/internal.h" diff --git a/src/libultra/io/pirawdma.c b/src/libultra/io/pirawdma.c index 84f809c9c9..20a0e18a9b 100644 --- a/src/libultra/io/pirawdma.c +++ b/src/libultra/io/pirawdma.c @@ -1,4 +1,4 @@ -#include "global.h" +#include "ultra64.h" s32 __osPiRawStartDma(s32 dir, u32 cartAddr, void* dramAddr, size_t size) { s32 status; diff --git a/src/libultra/io/si.c b/src/libultra/io/si.c index 4afee03405..65cab5e898 100644 --- a/src/libultra/io/si.c +++ b/src/libultra/io/si.c @@ -1,4 +1,4 @@ -#include "global.h" +#include "ultra64.h" s32 __osSiDeviceBusy(void) { register u32 status = IO_READ(SI_STATUS_REG); diff --git a/src/libultra/io/siacs.c b/src/libultra/io/siacs.c index 9f528feeff..dd54180837 100644 --- a/src/libultra/io/siacs.c +++ b/src/libultra/io/siacs.c @@ -1,4 +1,5 @@ -#include "global.h" +#include "ultra64.h" +#include "macros.h" static OSMesg siAccessBuf[1]; OSMesgQueue __osSiAccessQueue; diff --git a/src/libultra/io/sirawdma.c b/src/libultra/io/sirawdma.c index 0aa2f86942..4e7d082fd7 100644 --- a/src/libultra/io/sirawdma.c +++ b/src/libultra/io/sirawdma.c @@ -1,4 +1,4 @@ -#include "global.h" +#include "ultra64.h" #include "ultra64/bbskapi.h" #define PIF_RAM_SIZE (PIF_RAM_END + 1 - PIF_RAM_START) diff --git a/src/libultra/io/sirawread.c b/src/libultra/io/sirawread.c index 8efa071efb..71646f0324 100644 --- a/src/libultra/io/sirawread.c +++ b/src/libultra/io/sirawread.c @@ -1,4 +1,4 @@ -#include "global.h" +#include "ultra64.h" s32 __osSiRawReadIo(void* devAddr, u32* dst) { if (__osSiDeviceBusy()) { diff --git a/src/libultra/io/sirawwrite.c b/src/libultra/io/sirawwrite.c index f0e4514d77..c4b688813d 100644 --- a/src/libultra/io/sirawwrite.c +++ b/src/libultra/io/sirawwrite.c @@ -1,4 +1,4 @@ -#include "global.h" +#include "ultra64.h" s32 __osSiRawWriteIo(void* devAddr, u32 val) { if (__osSiDeviceBusy()) { diff --git a/src/libultra/io/sp.c b/src/libultra/io/sp.c index 1796dc8f6e..3f4bbca704 100644 --- a/src/libultra/io/sp.c +++ b/src/libultra/io/sp.c @@ -1,4 +1,4 @@ -#include "global.h" +#include "ultra64.h" u32 __osSpDeviceBusy(void) { register u32 status = IO_READ(SP_STATUS_REG); diff --git a/src/libultra/io/spgetstat.c b/src/libultra/io/spgetstat.c index e1545bdb7c..5b749e03f6 100644 --- a/src/libultra/io/spgetstat.c +++ b/src/libultra/io/spgetstat.c @@ -1,4 +1,4 @@ -#include "global.h" +#include "ultra64.h" u32 __osSpGetStatus(void) { return IO_READ(SP_STATUS_REG); diff --git a/src/libultra/io/sprawdma.c b/src/libultra/io/sprawdma.c index 795282c4a0..2faee64ca0 100644 --- a/src/libultra/io/sprawdma.c +++ b/src/libultra/io/sprawdma.c @@ -1,4 +1,4 @@ -#include "global.h" +#include "ultra64.h" s32 __osSpRawStartDma(s32 direction, void* devAddr, void* dramAddr, u32 size) { if (__osSpDeviceBusy()) { diff --git a/src/libultra/io/spsetpc.c b/src/libultra/io/spsetpc.c index 944fc98631..5ffae42652 100644 --- a/src/libultra/io/spsetpc.c +++ b/src/libultra/io/spsetpc.c @@ -1,4 +1,4 @@ -#include "global.h" +#include "ultra64.h" s32 __osSpSetPc(void* pc) { register u32 spStatus = IO_READ(SP_STATUS_REG); diff --git a/src/libultra/io/spsetstat.c b/src/libultra/io/spsetstat.c index 3fa7a49188..9becdb0ebe 100644 --- a/src/libultra/io/spsetstat.c +++ b/src/libultra/io/spsetstat.c @@ -1,4 +1,4 @@ -#include "global.h" +#include "ultra64.h" void __osSpSetStatus(u32 status) { IO_WRITE(SP_STATUS_REG, status); diff --git a/src/libultra/io/sptask.c b/src/libultra/io/sptask.c index be805ab5ce..b728146bda 100644 --- a/src/libultra/io/sptask.c +++ b/src/libultra/io/sptask.c @@ -1,4 +1,4 @@ -#include "global.h" +#include "ultra64.h" #define _osVirtualToPhysical(ptr) \ if (ptr != NULL) { \ diff --git a/src/libultra/io/sptaskyield.c b/src/libultra/io/sptaskyield.c index ec7a248bbb..1aaf3773b5 100644 --- a/src/libultra/io/sptaskyield.c +++ b/src/libultra/io/sptaskyield.c @@ -1,4 +1,4 @@ -#include "global.h" +#include "ultra64.h" void osSpTaskYield(void) { __osSpSetStatus(SP_SET_SIG0); diff --git a/src/libultra/io/sptaskyielded.c b/src/libultra/io/sptaskyielded.c index 8be0556c33..13acd4a5ff 100644 --- a/src/libultra/io/sptaskyielded.c +++ b/src/libultra/io/sptaskyielded.c @@ -1,4 +1,4 @@ -#include "global.h" +#include "ultra64.h" u32 osSpTaskYielded(OSTask* task) { u32 status = __osSpGetStatus(); diff --git a/src/libultra/io/vi.c b/src/libultra/io/vi.c index dac56ed812..c2c91ba276 100644 --- a/src/libultra/io/vi.c +++ b/src/libultra/io/vi.c @@ -1,4 +1,4 @@ -#include "global.h" +#include "ultra64.h" #include "ultra64/viint.h" OSViContext vi[2] = { 0 }; diff --git a/src/libultra/io/viblack.c b/src/libultra/io/viblack.c index 491522fb1f..7866f3fc9d 100644 --- a/src/libultra/io/viblack.c +++ b/src/libultra/io/viblack.c @@ -1,4 +1,4 @@ -#include "global.h" +#include "ultra64.h" #include "ultra64/viint.h" void osViBlack(u8 active) { diff --git a/src/libultra/io/vigetcurrcontext.c b/src/libultra/io/vigetcurrcontext.c index 1e3c6ffa3c..24ebcc5745 100644 --- a/src/libultra/io/vigetcurrcontext.c +++ b/src/libultra/io/vigetcurrcontext.c @@ -1,4 +1,4 @@ -#include "global.h" +#include "ultra64.h" OSViContext* __osViGetCurrentContext(void) { return __osViCurr; diff --git a/src/libultra/io/vigetcurrframebuf.c b/src/libultra/io/vigetcurrframebuf.c index 442a1afa9d..3c7ec71183 100644 --- a/src/libultra/io/vigetcurrframebuf.c +++ b/src/libultra/io/vigetcurrframebuf.c @@ -1,4 +1,4 @@ -#include "global.h" +#include "ultra64.h" void* osViGetCurrentFramebuffer(void) { register u32 prevInt = __osDisableInt(); diff --git a/src/libultra/io/vigetnextframebuf.c b/src/libultra/io/vigetnextframebuf.c index 5e6bd2ac74..8c782ca54f 100644 --- a/src/libultra/io/vigetnextframebuf.c +++ b/src/libultra/io/vigetnextframebuf.c @@ -1,4 +1,4 @@ -#include "global.h" +#include "ultra64.h" void* osViGetNextFramebuffer(void) { register u32 prevInt = __osDisableInt(); diff --git a/src/libultra/io/vimgr.c b/src/libultra/io/vimgr.c index a075ebf4f7..b8eb522e92 100644 --- a/src/libultra/io/vimgr.c +++ b/src/libultra/io/vimgr.c @@ -1,6 +1,7 @@ -#include "global.h" +#include "ultra64.h" #include "stack.h" #include "ultra64/internal.h" +#include "macros.h" static OSThread viThread; static STACK(viThreadStack, 0x1000); diff --git a/src/libultra/io/visetevent.c b/src/libultra/io/visetevent.c index 89e482cf84..789e044a60 100644 --- a/src/libultra/io/visetevent.c +++ b/src/libultra/io/visetevent.c @@ -1,4 +1,4 @@ -#include "global.h" +#include "ultra64.h" void osViSetEvent(OSMesgQueue* mq, OSMesg msg, u32 retraceCount) { register u32 prevInt = __osDisableInt(); diff --git a/src/libultra/io/visetmode.c b/src/libultra/io/visetmode.c index 8c34a4ee31..38eae7522b 100644 --- a/src/libultra/io/visetmode.c +++ b/src/libultra/io/visetmode.c @@ -1,4 +1,4 @@ -#include "global.h" +#include "ultra64.h" #include "ultra64/viint.h" void osViSetMode(OSViMode* mode) { diff --git a/src/libultra/io/visetspecial.c b/src/libultra/io/visetspecial.c index d51e3479d3..ef053fee1f 100644 --- a/src/libultra/io/visetspecial.c +++ b/src/libultra/io/visetspecial.c @@ -1,4 +1,4 @@ -#include "global.h" +#include "ultra64.h" #include "ultra64/viint.h" /** diff --git a/src/libultra/io/visetxscale.c b/src/libultra/io/visetxscale.c index 5e5e04ee47..765ac43844 100644 --- a/src/libultra/io/visetxscale.c +++ b/src/libultra/io/visetxscale.c @@ -1,4 +1,4 @@ -#include "global.h" +#include "ultra64.h" #include "ultra64/viint.h" void osViSetXScale(f32 value) { diff --git a/src/libultra/io/visetyscale.c b/src/libultra/io/visetyscale.c index adea96fd23..95c3273580 100644 --- a/src/libultra/io/visetyscale.c +++ b/src/libultra/io/visetyscale.c @@ -1,4 +1,4 @@ -#include "global.h" +#include "ultra64.h" #include "ultra64/viint.h" void osViSetYScale(f32 scale) { diff --git a/src/libultra/io/viswapbuf.c b/src/libultra/io/viswapbuf.c index 99259c03c3..e1e42922d2 100644 --- a/src/libultra/io/viswapbuf.c +++ b/src/libultra/io/viswapbuf.c @@ -1,4 +1,4 @@ -#include "global.h" +#include "ultra64.h" #include "ultra64/viint.h" void osViSwapBuffer(void* frameBufPtr) { diff --git a/src/libultra/io/viswapcontext.c b/src/libultra/io/viswapcontext.c index d1a7d0c0e6..19892ece36 100644 --- a/src/libultra/io/viswapcontext.c +++ b/src/libultra/io/viswapcontext.c @@ -1,4 +1,4 @@ -#include "global.h" +#include "ultra64.h" #include "ultra64/viint.h" void __osViSwapContext(void) { diff --git a/src/libultra/os/afterprenmi.c b/src/libultra/os/afterprenmi.c index b59814763f..6a9a83de33 100644 --- a/src/libultra/os/afterprenmi.c +++ b/src/libultra/os/afterprenmi.c @@ -1,5 +1,4 @@ #include "ultra64.h" -#include "global.h" s32 osAfterPreNMI(void) { return __osSpSetPc(0); diff --git a/src/libultra/os/createmesgqueue.c b/src/libultra/os/createmesgqueue.c index a85eadb0d7..4598de6aaa 100644 --- a/src/libultra/os/createmesgqueue.c +++ b/src/libultra/os/createmesgqueue.c @@ -1,4 +1,4 @@ -#include "global.h" +#include "ultra64.h" void osCreateMesgQueue(OSMesgQueue* mq, OSMesg* msg, s32 count) { mq->mtqueue = (OSThread*)&__osThreadTail; diff --git a/src/libultra/os/createthread.c b/src/libultra/os/createthread.c index 8d54fb9871..9332207971 100644 --- a/src/libultra/os/createthread.c +++ b/src/libultra/os/createthread.c @@ -1,4 +1,4 @@ -#include "global.h" +#include "ultra64.h" #include "ultra64/asm.h" void osCreateThread(OSThread* thread, OSId id, void (*entry)(void*), void* arg, void* sp, OSPri pri) { diff --git a/src/libultra/os/destroythread.c b/src/libultra/os/destroythread.c index a3273cadee..0b74a4fcbc 100644 --- a/src/libultra/os/destroythread.c +++ b/src/libultra/os/destroythread.c @@ -1,4 +1,4 @@ -#include "global.h" +#include "ultra64.h" void osDestroyThread(OSThread* thread) { register u32 prevInt = __osDisableInt(); diff --git a/src/libultra/os/getactivequeue.c b/src/libultra/os/getactivequeue.c index de55d7f041..633e01814a 100644 --- a/src/libultra/os/getactivequeue.c +++ b/src/libultra/os/getactivequeue.c @@ -1,4 +1,4 @@ -#include "global.h" +#include "ultra64.h" OSThread* __osGetActiveQueue(void) { return __osActiveQueue; diff --git a/src/libultra/os/getcurrfaultedthread.c b/src/libultra/os/getcurrfaultedthread.c index f36799b26f..bf2edb92d3 100644 --- a/src/libultra/os/getcurrfaultedthread.c +++ b/src/libultra/os/getcurrfaultedthread.c @@ -1,4 +1,4 @@ -#include "global.h" +#include "ultra64.h" OSThread* __osGetCurrFaultedThread(void) { return __osFaultedThread; diff --git a/src/libultra/os/gethwintrroutine.c b/src/libultra/os/gethwintrroutine.c index d7d8897803..64044e66d3 100644 --- a/src/libultra/os/gethwintrroutine.c +++ b/src/libultra/os/gethwintrroutine.c @@ -1,4 +1,4 @@ -#include "global.h" +#include "ultra64.h" #include "ultra64/internal.h" void __osGetHWIntrRoutine(OSHWIntr intr, s32 (**callbackOut)(void), void** spOut) { diff --git a/src/libultra/os/getmemsize.c b/src/libultra/os/getmemsize.c index 1adbd66ff4..9489b0f057 100644 --- a/src/libultra/os/getmemsize.c +++ b/src/libultra/os/getmemsize.c @@ -1,4 +1,4 @@ -#include "global.h" +#include "ultra64.h" #define STEP 0x100000 diff --git a/src/libultra/os/getthreadid.c b/src/libultra/os/getthreadid.c index 792229c9bf..8cee7a2aa3 100644 --- a/src/libultra/os/getthreadid.c +++ b/src/libultra/os/getthreadid.c @@ -1,4 +1,4 @@ -#include "global.h" +#include "ultra64.h" OSId osGetThreadId(OSThread* thread) { if (thread == NULL) { diff --git a/src/libultra/os/getthreadpri.c b/src/libultra/os/getthreadpri.c index 6c36a7c3b1..8eed2024f9 100644 --- a/src/libultra/os/getthreadpri.c +++ b/src/libultra/os/getthreadpri.c @@ -1,4 +1,4 @@ -#include "global.h" +#include "ultra64.h" OSPri osGetThreadPri(OSThread* thread) { if (thread == NULL) { diff --git a/src/libultra/os/gettime.c b/src/libultra/os/gettime.c index e8943cd9e0..e0adcc9f80 100644 --- a/src/libultra/os/gettime.c +++ b/src/libultra/os/gettime.c @@ -1,4 +1,4 @@ -#include "global.h" +#include "ultra64.h" OSTime osGetTime(void) { u32 count; diff --git a/src/libultra/os/initialize.c b/src/libultra/os/initialize.c index 9b41822b65..1241a0ac8f 100644 --- a/src/libultra/os/initialize.c +++ b/src/libultra/os/initialize.c @@ -1,4 +1,4 @@ -#include "global.h" +#include "ultra64.h" #include "ultra64/bcp.h" typedef struct __osExceptionVector { diff --git a/src/libultra/os/jammesg.c b/src/libultra/os/jammesg.c index e0ca40fc68..b5d42895c2 100644 --- a/src/libultra/os/jammesg.c +++ b/src/libultra/os/jammesg.c @@ -1,4 +1,4 @@ -#include "global.h" +#include "ultra64.h" s32 osJamMesg(OSMesgQueue* mq, OSMesg msg, s32 flag) { register u32 prevInt = __osDisableInt(); diff --git a/src/libultra/os/recvmesg.c b/src/libultra/os/recvmesg.c index 3254867cce..0e60519d18 100644 --- a/src/libultra/os/recvmesg.c +++ b/src/libultra/os/recvmesg.c @@ -1,4 +1,4 @@ -#include "global.h" +#include "ultra64.h" s32 osRecvMesg(OSMesgQueue* mq, OSMesg* msg, s32 flag) { register u32 prevInt = __osDisableInt(); diff --git a/src/libultra/os/resetglobalintmask.c b/src/libultra/os/resetglobalintmask.c index c418731838..1dde3754ca 100644 --- a/src/libultra/os/resetglobalintmask.c +++ b/src/libultra/os/resetglobalintmask.c @@ -1,4 +1,4 @@ -#include "global.h" +#include "ultra64.h" void __osResetGlobalIntMask(OSHWIntr mask) { register u32 prevInt = __osDisableInt(); diff --git a/src/libultra/os/sendmesg.c b/src/libultra/os/sendmesg.c index df0bc2bee4..cba5dcee81 100644 --- a/src/libultra/os/sendmesg.c +++ b/src/libultra/os/sendmesg.c @@ -1,4 +1,4 @@ -#include "global.h" +#include "ultra64.h" s32 osSendMesg(OSMesgQueue* mq, OSMesg msg, s32 flag) { register u32 prevInt = __osDisableInt(); diff --git a/src/libultra/os/seteventmesg.c b/src/libultra/os/seteventmesg.c index d105850ee1..d77dea8999 100644 --- a/src/libultra/os/seteventmesg.c +++ b/src/libultra/os/seteventmesg.c @@ -1,4 +1,4 @@ -#include "global.h" +#include "ultra64.h" #include "ultra64/internal.h" __OSEventState __osEventStateTab[OS_NUM_EVENTS]; diff --git a/src/libultra/os/setglobalintmask.c b/src/libultra/os/setglobalintmask.c index 8c4aebb926..c75f846f1e 100644 --- a/src/libultra/os/setglobalintmask.c +++ b/src/libultra/os/setglobalintmask.c @@ -1,4 +1,4 @@ -#include "global.h" +#include "ultra64.h" void __osSetGlobalIntMask(OSHWIntr mask) { register u32 prevInt = __osDisableInt(); diff --git a/src/libultra/os/sethwintrroutine.c b/src/libultra/os/sethwintrroutine.c index e6bb74f0f3..5ceae62bb1 100644 --- a/src/libultra/os/sethwintrroutine.c +++ b/src/libultra/os/sethwintrroutine.c @@ -1,4 +1,4 @@ -#include "global.h" +#include "ultra64.h" #include "ultra64/internal.h" void __osSetHWIntrRoutine(OSHWIntr intr, s32 (*callback)(void), void* sp) { diff --git a/src/libultra/os/setthreadpri.c b/src/libultra/os/setthreadpri.c index a9a1b0eb6e..93ece6f5c8 100644 --- a/src/libultra/os/setthreadpri.c +++ b/src/libultra/os/setthreadpri.c @@ -1,4 +1,4 @@ -#include "global.h" +#include "ultra64.h" void osSetThreadPri(OSThread* thread, OSPri pri) { register u32 prevInt = __osDisableInt(); diff --git a/src/libultra/os/settime.c b/src/libultra/os/settime.c index 2be47ed9ed..310809e2c4 100644 --- a/src/libultra/os/settime.c +++ b/src/libultra/os/settime.c @@ -1,4 +1,4 @@ -#include "global.h" +#include "ultra64.h" void osSetTime(OSTime time) { __osCurrentTime = time; diff --git a/src/libultra/os/settimer.c b/src/libultra/os/settimer.c index 3c4c644078..4ad8ccc820 100644 --- a/src/libultra/os/settimer.c +++ b/src/libultra/os/settimer.c @@ -1,7 +1,7 @@ #include "ultra64.h" #include "attributes.h" -#include "global.h" +#include "ultra64.h" s32 osSetTimer(OSTimer* timer, OSTime countdown, OSTime interval, OSMesgQueue* mq, OSMesg msg) { UNUSED OSTime time; diff --git a/src/libultra/os/startthread.c b/src/libultra/os/startthread.c index 6594fd5ae5..eb84bd9461 100644 --- a/src/libultra/os/startthread.c +++ b/src/libultra/os/startthread.c @@ -1,4 +1,4 @@ -#include "global.h" +#include "ultra64.h" void osStartThread(OSThread* thread) { register u32 prevInt = __osDisableInt(); diff --git a/src/libultra/os/stopthread.c b/src/libultra/os/stopthread.c index 53aecd940a..6e24b5d83f 100644 --- a/src/libultra/os/stopthread.c +++ b/src/libultra/os/stopthread.c @@ -1,4 +1,4 @@ -#include "global.h" +#include "ultra64.h" void osStopThread(OSThread* thread) { register u32 prevInt = __osDisableInt(); diff --git a/src/libultra/os/stoptimer.c b/src/libultra/os/stoptimer.c index d6d20536a1..e8dbdbd2cf 100644 --- a/src/libultra/os/stoptimer.c +++ b/src/libultra/os/stoptimer.c @@ -1,4 +1,4 @@ -#include "global.h" +#include "ultra64.h" s32 osStopTimer(OSTimer* timer) { register u32 prevInt; diff --git a/src/libultra/os/thread.c b/src/libultra/os/thread.c index 0263acb454..a9429b6b9b 100644 --- a/src/libultra/os/thread.c +++ b/src/libultra/os/thread.c @@ -1,4 +1,4 @@ -#include "global.h" +#include "ultra64.h" __OSThreadTail __osThreadTail = { NULL, OS_PRIORITY_THREADTAIL }; OSThread* __osRunQueue = (OSThread*)&__osThreadTail; diff --git a/src/libultra/os/timerintr.c b/src/libultra/os/timerintr.c index 3f94368b20..2e6d6ba71b 100644 --- a/src/libultra/os/timerintr.c +++ b/src/libultra/os/timerintr.c @@ -1,4 +1,4 @@ -#include "global.h" +#include "ultra64.h" OSTimer __osBaseTimer; OSTime __osCurrentTime; diff --git a/src/libultra/os/virtualtophysical.c b/src/libultra/os/virtualtophysical.c index 0037572232..0906dc51af 100644 --- a/src/libultra/os/virtualtophysical.c +++ b/src/libultra/os/virtualtophysical.c @@ -1,4 +1,4 @@ -#include "global.h" +#include "ultra64.h" u32 osVirtualToPhysical(void* vaddr) { if (IS_KSEG0(vaddr)) { diff --git a/src/libultra/os/yieldthread.c b/src/libultra/os/yieldthread.c index af9e15a2c1..a0604f7183 100644 --- a/src/libultra/os/yieldthread.c +++ b/src/libultra/os/yieldthread.c @@ -1,4 +1,4 @@ -#include "global.h" +#include "ultra64.h" void osYieldThread(void) { register u32 prevInt = __osDisableInt(); diff --git a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.c index bcd13a5c67..384b1a9fb6 100644 --- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.c +++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.c @@ -37,7 +37,8 @@ #endif #include "assets/textures/icon_item_gameover_static/icon_item_gameover_static.h" -#pragma increment_block_number "gc-eu:128 gc-eu-mq:128 ntsc-1.0:128 ntsc-1.1:128 ntsc-1.2:128 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" \ + "ntsc-1.0:0 ntsc-1.1:0 ntsc-1.2:0 pal-1.0:0 pal-1.1:0" #if !PLATFORM_GC #define KALEIDO_PROMPT_CURSOR_R 100 diff --git a/tools/ZAPD/ZAPD/ZFile.cpp b/tools/ZAPD/ZAPD/ZFile.cpp index db2d251a5c..e59c50e67a 100644 --- a/tools/ZAPD/ZAPD/ZFile.cpp +++ b/tools/ZAPD/ZAPD/ZFile.cpp @@ -905,7 +905,7 @@ std::string ZFile::GetZRoomHeaderInclude() const headers += "#include \"segment_symbols.h\"\n"; headers += "#include \"command_macros_base.h\"\n"; headers += "#include \"z64cutscene_commands.h\"\n"; - headers += "#include \"variables.h\"\n"; + /* headers += "#include \"variables.h\"\n"; */ return headers; }