diff --git a/include/REL/m433Dll.h b/include/REL/m433Dll.h index 5028045a..fc0407db 100644 --- a/include/REL/m433Dll.h +++ b/include/REL/m433Dll.h @@ -1,5 +1,5 @@ -#ifndef M4303LL_H -#define M4303LL_H +#ifndef M430DLL_H +#define M430DLL_H #include "game/object.h" diff --git a/src/REL/m425Dll/main.c b/src/REL/m425Dll/main.c index 9fc806f3..2c2d321c 100644 --- a/src/REL/m425Dll/main.c +++ b/src/REL/m425Dll/main.c @@ -462,9 +462,6 @@ void fn_1_F48(omObjData *object) void fn_1_FA8(omObjData *object) { M425DllUnkBss10Struct *var_r31; - s32 var_ctr; - void *var_r4; - s32 temp_r3; s32 var_r30; s16 *var_r28; s32 var_r27; @@ -582,11 +579,8 @@ void fn_1_14CC(Mtx arg0, float arg8, float arg9, float argA) float fn_1_15EC(float arg8, float arg9) { - float var_f31; - float var_f30; - - var_f30 = 360.0f; - var_f31 = 180.0 * (atan2f(arg9, arg8) / M_PI); + float var_f30 = 360.0f; + float var_f31 = 180.0 * (atan2f(arg9, arg8) / M_PI); if (var_f31 < 0.0f) { var_f31 += var_f30; } @@ -684,6 +678,18 @@ void fn_1_1B40(omObjData *object) int x = 12; int y = 24; char *str = "%f"; + (void)x; + (void)x; + (void)x; + (void)x; + (void)y; + (void)y; + (void)y; + (void)y; + (void)str; + (void)str; + (void)str; + (void)str; print8(x, y, 1.5f, str, sqrtf(fn_1_15EC(object->trans.x, object->trans.y))); } var_r31->unk_38 = var_r31->unk_04 * sind(var_r31->unk_18); diff --git a/src/REL/m438Dll/main.c b/src/REL/m438Dll/main.c index dc82ed96..cb329774 100644 --- a/src/REL/m438Dll/main.c +++ b/src/REL/m438Dll/main.c @@ -119,7 +119,7 @@ typedef struct M438MainWork3 { float unk_170[3]; float unk_17C[3]; u16 unk_188[3]; -} M438MainWork3; /* size = */ +} M438MainWork3; /* size = 0x190 */ typedef struct M438StructBss298 { /* 0x00 */ u8 unk_00; diff --git a/src/REL/m453Dll/main.c b/src/REL/m453Dll/main.c index f72224c2..2c099d2d 100644 --- a/src/REL/m453Dll/main.c +++ b/src/REL/m453Dll/main.c @@ -1630,20 +1630,7 @@ void fn_1_5670(float arg8, float *arg0, float *arg1, float (*arg2)[3], float (*a sp48[var_r30] = arg2[var_r30][var_r29]; sp8[var_r30] = arg3[var_r30][var_r29]; } - var_f30 = arg8; - var_r31 = var_f30; - var_f30 -= var_r31; - var_f31 = arg1[var_r31 + 1] - arg1[var_r31]; - var_f29 = var_f31 * var_f30; - var_f28 = sp48[var_r31] - + (var_f29 - * ((var_f29 * ((3.0f * sp8[var_r31]) + ((var_f29 * (sp8[var_r31 + 1] - sp8[var_r31])) / var_f31))) - + (((sp48[var_r31 + 1] - sp48[var_r31]) / var_f31) - (var_f31 * ((2.0f * sp8[var_r31]) + sp8[var_r31 + 1]))))); - if (var_f31 == 0.0f) { - var_f28 = sp48[var_r31]; - } - var_f27 = var_f28; - arg0[var_r29] = var_f27; + arg0[var_r29] = fn_1_513C(arg8, arg1, sp48, sp8, 3); } } diff --git a/src/REL/option/rumble.c b/src/REL/option/rumble.c index 4a52323d..aeae0f72 100755 --- a/src/REL/option/rumble.c +++ b/src/REL/option/rumble.c @@ -197,12 +197,12 @@ static omObjData *CreateHand(void) return hand; } -static void KillHand(omObjData *hand) +static void KillHand(omObjData *object) { s32 i; for (i = 0; i < 1; i++) { - Hu3DModelKill(hand->model[i]); + Hu3DModelKill(object->model[i]); } } @@ -222,21 +222,21 @@ static omObjData *CreateSystem(void) return system; } -static void KillSystem(omObjData *system) +static void KillSystem(omObjData *object) { s32 i; for (i = 0; i < 1; i++) { - Hu3DModelKill(system->model[i]); + Hu3DModelKill(object->model[i]); } } -static void StartSystemMotion(omObjData *system, s32 rumbleF, BOOL slowF) +static void StartSystemMotion(omObjData *object, s32 rumbleF, BOOL slowF) { - s16 model = system->model[0]; + s16 model = object->model[0]; - Hu3DModelAttrReset(system->model[0], HU3D_MOTATTR_PAUSE); - Hu3DModelAttrReset(system->model[0], HU3D_MOTATTR_LOOP); + Hu3DModelAttrReset(object->model[0], HU3D_MOTATTR_PAUSE); + Hu3DModelAttrReset(object->model[0], HU3D_MOTATTR_LOOP); if (rumbleF) { Hu3DMotionStartEndSet(model, 60.0f, 120.0f); if (slowF) { @@ -267,24 +267,24 @@ static omObjData *CreatePad(void) return pad; } -static void KillPad(omObjData *pad) +static void KillPad(omObjData *object) { s32 i; for (i = 0; i < 1; i++) { - Hu3DModelKill(pad->model[i]); + Hu3DModelKill(object->model[i]); } } -static void ShakePad(omObjData *pad, BOOL on) +static void ShakePad(omObjData *object, BOOL on) { if (on) { - Hu3DModelAttrReset(pad->model[0], HU3D_MOTATTR_PAUSE); - Hu3DModelAttrSet(pad->model[0], HU3D_MOTATTR_LOOP); + Hu3DModelAttrReset(object->model[0], HU3D_MOTATTR_PAUSE); + Hu3DModelAttrSet(object->model[0], HU3D_MOTATTR_LOOP); } else { - Hu3DModelAttrSet(pad->model[0], HU3D_MOTATTR_PAUSE); - Hu3DModelAttrReset(pad->model[0], HU3D_MOTATTR_LOOP); + Hu3DModelAttrSet(object->model[0], HU3D_MOTATTR_PAUSE); + Hu3DModelAttrReset(object->model[0], HU3D_MOTATTR_LOOP); } }