Merge remote-tracking branch 'decomp/main' into decomp_merge

include/carthandle.h

@@ -0,0 +1,8 @@
+#ifndef CARTHANDLE_H
+#define CARTHANDLE_H
+
+#include "ultra64.h"
+
+extern OSPiHandle* gCartHandle;
+
+#endif

include/gfx.h

@@ -127,4 +127,7 @@ void Graph_CloseDisps(Gfx** dispRefs, GraphicsContext* gfxCtx, const char* file,
 
 void Graph_ThreadEntry(void*);
 
+extern u64 gMojiFontTLUTs[4][4]; // original name: "moji_tlut"
+extern u64 gMojiFontTex[]; // original name: "font_ff"
+
 #endif

include/global.h

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

include/idle.h

@@ -1,10 +1,12 @@
 #ifndef IDLE_H
 #define IDLE_H
 
-#include "ultra64/vi.h"
+#include "ultra64.h"
 
 void Idle_ThreadEntry(void* arg);
 
+extern OSMesgQueue gPiMgrCmdQueue;
 extern OSViMode gViConfigMode;
+extern u8 gViConfigModeType;
 
 #endif

include/macros.h

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

include/map.h

@@ -68,6 +68,7 @@ typedef struct MapData {
 #define MAP_48x85_TEX_SIZE ((MAP_48x85_TEX_WIDTH * MAP_48x85_TEX_HEIGHT) / 2) // 48x85 CI4 texture
 
 extern MapData gMapDataTable;
+extern MapData* gMapData;
 
 void Map_SavePlayerInitialInfo(struct PlayState* play);
 void Map_SetFloorPalettesData(struct PlayState* play, s16 floor);

include/ultra64/gbi.h

@@ -1,4 +1,3 @@
-#include "mbi.h"
 
 #ifndef ULTRA64_GBI_H
 #define ULTRA64_GBI_H
@@ -12,6 +11,8 @@
     #endif
     #include "gbi.f3dex3.h"
 #else
+#include "mbi.h"
+#include "ultratypes.h"
 
 #ifdef GBI_DOWHILE
 /* Private macro to wrap other macros in do {...} 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,28 +0,0 @@
-#ifndef VARIABLES_H
-#define VARIABLES_H
-
-#include "z64.h"
-#include "libc64/os_malloc.h"
-#include "segment_symbols.h"
-
-struct MapData;
-
-extern OSPiHandle* gCartHandle;
-
-extern OSMesgQueue gPiMgrCmdQueue;
-extern u8 gViConfigModeType;
-
-extern s16 gSpoilingItems[3];
-extern s16 gSpoilingItemReverts[3];
-
-// 4 16-colors palettes
-extern u64 gMojiFontTLUTs[4][4]; // original name: "moji_tlut"
-extern u64 gMojiFontTex[]; // original name: "font_ff"
-
-extern struct MapData* gMapData;
-extern u8 gBossMarkState;
-extern f32 gBossMarkScale;
-extern u32 D_8016139C;
-extern PauseMapMarksData* gLoadedPauseMarkDataTable;
-
-#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, ...) DmaMgr_RequestSyncDebug(ram, vrom, size,  __FILE__, __LINE__)
+#define DMA_REQUEST_ASYNC(req, ram, vrom, size, unk5, queue, msg, ...) DmaMgr_RequestAsyncDebug(req, ram, vrom, size, unk5, queue, msg,  __FILE__, __LINE__)
+#else
+#define DMA_REQUEST_SYNC(ram, vrom, size, ...) DmaMgr_RequestSync(ram, vrom, size)
+#define DMA_REQUEST_ASYNC(req, ram, vrom, size, unk5, queue, msg, ...) DmaMgr_RequestAsync(req, ram, vrom, size, unk5, queue, msg)
+#endif
+
 #endif

include/z64interface.h

@@ -279,4 +279,7 @@ void Interface_Update(struct PlayState* play);
 void Interface_Destroy(struct PlayState* play);
 void Interface_Init(struct PlayState* play);
 
+extern s16 gSpoilingItems[3];
+extern s16 gSpoilingItemReverts[3];
+
 #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

include/z64pause.h

@@ -257,4 +257,9 @@ void KaleidoSetup_Update(struct PlayState* play);
 void KaleidoSetup_Init(struct PlayState* play);
 void KaleidoSetup_Destroy(struct PlayState* play);
 
+extern u8 gBossMarkState;
+extern f32 gBossMarkScale;
+extern u32 D_8016139C;
+extern PauseMapMarksData* gLoadedPauseMarkDataTable;
+
 #endif