diff options
| author | fig02 <fig02srl@gmail.com> | 2025-04-19 22:04:08 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-04-19 22:04:08 -0400 |
| commit | 2278bcb2c3383553d136216a7fc1600cd86485f3 (patch) | |
| tree | 5aaf0522d10f2c0f0ec43653bb136ba603099b7a /src/code/z_camera.c | |
| parent | 655ec771387927eda89d89b5bc2751192b075909 (diff) | |
Remove Variables.h; Decouple z64.h from global.h (#2507)
* progress
* z64.h issues sorted
* remove variables.h
* format
* n64 fix
* another fix
* did the wrong fix
* fix libleo
* fix bss
* review
* remove instead of comment
Diffstat (limited to 'src/code/z_camera.c')
| -rw-r--r-- | src/code/z_camera.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/code/z_camera.c b/src/code/z_camera.c index b7a7d2fad..8e835e1fd 100644 --- a/src/code/z_camera.c +++ b/src/code/z_camera.c @@ -23,8 +23,8 @@ #include "z64save.h" #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:0 ntsc-1.1:0 ntsc-1.2:0 pal-1.0:0 pal-1.1:0" +#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" 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:70 ntsc-1.1:70 ntsc-1.2:70 pal-1.0:70 pal-1.1:70" + "ique-cn:128 ntsc-1.0:128 ntsc-1.1:128 ntsc-1.2:128 pal-1.0:128 pal-1.1:128" s32 Camera_KeepOn4(Camera* camera) { static Vec3f D_8015BD50; |