variables.h: migrate all remaining varaibles, remove other dependencies except z64.h (#2505)

* move remaining variables from variables.h

* fix other dependencies

* extra newline

* fix and adjust comment

* is this the problem

* fix bss

include/build.h

@@ -0,0 +1,8 @@
+#ifndef BUILD_H
+#define BUILD_H
+
+extern const char gBuildCreator[];
+extern const char gBuildDate[];
+extern const char gBuildMakeOption[];
+
+#endif

include/carthandle.h

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

include/gfx.h

@@ -121,4 +121,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/idle.h

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

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/variables.h

@@ -2,32 +2,9 @@
 #define VARIABLES_H
 
 #include "z64.h"
-#include "libc64/os_malloc.h"
-#include "segment_symbols.h"
 
-struct MapData;
-
-extern OSPiHandle* gCartHandle;
-
-extern const char gBuildCreator[];
-extern const char gBuildDate[];
-extern const char gBuildMakeOption[];
-
-extern OSMesgQueue gPiMgrCmdQueue;
-extern OSViMode gViConfigMode;
-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;
+// TODO:
+// Plenty of files depend on this file to have access to z64.h.
+// Fix those cases and then delete this file.
 
 #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/z64pause.h

@@ -250,4 +250,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

src/audio/lib/load.c

@@ -1,6 +1,7 @@
-#include "ultra64.h"
 #include "attributes.h"
 #include "buffers.h"
+#include "segment_symbols.h"
+#include "ultra64.h"
 #include "versions.h"
 
 #include "global.h"

src/boot/boot_main.c

@@ -1,7 +1,9 @@
 #include "boot.h"
 
+#include "carthandle.h"
 #include "idle.h"
 #include "is_debug.h"
+#include "segment_symbols.h"
 #include "stack.h"
 #include "stackcheck.h"
 #if PLATFORM_N64

src/boot/build.c

@@ -1,3 +1,5 @@
+#include "build.h"
+
 #include "versions.h"
 
 const char gBuildCreator[] = BUILD_CREATOR;

src/boot/carthandle.c

@@ -1,3 +1,3 @@
-#include "ultra64.h"
+#include "carthandle.h"
 
 OSPiHandle* gCartHandle = NULL;

src/boot/cic6105.c

@@ -1,10 +1,13 @@
-#pragma increment_block_number "ntsc-1.2:0"
-#include "global.h"
+#pragma increment_block_number "ntsc-1.0:132 ntsc-1.1:132 ntsc-1.2:132 pal-1.0:132 pal-1.1:132"
+
 #include "audiomgr.h"
+#include "build.h"
 #include "cic6105.h"
+#include "fault.h"
 #include "regs.h"
 #include "sched.h"
-#include "fault.h"
+
+#include "global.h"
 
 s32 func_80001714(void);
 

src/boot/idle.c

@@ -1,4 +1,5 @@
 #include "buffers.h"
+#include "build.h"
 #include "idle.h"
 #include "main.h"
 #include "segment_symbols.h"

src/boot/viconfig.c

@@ -1,5 +1,7 @@
-#include "global.h"
 #include "terminal.h"
+#include "idle.h"
+
+#include "global.h"
 
 s8 D_80009430 = 1;
 vu8 gViConfigBlack = true;

src/boot/z_locale.c

@@ -1,5 +1,6 @@
 #include "libu64/debug.h"
 #include "alignment.h"
+#include "carthandle.h"
 #include "line_numbers.h"
 #include "padmgr.h"
 #include "region.h"

src/boot/z_std_dma.c

@@ -22,7 +22,9 @@
 #include "libc64/sprintf.h"
 #include "libu64/debug.h"
 #include "attributes.h"
+#include "carthandle.h"
 #include "fault.h"
+#include "idle.h"
 #if PLATFORM_IQUE
 #include "inflate.h"
 #endif
@@ -41,8 +43,8 @@
 
 #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:22" \
-                               "pal-1.0:20 pal-1.1:20"
+#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"
 
 StackEntry sDmaMgrStackInfo;
 OSMesgQueue sDmaMgrMsgQueue;

src/code/fault_gc.c

@@ -41,8 +41,8 @@
  * DPad-Down disables sending fault pages over osSyncPrintf.
  */
 
-#pragma increment_block_number "gc-eu:96 gc-eu-mq:96 gc-eu-mq-dbg:96 gc-jp:96 gc-jp-ce:96 gc-jp-mq:96 gc-us:96" \
-                               "gc-us-mq:96 ique-cn:96"
+#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"
 
 #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:88 ntsc-1.1:88 ntsc-1.2:88 pal-1.0:86 pal-1.1:86"
+#pragma increment_block_number "ntsc-1.0:108 ntsc-1.1:108 ntsc-1.2:108 pal-1.0:108 pal-1.1:108"
 
 typedef struct FaultMgr {
     OSThread thread;

src/code/game.c

@@ -1,4 +1,5 @@
 #include "libc64/malloc.h"
+#include "libc64/os_malloc.h"
 #include "libu64/debug.h"
 #include "libu64/gfxprint.h"
 #include "audiomgr.h"
@@ -8,7 +9,7 @@
 #include "gfx.h"
 #include "gfxalloc.h"
 #include "fault.h"
-#include "libc64/os_malloc.h"
+#include "idle.h"
 #include "line_numbers.h"
 #if PLATFORM_N64
 #include "n64dd.h"