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_800D2E30.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_800D2E30.c')
| -rw-r--r-- | src/code/code_800D2E30.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/code/code_800D2E30.c b/src/code/code_800D2E30.c index ebf03760e..1c731c9bd 100644 --- a/src/code/code_800D2E30.c +++ b/src/code/code_800D2E30.c @@ -20,6 +20,7 @@ void func_800D2E30(UnkRumbleStruct* arg0) { D_8012DBB0 = new_var->unk_105; return; } + D_8012DBB0 = arg0->unk_105; if (arg0->unk_104 == 2) { @@ -38,7 +39,6 @@ void func_800D2E30(UnkRumbleStruct* arg0) { } if (arg0->unk_104 != 0) { for (i = 0; i < 0x40; i++) { - if (arg0->unk_04[i] != 0) { if (arg0->unk_44[i] > 0) { arg0->unk_44[i]--; @@ -56,12 +56,9 @@ void func_800D2E30(UnkRumbleStruct* arg0) { if (index == -1) { index = i; arg0->rumbleEnable[0] = (unk_a3 >= 0x100); - } else { - - if (arg0->unk_04[index] < arg0->unk_04[i]) { - index = i; - arg0->rumbleEnable[0] = (unk_a3 >= 0x100); - } + } else if (arg0->unk_04[index] < arg0->unk_04[i]) { + index = i; + arg0->rumbleEnable[0] = (unk_a3 >= 0x100); } } } |