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/z_debug.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/z_debug.c')
| -rw-r--r-- | src/code/z_debug.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/code/z_debug.c b/src/code/z_debug.c index 91137e190..6cb76f846 100644 --- a/src/code/z_debug.c +++ b/src/code/z_debug.c @@ -34,7 +34,7 @@ InputCombo inputCombos[REG_GROUPS] = { char regChar[] = " SOPQMYDUIZCNKXcsiWAVHGmnBdkb"; // initialize GameInfo -void func_800636C0() { +void func_800636C0(void) { s32 i; gGameInfo = (GameInfo*)SystemArena_MallocDebug(sizeof(GameInfo), "../z_debug.c", 260); @@ -67,7 +67,7 @@ void func_8006376C(u8 x, u8 y, u8 colorId, const char* text) { i = 0; bufText = buf->text; - while (*bufText++ = *text++) { + while ((*bufText++ = *text++)) { if (i++ > 0x14) { break; } @@ -188,14 +188,11 @@ void func_8006390C(Input* input) { // Draw Memory Viewer void func_80063C04(GfxPrint* gfxPrint) { s32 i; - s32 page; - s32 regGroup; - s32 test; // removing affects stack + s32 page = (gGameInfo->regPage * REG_PER_PAGE) - REG_PER_PAGE; + s32 regGroup = (gGameInfo->regGroup * REG_PAGES + gGameInfo->regPage) * REG_PER_PAGE - REG_PER_PAGE; + s32 pad; char name[3]; - page = (gGameInfo->regPage * REG_PER_PAGE) - REG_PER_PAGE; - regGroup = (gGameInfo->regGroup * REG_PAGES + gGameInfo->regPage) * REG_PER_PAGE - REG_PER_PAGE; - // set up register name string name[0] = 'R'; name[1] = regChar[gGameInfo->regGroup]; // r_group type char @@ -242,7 +239,7 @@ void func_80063D7C(GraphicsContext* gfxCtx) { Graph_BranchDlist(sp78, sp7C); POLY_OPA_DISP = sp7C; - if (0) {} + if (1) {} CLOSE_DISPS(gfxCtx, "../z_debug.c", 664); |