diff options
| author | Tharo <17233964+Thar0@users.noreply.github.com> | 2021-02-14 00:49:40 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-13 19:49:40 -0500 |
| commit | f9d96d9f73ac090245a518ec04f3fa0e50655d1e (patch) | |
| tree | 9dc905fce276cbfb07a05fc2bf0883bcedddcf23 /src/code/code_800FC620.c | |
| parent | d615ec4f31563b939f8c0dce1c20c79e137c2043 (diff) | |
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>
Diffstat (limited to 'src/code/code_800FC620.c')
| -rw-r--r-- | src/code/code_800FC620.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/code/code_800FC620.c b/src/code/code_800FC620.c index d1bb1f36d..5e2532ae3 100644 --- a/src/code/code_800FC620.c +++ b/src/code/code_800FC620.c @@ -71,6 +71,7 @@ s32 Overlay_Load(u32 vRomStart, u32 vRomEnd, void* vRamStart, void* vRamEnd, voi bssSize = size; bzero((void*)end, bssSize); relocCnt = ovl->nRelocations; + (void)relocCnt; // suppresses set but unused warning } size = (u32)&ovl->relocations[ovl->nRelocations] - (u32)ovl; @@ -126,6 +127,7 @@ void func_800FC8D8(void* blk, u32 nBlk, s32 blkSize, arg3_800FC8D8 arg3) { void* func_800FC948(void* blk, u32 nBlk, u32 blkSize, arg3_800FC948 arg3) { u32 pos; + if (blk == NULL) { blk = func_800FC800(nBlk * blkSize); } @@ -171,13 +173,9 @@ void func_800FCA18(void* blk, u32 nBlk, u32 blkSize, arg3_800FCA18 arg3, s32 arg } void func_800FCB34(void) { - InitFunc* initFunc; - u32 nextOffset; - InitFunc* prev; - - initFunc = (InitFunc*)&sInitFuncs; - nextOffset = initFunc->nextOffset; - prev = NULL; + InitFunc* initFunc = (InitFunc*)&sInitFuncs; + u32 nextOffset = initFunc->nextOffset; + InitFunc* prev = NULL; while (nextOffset != 0) { initFunc = (InitFunc*)((s32)initFunc + nextOffset); |
