diff options
| author | Joshua Peisach <itzswirlz2020@outlook.com> | 2023-08-26 13:46:54 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-26 11:46:54 -0600 |
| commit | b9b1d2f0c17f74e0fb068c67db05db4d82dd3abc (patch) | |
| tree | c10f8f5c872f6514cdf81b09b7baff81781707eb /src/audio/external.c | |
| parent | 0e85b1acb135f3b984cc223d45f5297f517bcd67 (diff) | |
audio/external: func_800C357C func_800C9D0C (#386)
Signed-off-by: Joshua Peisach <itzswirlz2020@outlook.com>
Diffstat (limited to 'src/audio/external.c')
| -rw-r--r-- | src/audio/external.c | 47 |
1 files changed, 13 insertions, 34 deletions
diff --git a/src/audio/external.c b/src/audio/external.c index b386f5059..6161231b7 100644 --- a/src/audio/external.c +++ b/src/audio/external.c @@ -1121,34 +1121,23 @@ u16 func_800C3508(s32 player) { GLOBAL_ASM("asm/non_matchings/audio/external/func_800C3508.s") #endif -#ifdef MIPS_TO_C -//generated by m2c commit eefca95b040d7ee0c617bc58f9ac6cd1cf7bce87 on Aug-14-2023 -extern ? D_80192CD0; -static u8 D_800EA1E4 = 0; -static u8 D_800EA1E8 = 0; +extern u8 D_800EA1E8; -s32 func_800C357C(s32 arg0) { - s32 temp_t9; - s32 var_v1; - u8 var_v0; +u8 func_800C357C(s32 arg0) { + u8 var_v1; + u8 i; - var_v0 = D_800EA1E8; + i = D_800EA1E8; var_v1 = 1; - if ((s32) var_v0 < (s32) D_800EA1E4) { - do { - if (arg0 == *(&D_80192CD0 + (var_v0 * 4))) { - var_v1 = 0; - var_v0 = D_800EA1E4 & 0xFF; - } - temp_t9 = (var_v0 + 1) & 0xFF; - var_v0 = (u8) temp_t9; - } while (temp_t9 < (s32) D_800EA1E4); + for(i = D_800EA1E8; i < (s32) D_800EA1E4; i++) { + if (arg0 == D_80192CD0[i]) { + var_v1 = 0; + i = D_800EA1E4; + } } return var_v1; } -#else -GLOBAL_ASM("asm/non_matchings/audio/external/func_800C357C.s") -#endif + void func_800C35E8(u8 arg0) { D_80192CC6[arg0] = 0; @@ -4412,19 +4401,9 @@ void func_800C9A88(u8 playerId) { } } -#ifdef MIPS_TO_C -//generated by m2c commit 0927f17aac197848d4ebdf0c6bbad74b01f0851c -? func_800C550C(f32 *); /* extern */ - -void func_800C9D0C(s32 playerId) { - Player *temp_v0; - - temp_v0 = &gPlayers[playerId & 0xFF]; - func_800C550C(func_800C21E8(temp_v0->pos, temp_v0->characterId + 0x31028000)); +void func_800C9D0C(u8 playerId) { + func_800C550C(func_800C21E8(gPlayers[playerId].pos, gPlayers[playerId].characterId + 0x31028000)); } -#else -GLOBAL_ASM("asm/non_matchings/audio/external/func_800C9D0C.s") -#endif #ifdef MIPS_TO_C //generated by m2c commit 0927f17aac197848d4ebdf0c6bbad74b01f0851c |