diff --git a/src/REL/m418Dll/main.c b/src/REL/m418Dll/main.c index c2794f39..38b547ca 100644 --- a/src/REL/m418Dll/main.c +++ b/src/REL/m418Dll/main.c @@ -1,4 +1,3 @@ -#include "math.h" #include "ext_math.h" #include "game/chrman.h" #include "game/hsfman.h" @@ -6,17 +5,18 @@ #include "game/objsub.h" #include "game/pad.h" #include "game/wipe.h" +#include "math.h" #include "REL/m418Dll.h" // types typedef struct M418DllUnkStruct2 { - omObjData* unk0; + omObjData *unk0; s32 unk4[4]; } M418DllUnkStruct2; // sizeof 0x14 typedef struct M418DllUnkStruct3 { - omObjData* unk0; + omObjData *unk0; s32 unk4; s32 unk8; s32 unkC; @@ -41,7 +41,7 @@ typedef struct M418DllUnkStruct3 { } M418DllUnkStruct3; // sizeof 0x60 typedef struct M418DllUnkStruct4 { - omObjData* unk0; + omObjData *unk0; f32 unk4; f32 unk8; s32 unkC; @@ -69,7 +69,7 @@ typedef struct M418DllUnkStruct6 { } M418DllUnkStruct6; // sizeof 0x44 typedef struct M418DllWorkStruct { - omObjData* unk0; + omObjData *unk0; Vec unk4; Vec unk10[10]; s32 unk88; @@ -95,18 +95,20 @@ s32 lbl_1_bss_10; s32 lbl_1_bss_C; s32 lbl_1_bss_8; s32 lbl_1_bss_4; -Process* lbl_1_bss_0; +Process *lbl_1_bss_0; // data s32 lbl_1_data_0[2] = { -1, -1 }; s32 lbl_1_data_8 = -1; -void fn_1_0(void) { +void fn_1_0(void) +{ Hu3DGLightCreate(-2500.0f, 5000.0f, 5000.0f, 0.0f, -1.0f, -1.0f, 0xFF, 0xD8, 0xA0); } -void fn_1_74(void) { - M418DllUnkStruct* var_r31 = &lbl_1_bss_1F4; +void fn_1_74(void) +{ + M418DllUnkStruct *var_r31 = &lbl_1_bss_1F4; Vec sp2C = { 0.0f, 1100.0f, 1800.0f }; Vec sp20 = { 0.0f, 600.0f, 600.0f }; @@ -115,15 +117,17 @@ void fn_1_74(void) { var_r31->rot.x++; } -void fn_1_158(s32 arg0, f32 arg8) { - M418DllUnkStruct* var_r31 = &lbl_1_bss_1F4; - +void fn_1_158(s32 arg0, f32 arg8) +{ + M418DllUnkStruct *var_r31 = &lbl_1_bss_1F4; + var_r31->unk3C[arg0] = arg8; } -f32 fn_1_180(s32 arg0) { - M418DllUnkStruct* var_r31 = &lbl_1_bss_1F4; - +f32 fn_1_180(s32 arg0) +{ + M418DllUnkStruct *var_r31 = &lbl_1_bss_1F4; + if (var_r31->unk3C[arg0] != 0.0f) { var_r31->unk3C[arg0] *= -0.9f; if (var_r31->unk3C[arg0] >= -0.5f) { @@ -135,19 +139,21 @@ f32 fn_1_180(s32 arg0) { return var_r31->unk3C[arg0]; } -void fn_1_248(M418DllFunc arg0) { - M418DllUnkStruct* var_r31 = &lbl_1_bss_1F4; - +void fn_1_248(M418DllFunc arg0) +{ + M418DllUnkStruct *var_r31 = &lbl_1_bss_1F4; + var_r31->unk0 = arg0; } -void fn_1_268(omObjData* object) { - M418DllUnkStruct* var_r31 = &lbl_1_bss_1F4; - +void fn_1_268(omObjData *object) +{ + M418DllUnkStruct *var_r31 = &lbl_1_bss_1F4; + if (var_r31->unk0 != NULL) { var_r31->unk0(); } - + Center.x = var_r31->center.x + fn_1_180(0); Center.y = var_r31->center.y + fn_1_180(1); Center.z = var_r31->center.z + fn_1_180(2); @@ -157,8 +163,9 @@ void fn_1_268(omObjData* object) { CZoom = var_r31->zoom; } -void fn_1_500(void) { - M418DllUnkStruct* var_r31; +void fn_1_500(void) +{ + M418DllUnkStruct *var_r31; Hu3DCameraCreate(1); Hu3DCameraViewportSet(1, 0.0f, 0.0f, 640.0f, 480.0f, 0.0f, 1.0f); Hu3DCameraPerspectiveSet(1, 40.0f, 0.1f, 17500.0f, 1.2f); @@ -168,7 +175,8 @@ void fn_1_500(void) { omAddObjEx(lbl_1_bss_0, 0x7FD9, 0, 0, -1, fn_1_268); } -void fn_1_618(void) { +void fn_1_618(void) +{ Vec sp20 = { -1500.0f, 2500.0f, 1000.0f }; Vec sp14 = { 0.0f, 0.0f, 0.0f }; Vec sp8 = { 0.0f, 1.0f, 0.0f }; @@ -178,30 +186,34 @@ void fn_1_618(void) { Hu3DShadowPosSet(&sp20, &sp8, &sp14); } -void fn_1_6DC(s32 arg0) { +void fn_1_6DC(s32 arg0) +{ if (lbl_1_bss_8 == 0) { lbl_1_bss_8 = 1; lbl_1_bss_4 = arg0 * 0x3C; } } -s32 fn_1_714(void) { +s32 fn_1_714(void) +{ s32 var_r31 = 0; - + if (lbl_1_bss_8 == 3) { var_r31 = 1; } return var_r31; } -void fn_1_748(void) { +void fn_1_748(void) +{ if (lbl_1_bss_8 == 2) { lbl_1_bss_8 = 3; lbl_1_bss_4 = 30; } } -void fn_1_780(omObjData* object) { +void fn_1_780(omObjData *object) +{ switch (lbl_1_bss_8) { case 1: if (lbl_1_data_8 == -1) { @@ -230,18 +242,21 @@ void fn_1_780(omObjData* object) { } } -s32 fn_1_950(s32 arg0) { - +s32 fn_1_950(s32 arg0) +{ + if ((rand8() % arg0) == 0) { return 1; - } else { + } + else { return 0; } } -void fn_1_998(omObjData* object) { +void fn_1_998(omObjData *object) +{ s32 var_r31; - M418DllUnkStruct2* var_r30 = &lbl_1_bss_1E0; + M418DllUnkStruct2 *var_r30 = &lbl_1_bss_1E0; for (var_r31 = 0; var_r31 < 3; var_r31++) { switch (var_r30->unk4[var_r31]) { @@ -262,9 +277,10 @@ void fn_1_998(omObjData* object) { } } -void fn_1_AA8(omObjData* object) { +void fn_1_AA8(omObjData *object) +{ Mtx sp10; - char* sp8[2] = { "scene02-dai1_null", "scene02-dai2_null1" }; + char *sp8[2] = { "scene02-dai1_null", "scene02-dai2_null1" }; s32 var_r31; for (var_r31 = 0; var_r31 < 2; var_r31++) { @@ -274,13 +290,14 @@ void fn_1_AA8(omObjData* object) { object->func = fn_1_998; } -void fn_1_B4C(omObjData* object) { +void fn_1_B4C(omObjData *object) +{ s32 sp8[3] = { 0x310021, 0x310022, 0x310023 }; s32 var_r30; object->model[0] = Hu3DModelCreateFile(0x310011); Hu3DModelShadowMapSet(object->model[0]); - + for (var_r30 = 1; var_r30 < 4; var_r30++) { object->model[var_r30] = Hu3DModelCreateFile(sp8[var_r30 - 1]); object->motion[var_r30] = Hu3DMotionIDGet(object->model[var_r30]); @@ -290,7 +307,7 @@ void fn_1_B4C(omObjData* object) { } object->model[4] = Hu3DModelCreateFile(0x310016); object->model[5] = Hu3DModelCreateFile(0x310018); - + for (var_r30 = 6; var_r30 < 8; var_r30++) { object->model[var_r30] = Hu3DModelCreateFile(0x310026); object->motion[var_r30] = Hu3DMotionIDGet(object->model[var_r30]); @@ -298,7 +315,7 @@ void fn_1_B4C(omObjData* object) { Hu3DModelLayerSet(object->model[var_r30], 1); fn_1_ABC4(object, var_r30, var_r30, 0, 1); } - + for (var_r30 = 8; var_r30 < 11; var_r30++) { object->model[var_r30] = Hu3DModelCreateFile(0x31002A); object->motion[var_r30] = Hu3DJointMotion(object->model[var_r30], HuDataSelHeapReadNum(0x31002E, MEMORY_DEFAULT_NUM, HEAP_DATA)); @@ -308,24 +325,26 @@ void fn_1_B4C(omObjData* object) { object->func = fn_1_AA8; } -void fn_1_E74(omObjData* object) { +void fn_1_E74(omObjData *object) +{ Mtx sp18; f32 var_f31; - M418DllUnkStruct4* temp_r30; - M418DllUnkStruct4* temp_r29; - M418DllUnkStruct3* temp_r28; - M418DllUnkStruct4* temp_r27; - M418DllUnkStruct6* temp_r26; - HsfObject* temp_r25; - ModelData* temp_r24; + M418DllUnkStruct4 *temp_r30; + M418DllUnkStruct4 *temp_r29; + M418DllUnkStruct3 *temp_r28; + M418DllUnkStruct4 *temp_r27; + M418DllUnkStruct6 *temp_r26; + HsfObject *temp_r25; + ModelData *temp_r24; temp_r26 = &lbl_1_bss_3EC; temp_r28 = &lbl_1_bss_26C[temp_r26->unk0]; temp_r30 = &lbl_1_bss_170[object->work[0]]; if (object->work[1] == 0) { fn_1_ABC4(object, 2, 2, 0, 2); - } else if (object->work[1] == 1) { + } + else if (object->work[1] == 1) { Hu3DModelAttrReset(object->model[3], 1); Hu3DModelAttrReset(object->model[4], 1); Hu3DModelAttrReset(object->model[5], 1); @@ -335,14 +354,16 @@ void fn_1_E74(omObjData* object) { fn_1_ABC4(object, 4, 4, 0, 1); object->work[1] = 2; lbl_1_bss_240[5] = HuAudFXPlay(0x5D6); - } else if (object->work[1] == 2) { + } + else if (object->work[1] == 2) { if (Hu3DMotionEndCheck(object->model[3]) != 0) { object->work[1] = 3; object->work[2] = 0; temp_r30->unkC = 1; HuAudFXFadeOut(lbl_1_bss_240[5], 0x3E8); } - } else if (object->work[1] == 3) { + } + else if (object->work[1] == 3) { temp_r29 = &lbl_1_bss_170[object->work[0]]; temp_r29->unkC = 2; temp_r29->unk4 += 1.0f; @@ -353,7 +374,8 @@ void fn_1_E74(omObjData* object) { if (temp_r29->unk10 == 1) { object->work[1] = 5; temp_r29->unk8 = 0.0f; - } else { + } + else { HuAudFXPlay(0x5D2); object->work[1] = 4; Hu3DModelObjMtxGet(object->model[0], "taihou-null4", sp18); @@ -363,21 +385,24 @@ void fn_1_E74(omObjData* object) { } temp_r29->unkC = 3; } - } else if (object->work[1] == 4) { - if ((Hu3DMotionEndCheck(object->model[5]) != 0) || (temp_r30->unk10 == 1)) { - object->work[1] = 99; - Hu3DModelAttrSet(object->model[3], 1); - Hu3DModelAttrSet(object->model[4], 1); - Hu3DModelAttrSet(object->model[5], 1); - } - } else if (object->work[1] == 5 || object->work[1] == 6) { + } + else if (object->work[1] == 4) { + if ((Hu3DMotionEndCheck(object->model[5]) != 0) || (temp_r30->unk10 == 1)) { + object->work[1] = 99; + Hu3DModelAttrSet(object->model[3], 1); + Hu3DModelAttrSet(object->model[4], 1); + Hu3DModelAttrSet(object->model[5], 1); + } + } + else if (object->work[1] == 5 || object->work[1] == 6) { if (temp_r30->unk8 > 1.7f) { temp_r30->unk8 = 1.7f; } if (object->work[1] == 5) { var_f31 = temp_r30->unk8 * temp_r30->unk8 * (temp_r30->unk8 >= 0.0f ? -3.5f : 3.5f); temp_r30->unk4 += var_f31; - } else { + } + else { var_f31 = temp_r30->unk8 * temp_r30->unk8 * (temp_r30->unk8 >= 0.0f ? -1.25f : 1.25f); temp_r30->unk4 += var_f31; } @@ -388,7 +413,8 @@ void fn_1_E74(omObjData* object) { fn_1_158(1, 4.0f); omVibrate(temp_r28->unk4, 0xC, 6, 6); HuAudFXPlay(0x5DA); - } else { + } + else { if ((temp_r30->unk4 <= 0.0f) && (object->work[1] == 6)) { Hu3DModelObjMtxGet(object->model[0], "taihou-null4", sp18); Hu3DModelPosSet(object->model[6], sp18[0][3], sp18[1][3], sp18[2][3]); @@ -405,7 +431,7 @@ void fn_1_E74(omObjData* object) { temp_r30->unk8 += 0.11f; } if (object->work[1] != 0) { - const char* sp8[4] = { "doukasen-null_B", "doukasen-null_A", "doukasen-null_X", "doukasen-null_Y" }; + const char *sp8[4] = { "doukasen-null_B", "doukasen-null_A", "doukasen-null_X", "doukasen-null_Y" }; Hu3DModelObjMtxGet(object->model[3], sp8[object->work[0]], sp18); Hu3DModelPosSet(object->model[4], sp18[0][3], sp18[1][3], sp18[2][3]); } @@ -416,12 +442,13 @@ void fn_1_E74(omObjData* object) { temp_r24->rot.x = temp_r27->unk4; } -void fn_1_14F0(omObjData* arg0) { +void fn_1_14F0(omObjData *arg0) +{ s32 var_r30 = arg0->work[0]; s32 sp28[4] = { 0x310012, 0x310013, 0x310015, 0x310014 }; s32 sp18[4] = { 0x310019, 0x31001A, 0x31001B, 0x31001C }; s32 sp8[4] = { 0x31001D, 0x31001E, 0x31001F, 0x310020 }; - + arg0->model[0] = Hu3DModelCreateFile(0x310010); omSetTra(arg0, -540.0f + (360.0f * var_r30), 115.0f, -900.0f); arg0->model[1] = Hu3DModelCreateFile(sp28[var_r30]); @@ -449,8 +476,9 @@ void fn_1_14F0(omObjData* arg0) { arg0->func = fn_1_E74; } -void fn_1_18AC(omObjData* object) { - M418DllUnkStruct4* var_r31; +void fn_1_18AC(omObjData *object) +{ + M418DllUnkStruct4 *var_r31; var_r31 = &lbl_1_bss_11C[object->work[0]]; if (var_r31->unk14 == 0.0f) { @@ -458,8 +486,9 @@ void fn_1_18AC(omObjData* object) { } } -s32 fn_1_18FC(omObjData* object, Vec arg1, f32 arg8, f32 arg9) { - M418DllUnkStruct4* temp_r30; +s32 fn_1_18FC(omObjData *object, Vec arg1, f32 arg8, f32 arg9) +{ + M418DllUnkStruct4 *temp_r30; s32 var_r28; f32 var_f31; f32 var_f30; @@ -476,7 +505,8 @@ s32 fn_1_18FC(omObjData* object, Vec arg1, f32 arg8, f32 arg9) { var_f27 = sqrtf((var_f31 * var_f31) + (var_f30 * var_f30)); if (var_f27 <= 15.0f) { var_f31 = var_f30 = 0.0f; - } else { + } + else { var_f31 = 55.0f * (var_f31 / var_f27); var_f30 = 55.0f * (var_f30 / var_f27); } @@ -486,7 +516,8 @@ s32 fn_1_18FC(omObjData* object, Vec arg1, f32 arg8, f32 arg9) { var_f27 = arg9 * (sqrtf((var_f31 * var_f31) + (var_f30 * var_f30)) / 72.0f); if (var_f27 >= arg9) { var_f27 = arg9; - } else if (var_f27 <= 1.0f) { + } + else if (var_f27 <= 1.0f) { var_f31 = var_f30 = var_f27 = 0.0f; var_r28 = 1; } @@ -501,7 +532,8 @@ s32 fn_1_18FC(omObjData* object, Vec arg1, f32 arg8, f32 arg9) { if (object->rot.y - var_f26 < -180.0f) { object->rot.y += 360.0f; } - } else { + } + else { if (object->rot.y - var_f26 > 180.0f) { object->rot.y -= 360.0f; } @@ -529,32 +561,27 @@ s32 fn_1_18FC(omObjData* object, Vec arg1, f32 arg8, f32 arg9) { } if (var_f27 > 0.0f) { fn_1_AD14(object, 0, 1, 10, 1); - } else { + } + else { fn_1_AD14(object, 0, 0, 10, 1); } return var_r28; } -s32 fn_1_20B0(omObjData* object, Vec arg1, f32 arg8, f32 arg9, s32 arg2) { - if (arg2 == 1) fn_1_18AC(object); +s32 fn_1_20B0(omObjData *object, Vec arg1, f32 arg8, f32 arg9, s32 arg2) +{ + if (arg2 == 1) + fn_1_18AC(object); return fn_1_18FC(object, arg1, arg9, arg8); } -Vec lbl_1_data_8C[9] = { - { 140.0f, 0.0f, -90.0f }, - { -200.0f, 0.0f, 50.0f }, - { -300.0f, 0.0f, -150.0f }, - { -250.0f, 0.0f, -500.0f }, - { 0.0f, 0.0f, 150.0f }, - { 700.0f, 0.0f, 50.0f }, - { 1000.0f, -50.0f, 500.0f }, - { 1000.0f, -100.0f, 500.0f }, - { 1000.0f, -150.0f, 500.0f } -}; +Vec lbl_1_data_8C[9] = { { 140.0f, 0.0f, -90.0f }, { -200.0f, 0.0f, 50.0f }, { -300.0f, 0.0f, -150.0f }, { -250.0f, 0.0f, -500.0f }, + { 0.0f, 0.0f, 150.0f }, { 700.0f, 0.0f, 50.0f }, { 1000.0f, -50.0f, 500.0f }, { 1000.0f, -100.0f, 500.0f }, { 1000.0f, -150.0f, 500.0f } }; -s32 fn_1_2178(omObjData* object) { +s32 fn_1_2178(omObjData *object) +{ s32 var_r30; - + switch (object->work[1]) { case 1: object->work[2] = 0; @@ -580,7 +607,7 @@ s32 fn_1_2178(omObjData* object) { object->work[2] = 0; } break; - + case 2: object->work[2] = 0; object->work[1] = 0x14; @@ -646,10 +673,11 @@ s32 fn_1_2178(omObjData* object) { } } -void fn_1_2894(omObjData* object) { +void fn_1_2894(omObjData *object) +{ Mtx sp3C; Mtx spC; - M418DllUnkStruct6* sp8; + M418DllUnkStruct6 *sp8; f32 temp_f31; sp8 = &lbl_1_bss_3EC; @@ -661,7 +689,8 @@ void fn_1_2894(omObjData* object) { fn_1_2178(object); } -void fn_1_29A0(omObjData* object) { +void fn_1_29A0(omObjData *object) +{ u32 temp_r30; temp_r30 = object->work[0]; @@ -683,8 +712,9 @@ void fn_1_29A0(omObjData* object) { object->func = fn_1_2894; } -void fn_1_2BC4(Vec arg0) { - M418DllWorkStruct* var_r31 = &lbl_1_bss_68; +void fn_1_2BC4(Vec arg0) +{ + M418DllWorkStruct *var_r31 = &lbl_1_bss_68; var_r31->unk4.x = arg0.x; var_r31->unk4.y = arg0.y; var_r31->unk4.z = arg0.z; @@ -692,9 +722,10 @@ void fn_1_2BC4(Vec arg0) { var_r31->unk0->work[0] = 1; } -void fn_1_2C0C(omObjData* object) { - ModelData* temp_r28; - M418DllWorkStruct* var_r31 = &lbl_1_bss_68; +void fn_1_2C0C(omObjData *object) +{ + ModelData *temp_r28; + M418DllWorkStruct *var_r31 = &lbl_1_bss_68; s32 var_r30; switch (object->work[0]) { @@ -726,7 +757,8 @@ void fn_1_2C0C(omObjData* object) { } } -void fn_1_3054(omObjData* object) { +void fn_1_3054(omObjData *object) +{ s32 var_r30; for (var_r30 = 1; var_r30 < 11; var_r30++) { @@ -738,8 +770,9 @@ void fn_1_3054(omObjData* object) { object->func = fn_1_2C0C; } -void fn_1_3138(void) { - M418DllUnkStruct3* temp_r31; +void fn_1_3138(void) +{ + M418DllUnkStruct3 *temp_r31; s32 var_r30; for (var_r30 = 0; var_r30 < 4; var_r30++) { @@ -748,13 +781,15 @@ void fn_1_3138(void) { temp_r31->unk8 = GWPlayerCfg[temp_r31->unk4].group; if (temp_r31->unk8 == 0) { temp_r31->unk8 = 0; - } else { + } + else { temp_r31->unk8 = 1; } temp_r31->unkC = GWPlayerCfg[temp_r31->unk4].iscom; if (temp_r31->unkC != 0) { temp_r31->unk10 = GWPlayerCfg[temp_r31->unk4].diff; - } else { + } + else { temp_r31->unk10 = 0; } temp_r31->unk14 = GWPlayerCfg[temp_r31->unk4].character; @@ -762,23 +797,16 @@ void fn_1_3138(void) { } } -char* lbl_1_data_1C0[8] = { - "test11_tex_we-itemhook-r", - "test11_tex_we-itemhook-r", - "test11_tex_we-itemhook-r", - "test11_tex_we-itemhook-r", - "test11_tex_we-itemhook-r", - "test11_tex_we-itemhook-r", - "test11_tex_we-itemhook-r", - "test11_tex_we-itemhook-r" -}; +char *lbl_1_data_1C0[8] = { "test11_tex_we-itemhook-r", "test11_tex_we-itemhook-r", "test11_tex_we-itemhook-r", "test11_tex_we-itemhook-r", + "test11_tex_we-itemhook-r", "test11_tex_we-itemhook-r", "test11_tex_we-itemhook-r", "test11_tex_we-itemhook-r" }; -void fn_1_3240(omObjData* object) { +void fn_1_3240(omObjData *object) +{ Mtx sp14; Vec sp8; - M418DllUnkStruct3* temp_r28; - ModelData* temp_r30; - M418DllWorkStruct* var_r29; + M418DllUnkStruct3 *temp_r28; + ModelData *temp_r30; + M418DllWorkStruct *var_r29; temp_r30 = &Hu3DData[object->model[11]]; temp_r28 = &lbl_1_bss_26C[object->work[0]]; @@ -801,12 +829,13 @@ void fn_1_3240(omObjData* object) { Hu3DModelAttrSet(object->model[11], 1); object->work[1] = object->work[2] = 0; } - break; + break; } } -void fn_1_3408(omObjData* object) { - M418DllUnkStruct3* temp_r31; +void fn_1_3408(omObjData *object) +{ + M418DllUnkStruct3 *temp_r31; temp_r31 = &lbl_1_bss_26C[object->work[0]]; if (temp_r31->unk1C == 0) { @@ -814,14 +843,15 @@ void fn_1_3408(omObjData* object) { } } -void fn_1_3444(omObjData* object, Vec arg1, f32 arg8, f32 arg9) { +void fn_1_3444(omObjData *object, Vec arg1, f32 arg8, f32 arg9) +{ s32 sp24; f32 sp20; f32 sp1C; f32 sp18; - M418DllUnkStruct3* temp_r28; - M418DllUnkStruct3* temp_r30; - + M418DllUnkStruct3 *temp_r28; + M418DllUnkStruct3 *temp_r30; + f32 var_f31; f32 var_f30; f32 temp_f29; @@ -842,7 +872,8 @@ void fn_1_3444(omObjData* object, Vec arg1, f32 arg8, f32 arg9) { var_f24 = sqrtf((var_f31 * var_f31) + (var_f30 * var_f30)); if (var_f24 <= 30.0f) { var_f31 = var_f30 = 0.0f; - } else { + } + else { var_f31 = 55.0f * (var_f31 / var_f24); var_f30 = 55.0f * (var_f30 / var_f24); } @@ -852,7 +883,8 @@ void fn_1_3444(omObjData* object, Vec arg1, f32 arg8, f32 arg9) { var_f24 = arg9 * (sqrtf((var_f31 * var_f31) + (var_f30 * var_f30)) / 72.0f); if (var_f24 >= arg9) { var_f24 = arg9; - } else if (var_f24 <= 1.0f) { + } + else if (var_f24 <= 1.0f) { var_f31 = var_f30 = var_f24 = 0.0f; } if (var_f31 != 0.0f || var_f30 != 0.0f || arg8 >= 0.0f) { @@ -866,7 +898,8 @@ void fn_1_3444(omObjData* object, Vec arg1, f32 arg8, f32 arg9) { if (object->rot.y - var_f23 < -180.0f) { object->rot.y += 360.0f; } - } else { + } + else { if (object->rot.y - var_f23 > 180.0f) { object->rot.y -= 360.0f; } @@ -881,7 +914,8 @@ void fn_1_3444(omObjData* object, Vec arg1, f32 arg8, f32 arg9) { sp18 = object->trans.z - (50.0 * sind(object->rot.y - 90.0f)); for (var_r29 = 0; var_r29 < 4; var_r29++) { - if (var_r29 == object->work[0]) continue; + if (var_r29 == object->work[0]) + continue; temp_r28 = &lbl_1_bss_26C[var_r29]; temp_f29 = temp_r28->unk0->trans.x; temp_f28 = temp_r28->unk0->trans.z; @@ -925,8 +959,9 @@ void fn_1_3444(omObjData* object, Vec arg1, f32 arg8, f32 arg9) { fn_1_AD14(object, 0, 0, 10, 1); } -void fn_1_3EB0(omObjData* object, Vec arg1, f32 arg8, f32 arg9) { - M418DllUnkStruct3* temp_r30; +void fn_1_3EB0(omObjData *object, Vec arg1, f32 arg8, f32 arg9) +{ + M418DllUnkStruct3 *temp_r30; s32 sp10; f32 var_f31; f32 var_f30; @@ -943,7 +978,8 @@ void fn_1_3EB0(omObjData* object, Vec arg1, f32 arg8, f32 arg9) { var_f27 = sqrtf((var_f31 * var_f31) + (var_f30 * var_f30)); if (var_f27 <= 30.0f) { var_f31 = var_f30 = 0.0f; - } else { + } + else { var_f31 = 55.0f * (var_f31 / var_f27); var_f30 = 55.0f * (var_f30 / var_f27); } @@ -953,7 +989,8 @@ void fn_1_3EB0(omObjData* object, Vec arg1, f32 arg8, f32 arg9) { var_f27 = arg9 * (sqrtf((var_f31 * var_f31) + (var_f30 * var_f30)) / 72.0f); if (var_f27 >= arg9) { var_f27 = arg9; - } else if (var_f27 <= 1.0f) { + } + else if (var_f27 <= 1.0f) { var_f31 = var_f30 = var_f27 = 0.0f; } if (var_f31 != 0.0f || var_f30 != 0.0f || arg8 >= 0.0f) { @@ -967,7 +1004,8 @@ void fn_1_3EB0(omObjData* object, Vec arg1, f32 arg8, f32 arg9) { if (object->rot.y - var_f26 < -180.0f) { object->rot.y += 360.0f; } - } else { + } + else { if (object->rot.y - var_f26 > 180.0f) { object->rot.y -= 360.0f; } @@ -995,29 +1033,28 @@ void fn_1_3EB0(omObjData* object, Vec arg1, f32 arg8, f32 arg9) { } if (temp_r30->unk1C != 0) { fn_1_AD14(object, 0, 3, 10, 0); - } else if (var_f27 >= 6.75f) { + } + else if (var_f27 >= 6.75f) { fn_1_AD14(object, 0, 2, 10, 1); - } else if (var_f27 > 0.0f) { + } + else if (var_f27 > 0.0f) { fn_1_AD14(object, 0, 1, 10, 1); - } else { + } + else { fn_1_AD14(object, 0, 0, 10, 1); } } -s32 lbl_1_data_1E0[4][2] = { - { -1, 127 }, - { -1, 127 }, - { -1, 127 }, - { -1, 127 } -}; +s32 lbl_1_data_1E0[4][2] = { { -1, 127 }, { -1, 127 }, { -1, 127 }, { -1, 127 } }; -void fn_1_46C4(omObjData* object) { +void fn_1_46C4(omObjData *object) +{ s32 sp8; - M418DllUnkStruct3* temp_r31; + M418DllUnkStruct3 *temp_r31; sp8 = 0; temp_r31 = &lbl_1_bss_26C[object->work[0]]; - + switch (temp_r31->unk24) { case 0: temp_r31->unk2C = object->scale.x; @@ -1090,15 +1127,16 @@ void fn_1_46C4(omObjData* object) { } } -void fn_1_4C84(omObjData* object) { +void fn_1_4C84(omObjData *object) +{ Mtx sp14; Vec sp8; f32 var_f31; - M418DllUnkStruct3* temp_r26; - M418DllWorkStruct* var_r27; - M418DllUnkStruct3* temp_r30; - ModelData* temp_r28; - ModelData* temp_r29; + M418DllUnkStruct3 *temp_r26; + M418DllWorkStruct *var_r27; + M418DllUnkStruct3 *temp_r30; + ModelData *temp_r28; + ModelData *temp_r29; s32 temp_r0; u32 temp_r3; @@ -1108,7 +1146,8 @@ void fn_1_4C84(omObjData* object) { temp_r29 = &Hu3DData[object->model[12]]; if ((temp_r30->unk14 == 7) || (temp_r30->unk14 == 5)) { temp_r29->rot.y = -object->rot.y - 360.0f; - } else { + } + else { temp_r29->rot.y = -object->rot.y - 90.0f; } temp_r29->scale.x = 0.35f * temp_r30->unk3C; @@ -1119,20 +1158,21 @@ void fn_1_4C84(omObjData* object) { fn_1_46C4(object); } -void fn_1_4F60(omObjData* object) { - M418DllUnkStruct3* temp_r30; +void fn_1_4F60(omObjData *object) +{ + M418DllUnkStruct3 *temp_r30; temp_r30 = &lbl_1_bss_26C[object->work[0]]; object->model[0] = CharModelCreate(temp_r30->unk14, 2); - object->motion[0] = CharModelMotionCreate(temp_r30->unk14, 0x5F0000); - object->motion[1] = CharModelMotionCreate(temp_r30->unk14, 0x5F0002); - object->motion[2] = CharModelMotionCreate(temp_r30->unk14, 0x5F0003); - object->motion[3] = CharModelMotionCreate(temp_r30->unk14, 0x5F0073); - object->motion[4] = CharModelMotionCreate(temp_r30->unk14, 0x5F0074); - object->motion[5] = CharModelMotionCreate(temp_r30->unk14, 0x5F0017); - object->motion[6] = CharModelMotionCreate(temp_r30->unk14, 0x5F0018); - object->motion[7] = CharModelMotionCreate(temp_r30->unk14, 0x5F001B); - object->motion[8] = CharModelMotionCreate(temp_r30->unk14, 0x5F002A); + object->motion[0] = CharModelMotionCreate(temp_r30->unk14, DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x00)); + object->motion[1] = CharModelMotionCreate(temp_r30->unk14, DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x02)); + object->motion[2] = CharModelMotionCreate(temp_r30->unk14, DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x03)); + object->motion[3] = CharModelMotionCreate(temp_r30->unk14, DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x73)); + object->motion[4] = CharModelMotionCreate(temp_r30->unk14, DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x74)); + object->motion[5] = CharModelMotionCreate(temp_r30->unk14, DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x17)); + object->motion[6] = CharModelMotionCreate(temp_r30->unk14, DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x18)); + object->motion[7] = CharModelMotionCreate(temp_r30->unk14, DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x1B)); + object->motion[8] = CharModelMotionCreate(temp_r30->unk14, DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x2A)); object->motion[9] = Hu3DJointMotion(object->model[0], HuDataSelHeapReadNum(temp_r30->unk14 + 0x310000, 0x10000000, HEAP_DATA)); object->motion[10] = Hu3DJointMotion(object->model[0], HuDataSelHeapReadNum(temp_r30->unk14 + 0x310008, 0x10000000, HEAP_DATA)); object->model[1] = Hu3DModelCreateFile(0x310017); @@ -1161,8 +1201,9 @@ void fn_1_4F60(omObjData* object) { object->func = fn_1_4C84; } -void fn_1_5358(void) { - M418DllUnkStruct* var_r31 = &lbl_1_bss_1F4; +void fn_1_5358(void) +{ + M418DllUnkStruct *var_r31 = &lbl_1_bss_1F4; Vec sp2C = { 0.0f, 1100.0f, 1800.0f }; Vec sp20 = { 0.0f, 600.0f, 600.0f }; @@ -1171,13 +1212,13 @@ void fn_1_5358(void) { var_r31->rot.x++; } -void fn_1_543C(void) { +void fn_1_543C(void) +{ M418DllUnkStruct sp38; - M418DllUnkStruct* var_r31 = &lbl_1_bss_1F4; - Vec sp2C = { -180.0f, 500.0f, 440.0f }; + M418DllUnkStruct *var_r31 = &lbl_1_bss_1F4; + Vec sp2C = { -180.0f, 500.0f, 440.0f }; Vec sp20 = { -180.0f, 330.0f, -760.0f }; - fn_1_B104(&sp38, sp2C, sp20); fn_1_B41C(&sp38); sp38.center.x = 0.0f; @@ -1187,11 +1228,12 @@ void fn_1_543C(void) { fn_1_DC10(var_r31, &sp38, var_r31->unk48++, 30.0f, 10.0f); } -void fn_1_558C(void) { +void fn_1_558C(void) +{ M418DllUnkStruct sp38; - M418DllUnkStruct* var_r31 = &lbl_1_bss_1F4; + M418DllUnkStruct *var_r31 = &lbl_1_bss_1F4; Vec sp2C = { 0.0f, 1100.0f, 1800.0f }; - Vec sp20 = { 0.0f, 600.0f, 600.0f }; + Vec sp20 = { 0.0f, 600.0f, 600.0f }; fn_1_B104(&sp38, sp2C, sp20); fn_1_B41C(&sp38); @@ -1199,8 +1241,9 @@ void fn_1_558C(void) { fn_1_CBF8(var_r31, &sp38, var_r31->unk48++, 30.0f, 10.0f); } -void fn_1_56AC(s32 arg0) { - M418DllUnkStruct* var_r28 = &lbl_1_bss_1F4; +void fn_1_56AC(s32 arg0) +{ + M418DllUnkStruct *var_r28 = &lbl_1_bss_1F4; fn_1_B458(var_r28); switch (arg0) { case 0: @@ -1215,11 +1258,12 @@ void fn_1_56AC(s32 arg0) { } } -void fn_1_5768(s32 arg0) { +void fn_1_5768(s32 arg0) +{ s32 var_r31; - M418DllUnkStruct4* var_r30; - M418DllUnkStruct* var_r26; - + M418DllUnkStruct4 *var_r30; + M418DllUnkStruct *var_r26; + for (var_r31 = 0; var_r31 < 3; var_r31++) { var_r30 = &lbl_1_bss_170[var_r31]; var_r30->unkC = 0; @@ -1228,9 +1272,10 @@ void fn_1_5768(s32 arg0) { fn_1_56AC(0); } -s32 fn_1_57E4(s32 arg0) { - M418DllUnkStruct4* temp_r31; - M418DllUnkStruct* var_r25; +s32 fn_1_57E4(s32 arg0) +{ + M418DllUnkStruct4 *temp_r31; + M418DllUnkStruct *var_r25; s32 var_r29; s32 var_r30; @@ -1240,14 +1285,16 @@ s32 fn_1_57E4(s32 arg0) { if (temp_r31->unkC == 0) { if ((rand8() % 5) == 0) { var_r29 = 1; - } else { + } + else { var_r29 = 0; } if (var_r29 || (fn_1_B0C8(&lbl_1_bss_50, 0) >= 0x41)) { HuAudFXPlay(0x5D3); temp_r31->unkC = 1; } - } else { + } + else { temp_r31->unk4 += 5.0f; if (temp_r31->unk4 >= 90.0f) { temp_r31->unk4 = 90.0f; @@ -1260,28 +1307,26 @@ s32 fn_1_57E4(s32 arg0) { } if (fn_1_B0C8(&lbl_1_bss_50, 1) != 0) { return fn_1_AF38(&lbl_1_bss_50); - } else { + } + else { return 0; } } -s32 lbl_1_data_200[16] = { - 0x310000, 0x310001, 0x310002, 0x310003, - 0x310004, 0x310005, 0x310006, 0x310007, - 0x310008, 0x310009, 0x31000A, 0x31000B, - 0x31000C, 0x31000D, 0x31000E, 0x31000F -}; +s32 lbl_1_data_200[16] = { 0x310000, 0x310001, 0x310002, 0x310003, 0x310004, 0x310005, 0x310006, 0x310007, 0x310008, 0x310009, 0x31000A, 0x31000B, + 0x31000C, 0x31000D, 0x31000E, 0x31000F }; Vec lbl_1_data_240[3] = { { -540.0f, 225.0f, -900.0f }, { -180.0f, 225.0f, -900.0f }, - { 180.0f, 225.0f, -900.0f }, + { 180.0f, 225.0f, -900.0f }, }; -void fn_1_5970(s32 arg0) { - M418DllUnkStruct3* temp_r30; - M418DllUnkStruct6* temp_r29; - M418DllUnkStruct4* temp_r28; +void fn_1_5970(s32 arg0) +{ + M418DllUnkStruct3 *temp_r30; + M418DllUnkStruct6 *temp_r29; + M418DllUnkStruct4 *temp_r28; s32 var_r31; temp_r29 = &lbl_1_bss_3EC; @@ -1291,7 +1336,7 @@ void fn_1_5970(s32 arg0) { omSetTra(temp_r30->unk0, lbl_1_data_240[var_r31].x, lbl_1_data_240[var_r31].y, lbl_1_data_240[var_r31].z - 50.0f); temp_r30->unk4C = 0; } - + for (var_r31 = 0; var_r31 < 3; var_r31++) { temp_r28 = &lbl_1_bss_170[var_r31]; temp_r28->unkC = 0; @@ -1300,28 +1345,30 @@ void fn_1_5970(s32 arg0) { Vec lbl_1_data_264[4] = { { -355.0f, 0.0f, -680.0f }, - { 5.0f, 0.0f, -680.0f }, - { 365.0f, 0.0f, -680.0f }, + { 5.0f, 0.0f, -680.0f }, + { 365.0f, 0.0f, -680.0f }, }; -s32 fn_1_5A6C(s32 arg0) { +s32 fn_1_5A6C(s32 arg0) +{ s32 var_r31; - M418DllUnkStruct3* temp_r30; - M418DllUnkStruct4* temp_r29; - M418DllUnkStruct3* temp_r28; - M418DllUnkStruct6* temp_r27; + M418DllUnkStruct3 *temp_r30; + M418DllUnkStruct4 *temp_r29; + M418DllUnkStruct3 *temp_r28; + M418DllUnkStruct6 *temp_r27; s32 var_r26; - omObjData* temp_r25; + omObjData *temp_r25; s32 var_r24; - M418DllUnkStruct* temp_r20; + M418DllUnkStruct *temp_r20; - temp_r27 = &lbl_1_bss_3EC; + temp_r27 = &lbl_1_bss_3EC; for (var_r31 = 0; var_r31 < 3; var_r31++) { temp_r30 = &lbl_1_bss_26C[temp_r27->unk4[var_r31]]; if (temp_r30->unk4C == 0) { if ((rand8() % 5) == 0) { var_r26 = 1; - } else { + } + else { var_r26 = 0; } if (var_r26 || (fn_1_B0C8(&lbl_1_bss_50, 0) >= 5)) { @@ -1333,25 +1380,28 @@ s32 fn_1_5A6C(s32 arg0) { } HuAudCharVoicePlay(temp_r30->unk14, 0x122); } - } else { + } + else { fn_1_3EB0(temp_r30->unk0, lbl_1_data_264[var_r31], 0.0f, 9.0f); } } if (fn_1_B0C8(&lbl_1_bss_50, 0) >= 0x3C) { - + for (var_r31 = 0; var_r31 < 3; var_r31++) { temp_r29 = &lbl_1_bss_170[var_r31]; if (temp_r29->unkC == 0) { if ((rand8() % 5) == 0) { var_r24 = 1; - } else { + } + else { var_r24 = 0; } if ((var_r24 != 0) || (fn_1_B0C8(&lbl_1_bss_50, 0) >= 0x41)) { HuAudFXPlay(0x5D3); temp_r29->unkC = 1; } - } else { + } + else { temp_r29->unk4 -= 2.5f; if (temp_r29->unk4 <= 0.0f) { temp_r29->unk4 = 0.0f; @@ -1368,17 +1418,15 @@ s32 fn_1_5A6C(s32 arg0) { return 0; } -M418DllUnkStruct8 lbl_1_data_294[3] = { - { fn_1_5768, fn_1_57E4, 0x5A }, - { fn_1_5970, fn_1_5A6C, 0xB4 }, - { NULL, NULL, -1 } -}; +M418DllUnkStruct8 lbl_1_data_294[3] = { { fn_1_5768, fn_1_57E4, 0x5A }, { fn_1_5970, fn_1_5A6C, 0xB4 }, { NULL, NULL, -1 } }; -void fn_1_5D28(void) { +void fn_1_5D28(void) +{ fn_1_AEDC(&lbl_1_bss_50, &lbl_1_data_294[0]); } -s32 fn_1_5D58(void) { +s32 fn_1_5D58(void) +{ s32 var_r31; var_r31 = 0; @@ -1392,8 +1440,9 @@ s32 fn_1_5D58(void) { return var_r31; } -s32 fn_1_5DF0(omObjData* object, s32 arg1) { - M418DllUnkStruct3* temp_r31; +s32 fn_1_5DF0(omObjData *object, s32 arg1) +{ + M418DllUnkStruct3 *temp_r31; s32 var_r30; temp_r31 = &lbl_1_bss_26C[object->work[0]]; @@ -1421,7 +1470,8 @@ s32 fn_1_5DF0(omObjData* object, s32 arg1) { } break; } - } else { + } + else { if ((HuPadBtnDown[temp_r31->unk18] & PAD_BUTTON_A) != 0) { var_r30 = 1; } @@ -1438,11 +1488,12 @@ s32 fn_1_5DF0(omObjData* object, s32 arg1) { return var_r30; } -s32 fn_1_6038(omObjData* object, s32 arg1) { - M418DllUnkStruct3* temp_r30; - M418DllUnkStruct4* temp_r28; - M418DllUnkStruct4* temp_r27; - M418DllUnkStruct4* temp_r26; +s32 fn_1_6038(omObjData *object, s32 arg1) +{ + M418DllUnkStruct3 *temp_r30; + M418DllUnkStruct4 *temp_r28; + M418DllUnkStruct4 *temp_r27; + M418DllUnkStruct4 *temp_r26; s32 var_r29; s32 var_r31; @@ -1482,11 +1533,13 @@ s32 fn_1_6038(omObjData* object, s32 arg1) { break; } } - } else { + } + else { temp_r28->unk18s = 1; } } - } else { + } + else { if ((HuPadBtnDown[temp_r30->unk18] & PAD_BUTTON_A) != 0) { var_r31 = 1; } @@ -1503,7 +1556,8 @@ s32 fn_1_6038(omObjData* object, s32 arg1) { temp_r26 = &lbl_1_bss_170[var_r31]; if (temp_r26->unk18s == 1) { var_r31 = -1; - } else { + } + else { temp_r26->unk18s = 1; } } @@ -1511,8 +1565,9 @@ s32 fn_1_6038(omObjData* object, s32 arg1) { return var_r31; } -void fn_1_6314(void) { - M418DllUnkStruct* var_r31 = &lbl_1_bss_1F4; +void fn_1_6314(void) +{ + M418DllUnkStruct *var_r31 = &lbl_1_bss_1F4; Vec sp2C = { 0.0f, 1100.0f, 1800.0f }; Vec sp20 = { 0.0f, 600.0f, 600.0f }; @@ -1521,8 +1576,9 @@ void fn_1_6314(void) { var_r31->rot.x++; } -void fn_1_63F8(void) { - M418DllUnkStruct* var_r31 = &lbl_1_bss_1F4; +void fn_1_63F8(void) +{ + M418DllUnkStruct *var_r31 = &lbl_1_bss_1F4; M418DllUnkStruct sp38; Vec sp2C = { 0.0f, 1800.0f, 480.0f }; Vec sp20 = { 0.0f, 600.0f, 250.0f }; @@ -1533,33 +1589,27 @@ void fn_1_63F8(void) { fn_1_BEAC(var_r31, &sp38, var_r31->unk48++, 120.0f, 10.0f); } -void fn_1_6510(void) { - M418DllUnkStruct* var_r31 = &lbl_1_bss_1F4; +void fn_1_6510(void) +{ + M418DllUnkStruct *var_r31 = &lbl_1_bss_1F4; M418DllUnkStruct sp38; Vec sp2C = { 0.0f, 980.0f, 1330.0f }; Vec sp20 = { 0.0f, 480.0f, 130.0f }; - + fn_1_B104(&sp38, sp2C, sp20); fn_1_B41C(&sp38); fn_1_BEAC(var_r31, &sp38, var_r31->unk48++, 30.0f, 10.0f); } -Vec lbl_1_data_2B8[8] = { - { -540.0f, 225.0f, -900.0f }, - { -180.0f, 225.0f, -900.0f }, - { 180.0f, 225.0f, -900.0f }, - { 540.0f, 225.0f, -900.0f }, - { -360.0f, 0.0f, -680.0f }, - { 0.0f, 0.0f, -680.0f }, - { 360.0f, 0.0f, -680.0f }, - { 0.0f, 0.0f, 0.0f } -}; +Vec lbl_1_data_2B8[8] = { { -540.0f, 225.0f, -900.0f }, { -180.0f, 225.0f, -900.0f }, { 180.0f, 225.0f, -900.0f }, { 540.0f, 225.0f, -900.0f }, + { -360.0f, 0.0f, -680.0f }, { 0.0f, 0.0f, -680.0f }, { 360.0f, 0.0f, -680.0f }, { 0.0f, 0.0f, 0.0f } }; -void fn_1_6618(void) { +void fn_1_6618(void) +{ M418DllUnkStruct sp8; - M418DllUnkStruct3* temp_r31; - M418DllUnkStruct* var_r30; - M418DllUnkStruct6* var_r29; + M418DllUnkStruct3 *temp_r31; + M418DllUnkStruct *var_r30; + M418DllUnkStruct6 *var_r29; var_r29 = &lbl_1_bss_3EC; temp_r31 = &lbl_1_bss_26C[var_r29->unk0]; @@ -1574,9 +1624,10 @@ void fn_1_6618(void) { fn_1_CBF8(var_r30, &sp8, var_r30->unk48++, 30.0f, 5.0f); } -void fn_1_6740(s32 arg0) { - M418DllUnkStruct* var_r27 = &lbl_1_bss_1F4; - +void fn_1_6740(s32 arg0) +{ + M418DllUnkStruct *var_r27 = &lbl_1_bss_1F4; + fn_1_B458(var_r27); switch (arg0) { case 0: @@ -1594,20 +1645,21 @@ void fn_1_6740(s32 arg0) { } } -void fn_1_6808(s32 arg0) { +void fn_1_6808(s32 arg0) +{ s32 var_r31; - M418DllUnkStruct6* var_r30 = &lbl_1_bss_3EC; - M418DllUnkStruct3* var_r29; - M418DllUnkStruct4* var_r28; - M418DllUnkStruct* var_r23; + M418DllUnkStruct6 *var_r30 = &lbl_1_bss_3EC; + M418DllUnkStruct3 *var_r29; + M418DllUnkStruct4 *var_r28; + M418DllUnkStruct *var_r23; HuAudAUXVolSet(0x40, 0x40); - + for (var_r31 = 0; var_r31 < 3; var_r31++) { var_r29 = &lbl_1_bss_26C[var_r30->unk4[var_r31]]; var_r29->unk4C = -1; } - + for (var_r31 = 0; var_r31 < 3; var_r31++) { var_r28 = &lbl_1_bss_11C[var_r31]; fn_1_ABC4(var_r28->unk0, 0, 3, 30, 1); @@ -1616,29 +1668,25 @@ void fn_1_6808(s32 arg0) { lbl_1_bss_8 = 1; lbl_1_bss_4 = 0x12C; } - + fn_1_6740(0); } -Vec lbl_1_data_318[4] = { - { -540.0f, 115.0f, -700.0f }, - { -180.0f, 115.0f, -700.0f }, - { 180.0f, 115.0f, -700.0f }, - { 540.0f, 115.0f, -700.0f } -}; +Vec lbl_1_data_318[4] = { { -540.0f, 115.0f, -700.0f }, { -180.0f, 115.0f, -700.0f }, { 180.0f, 115.0f, -700.0f }, { 540.0f, 115.0f, -700.0f } }; -s32 fn_1_6914(s32 arg0) { +s32 fn_1_6914(s32 arg0) +{ Vec sp14; - M418DllUnkStruct3* temp_r31; - M418DllUnkStruct3* temp_r30; + M418DllUnkStruct3 *temp_r31; + M418DllUnkStruct3 *temp_r30; s32 var_r29; s32 temp_r27; - M418DllUnkStruct6* var_r26; - M418DllUnkStruct4* var_r25; - M418DllUnkStruct* var_r18; + M418DllUnkStruct6 *var_r26; + M418DllUnkStruct4 *var_r25; + M418DllUnkStruct *var_r18; var_r26 = &lbl_1_bss_3EC; - + for (var_r29 = 0; var_r29 < 3; var_r29++) { temp_r31 = &lbl_1_bss_26C[var_r26->unk4[var_r29]]; temp_r27 = fn_1_B0C8(&lbl_1_bss_38, 0); @@ -1660,7 +1708,7 @@ s32 fn_1_6914(s32 arg0) { } } } - + for (var_r29 = 0; var_r29 < 3; var_r29++) { var_r25 = &lbl_1_bss_11C[var_r29]; var_r25->unk0->rot.y += 1.2f; @@ -1674,10 +1722,11 @@ s32 fn_1_6914(s32 arg0) { return 0; } -void fn_1_6DCC(s32 arg0) { +void fn_1_6DCC(s32 arg0) +{ s32 var_r31; - M418DllUnkStruct4* temp_r30; - + M418DllUnkStruct4 *temp_r30; + for (var_r31 = 0; var_r31 < 3; var_r31++) { temp_r30 = &lbl_1_bss_11C[var_r31]; temp_r30->unk0->rot.y = 0.0f; @@ -1686,20 +1735,22 @@ void fn_1_6DCC(s32 arg0) { fn_1_6740(2); } -s32 fn_1_6E6C(s32 arg0) { +s32 fn_1_6E6C(s32 arg0) +{ if (fn_1_B0C8(&lbl_1_bss_38, 1) != 0) { return fn_1_AF38(&lbl_1_bss_38); } return 0; } -void fn_1_6EB4(s32 arg0) { - M418DllUnkStruct6* var_r31 = &lbl_1_bss_3EC; +void fn_1_6EB4(s32 arg0) +{ + M418DllUnkStruct6 *var_r31 = &lbl_1_bss_3EC; s32 var_r30; - M418DllUnkStruct3* temp_r29; + M418DllUnkStruct3 *temp_r29; var_r31->unk34 = 0; - + for (var_r30 = 0; var_r30 < 3; var_r30++) { temp_r29 = &lbl_1_bss_26C[var_r31->unk4[var_r30]]; if (temp_r29->unk4C == -1) { @@ -1709,12 +1760,13 @@ void fn_1_6EB4(s32 arg0) { } } -s32 fn_1_6F38(s32 arg0) { - M418DllUnkStruct3* temp_r31; - M418DllUnkStruct2* temp_r29; - M418DllUnkStruct6* temp_r28; - M418DllUnkStruct2* temp_r27; - +s32 fn_1_6F38(s32 arg0) +{ + M418DllUnkStruct3 *temp_r31; + M418DllUnkStruct2 *temp_r29; + M418DllUnkStruct6 *temp_r28; + M418DllUnkStruct2 *temp_r27; + s32 var_r26; s32 var_r30; f32 var_f31; @@ -1725,14 +1777,15 @@ s32 fn_1_6F38(s32 arg0) { if (temp_r28->unk34 == 0) { return fn_1_B034(&lbl_1_bss_38, 9); } - + for (var_r30 = 0; var_r30 < 3; var_r30++) { temp_r31 = &lbl_1_bss_26C[temp_r28->unk4[var_r30]]; if (temp_r31->unk4C == -1) { if (temp_r29->unk4[var_r30] == 0) { if ((rand8() % 10) == 0) { var_r26 = 1; - } else { + } + else { var_r26 = 0; } if ((var_r26 != 0) || (fn_1_B0C8(&lbl_1_bss_38, 0) >= 10)) { @@ -1744,17 +1797,13 @@ s32 fn_1_6F38(s32 arg0) { temp_r31->unk50 = fn_1_B0C8(&lbl_1_bss_38, 0); omVibrate(temp_r31->unk4, 0xC, 6, 6); } - } else if (fn_1_B0C8(&lbl_1_bss_38, 0) >= (temp_r31->unk50 + 0x1E)) { + } + else if (fn_1_B0C8(&lbl_1_bss_38, 0) >= (temp_r31->unk50 + 0x1E)) { temp_r31->unk0->trans.y -= 15.0f; } if (fn_1_B0C8(&lbl_1_bss_38, 0) >= (temp_r31->unk50 + 0x3C)) { var_f31 = fn_1_AA30(-200.0f, -110.0f, fn_1_B0C8(&lbl_1_bss_38, 0) - (temp_r31->unk50 + 0x3C), 90.0f); - Hu3DModelPosSet( - temp_r29->unk0->model[var_r30 + 8], - -350.0f + (360.0f * var_r30), - var_f31, - -660.0f - ); + Hu3DModelPosSet(temp_r29->unk0->model[var_r30 + 8], -350.0f + (360.0f * var_r30), var_f31, -660.0f); Hu3DModelRotSet(temp_r29->unk0->model[var_r30 + 8], 0.0f, 0.0f, 20.0f); } } @@ -1766,17 +1815,19 @@ s32 fn_1_6F38(s32 arg0) { return 1; } return fn_1_B034(&lbl_1_bss_38, 9); - } else { + } + else { return 0; } } -void fn_1_7294(s32 arg0) {} +void fn_1_7294(s32 arg0) { } -s32 fn_1_7298(s32 arg0) { - M418DllUnkStruct3* temp_r31; - M418DllUnkStruct4* temp_r30; - M418DllUnkStruct6* temp_r29; +s32 fn_1_7298(s32 arg0) +{ + M418DllUnkStruct3 *temp_r31; + M418DllUnkStruct4 *temp_r30; + M418DllUnkStruct6 *temp_r29; temp_r29 = &lbl_1_bss_3EC; temp_r31 = &lbl_1_bss_26C[temp_r29->unk0]; @@ -1794,33 +1845,38 @@ s32 fn_1_7298(s32 arg0) { temp_r30->unk0->rot.y = -50.0f; } } - } else if (fn_1_B0C8(&lbl_1_bss_38, 0) == 0x3C) { + } + else if (fn_1_B0C8(&lbl_1_bss_38, 0) == 0x3C) { HuAudFXPlay(0x40); fn_1_ABC4(temp_r30->unk0, 0, 2, 0xA, 0); fn_1_AD14(temp_r31->unk0, 0, 0, 0xA, 1); Hu3DMotionOverlaySet(temp_r31->unk0->model[0], temp_r31->unk0->motion[9]); Hu3DMotionOverlaySpeedSet(temp_r31->unk0->model[0], 1.0f); lbl_1_bss_240[8] = HuAudFXPlay(0x5D9); - } else if (fn_1_B0C8(&lbl_1_bss_38, 0) <= 0xAA) { + } + else if (fn_1_B0C8(&lbl_1_bss_38, 0) <= 0xAA) { if (fn_1_B0C8(&lbl_1_bss_38, 0) >= 0x5A) { temp_r31->unk3C += 0.025f; if (temp_r31->unk3C >= 1.0f) { temp_r31->unk3C = 1.0f; } } - } else { + } + else { Hu3DMotionOverlaySpeedSet(temp_r31->unk0->model[0], -1.0f); } if (fn_1_B0C8(&lbl_1_bss_38, 1) != 0) { return fn_1_AF38(&lbl_1_bss_38); - } else { + } + else { return 0; } } -void fn_1_7570(s32 arg0) { - M418DllUnkStruct6* var_r31 = &lbl_1_bss_3EC; - M418DllUnkStruct3* var_r30 = &lbl_1_bss_26C[var_r31->unk0]; +void fn_1_7570(s32 arg0) +{ + M418DllUnkStruct6 *var_r31 = &lbl_1_bss_3EC; + M418DllUnkStruct3 *var_r30 = &lbl_1_bss_26C[var_r31->unk0]; var_r30->unk4C = -1; if (lbl_1_bss_8 == 0) { lbl_1_bss_8 = 1; @@ -1828,11 +1884,12 @@ void fn_1_7570(s32 arg0) { } } -s32 fn_1_75E4(s32 arg0) { +s32 fn_1_75E4(s32 arg0) +{ Mtx sp38; Mtx sp8; - M418DllUnkStruct3* temp_r31; - M418DllUnkStruct6* var_r30; + M418DllUnkStruct3 *temp_r31; + M418DllUnkStruct6 *var_r30; s32 var_r29; var_r30 = &lbl_1_bss_3EC; @@ -1860,14 +1917,16 @@ s32 fn_1_75E4(s32 arg0) { Hu3DMotionSpeedSet(temp_r31->unk0->model[13], 2.0f); fn_1_ABC4(temp_r31->unk0, 0xD, 0xD, 0, 0); return fn_1_AF38(&lbl_1_bss_38); - } else { + } + else { return 0; } } -void fn_1_77F8(s32 arg0) { - M418DllUnkStruct6* var_r31; - M418DllUnkStruct3* var_r30; +void fn_1_77F8(s32 arg0) +{ + M418DllUnkStruct6 *var_r31; + M418DllUnkStruct3 *var_r30; var_r31 = &lbl_1_bss_3EC; var_r30 = &lbl_1_bss_26C[var_r31->unk0]; @@ -1876,9 +1935,10 @@ void fn_1_77F8(s32 arg0) { } } -s32 fn_1_7860(s32 arg0) { - M418DllUnkStruct3* temp_r31; - M418DllUnkStruct6* temp_r30; +s32 fn_1_7860(s32 arg0) +{ + M418DllUnkStruct3 *temp_r31; + M418DllUnkStruct6 *temp_r30; temp_r30 = &lbl_1_bss_3EC; temp_r31 = &lbl_1_bss_26C[temp_r30->unk0]; @@ -1890,11 +1950,9 @@ s32 fn_1_7860(s32 arg0) { if (fn_1_B0C8(&lbl_1_bss_38, 1) != 0) { return fn_1_AF38(&lbl_1_bss_38); } - } else { - temp_r31->unk0->rot.y = fn_1_A940( - 180.0f, 200.0f - (10.0f * temp_r31->unk4C), - fn_1_B0C8(&lbl_1_bss_38, 0), 10.0f - ); + } + else { + temp_r31->unk0->rot.y = fn_1_A940(180.0f, 200.0f - (10.0f * temp_r31->unk4C), fn_1_B0C8(&lbl_1_bss_38, 0), 10.0f); if (fn_1_B0C8(&lbl_1_bss_38, 0) == 0xA) { Hu3DMotionOverlaySet(temp_r31->unk0->model[0], temp_r31->unk0->motion[10]); Hu3DMotionOverlaySpeedSet(temp_r31->unk0->model[0], 1.0f); @@ -1909,12 +1967,13 @@ s32 fn_1_7860(s32 arg0) { return 0; } -void fn_1_7A68(s32 arg0) { - M418DllUnkStruct6* temp_r31; - M418DllUnkStruct3* temp_r30; - M418DllUnkStruct4* temp_r29; +void fn_1_7A68(s32 arg0) +{ + M418DllUnkStruct6 *temp_r31; + M418DllUnkStruct3 *temp_r30; + M418DllUnkStruct4 *temp_r29; s32 var_r28; - M418DllUnkStruct3* temp_r27; + M418DllUnkStruct3 *temp_r27; s32 var_r26; var_r26 = 0; @@ -1922,7 +1981,7 @@ void fn_1_7A68(s32 arg0) { temp_r30 = &lbl_1_bss_26C[temp_r31->unk0]; if (temp_r30->unk4C != -1) { temp_r31->unk10[0] = temp_r31->unk10[1] = temp_r31->unk10[2] = -1; - + for (var_r28 = 0; var_r28 < 3; var_r28++) { temp_r27 = &lbl_1_bss_26C[temp_r31->unk4[var_r28]]; if (temp_r30->unk4C == temp_r27->unk4C) { @@ -1938,15 +1997,16 @@ void fn_1_7A68(s32 arg0) { } } -s32 fn_1_7B68(s32 arg0) { +s32 fn_1_7B68(s32 arg0) +{ Mtx sp8; - M418DllUnkStruct3* temp_r31; - M418DllUnkStruct6* temp_r30; - M418DllUnkStruct3* temp_r29; - M418DllUnkStruct4* temp_r28; + M418DllUnkStruct3 *temp_r31; + M418DllUnkStruct6 *temp_r30; + M418DllUnkStruct3 *temp_r29; + M418DllUnkStruct4 *temp_r28; s32 var_r27; s32 var_r26; - M418DllUnkStruct* temp_r21; + M418DllUnkStruct *temp_r21; var_r26 = -1; temp_r30 = &lbl_1_bss_3EC; @@ -1959,11 +2019,11 @@ s32 fn_1_7B68(s32 arg0) { fn_1_6740(3); } if (temp_r28->unkC == 3) { - + for (var_r27 = 0; var_r27 < 3; var_r27++) { if (temp_r30->unk10[var_r27] != -1) { temp_r31 = &lbl_1_bss_26C[temp_r30->unk10[var_r27]]; - Hu3DModelObjMtxGet(*temp_r28->unk0->model, "taihou-null4", (f32 (*)[4]) &sp8[0]); + Hu3DModelObjMtxGet(*temp_r28->unk0->model, "taihou-null4", (f32(*)[4]) & sp8[0]); omSetTra(temp_r31->unk0, sp8[0][3], sp8[1][3] - 25.0f, 50.0f + sp8[2][3]); omSetRot(temp_r31->unk0, 0.0f, 180.0f, 0.0f); fn_1_AD14(temp_r31->unk0, 0, 8, 0, 2); @@ -1974,7 +2034,7 @@ s32 fn_1_7B68(s32 arg0) { } temp_r31->unk30 = var_r26++; temp_r31->unk28 = 0.0f; - omVibrate((s16) temp_r29->unk4, 0xC, 4, 2); + omVibrate((s16)temp_r29->unk4, 0xC, 4, 2); } } return fn_1_AF38(&lbl_1_bss_38); @@ -1982,31 +2042,33 @@ s32 fn_1_7B68(s32 arg0) { return 0; } -void fn_1_7D80(s32 arg0) { +void fn_1_7D80(s32 arg0) +{ s32 var_r31; - M418DllUnkStruct3* temp_r30; - M418DllUnkStruct6* temp_r29; - M418DllUnkStruct4* temp_r28; + M418DllUnkStruct3 *temp_r30; + M418DllUnkStruct6 *temp_r29; + M418DllUnkStruct4 *temp_r28; temp_r29 = &lbl_1_bss_3EC; temp_r30 = &lbl_1_bss_26C[temp_r29->unk0]; temp_r30->unk0->rot.y = 180.0f; temp_r30->unk3C = 0.0f; - + for (var_r31 = 0; var_r31 < 3; var_r31++) { temp_r28 = &lbl_1_bss_11C[var_r31]; temp_r28->unk0->rot.y = 0.0f; } } -s32 fn_1_7E24(s32 arg0) { - M418DllUnkStruct6* var_r31; +s32 fn_1_7E24(s32 arg0) +{ + M418DllUnkStruct6 *var_r31; s32 var_r30; s32 var_r29; - M418DllUnkStruct4* var_r28; - M418DllUnkStruct4* var_r27; - M418DllUnkStruct4* var_r26; - M418DllUnkStruct3* var_r25; + M418DllUnkStruct4 *var_r28; + M418DllUnkStruct4 *var_r27; + M418DllUnkStruct4 *var_r26; + M418DllUnkStruct3 *var_r25; var_r29 = 0; var_r31 = &lbl_1_bss_3EC; @@ -2020,7 +2082,7 @@ s32 fn_1_7E24(s32 arg0) { return 1; } var_r31->unk38++; - + for (var_r30 = 0; var_r30 < 3; var_r30++) { var_r25 = &lbl_1_bss_26C[var_r31->unk4[var_r30]]; if (var_r25->unk4C != -1) { @@ -2029,36 +2091,40 @@ s32 fn_1_7E24(s32 arg0) { } if (var_r29 == 0) { return 1; - } else { + } + else { return fn_1_AF38(&lbl_1_bss_38); } } -void fn_1_7F1C(s32 arg0) { - M418DllUnkStruct6* var_r31; - M418DllUnkStruct4* var_r30; - M418DllUnkStruct4* var_r29; - M418DllUnkStruct4* var_r28; +void fn_1_7F1C(s32 arg0) +{ + M418DllUnkStruct6 *var_r31; + M418DllUnkStruct4 *var_r30; + M418DllUnkStruct4 *var_r29; + M418DllUnkStruct4 *var_r28; var_r31 = &lbl_1_bss_3EC; var_r30 = &lbl_1_bss_11C[0]; var_r29 = &lbl_1_bss_11C[1]; var_r28 = &lbl_1_bss_11C[2]; if (var_r31->unk38 == 1) { - var_r30->unk0->work[1] = 3; - var_r29->unk0->work[1] = 2; - var_r28->unk0->work[1] = 1; - } else if (var_r31->unk38 == 2) { - var_r30->unk0->work[1] = 0; - var_r29->unk0->work[1] = 3; - var_r28->unk0->work[1] = 2; + var_r30->unk0->work[1] = 3; + var_r29->unk0->work[1] = 2; + var_r28->unk0->work[1] = 1; + } + else if (var_r31->unk38 == 2) { + var_r30->unk0->work[1] = 0; + var_r29->unk0->work[1] = 3; + var_r28->unk0->work[1] = 2; } } -s32 fn_1_7FD4(s32 arg0) { - M418DllUnkStruct3* temp_r31; - M418DllUnkStruct6* temp_r30; - M418DllUnkStruct4* temp_r29; +s32 fn_1_7FD4(s32 arg0) +{ + M418DllUnkStruct3 *temp_r31; + M418DllUnkStruct6 *temp_r30; + M418DllUnkStruct4 *temp_r29; temp_r30 = &lbl_1_bss_3EC; temp_r31 = &lbl_1_bss_26C[temp_r30->unk0]; @@ -2069,7 +2135,8 @@ s32 fn_1_7FD4(s32 arg0) { if (fn_1_B0C8(&lbl_1_bss_38, 0) == 120) { return fn_1_B034(&lbl_1_bss_38, 9); } - } else { + } + else { temp_r29 = &lbl_1_bss_170[temp_r31->unk4C]; if (temp_r29->unk10 != 0) { if (fn_1_B0C8(&lbl_1_bss_38, 0) == 210) { @@ -2078,7 +2145,8 @@ s32 fn_1_7FD4(s32 arg0) { if (fn_1_B0C8(&lbl_1_bss_38, 0) == 300) { return fn_1_B034(&lbl_1_bss_38, 9); } - } else { + } + else { if (fn_1_B0C8(&lbl_1_bss_38, 0) == 30) { fn_1_6740(2); } @@ -2091,12 +2159,13 @@ s32 fn_1_7FD4(s32 arg0) { return 0; } -void fn_1_81A0(s32 arg0) {} +void fn_1_81A0(s32 arg0) { } -s32 fn_1_81A4(s32 arg0) { - M418DllUnkStruct3* temp_r31; - M418DllUnkStruct4* temp_r30; - M418DllUnkStruct6* temp_r29; +s32 fn_1_81A4(s32 arg0) +{ + M418DllUnkStruct3 *temp_r31; + M418DllUnkStruct4 *temp_r30; + M418DllUnkStruct6 *temp_r29; temp_r29 = &lbl_1_bss_3EC; temp_r31 = &lbl_1_bss_26C[temp_r29->unk0]; @@ -2114,49 +2183,45 @@ s32 fn_1_81A4(s32 arg0) { temp_r30->unk0->rot.y = -50.0f; } } - } else if (fn_1_B0C8(&lbl_1_bss_38, 0) == 0x3C) { + } + else if (fn_1_B0C8(&lbl_1_bss_38, 0) == 0x3C) { HuAudFXPlay(0x40); fn_1_ABC4(temp_r30->unk0, 0, 2, 0xA, 0); fn_1_AD14(temp_r31->unk0, 0, 0, 0xA, 1); Hu3DMotionOverlaySet(temp_r31->unk0->model[0], temp_r31->unk0->motion[9]); Hu3DMotionOverlaySpeedSet(temp_r31->unk0->model[0], 1.0f); lbl_1_bss_240[8] = HuAudFXPlay(0x5D9); - } else if (fn_1_B0C8(&lbl_1_bss_38, 0) <= 0xAA) { + } + else if (fn_1_B0C8(&lbl_1_bss_38, 0) <= 0xAA) { if (fn_1_B0C8(&lbl_1_bss_38, 0) >= 0x5A) { temp_r31->unk3C += 0.025f; if (temp_r31->unk3C >= 1.0f) { temp_r31->unk3C = 1.0f; } } - } else { + } + else { Hu3DMotionOverlaySpeedSet(temp_r31->unk0->model[0], -1.0f); } if (fn_1_B0C8(&lbl_1_bss_38, 1) != 0) { return fn_1_B034(&lbl_1_bss_38, 4); - } else { + } + else { return 0; } } -M418DllUnkStruct8 lbl_1_data_348[11] = { - { fn_1_6808, fn_1_6914, 300 }, - { fn_1_6DCC, fn_1_6E6C, 60 }, - { fn_1_6EB4, fn_1_6F38, 180 }, - { fn_1_7294, fn_1_7298, 300 }, - { fn_1_7570, fn_1_75E4, 300 }, - { fn_1_77F8, fn_1_7860, 60 }, - { fn_1_7A68, fn_1_7B68, 180 }, - { fn_1_7D80, fn_1_7E24, -1 }, - { fn_1_7F1C, fn_1_7FD4, 300 }, - { fn_1_81A0, fn_1_81A4, 240 }, - { NULL, NULL, -1 } -}; +M418DllUnkStruct8 lbl_1_data_348[11] = { { fn_1_6808, fn_1_6914, 300 }, { fn_1_6DCC, fn_1_6E6C, 60 }, { fn_1_6EB4, fn_1_6F38, 180 }, + { fn_1_7294, fn_1_7298, 300 }, { fn_1_7570, fn_1_75E4, 300 }, { fn_1_77F8, fn_1_7860, 60 }, { fn_1_7A68, fn_1_7B68, 180 }, + { fn_1_7D80, fn_1_7E24, -1 }, { fn_1_7F1C, fn_1_7FD4, 300 }, { fn_1_81A0, fn_1_81A4, 240 }, { NULL, NULL, -1 } }; -void fn_1_8480(void) { +void fn_1_8480(void) +{ fn_1_AEDC(&lbl_1_bss_38, &lbl_1_data_348[0]); } -s32 fn_1_84B0(void) { +s32 fn_1_84B0(void) +{ s32 var_r31; var_r31 = 0; @@ -2170,9 +2235,10 @@ s32 fn_1_84B0(void) { return var_r31; } -void fn_1_8548(void) { +void fn_1_8548(void) +{ M418DllUnkStruct sp38; - M418DllUnkStruct* var_r31 = &lbl_1_bss_1F4; + M418DllUnkStruct *var_r31 = &lbl_1_bss_1F4; Vec sp2C = { 0.0f, 1100.0f, 1800.0f }; Vec sp20 = { 0.0f, 600.0f, 600.0f }; @@ -2182,12 +2248,13 @@ void fn_1_8548(void) { fn_1_CBF8(var_r31, &sp38, var_r31->unk48++, 60.0f, 10.0f); } -void fn_1_8668(void) { +void fn_1_8668(void) +{ M418DllUnkStruct sp8; f32 temp_f1; - M418DllUnkStruct* var_r31 = &lbl_1_bss_1F4; - + M418DllUnkStruct *var_r31 = &lbl_1_bss_1F4; + sp8.center.x = sp8.center.y = 0.0f; sp8.center.z = -500.0f; sp8.rot.x = -20.0f; @@ -2196,9 +2263,10 @@ void fn_1_8668(void) { fn_1_CBF8(var_r31, &sp8, var_r31->unk48++, 10.0f, 5.0f); } -void fn_1_8728(void) { +void fn_1_8728(void) +{ M418DllUnkStruct sp8; - M418DllUnkStruct* var_r31; + M418DllUnkStruct *var_r31; var_r31 = &lbl_1_bss_1F4; @@ -2212,43 +2280,46 @@ void fn_1_8728(void) { fn_1_CBF8(var_r31, &sp8, var_r31->unk48++, 10.0f, 5.0f); } -void fn_1_87D0(s32 arg0) { - M418DllUnkStruct* var_r31; +void fn_1_87D0(s32 arg0) +{ + M418DllUnkStruct *var_r31; var_r31 = &lbl_1_bss_1F4; - + fn_1_B458(var_r31); switch (arg0) { - case 0: - fn_1_248(fn_1_8548); - break; - case 1: - fn_1_248(fn_1_8668); - break; - case 2: - fn_1_248(fn_1_8728); - break; + case 0: + fn_1_248(fn_1_8548); + break; + case 1: + fn_1_248(fn_1_8668); + break; + case 2: + fn_1_248(fn_1_8728); + break; } } -void fn_1_888C(s32 arg0) { +void fn_1_888C(s32 arg0) +{ HuAudAUXVolSet(-1, -1); } -s32 fn_1_88B4(s32 arg0) { +s32 fn_1_88B4(s32 arg0) +{ s32 var_r31; - M418DllUnkStruct6* var_r30; + M418DllUnkStruct6 *var_r30; s32 var_r29; - M418DllUnkStruct3* var_r28; - M418DllUnkStruct3* var_r27; - M418DllUnkStruct* var_r23; + M418DllUnkStruct3 *var_r28; + M418DllUnkStruct3 *var_r27; + M418DllUnkStruct *var_r23; var_r29 = 5; var_r30 = &lbl_1_bss_3EC; - + fn_1_87D0(0); lbl_1_bss_10 = 0; - + for (var_r31 = 0; var_r31 < 3; var_r31++) { var_r28 = &lbl_1_bss_26C[var_r30->unk4[var_r31]]; if (var_r28->unk4C != -1) { @@ -2263,12 +2334,13 @@ s32 fn_1_88B4(s32 arg0) { fn_1_B034(&lbl_1_bss_20, var_r29); } -void fn_1_89B0(s32 arg0) { - M418DllUnkStruct6* var_r31; +void fn_1_89B0(s32 arg0) +{ + M418DllUnkStruct6 *var_r31; s32 var_r30; s32 var_r29; - M418DllUnkStruct3* temp_r28; - M418DllUnkStruct4* temp_r27; + M418DllUnkStruct3 *temp_r28; + M418DllUnkStruct4 *temp_r27; var_r29 = 0; var_r31 = &lbl_1_bss_3EC; @@ -2279,7 +2351,7 @@ void fn_1_89B0(s32 arg0) { var_r29++; } } - switch (var_r29) { /* irregular */ + switch (var_r29) { /* irregular */ case 1: var_r31->unk1C[0] = 3; break; @@ -2302,17 +2374,18 @@ void fn_1_89B0(s32 arg0) { if (var_r31->unk28[1] == var_r31->unk28[2]) { var_r31->unk28[2] = -1; } - + for (var_r30 = 0; var_r30 < 4; var_r30++) { temp_r27 = &lbl_1_bss_170[var_r30]; temp_r27->unkC = 0; } } -s32 fn_1_8B14(s32 arg0) { - M418DllUnkStruct4* temp_r31; +s32 fn_1_8B14(s32 arg0) +{ + M418DllUnkStruct4 *temp_r31; s32 var_r30; - M418DllUnkStruct6* var_r29; + M418DllUnkStruct6 *var_r29; s32 var_r28; var_r29 = &lbl_1_bss_3EC; @@ -2322,14 +2395,16 @@ s32 fn_1_8B14(s32 arg0) { if (temp_r31->unkC == 0) { if ((rand8() % 5) == 0) { var_r28 = 1; - } else { + } + else { var_r28 = 0; } if ((var_r28 != 0) || (fn_1_B0C8(&lbl_1_bss_20, 0) >= 5)) { temp_r31->unkC = 1; HuAudFXPlay(0x5D3); } - } else { + } + else { temp_r31->unk4 += 5.0f; if (temp_r31->unk4 >= 90.0f) { temp_r31->unk4 = 90.0f; @@ -2339,16 +2414,18 @@ s32 fn_1_8B14(s32 arg0) { } if (fn_1_B0C8(&lbl_1_bss_20, 1) != 0) { return fn_1_AF38(&lbl_1_bss_20); - } else { + } + else { return 0; } } -void fn_1_8C84(s32 arg0) { - M418DllUnkStruct3* temp_r31; +void fn_1_8C84(s32 arg0) +{ + M418DllUnkStruct3 *temp_r31; s32 var_r30; - M418DllUnkStruct6* temp_r29; - M418DllUnkStruct3* temp_r28; + M418DllUnkStruct6 *temp_r29; + M418DllUnkStruct3 *temp_r28; s32 var_r27; s32 temp_r0; @@ -2368,51 +2445,43 @@ void fn_1_8C84(s32 arg0) { temp_r28->unk0->work[1] = 1; } -Vec lbl_1_data_3CC[4] = { - { -540.0f, 225.0f, -900.0f }, - { -180.0f, 225.0f, -900.0f }, - { 180.0f, 225.0f, -900.0f }, - { 540.0f, 225.0f, -900.0f } -}; +Vec lbl_1_data_3CC[4] = { { -540.0f, 225.0f, -900.0f }, { -180.0f, 225.0f, -900.0f }, { 180.0f, 225.0f, -900.0f }, { 540.0f, 225.0f, -900.0f } }; -Vec lbl_1_data_3FC[6] = { - { -200.0f, 0.0f, -450.0f }, - { 0.0f, 0.0f, -400.0f }, - { 200.0f, 0.0f, -450.0f }, - { 0.0f, 0.0f, -400.0f }, - { -100.0f, 0.0f, -425.0f }, - { 100.0f, 0.0f, -425.0f } -}; +Vec lbl_1_data_3FC[6] = { { -200.0f, 0.0f, -450.0f }, { 0.0f, 0.0f, -400.0f }, { 200.0f, 0.0f, -450.0f }, { 0.0f, 0.0f, -400.0f }, + { -100.0f, 0.0f, -425.0f }, { 100.0f, 0.0f, -425.0f } }; -s32 fn_1_8D70(s32 arg0) { +s32 fn_1_8D70(s32 arg0) +{ s32 sp10; s32 spC; s32 sp8; - M418DllUnkStruct3* temp_r31; - M418DllUnkStruct6* temp_r30; + M418DllUnkStruct3 *temp_r31; + M418DllUnkStruct6 *temp_r30; s32 var_r29; - M418DllUnkStruct3* temp_r28; - M418DllUnkStruct3* temp_r27; - omObjData* var_r26; + M418DllUnkStruct3 *temp_r28; + M418DllUnkStruct3 *temp_r27; + omObjData *var_r26; s32 temp_r3; - void* temp_r4; + void *temp_r4; temp_r30 = &lbl_1_bss_3EC; - + for (var_r29 = 0; var_r29 < 3; var_r29++) { temp_r31 = &lbl_1_bss_26C[temp_r30->unk4[var_r29]]; if (temp_r31->unk4C != -1) { if (temp_r31->unk54 == 0) { if (temp_r31->unk50++ == 0) { temp_r31->unk54 = 1; - omSetTra(temp_r31->unk0, lbl_1_data_3CC[temp_r31->unk4C].x, lbl_1_data_3CC[temp_r31->unk4C].y, lbl_1_data_3CC[temp_r31->unk4C].z - 50.0f); + omSetTra(temp_r31->unk0, lbl_1_data_3CC[temp_r31->unk4C].x, lbl_1_data_3CC[temp_r31->unk4C].y, + lbl_1_data_3CC[temp_r31->unk4C].z - 50.0f); var_r26 = temp_r31->unk0; temp_r28 = &lbl_1_bss_26C[var_r26->work[0]]; if (temp_r28->unk1C == 0) { temp_r28->unk1C = 1; } } - } else if (temp_r31->unk54 == 1) { + } + else if (temp_r31->unk54 == 1) { fn_1_3EB0(temp_r31->unk0, lbl_1_data_3FC[temp_r30->unk1C[temp_r31->unk58]], 0.0f, 12.0f); } } @@ -2423,17 +2492,19 @@ s32 fn_1_8D70(s32 arg0) { } if (fn_1_B0C8(&lbl_1_bss_20, 1) != 0) { return fn_1_AF38(&lbl_1_bss_20); - } else { + } + else { return 0; } } -void fn_1_8F74(s32 arg0) { +void fn_1_8F74(s32 arg0) +{ s32 sp8[3]; - M418DllUnkStruct3* temp_r31; + M418DllUnkStruct3 *temp_r31; s32 var_r30; - M418DllUnkStruct6* var_r29; - M418DllUnkStruct3* temp_r28; + M418DllUnkStruct6 *var_r29; + M418DllUnkStruct3 *temp_r28; var_r29 = &lbl_1_bss_3EC; for (var_r30 = 0; var_r30 < 3; var_r30++) { @@ -2450,17 +2521,20 @@ void fn_1_8F74(s32 arg0) { HuAudSStreamPlay(1); } -s32 fn_1_9094(s32 arg0) { +s32 fn_1_9094(s32 arg0) +{ if (fn_1_B0C8(&lbl_1_bss_20, 1) != 0) { return fn_1_AF38(&lbl_1_bss_20); - } else { + } + else { return 0; } } -void fn_1_90DC(s32 arg0) { - M418DllUnkStruct3* temp_r31; - M418DllUnkStruct6* temp_r30; +void fn_1_90DC(s32 arg0) +{ + M418DllUnkStruct3 *temp_r31; + M418DllUnkStruct6 *temp_r30; temp_r30 = &lbl_1_bss_3EC; temp_r31 = &lbl_1_bss_26C[temp_r30->unk0]; @@ -2468,9 +2542,10 @@ void fn_1_90DC(s32 arg0) { temp_r31->unk0->work[1] = 1; } -s32 fn_1_9140(s32 arg0) { - M418DllUnkStruct6* temp_r31; - M418DllUnkStruct3* temp_r30; +s32 fn_1_9140(s32 arg0) +{ + M418DllUnkStruct6 *temp_r31; + M418DllUnkStruct3 *temp_r30; temp_r31 = &lbl_1_bss_3EC; @@ -2480,22 +2555,24 @@ s32 fn_1_9140(s32 arg0) { } if (fn_1_B0C8(&lbl_1_bss_20, 1) != 0) { return fn_1_AF38(&lbl_1_bss_20); - } else { + } + else { return 0; } } -void fn_1_91E4(s32 arg0) { - M418DllUnkStruct3* temp_r31; +void fn_1_91E4(s32 arg0) +{ + M418DllUnkStruct3 *temp_r31; s32 var_r30; - M418DllUnkStruct6* temp_r29; - M418DllUnkStruct4* temp_r28; + M418DllUnkStruct6 *temp_r29; + M418DllUnkStruct4 *temp_r28; temp_r29 = &lbl_1_bss_3EC; temp_r31 = &lbl_1_bss_26C[temp_r29->unk0]; Hu3DMotionOverlayReset(temp_r31->unk0->model[0]); fn_1_ABC4(temp_r31->unk0, 0, 5, 10, 0); - + for (var_r30 = 0; var_r30 < 3; var_r30++) { temp_r28 = &lbl_1_bss_11C[var_r30]; fn_1_ABC4(temp_r28->unk0, 0, 3, 10, 1); @@ -2505,30 +2582,26 @@ void fn_1_91E4(s32 arg0) { HuAudSStreamPlay(1); } -s32 fn_1_92EC(s32 arg0) { +s32 fn_1_92EC(s32 arg0) +{ if (fn_1_B0C8(&lbl_1_bss_20, 1) != 0) { return fn_1_AF38(&lbl_1_bss_20); - } else { + } + else { return 0; } } -M418DllUnkStruct8 lbl_1_data_444[8] = { - { fn_1_888C, fn_1_88B4, -1 }, - { fn_1_89B0, fn_1_8B14, 90 }, - { fn_1_8C84, fn_1_8D70, 180 }, - { fn_1_8F74, fn_1_9094, 210 }, - { NULL, NULL, -1 }, - { fn_1_90DC, fn_1_9140, 180 }, - { fn_1_91E4, fn_1_92EC, 240 }, - { NULL, NULL, -1 } -}; +M418DllUnkStruct8 lbl_1_data_444[8] = { { fn_1_888C, fn_1_88B4, -1 }, { fn_1_89B0, fn_1_8B14, 90 }, { fn_1_8C84, fn_1_8D70, 180 }, + { fn_1_8F74, fn_1_9094, 210 }, { NULL, NULL, -1 }, { fn_1_90DC, fn_1_9140, 180 }, { fn_1_91E4, fn_1_92EC, 240 }, { NULL, NULL, -1 } }; -void fn_1_9334(void) { +void fn_1_9334(void) +{ fn_1_AEDC(&lbl_1_bss_20, &lbl_1_data_444[0]); } -s32 fn_1_9364(void) { +s32 fn_1_9364(void) +{ s32 var_r31; var_r31 = 0; @@ -2542,14 +2615,15 @@ s32 fn_1_9364(void) { return var_r31; } -void fn_1_93FC(omObjData* object) { +void fn_1_93FC(omObjData *object) +{ s32 var_r31; - M418DllUnkStruct6* var_r30; - M418DllUnkStruct3* var_r29; - M418DllUnkStruct3* var_r28; + M418DllUnkStruct6 *var_r30; + M418DllUnkStruct3 *var_r29; + M418DllUnkStruct3 *var_r28; s32 temp_r27; s32 temp_r26; - + if (WipeStatGet() == 0) { var_r30 = &lbl_1_bss_3EC; if (lbl_1_bss_10 != 0) { @@ -2560,7 +2634,8 @@ void fn_1_93FC(omObjData* object) { GWPlayer[temp_r27].coin_win = 10; } } - } else { + } + else { var_r28 = &lbl_1_bss_26C[var_r30->unk0]; temp_r26 = var_r28->unk4; if (_CheckFlag(0x1000CU) == 0) { @@ -2576,7 +2651,8 @@ void fn_1_93FC(omObjData* object) { } } -void fn_1_952C(omObjData* object) { +void fn_1_952C(omObjData *object) +{ if (omSysExitReq == 1) { HuAudSeqAllFadeOut(0xFA); WipeCreate(2, 0, -1); @@ -2584,14 +2660,15 @@ void fn_1_952C(omObjData* object) { } } -void fn_1_958C(void) { - M418DllUnkStruct3* temp_r31; +void fn_1_958C(void) +{ + M418DllUnkStruct3 *temp_r31; s32 var_r30; - M418DllUnkStruct6* temp_r29; - M418DllUnkStruct2* temp_r28; - M418DllUnkStruct4* temp_r27; - M418DllUnkStruct4* temp_r26; - M418DllUnkStruct3* temp_r25; + M418DllUnkStruct6 *temp_r29; + M418DllUnkStruct2 *temp_r28; + M418DllUnkStruct4 *temp_r27; + M418DllUnkStruct4 *temp_r26; + M418DllUnkStruct3 *temp_r25; s32 temp_r0; s32 var_r24; @@ -2600,22 +2677,22 @@ void fn_1_958C(void) { for (var_r30 = 1; var_r30 < 4; var_r30++) { fn_1_ABC4(temp_r28->unk0, var_r30, var_r30, 0, 2); } - + for (var_r30 = 8; var_r30 < 11; var_r30++) { fn_1_ABC4(temp_r28->unk0, var_r30, var_r30, 0, 1); Hu3DModelPosSet(temp_r28->unk0->model[var_r30 + 8], -360.0f + (360.0f * (var_r30 - 8)), -200.0f, -660.0f); Hu3DModelRotSet(temp_r28->unk0->model[var_r30], 0.0f, 0.0f, 20.0f); } - + temp_r28->unk4[0] = temp_r28->unk4[1] = temp_r28->unk4[2] = temp_r28->unk4[3] = 0; - + for (var_r30 = 0; var_r30 < 4; var_r30++) { temp_r27 = &lbl_1_bss_170[var_r30]; temp_r27->unk0->work[1] = temp_r27->unk0->work[2] = 0; temp_r27->unk4 = 0.0f; temp_r27->unkC = temp_r27->unk10 = temp_r27->unk14s = temp_r27->unk18s = 0; } - + for (var_r30 = 0; var_r30 < 3; var_r30++) { temp_r26 = &lbl_1_bss_11C[var_r30]; omSetTra(temp_r26->unk0, lbl_1_data_8C[var_r30].x, lbl_1_data_8C[var_r30].y, lbl_1_data_8C[var_r30].z); @@ -2624,12 +2701,13 @@ void fn_1_958C(void) { fn_1_AD14(temp_r26->unk0, 0, 0, 10, 1); temp_r26->unk0->work[1] = -1U; } - + for (var_r30 = 0; var_r30 < 4; var_r30++) { temp_r31 = &lbl_1_bss_26C[var_r30]; if (temp_r31->unk8 != 0) { omSetTra(temp_r31->unk0, 0.0f, -5000.0f, 0.0f); - } else { + } + else { omSetTra(temp_r31->unk0, 0.0f, 0.0f, 0.0f); } omSetRot(temp_r31->unk0, 0.0f, 0.0f, 0.0f); @@ -2654,21 +2732,22 @@ void fn_1_958C(void) { temp_r25 = &lbl_1_bss_26C[var_r30]; if (temp_r25->unk8 != 0) { temp_r29->unk4[var_r24++] = temp_r25->unk4; - } else { + } + else { temp_r29->unk0 = temp_r25->unk4; } } - + for (var_r30 = 0; var_r30 < 3; var_r30++) { temp_r29->unk1C[var_r30] = temp_r29->unk28[var_r30] = -1; temp_r29->unk10[var_r30] = -1; } - + temp_r29->unk34 = temp_r29->unk38 = temp_r29->unk3C = temp_r29->unk40 = 0; fn_1_5D28(); fn_1_8480(); fn_1_9334(); - + for (var_r30 = 0; var_r30 < 10; var_r30++) { lbl_1_bss_240[var_r30] = -1; } @@ -2676,7 +2755,8 @@ void fn_1_958C(void) { lbl_1_bss_240[7] = HuAudFXPlay(0x5D8); } -void fn_1_9BA4(omObjData* object) { +void fn_1_9BA4(omObjData *object) +{ switch (lbl_1_bss_18) { case 0: fn_1_958C(); @@ -2741,35 +2821,36 @@ void fn_1_9BA4(omObjData* object) { } } -void fn_1_9F94(omObjData* object) { +void fn_1_9F94(omObjData *object) +{ s32 var_r31; - M418DllUnkStruct4* temp_r30; - M418DllUnkStruct4* temp_r29; - M418DllUnkStruct3* temp_r28; - M418DllUnkStruct2* temp_r27; - M418DllWorkStruct* temp_r26; + M418DllUnkStruct4 *temp_r30; + M418DllUnkStruct4 *temp_r29; + M418DllUnkStruct3 *temp_r28; + M418DllUnkStruct2 *temp_r27; + M418DllWorkStruct *temp_r26; temp_r27 = &lbl_1_bss_1E0; temp_r27->unk0 = omAddObjEx(lbl_1_bss_0, 0x100, 0x14U, 0x14U, -1, fn_1_B4C); - + for (var_r31 = 0; var_r31 < 4; var_r31++) { temp_r30 = &lbl_1_bss_170[var_r31]; temp_r30->unk0 = omAddObjEx(lbl_1_bss_0, 0x200, 0x14U, 0x14U, -1, fn_1_14F0); temp_r30->unk0->work[0] = var_r31; } - + for (var_r31 = 0; var_r31 < 3; var_r31++) { temp_r29 = &lbl_1_bss_11C[var_r31]; temp_r29->unk0 = omAddObjEx(lbl_1_bss_0, 0x300, 0x14U, 0x14U, -1, fn_1_29A0); temp_r29->unk0->work[0] = var_r31; } - + for (var_r31 = 0; var_r31 < 4; var_r31++) { temp_r28 = &lbl_1_bss_26C[var_r31]; temp_r28->unk0 = omAddObjEx(lbl_1_bss_0, 0x400, 0x14U, 0x14U, -1, fn_1_4F60); temp_r28->unk0->work[0] = var_r31; } - + temp_r26 = &lbl_1_bss_68; temp_r26->unk0 = omAddObjEx(lbl_1_bss_0, 0x500, 0xBU, 0xBU, -1, fn_1_3054); WipeCreate(1, 0, -1); @@ -2778,7 +2859,8 @@ void fn_1_9F94(omObjData* object) { #include "src/REL/executor.c" -void fn_1_A1F0(void) { +void fn_1_A1F0(void) +{ lbl_1_bss_0 = omInitObjMan(0x3E, 0x2000); omGameSysInit(lbl_1_bss_0); HuAudAUXVolSet(-1, -1); @@ -2790,6 +2872,7 @@ void fn_1_A1F0(void) { omAddObjEx(lbl_1_bss_0, 0x2000, 0U, 0U, -1, fn_1_780); } -void ObjectSetup(void) { +void ObjectSetup(void) +{ fn_1_A1F0(); } diff --git a/src/REL/m420dll/player.c b/src/REL/m420dll/player.c index 6b424066..5bdb79f2 100644 --- a/src/REL/m420dll/player.c +++ b/src/REL/m420dll/player.c @@ -59,16 +59,111 @@ M420DllUnkStruct2 lbl_1_data_50[4] = { { 0x19, 0x01, 0x14, 0x04, 0x0A, 0x08, 0x01, 0x01 }, }; -// TODO MAKE_NUM static const s32 lbl_1_rodata_F8[8][0xB] = { - { 0x5F0000, 0x5F0017, 0x5F0018, 0x5F0068, 0x5F0069, 0x5F006A, 0x5F0035, 0x5F006B, 0x5F006E, 0x5F0049, 0x33001B }, - { 0x1A0000, 0x1A0017, 0x1A0018, 0x1A0068, 0x1A0069, 0x1A006A, 0x1A0035, 0x1A006B, 0x1A006E, 0x1A0049, 0x33001C }, - { 0x6D0000, 0x6D0017, 0x6D0018, 0x6D0068, 0x6D0069, 0x6D006A, 0x6D0035, 0x6D006B, 0x6D006E, 0x6D0049, 0x33001D }, - { 0x8A0000, 0x8A0017, 0x8A0018, 0x8A0068, 0x8A0069, 0x8A006A, 0x8A0035, 0x8A006B, 0x8A006E, 0x8A0049, 0x33001E }, - { 0x850000, 0x850017, 0x850018, 0x850068, 0x850069, 0x85006A, 0x850035, 0x85006B, 0x85006E, 0x850049, 0x33001F }, - { 0x110000, 0x110017, 0x110018, 0x110068, 0x110069, 0x11006A, 0x110035, 0x11006B, 0x11006E, 0x110049, 0x330020 }, - { 0x0D0000, 0x0D0017, 0x0D0018, 0x0D0068, 0x0D0069, 0x0D006A, 0x0D0035, 0x0D006B, 0x0D006E, 0x0D0049, 0x330021 }, - { 0x810000, 0x810017, 0x810018, 0x810068, 0x810069, 0x81006A, 0x810035, 0x81006B, 0x81006E, 0x810049, 0x330022 }, + { + DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x00), + DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x17), + DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x18), + DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x68), + DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x69), + DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x6A), + DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x35), + DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x6B), + DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x6E), + DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x49), + 0x33001B, + }, + { + DATA_MAKE_NUM(DATADIR_LUIGIMOT, 0x00), + DATA_MAKE_NUM(DATADIR_LUIGIMOT, 0x17), + DATA_MAKE_NUM(DATADIR_LUIGIMOT, 0x18), + DATA_MAKE_NUM(DATADIR_LUIGIMOT, 0x68), + DATA_MAKE_NUM(DATADIR_LUIGIMOT, 0x69), + DATA_MAKE_NUM(DATADIR_LUIGIMOT, 0x6A), + DATA_MAKE_NUM(DATADIR_LUIGIMOT, 0x35), + DATA_MAKE_NUM(DATADIR_LUIGIMOT, 0x6B), + DATA_MAKE_NUM(DATADIR_LUIGIMOT, 0x6E), + DATA_MAKE_NUM(DATADIR_LUIGIMOT, 0x49), + 0x33001C, + }, + { + DATA_MAKE_NUM(DATADIR_PEACHMOT, 0x00), + DATA_MAKE_NUM(DATADIR_PEACHMOT, 0x17), + DATA_MAKE_NUM(DATADIR_PEACHMOT, 0x18), + DATA_MAKE_NUM(DATADIR_PEACHMOT, 0x68), + DATA_MAKE_NUM(DATADIR_PEACHMOT, 0x69), + DATA_MAKE_NUM(DATADIR_PEACHMOT, 0x6A), + DATA_MAKE_NUM(DATADIR_PEACHMOT, 0x35), + DATA_MAKE_NUM(DATADIR_PEACHMOT, 0x6B), + DATA_MAKE_NUM(DATADIR_PEACHMOT, 0x6E), + DATA_MAKE_NUM(DATADIR_PEACHMOT, 0x49), + 0x33001D, + }, + { + DATA_MAKE_NUM(DATADIR_YOSHIMOT, 0x00), + DATA_MAKE_NUM(DATADIR_YOSHIMOT, 0x17), + DATA_MAKE_NUM(DATADIR_YOSHIMOT, 0x18), + DATA_MAKE_NUM(DATADIR_YOSHIMOT, 0x68), + DATA_MAKE_NUM(DATADIR_YOSHIMOT, 0x69), + DATA_MAKE_NUM(DATADIR_YOSHIMOT, 0x6A), + DATA_MAKE_NUM(DATADIR_YOSHIMOT, 0x35), + DATA_MAKE_NUM(DATADIR_YOSHIMOT, 0x6B), + DATA_MAKE_NUM(DATADIR_YOSHIMOT, 0x6E), + DATA_MAKE_NUM(DATADIR_YOSHIMOT, 0x49), + 0x33001E, + }, + { + DATA_MAKE_NUM(DATADIR_WARIOMOT, 0x00), + DATA_MAKE_NUM(DATADIR_WARIOMOT, 0x17), + DATA_MAKE_NUM(DATADIR_WARIOMOT, 0x18), + DATA_MAKE_NUM(DATADIR_WARIOMOT, 0x68), + DATA_MAKE_NUM(DATADIR_WARIOMOT, 0x69), + DATA_MAKE_NUM(DATADIR_WARIOMOT, 0x6A), + DATA_MAKE_NUM(DATADIR_WARIOMOT, 0x35), + DATA_MAKE_NUM(DATADIR_WARIOMOT, 0x6B), + DATA_MAKE_NUM(DATADIR_WARIOMOT, 0x6E), + DATA_MAKE_NUM(DATADIR_WARIOMOT, 0x49), + 0x33001F, + }, + { + DATA_MAKE_NUM(DATADIR_DONKEYMOT, 0x00), + DATA_MAKE_NUM(DATADIR_DONKEYMOT, 0x17), + DATA_MAKE_NUM(DATADIR_DONKEYMOT, 0x18), + DATA_MAKE_NUM(DATADIR_DONKEYMOT, 0x68), + DATA_MAKE_NUM(DATADIR_DONKEYMOT, 0x69), + DATA_MAKE_NUM(DATADIR_DONKEYMOT, 0x6A), + DATA_MAKE_NUM(DATADIR_DONKEYMOT, 0x35), + DATA_MAKE_NUM(DATADIR_DONKEYMOT, 0x6B), + DATA_MAKE_NUM(DATADIR_DONKEYMOT, 0x6E), + DATA_MAKE_NUM(DATADIR_DONKEYMOT, 0x49), + 0x330020, + }, + { + DATA_MAKE_NUM(DATADIR_DAISYMOT, 0x00), + DATA_MAKE_NUM(DATADIR_DAISYMOT, 0x17), + DATA_MAKE_NUM(DATADIR_DAISYMOT, 0x18), + DATA_MAKE_NUM(DATADIR_DAISYMOT, 0x68), + DATA_MAKE_NUM(DATADIR_DAISYMOT, 0x69), + DATA_MAKE_NUM(DATADIR_DAISYMOT, 0x6A), + DATA_MAKE_NUM(DATADIR_DAISYMOT, 0x35), + DATA_MAKE_NUM(DATADIR_DAISYMOT, 0x6B), + DATA_MAKE_NUM(DATADIR_DAISYMOT, 0x6E), + DATA_MAKE_NUM(DATADIR_DAISYMOT, 0x49), + 0x330021, + }, + { + DATA_MAKE_NUM(DATADIR_WALUIGIMOT, 0x00), + DATA_MAKE_NUM(DATADIR_WALUIGIMOT, 0x17), + DATA_MAKE_NUM(DATADIR_WALUIGIMOT, 0x18), + DATA_MAKE_NUM(DATADIR_WALUIGIMOT, 0x68), + DATA_MAKE_NUM(DATADIR_WALUIGIMOT, 0x69), + DATA_MAKE_NUM(DATADIR_WALUIGIMOT, 0x6A), + DATA_MAKE_NUM(DATADIR_WALUIGIMOT, 0x35), + DATA_MAKE_NUM(DATADIR_WALUIGIMOT, 0x6B), + DATA_MAKE_NUM(DATADIR_WALUIGIMOT, 0x6E), + DATA_MAKE_NUM(DATADIR_WALUIGIMOT, 0x49), + 0x330022, + }, }; static const Vec lbl_1_rodata_258[4][2] = { { { -372.0f, 300.0f, -220.0f }, { 0.0f, 50.0f, 0.0f } }, diff --git a/src/REL/m424Dll/claw.c b/src/REL/m424Dll/claw.c index 752b4afb..2e6b061f 100644 --- a/src/REL/m424Dll/claw.c +++ b/src/REL/m424Dll/claw.c @@ -1,6 +1,5 @@ #include "REL/m424Dll.h" -#include "math.h" #include "ext_math.h" #include "game/audio.h" #include "game/chrman.h" @@ -8,6 +7,8 @@ #include "game/hsfman.h" #include "game/hsfmotion.h" #include "game/pad.h" +#include "math.h" + // STRUCT typedef struct _M424DllClawStruct { @@ -66,8 +67,8 @@ typedef struct _M424DllClawStruct3 { } M424DllClawStruct3; // sizeof 0x8 // BSS -Process* lbl_1_bss_6DC; -omObjData* lbl_1_bss_6D8; +Process *lbl_1_bss_6DC; +omObjData *lbl_1_bss_6D8; s32 lbl_1_bss_6D0[2]; s32 lbl_1_bss_6CC; s32 lbl_1_bss_6C8; @@ -77,25 +78,30 @@ M424DllClawStruct3 lbl_1_bss_640[0x10]; // DATA Vec lbl_1_data_1E0[4] = { - { 950.0f, 275.0f, 0.0f }, + { 950.0f, 275.0f, 0.0f }, { 900.0f, 360.0f, 320.0f }, -{ 494.99996f, 220.0f, 494.99996f }, - { 0.0f, 225.0f, 0.0f }, + { 494.99996f, 220.0f, 494.99996f }, + { 0.0f, 225.0f, 0.0f }, }; f32 lbl_1_data_210[3] = { 12.0f, 11.0f, 17.5f }; char lbl_1_data_21C[12][0x10] = { - "tsume10", "tsume11", "tsume12", - "tsume20", "tsume21", "tsume22", - "tsume30", "tsume31", "tsume32", - "tsume40", "tsume41", "tsume42", -}; -u8 lbl_1_data_2DC[12] = { - 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0 -}; -s32 lbl_1_data_2E8[9] = { - 0x5F0000, 0x5F0002, 0x5F0003, 0x5F0005, 0x5F0006, - 0x5F0042, 0x5F0008, 0x5F0017, 0x5F0018 + "tsume10", + "tsume11", + "tsume12", + "tsume20", + "tsume21", + "tsume22", + "tsume30", + "tsume31", + "tsume32", + "tsume40", + "tsume41", + "tsume42", }; +u8 lbl_1_data_2DC[12] = { 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0 }; +s32 lbl_1_data_2E8[9] = { DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x00), DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x02), DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x03), + DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x05), DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x06), DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x42), + DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x08), DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x17), DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x18) }; Vec lbl_1_data_30C = { 0.0f, 0.0f, 0.0f }; // PROTO @@ -104,22 +110,23 @@ void fn_1_8924(u8, s32); u8 fn_1_8950(u8); u8 fn_1_897C(u8); u8 fn_1_89A8(u8); -Vec* fn_1_89D4(u8); -void fn_1_94D0(omObjData*); -void fn_1_9A64(omObjData*); -void fn_1_AE58(omObjData*); -void fn_1_AE64(omObjData*); +Vec *fn_1_89D4(u8); +void fn_1_94D0(omObjData *); +void fn_1_9A64(omObjData *); +void fn_1_AE58(omObjData *); +void fn_1_AE64(omObjData *); u16 fn_1_B79C(f32, f32, f32); -s32 fn_1_B9E0(Vec* arg0, Vec* arg1, f32 arg8, Vec* arg2, s32 arg3); +s32 fn_1_B9E0(Vec *arg0, Vec *arg1, f32 arg8, Vec *arg2, s32 arg3); void fn_1_C604(s32, s32); -s32 fn_1_C878(s16, const char*, Mtx, s32); -void fn_1_C99C(HsfObject*, Mtx, const char*, Mtx); +s32 fn_1_C878(s16, const char *, Mtx, s32); +void fn_1_C99C(HsfObject *, Mtx, const char *, Mtx); void fn_1_CE74(s32); -void fn_1_CF00(Process*); -void fn_1_CF80(omObjData*); +void fn_1_CF00(Process *); +void fn_1_CF80(omObjData *); s32 fn_1_D010(s32, s32); -omObjData* fn_1_93F0(Process* arg0) { +omObjData *fn_1_93F0(Process *arg0) +{ lbl_1_bss_6DC = arg0; lbl_1_bss_6D8 = omAddObjEx(arg0, 0x40, 5, 9, -1, fn_1_94D0); lbl_1_bss_6CC = 0; @@ -130,13 +137,15 @@ omObjData* fn_1_93F0(Process* arg0) { return lbl_1_bss_6D8; } -void fn_1_94A4(void) { +void fn_1_94A4(void) +{ fn_1_AE58(lbl_1_bss_6D8); } -void fn_1_94D0(omObjData* arg0) { +void fn_1_94D0(omObjData *arg0) +{ s32 var_r29; - M424DllClawStruct* var_r31; + M424DllClawStruct *var_r31; var_r31 = arg0->data = HuMemDirectMallocNum(HEAP_SYSTEM, 0x1B0, 0x10000000); memset(var_r31, 0, 0x1B0); @@ -170,7 +179,7 @@ void fn_1_94D0(omObjData* arg0) { } var_r31->unk184 = -1; var_r31->unk30 = lbl_1_data_30C; - + for (var_r29 = 0; var_r29 < 0xC; var_r29++) { var_r31->unk3C[var_r29] = lbl_1_data_30C; var_r31->unkCC[var_r29] = lbl_1_data_30C; @@ -218,7 +227,8 @@ void fn_1_94D0(omObjData* arg0) { arg0->func = fn_1_9A64; } -void fn_1_9A64(omObjData* arg0) { +void fn_1_9A64(omObjData *arg0) +{ Mtx sp74; Mtx sp44; Vec sp38; @@ -228,7 +238,7 @@ void fn_1_9A64(omObjData* arg0) { Vec sp8; f32 var_f31; f32 temp_f30; - M424DllClawStruct* temp_r31; + M424DllClawStruct *temp_r31; s32 var_r29; s32 temp_r28; s32 var_r27; @@ -242,13 +252,15 @@ void fn_1_9A64(omObjData* arg0) { if (temp_r31->unk6 != 0) { fn_1_AE64(arg0); } - } else { + } + else { temp_r31->unkC = 0; temp_r31->unkA = 0; } if (fn_1_FE0() <= 1) { var_r25 = -1; - } else { + } + else { var_r25 = temp_r31->unk10; } switch (var_r25) { @@ -262,7 +274,8 @@ void fn_1_9A64(omObjData* arg0) { if (fn_1_FE0() > 4) { temp_r31->unk10 = 10; temp_r31->unk12 = 0; - } else if ((temp_r31->unkA & 0x100) != 0) { + } + else if ((temp_r31->unkA & 0x100) != 0) { HuAudFXPlay(0x62A); temp_r31->unk184 = HuAudFXPlay(0x621); temp_r31->unk10 = 2; @@ -275,7 +288,8 @@ void fn_1_9A64(omObjData* arg0) { if (temp_r31->unk24 >= 1.0f) { temp_r31->unk24 = 1.0f; temp_r31->unk20 = -1.0f; - } else { + } + else { if (temp_r31->unk24 <= 0.0f) { temp_r31->unk24 = 0.0f; temp_r31->unk20 = 1.0f; @@ -289,7 +303,8 @@ void fn_1_9A64(omObjData* arg0) { HuAudFXPlay(0x622); temp_r31->unk10 = 10; temp_r31->unk12 = 0; - } else if (((temp_r31->unkC & 0x100) == 0) || (temp_r31->unk12 >= 360.0f)) { + } + else if (((temp_r31->unkC & 0x100) == 0) || (temp_r31->unk12 >= 360.0f)) { if (temp_r31->unk184 != -1) { HuAudFXStop(temp_r31->unk184); temp_r31->unk184 = -1; @@ -363,23 +378,27 @@ void fn_1_9A64(omObjData* arg0) { temp_r31->unk28 = 0.0f; if (temp_r31->unk168 != -1) { var_r27 = fn_1_897C(temp_r31->unk168); - } else { + } + else { var_r27 = -1; } if (temp_r31->unk168 == -1) { if (fn_1_FE0() > 4) { temp_r31->unk10 = 10; temp_r31->unk12 = 0; - } else { + } + else { temp_r31->unk10 = 8; temp_r31->unk12 = 0; HuAudFXPlay(0x625); } - } else if (var_r27 == 0) { + } + else if (var_r27 == 0) { temp_r31->unk10 = 8; temp_r31->unk12 = 0; HuAudFXPlay(0x625); - } else { + } + else { if (temp_r31->unk168 != -1) { fn_1_252C(-0.01f, 0x3C); fn_1_2670(0x75, 0); @@ -394,15 +413,18 @@ void fn_1_9A64(omObjData* arg0) { case 7: if (arg0->rot.y < temp_r31->unk180) { arg0->rot.y += 1.25f; - } else if (arg0->rot.y > temp_r31->unk180) { + } + else if (arg0->rot.y > temp_r31->unk180) { arg0->rot.y = temp_r31->unk180; } var_f31 = 0.35f - temp_r31->unk24; if (var_f31 > 0.0125f) { temp_r31->unk24 += 0.0125f; - } else if (var_f31 < -0.0125f) { + } + else if (var_f31 < -0.0125f) { temp_r31->unk24 -= 0.0125f; - } else { + } + else { temp_r31->unk24 = 0.35f; } if ((arg0->rot.y == temp_r31->unk180) && (0.35f == temp_r31->unk24)) { @@ -423,7 +445,8 @@ void fn_1_9A64(omObjData* arg0) { var_r26 = fn_1_89A8(temp_r31->unk168); HuAudCharVoicePlay(var_r26, 0x123); fn_1_D010(0x628, 30); - } else { + } + else { fn_1_8924(temp_r31->unk168, 2); } temp_r31->unk16C = temp_r31->unk168; @@ -451,12 +474,14 @@ void fn_1_9A64(omObjData* arg0) { temp_r31->unk12++; if (arg0->rot.y > 270.0f) { arg0->rot.y -= 1.25f; - } else if (arg0->rot.y < 270.0f) { + } + else if (arg0->rot.y < 270.0f) { arg0->rot.y = 270.0f; } if (temp_r31->unk24 > 0.025f) { temp_r31->unk24 -= 0.025f; - } else if (temp_r31->unk24 < 0.05f) { + } + else if (temp_r31->unk24 < 0.05f) { temp_r31->unk24 = 0.0f; } if ((270.0f == arg0->rot.y) && (0.0f == temp_r31->unk24)) { @@ -482,7 +507,8 @@ void fn_1_9A64(omObjData* arg0) { temp_r31->unk18 = fn_1_B79C(lbl_1_data_1E0[0].y, lbl_1_data_1E0[1].y, temp_r31->unk1C); temp_r31->unk10 = 11; temp_r31->unk12 = 0; - } else { + } + else { temp_r31->unk10 = 13; temp_r31->unk12 = 0; } @@ -520,7 +546,8 @@ void fn_1_9A64(omObjData* arg0) { temp_r31->unk10 = 0xC; } } - } else { + } + else { sp14 = lbl_1_data_1E0[var_r29]; sp8 = lbl_1_data_1E0[var_r29 + 1]; var_f31 = atan2d((sp8.x - arg0->trans.x), (sp8.z - arg0->trans.z)); @@ -551,7 +578,8 @@ void fn_1_9A64(omObjData* arg0) { if (fn_1_B888() != 0) { temp_r31->unk10 = 14; temp_r31->unk12 = 0; - } else { + } + else { temp_r31->unk10 = 15; temp_r31->unk12 = 0; } @@ -585,7 +613,7 @@ void fn_1_9A64(omObjData* arg0) { temp_r31->unk30.x = sp74[0][3]; temp_r31->unk30.y = sp74[1][3]; temp_r31->unk30.z = sp74[2][3]; - + for (var_r29 = 0; var_r29 < 0xC; var_r29++) { PSMTXCopy(sp44, sp74); fn_1_C878(arg0->model[4], lbl_1_data_21C[var_r29], sp74, 1); @@ -611,25 +639,17 @@ void fn_1_9A64(omObjData* arg0) { temp_r31->unk164 = 1; } -void fn_1_AE58(omObjData* arg0) { +void fn_1_AE58(omObjData *arg0) +{ arg0->func = NULL; } -f32 lbl_1_data_36C[4][2] = { - 30.0f, 24.0f, - 24.0f, 18.0f, - 12.0f, 6.0f, - 6.0f, 0.0f -}; +f32 lbl_1_data_36C[4][2] = { 30.0f, 24.0f, 24.0f, 18.0f, 12.0f, 6.0f, 6.0f, 0.0f }; -f32 lbl_1_data_38C[4][2] = { - 0.2f, 0.15f, - 0.15f, 0.1f, - 0.1f, 0.05f, - 0.05f, 0.0f -}; +f32 lbl_1_data_38C[4][2] = { 0.2f, 0.15f, 0.15f, 0.1f, 0.1f, 0.05f, 0.05f, 0.0f }; -void fn_1_AE64(omObjData* arg0) { +void fn_1_AE64(omObjData *arg0) +{ M424DllClawStruct2 sp20[8]; M424DllClawStruct2 sp10; s32 spC; @@ -642,12 +662,12 @@ void fn_1_AE64(omObjData* arg0) { f32 var_f24; s32 temp_r24; s32 temp_r23; - M424DllClawStruct* temp_r31; - Vec* var_r30; + M424DllClawStruct *temp_r31; + Vec *var_r30; s32 var_r29; s32 var_r28; s32 var_r27; - M424DllBallStruct2* var_r26; + M424DllBallStruct2 *var_r26; s32 var_r25; spC = 0; @@ -693,7 +713,7 @@ void fn_1_AE64(omObjData* arg0) { if (var_r28 != 0) { for (var_r29 = 0; var_r29 < (var_r28 - 1); var_r29++) { var_r27 = var_r29 + 1; - for (;var_r27 < var_r28; var_r27++) { + for (; var_r27 < var_r28; var_r27++) { if (sp20[var_r29].unkC < sp20[var_r27].unkC) { sp10 = sp20[var_r29]; sp20[var_r29] = sp20[var_r27]; @@ -729,7 +749,8 @@ void fn_1_AE64(omObjData* arg0) { var_f29 = (var_f29 - 350.0f) / 250.0f + temp_r23; if (var_f29 < 0.0f) { var_f29 = 0.0f; - } else if (var_f29 > 1.0f) { + } + else if (var_f29 > 1.0f) { var_f29 = 1.0f; } temp_r31->unk194 = (60.0f * (1.0f - var_f29)); @@ -748,7 +769,8 @@ void fn_1_AE64(omObjData* arg0) { temp_r31->unk1AC = 0; return; } - } else { + } + else { if (var_f31 >= (15.0f + temp_r31->unk1A8)) { temp_r31->unk1A0++; temp_r31->unk1A8 = var_f31; @@ -766,7 +788,8 @@ void fn_1_AE64(omObjData* arg0) { if (++temp_r31->unk1AC >= temp_r31->unk194) { var_r25 = 0; } - } else { + } + else { var_r25 = 0; } if (var_r25 != 0) { @@ -778,7 +801,8 @@ void fn_1_AE64(omObjData* arg0) { } } -u16 fn_1_B79C(f32 arg0, f32 arg1, f32 arg2) { +u16 fn_1_B79C(f32 arg0, f32 arg1, f32 arg2) +{ f32 var_f31; f32 var_f3; u16 var_r31; @@ -791,8 +815,9 @@ u16 fn_1_B79C(f32 arg0, f32 arg1, f32 arg2) { return var_r31; } -s32 fn_1_B804(void) { - M424DllClawStruct* temp_r31; +s32 fn_1_B804(void) +{ + M424DllClawStruct *temp_r31; if (!lbl_1_bss_6D8) { return 0; @@ -807,17 +832,20 @@ s32 fn_1_B804(void) { return 0; } -s32 fn_1_B888(void) { +s32 fn_1_B888(void) +{ if (lbl_1_bss_6CC >= 3) { return 1; - } else { + } + else { return 0; } } -s32 fn_1_B8AC(void) { - M424DllClawStruct* temp_r31; - +s32 fn_1_B8AC(void) +{ + M424DllClawStruct *temp_r31; + if (!lbl_1_bss_6D8) { return 0; } @@ -832,9 +860,10 @@ s32 fn_1_B8AC(void) { return 0; } -s32 fn_1_B924(void) { - M424DllClawStruct* temp_r31; - +s32 fn_1_B924(void) +{ + M424DllClawStruct *temp_r31; + if (!lbl_1_bss_6D8) { return 0; } @@ -849,11 +878,13 @@ s32 fn_1_B924(void) { return 0; } -void fn_1_B99C(Vec* arg0, Vec* arg1, f32 arg8, Vec* arg2) { +void fn_1_B99C(Vec *arg0, Vec *arg1, f32 arg8, Vec *arg2) +{ fn_1_B9E0(arg0, arg1, arg8, arg2, 0x10); } -s32 fn_1_B9E0(Vec* arg0, Vec* arg1, f32 arg8, Vec* arg2, s32 arg3) { +s32 fn_1_B9E0(Vec *arg0, Vec *arg1, f32 arg8, Vec *arg2, s32 arg3) +{ Vec sp60; Vec sp54; Vec sp48; @@ -870,11 +901,11 @@ s32 fn_1_B9E0(Vec* arg0, Vec* arg1, f32 arg8, Vec* arg2, s32 arg3) { f32 var_f25; f32 var_f24; f32 var_f23; - M424DllClawStruct* temp_r31; + M424DllClawStruct *temp_r31; s32 var_r29; s32 var_r28; s32 var_r26; - omObjData* var_r24; + omObjData *var_r24; s32 var_r23; var_r23 = 1; @@ -907,7 +938,8 @@ s32 fn_1_B9E0(Vec* arg0, Vec* arg1, f32 arg8, Vec* arg2, s32 arg3) { var_f23 = sqrtf((sp18.x * sp18.x) + (sp18.z * sp18.z)); if ((temp_r31->unk3C[var_r29].y > sp24.y) && (var_f23 < 17.599999999999998)) { temp_r31->unk15C = 1; - } else { + } + else { PSVECNormalize(&sp18, &sp18); PSVECScale(&sp18, &sp18, temp_f30); PSVECAdd(&temp_r31->unk3C[var_r29], &sp18, arg2); @@ -947,9 +979,10 @@ s32 fn_1_B9E0(Vec* arg0, Vec* arg1, f32 arg8, Vec* arg2, s32 arg3) { PSVECAdd(&sp60, &sp30, arg2); var_r28 = 1; var_r26 = 1; - } else if (var_f29 < temp_f30) { + } + else if (var_f29 < temp_f30) { if (PSVECMag(&sp30) <= 0.0f) { - + sp30.x = sp30.y = 0.0f; sp30.z = 1.0f; } @@ -1025,12 +1058,13 @@ s32 fn_1_B9E0(Vec* arg0, Vec* arg1, f32 arg8, Vec* arg2, s32 arg3) { return var_r28; } -s32 fn_1_C210(Vec* arg0) { +s32 fn_1_C210(Vec *arg0) +{ Vec sp1C; Vec sp10; f32 spC; - M424DllClawStruct* temp_r31; - omObjData* var_r30; + M424DllClawStruct *temp_r31; + omObjData *var_r30; s32 var_r29; var_r29 = 0; @@ -1052,21 +1086,23 @@ s32 fn_1_C210(Vec* arg0) { return var_r29; } -void fn_1_C2E0(s32 arg0) { +void fn_1_C2E0(s32 arg0) +{ Vec sp4C; Vec sp40; Vec sp34; Vec sp28; - Vec* spC; - M424DllBallStruct2* temp_r27; - Vec* temp_r28; - M424DllClawStruct* temp_r31; + Vec *spC; + M424DllBallStruct2 *temp_r27; + Vec *temp_r28; + M424DllClawStruct *temp_r31; s32 var_r30; s32 var_r26; - omObjData* var_r25; + omObjData *var_r25; + + if ((u8)omPauseChk() != 0U) + return; - if ((u8)omPauseChk() != 0U) return; - var_r25 = lbl_1_bss_6D8; if (lbl_1_bss_6D8) { temp_r31 = var_r25->data; @@ -1074,10 +1110,11 @@ void fn_1_C2E0(s32 arg0) { temp_r27 = &lbl_1_bss_60[0]; if (temp_r27) { var_r26 = 0x10; - + for (var_r30 = 0; var_r30 < lbl_1_bss_58; var_r30++) { temp_r27 = &lbl_1_bss_60[var_r30]; - if ((fn_1_8950(var_r30) == 3) || (fn_1_8950(var_r30) == 4)) continue; + if ((fn_1_8950(var_r30) == 3) || (fn_1_8950(var_r30) == 4)) + continue; temp_r28 = fn_1_89D4(var_r30); spC = fn_1_8A00(var_r30); sp28 = *temp_r28; @@ -1116,18 +1153,19 @@ void fn_1_C2E0(s32 arg0) { } } -void fn_1_C604(s32 arg0, s32 arg1) { +void fn_1_C604(s32 arg0, s32 arg1) +{ Vec sp30; Vec sp24; Vec sp18; Vec spC; - M424DllBallStruct2* sp8; - Vec* var_r31; + M424DllBallStruct2 *sp8; + Vec *var_r31; f32 temp_f31; f32 var_f30; s32 var_r30; - M424DllBallStruct2* var_r28; - Vec* var_r27; + M424DllBallStruct2 *var_r28; + Vec *var_r27; sp8 = &lbl_1_bss_60[var_r30]; var_r27 = fn_1_89D4(arg0); @@ -1145,7 +1183,8 @@ void fn_1_C604(s32 arg0, s32 arg1) { sp18.x *= temp_f31; sp18.y *= temp_f31; sp18.z *= temp_f31; - } else { + } + else { sp18.x = 0.0f; sp18.y = 0.0f; sp18.z = 1.0f; @@ -1168,22 +1207,25 @@ void fn_1_C604(s32 arg0, s32 arg1) { } } -void fn_1_C854(void) { +void fn_1_C854(void) +{ fn_1_C2E0(0); } -s32 fn_1_C878(s16 arg0, const char* arg1, Mtx arg2, s32 arg3) { +s32 fn_1_C878(s16 arg0, const char *arg1, Mtx arg2, s32 arg3) +{ Mtx sp44; Mtx sp14; - HsfData* temp_r30; - ModelData* temp_r31; + HsfData *temp_r30; + ModelData *temp_r31; temp_r31 = &Hu3DData[arg0]; temp_r30 = temp_r31->hsfData; lbl_1_bss_6C8 = 0; if (temp_r31->unk_08 != -1) { lbl_1_bss_6C4 = 1; - } else { + } + else { lbl_1_bss_6C4 = 0; } mtxRot(sp14, temp_r31->rot.x, temp_r31->rot.y, temp_r31->rot.z); @@ -1197,18 +1239,19 @@ s32 fn_1_C878(s16 arg0, const char* arg1, Mtx arg2, s32 arg3) { return lbl_1_bss_6C8; } -void fn_1_C99C(HsfObject* arg0, Mtx arg1, const char* arg2, Mtx arg3) { +void fn_1_C99C(HsfObject *arg0, Mtx arg1, const char *arg2, Mtx arg3) +{ Mtx spF8; Mtx spC8; Mtx sp98; Mtx sp68; Mtx sp38; Mtx sp8; - HsfTransform* var_r31; - HsfTransform* var_r30; - HsfTransform* var_r29; - HsfObject* temp_r28; - HsfObject* temp_r27; + HsfTransform *var_r31; + HsfTransform *var_r30; + HsfTransform *var_r29; + HsfObject *temp_r28; + HsfObject *temp_r27; u32 var_r25; u32 var_r24; u32 var_r23; @@ -1216,13 +1259,15 @@ void fn_1_C99C(HsfObject* arg0, Mtx arg1, const char* arg2, Mtx arg3) { if (lbl_1_bss_6C8 == 0) { if (lbl_1_bss_6C4 != 0) { var_r31 = &arg0->data.curr; - } else { + } + else { var_r31 = &arg0->data.base; } if ((var_r31->scale.x <= 0.0f) && (var_r31->scale.y <= 0.0f) && (var_r31->scale.z <= 0.0f)) { PSMTXCopy(arg1, spF8); OSReport("OBJ MTX CHECK ERROR %s \n", arg0->name); - } else { + } + else { mtxRot(spC8, var_r31->rot.x, var_r31->rot.y, var_r31->rot.z); PSMTXScale(spF8, var_r31->scale.x, var_r31->scale.y, var_r31->scale.z); PSMTXConcat(spC8, spF8, spF8); @@ -1241,13 +1286,15 @@ void fn_1_C99C(HsfObject* arg0, Mtx arg1, const char* arg2, Mtx arg3) { if (lbl_1_bss_6C8 == 0) { if (lbl_1_bss_6C4 != 0) { var_r30 = &temp_r28->data.curr; - } else { + } + else { var_r30 = &temp_r28->data.base; } if ((var_r30->scale.x <= 0.0f) && (var_r30->scale.y <= 0.0f) && (var_r30->scale.z <= 0.0f)) { PSMTXCopy(spF8, sp68); OSReport("OBJ MTX CHECK ERROR %s \n", temp_r28->name); - } else { + } + else { mtxRot(sp98, var_r30->rot.x, var_r30->rot.y, var_r30->rot.z); PSMTXScale(sp68, var_r30->scale.x, var_r30->scale.y, var_r30->scale.z); PSMTXConcat(sp98, sp68, sp68); @@ -1266,13 +1313,15 @@ void fn_1_C99C(HsfObject* arg0, Mtx arg1, const char* arg2, Mtx arg3) { if (lbl_1_bss_6C8 == 0) { if (lbl_1_bss_6C4 != 0) { var_r29 = &temp_r27->data.curr; - } else { + } + else { var_r29 = &temp_r27->data.base; } if ((var_r29->scale.x <= 0.0f) && (var_r29->scale.y <= 0.0f) && (var_r29->scale.z <= 0.0f)) { PSMTXCopy(sp68, sp8); OSReport("OBJ MTX CHECK ERROR %s \n", temp_r27->name); - } else { + } + else { mtxRot(sp38, var_r29->rot.x, var_r29->rot.y, var_r29->rot.z); PSMTXScale(sp8, var_r29->scale.x, var_r29->scale.y, var_r29->scale.z); PSMTXConcat(sp38, sp8, sp8); @@ -1296,8 +1345,9 @@ void fn_1_C99C(HsfObject* arg0, Mtx arg1, const char* arg2, Mtx arg3) { } } -void fn_1_CE74(s32 arg0) { - ModelData* temp_r31; +void fn_1_CE74(s32 arg0) +{ + ModelData *temp_r31; temp_r31 = &Hu3DData[arg0]; if (temp_r31->unk_08 != -1) { @@ -1311,21 +1361,23 @@ void fn_1_CE74(s32 arg0) { } } -void fn_1_CF00(Process* arg0) { - M424DllClawStruct3* var_r31; +void fn_1_CF00(Process *arg0) +{ + M424DllClawStruct3 *var_r31; s32 var_r30; omAddObjEx(arg0, 0x40, 0, 0, -1, fn_1_CF80); var_r31 = &lbl_1_bss_640[0]; - + for (var_r30 = 0; var_r30 < 0x10; var_r30++, var_r31++) { var_r31->unk0 = -1; var_r31->unk4 = -1; } } -void fn_1_CF80(omObjData* arg0) { - M424DllClawStruct3* var_r31; +void fn_1_CF80(omObjData *arg0) +{ + M424DllClawStruct3 *var_r31; s32 var_r30; var_r31 = &lbl_1_bss_640[0]; @@ -1340,13 +1392,15 @@ void fn_1_CF80(omObjData* arg0) { } } -s32 fn_1_D010(s32 arg0, s32 arg1) { - M424DllClawStruct3* var_r31; +s32 fn_1_D010(s32 arg0, s32 arg1) +{ + M424DllClawStruct3 *var_r31; s32 var_r30; var_r31 = &lbl_1_bss_640[0]; for (var_r30 = 0; var_r30 < 0x10; var_r30++, var_r31++) { - if (var_r31->unk0 == -1) break; + if (var_r31->unk0 == -1) + break; } if (var_r30 >= 0x10) { return -1; diff --git a/src/REL/m430Dll/main.c b/src/REL/m430Dll/main.c index bf93c2c6..f7320e52 100644 --- a/src/REL/m430Dll/main.c +++ b/src/REL/m430Dll/main.c @@ -139,7 +139,7 @@ void ObjectSetup(void) lbl_1_bss_34 = omAddObjEx(var_r31, 0xA, 0, 0, -1, fn_1_65C); fn_1_4A80(var_r31); fn_1_BBC4(var_r31); - lbl_1_bss_10 = espEntry(0x3D001B, 0x64, 0); + lbl_1_bss_10 = espEntry(DATA_MAKE_NUM(DATADIR_M430, 0x1B), 0x64, 0); espPosSet(lbl_1_bss_10, 288.0, 240.0); espScaleSet(lbl_1_bss_10, 0.22499999403953552, 60.0); espDispOff(lbl_1_bss_10); diff --git a/src/REL/m430Dll/player.c b/src/REL/m430Dll/player.c index 981602dc..e42fbd99 100644 --- a/src/REL/m430Dll/player.c +++ b/src/REL/m430Dll/player.c @@ -219,21 +219,22 @@ void fn_1_F6A0(omObjData *object); void fn_1_FC9C(omObjData *object); M430PlayerData170Struct lbl_1_data_170[7] = { - { 0x5F0042, -1 }, + { DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x42), -1 }, { 0, 1 }, { 0, 2 }, { 0, 3 }, { 0, -1 }, - { 0x5F0017, -1 }, - { 0x5F0018, -1 }, + { DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x17), -1 }, + { DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x18), -1 }, }; M430PlayerData170Struct lbl_1_data_1A8[4] = { { 0, 4 }, - { 0x5F0000, -1 }, - { 0x5F0017, -1 }, - { 0x5F0018, -1 }, + { DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x00), -1 }, + { DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x17), -1 }, + { DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x18), -1 }, }; -s32 lbl_1_data_1C8[5] = { 0, 0x3D0031, 0x3D0039, 0x3D0041, 0x3D0049 }; +s32 lbl_1_data_1C8[5] = { 0, DATA_MAKE_NUM(DATADIR_M430, 0x31), DATA_MAKE_NUM(DATADIR_M430, 0x39), DATA_MAKE_NUM(DATADIR_M430, 0x41), + DATA_MAKE_NUM(DATADIR_M430, 0x49) }; float lbl_1_data_1DC[7] = { -262.5f, -173.25f, -86.625f, 0.0f, 86.625f, 173.25f, 262.5f }; Vec lbl_1_data_1F8[8] = { { 0.0f, 0.0f, 0.0f }, @@ -246,9 +247,9 @@ Vec lbl_1_data_1F8[8] = { { -60.000004f, 0.0f, -120.00001f }, }; float lbl_1_data_258[8] = { 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 25.0f, 0.0f, 25.0f }; -s32 lbl_1_data_278[2] = { 0x3D001C, 0x3D001D }; -s32 lbl_1_data_280[2] = { 0x3D001E, 0x3D001F }; -s32 lbl_1_data_288[2] = { 0x3D0020, 0x3D0021 }; +s32 lbl_1_data_278[2] = { DATA_MAKE_NUM(DATADIR_M430, 0x1C), DATA_MAKE_NUM(DATADIR_M430, 0x1D) }; +s32 lbl_1_data_280[2] = { DATA_MAKE_NUM(DATADIR_M430, 0x1E), DATA_MAKE_NUM(DATADIR_M430, 0x1F) }; +s32 lbl_1_data_288[2] = { DATA_MAKE_NUM(DATADIR_M430, 0x20), DATA_MAKE_NUM(DATADIR_M430, 0x21) }; s32 lbl_1_bss_17C; Process *lbl_1_bss_178; @@ -427,7 +428,7 @@ void fn_1_C1E4(omObjData *object) Hu3DModelLayerSet(object->model[1], 2); Hu3DModelCameraSet(object->model[1], 3); Hu3DModelScaleSet(object->model[1], 1.2f, 1.2f, 1.2f); - object->model[2] = Hu3DModelCreateFile(0x3D0025); + object->model[2] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M430, 0x25)); Hu3DModelLayerSet(object->model[2], 1); Hu3DModelCameraSet(object->model[2], 3); work->unk_60 = HuAudFXPlay(0x67A); @@ -1659,14 +1660,14 @@ void fn_1_10B88(void) for (var_r30 = 0; var_r30 < 0x10; var_r30++, var_r31++) { var_r31->unk_00 = var_r30; if (var_r30 == 0) { - var_r31->unk_04 = Hu3DModelCreateFile(0x3D0023); + var_r31->unk_04 = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M430, 0x23)); } else { var_r31->unk_04 = Hu3DModelLink(lbl_1_bss_16C[0].unk_04); } Hu3DModelLayerSet(var_r31->unk_04, 2); Hu3DModelAttrSet(var_r31->unk_04, HU3D_ATTR_DISPOFF); - var_r31->unk_08 = Hu3DModelCreateFile(0x3D0024); + var_r31->unk_08 = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M430, 0x24)); Hu3DModelLayerSet(var_r31->unk_08, 2); Hu3DModelAttrSet(var_r31->unk_08, HU3D_ATTR_DISPOFF); var_r31->unk_0C = 0; @@ -1836,7 +1837,7 @@ void fn_1_113AC(void) for (var_r30 = 0; var_r30 < 0x20; var_r31++) { var_r31->unk_00 = var_r30; if (var_r30 == 0) { - var_r31->unk_04 = Hu3DModelCreateFile(0x3D0022); + var_r31->unk_04 = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M430, 0x22)); } else { var_r31->unk_04 = Hu3DModelLink(lbl_1_bss_168[0].unk_04); @@ -2006,7 +2007,7 @@ void fn_1_11C1C(void) memset(var_r31, 0, 8 * sizeof(M430PlayerBss164Struct)); for (var_r30 = 0; var_r30 < 8; var_r30++, var_r31++) { if (var_r30 == 0) { - var_r31->unk_14 = HuSprAnimRead(HuDataReadNum(0x3D0026, MEMORY_DEFAULT_NUM)); + var_r31->unk_14 = HuSprAnimRead(HuDataReadNum(DATA_MAKE_NUM(DATADIR_M430, 0x26), MEMORY_DEFAULT_NUM)); } else { var_r31->unk_14 = lbl_1_bss_164[0].unk_14; @@ -2182,7 +2183,7 @@ void fn_1_125C4(void) switch (var_r30) { case 0: case 1: - var_r31->unk_10[var_r30] = espEntry(0x610033, 1, 0); + var_r31->unk_10[var_r30] = espEntry(DATA_MAKE_NUM(DATADIR_MGCONST, 0x33), 1, 0); espPriSet(var_r31->unk_10[var_r30], 0x40); var_r31->unk_28[var_r30][0] = (var_r30 * 0x14) + 0xB; var_r31->unk_28[var_r30][1] = 0; @@ -2191,17 +2192,17 @@ void fn_1_125C4(void) break; case 2: if (var_r29 == 0) { - var_r31->unk_10[var_r30] = espEntry(0x61001B, 1, 0); + var_r31->unk_10[var_r30] = espEntry(DATA_MAKE_NUM(DATADIR_MGCONST, 0x1B), 1, 0); } else { - var_r31->unk_10[var_r30] = espEntry(0x61001C, 1, 0); + var_r31->unk_10[var_r30] = espEntry(DATA_MAKE_NUM(DATADIR_MGCONST, 0x1C), 1, 0); } espPriSet(var_r31->unk_10[var_r30], 0xFF); var_r31->unk_28[var_r30][0] = 0; var_r31->unk_28[var_r30][1] = 0; break; case 3: - var_r31->unk_10[var_r30] = espEntry(0x61001D, 1, 0); + var_r31->unk_10[var_r30] = espEntry(DATA_MAKE_NUM(DATADIR_MGCONST, 0x1D), 1, 0); espPriSet(var_r31->unk_10[var_r30], 0x100); espTPLvlSet(var_r31->unk_10[var_r30], 0.6000000238418579); espColorSet(var_r31->unk_10[var_r30], 0, 0, 0); @@ -2209,13 +2210,13 @@ void fn_1_125C4(void) var_r31->unk_28[var_r30][1] = 0; break; case 4: - var_r31->unk_10[var_r30] = espEntry(0x610008, 1, 0); + var_r31->unk_10[var_r30] = espEntry(DATA_MAKE_NUM(DATADIR_MGCONST, 0x08), 1, 0); espPriSet(var_r31->unk_10[var_r30], 0x80); var_r31->unk_28[var_r30][0] = -0x21; var_r31->unk_28[var_r30][1] = 0; break; case 5: - var_r31->unk_10[var_r30] = espEntry(0x3D0028, 1, 0); + var_r31->unk_10[var_r30] = espEntry(DATA_MAKE_NUM(DATADIR_M430, 0x28), 1, 0); espPriSet(var_r31->unk_10[var_r30], 0x80); espZRotSet(var_r31->unk_10[var_r30], 45.0); var_r31->unk_28[var_r30][0] = -0xA; diff --git a/src/REL/m430Dll/water.c b/src/REL/m430Dll/water.c index 1d295c95..f9b938a2 100644 --- a/src/REL/m430Dll/water.c +++ b/src/REL/m430Dll/water.c @@ -165,11 +165,11 @@ void fn_1_4A80(Process *process) { omObjData *object; - lbl_1_bss_150 = HuSprAnimRead(HuDataReadNum(0x3D0019, 0x10000000)); - lbl_1_bss_14C = HuSprAnimRead(HuDataReadNum(0x3D001A, 0x10000000)); - lbl_1_bss_148 = HuSprAnimRead(HuDataReadNum(0x3D0014, 0x10000000)); - lbl_1_bss_144 = HuSprAnimRead(HuDataReadNum(0x3D0017, 0x10000000)); - lbl_1_bss_140 = HuSprAnimRead(HuDataReadNum(0x3D0018, 0x10000000)); + lbl_1_bss_150 = HuSprAnimRead(HuDataReadNum(DATA_MAKE_NUM(DATADIR_M430, 0x19), MEMORY_DEFAULT_NUM)); + lbl_1_bss_14C = HuSprAnimRead(HuDataReadNum(DATA_MAKE_NUM(DATADIR_M430, 0x1A), MEMORY_DEFAULT_NUM)); + lbl_1_bss_148 = HuSprAnimRead(HuDataReadNum(DATA_MAKE_NUM(DATADIR_M430, 0x14), MEMORY_DEFAULT_NUM)); + lbl_1_bss_144 = HuSprAnimRead(HuDataReadNum(DATA_MAKE_NUM(DATADIR_M430, 0x17), MEMORY_DEFAULT_NUM)); + lbl_1_bss_140 = HuSprAnimRead(HuDataReadNum(DATA_MAKE_NUM(DATADIR_M430, 0x18), MEMORY_DEFAULT_NUM)); object = lbl_1_bss_58 = omAddObjEx(process, 0x1E, 0x68, 0, -1, fn_1_4CB4); object->work[0] = 0; object = lbl_1_bss_54 = omAddObjEx(process, 0x1E, 7, 0, -1, fn_1_803C); @@ -200,12 +200,12 @@ void fn_1_4CB4(omObjData *object) s32 var_r25; M430DllWork *work; - u32 spC[1] = { 0x3D0001 }; + u32 spC[1] = { DATA_MAKE_NUM(DATADIR_M430, 0x01) }; s32 sp8[1]; - u32 sp90[4] = { 0x003D000B, 0x003D000C, 0x003D000D, 0x003D000E }; - u32 sp80[4] = { 0x003D0002, 0x003D0002, 0x003D0003, 0x003D0003 }; - u32 sp70[4] = { 0x003D0004, 0x003D0004, 0x00000000, 0x00000000 }; - u32 sp60[4] = { 0x003D0006, 0x003D0007, 0x003D0008, 0x003D0009 }; + u32 sp90[4] = { DATA_MAKE_NUM(DATADIR_M430, 0x0B), DATA_MAKE_NUM(DATADIR_M430, 0x0C), DATA_MAKE_NUM(DATADIR_M430, 0x0D), DATA_MAKE_NUM(DATADIR_M430, 0x0E) }; + u32 sp80[4] = { DATA_MAKE_NUM(DATADIR_M430, 0x02), DATA_MAKE_NUM(DATADIR_M430, 0x02), DATA_MAKE_NUM(DATADIR_M430, 0x03), DATA_MAKE_NUM(DATADIR_M430, 0x03) }; + u32 sp70[4] = { DATA_MAKE_NUM(DATADIR_M430, 0x04), DATA_MAKE_NUM(DATADIR_M430, 0x04), 0, 0 }; + u32 sp60[4] = { DATA_MAKE_NUM(DATADIR_M430, 0x06), DATA_MAKE_NUM(DATADIR_M430, 0x07), DATA_MAKE_NUM(DATADIR_M430, 0x08), DATA_MAKE_NUM(DATADIR_M430, 0x09) }; s32 sp50[4]; s32 sp40[4]; s32 sp30[4]; @@ -227,11 +227,11 @@ void fn_1_4CB4(omObjData *object) } var_r30 = work; for (var_r31 = 0; var_r31 < 2; var_r31++) { - object->model[var_r31] = Hu3DModelCreateFile(0x3D0000); + object->model[var_r31] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M430, 0x00)); var_r30[var_r31].unk_18 = object->model[var_r31]; Hu3DModelLayerSet(var_r30[var_r31].unk_18, 0); Hu3DModelScaleSet(var_r30[var_r31].unk_18, 1.15f, 1.15f, 1.15f); - var_r27 = Hu3DParticleCreate(HuSprAnimReadFile(0x3D000A), 1); + var_r27 = Hu3DParticleCreate(HuSprAnimReadFile(DATA_MAKE_NUM(DATADIR_M430, 0x0A)), 1); var_r30[var_r31].unk_1A = var_r27; Hu3DModelLayerSet(var_r27, 1); *((s16 *)Hu3DData[var_r27].unk_120) = 1; @@ -247,14 +247,14 @@ void fn_1_4CB4(omObjData *object) var_r26->material[var_r28].invAlpha = 0.001f; } } - object->model[2] = Hu3DModelCreateFile(0x3D000F); + object->model[2] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M430, 0x0F)); Hu3DModelLayerSet(object->model[2], 1); Hu3DModelScaleSet(object->model[2], 1.5f, 1.5f, 1.5f); - object->model[3] = Hu3DModelCreateFile(0x3D0010); + object->model[3] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M430, 0x10)); Hu3DModelLayerSet(object->model[3], 2); Hu3DModelScaleSet(object->model[3], 1.5f, 1.5f, 1.5f); for (var_r31 = 0; var_r31 < 2; var_r31++) { - var_r27 = Hu3DParticleCreate(HuSprAnimReadFile(0x3D0015), 0x64); + var_r27 = Hu3DParticleCreate(HuSprAnimReadFile(DATA_MAKE_NUM(DATADIR_M430, 0x15)), 0x64); object->model[var_r31 + 4] = var_r27; var_r30[var_r31].unk_10 = var_r27; Hu3DModelLayerSet(var_r27, 2); @@ -264,7 +264,7 @@ void fn_1_4CB4(omObjData *object) *((s16 *)Hu3DData[var_r27].unk_120) = 0; } for (var_r31 = 0; var_r31 < 2; var_r31++) { - var_r27 = Hu3DParticleCreate(HuSprAnimReadFile(0x3D0015), 0x64); + var_r27 = Hu3DParticleCreate(HuSprAnimReadFile(DATA_MAKE_NUM(DATADIR_M430, 0x15)), 0x64); object->model[var_r31 + 6] = var_r27; var_r30[var_r31].unk_14 = var_r27; Hu3DModelLayerSet(var_r27, 1); @@ -701,7 +701,7 @@ M430DllUnkStruct2 *fn_1_70AC(omObjData *arg0, s32 var_r27, s16 var_r28) s32 var_r30; M430DllUnkStruct2 *var_r29; - u32 sp10[2] = { 0x003D0011, 0x003D0012 }; + u32 sp10[2] = { DATA_MAKE_NUM(DATADIR_M430, 0x11), DATA_MAKE_NUM(DATADIR_M430, 0x12) }; s32 sp8[2] = { 1, 2 }; var_r29 = HuMemDirectMallocNum(HEAP_SYSTEM, var_r28 * sizeof(M430DllUnkStruct2), MEMORY_DEFAULT_NUM); memset(var_r29, 0, var_r28 * 0x3C); @@ -807,7 +807,7 @@ void fn_1_7848(omObjData *object) work = HuMemDirectMallocNum(HEAP_SYSTEM, var_r30 * sizeof(M430DllWork2), MEMORY_DEFAULT_NUM); object->data = work; memset(work, 0, var_r30 * sizeof(M430DllWork2)); - var_r26 = Hu3DModelCreateFile(0x3D0013); + var_r26 = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M430, 0x13)); var_f29 = 1000.0f; for (var_r31 = work, var_r29 = 0; var_r29 < var_r30; var_r29++, var_r31++) { var_r31->unk_00 = Hu3DModelLink(var_r26); diff --git a/src/REL/m449Dll/main.c b/src/REL/m449Dll/main.c index e2ee45d9..be72261b 100644 --- a/src/REL/m449Dll/main.c +++ b/src/REL/m449Dll/main.c @@ -127,7 +127,8 @@ s32 lbl_1_data_0[0x12] = { 0x610000, }; s32 lbl_1_data_48[0x12] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; -s32 lbl_1_data_90[4] = { 0x5F0000, 0x500000, 0x5F0017, 0x5F0085 }; +s32 lbl_1_data_90[4] + = { DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x00), 0x500000, DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x17), DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x85) }; s32 lbl_1_data_A0[4] = { 0x50001C, 0x50001E, 0x50001D, 0x50001F }; u8 lbl_1_data_B0[0x38] = { 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, diff --git a/src/REL/m455Dll/main.c b/src/REL/m455Dll/main.c index 2a2c634a..fa1c4b5b 100644 --- a/src/REL/m455Dll/main.c +++ b/src/REL/m455Dll/main.c @@ -3,7 +3,6 @@ #include "game/object.h" #include "game/objsub.h" - #include "game/hsfmotion.h" #include "game/pad.h" @@ -15,7 +14,6 @@ #include "game/minigame_seq.h" #include "game/wipe.h" - #include "ext_math.h" #include "math.h" @@ -329,15 +327,15 @@ s32 fn_1_C90(void) s32 fn_1_3214(void); u32 lbl_1_data_E0[5][2] = { - 0x5F0000, + DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x00), 0, 0x540024, 1, 0x54001C, 1, - 0x5F0017, + DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x17), 0, - 0x5F0018, + DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x18), 0, }; diff --git a/src/REL/m456Dll/main.c b/src/REL/m456Dll/main.c index 8604098f..9c760c47 100644 --- a/src/REL/m456Dll/main.c +++ b/src/REL/m456Dll/main.c @@ -436,16 +436,16 @@ s32 fn_1_F4C(void) } M456DllDataE4Struct lbl_1_data_E4[0xA] = { - { 0x5F0000, 0 }, - { 0x55001C, 1 }, - { 0x550024, 1 }, - { 0x55002C, 1 }, - { 0x550034, 1 }, - { 0x5F002A, 0 }, - { 0x5F0005, 0 }, - { 0x5F0017, 0 }, - { 0x5F0018, 0 }, - { 0x55003C, 1 }, + { DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x00), 0 }, + { DATA_MAKE_NUM(DATADIR_M456, 0x1C), 1 }, + { DATA_MAKE_NUM(DATADIR_M456, 0x24), 1 }, + { DATA_MAKE_NUM(DATADIR_M456, 0x2C), 1 }, + { DATA_MAKE_NUM(DATADIR_M456, 0x34), 1 }, + { DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x2A), 0 }, + { DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x05), 0 }, + { DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x17), 0 }, + { DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x18), 0 }, + { DATA_MAKE_NUM(DATADIR_M456, 0x3C), 1 }, }; Vec lbl_1_data_134[4] = { { -300.0f, 0.0f, 0.0f }, @@ -826,7 +826,7 @@ void fn_1_2448(omObjData *object) } M456DllData1B0Struct lbl_1_data_1B0[0x10] = { - { 0x550044, 0x10E }, + { DATA_MAKE_NUM(DATADIR_M456, 0x44), 0x10E }, { 0x610037, 0xFA }, { 0x610030, 0xFA }, { 0x610030, 0xFA }, diff --git a/src/REL/m458Dll/main.c b/src/REL/m458Dll/main.c index 1e95123b..f7242c46 100644 --- a/src/REL/m458Dll/main.c +++ b/src/REL/m458Dll/main.c @@ -77,16 +77,16 @@ void fn_1_6D9C(omObjData *arg0); s32 lbl_1_data_0[2] = { 0x570025, 0x570026 }; s32 lbl_1_data_8[2] = { 0, 0 }; s32 lbl_1_data_10[0xA] = { - 0x5F0000, - 0x5F0002, - 0x5F0003, - 0x5F0005, - 0x5F0006, - 0x5F0036, - 0x5F002F, - 0x5F001A, + DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x00), + DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x02), + DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x03), + DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x05), + DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x06), + DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x36), + DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x2F), + DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x1A), 0x570000, - 0x5F0017, + DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x17), }; u32 lbl_1_data_38[0xA] = { 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 }; u32 lbl_1_data_60[0xA] = { 0x30008, 0, 0, 0x3000A, 0, 0, 0x57002A, 0x570028, 0x570029, 0x570027 }; diff --git a/src/REL/m461Dll/main.c b/src/REL/m461Dll/main.c index d24bdfd7..2c18e8cd 100644 --- a/src/REL/m461Dll/main.c +++ b/src/REL/m461Dll/main.c @@ -1,11 +1,11 @@ #include "REL/executor.h" #include "game/chrman.h" #include "game/frand.h" +#include "game/gamework.h" #include "game/minigame_seq.h" #include "game/object.h" #include "game/objsub.h" #include "game/wipe.h" -#include "game/gamework.h" #include "game/gamework_data.h" @@ -544,27 +544,19 @@ float lbl_1_bss_8; float lbl_1_bss_4; float lbl_1_bss_0; -s16 lbl_1_data_0[8] = { - 0, 1, 2, 3, 4, 5, 6, 7 -}; +s16 lbl_1_data_0[8] = { 0, 1, 2, 3, 4, 5, 6, 7 }; -s32 lbl_1_data_10[8] = { - 0, 1, 2, 3, 4, 5, 6, 7 -}; +s32 lbl_1_data_10[8] = { 0, 1, 2, 3, 4, 5, 6, 7 }; -float lbl_1_data_30[10] = { - 70, 70, 70, 70, 70, 70, 70, 70, 70, 100 -}; +float lbl_1_data_30[10] = { 70, 70, 70, 70, 70, 70, 70, 70, 70, 100 }; -float lbl_1_data_58[10] = { - 150, 170, 190, 170, 160, 150, 180, 200, 150, 200 -}; +float lbl_1_data_58[10] = { 150, 170, 190, 170, 160, 150, 180, 200, 150, 200 }; void fn_1_23B4(WorkPlayerOld *player) { s32 i; - for(i=0; i<8; i++) { - if(player->unk44 == player->unk14[i]) { + for (i = 0; i < 8; i++) { + if (player->unk44 == player->unk14[i]) { player->unk40 = lbl_1_data_10[i]; return; } @@ -580,7 +572,7 @@ void fn_1_2418(float *minDist, s32 *state, s32 stateNew, Vec *posA, float aYOfs, pointA.y += aYOfs; pointB.y += bYOfs; dist = VECDistance(&pointA, &pointB); - if(*minDist > dist) { + if (*minDist > dist) { *minDist = dist; *state = stateNew; } @@ -588,11 +580,11 @@ void fn_1_2418(float *minDist, s32 *state, s32 stateNew, Vec *posA, float aYOfs, void fn_1_24F8(WorkPlayerOld *player1, WorkPlayerOld *player2, float *minDist, s32 *state) { - *minDist = 10*(player1->unkBC+player2->unkBC); + *minDist = 10 * (player1->unkBC + player2->unkBC); fn_1_2418(minDist, state, 0, &player1->unk6C, player1->unkBC, &player2->unk6C, player2->unkBC); - fn_1_2418(minDist, state, 1, &player1->unk6C, player1->unkC0-player1->unkBC, &player2->unk6C, player2->unkC0-player2->unkBC); - fn_1_2418(minDist, state, 2, &player1->unk6C, player1->unkBC, &player2->unk6C, player2->unkC0-player2->unkBC); - fn_1_2418(minDist, state, 3, &player1->unk6C, player1->unkC0-player1->unkBC, &player2->unk6C, player2->unkBC); + fn_1_2418(minDist, state, 1, &player1->unk6C, player1->unkC0 - player1->unkBC, &player2->unk6C, player2->unkC0 - player2->unkBC); + fn_1_2418(minDist, state, 2, &player1->unk6C, player1->unkBC, &player2->unk6C, player2->unkC0 - player2->unkBC); + fn_1_2418(minDist, state, 3, &player1->unk6C, player1->unkC0 - player1->unkBC, &player2->unk6C, player2->unkBC); } s32 fn_1_2824(WorkPlayerOld *player, WorkPlayerOld *player2) @@ -600,29 +592,30 @@ s32 fn_1_2824(WorkPlayerOld *player, WorkPlayerOld *player2) Vec dir; Vec dir2; float dist; - + player->unk3C |= 0x1; - player->unk90.x = player->unk20/4.0f; - player->unk90.z = -(float)player->unk24/4.0f; - if(player->unk90.x != 0.0f || player->unk90.z != 0.0f) { + player->unk90.x = player->unk20 / 4.0f; + player->unk90.z = -(float)player->unk24 / 4.0f; + if (player->unk90.x != 0.0f || player->unk90.z != 0.0f) { return; } VECSubtract(&player->unk6C, &player2->unk6C, &dir); dist = VECMagXZ(&dir); - if(0.0f == dist) { + if (0.0f == dist) { dir.x = 0; dir.z = -1; - } else { + } + else { dir.x /= dist; dir.z /= dist; } VECSubtract(&player->unk6C, &player->unk78, &dir2); dist = VECMagXZ(&dir2); - if(5 > dist) { + if (5 > dist) { dist = 5; } - player->unk90.x = dir.x*dist; - player->unk90.z = dir.z*dist; + player->unk90.x = dir.x * dist; + player->unk90.z = dir.z * dist; } void fn_1_2BD0(WorkPlayerOld *player, float arg1, float arg2) @@ -630,7 +623,7 @@ void fn_1_2BD0(WorkPlayerOld *player, float arg1, float arg2) player->unk38 = 1; player->unk84.y = arg1; player->unkA4 = arg2; - if(player->unk3C & 0x2) { + if (player->unk3C & 0x2) { player->unk3C &= ~0x2; } } @@ -709,45 +702,46 @@ void fn_1_2E34(WorkPlayerOld *player) BOOL addTime; s32 i; player->unk3C &= ~0x100; - if(player->unk3C & 0x8) { + if (player->unk3C & 0x8) { return; } - if(NULL == lbl_1_bss_A8) { + if (NULL == lbl_1_bss_A8) { return; } addTime = FALSE; - for(i=0; i<4; i++) { + for (i = 0; i < 4; i++) { WorkPlayerOld *player2 = lbl_1_bss_A8(i); BOOL fixPos; float minDist; s32 state; - if(player == player2) { - continue; + if (player == player2) { + continue; } - if(player2->unk3C & 0x8) { + if (player2->unk3C & 0x8) { continue; } fixPos = FALSE; fn_1_24F8(player, player2, &minDist, &state); - if(minDist < player->unkBC+player2->unkBC) { - if(state < 2) { + if (minDist < player->unkBC + player2->unkBC) { + if (state < 2) { fixPos = TRUE; - if(player->unk38 == 1) { + if (player->unk38 == 1) { fn_1_2824(player, player2); } - } else { - if(state == 2 && player->unk38 == 1) { + } + else { + if (state == 2 && player->unk38 == 1) { fn_1_2824(player, player2); player->unk3C |= 0x100; player->unkA4 = 0; - if(!(player2->unk3C & 0x100)) { + if (!(player2->unk3C & 0x100)) { player->unk84.y = 26.766666f; } } - if(state == 3) { + if (state == 3) { fixPos = TRUE; - if(player->unk38 == 1) { - if(0.0f < player->unk84.y) { + if (player->unk38 == 1) { + if (0.0f < player->unk84.y) { player->unk84.y = 0.0f; } player->unkA4 = 0; @@ -755,24 +749,26 @@ void fn_1_2E34(WorkPlayerOld *player) } } } - if(fixPos) { + if (fixPos) { Vec dir; addTime = TRUE; VECSubtract(&player->unk6C, &player2->unk6C, &dir); - if(0.0f == minDist) { + if (0.0f == minDist) { dir.x = 0; dir.z = -1; - } else { + } + else { dir.x /= minDist; dir.z /= minDist; } - player->unk6C.x = player2->unk6C.x+(dir.x*(player->unkBC+player2->unkBC)); - player->unk6C.z = player2->unk6C.z+(dir.z*(player->unkBC+player2->unkBC)); + player->unk6C.x = player2->unk6C.x + (dir.x * (player->unkBC + player2->unkBC)); + player->unk6C.z = player2->unk6C.z + (dir.z * (player->unkBC + player2->unkBC)); } } - if(addTime) { + if (addTime) { player->unk4C++; - } else { + } + else { player->unk4C = 0; } } @@ -783,62 +779,63 @@ float fn_1_39C4(WorkPlayerOld *player, float arg2) s32 i; AddX = 0; AddZ = 0; - if(NULL != player->unk68) { - for(pos=player->unk68, i=0; iunk64; i++, pos += 2) { + if (NULL != player->unk68) { + for (pos = player->unk68, i = 0; i < player->unk64; i++, pos += 2) { int num = 0; - if(pos[0].x == pos[1].x || pos[0].x > player->unk6C.x || pos[1].x < player->unk6C.x) { + if (pos[0].x == pos[1].x || pos[0].x > player->unk6C.x || pos[1].x < player->unk6C.x) { num++; } - if(pos[0].y == pos[1].y || pos[0].y > player->unk6C.y || pos[1].y < player->unk6C.y) { + if (pos[0].y == pos[1].y || pos[0].y > player->unk6C.y || pos[1].y < player->unk6C.y) { num++; } - if(pos[0].z == pos[1].z || pos[0].z > player->unk6C.z || pos[1].z < player->unk6C.z) { + if (pos[0].z == pos[1].z || pos[0].z > player->unk6C.z || pos[1].z < player->unk6C.z) { num++; } - if(num == 3) { - if(pos[0].x != pos[1].x) { - if(pos[0].x > player->unk6C.x) { - player->unk6C.x = pos[0].x+player->unkBC; + if (num == 3) { + if (pos[0].x != pos[1].x) { + if (pos[0].x > player->unk6C.x) { + player->unk6C.x = pos[0].x + player->unkBC; } - if(pos[1].x < player->unk6C.x) { - player->unk6C.x = pos[1].x-player->unkBC; + if (pos[1].x < player->unk6C.x) { + player->unk6C.x = pos[1].x - player->unkBC; } } - if(pos[0].y != pos[1].y) { - if(pos[0].y > player->unk6C.y) { + if (pos[0].y != pos[1].y) { + if (pos[0].y > player->unk6C.y) { player->unk6C.y = pos[0].y; } - if(pos[1].y < player->unk6C.y) { + if (pos[1].y < player->unk6C.y) { player->unk6C.y = pos[1].y; } } - if(pos[0].z != pos[1].z) { - if(pos[0].z > player->unk6C.z) { - player->unk6C.z = pos[0].z+player->unkBC; + if (pos[0].z != pos[1].z) { + if (pos[0].z > player->unk6C.z) { + player->unk6C.z = pos[0].z + player->unkBC; } - if(pos[1].z < player->unk6C.z) { - player->unk6C.z = pos[1].z-player->unkBC; + if (pos[1].z < player->unk6C.z) { + player->unk6C.z = pos[1].z - player->unkBC; } } } } } - return ABS(AddX)+ABS(AddZ); + return ABS(AddX) + ABS(AddZ); } void fn_1_3C74(WorkPlayerOld *player, s32 *state, u32 *motAttr) { *motAttr = HU3D_MOTATTR_LOOP; *state = 0; - if(0.5f <= player->unkA0) { - if(7.0f <= player->unkA0) { + if (0.5f <= player->unkA0) { + if (7.0f <= player->unkA0) { *state = 2; - } else { + } + else { *state = 1; } } - - if(player->unk14[3] >= 0 && (player->unk28 & 0x100)) { + + if (player->unk14[3] >= 0 && (player->unk28 & 0x100)) { fn_1_2BD0(player, 26.766666f, 1.0f); *motAttr = HU3D_MOTATTR_NONE; *state = 3; @@ -847,20 +844,22 @@ void fn_1_3C74(WorkPlayerOld *player, s32 *state, u32 *motAttr) void fn_1_3D4C(WorkPlayerOld *player, s32 *state, u32 *motAttr) { - if(0.0f < player->unkA4) { - if(player->unk2C & 0x100) { + if (0.0f < player->unkA4) { + if (player->unk2C & 0x100) { player->unkA4++; - if(4.0f < player->unkA4) { + if (4.0f < player->unkA4) { player->unkA4 = 0; - } else { + } + else { player->unk84.y += 3.65f; } - } else { + } + else { player->unkA4 = 0; } } player->unk84.y += -2.4333334f; - if(player->unk14[5] >= 0 && (player->unk28 & 0x140)) { + if (player->unk14[5] >= 0 && (player->unk28 & 0x140)) { player->unk38 = 3; player->unk84.y = 0.0f; player->unk3C &= ~0x3; @@ -872,13 +871,14 @@ void fn_1_3D4C(WorkPlayerOld *player, s32 *state, u32 *motAttr) void fn_1_3E60(WorkPlayerOld *player, s32 *state, u32 *motAttr) { - if((player->unk3C & 0x1000) || Hu3DMotionEndCheck(player->unk0->model[0])) { + if ((player->unk3C & 0x1000) || Hu3DMotionEndCheck(player->unk0->model[0])) { player->unk3C &= ~0x3; - if(player->unk40 == 6) { + if (player->unk40 == 6) { player->unk38 = 4; *motAttr = HU3D_MOTATTR_NONE; *state = 7; - } else { + } + else { player->unk38 = 0; *motAttr = HU3D_MOTATTR_LOOP; *state = 0; @@ -888,15 +888,14 @@ void fn_1_3E60(WorkPlayerOld *player, s32 *state, u32 *motAttr) void fn_1_3F18(WorkPlayerOld *player, s32 *state, u32 *motAttr) { - if(Hu3DMotionShiftIDGet(player->unk0->model[0]) < 0 && Hu3DMotionEndCheck(player->unk0->model[0])) { + if (Hu3DMotionShiftIDGet(player->unk0->model[0]) < 0 && Hu3DMotionEndCheck(player->unk0->model[0])) { fn_1_2BD0(player, 0.0f, 0.0f); } } - void fn_1_3FB8(WorkPlayerOld *player, s32 *state, u32 *motAttr) { - if(Hu3DMotionShiftIDGet(player->unk0->model[0]) < 0 && Hu3DMotionEndCheck(player->unk0->model[0])) { + if (Hu3DMotionShiftIDGet(player->unk0->model[0]) < 0 && Hu3DMotionEndCheck(player->unk0->model[0])) { player->unk3C &= ~0x4; player->unk38 = 0; *motAttr = HU3D_MOTATTR_LOOP; @@ -913,17 +912,18 @@ void fn_1_4054(WorkPlayerOld *player) float temp_f22; Vec *pos; BOOL temp_r27; - if(player->unk3C & 0x1) { + if (player->unk3C & 0x1) { player->unk84.x = player->unk90.x; player->unk84.z = player->unk90.z; - } else { - player->unk84.x = player->unk20/4.0f; - player->unk84.z = -(float)player->unk24/4.0f; - if(player->unk38 == 1 && 0.0f == player->unk84.x && 0.0f == player->unk84.z) { - player->unk84.x = 0.98f*(player->unk6C.x-player->unk78.x); - player->unk84.z = 0.98f*(player->unk6C.z-player->unk78.z); + } + else { + player->unk84.x = player->unk20 / 4.0f; + player->unk84.z = -(float)player->unk24 / 4.0f; + if (player->unk38 == 1 && 0.0f == player->unk84.x && 0.0f == player->unk84.z) { + player->unk84.x = 0.98f * (player->unk6C.x - player->unk78.x); + player->unk84.z = 0.98f * (player->unk6C.z - player->unk78.z); } - if(player->unk3C & 0x14) { + if (player->unk3C & 0x14) { player->unk84.x = 0; player->unk84.z = 0; player->unk28 = 0; @@ -931,15 +931,16 @@ void fn_1_4054(WorkPlayerOld *player) } player->unk78 = player->unk6C; player->unkA0 = VECMagXZ(&player->unk84); - if(0.5f <= player->unkA0) { - if(10.0f <= player->unkA0) { + if (0.5f <= player->unkA0) { + if (10.0f <= player->unkA0) { player->unk84.x /= player->unkA0; player->unk84.z /= player->unkA0; player->unkA0 = 10; - player->unk84.x = 10*player->unk84.x; - player->unk84.z = 10*player->unk84.z; + player->unk84.x = 10 * player->unk84.x; + player->unk84.z = 10 * player->unk84.z; } - } else { + } + else { player->unk84.x = 0; player->unk84.z = 0; player->unkA0 = 0; @@ -947,134 +948,137 @@ void fn_1_4054(WorkPlayerOld *player) player->unk84.x *= player->unkB8; player->unk84.z *= player->unkB8; player->unkA0 *= player->unkB8; - if(player->unk3C & 0x800) { + if (player->unk3C & 0x800) { player->unk28 |= 0x100; player->unk2C |= 0x100; - if(player->unk38 == 1) { - if(0.0f == player->unkA4) { + if (player->unk38 == 1) { + if (0.0f == player->unkA4) { player->unk3C &= ~0x800; } } } - switch(player->unk38) { + switch (player->unk38) { case 0: fn_1_3C74(player, &state, &motAttr); break; - + case 1: fn_1_3D4C(player, &state, &motAttr); break; - + case 2: fn_1_3E60(player, &state, &motAttr); break; - + case 3: fn_1_3F18(player, &state, &motAttr); break; - + case 4: fn_1_3FB8(player, &state, &motAttr); break; - + default: OSReport("*** player action error(%d)!!\n", player->unk38); break; } - if(player->unk3C & 0x2000) { + if (player->unk3C & 0x2000) { player->unk84.y = 0; } temp_f28 = 0; - if(50.0f < ABS(player->unk84.y)) { - player->unk84.y = 50.0f*((0.0f > player->unk84.y) ? -1 : 1); + if (50.0f < ABS(player->unk84.y)) { + player->unk84.y = 50.0f * ((0.0f > player->unk84.y) ? -1 : 1); } - if(player->unk3C & 0x2) { + if (player->unk3C & 0x2) { Mtx rotMtx; - MTXRotDeg(rotMtx, 'y', player->unk50[2].x-player->unk60); + MTXRotDeg(rotMtx, 'y', player->unk50[2].x - player->unk60); MTXMultVec(rotMtx, &player->unk54, &player->unk54); VECAdd(&player->unk54, &player->unk50[0], &player->unk6C); - player->unk9C += player->unk50[2].x-player->unk60; + player->unk9C += player->unk50[2].x - player->unk60; } temp_f22 = player->unk6C.y; VECAdd(&player->unk6C, &player->unk84, &player->unk6C); - if((player->unk3C & 0x1) == 0 && (0.0f != player->unk84.x || 0.0f != player->unk84.z)) { - player->unk9C = fn_1_1E20(player->unk9C, atan2d(player->unk84.x, player->unk84.z), 0.4f*player->unkB8); + if ((player->unk3C & 0x1) == 0 && (0.0f != player->unk84.x || 0.0f != player->unk84.z)) { + player->unk9C = fn_1_1E20(player->unk9C, atan2d(player->unk84.x, player->unk84.z), 0.4f * player->unkB8); } temp_f28 += fn_1_39C4(player, temp_f22); - if(nMap == 0) { + if (nMap == 0) { player->unkA8 = lbl_1_bss_A4; - } else { + } + else { player->unkA8 = MapPos(player->unk6C.x, player->unk6C.y, player->unk6C.z, player->unkC0, &player->unkAC); } temp_r27 = FALSE; - if(NULL != player->unk8) { + if (NULL != player->unk8) { pos = player->unk8(player->unk0); - if(NULL != pos) { - if(player->unkA8 < pos[1].y) { + if (NULL != pos) { + if (player->unkA8 < pos[1].y) { temp_r27 = TRUE; player->unk50 = pos; player->unkA8 = pos[1].y; } } } - if(!temp_r27 && (player->unk3C & 0x2)) { + if (!temp_r27 && (player->unk3C & 0x2)) { player->unk3C &= ~0x2; } - if(player->unk38 == 1 && player->unkA8 >= player->unk6C.y) { + if (player->unk38 == 1 && player->unkA8 >= player->unk6C.y) { player->unk38 = 2; player->unk3C &= ~0x3; player->unk6C.y = player->unkA8; player->unk84.y = 0; motAttr = HU3D_MOTATTR_NONE; state = 4; - if(player->unk40 == 5) { + if (player->unk40 == 5) { state = 6; - if(NULL != player->unk10) { + if (NULL != player->unk10) { player->unk10(player->unk0); } - if(player->unk18 < 4) { + if (player->unk18 < 4) { omVibrate(player->unk18, 12, 4, 2); } } - if(player->unk3C & 0x200) { + if (player->unk3C & 0x200) { state = -1; - if(NULL != player->unkC) { + if (NULL != player->unkC) { player->unkC(player->unk0); } } - if(temp_r27) { + if (temp_r27) { player->unk3C |= 0x2; } } - temp_f23 = player->unk6C.y-player->unkA8; - if(player->unk38 == 0 && 10.0f < temp_f23) { - if(!(player->unk3C & 0x2000) && (player->unk3C & 0x400)) { + temp_f23 = player->unk6C.y - player->unkA8; + if (player->unk38 == 0 && 10.0f < temp_f23) { + if (!(player->unk3C & 0x2000) && (player->unk3C & 0x400)) { player->unk3C |= 0x800; } - } else if(temp_r27) { - if(!(player->unk3C & 0x2)) { + } + else if (temp_r27) { + if (!(player->unk3C & 0x2)) { player->unk6C.y = player->unkA8; player->unk3C |= 0x2; } } fn_1_2E34(player); - if(NULL != player->unk4) { + if (NULL != player->unk4) { player->unk4(player->unk0); } temp_f28 += fn_1_39C4(player, player->unk6C.y); - if(player->unk3C & 0x2) { + if (player->unk3C & 0x2) { player->unk60 = player->unk50[2].x; VECSubtract(&player->unk6C, &player->unk50[0], &player->unk54); } - if(0.0f != temp_f28) { + if (0.0f != temp_f28) { player->unk48++; - } else { + } + else { player->unk48 = 0; } - if(state >= 0 && player->unk40 != state) { + if (state >= 0 && player->unk40 != state) { player->unk40 = state; player->unk44 = player->unk14[player->unk40]; - if(player->unk44 >= 0 && !(player->unk3C & 0x20)) { + if (player->unk44 >= 0 && !(player->unk3C & 0x20)) { Hu3DMotionShiftSet(player->unk0->model[0], player->unk0->motion[player->unk44], 0, 8, motAttr); } } @@ -1091,17 +1095,19 @@ void fn_1_4E1C(WorkPlayerOld *player, s32 motNo) player->unk84.y = 0; player->unk84.z = 0; fn_1_23B4(player); - if(player->unk40 == 3) { - Hu3DModelAttrReset(player->unk0->model[0], HU3D_MOTATTR_LOOP|HU3D_MOTATTR_PAUSE); + if (player->unk40 == 3) { + Hu3DModelAttrReset(player->unk0->model[0], HU3D_MOTATTR_LOOP | HU3D_MOTATTR_PAUSE); Hu3DMotionSet(player->unk0->model[0], player->unk0->motion[player->unk44]); - Hu3DMotionTimeSet(player->unk0->model[0], Hu3DMotionMaxTimeGet(player->unk0->model[0])-1); - } else if(player->unk40 == 5) { + Hu3DMotionTimeSet(player->unk0->model[0], Hu3DMotionMaxTimeGet(player->unk0->model[0]) - 1); + } + else if (player->unk40 == 5) { player->unk38 = 3; player->unk3C |= 0x4; - Hu3DModelAttrReset(player->unk0->model[0], HU3D_MOTATTR_LOOP|HU3D_MOTATTR_PAUSE); + Hu3DModelAttrReset(player->unk0->model[0], HU3D_MOTATTR_LOOP | HU3D_MOTATTR_PAUSE); Hu3DMotionSet(player->unk0->model[0], player->unk0->motion[player->unk44]); - Hu3DMotionTimeSet(player->unk0->model[0], Hu3DMotionMaxTimeGet(player->unk0->model[0])-1); - } else { + Hu3DMotionTimeSet(player->unk0->model[0], Hu3DMotionMaxTimeGet(player->unk0->model[0]) - 1); + } + else { Hu3DModelAttrReset(player->unk0->model[0], HU3D_MOTATTR_PAUSE); Hu3DMotionShiftSet(player->unk0->model[0], player->unk0->motion[player->unk44], 0, 8, HU3D_MOTATTR_LOOP); } @@ -1131,93 +1137,82 @@ Vec lbl_1_data_E8 = { -1500, 4000, 1500 }; Vec lbl_1_data_F4 = { 1.5, -4, -1.5 }; GXColor lbl_1_data_100 = { 255, 255, 255, 255 }; - Vec lbl_1_data_104 = { -1500, 4000, 1500 }; Vec lbl_1_data_110 = { 0, 0, 0 }; Vec lbl_1_data_11C = { 0, 1, 0 }; s32 lbl_1_data_128[8][5] = { - 0x005F0000, 0x005F0002, 0x005F0003, 0x005F0014, 0x005F0017, - 0x001A0000, 0x001A0002, 0x001A0003, 0x001A0014, 0x001A0017, - 0x006D0000, 0x006D0002, 0x006D0003, 0x006D0014, 0x006D0017, - 0x008A0000, 0x008A0002, 0x008A0003, 0x008A0014, 0x008A0017, - 0x00850000, 0x00850002, 0x00850003, 0x00850014, 0x00850017, - 0x00110000, 0x00110002, 0x00110003, 0x00110014, 0x00110017, - 0x000D0000, 0x000D0002, 0x000D0003, 0x000D0014, 0x000D0017, - 0x00810000, 0x00810002, 0x00810003, 0x00810014, 0x00810017 + DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x00), + DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x02), + DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x03), + DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x14), + DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x17), + DATA_MAKE_NUM(DATADIR_LUIGIMOT, 0x00), + DATA_MAKE_NUM(DATADIR_LUIGIMOT, 0x02), + DATA_MAKE_NUM(DATADIR_LUIGIMOT, 0x03), + DATA_MAKE_NUM(DATADIR_LUIGIMOT, 0x14), + DATA_MAKE_NUM(DATADIR_LUIGIMOT, 0x17), + DATA_MAKE_NUM(DATADIR_PEACHMOT, 0x00), + DATA_MAKE_NUM(DATADIR_PEACHMOT, 0x02), + DATA_MAKE_NUM(DATADIR_PEACHMOT, 0x03), + DATA_MAKE_NUM(DATADIR_PEACHMOT, 0x14), + DATA_MAKE_NUM(DATADIR_PEACHMOT, 0x17), + DATA_MAKE_NUM(DATADIR_YOSHIMOT, 0x00), + DATA_MAKE_NUM(DATADIR_YOSHIMOT, 0x02), + DATA_MAKE_NUM(DATADIR_YOSHIMOT, 0x03), + DATA_MAKE_NUM(DATADIR_YOSHIMOT, 0x14), + DATA_MAKE_NUM(DATADIR_YOSHIMOT, 0x17), + DATA_MAKE_NUM(DATADIR_WARIOMOT, 0x00), + DATA_MAKE_NUM(DATADIR_WARIOMOT, 0x02), + DATA_MAKE_NUM(DATADIR_WARIOMOT, 0x03), + DATA_MAKE_NUM(DATADIR_WARIOMOT, 0x14), + DATA_MAKE_NUM(DATADIR_WARIOMOT, 0x17), + DATA_MAKE_NUM(DATADIR_DONKEYMOT, 0x00), + DATA_MAKE_NUM(DATADIR_DONKEYMOT, 0x02), + DATA_MAKE_NUM(DATADIR_DONKEYMOT, 0x03), + DATA_MAKE_NUM(DATADIR_DONKEYMOT, 0x14), + DATA_MAKE_NUM(DATADIR_DONKEYMOT, 0x17), + DATA_MAKE_NUM(DATADIR_DAISYMOT, 0x00), + DATA_MAKE_NUM(DATADIR_DAISYMOT, 0x02), + DATA_MAKE_NUM(DATADIR_DAISYMOT, 0x03), + DATA_MAKE_NUM(DATADIR_DAISYMOT, 0x14), + DATA_MAKE_NUM(DATADIR_DAISYMOT, 0x17), + DATA_MAKE_NUM(DATADIR_WALUIGIMOT, 0x00), + DATA_MAKE_NUM(DATADIR_WALUIGIMOT, 0x02), + DATA_MAKE_NUM(DATADIR_WALUIGIMOT, 0x03), + DATA_MAKE_NUM(DATADIR_WALUIGIMOT, 0x14), + DATA_MAKE_NUM(DATADIR_WALUIGIMOT, 0x17), }; -s32 lbl_1_data_1C8[3] = { - 0x005A0002, - 0x005A0003, - 0x005A0008 -}; +s32 lbl_1_data_1C8[3] = { DATA_MAKE_NUM(DATADIR_M461, 0x02), DATA_MAKE_NUM(DATADIR_M461, 0x03), DATA_MAKE_NUM(DATADIR_M461, 0x08) }; -s32 lbl_1_data_1D4[4] = { - 0x005A0004, - 0x005A0005, - 0x005A0006, - 0x005A0007 -}; +s32 lbl_1_data_1D4[4] = { DATA_MAKE_NUM(DATADIR_M461, 0x04), DATA_MAKE_NUM(DATADIR_M461, 0x05), DATA_MAKE_NUM(DATADIR_M461, 0x06), DATA_MAKE_NUM(DATADIR_M461, 0x07) }; -float lbl_1_data_1E4[3] = { - 0.3f, - 0.5f, - 0.9f -}; +float lbl_1_data_1E4[3] = { 0.3f, 0.5f, 0.9f }; -float lbl_1_data_1F0[10][2] = { - 0, 60, - 1860, 60, - 3660, 50, - 5460, 50, - 7260, 40, - 9060, 40, - 10860, 30, - 12660, 20, - 14460, 10, - -1, 10 -}; +float lbl_1_data_1F0[10][2] = { 0, 60, 1860, 60, 3660, 50, 5460, 50, 7260, 40, 9060, 40, 10860, 30, 12660, 20, 14460, 10, -1, 10 }; -Vec lbl_1_data_240[3] = { - { 0, 0, 2800 }, - { 2800, 0, 0 }, - { -2800, 0, 0 } -}; +Vec lbl_1_data_240[3] = { { 0, 0, 2800 }, { 2800, 0, 0 }, { -2800, 0, 0 } }; -s32 lbl_1_data_264[3] = { - 70, 30, 0 -}; +s32 lbl_1_data_264[3] = { 70, 30, 0 }; typedef struct data270_struct { Vec unk0; float unkC; } Data270Struct; -Data270Struct lbl_1_data_270[8] = { - {{ 200, 0, 1400 }, 180 }, - {{ -200, 0, 1400 }, 180 }, - {{ 200, 0, -1400 }, 0 }, - {{ -200, 0, -1400 }, 0 }, - {{ 1400, 0, 200 }, 270 }, - {{ 1400, 0, -200 }, 270 }, - {{ -1400, 0, 200 }, 90 }, - {{ -1400, 0, -200}, 90 } -}; +Data270Struct lbl_1_data_270[8] = { { { 200, 0, 1400 }, 180 }, { { -200, 0, 1400 }, 180 }, { { 200, 0, -1400 }, 0 }, { { -200, 0, -1400 }, 0 }, + { { 1400, 0, 200 }, 270 }, { { 1400, 0, -200 }, 270 }, { { -1400, 0, 200 }, 90 }, { { -1400, 0, -200 }, 90 } }; -Vec lbl_1_data_2F0[4] = { - { 600, 0, 600 }, - { 600, 0, -600 }, - { -600, 0, 600 }, - { -600, 0, -600 } -}; +Vec lbl_1_data_2F0[4] = { { 600, 0, 600 }, { 600, 0, -600 }, { -600, 0, 600 }, { -600, 0, -600 } }; void fn_1_512C(void) { - if(HuPadBtn[0] & PAD_BUTTON_X) { + if (HuPadBtn[0] & PAD_BUTTON_X) { lbl_1_bss_200 = 35999; } - print8(24, 32, 1.5f, "COUNT:%d MODE:%d MES:%d %d/%d %02x", lbl_1_bss_204, lbl_1_bss_A0->work[0], lbl_1_bss_1FA, lbl_1_bss_20, lbl_1_bss_24, lbl_1_bss_28); + print8(24, 32, 1.5f, "COUNT:%d MODE:%d MES:%d %d/%d %02x", lbl_1_bss_204, lbl_1_bss_A0->work[0], lbl_1_bss_1FA, lbl_1_bss_20, lbl_1_bss_24, + lbl_1_bss_28); print8(24, 48, 1.5f, "%f %f %f", lbl_1_bss_0, lbl_1_bss_8, lbl_1_bss_4); print8(24, 64, 1.5f, "%x %x", HuMemHeapSizeGet(HEAP_SYSTEM) - HuMemUsedMallocSizeGet(HEAP_SYSTEM), HuMemHeapSizeGet(HEAP_DATA) - HuMemUsedMallocSizeGet(HEAP_DATA)); @@ -1257,14 +1252,16 @@ typedef struct work_bomhei { void fn_1_5438(Vec *pos) { float dist = VECDistance(pos, &((WorkPlayer *)lbl_1_bss_9C->data)->unk0); - if(2000 < dist) { + if (2000 < dist) { return; } - if(1000 < dist) { + if (1000 < dist) { omVibrate(lbl_1_bss_18, 12, 6, 6); - } else if(300 < dist) { + } + else if (300 < dist) { omVibrate(lbl_1_bss_18, 12, 4, 2); - } else { + } + else { omVibrate(lbl_1_bss_18, 12, 12, 0); } } @@ -1272,40 +1269,40 @@ void fn_1_5438(Vec *pos) BOOL fn_1_5528(Vec *pos, float offset) { BOOL result = FALSE; - float ofs = 700-offset; + float ofs = 700 - offset; Mtx rotMtx; - - if(ofs < pos->x) { + + if (ofs < pos->x) { pos->x = ofs; } - if(ofs < pos->z) { + if (ofs < pos->z) { pos->z = ofs; } - if(-ofs > pos->x) { + if (-ofs > pos->x) { pos->x = -ofs; } - if(-ofs > pos->z) { + if (-ofs > pos->z) { pos->z = -ofs; } - if(ofs == ABS(pos->x) || ofs == ABS(pos->z)) { + if (ofs == ABS(pos->x) || ofs == ABS(pos->z)) { result = TRUE; } MTXRotDeg(rotMtx, 'Y', 45); MTXMultVec(rotMtx, pos, pos); - ofs = (550*sqrtf(2))-offset; - if(ofs < pos->x) { + ofs = (550 * sqrtf(2)) - offset; + if (ofs < pos->x) { pos->x = ofs; } - if(ofs < pos->z) { + if (ofs < pos->z) { pos->z = ofs; } - if(-ofs > pos->x) { + if (-ofs > pos->x) { pos->x = -ofs; } - if(-ofs > pos->z) { + if (-ofs > pos->z) { pos->z = -ofs; } - if(ofs == ABS(pos->x) || ofs == ABS(pos->z)) { + if (ofs == ABS(pos->x) || ofs == ABS(pos->z)) { result = TRUE; } MTXRotDeg(rotMtx, 'Y', -45); @@ -1315,19 +1312,20 @@ BOOL fn_1_5528(Vec *pos, float offset) void fn_1_5894(Vec *pos1, Vec *pos2, float radius1, float radius2) { - float dx = pos1->x-pos2->x; - float dz = pos1->z-pos2->z; - float dist = sqrtf((dx*dx)+(dz*dz)); - if(radius1+radius2 > dist) { - if(0.0f == dist) { + float dx = pos1->x - pos2->x; + float dz = pos1->z - pos2->z; + float dist = sqrtf((dx * dx) + (dz * dz)); + if (radius1 + radius2 > dist) { + if (0.0f == dist) { dx = 0; dz = -1; - } else { + } + else { dx /= dist; dz /= dist; } - pos1->x = pos2->x+(dx*(radius1+radius2)); - pos1->z = pos2->z+(dz*(radius1+radius2)); + pos1->x = pos2->x + (dx * (radius1 + radius2)); + pos1->z = pos2->z + (dz * (radius1 + radius2)); } } @@ -1338,9 +1336,9 @@ void fn_1_5A7C(WorkPlayer *player, omObjData *obj) player->unk58 = 2002; Hu3DMotionShiftSet(obj->model[0], obj->motion[3], 0, 8, HU3D_MOTATTR_NONE); distMin = 100000; - for(i=0; i<3; i++) { + for (i = 0; i < 3; i++) { float dist = VECDistance(&lbl_1_data_240[i], &player->unk0); - if(distMin > dist) { + if (distMin > dist) { distMin = dist; player->unk3C = lbl_1_data_240[i]; } @@ -1359,45 +1357,47 @@ void fn_1_5BF4(WorkPlayer *player, omObjData *obj) player->unkC.x = 0; player->unkC.y = 0; player->unkC.z = 0; - player->unkC.x = player->unk4C/4.0f; - player->unkC.z = -(float)player->unk50/4.0f; + player->unkC.x = player->unk4C / 4.0f; + player->unkC.z = -(float)player->unk50 / 4.0f; action = 0; player->unk18.z = VECMagXZ(&player->unkC); - if(0.5f <= player->unk18.z) { - if(10.0f <= player->unk18.z) { + if (0.5f <= player->unk18.z) { + if (10.0f <= player->unk18.z) { player->unkC.x /= player->unk18.z; player->unkC.z /= player->unk18.z; player->unk18.z = 10; - player->unkC.x = 10*player->unkC.x; - player->unkC.z = 10*player->unkC.z; + player->unkC.x = 10 * player->unkC.x; + player->unkC.z = 10 * player->unkC.z; } player->unk18.y = fn_1_1E20(player->unk18.y, atan2d(player->unkC.x, player->unkC.z), 0.4f); - if(7.0f <= player->unk18.z) { + if (7.0f <= player->unk18.z) { action = 2; - } else { + } + else { action = 1; } } VECAdd(&player->unk0, &player->unkC, &player->unk0); fn_1_5528(&player->unk0, 70); - for(i=0; i<20; i++) { + for (i = 0; i < 20; i++) { WorkBomhei *bomhei; - if(NULL == lbl_1_bss_4C[i]) { + if (NULL == lbl_1_bss_4C[i]) { continue; } bomhei = lbl_1_bss_4C[i]->data; - if(bomhei->unk34 == 3004 && 30 > Hu3DMotionTimeGet(lbl_1_bss_4C[i]->model[2])) { - float dx = player->unk0.x-bomhei->unk0.x; - float dz = player->unk0.z-bomhei->unk0.z; - if(200 > sqrtf((dx*dx)+(dz*dz))) { + if (bomhei->unk34 == 3004 && 30 > Hu3DMotionTimeGet(lbl_1_bss_4C[i]->model[2])) { + float dx = player->unk0.x - bomhei->unk0.x; + float dz = player->unk0.z - bomhei->unk0.z; + if (200 > sqrtf((dx * dx) + (dz * dz))) { lbl_1_bss_14 = 1; } - } else { + } + else { fn_1_5894(&player->unk0, &bomhei->unk0, 70, 70); } } fn_1_5528(&player->unk0, 70); - if(player->unk54 != action) { + if (player->unk54 != action) { player->unk54 = action; Hu3DMotionShiftSet(obj->model[0], obj->motion[player->unk54], 0, 8, HU3D_MOTATTR_LOOP); } @@ -1409,73 +1409,74 @@ void fn_1_6A00(omObjData *obj) float dx; float dz; float dist; - switch(player->unk58) { + switch (player->unk58) { case 2000: - if(lbl_1_bss_A0->work[0] >= 1004) { + if (lbl_1_bss_A0->work[0] >= 1004) { player->unk58++; } break; - + case 2001: player->unk4C = HuPadStkX[player->unk60]; player->unk50 = HuPadStkY[player->unk60]; fn_1_5BF4(player, obj); - if(lbl_1_bss_A0->work[0] >= 1005) { - if(lbl_1_bss_14) { + if (lbl_1_bss_A0->work[0] >= 1005) { + if (lbl_1_bss_14) { fn_1_5A7C(player, obj); - } else { + } + else { player->unk58 = 2003; Hu3DMotionShiftSet(obj->model[0], obj->motion[0], 0, 8, HU3D_MOTATTR_LOOP); } } break; - + case 2002: - dx = player->unk3C.x-player->unk0.x; - dz = player->unk3C.z-player->unk0.z; - dist = sqrtf((dx*dx)+(dz*dz)); - if(player->unk48 < dist) { - dx = player->unk48*(dx/dist); - dz = player->unk48*(dz/dist); + dx = player->unk3C.x - player->unk0.x; + dz = player->unk3C.z - player->unk0.z; + dist = sqrtf((dx * dx) + (dz * dz)); + if (player->unk48 < dist) { + dx = player->unk48 * (dx / dist); + dz = player->unk48 * (dz / dist); } player->unk18.x -= player->unk48; - if(0.0f > player->unk18.x) { + if (0.0f > player->unk18.x) { player->unk18.x += 360; } - player->unk18.y = fn_1_1E20(player->unk18.y, atan2d(dx, dz)+180.0, 0.4f); + player->unk18.y = fn_1_1E20(player->unk18.y, atan2d(dx, dz) + 180.0, 0.4f); player->unk0.x += dx; player->unk0.z += dz; - dist = VECDistance(&player->unk3C, &player->unk0)/VECDistance(&player->unk3C, &player->unk30); - player->unk0.y = 500*sind(dist*180); + dist = VECDistance(&player->unk3C, &player->unk0) / VECDistance(&player->unk3C, &player->unk30); + player->unk0.y = 500 * sind(dist * 180); player->unk48 *= 1.05f; - if(lbl_1_bss_10 >= 0) { + if (lbl_1_bss_10 >= 0) { HuAudFXEmiterUpDate(lbl_1_bss_10, &player->unk0); } - if(lbl_1_bss_C >= 0) { + if (lbl_1_bss_C >= 0) { HuAudFXEmiterUpDate(lbl_1_bss_C, &player->unk0); } fn_1_5438(&player->unk24); - if(lbl_1_bss_A0->work[0] >= 1007) { + if (lbl_1_bss_A0->work[0] >= 1007) { player->unk58 = 2005; HuAudSStreamPlay(4); } break; - + case 2003: - if(lbl_1_bss_A0->work[0] >= 1007) { + if (lbl_1_bss_A0->work[0] >= 1007) { player->unk58 = 2004; HuAudSStreamPlay(1); Hu3DMotionShiftSet(obj->model[0], obj->motion[4], 0, 8, HU3D_MOTATTR_NONE); } break; - + case 2004: player->unk18.y = fn_1_1E20(player->unk18.y, 0, 0.4f); break; - + case 2005: break; - + default: OSReport("*** player mode error(%d)!!\n", player->unk58); break; @@ -1496,7 +1497,7 @@ void fn_1_7328(omObjData *obj) player->unk54 = 0; obj->model[0] = CharModelCreate(lbl_1_data_0[player->unk5C], 2); CharModelStepTypeSet(lbl_1_data_0[player->unk5C], 0); - for(i=0; i<5; i++) { + for (i = 0; i < 5; i++) { obj->motion[i] = CharModelMotionCreate(lbl_1_data_0[player->unk5C], lbl_1_data_128[player->unk5C][i]); CharModelMotionSet(lbl_1_data_0[player->unk5C], obj->motion[i]); } @@ -1523,8 +1524,8 @@ void fn_1_75B0(WorkBomhei *bomhei, omObjData *obj) float *data1F0; bomhei->unk34 = 3003; bomhei->unk24 = 10; - for(data1F0=&lbl_1_data_1F0[0][0]; 0.0f<=data1F0[0]; data1F0 += 2) { - if(data1F0[0] <= lbl_1_bss_200) { + for (data1F0 = &lbl_1_data_1F0[0][0]; 0.0f <= data1F0[0]; data1F0 += 2) { + if (data1F0[0] <= lbl_1_bss_200) { bomhei->unk24 = data1F0[1]; } } @@ -1537,20 +1538,20 @@ void fn_1_75B0(WorkBomhei *bomhei, omObjData *obj) BOOL fn_1_76CC(WorkBomhei *bomhei) { - if(bomhei->unk34 == 3002) { - if(fn_1_5528(&bomhei->unk0, 70)) { + if (bomhei->unk34 == 3002) { + if (fn_1_5528(&bomhei->unk0, 70)) { return TRUE; } - } else { - float ofs = 700-70; - - if(ofs > bomhei->unk0.x && -ofs < bomhei->unk0.x) { - if(ofs > bomhei->unk0.z && -ofs < bomhei->unk0.z) { - if(bomhei->unk28 >= 0) { + } + else { + float ofs = 700 - 70; + + if (ofs > bomhei->unk0.x && -ofs < bomhei->unk0.x) { + if (ofs > bomhei->unk0.z && -ofs < bomhei->unk0.z) { + if (bomhei->unk28 >= 0) { lbl_1_bss_28 = lbl_1_bss_28 & ~(u32)(1 << bomhei->unk28); bomhei->unk28 = -1; } - } } } @@ -1559,35 +1560,36 @@ BOOL fn_1_76CC(WorkBomhei *bomhei) void fn_1_7AD8(WorkBomhei *bomhei, omObjData *obj) { - float radius = 10*lbl_1_data_1E4[bomhei->unk30]; + float radius = 10 * lbl_1_data_1E4[bomhei->unk30]; Vec playerOfs; Vec angle; - + s32 i; s32 state; BOOL temp_r25; - + angle.x = bomhei->unkC.y; - if(bomhei->unk34 == 3002) { - switch(bomhei->unk30) { + if (bomhei->unk34 == 3002) { + switch (bomhei->unk30) { case 0: bomhei->unk18.x--; - if(0.0f > bomhei->unk18.x) { + if (0.0f > bomhei->unk18.x) { radius = 0; - if(-bomhei->unk18.y > bomhei->unk18.x) { - bomhei->unk18.y = frandmod(120)+120; - bomhei->unk18.x = frandmod(120)+120; + if (-bomhei->unk18.y > bomhei->unk18.x) { + bomhei->unk18.y = frandmod(120) + 120; + bomhei->unk18.x = frandmod(120) + 120; } - } else { + } + else { bomhei->unk18.z--; - if(0.0f > bomhei->unk18.z) { - bomhei->unk18.z = frandmod(120)+120; - bomhei->unkC.z = frandf()*360; + if (0.0f > bomhei->unk18.z) { + bomhei->unk18.z = frandmod(120) + 120; + bomhei->unkC.z = frandf() * 360; } } angle.x = bomhei->unkC.z; break; - + case 1: case 2: VECSubtract(&((WorkPlayer *)lbl_1_bss_9C->data)->unk0, &bomhei->unk0, &playerOfs); @@ -1596,49 +1598,50 @@ void fn_1_7AD8(WorkBomhei *bomhei, omObjData *obj) } } bomhei->unkC.y = fn_1_1E20(bomhei->unkC.y, angle.x, 0.05f); - angle.z = radius*sind(bomhei->unkC.y); - angle.y = radius*cosd(bomhei->unkC.y); + angle.z = radius * sind(bomhei->unkC.y); + angle.y = radius * cosd(bomhei->unkC.y); bomhei->unk0.x += angle.z; bomhei->unk0.z += angle.y; - if(0.0f < radius) { + if (0.0f < radius) { bomhei->unkC.x = fn_1_1E20(bomhei->unkC.x, atan2d(angle.z, angle.y), 0.2f); } state = 0; - if(0.5f <= radius) { - if(7.0f <= radius) { + if (0.5f <= radius) { + if (7.0f <= radius) { state = 2; - } else { + } + else { state = 1; } } temp_r25 = FALSE; - if(fn_1_76CC(bomhei)) { + if (fn_1_76CC(bomhei)) { temp_r25 = TRUE; } fn_1_5894(&bomhei->unk0, &((WorkPlayer *)lbl_1_bss_9C->data)->unk0, 70, 70); - for(i=0; i<20; i++) { + for (i = 0; i < 20; i++) { WorkBomhei *bomhei2; - if(NULL == lbl_1_bss_4C[i]) { + if (NULL == lbl_1_bss_4C[i]) { continue; } - if(obj == lbl_1_bss_4C[i]) { + if (obj == lbl_1_bss_4C[i]) { continue; } bomhei2 = lbl_1_bss_4C[i]->data; - if(bomhei2->unk34 != 3004) { + if (bomhei2->unk34 != 3004) { fn_1_5894(&bomhei->unk0, &bomhei2->unk0, 70, 70); } } - if(fn_1_76CC(bomhei)) { + if (fn_1_76CC(bomhei)) { temp_r25 = TRUE; } - if(temp_r25 && bomhei->unk30 == 0) { - float radius = frandf()*350; - float angle2 = frandf()*360; - bomhei->unkC.z = atan2d((radius*sind(angle2))-bomhei->unk0.x, (radius*cosd(angle2))-bomhei->unk0.z); - bomhei->unk18.z = frandmod(120)+120; + if (temp_r25 && bomhei->unk30 == 0) { + float radius = frandf() * 350; + float angle2 = frandf() * 360; + bomhei->unkC.z = atan2d((radius * sind(angle2)) - bomhei->unk0.x, (radius * cosd(angle2)) - bomhei->unk0.z); + bomhei->unk18.z = frandmod(120) + 120; } - if(bomhei->unk2C != state) { + if (bomhei->unk2C != state) { bomhei->unk2C = state; Hu3DMotionShiftSet(obj->model[0], obj->motion[bomhei->unk2C], 0, 8, HU3D_MOTATTR_LOOP); } @@ -1650,61 +1653,61 @@ void fn_1_8D08(omObjData *obj) { WorkBomhei *bomhei = obj->data; s32 i; - switch(bomhei->unk34) { + switch (bomhei->unk34) { case 3000: - if(lbl_1_bss_A0->work[0] >= 1004) { + if (lbl_1_bss_A0->work[0] >= 1004) { bomhei->unk34 = 3002; } break; - + case 3001: fn_1_7AD8(bomhei, obj); - if(bomhei->unk28 < 0) { + if (bomhei->unk28 < 0) { bomhei->unk34 = 3002; } break; - + case 3002: fn_1_7AD8(bomhei, obj); bomhei->unk24--; - if(0.0f > bomhei->unk24) { + if (0.0f > bomhei->unk24) { fn_1_75B0(bomhei, obj); } break; - + case 3003: bomhei->unk24--; - if(0.0f > bomhei->unk24) { + if (0.0f > bomhei->unk24) { bomhei->unk34++; Hu3DModelAttrSet(obj->model[1], HU3D_ATTR_DISPOFF); - Hu3DModelAttrReset(obj->model[2], HU3D_MOTATTR_PAUSE|HU3D_MOTATTR_LOOP); + Hu3DModelAttrReset(obj->model[2], HU3D_MOTATTR_PAUSE | HU3D_MOTATTR_LOOP); Hu3DModelAttrReset(obj->model[2], HU3D_ATTR_DISPOFF); HuAudFXEmiterPlay(2082, &bomhei->unk0); fn_1_5438(&bomhei->unk0); } break; - + case 3004: - if(Hu3DMotionEndCheck(obj->model[2])) { + if (Hu3DMotionEndCheck(obj->model[2])) { fn_1_9724(obj); return; } break; - + case 3005: break; - + default: OSReport("*** bomhei mode error(%d)!!\n", bomhei->unk34); break; } - if(bomhei->unk34 != 3004 && lbl_1_bss_A0->work[0] >= 1005) { + if (bomhei->unk34 != 3004 && lbl_1_bss_A0->work[0] >= 1005) { bomhei->unk34 = 3005; Hu3DMotionShiftSet(obj->model[0], obj->motion[0], 0, 8, HU3D_MOTATTR_LOOP); } omSetTra(obj, bomhei->unk0.x, bomhei->unk0.y, bomhei->unk0.z); omSetRot(obj, 0, bomhei->unkC.x, 0); - for(i=0; i<3; i++) { + for (i = 0; i < 3; i++) { Hu3DModelPosSet(obj->model[i], bomhei->unk0.x, bomhei->unk0.y, bomhei->unk0.z); Hu3DModelRotSet(obj->model[i], 0, bomhei->unkC.x, 0); } @@ -1718,27 +1721,30 @@ void fn_1_9164(omObjData *obj) omSetTra(obj, bomhei->unk0.x, bomhei->unk0.y, bomhei->unk0.z); omSetRot(obj, 0, bomhei->unkC.x, 0); modelId = fn_1_AC(0x1000); - if(modelId < 0) { + if (modelId < 0) { obj->model[0] = Hu3DModelLink(lbl_1_bss_3C[0]); - } else { + } + else { obj->model[0] = modelId; } modelId = fn_1_AC(0x2000); - if(modelId < 0) { + if (modelId < 0) { obj->model[1] = Hu3DModelLink(lbl_1_bss_3C[1]); - } else { + } + else { obj->model[1] = modelId; } modelId = fn_1_AC(0x3000); - if(modelId < 0) { + if (modelId < 0) { obj->model[2] = Hu3DModelLink(lbl_1_bss_3C[2]); - } else { + } + else { obj->model[2] = modelId; } - for(i=0; i<4; i++) { + for (i = 0; i < 4; i++) { obj->motion[i] = lbl_1_bss_2C[i]; } - for(i=0; i<3; i++) { + for (i = 0; i < 3; i++) { Hu3DModelAttrSet(obj->model[i], HU3D_ATTR_DISPOFF); Hu3DModelAttrSet(obj->model[i], HU3D_MOTATTR_LOOP); Hu3DModelAttrReset(obj->model[i], HU3D_MOTATTR_PAUSE); @@ -1750,8 +1756,8 @@ void fn_1_9164(omObjData *obj) Hu3DModelLayerSet(obj->model[2], 4); Hu3DModelShadowSet(obj->model[0]); Hu3DModelShadowSet(obj->model[1]); - for(i=0; i<20; i++) { - if(NULL == lbl_1_bss_4C[i]) { + for (i = 0; i < 20; i++) { + if (NULL == lbl_1_bss_4C[i]) { lbl_1_bss_4C[i] = obj; break; } @@ -1777,10 +1783,10 @@ void fn_1_956C(Vec *pos, float rotY, s32 type, s32 mode, s32 time) bomhei->unk28 = time; bomhei->unkC.y = bomhei->unkC.x; bomhei->unkC.z = bomhei->unkC.x; - bomhei->unk18.x = frandmod(120)+120; - bomhei->unk18.y = frandmod(120)+120; - bomhei->unk18.z = frandmod(120)+120; - bomhei->unk24 = frandmod(300)+180; + bomhei->unk18.x = frandmod(120) + 120; + bomhei->unk18.y = frandmod(120) + 120; + bomhei->unk18.z = frandmod(120) + 120; + bomhei->unk24 = frandmod(300) + 180; bomhei->unk2C = 0; } @@ -1788,15 +1794,15 @@ void fn_1_9724(omObjData *obj) { s32 i; lbl_1_bss_20--; - for(i=0; i<20; i++) { - if(obj == lbl_1_bss_4C[i]) { + for (i = 0; i < 20; i++) { + if (obj == lbl_1_bss_4C[i]) { lbl_1_bss_4C[i] = NULL; break; } } - for(i=0; i<3; i++) { + for (i = 0; i < 3; i++) { Hu3DModelAttrSet(obj->model[i], HU3D_ATTR_DISPOFF); - fn_1_24((i*4096)+4096, obj->model[i]); + fn_1_24((i * 4096) + 4096, obj->model[i]); } omDelObjEx(lbl_1_bss_238, obj); } @@ -1819,50 +1825,50 @@ typedef struct work_bomhei2 { void fn_1_9854(void) { - if(lbl_1_bss_200 % 900 == 0) { - if(++lbl_1_bss_24 >= 20) { + if (lbl_1_bss_200 % 900 == 0) { + if (++lbl_1_bss_24 >= 20) { lbl_1_bss_24 = 20; } } - if(lbl_1_bss_200 % 1800 == 0) { - if(lbl_1_data_264[2] < 40) { + if (lbl_1_bss_200 % 1800 == 0) { + if (lbl_1_data_264[2] < 40) { lbl_1_data_264[2] += 10; - if(lbl_1_data_264[2] > 100) { + if (lbl_1_data_264[2] > 100) { lbl_1_data_264[2] = 100; } lbl_1_data_264[1] -= 5; - if(lbl_1_data_264[1] < 0) { + if (lbl_1_data_264[1] < 0) { lbl_1_data_264[1] = 0; lbl_1_data_264[0] -= 5; } lbl_1_data_264[0] -= 5; - if(lbl_1_data_264[0] < 0) { + if (lbl_1_data_264[0] < 0) { lbl_1_data_264[0] = 0; } } } - if(lbl_1_bss_24 > lbl_1_bss_20) { + if (lbl_1_bss_24 > lbl_1_bss_20) { Data270Struct *data270 = NULL; s32 bitNum = frandmod(8); s32 i; - for(i=0; i<8; i++) { - if(((1 << bitNum) & lbl_1_bss_28) == 0) { + for (i = 0; i < 8; i++) { + if (((1 << bitNum) & lbl_1_bss_28) == 0) { data270 = &lbl_1_data_270[bitNum]; lbl_1_bss_28 |= (1 << bitNum); (void)i; break; } bitNum++; - if(bitNum >= 8) { + if (bitNum >= 8) { bitNum -= 8; } } - if(NULL != data270) { + if (NULL != data270) { s32 type = 2; s32 chance = frandmod(100); Vec pos; - for(i=0; i<3; i++) { - if(lbl_1_data_264[i] > chance) { + for (i = 0; i < 3; i++) { + if (lbl_1_data_264[i] > chance) { type = i; break; } @@ -1893,12 +1899,13 @@ WorkBomhei2 *fn_1_9CAC(omObjFunc func, s32 prio) bomhei->unk8.y = 10; bomhei->unk8.z = 0; modelId = fn_1_AC(0x1000); - if(modelId < 0) { + if (modelId < 0) { obj->model[0] = Hu3DModelLink(lbl_1_bss_3C[0]); - } else { + } + else { obj->model[0] = modelId; } - for(i=0; i<4; i++) { + for (i = 0; i < 4; i++) { obj->motion[i] = lbl_1_bss_2C[i]; } omSetTra(obj, bomhei->unk8.x, bomhei->unk8.y, bomhei->unk8.z); @@ -1920,27 +1927,27 @@ void fn_1_9EF4(omObjData *obj) float vel = 3; float dx; float dz; - + s32 state; - switch(bomhei->unk44) { + switch (bomhei->unk44) { case 0: - if(bomhei->unk3C != 1) { + if (bomhei->unk3C != 1) { bomhei->unk3C = 1; Hu3DMotionShiftSet(obj->model[0], obj->motion[bomhei->unk3C], 0, 8, HU3D_MOTATTR_LOOP); } - dx = bomhei->unk14.x-bomhei->unk8.x; - dz = bomhei->unk14.z-bomhei->unk8.z; - dist = sqrtf((dx*dx)+(dz*dz)); - if(vel < dist) { - dx = vel*(dx/dist); - dz = vel*(dz/dist); + dx = bomhei->unk14.x - bomhei->unk8.x; + dz = bomhei->unk14.z - bomhei->unk8.z; + dist = sqrtf((dx * dx) + (dz * dz)); + if (vel < dist) { + dx = vel * (dx / dist); + dz = vel * (dz / dist); } bomhei->unk8.x += dx; bomhei->unk8.z += dz; bomhei->unk2C = fn_1_1E20(bomhei->unk2C, atan2d(dx, dz), 0.4f); bomhei->unk30 = bomhei->unk2C; - if(vel > dist) { - switch(bomhei->unk40) { + if (vel > dist) { + switch (bomhei->unk40) { case 1: case 2: bomhei->unk44 = 1; @@ -1948,30 +1955,29 @@ void fn_1_9EF4(omObjData *obj) bomhei->unk3C = 0; Hu3DMotionShiftSet(obj->model[0], obj->motion[bomhei->unk3C], 0, 8, HU3D_MOTATTR_LOOP); break; - + default: bomhei->unk44 = 3; break; } } break; - + case 1: - bomhei->unk2C = fn_1_1E20(bomhei->unk2C, atan2d(parent->unk8.x-bomhei->unk8.x, parent->unk8.z-bomhei->unk8.z), 0.05f); + bomhei->unk2C = fn_1_1E20(bomhei->unk2C, atan2d(parent->unk8.x - bomhei->unk8.x, parent->unk8.z - bomhei->unk8.z), 0.05f); bomhei->unk30 = bomhei->unk2C; - parent->unk2C = fn_1_1E20(parent->unk2C, atan2d(bomhei->unk8.x-parent->unk8.x, bomhei->unk8.z-parent->unk8.z), 0.05f); + parent->unk2C = fn_1_1E20(parent->unk2C, atan2d(bomhei->unk8.x - parent->unk8.x, bomhei->unk8.z - parent->unk8.z), 0.05f); parent->unk30 = parent->unk2C; bomhei->unk34++; - if(180.0f < bomhei->unk34) { + if (180.0f < bomhei->unk34) { bomhei->unk44 = 3; - if(bomhei->unk40 == 2) { + if (bomhei->unk40 == 2) { bomhei->unk44 = 2; } } break; - - case 2: - { + + case 2: { Vec temp = parent->unk8; float tempAngle = parent->unk2C; parent->unk20 = parent->unk8; @@ -1982,40 +1988,39 @@ void fn_1_9EF4(omObjData *obj) bomhei->unk30 = tempAngle; bomhei->unk34 = 0; bomhei->unk44 = 3; - } - break; - + } break; + case 3: - bomhei->unk30 = fn_1_1E20(bomhei->unk30, atan2d(bomhei->unk20.x-bomhei->unk14.x, bomhei->unk20.z-bomhei->unk14.z), 0.2f); + bomhei->unk30 = fn_1_1E20(bomhei->unk30, atan2d(bomhei->unk20.x - bomhei->unk14.x, bomhei->unk20.z - bomhei->unk14.z), 0.2f); bomhei->unk2C = bomhei->unk30; - bomhei->unk8.x += vel*sind(bomhei->unk30); - bomhei->unk8.z += vel*cosd(bomhei->unk30); - if(bomhei->unk3C != 1) { + bomhei->unk8.x += vel * sind(bomhei->unk30); + bomhei->unk8.z += vel * cosd(bomhei->unk30); + if (bomhei->unk3C != 1) { bomhei->unk3C = 1; Hu3DMotionShiftSet(obj->model[0], obj->motion[bomhei->unk3C], 0, 8, HU3D_MOTATTR_LOOP); } parent->unk2C = fn_1_1E20(parent->unk2C, atan2d(-parent->unk8.x, -parent->unk8.z), 0.05f); bomhei->unk34++; - if(bomhei->unk40 == 2 && 60.0f < bomhei->unk34) { - dx = parent->unk20.x-parent->unk8.x; - dz = parent->unk20.z-parent->unk8.z; - dist = sqrtf((dx*dx)+(dz*dz)); - if(vel < dist) { - dx = vel*(dx/dist); - dz = vel*(dz/dist); + if (bomhei->unk40 == 2 && 60.0f < bomhei->unk34) { + dx = parent->unk20.x - parent->unk8.x; + dz = parent->unk20.z - parent->unk8.z; + dist = sqrtf((dx * dx) + (dz * dz)); + if (vel < dist) { + dx = vel * (dx / dist); + dz = vel * (dz / dist); } parent->unk8.x += dx; parent->unk8.z += dz; state = 0; - if(0.0f < dist) { + if (0.0f < dist) { state = 1; } - if(state != parent->unk3C) { + if (state != parent->unk3C) { parent->unk3C = state; Hu3DMotionShiftSet(parent->unk0->model[0], parent->unk0->motion[parent->unk3C], 0, 8, HU3D_MOTATTR_LOOP); } } - if(1750 < VECMagXZ(&bomhei->unk8)) { + if (1750 < VECMagXZ(&bomhei->unk8)) { parent->unk4 = NULL; Hu3DModelAttrSet(obj->model[0], HU3D_ATTR_DISPOFF); fn_1_24(0x1000, obj->model[0]); @@ -2026,9 +2031,9 @@ void fn_1_9EF4(omObjData *obj) } omSetTra(obj, bomhei->unk8.x, bomhei->unk8.y, bomhei->unk8.z); omSetRot(obj, 0, bomhei->unk2C, 0); - if(bomhei->unk38) { + if (bomhei->unk38) { bomhei->unk38 = 0; - Hu3DMotionTimeSet(obj->model[0], Hu3DMotionMaxTimeGet(obj->model[0])*frandf()); + Hu3DMotionTimeSet(obj->model[0], Hu3DMotionMaxTimeGet(obj->model[0]) * frandf()); Hu3DModelAttrReset(obj->model[0], HU3D_ATTR_DISPOFF); } } @@ -2037,43 +2042,44 @@ s32 fn_1_ADDC(WorkBomhei2 *parent, WorkBomhei2 *bomhei) { parent->unk4 = bomhei->unk0; bomhei->unk4 = parent->unk0; - bomhei->unk40 = frandmod(3); + bomhei->unk40 = frandmod(3); bomhei->unk44 = 0; - bomhei->unk14.x = 750.0f*((0 > parent->unk8.x) ? -1 : 1); - bomhei->unk14.z = 750.0f*((0 > parent->unk8.z) ? -1 : 1); - if(lbl_1_bss_204 & 0x1) { - bomhei->unk8.x = 1400.0f*((0 > parent->unk8.x) ? -1 : 1); - bomhei->unk8.z = 750.0f*((0 > parent->unk8.z) ? -1 : 1); - bomhei->unk20.x = 750.0f*((0 > parent->unk8.x) ? -1 : 1); - bomhei->unk20.z = 1400.0f*((0 > parent->unk8.z) ? -1 : 1); - } else { - bomhei->unk8.x = 750.0f*((0 > parent->unk8.x) ? -1 : 1); - bomhei->unk8.z = 1400.0f*((0 > parent->unk8.z) ? -1 : 1); - bomhei->unk20.x = 1400.0f*((0 > parent->unk8.x) ? -1 : 1); - bomhei->unk20.z = 750.0f*((0 > parent->unk8.z) ? -1 : 1); + bomhei->unk14.x = 750.0f * ((0 > parent->unk8.x) ? -1 : 1); + bomhei->unk14.z = 750.0f * ((0 > parent->unk8.z) ? -1 : 1); + if (lbl_1_bss_204 & 0x1) { + bomhei->unk8.x = 1400.0f * ((0 > parent->unk8.x) ? -1 : 1); + bomhei->unk8.z = 750.0f * ((0 > parent->unk8.z) ? -1 : 1); + bomhei->unk20.x = 750.0f * ((0 > parent->unk8.x) ? -1 : 1); + bomhei->unk20.z = 1400.0f * ((0 > parent->unk8.z) ? -1 : 1); } - bomhei->unk2C = atan2d(bomhei->unk14.x-bomhei->unk8.x, bomhei->unk14.z-bomhei->unk8.z); + else { + bomhei->unk8.x = 750.0f * ((0 > parent->unk8.x) ? -1 : 1); + bomhei->unk8.z = 1400.0f * ((0 > parent->unk8.z) ? -1 : 1); + bomhei->unk20.x = 1400.0f * ((0 > parent->unk8.x) ? -1 : 1); + bomhei->unk20.z = 750.0f * ((0 > parent->unk8.z) ? -1 : 1); + } + bomhei->unk2C = atan2d(bomhei->unk14.x - bomhei->unk8.x, bomhei->unk14.z - bomhei->unk8.z); bomhei->unk30 = bomhei->unk2C; } void fn_1_B234(omObjData *obj) { WorkBomhei2 *bomhei = obj->data; - if(NULL == bomhei->unk4) { + if (NULL == bomhei->unk4) { bomhei->unk2C = atan2d(-bomhei->unk8.x, -bomhei->unk8.z); bomhei->unk48--; - if(0.0f > bomhei->unk48) { + if (0.0f > bomhei->unk48) { WorkBomhei2 *bomheiNew; - bomhei->unk48 = frandmod(1200)+300; + bomhei->unk48 = frandmod(1200) + 300; bomheiNew = fn_1_9CAC(fn_1_9EF4, 102); fn_1_ADDC(bomhei, bomheiNew); } } omSetTra(obj, bomhei->unk8.x, bomhei->unk8.y, bomhei->unk8.z); omSetRot(obj, 0, bomhei->unk2C, 0); - if(bomhei->unk38) { + if (bomhei->unk38) { bomhei->unk38 = 0; - Hu3DMotionTimeSet(obj->model[0], Hu3DMotionMaxTimeGet(obj->model[0])*frandf()); + Hu3DMotionTimeSet(obj->model[0], Hu3DMotionMaxTimeGet(obj->model[0]) * frandf()); Hu3DModelAttrReset(obj->model[0], HU3D_ATTR_DISPOFF); } } @@ -2082,15 +2088,15 @@ void fn_1_D70C(omObjData *obj); void fn_1_BA2C(omObjData *obj) { - if(omSysExitReq) { + if (omSysExitReq) { fn_1_1F58(-1); WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 60); obj->func = fn_1_D70C; } lbl_1_bss_204++; - switch(obj->work[0]) { + switch (obj->work[0]) { case 1000: - if(!WipeStatGet()) { + if (!WipeStatGet()) { Vec dir; obj->work[0]++; lbl_1_bss_1C = 0; @@ -2100,61 +2106,63 @@ void fn_1_BA2C(omObjData *obj) VECNormalize(&dir, &dir); HuAudFXListnerSetEX(&lbl_1_bss_220, &dir, 14000.0, 36000.0, 1000.0, 300.0, 300.0); } - + break; - + case 1001: lbl_1_bss_1C++; - if(30.0f < lbl_1_bss_1C) { + if (30.0f < lbl_1_bss_1C) { obj->work[0]++; lbl_1_bss_1C = 0; } break; - + case 1002: lbl_1_bss_1C++; - fn_1_13DC(lbl_1_bss_1C/120, &lbl_1_data_D0); - if(120.0f <= lbl_1_bss_1C) { + fn_1_13DC(lbl_1_bss_1C / 120, &lbl_1_data_D0); + if (120.0f <= lbl_1_bss_1C) { obj->work[0]++; lbl_1_bss_1C = 0; fn_1_1350(&lbl_1_data_C4, &lbl_1_data_D0, &lbl_1_data_DC); } break; - + case 1003: - if(lbl_1_bss_1FA < 0) { + if (lbl_1_bss_1FA < 0) { lbl_1_bss_1FA = MGSeqStartCreate(); - } else { - if(lbl_1_bss_1F4 < 0 && (MGSeqStatGet(lbl_1_bss_1FA) & 0x10)) { + } + else { + if (lbl_1_bss_1F4 < 0 && (MGSeqStatGet(lbl_1_bss_1FA) & 0x10)) { fn_1_1F24(70); } - if(MGSeqStatGet(lbl_1_bss_1FA) == 0) { + if (MGSeqStatGet(lbl_1_bss_1FA) == 0) { obj->work[0]++; lbl_1_bss_1FA = -1; } } break; - + case 1004: lbl_1_bss_200++; fn_1_580(lbl_1_bss_1AC, 0, lbl_1_bss_200); - if(lbl_1_bss_14 || 35999 <= lbl_1_bss_200) { + if (lbl_1_bss_14 || 35999 <= lbl_1_bss_200) { obj->work[0] = 1005; lbl_1_bss_1C = 0; } fn_1_9854(); break; - + case 1005: - if(lbl_1_bss_1FA < 0) { + if (lbl_1_bss_1FA < 0) { lbl_1_bss_1FA = MGSeqFinishCreate(); fn_1_1F58(100); mgRecordExtra = lbl_1_bss_200; - } else { + } + else { lbl_1_bss_1C++; - if(60.0f < lbl_1_bss_1C && !MGSeqStatGet(lbl_1_bss_1FA)) { + if (60.0f < lbl_1_bss_1C && !MGSeqStatGet(lbl_1_bss_1FA)) { obj->work[0] = 1007; - if(lbl_1_bss_1FC < lbl_1_bss_200) { + if (lbl_1_bss_1FC < lbl_1_bss_200) { obj->work[0] = 1006; fn_1_798(13); } @@ -2163,29 +2171,30 @@ void fn_1_BA2C(omObjData *obj) } } break; - + case 1006: - if(lbl_1_bss_1FA < 0) { + if (lbl_1_bss_1FA < 0) { lbl_1_bss_1FA = MGSeqRecordCreate(lbl_1_bss_1FC); - } else { - if(!MGSeqStatGet(lbl_1_bss_1FA)) { + } + else { + if (!MGSeqStatGet(lbl_1_bss_1FA)) { obj->work[0]++; lbl_1_bss_1C = 0; lbl_1_bss_1FA = -1; } } break; - + case 1007: lbl_1_bss_1C++; - if(210.0f < lbl_1_bss_1C) { + if (210.0f < lbl_1_bss_1C) { fn_1_1F58(-1); lbl_1_bss_1FA = -1; WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 60); obj->func = fn_1_D70C; } break; - + default: OSReport("*** main mode error(%d)!!\n", obj->work[0]); break; @@ -2196,23 +2205,23 @@ void fn_1_BA2C(omObjData *obj) void fn_1_C970(omObjData *obj) { s32 i; - obj->model[0] = Hu3DModelCreateFile(0x5A0000); - Hu3DModelAttrSet(obj->model[0], HU3D_ATTR_NOCULL|HU3D_ATTR_DISPOFF); + obj->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M461, 0x00)); + Hu3DModelAttrSet(obj->model[0], HU3D_ATTR_NOCULL | HU3D_ATTR_DISPOFF); Hu3DModelAttrSet(obj->model[0], HU3D_MOTATTR_PAUSE); Hu3DModelLayerSet(obj->model[0], 0); Hu3DModelShadowMapSet(obj->model[0]); omSetTra(obj, 0, 0, 0); omSetRot(obj, 0, 0, 0); - obj->model[1] = Hu3DModelCreateFile(0x5A0001); - Hu3DModelAttrSet(obj->model[1], HU3D_ATTR_NOCULL|HU3D_ATTR_DISPOFF); + obj->model[1] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M461, 0x01)); + Hu3DModelAttrSet(obj->model[1], HU3D_ATTR_NOCULL | HU3D_ATTR_DISPOFF); Hu3DModelAttrSet(obj->model[1], HU3D_MOTATTR_PAUSE); Hu3DModelLayerSet(obj->model[1], 1); Hu3DModelShadowSet(obj->model[1]); Hu3DModelPosSet(obj->model[1], 0, 0, 0); Hu3DModelRotSet(obj->model[1], 0, 0, 0); - fn_1_B4C(64, 0x5A0009); + fn_1_B4C(64, DATA_MAKE_NUM(DATADIR_M461, 0x09)); fn_1_9EC(); - for(i=0; i<2; i++) { + for (i = 0; i < 2; i++) { Hu3DModelAttrReset(obj->model[i], HU3D_ATTR_DISPOFF); } HuAudFXPlay(2085); @@ -2254,45 +2263,45 @@ void ObjectSetup(void) Hu3DShadowTPLvlSet(0.5f); Hu3DShadowPosSet(&lbl_1_data_104, &lbl_1_data_11C, &lbl_1_data_110); fn_1_0(); - for(i=0; i<20; i++) { + for (i = 0; i < 20; i++) { s32 modelId; lbl_1_bss_4C[i] = NULL; - modelId = Hu3DModelCreateFile(0x5A0008); + modelId = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M461, 0x08)); Hu3DModelAttrSet(modelId, HU3D_ATTR_DISPOFF); fn_1_24(12288, modelId); } - for(i=0; i<3; i++) { + for (i = 0; i < 3; i++) { lbl_1_bss_3C[i] = Hu3DModelCreateFile(lbl_1_data_1C8[i]); - Hu3DModelAttrSet(lbl_1_bss_3C[i], HU3D_ATTR_NOCULL|HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(lbl_1_bss_3C[i], HU3D_ATTR_NOCULL | HU3D_ATTR_DISPOFF); } - for(i=0; i<4; i++) { + for (i = 0; i < 4; i++) { lbl_1_bss_2C[i] = Hu3DJointMotionFile(lbl_1_bss_3C[0], lbl_1_data_1D4[i]); } lbl_1_bss_28 = 0; lbl_1_bss_20 = 0; lbl_1_bss_24 = 10; - angle = 360.0f*frandf(); + angle = 360.0f * frandf(); radiusPrev = -1; - for(i=0; iunk8 = lbl_1_data_2F0[i]; bomhei2->unk2C = atan2d(-bomhei2->unk8.x, -bomhei2->unk8.z); - bomhei2->unk48 = frandmod(1200)+300; + bomhei2->unk48 = frandmod(1200) + 300; } lbl_1_bss_9C = omAddObjEx(lbl_1_bss_238, 100, 1, 5, -1, fn_1_7328); lbl_1_bss_A0 = omAddObjEx(lbl_1_bss_238, 104, 2, 0, -1, fn_1_C970); @@ -2303,18 +2312,18 @@ void ObjectSetup(void) void fn_1_D70C(omObjData *obj) { s32 i; - if(WipeStatGet()) { + if (WipeStatGet()) { return; } - if(lbl_1_bss_1FA >= 0) { + if (lbl_1_bss_1FA >= 0) { MGSeqKill(lbl_1_bss_1FA); } - if(lbl_1_bss_1F8 >= 0) { + if (lbl_1_bss_1F8 >= 0) { MGSeqKill(lbl_1_bss_1F8); } MGSeqKillAll(); HuAudAllStop(); - for(i=0; i<4; i++) { + for (i = 0; i < 4; i++) { CharModelKill(lbl_1_data_0[GWPlayerCfg[i].character]); } omOvlReturnEx(1, 1); diff --git a/src/REL/mstory2Dll/board_clear.c b/src/REL/mstory2Dll/board_clear.c index 206854e1..b4013800 100644 --- a/src/REL/mstory2Dll/board_clear.c +++ b/src/REL/mstory2Dll/board_clear.c @@ -10,12 +10,13 @@ #include "game/hsfman.h" #include "game/hsfmotion.h" #include "game/minigame_seq.h" +#include "game/objsub.h" +#include "game/pad.h" #include "game/printfunc.h" #include "game/sprite.h" #include "game/window.h" #include "game/wipe.h" -#include "game/pad.h" -#include "game/objsub.h" + typedef struct { /* 0x000 */ s32 unk00; @@ -42,17 +43,17 @@ void fn_1_C858(void); void fn_1_CCCC(int arg0, int arg1, int arg2, int arg3, int arg4); void fn_1_CD78(void); void fn_1_D224(int arg0, int arg1, int arg2, int arg3, int arg4); -void fn_1_D2D0(omObjData* arg0, StructBss16C* arg1); +void fn_1_D2D0(omObjData *arg0, StructBss16C *arg1); void fn_1_D478(void); void fn_1_D764(int arg0); void fn_1_DB58(int arg0, int arg1, int arg2, int arg3, int arg4); -void fn_1_DC54(omObjData* arg0, StructBss16C* arg1); +void fn_1_DC54(omObjData *arg0, StructBss16C *arg1); void fn_1_DDC4(void); void fn_1_E1B8(void); void fn_1_E244(void); void fn_1_E334(void); -void fn_1_B37C(omObjData* arg0, StructBss16C* arg1) +void fn_1_B37C(omObjData *arg0, StructBss16C *arg1) { fn_1_BE8(30); fn_1_DB58(4, -1, 15, 1, 0); @@ -60,7 +61,7 @@ void fn_1_B37C(omObjData* arg0, StructBss16C* arg1) arg1->unk04 = NULL; } -void fn_1_B3E4(Process* arg0, s32 arg1) +void fn_1_B3E4(Process *arg0, s32 arg1) { int i; lbl_1_bss_298 = arg0; @@ -73,20 +74,19 @@ void fn_1_B3E4(Process* arg0, s32 arg1) HuPrcChildCreate(fn_1_C858, 100, 8192, 0, HuPrcCurrentGet()); HuPrcChildCreate(fn_1_CD78, 100, 8192, 0, HuPrcCurrentGet()); HuPrcChildCreate(fn_1_D478, 100, 8192, 0, HuPrcCurrentGet()); - for(i=0; i<4; i++) { + for (i = 0; i < 4; i++) { HuPrcChildCreate(fn_1_DDC4, 100, 8192, 0, HuPrcCurrentGet()); } HuPrcChildCreate(fn_1_C4C0, 100, 8192, 0, HuPrcCurrentGet()); - } void fn_1_B518(omObjData *object) { - if(object->work[2]) { + if (object->work[2]) { object->work[2]--; return; } - if(object->work[2] == 0 && Hu3DMotionEndCheck(object->model[1])) { + if (object->work[2] == 0 && Hu3DMotionEndCheck(object->model[1])) { fn_1_1DFC(object, 1, object->work[1], 15, 1); object->work[0] = object->work[1] = object->work[2] = 0; } @@ -98,42 +98,47 @@ void fn_1_B5A4(void) int posY = 40; GXColor winColor = { 0, 0, 128, 128 }; int i; - while(1) { + while (1) { fn_1_BC8(); printWin(posX, posY, 220, 160, &winColor); - if(lbl_1_bss_3B4.unk04 == NULL) { + if (lbl_1_bss_3B4.unk04 == NULL) { print8(posX, posY, 1, "PROC_MAIN -> FALSE"); - } else { + } + else { print8(posX, posY, 1, "PROC_MAIN -> TRUE"); } - if(lbl_1_bss_38C.unk04 == NULL) { - print8(posX, posY+10, 1, "PROC_MAP -> FALSE"); - } else { - print8(posX, posY+10, 1, "PROC_MAP -> TRUE"); + if (lbl_1_bss_38C.unk04 == NULL) { + print8(posX, posY + 10, 1, "PROC_MAP -> FALSE"); } - if(lbl_1_bss_364.unk04 == NULL) { - print8(posX, posY+20, 1, "PROC_KOOPA -> FALSE"); - } else { - print8(posX, posY+20, 1, "PROC_KOOPA -> TRUE"); + else { + print8(posX, posY + 10, 1, "PROC_MAP -> TRUE"); } - if(lbl_1_bss_33C.unk04 == NULL) { - print8(posX, posY+30, 1, "PROC_MKOOPA -> FALSE"); - } else { - print8(posX, posY+30, 1, "PROC_MKOOPA -> TRUE"); + if (lbl_1_bss_364.unk04 == NULL) { + print8(posX, posY + 20, 1, "PROC_KOOPA -> FALSE"); } - for(i=0; i<4; i++) { - if(lbl_1_bss_29C[i].unk04 == NULL) { - print8(posX, posY+40+(i*10), 1, "PROC_PLAYER%d -> FALSE", i); - } else { - print8(posX, posY+40+(i*10), 1, "PROC_PLAYER%d -> TRUE", i); + else { + print8(posX, posY + 20, 1, "PROC_KOOPA -> TRUE"); + } + if (lbl_1_bss_33C.unk04 == NULL) { + print8(posX, posY + 30, 1, "PROC_MKOOPA -> FALSE"); + } + else { + print8(posX, posY + 30, 1, "PROC_MKOOPA -> TRUE"); + } + for (i = 0; i < 4; i++) { + if (lbl_1_bss_29C[i].unk04 == NULL) { + print8(posX, posY + 40 + (i * 10), 1, "PROC_PLAYER%d -> FALSE", i); + } + else { + print8(posX, posY + 40 + (i * 10), 1, "PROC_PLAYER%d -> TRUE", i); } } - print8(posX, posY+90, 1, "P:%d W:%d", lbl_1_bss_3DC.unk00, lbl_1_bss_3DC.unk0C); - print8(posX, posY+110, 1, "NO) IDX:GRP:COM:DIF:PAD:CHR"); - for(i=0; i<4; i++) { - print8(posX, posY+120+(i*10), 1, "%2d) %3d:%3d:%3d:%3d:%3d:%3d", i, lbl_1_bss_3DC.unk30[i].unk00, lbl_1_bss_3DC.unk30[i].unk04, lbl_1_bss_3DC.unk30[i].unk08, lbl_1_bss_3DC.unk30[i].unk0C, lbl_1_bss_3DC.unk30[i].unk14, lbl_1_bss_3DC.unk30[i].unk10); + print8(posX, posY + 90, 1, "P:%d W:%d", lbl_1_bss_3DC.unk00, lbl_1_bss_3DC.unk0C); + print8(posX, posY + 110, 1, "NO) IDX:GRP:COM:DIF:PAD:CHR"); + for (i = 0; i < 4; i++) { + print8(posX, posY + 120 + (i * 10), 1, "%2d) %3d:%3d:%3d:%3d:%3d:%3d", i, lbl_1_bss_3DC.unk30[i].unk00, lbl_1_bss_3DC.unk30[i].unk04, + lbl_1_bss_3DC.unk30[i].unk08, lbl_1_bss_3DC.unk30[i].unk0C, lbl_1_bss_3DC.unk30[i].unk14, lbl_1_bss_3DC.unk30[i].unk10); } - } } @@ -152,15 +157,15 @@ void fn_1_B9E0(void) lbl_1_bss_29C[lbl_1_bss_3DC.unk00].unk04 = (void *)fn_1_DC54; fn_1_3854(&lbl_1_bss_24); fn_1_2750(fn_1_E244); - while(1) { + while (1) { fn_1_BC8(); - if(lbl_1_bss_29C[lbl_1_bss_3DC.unk00].unk04 == NULL) { + if (lbl_1_bss_29C[lbl_1_bss_3DC.unk00].unk04 == NULL) { break; } } - while(1) { + while (1) { fn_1_BC8(); - if(lbl_1_bss_33C.unk04 == NULL) { + if (lbl_1_bss_33C.unk04 == NULL) { break; } } @@ -181,8 +186,8 @@ void fn_1_BA90(void) fn_1_1A94(lbl_1_bss_3DC.unk04); HuAudSeqFadeOut(lbl_1_bss_78[0], 1000); fn_1_BE8(60); - for(i=0; i<4; i++) { - if(lbl_1_bss_3DC.unk30[i].unk00 != lbl_1_bss_3DC.unk30[lbl_1_bss_3DC.unk00].unk00) { + for (i = 0; i < 4; i++) { + if (lbl_1_bss_3DC.unk30[i].unk00 != lbl_1_bss_3DC.unk30[lbl_1_bss_3DC.unk00].unk00) { Hu3DModelAttrSet(lbl_1_bss_29C[i].unk00->model[1], 1); } Hu3DModelAttrSet(lbl_1_bss_29C[i].unk00->model[2], 1); @@ -236,9 +241,9 @@ void fn_1_BF48(void) int padNo; WipeColorSet(0, 0, 0); WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, -1); - while(1) { + while (1) { fn_1_BC8(); - if(!WipeStatGet()) { + if (!WipeStatGet()) { break; } } @@ -253,14 +258,14 @@ void fn_1_BF48(void) GWPlayerCfg[0].pad_idx = padNo; GWPlayerCfg[0].group = 0; GWPlayerCfg[0].iscom = FALSE; - for(i=0; i<4; i++) { + for (i = 0; i < 4; i++) { GWPlayer[i].character = GWPlayerCfg[i].character; GWPlayer[i].port = GWPlayerCfg[i].pad_idx; GWPlayer[i].com = GWPlayerCfg[i].iscom; GWPlayer[i].team = GWPlayerCfg[i].group; } GWPlayerCfg[1].character = 8; - for(i=1; i<4; i++) { + for (i = 1; i < 4; i++) { GWPlayerCfg[i].iscom = GWPlayerCfg[i].group = 1; } his = omOvlHisGet(0); @@ -269,14 +274,14 @@ void fn_1_BF48(void) HuAudSStreamAllFadeOut(1000); GWSystem.mg_type = -1; GWMGAvailSet(450); - GWSystem.mg_next = 450-401; + GWSystem.mg_next = 450 - 401; omOvlCallEx(OVL_M450, 1, 0, 0); - while(1) { + while (1) { fn_1_BC8(); } } -void fn_1_C270(omObjData* arg0, StructBss16C* arg1) +void fn_1_C270(omObjData *arg0, StructBss16C *arg1) { int temp = 0; fn_1_B984(); @@ -293,9 +298,9 @@ void fn_1_C4C0(void) lbl_1_bss_3B4.unk00 = obj = omAddObjEx(lbl_1_bss_298, 256, 16, 16, -1, NULL); lbl_1_bss_3B4.unk04 = (void *)fn_1_C270; lbl_1_bss_3B4.unk00->data = &lbl_1_bss_3B4; - while(1) { + while (1) { fn_1_BC8(); - if(lbl_1_bss_3B4.unk04 != NULL) { + if (lbl_1_bss_3B4.unk04 != NULL) { lbl_1_bss_3B4.unk04(obj, &lbl_1_bss_3B4); } } @@ -324,10 +329,10 @@ void fn_1_C574(omObjData *object) fn_1_1DFC(object, 6, 6, 0, 2); } -void fn_1_C79C(omObjData* arg0, StructBss16C* arg1) +void fn_1_C79C(omObjData *arg0, StructBss16C *arg1) { Hu3DData[arg0->model[5]].pos.y = fn_1_B08(80, 90, arg1->unk08++, 360); - if(arg1->unk08 >= 360) { + if (arg1->unk08 >= 360) { arg1->unk08 = 0; } } @@ -339,9 +344,9 @@ void fn_1_C858(void) lbl_1_bss_38C.unk04 = (void *)fn_1_C79C; lbl_1_bss_38C.unk00->data = &lbl_1_bss_38C; fn_1_C574(obj); - while(1) { + while (1) { fn_1_BC8(); - if(lbl_1_bss_38C.unk04 != NULL) { + if (lbl_1_bss_38C.unk04 != NULL) { lbl_1_bss_38C.unk04(obj, &lbl_1_bss_38C); } } @@ -365,12 +370,12 @@ void fn_1_CB0C(omObjData *object) void fn_1_CCCC(int arg0, int arg1, int arg2, int arg3, int arg4) { fn_1_1DFC(lbl_1_bss_364.unk00, 1, arg0, arg2, arg3); - if(arg3 == 1) { + if (arg3 == 1) { arg4 = 0; } lbl_1_bss_364.unk00->work[0] = arg4; lbl_1_bss_364.unk00->work[1] = arg1; - lbl_1_bss_364.unk00->work[2] = arg2+1; + lbl_1_bss_364.unk00->work[2] = arg2 + 1; } void fn_1_CD78(void) @@ -380,15 +385,16 @@ void fn_1_CD78(void) lbl_1_bss_364.unk04 = NULL; lbl_1_bss_364.unk00->data = &lbl_1_bss_38C; fn_1_CB0C(obj); - while(1) { + while (1) { fn_1_BC8(); - if(lbl_1_bss_364.unk04 != NULL) { + if (lbl_1_bss_364.unk04 != NULL) { lbl_1_bss_364.unk04(obj, &lbl_1_bss_364); } - if(obj->work[0]) { - if(obj->work[2]) { + if (obj->work[0]) { + if (obj->work[2]) { obj->work[2]--; - } else if(obj->work[2] == 0 && Hu3DMotionEndCheck(obj->model[1])) { + } + else if (obj->work[2] == 0 && Hu3DMotionEndCheck(obj->model[1])) { fn_1_1DFC(obj, 1, obj->work[1], 15, 1); obj->work[0] = obj->work[1] = obj->work[2] = 0; } @@ -415,25 +421,25 @@ void fn_1_D030(omObjData *object) void fn_1_D224(int arg0, int arg1, int arg2, int arg3, int arg4) { fn_1_1DFC(lbl_1_bss_33C.unk00, 1, arg0, arg2, arg3); - if(arg3 == 1) { + if (arg3 == 1) { arg4 = 0; } lbl_1_bss_33C.unk00->work[0] = arg4; lbl_1_bss_33C.unk00->work[1] = arg1; - lbl_1_bss_33C.unk00->work[2] = arg2+1; + lbl_1_bss_33C.unk00->work[2] = arg2 + 1; } -void fn_1_D2D0(omObjData* arg0, StructBss16C* arg1) +void fn_1_D2D0(omObjData *arg0, StructBss16C *arg1) { int i; - for(i=0; i<15; i++) { + for (i = 0; i < 15; i++) { fn_1_BC8(); Hu3DData[arg0->model[1]].rot.y = fn_1_864(0, 135, i, 15); } arg1->unk04 = NULL; } -void fn_1_D394(omObjData* arg0, StructBss16C* arg1) +void fn_1_D394(omObjData *arg0, StructBss16C *arg1) { Vec pos = { -120, 0, 800 }; fn_1_1DFC(arg0, 1, 2, 15, 1); @@ -449,15 +455,16 @@ void fn_1_D478(void) lbl_1_bss_33C.unk04 = NULL; lbl_1_bss_33C.unk00->data = &lbl_1_bss_33C; fn_1_D030(obj); - while(1) { + while (1) { fn_1_BC8(); - if(lbl_1_bss_33C.unk04 != NULL) { + if (lbl_1_bss_33C.unk04 != NULL) { lbl_1_bss_33C.unk04(obj, &lbl_1_bss_33C); } - if(obj->work[0]) { - if(obj->work[2]) { + if (obj->work[0]) { + if (obj->work[2]) { obj->work[2]--; - } else if(obj->work[2] == 0 && Hu3DMotionEndCheck(obj->model[1])) { + } + else if (obj->work[2] == 0 && Hu3DMotionEndCheck(obj->model[1])) { fn_1_1DFC(obj, 1, obj->work[1], 15, 1); obj->work[0] = obj->work[1] = obj->work[2] = 0; } @@ -470,20 +477,20 @@ void fn_1_D764(int arg0) int i; int order[4]; order[0] = 0; - for(i=1; i<4; i++) { - order[i] = order[i-1]+1; - if(order[i] >= 4) { + for (i = 1; i < 4; i++) { + order[i] = order[i - 1] + 1; + if (order[i] >= 4) { order[i] = 0; } - if(arg0 == order[i]) { + if (arg0 == order[i]) { lbl_1_bss_3DC.unk00 = i; } } - for(i=0; i<4; i++) { + for (i = 0; i < 4; i++) { fn_1_357C(&lbl_1_bss_3DC.unk30[i], order[i]); } - for(i=0; i<4; i++) { - lbl_1_bss_3DC.unk30[i].unk18 = GWPlayer[order[i]].rank+1; + for (i = 0; i < 4; i++) { + lbl_1_bss_3DC.unk30[i].unk18 = GWPlayer[order[i]].rank + 1; } } @@ -499,20 +506,22 @@ void fn_1_D898(omObjData *object, int player) int playerNo = player; int charNo = lbl_1_bss_3DC.unk30[playerNo].unk10; object->model[1] = CharModelCreate(charNo, 4); - object->motion[1] = CharModelMotionCreate(charNo, 0x5F0000); - object->motion[2] = CharModelMotionCreate(charNo, 0x5F0003); - object->motion[3] = CharModelMotionCreate(charNo, 0x5F0005); - object->motion[4] = CharModelMotionCreate(charNo, 0x5F001A); - object->motion[5] = CharModelMotionCreate(charNo, 0x5F006D); + object->motion[1] = CharModelMotionCreate(charNo, DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x00)); + object->motion[2] = CharModelMotionCreate(charNo, DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x03)); + object->motion[3] = CharModelMotionCreate(charNo, DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x05)); + object->motion[4] = CharModelMotionCreate(charNo, DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x1A)); + object->motion[5] = CharModelMotionCreate(charNo, DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x6D)); CharModelMotionDataClose(charNo); - Hu3DModelPosSet(object->model[1], lbl_1_data_668[playerNo].x, lbl_1_data_668[lbl_1_bss_3DC.unk30[playerNo].unk18-1].y+90, lbl_1_data_668[playerNo].z); + Hu3DModelPosSet( + object->model[1], lbl_1_data_668[playerNo].x, lbl_1_data_668[lbl_1_bss_3DC.unk30[playerNo].unk18 - 1].y + 90, lbl_1_data_668[playerNo].z); Hu3DModelRotSet(object->model[1], 0, 0, 0); Hu3DModelScaleSet(object->model[1], 1, 1, 1); Hu3DModelShadowSet(object->model[1]); fn_1_1DFC(object, 1, 1, 0, 1); object->model[2] = Hu3DModelCreateFile(0x660056); - Hu3DModelPosSet(object->model[2], lbl_1_data_668[playerNo].x, lbl_1_data_668[lbl_1_bss_3DC.unk30[playerNo].unk18-1].y, lbl_1_data_668[playerNo].z); - if(lbl_1_bss_3DC.unk30[playerNo].unk18 == 4) { + Hu3DModelPosSet( + object->model[2], lbl_1_data_668[playerNo].x, lbl_1_data_668[lbl_1_bss_3DC.unk30[playerNo].unk18 - 1].y, lbl_1_data_668[playerNo].z); + if (lbl_1_bss_3DC.unk30[playerNo].unk18 == 4) { Hu3DModelAttrSet(object->model[2], 1); } Hu3DModelScaleSet(object->model[2], 1.5, 1, 1.5); @@ -522,15 +531,15 @@ void fn_1_D898(omObjData *object, int player) void fn_1_DB58(int arg0, int arg1, int arg2, int arg3, int arg4) { fn_1_1DFC(lbl_1_bss_29C[lbl_1_bss_3DC.unk00].unk00, 1, arg0, arg2, arg3); - if(arg3 == 1) { + if (arg3 == 1) { arg4 = 0; } lbl_1_bss_29C[lbl_1_bss_3DC.unk00].unk00->work[0] = arg4; lbl_1_bss_29C[lbl_1_bss_3DC.unk00].unk00->work[1] = arg1; - lbl_1_bss_29C[lbl_1_bss_3DC.unk00].unk00->work[2] = arg2+1; + lbl_1_bss_29C[lbl_1_bss_3DC.unk00].unk00->work[2] = arg2 + 1; } -void fn_1_DC54(omObjData* arg0, StructBss16C* arg1) +void fn_1_DC54(omObjData *arg0, StructBss16C *arg1) { Vec pos = { 120, 0, 800 }; fn_1_2948(arg0, 1, pos, -1, 30, 10); @@ -550,15 +559,16 @@ void fn_1_DDC4(void) lbl_1_bss_29C[playerNo].unk04 = NULL; lbl_1_bss_29C[playerNo].unk00->data = &lbl_1_bss_29C[0]; fn_1_D898(obj, playerNo); - while(1) { + while (1) { fn_1_BC8(); - if(lbl_1_bss_29C[playerNo].unk04 != NULL) { + if (lbl_1_bss_29C[playerNo].unk04 != NULL) { lbl_1_bss_29C[playerNo].unk04(obj, &lbl_1_bss_29C[playerNo]); } - if(obj->work[0]) { - if(obj->work[2]) { + if (obj->work[0]) { + if (obj->work[2]) { obj->work[2]--; - } else if(obj->work[2] == 0 && Hu3DMotionEndCheck(obj->model[1])) { + } + else if (obj->work[2] == 0 && Hu3DMotionEndCheck(obj->model[1])) { fn_1_1DFC(obj, 1, obj->work[1], 15, 1); obj->work[0] = obj->work[1] = obj->work[2] = 0; } @@ -596,7 +606,7 @@ void fn_1_E334(void) { StructBss24 *work = &lbl_1_bss_24; StructBss24 temp; - if(work->unk40 == 50) { + if (work->unk40 == 50) { fn_1_1DFC(lbl_1_bss_38C.unk00, 5, 5, 0, 0); fn_1_1DFC(lbl_1_bss_38C.unk00, 6, 6, 0, 0); HuAudFXPlay(161); @@ -609,11 +619,11 @@ void fn_1_E334(void) temp.unk20.z = 0; temp.unk38 = 150; fn_1_4FEC(work, &temp, work->unk40, 180, 10); - if(work->unk40++ >= 90) { - if(work->unk40 == 91) { + if (work->unk40++ >= 90) { + if (work->unk40 == 91) { lbl_1_bss_88[0] = HuAudFXPlay(32); } - work->unk20.x = fn_1_864(work->unk20.x, -45, work->unk40-90, 90); - Hu3DData[lbl_1_bss_38C.unk00->model[5]].rot.x = fn_1_864(0, 45, work->unk40-90, 90); + work->unk20.x = fn_1_864(work->unk20.x, -45, work->unk40 - 90, 90); + Hu3DData[lbl_1_bss_38C.unk00->model[5]].rot.x = fn_1_864(0, 45, work->unk40 - 90, 90); } -} \ No newline at end of file +} diff --git a/src/REL/mstory2Dll/board_entrance.c b/src/REL/mstory2Dll/board_entrance.c index d1ac7abb..c1b93643 100644 --- a/src/REL/mstory2Dll/board_entrance.c +++ b/src/REL/mstory2Dll/board_entrance.c @@ -9,12 +9,13 @@ #include "game/hsfman.h" #include "game/hsfmotion.h" #include "game/minigame_seq.h" +#include "game/objsub.h" +#include "game/pad.h" #include "game/printfunc.h" #include "game/sprite.h" #include "game/window.h" #include "game/wipe.h" -#include "game/pad.h" -#include "game/objsub.h" + typedef struct { /* 0x000 */ s32 unk00; @@ -38,26 +39,10 @@ Process *lbl_1_bss_C8; s32 lbl_1_bss_88[16]; s32 lbl_1_bss_78[4]; -u32 lbl_1_data_3A0[11] = { - 0x00250000, - 0x00250000, - 0x00250000, - 0x00250000, - 0x00250000, - 0x00250000, - 0x00250000, - 0x00250000, - 0x00250000, - 0x00250000, - 0x00250000 -}; +u32 lbl_1_data_3A0[11] + = { 0x00250000, 0x00250000, 0x00250000, 0x00250000, 0x00250000, 0x00250000, 0x00250000, 0x00250000, 0x00250000, 0x00250000, 0x00250000 }; -s32 lbl_1_data_3CC[2][2] = { - 20, - 70, - 1, - 1 -}; +s32 lbl_1_data_3CC[2][2] = { 20, 70, 1, 1 }; s32 lbl_1_data_3DC = -1; s32 lbl_1_data_3E0[2] = { -1, -1 }; @@ -65,11 +50,11 @@ s32 lbl_1_data_3E0[2] = { -1, -1 }; void fn_1_9768(void); void fn_1_9A10(void); void fn_1_9BD4(s32 arg0); -void fn_1_9ECC(omObjData* arg0, StructBss16C* arg1); +void fn_1_9ECC(omObjData *arg0, StructBss16C *arg1); void fn_1_9FDC(void); -void fn_1_A4A8(omObjData* arg0, StructBss16C* arg1); +void fn_1_A4A8(omObjData *arg0, StructBss16C *arg1); void fn_1_A58C(void); -void fn_1_AB10(omObjData* arg0, StructBss16C* arg1); +void fn_1_AB10(omObjData *arg0, StructBss16C *arg1); void fn_1_AE5C(void); void fn_1_B1C0(void); @@ -78,30 +63,28 @@ void fn_1_B24C(void); void fn_1_7DB0(void) { int i; - while(1) { + while (1) { do { HuPrcVSleep(); - } while(lbl_1_data_3DC == -1 || lbl_1_data_3E0[0] == -1 || lbl_1_data_3E0[1] == -1 || lbl_1_data_3E0[0] != Hu3DMotionIDGet(lbl_1_data_3DC)); - for(i=0; i<2; i++) { - if(lbl_1_data_3CC[1][i] != -1) { - if(Hu3DMotionTimeGet(lbl_1_data_3DC) >= lbl_1_data_3CC[0][i]) { + } while (lbl_1_data_3DC == -1 || lbl_1_data_3E0[0] == -1 || lbl_1_data_3E0[1] == -1 || lbl_1_data_3E0[0] != Hu3DMotionIDGet(lbl_1_data_3DC)); + for (i = 0; i < 2; i++) { + if (lbl_1_data_3CC[1][i] != -1) { + if (Hu3DMotionTimeGet(lbl_1_data_3DC) >= lbl_1_data_3CC[0][i]) { OSReport("KE-System TIME:%d\n", lbl_1_data_3CC[0][i]); HuAudFXPlay(81); lbl_1_data_3CC[1][i] = -1; } } } - if(Hu3DMotionTimeGet(lbl_1_data_3DC) <= 10) { - for(i=0; i<2; i++) { + if (Hu3DMotionTimeGet(lbl_1_data_3DC) <= 10) { + for (i = 0; i < 2; i++) { lbl_1_data_3CC[1][i] = 1; } } - } - } -void fn_1_7F54(Process* arg0, s32 arg1) +void fn_1_7F54(Process *arg0, s32 arg1) { lbl_1_bss_C8 = arg0; lbl_1_bss_194.unk0C = arg1; @@ -119,11 +102,11 @@ void fn_1_7F54(Process* arg0, s32 arg1) void fn_1_806C(omObjData *object) { - if(object->work[2]) { + if (object->work[2]) { object->work[2]--; return; } - if(object->work[2] == 0 && Hu3DMotionEndCheck(object->model[1])) { + if (object->work[2] == 0 && Hu3DMotionEndCheck(object->model[1])) { fn_1_1DFC(object, 1, object->work[1], 15, 1); object->work[0] = object->work[1] = object->work[2] = 0; } @@ -135,44 +118,51 @@ void fn_1_80F8(void) int posY = 40; GXColor winColor = { 0, 0, 128, 128 }; int i; - while(1) { + while (1) { fn_1_BC8(); fontcolor = FONT_COLOR_WHITE; printWin(posX, posY, 220, 130, &winColor); - if(lbl_1_bss_16C.unk04 == NULL) { + if (lbl_1_bss_16C.unk04 == NULL) { print8(posX, posY, 1, "PROC_MAIN -> FALSE"); - } else { + } + else { print8(posX, posY, 1, "PROC_MAIN -> TRUE"); } - if(lbl_1_bss_144.unk04 == NULL) { - print8(posX, posY+10, 1, "PROC_MAP -> FALSE"); - } else { - print8(posX, posY+10, 1, "PROC_MAP -> TRUE"); + if (lbl_1_bss_144.unk04 == NULL) { + print8(posX, posY + 10, 1, "PROC_MAP -> FALSE"); } - if(lbl_1_bss_11C.unk04 == NULL) { - print8(posX, posY+20, 1, "PROC_PLAYER -> FALSE"); - } else { - print8(posX, posY+20, 1, "PROC_PLAYER -> TRUE"); + else { + print8(posX, posY + 10, 1, "PROC_MAP -> TRUE"); } - if(lbl_1_bss_F4.unk04 == NULL) { - print8(posX, posY+30, 1, "PROC_SUB -> FALSE"); - } else { - print8(posX, posY+30, 1, "PROC_SUB -> TRUE"); + if (lbl_1_bss_11C.unk04 == NULL) { + print8(posX, posY + 20, 1, "PROC_PLAYER -> FALSE"); } - if(lbl_1_bss_CC.unk04 == NULL) { - print8(posX, posY+40, 1, "PROC_KOOPA -> FALSE"); - } else { - print8(posX, posY+40, 1, "PROC_KOOPA -> TRUE"); + else { + print8(posX, posY + 20, 1, "PROC_PLAYER -> TRUE"); } - - print8(posX, posY+60, 1, "P:%d W:%d", lbl_1_bss_194.unk00, lbl_1_bss_194.unk0C); - print8(posX, posY+80, 1, "NO) IDX:GRP:COM:DIF:PAD:CHR"); - for(i=0; i<4; i++) { - print8(posX, posY+90+(i*10), 1, "%2d) %3d:%3d:%3d:%3d:%3d:%3d", i, lbl_1_bss_194.unk30[i].unk00, lbl_1_bss_194.unk30[i].unk04, lbl_1_bss_194.unk30[i].unk08, lbl_1_bss_194.unk30[i].unk0C, lbl_1_bss_194.unk30[i].unk14, lbl_1_bss_194.unk30[i].unk10); + if (lbl_1_bss_F4.unk04 == NULL) { + print8(posX, posY + 30, 1, "PROC_SUB -> FALSE"); } - if(HuPadBtnDown[0] & PAD_BUTTON_X) { + else { + print8(posX, posY + 30, 1, "PROC_SUB -> TRUE"); + } + if (lbl_1_bss_CC.unk04 == NULL) { + print8(posX, posY + 40, 1, "PROC_KOOPA -> FALSE"); + } + else { + print8(posX, posY + 40, 1, "PROC_KOOPA -> TRUE"); + } + + print8(posX, posY + 60, 1, "P:%d W:%d", lbl_1_bss_194.unk00, lbl_1_bss_194.unk0C); + print8(posX, posY + 80, 1, "NO) IDX:GRP:COM:DIF:PAD:CHR"); + for (i = 0; i < 4; i++) { + print8(posX, posY + 90 + (i * 10), 1, "%2d) %3d:%3d:%3d:%3d:%3d:%3d", i, lbl_1_bss_194.unk30[i].unk00, lbl_1_bss_194.unk30[i].unk04, + lbl_1_bss_194.unk30[i].unk08, lbl_1_bss_194.unk30[i].unk0C, lbl_1_bss_194.unk30[i].unk14, lbl_1_bss_194.unk30[i].unk10); + } + if (HuPadBtnDown[0] & PAD_BUTTON_X) { fn_1_7384(lbl_1_bss_11C.unk00->model[1], lbl_1_bss_194.unk30[lbl_1_bss_194.unk00].unk10, 30, 120, TRUE); - } else if(HuPadBtnDown[0] & PAD_BUTTON_Y) { + } + else if (HuPadBtnDown[0] & PAD_BUTTON_Y) { fn_1_7384(lbl_1_bss_11C.unk00->model[1], lbl_1_bss_194.unk30[lbl_1_bss_194.unk00].unk10, 30, 120, FALSE); } } @@ -200,10 +190,10 @@ void fn_1_85DC(void) fn_1_1DFC(lbl_1_bss_144.unk00, 2, 2, 0, 0); do { fn_1_BC8(); - } while(lbl_1_bss_11C.unk04 != NULL); + } while (lbl_1_bss_11C.unk04 != NULL); do { fn_1_BC8(); - } while(lbl_1_bss_F4.unk04 != NULL); + } while (lbl_1_bss_F4.unk04 != NULL); lbl_1_bss_194.unk04 = fn_1_185C(1, 0, 21, 2, lbl_1_bss_194.unk0C); HuAudFXPlay(lbl_1_data_0[0][2]); fn_1_1DFC(lbl_1_bss_F4.unk00, 1, 3, 5, 1); @@ -227,17 +217,17 @@ void fn_1_87D4(void) fn_1_BC8(); Hu3DMotionTimeSet(lbl_1_bss_CC.unk00->model[1], 100); Hu3DModelAttrReset(lbl_1_bss_CC.unk00->model[1], 1); - while(1) { + while (1) { fn_1_BC8(); - if(Hu3DMotionTimeGet(lbl_1_bss_CC.unk00->model[1]) >= 132) { + if (Hu3DMotionTimeGet(lbl_1_bss_CC.unk00->model[1]) >= 132) { break; } } fn_1_1DFC(lbl_1_bss_F4.unk00, 1, 4, 0, 0); fn_1_BC8(); - while(1) { + while (1) { fn_1_BC8(); - if(Hu3DMotionTimeGet(lbl_1_bss_F4.unk00->model[1]) >= 5) { + if (Hu3DMotionTimeGet(lbl_1_bss_F4.unk00->model[1]) >= 5) { break; } } @@ -247,8 +237,8 @@ void fn_1_87D4(void) HuAudFXPlay(156); omVibrate(lbl_1_bss_194.unk0C, 45, 12, 0); speed = 50; - for(i=0; i<60; i++) { - float weight = fn_1_B08(0, speed, i%15, 15); + for (i = 0; i < 60; i++) { + float weight = fn_1_B08(0, speed, i % 15, 15); speed = fn_1_88C(speed, 0, 30); lbl_1_bss_194.unk100 = fn_1_88C(lbl_1_bss_194.unk100, weight, 5); fn_1_BC8(); @@ -326,9 +316,9 @@ void fn_1_9034(void) fn_1_1D18(lbl_1_bss_194.unk04, 0x1F0007); fn_1_1AFC(lbl_1_bss_194.unk04, -1); fn_1_1A94(lbl_1_bss_194.unk04); - while(1) { + while (1) { fn_1_BC8(); - if(lbl_1_bss_CC.unk04 == NULL) { + if (lbl_1_bss_CC.unk04 == NULL) { break; } } @@ -349,9 +339,9 @@ void fn_1_9198(void) HuAudFXFadeOut(lbl_1_bss_88[0], 1000); WipeColorSet(0, 0, 0); WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, -1); - while(1) { + while (1) { fn_1_BC8(); - if(!WipeStatGet()) { + if (!WipeStatGet()) { break; } } @@ -364,7 +354,7 @@ void fn_1_9198(void) omOvlGotoEx(OVL_MENT, 1, 11, 0); } -void fn_1_92BC(omObjData* arg0, StructBss16C* arg1) +void fn_1_92BC(omObjData *arg0, StructBss16C *arg1) { int temp = 0; fn_1_8580(); @@ -382,9 +372,9 @@ void fn_1_9768(void) lbl_1_bss_16C.unk00 = obj = omAddObjEx(lbl_1_bss_C8, 256, 16, 16, -1, NULL); lbl_1_bss_16C.unk04 = (void *)fn_1_92BC; lbl_1_bss_16C.unk00->data = &lbl_1_bss_16C; - while(1) { + while (1) { fn_1_BC8(); - if(lbl_1_bss_16C.unk04 != NULL) { + if (lbl_1_bss_16C.unk04 != NULL) { lbl_1_bss_16C.unk04(obj, &lbl_1_bss_16C); } } @@ -403,10 +393,10 @@ void fn_1_981C(omObjData *object) object->model[4] = Hu3DModelCreateFile(0x660051); } -void fn_1_9954(omObjData* arg0, StructBss16C* arg1) +void fn_1_9954(omObjData *arg0, StructBss16C *arg1) { Hu3DData[arg0->model[5]].pos.y = fn_1_B08(125, 130, arg1->unk08++, 360); - if(arg1->unk08 >= 360) { + if (arg1->unk08 >= 360) { arg1->unk08 = 0; } } @@ -418,9 +408,9 @@ void fn_1_9A10(void) lbl_1_bss_144.unk04 = (void *)fn_1_9954; lbl_1_bss_144.unk00->data = &lbl_1_bss_144; fn_1_981C(obj); - while(1) { + while (1) { fn_1_BC8(); - if(lbl_1_bss_144.unk04 != NULL) { + if (lbl_1_bss_144.unk04 != NULL) { lbl_1_bss_144.unk04(obj, &lbl_1_bss_144); } } @@ -431,16 +421,16 @@ void fn_1_9BD4(s32 arg0) int i; int order[4]; order[0] = 0; - for(i=1; i<4; i++) { - order[i] = order[i-1]+1; - if(order[i] >= 4) { + for (i = 1; i < 4; i++) { + order[i] = order[i - 1] + 1; + if (order[i] >= 4) { order[i] = 0; } - if(arg0 == order[i]) { + if (arg0 == order[i]) { lbl_1_bss_194.unk00 = i; } } - for(i=0; i<4; i++) { + for (i = 0; i < 4; i++) { fn_1_357C(&lbl_1_bss_194.unk30[i], order[i]); } } @@ -449,13 +439,13 @@ void fn_1_9CB8(omObjData *object) { int charNo = lbl_1_bss_194.unk30[lbl_1_bss_194.unk00].unk10; object->model[1] = CharModelCreate(charNo, 1); - object->motion[1] = CharModelMotionCreate(charNo, 0x5F0000); - object->motion[2] = CharModelMotionCreate(charNo, 0x5F0035); - object->motion[3] = Hu3DJointMotionFile(object->model[1], 0x660018+charNo); - object->motion[7] = Hu3DJointMotionFile(object->model[1], 0x660048+charNo); - object->motion[8] = Hu3DJointMotionFile(object->model[1], 0x660040+charNo); - object->motion[9] = Hu3DJointMotionFile(object->model[1], 0x660020+charNo); - object->motion[10] = CharModelMotionCreate(charNo, 0x5F0012); + object->motion[1] = CharModelMotionCreate(charNo, DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x00)); + object->motion[2] = CharModelMotionCreate(charNo, DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x35)); + object->motion[3] = Hu3DJointMotionFile(object->model[1], 0x660018 + charNo); + object->motion[7] = Hu3DJointMotionFile(object->model[1], 0x660048 + charNo); + object->motion[8] = Hu3DJointMotionFile(object->model[1], 0x660040 + charNo); + object->motion[9] = Hu3DJointMotionFile(object->model[1], 0x660020 + charNo); + object->motion[10] = CharModelMotionCreate(charNo, DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x12)); CharModelMotionDataClose(charNo); Hu3DModelPosSet(object->model[1], 120, 0, 800); Hu3DModelRotSet(object->model[1], 0, -135, 0); @@ -464,13 +454,13 @@ void fn_1_9CB8(omObjData *object) fn_1_1DFC(object, 1, 1, 0, 1); } -void fn_1_9ECC(omObjData* arg0, StructBss16C* arg1) +void fn_1_9ECC(omObjData *arg0, StructBss16C *arg1) { int i; fn_1_1DFC(arg0, 1, 2, 0, 0); fn_1_BC8(); Hu3DMotionTimeSet(arg0->model[1], 60); - for(i=0; i<60; i++) { + for (i = 0; i < 60; i++) { fn_1_BC8(); Hu3DData[arg0->model[1]].rot.y = fn_1_864(-135, -90, i, 60); } @@ -485,12 +475,12 @@ void fn_1_9FDC(void) lbl_1_bss_11C.unk04 = NULL; lbl_1_bss_11C.unk00->data = &lbl_1_bss_11C; fn_1_9CB8(obj); - while(1) { + while (1) { fn_1_BC8(); - if(lbl_1_bss_11C.unk04 != NULL) { + if (lbl_1_bss_11C.unk04 != NULL) { lbl_1_bss_11C.unk04(obj, &lbl_1_bss_11C); } - if(obj->work[0]) { + if (obj->work[0]) { fn_1_6704(obj); } } @@ -513,7 +503,7 @@ void fn_1_A288(omObjData *object) CharModelEffectNpcInit(object->model[1], object->motion[2], 1, 9); } -void fn_1_A4A8(omObjData* arg0, StructBss16C* arg1) +void fn_1_A4A8(omObjData *arg0, StructBss16C *arg1) { Vec pos = { -120, 0, 800 }; fn_1_1DFC(arg0, 1, 2, 15, 1); @@ -529,12 +519,12 @@ void fn_1_A58C(void) lbl_1_bss_F4.unk04 = NULL; lbl_1_bss_F4.unk00->data = &lbl_1_bss_F4; fn_1_A288(obj); - while(1) { + while (1) { fn_1_BC8(); - if(lbl_1_bss_F4.unk04 != NULL) { + if (lbl_1_bss_F4.unk04 != NULL) { lbl_1_bss_F4.unk04(obj, &lbl_1_bss_F4); } - if(obj->work[0]) { + if (obj->work[0]) { fn_1_6704(obj); } } @@ -563,11 +553,11 @@ void fn_1_A848(omObjData *object) HuPrcChildCreate(fn_1_7DB0, 100, 8192, 0, HuPrcCurrentGet()); } -void fn_1_AB10(omObjData* arg0, StructBss16C* arg1) +void fn_1_AB10(omObjData *arg0, StructBss16C *arg1) { int i; fn_1_1DFC(lbl_1_bss_CC.unk00, 1, 8, 15, 1); - for(i=0; i<30; i++) { + for (i = 0; i < 30; i++) { fn_1_BC8(); Hu3DData[lbl_1_bss_CC.unk00->model[1]].pos.x = fn_1_864(-120, -60, i, 30); } @@ -576,7 +566,7 @@ void fn_1_AB10(omObjData* arg0, StructBss16C* arg1) fn_1_2264(lbl_1_bss_CC.unk00, 1, 6, 15); fn_1_1DFC(lbl_1_bss_CC.unk00, 1, 7, 15, 1); fn_1_1DFC(lbl_1_bss_11C.unk00, 1, 10, 15, 1); - for(i=0; i<240; i++) { + for (i = 0; i < 240; i++) { fn_1_BC8(); Hu3DData[lbl_1_bss_CC.unk00->model[1]].pos.x = fn_1_864(-60, 540, i, 180); Hu3DData[lbl_1_bss_11C.unk00->model[1]].pos.x = fn_1_864(120, 840, i, 180); @@ -588,12 +578,12 @@ void fn_1_AB10(omObjData* arg0, StructBss16C* arg1) void fn_1_ADB0(int arg0, int arg1, int arg2, int arg3, int arg4) { fn_1_1DFC(lbl_1_bss_CC.unk00, 1, arg0, arg2, arg3); - if(arg3 == 1) { + if (arg3 == 1) { arg4 = 0; } lbl_1_bss_CC.unk00->work[0] = arg4; lbl_1_bss_CC.unk00->work[1] = arg1; - lbl_1_bss_CC.unk00->work[2] = arg2+1; + lbl_1_bss_CC.unk00->work[2] = arg2 + 1; } void fn_1_AE5C(void) @@ -603,12 +593,12 @@ void fn_1_AE5C(void) lbl_1_bss_CC.unk04 = NULL; lbl_1_bss_CC.unk00->data = &lbl_1_bss_CC; fn_1_A848(obj); - while(1) { + while (1) { fn_1_BC8(); - if(lbl_1_bss_CC.unk04 != NULL) { + if (lbl_1_bss_CC.unk04 != NULL) { lbl_1_bss_CC.unk04(obj, &lbl_1_bss_CC); } - if(obj->work[0]) { + if (obj->work[0]) { fn_1_6704(obj); } } @@ -638,7 +628,7 @@ void fn_1_B24C(void) temp.unk20.z = 0; temp.unk38 = 1400; fn_1_42A0(work, &temp, work->unk40++, 60, 10); - if(0.0f != lbl_1_bss_194.unk100) { - work->unk08.y = 100+lbl_1_bss_194.unk100; + if (0.0f != lbl_1_bss_194.unk100) { + work->unk08.y = 100 + lbl_1_bss_194.unk100; } -} \ No newline at end of file +} diff --git a/src/REL/mstory2Dll/board_miss.c b/src/REL/mstory2Dll/board_miss.c index 45b05479..89c73938 100644 --- a/src/REL/mstory2Dll/board_miss.c +++ b/src/REL/mstory2Dll/board_miss.c @@ -10,13 +10,13 @@ #include "game/hsfman.h" #include "game/hsfmotion.h" #include "game/minigame_seq.h" +#include "game/objsub.h" +#include "game/pad.h" #include "game/printfunc.h" #include "game/sprite.h" #include "game/window.h" #include "game/wipe.h" -#include "game/pad.h" -#include "game/objsub.h" -#include "game/board/main.h" + typedef struct { /* 0x000 */ s32 unk00; @@ -59,27 +59,19 @@ s32 lbl_1_data_698[7] = { DATADIR_W10, }; -s32 lbl_1_data_6B4[8] = { - DATADIR_MARIOMDL1, - DATADIR_LUIGIMDL1, - DATADIR_PEACHMDL1, - DATADIR_YOSHIMDL1, - DATADIR_WARIOMDL1, - DATADIR_DONKEYMDL1, - DATADIR_DAISYMDL1, - DATADIR_WALUIGIMDL1 -}; +s32 lbl_1_data_6B4[8] = { DATADIR_MARIOMDL1, DATADIR_LUIGIMDL1, DATADIR_PEACHMDL1, DATADIR_YOSHIMDL1, DATADIR_WARIOMDL1, DATADIR_DONKEYMDL1, + DATADIR_DAISYMDL1, DATADIR_WALUIGIMDL1 }; void fn_1_FDFC(void); void fn_1_10194(void); -void fn_1_106B0(omObjData* arg0, StructBss16C* arg1); +void fn_1_106B0(omObjData *arg0, StructBss16C *arg1); void fn_1_1094C(void); void fn_1_10DF4(int arg0, int arg1, int arg2, int arg3, int arg4); -void fn_1_10EA0(omObjData* arg0, StructBss16C* arg1); +void fn_1_10EA0(omObjData *arg0, StructBss16C *arg1); void fn_1_1112C(void); void fn_1_11418(int arg0); -void fn_1_11934(omObjData* arg0, StructBss16C* arg1); -void fn_1_11A98(omObjData* arg0, StructBss16C* arg1); +void fn_1_11934(omObjData *arg0, StructBss16C *arg1); +void fn_1_11A98(omObjData *arg0, StructBss16C *arg1); void fn_1_11BB0(void); void fn_1_11FD0(void); void fn_1_1205C(void); @@ -88,25 +80,25 @@ void fn_1_1218C(void); void fn_1_E570(void) { int statId = HuDataDirReadAsync(DATADIR_BOARD); - if(statId != -1) { - while(!HuDataGetAsyncStat(statId)) { + if (statId != -1) { + while (!HuDataGetAsyncStat(statId)) { HuPrcVSleep(); } } HuAR_MRAMtoARAM(DATADIR_BOARD); - while(HuARDMACheck()) { + while (HuARDMACheck()) { HuPrcVSleep(); } HuDataDirClose(DATADIR_BOARD); statId = HuDataDirReadAsync(lbl_1_data_698[GWSystem.board]); - if(statId != -1) { - while(!HuDataGetAsyncStat(statId)) { + if (statId != -1) { + while (!HuDataGetAsyncStat(statId)) { HuPrcVSleep(); } } lbl_1_bss_4E4 = TRUE; HuPrcEnd(); - while(1) { + while (1) { HuPrcVSleep(); } } @@ -119,22 +111,22 @@ void fn_1_E638(void) lbl_1_bss_4E8[0].unk10 = lbl_1_bss_688.unk30[lbl_1_bss_688.unk00].unk10; lbl_1_bss_4E8[0].unk14 = lbl_1_bss_688.unk30[lbl_1_bss_688.unk00].unk14; lbl_1_bss_4E8[0].unk08 = 0; - for(i=1; i<4; i++) { + for (i = 1; i < 4; i++) { lbl_1_bss_4E8[i].unk10 = -1; lbl_1_bss_4E8[i].unk14 = i; lbl_1_bss_4E8[i].unk08 = 1; } - for(i=1; i<4; i++) { + for (i = 1; i < 4; i++) { do { - lbl_1_bss_4E8[i].unk10 = rand8()%8; - for(j=0; j<4; j++) { - if(i != j && lbl_1_bss_4E8[j].unk10 != -1 && lbl_1_bss_4E8[i].unk10 == lbl_1_bss_4E8[j].unk10) { + lbl_1_bss_4E8[i].unk10 = rand8() % 8; + for (j = 0; j < 4; j++) { + if (i != j && lbl_1_bss_4E8[j].unk10 != -1 && lbl_1_bss_4E8[i].unk10 == lbl_1_bss_4E8[j].unk10) { break; } } - } while(j != 4); + } while (j != 4); } - for(i=0; i<4; i++) { + for (i = 0; i < 4; i++) { GWPlayerCfg[i].character = lbl_1_bss_4E8[i].unk10; GWPlayerCfg[i].pad_idx = lbl_1_bss_4E8[i].unk14; GWPlayerCfg[i].group = 0; @@ -148,15 +140,7 @@ void fn_1_E638(void) void fn_1_E8EC(void) { - int ovlTbl[7] = { - OVL_W01, - OVL_W02, - OVL_W03, - OVL_W04, - OVL_W05, - OVL_W06, - OVL_W10 - }; + int ovlTbl[7] = { OVL_W01, OVL_W02, OVL_W03, OVL_W04, OVL_W05, OVL_W06, OVL_W10 }; omOvlHisData *his; WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, -1); while (WipeStatGet()) { @@ -168,7 +152,7 @@ void fn_1_E8EC(void) omOvlHisChg(0, OVL_MSTORY3, 0, his->stat); do { fn_1_BC8(); - } while(lbl_1_bss_4E4 != 1); + } while (lbl_1_bss_4E4 != 1); CharARAMOpen(GWPlayerCfg[0].character); CharARAMOpen(GWPlayerCfg[1].character); CharARAMOpen(GWPlayerCfg[2].character); @@ -176,12 +160,12 @@ void fn_1_E8EC(void) HuAudSeqAllFadeOut(1000); HuAudSStreamAllFadeOut(1000); omOvlCallEx(ovlTbl[GWSystem.board], 1, 0, 0); - while(1) { + while (1) { fn_1_BC8(); } } -void fn_1_EA2C(Process* arg0, s32 arg1) +void fn_1_EA2C(Process *arg0, s32 arg1) { int i; lbl_1_bss_4E0 = arg0; @@ -194,7 +178,7 @@ void fn_1_EA2C(Process* arg0, s32 arg1) HuPrcChildCreate(fn_1_10194, 100, 8192, 0, HuPrcCurrentGet()); HuPrcChildCreate(fn_1_1094C, 100, 8192, 0, HuPrcCurrentGet()); HuPrcChildCreate(fn_1_1112C, 100, 8192, 0, HuPrcCurrentGet()); - for(i=0; i<4; i++) { + for (i = 0; i < 4; i++) { HuPrcChildCreate(fn_1_11BB0, 100, 8192, 0, HuPrcCurrentGet()); } HuPrcChildCreate(fn_1_FDFC, 100, 8192, 0, HuPrcCurrentGet()); @@ -202,11 +186,11 @@ void fn_1_EA2C(Process* arg0, s32 arg1) void fn_1_EB60(omObjData *object) { - if(object->work[2]) { + if (object->work[2]) { object->work[2]--; return; } - if(object->work[2] == 0 && Hu3DMotionEndCheck(object->model[1])) { + if (object->work[2] == 0 && Hu3DMotionEndCheck(object->model[1])) { fn_1_1DFC(object, 1, object->work[1], 15, 1); object->work[0] = object->work[1] = object->work[2] = 0; } @@ -218,40 +202,46 @@ void fn_1_EBEC(void) int posY = 40; GXColor winColor = { 0, 0, 128, 128 }; int i; - while(1) { + while (1) { fn_1_BC8(); printWin(posX, posY, 220, 160, &winColor); - if(lbl_1_bss_660.unk04 == NULL) { + if (lbl_1_bss_660.unk04 == NULL) { print8(posX, posY, 1, "PROC_MAIN -> FALSE"); - } else { + } + else { print8(posX, posY, 1, "PROC_MAIN -> TRUE"); } - if(lbl_1_bss_638.unk04 == NULL) { - print8(posX, posY+10, 1, "PROC_MAP -> FALSE"); - } else { - print8(posX, posY+10, 1, "PROC_MAP -> TRUE"); + if (lbl_1_bss_638.unk04 == NULL) { + print8(posX, posY + 10, 1, "PROC_MAP -> FALSE"); } - if(lbl_1_bss_610.unk04 == NULL) { - print8(posX, posY+20, 1, "PROC_KOOPA -> FALSE"); - } else { - print8(posX, posY+20, 1, "PROC_KOOPA -> TRUE"); + else { + print8(posX, posY + 10, 1, "PROC_MAP -> TRUE"); } - if(lbl_1_bss_5E8.unk04 == NULL) { - print8(posX, posY+30, 1, "PROC_MKOOPA -> FALSE"); - } else { - print8(posX, posY+30, 1, "PROC_MKOOPA -> TRUE"); + if (lbl_1_bss_610.unk04 == NULL) { + print8(posX, posY + 20, 1, "PROC_KOOPA -> FALSE"); } - for(i=0; i<4; i++) { - if(lbl_1_bss_548[i].unk04 == NULL) { - print8(posX, posY+40+(i*10), 1, "PROC_PLAYER%d -> FALSE", i); - } else { - print8(posX, posY+40+(i*10), 1, "PROC_PLAYER%d -> TRUE", i); + else { + print8(posX, posY + 20, 1, "PROC_KOOPA -> TRUE"); + } + if (lbl_1_bss_5E8.unk04 == NULL) { + print8(posX, posY + 30, 1, "PROC_MKOOPA -> FALSE"); + } + else { + print8(posX, posY + 30, 1, "PROC_MKOOPA -> TRUE"); + } + for (i = 0; i < 4; i++) { + if (lbl_1_bss_548[i].unk04 == NULL) { + print8(posX, posY + 40 + (i * 10), 1, "PROC_PLAYER%d -> FALSE", i); + } + else { + print8(posX, posY + 40 + (i * 10), 1, "PROC_PLAYER%d -> TRUE", i); } } - print8(posX, posY+90, 1, "P:%d W:%d", lbl_1_bss_688.unk00, lbl_1_bss_688.unk0C); - print8(posX, posY+110, 1, "NO) IDX:GRP:COM:DIF:PAD:CHR"); - for(i=0; i<4; i++) { - print8(posX, posY+120+(i*10), 1, "%2d) %3d:%3d:%3d:%3d:%3d:%3d", i, lbl_1_bss_688.unk30[i].unk00, lbl_1_bss_688.unk30[i].unk04, lbl_1_bss_688.unk30[i].unk08, lbl_1_bss_688.unk30[i].unk0C, lbl_1_bss_688.unk30[i].unk14, lbl_1_bss_688.unk30[i].unk10); + print8(posX, posY + 90, 1, "P:%d W:%d", lbl_1_bss_688.unk00, lbl_1_bss_688.unk0C); + print8(posX, posY + 110, 1, "NO) IDX:GRP:COM:DIF:PAD:CHR"); + for (i = 0; i < 4; i++) { + print8(posX, posY + 120 + (i * 10), 1, "%2d) %3d:%3d:%3d:%3d:%3d:%3d", i, lbl_1_bss_688.unk30[i].unk00, lbl_1_bss_688.unk30[i].unk04, + lbl_1_bss_688.unk30[i].unk08, lbl_1_bss_688.unk30[i].unk0C, lbl_1_bss_688.unk30[i].unk14, lbl_1_bss_688.unk30[i].unk10); } } } @@ -269,46 +259,46 @@ void fn_1_EFCC(void) void fn_1_F028(void) { int i; - for(i=0; i<4; i++) { + for (i = 0; i < 4; i++) { lbl_1_bss_548[i].unk04 = (void *)fn_1_11934; } do { fn_1_BC8(); - for(i=0; i<4; i++) { - if(lbl_1_bss_548[i].unk04 != NULL) { + for (i = 0; i < 4; i++) { + if (lbl_1_bss_548[i].unk04 != NULL) { break; } } - } while(i != 4); + } while (i != 4); lbl_1_bss_548[lbl_1_bss_688.unk00].unk04 = (void *)fn_1_11A98; fn_1_3854(&lbl_1_bss_24); fn_1_2750(fn_1_1205C); do { fn_1_BC8(); - } while(lbl_1_bss_548[lbl_1_bss_688.unk00].unk04 != NULL); + } while (lbl_1_bss_548[lbl_1_bss_688.unk00].unk04 != NULL); do { fn_1_BC8(); - } while(lbl_1_bss_5E8.unk04 != NULL); + } while (lbl_1_bss_5E8.unk04 != NULL); fn_1_BE8(30); - if(0) { - //Dummy code to stop this function from inlining + if (0) { + // Dummy code to stop this function from inlining do { fn_1_BC8(); - for(i=0; i<4; i++) { - if(lbl_1_bss_548[i].unk04 != NULL) { + for (i = 0; i < 4; i++) { + if (lbl_1_bss_548[i].unk04 != NULL) { break; } } - } while(i != 4); + } while (i != 4); lbl_1_bss_548[lbl_1_bss_688.unk00].unk04 = (void *)fn_1_11A98; fn_1_3854(&lbl_1_bss_24); fn_1_2750(fn_1_1205C); do { fn_1_BC8(); - } while(lbl_1_bss_548[lbl_1_bss_688.unk00].unk04 != NULL); + } while (lbl_1_bss_548[lbl_1_bss_688.unk00].unk04 != NULL); do { fn_1_BC8(); - } while(lbl_1_bss_5E8.unk04 != NULL); + } while (lbl_1_bss_5E8.unk04 != NULL); fn_1_BE8(30); } } @@ -363,11 +353,11 @@ void fn_1_F3D0(void) HuAudSeqFadeOut(lbl_1_bss_78[0], 1000); do { fn_1_BC8(); - } while(lbl_1_bss_5E8.unk04 != NULL); + } while (lbl_1_bss_5E8.unk04 != NULL); lbl_1_bss_610.unk04 = (void *)fn_1_106B0; do { fn_1_BC8(); - } while(lbl_1_bss_610.unk04 != NULL); + } while (lbl_1_bss_610.unk04 != NULL); fn_1_7384(lbl_1_bss_548[lbl_1_bss_688.unk00].unk00->model[1], lbl_1_bss_688.unk30[lbl_1_bss_688.unk00].unk10, 1, 20, 1); lbl_1_bss_78[1] = HuAudSeqPlay(6); fn_1_BE8(30); @@ -404,10 +394,7 @@ void fn_1_F3D0(void) fn_1_BE8(150); } -void fn_1_F838(void) -{ - -} +void fn_1_F838(void) { } void fn_1_F83C(void) { @@ -422,7 +409,7 @@ void fn_1_F83C(void) omOvlReturnEx(1, 1); } -void fn_1_F8B4(omObjData* arg0, StructBss16C* arg1) +void fn_1_F8B4(omObjData *arg0, StructBss16C *arg1) { int mode = 0; int i; @@ -430,36 +417,37 @@ void fn_1_F8B4(omObjData* arg0, StructBss16C* arg1) fn_1_F028(); fn_1_F150(); lbl_1_bss_688.unk04 = fn_1_185C(1, 0, 21, 2, lbl_1_bss_688.unk0C); - while(1) { + while (1) { fn_1_BC8(); - if(fn_1_F22C()) { + if (fn_1_F22C()) { mode = 0; break; - } else if(fn_1_F2FC()) { + } + else if (fn_1_F2FC()) { mode = 1; break; } } - + fn_1_1A94(lbl_1_bss_688.unk04); - for(i=0; i<4; i++) { - if(lbl_1_bss_688.unk30[i].unk00 != lbl_1_bss_688.unk30[lbl_1_bss_688.unk00].unk00) { + for (i = 0; i < 4; i++) { + if (lbl_1_bss_688.unk30[i].unk00 != lbl_1_bss_688.unk30[lbl_1_bss_688.unk00].unk00) { Hu3DModelAttrSet(lbl_1_bss_548[i].unk00->model[1], 1); } Hu3DModelAttrSet(lbl_1_bss_548[i].unk00->model[2], 1); } - switch(mode) { + switch (mode) { case 0: fn_1_F3D0(); break; case 1: break; } - switch(mode) { + switch (mode) { case 0: fn_1_E8EC(); break; - + case 1: fn_1_F83C(); break; @@ -473,9 +461,9 @@ void fn_1_FDFC(void) lbl_1_bss_660.unk00 = obj = omAddObjEx(lbl_1_bss_4E0, 256, 16, 16, -1, NULL); lbl_1_bss_660.unk04 = (void *)fn_1_F8B4; lbl_1_bss_660.unk00->data = &lbl_1_bss_660; - while(1) { + while (1) { fn_1_BC8(); - if(lbl_1_bss_660.unk04 != NULL) { + if (lbl_1_bss_660.unk04 != NULL) { lbl_1_bss_660.unk04(obj, &lbl_1_bss_660); } } @@ -504,10 +492,10 @@ void fn_1_FEB0(omObjData *object) fn_1_1DFC(object, 6, 6, 0, 2); } -void fn_1_100D8(omObjData* arg0, StructBss16C* arg1) +void fn_1_100D8(omObjData *arg0, StructBss16C *arg1) { Hu3DData[arg0->model[5]].pos.y = fn_1_B08(80, 90, arg1->unk08++, 360); - if(arg1->unk08 >= 360) { + if (arg1->unk08 >= 360) { arg1->unk08 = 0; } } @@ -519,9 +507,9 @@ void fn_1_10194(void) lbl_1_bss_638.unk04 = (void *)fn_1_100D8; lbl_1_bss_638.unk00->data = &lbl_1_bss_638; fn_1_FEB0(obj); - while(1) { + while (1) { fn_1_BC8(); - if(lbl_1_bss_638.unk04 != NULL) { + if (lbl_1_bss_638.unk04 != NULL) { lbl_1_bss_638.unk04(obj, &lbl_1_bss_638); } } @@ -545,38 +533,38 @@ void fn_1_10448(omObjData *object) void fn_1_10604(int arg0, int arg1, int arg2, int arg3, int arg4) { fn_1_1DFC(lbl_1_bss_610.unk00, 1, arg0, arg2, arg3); - if(arg3 == 1) { + if (arg3 == 1) { arg4 = 0; } lbl_1_bss_610.unk00->work[0] = arg4; lbl_1_bss_610.unk00->work[1] = arg1; - lbl_1_bss_610.unk00->work[2] = arg2+1; + lbl_1_bss_610.unk00->work[2] = arg2 + 1; } -void fn_1_106B0(omObjData* arg0, StructBss16C* arg1) +void fn_1_106B0(omObjData *arg0, StructBss16C *arg1) { int i = 0; float speed = 50; - + HuAudFXPlay(153); fn_1_10604(2, 1, 0, 0, 1); fn_1_BE8(5); Hu3DMotionTimeSet(lbl_1_bss_610.unk00->model[1], 100); fn_1_BC8(); Hu3DModelAttrReset(arg0->model[1], 1); - while(1) { + while (1) { fn_1_BC8(); - if(Hu3DMotionTimeGet(lbl_1_bss_610.unk00->model[1]) >= 137) { + if (Hu3DMotionTimeGet(lbl_1_bss_610.unk00->model[1]) >= 137) { break; } } HuAudFXPlay(156); omVibrate(lbl_1_bss_688.unk0C, 45, 12, 0); fn_1_67D8(lbl_1_bss_548[lbl_1_bss_688.unk00].unk00, 6, 1, 5, 0); - for(i=0; i<60; i++) { + for (i = 0; i < 60; i++) { float posY; fn_1_BC8(); - posY = fn_1_B08(0, speed, i%15, 15); + posY = fn_1_B08(0, speed, i % 15, 15); speed = fn_1_88C(speed, 0, 30); lbl_1_bss_688.unk100 = fn_1_88C(lbl_1_bss_688.unk100, posY, 5); } @@ -591,15 +579,16 @@ void fn_1_1094C(void) lbl_1_bss_610.unk04 = NULL; lbl_1_bss_610.unk00->data = &lbl_1_bss_638; fn_1_10448(obj); - while(1) { + while (1) { fn_1_BC8(); - if(lbl_1_bss_610.unk04 != NULL) { + if (lbl_1_bss_610.unk04 != NULL) { lbl_1_bss_610.unk04(obj, &lbl_1_bss_610); } - if(obj->work[0]) { - if(obj->work[2]) { + if (obj->work[0]) { + if (obj->work[2]) { obj->work[2]--; - } else if(obj->work[2] == 0 && Hu3DMotionEndCheck(obj->model[1])) { + } + else if (obj->work[2] == 0 && Hu3DMotionEndCheck(obj->model[1])) { fn_1_1DFC(obj, 1, obj->work[1], 15, 1); obj->work[0] = obj->work[1] = obj->work[2] = 0; } @@ -626,15 +615,15 @@ void fn_1_10C00(omObjData *object) void fn_1_10DF4(int arg0, int arg1, int arg2, int arg3, int arg4) { fn_1_1DFC(lbl_1_bss_5E8.unk00, 1, arg0, arg2, arg3); - if(arg3 == 1) { + if (arg3 == 1) { arg4 = 0; } lbl_1_bss_5E8.unk00->work[0] = arg4; lbl_1_bss_5E8.unk00->work[1] = arg1; - lbl_1_bss_5E8.unk00->work[2] = arg2+1; + lbl_1_bss_5E8.unk00->work[2] = arg2 + 1; } -void fn_1_10EA0(omObjData* arg0, StructBss16C* arg1) +void fn_1_10EA0(omObjData *arg0, StructBss16C *arg1) { Vec pos = { -600, 0, 800 }; fn_1_1DFC(arg0, 1, 2, 15, 1); @@ -643,17 +632,17 @@ void fn_1_10EA0(omObjData* arg0, StructBss16C* arg1) arg1->unk04 = NULL; } -void fn_1_10F84(omObjData* arg0, StructBss16C* arg1) +void fn_1_10F84(omObjData *arg0, StructBss16C *arg1) { int i; - for(i=0; i<15; i++) { + for (i = 0; i < 15; i++) { fn_1_BC8(); Hu3DData[arg0->model[1]].rot.y = fn_1_864(0, 135, i, 15); } arg1->unk04 = NULL; } -void fn_1_11048(omObjData* arg0, StructBss16C* arg1) +void fn_1_11048(omObjData *arg0, StructBss16C *arg1) { Vec pos = { -120, 0, 800 }; fn_1_1DFC(arg0, 1, 2, 15, 1); @@ -669,15 +658,16 @@ void fn_1_1112C(void) lbl_1_bss_5E8.unk04 = NULL; lbl_1_bss_5E8.unk00->data = &lbl_1_bss_5E8; fn_1_10C00(obj); - while(1) { + while (1) { fn_1_BC8(); - if(lbl_1_bss_5E8.unk04 != NULL) { + if (lbl_1_bss_5E8.unk04 != NULL) { lbl_1_bss_5E8.unk04(obj, &lbl_1_bss_5E8); } - if(obj->work[0]) { - if(obj->work[2]) { + if (obj->work[0]) { + if (obj->work[2]) { obj->work[2]--; - } else if(obj->work[2] == 0 && Hu3DMotionEndCheck(obj->model[1])) { + } + else if (obj->work[2] == 0 && Hu3DMotionEndCheck(obj->model[1])) { fn_1_1DFC(obj, 1, obj->work[1], 15, 1); obj->work[0] = obj->work[1] = obj->work[2] = 0; } @@ -690,20 +680,20 @@ void fn_1_11418(int arg0) int i; int order[4]; order[0] = 0; - for(i=1; i<4; i++) { - order[i] = order[i-1]+1; - if(order[i] >= 4) { + for (i = 1; i < 4; i++) { + order[i] = order[i - 1] + 1; + if (order[i] >= 4) { order[i] = 0; } - if(arg0 == order[i]) { + if (arg0 == order[i]) { lbl_1_bss_688.unk00 = i; } } - for(i=0; i<4; i++) { + for (i = 0; i < 4; i++) { fn_1_357C(&lbl_1_bss_688.unk30[i], order[i]); } - for(i=0; i<4; i++) { - lbl_1_bss_688.unk30[i].unk18 = GWPlayer[order[i]].rank+1; + for (i = 0; i < 4; i++) { + lbl_1_bss_688.unk30[i].unk18 = GWPlayer[order[i]].rank + 1; } } @@ -719,21 +709,23 @@ void fn_1_1154C(omObjData *object, int player) int playerNo = player; int charNo = lbl_1_bss_688.unk30[playerNo].unk10; object->model[1] = CharModelCreate(charNo, 4); - object->motion[1] = CharModelMotionCreate(charNo, 0x5F0000); - object->motion[2] = CharModelMotionCreate(charNo, 0x5F0003); - object->motion[3] = CharModelMotionCreate(charNo, 0x5F0005); - object->motion[4] = CharModelMotionCreate(charNo, 0x5F001A); - object->motion[5] = CharModelMotionCreate(charNo, 0x5F006D); - object->motion[6] = Hu3DJointMotionFile(object->model[1], 0x660018+charNo); + object->motion[1] = CharModelMotionCreate(charNo, DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x00)); + object->motion[2] = CharModelMotionCreate(charNo, DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x03)); + object->motion[3] = CharModelMotionCreate(charNo, DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x05)); + object->motion[4] = CharModelMotionCreate(charNo, DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x1A)); + object->motion[5] = CharModelMotionCreate(charNo, DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x6D)); + object->motion[6] = Hu3DJointMotionFile(object->model[1], 0x660018 + charNo); CharModelMotionDataClose(charNo); - Hu3DModelPosSet(object->model[1], lbl_1_data_81C[playerNo].x, lbl_1_data_81C[lbl_1_bss_688.unk30[playerNo].unk18-1].y+90, lbl_1_data_81C[playerNo].z); + Hu3DModelPosSet( + object->model[1], lbl_1_data_81C[playerNo].x, lbl_1_data_81C[lbl_1_bss_688.unk30[playerNo].unk18 - 1].y + 90, lbl_1_data_81C[playerNo].z); Hu3DModelRotSet(object->model[1], 0, 0, 0); Hu3DModelScaleSet(object->model[1], 1, 1, 1); Hu3DModelShadowSet(object->model[1]); fn_1_1DFC(object, 1, 1, 0, 1); object->model[2] = Hu3DModelCreateFile(0x660056); - Hu3DModelPosSet(object->model[2], lbl_1_data_81C[playerNo].x, lbl_1_data_81C[lbl_1_bss_688.unk30[playerNo].unk18-1].y, lbl_1_data_81C[playerNo].z); - if(lbl_1_bss_688.unk30[playerNo].unk18 == 4) { + Hu3DModelPosSet( + object->model[2], lbl_1_data_81C[playerNo].x, lbl_1_data_81C[lbl_1_bss_688.unk30[playerNo].unk18 - 1].y, lbl_1_data_81C[playerNo].z); + if (lbl_1_bss_688.unk30[playerNo].unk18 == 4) { Hu3DModelAttrSet(object->model[2], 1); } Hu3DModelScaleSet(object->model[2], 1.5, 1, 1.5); @@ -743,28 +735,28 @@ void fn_1_1154C(omObjData *object, int player) void fn_1_11838(int arg0, int arg1, int arg2, int arg3, int arg4) { fn_1_1DFC(lbl_1_bss_548[lbl_1_bss_688.unk00].unk00, 1, arg0, arg2, arg3); - if(arg3 == 1) { + if (arg3 == 1) { arg4 = 0; } lbl_1_bss_548[lbl_1_bss_688.unk00].unk00->work[0] = arg4; lbl_1_bss_548[lbl_1_bss_688.unk00].unk00->work[1] = arg1; - lbl_1_bss_548[lbl_1_bss_688.unk00].unk00->work[2] = arg2+1; + lbl_1_bss_548[lbl_1_bss_688.unk00].unk00->work[2] = arg2 + 1; } -void fn_1_11934(omObjData* arg0, StructBss16C* arg1) +void fn_1_11934(omObjData *arg0, StructBss16C *arg1) { float posY = Hu3DData[arg0->model[1]].pos.y; int i; - for(i=0; i<60; i++) { + for (i = 0; i < 60; i++) { fn_1_BC8(); Hu3DData[arg0->model[1]].pos.y = fn_1_984(posY, 0, i, 60); - Hu3DData[arg0->model[2]].pos.y = fn_1_984(posY-90, -90, i, 60); + Hu3DData[arg0->model[2]].pos.y = fn_1_984(posY - 90, -90, i, 60); } Hu3DModelAttrSet(arg0->model[2], 1); arg1->unk04 = NULL; } -void fn_1_11A98(omObjData* arg0, StructBss16C* arg1) +void fn_1_11A98(omObjData *arg0, StructBss16C *arg1) { Vec pos = { 120, 0, 800 }; lbl_1_bss_5E8.unk04 = (void *)fn_1_11048; @@ -783,15 +775,16 @@ void fn_1_11BB0(void) lbl_1_bss_548[playerNo].unk04 = NULL; lbl_1_bss_548[playerNo].unk00->data = &lbl_1_bss_548[0]; fn_1_1154C(obj, playerNo); - while(1) { + while (1) { fn_1_BC8(); - if(lbl_1_bss_548[playerNo].unk04 != NULL) { + if (lbl_1_bss_548[playerNo].unk04 != NULL) { lbl_1_bss_548[playerNo].unk04(obj, &lbl_1_bss_548[playerNo]); } - if(obj->work[0]) { - if(obj->work[2]) { + if (obj->work[0]) { + if (obj->work[2]) { obj->work[2]--; - } else if(obj->work[2] == 0 && Hu3DMotionEndCheck(obj->model[1])) { + } + else if (obj->work[2] == 0 && Hu3DMotionEndCheck(obj->model[1])) { fn_1_1DFC(obj, 1, obj->work[1], 15, 1); obj->work[0] = obj->work[1] = obj->work[2] = 0; } @@ -823,8 +816,8 @@ void fn_1_1205C(void) temp.unk20.z = 0; temp.unk38 = 1750; fn_1_4FEC(work, &temp, work->unk40++, 60, 30); - if(0.0f != lbl_1_bss_688.unk100) { - work->unk08.y = lbl_1_bss_688.unk100+125; + if (0.0f != lbl_1_bss_688.unk100) { + work->unk08.y = lbl_1_bss_688.unk100 + 125; } } @@ -832,7 +825,7 @@ void fn_1_1218C(void) { StructBss24 *work = &lbl_1_bss_24; StructBss24 temp; - if(work->unk40 == 50) { + if (work->unk40 == 50) { fn_1_1DFC(lbl_1_bss_638.unk00, 5, 5, 0, 0); fn_1_1DFC(lbl_1_bss_638.unk00, 6, 6, 0, 0); HuAudFXPlay(161); @@ -845,11 +838,11 @@ void fn_1_1218C(void) temp.unk20.z = 0; temp.unk38 = 125; fn_1_4FEC(work, &temp, work->unk40, 180, 10); - if(work->unk40++ >= 90) { - if(work->unk40 == 91) { + if (work->unk40++ >= 90) { + if (work->unk40 == 91) { lbl_1_bss_88[0] = HuAudFXPlay(32); } - work->unk20.x = fn_1_864(work->unk20.x, -45, work->unk40-90, 90); - Hu3DData[lbl_1_bss_638.unk00->model[5]].rot.x = fn_1_864(0, 45, work->unk40-90, 90); + work->unk20.x = fn_1_864(work->unk20.x, -45, work->unk40 - 90, 90); + Hu3DData[lbl_1_bss_638.unk00->model[5]].rot.x = fn_1_864(0, 45, work->unk40 - 90, 90); } -} \ No newline at end of file +} diff --git a/src/REL/mstory2Dll/ending.c b/src/REL/mstory2Dll/ending.c index c0c09595..5e1a9b17 100644 --- a/src/REL/mstory2Dll/ending.c +++ b/src/REL/mstory2Dll/ending.c @@ -3,19 +3,20 @@ #include "game/board/main.h" #include "game/chrman.h" #include "game/data.h" +#include "game/esprite.h" #include "game/gamework.h" #include "game/gamework_data.h" #include "game/hsfanim.h" #include "game/hsfman.h" #include "game/hsfmotion.h" #include "game/minigame_seq.h" +#include "game/objsub.h" +#include "game/pad.h" #include "game/printfunc.h" #include "game/sprite.h" #include "game/window.h" #include "game/wipe.h" -#include "game/pad.h" -#include "game/objsub.h" -#include "game/esprite.h" + typedef struct { /* 0x000 */ s32 unk00; @@ -46,11 +47,11 @@ s32 lbl_1_data_F14 = 127; void fn_1_19F14(void); void fn_1_1A160(void); -void fn_1_1A538(omObjData* arg0, StructBss16C* arg1); +void fn_1_1A538(omObjData *arg0, StructBss16C *arg1); void fn_1_1A578(void); -void fn_1_1A9D0(omObjData* arg0, StructBss16C* arg1); +void fn_1_1A9D0(omObjData *arg0, StructBss16C *arg1); void fn_1_1AAB4(void); -void fn_1_1AFD4(omObjData* arg0, StructBss16C* arg1); +void fn_1_1AFD4(omObjData *arg0, StructBss16C *arg1); void fn_1_1B0E4(void); void fn_1_1AD3C(int arg0); void fn_1_1B318(void); @@ -60,44 +61,44 @@ void fn_1_1B430(void); void fn_1_186D0(void) { int i; - while(1) { + while (1) { HuPrcVSleep(); - if(lbl_1_data_F08 != -1 && lbl_1_data_F0C[0] != -1 && lbl_1_data_F0C[1] != -1 && lbl_1_data_F0C[0] == Hu3DMotionIDGet(lbl_1_data_F08)) { - for(i=0; i<2; i++) { - if(lbl_1_data_EF8[1][i] != -1) { - if(Hu3DMotionTimeGet(lbl_1_data_F08) >= lbl_1_data_EF8[0][i]) { + if (lbl_1_data_F08 != -1 && lbl_1_data_F0C[0] != -1 && lbl_1_data_F0C[1] != -1 && lbl_1_data_F0C[0] == Hu3DMotionIDGet(lbl_1_data_F08)) { + for (i = 0; i < 2; i++) { + if (lbl_1_data_EF8[1][i] != -1) { + if (Hu3DMotionTimeGet(lbl_1_data_F08) >= lbl_1_data_EF8[0][i]) { OSReport("KE-System TIME:%d\n", lbl_1_data_EF8[0][i]); HuAudFXPlayVol(81, lbl_1_data_F14); lbl_1_data_EF8[1][i] = -1; } } } - if(Hu3DMotionTimeGet(lbl_1_data_F08) <= 10) { - for(i=0; i<2; i++) { + if (Hu3DMotionTimeGet(lbl_1_data_F08) <= 10) { + for (i = 0; i < 2; i++) { lbl_1_data_EF8[1][i] = 1; } } } - if(lbl_1_bss_B3C == 1) { + if (lbl_1_bss_B3C == 1) { lbl_1_data_F14--; - if(lbl_1_data_F14 <= 0) { + if (lbl_1_data_F14 <= 0) { lbl_1_data_F14 = 0; } } - if(lbl_1_bss_B3C == 2) { + if (lbl_1_bss_B3C == 2) { break; } } HuPrcEnd(); - while(1) { + while (1) { HuPrcVSleep(); } } -void fn_1_188F0(Process* arg0, s32 arg1) +void fn_1_188F0(Process *arg0, s32 arg1) { lbl_1_bss_B38 = arg0; - if(GWSystem.diff_story == 2) { + if (GWSystem.diff_story == 2) { GWGameStat.field10E_bit4 = TRUE; } lbl_1_bss_C0C.unk0C = arg1; @@ -115,11 +116,11 @@ void fn_1_188F0(Process* arg0, s32 arg1) void fn_1_18A34(omObjData *object) { - if(object->work[2]) { + if (object->work[2]) { object->work[2]--; return; } - if(object->work[2] == 0 && Hu3DMotionEndCheck(object->model[1])) { + if (object->work[2] == 0 && Hu3DMotionEndCheck(object->model[1])) { fn_1_1DFC(object, 1, object->work[1], 15, 1); object->work[0] = object->work[1] = object->work[2] = 0; } @@ -131,40 +132,46 @@ void fn_1_18AC0(void) int posY = 40; GXColor winColor = { 0, 0, 128, 128 }; int i; - while(1) { + while (1) { fn_1_BC8(); fontcolor = FONT_COLOR_WHITE; printWin(posX, posY, 220, 130, &winColor); - if(lbl_1_bss_BE4.unk04 == NULL) { + if (lbl_1_bss_BE4.unk04 == NULL) { print8(posX, posY, 1, "PROC_MAIN -> FALSE"); - } else { + } + else { print8(posX, posY, 1, "PROC_MAIN -> TRUE"); } - if(lbl_1_bss_BBC.unk04 == NULL) { - print8(posX, posY+10, 1, "PROC_MAP -> FALSE"); - } else { - print8(posX, posY+10, 1, "PROC_MAP -> TRUE"); + if (lbl_1_bss_BBC.unk04 == NULL) { + print8(posX, posY + 10, 1, "PROC_MAP -> FALSE"); } - if(lbl_1_bss_B94.unk04 == NULL) { - print8(posX, posY+20, 1, "PROC_PLAYER -> FALSE"); - } else { - print8(posX, posY+20, 1, "PROC_PLAYER -> TRUE"); + else { + print8(posX, posY + 10, 1, "PROC_MAP -> TRUE"); } - if(lbl_1_bss_B6C.unk04 == NULL) { - print8(posX, posY+30, 1, "PROC_SUB -> FALSE"); - } else { - print8(posX, posY+30, 1, "PROC_SUB -> TRUE"); + if (lbl_1_bss_B94.unk04 == NULL) { + print8(posX, posY + 20, 1, "PROC_PLAYER -> FALSE"); } - if(lbl_1_bss_B44.unk04 == NULL) { - print8(posX, posY+40, 1, "PROC_KOOPA -> FALSE"); - } else { - print8(posX, posY+40, 1, "PROC_KOOPA -> TRUE"); + else { + print8(posX, posY + 20, 1, "PROC_PLAYER -> TRUE"); } - - print8(posX, posY+60, 1, "P:%d W:%d", lbl_1_bss_C0C.unk00, lbl_1_bss_C0C.unk0C); - print8(posX, posY+80, 1, "NO) IDX:GRP:COM:DIF:PAD:CHR"); - for(i=0; i<4; i++) { - print8(posX, posY+90+(i*10), 1, "%2d) %3d:%3d:%3d:%3d:%3d:%3d", i, lbl_1_bss_C0C.unk30[i].unk00, lbl_1_bss_C0C.unk30[i].unk04, lbl_1_bss_C0C.unk30[i].unk08, lbl_1_bss_C0C.unk30[i].unk0C, lbl_1_bss_C0C.unk30[i].unk14, lbl_1_bss_C0C.unk30[i].unk10); + if (lbl_1_bss_B6C.unk04 == NULL) { + print8(posX, posY + 30, 1, "PROC_SUB -> FALSE"); + } + else { + print8(posX, posY + 30, 1, "PROC_SUB -> TRUE"); + } + if (lbl_1_bss_B44.unk04 == NULL) { + print8(posX, posY + 40, 1, "PROC_KOOPA -> FALSE"); + } + else { + print8(posX, posY + 40, 1, "PROC_KOOPA -> TRUE"); + } + + print8(posX, posY + 60, 1, "P:%d W:%d", lbl_1_bss_C0C.unk00, lbl_1_bss_C0C.unk0C); + print8(posX, posY + 80, 1, "NO) IDX:GRP:COM:DIF:PAD:CHR"); + for (i = 0; i < 4; i++) { + print8(posX, posY + 90 + (i * 10), 1, "%2d) %3d:%3d:%3d:%3d:%3d:%3d", i, lbl_1_bss_C0C.unk30[i].unk00, lbl_1_bss_C0C.unk30[i].unk04, + lbl_1_bss_C0C.unk30[i].unk08, lbl_1_bss_C0C.unk30[i].unk0C, lbl_1_bss_C0C.unk30[i].unk14, lbl_1_bss_C0C.unk30[i].unk10); } } } @@ -211,7 +218,7 @@ void fn_1_18EC4(void) do { fn_1_BC8(); } while (WipeStatGet()); - if(0) { + if (0) { fn_1_BC8(); } } @@ -226,15 +233,15 @@ void fn_1_19138(void) fn_1_2750(fn_1_1B430); fn_1_BE8(30); fn_1_1DFC(lbl_1_bss_BBC.unk00, 2, 2, 0, 0); - while(1) { + while (1) { fn_1_BC8(); - if(lbl_1_bss_B94.unk04 == NULL) { + if (lbl_1_bss_B94.unk04 == NULL) { break; } } - while(1) { + while (1) { fn_1_BC8(); - if(lbl_1_bss_B6C.unk04 == NULL) { + if (lbl_1_bss_B6C.unk04 == NULL) { break; } } @@ -251,16 +258,8 @@ void fn_1_19138(void) fn_1_BE8(60); } -char *lbl_1_data_10E4[8] = { - "movie/endmov_ma0.thp", - "movie/endmov_lu0.thp", - "movie/endmov_pe0.thp", - "movie/endmov_yo0.thp", - "movie/endmov_wa0.thp", - "movie/endmov_do0.thp", - "movie/endmov_da0.thp", - "movie/endmov_wl0.thp" -}; +char *lbl_1_data_10E4[8] = { "movie/endmov_ma0.thp", "movie/endmov_lu0.thp", "movie/endmov_pe0.thp", "movie/endmov_yo0.thp", "movie/endmov_wa0.thp", + "movie/endmov_do0.thp", "movie/endmov_da0.thp", "movie/endmov_wl0.thp" }; void fn_1_19334(void) { @@ -303,7 +302,7 @@ void fn_1_19334(void) lbl_1_bss_B94.unk04 = NULL; lbl_1_bss_B44.unk04 = NULL; lbl_1_bss_B6C.unk04 = NULL; - + CharModelKill(-1); Hu3DAllKill(); fn_1_BE8(60); @@ -320,7 +319,7 @@ void fn_1_19334(void) sprid = HuSprCreate(HuSprAnimRead(HuDataReadNum(0x660061, 0x10000000)), 950, 0); HuSprGrpMemberSet(gid, 2, sprid); HuSprBankSet(gid, 2, lbl_1_bss_C0C.unk30[lbl_1_bss_C0C.unk00].unk10); - if(GWLanguageGet() == 0 && lbl_1_bss_C0C.unk30[lbl_1_bss_C0C.unk00].unk10 == 5) { + if (GWLanguageGet() == 0 && lbl_1_bss_C0C.unk30[lbl_1_bss_C0C.unk00].unk10 == 5) { HuSprBankSet(gid, 2, 8); } HuSprPosSet(gid, 2, 288, 254); @@ -328,28 +327,28 @@ void fn_1_19334(void) HuPrcSleep(5); WipeColorSet(0, 0, 0); WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 10); - while(WipeStatGet()) { + while (WipeStatGet()) { HuPrcVSleep(); } - while(!HuTHPEndCheck()) { - if(time >= 3300) { + while (!HuTHPEndCheck()) { + if (time >= 3300) { HuSprAttrReset(gid, 1, HUSPR_ATTR_DISPOFF); HuSprAttrReset(gid, 2, HUSPR_ATTR_DISPOFF); - } else { + } + else { time++; } HuPrcVSleep(); } WipeColorSet(0, 0, 0); WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 30); - while(WipeStatGet()) { + while (WipeStatGet()) { HuPrcVSleep(); } HuTHPClose(); HuPrcVSleep(); HuSprGrpKill(gid); } - } void fn_1_199A0(void) @@ -423,13 +422,13 @@ void fn_1_19BE8(void) HuAudFadeOut(1); his = omOvlHisGet(0); omOvlHisChg(0, OVL_MSTORY2, 20, 1); - omOvlCallEx(OVL_STAFF, 1, 0, 0); - while(1) { + omOvlCallEx(OVL_STAFF, 1, 0, 0); + while (1) { fn_1_BC8(); } } -void fn_1_19C6C(omObjData* arg0, StructBss16C* arg1) +void fn_1_19C6C(omObjData *arg0, StructBss16C *arg1) { int temp = 0; fn_1_18E7C(); @@ -446,9 +445,9 @@ void fn_1_19F14(void) lbl_1_bss_BE4.unk00 = obj = omAddObjEx(lbl_1_bss_B38, 256, 16, 16, -1, NULL); lbl_1_bss_BE4.unk04 = (void *)fn_1_19C6C; lbl_1_bss_BE4.unk00->data = &lbl_1_bss_BE4; - while(1) { + while (1) { fn_1_BC8(); - if(lbl_1_bss_BE4.unk04 != NULL) { + if (lbl_1_bss_BE4.unk04 != NULL) { lbl_1_bss_BE4.unk04(obj, &lbl_1_bss_BE4); } } @@ -477,9 +476,9 @@ void fn_1_1A160(void) lbl_1_bss_BBC.unk00 = obj = omAddObjEx(lbl_1_bss_B38, 256, 16, 16, -1, NULL); lbl_1_bss_BBC.unk04 = NULL; fn_1_19FC8(obj); - while(1) { + while (1) { fn_1_BC8(); - if(lbl_1_bss_BBC.unk04 != NULL) { + if (lbl_1_bss_BBC.unk04 != NULL) { lbl_1_bss_BBC.unk04(obj, &lbl_1_bss_BBC); } } @@ -501,7 +500,7 @@ void fn_1_1A368(omObjData *object) HuPrcChildCreate(fn_1_186D0, 100, 8192, 0, HuPrcCurrentGet()); } -void fn_1_1A538(omObjData* arg0, StructBss16C* arg1) +void fn_1_1A538(omObjData *arg0, StructBss16C *arg1) { Hu3DData[lbl_1_bss_B44.unk00->model[1]].pos.z -= 2.5f; } @@ -512,12 +511,12 @@ void fn_1_1A578(void) lbl_1_bss_B44.unk00 = obj = omAddObjEx(lbl_1_bss_B38, 256, 16, 16, -1, NULL); lbl_1_bss_B44.unk04 = NULL; fn_1_1A368(obj); - while(1) { + while (1) { fn_1_BC8(); - if(lbl_1_bss_B44.unk04 != NULL) { + if (lbl_1_bss_B44.unk04 != NULL) { lbl_1_bss_B44.unk04(obj, &lbl_1_bss_B44); } - if(obj->work[0]) { + if (obj->work[0]) { fn_1_6704(obj); } } @@ -540,8 +539,7 @@ void fn_1_1A7CC(omObjData *object) CharModelEffectNpcInit(object->model[1], object->motion[2], 1, 9); } - -void fn_1_1A9D0(omObjData* arg0, StructBss16C* arg1) +void fn_1_1A9D0(omObjData *arg0, StructBss16C *arg1) { Vec pos = { -120, 0, 800 }; fn_1_1DFC(arg0, 1, 2, 15, 1); @@ -556,12 +554,12 @@ void fn_1_1AAB4(void) lbl_1_bss_B6C.unk00 = obj = omAddObjEx(lbl_1_bss_B38, 256, 16, 16, -1, NULL); lbl_1_bss_B6C.unk04 = NULL; fn_1_1A7CC(obj); - while(1) { + while (1) { fn_1_BC8(); - if(lbl_1_bss_B6C.unk04 != NULL) { + if (lbl_1_bss_B6C.unk04 != NULL) { lbl_1_bss_B6C.unk04(obj, &lbl_1_bss_B6C); } - if(obj->work[0]) { + if (obj->work[0]) { fn_1_6704(obj); } } @@ -572,16 +570,16 @@ void fn_1_1AD3C(int arg0) int i; int order[4]; order[0] = 0; - for(i=1; i<4; i++) { - order[i] = order[i-1]+1; - if(order[i] >= 4) { + for (i = 1; i < 4; i++) { + order[i] = order[i - 1] + 1; + if (order[i] >= 4) { order[i] = 0; } - if(arg0 == order[i]) { + if (arg0 == order[i]) { lbl_1_bss_C0C.unk00 = i; } } - for(i=0; i<4; i++) { + for (i = 0; i < 4; i++) { fn_1_357C(&lbl_1_bss_C0C.unk30[i], order[i]); } } @@ -590,10 +588,10 @@ void fn_1_1AE20(omObjData *object) { int charNo = lbl_1_bss_C0C.unk30[lbl_1_bss_C0C.unk00].unk10; object->model[1] = CharModelCreate(charNo, 1); - object->motion[1] = CharModelMotionCreate(charNo, 0x5F0000); - object->motion[2] = CharModelMotionCreate(charNo, 0x5F0035); - object->motion[3] = Hu3DJointMotionFile(object->model[1], 0x660010+charNo); - object->motion[4] = Hu3DJointMotionFile(object->model[1], 0x660008+charNo); + object->motion[1] = CharModelMotionCreate(charNo, DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x00)); + object->motion[2] = CharModelMotionCreate(charNo, DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x35)); + object->motion[3] = Hu3DJointMotionFile(object->model[1], 0x660010 + charNo); + object->motion[4] = Hu3DJointMotionFile(object->model[1], 0x660008 + charNo); CharModelMotionDataClose(charNo); Hu3DModelPosSet(object->model[1], 120, 0, 800); Hu3DModelRotSet(object->model[1], 0, -135, 0); @@ -603,13 +601,13 @@ void fn_1_1AE20(omObjData *object) fn_1_1DFC(object, 1, 1, 0, 1); } -void fn_1_1AFD4(omObjData* arg0, StructBss16C* arg1) +void fn_1_1AFD4(omObjData *arg0, StructBss16C *arg1) { int i; fn_1_1DFC(arg0, 1, 2, 0, 0); fn_1_BC8(); Hu3DMotionTimeSet(arg0->model[1], 60); - for(i=0; i<60; i++) { + for (i = 0; i < 60; i++) { fn_1_BC8(); Hu3DData[arg0->model[1]].rot.y = fn_1_864(-135, -90, i, 60); } @@ -623,12 +621,12 @@ void fn_1_1B0E4(void) lbl_1_bss_B94.unk00 = obj = omAddObjEx(lbl_1_bss_B38, 256, 16, 16, -1, NULL); lbl_1_bss_B94.unk04 = NULL; fn_1_1AE20(obj); - while(1) { + while (1) { fn_1_BC8(); - if(lbl_1_bss_B94.unk04 != NULL) { + if (lbl_1_bss_B94.unk04 != NULL) { lbl_1_bss_B94.unk04(obj, &lbl_1_bss_B94); } - if(obj->work[0]) { + if (obj->work[0]) { fn_1_6704(obj); } } @@ -670,7 +668,7 @@ void fn_1_1B430(void) temp.unk20.z = 0; temp.unk38 = 1400; fn_1_42A0(work, &temp, work->unk40++, 60, 10); - if(0.0f != lbl_1_bss_C0C.unk100) { - work->unk08.y = 125+lbl_1_bss_C0C.unk100; + if (0.0f != lbl_1_bss_C0C.unk100) { + work->unk08.y = 125 + lbl_1_bss_C0C.unk100; } -} \ No newline at end of file +} diff --git a/src/REL/mstory2Dll/mg_clear.c b/src/REL/mstory2Dll/mg_clear.c index ddeded43..524869fe 100644 --- a/src/REL/mstory2Dll/mg_clear.c +++ b/src/REL/mstory2Dll/mg_clear.c @@ -9,70 +9,71 @@ #include "game/hsfman.h" #include "game/hsfmotion.h" #include "game/minigame_seq.h" +#include "game/objsub.h" +#include "game/pad.h" #include "game/printfunc.h" #include "game/sprite.h" #include "game/window.h" #include "game/wipe.h" -#include "game/pad.h" -#include "game/objsub.h" + typedef struct struct_data850 { - s32 unk0; - s32 unk4; - s32 unk8; - s32 unkC; - s32 unk10; + s32 unk0; + s32 unk4; + s32 unk8; + s32 unkC; + s32 unk10; } StructData850; StructData850 lbl_1_data_850[] = { - { DATA_MAKE_NUM(DATADIR_MSTORY4, 0x00), 0, 0, 0, 1 }, - { DATA_MAKE_NUM(DATADIR_MSTORY4, 0x01), 0, 0, 0, 1 }, - { DATA_MAKE_NUM(DATADIR_MSTORY4, 0x02), 0, 0, 0, 1 }, - { DATA_MAKE_NUM(DATADIR_MSTORY4, 0x03), 0, 0, 0, 1 }, - { DATA_MAKE_NUM(DATADIR_MSTORY4, 0x04), 0, 0, 0, 1 }, - { DATA_MAKE_NUM(DATADIR_MSTORY4, 0x05), 0, 0, 0, 1 }, - { DATA_MAKE_NUM(DATADIR_MSTORY4, 0x06), 0, 0, 0, 1 }, - { DATA_MAKE_NUM(DATADIR_MSTORY4, 0x07), 0, 0, 0, 1 }, - { DATA_MAKE_NUM(DATADIR_MSTORY4, 0x08), 0, 0, 0, 1 }, - { DATA_MAKE_NUM(DATADIR_MSTORY4, 0x09), 0, 0, 0, 1 }, - { DATA_MAKE_NUM(DATADIR_MSTORY4, 0x0A), 0, 0, 0, 1 }, - { DATA_MAKE_NUM(DATADIR_MSTORY4, 0x0B), 0, 0, 0, 1 }, - { DATA_MAKE_NUM(DATADIR_MSTORY4, 0x0C), 0, 0, 0, 1 }, - { DATA_MAKE_NUM(DATADIR_MSTORY4, 0x0D), 0, 0, 0, 1 }, - { DATA_MAKE_NUM(DATADIR_MSTORY4, 0x0E), 1, 0, 0, 1 }, - { DATA_MAKE_NUM(DATADIR_MSTORY4, 0x0F), 0, 0, 0, 1 }, - { DATA_MAKE_NUM(DATADIR_MSTORY4, 0x10), 0, 0, 0, 1 }, - { DATA_MAKE_NUM(DATADIR_MSTORY4, 0x11), 0, 0, 0, 1 }, - { DATA_MAKE_NUM(DATADIR_MSTORY4, 0x12), 0, 0, 0, 1 }, - { DATA_MAKE_NUM(DATADIR_MSTORY4, 0x13), 0, 0, 0, 1 }, - { DATA_MAKE_NUM(DATADIR_MSTORY4, 0x14), 0, 0, 0, 1 }, - { DATA_MAKE_NUM(DATADIR_MSTORY4, 0x15), 0, 0, 0, 1 }, - { DATA_MAKE_NUM(DATADIR_MSTORY4, 0x16), 0, 0, 0, 1 }, - { DATA_MAKE_NUM(DATADIR_MSTORY4, 0x17), 0, 0, 0, 1 }, - { DATA_MAKE_NUM(DATADIR_MSTORY4, 0x18), 0, 0, 0, 1 }, - { DATA_MAKE_NUM(DATADIR_MSTORY4, 0x19), 0, 0, 0, 1 }, - { DATA_MAKE_NUM(DATADIR_MSTORY4, 0x1A), 0, 0, 0, 1 }, - { DATA_MAKE_NUM(DATADIR_MSTORY4, 0x1B), 0, 0, 0, 1 }, - { DATA_MAKE_NUM(DATADIR_MSTORY4, 0x1C), 0, 0, 0, 1 }, - { DATA_MAKE_NUM(DATADIR_MSTORY4, 0x1D), 0, 0, 0, 1 }, - { DATA_MAKE_NUM(DATADIR_MSTORY4, 0x1E), 0, 0, 0, 1 }, - { DATA_MAKE_NUM(DATADIR_MSTORY4, 0x1F), 0, 0, 0, 1 }, - { DATA_MAKE_NUM(DATADIR_MSTORY4, 0x20), 0, 0, 0, 1 }, - { DATA_MAKE_NUM(DATADIR_MSTORY4, 0x21), 0, 0, 0, 1 }, - { DATA_MAKE_NUM(DATADIR_MSTORY4, 0x22), 0, 0, 0, 1 }, - { DATA_MAKE_NUM(DATADIR_MSTORY4, 0x23), 0, 0, 0, 1 }, - { DATA_MAKE_NUM(DATADIR_MSTORY4, 0x24), 0, 0, 0, 1 }, - { DATA_MAKE_NUM(DATADIR_MSTORY4, 0x25), 0, 0, 0, 1 }, - { DATA_MAKE_NUM(DATADIR_MSTORY4, 0x26), 0, 0, 0, 1 }, - { DATA_MAKE_NUM(DATADIR_MSTORY4, 0x27), 0, 0, 0, 1 }, - { DATA_MAKE_NUM(DATADIR_MSTORY4, 0x28), 0, 0, 0, 1 }, - { DATA_MAKE_NUM(DATADIR_MSTORY4, 0x29), 0, 0, 0, 1 }, - { DATA_MAKE_NUM(DATADIR_MSTORY4, 0x2A), 0, 0, 0, 1 }, - { DATA_MAKE_NUM(DATADIR_MSTORY4, 0x2B), 0, 0, 0, 1 }, - { DATA_MAKE_NUM(DATADIR_MSTORY4, 0x2C), 0, 0, 0, 1 }, - { DATA_MAKE_NUM(DATADIR_MSTORY4, 0x2D), 0, 0, 0, 1 }, - { DATA_MAKE_NUM(DATADIR_MSTORY4, 0x2E), 0, 0, 0, 1 }, - { DATA_MAKE_NUM(DATADIR_MSTORY4, 0x2F), 0, 0, 0, 1 }, + { DATA_MAKE_NUM(DATADIR_MSTORY4, 0x00), 0, 0, 0, 1 }, + { DATA_MAKE_NUM(DATADIR_MSTORY4, 0x01), 0, 0, 0, 1 }, + { DATA_MAKE_NUM(DATADIR_MSTORY4, 0x02), 0, 0, 0, 1 }, + { DATA_MAKE_NUM(DATADIR_MSTORY4, 0x03), 0, 0, 0, 1 }, + { DATA_MAKE_NUM(DATADIR_MSTORY4, 0x04), 0, 0, 0, 1 }, + { DATA_MAKE_NUM(DATADIR_MSTORY4, 0x05), 0, 0, 0, 1 }, + { DATA_MAKE_NUM(DATADIR_MSTORY4, 0x06), 0, 0, 0, 1 }, + { DATA_MAKE_NUM(DATADIR_MSTORY4, 0x07), 0, 0, 0, 1 }, + { DATA_MAKE_NUM(DATADIR_MSTORY4, 0x08), 0, 0, 0, 1 }, + { DATA_MAKE_NUM(DATADIR_MSTORY4, 0x09), 0, 0, 0, 1 }, + { DATA_MAKE_NUM(DATADIR_MSTORY4, 0x0A), 0, 0, 0, 1 }, + { DATA_MAKE_NUM(DATADIR_MSTORY4, 0x0B), 0, 0, 0, 1 }, + { DATA_MAKE_NUM(DATADIR_MSTORY4, 0x0C), 0, 0, 0, 1 }, + { DATA_MAKE_NUM(DATADIR_MSTORY4, 0x0D), 0, 0, 0, 1 }, + { DATA_MAKE_NUM(DATADIR_MSTORY4, 0x0E), 1, 0, 0, 1 }, + { DATA_MAKE_NUM(DATADIR_MSTORY4, 0x0F), 0, 0, 0, 1 }, + { DATA_MAKE_NUM(DATADIR_MSTORY4, 0x10), 0, 0, 0, 1 }, + { DATA_MAKE_NUM(DATADIR_MSTORY4, 0x11), 0, 0, 0, 1 }, + { DATA_MAKE_NUM(DATADIR_MSTORY4, 0x12), 0, 0, 0, 1 }, + { DATA_MAKE_NUM(DATADIR_MSTORY4, 0x13), 0, 0, 0, 1 }, + { DATA_MAKE_NUM(DATADIR_MSTORY4, 0x14), 0, 0, 0, 1 }, + { DATA_MAKE_NUM(DATADIR_MSTORY4, 0x15), 0, 0, 0, 1 }, + { DATA_MAKE_NUM(DATADIR_MSTORY4, 0x16), 0, 0, 0, 1 }, + { DATA_MAKE_NUM(DATADIR_MSTORY4, 0x17), 0, 0, 0, 1 }, + { DATA_MAKE_NUM(DATADIR_MSTORY4, 0x18), 0, 0, 0, 1 }, + { DATA_MAKE_NUM(DATADIR_MSTORY4, 0x19), 0, 0, 0, 1 }, + { DATA_MAKE_NUM(DATADIR_MSTORY4, 0x1A), 0, 0, 0, 1 }, + { DATA_MAKE_NUM(DATADIR_MSTORY4, 0x1B), 0, 0, 0, 1 }, + { DATA_MAKE_NUM(DATADIR_MSTORY4, 0x1C), 0, 0, 0, 1 }, + { DATA_MAKE_NUM(DATADIR_MSTORY4, 0x1D), 0, 0, 0, 1 }, + { DATA_MAKE_NUM(DATADIR_MSTORY4, 0x1E), 0, 0, 0, 1 }, + { DATA_MAKE_NUM(DATADIR_MSTORY4, 0x1F), 0, 0, 0, 1 }, + { DATA_MAKE_NUM(DATADIR_MSTORY4, 0x20), 0, 0, 0, 1 }, + { DATA_MAKE_NUM(DATADIR_MSTORY4, 0x21), 0, 0, 0, 1 }, + { DATA_MAKE_NUM(DATADIR_MSTORY4, 0x22), 0, 0, 0, 1 }, + { DATA_MAKE_NUM(DATADIR_MSTORY4, 0x23), 0, 0, 0, 1 }, + { DATA_MAKE_NUM(DATADIR_MSTORY4, 0x24), 0, 0, 0, 1 }, + { DATA_MAKE_NUM(DATADIR_MSTORY4, 0x25), 0, 0, 0, 1 }, + { DATA_MAKE_NUM(DATADIR_MSTORY4, 0x26), 0, 0, 0, 1 }, + { DATA_MAKE_NUM(DATADIR_MSTORY4, 0x27), 0, 0, 0, 1 }, + { DATA_MAKE_NUM(DATADIR_MSTORY4, 0x28), 0, 0, 0, 1 }, + { DATA_MAKE_NUM(DATADIR_MSTORY4, 0x29), 0, 0, 0, 1 }, + { DATA_MAKE_NUM(DATADIR_MSTORY4, 0x2A), 0, 0, 0, 1 }, + { DATA_MAKE_NUM(DATADIR_MSTORY4, 0x2B), 0, 0, 0, 1 }, + { DATA_MAKE_NUM(DATADIR_MSTORY4, 0x2C), 0, 0, 0, 1 }, + { DATA_MAKE_NUM(DATADIR_MSTORY4, 0x2D), 0, 0, 0, 1 }, + { DATA_MAKE_NUM(DATADIR_MSTORY4, 0x2E), 0, 0, 0, 1 }, + { DATA_MAKE_NUM(DATADIR_MSTORY4, 0x2F), 0, 0, 0, 1 }, }; s32 lbl_1_data_C10[2][2] = { 20, 70, 1, 1 }; @@ -101,15 +102,15 @@ BOOL lbl_1_bss_794; Process *lbl_1_bss_790; void fn_1_13BB8(void); -void fn_1_13FB4(omObjData* arg0, StructBss16C* arg1); -void fn_1_140A0(omObjData* arg0, StructBss16C* arg1); +void fn_1_13FB4(omObjData *arg0, StructBss16C *arg1); +void fn_1_140A0(omObjData *arg0, StructBss16C *arg1); void fn_1_1449C(void); void fn_1_14A9C(int arg0, int arg1, int arg2, int arg3, int arg4); -void fn_1_14B48(omObjData* arg0, StructBss16C* arg1); +void fn_1_14B48(omObjData *arg0, StructBss16C *arg1); void fn_1_14C40(void); void fn_1_15134(int arg0, int arg1, int arg2, int arg3, int arg4); -void fn_1_151E0(omObjData* arg0, StructBss16C* arg1); -void fn_1_152C4(omObjData* arg0, StructBss16C* arg1); +void fn_1_151E0(omObjData *arg0, StructBss16C *arg1); +void fn_1_152C4(omObjData *arg0, StructBss16C *arg1); void fn_1_153A8(void); void fn_1_15668(int arg0); void fn_1_159F0(void); @@ -121,28 +122,28 @@ void fn_1_15F70(void); void fn_1_123C8(void) { int i; - while(1) { + while (1) { do { HuPrcVSleep(); - } while(lbl_1_data_C20 == -1 || lbl_1_data_C24[0] == -1 || lbl_1_data_C24[1] == -1 || lbl_1_data_C24[0] != Hu3DMotionIDGet(lbl_1_data_C20)); - for(i=0; i<2; i++) { - if(lbl_1_data_C10[1][i] != -1) { - if(Hu3DMotionTimeGet(lbl_1_data_C20) >= lbl_1_data_C10[0][i]) { + } while (lbl_1_data_C20 == -1 || lbl_1_data_C24[0] == -1 || lbl_1_data_C24[1] == -1 || lbl_1_data_C24[0] != Hu3DMotionIDGet(lbl_1_data_C20)); + for (i = 0; i < 2; i++) { + if (lbl_1_data_C10[1][i] != -1) { + if (Hu3DMotionTimeGet(lbl_1_data_C20) >= lbl_1_data_C10[0][i]) { OSReport("KE-System TIME:%d\n", lbl_1_data_C10[0][i]); HuAudFXPlay(81); lbl_1_data_C10[1][i] = -1; } } } - if(Hu3DMotionTimeGet(lbl_1_data_C20) <= 10) { - for(i=0; i<2; i++) { + if (Hu3DMotionTimeGet(lbl_1_data_C20) <= 10) { + for (i = 0; i < 2; i++) { lbl_1_data_C10[1][i] = 1; } } } } -void fn_1_1256C(Process* arg0, s32 arg1) +void fn_1_1256C(Process *arg0, s32 arg1) { lbl_1_bss_790 = arg0; lbl_1_bss_860.unk0C = arg1; @@ -160,11 +161,11 @@ void fn_1_1256C(Process* arg0, s32 arg1) void fn_1_12690(omObjData *object) { - if(object->work[2]) { + if (object->work[2]) { object->work[2]--; return; } - if(object->work[2] == 0 && Hu3DMotionEndCheck(object->model[1])) { + if (object->work[2] == 0 && Hu3DMotionEndCheck(object->model[1])) { fn_1_1DFC(object, 1, object->work[1], 15, 1); object->work[0] = object->work[1] = object->work[2] = 0; } @@ -176,38 +177,44 @@ void fn_1_1271C(void) int posY = 40; GXColor winColor = { 0, 0, 128, 128 }; int i; - while(1) { + while (1) { fn_1_BC8(); printWin(posX, posY, 220, 130, &winColor); - if(lbl_1_bss_838.unk04 == NULL) { + if (lbl_1_bss_838.unk04 == NULL) { print8(posX, posY, 1, "PROC_MAIN -> FALSE"); - } else { + } + else { print8(posX, posY, 1, "PROC_MAIN -> TRUE"); } - if(lbl_1_bss_810.unk04 == NULL) { - print8(posX, posY+10, 1, "PROC_MAP -> FALSE"); - } else { - print8(posX, posY+10, 1, "PROC_MAP -> TRUE"); + if (lbl_1_bss_810.unk04 == NULL) { + print8(posX, posY + 10, 1, "PROC_MAP -> FALSE"); } - if(lbl_1_bss_7E8.unk04 == NULL) { - print8(posX, posY+20, 1, "PROC_KOOPA -> FALSE"); - } else { - print8(posX, posY+20, 1, "PROC_KOOPA -> TRUE"); + else { + print8(posX, posY + 10, 1, "PROC_MAP -> TRUE"); } - if(lbl_1_bss_7C0.unk04 == NULL) { - print8(posX, posY+30, 1, "PROC_MKOOPA -> FALSE"); - } else { - print8(posX, posY+30, 1, "PROC_MKOOPA -> TRUE"); + if (lbl_1_bss_7E8.unk04 == NULL) { + print8(posX, posY + 20, 1, "PROC_KOOPA -> FALSE"); } - if(lbl_1_bss_798.unk04 == NULL) { - print8(posX, posY+40, 1, "PROC_PLAYER -> FALSE"); - } else { - print8(posX, posY+40, 1, "PROC_PLAYER -> TRUE"); + else { + print8(posX, posY + 20, 1, "PROC_KOOPA -> TRUE"); } - print8(posX, posY+60, 1, "P:%d W:%d", lbl_1_bss_860.unk00, lbl_1_bss_860.unk0C); - print8(posX, posY+80, 1, "NO) IDX:GRP:COM:DIF:PAD:CHR"); - for(i=0; i<4; i++) { - print8(posX, posY+90+(i*10), 1, "%2d) %3d:%3d:%3d:%3d:%3d:%3d", i, lbl_1_bss_860.unk30[i].unk00, lbl_1_bss_860.unk30[i].unk04, lbl_1_bss_860.unk30[i].unk08, lbl_1_bss_860.unk30[i].unk0C, lbl_1_bss_860.unk30[i].unk14, lbl_1_bss_860.unk30[i].unk10); + if (lbl_1_bss_7C0.unk04 == NULL) { + print8(posX, posY + 30, 1, "PROC_MKOOPA -> FALSE"); + } + else { + print8(posX, posY + 30, 1, "PROC_MKOOPA -> TRUE"); + } + if (lbl_1_bss_798.unk04 == NULL) { + print8(posX, posY + 40, 1, "PROC_PLAYER -> FALSE"); + } + else { + print8(posX, posY + 40, 1, "PROC_PLAYER -> TRUE"); + } + print8(posX, posY + 60, 1, "P:%d W:%d", lbl_1_bss_860.unk00, lbl_1_bss_860.unk0C); + print8(posX, posY + 80, 1, "NO) IDX:GRP:COM:DIF:PAD:CHR"); + for (i = 0; i < 4; i++) { + print8(posX, posY + 90 + (i * 10), 1, "%2d) %3d:%3d:%3d:%3d:%3d:%3d", i, lbl_1_bss_860.unk30[i].unk00, lbl_1_bss_860.unk30[i].unk04, + lbl_1_bss_860.unk30[i].unk08, lbl_1_bss_860.unk30[i].unk0C, lbl_1_bss_860.unk30[i].unk14, lbl_1_bss_860.unk30[i].unk10); } } } @@ -239,16 +246,16 @@ void fn_1_12B10(void) fn_1_BE8(60); fn_1_1DFC(lbl_1_bss_798.unk00, 1, 4, 15, 0); fn_1_BE8(16); - while(1) { + while (1) { fn_1_BC8(); - if(Hu3DMotionTimeGet(lbl_1_bss_798.unk00->model[1]) >= 20) { + if (Hu3DMotionTimeGet(lbl_1_bss_798.unk00->model[1]) >= 20) { break; } } Hu3DMotionSpeedSet(lbl_1_bss_798.unk00->model[1], 0); - while(1) { + while (1) { fn_1_BC8(); - if(lbl_1_bss_7E8.unk04 == NULL) { + if (lbl_1_bss_7E8.unk04 == NULL) { break; } } @@ -259,9 +266,9 @@ void fn_1_12B10(void) fn_1_BE8(80); Hu3DMotionSpeedSet(lbl_1_bss_798.unk00->model[1], 1); fn_1_1DFC(lbl_1_bss_798.unk00, 1, 1, 15, 1); - while(1) { + while (1) { fn_1_BC8(); - if(lbl_1_bss_7C0.unk04 == NULL) { + if (lbl_1_bss_7C0.unk04 == NULL) { break; } } @@ -304,20 +311,20 @@ void fn_1_12DD4(void) fn_1_1AFC(lbl_1_bss_860.unk04, -1); fn_1_1D18(lbl_1_bss_860.unk04, 0x250004); fn_1_1A94(lbl_1_bss_860.unk04); - while(1) { + while (1) { fn_1_BC8(); - if(lbl_1_bss_7C0.unk04 == NULL) { + if (lbl_1_bss_7C0.unk04 == NULL) { break; } } } -void fn_1_13150(omObjData* arg0, StructBss16C* arg1) +void fn_1_13150(omObjData *arg0, StructBss16C *arg1) { int streamNo = HuAudSStreamPlay(7); - while(1) { + while (1) { fn_1_BC8(); - if(HuAudSStreamStatGet(streamNo) == 0) { + if (HuAudSStreamStatGet(streamNo) == 0) { break; } } @@ -325,12 +332,12 @@ void fn_1_13150(omObjData* arg0, StructBss16C* arg1) arg1->unk04 = NULL; } -void fn_1_131C0(omObjData* arg0, StructBss16C* arg1) +void fn_1_131C0(omObjData *arg0, StructBss16C *arg1) { - int presentSe = (lbl_1_bss_860.unk30[lbl_1_bss_860.unk00].unk10*6)+5; + int presentSe = (lbl_1_bss_860.unk30[lbl_1_bss_860.unk00].unk10 * 6) + 5; fn_1_BE8(150); OSReport("########## PRESENT_SE : %d\n", presentSe); - HuAudFXPlay(presentSe+2260); + HuAudFXPlay(presentSe + 2260); fn_1_1DFC(lbl_1_bss_810.unk00, 7, 7, 1, 0); arg1->unk04 = NULL; } @@ -339,23 +346,24 @@ void fn_1_13264(void) { int i; fn_1_1DFC(lbl_1_bss_798.unk00, 1, 2, 15, 1); - for(i=0; i<30; i++) { + for (i = 0; i < 30; i++) { fn_1_BC8(); - if(lbl_1_bss_860.unk30[lbl_1_bss_860.unk00].unk10 != 5) { + if (lbl_1_bss_860.unk30[lbl_1_bss_860.unk00].unk10 != 5) { Hu3DData[lbl_1_bss_798.unk00->model[1]].pos.x = fn_1_864(120, 80, i, 30); } Hu3DData[lbl_1_bss_798.unk00->model[1]].rot.y = fn_1_864(-60, -90, i, 30); } fn_1_1DFC(lbl_1_bss_798.unk00, 1, 5, 5, 0); fn_1_BE8(10); - while(1) { + while (1) { fn_1_BC8(); - if(Hu3DMotionTimeGet(lbl_1_bss_798.unk00->model[1]) >= 30) { + if (Hu3DMotionTimeGet(lbl_1_bss_798.unk00->model[1]) >= 30) { break; } } Hu3DModelPosSet(lbl_1_bss_810.unk00->model[5], 0, 0, 0); - Hu3DModelHookSet(lbl_1_bss_798.unk00->model[1], CharModelHookNameGet(lbl_1_bss_860.unk30[lbl_1_bss_860.unk00].unk10, 1, 1), lbl_1_bss_810.unk00->model[5]); + Hu3DModelHookSet( + lbl_1_bss_798.unk00->model[1], CharModelHookNameGet(lbl_1_bss_860.unk30[lbl_1_bss_860.unk00].unk10, 1, 1), lbl_1_bss_810.unk00->model[5]); fn_1_BE8(60); lbl_1_bss_810.unk04 = (void *)fn_1_13FB4; HuAudFXPlay(163); @@ -367,9 +375,9 @@ void fn_1_13264(void) HuAudSeqPause(lbl_1_bss_78[0], 1, 1000); WipeColorSet(255, 255, 255); WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 60); - while(1) { + while (1) { fn_1_BC8(); - if(!WipeStatGet()) { + if (!WipeStatGet()) { break; } } @@ -381,9 +389,9 @@ void fn_1_13264(void) fn_1_BE8(30); HuAudFXPlay(169); WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 60); - while(1) { + while (1) { fn_1_BC8(); - if(!WipeStatGet()) { + if (!WipeStatGet()) { break; } } @@ -393,9 +401,9 @@ void fn_1_13264(void) lbl_1_bss_798.unk04 = (void *)fn_1_131C0; lbl_1_bss_860.unk04 = fn_1_185C(1, 0, 21, 2, lbl_1_bss_860.unk0C); lbl_1_bss_7C0.unk04 = (void *)fn_1_13150; - fn_1_1D4C(lbl_1_bss_860.unk04, (lbl_1_bss_860.unk30[lbl_1_bss_860.unk00].unk10*6)+0x32000B, 0); + fn_1_1D4C(lbl_1_bss_860.unk04, (lbl_1_bss_860.unk30[lbl_1_bss_860.unk00].unk10 * 6) + 0x32000B, 0); fn_1_6DBC(lbl_1_bss_860.unk04, 0x320086, 0, 300); - fn_1_1D18(lbl_1_bss_860.unk04,0x250004); + fn_1_1D18(lbl_1_bss_860.unk04, 0x250004); fn_1_1A94(lbl_1_bss_860.unk04); fn_1_3854(&lbl_1_bss_24); fn_1_2750(fn_1_15E58); @@ -435,7 +443,7 @@ void fn_1_13828(void) void fn_1_138CC(void) { - omOvlHisData* var_r31; + omOvlHisData *var_r31; msmSeStopAll(FALSE, 1000); do { @@ -444,15 +452,16 @@ void fn_1_138CC(void) CharModelKill(-1); HuAudFXAllStop(); HuAudSStreamAllStop(); - GWMGAvailSet(omMgIndexGet(58)+401); + GWMGAvailSet(omMgIndexGet(58) + 401); GWGameStat.present[lbl_1_bss_860.unk30[lbl_1_bss_860.unk00].unk10 * 6 + 5] = 1; - OSReport("########## PRESENTFLG CHR:%d, MAP:5, PRESENT:%d\n", lbl_1_bss_860.unk30[lbl_1_bss_860.unk00].unk10, lbl_1_bss_860.unk30[lbl_1_bss_860.unk00].unk10 * 6 + 5); + OSReport("########## PRESENTFLG CHR:%d, MAP:5, PRESENT:%d\n", lbl_1_bss_860.unk30[lbl_1_bss_860.unk00].unk10, + lbl_1_bss_860.unk30[lbl_1_bss_860.unk00].unk10 * 6 + 5); var_r31 = omOvlHisGet(0); omOvlHisChg(0, OVL_MSTORY2, 20, var_r31->stat); omOvlCallEx(OVL_PRESENT, 1, lbl_1_bss_860.unk30[lbl_1_bss_860.unk00].unk10 * 6 + 5 + 1, 0); } -void fn_1_13A18(omObjData* arg0, StructBss16C* arg1) +void fn_1_13A18(omObjData *arg0, StructBss16C *arg1) { int temp = 0; fn_1_12AC8(); @@ -469,15 +478,15 @@ void fn_1_13BB8(void) lbl_1_bss_838.unk00 = obj = omAddObjEx(lbl_1_bss_790, 256, 16, 16, -1, NULL); lbl_1_bss_838.unk04 = (void *)fn_1_13A18; lbl_1_bss_838.unk00->data = &lbl_1_bss_838; - while(1) { + while (1) { fn_1_BC8(); - if(lbl_1_bss_838.unk04 != NULL) { + if (lbl_1_bss_838.unk04 != NULL) { lbl_1_bss_838.unk04(obj, &lbl_1_bss_838); } } } -void fn_1_13C6C(omObjData* object) +void fn_1_13C6C(omObjData *object) { s32 charNo; charNo = lbl_1_bss_860.unk30[lbl_1_bss_860.unk00].unk10; @@ -511,28 +520,27 @@ void fn_1_13C6C(omObjData* object) fn_1_1DFC(object, 8, 8, 0, 1); } - -void fn_1_13FB4(omObjData* arg0, StructBss16C* arg1) +void fn_1_13FB4(omObjData *arg0, StructBss16C *arg1) { Mtx matrix; Hu3DData[arg0->model[7]].pos.y = fn_1_B08(180, 185, arg1->unk08++, 360); Hu3DModelObjMtxGet(arg0->model[7], "effect", matrix); Hu3DModelPosSet(arg0->model[8], matrix[0][3], matrix[1][3], matrix[2][3]); - if(arg1->unk08 >= 360) { + if (arg1->unk08 >= 360) { arg1->unk08 = 0; } } -void fn_1_140A0(omObjData* arg0, StructBss16C* arg1) +void fn_1_140A0(omObjData *arg0, StructBss16C *arg1) { Mtx matrix; - Hu3DData[arg0->model[7]].pos.y += arg1->unk0C/100.0f; + Hu3DData[arg0->model[7]].pos.y += arg1->unk0C / 100.0f; Hu3DModelObjMtxGet(arg0->model[7], "effect", matrix); Hu3DModelPosSet(arg0->model[8], matrix[0][3], matrix[1][3], matrix[2][3]); arg1->unk0C += 2; } -void fn_1_1416C(omObjData* arg0, StructBss16C* arg1) +void fn_1_1416C(omObjData *arg0, StructBss16C *arg1) { int i; Vec pos; @@ -540,19 +548,20 @@ void fn_1_1416C(omObjData* arg0, StructBss16C* arg1) Hu3DModelPosSet(arg0->model[5], -180, 100, 800); Hu3DModelRotSet(arg0->model[5], 0, 0, 0); Hu3DModelAttrReset(arg0->model[5], 1); - for(i=0; i<60; i++) { + for (i = 0; i < 60; i++) { fn_1_BC8(); - if(i == 30) { + if (i == 30) { HuAudFXPlay(151); } - if(i <= 30) { - pos.y = fn_1_A4C(0, 100, i+30, 60); + if (i <= 30) { + pos.y = fn_1_A4C(0, 100, i + 30, 60); pos.x = fn_1_864(-180, -45, i, 30); rotY = fn_1_984(0, -90, i, 30); - } else { - pos.x = fn_1_864(-45, 0, i-30, 30); - pos.y = fn_1_A4C(0, 25, i-30, 30); - rotY = fn_1_984(-90, -360, i-30, 30); + } + else { + pos.x = fn_1_864(-45, 0, i - 30, 30); + pos.y = fn_1_A4C(0, 25, i - 30, 30); + rotY = fn_1_984(-90, -360, i - 30, 30); } Hu3DModelPosSet(arg0->model[5], pos.x, pos.y, 800); Hu3DModelRotSet(arg0->model[5], 0, rotY, 0); @@ -567,9 +576,9 @@ void fn_1_1449C(void) lbl_1_bss_810.unk04 = NULL; lbl_1_bss_810.unk00->data = &lbl_1_bss_810; fn_1_13C6C(obj); - while(1) { + while (1) { fn_1_BC8(); - if(lbl_1_bss_810.unk04 != NULL) { + if (lbl_1_bss_810.unk04 != NULL) { lbl_1_bss_810.unk04(obj, &lbl_1_bss_810); } } @@ -597,15 +606,15 @@ void fn_1_14868(omObjData *object) void fn_1_14A9C(int arg0, int arg1, int arg2, int arg3, int arg4) { fn_1_1DFC(lbl_1_bss_7E8.unk00, 1, arg0, arg2, arg3); - if(arg3 == 1) { + if (arg3 == 1) { arg4 = 0; } lbl_1_bss_7E8.unk00->work[0] = arg4; lbl_1_bss_7E8.unk00->work[1] = arg1; - lbl_1_bss_7E8.unk00->work[2] = arg2+1; + lbl_1_bss_7E8.unk00->work[2] = arg2 + 1; } -void fn_1_14B48(omObjData* arg0, StructBss16C* arg1) +void fn_1_14B48(omObjData *arg0, StructBss16C *arg1) { Vec pos = { -1000, 0, 810 }; lbl_1_bss_810.unk04 = (void *)fn_1_1416C; @@ -622,15 +631,16 @@ void fn_1_14C40(void) lbl_1_bss_7E8.unk04 = NULL; lbl_1_bss_7E8.unk00->data = &lbl_1_bss_810; fn_1_14868(obj); - while(1) { + while (1) { fn_1_BC8(); - if(lbl_1_bss_7E8.unk04 != NULL) { + if (lbl_1_bss_7E8.unk04 != NULL) { lbl_1_bss_7E8.unk04(obj, &lbl_1_bss_7E8); } - if(obj->work[0]) { - if(obj->work[2]) { + if (obj->work[0]) { + if (obj->work[2]) { obj->work[2]--; - } else if(obj->work[2] == 0 && Hu3DMotionEndCheck(obj->model[1])) { + } + else if (obj->work[2] == 0 && Hu3DMotionEndCheck(obj->model[1])) { fn_1_1DFC(obj, 1, obj->work[1], 15, 1); obj->work[0] = obj->work[1] = obj->work[2] = 0; } @@ -656,15 +666,15 @@ void fn_1_14F6C(omObjData *object) void fn_1_15134(int arg0, int arg1, int arg2, int arg3, int arg4) { fn_1_1DFC(lbl_1_bss_7C0.unk00, 1, arg0, arg2, arg3); - if(arg3 == 1) { + if (arg3 == 1) { arg4 = 0; } lbl_1_bss_7C0.unk00->work[0] = arg4; lbl_1_bss_7C0.unk00->work[1] = arg1; - lbl_1_bss_7C0.unk00->work[2] = arg2+1; + lbl_1_bss_7C0.unk00->work[2] = arg2 + 1; } -void fn_1_151E0(omObjData* arg0, StructBss16C* arg1) +void fn_1_151E0(omObjData *arg0, StructBss16C *arg1) { Vec pos = { -800, 0, 800 }; fn_1_1DFC(arg0, 1, 2, 15, 1); @@ -673,7 +683,7 @@ void fn_1_151E0(omObjData* arg0, StructBss16C* arg1) arg1->unk04 = NULL; } -void fn_1_152C4(omObjData* arg0, StructBss16C* arg1) +void fn_1_152C4(omObjData *arg0, StructBss16C *arg1) { Vec pos = { -120, 0, 800 }; fn_1_1DFC(arg0, 1, 2, 15, 1); @@ -689,15 +699,16 @@ void fn_1_153A8(void) lbl_1_bss_7C0.unk04 = NULL; lbl_1_bss_7C0.unk00->data = &lbl_1_bss_7C0; fn_1_14F6C(obj); - while(1) { + while (1) { fn_1_BC8(); - if(lbl_1_bss_7C0.unk04 != NULL) { + if (lbl_1_bss_7C0.unk04 != NULL) { lbl_1_bss_7C0.unk04(obj, &lbl_1_bss_7C0); } - if(obj->work[0]) { - if(obj->work[2]) { + if (obj->work[0]) { + if (obj->work[2]) { obj->work[2]--; - } else if(obj->work[2] == 0 && Hu3DMotionEndCheck(obj->model[1])) { + } + else if (obj->work[2] == 0 && Hu3DMotionEndCheck(obj->model[1])) { fn_1_1DFC(obj, 1, obj->work[1], 15, 1); obj->work[0] = obj->work[1] = obj->work[2] = 0; } @@ -710,16 +721,16 @@ void fn_1_15668(int arg0) int i; int order[4]; order[0] = 0; - for(i=1; i<4; i++) { - order[i] = order[i-1]+1; - if(order[i] >= 4) { + for (i = 1; i < 4; i++) { + order[i] = order[i - 1] + 1; + if (order[i] >= 4) { order[i] = 0; } - if(arg0 == order[i]) { + if (arg0 == order[i]) { lbl_1_bss_860.unk00 = i; } } - for(i=0; i<4; i++) { + for (i = 0; i < 4; i++) { fn_1_357C(&lbl_1_bss_860.unk30[i], order[i]); } } @@ -728,12 +739,12 @@ void fn_1_1574C(omObjData *object) { int charNo = lbl_1_bss_860.unk30[lbl_1_bss_860.unk00].unk10; object->model[1] = CharModelCreate(charNo, 1); - object->motion[1] = CharModelMotionCreate(charNo, 0x5F0000); - object->motion[2] = CharModelMotionCreate(charNo, 0x5F0002); - object->motion[3] = Hu3DJointMotionFile(object->model[1], 0x660028+charNo); - object->motion[4] = Hu3DJointMotionFile(object->model[1], 0x660030+charNo); - object->motion[5] = Hu3DJointMotionFile(object->model[1], 0x660038+charNo); - object->motion[6] = Hu3DJointMotionFile(object->model[1], 0x660000+charNo); + object->motion[1] = CharModelMotionCreate(charNo, DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x00)); + object->motion[2] = CharModelMotionCreate(charNo, DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x02)); + object->motion[3] = Hu3DJointMotionFile(object->model[1], 0x660028 + charNo); + object->motion[4] = Hu3DJointMotionFile(object->model[1], 0x660030 + charNo); + object->motion[5] = Hu3DJointMotionFile(object->model[1], 0x660038 + charNo); + object->motion[6] = Hu3DJointMotionFile(object->model[1], 0x660000 + charNo); CharModelMotionDataClose(charNo); Hu3DModelPosSet(object->model[1], 120, 0, 800); Hu3DModelRotSet(object->model[1], 0, -60, 0); @@ -745,12 +756,12 @@ void fn_1_1574C(omObjData *object) void fn_1_15944(int arg0, int arg1, int arg2, int arg3, int arg4) { fn_1_1DFC(lbl_1_bss_798.unk00, 1, arg0, arg2, arg3); - if(arg3 == 1) { + if (arg3 == 1) { arg4 = 0; } lbl_1_bss_798.unk00->work[0] = arg4; lbl_1_bss_798.unk00->work[1] = arg1; - lbl_1_bss_798.unk00->work[2] = arg2+1; + lbl_1_bss_798.unk00->work[2] = arg2 + 1; } void fn_1_159F0(void) @@ -760,15 +771,16 @@ void fn_1_159F0(void) lbl_1_bss_798.unk04 = NULL; lbl_1_bss_798.unk00->data = &lbl_1_bss_798; fn_1_1574C(obj); - while(1) { + while (1) { fn_1_BC8(); - if(lbl_1_bss_798.unk04 != NULL) { + if (lbl_1_bss_798.unk04 != NULL) { lbl_1_bss_798.unk04(obj, &lbl_1_bss_798); } - if(obj->work[0]) { - if(obj->work[2]) { + if (obj->work[0]) { + if (obj->work[2]) { obj->work[2]--; - } else if(obj->work[2] == 0 && Hu3DMotionEndCheck(obj->model[1])) { + } + else if (obj->work[2] == 0 && Hu3DMotionEndCheck(obj->model[1])) { fn_1_1DFC(obj, 1, obj->work[1], 15, 1); obj->work[0] = obj->work[1] = obj->work[2] = 0; } @@ -800,7 +812,6 @@ void fn_1_15D68(void) temp.unk20.z = 0; temp.unk38 = 1400; fn_1_4FEC(work, &temp, work->unk40++, 120, 10); - } void fn_1_15E58(void) @@ -828,4 +839,4 @@ void fn_1_15F70(void) temp.unk20.z = 0; temp.unk38 = 1200; fn_1_6004(work, &temp, work->unk40++, 10, 5); -} \ No newline at end of file +} diff --git a/src/REL/mstory2Dll/mg_miss.c b/src/REL/mstory2Dll/mg_miss.c index 6a9232ab..cc329a56 100644 --- a/src/REL/mstory2Dll/mg_miss.c +++ b/src/REL/mstory2Dll/mg_miss.c @@ -9,12 +9,13 @@ #include "game/hsfman.h" #include "game/hsfmotion.h" #include "game/minigame_seq.h" +#include "game/objsub.h" +#include "game/pad.h" #include "game/printfunc.h" #include "game/sprite.h" #include "game/window.h" #include "game/wipe.h" -#include "game/pad.h" -#include "game/objsub.h" + typedef struct { /* 0x000 */ s32 unk00; @@ -47,7 +48,7 @@ void fn_1_18184(void); void fn_1_18408(void); void fn_1_18494(void); -void fn_1_16060(Process* arg0, s32 arg1) +void fn_1_16060(Process *arg0, s32 arg1) { lbl_1_bss_968 = arg0; lbl_1_bss_A34.unk0C = arg1; @@ -65,11 +66,11 @@ void fn_1_16060(Process* arg0, s32 arg1) void fn_1_16178(omObjData *object) { - if(object->work[2]) { + if (object->work[2]) { object->work[2]--; return; } - if(object->work[2] == 0 && Hu3DMotionEndCheck(object->model[1])) { + if (object->work[2] == 0 && Hu3DMotionEndCheck(object->model[1])) { fn_1_1DFC(object, 1, object->work[1], 15, 1); object->work[0] = object->work[1] = object->work[2] = 0; } @@ -81,38 +82,44 @@ void fn_1_16204(void) int posY = 40; GXColor winColor = { 0, 0, 128, 128 }; int i; - while(1) { + while (1) { fn_1_BC8(); printWin(posX, posY, 220, 130, &winColor); - if(lbl_1_bss_A0C.unk04 == NULL) { + if (lbl_1_bss_A0C.unk04 == NULL) { print8(posX, posY, 1, "PROC_MAIN -> FALSE"); - } else { + } + else { print8(posX, posY, 1, "PROC_MAIN -> TRUE"); } - if(lbl_1_bss_9E4.unk04 == NULL) { - print8(posX, posY+10, 1, "PROC_MAP -> FALSE"); - } else { - print8(posX, posY+10, 1, "PROC_MAP -> TRUE"); + if (lbl_1_bss_9E4.unk04 == NULL) { + print8(posX, posY + 10, 1, "PROC_MAP -> FALSE"); } - if(lbl_1_bss_9BC.unk04 == NULL) { - print8(posX, posY+20, 1, "PROC_KOOPA -> FALSE"); - } else { - print8(posX, posY+20, 1, "PROC_KOOPA -> TRUE"); + else { + print8(posX, posY + 10, 1, "PROC_MAP -> TRUE"); } - if(lbl_1_bss_994.unk04 == NULL) { - print8(posX, posY+30, 1, "PROC_MKOOPA -> FALSE"); - } else { - print8(posX, posY+30, 1, "PROC_MKOOPA -> TRUE"); + if (lbl_1_bss_9BC.unk04 == NULL) { + print8(posX, posY + 20, 1, "PROC_KOOPA -> FALSE"); } - if(lbl_1_bss_96C.unk04 == NULL) { - print8(posX, posY+40, 1, "PROC_PLAYER -> FALSE"); - } else { - print8(posX, posY+40, 1, "PROC_PLAYER -> TRUE"); + else { + print8(posX, posY + 20, 1, "PROC_KOOPA -> TRUE"); } - print8(posX, posY+60, 1, "P:%d W:%d", lbl_1_bss_A34.unk00, lbl_1_bss_A34.unk0C); - print8(posX, posY+80, 1, "NO) IDX:GRP:COM:DIF:PAD:CHR"); - for(i=0; i<4; i++) { - print8(posX, posY+90+(i*10), 1, "%2d) %3d:%3d:%3d:%3d:%3d:%3d", i, lbl_1_bss_A34.unk30[i].unk00, lbl_1_bss_A34.unk30[i].unk04, lbl_1_bss_A34.unk30[i].unk08, lbl_1_bss_A34.unk30[i].unk0C, lbl_1_bss_A34.unk30[i].unk14, lbl_1_bss_A34.unk30[i].unk10); + if (lbl_1_bss_994.unk04 == NULL) { + print8(posX, posY + 30, 1, "PROC_MKOOPA -> FALSE"); + } + else { + print8(posX, posY + 30, 1, "PROC_MKOOPA -> TRUE"); + } + if (lbl_1_bss_96C.unk04 == NULL) { + print8(posX, posY + 40, 1, "PROC_PLAYER -> FALSE"); + } + else { + print8(posX, posY + 40, 1, "PROC_PLAYER -> TRUE"); + } + print8(posX, posY + 60, 1, "P:%d W:%d", lbl_1_bss_A34.unk00, lbl_1_bss_A34.unk0C); + print8(posX, posY + 80, 1, "NO) IDX:GRP:COM:DIF:PAD:CHR"); + for (i = 0; i < 4; i++) { + print8(posX, posY + 90 + (i * 10), 1, "%2d) %3d:%3d:%3d:%3d:%3d:%3d", i, lbl_1_bss_A34.unk30[i].unk00, lbl_1_bss_A34.unk30[i].unk04, + lbl_1_bss_A34.unk30[i].unk08, lbl_1_bss_A34.unk30[i].unk0C, lbl_1_bss_A34.unk30[i].unk14, lbl_1_bss_A34.unk30[i].unk10); } } } @@ -150,7 +157,7 @@ int fn_1_1670C(void) result = fn_1_1C64(lbl_1_bss_A34.unk08); fn_1_1D18(lbl_1_bss_A34.unk08, 0x250004); fn_1_71DC(lbl_1_bss_A34.unk08); - if(result) { + if (result) { HuAudFXPlay(lbl_1_data_0[6][2]); fn_1_1774C(3, 1, 15, 1, 0); fn_1_1D18(lbl_1_bss_A34.unk04, 0x1F0012); @@ -183,14 +190,11 @@ void fn_1_16984(void) fn_1_BE8(150); } -void fn_1_169D4(void) -{ - -} +void fn_1_169D4(void) { } void fn_1_169D8(int arg0) { - omOvlHisData* his; + omOvlHisData *his; if (arg0 != 0) { HuAudSeqFadeOut(lbl_1_bss_78[0], 1000); @@ -206,32 +210,34 @@ void fn_1_169D8(int arg0) HuAudSeqAllFadeOut(1000); HuAudSStreamAllFadeOut(1000); GWMGAvailSet(450); - GWSystem.mg_next = 450-401; + GWSystem.mg_next = 450 - 401; omOvlCallEx(OVL_M450, 1, 0, 0); - } else { + } + else { HuAudFadeOut(1); omOvlReturnEx(1, 1); } } -void fn_1_16ACC(omObjData* arg0, StructBss16C* arg1) +void fn_1_16ACC(omObjData *arg0, StructBss16C *arg1) { int mode = 0; fn_1_165B0(); fn_1_1661C(); lbl_1_bss_A34.unk04 = fn_1_185C(1, 0, 21, 2, lbl_1_bss_A34.unk0C); - while(1) { + while (1) { fn_1_BC8(); - if(fn_1_1670C()) { + if (fn_1_1670C()) { mode = 0; break; - } else if(fn_1_168B0()) { + } + else if (fn_1_168B0()) { mode = 1; break; } } fn_1_1A94(lbl_1_bss_A34.unk04); - switch(mode) { + switch (mode) { case 0: fn_1_16984(); break; @@ -248,9 +254,9 @@ void fn_1_16FC0(void) lbl_1_bss_A0C.unk00 = obj = omAddObjEx(lbl_1_bss_968, 256, 16, 16, -1, NULL); lbl_1_bss_A0C.unk04 = (void *)fn_1_16ACC; lbl_1_bss_A0C.unk00->data = &lbl_1_bss_A0C; - while(1) { + while (1) { fn_1_BC8(); - if(lbl_1_bss_A0C.unk04 != NULL) { + if (lbl_1_bss_A0C.unk04 != NULL) { lbl_1_bss_A0C.unk04(obj, &lbl_1_bss_A0C); } } @@ -277,10 +283,10 @@ void fn_1_17074(omObjData *object) fn_1_1DFC(object, 6, 6, 0, 2); } -void fn_1_1727C(omObjData* arg0, StructBss16C* arg1) +void fn_1_1727C(omObjData *arg0, StructBss16C *arg1) { Hu3DData[arg0->model[5]].pos.y = fn_1_B08(80, 90, arg1->unk08++, 360); - if(arg1->unk08 >= 360) { + if (arg1->unk08 >= 360) { arg1->unk08 = 0; } } @@ -292,9 +298,9 @@ void fn_1_17338(void) lbl_1_bss_9E4.unk04 = (void *)fn_1_1727C; lbl_1_bss_9E4.unk00->data = &lbl_1_bss_9E4; fn_1_17074(obj); - while(1) { + while (1) { fn_1_BC8(); - if(lbl_1_bss_9E4.unk04 != NULL) { + if (lbl_1_bss_9E4.unk04 != NULL) { lbl_1_bss_9E4.unk04(obj, &lbl_1_bss_9E4); } } @@ -316,12 +322,12 @@ void fn_1_175CC(omObjData *object) void fn_1_1774C(int arg0, int arg1, int arg2, int arg3, int arg4) { fn_1_1DFC(lbl_1_bss_9BC.unk00, 1, arg0, arg2, arg3); - if(arg3 == 1) { + if (arg3 == 1) { arg4 = 0; } lbl_1_bss_9BC.unk00->work[0] = arg4; lbl_1_bss_9BC.unk00->work[1] = arg1; - lbl_1_bss_9BC.unk00->work[2] = arg2+1; + lbl_1_bss_9BC.unk00->work[2] = arg2 + 1; } void fn_1_177F8(void) @@ -331,15 +337,16 @@ void fn_1_177F8(void) lbl_1_bss_9BC.unk04 = NULL; lbl_1_bss_9BC.unk00->data = &lbl_1_bss_9E4; fn_1_175CC(obj); - while(1) { + while (1) { fn_1_BC8(); - if(lbl_1_bss_9BC.unk04 != NULL) { + if (lbl_1_bss_9BC.unk04 != NULL) { lbl_1_bss_9BC.unk04(obj, &lbl_1_bss_9BC); } - if(obj->work[0]) { - if(obj->work[2]) { + if (obj->work[0]) { + if (obj->work[2]) { obj->work[2]--; - } else if(obj->work[2] == 0 && Hu3DMotionEndCheck(obj->model[1])) { + } + else if (obj->work[2] == 0 && Hu3DMotionEndCheck(obj->model[1])) { fn_1_1DFC(obj, 1, obj->work[1], 15, 1); obj->work[0] = obj->work[1] = obj->work[2] = 0; } @@ -361,12 +368,12 @@ void fn_1_17A70(omObjData *object) void fn_1_17B98(int arg0, int arg1, int arg2, int arg3, int arg4) { fn_1_1DFC(lbl_1_bss_994.unk00, 1, arg0, arg2, arg3); - if(arg3 == 1) { + if (arg3 == 1) { arg4 = 0; } lbl_1_bss_994.unk00->work[0] = arg4; lbl_1_bss_994.unk00->work[1] = arg1; - lbl_1_bss_994.unk00->work[2] = arg2+1; + lbl_1_bss_994.unk00->work[2] = arg2 + 1; } void fn_1_17C44(void) @@ -376,15 +383,16 @@ void fn_1_17C44(void) lbl_1_bss_994.unk04 = NULL; lbl_1_bss_994.unk00->data = &lbl_1_bss_994; fn_1_17A70(obj); - while(1) { + while (1) { fn_1_BC8(); - if(lbl_1_bss_994.unk04 != NULL) { + if (lbl_1_bss_994.unk04 != NULL) { lbl_1_bss_994.unk04(obj, &lbl_1_bss_994); } - if(obj->work[0]) { - if(obj->work[2]) { + if (obj->work[0]) { + if (obj->work[2]) { obj->work[2]--; - } else if(obj->work[2] == 0 && Hu3DMotionEndCheck(obj->model[1])) { + } + else if (obj->work[2] == 0 && Hu3DMotionEndCheck(obj->model[1])) { fn_1_1DFC(obj, 1, obj->work[1], 15, 1); obj->work[0] = obj->work[1] = obj->work[2] = 0; } @@ -397,16 +405,16 @@ void fn_1_17E64(s32 arg0) int i; int order[4]; order[0] = 0; - for(i=1; i<4; i++) { - order[i] = order[i-1]+1; - if(order[i] >= 4) { + for (i = 1; i < 4; i++) { + order[i] = order[i - 1] + 1; + if (order[i] >= 4) { order[i] = 0; } - if(arg0 == order[i]) { + if (arg0 == order[i]) { lbl_1_bss_A34.unk00 = i; } } - for(i=0; i<4; i++) { + for (i = 0; i < 4; i++) { fn_1_357C(&lbl_1_bss_A34.unk30[i], order[i]); } } @@ -415,10 +423,10 @@ void fn_1_17F48(omObjData *object) { int charNo = lbl_1_bss_A34.unk30[lbl_1_bss_A34.unk00].unk10; object->model[1] = CharModelCreate(charNo, 1); - object->motion[1] = CharModelMotionCreate(charNo, 0x5F0000); - object->motion[2] = CharModelMotionCreate(charNo, 0x5F0018); - object->motion[3] = CharModelMotionCreate(charNo, 0x5F0034); - object->motion[4] = CharModelMotionCreate(charNo, 0x5F0048); + object->motion[1] = CharModelMotionCreate(charNo, DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x00)); + object->motion[2] = CharModelMotionCreate(charNo, DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x18)); + object->motion[3] = CharModelMotionCreate(charNo, DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x34)); + object->motion[4] = CharModelMotionCreate(charNo, DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x48)); CharModelVoiceEnableSet(charNo, object->motion[2], FALSE); CharModelMotionDataClose(charNo); Hu3DModelPosSet(object->model[1], 120, 0, 800); @@ -431,12 +439,12 @@ void fn_1_17F48(omObjData *object) void fn_1_180D8(int arg0, int arg1, int arg2, int arg3, int arg4) { fn_1_1DFC(lbl_1_bss_96C.unk00, 1, arg0, arg2, arg3); - if(arg3 == 1) { + if (arg3 == 1) { arg4 = 0; } lbl_1_bss_96C.unk00->work[0] = arg4; lbl_1_bss_96C.unk00->work[1] = arg1; - lbl_1_bss_96C.unk00->work[2] = arg2+1; + lbl_1_bss_96C.unk00->work[2] = arg2 + 1; } void fn_1_18184(void) @@ -446,15 +454,16 @@ void fn_1_18184(void) lbl_1_bss_96C.unk04 = NULL; lbl_1_bss_96C.unk00->data = &lbl_1_bss_96C; fn_1_17F48(obj); - while(1) { + while (1) { fn_1_BC8(); - if(lbl_1_bss_96C.unk04 != NULL) { + if (lbl_1_bss_96C.unk04 != NULL) { lbl_1_bss_96C.unk04(obj, &lbl_1_bss_96C); } - if(obj->work[0]) { - if(obj->work[2]) { + if (obj->work[0]) { + if (obj->work[2]) { obj->work[2]--; - } else if(obj->work[2] == 0 && Hu3DMotionEndCheck(obj->model[1])) { + } + else if (obj->work[2] == 0 && Hu3DMotionEndCheck(obj->model[1])) { fn_1_1DFC(obj, 1, obj->work[1], 15, 1); obj->work[0] = obj->work[1] = obj->work[2] = 0; } @@ -478,7 +487,7 @@ void fn_1_18494(void) { StructBss24 *work = &lbl_1_bss_24; StructBss24 temp; - if(work->unk40 == 50) { + if (work->unk40 == 50) { fn_1_1DFC(lbl_1_bss_9E4.unk00, 5, 5, 0, 0); fn_1_1DFC(lbl_1_bss_9E4.unk00, 6, 6, 0, 0); HuAudFXPlay(161); @@ -491,11 +500,11 @@ void fn_1_18494(void) temp.unk20.z = 0; temp.unk38 = 150; fn_1_4FEC(work, &temp, work->unk40, 180, 10); - if(work->unk40++ >= 90) { - if(work->unk40 == 91) { + if (work->unk40++ >= 90) { + if (work->unk40 == 91) { lbl_1_bss_88[0] = HuAudFXPlay(32); } - work->unk20.x = fn_1_864(work->unk20.x, -45, work->unk40-90, 90); - Hu3DData[lbl_1_bss_9E4.unk00->model[5]].rot.x = fn_1_864(0, 45, work->unk40-90, 90); + work->unk20.x = fn_1_864(work->unk20.x, -45, work->unk40 - 90, 90); + Hu3DData[lbl_1_bss_9E4.unk00->model[5]].rot.x = fn_1_864(0, 45, work->unk40 - 90, 90); } -} \ No newline at end of file +}