From f448a48cd66d6a60fdac5ed1efec078a434a1fe7 Mon Sep 17 00:00:00 2001 From: mzxrules Date: Fri, 24 Jan 2025 13:25:05 -0500 Subject: Create headers for some libu64 files (#2440) * Create headers for some libu64 files * apply bss patch --- src/code/main.c | 2 +- src/code/padmgr.c | 4 +++- src/code/sys_math3d.c | 2 +- src/code/z_camera.c | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) (limited to 'src/code') diff --git a/src/code/main.c b/src/code/main.c index 6e6e3026c..d4c54b687 100644 --- a/src/code/main.c +++ b/src/code/main.c @@ -24,7 +24,7 @@ extern struct IrqMgr gIrqMgr; #endif #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" \ - "ntsc-1.0:127 ntsc-1.1:127 ntsc-1.2:127 pal-1.0:125 pal-1.1:125" + "ntsc-1.0:125 ntsc-1.1:125 ntsc-1.2:125 pal-1.0:123 pal-1.1:123" extern u8 _buffersSegmentEnd[]; diff --git a/src/code/padmgr.c b/src/code/padmgr.c index b5f76b721..740f15b29 100644 --- a/src/code/padmgr.c +++ b/src/code/padmgr.c @@ -28,7 +28,9 @@ * `osContStartReadData` to receiving the data. By running this on a separate thread to the game state, work can be * done while waiting for this operation to complete. */ -#include "global.h" +#include "libu64/debug.h" +#include "libu64/padsetup.h" +#include "macros.h" #include "fault.h" #include "terminal.h" #include "line_numbers.h" diff --git a/src/code/sys_math3d.c b/src/code/sys_math3d.c index 0a773bfb6..fc37a98c6 100644 --- a/src/code/sys_math3d.c +++ b/src/code/sys_math3d.c @@ -5,7 +5,7 @@ #include "macros.h" #include "sys_math3d.h" -#pragma increment_block_number "gc-eu:98 gc-eu-mq:98 gc-jp:98 gc-jp-ce:98 gc-jp-mq:98 gc-us:98 gc-us-mq:98" \ +#pragma increment_block_number "gc-eu:97 gc-eu-mq:97 gc-jp:97 gc-jp-ce:97 gc-jp-mq:97 gc-us:97 gc-us-mq:97" \ "ntsc-1.0:80 ntsc-1.1:80 ntsc-1.2:79 pal-1.0:80 pal-1.1:80" s32 Math3D_LineVsLineClosestTwoPoints(Vec3f* lineAPointA, Vec3f* lineAPointB, Vec3f* lineBPointA, Vec3f* lineBPointB, diff --git a/src/code/z_camera.c b/src/code/z_camera.c index f36aba0d7..e528431a2 100644 --- a/src/code/z_camera.c +++ b/src/code/z_camera.c @@ -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" \ - "ntsc-1.0:129 ntsc-1.1:129 ntsc-1.2:129 pal-1.0:127 pal-1.1:127" + "ntsc-1.0:127 ntsc-1.1:127 ntsc-1.2:127 pal-1.0:125 pal-1.1:125" s32 Camera_KeepOn4(Camera* camera) { static Vec3f D_8015BD50; -- cgit v1.2.3