summaryrefslogtreecommitdiff
path: root/src/code
diff options
context:
space:
mode:
Diffstat (limited to 'src/code')
-rw-r--r--src/code/fault_gc.c4
-rw-r--r--src/code/fault_n64.c2
-rw-r--r--src/code/game.c1
-rw-r--r--src/code/graph.c5
-rw-r--r--src/code/main.c5
-rw-r--r--src/code/z_DLF.c2
-rw-r--r--src/code/z_actor.c1
-rw-r--r--src/code/z_bgcheck.c2
-rw-r--r--src/code/z_camera.c2
-rw-r--r--src/code/z_demo.c6
-rw-r--r--src/code/z_effect_soft_sprite.c1
-rw-r--r--src/code/z_kaleido_manager.c2
-rw-r--r--src/code/z_kaleido_scope_call.c4
-rw-r--r--src/code/z_kankyo.c2
-rw-r--r--src/code/z_map_mark.c1
-rw-r--r--src/code/z_message.c2
-rw-r--r--src/code/z_play.c2
-rw-r--r--src/code/z_prenmi_buff.c1
-rw-r--r--src/code/z_vimode.c2
19 files changed, 30 insertions, 17 deletions
diff --git a/src/code/fault_gc.c b/src/code/fault_gc.c
index 45d2d01b8..f1f100071 100644
--- a/src/code/fault_gc.c
+++ b/src/code/fault_gc.c
@@ -40,8 +40,8 @@
* 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: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: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"
#include "global.h"
#include "libc64/sleep.h"
diff --git a/src/code/fault_n64.c b/src/code/fault_n64.c
index bb9559f12..feb884716 100644
--- a/src/code/fault_n64.c
+++ b/src/code/fault_n64.c
@@ -13,7 +13,7 @@
#include "macros.h"
#include "global.h"
-#pragma increment_block_number "ntsc-1.0:160 ntsc-1.1:160 ntsc-1.2:160 pal-1.0:160 pal-1.1:160"
+#pragma increment_block_number "ntsc-1.0:192 ntsc-1.1:192 ntsc-1.2:192 pal-1.0:192 pal-1.1:192"
typedef struct FaultMgr {
OSThread thread;
diff --git a/src/code/game.c b/src/code/game.c
index 2e9e9e2d5..3f5dfb7eb 100644
--- a/src/code/game.c
+++ b/src/code/game.c
@@ -18,6 +18,7 @@
#include "speed_meter.h"
#include "terminal.h"
#include "versions.h"
+#include "vi_mode.h"
#include "z64debug.h"
#include "z64game.h"
#include "z64vis.h"
diff --git a/src/code/graph.c b/src/code/graph.c
index 36749697f..de9ecd900 100644
--- a/src/code/graph.c
+++ b/src/code/graph.c
@@ -9,6 +9,7 @@
#include "file_select_state.h"
#include "line_numbers.h"
#include "map_select_state.h"
+#include "prenmi_buff.h"
#include "prenmi_state.h"
#include "regs.h"
#include "setup_state.h"
@@ -26,8 +27,8 @@
#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:192" \
- "ntsc-1.1:192 ntsc-1.2:192 pal-1.0:192 pal-1.1:192"
+#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:224" \
+ "ntsc-1.1:224 ntsc-1.2:224 pal-1.0:224 pal-1.1:224"
/**
* The time at which the previous `Graph_Update` ended.
diff --git a/src/code/main.c b/src/code/main.c
index cbc4677e7..62cd22573 100644
--- a/src/code/main.c
+++ b/src/code/main.c
@@ -14,6 +14,7 @@ extern struct IrqMgr gIrqMgr;
#include "debug_arena.h"
#include "fault.h"
+#include "prenmi_buff.h"
#include "segmented_address.h"
#include "stack.h"
#include "terminal.h"
@@ -27,8 +28,8 @@ 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:128 ntsc-1.0:104 ntsc-1.1:104 ntsc-1.2:104 pal-1.0:102 pal-1.1:102"
+#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:144 ntsc-1.0:129 ntsc-1.1:129 ntsc-1.2:129 pal-1.0:127 pal-1.1:127"
extern u8 _buffersSegmentEnd[];
diff --git a/src/code/z_DLF.c b/src/code/z_DLF.c
index f56fcc742..7934b7745 100644
--- a/src/code/z_DLF.c
+++ b/src/code/z_DLF.c
@@ -1,3 +1,5 @@
+#include "libu64/overlay.h"
+
#include "global.h"
#include "terminal.h"
diff --git a/src/code/z_actor.c b/src/code/z_actor.c
index 155389b53..7c6249759 100644
--- a/src/code/z_actor.c
+++ b/src/code/z_actor.c
@@ -1,4 +1,5 @@
#include "libc64/math64.h"
+#include "libu64/overlay.h"
#include "fault.h"
#include "gfx.h"
#include "gfx_setupdl.h"
diff --git a/src/code/z_bgcheck.c b/src/code/z_bgcheck.c
index e0f8454f7..b54707fd6 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:180 ntsc-1.1:180 ntsc-1.2:180"
+#pragma increment_block_number "ntsc-1.0:176 ntsc-1.1:176 ntsc-1.2:176"
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 8b4b32762..142d23aed 100644
--- a/src/code/z_camera.c
+++ b/src/code/z_camera.c
@@ -3642,7 +3642,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:79 ntsc-1.1:79 ntsc-1.2:79 pal-1.0:77 pal-1.1:77"
+ "ique-cn:128 ntsc-1.0:109 ntsc-1.1:109 ntsc-1.2:109 pal-1.0:107 pal-1.1:107"
s32 Camera_KeepOn4(Camera* camera) {
static Vec3f D_8015BD50;
diff --git a/src/code/z_demo.c b/src/code/z_demo.c
index 9db96e052..50b049fc1 100644
--- a/src/code/z_demo.c
+++ b/src/code/z_demo.c
@@ -1,4 +1,4 @@
-#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" \
+#pragma increment_block_number "gc-eu:0 gc-eu-mq:128 gc-jp:0 gc-jp-ce:0 gc-jp-mq:128 gc-us:0 gc-us-mq:128 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 "libu64/gfxprint.h"
@@ -144,8 +144,8 @@ u16 gCamAtSplinePointsAppliedFrame;
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"
+#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: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_effect_soft_sprite.c b/src/code/z_effect_soft_sprite.c
index 9a3df7eef..d424191d2 100644
--- a/src/code/z_effect_soft_sprite.c
+++ b/src/code/z_effect_soft_sprite.c
@@ -1,3 +1,4 @@
+#include "libu64/overlay.h"
#include "global.h"
#include "terminal.h"
diff --git a/src/code/z_kaleido_manager.c b/src/code/z_kaleido_manager.c
index 42ec59fd0..e1d7f5529 100644
--- a/src/code/z_kaleido_manager.c
+++ b/src/code/z_kaleido_manager.c
@@ -1,3 +1,5 @@
+#include "libu64/overlay.h"
+
#include "global.h"
#include "terminal.h"
diff --git a/src/code/z_kaleido_scope_call.c b/src/code/z_kaleido_scope_call.c
index 50470ab02..35e14433a 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: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:192 ntsc-1.1:192 ntsc-1.2:192 pal-1.0:192 pal-1.1:192"
+#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"
#include "libu64/debug.h"
#include "kaleido_manager.h"
diff --git a/src/code/z_kankyo.c b/src/code/z_kankyo.c
index 3656d7179..61285768a 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:160 gc-eu-mq:160 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:192 pal-1.1:192"
+ "ique-cn:128 ntsc-1.0:128 ntsc-1.1:128 ntsc-1.2:128 pal-1.0:160 pal-1.1:160"
LightNode* sNGameOverLightNode;
LightInfo sNGameOverLightInfo;
diff --git a/src/code/z_map_mark.c b/src/code/z_map_mark.c
index 79e4f97ca..d226d9e0a 100644
--- a/src/code/z_map_mark.c
+++ b/src/code/z_map_mark.c
@@ -1,4 +1,5 @@
#include "libu64/debug.h"
+#include "libu64/overlay.h"
#include "regs.h"
#include "romfile.h"
#include "segment_symbols.h"
diff --git a/src/code/z_message.c b/src/code/z_message.c
index 5c5a51371..68d208623 100644
--- a/src/code/z_message.c
+++ b/src/code/z_message.c
@@ -24,7 +24,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:160 ntsc-1.1:160 ntsc-1.2:160 pal-1.0:128 pal-1.1:128"
+ "ntsc-1.0:192 ntsc-1.1:192 ntsc-1.2:192 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 4657281a5..095638be6 100644
--- a/src/code/z_play.c
+++ b/src/code/z_play.c
@@ -36,7 +36,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" \
- "ique-cn:192 ntsc-1.0:112 ntsc-1.1:112 ntsc-1.2:112 pal-1.0:112 pal-1.1:112"
+ "ique-cn:192 ntsc-1.0:144 ntsc-1.1:144 ntsc-1.2:144 pal-1.0:144 pal-1.1:144"
TransitionTile gTransitionTile;
s32 gTransitionTileState;
diff --git a/src/code/z_prenmi_buff.c b/src/code/z_prenmi_buff.c
index c00d0513c..17ef0b78c 100644
--- a/src/code/z_prenmi_buff.c
+++ b/src/code/z_prenmi_buff.c
@@ -1,3 +1,4 @@
+#include "prenmi_buff.h"
#include "global.h"
#define COLD_RESET 0
diff --git a/src/code/z_vimode.c b/src/code/z_vimode.c
index 0d2f5716f..668e9648e 100644
--- a/src/code/z_vimode.c
+++ b/src/code/z_vimode.c
@@ -1,3 +1,5 @@
+#include "vi_mode.h"
+
#include "global.h"
#include "ultra64/viint.h"
#include "versions.h"
generated by cgit v1.2.3 (git 2.25.1) at 2026-08-03 11:26:29 +0000