From 655ec771387927eda89d89b5bc2751192b075909 Mon Sep 17 00:00:00 2001
From: fig02 <fig02srl@gmail.com>
Date: Wed, 16 Apr 2025 08:22:42 -0400
Subject: [PATCH] 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                               |  8 +++++
 include/carthandle.h                          |  8 +++++
 include/gfx.h                                 |  3 ++
 include/idle.h                                |  6 ++++
 include/map.h                                 |  1 +
 include/variables.h                           | 29 ++-----------------
 include/z64interface.h                        |  3 ++
 include/z64pause.h                            |  5 ++++
 src/audio/lib/load.c                          |  3 +-
 src/boot/boot_main.c                          |  2 ++
 src/boot/build.c                              |  2 ++
 src/boot/carthandle.c                         |  2 +-
 src/boot/cic6105.c                            |  9 ++++--
 src/boot/idle.c                               |  1 +
 src/boot/viconfig.c                           |  4 ++-
 src/boot/z_locale.c                           |  1 +
 src/boot/z_std_dma.c                          |  6 ++--
 src/code/fault_gc.c                           |  4 +--
 src/code/fault_n64.c                          |  2 +-
 src/code/game.c                               |  3 +-
 src/code/main.c                               |  4 ++-
 src/code/object_table.c                       |  7 ++++-
 src/code/z_bgcheck.c                          |  2 +-
 src/code/z_camera.c                           |  4 +--
 src/code/z_collision_check.c                  |  2 +-
 src/code/z_effect_soft_sprite_dlftbls.c       |  3 +-
 src/code/z_kaleido_scope_call.c               |  4 +--
 src/code/z_kankyo.c                           |  2 +-
 src/code/z_map_exp.c                          |  1 +
 src/code/z_message.c                          |  2 +-
 src/code/z_play.c                             |  4 +--
 src/code/z_vr_box.c                           |  4 ++-
 src/overlays/actors/ovl_En_Xc/z_en_xc.c       |  2 +-
 src/overlays/gamestates/ovl_title/z_title.c   |  1 +
 .../misc/ovl_kaleido_scope/z_kaleido_scope.c  |  2 +-
 35 files changed, 92 insertions(+), 54 deletions(-)
 create mode 100644 include/build.h
 create mode 100644 include/carthandle.h

diff --git a/include/build.h b/include/build.h
new file mode 100644
index 000000000..25afaaa81
--- /dev/null
+++ b/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
diff --git a/include/carthandle.h b/include/carthandle.h
new file mode 100644
index 000000000..72d0821e5
--- /dev/null
+++ b/include/carthandle.h
@@ -0,0 +1,8 @@
+#ifndef CARTHANDLE_H
+#define CARTHANDLE_H
+
+#include "ultra64.h"
+
+extern OSPiHandle* gCartHandle;
+
+#endif
diff --git a/include/gfx.h b/include/gfx.h
index 51aa8580d..290b63054 100644
--- a/include/gfx.h
+++ b/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
diff --git a/include/idle.h b/include/idle.h
index 03dfa5180..1317775d5 100644
--- a/include/idle.h
+++ b/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
diff --git a/include/map.h b/include/map.h
index 88c5d9279..ef82c0355 100644
--- a/include/map.h
+++ b/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);
diff --git a/include/variables.h b/include/variables.h
index f8bad48d8..e1fe4ad6e 100644
--- a/include/variables.h
+++ b/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
diff --git a/include/z64interface.h b/include/z64interface.h
index 5bcad2bc1..bfa3bffeb 100644
--- a/include/z64interface.h
+++ b/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
diff --git a/include/z64pause.h b/include/z64pause.h
index 3a698f532..9116003e8 100644
--- a/include/z64pause.h
+++ b/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
diff --git a/src/audio/lib/load.c b/src/audio/lib/load.c
index 28cb2459d..6ff8c6ee6 100644
--- a/src/audio/lib/load.c
+++ b/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"
diff --git a/src/boot/boot_main.c b/src/boot/boot_main.c
index cbaa418ed..811c75d35 100644
--- a/src/boot/boot_main.c
+++ b/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
diff --git a/src/boot/build.c b/src/boot/build.c
index 31e48096b..035e685db 100644
--- a/src/boot/build.c
+++ b/src/boot/build.c
@@ -1,3 +1,5 @@
+#include "build.h"
+
 #include "versions.h"
 
 const char gBuildCreator[] = BUILD_CREATOR;
