summaryrefslogtreecommitdiff
path: root/src/code/z_camera.c
diff options
context:
space:
mode:
authormzxrules <mzxrules@gmail.com>2025-02-05 15:07:19 -0500
committerGitHub <noreply@github.com>2025-02-05 21:07:19 +0100
commit54939bac3ac972a24918d3fdc97d58199ff54bc9 (patch)
tree2cf92ea6a9fc16316cc98368f9e004426fff98e5 /src/code/z_camera.c
parent8b82eb1ff7d0672fb24066bdf2fa8965f0e63337 (diff)
Reduce overlay dependencies on global.h (3) (#2449)
* kill more global.h references * .format.py * bss * ique
Diffstat (limited to 'src/code/z_camera.c')
-rw-r--r--src/code/z_camera.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/code/z_camera.c b/src/code/z_camera.c
index dda1f5ea3..9fb036573 100644
--- a/src/code/z_camera.c
+++ b/src/code/z_camera.c
@@ -4,8 +4,8 @@
#include "terminal.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:128 ntsc-1.1:128 ntsc-1.2:128 pal-1.0:128 pal-1.1:128"
s16 Camera_RequestSettingImpl(Camera* camera, s16 requestedSetting, s16 flags);
s32 Camera_RequestModeImpl(Camera* camera, s16 requestedMode, u8 forceModeChange);
@@ -3639,7 +3639,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:124 ntsc-1.1:124 ntsc-1.2:124 pal-1.0:122 pal-1.1:122"
+ "ique-cn:128 ntsc-1.0:138 ntsc-1.1:138 ntsc-1.2:138 pal-1.0:136 pal-1.1:136"
s32 Camera_KeepOn4(Camera* camera) {
static Vec3f D_8015BD50;