1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-05 23:44:53 +00:00

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
This commit is contained in:
louist103 2020-07-30 15:50:18 -04:00 committed by GitHub
parent c3421dda0c
commit 449b2247fd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
19 changed files with 43 additions and 43 deletions

View file

@ -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;

View file

@ -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);

View file

@ -37,7 +37,7 @@ void FlagSet_Update(GlobalContext* globalCtx) {
};
GraphicsContext* gfxCtx;
u32 pad;
s32 pad;
Gfx* gfx;
Gfx* polyOpa;
Gfx* dispRefs[5];

View file

@ -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);

View file

@ -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;

View file

@ -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);

View file

@ -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];

View file

@ -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;

View file

@ -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;

View file

@ -2,7 +2,7 @@
#include <global.h>
void MsgEvent_SendNullTask() {
u32 pad[4];
s32 pad[4];
OSScTask task;
OSMesgQueue queue;
OSMesg msg;

View file

@ -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--;