diff --git a/src/boot/carthandle.c b/src/boot/carthandle.c
index 16d3160b5..9a4cf542d 100644
--- a/src/boot/carthandle.c
+++ b/src/boot/carthandle.c
@@ -1,3 +1,3 @@
-#include "ultra64.h"
+#include "carthandle.h"
 
 OSPiHandle* gCartHandle = NULL;
diff --git a/src/boot/cic6105.c b/src/boot/cic6105.c
index 29b04f2a8..81c0af99c 100644
--- a/src/boot/cic6105.c
+++ b/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);
 
diff --git a/src/boot/idle.c b/src/boot/idle.c
index c56489137..190130c02 100644
--- a/src/boot/idle.c
+++ b/src/boot/idle.c
@@ -1,4 +1,5 @@
 #include "buffers.h"
+#include "build.h"
 #include "idle.h"
 #include "main.h"
 #include "segment_symbols.h"
diff --git a/src/boot/viconfig.c b/src/boot/viconfig.c
index ae50922e6..5bb525aa3 100644
--- a/src/boot/viconfig.c
+++ b/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;
diff --git a/src/boot/z_locale.c b/src/boot/z_locale.c
index 46d65042d..fcf544388 100644
--- a/src/boot/z_locale.c
+++ b/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"
diff --git a/src/boot/z_std_dma.c b/src/boot/z_std_dma.c
index 275ab35c2..2e742ec92 100644
--- a/src/boot/z_std_dma.c
+++ b/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;
diff --git a/src/code/fault_gc.c b/src/code/fault_gc.c
index b70bcf80b..c8088f23f 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: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"
diff --git a/src/code/fault_n64.c b/src/code/fault_n64.c
index 70549cf8b..ae9d2ba4a 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: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;
diff --git a/src/code/game.c b/src/code/game.c
index 6db35e563..f08133fc9 100644
--- a/src/code/game.c
+++ b/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"
diff --git a/src/code/main.c b/src/code/main.c
index 434f999f5..8a7c12a9e 100644
--- a/src/code/main.c
+++ b/src/code/main.c
@@ -23,9 +23,11 @@ extern struct IrqMgr gIrqMgr;
 #include "debug_arena.h"
 #include "fault.h"
 #include "gfx.h"
+#include "idle.h"
 #include "padmgr.h"
 #include "prenmi_buff.h"
 #include "regs.h"
+#include "segment_symbols.h"
 #include "segmented_address.h"
 #include "stack.h"
 #include "stackcheck.h"
@@ -41,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:51 ntsc-1.1:51 ntsc-1.2:51 pal-1.0:49 pal-1.1:49"
+                               "ique-cn:0 ntsc-1.0:56 ntsc-1.1:56 ntsc-1.2:56 pal-1.0:54 pal-1.1:54"
 
 extern u8 _buffersSegmentEnd[];
 
diff --git a/src/code/object_table.c b/src/code/object_table.c
index d0f9e936d..904683596 100644
--- a/src/code/object_table.c
+++ b/src/code/object_table.c
@@ -1,4 +1,9 @@
-#include "global.h"
+#include "segment_symbols.h"
+#include "romfile.h"
+#include "ultra64.h"
+#include "z64object.h"
+
+#include "macros.h"
 
 s16 gLinkObjectIds[] = { OBJECT_LINK_BOY, OBJECT_LINK_CHILD };
 
