summaryrefslogtreecommitdiff
path: root/src/code
diff options
context:
space:
mode:
Diffstat (limited to 'src/code')
-rw-r--r--src/code/fault_gc_drawer.c4
-rw-r--r--src/code/flg_set.c2
-rw-r--r--src/code/graph.c1
-rw-r--r--src/code/main.c5
-rw-r--r--src/code/sched.c1
-rw-r--r--src/code/sys_cfb.c3
-rw-r--r--src/code/z_bgcheck.c2
-rw-r--r--src/code/z_camera.c2
-rw-r--r--src/code/z_collision_check.c2
-rw-r--r--src/code/z_demo.c1
-rw-r--r--src/code/z_en_item00.c2
-rw-r--r--src/code/z_fbdemo.c2
-rw-r--r--src/code/z_fbdemo_circle.c2
-rw-r--r--src/code/z_fbdemo_fade.c3
-rw-r--r--src/code/z_fbdemo_triforce.c2
-rw-r--r--src/code/z_fbdemo_wipe1.c2
-rw-r--r--src/code/z_kankyo.c2
-rw-r--r--src/code/z_message.c1
-rw-r--r--src/code/z_parameter.c1
-rw-r--r--src/code/z_play.c5
-rw-r--r--src/code/z_sram.c1
21 files changed, 36 insertions, 10 deletions
diff --git a/src/code/fault_gc_drawer.c b/src/code/fault_gc_drawer.c
index 9d3478a48..4482ba9ae 100644
--- a/src/code/fault_gc_drawer.c
+++ b/src/code/fault_gc_drawer.c
@@ -7,7 +7,7 @@
#include "global.h"
#include "fault.h"
#include "terminal.h"
-#pragma increment_block_number "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"
typedef struct FaultDrawer {
/* 0x00 */ u16* fb;
@@ -101,7 +101,7 @@ FaultDrawer sFaultDrawerDefault = {
NULL,
};
-#pragma increment_block_number "gc-eu:128 gc-eu-mq:128"
+#pragma increment_block_number "gc-eu:0 gc-eu-mq:0"
FaultDrawer sFaultDrawer;
char D_8016B6C0[0x20];
diff --git a/src/code/flg_set.c b/src/code/flg_set.c
index 5f4316d7f..88f32a3e4 100644
--- a/src/code/flg_set.c
+++ b/src/code/flg_set.c
@@ -1,3 +1,5 @@
+#include "flag_set.h"
+
#include "libu64/gfxprint.h"
#include "libu64/pad.h"
#include "gfx.h"
diff --git a/src/code/graph.c b/src/code/graph.c
index a20c64e1f..8fe664dec 100644
--- a/src/code/graph.c
+++ b/src/code/graph.c
@@ -15,6 +15,7 @@
#include "regs.h"
#include "setup_state.h"
#include "speed_meter.h"
+#include "sys_cfb.h"
#include "sys_debug_controller.h"
#include "sys_ucode.h"
#include "terminal.h"
diff --git a/src/code/main.c b/src/code/main.c
index 79c40658c..ab330cb33 100644
--- a/src/code/main.c
+++ b/src/code/main.c
@@ -1,3 +1,4 @@
+#include "sys_cfb.h"
#include "ultra64.h"
#include "versions.h"
@@ -13,6 +14,8 @@ extern struct PadMgr gPadMgr;
extern struct IrqMgr gIrqMgr;
#include "libc64/malloc.h"
+#include "libu64/rcp_utils.h"
+#include "libu64/runtime.h"
#include "audiomgr.h"
#include "debug_arena.h"
#include "fault.h"
@@ -35,7 +38,7 @@ extern struct IrqMgr gIrqMgr;
#include "global.h"
#pragma increment_block_number "gc-eu:32 gc-eu-mq:32 gc-jp:32 gc-jp-ce:32 gc-jp-mq:32 gc-us:32 gc-us-mq:32 ique-cn:32" \
- "ntsc-1.0:6 ntsc-1.1:6 ntsc-1.2:6 pal-1.0:4 pal-1.1:4"
+ "ntsc-1.0:0 ntsc-1.1:0 ntsc-1.2:0 pal-1.0:254 pal-1.1:254"
extern u8 _buffersSegmentEnd[];
diff --git a/src/code/sched.c b/src/code/sched.c
index 561a28370..2b519c6bd 100644
--- a/src/code/sched.c
+++ b/src/code/sched.c
@@ -40,6 +40,7 @@
* @see irqmgr.c
*/
#include "libu64/debug.h"
+#include "libu64/rcp_utils.h"
#include "fault.h"
#include "irqmgr.h"
#include "main.h"
diff --git a/src/code/sys_cfb.c b/src/code/sys_cfb.c
index 4e4bc06f2..4fa17abfd 100644
--- a/src/code/sys_cfb.c
+++ b/src/code/sys_cfb.c
@@ -1,4 +1,5 @@
-#include "ultra64.h"
+#include "sys_cfb.h"
+
#include "libu64/debug.h"
#include "attributes.h"
#include "line_numbers.h"
diff --git a/src/code/z_bgcheck.c b/src/code/z_bgcheck.c
index 71733baef..f4f3a1fd3 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:208 ntsc-1.1:208 ntsc-1.2:208"
+#pragma increment_block_number "ntsc-1.0:200 ntsc-1.1:200 ntsc-1.2:200"
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 8582519cd..64299a886 100644
--- a/src/code/z_camera.c
+++ b/src/code/z_camera.c
@@ -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:102 ntsc-1.1:102 ntsc-1.2:102 pal-1.0:100 pal-1.1:100"
+ "ique-cn:128 ntsc-1.0:98 ntsc-1.1:98 ntsc-1.2:98 pal-1.0:96 pal-1.1:96"
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 e05bb44d1..392df7c1f 100644
--- a/src/code/z_collision_check.c
+++ b/src/code/z_collision_check.c
@@ -15,7 +15,7 @@
#include "overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.h"
#include "z_lib.h"
-#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"
+#pragma increment_block_number "ique-cn:0 ntsc-1.0:240 ntsc-1.1:240 ntsc-1.2:240 pal-1.0:240 pal-1.1:240"
typedef s32 (*ColChkResetFunc)(PlayState*, Collider*);
typedef void (*ColChkApplyFunc)(PlayState*, CollisionCheckContext*, Collider*);
diff --git a/src/code/z_demo.c b/src/code/z_demo.c
index 921613bd8..d34e0808d 100644
--- a/src/code/z_demo.c
+++ b/src/code/z_demo.c
@@ -6,6 +6,7 @@
#include "gfx.h"
#include "gfxalloc.h"
#include "letterbox.h"
+#include "memory_utils.h"
#if PLATFORM_N64
#include "n64dd.h"
#endif
diff --git a/src/code/z_en_item00.c b/src/code/z_en_item00.c
index aa757f864..f0c627b25 100644
--- a/src/code/z_en_item00.c
+++ b/src/code/z_en_item00.c
@@ -22,7 +22,7 @@
#include "assets/objects/gameplay_keep/gameplay_keep.h"
#pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-eu-mq-dbg:0 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128" \
- "gc-us-mq:128 ntsc-1.0:128 ntsc-1.2:128"
+ "gc-us-mq:128 ique-cn:128 ntsc-1.0:128 ntsc-1.2:128"
#define FLAGS 0
diff --git a/src/code/z_fbdemo.c b/src/code/z_fbdemo.c
index 246e27b1a..46cfa0573 100644
--- a/src/code/z_fbdemo.c
+++ b/src/code/z_fbdemo.c
@@ -9,6 +9,8 @@
* @note The only coded effect has a visual effect to blend the tiles to a single point, which looks like the screen
* gets sucked into.
*/
+#include "transition_tile.h"
+
#include "libc64/malloc.h"
#include "libc64/sleep.h"
#include "libu64/debug.h"
diff --git a/src/code/z_fbdemo_circle.c b/src/code/z_fbdemo_circle.c
index c25f174a7..eb1b22feb 100644
--- a/src/code/z_fbdemo_circle.c
+++ b/src/code/z_fbdemo_circle.c
@@ -1,3 +1,5 @@
+#include "transition_circle.h"
+
#include "gfx.h"
#include "global.h"
diff --git a/src/code/z_fbdemo_fade.c b/src/code/z_fbdemo_fade.c
index 3375628cb..cbd9f6813 100644
--- a/src/code/z_fbdemo_fade.c
+++ b/src/code/z_fbdemo_fade.c
@@ -1,4 +1,5 @@
-#include "ultra64.h"
+#include "transition_fade.h"
+
#include "main.h"
#include "regs.h"
#include "terminal.h"
diff --git a/src/code/z_fbdemo_triforce.c b/src/code/z_fbdemo_triforce.c
index 7bb8862b2..93826fa36 100644
--- a/src/code/z_fbdemo_triforce.c
+++ b/src/code/z_fbdemo_triforce.c
@@ -1,3 +1,5 @@
+#include "transition_triforce.h"
+
#include "global.h"
#include "assets/code/fbdemo_triforce/z_fbdemo_triforce.c"
diff --git a/src/code/z_fbdemo_wipe1.c b/src/code/z_fbdemo_wipe1.c
index a3418e91a..d876b0b73 100644
--- a/src/code/z_fbdemo_wipe1.c
+++ b/src/code/z_fbdemo_wipe1.c
@@ -1,3 +1,5 @@
+#include "transition_wipe.h"
+
#include "gfx.h"
#include "z64save.h"
#include "z64transition_instances.h"
diff --git a/src/code/z_kankyo.c b/src/code/z_kankyo.c
index 0bdc048ee..d86af19c0 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: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"
+ "ique-cn:160 ntsc-1.0:160 ntsc-1.1:160 ntsc-1.2:160 pal-1.0:192 pal-1.1:192"
LightNode* sNGameOverLightNode;
LightInfo sNGameOverLightInfo;
diff --git a/src/code/z_message.c b/src/code/z_message.c
index 88c219d37..789d4aa6a 100644
--- a/src/code/z_message.c
+++ b/src/code/z_message.c
@@ -4,6 +4,7 @@
#include "gfx.h"
#include "gfx_setupdl.h"
#include "gfxalloc.h"
+#include "memory_utils.h"
#include "message_data_static.h"
#if PLATFORM_N64
#include "n64dd.h"
diff --git a/src/code/z_parameter.c b/src/code/z_parameter.c
index 2c9b21950..4dd6662d5 100644
--- a/src/code/z_parameter.c
+++ b/src/code/z_parameter.c
@@ -1,5 +1,6 @@
#include "attributes.h"
#include "controller.h"
+#include "flag_set.h"
#include "gfx.h"
#include "gfx_setupdl.h"
#include "main.h"
diff --git a/src/code/z_play.c b/src/code/z_play.c
index cc041ecaf..7e4f5f5e3 100644
--- a/src/code/z_play.c
+++ b/src/code/z_play.c
@@ -24,6 +24,11 @@
#include "sys_matrix.h"
#include "terminal.h"
#include "title_setup_state.h"
+#include "transition_circle.h"
+#include "transition_fade.h"
+#include "transition_tile.h"
+#include "transition_triforce.h"
+#include "transition_wipe.h"
#include "versions.h"
#include "z_actor_dlftbls.h"
#include "zelda_arena.h"
diff --git a/src/code/z_sram.c b/src/code/z_sram.c
index bf713d373..534017d83 100644
--- a/src/code/z_sram.c
+++ b/src/code/z_sram.c
@@ -1,5 +1,6 @@
#include "file_select_state.h"
#include "controller.h"
+#include "memory_utils.h"
#include "terminal.h"
#include "versions.h"
#include "z64game.h"
generated by cgit v1.2.3 (git 2.25.1) at 2026-08-05 23:34:53 +0000