diff options
| author | MegaMech <MegaMech@users.noreply.github.com> | 2022-07-09 05:05:11 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-09 04:05:11 -0700 |
| commit | a8e984d2fd99150f5c9fe08af67f17edc6d8a0d3 (patch) | |
| tree | 1d25fe9d98483d66125a391ea4782257e8343a82 /src/code_80086E70.c | |
| parent | 42b81c1979fd27448c6ca3d9c4b3d99650b14ded (diff) | |
Decomp 800 byte sized funcs and smaller (#241)
* Decomp 800 byte sized funcs and below
Diffstat (limited to 'src/code_80086E70.c')
| -rw-r--r-- | src/code_80086E70.c | 127 |
1 files changed, 48 insertions, 79 deletions
diff --git a/src/code_80086E70.c b/src/code_80086E70.c index c647939c5..7ff30fd0b 100644 --- a/src/code_80086E70.c +++ b/src/code_80086E70.c @@ -2376,102 +2376,71 @@ void func_8008B78C(s32 arg0) { GLOBAL_ASM("asm/non_matchings/code_80086E70/func_8008B78C.s") #endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -extern ? D_80165C18; - void func_8008B7D4(s32 arg0, f32 arg1, f32 arg2, f32 arg3) { - void *temp_v0; - - temp_v0 = (arg0 * 0xE0) + &D_80165C18; - temp_v0->unk10 = arg1; - temp_v0->unk14 = arg2; - temp_v0->unk18 = arg3; + D_80165C18[arg0].unk_010[0] = arg1; + D_80165C18[arg0].unk_010[1] = arg2; + D_80165C18[arg0].unk_010[2] = arg3; } -#else -GLOBAL_ASM("asm/non_matchings/code_80086E70/func_8008B7D4.s") -#endif - -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -extern ? D_80165C18; void func_8008B80C(s32 arg0, f32 arg1, f32 arg2, f32 arg3) { - void *temp_v0; - - temp_v0 = (arg0 * 0xE0) + &D_80165C18; - temp_v0->unk28 = arg1; - temp_v0->unk2C = arg2; - temp_v0->unk30 = arg3; + D_80165C18[arg0].unk_028[0] = arg1; + D_80165C18[arg0].unk_028[1] = arg2; + D_80165C18[arg0].unk_028[2] = arg3; } -#else -GLOBAL_ASM("asm/non_matchings/code_80086E70/func_8008B80C.s") -#endif - -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -extern ? D_80165C18; void func_8008B844(s32 arg0) { - f32 temp_f0; - void *temp_v0; + f32 temp_f0 = D_80165C18[arg0].unk_010[0]; - temp_v0 = (arg0 * 0xE0) + &D_80165C18; - temp_f0 = temp_v0->unk10; - temp_v0->unk4 = temp_v0->unk28 + temp_f0; - temp_v0->unk8 = temp_v0->unk2C + temp_f0; - temp_v0->unkC = temp_v0->unk30 + temp_f0; + D_80165C18[arg0].unk_004[0] = D_80165C18[arg0].unk_028[0] + temp_f0; + D_80165C18[arg0].unk_004[1] = D_80165C18[arg0].unk_028[1] + temp_f0; + D_80165C18[arg0].unk_004[2] = D_80165C18[arg0].unk_028[2] + temp_f0; } -#else -GLOBAL_ASM("asm/non_matchings/code_80086E70/func_8008B844.s") -#endif - -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -extern ? D_80165C18; - -void func_8008B888(s32 arg0, s16 arg1, s16 arg2, s16 arg3) { - void *temp_v0; - temp_v0 = (arg0 * 0xE0) + &D_80165C18; - temp_v0->unkBE = arg1; - temp_v0->unkC0 = arg2; - temp_v0->unkC2 = arg3; +void func_8008B888(s32 arg0, u16 arg1, u16 arg2, u16 arg3) { + D_80165C18[arg0].unk_0BE = arg1; + D_80165C18[arg0].unk_0C0 = arg2; + D_80165C18[arg0].unk_0C2 = arg3; } -#else -GLOBAL_ASM("asm/non_matchings/code_80086E70/func_8008B888.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -extern ? D_80165C18; - -void func_8008B8BC(s32 arg0, s16 arg1, s16 arg2, s16 arg3) { - void *temp_v0; +void func_8008B8BC(s32 arg0, u16 arg1, u16 arg2, u16 arg3) { + D_80165C18[arg0].unk_0B2 = arg1; + D_80165C18[arg0].unk_0B4 = arg2; + D_80165C18[arg0].unk_0B6 = arg3; +} - temp_v0 = (arg0 * 0xE0) + &D_80165C18; - temp_v0->unkB2 = arg1; - temp_v0->unkB4 = arg2; - temp_v0->unkB6 = arg3; +void func_8008B8F0(s32 arg0, f32 arg1, f32 arg2, f32 arg3) { + D_80165C18[arg0].unk_038 = arg1; + D_80165C18[arg0].unk_03C = arg2; + D_80165C18[arg0].unk_040 = arg3; } -#else -GLOBAL_ASM("asm/non_matchings/code_80086E70/func_8008B8BC.s") -#endif #ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -extern ? D_80165C18; - -void func_8008B8F0(s32 arg0, f32 arg1, f32 arg2, f32 arg3) { - void *temp_v0; +UNUSED void func_8008B928(s32 arg0, s16 arg1, s16 arg2, s16 arg3, void *arg4) { + s16 temp_v0; + s32 temp_t3; + void *temp_s0; - temp_v0 = (arg0 * 0xE0) + &D_80165C18; - temp_v0->unk38 = arg1; - temp_v0->unk3C = arg2; - temp_v0->unk40 = arg3; -} -#else -GLOBAL_ASM("asm/non_matchings/code_80086E70/func_8008B8F0.s") + temp_s0 = (arg0 * 0xE0) + &D_80165C18; + temp_s0->unk10 = (f32) arg1; + temp_s0->unk14 = (f32) arg2; + temp_s0->unk80 = arg4; + temp_s0->unk18 = (f32) arg3; + temp_s0->unk38 = (f32) (arg4->unkA - arg4->unk2); + temp_s0->unk3C = (f32) (arg4->unkC - arg4->unk4); + temp_s0->unk40 = (f32) (arg4->unkE - arg4->unk6); + temp_v0 = func_80087368(arg1, arg2, arg3); + temp_t3 = -temp_v0 & 0xFFFF; + temp_s0->unkC0 = temp_v0; + temp_s0->unk40 = func_800416D8(temp_s0->unk40, temp_s0->unk38, temp_t3); + temp_s0->unkBE = func_80087324(arg0); +} + +UNUSED void func_8008BA40(s32 arg0, s16 arg1, u16 arg2) { + *(&D_80165C28 + (arg0 * 0xE0)) = (f32) (arg1 + (s16) (random_int(arg2) - ((s32) arg2 / 2))); +} +*/ +#else +GLOBAL_ASM("asm/non_matchings/code_80086E70/func_8008B928.s") #endif #ifdef MIPS_TO_C |