diff --git a/src/code/z_bgcheck.c b/src/code/z_bgcheck.c
index 24230152f..469840de9 100644
--- a/src/code/z_bgcheck.c
+++ b/src/code/z_bgcheck.c
@@ -11,7 +11,7 @@
 #include "z64player.h"
 #include "z64skin_matrix.h"
 
-#pragma increment_block_number "ntsc-1.0:160 ntsc-1.1:160 ntsc-1.2:160"
+#pragma increment_block_number "ntsc-1.0:152 ntsc-1.1:152 ntsc-1.2:152"
 
 u16 DynaSSNodeList_GetNextNodeIdx(DynaSSNodeList* nodeList);
 void BgCheck_GetStaticLookupIndicesFromPos(CollisionContext* colCtx, Vec3f* pos, Vec3i* sector);
diff --git a/src/code/z_camera.c b/src/code/z_camera.c
index 9f297f795..b7a7d2fad 100644
--- a/src/code/z_camera.c
+++ b/src/code/z_camera.c
@@ -24,7 +24,7 @@
 #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:192 ntsc-1.1:192 ntsc-1.2:192 pal-1.0:192 pal-1.1:192"
+                               "ique-cn:192 ntsc-1.0:0 ntsc-1.1:0 ntsc-1.2:0 pal-1.0:0 pal-1.1:0"
 
 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:106 ntsc-1.1:106 ntsc-1.2:106 pal-1.0:104 pal-1.1:104"
