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_800A9F30.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_800A9F30.c')
| -rw-r--r-- | src/code/code_800A9F30.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/code/code_800A9F30.c b/src/code/code_800A9F30.c index fd8d220e2..b8f4e1ce8 100644 --- a/src/code/code_800A9F30.c +++ b/src/code/code_800A9F30.c @@ -8,7 +8,8 @@ void func_800A9F30(PadMgr* a, s32 b) { } void func_800A9F6C(f32 a, u8 b, u8 c, u8 d) { - s32 temp1, temp2; + s32 temp1; + s32 temp2; if (1000000.0f < a) { temp1 = 1000; @@ -30,6 +31,7 @@ void func_800AA000(f32 a, u8 b, u8 c, u8 d) { s32 temp1; s32 temp2; s32 i; + if (1000000.0f < a) { temp1 = 1000; } else { @@ -55,16 +57,16 @@ void func_800AA000(f32 a, u8 b, u8 c, u8 d) { void func_800AA0B4(void) { func_800D3140(&D_80160FD0); - gPadMgr.retraceCallback = (void*)func_800A9F30; + gPadMgr.retraceCallback = func_800A9F30; gPadMgr.retraceCallbackValue = 0; - if (0) {} // Necessary to match + if (1) {} } void func_800AA0F0(void) { PadMgr* padmgr = &gPadMgr; - if (((void*)padmgr->retraceCallback == (void*)func_800A9F30) && (padmgr->retraceCallbackValue == 0)) { + if ((padmgr->retraceCallback == func_800A9F30) && (padmgr->retraceCallbackValue == 0)) { padmgr->retraceCallback = NULL; padmgr->retraceCallbackValue = 0; } |
