diff --git a/src/audio.h b/src/audio.h index 3d380fc3c7..08c055e307 100644 --- a/src/audio.h +++ b/src/audio.h @@ -410,7 +410,7 @@ typedef struct UnkAlA9C { /* 0x16C */ char unk_16C[0x98]; /* 0x204 */ s32 unk_204; /* 0x208 */ s16 unk_208; - /* 0x20A */ s16 unk_20A; + /* 0x20A */ u16 unk_20A; /* 0x20C */ s16 unk_20C; /* 0x20E */ s16 unk_20E; /* 0x210 */ char unk_210[0xA]; diff --git a/src/code_26840_len_20d0.c b/src/code_26840_len_20d0.c index 27529df71f..8b8181fa4b 100644 --- a/src/code_26840_len_20d0.c +++ b/src/code_26840_len_20d0.c @@ -84,42 +84,6 @@ void func_8004B440(UnkAl6CC* arg0, u8 arg1, u8 arg2, UnkAl19E0* arg3, u8 arg4) { } INCLUDE_ASM(void, "code_26840_len_20d0", func_8004B62C, UnkAl6CC* arg0); -// void func_8004B62C(UnkAl6CC *arg0) { -// s32 *temp_a1; -// u16 temp_v0; -// u16 temp_v0_2; -// u32 temp_a3; -// s32 *phi_v1; -// UnkAl6CC *phi_a2; -// u32 phi_a3; - -// temp_a1 = arg0->unk_00->unk_A0; -// arg0->unk_08 = temp_a1; - -// phi_v1 = temp_a1; -// phi_a2 = arg0; -// phi_a3 = 0U; -// loop_1: -// temp_v0 = phi_v1->unk10; -// if (temp_v0 != 0) { -// phi_a2->unkC = (void *) (temp_v0 + temp_a1); -// } -// temp_a3 = phi_a3 + 1; -// phi_v1 = phi_v1 + 2; -// phi_a2 = phi_a2 + 4; -// phi_a3 = temp_a3; -// if (temp_a3 < 8U) { -// goto loop_1; -// } - - -// if (temp_a1->unkE == 1) { -// temp_v0_2 = ; -// if (temp_a1->unk_20 != 0) { -// arg0->unk_2C = (void *) (temp_v0_2 + temp_a1); -// } -// } -// } void func_8004B698(UnkAl6CC* arg0) { s32 i; diff --git a/src/code_28910_len_5090.c b/src/code_28910_len_5090.c index 4461d05b6a..0a5d163bca 100644 --- a/src/code_28910_len_5090.c +++ b/src/code_28910_len_5090.c @@ -161,7 +161,7 @@ void func_8004E3A4(UnkAlA9C* arg0) { if (arg0->unk_2C.unk_0A != 0) { arg0->unk_2C.unk_00.s32 += arg0->unk_2C.unk_04; } else { - arg0->unk_2C.unk_00.s32 = arg0->unk_2C.unk_08 << 0x10; + arg0->unk_2C.unk_00.s32 = arg0->unk_2C.unk_08 << 16; if (arg0->unk_2C.unk_0C != NULL) { arg0->unk_2C.unk_0C(); @@ -210,17 +210,13 @@ void func_8004FBBC(UnkAlA9C* arg0, UnkAl60* arg1) { } s32 func_8004FC08(UnkAlA9C* arg0, u32 arg1) { - u32 t32; - u16 t16; - u32 ret; + u32 unk_20A = arg0->unk_20A; + u32 ret = arg1; - t32 = t16 = arg0->unk_20A; - - ret = arg1; ret *= arg0->unk_D0; - if (t32 < ret) { - ret = t32; + if (unk_20A < ret) { + ret = unk_20A; } else if (ret == 0) { ret = 1; }