+                               "ique-cn:128 ntsc-1.0:70 ntsc-1.1:70 ntsc-1.2:70 pal-1.0:70 pal-1.1:70"
 
 s32 Camera_KeepOn4(Camera* camera) {
     static Vec3f D_8015BD50;
diff --git a/src/code/z_collision_check.c b/src/code/z_collision_check.c
index e0ab3b031..15eec283a 100644
--- a/src/code/z_collision_check.c
+++ b/src/code/z_collision_check.c
@@ -16,7 +16,7 @@
 #include "z_lib.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:176 ntsc-1.1:176 ntsc-1.2:176 pal-1.0:176 pal-1.1:176"
+                               "ique-cn:192 ntsc-1.0:168 ntsc-1.1:168 ntsc-1.2:168 pal-1.0:168 pal-1.1:168"
 
 typedef s32 (*ColChkResetFunc)(PlayState*, Collider*);
 typedef void (*ColChkApplyFunc)(PlayState*, CollisionCheckContext*, Collider*);
diff --git a/src/code/z_effect_soft_sprite_dlftbls.c b/src/code/z_effect_soft_sprite_dlftbls.c
index cb24257c8..7c9e228f6 100644
--- a/src/code/z_effect_soft_sprite_dlftbls.c
+++ b/src/code/z_effect_soft_sprite_dlftbls.c
@@ -1,4 +1,5 @@
-#include "global.h"
+#include "segment_symbols.h"
+#include "z64effect.h"
 
 // Linker symbol declarations (used in the table below)
 #define DEFINE_EFFECT_SS(name, _1) DECLARE_OVERLAY_SEGMENT(name)
diff --git a/src/code/z_kaleido_scope_call.c b/src/code/z_kaleido_scope_call.c
index 0e89a854a..39101b373 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:133 gc-eu-mq:133 gc-jp:135 gc-jp-ce:135 gc-jp-mq:135 gc-us:135 gc-us-mq:135" \
-                               "ique-cn:125 ntsc-1.0:144 ntsc-1.1:144 ntsc-1.2:144 pal-1.0:142 pal-1.1:142"
+#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 "libu64/debug.h"
 #include "kaleido_manager.h"
diff --git a/src/code/z_kankyo.c b/src/code/z_kankyo.c
index 081d7abc2..a4bb1295b 100644
--- a/src/code/z_kankyo.c
+++ b/src/code/z_kankyo.c
@@ -236,7 +236,7 @@ s16 sSunDepthTestX;
 s16 sSunDepthTestY;
 
 #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"
+                               "ique-cn:160 ntsc-1.0:192 ntsc-1.1:192 ntsc-1.2:192 pal-1.0:192 pal-1.1:192"
 
 LightNode* sNGameOverLightNode;
 LightInfo sNGameOverLightInfo;
diff --git a/src/code/z_map_exp.c b/src/code/z_map_exp.c
index 3283cd62f..bac9ed222 100644
--- a/src/code/z_map_exp.c
+++ b/src/code/z_map_exp.c
@@ -6,6 +6,7 @@
 #include "n64dd.h"
 #endif
 #include "regs.h"
+#include "segment_symbols.h"
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "terminal.h"
diff --git a/src/code/z_message.c b/src/code/z_message.c
index bfba7cdf4..c13f5c462 100644
--- a/src/code/z_message.c
+++ b/src/code/z_message.c
@@ -25,7 +25,7 @@
 #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:96 ntsc-1.1:96 ntsc-1.2:96 pal-1.0:128 pal-1.1:128"
+                               "ntsc-1.0:112 ntsc-1.1:112 ntsc-1.2:112 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 f37f80c67..36928c9cb 100644
--- a/src/code/z_play.c
+++ b/src/code/z_play.c
@@ -44,8 +44,8 @@
 
 #include "global.h"
 
-#pragma increment_block_number "gc-eu:64 gc-eu-mq:64 gc-jp:64 gc-jp-ce:64 gc-jp-mq:64 gc-us:64 gc-us-mq:64 ique-cn:64" \
-                               "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: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"
 
 TransitionTile gTransitionTile;
 s32 gTransitionTileState;
diff --git a/src/code/z_vr_box.c b/src/code/z_vr_box.c
index cd8c1b2b8..f53da0df4 100644
--- a/src/code/z_vr_box.c
+++ b/src/code/z_vr_box.c
@@ -1,8 +1,10 @@
-#include "global.h"
+#include "segment_symbols.h"
 #include "terminal.h"
 #include "z64environment.h"
 #include "z64save.h"
 
+#include "global.h"
+
 typedef struct SkyboxFaceParams {
     /* 0x000 */ s32 xStart;
     /* 0x004 */ s32 yStart;
diff --git a/src/overlays/actors/ovl_En_Xc/z_en_xc.c b/src/overlays/actors/ovl_En_Xc/z_en_xc.c
index 38a147d14..ad0e1134f 100644
--- a/src/overlays/actors/ovl_En_Xc/z_en_xc.c
+++ b/src/overlays/actors/ovl_En_Xc/z_en_xc.c
@@ -1412,7 +1412,7 @@ void func_80B3F3D8(void) {
     Sfx_PlaySfxCentered2(NA_SE_PL_SKIP);
 }
 
-#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:128 gc-eu-mq:64 gc-jp:128 gc-jp-ce:128 gc-jp-mq:64 gc-us:128 gc-us-mq:64" \
                                "ique-cn:64 ntsc-1.0:128 ntsc-1.1:128 ntsc-1.2:128 pal-1.0:128 pal-1.1:128"
 
 void EnXc_PlayDiveSFX(Vec3f* src, PlayState* play) {
diff --git a/src/overlays/gamestates/ovl_title/z_title.c b/src/overlays/gamestates/ovl_title/z_title.c
index 175c43f9e..272cfe231 100644
--- a/src/overlays/gamestates/ovl_title/z_title.c
+++ b/src/overlays/gamestates/ovl_title/z_title.c
@@ -11,6 +11,7 @@
 #endif
 
 #include "alloca.h"
+#include "build.h"
 #include "console_logo_state.h"
 #include "gfx.h"
 #include "gfx_setupdl.h"
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 5c0bfab0d..bcd13a5c6 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,7 @@
 #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:0 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 ntsc-1.0:128 ntsc-1.1:128 ntsc-1.2:128 pal-1.0:0 pal-1.1:0"
 
 #if !PLATFORM_GC
 #define KALEIDO_PROMPT_CURSOR_R 100