diff options
| author | Tyler McGavran <tyler.taggerung@gmail.com> | 2022-12-25 20:56:35 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-25 18:56:35 -0700 |
| commit | 3e3561bbf1f01a74a2ce92ae2a8749c864056792 (patch) | |
| tree | b7b04b165359e9a60291e27855d182719f221ebd /src/code_80086E70.c | |
| parent | e1976267f327c81cba064ad918329dd6e48a11c5 (diff) | |
Couple small matches and m2c refreshing (#282)
* Moved stuff into header files to
make m2c_helper a more useful
Signed-off-by: Taggerung <tyler.taggerung@gmail.com>
Diffstat (limited to 'src/code_80086E70.c')
| -rw-r--r-- | src/code_80086E70.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/code_80086E70.c b/src/code_80086E70.c index 80bb44d93..59e543b41 100644 --- a/src/code_80086E70.c +++ b/src/code_80086E70.c @@ -999,20 +999,17 @@ GLOBAL_ASM("asm/non_matchings/code_80086E70/func_8008933C.s") #endif #ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -void func_80072180(); // extern -s32 func_8007223C(?); // extern -f32 func_8008933C(Player *, s32, s32, s32); // extern -void func_800C9060(u8, s32); // extern +//generated by m2c commit d9d3d6575355663122de59f6b2882d8f174e2355 on Dec-21-2022 +f32 func_8008933C(Player *, s32, s32, s32); /* extern */ -void func_80089474(s32 arg0, u8 arg1, s32 arg2, s32 arg3, s32 arg4) { +void func_80089474(s32 arg0, u8 arg1, s32 arg2, s32 arg3, u32 arg4) { Player *sp18; sp18 = &gPlayerOne[arg1]; - if (func_8007223C(0x4000000) != 0) { + if (func_8007223C(arg0, 0x04000000) != 0) { func_80072180(); } - if ((func_8008933C(sp18, arg0, arg2, arg3) >= 4.0) && ((sp18->unk_000 & 0x1000) != 0x1000)) { + if (((f64) func_8008933C(sp18, arg0, arg2, arg3) >= 4.0) && ((sp18->unk_000 & 0x1000) != 0x1000)) { func_800C9060(arg1, arg4); } } |