Reduce overlay dependencies on global.h (7) (#2472)

* z64env_flags, z64quest_hint_commands

* z64cutscene_spline, z64save.h moved from z64.h

* bss

* pr suggestion

* bss

* suggestions

include/functions.h

@@ -47,13 +47,6 @@ void Debug_DrawText(GraphicsContext* gfxCtx);
 
 void* MemCpy(void* dest, const void* src, s32 len);
 
-u16 QuestHint_GetSariaTextId(PlayState* play);
-u16 QuestHint_GetNaviTextId(PlayState* play);
-void CutsceneFlags_UnsetAll(PlayState* play);
-void CutsceneFlags_Set(PlayState* play, s16 flag);
-void CutsceneFlags_Unset(PlayState* play, s16 flag);
-s32 CutsceneFlags_Get(PlayState* play, s16 flag);
-
 s32 Kanji_OffsetFromShiftJIS(s32 character);
 #if PLATFORM_IQUE
 void Font_LoadCharCHN(Font* font, u16 character, u16 codePointIndex);
@@ -160,8 +153,6 @@ void DebugCamera_Init(DebugCam* debugCam, Camera* cameraPtr);
 void DebugCamera_Enable(DebugCam* debugCam, Camera* cam);
 void DebugCamera_Update(DebugCam* debugCam, Camera* cam);
 void DebugCamera_Reset(Camera* cam, DebugCam* debugCam);
-void func_800BB0A0(f32 u, Vec3f* pos, f32* roll, f32* viewAngle, f32* point0, f32* point1, f32* point2, f32* point3);
-s32 func_800BB2B4(Vec3f* pos, f32* roll, f32* fov, CutsceneCameraPoint* point, s16* keyFrame, f32* curFrame);
 
 void PreRender_SetValuesSave(PreRender* this, u32 width, u32 height, void* fbuf, void* zbuf, void* cvg);
 void PreRender_Init(PreRender* this);

include/gfx.h

@@ -54,6 +54,8 @@ typedef struct GraphicsContext {
     /* 0x02FC */ char unk_2FC[0x04];
 } GraphicsContext; // size = 0x300
 
+extern Gfx gEmptyDL[];
+
 Gfx* Gfx_SetFog(Gfx* gfx, s32 r, s32 g, s32 b, s32 a, s32 near, s32 far);
 Gfx* Gfx_SetFogWithSync(Gfx* gfx, s32 r, s32 g, s32 b, s32 a, s32 near, s32 far);
 Gfx* Gfx_SetFog2(Gfx* gfx, s32 r, s32 g, s32 b, s32 a, s32 near, s32 far);

include/regs.h

@@ -1,6 +1,7 @@
 #ifndef REGS_H
 #define REGS_H
 
+#include "ultra64.h"
 #include "versions.h"
 
 #define REG_GROUPS 29 // number of REG groups, i.e. REG, SREG, OREG, etc.

include/segment_symbols.h

@@ -1,8 +1,8 @@
 #ifndef SEGMENT_SYMBOLS_H
 #define SEGMENT_SYMBOLS_H
 
+#include "ultra64/ultratypes.h"
 #include "versions.h"
-#include "z64.h"
 
 #define DECLARE_SEGMENT(name)          \
     extern u8 _##name##SegmentStart[]; \

include/variables.h

@@ -5,8 +5,6 @@
 #include "libc64/os_malloc.h"
 #include "segment_symbols.h"
 
-extern Mtx D_01000000;
-
 extern void* osRomBase;
 extern s32 osTvType;
 extern u32 osRomType;
@@ -77,8 +75,6 @@ extern MapData gMapDataTable;
 extern s16 gSpoilingItems[3];
 extern s16 gSpoilingItemReverts[3];
 
-extern Gfx gEmptyDL[];
-
 extern u16 gSramSlotOffsets[];
 // 4 16-colors palettes
 extern u64 gMojiFontTLUTs[4][4]; // original name: "moji_tlut"
@@ -153,14 +149,6 @@ extern u8 gSequenceFontTable[];
 extern u8 gSequenceTable[];
 extern AudioTable gSampleBankTable;
 
-extern u8 gUseCutsceneCam;
-extern u16 D_8015FCCC;
-extern char D_8015FCD0[20];
-extern u8 D_8015FCE4;
-extern u16 gCamAtSplinePointsAppliedFrame;
-extern u16 gCamEyePointAppliedFrame;
-extern u16 gCamAtPointAppliedFrame;
-
 extern LightningStrike gLightningStrike;
 // TODO: These variables are here for BSS ordering but ideally they should not
 // be extern. This could be fixed by putting more stuff (e.g. struct definitions)

include/z64.h

@@ -7,55 +7,28 @@
 #include "audiomgr.h"
 #include "controller.h"
 #include "versions.h"
-#include "z64save.h"
-#include "z64light.h"
-#include "z64bgcheck.h"
-#include "z64actor.h"
 #include "z64player.h"
 #include "z64audio.h"
-#include "z64object.h"
 #include "z64ocarina.h"
-#include "z64camera.h"
-#include "z64environment.h"
-#include "z64cutscene.h"
-#include "z64collision_check.h"
 #include "z64curve.h"
-#include "z64scene.h"
 #include "z64effect.h"
-#include "z64game_over.h"
-#include "z64inventory.h"
-#include "z64item.h"
 #include "z64animation.h"
 #include "z64animation_legacy.h"
-#include "z64dma.h"
 #include "letterbox.h"
 #include "z64math.h"
 #include "z64map_mark.h"
-#include "z64message.h"
 #include "one_point_cutscene.h"
-#include "z64pause.h"
 #include "z64play.h"
 #include "z64skin.h"
 #include "z64skin_matrix.h"
-#include "z64game.h"
-#include "z64transition.h"
-#include "z64transition_instances.h"
-#include "z64interface.h"
-#include "z64sfx_source.h"
-#include "z64skybox.h"
-#include "z64sram.h"
-#include "z64view.h"
 #include "z64vis.h"
 #include "zelda_arena.h"
 #include "alignment.h"
 #include "audiothread_cmd.h"
-#include "seqcmd.h"
-#include "sequence.h"
 #include "sfx.h"
 #include "color.h"
 #include "libu64/gfxprint.h"
 #include "z_lib.h"
-#include "ichain.h"
 #include "regs.h"
 #include "irqmgr.h"
 #include "padmgr.h"
@@ -69,10 +42,8 @@
 #include "gfx.h"
 #include "gfx_setupdl.h"
 #include "gfxalloc.h"
-#include "jpeg.h"
 #include "prerender.h"
 #include "rand.h"
-#include "libc64/qrand.h"
 #include "sys_math.h"
 #include "sys_math3d.h"
 #include "libc64/math64.h"
@@ -148,13 +119,6 @@ typedef struct SampleState {
     /* 0x00A8 */ View view;
 } SampleState; // size = 0x1D0
 
-typedef struct QuestHintCmd {
-    /* 0x00 */ u8 byte0;
-    /* 0x01 */ u8 byte1;
-    /* 0x02 */ u8 byte2;
-    /* 0x03 */ u8 byte3;
-} QuestHintCmd; // size = 0x4
-
 typedef enum PauseBgPreRenderState {
     /* 0 */ PAUSE_BG_PRERENDER_OFF, // Inactive, do nothing.
     /* 1 */ PAUSE_BG_PRERENDER_SETUP, // The current frame is only drawn for the purpose of serving as the pause background.

include/z64camera.h

@@ -4,7 +4,6 @@
 #include "ultra64.h"
 #include "z64cutscene.h"
 #include "z64math.h"
-#include "z64save.h"
 
 struct CollisionContext;
 struct View;

include/z64cutscene.h

@@ -515,6 +515,14 @@ typedef struct CutsceneContext {
     /* 0x28 */ CsCmdActorCue* actorCues[10]; // "npcdemopnt"
 } CutsceneContext; // size = 0x50
 
+extern u8 gUseCutsceneCam;
+extern u16 D_8015FCCC;
+extern char D_8015FCD0[20];
+extern u8 D_8015FCE4;
+extern u16 gCamAtSplinePointsAppliedFrame;
+extern u16 gCamEyePointAppliedFrame;
+extern u16 gCamAtPointAppliedFrame;
+
 void Cutscene_InitContext(struct PlayState* play, CutsceneContext* csCtx);
 void Cutscene_StartManual(struct PlayState* play, CutsceneContext* csCtx);
 void Cutscene_StopManual(struct PlayState* play, CutsceneContext* csCtx);

include/z64cutscene_flags.h

@@ -0,0 +1,13 @@
+#ifndef Z64CUTSCENE_FLAGS_H
+#define Z64CUTSCENE_FLAGS_H
+
+#include "ultra64.h"
+
+struct PlayState;
+
+void CutsceneFlags_UnsetAll(struct PlayState* play);
+void CutsceneFlags_Set(struct PlayState* play, s16 flag);
+void CutsceneFlags_Unset(struct PlayState* play, s16 flag);
+s32 CutsceneFlags_Get(struct PlayState* play, s16 flag);
+
+#endif

include/z64cutscene_spline.h

@@ -0,0 +1,12 @@
+#ifndef Z64CUTSCENE_SPLINE_H
+#define Z64CUTSCENE_SPLINE_H
+
+#include "ultra64.h"
+#include "z64math.h"
+
+union CutsceneCameraPoint;
+
+void func_800BB0A0(f32 u, Vec3f* pos, f32* roll, f32* viewAngle, f32* point0, f32* point1, f32* point2, f32* point3);
+s32 func_800BB2B4(Vec3f* pos, f32* roll, f32* fov, union CutsceneCameraPoint* point, s16* keyFrame, f32* curFrame);
+
+#endif

include/z64play.h

@@ -4,7 +4,6 @@
 #include "ultra64.h"
 
 #include "prerender.h"
-
 #include "z64actor.h"
 #include "z64bgcheck.h"
 #include "z64camera.h"
@@ -26,6 +25,7 @@
 #include "z64view.h"
 
 union Color_RGBA8_u32;
+struct Path;
 struct Player;
 struct QuestHintCmd;
 struct VisMono;
@@ -115,6 +115,8 @@ typedef struct PlayState {
     /* 0x12430 */ char unk_12430[0xE8];
 } PlayState; // size = 0x12518
 
+extern Mtx D_01000000; // billboardMtx
+
 #define GET_ACTIVE_CAM(play) ((play)->cameraPtrs[(play)->activeCamId])
 #define GET_PLAYER(play) ((Player*)(play)->actorCtx.actorLists[ACTORCAT_PLAYER].head)
 

include/z64quest_hint.h

@@ -0,0 +1,11 @@
+#ifndef Z64QUEST_HINT_H
+#define Z64QUEST_HINT_H
+
+#include "ultra64.h"
+
+struct PlayState;
+
+u16 QuestHint_GetSariaTextId(struct PlayState* play);
+u16 QuestHint_GetNaviTextId(struct PlayState* play);
+
+#endif

include/z64quest_hint_commands.h

@@ -3,6 +3,13 @@
 
 #include "ultra64.h"
 
+typedef struct QuestHintCmd {
+    /* 0x00 */ u8 byte0;
+    /* 0x01 */ u8 byte1;
+    /* 0x02 */ u8 byte2;
+    /* 0x03 */ u8 byte3;
+} QuestHintCmd; // size = 0x4
+
 /*
  * Hint Command Types
  */

src/audio/general.c

@@ -1,5 +1,7 @@
 #include "ultra64.h"
 #include "global.h"
+#include "seqcmd.h"
+#include "sequence.h"
 #include "versions.h"
 
 #define ABS_ALT(x) ((x) < 0 ? -(x) : (x))

src/audio/sequence.c

@@ -20,6 +20,7 @@
 #include "ultra64.h"
 #include "global.h"
 #include "ultra64/abi.h"
+#include "seqcmd.h"
 
 // Direct audio command (skips the queueing system)
 #define SEQCMD_SET_SEQPLAYER_VOLUME_NOW(seqPlayerIndex, duration, volume)                       \

src/boot/boot_main.c

@@ -6,8 +6,7 @@
 #endif
 #include "z64thread.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.2: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.2:128"
 
 StackEntry sBootThreadInfo;
 OSThread sIdleThread;

src/boot/cic6105.c

@@ -1,4 +1,4 @@
-#pragma increment_block_number "ntsc-1.2:128"
+#pragma increment_block_number "ntsc-1.2:0"
 
 #include "global.h"
 #include "cic6105.h"

src/boot/yaz0.c

@@ -1,7 +1,7 @@
 #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.2: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.2:128" \
+                               "pal-1.1:128"
 
 ALIGNED(16) u8 sYaz0DataBuffer[0x400];
 u8* sYaz0DataBufferEnd;

src/boot/z_std_dma.c

@@ -18,18 +18,22 @@
  * There are some additional provisions to ensure that audio DMA is particularly high-speed, the audio data is assumed
  * to be uncompressed and the request queue and address translation is skipped.
  */
-#include "global.h"
+#include "libc64/sleep.h"
 #include "fault.h"
-#include "stack.h"
-#include "terminal.h"
 #include "line_numbers.h"
 #if PLATFORM_N64
 #include "n64dd.h"
 #endif
+#include "segment_symbols.h"
+#include "stack.h"
+#include "stackcheck.h"
+#include "terminal.h"
 #include "z64thread.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.2:72 pal-1.0:70 pal-1.1:70"
+                               "ntsc-1.2:20 pal-1.0:18 pal-1.1:18"
 
 StackEntry sDmaMgrStackInfo;
 OSMesgQueue sDmaMgrMsgQueue;

src/code/code_n64dd_800AD4C0.c

@@ -1,6 +1,8 @@
-#include "global.h"
 #include "fault.h"
 #include "n64dd.h"
+#include "z64save.h"
+
+#include "global.h"
 
 n64ddStruct_800FEE70_pointers D_800FEE70 = {
     func_801C7C1C,

src/code/db_camera.c

@@ -1,6 +1,19 @@
 #include "global.h"
+#include "libu64/gfxprint.h"
+#include "attributes.h"
+#include "controller.h"
+#include "letterbox.h"
+#include "mempak.h"
+#include "regs.h"
+#include "sfx.h"
+#include "z_lib.h"
+#include "z64camera.h"
+#include "z64cutscene.h"
+#include "z64cutscene_spline.h"
 #include "z64debug_display.h"
 #include "z64olib.h"
+#include "z64play.h"
+#include "z64save.h"
 
 #define DEBUG_CAM_CONTROLLER_PORT 2
 

src/code/fault_gc.c

@@ -40,16 +40,22 @@
  * DPad-Up may be pressed to enable sending fault pages over osSyncPrintf as well as displaying them on-screen.
  * DPad-Down disables sending fault pages over osSyncPrintf.
  */
-#pragma increment_block_number "gc-eu:160 gc-eu-mq:160 gc-eu-mq-dbg:160 gc-jp:160 gc-jp-ce:160 gc-jp-mq:160 gc-us:160" \
-                               "gc-us-mq:160 ique-cn:160"
+#pragma increment_block_number "gc-eu:96 gc-eu-mq:96 gc-eu-mq-dbg:96 gc-jp:112 gc-jp-ce:112 gc-jp-mq:112 gc-us:112" \
+                               "gc-us-mq:112 ique-cn:112"
 
 #include "global.h"
+#include "libc64/sleep.h"
+#include "libc64/sprintf.h"
 #include "alloca.h"
+#include "controller.h"
 #include "fault.h"
 #include "stack.h"
+#include "stackcheck.h"
 #include "terminal.h"
 #include "z64thread.h"
 
+#include "macros.h"
+
 void Fault_Init(void);
 void Fault_SetOsSyncPrintfEnabled(u32 enabled);
 void Fault_DrawRecImpl(s32 xStart, s32 yStart, s32 xEnd, s32 yEnd, u16 color);

src/code/fault_n64.c

@@ -1,13 +1,19 @@
-#pragma increment_block_number "ntsc-1.0:0 ntsc-1.1:0 ntsc-1.2:0 pal-1.0:0 pal-1.1:0"
-
-#include "global.h"
-#include "fault.h"
 #include "libc64/os_malloc.h"
+#include "libc64/sleep.h"
+#include "libc64/sprintf.h"
+#include "controller.h"
+#include "fault.h"
+#include "padmgr.h"
+#include "segmented_address.h"
 #include "stack.h"
+#include "stackcheck.h"
 #include "terminal.h"
 #include "z64thread.h"
 
-#pragma increment_block_number "ntsc-1.0:192 ntsc-1.1:192 ntsc-1.2:192 pal-1.0:192 pal-1.1:192"
+#include "macros.h"
+#include "global.h"
+
+#pragma increment_block_number "ntsc-1.0:128 ntsc-1.1:128 ntsc-1.2:128 pal-1.0:128 pal-1.1:128"
 
 typedef struct FaultMgr {
     OSThread thread;

src/code/flg_set.c

@@ -1,4 +1,10 @@
-#include "global.h"
+#include "libu64/gfxprint.h"
+#include "libu64/pad.h"
+#include "gfx.h"
+#include "gfxalloc.h"
+#include "controller.h"
+#include "z64play.h"
+#include "z64save.h"
 
 typedef struct FlagSetEntry {
     /* 0x00 */ u16* value;

src/code/graph.c

@@ -1,16 +1,24 @@
-#include "global.h"
+#include "libc64/malloc.h"
+#include "libc64/sprintf.h"
+#include "libu64/debug.h"
+#include "gfx.h"
 #include "fault.h"
+#include "line_numbers.h"
+#include "regs.h"
 #include "sys_ucode.h"
 #include "terminal.h"
 #include "ucode_disas.h"
 #include "versions.h"
-#include "line_numbers.h"
+#include "z64save.h"
+
+#include "macros.h"
+#include "global.h"
 
 #define GFXPOOL_HEAD_MAGIC 0x1234
 #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 ntsc-1.0:160" \
-                               "ntsc-1.1:160 ntsc-1.2:160 pal-1.0:160 pal-1.1:160"
+#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:192" \
+                               "ntsc-1.1:192 ntsc-1.2:192 pal-1.0:192 pal-1.1:192"
 
 /**
  * The time at which the previous `Graph_Update` ended.

src/code/jpegdecoder.c

@@ -1,4 +1,4 @@
-#include "global.h"
+#include "jpeg.h"
 
 s32 JpegDecoder_ProcessMcu(JpegHuffmanTable* hTable0, JpegHuffmanTable* hTable1, u16* mcu, s16* unk);
 s32 JpegDecoder_ParseNextSymbol(JpegHuffmanTable* hTable, s16* outCoeff, s8* outZeroCount);

src/code/jpegutils.c

@@ -1,4 +1,4 @@
-#include "global.h"
+#include "jpeg.h"
 
 void JpegUtils_ProcessQuantizationTable(u8* dqt, JpegQuantizationTable* qt, u8 count) {
     u8 i;

src/code/main.c

@@ -24,8 +24,8 @@ extern struct IrqMgr gIrqMgr;
 #endif
 #include "z64thread.h"
 
-#pragma increment_block_number "gc-eu:144 gc-eu-mq:144 gc-jp:144 gc-jp-ce:144 gc-jp-mq:144 gc-us:144 gc-us-mq:144" \
-                               "ique-cn:160 ntsc-1.0:133 ntsc-1.1:133 ntsc-1.2:133 pal-1.0:131 pal-1.1:131"
+#pragma increment_block_number "gc-eu:96 gc-eu-mq:96 gc-jp:96 gc-jp-ce:96 gc-jp-mq:96 gc-us:96 gc-us-mq:96 ique-cn:96" \
+                               "ntsc-1.0:78 ntsc-1.1:78 ntsc-1.2:78 pal-1.0:76 pal-1.1:76"
 
 extern u8 _buffersSegmentEnd[];
 

src/code/speed_meter.c

@@ -1,4 +1,4 @@
-#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" \
+#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.2:128 pal-1.0:128 pal-1.1:128"
 
 #include "global.h"

src/code/z_actor.c

@@ -18,6 +18,7 @@
 #include "z64light.h"
 #include "z64horse.h"
 #include "z64play.h"
+#include "z64save.h"
 #include "z64skin_matrix.h"
 
 #include "global.h"

src/code/z_bgcheck.c

@@ -2,7 +2,7 @@
 #include "terminal.h"
 #include "line_numbers.h"
 
-#pragma increment_block_number "ntsc-1.0:120 ntsc-1.1:120 ntsc-1.2:120"
+#pragma increment_block_number "ntsc-1.0:64 ntsc-1.1:64 ntsc-1.2:64"
 
 u16 DynaSSNodeList_GetNextNodeIdx(DynaSSNodeList* nodeList);
 void BgCheck_GetStaticLookupIndicesFromPos(CollisionContext* colCtx, Vec3f* pos, Vec3i* sector);

src/code/z_camera.c

@@ -1,12 +1,13 @@
 #include "ultra64.h"
-#include "global.h"
 #include "quake.h"
 #include "terminal.h"
+#include "z64cutscene_spline.h"
 #include "z64olib.h"
+#include "z64save.h"
 #include "overlays/actors/ovl_En_Horse/z_en_horse.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:128 ntsc-1.0:128 ntsc-1.1:128 ntsc-1.2:128 pal-1.0:128 pal-1.1:128"
+#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:192 ntsc-1.1:192 ntsc-1.2:192 pal-1.0:192 pal-1.1:192"
 
 s16 Camera_RequestSettingImpl(Camera* camera, s16 requestedSetting, s16 flags);
 s32 Camera_RequestModeImpl(Camera* camera, s16 requestedMode, u8 forceModeChange);
@@ -3640,7 +3641,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:134 ntsc-1.1:134 ntsc-1.2:134 pal-1.0:132 pal-1.1:132"
+                               "ique-cn:128 ntsc-1.0:117 ntsc-1.1:117 ntsc-1.2:117 pal-1.0:115 pal-1.1:115"
 
 s32 Camera_KeepOn4(Camera* camera) {
     static Vec3f D_8015BD50;

src/code/z_collision_check.c

@@ -15,8 +15,7 @@
 #include "overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.h"
 #include "z_lib.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:128 ntsc-1.0:104 ntsc-1.1:104 ntsc-1.2:104 pal-1.0:104 pal-1.1:104"
+#pragma increment_block_number "ique-cn:0 ntsc-1.0:248 ntsc-1.1:248 ntsc-1.2:248 pal-1.0:248 pal-1.1:248"
 
 typedef s32 (*ColChkResetFunc)(PlayState*, Collider*);
 typedef void (*ColChkApplyFunc)(PlayState*, CollisionCheckContext*, Collider*);

src/code/z_common_data.c

@@ -1,9 +1,14 @@
-#include "global.h"
 #include "region.h"
+#include "sequence.h"
 #include "versions.h"
+#include "z64environment.h"
+#include "z64save.h"
+#include "z64transition.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:176 ntsc-1.1:176 ntsc-1.2:176 pal-1.0:176 pal-1.1:176"
+#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.0:176" \
+                               "ntsc-1.1:176 ntsc-1.2:176 pal-1.0:192 pal-1.1:192"
 
 ALIGNED(16) SaveContext gSaveContext;
 #if PLATFORM_IQUE

src/code/z_construct.c

@@ -1,5 +1,10 @@
 #include "global.h"
+#include "map.h"
+#include "regs.h"
 #include "versions.h"
+#include "z64ocarina.h"
+#include "z64play.h"
+#include "z64save.h"
 
 void Interface_Destroy(PlayState* play) {
     Map_Destroy(play);

src/code/z_cutscene_spline.c

@@ -1,4 +1,8 @@
-#include "global.h"
+#include "ultra64.h"
+#include "z64math.h"
+#include "z64camera.h"
+#include "z64cutscene_spline.h"
+#include "macros.h"
 
 // The code in this file is very similar to a spline system used in Super Mario 64 for cutscene camera movement
 

src/code/z_debug.c

@@ -1,4 +1,15 @@
-#include "global.h"
+#include "libc64/malloc.h"
+#include "libu64/gfxprint.h"
+#include "libu64/pad.h"
+#include "color.h"
+#include "controller.h"
+#include "gfx.h"
+#include "gfxalloc.h"
+#include "regs.h"
+#include "rumble.h"
+#include "ultra64.h"
+
+#include "macros.h"
 
 typedef struct DebugCamTextBufferEntry {
     /* 0x0 */ u8 x;
@@ -13,7 +24,7 @@ typedef struct InputCombo {
 } InputCombo; // size = 0x4
 
 #pragma increment_block_number "gc-eu:160 gc-eu-mq:160 gc-jp:160 gc-jp-ce:160 gc-jp-mq:160 gc-us:160 gc-us-mq:160" \
-                               "ique-cn:128 ntsc-1.0:160 ntsc-1.1:160 ntsc-1.2:160 pal-1.0:160 pal-1.1:160"
+                               "ique-cn:160 ntsc-1.0:160 ntsc-1.1:160 ntsc-1.2:160 pal-1.0:160 pal-1.1:160"
 
 RegEditor* gRegEditor;
 

src/code/z_demo.c

@@ -1,11 +1,29 @@
-#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:128 ntsc-1.1:128 ntsc-1.2:128 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 ique-cn:0" \
+                               "ntsc-1.0:0 ntsc-1.1:0 ntsc-1.2:0 pal-1.0:0 pal-1.1:0"
 #include "global.h"
-#include "quake.h"
-#include "z64camera.h"
+#include "libu64/gfxprint.h"
+#include "controller.h"
+#include "gfx.h"
+#include "gfxalloc.h"
+#include "letterbox.h"
 #if PLATFORM_N64
 #include "n64dd.h"
 #endif
+#include "regs.h"
+#include "rumble.h"
+#include "quake.h"
+#include "segmented_address.h"
+#include "seqcmd.h"
+#include "sequence.h"
+#include "sfx.h"
+#include "z_lib.h"
+#include "z64audio.h"
+#include "z64camera.h"
+#include "z64cutscene.h"
+#include "z64cutscene_flags.h"
+#include "z64play.h"
+#include "z64player.h"
+#include "z64save.h"
 
 #include "assets/scenes/indoors/tokinoma/tokinoma_scene.h"
 
@@ -126,8 +144,8 @@ u16 gCamAtSplinePointsAppliedFrame;
 u16 gCamEyePointAppliedFrame;
 u16 gCamAtPointAppliedFrame;
 
-#pragma increment_block_number "gc-eu:0 gc-eu-mq:0 gc-jp:188 gc-jp-ce:188 gc-jp-mq:0 gc-us:188 gc-us-mq:0" \
-                               "ntsc-1.0:128 ntsc-1.1:80 ntsc-1.2:80 pal-1.0:80 pal-1.1:80"
+#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"
 
 // Cam ID to return to when a scripted cutscene is finished
 s16 sReturnToCamId;

src/code/z_elf_message.c

@@ -1,5 +1,9 @@
-#include "global.h"
+#include "libu64/debug.h"
+#include "rand.h"
+#include "z64play.h"
+#include "z64player.h"
 #include "z64quest_hint_commands.h"
+#include "z64save.h"
 
 QuestHintCmd sChildSariaQuestHints[] = {
     QUEST_HINT_STRENGTH_UPG(SKIP, 0, false, 3),

src/code/z_en_item00.c

@@ -17,6 +17,7 @@
 #include "z64item.h"
 #include "z64play.h"
 #include "z64player.h"
+#include "z64save.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 

src/code/z_env_flags.c

@@ -1,4 +1,5 @@
 #include "ultra64.h"
+#include "z64cutscene_flags.h"
 #include "z64play.h"
 
 void CutsceneFlags_UnsetAll(PlayState* play) {

src/code/z_fbdemo_fade.c

@@ -1,5 +1,12 @@
-#include "global.h"
+#include "ultra64.h"
+#include "main.h"
+#include "regs.h"
 #include "terminal.h"
+#include "z_lib.h"
+#include "z64save.h"
+#include "z64transition_instances.h"
+
+#include "macros.h"
 
 typedef enum TransitionFadeDirection {
     /* 0 */ TRANS_FADE_DIR_IN,

src/code/z_fbdemo_wipe1.c

@@ -1,4 +1,6 @@
-#include "global.h"
+#include "gfx.h"
+#include "z64save.h"
+#include "z64transition_instances.h"
 
 typedef enum TransitionWipeDirection {
     /* 0 */ TRANS_WIPE_DIR_IN,

src/code/z_game_over.c

@@ -1,7 +1,14 @@
-#include "z64game_over.h"
-
-#include "global.h"
+#include "letterbox.h"
+#include "regs.h"
+#include "rumble.h"
+#include "sequence.h"
 #include "versions.h"
+#include "z64game_over.h"
+#include "z64play.h"
+#include "z64save.h"
+
+#include "macros.h"
+#include "global.h"
 
 void GameOver_Init(PlayState* play) {
     play->gameOverCtx.state = GAMEOVER_INACTIVE;

src/code/z_horse.c

@@ -4,7 +4,8 @@
 #include "z64horse.h"
 #include "z64play.h"
 #include "z64player.h"
-#include "src/overlays/actors/ovl_En_Horse/z_en_horse.h"
+#include "z64save.h"
+#include "overlays/actors/ovl_En_Horse/z_en_horse.h"
 
 /**
  * Tests if the player horse can be spawned

src/code/z_inventory.c

@@ -1,4 +1,8 @@
-#include "global.h"
+#include "ultra64.h"
+#include "z64play.h"
+#include "z64player.h"
+#include "z64save.h"
+
 #include "assets/textures/icon_item_static/icon_item_static.h"
 #include "assets/textures/icon_item_24_static/icon_item_24_static.h"
 #include "assets/textures/parameter_static/parameter_static.h"

src/code/z_kaleido_scope_call.c

@@ -1,8 +1,14 @@
-#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:224 ntsc-1.1:224 ntsc-1.2:224 pal-1.0:224 pal-1.1:224"
+#pragma increment_block_number "gc-eu:160 gc-eu-mq:160 gc-jp:160 gc-jp-ce:160 gc-jp-mq:160 gc-us:160 gc-us-mq:160" \
+                               "ique-cn:160 ntsc-1.0:160 ntsc-1.1:160 ntsc-1.2:160 pal-1.0:160 pal-1.1:160"
+
+#include "libu64/debug.h"
+#include "kaleido_manager.h"
+#include "letterbox.h"
+#include "regs.h"
+#include "terminal.h"
+#include "z64play.h"
 
 #include "global.h"
-#include "terminal.h"
 
 void (*sKaleidoScopeUpdateFunc)(PlayState* play);
 void (*sKaleidoScopeDrawFunc)(PlayState* play);

src/code/z_kaleido_setup.c

@@ -1,7 +1,12 @@
-#include "global.h"
+#include "controller.h"
+#include "letterbox.h"
 #if PLATFORM_N64
 #include "n64dd.h"
 #endif
+#include "regs.h"
+#include "z64audio.h"
+#include "z64play.h"
+#include "z64save.h"
 
 /*
  * The following three arrays are effectively unused.

src/code/z_kankyo.c

@@ -1,12 +1,16 @@
-#pragma increment_block_number "gc-eu:224 gc-eu-mq:224 gc-jp:208 gc-jp-ce:208 gc-jp-mq:208 gc-us:208 gc-us-mq:208" \
-                               "ique-cn:208 ntsc-1.0:224 ntsc-1.1:224 ntsc-1.2:224 pal-1.0:232 pal-1.1:232"
+#pragma increment_block_number "gc-eu:64 gc-eu-mq:64 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:64 pal-1.1:64"
 
 #include "global.h"
 #include "ultra64.h"
+#include "seqcmd.h"
+#include "sequence.h"
 #include "terminal.h"
 #include "versions.h"
 
+#include "z64cutscene.h"
 #include "z64frame_advance.h"
+#include "z64save.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 #include "assets/objects/gameplay_field_keep/gameplay_field_keep.h"
@@ -214,8 +218,8 @@ s16 sLightningFlashAlpha;
 s16 sSunDepthTestX;
 s16 sSunDepthTestY;
 
-#pragma increment_block_number "gc-eu:240 gc-eu-mq:240 gc-jp:224 gc-jp-ce:224 gc-jp-mq:224 gc-us:224 gc-us-mq:224" \
-                               "ique-cn:224 ntsc-1.0:224 ntsc-1.1:224 ntsc-1.2:224 pal-1.0:240 pal-1.1:240"
+#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"
 
 LightNode* sNGameOverLightNode;
 LightInfo sNGameOverLightInfo;

src/code/z_lifemeter.c

@@ -1,4 +1,14 @@
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "sfx.h"
+#include "sys_matrix.h"
+#include "z_lib.h"
+#include "z64play.h"
+#include "z64player.h"
+#include "z64save.h"
+
 #include "global.h"
+
 #include "assets/textures/parameter_static/parameter_static.h"
 
 static s16 sHeartsPrimColors[3][3] = {

src/code/z_map_data.c

@@ -1,4 +1,5 @@
-#include "global.h"
+#include "map.h"
+#include "z64save.h"
 
 static s16 sFloorTexIndexOffset[10][8] = {
     { 0, 0, 0, 0, 2, 4, 6, 8 }, { 0, 0, 0, 0, 0, 0, 0, 2 },

src/code/z_map_exp.c

@@ -1,10 +1,22 @@
-#include "global.h"
-#include "terminal.h"
-#include "assets/objects/gameplay_keep/gameplay_keep.h"
-#include "assets/textures/parameter_static/parameter_static.h"
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "controller.h"
+#include "map.h"
 #if PLATFORM_N64
 #include "n64dd.h"
 #endif
+#include "regs.h"
+#include "sfx.h"
+#include "sys_matrix.h"
+#include "terminal.h"
+#include "z64play.h"
+#include "z64player.h"
+#include "z64save.h"
+
+#include "global.h"
+
+#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/textures/parameter_static/parameter_static.h"
 
 MapData* gMapData;
 

src/code/z_map_mark.c

@@ -1,9 +1,16 @@
-#include "global.h"
+#include "libu64/debug.h"
+#include "romfile.h"
+#include "segment_symbols.h"
 #include "terminal.h"
 #include "assets/textures/parameter_static/parameter_static.h"
 #if PLATFORM_N64
 #include "n64dd.h"
 #endif
+#include "z64map_mark.h"
+#include "z64play.h"
+#include "z64save.h"
+
+#include "global.h"
 
 typedef struct MapMarkInfo {
     /* 0x00 */ void* texture;

src/code/z_message.c

@@ -1,14 +1,30 @@
-#include "global.h"
+#include "libu64/gfxprint.h"
+#include "attributes.h"
+#include "controller.h"
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "gfxalloc.h"
 #include "message_data_static.h"
-#include "terminal.h"
-#include "versions.h"
-#include "assets/textures/parameter_static/parameter_static.h"
 #if PLATFORM_N64
 #include "n64dd.h"
 #endif
+#include "segment_symbols.h"
+#include "sequence.h"
+#include "regs.h"
+#include "terminal.h"
+#include "versions.h"
+#include "z64audio.h"
+#include "z64ocarina.h"
+#include "z64play.h"
+#include "z64player.h"
+#include "z64save.h"
+
+#include "global.h"
+
+#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:80 ntsc-1.1:80 ntsc-1.2:80 pal-1.0:128 pal-1.1:128"
+                               "ntsc-1.0:144 ntsc-1.1:144 ntsc-1.2:144 pal-1.0:128 pal-1.1:128"
 
 #if !PLATFORM_IQUE
 #define MSG_BUF_DECODED (msgCtx->msgBufDecoded)

src/code/z_onepointdemo.c

@@ -1,8 +1,15 @@
-#include "global.h"
+#include "libc64/math64.h"
+#include "libc64/qrand.h"
+#include "one_point_cutscene.h"
 #include "quake.h"
+#include "sfx.h"
 #include "terminal.h"
 #include "versions.h"
+#include "z_lib.h"
 #include "z64olib.h"
+#include "z64play.h"
+#include "z64player.h"
+#include "z64save.h"
 #include "overlays/actors/ovl_En_Sw/z_en_sw.h"
 
 static s16 sDisableAttention = false;

src/code/z_parameter.c

@@ -1,7 +1,26 @@
-#include "global.h"
+#include "attributes.h"
+#include "controller.h"
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "main.h"
+#include "map.h"
+#include "regs.h"
+#include "segment_symbols.h"
+#include "segmented_address.h"
+#include "sequence.h"
+#include "sfx.h"
+#include "sys_matrix.h"
 #include "terminal.h"
 #include "versions.h"
+#include "z64audio.h"
 #include "z64horse.h"
+#include "z64ocarina.h"
+#include "z64play.h"
+#include "z64player.h"
+#include "z64save.h"
+
+#include "global.h"
+
 #include "assets/textures/parameter_static/parameter_static.h"
 #include "assets/textures/do_action_static/do_action_static.h"
 #include "assets/textures/icon_item_static/icon_item_static.h"

src/code/z_play.c

@@ -1,18 +1,39 @@
-
-#include "global.h"
+#include "libu64/debug.h"
+#include "controller.h"
 #include "fault.h"
-#include "quake.h"
-#include "terminal.h"
-#include "versions.h"
+#include "gfx.h"
+#include "gfxalloc.h"
+#include "kaleido_manager.h"
+#include "letterbox.h"
 #include "line_numbers.h"
 #if PLATFORM_N64
 #include "n64dd.h"
 #endif
-
+#include "one_point_cutscene.h"
+#include "quake.h"
+#include "regs.h"
+#include "rumble.h"
+#include "segmented_address.h"
+#include "sequence.h"
+#include "sfx.h"
+#include "sys_math3d.h"
+#include "sys_matrix.h"
+#include "terminal.h"
+#include "versions.h"
+#include "zelda_arena.h"
+#include "z64cutscene_flags.h"
 #include "z64debug_display.h"
+#include "z64effect.h"
 #include "z64frame_advance.h"
+#include "z64light.h"
+#include "z64play.h"
+#include "z64player.h"
+#include "z64save.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"
+#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:192 ntsc-1.0:64 ntsc-1.1:64 ntsc-1.2:64 pal-1.0:64 pal-1.1:64"
 
 TransitionTile gTransitionTile;
 s32 gTransitionTileState;

src/code/z_player_call.c

@@ -4,7 +4,7 @@
     (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \
      ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA | ACTOR_FLAG_CAN_PRESS_SWITCHES)
 
-#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" \
+#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.2:128 pal-1.1:128"
 
 void (*sPlayerCallInitFunc)(Actor* thisx, PlayState* play);

src/code/z_player_lib.c

@@ -1,12 +1,24 @@
-#include "global.h"
+#include "libc64/math64.h"
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "regs.h"
+#include "segmented_address.h"
+#include "sys_matrix.h"
 #include "versions.h"
+#include "z_lib.h"
 #include "z64draw.h"
+#include "z64effect.h"
+#include "z64play.h"
+#include "z64player.h"
+#include "z64save.h"
+#include "z64skin_matrix.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 #include "assets/objects/object_link_boy/object_link_boy.h"
 #include "assets/objects/object_link_child/object_link_child.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"
+#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" \
+                               "pal-1.0:0 pal-1.1:0"
 
 typedef struct BowSlingshotStringData {
     /* 0x00 */ Gfx* dList;

src/code/z_room.c

@@ -1,12 +1,27 @@
-#include "global.h"
+#include "libu64/debug.h"
+#include "ultra64/gs2dex.h"
 #include "fault.h"
-#include "sys_ucode.h"
-#include "terminal.h"
-#include "versions.h"
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "jpeg.h"
 #include "line_numbers.h"
+#include "map.h"
 #if PLATFORM_N64
 #include "n64dd.h"
 #endif
+#include "regs.h"
+#include "segmented_address.h"
+#include "sys_matrix.h"
+#include "sys_ucode.h"
+#include "terminal.h"
+#include "versions.h"
+#include "z64audio.h"
+#include "z64play.h"
+#include "z64player.h"
+#include "z64save.h"
+#include "z64skin_matrix.h"
+
+#include "global.h"
 
 Vec3f D_801270A0 = { 0.0f, 0.0f, 0.0f };
 

src/code/z_scene.c

@@ -1,6 +1,8 @@
 #include "global.h"
+#include "seqcmd.h"
 #include "terminal.h"
 #include "versions.h"
+#include "z64save.h"
 
 SceneCmdHandlerFunc sSceneCmdHandlers[SCENE_CMD_ID_MAX];
 RomFile sNaviQuestHintFiles[];

src/code/z_scene_table.c

@@ -1,10 +1,22 @@
-#include "global.h"
-#include "quake.h"
-#include "versions.h"
-#include "z64frame_advance.h"
+#include "libc64/qrand.h"
+#include "gfx.h"
 #if PLATFORM_N64
 #include "n64dd.h"
 #endif
+#include "quake.h"
+#include "regs.h"
+#include "segment_symbols.h"
+#include "segmented_address.h"
+#include "sfx.h"
+#include "sys_matrix.h"
+#include "versions.h"
+#include "z_lib.h"
+#include "z64frame_advance.h"
+#include "z64play.h"
+#include "z64player.h"
+#include "z64save.h"
+
+#include "global.h"
 
 #include "assets/scenes/indoors/miharigoya/miharigoya_scene.h"
 #include "assets/scenes/indoors/souko/souko_scene.h"

src/code/z_sram.c

@@ -1,6 +1,7 @@
 #include "global.h"
 #include "terminal.h"
 #include "versions.h"
+#include "z64save.h"
 
 #define SLOT_SIZE (sizeof(SaveContext) + 0x28)
 #define CHECKSUM_SIZE (sizeof(Save) / 2)

src/code/z_vr_box.c

@@ -1,6 +1,7 @@
 #include "global.h"
 #include "terminal.h"
 #include "z64environment.h"
+#include "z64save.h"
 
 typedef struct SkyboxFaceParams {
     /* 0x000 */ s32 xStart;

src/elf_message/elf_message_field.c

@@ -1,5 +1,5 @@
-#include "global.h"
 #include "z64quest_hint_commands.h"
+#include "z64save.h"
 
 QuestHintCmd gOverworldNaviQuestHints[] = {
     QUEST_HINT_FLAG(CHECK, EVENTCHKINF_05, false, 0x40),

src/elf_message/elf_message_ydan.c

@@ -1,4 +1,3 @@
-#include "global.h"
 #include "z64quest_hint_commands.h"
 
 QuestHintCmd gDungeonNaviQuestHints[] = {

src/n64dd/z_n64dd.c

@@ -8,7 +8,7 @@
 #include "line_numbers.h"
 #include "z64thread.h"
 
-#pragma increment_block_number "ntsc-1.0:128 ntsc-1.1:128 ntsc-1.2:128 pal-1.0:128 pal-1.1:128"
+#pragma increment_block_number "ntsc-1.0:64 ntsc-1.1:64 ntsc-1.2:64 pal-1.0:64 pal-1.1:64"
 
 typedef struct struct_801D9C30 {
     /* 0x000 */ s32 unk_000;       // disk start

src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c

@@ -16,6 +16,7 @@
 #include "z64audio.h"
 #include "z64play.h"
 #include "z64player.h"
+#include "z64save.h"
 
 #include "assets/objects/object_bdan_objects/object_bdan_objects.h"
 

src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c

@@ -17,6 +17,7 @@
 #include "z_lib.h"
 #include "z64play.h"
 #include "z64player.h"
+#include "z64save.h"
 
 #include "assets/scenes/dungeons/ddan/ddan_scene.h"
 #include "assets/objects/object_bwall/object_bwall.h"

src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c

@@ -20,6 +20,7 @@
 #include "z_lib.h"
 #include "z64effect.h"
 #include "z64play.h"
+#include "z64save.h"
 
 #include "assets/objects/object_ddan_objects/object_ddan_objects.h"
 

src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c

@@ -22,6 +22,7 @@
 #include "z64ocarina.h"
 #include "z64play.h"
 #include "z64player.h"
+#include "z64save.h"
 
 #include "assets/objects/object_dy_obj/object_dy_obj.h"
 #include "assets/scenes/indoors/yousei_izumi_yoko/yousei_izumi_yoko_scene.h"

src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c

@@ -13,6 +13,7 @@
 #include "terminal.h"
 #include "z_lib.h"
 #include "z64play.h"
+#include "z64save.h"
 
 #include "assets/objects/object_spot01_matoyab/object_spot01_matoyab.h"
 

src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c

@@ -13,6 +13,7 @@
 #include "sys_matrix.h"
 #include "z64play.h"
 #include "z64player.h"
+#include "z64save.h"
 
 #include "assets/objects/object_gjyo_objects/object_gjyo_objects.h"
 #include "assets/scenes/overworld/ganon_tou/ganon_tou_scene.h"

src/overlays/actors/ovl_Bg_Haka/z_bg_haka.c

@@ -14,6 +14,7 @@
 #include "z_lib.h"
 #include "z64play.h"
 #include "z64player.h"
+#include "z64save.h"
 
 #include "assets/objects/object_haka/object_haka.h"
 

src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c

@@ -14,6 +14,7 @@
 #include "sys_matrix.h"
 #include "z_lib.h"
 #include "z64play.h"
+#include "z64save.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 

src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c

@@ -17,6 +17,7 @@
 #include "z_lib.h"
 #include "z64play.h"
 #include "z64player.h"
+#include "z64save.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 #include "assets/objects/object_hidan_objects/object_hidan_objects.h"

src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c

@@ -11,6 +11,7 @@
 #include "sys_matrix.h"
 #include "z_lib.h"
 #include "z64play.h"
+#include "z64save.h"
 
 #include "assets/objects/object_ingate/object_ingate.h"
 

src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c

@@ -10,6 +10,7 @@
 #include "sfx.h"
 #include "z_lib.h"
 #include "z64play.h"
+#include "z64save.h"
 
 #include "assets/objects/object_jya_obj/object_jya_obj.h"
 

src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.c

@@ -13,6 +13,7 @@
 #include "sys_matrix.h"
 #include "z64play.h"
 #include "z64player.h"
+#include "z64save.h"
 
 #include "assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h"
 

src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c

@@ -18,6 +18,7 @@
 #include "z64effect.h"
 #include "z64play.h"
 #include "z64player.h"
+#include "z64save.h"
 
 #include "assets/objects/object_po_sisters/object_po_sisters.h"
 

src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c

@@ -11,10 +11,10 @@
 #include "sfx.h"
 #include "z_lib.h"
 #include "z64audio.h"
+#include "z64cutscene_flags.h"
 #include "z64play.h"
 #include "z64player.h"
-
-#include "global.h"
+#include "z64save.h"
 
 #include "assets/objects/object_relay_objects/object_relay_objects.h"
 

src/overlays/actors/ovl_Bg_Spot00_Break/z_bg_spot00_break.c

@@ -8,6 +8,7 @@
 
 #include "ichain.h"
 #include "z64play.h"
+#include "z64save.h"
 
 #include "assets/objects/object_spot00_break/object_spot00_break.h"
 

src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c

@@ -13,11 +13,11 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
+#include "z64cutscene_flags.h"
 #include "z64light.h"
 #include "z64play.h"
 #include "z64player.h"
-
-#include "global.h"
+#include "z64save.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 #include "assets/objects/object_spot00_objects/object_spot00_objects.h"

src/overlays/actors/ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.c

@@ -13,6 +13,7 @@
 #include "z_lib.h"
 #include "z64audio.h"
 #include "z64play.h"
+#include "z64save.h"
 
 #include "assets/objects/object_spot01_objects/object_spot01_objects.h"
 

src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.c

@@ -16,6 +16,7 @@
 #include "z_lib.h"
 #include "z64effect.h"
 #include "z64play.h"
+#include "z64save.h"
 
 #include "assets/objects/object_spot01_objects/object_spot01_objects.h"
 

src/overlays/actors/ovl_Bg_Spot01_Idomizu/z_bg_spot01_idomizu.c

@@ -13,6 +13,7 @@
 #include "sys_matrix.h"
 #include "z_lib.h"
 #include "z64play.h"
+#include "z64save.h"
 
 #include "assets/objects/object_spot01_objects/object_spot01_objects.h"
 

src/overlays/actors/ovl_Bg_Spot01_Idosoko/z_bg_spot01_idosoko.c

@@ -11,6 +11,7 @@
 #include "ichain.h"
 #include "sys_matrix.h"
 #include "z64play.h"
+#include "z64save.h"
 
 #include "assets/objects/object_spot01_matoya/object_spot01_matoya.h"
 

src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.c

@@ -9,6 +9,7 @@
 #include "ichain.h"
 #include "segmented_address.h"
 #include "z64play.h"
+#include "z64save.h"
 
 #include "assets/objects/object_spot01_matoya/object_spot01_matoya.h"
 #include "assets/objects/object_spot01_matoyab/object_spot01_matoyab.h"

src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.c

@@ -17,6 +17,7 @@
 #include "z64effect.h"
 #include "z64play.h"
 #include "z64player.h"
+#include "z64save.h"
 
 #include "assets/objects/object_spot02_objects/object_spot02_objects.h"
 

src/overlays/actors/ovl_Bg_Spot05_Soko/z_bg_spot05_soko.c

@@ -11,6 +11,7 @@
 #include "sfx.h"
 #include "z_lib.h"
 #include "z64play.h"
+#include "z64save.h"
 
 #include "assets/objects/object_spot05_objects/object_spot05_objects.h"
 

src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c

@@ -16,6 +16,7 @@
 #include "z_lib.h"
 #include "z64effect.h"
 #include "z64play.h"
+#include "z64save.h"
 
 #include "assets/objects/object_spot06_objects/object_spot06_objects.h"
 

src/overlays/actors/ovl_Bg_Spot07_Taki/z_bg_spot07_taki.c

@@ -12,6 +12,7 @@
 #include "sys_matrix.h"
 #include "versions.h"
 #include "z64play.h"
+#include "z64save.h"
 
 #include "assets/objects/object_spot07_object/object_spot07_object.h"
 

src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.c

@@ -14,6 +14,7 @@
 #include "z_lib.h"
 #include "z64play.h"
 #include "z64player.h"
+#include "z64save.h"
 
 #include "assets/objects/object_spot08_obj/object_spot08_obj.h"
 

src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c

@@ -11,6 +11,7 @@
 #include "ichain.h"
 #include "sys_matrix.h"
 #include "z64play.h"
+#include "z64save.h"
 
 #include "assets/objects/object_spot09_obj/object_spot09_obj.h"
 

src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.c

@@ -16,12 +16,11 @@
 #include "sys_math3d.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
+#include "z64cutscene_flags.h"
 #include "z64effect.h"
 #include "z64play.h"
 #include "z64player.h"
 
-#include "global.h"
-
 #include "assets/objects/object_spot11_obj/object_spot11_obj.h"
 
 #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED

src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c

@@ -12,6 +12,7 @@
 #include "z_lib.h"
 #include "z64play.h"
 #include "z64player.h"
+#include "z64save.h"
 
 #include "assets/objects/object_spot15_obj/object_spot15_obj.h"
 

src/overlays/actors/ovl_Bg_Spot15_Saku/z_bg_spot15_saku.c

@@ -11,6 +11,7 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z64play.h"
+#include "z64save.h"
 
 #include "assets/objects/object_spot15_obj/object_spot15_obj.h"
 

src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c

@@ -15,6 +15,7 @@
 #include "z64effect.h"
 #include "z64play.h"
 #include "z64player.h"
+#include "z64save.h"
 
 #include "assets/objects/object_spot16_obj/object_spot16_obj.h"
 #include "assets/objects/object_bombiwa/object_bombiwa.h"

src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.c

@@ -12,6 +12,7 @@
 #include "sys_matrix.h"
 #include "terminal.h"
 #include "z64play.h"
+#include "z64save.h"
 
 #include "assets/objects/object_efc_doughnut/object_efc_doughnut.h"
 

src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.c

@@ -13,6 +13,7 @@
 #include "z_lib.h"
 #include "z64play.h"
 #include "z64player.h"
+#include "z64save.h"
 
 #include "assets/objects/object_spot18_obj/object_spot18_obj.h"