Fix most compiler warnings in the boot and code segments (#674)

* Less warnings in boot & code segments

* few more warnings gone

* Ran formatter

* z_view warning gone

* -> 1

* f31 -> 31

* Remove function casts

* Few more small improvements

* Separate declaration and assignment in func_80091738 and Item_Give

Co-authored-by: Thar0 <maximilianc64@gmail.com>

1 files changed, 16 insertions, 25 deletions

diff --git a/src/code/graph.c b/src/code/graph.c
index 9d568068c..2ad106782 100644
--- a/src/code/graph.c
+++ b/src/code/graph.c
@@ -25,18 +25,15 @@ UCodeInfo D_8012D248[3] = {
 // clang-format on
 
 void Graph_FaultClient() {
-    void* nextFb;
-    void* newFb;
-
-    nextFb = osViGetNextFramebuffer();
-    newFb = ((u32)SysCfb_GetFbPtr(0) != (u32)nextFb) ? SysCfb_GetFbPtr(0) : SysCfb_GetFbPtr(1);
+    void* nextFb = osViGetNextFramebuffer();
+    void* newFb = ((u32)SysCfb_GetFbPtr(0) != (u32)nextFb) ? SysCfb_GetFbPtr(0) : SysCfb_GetFbPtr(1);
 
     osViSwapBuffer(newFb);
     Fault_WaitForInput();
     osViSwapBuffer(nextFb);
 }
 
-void Graph_DisassembleUCode(void* arg0) {
+void Graph_DisassembleUCode(Gfx* workBuf) {
     UCodeDisas disassembler;
 
     if (HREG(80) == 7 && HREG(81) != 0) {
@@ -44,7 +41,7 @@ void Graph_DisassembleUCode(void* arg0) {
         disassembler.enableLog = HREG(83);
         UCodeDisas_RegisterUCode(&disassembler, ARRAY_COUNT(D_8012D230), D_8012D230);
         UCodeDisas_SetCurUCode(&disassembler, D_80155F50);
-        UCodeDisas_Disassemble(&disassembler, arg0);
+        UCodeDisas_Disassemble(&disassembler, workBuf);
         HREG(93) = disassembler.dlCnt;
         HREG(84) = disassembler.tri2Cnt * 2 + disassembler.tri1Cnt + (disassembler.quadCnt * 2) + disassembler.lineCnt;
         HREG(85) = disassembler.vtxCnt;
@@ -71,21 +68,19 @@ void Graph_DisassembleUCode(void* arg0) {
     }
 }
 
-void Graph_UCodeFaultClient(void* arg0) {
+void Graph_UCodeFaultClient(Gfx* workBuf) {
     UCodeDisas disassembler;
 
     UCodeDisas_Init(&disassembler);
     disassembler.enableLog = true;
     UCodeDisas_RegisterUCode(&disassembler, ARRAY_COUNT(D_8012D248), D_8012D248);
     UCodeDisas_SetCurUCode(&disassembler, D_80155F50);
-    UCodeDisas_Disassemble(&disassembler, arg0);
+    UCodeDisas_Disassemble(&disassembler, workBuf);
     UCodeDisas_Destroy(&disassembler);
 }
 
 void* Graph_InitTHGA(GraphicsContext* gfxCtx) {
-    GfxPool* pool;
-
-    pool = &gGfxPools[gfxCtx->gfxPoolIdx & 1];
+    GfxPool* pool = &gGfxPools[gfxCtx->gfxPoolIdx & 1];
 
     pool->headMagic = GFXPOOL_HEAD_MAGIC;
     pool->tailMagic = GFXPOOL_TAIL_MAGIC;
@@ -104,9 +99,8 @@ void* Graph_InitTHGA(GraphicsContext* gfxCtx) {
 }
 
 GameStateOverlay* Graph_GetNextGameState(GameState* gameState) {
-    void* gameStateInitFunc;
+    void* gameStateInitFunc = GameState_GetInit(gameState);
 
-    gameStateInitFunc = GameState_GetInit(gameState);
     if (gameStateInitFunc == TitleSetup_Init) {
         return &gGameStateOverlayTable[0];
     }
@@ -149,20 +143,17 @@ void Graph_Destroy(GraphicsContext* gfxCtx) {
 }
 
 void Graph_TaskSet00(GraphicsContext* gfxCtx) {
-    static u32 D_8012D260 = 0;
+    static Gfx* D_8012D260 = NULL;
     static s32 sGraphCfbInfoIdx = 0;
 
     OSTime time;
     OSTimer timer;
     OSMesg msg;
-    OSTask_t* task;
-    OSScTask* scTask;
+    OSTask_t* task = &gfxCtx->task.list.t;
+    OSScTask* scTask = &gfxCtx->task;
     CfbInfo* cfb;
     s32 pad1;
 
-    task = &gfxCtx->task.list.t;
-    scTask = &gfxCtx->task;
-
     D_8016A528 = osGetTime() - sGraphSetTaskTime - D_8016A558;
 
     osSetTimer(&timer, 140625000, 0, &gfxCtx->queue, (OSMesg)666);
@@ -174,8 +165,8 @@ void Graph_TaskSet00(GraphicsContext* gfxCtx) {
         osSyncPrintf(VT_FGCOL(RED));
         osSyncPrintf("RCPが帰ってきませんでした。"); // "RCP did not return."
         osSyncPrintf(VT_RST);
-        LogUtils_LogHexDump(&HW_REG(SP_MEM_ADDR_REG, u32), 0x20);
-        LogUtils_LogHexDump(&DPC_START_REG, 0x20);
+        LogUtils_LogHexDump((void*)&HW_REG(SP_MEM_ADDR_REG, u32), 0x20);
+        LogUtils_LogHexDump((void*)&DPC_START_REG, 0x20);
         LogUtils_LogHexDump(gGfxSPTaskYieldBuffer, sizeof(gGfxSPTaskYieldBuffer));
 
         SREG(6) = -1;
@@ -316,8 +307,8 @@ void Graph_Update(GraphicsContext* gfxCtx, GameState* gameState) {
         }
 
         if (HREG(81) < 0) {
-            LogUtils_LogHexDump(&HW_REG(SP_MEM_ADDR_REG, u32), 0x20);
-            LogUtils_LogHexDump(&DPC_START_REG, 0x20);
+            LogUtils_LogHexDump((void*)&HW_REG(SP_MEM_ADDR_REG, u32), 0x20);
+            LogUtils_LogHexDump((void*)&DPC_START_REG, 0x20);
         }
 
         if (HREG(81) < 0) {
@@ -521,7 +512,7 @@ void* Graph_DlistAlloc(Gfx** gfx, u32 size) {
 
     size = ((size + 7) & ~7),
 
-    ptr = *gfx + 1;
+    ptr = (u8*)(*gfx + 1);
 
     dst = (Gfx*)(ptr + size);
     gSPBranchList(*gfx, dst);