summaryrefslogtreecommitdiff
path: root/src/code
diff options
context:
space:
mode:
authorDragorn421 <Dragorn421@users.noreply.github.com>2024-09-25 10:25:49 +0200
committerGitHub <noreply@github.com>2024-09-25 10:25:49 +0200
commit5ed5f196d9ea284e789790ea15c1c37f993609fb (patch)
tree1dc38550d6c0c3db09a9db2c02b2017db23b3f03 /src/code
parente331805c0a0bc1ac939b7c7af0db53277e73385b (diff)
[headers] audio functions to z64audio.h and z64ocarina.h (#2223)
* [headers] audio functions to z64audio.h and z64ocarina.h * bss
Diffstat (limited to 'src/code')
-rw-r--r--src/code/main.c2
-rw-r--r--src/code/z_camera.c2
-rw-r--r--src/code/z_collision_check.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/code/main.c b/src/code/main.c
index 2adf79517..ba53239c8 100644
--- a/src/code/main.c
+++ b/src/code/main.c
@@ -23,7 +23,7 @@ extern struct IrqMgr gIrqMgr;
#endif
#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" \
- "ntsc-1.2:164"
+ "ntsc-1.2:163"
extern u8 _buffersSegmentEnd[];
diff --git a/src/code/z_camera.c b/src/code/z_camera.c
index eeba153ab..346e33450 100644
--- a/src/code/z_camera.c
+++ b/src/code/z_camera.c
@@ -3638,7 +3638,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" \
- "ntsc-1.2:108"
+ "ntsc-1.2:107"
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 1f6bb36cd..27629dd82 100644
--- a/src/code/z_collision_check.c
+++ b/src/code/z_collision_check.c
@@ -5,7 +5,7 @@
#include "overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.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:224"
+#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:216"
typedef s32 (*ColChkResetFunc)(PlayState*, Collider*);
typedef void (*ColChkApplyFunc)(PlayState*, CollisionCheckContext*, Collider*);