Math Sizes (#297)

* Math Sizes

Added sizes to most variable types

* Removed sizes and fixed pads

Removed sizes from base types and cleaned up pads

* PR fixes

17 files changed, 28 insertions, 28 deletions

diff --git a/src/boot/z_std_dma.c b/src/boot/z_std_dma.c
index 7a0e0a31e..aec911a3d 100644
--- a/src/boot/z_std_dma.c
+++ b/src/boot/z_std_dma.c
@@ -1575,7 +1575,7 @@ s32 DmaMgr_DMARomToRam(u32 rom, u32 ram, u32 size) {
     OSMesg msg;
     s32 ret;
     u32 buffSize;
-    u32 pad[2];
+    s32 pad[2];
 
     buffSize = gDmaMgrDmaBuffSize;
     if (buffSize == 0) {
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--;
diff --git a/src/overlays/actors/ovl_En_Guest/z_en_guest.c b/src/overlays/actors/ovl_En_Guest/z_en_guest.c
index 700221781..ca2004c83 100644
--- a/src/overlays/actors/ovl_En_Guest/z_en_guest.c
+++ b/src/overlays/actors/ovl_En_Guest/z_en_guest.c
@@ -78,7 +78,7 @@ void EnGuest_Destroy(Actor* thisx, GlobalContext* globalCtx) {
 
 void EnGuest_Update(Actor* thisx, GlobalContext* globalCtx) {
     EnGuest* this = THIS;
-    u32 pad;
+    s32 pad;
 
     if (Object_IsLoaded(&globalCtx->objectCtx, this->osAnimeBankIndex) != 0) {
         this->actor.flags &= ~0x10;
@@ -147,7 +147,7 @@ void func_80A5057C(EnGuest* this, GlobalContext* globalCtx) {
 
 void func_80A505CC(Actor* thisx, GlobalContext* globalCtx) {
     EnGuest* this = THIS;
-    u32 pad;
+    s32 pad;
     Player* player;
 
     player = PLAYER;
diff --git a/src/overlays/actors/ovl_En_Hata/z_en_hata.c b/src/overlays/actors/ovl_En_Hata/z_en_hata.c
index 4dcec91d9..e6a7360b3 100644
--- a/src/overlays/actors/ovl_En_Hata/z_en_hata.c
+++ b/src/overlays/actors/ovl_En_Hata/z_en_hata.c
@@ -40,7 +40,7 @@ extern UNK_TYPE D_060000C0;
 
 void EnHata_Init(Actor* thisx, GlobalContext* globalCtx) {
     EnHata* this = THIS;
-    u32 pad;
+    s32 pad;
     u32 temp;
     f32 frameCount;
 
diff --git a/src/overlays/actors/ovl_En_Insect/z_en_insect.c b/src/overlays/actors/ovl_En_Insect/z_en_insect.c
index 8183b42c9..1d8a41537 100644
--- a/src/overlays/actors/ovl_En_Insect/z_en_insect.c
+++ b/src/overlays/actors/ovl_En_Insect/z_en_insect.c
@@ -78,7 +78,7 @@ f32 EnInsect_XZDistanceSquared(Vec3f* v1, Vec3f* v2) {
 }
 
 s32 func_80A7BE6C(EnInsect* this, GlobalContext* globalCtx) {
-    u32 pad;
+    s32 pad;
     Player* player = PLAYER;
     Vec3f pos;
 
diff --git a/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c b/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c
index 381edcb6e..32b6c0325 100644
--- a/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c
+++ b/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c
@@ -42,7 +42,7 @@ void OceffSpot_SetupAction(OceffSpot* this, OceffSpotActionFunc actionFunc) {
 }
 
 void OceffSpot_Init(Actor* thisx, GlobalContext* globalCtx) {
-    u32 pad;
+    s32 pad;
     OceffSpot* this = THIS;
 
     Actor_ProcessInitChain(&this->actor, sInitChain);
@@ -65,7 +65,7 @@ void OceffSpot_Init(Actor* thisx, GlobalContext* globalCtx) {
 }
 
 void OceffSpot_Destroy(Actor* thisx, GlobalContext* globalCtx) {
-    u32 pad;
+    s32 pad;
     OceffSpot* this = THIS;
     Player* player = PLAYER;
 
@@ -119,7 +119,7 @@ void OceffSpot_GrowCylinder(OceffSpot* this, GlobalContext* globalCtx) {
 
 void OceffSpot_Update(Actor* thisx, GlobalContext* globalCtx) {
     OceffSpot* this = THIS;
-    u32 pad;
+    s32 pad;
     Player* player = PLAYER;
     f32 temp;
 
diff --git a/src/overlays/gamestates/ovl_title/z_title.c b/src/overlays/gamestates/ovl_title/z_title.c
index 456c87fd1..1b5b3f6b1 100644
--- a/src/overlays/gamestates/ovl_title/z_title.c
+++ b/src/overlays/gamestates/ovl_title/z_title.c
@@ -130,7 +130,7 @@ void Title_Draw(TitleContext* this) {
 void Title_Main(TitleContext* this) {
     GraphicsContext* gfxCtx = this->state.gfxCtx;
     Gfx* dispRefs[5];
-    u32 pad[2];
+    s32 pad[2];
     Gfx* gfx;
 
     Graph_OpenDisps(dispRefs, this->state.gfxCtx, "../z_title.c", 494);
@@ -162,7 +162,7 @@ void Title_Destroy(TitleContext* this) {
 
 void Title_Init(TitleContext* this) {
     u32 size = (u32)_nintendo_rogo_staticSegmentRomEnd - (u32)_nintendo_rogo_staticSegmentRomStart;
-    u32 pad;
+    s32 pad;
 
     this->staticSegment = GameState_Alloc(&this->state, size, "../z_title.c", 611);
     osSyncPrintf("z_title.c\n");