summaryrefslogtreecommitdiff
path: root/src/code
diff options
context:
space:
mode:
Diffstat (limited to 'src/code')
-rw-r--r--src/code/code_800FC620.c2
-rw-r--r--src/code/fault.c4
-rw-r--r--src/code/flg_set.c2
-rw-r--r--src/code/mempak.c10
-rw-r--r--src/code/speed_meter.c4
-rw-r--r--src/code/z_debug.c2
-rw-r--r--src/code/z_draw.c2
-rw-r--r--src/code/z_jpeg.c2
-rw-r--r--src/code/z_kaleido_scope_call.c2
-rw-r--r--src/code/z_msgevent.c2
-rw-r--r--src/code/z_quake.c4
11 files changed, 18 insertions, 18 deletions
diff --git a/src/code/code_800FC620.c b/src/code/code_800FC620.c
index c75135cd7..1b62a7770 100644
--- a/src/code/code_800FC620.c
+++ b/src/code/code_800FC620.c
@@ -21,7 +21,7 @@ char D_80134488[0x18] = {
};
s32 Overlay_Load(u32 vRomStart, u32 vRomEnd, void* vRamStart, void* vRamEnd, void* allocatedVRamAddr) {
- u32 pad;
+ s32 pad;
u32 end;
u32 bssSize;
OverlayRelocationSection* ovl;
diff --git a/src/code/fault.c b/src/code/fault.c
index 892e110c9..c5972c3a3 100644
--- a/src/code/fault.c
+++ b/src/code/fault.c
@@ -882,7 +882,7 @@ void Fault_LogStackTrace(OSThread* thread, s32 height) {
u32 ra = thread->context.ra;
u32 pc = thread->context.pc;
u32 addr;
- u32 pad;
+ s32 pad;
osSyncPrintf("STACK TRACE\nSP PC (VPC)\n");
for (line = 1; line < height && (ra != 0 || sp != 0) && pc != (u32)__osCleanupThread; line++) {
@@ -955,7 +955,7 @@ void Fault_UpdatePad() {
void Fault_ThreadEntry(void* arg) {
OSMesg msg;
OSThread* faultedThread;
- u32 pad;
+ s32 pad;
osSetEventMesg(OS_EVENT_CPU_BREAK, &sFaultStructPtr->queue, 1);
osSetEventMesg(OS_EVENT_FAULT, &sFaultStructPtr->queue, 2);
diff --git a/src/code/flg_set.c b/src/code/flg_set.c
index b49c10947..9f277f3eb 100644
--- a/src/code/flg_set.c
+++ b/src/code/flg_set.c
@@ -37,7 +37,7 @@ void FlagSet_Update(GlobalContext* globalCtx) {
};
GraphicsContext* gfxCtx;
- u32 pad;
+ s32 pad;
Gfx* gfx;
Gfx* polyOpa;
Gfx* dispRefs[5];
diff --git a/src/code/mempak.c b/src/code/mempak.c
index b81a50125..6478bb725 100644
--- a/src/code/mempak.c
+++ b/src/code/mempak.c
@@ -14,7 +14,7 @@ u8 sMempakExtName[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
s32 Mempak_Init(s32 controllerNb) {
OSMesgQueue* mq;
- u32 pad;
+ s32 pad;
s32 ret;
ret = false;
@@ -71,7 +71,7 @@ s32 Mempak_Write(s32 controllerNb, char idx, void* buffer, s32 offset, s32 size)
OSMesgQueue* mq;
s32 error;
s32 ret;
- u32 pad;
+ s32 pad;
ret = false;
mq = PadMgr_LockSerialMesgQueue(&gPadMgr);
@@ -90,7 +90,7 @@ s32 Mempak_Read(s32 controllerNb, char idx, void* buffer, s32 offset, s32 size)
OSMesgQueue* mq;
s32 error;
s32 ret;
- u32 pad;
+ s32 pad;
ret = false;
mq = PadMgr_LockSerialMesgQueue(&gPadMgr);
@@ -110,7 +110,7 @@ s32 Mempak_Alloc(s32 controllerNb, char* idx, s32 size) {
s32 error;
s32 ret;
s32 i;
- u32 pad;
+ s32 pad;
ret = 0;
mq = PadMgr_LockSerialMesgQueue(&gPadMgr);
@@ -177,7 +177,7 @@ s32 Mempak_GetFileSize(s32 controllerNb, char idx) {
OSMesgQueue* mq;
OSPfsState state;
s32 error;
- u32 pad;
+ s32 pad;
mq = PadMgr_LockSerialMesgQueue(&gPadMgr);
error = osPfsFileState(&sMempakPfsHandle, sMempakFiles[idx - 'A'], &state);
diff --git a/src/code/speed_meter.c b/src/code/speed_meter.c
index b7cbc412e..18672eb77 100644
--- a/src/code/speed_meter.c
+++ b/src/code/speed_meter.c
@@ -43,7 +43,7 @@ void SpeedMeter_Destroy(SpeedMeter* this) {
}
void SpeedMeter_DrawTimeEntries(SpeedMeter* this, GraphicsContext* gfxCtx) {
- u32 pad[2];
+ s32 pad[2];
u32 baseX = 32;
s32 temp;
s32 i;
@@ -153,7 +153,7 @@ void SpeedMeter_DrawAllocEntry(SpeedMeterAllocEntry* this, GraphicsContext* gfxC
}
void SpeedMeter_DrawAllocEntries(SpeedMeter* meter, GraphicsContext* gfxCtx, GameState* state) {
- u32 pad[2];
+ s32 pad[2];
u32 ulx = 30;
u32 lrx = 290;
SpeedMeterAllocEntry entry;
diff --git a/src/code/z_debug.c b/src/code/z_debug.c
index 658f64144..48caa825d 100644
--- a/src/code/z_debug.c
+++ b/src/code/z_debug.c
@@ -220,7 +220,7 @@ void func_80063D7C(GraphicsContext* gfxCtx) {
Gfx* sp78;
GfxPrint gfxPrint;
Gfx* tempRet;
- u32 pad;
+ s32 pad;
Gfx* dispRefs[4]; // stores state of GfxCtx next ptrs
Graph_OpenDisps(dispRefs, gfxCtx, "../z_debug.c", 628);
diff --git a/src/code/z_draw.c b/src/code/z_draw.c
index 4806dfa98..12a04eeb3 100644
--- a/src/code/z_draw.c
+++ b/src/code/z_draw.c
@@ -671,7 +671,7 @@ void func_8006B6E4(GlobalContext* globalCtx, s16 drawId) {
}
void func_8006B870(GlobalContext* globalCtx, s16 drawId) {
- u32 pad;
+ s32 pad;
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
Gfx* dispRefs[4];
diff --git a/src/code/z_jpeg.c b/src/code/z_jpeg.c
index 70cf1e70e..ee92e02cf 100644
--- a/src/code/z_jpeg.c
+++ b/src/code/z_jpeg.c
@@ -37,7 +37,7 @@ u32 Jpeg_SendTask(JpegContext* ctx) {
// clang-format on
JpegWork* workBuf = ctx->workBuf;
- u32 pad[2];
+ s32 pad[2];
workBuf->taskData.address = PHYSICAL_TO_VIRTUAL(&workBuf->unk_6C0);
workBuf->taskData.mode = ctx->mode;
diff --git a/src/code/z_kaleido_scope_call.c b/src/code/z_kaleido_scope_call.c
index 0baf2654b..d7f42b724 100644
--- a/src/code/z_kaleido_scope_call.c
+++ b/src/code/z_kaleido_scope_call.c
@@ -47,7 +47,7 @@ void KaleidoScopeCall_Destroy(GlobalContext* globalCtx) {
// regalloc
#ifdef NON_MATCHING
void KaleidoScopeCall_Update(GlobalContext* globalCtx) {
- u32 pad;
+ s32 pad;
PauseContext* pauseCtx;
pauseCtx = &globalCtx->pauseCtx;
diff --git a/src/code/z_msgevent.c b/src/code/z_msgevent.c
index 9e61a9181..652d49899 100644
--- a/src/code/z_msgevent.c
+++ b/src/code/z_msgevent.c
@@ -2,7 +2,7 @@
#include <global.h>
void MsgEvent_SendNullTask() {
- u32 pad[4];
+ s32 pad[4];
OSScTask task;
OSMesgQueue queue;
OSMesg msg;
diff --git a/src/code/z_quake.c b/src/code/z_quake.c
index 379fa03e7..c844ae3e3 100644
--- a/src/code/z_quake.c
+++ b/src/code/z_quake.c
@@ -62,7 +62,7 @@ void Quake_UpdateShakeInfo(QuakeRequest* req, ShakeInfo* shake, f32 y, f32 x) {
}
s16 Quake_Callback1(QuakeRequest* req, ShakeInfo* shake) {
- u32 pad;
+ s32 pad;
if (req->countdown > 0) {
f32 a = Math_Sins(req->speed * req->countdown);
Quake_UpdateShakeInfo(req, shake, a, Math_Rand_ZeroOne() * a);
@@ -81,7 +81,7 @@ s16 Quake_Callback5(QuakeRequest* req, ShakeInfo* shake) {
}
s16 Quake_Callback6(QuakeRequest* req, ShakeInfo* shake) {
- u32 pad;
+ s32 pad;
f32 a;
req->countdown--;
generated by cgit v1.2.3 (git 2.25.1) at 2026-08-03 19:52:59 +0000