diff --git a/src/REL/m412Dll/main.c b/src/REL/m412Dll/main.c index edea5f01..a26e3040 100644 --- a/src/REL/m412Dll/main.c +++ b/src/REL/m412Dll/main.c @@ -1153,62 +1153,6 @@ s8 fn_1_4E58(s32 arg0, s32 arg1) return var_r30; } -static inline s8 fn_1_4E58_0(s32 arg0) -{ - Vec spC; - float temp; - f32 temp_f28; - f32 temp_f27; - s8 var_r30; - s8 temp_r29; - s8 temp_r28; - - unkStruct3 *temp_r31; - - temp_r31 = &lbl_1_bss_4D4[arg0]; - if (GWPlayerCfg[arg0].iscom == 0) { - temp_r29 = HuPadStkX[temp_r31->unk2C]; - temp_r28 = HuPadStkY[temp_r31->unk2C]; - temp_f28 = fn_1_1D08(atan2d(temp_r29, temp_r28)); - temp_f28 -= lbl_1_bss_778; - HuSetVecF(&spC, (f32)temp_r29, 0.0, (f32)temp_r28); - fn_1_4C9C(&spC, temp_f28, 1.0f); - var_r30 = spC.x; - } - else { - var_r30 = temp_r31->unk88; - } - return var_r30; -} - -static inline s8 fn_1_4E58_1(s32 arg0) -{ - Vec spC; - float temp; - f32 temp_f28; - f32 temp_f27; - s8 var_r30; - s8 temp_r29; - s8 temp_r28; - - unkStruct3 *temp_r31; - - temp_r31 = &lbl_1_bss_4D4[arg0]; - if (GWPlayerCfg[arg0].iscom == 0) { - temp_r29 = HuPadStkX[temp_r31->unk2C]; - temp_r28 = HuPadStkY[temp_r31->unk2C]; - temp_f28 = fn_1_1D08(atan2d(temp_r29, temp_r28)); - temp_f28 -= lbl_1_bss_778; - HuSetVecF(&spC, (f32)temp_r29, 0.0, (f32)temp_r28); - fn_1_4C9C(&spC, temp_f28, 1.0f); - var_r30 = spC.z; - } - else { - var_r30 = temp_r31->unk89; - } - return var_r30; -} - u8 fn_1_525C(s32 arg0, s32 arg1) { s8 var_r30; @@ -1278,8 +1222,6 @@ s32 fn_1_53F4(unkStruct3 *arg0, f32 arg8, f32 arg9, f32 argA) var_f28 = var_f27; var_r28 = var_r30; arg0->unkA4 = 0; - (void)temp_r31; - (void)temp_r31; } } } @@ -1490,12 +1432,6 @@ void fn_1_6814(unkStruct3 *arg0) Vec sp104; Vec spF8; Vec spEC; - Vec spE0; - Vec spD4; - Vec spC8; - f32 spBC; - f32 spB0; - f32 spA4; volatile f32 spA0; f32 sp9C; f32 sp98; @@ -1656,24 +1592,6 @@ void fn_1_6814(unkStruct3 *arg0) } } -static inline DummyInline(Vec *arg0, Vec *arg1, Vec *arg2, float arg3, float arg4, float arg5) -{ - float spB8; - float spBC; - HuSetVecF(arg0, arg1->x, 0.0, arg1->z); - spBC = sqrtf((arg0->x * arg0->x) + (arg0->z * arg0->z)); - spBC *= (1.0f - arg3); - arg0->x = spBC * sind(arg4); - arg0->z = spBC * cosd(arg4); - HuSetVecF(arg2, arg0->x, 0.0, arg0->z); - HuSetVecF(arg0, arg1->x, 0.0, arg1->z); - spB8 = sqrtf((arg0->x * arg0->x) + (arg0->z * arg0->z)); - spB8 *= arg3; - arg0->x = spB8 * sind(arg5); - arg0->z = spB8 * cosd(arg5); - HuSetVecF(arg1, arg0->x, 0.0, arg0->z); -} - void fn_1_7C60(void) { Vec sp1A0; @@ -1689,35 +1607,6 @@ void fn_1_7C60(void) f32 sp134; f32 sp130; f32 sp12C; - f32 sp128; - f32 sp124; - s32 sp120; - f32 sp11C; - f32 sp118; - f32 sp114; - f32 sp110; - f32 sp10C; - f32 sp108; - f32 sp104; - f32 sp100; - f32 spFC; - f32 spF8; - f32 spF4; - f32 spF0; - s32 spEC; - f32 spE8; - f32 spE4; - s32 spE0; - f32 spDC; - f32 spD8; - f32 spD4; - f32 spD0; - f32 spCC; - f32 spC8; - f32 spC4; - f32 spC0; - f32 spBC; - f32 spB8; f32 temp_f20; f32 var_f21; f32 var_f31; @@ -1746,7 +1635,7 @@ void fn_1_7C60(void) } switch (temp_r31->unk30) { default: - HuSetVecF(&sp1A0, fn_1_4E58_0(temp_r31->unk24) / 4.0f, 0.0, -fn_1_4E58_1(temp_r31->unk24) / 4.0f); + HuSetVecF(&sp1A0, fn_1_4E58(temp_r31->unk24, 0) / 4.0f, 0.0, -fn_1_4E58(temp_r31->unk24, 1) / 4.0f); temp_r31->unk60.z = sqrtf((sp1A0.z * sp1A0.z) + ((sp1A0.x * sp1A0.x) + (sp1A0.y * sp1A0.y))); if (temp_r31->unk60.z >= 0.5f) { if (temp_r31->unk60.z >= 10.0f) { @@ -1818,7 +1707,12 @@ void fn_1_7C60(void) temp_f20 = fn_1_1D08(180.0f + temp_f20); temp_f20 = fn_1_1D08(var_f31 - (temp_f20 - var_f31)); var_f31 = fn_1_1D08(atan2d((temp_r30->unk40.x - temp_r31->unk40.x), (temp_r30->unk40.z - temp_r31->unk40.z))); - DummyInline(&sp1A0, &temp_r31->unk7C, &temp_r30->unk7C, sp138, var_f31, temp_f20); + HuSetVecF(&sp1A0, temp_r31->unk7C.x, 0.0, temp_r31->unk7C.z); + fn_1_4C9C(&sp1A0, var_f31, 1.0f - sp138); + HuSetVecF(&temp_r30->unk7C, sp1A0.x, 0.0, sp1A0.z); + HuSetVecF(&sp1A0, temp_r31->unk7C.x, 0.0, temp_r31->unk7C.z); + fn_1_4C9C(&sp1A0, temp_f20, sp138); + HuSetVecF(&temp_r31->unk7C, sp1A0.x, 0.0, sp1A0.z); } fn_1_5838(temp_r31); } @@ -1882,8 +1776,6 @@ void fn_1_7C60(void) Hu3DModelRotSet(temp_r31->unk2, temp_r31->unk54.x, temp_r31->unk54.y, temp_r31->unk54.z); HuPrcVSleep(); } - (void)var_r27; - (void)var_r27; while (lbl_1_bss_794 < 5) { HuPrcVSleep(); }