From b54aaa2273e6044fadc4b1c29ccbe51325a151d8 Mon Sep 17 00:00:00 2001 From: dbalatoni13 Date: Sun, 19 Jan 2025 02:38:04 +0100 Subject: [PATCH] Remove PS prefix from mtx function usages --- src/REL/m402Dll/main.c | 10 +- src/REL/m403Dll/main.c | 12 +- src/REL/m403Dll/scene.c | 28 +- src/REL/m405Dll/main.c | 58 +- src/REL/m406Dll/map.c | 40 +- src/REL/m406Dll/player.c | 76 +- src/REL/m409Dll/cursor.c | 530 ++++++----- src/REL/m409Dll/main.c | 6 +- src/REL/m410Dll/game.c | 40 +- src/REL/m410Dll/main.c | 2 +- src/REL/m410Dll/player.c | 32 +- src/REL/m415Dll/main.c | 10 +- src/REL/m415Dll/map.c | 538 ++++++----- src/REL/m417Dll/main.c | 14 +- src/REL/m417Dll/player.c | 34 +- src/REL/m417Dll/water.c | 46 +- src/REL/m419Dll/main.c | 540 ++++++----- src/REL/m421Dll/main.c | 4 +- src/REL/m422Dll/main.c | 747 ++++++--------- src/REL/m423Dll/main.c | 1784 ++++++++++++++++++----------------- src/REL/m424Dll/ball.c | 593 +++++++----- src/REL/m424Dll/claw.c | 141 +-- src/REL/m424Dll/map.c | 128 +-- src/REL/m425Dll/main.c | 20 +- src/REL/m425Dll/thwomp.c | 58 +- src/REL/m426Dll/main.c | 4 +- src/REL/m428Dll/main.c | 18 +- src/REL/m428Dll/map.c | 46 +- src/REL/m429Dll/main.c | 4 +- src/REL/m430Dll/main.c | 2 +- src/REL/m430Dll/player.c | 10 +- src/REL/m430Dll/water.c | 195 ++-- src/REL/m431Dll/main.c | 2 +- src/REL/m433Dll/main.c | 4 +- src/REL/m433Dll/map.c | 12 +- src/REL/m433Dll/player.c | 190 ++-- src/REL/m438Dll/main.c | 442 +++++---- src/REL/m438Dll/map.c | 256 ++--- src/REL/m440Dll/main.c | 38 +- src/REL/m440Dll/object.c | 6 +- src/REL/m441Dll/main.c | 4 +- src/REL/m442Dll/main.c | 10 +- src/REL/m443Dll/main.c | 22 +- src/REL/m443Dll/map.c | 8 +- src/REL/m443Dll/player.c | 26 +- src/REL/m447dll/block.c | 14 +- src/REL/m448Dll/main.c | 6 +- src/REL/m449Dll/main.c | 20 +- src/REL/m453Dll/main.c | 38 +- src/REL/m453Dll/map.c | 76 +- src/REL/m455Dll/main.c | 2 +- src/REL/m456Dll/main.c | 4 +- src/REL/m458Dll/main.c | 4 +- src/REL/m460Dll/main.c | 28 +- src/REL/m460Dll/map.c | 14 +- src/REL/m460Dll/player.c | 16 +- src/REL/m461Dll/main.c | 7 +- src/REL/m462Dll/main.c | 305 +++--- src/REL/m463Dll/main.c | 328 +++---- src/REL/modeltestDll/main.c | 23 +- src/REL/w01Dll/main.c | 599 +++++++----- src/REL/w03Dll/condor.c | 28 +- src/REL/w03Dll/mg_item.c | 4 +- src/REL/w03Dll/statue.c | 191 ++-- src/REL/w06Dll/mg_item.c | 200 ++-- src/REL/ztardll/main.c | 8 +- 66 files changed, 4567 insertions(+), 4138 deletions(-) diff --git a/src/REL/m402Dll/main.c b/src/REL/m402Dll/main.c index d604cf04..e4044763 100755 --- a/src/REL/m402Dll/main.c +++ b/src/REL/m402Dll/main.c @@ -579,7 +579,7 @@ static void fn_1_1A60(Vec *arg0, s16 arg1, Vec *arg2) } temp_r31 = &Hu3DCamera[i]; C_MTXLookAt(sp1C, &temp_r31->pos, &temp_r31->up, &temp_r31->target); - PSMTXMultVec(sp1C, arg0, &sp10); + MTXMultVec(sp1C, arg0, &sp10); temp_f30 = sp10.z * (sind(temp_r31->fov / 2) / cosd(temp_r31->fov / 2)) * temp_r31->aspect; temp_f29 = sp10.z * (sind(temp_r31->fov / 2) / cosd(temp_r31->fov / 2)); temp_f28 = 0.9f * temp_r31->viewport_x; @@ -606,9 +606,9 @@ static void fn_1_1D70(s16 arg0, char *arg1, Vec *arg2, Mtx arg3) var_r30 = &Hu3DData[arg0]; Hu3DModelObjMtxGet(arg0, arg1, spC); - PSMTXConcat(var_r30->unk_F0, spC, spC); + MTXConcat(var_r30->unk_F0, spC, spC); if (NULL != arg3) { - PSMTXCopy(spC, arg3); + MTXCopy(spC, arg3); } arg2->x = spC[0][3]; arg2->y = spC[1][3]; @@ -1425,9 +1425,9 @@ static void fn_1_70E4(omObjData *arg0) spC.y = 0.0f; spC.z = var_f27; temp_r31->unk24.z *= 0.92f; - PSMTXIdentity(sp18); + MTXIdentity(sp18); mtxRot(sp18, temp_r31->unk24.x, temp_r31->unk24.y, 0.0f); - PSMTXMultVec(sp18, &spC, &spC); + MTXMultVec(sp18, &spC, &spC); VECAdd(&spC, &temp_r31->unk00, &temp_r31->unk00); omSetTra(arg0, temp_r31->unk00.x, temp_r31->unk00.y, temp_r31->unk00.z); Hu3DModelTPLvlSet(arg0->model[0], temp_r31->unk30); diff --git a/src/REL/m403Dll/main.c b/src/REL/m403Dll/main.c index a1e3fc91..af675a31 100755 --- a/src/REL/m403Dll/main.c +++ b/src/REL/m403Dll/main.c @@ -1384,18 +1384,18 @@ static void fn_1_46E4(Mtx arg0, float arg1, float arg2, float arg3) Mtx sp8; if (arg3 != 0.0f) { - PSMTXRotRad(arg0, 'Z', MTXDegToRad(arg3)); + MTXRotRad(arg0, 'Z', MTXDegToRad(arg3)); } else { - PSMTXIdentity(arg0); + MTXIdentity(arg0); } if (arg1 != 0.0f) { - PSMTXRotRad(sp38, 'X', MTXDegToRad(arg1)); - PSMTXConcat(sp38, arg0, arg0); + MTXRotRad(sp38, 'X', MTXDegToRad(arg1)); + MTXConcat(sp38, arg0, arg0); } if (arg2 != 0.0f) { - PSMTXRotRad(sp8, 'Y', MTXDegToRad(arg2)); - PSMTXConcat(sp8, arg0, arg0); + MTXRotRad(sp8, 'Y', MTXDegToRad(arg2)); + MTXConcat(sp8, arg0, arg0); } } diff --git a/src/REL/m403Dll/scene.c b/src/REL/m403Dll/scene.c index e87fd648..b71d445f 100755 --- a/src/REL/m403Dll/scene.c +++ b/src/REL/m403Dll/scene.c @@ -307,12 +307,12 @@ static void fn_1_6ED8(omObjData *arg0) Mtx sp8; s32 i; - PSMTXTrans(sp38, arg0->trans.x, arg0->trans.y, arg0->trans.z); + MTXTrans(sp38, arg0->trans.x, arg0->trans.y, arg0->trans.z); mtxRot(sp8, arg0->rot.x, arg0->rot.y, arg0->rot.z); - PSMTXConcat(sp38, sp8, sp38); + MTXConcat(sp38, sp8, sp38); for (i = 0; i < 6; i++) { - PSMTXTrans(sp8, lbl_1_data_A88[i].x, lbl_1_data_A88[i].y, lbl_1_data_A88[i].z); - PSMTXConcat(sp38, sp8, sp8); + MTXTrans(sp8, lbl_1_data_A88[i].x, lbl_1_data_A88[i].y, lbl_1_data_A88[i].z); + MTXConcat(sp38, sp8, sp8); Hu3DModelPosSet(arg0->model[i + 1], sp8[0][3], sp8[1][3], sp8[2][3]); Hu3DModelRotSet(arg0->model[i + 1], arg0->rot.x, arg0->rot.y, arg0->rot.z); } @@ -598,16 +598,16 @@ static s32 fn_1_7D04(float arg0, float arg1, Vec *arg2) temp_r28 -= 6; fn_1_7BD4(temp_r21, &sp10); sp10 = lbl_1_data_A88[temp_r21]; - PSMTXTrans(sp4C, temp_r31->trans.x, temp_r31->trans.y, temp_r31->trans.z); + MTXTrans(sp4C, temp_r31->trans.x, temp_r31->trans.y, temp_r31->trans.z); mtxRot(sp1C, temp_r31->rot.x, temp_r31->rot.y, temp_r31->rot.z); - PSMTXConcat(sp4C, sp1C, sp4C); - PSMTXTrans(sp1C, sp10.x, sp10.y, sp10.z); - PSMTXConcat(sp4C, sp1C, sp4C); + MTXConcat(sp4C, sp1C, sp4C); + MTXTrans(sp1C, sp10.x, sp10.y, sp10.z); + MTXConcat(sp4C, sp1C, sp4C); var_r30 = lbl_1_data_AFC[temp_r28]; temp_r23 = lbl_1_data_B14[temp_r28]; for (i = 0; i < temp_r23; i++) { - PSMTXTrans(sp1C, var_r30->x, var_r30->y, var_r30->z); - PSMTXConcat(sp4C, sp1C, sp1C); + MTXTrans(sp1C, var_r30->x, var_r30->y, var_r30->z); + MTXConcat(sp4C, sp1C, sp1C); arg2->x = sp1C[0][3]; arg2->y = sp1C[1][3]; arg2->z = sp1C[2][3]; @@ -703,17 +703,17 @@ s32 fn_1_8470(Vec *arg0) temp_r30 = lbl_1_bss_9C[lbl_1_bss_94]; temp_r27 = temp_r30->data; var_r25 = fn_1_8274(temp_r27, sp8); - PSMTXTrans(sp50, temp_r30->trans.x, temp_r30->trans.y, temp_r30->trans.z); + MTXTrans(sp50, temp_r30->trans.x, temp_r30->trans.y, temp_r30->trans.z); mtxRot(sp20, temp_r30->rot.x, temp_r30->rot.y, temp_r30->rot.z); - PSMTXConcat(sp50, sp20, sp50); + MTXConcat(sp50, sp20, sp50); for (i = 0; i < var_r25; i++) { fn_1_7BD4(sp8[i], arg0); temp_r26 = fn_1_7C20(temp_r27, sp8[i]) - 6; arg0->x += lbl_1_data_B2C[temp_r26].x; arg0->y += lbl_1_data_B2C[temp_r26].y; arg0->z += lbl_1_data_B2C[temp_r26].z; - PSMTXTrans(sp20, arg0->x, arg0->y, arg0->z); - PSMTXConcat(sp50, sp20, sp20); + MTXTrans(sp20, arg0->x, arg0->y, arg0->z); + MTXConcat(sp50, sp20, sp20); arg0->x = sp20[0][3]; arg0->y = sp20[1][3]; arg0->z = sp20[2][3]; diff --git a/src/REL/m405Dll/main.c b/src/REL/m405Dll/main.c index 610db76f..0eade3f2 100755 --- a/src/REL/m405Dll/main.c +++ b/src/REL/m405Dll/main.c @@ -571,7 +571,7 @@ void fn_1_1A60(Vec *arg0, s16 arg1, Vec *arg2) } temp_r31 = &Hu3DCamera[i]; C_MTXLookAt(sp1C, &temp_r31->pos, &temp_r31->up, &temp_r31->target); - PSMTXMultVec(sp1C, arg0, &sp10); + MTXMultVec(sp1C, arg0, &sp10); temp_f30 = sp10.z * (sind(temp_r31->fov / 2) / cosd(temp_r31->fov / 2)) * temp_r31->aspect; temp_f29 = sp10.z * (sind(temp_r31->fov / 2) / cosd(temp_r31->fov / 2)); temp_f28 = 0.9f * temp_r31->viewport_x; @@ -598,9 +598,9 @@ void fn_1_1D70(s16 arg0, char *arg1, Vec *arg2, Mtx arg3) var_r30 = &Hu3DData[arg0]; Hu3DModelObjMtxGet(arg0, arg1, spC); - PSMTXConcat(var_r30->unk_F0, spC, spC); + MTXConcat(var_r30->unk_F0, spC, spC); if (NULL != arg3) { - PSMTXCopy(spC, arg3); + MTXCopy(spC, arg3); } arg2->x = spC[0][3]; arg2->y = spC[1][3]; @@ -928,7 +928,7 @@ void fn_1_37A4(ModelData *arg0, Mtx arg1) UnkBss10Struct *temp_r31; GXLoadPosMtxImm(arg1, GX_PNMTX0); - PSMTXInvXpose(arg1, spEC); + MTXInvXpose(arg1, spEC); GXLoadNrmMtxImm(spEC, GX_PNMTX0); temp_r31 = &lbl_1_data_10[2]; GXInitTexObj(&spC, temp_r31->unk00, temp_r31->unk08, temp_r31->unk0A, GX_TF_RGB565, GX_CLAMP, GX_CLAMP, GX_FALSE); @@ -941,31 +941,31 @@ void fn_1_37A4(ModelData *arg0, Mtx arg1) GXLoadTexObj(&spC, GX_TEXMAP3); GXSetNumTexGens(4); C_MTXLightPerspective(sp2C, 30.0f, 1.2f, 0.5f, -0.5f, 0.5f, 0.5f); - PSMTXInverse(Hu3DCameraMtx, spEC); - PSMTXConcat(spEC, arg1, spEC); - PSMTXConcat(sp2C, Hu3DCameraMtx, spBC); - PSMTXConcat(spBC, spEC, spBC); + MTXInverse(Hu3DCameraMtx, spEC); + MTXConcat(spEC, arg1, spEC); + MTXConcat(sp2C, Hu3DCameraMtx, spBC); + MTXConcat(spBC, spEC, spBC); GXLoadTexMtxImm(spBC, GX_TEXMTX0, GX_MTX3x4); C_MTXLightPerspective(sp2C, 30.0f, 1.2f, 0.5f, -0.5f, 0.5f, 0.5f); - PSMTXInverse(Hu3DCameraMtx, spEC); - PSMTXConcat(spEC, arg1, spEC); - PSMTXConcat(sp2C, Hu3DCameraMtx, spBC); - PSMTXConcat(spBC, spEC, spBC); + MTXInverse(Hu3DCameraMtx, spEC); + MTXConcat(spEC, arg1, spEC); + MTXConcat(sp2C, Hu3DCameraMtx, spBC); + MTXConcat(spBC, spEC, spBC); GXLoadTexMtxImm(spBC, GX_TEXMTX1, GX_MTX3x4); - PSMTXRotRad(spEC, 'X', MTXDegToRad(-90)); + MTXRotRad(spEC, 'X', MTXDegToRad(-90)); var_f31 = 0.0004f; - PSMTXScale(sp8C, 0.00083333335f, var_f31, 0.0004f); - PSMTXConcat(sp8C, spEC, sp5C); - PSMTXTrans(spBC, 0.5f, 0.5f, 0.5f); - PSMTXConcat(spBC, sp5C, sp5C); + MTXScale(sp8C, 0.00083333335f, var_f31, 0.0004f); + MTXConcat(sp8C, spEC, sp5C); + MTXTrans(spBC, 0.5f, 0.5f, 0.5f); + MTXConcat(spBC, sp5C, sp5C); sp5C[0][1] = -0.01f; GXLoadTexMtxImm(sp5C, GX_TEXMTX2, GX_MTX2x4); - PSMTXRotRad(spEC, 'X', MTXDegToRad(-90)); + MTXRotRad(spEC, 'X', MTXDegToRad(-90)); var_f31 = 0.0004f; - PSMTXScale(sp8C, var_f31, var_f31, var_f31); - PSMTXConcat(sp8C, spEC, sp5C); - PSMTXTrans(spBC, 0.5f, 0.5f, 0.0f); - PSMTXConcat(spBC, sp5C, sp5C); + MTXScale(sp8C, var_f31, var_f31, var_f31); + MTXConcat(sp8C, spEC, sp5C); + MTXTrans(spBC, 0.5f, 0.5f, 0.0f); + MTXConcat(spBC, sp5C, sp5C); GXLoadTexMtxImm(sp5C, GX_TEXMTX3, GX_MTX2x4); GXSetTexCoordGen2(GX_TEXCOORD0, GX_TG_MTX3x4, GX_TG_POS, GX_TEXMTX0, GX_FALSE, GX_PTIDENTITY); GXSetTexCoordGen2(GX_TEXCOORD1, GX_TG_MTX3x4, GX_TG_POS, GX_TEXMTX1, GX_FALSE, GX_PTIDENTITY); @@ -974,12 +974,12 @@ void fn_1_37A4(ModelData *arg0, Mtx arg1) GXSetNumIndStages(2); GXSetIndTexOrder(GX_INDTEXSTAGE0, GX_TEXCOORD2, GX_TEXMAP2); GXSetIndTexCoordScale(GX_INDTEXSTAGE0, GX_ITS_1, GX_ITS_1); - PSMTXScale(spBC, -0.2f, -0.2f, 0.2f); + MTXScale(spBC, -0.2f, -0.2f, 0.2f); GXSetIndTexMtx(GX_ITM_0, (float(*)[3])spBC, -2); GXSetTevIndWarp(GX_TEVSTAGE0, GX_INDTEXSTAGE0, GX_TRUE, GX_FALSE, GX_ITM_0); GXSetIndTexOrder(GX_INDTEXSTAGE1, GX_TEXCOORD3, GX_TEXMAP3); GXSetIndTexCoordScale(GX_INDTEXSTAGE1, GX_ITS_1, GX_ITS_1); - PSMTXScale(spBC, 0.5f, 0.5f, 0.5f); + MTXScale(spBC, 0.5f, 0.5f, 0.5f); GXSetIndTexMtx(GX_ITM_1, (float(*)[3])spBC, 0); GXSetTevIndWarp(GX_TEVSTAGE1, GX_INDTEXSTAGE1, GX_TRUE, GX_FALSE, GX_ITM_1); GXSetNumTevStages(2); @@ -1031,10 +1031,10 @@ void fn_1_4024(ModelData *arg0, Mtx arg1) fn_1_2714(1, GX_FALSE); GXLoadPosMtxImm(arg1, GX_PNMTX0); C_MTXLightPerspective(sp98, 30.0f, 1.2f, 0.5f, -0.5f, 0.5f, 0.5f); - PSMTXInverse(Hu3DCameraMtx, sp68); - PSMTXConcat(sp68, arg1, sp68); - PSMTXConcat(sp98, Hu3DCameraMtx, sp38); - PSMTXConcat(sp38, sp68, sp68); + MTXInverse(Hu3DCameraMtx, sp68); + MTXConcat(sp68, arg1, sp68); + MTXConcat(sp98, Hu3DCameraMtx, sp38); + MTXConcat(sp38, sp68, sp68); GXLoadTexMtxImm(sp68, GX_TEXMTX0, GX_MTX3x4); GXSetTexCoordGen2(GX_TEXCOORD0, GX_TG_MTX3x4, GX_TG_POS, GX_TEXMTX0, GX_FALSE, GX_PTIDENTITY); GXSetNumChans(1); @@ -1096,7 +1096,7 @@ void fn_1_4700(ModelData *arg0, Mtx arg1) C_MTXOrtho(sp20, 0.0f, 480.0f, 0.0f, 640.0f, 0.0f, 100.0f); GXSetProjection(sp20, GX_ORTHOGRAPHIC); - PSMTXIdentity(sp60); + MTXIdentity(sp60); GXLoadPosMtxImm(sp60, GX_PNMTX0); GXSetNumChans(1); GXSetChanCtrl(GX_COLOR0A0, GX_FALSE, GX_SRC_REG, GX_SRC_REG, 0, GX_DF_CLAMP, GX_AF_NONE); diff --git a/src/REL/m406Dll/map.c b/src/REL/m406Dll/map.c index 7abe5b76..e995e73a 100644 --- a/src/REL/m406Dll/map.c +++ b/src/REL/m406Dll/map.c @@ -1083,7 +1083,7 @@ void fn_1_45BC(ModelData *arg0, Mtx arg1) } if (!var_r31->unk_28) { GXLoadPosMtxImm(arg1, 0); - PSMTXInvXpose(arg1, sp10); + MTXInvXpose(arg1, sp10); GXLoadNrmMtxImm(sp10, 0); var_r26 = fn_1_D06C(arg0, Hu3DCameraMtx, Hu3DCameraMtxXPose, 2.0f); GXSetNumTevStages(1); @@ -2149,7 +2149,7 @@ void fn_1_82C8(Mtx arg0, s32 arg1, float arg8) sp80.z = arg0[2][3]; sp74.x = sp74.z = 0.0f; sp74.y = atan2d(arg0[0][0], arg0[2][0]); - PSMTXCopy(arg0, sp8C); + MTXCopy(arg0, sp8C); sp8C[0][3] = sp8C[1][3] = sp8C[2][3] = sp8C[3][3] = 0.0f; sp68.x = -25.0f; sp68.z = -50.0f; @@ -2227,7 +2227,7 @@ void fn_1_8F98(void) var_r31->unk_10 = 0.0f; var_r31->unk_14 = 6.0f; var_r31->unk_18 = 1.0f; - PSMTXIdentity(var_r31->unk_1C); + MTXIdentity(var_r31->unk_1C); if (var_r30 == 0) { var_r31->unk_04 = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M406, 59)); } @@ -2246,7 +2246,7 @@ void fn_1_8F98(void) var_r31->unk_10 = 0.0f; var_r31->unk_14 = 6.0f; var_r31->unk_18 = 1.0f; - PSMTXIdentity(var_r31->unk_1C); + MTXIdentity(var_r31->unk_1C); if (var_r30 == 0) { var_r31->unk_04 = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M406, 60)); } @@ -2278,8 +2278,8 @@ void fn_1_91E0(void) var_f31 = var_r31->unk_18 * cosd((90.0f * var_f30)); var_f31 = var_f31; var_r30 = &Hu3DData[var_r31->unk_04]; - PSMTXScale(sp8, var_f31, var_f31, var_f31); - PSMTXConcat(var_r31->unk_1C, sp8, var_r30->unk_F0); + MTXScale(sp8, var_f31, var_f31, var_f31); + MTXConcat(var_r31->unk_1C, sp8, var_r30->unk_F0); var_r30->unk_F0[0][3] = var_r31->unk_1C[0][3]; var_r30->unk_F0[1][3] = var_r31->unk_1C[1][3]; var_r30->unk_F0[2][3] = var_r31->unk_1C[2][3]; @@ -2299,8 +2299,8 @@ void fn_1_91E0(void) var_f31 = var_r31->unk_18 * cosd((90.0f * var_f30)); var_f31 = var_f31; var_r30 = &Hu3DData[var_r31->unk_04]; - PSMTXScale(sp8, var_f31, var_f31, var_f31); - PSMTXConcat(var_r31->unk_1C, sp8, var_r30->unk_F0); + MTXScale(sp8, var_f31, var_f31, var_f31); + MTXConcat(var_r31->unk_1C, sp8, var_r30->unk_F0); var_r30->unk_F0[0][3] = var_r31->unk_1C[0][3]; var_r30->unk_F0[1][3] = var_r31->unk_1C[1][3]; var_r30->unk_F0[2][3] = var_r31->unk_1C[2][3]; @@ -2340,7 +2340,7 @@ s32 fn_1_94C0(Mtx arg0, s32 arg1, s32 arg2) sp64.z = arg0[2][3]; sp58.x = sp58.z = 0.0f; sp58.y = atan2d(arg0[0][0], arg0[2][0]); - PSMTXCopy(arg0, spA0); + MTXCopy(arg0, spA0); spA0[0][3] = spA0[1][3] = spA0[2][3] = spA0[3][3] = 0.0f; if (!arg2) { sp4C.x = 25.0f; @@ -2419,12 +2419,12 @@ s32 fn_1_94C0(Mtx arg0, s32 arg1, s32 arg2) var_r31->unk_10 = 1.0f; var_r31->unk_14 = 6.0f; var_r31->unk_18 = var_f31; - PSMTXCopy(arg0, var_r31->unk_1C); + MTXCopy(arg0, var_r31->unk_1C); Hu3DMotionTimeSet(var_r31->unk_04, 0.0f); Hu3DMotionSpeedSet(var_r31->unk_04, 0.0f); var_r27 = &Hu3DData[var_r31->unk_04]; - PSMTXScale(sp70, var_f31, var_f31, var_f31); - PSMTXConcat(arg0, sp70, var_r27->unk_F0); + MTXScale(sp70, var_f31, var_f31, var_f31); + MTXConcat(arg0, sp70, var_r27->unk_F0); var_r27->unk_F0[0][3] = arg0[0][3]; var_r27->unk_F0[1][3] = arg0[1][3]; var_r27->unk_F0[2][3] = arg0[2][3]; @@ -2630,7 +2630,7 @@ void fn_1_ADB4(ModelData *arg0, float (*arg1)[4]) GXSetTevColorOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, GX_TEVPREV); GXSetTevAlphaIn(GX_TEVSTAGE0, GX_CA_ZERO, GX_CA_ZERO, GX_CA_ZERO, GX_CA_A0); GXSetTevAlphaOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, GX_TEVPREV); - PSMTXIdentity(sp50); + MTXIdentity(sp50); GXLoadPosMtxImm(sp50, 0); GXSetZMode(GX_FALSE, GX_ALWAYS, GX_TRUE); GXSetNumChans(1); @@ -2954,7 +2954,7 @@ void fn_1_BC18(ModelData *arg0, float (*arg1)[4]) GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_TEX0, GX_TEX_ST, GX_F32, 0); GXSetArray(GX_VA_TEX0, var_r31->unk_44, 8); if (HmfInverseMtxF3X3(arg1, sp128) == 0) { - PSMTXIdentity(sp128); + MTXIdentity(sp128); } PSMTXReorder(sp128, sp8); if (var_r31->unk_4C) { @@ -2993,9 +2993,9 @@ void fn_1_BC18(ModelData *arg0, float (*arg1)[4]) VECScale(&lbl_1_data_8E0[1], &sp98[1], var_r29->unk_28); VECScale(&lbl_1_data_8E0[2], &sp98[2], var_r29->unk_28); VECScale(&lbl_1_data_8E0[3], &sp98[3], var_r29->unk_28); - PSMTXRotRad(spC8, 90, var_r29->unk_2C); - PSMTXConcat(sp128, spC8, spF8); - PSMTXMultVecArray(spF8, &sp98[0], &sp68[0], 4); + MTXRotRad(spC8, 90, var_r29->unk_2C); + MTXConcat(sp128, spC8, spF8); + MTXMultVecArray(spF8, &sp98[0], &sp68[0], 4); VECAdd(&sp68[0], &var_r29->unk_30, var_r30++); VECAdd(&sp68[1], &var_r29->unk_30, var_r30++); VECAdd(&sp68[2], &var_r29->unk_30, var_r30++); @@ -3167,7 +3167,7 @@ void fn_1_C86C(ModelData *arg0, Mtx arg1) GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_CLR0, GX_CLR_RGBA, GX_RGBA8, 0); GXSetArray(GX_VA_CLR0, &var_r31->unk_3C->unk_3C, 0x44); if (HmfInverseMtxF3X3(arg1, sp9C) == 0) { - PSMTXIdentity(sp9C); + MTXIdentity(sp9C); } PSMTXReorder(sp9C, spC); if (var_r31->unk_4C) { @@ -3362,8 +3362,8 @@ void fn_1_D13C(LightData *arg0, s16 arg1, Mtx arg2, Mtx arg3, float arg8) break; } if (arg0->unk_00 & 0x8000) { - PSMTXMultVec(arg2, &arg0->unk_28, &sp24); - PSMTXMultVec(arg3, &arg0->unk_1C, &sp18); + MTXMultVec(arg2, &arg0->unk_28, &sp24); + MTXMultVec(arg3, &arg0->unk_1C, &sp18); GXInitLightPos(&sp30, sp18.x, sp18.y, sp18.z); } else { diff --git a/src/REL/m406Dll/player.c b/src/REL/m406Dll/player.c index b484169b..9685aac0 100644 --- a/src/REL/m406Dll/player.c +++ b/src/REL/m406Dll/player.c @@ -666,11 +666,11 @@ void fn_1_E214(omObjData *object) } Hu3DModelScaleSet(object->model[5], var_f30, var_f30, var_f30); var_r31->unk_50 += VECMag(&var_r31->unk_2C) / 3.125f; - PSMTXTrans(sp94, -var_r31->unk_68, -var_r31->unk_6C, -var_r31->unk_70); - PSMTXRotRad(sp64, 0x78, 0.017453292f * var_r31->unk_50); - PSMTXConcat(sp64, sp94, sp34); - PSMTXTrans(sp94, var_r31->unk_68, var_r31->unk_6C, var_r31->unk_70); - PSMTXConcat(sp94, sp34, var_r26->unk_F0); + MTXTrans(sp94, -var_r31->unk_68, -var_r31->unk_6C, -var_r31->unk_70); + MTXRotRad(sp64, 0x78, 0.017453292f * var_r31->unk_50); + MTXConcat(sp64, sp94, sp34); + MTXTrans(sp94, var_r31->unk_68, var_r31->unk_6C, var_r31->unk_70); + MTXConcat(sp94, sp34, var_r26->unk_F0); var_r27 = 6; var_f31 = 2.0f; var_r25 = 0; @@ -690,14 +690,14 @@ void fn_1_E214(omObjData *object) var_r31->unk_2C.x = var_r31->unk_2C.y = var_r31->unk_2C.z = 0.0f; } var_r31->unk_50 = fn_1_13AF4(var_r31->unk_50, 0.0f, 0.5f); - PSMTXTrans(sp94, -var_r31->unk_68, -var_r31->unk_6C, -var_r31->unk_70); - PSMTXRotRad(sp64, 0x78, 0.017453292f * var_r31->unk_50); - PSMTXConcat(sp64, sp94, sp34); - PSMTXTrans(sp94, var_r31->unk_68, var_r31->unk_6C, var_r31->unk_70); - PSMTXConcat(sp94, sp34, var_r26->unk_F0); + MTXTrans(sp94, -var_r31->unk_68, -var_r31->unk_6C, -var_r31->unk_70); + MTXRotRad(sp64, 0x78, 0.017453292f * var_r31->unk_50); + MTXConcat(sp64, sp94, sp34); + MTXTrans(sp94, var_r31->unk_68, var_r31->unk_6C, var_r31->unk_70); + MTXConcat(sp94, sp34, var_r26->unk_F0); if (var_r31->unk_5E != 0) { - PSMTXTrans(sp94, 100.0f * (0.2f * (((var_r31->unk_5E & 1) * 2) - 1)), 0.0f, 0.0f); - PSMTXConcat(sp94, var_r26->unk_F0, var_r26->unk_F0); + MTXTrans(sp94, 100.0f * (0.2f * (((var_r31->unk_5E & 1) * 2) - 1)), 0.0f, 0.0f); + MTXConcat(sp94, var_r26->unk_F0, var_r26->unk_F0); if (--var_r31->unk_5E == 0) { if (++var_r31->unk_5C >= 4) { var_r31->unk_00_field3 = 0; @@ -708,7 +708,7 @@ void fn_1_E214(omObjData *object) Hu3DModelPosSet(object->model[6], object->trans.x + var_r31->unk_68, object->trans.y + var_r31->unk_6C, object->trans.z + var_r31->unk_70); Hu3DModelAttrReset(object->model[6], HU3D_ATTR_DISPOFF); - PSMTXIdentity(var_r26->unk_F0); + MTXIdentity(var_r26->unk_F0); fn_1_117BC(var_r31->unk_14.x, 25.0f, &var_r31->unk_44, &var_r31->unk_2C); } } @@ -733,7 +733,7 @@ void fn_1_E214(omObjData *object) if (fn_1_6A44(sp28) == 1) { var_r31->unk_00_field0 = 1; var_r26 = &Hu3DData[object->model[0]]; - PSMTXIdentity(var_r26->unk_F0); + MTXIdentity(var_r26->unk_F0); omVibrate(var_r31->unk_02, 0xC, 4, 2); HuAudCharVoicePlayPos(var_r31->unk_0C, 0x123, &object->trans); for (var_r24 = 0; var_r24 < 2; var_r24++) { @@ -804,13 +804,13 @@ void fn_1_F194(omObjData *object) mtxTransCat(sp80, var_r30->pos.x, var_r30->pos.y, var_r30->pos.z); VECCrossProduct(&sp44, &sp8, &sp44); if (sp44.y >= 0.0f) { - PSMTXTrans(sp50, -10.0f, 0.0f, 0.0f); - PSMTXConcat(sp50, sp80, sp80); + MTXTrans(sp50, -10.0f, 0.0f, 0.0f); + MTXConcat(sp50, sp80, sp80); fn_1_94C0(sp80, 10, 0); } else { - PSMTXTrans(sp50, 10.0f, 0.0f, 0.0f); - PSMTXConcat(sp50, sp80, sp80); + MTXTrans(sp50, 10.0f, 0.0f, 0.0f); + MTXConcat(sp50, sp80, sp80); fn_1_94C0(sp80, 10, 1); } } @@ -868,13 +868,13 @@ void fn_1_F694(omObjData *object) mtxTransCat(sp68, var_r30->pos.x, var_r30->pos.y, var_r30->pos.z); VECCrossProduct(&sp20, &sp14, &sp8); if (sp8.y >= 0.0f) { - PSMTXTrans(sp38, -10.0f, 0.0f, 0.0f); - PSMTXConcat(sp38, sp68, sp68); + MTXTrans(sp38, -10.0f, 0.0f, 0.0f); + MTXConcat(sp38, sp68, sp68); fn_1_94C0(sp68, 10, 0); } else { - PSMTXTrans(sp38, 10.0f, 0.0f, 0.0f); - PSMTXConcat(sp38, sp68, sp68); + MTXTrans(sp38, 10.0f, 0.0f, 0.0f); + MTXConcat(sp38, sp68, sp68); fn_1_94C0(sp68, 10, 1); } } @@ -1228,8 +1228,8 @@ void fn_1_10744(omObjData *object) if ((var_r31->unk_64 < 0x50) && (var_r31->unk_64 > 0x1E)) { mtxRot(sp48, var_r29->rot.x, var_r29->rot.y, var_r29->rot.z); mtxTransCat(sp48, var_r29->pos.x, var_r29->pos.y, var_r29->pos.z); - PSMTXTrans(sp18, 10.0f, 0.0f, 0.0f); - PSMTXConcat(sp18, sp48, sp48); + MTXTrans(sp18, 10.0f, 0.0f, 0.0f); + MTXConcat(sp18, sp48, sp48); fn_1_94C0(sp48, 10, 0); } var_r31->unk_2C.x = var_r31->unk_54 * (100.0 * (0.10000000149011612 * sind(180.0f + var_r31->unk_14.x))); @@ -1345,15 +1345,15 @@ void fn_1_114A0(omObjData *object) } mtxRot(sp9C, object->rot.x, object->rot.y, object->trans.z); mtxScaleCat(sp9C, object->scale.x, object->scale.y, object->scale.z); - PSMTXTrans(sp9C, object->trans.x, object->trans.y, object->trans.z); - PSMTXRotRad(sp6C, 0x78, 0.017453292f * var_r31->unk_50); - PSMTXConcat(sp9C, sp6C, sp9C); - PSMTXCopy(sp9C, spC); + MTXTrans(sp9C, object->trans.x, object->trans.y, object->trans.z); + MTXRotRad(sp6C, 0x78, 0.017453292f * var_r31->unk_50); + MTXConcat(sp9C, sp6C, sp9C); + MTXCopy(sp9C, spC); mtxScaleCat(spC, 2.0f, 2.0f, 2.0f); - PSMTXCopy(spC, Hu3DData[object->model[5]].unk_F0); - PSMTXTrans(sp3C, 0.0f, 110.0f, 0.0f); - PSMTXConcat(sp9C, sp3C, spC); - PSMTXCopy(spC, Hu3DData[object->model[7]].unk_F0); + MTXCopy(spC, Hu3DData[object->model[5]].unk_F0); + MTXTrans(sp3C, 0.0f, 110.0f, 0.0f); + MTXConcat(sp9C, sp3C, spC); + MTXCopy(spC, Hu3DData[object->model[7]].unk_F0); } void fn_1_117BC(float arg8, float arg9, UnkM406PlayerStruct2 *arg0, Vec *arg1) @@ -1753,7 +1753,7 @@ void fn_1_12BC4(omObjData *object) var_r30->target.z = Center.z; C_MTXLookAt(spA8, &var_r30->pos, &var_r30->up, &var_r30->target); for (var_r31 = 0; var_r31 < lbl_1_bss_1C4; var_r31++) { - PSMTXMultVec(spA8, &lbl_1_bss_104[var_r31], &sp198[var_r31]); + MTXMultVec(spA8, &lbl_1_bss_104[var_r31], &sp198[var_r31]); spD8[var_r31].x = sp198[var_r31].x / (sp198[var_r31].z * (sind((var_r30->fov / 2)) / cosd((var_r30->fov / 2)))); spD8[var_r31].y = sp198[var_r31].y / (sp198[var_r31].z * (sind((var_r30->fov / 2)) / cosd((var_r30->fov / 2)))); } @@ -1811,13 +1811,13 @@ s32 fn_1_136AC(HsfObject *arg0, Mtx arg1, char *arg2, Mtx arg3) HsfTransform *var_r31 = &arg0->data.curr; mtxRot(sp144, var_r31->rot.x, var_r31->rot.y, var_r31->rot.z); - PSMTXScale(sp174, var_r31->scale.x, var_r31->scale.y, var_r31->scale.z); - PSMTXConcat(sp144, sp174, sp174); + MTXScale(sp174, var_r31->scale.x, var_r31->scale.y, var_r31->scale.z); + MTXConcat(sp144, sp174, sp174); mtxTransCat(sp174, var_r31->pos.x, var_r31->pos.y, var_r31->pos.z); - PSMTXConcat(arg1, sp174, sp174); + MTXConcat(arg1, sp174, sp174); strcpy(sp4A4, MakeObjectName(arg2)); if (strcmp(sp4A4, arg0->name) == 0) { - PSMTXCopy(sp174, arg3); + MTXCopy(sp174, arg3); return 1; } for (var_r23 = 0; var_r23 < arg0->data.childrenCount; var_r23++) { @@ -1838,7 +1838,7 @@ void fn_1_13A88(s16 arg0, char *arg1, Mtx arg2) var_r31 = &Hu3DData[arg0]; var_r30 = var_r31->hsfData; - PSMTXIdentity(sp14); + MTXIdentity(sp14); fn_1_136AC(var_r30->root, sp14, arg1, arg2); } diff --git a/src/REL/m409Dll/cursor.c b/src/REL/m409Dll/cursor.c index c007391c..76fbe60a 100644 --- a/src/REL/m409Dll/cursor.c +++ b/src/REL/m409Dll/cursor.c @@ -4,11 +4,12 @@ #include "game/hsfdraw.h" #include "game/sprite.h" -void fn_1_BF88(s16 arg0, s16 arg1) { +void fn_1_BF88(s16 arg0, s16 arg1) +{ s32 var_r31; s32 var_r31_2; - unkStruct8* var_r29; - unkStruct9Sub* var_r30; + unkStruct8 *var_r29; + unkStruct9Sub *var_r30; lbl_1_bss_F0.unk4 = Hu3DHookFuncCreate(fn_1_CB98); Hu3DModelLayerSet(lbl_1_bss_F0.unk4, 6); @@ -18,26 +19,27 @@ void fn_1_BF88(s16 arg0, s16 arg1) { lbl_1_bss_F0.unk2 = arg1; var_r30 = HuMemDirectMallocNum(HEAP_SYSTEM, arg1 * sizeof(unkStruct9Sub), MEMORY_DEFAULT_NUM); lbl_1_bss_F0.unkC = var_r30; - + for (var_r31 = 0; var_r31 < arg0; var_r31++, var_r29++) { var_r29->unk8 = 0; } - + for (var_r31 = 0; var_r31 < arg1; var_r31++, var_r30++) { var_r30->unk6 = 0; var_r30->unk8 = 0; } - + lbl_1_bss_F0.unk6 = lbl_1_bss_F0.unk8 = lbl_1_bss_F0.unkA = 0; } -void fn_1_C0C0(void) { +void fn_1_C0C0(void) +{ s32 var_r31; for (var_r31 = 1; var_r31 < lbl_1_bss_F0.unk0; var_r31++) { fn_1_DDB8(var_r31); } - + for (var_r31 = 1; var_r31 < lbl_1_bss_F0.unk2; var_r31++) { fn_1_E228(var_r31); } @@ -48,7 +50,8 @@ void fn_1_C0C0(void) { extern u8 texMtxTbl[]; -void fn_1_C164(unkStruct8* arg0) { +void fn_1_C164(unkStruct8 *arg0) +{ ModelData spEC; Mtx spBC; Mtx sp8C; @@ -59,27 +62,27 @@ void fn_1_C164(unkStruct8* arg0) { GXColorSrc var_r25; s32 var_r26; s16 temp_r23; - unkStruct9Sub* temp_r28; + unkStruct9Sub *temp_r28; s16 var_r27; s16 var_r30; s32 var_r24; s32 var_r22; s32 var_r21; s32 var_r20; - unkStruct8Sub* var_r31; + unkStruct8Sub *var_r31; mtxRot(sp2C, arg0->unk18.x, arg0->unk18.y, arg0->unk18.z); - PSMTXScale(sp5C, arg0->unk24.x, arg0->unk24.y, arg0->unk24.z); - PSMTXConcat(sp2C, sp5C, sp5C); + MTXScale(sp5C, arg0->unk24.x, arg0->unk24.y, arg0->unk24.z); + MTXConcat(sp2C, sp5C, sp5C); mtxTransCat(sp5C, arg0->unkC.x, arg0->unkC.y, arg0->unkC.z); - PSMTXConcat(Hu3DCameraMtx, sp5C, sp8C); + MTXConcat(Hu3DCameraMtx, sp5C, sp8C); var_r30 = 0; var_r27 = 0; sp8 = 0; - + for (var_r26 = GX_TEXMAP0; var_r26 < arg0->unk4; var_r26++) { temp_r28 = &lbl_1_bss_F0.unkC[arg0->unk34[var_r26]]; - PSMTXRotRad(temp_r28->unk18, 0x5A, 0.0f); + MTXRotRad(temp_r28->unk18, 0x5A, 0.0f); mtxTransCat(temp_r28->unk18, temp_r28->unkC.x, temp_r28->unkC.y, temp_r28->unkC.z); switch (temp_r28->unk4) { case 0: @@ -91,11 +94,13 @@ void fn_1_C164(unkStruct8* arg0) { if ((temp_r28->unk0->bmp->dataFmt == 7) || (temp_r28->unk0->bmp->dataFmt == 8)) { GXSetTevColor(GX_TEVREG2, temp_r28->unk48); GXSetTevColorIn(var_r30, GX_CC_ZERO, GX_CC_C2, GX_CC_RASC, GX_CC_ZERO); - } else { + } + else { GXSetTevColorIn(var_r30, GX_CC_ZERO, GX_CC_TEXC, GX_CC_RASC, GX_CC_ZERO); } GXSetTevAlphaIn(var_r30, GX_CA_ZERO, GX_CA_TEXA, GX_CA_RASA, GX_CA_ZERO); - } else { + } + else { sp28.a = temp_r28->unk48.a; GXSetTevColor(GX_TEVREG2, sp28); GXSetTevColorIn(var_r30, GX_CC_CPREV, GX_CC_TEXC, GX_CC_A2, GX_CC_ZERO); @@ -150,39 +155,40 @@ void fn_1_C164(unkStruct8* arg0) { GXSetNumTevStages((s32)var_r30); GXSetNumTexGens((s32)var_r27); var_r31 = arg0->unk3C; - + for (var_r24 = 0; var_r24 < arg0->unk2; var_r24++, var_r31++) { if ((var_r31->unk34 != 0) && ((var_r31->unk34 & 4) == 0)) { switch (var_r31->unk30) { case 0: mtxRot(sp2C, var_r31->unkC.x, var_r31->unkC.y, var_r31->unkC.z); - PSMTXIdentity(sp5C); + MTXIdentity(sp5C); HmfInverseMtxF3X3(Hu3DCameraMtx, sp5C); - PSMTXConcat(sp5C, sp2C, sp2C); - PSMTXScale(sp5C, var_r31->unk18.x, var_r31->unk18.y, var_r31->unk18.z); - PSMTXConcat(sp2C, sp5C, sp5C); + MTXConcat(sp5C, sp2C, sp2C); + MTXScale(sp5C, var_r31->unk18.x, var_r31->unk18.y, var_r31->unk18.z); + MTXConcat(sp2C, sp5C, sp5C); mtxTransCat(sp5C, var_r31->unk0.x, var_r31->unk0.y, var_r31->unk0.z); - PSMTXConcat(Hu3DCameraMtx, sp5C, spBC); + MTXConcat(Hu3DCameraMtx, sp5C, spBC); break; case 1: - PSMTXCopy(sp8C, sp2C); + MTXCopy(sp8C, sp2C); mtxRotCat(sp2C, var_r31->unkC.x, var_r31->unkC.y, var_r31->unkC.z); - PSMTXScale(sp5C, var_r31->unk18.x, var_r31->unk18.y, var_r31->unk18.z); - PSMTXConcat(sp2C, sp5C, sp5C); + MTXScale(sp5C, var_r31->unk18.x, var_r31->unk18.y, var_r31->unk18.z); + MTXConcat(sp2C, sp5C, sp5C); mtxTransCat(sp5C, var_r31->unk0.x, var_r31->unk0.y, var_r31->unk0.z); - PSMTXCopy(sp5C, spBC); + MTXCopy(sp5C, spBC); break; } GXLoadPosMtxImm(spBC, 0); - PSMTXInverse(spBC, sp5C); - PSMTXTranspose(sp5C, sp2C); + MTXInverse(spBC, sp5C); + MTXTranspose(sp5C, sp2C); GXLoadNrmMtxImm(sp2C, 0); GXSetChanAmbColor(GX_COLOR0A0, var_r31->unk4C); GXSetChanMatColor(GX_COLOR0A0, var_r31->unk50); GXSetBlendMode(GX_BM_BLEND, GX_BL_SRCALPHA, GX_BL_INVSRCALPHA, GX_LO_NOOP); if ((var_r31->unk34 & 0x10) != 0) { GXSetZMode(GX_FALSE, GX_LEQUAL, GX_TRUE); - } else { + } + else { GXSetZMode(GX_TRUE, GX_LEQUAL, GX_TRUE); } spEC.attr = 0; @@ -190,7 +196,8 @@ void fn_1_C164(unkStruct8* arg0) { GXSetNumChans(1); if ((var_r31->unk34 & 8) != 0) { var_r25 = GX_SRC_VTX; - } else { + } + else { var_r25 = GX_SRC_REG; } switch (var_r31->unk31) { @@ -224,18 +231,19 @@ void fn_1_C164(unkStruct8* arg0) { } } -void fn_1_CB98(ModelData* model, Mtx matrix) { +void fn_1_CB98(ModelData *model, Mtx matrix) +{ Mtx sp38; Mtx sp8; s32 var_r30; - unkStruct8* var_r31; + unkStruct8 *var_r31; var_r31 = lbl_1_bss_F0.unk10; GXLoadPosMtxImm(matrix, 0); - PSMTXInverse(matrix, sp38); - PSMTXTranspose(sp38, sp8); + MTXInverse(matrix, sp38); + MTXTranspose(sp38, sp8); GXLoadNrmMtxImm(sp8, 0); - + for (var_r30 = 0; var_r30 < lbl_1_bss_F0.unk0; var_r30++, var_r31++) { if ((var_r31->unk8 == 0) || ((var_r31->unk8 & 2) == 0) || ((var_r31->unk8 & 4) != 0)) { continue; @@ -244,28 +252,33 @@ void fn_1_CB98(ModelData* model, Mtx matrix) { if (var_r31->unk30) { var_r31->unk30(var_r31); } - if (var_r31->unk8 == 0) continue; + if (var_r31->unk8 == 0) + continue; fn_1_D430(var_r31); - if (var_r31->unk8 == 0) continue; + if (var_r31->unk8 == 0) + continue; } fn_1_C164(var_r31); } } -unkStruct8* fn_1_CCB0(s16 idx) { +unkStruct8 *fn_1_CCB0(s16 idx) +{ return &lbl_1_bss_F0.unk10[idx]; } -unkStruct8Sub* fn_1_CCCC(s16 arg0, s16 arg1) { +unkStruct8Sub *fn_1_CCCC(s16 arg0, s16 arg1) +{ return &lbl_1_bss_F0.unk10[arg0].unk3C[arg1]; } -void fn_1_CCF8(unkStruct11** arg0, s16 arg1, f32 arg8, f32 arg9) { +void fn_1_CCF8(unkStruct11 **arg0, s16 arg1, f32 arg8, f32 arg9) +{ s32 var_r30; - unkStruct11* var_r31; - + unkStruct11 *var_r31; + var_r31 = *arg0 = HuMemDirectMallocNum(HEAP_SYSTEM, arg1 * sizeof(unkStruct11), MEMORY_DEFAULT_NUM); - + for (var_r30 = 0; var_r30 < arg1; var_r31++, var_r30++) { var_r31->unk0.x = (-0.5f * arg8); var_r31->unk0.y = (0.5f * arg9); @@ -282,13 +295,14 @@ void fn_1_CCF8(unkStruct11** arg0, s16 arg1, f32 arg8, f32 arg9) { } } -void fn_1_CE7C(Vec** arg0, s16 arg1, Vec* arg2) { +void fn_1_CE7C(Vec **arg0, s16 arg1, Vec *arg2) +{ s32 var_r29; s32 var_r28; - Vec* var_r31; + Vec *var_r31; var_r31 = *arg0 = HuMemDirectMallocNum(HEAP_SYSTEM, arg1 * sizeof(Vec[4]), MEMORY_DEFAULT_NUM); - + for (var_r29 = 0; var_r29 < arg1; var_r29++) { for (var_r28 = 0; var_r28 < 4; var_r31++, arg2++, var_r28++) { var_r31->x = arg2->x; @@ -298,13 +312,14 @@ void fn_1_CE7C(Vec** arg0, s16 arg1, Vec* arg2) { } } -void fn_1_CF1C(GXColor** arg0, s16 arg1, GXColor* arg2) { +void fn_1_CF1C(GXColor **arg0, s16 arg1, GXColor *arg2) +{ s32 var_r29; s32 var_r28; - GXColor* var_r31; + GXColor *var_r31; var_r31 = *arg0 = HuMemDirectMallocNum(HEAP_SYSTEM, arg1 * sizeof(GXColor[4]), MEMORY_DEFAULT_NUM); - + for (var_r29 = 0; var_r29 < arg1; var_r29++) { for (var_r28 = 0; var_r28 < 4; var_r31++, arg2++, var_r28++) { var_r31->r = arg2->r; @@ -315,12 +330,13 @@ void fn_1_CF1C(GXColor** arg0, s16 arg1, GXColor* arg2) { } } -void fn_1_CFC4(Vec** arg0, s16 arg1, Vec* arg2) { +void fn_1_CFC4(Vec **arg0, s16 arg1, Vec *arg2) +{ s32 var_r29; - Vec* var_r31; + Vec *var_r31; var_r31 = *arg0 = HuMemDirectMallocNum(HEAP_SYSTEM, arg1 * sizeof(Vec), MEMORY_DEFAULT_NUM); - + for (var_r29 = 0; var_r29 < arg1; var_r31++, arg2++, var_r29++) { var_r31->x = arg2->x; var_r31->y = arg2->y; @@ -328,10 +344,11 @@ void fn_1_CFC4(Vec** arg0, s16 arg1, Vec* arg2) { } } -void fn_1_D050(HsfVector2f** arg0, s16 arg1, HsfVector2f* arg2) { +void fn_1_D050(HsfVector2f **arg0, s16 arg1, HsfVector2f *arg2) +{ s32 var_r28; s32 var_r29; - HsfVector2f* var_r31; + HsfVector2f *var_r31; var_r31 = *arg0 = HuMemDirectMallocNum(HEAP_SYSTEM, arg1 * sizeof(HsfVector2f[4]), MEMORY_DEFAULT_NUM); @@ -343,31 +360,22 @@ void fn_1_D050(HsfVector2f** arg0, s16 arg1, HsfVector2f* arg2) { } } -void fn_1_D0E8(unkStruct8Sub* arg0) { - Vec sp18[4] = { - { -50.0f, 50.0f, 0.0f }, - { 50.0f, 50.0f, 0.0f }, - { 50.0f, -50.0f, 0.0f }, - { -50.0f, -50.0f, 0.0f } - }; - GXColor sp8[4] = { - { 0xFF, 0xFF, 0xFF, 0xFF }, - { 0xFF, 0xFF, 0xFF, 0xFF }, - { 0xFF, 0xFF, 0xFF, 0xFF }, - { 0xFF, 0xFF, 0xFF, 0xFF } - }; +void fn_1_D0E8(unkStruct8Sub *arg0) +{ + Vec sp18[4] = { { -50.0f, 50.0f, 0.0f }, { 50.0f, 50.0f, 0.0f }, { 50.0f, -50.0f, 0.0f }, { -50.0f, -50.0f, 0.0f } }; + GXColor sp8[4] = { { 0xFF, 0xFF, 0xFF, 0xFF }, { 0xFF, 0xFF, 0xFF, 0xFF }, { 0xFF, 0xFF, 0xFF, 0xFF }, { 0xFF, 0xFF, 0xFF, 0xFF } }; s32 var_r26; s32 var_r25; - void* temp_r3_3; - + void *temp_r3_3; + if (arg0->unk40 != NULL) { HuMemDirectFree(arg0->unk40); } - fn_1_CE7C((Vec**)&arg0->unk40, 1, &sp18[0]); + fn_1_CE7C((Vec **)&arg0->unk40, 1, &sp18[0]); if (arg0->unk44 != NULL) { HuMemDirectFree(arg0->unk44); } - fn_1_CF1C((GXColor**)&arg0->unk44, 1, &sp8[0]); + fn_1_CF1C((GXColor **)&arg0->unk44, 1, &sp8[0]); if (arg0->unk48 != NULL) { HuMemDirectFree(arg0->unk48); } @@ -383,12 +391,12 @@ void fn_1_D0E8(unkStruct8Sub* arg0) { DCFlushRange(arg0->unk3C, 0x1000); GXBeginDisplayList(temp_r3_3, 0x1000); GXBegin(GX_QUADS, GX_VTXFMT0, 4); - + for (var_r26 = 0; var_r26 < 4; var_r26++) { GXPosition1x16(var_r26); GXColor1x16(0); GXNormal1x16(var_r26); - + for (var_r25 = 0; var_r25 < arg0->unk32; var_r25++) { GXTexCoord1x16(var_r26); } @@ -396,23 +404,25 @@ void fn_1_D0E8(unkStruct8Sub* arg0) { arg0->unk38 = GXEndDisplayList(); } -void fn_1_D430(unkStruct8* arg0) { +void fn_1_D430(unkStruct8 *arg0) +{ s32 var_r25; s32 var_r26; s32 var_r27; - unkStruct8Sub* var_r28; - unkStruct12* var_r31; - unkStruct9Sub* temp_r30; + unkStruct8Sub *var_r28; + unkStruct12 *var_r31; + unkStruct9Sub *temp_r30; var_r27 = 0; var_r28 = arg0->unk3C; - + for (var_r25 = 0; var_r25 < arg0->unk2; var_r25++, var_r28++) { if ((var_r28->unk34 & 4) != 0) { var_r27++; - } else { + } + else { var_r31 = var_r28->unk54; - + for (var_r26 = 0; var_r26 < var_r28->unk32; var_r26++, var_r31++) { temp_r30 = &lbl_1_bss_F0.unkC[arg0->unk34[var_r26]]; var_r31->unk8 &= ~4; @@ -436,30 +446,37 @@ void fn_1_D430(unkStruct8* arg0) { if ((var_r31->unk8 & 0x10) != 0) { var_r31->unk8 |= 8; var_r31->unk0--; - } else if ((var_r31->unk8 & 0x40) != 0) { + } + else if ((var_r31->unk8 & 0x40) != 0) { var_r31->unk8 = (var_r31->unk8 & 0xF0) | 2; var_r31->unk0 -= 2; - } else if ((var_r31->unk8 & 0x20) != 0) { + } + else if ((var_r31->unk8 & 0x20) != 0) { var_r31->unk0 = 0; } var_r31->unk8 |= 4; - } else if (var_r31->unk0 < 0) { + } + else if (var_r31->unk0 < 0) { if ((var_r31->unk8 & 0x10) != 0) { var_r31->unk8 |= 8; var_r31->unk0 = 0; - } else if ((var_r31->unk8 & 0x20) != 0) { + } + else if ((var_r31->unk8 & 0x20) != 0) { if ((var_r31->unk8 & 0x40) != 0) { var_r31->unk8 = ((var_r31->unk8 & 0xF0) | 1); var_r31->unk0 = 1U; - } else { + } + else { var_r31->unk0 = (temp_r30->unk4C - 1); } - } else if ((var_r31->unk8 & 0x40) != 0) { + } + else if ((var_r31->unk8 & 0x40) != 0) { var_r31->unk8 |= 8; var_r31->unk0 = 0; } var_r31->unk8 |= 4; - } else { + } + else { var_r31->unk8 &= ~8; } if (var_r31->unk0 != var_r31->unk1) { @@ -483,11 +500,13 @@ void fn_1_D430(unkStruct8* arg0) { if ((var_r31->unk8 & 0x40) == 0) { if (var_r31->unk0 <= 0) { var_r31->unk0 = temp_r30->unk4C; - } else { + } + else { var_r31->unk0 = 0U; } } - } else if ((var_r28->unk34 & 0x80000000) != 0) { + } + else if ((var_r28->unk34 & 0x80000000) != 0) { fn_1_DDB8(arg0->unk0); } var_r27++; @@ -506,21 +525,23 @@ void fn_1_D430(unkStruct8* arg0) { } } -s16 fn_1_DA48(u8 arg0, u8 arg1) { +s16 fn_1_DA48(u8 arg0, u8 arg1) +{ s32 var_r29; s32 var_r28; - unkStruct8* var_r30; - unkStruct8Sub* var_r31; + unkStruct8 *var_r30; + unkStruct8Sub *var_r31; var_r30 = &lbl_1_bss_F0.unk10[1]; - + for (var_r29 = 1; var_r29 < lbl_1_bss_F0.unk0; var_r29++, var_r30++) { - if (var_r30->unk8 == 0) break; - + if (var_r30->unk8 == 0) + break; } - - if (var_r29 == lbl_1_bss_F0.unk0) return 0; - + + if (var_r29 == lbl_1_bss_F0.unk0) + return 0; + var_r30->unk0 = var_r29; var_r30->unk8 = 1; var_r30->unk30 = NULL; @@ -534,14 +555,14 @@ s16 fn_1_DA48(u8 arg0, u8 arg1) { var_r30->unk24.x = var_r30->unk24.y = var_r30->unk24.z = 1.0f; var_r30->unk54.x = var_r30->unk54.y = var_r30->unk54.z = 0.0f; var_r30->unk48.x = var_r30->unk48.y = var_r30->unk48.z = 0.0f; - + for (var_r29 = 0; var_r29 < 0x20; var_r29++) { var_r30->unk60[var_r29] = 0; } for (var_r29 = 0; var_r29 < arg1; var_r29++) { var_r30->unk34[var_r29] = 0; } - + for (var_r29 = 0; var_r29 < arg0; var_r29++, var_r31++) { var_r31->unk34 = 1; var_r31->unk32 = arg1; @@ -552,7 +573,7 @@ s16 fn_1_DA48(u8 arg0, u8 arg1) { var_r31->unk50.r = var_r31->unk50.g = var_r31->unk50.b = 0xFF; var_r31->unk50.a = 0xFF; var_r31->unk54 = HuMemDirectMallocNum(HEAP_SYSTEM, arg1 * sizeof(unkStruct12), MEMORY_DEFAULT_NUM); - + for (var_r28 = 0; var_r28 < arg1; var_r28++) { var_r31->unk54[var_r28].unk0 = var_r31->unk54[var_r28].unk1 = 0; var_r31->unk54[var_r28].unk4 = NULL; @@ -564,7 +585,7 @@ s16 fn_1_DA48(u8 arg0, u8 arg1) { var_r31->unk18.x = var_r31->unk18.y = var_r31->unk18.z = 1.0f; var_r31->unk64.x = var_r31->unk64.y = var_r31->unk64.z = 0.0f; var_r31->unk58.x = var_r31->unk58.y = var_r31->unk58.z = 0.0f; - + for (var_r28 = 0; var_r28 < 0x10; var_r28++) { var_r31->unk70[var_r28] = 0; } @@ -575,17 +596,18 @@ s16 fn_1_DA48(u8 arg0, u8 arg1) { return var_r30->unk0; } -void fn_1_DDB8(s16 arg0) { - unkStruct12* var_r28; +void fn_1_DDB8(s16 arg0) +{ + unkStruct12 *var_r28; s32 var_r29; - unkStruct8* temp_r30; - unkStruct8Sub* var_r31; + unkStruct8 *temp_r30; + unkStruct8Sub *var_r31; if (arg0 != 0) { temp_r30 = &lbl_1_bss_F0.unk10[arg0]; if (temp_r30->unk8 != 0) { var_r31 = temp_r30->unk3C; - + for (var_r29 = 0; var_r29 < temp_r30->unk2; var_r29++, var_r31++) { if (var_r31->unk40 != NULL) { HuMemDirectFree(var_r31->unk40); @@ -603,7 +625,7 @@ void fn_1_DDB8(s16 arg0) { HuMemDirectFree(var_r28->unk4); HuMemDirectFree(var_r31->unk54); } - + for (var_r29 = 0; var_r29 < temp_r30->unk4; var_r29++) { fn_1_E228(temp_r30->unk34[var_r29]); } @@ -615,32 +637,36 @@ void fn_1_DDB8(s16 arg0) { } } -void fn_1_DEF4(s16 arg0, s16 arg1, u8 arg2) { +void fn_1_DEF4(s16 arg0, s16 arg1, u8 arg2) +{ lbl_1_bss_F0.unk6 = arg0; lbl_1_bss_F0.unk8 = arg1; lbl_1_bss_F0.unkA = arg2; } -s16 fn_1_DF20(u32 arg0, s16 arg1, s16 arg2) { - AnimData* temp_r30; +s16 fn_1_DF20(u32 arg0, s16 arg1, s16 arg2) +{ + AnimData *temp_r30; f32 var_f31; f32 var_f30; s32 var_r29; - unkStruct9Sub* var_r31; + unkStruct9Sub *var_r31; var_r31 = &lbl_1_bss_F0.unkC[1]; - + for (var_r29 = 1; var_r29 < lbl_1_bss_F0.unk2; var_r29++, var_r31++) { - if ((var_r31->unk6 != 0) && (var_r31->unk8 == arg0)) break; + if ((var_r31->unk6 != 0) && (var_r31->unk8 == arg0)) + break; } if (var_r29 < lbl_1_bss_F0.unk2) { var_r31->unk6++; return var_r29; } var_r31 = &lbl_1_bss_F0.unkC[1]; - + for (var_r29 = 1; var_r29 < lbl_1_bss_F0.unk2; var_r29++, var_r31++) { - if (var_r31->unk6 == 0) break; + if (var_r31->unk6 == 0) + break; } var_r31->unk8 = arg0; var_r31->unk6 = 1; @@ -649,7 +675,8 @@ s16 fn_1_DF20(u32 arg0, s16 arg1, s16 arg2) { arg1 = temp_r30->bmp->sizeX; arg2 = temp_r30->bmp->sizeY; var_f31 = var_f30 = 1.0f; - } else { + } + else { var_f31 = arg1 / (f32)temp_r30->bmp->sizeX; var_f30 = arg2 / (f32)temp_r30->bmp->sizeY; } @@ -664,14 +691,15 @@ s16 fn_1_DF20(u32 arg0, s16 arg1, s16 arg2) { var_r31->unk4C = (temp_r30->bmp->sizeY / arg2); var_r31->unk48.r = var_r31->unk48.g = var_r31->unk48.b = 0xFF; var_r31->unk48.a = 0xFF; - PSMTXIdentity(var_r31->unk18); + MTXIdentity(var_r31->unk18); var_r31->unkC.x = var_r31->unkC.y = var_r31->unkC.z = 0.0f; return var_r29; } -void fn_1_E228(s16 arg0) { - unkStruct9Sub* temp_r31; - +void fn_1_E228(s16 arg0) +{ + unkStruct9Sub *temp_r31; + temp_r31 = &lbl_1_bss_F0.unkC[arg0]; if (temp_r31->unk8 != 0) { if (temp_r31->unk6 != 0) { @@ -684,17 +712,18 @@ void fn_1_E228(s16 arg0) { } } -s32 fn_1_E2A8(s16 arg0, u8 arg1, u32 arg2, s16 arg3, s16 arg4) { +s32 fn_1_E2A8(s16 arg0, u8 arg1, u32 arg2, s16 arg3, s16 arg4) +{ f32 temp_f31; f32 temp_f30; s32 var_r26; s32 var_r25; s32 var_r24; - unkStruct12* temp_r31; - unkStruct8* temp_r27; - unkStruct8Sub* var_r28; - unkStruct9Sub* temp_r30; - unkStruct11* var_r29; + unkStruct12 *temp_r31; + unkStruct8 *temp_r27; + unkStruct8Sub *var_r28; + unkStruct9Sub *temp_r30; + unkStruct11 *var_r29; if (arg0 == 0) { return 0; @@ -708,7 +737,7 @@ s32 fn_1_E2A8(s16 arg0, u8 arg1, u32 arg2, s16 arg3, s16 arg4) { temp_r27->unk34[arg1] = var_r24; temp_r30 = &lbl_1_bss_F0.unkC[var_r24]; var_r28 = temp_r27->unk3C; - + for (var_r26 = 0; var_r26 < temp_r27->unk2; var_r26++, var_r28++) { if (arg1 == 0) { if (var_r28->unk40) { @@ -717,7 +746,7 @@ s32 fn_1_E2A8(s16 arg0, u8 arg1, u32 arg2, s16 arg3, s16 arg4) { temp_f30 = temp_r30->unk50; temp_f31 = temp_r30->unk4E; var_r29 = var_r28->unk40 = HuMemDirectMallocNum(HEAP_SYSTEM, 0x30, MEMORY_DEFAULT_NUM); - + for (var_r25 = 0; var_r25 < 1; var_r29++, var_r25++) { var_r29->unk0.x = (-0.5f * temp_f31); var_r29->unk0.y = (0.5f * temp_f30); @@ -757,15 +786,17 @@ s32 fn_1_E2A8(s16 arg0, u8 arg1, u32 arg2, s16 arg3, s16 arg4) { return 1; } -s32 fn_1_E7C8(s16 arg0, u8 arg1, u32 arg2) { +s32 fn_1_E7C8(s16 arg0, u8 arg1, u32 arg2) +{ s32 var_r31; - + var_r31 = fn_1_E2A8(arg0, arg1, arg2, 0, 0); return var_r31; } -void fn_1_E818(s16 arg0, f32 arg8, f32 arg9, f32 argA) { - unkStruct8* temp_r31; +void fn_1_E818(s16 arg0, f32 arg8, f32 arg9, f32 argA) +{ + unkStruct8 *temp_r31; if (arg0 != 0) { temp_r31 = &lbl_1_bss_F0.unk10[arg0]; @@ -775,9 +806,10 @@ void fn_1_E818(s16 arg0, f32 arg8, f32 arg9, f32 argA) { } } -void fn_1_E85C(s16 arg0, s16 arg1, f32 arg8, f32 arg9, f32 argA) { - unkStruct8* temp_r30; - unkStruct8Sub* temp_r31; +void fn_1_E85C(s16 arg0, s16 arg1, f32 arg8, f32 arg9, f32 argA) +{ + unkStruct8 *temp_r30; + unkStruct8Sub *temp_r31; if (arg0 != 0) { temp_r30 = &lbl_1_bss_F0.unk10[arg0]; @@ -790,15 +822,16 @@ void fn_1_E85C(s16 arg0, s16 arg1, f32 arg8, f32 arg9, f32 argA) { } } -void fn_1_E8CC(s16 arg0, f32 arg8, f32 arg9, f32 argA) { +void fn_1_E8CC(s16 arg0, f32 arg8, f32 arg9, f32 argA) +{ s32 var_r29; - unkStruct8* temp_r30; - unkStruct8Sub* var_r31; + unkStruct8 *temp_r30; + unkStruct8Sub *var_r31; if (arg0 != 0) { temp_r30 = &lbl_1_bss_F0.unk10[arg0]; var_r31 = temp_r30->unk3C; - + for (var_r29 = 0; var_r29 < temp_r30->unk2; var_r29++, var_r31++) { var_r31->unk0.x = arg8; var_r31->unk0.y = arg9; @@ -807,8 +840,9 @@ void fn_1_E8CC(s16 arg0, f32 arg8, f32 arg9, f32 argA) { } } -void fn_1_E940(s16 arg0, f32 arg8, f32 arg9, f32 argA) { - unkStruct8* temp_r31; +void fn_1_E940(s16 arg0, f32 arg8, f32 arg9, f32 argA) +{ + unkStruct8 *temp_r31; if (arg0 != 0) { temp_r31 = &lbl_1_bss_F0.unk10[arg0]; @@ -818,9 +852,10 @@ void fn_1_E940(s16 arg0, f32 arg8, f32 arg9, f32 argA) { } } -void fn_1_E99C(s16 arg0, s16 arg1, f32 arg8, f32 arg9, f32 argA) { - unkStruct8* temp_r30; - unkStruct8Sub* temp_r31; +void fn_1_E99C(s16 arg0, s16 arg1, f32 arg8, f32 arg9, f32 argA) +{ + unkStruct8 *temp_r30; + unkStruct8Sub *temp_r31; if (arg0 != 0) { temp_r30 = &lbl_1_bss_F0.unk10[arg0]; @@ -833,15 +868,16 @@ void fn_1_E99C(s16 arg0, s16 arg1, f32 arg8, f32 arg9, f32 argA) { } } -void fn_1_EA24(s16 arg0, f32 arg8, f32 arg9, f32 argA) { +void fn_1_EA24(s16 arg0, f32 arg8, f32 arg9, f32 argA) +{ s32 var_r29; - unkStruct8* temp_r30; - unkStruct8Sub* var_r31; + unkStruct8 *temp_r30; + unkStruct8Sub *var_r31; if (arg0 != 0) { temp_r30 = &lbl_1_bss_F0.unk10[arg0]; var_r31 = temp_r30->unk3C; - + for (var_r29 = 0; var_r29 < temp_r30->unk2; var_r29++, var_r31++) { var_r31->unk0.x += arg8; var_r31->unk0.y += arg9; @@ -850,8 +886,9 @@ void fn_1_EA24(s16 arg0, f32 arg8, f32 arg9, f32 argA) { } } -void fn_1_EAB0(s16 arg0, f32 arg8, f32 arg9, f32 argA) { - unkStruct8* temp_r31; +void fn_1_EAB0(s16 arg0, f32 arg8, f32 arg9, f32 argA) +{ + unkStruct8 *temp_r31; if (arg0 != 0) { temp_r31 = &lbl_1_bss_F0.unk10[arg0]; @@ -861,9 +898,10 @@ void fn_1_EAB0(s16 arg0, f32 arg8, f32 arg9, f32 argA) { } } -void fn_1_EAF4(s16 arg0, s16 arg1, f32 arg8, f32 arg9, f32 argA) { - unkStruct8* temp_r30; - unkStruct8Sub* temp_r31; +void fn_1_EAF4(s16 arg0, s16 arg1, f32 arg8, f32 arg9, f32 argA) +{ + unkStruct8 *temp_r30; + unkStruct8Sub *temp_r31; if (arg0 != 0) { temp_r30 = &lbl_1_bss_F0.unk10[arg0]; @@ -876,15 +914,16 @@ void fn_1_EAF4(s16 arg0, s16 arg1, f32 arg8, f32 arg9, f32 argA) { } } -void fn_1_EB64(s16 arg0, f32 arg8, f32 arg9, f32 argA) { +void fn_1_EB64(s16 arg0, f32 arg8, f32 arg9, f32 argA) +{ s32 var_r29; - unkStruct8* temp_r30; - unkStruct8Sub* var_r31; + unkStruct8 *temp_r30; + unkStruct8Sub *var_r31; if (arg0 != 0) { temp_r30 = &lbl_1_bss_F0.unk10[arg0]; var_r31 = temp_r30->unk3C; - + for (var_r29 = 0; var_r29 < temp_r30->unk2; var_r29++, var_r31++) { var_r31->unkC.x = arg8; var_r31->unkC.y = arg9; @@ -893,8 +932,9 @@ void fn_1_EB64(s16 arg0, f32 arg8, f32 arg9, f32 argA) { } } -void fn_1_EBD8(s16 arg0, f32 arg8, f32 arg9, f32 argA) { - unkStruct8* temp_r31; +void fn_1_EBD8(s16 arg0, f32 arg8, f32 arg9, f32 argA) +{ + unkStruct8 *temp_r31; if (arg0 != 0) { temp_r31 = &lbl_1_bss_F0.unk10[arg0]; @@ -904,9 +944,10 @@ void fn_1_EBD8(s16 arg0, f32 arg8, f32 arg9, f32 argA) { } } -void fn_1_EC1C(s16 arg0, s16 arg1, f32 arg8, f32 arg9, f32 argA) { - unkStruct8* temp_r30; - unkStruct8Sub* temp_r31; +void fn_1_EC1C(s16 arg0, s16 arg1, f32 arg8, f32 arg9, f32 argA) +{ + unkStruct8 *temp_r30; + unkStruct8Sub *temp_r31; if (arg0 != 0) { temp_r30 = &lbl_1_bss_F0.unk10[arg0]; @@ -919,15 +960,16 @@ void fn_1_EC1C(s16 arg0, s16 arg1, f32 arg8, f32 arg9, f32 argA) { } } -void fn_1_EC8C(s16 arg0, f32 arg8, f32 arg9, f32 argA) { +void fn_1_EC8C(s16 arg0, f32 arg8, f32 arg9, f32 argA) +{ s32 var_r29; - unkStruct8* temp_r30; - unkStruct8Sub* var_r31; + unkStruct8 *temp_r30; + unkStruct8Sub *var_r31; if (arg0 != 0) { temp_r30 = &lbl_1_bss_F0.unk10[arg0]; var_r31 = temp_r30->unk3C; - + for (var_r29 = 0; var_r29 < temp_r30->unk2; var_r29++, var_r31++) { var_r31->unk18.x = arg8; var_r31->unk18.y = arg9; @@ -936,8 +978,9 @@ void fn_1_EC8C(s16 arg0, f32 arg8, f32 arg9, f32 argA) { } } -void fn_1_ED00(s16 arg0, s32 arg1) { - unkStruct8* temp_r31; +void fn_1_ED00(s16 arg0, s32 arg1) +{ + unkStruct8 *temp_r31; if (arg0 != 0) { temp_r31 = &lbl_1_bss_F0.unk10[arg0]; @@ -945,9 +988,10 @@ void fn_1_ED00(s16 arg0, s32 arg1) { } } -void fn_1_ED44(s16 arg0, s16 arg1, s32 arg2) { - unkStruct8* temp_r31; - unkStruct8Sub* temp_r30; +void fn_1_ED44(s16 arg0, s16 arg1, s32 arg2) +{ + unkStruct8 *temp_r31; + unkStruct8Sub *temp_r30; if (arg0 != 0) { temp_r31 = &lbl_1_bss_F0.unk10[arg0]; @@ -958,23 +1002,25 @@ void fn_1_ED44(s16 arg0, s16 arg1, s32 arg2) { } } -void fn_1_EDB4(s16 arg0, s32 arg1) { +void fn_1_EDB4(s16 arg0, s32 arg1) +{ s32 var_r30; - unkStruct8* temp_r31; - unkStruct8Sub* temp_r29; + unkStruct8 *temp_r31; + unkStruct8Sub *temp_r29; if (arg0 != 0) { temp_r31 = &lbl_1_bss_F0.unk10[arg0]; temp_r29 = temp_r31->unk3C; - + for (var_r30 = 0; var_r30 < temp_r31->unk2; var_r30++) { temp_r29->unk34 |= arg1; } } } -void fn_1_EE24(s16 arg0, u32 arg1) { - unkStruct8* temp_r31; +void fn_1_EE24(s16 arg0, u32 arg1) +{ + unkStruct8 *temp_r31; if (arg0 != 0) { temp_r31 = &lbl_1_bss_F0.unk10[arg0]; @@ -982,9 +1028,10 @@ void fn_1_EE24(s16 arg0, u32 arg1) { } } -void fn_1_EE68(s16 arg0, s16 arg1, u32 arg2) { - unkStruct8* temp_r31; - unkStruct8Sub* temp_r30; +void fn_1_EE68(s16 arg0, s16 arg1, u32 arg2) +{ + unkStruct8 *temp_r31; + unkStruct8Sub *temp_r30; if (arg0 != 0) { temp_r31 = &lbl_1_bss_F0.unk10[arg0]; @@ -995,23 +1042,25 @@ void fn_1_EE68(s16 arg0, s16 arg1, u32 arg2) { } } -void fn_1_EED8(s16 arg0, u32 arg1) { +void fn_1_EED8(s16 arg0, u32 arg1) +{ s32 var_r30; - unkStruct8* temp_r31; - unkStruct8Sub* temp_r29; + unkStruct8 *temp_r31; + unkStruct8Sub *temp_r29; if (arg0 != 0) { temp_r31 = &lbl_1_bss_F0.unk10[arg0]; temp_r29 = temp_r31->unk3C; - + for (var_r30 = 0; var_r30 < temp_r31->unk2; var_r30++) { temp_r29->unk34 &= ~arg1; } } } -s32 fn_1_EF48(s16 arg0, s32 arg1) { - unkStruct8* var_r31; +s32 fn_1_EF48(s16 arg0, s32 arg1) +{ + unkStruct8 *var_r31; if (arg0 == 0) { return 0; @@ -1024,26 +1073,31 @@ s32 fn_1_EF48(s16 arg0, s32 arg1) { return 0; } -s32 fn_1_EFA4(s16 arg0, s16 arg1, s32 arg2) { - unkStruct8Sub* var_r30; - unkStruct8* temp_r31; +s32 fn_1_EFA4(s16 arg0, s16 arg1, s32 arg2) +{ + unkStruct8Sub *var_r30; + unkStruct8 *temp_r31; + + if (arg0 == 0) + return; - if (arg0 == 0) return; - temp_r31 = &lbl_1_bss_F0.unk10[arg0]; - if (temp_r31->unk2 <= arg1) return; - + if (temp_r31->unk2 <= arg1) + return; + var_r30 = &temp_r31->unk3C[arg1]; if ((var_r30->unk34 & arg2) != 0) { return 1; - } else { + } + else { return 0; } } -void fn_1_F024(s16 arg0, s16 arg1, u8 arg2, u8 arg3, u8 arg4, u8 arg5) { - unkStruct8* temp_r30; - unkStruct8Sub* temp_r31; +void fn_1_F024(s16 arg0, s16 arg1, u8 arg2, u8 arg3, u8 arg4, u8 arg5) +{ + unkStruct8 *temp_r30; + unkStruct8Sub *temp_r31; if (arg0 != 0) { temp_r30 = &lbl_1_bss_F0.unk10[arg0]; @@ -1057,15 +1111,16 @@ void fn_1_F024(s16 arg0, s16 arg1, u8 arg2, u8 arg3, u8 arg4, u8 arg5) { } } -void fn_1_F098(s16 arg0, u8 arg1, u8 arg2, u8 arg3, u8 arg4) { +void fn_1_F098(s16 arg0, u8 arg1, u8 arg2, u8 arg3, u8 arg4) +{ s32 var_r29; - unkStruct8* temp_r30; - unkStruct8Sub* var_r31; + unkStruct8 *temp_r30; + unkStruct8Sub *var_r31; if (arg0 != 0) { temp_r30 = &lbl_1_bss_F0.unk10[arg0]; var_r31 = temp_r30->unk3C; - + for (var_r29 = 0; var_r29 < temp_r30->unk2; var_r29++, var_r31++) { var_r31->unk50.r = arg1; var_r31->unk50.g = arg2; @@ -1075,9 +1130,10 @@ void fn_1_F098(s16 arg0, u8 arg1, u8 arg2, u8 arg3, u8 arg4) { } } -void fn_1_F110(s16 arg0, s16 arg1, u8 arg2) { - unkStruct8* temp_r31; - unkStruct8Sub* var_r30; +void fn_1_F110(s16 arg0, s16 arg1, u8 arg2) +{ + unkStruct8 *temp_r31; + unkStruct8Sub *var_r30; if (arg0 != 0) { temp_r31 = &lbl_1_bss_F0.unk10[arg0]; @@ -1088,9 +1144,10 @@ void fn_1_F110(s16 arg0, s16 arg1, u8 arg2) { } } -void fn_1_F17C(s16 arg0, s16 arg1, u8 arg2, u8 arg3) { - unkStruct8* temp_r31; - unkStruct8Sub* var_r30; +void fn_1_F17C(s16 arg0, s16 arg1, u8 arg2, u8 arg3) +{ + unkStruct8 *temp_r31; + unkStruct8Sub *var_r30; if (arg0 != 0) { temp_r31 = &lbl_1_bss_F0.unk10[arg0]; @@ -1101,17 +1158,18 @@ void fn_1_F17C(s16 arg0, s16 arg1, u8 arg2, u8 arg3) { } } -void fn_1_F1F4(s16 arg0, u8 arg1) { +void fn_1_F1F4(s16 arg0, u8 arg1) +{ s32 var_r28; s32 var_r30; - unkStruct8* temp_r29; - unkStruct8Sub* var_r31; + unkStruct8 *temp_r29; + unkStruct8Sub *var_r31; if (arg0 != 0) { temp_r29 = &lbl_1_bss_F0.unk10[arg0]; var_r31 = (unkStruct8Sub *)(&temp_r29->unk3C); //! BAD WHY (void)temp_r29; - + for (var_r28 = 0; var_r28 < temp_r29->unk2; var_r28++, var_r31++) { for (var_r30 = 0; var_r30 < var_r31->unk32; var_r30++) { var_r31->unk54[var_r30].unk8 = arg1; @@ -1120,9 +1178,10 @@ void fn_1_F1F4(s16 arg0, u8 arg1) { } } -void fn_1_F28C(s16 arg0, s16 arg1, f32 arg8) { - unkStruct8* temp_r31; - unkStruct8Sub* var_r30; +void fn_1_F28C(s16 arg0, s16 arg1, f32 arg8) +{ + unkStruct8 *temp_r31; + unkStruct8Sub *var_r30; if (arg0 != 0) { temp_r31 = &lbl_1_bss_F0.unk10[arg0]; @@ -1133,9 +1192,10 @@ void fn_1_F28C(s16 arg0, s16 arg1, f32 arg8) { } } -void fn_1_F2F8(s16 arg0, s16 arg1, u8 arg2, f32 arg8) { - unkStruct8* temp_r31; - unkStruct8Sub* var_r30; +void fn_1_F2F8(s16 arg0, s16 arg1, u8 arg2, f32 arg8) +{ + unkStruct8 *temp_r31; + unkStruct8Sub *var_r30; if (arg0 != 0) { temp_r31 = &lbl_1_bss_F0.unk10[arg0]; @@ -1146,16 +1206,17 @@ void fn_1_F2F8(s16 arg0, s16 arg1, u8 arg2, f32 arg8) { } } -void fn_1_F370(s16 arg0, f32 arg8) { - unkStruct8* temp_r31; +void fn_1_F370(s16 arg0, f32 arg8) +{ + unkStruct8 *temp_r31; s32 var_r29; s32 var_r30; - unkStruct8Sub* volatile sp8; + unkStruct8Sub *volatile sp8; if (arg0 != 0) { temp_r31 = &lbl_1_bss_F0.unk10[arg0]; sp8 = &temp_r31->unk3C[0]; - + for (var_r29 = 0; var_r29 < temp_r31->unk2; var_r29++) { for (var_r30 = 0; var_r30 < sp8->unk32; var_r30++) { sp8->unk54[var_r30].unkC = arg8; @@ -1164,9 +1225,10 @@ void fn_1_F370(s16 arg0, f32 arg8) { } } -void fn_1_F408(s16 arg0, s16 arg1, u8 arg2) { - unkStruct8* temp_r31; - unkStruct8Sub* var_r30; +void fn_1_F408(s16 arg0, s16 arg1, u8 arg2) +{ + unkStruct8 *temp_r31; + unkStruct8Sub *var_r30; if (arg0 != 0) { temp_r31 = &lbl_1_bss_F0.unk10[arg0]; @@ -1177,9 +1239,10 @@ void fn_1_F408(s16 arg0, s16 arg1, u8 arg2) { } } -void fn_1_F478(s16 arg0, s16 arg1, u8 arg2, u8 arg3) { - unkStruct8* temp_r31; - unkStruct8Sub* var_r30; +void fn_1_F478(s16 arg0, s16 arg1, u8 arg2, u8 arg3) +{ + unkStruct8 *temp_r31; + unkStruct8Sub *var_r30; if (arg0 != 0) { temp_r31 = &lbl_1_bss_F0.unk10[arg0]; @@ -1190,10 +1253,11 @@ void fn_1_F478(s16 arg0, s16 arg1, u8 arg2, u8 arg3) { } } -void fn_1_F4F0(s16 arg0, u8 arg1) { - unkStruct8Sub* volatile sp8; +void fn_1_F4F0(s16 arg0, u8 arg1) +{ + unkStruct8Sub *volatile sp8; s32 var_r29; - unkStruct8* temp_r31; + unkStruct8 *temp_r31; s32 var_r30; if (arg0 != 0) { diff --git a/src/REL/m409Dll/main.c b/src/REL/m409Dll/main.c index a1ee937d..70955a13 100644 --- a/src/REL/m409Dll/main.c +++ b/src/REL/m409Dll/main.c @@ -1416,9 +1416,9 @@ void fn_1_602C(ModelData *arg0, f32 (*arg1)[4]) } else { fn_1_6778(&temp_r30->unk2C, &sp38, &var_r29->unk34, 4); - PSMTXRotRad(spC8, 0x5A, 0.017453292f * var_r29->unk30); - PSMTXConcat(sp128, spC8, sp98); - PSMTXMultVecArray(sp98, &sp38, &sp8, 4); + MTXRotRad(spC8, 0x5A, 0.017453292f * var_r29->unk30); + MTXConcat(sp128, spC8, sp98); + MTXMultVecArray(sp98, &sp38, &sp8, 4); VECAdd(&sp8, &var_r29->unk40, var_r31++); VECAdd(&sp14, &var_r29->unk40, var_r31++); VECAdd(&sp20, &var_r29->unk40, var_r31++); diff --git a/src/REL/m410Dll/game.c b/src/REL/m410Dll/game.c index 303236d5..5d9671c5 100644 --- a/src/REL/m410Dll/game.c +++ b/src/REL/m410Dll/game.c @@ -956,9 +956,9 @@ void fn_1_6968(omObjData *object) sp8.z = -var_r31->unk_1C.x; var_f30 = VECMag(&sp8) / 30.000002f; if (var_f30 >= 0.001f) { - PSMTXRotAxisRad(sp14, &sp8, var_f30); + MTXRotAxisRad(sp14, &sp8, var_f30); var_r28 = &Hu3DData[object->model[var_r30]]; - PSMTXConcat(sp14, var_r28->unk_F0, var_r28->unk_F0); + MTXConcat(sp14, var_r28->unk_F0, var_r28->unk_F0); } } } @@ -1238,8 +1238,8 @@ s32 fn_1_79F8(s16 arg0, char *arg1, Mtx arg2) var_r30 = var_r31->hsfData; lbl_1_bss_30 = 0; mtxRot(sp14, var_r31->rot.x, var_r31->rot.y, var_r31->rot.z); - PSMTXScale(sp44, var_r31->scale.x, var_r31->scale.y, var_r31->scale.z); - PSMTXConcat(sp14, sp44, sp44); + MTXScale(sp44, var_r31->scale.x, var_r31->scale.y, var_r31->scale.z); + MTXConcat(sp14, sp44, sp44); mtxTransCat(sp44, var_r31->pos.x, var_r31->pos.y, var_r31->pos.z); fn_1_7AC4(var_r30->root, sp44, arg1, arg2); return lbl_1_bss_30; @@ -1274,12 +1274,12 @@ void fn_1_7AC4(HsfObject *arg0, Mtx arg1, char *arg2, Mtx arg3) var_r31 = &arg0->data.curr; mtxRot(sp12C, var_r31->rot.x, var_r31->rot.y, var_r31->rot.z); - PSMTXScale(sp15C, var_r31->scale.x, var_r31->scale.y, var_r31->scale.z); - PSMTXConcat(sp12C, sp15C, sp15C); + MTXScale(sp15C, var_r31->scale.x, var_r31->scale.y, var_r31->scale.z); + MTXConcat(sp12C, sp15C, sp15C); mtxTransCat(sp15C, var_r31->pos.x, var_r31->pos.y, var_r31->pos.z); - PSMTXConcat(arg1, sp15C, sp15C); + MTXConcat(arg1, sp15C, sp15C); if (!strcmp(arg2, arg0->name)) { - PSMTXCopy(sp15C, arg3); + MTXCopy(sp15C, arg3); lbl_1_bss_30 = 1; } @@ -1288,12 +1288,12 @@ void fn_1_7AC4(HsfObject *arg0, Mtx arg1, char *arg2, Mtx arg3) if (!lbl_1_bss_30) { var_r30 = &var_r27->data.curr; mtxRot(spFC, var_r30->rot.x, var_r30->rot.y, var_r30->rot.z); - PSMTXScale(spCC, var_r30->scale.x, var_r30->scale.y, var_r30->scale.z); - PSMTXConcat(spFC, spCC, spCC); + MTXScale(spCC, var_r30->scale.x, var_r30->scale.y, var_r30->scale.z); + MTXConcat(spFC, spCC, spCC); mtxTransCat(spCC, var_r30->pos.x, var_r30->pos.y, var_r30->pos.z); - PSMTXConcat(sp15C, spCC, spCC); + MTXConcat(sp15C, spCC, spCC); if (!strcmp(arg2, var_r27->name)) { - PSMTXCopy(spCC, arg3); + MTXCopy(spCC, arg3); lbl_1_bss_30 = 1; } for (var_r22 = 0; var_r22 < var_r27->data.childrenCount; var_r22++) { @@ -1301,12 +1301,12 @@ void fn_1_7AC4(HsfObject *arg0, Mtx arg1, char *arg2, Mtx arg3) if (!lbl_1_bss_30) { var_r29 = &var_r26->data.curr; mtxRot(sp9C, var_r29->rot.x, var_r29->rot.y, var_r29->rot.z); - PSMTXScale(sp6C, var_r29->scale.x, var_r29->scale.y, var_r29->scale.z); - PSMTXConcat(sp9C, sp6C, sp6C); + MTXScale(sp6C, var_r29->scale.x, var_r29->scale.y, var_r29->scale.z); + MTXConcat(sp9C, sp6C, sp6C); mtxTransCat(sp6C, var_r29->pos.x, var_r29->pos.y, var_r29->pos.z); - PSMTXConcat(spCC, sp6C, sp6C); + MTXConcat(spCC, sp6C, sp6C); if (!strcmp(arg2, var_r26->name)) { - PSMTXCopy(sp6C, arg3); + MTXCopy(sp6C, arg3); lbl_1_bss_30 = 1; } @@ -1315,12 +1315,12 @@ void fn_1_7AC4(HsfObject *arg0, Mtx arg1, char *arg2, Mtx arg3) if (!lbl_1_bss_30) { var_r28 = &var_r25->data.curr; mtxRot(sp3C, var_r28->rot.x, var_r28->rot.y, var_r28->rot.z); - PSMTXScale(spC, var_r28->scale.x, var_r28->scale.y, var_r28->scale.z); - PSMTXConcat(sp3C, spC, spC); + MTXScale(spC, var_r28->scale.x, var_r28->scale.y, var_r28->scale.z); + MTXConcat(sp3C, spC, spC); mtxTransCat(spC, var_r28->pos.x, var_r28->pos.y, var_r28->pos.z); - PSMTXConcat(sp6C, spC, spC); + MTXConcat(sp6C, spC, spC); if (!strcmp(arg2, var_r25->name)) { - PSMTXCopy(spC, arg3); + MTXCopy(spC, arg3); lbl_1_bss_30 = 1; } diff --git a/src/REL/m410Dll/main.c b/src/REL/m410Dll/main.c index 42506076..e6855848 100644 --- a/src/REL/m410Dll/main.c +++ b/src/REL/m410Dll/main.c @@ -93,7 +93,7 @@ void ObjectSetup(void) sp8.x = sp8.z = 0.0f; sp8.y = lbl_1_data_18.z; mtxRot(sp20, lbl_1_data_18.x, lbl_1_data_18.y, 0.0f); - PSMTXMultVec(sp20, &sp8, &sp8); + MTXMultVec(sp20, &sp8, &sp8); Hu3DGLightPosAimSetV(lbl_1_bss_16, &sp8, &sp14); Hu3DShadowPosSet(&sp8, &lbl_1_data_34, &sp14); lbl_1_bss_14 = lbl_1_bss_12 = lbl_1_bss_10 = -1; diff --git a/src/REL/m410Dll/player.c b/src/REL/m410Dll/player.c index 133a5762..d4566bca 100644 --- a/src/REL/m410Dll/player.c +++ b/src/REL/m410Dll/player.c @@ -1075,8 +1075,8 @@ void fn_1_B140(ModelData *arg0, Mtx arg1) DCStoreRange(&sp10, 4); DCStoreRange(&lbl_1_data_294, 32); - PSMTXTrans(spF4, -400.0f, 400.0f, -700.0f); - PSMTXConcat(Hu3DCameraMtx, spF4, sp64); + MTXTrans(spF4, -400.0f, 400.0f, -700.0f); + MTXConcat(Hu3DCameraMtx, spF4, sp64); GXLoadPosMtxImm(sp64, 0); GXSetNumChans(1); GXSetChanCtrl(GX_COLOR0A0, GX_FALSE, GX_SRC_REG, GX_SRC_VTX, 0, GX_DF_CLAMP, GX_AF_NONE); @@ -1086,10 +1086,10 @@ void fn_1_B140(ModelData *arg0, Mtx arg1) HuSprTexLoad(lbl_1_bss_70, 0, 1, GX_REPEAT, GX_REPEAT, GX_LINEAR); GXSetNumTexGens(2); C_MTXLightPerspective(sp94, 41.5f, 1.2f, 0.5555555f, -0.5f, 0.5555555f, 0.5f); - PSMTXConcat(sp94, Hu3DCameraMtx, sp94); - PSMTXInverse(Hu3DCameraMtx, sp34); - PSMTXConcat(sp34, sp64, sp124); - PSMTXConcat(sp94, sp124, spF4); + MTXConcat(sp94, Hu3DCameraMtx, sp94); + MTXInverse(Hu3DCameraMtx, sp34); + MTXConcat(sp34, sp64, sp124); + MTXConcat(sp94, sp124, spF4); GXLoadTexMtxImm(spF4, 30, GX_MTX3x4); GXSetTexCoordGen2(GX_TEXCOORD0, GX_TG_MTX3x4, GX_TG_POS, 30, GX_FALSE, 125); GXSetTexCoordGen2(GX_TEXCOORD1, GX_TG_MTX2x4, GX_TG_TEXCOORD0, 33, GX_FALSE, 125); @@ -1097,7 +1097,7 @@ void fn_1_B140(ModelData *arg0, Mtx arg1) GXSetIndTexOrder(GX_INDTEXSTAGE0, GX_TEXCOORD1, GX_TEXMAP1); GXSetIndTexCoordScale(GX_INDTEXSTAGE0, GX_ITS_1, GX_ITS_1); GXSetTevIndWarp(GX_TEVSTAGE0, GX_INDTEXSTAGE0, GX_TRUE, GX_FALSE, GX_ITM_0); - PSMTXScale(spF4, -0.5f, -0.5f, 0.5f); + MTXScale(spF4, -0.5f, -0.5f, 0.5f); GXSetIndTexMtx(GX_ITM_0, (float(*)[3])spF4, -1); GXSetNumTevStages(1); GXSetTevColor(GX_TEVREG1, sp10); @@ -1124,17 +1124,17 @@ void fn_1_B140(ModelData *arg0, Mtx arg1) if (var_r31->unk_00) { lbl_1_data_294[var_r31->unk_02].a = 255.0f * var_r31->unk_0C; GXSetTevColor(GX_TEVREG0, lbl_1_data_294[var_r31->unk_02]); - PSMTXTrans(spF4, var_r31->unk_10.x, var_r31->unk_10.y, var_r31->unk_10.z); - PSMTXRotRad(sp124, 90, 0.017453292f * var_r31->unk_08); - PSMTXConcat(spF4, sp124, spF4); - PSMTXScale(spC4, var_r31->unk_04, var_r31->unk_04, var_r31->unk_04); - PSMTXConcat(spF4, spC4, spF4); - PSMTXConcat(Hu3DCameraMtx, spF4, sp64); + MTXTrans(spF4, var_r31->unk_10.x, var_r31->unk_10.y, var_r31->unk_10.z); + MTXRotRad(sp124, 90, 0.017453292f * var_r31->unk_08); + MTXConcat(spF4, sp124, spF4); + MTXScale(spC4, var_r31->unk_04, var_r31->unk_04, var_r31->unk_04); + MTXConcat(spF4, spC4, spF4); + MTXConcat(Hu3DCameraMtx, spF4, sp64); GXLoadPosMtxImm(sp64, 0); - PSMTXConcat(sp34, sp64, sp124); - PSMTXConcat(sp94, sp124, spF4); + MTXConcat(sp34, sp64, sp124); + MTXConcat(sp94, sp124, spF4); GXLoadTexMtxImm(spF4, 30, GX_MTX3x4); - PSMTXRotRad(sp124, 90, 0.017453292f * -var_r31->unk_08); + MTXRotRad(sp124, 90, 0.017453292f * -var_r31->unk_08); GXLoadTexMtxImm(sp124, 33, GX_MTX2x4); GXCallDisplayList(var_r30->unk_120.unk_E5C, var_r30->unk_120.unk_E58); } diff --git a/src/REL/m415Dll/main.c b/src/REL/m415Dll/main.c index 971724b5..2053aed7 100644 --- a/src/REL/m415Dll/main.c +++ b/src/REL/m415Dll/main.c @@ -513,8 +513,8 @@ void fn_1_1A60(unkStruct3 *arg0) for (var_r31 = -1; var_r31 < 2; var_r31 += 2) { for (var_r29 = -1; var_r29 < 2; var_r29 += 2) { MTXRotDeg(sp118, 0x59, temp_f30); - PSMTXTrans(spE8, (var_r30 * var_r31), 0.0f, (var_r30 * var_r29)); - PSMTXConcat(sp118, spE8, spE8); + MTXTrans(spE8, (var_r30 * var_r31), 0.0f, (var_r30 * var_r29)); + MTXConcat(sp118, spE8, spE8); if ((spB8[0].y > spE8[2][3]) || ((spB8[0].y == spE8[2][3]) && (spB8[0].x > spE8[0][3]))) { spB8[0].x = spE8[0][3]; spB8[0].y = spE8[2][3]; @@ -1604,15 +1604,15 @@ void fn_1_6958(Mtx arg0, f32 arg8, f32 arg9, f32 argA) MTXRotDeg(arg0, 0x5A, argA); } else { - PSMTXIdentity(arg0); + MTXIdentity(arg0); } if (arg8 != 0.0f) { MTXRotDeg(sp38, 0x58, arg8); - PSMTXConcat(sp38, arg0, arg0); + MTXConcat(sp38, arg0, arg0); } if (arg9 != 0.0f) { MTXRotDeg(sp8, 0x59, arg9); - PSMTXConcat(sp8, arg0, arg0); + MTXConcat(sp8, arg0, arg0); } } diff --git a/src/REL/m415Dll/map.c b/src/REL/m415Dll/map.c index 31636233..6533a2dc 100644 --- a/src/REL/m415Dll/map.c +++ b/src/REL/m415Dll/map.c @@ -4,10 +4,11 @@ #include "game/hsfdraw.h" #include "game/sprite.h" -void fn_1_8780(s16 arg0, s16 arg1) { +void fn_1_8780(s16 arg0, s16 arg1) +{ s32 var_r31; - unkSubStruct2* var_r29; - unkSubStruct3* var_r30; + unkSubStruct2 *var_r29; + unkSubStruct3 *var_r30; lbl_1_bss_36C.unk34 = Hu3DHookFuncCreate(fn_1_95C0); Hu3DModelLayerSet(lbl_1_bss_36C.unk34, 6); @@ -15,11 +16,11 @@ void fn_1_8780(s16 arg0, s16 arg1) { lbl_1_bss_36C.unk40 = var_r29 = HuMemDirectMallocNum(HEAP_SYSTEM, arg0 * sizeof(unkSubStruct2), MEMORY_DEFAULT_NUM); lbl_1_bss_36C.unk32 = arg1; lbl_1_bss_36C.unk3C = var_r30 = HuMemDirectMallocNum(HEAP_SYSTEM, arg1 * sizeof(unkSubStruct3), MEMORY_DEFAULT_NUM); - + for (var_r31 = 0; var_r31 < arg0; var_r31++, var_r29++) { var_r29->unk8 = 0; } - + for (var_r31 = 0; var_r31 < arg1; var_r31++, var_r30++) { var_r30->unk6 = 0; var_r30->unk8 = 0; @@ -27,7 +28,8 @@ void fn_1_8780(s16 arg0, s16 arg1) { lbl_1_bss_36C.unk36 = lbl_1_bss_36C.unk38 = lbl_1_bss_36C.unk3A = 0; } -void fn_1_88B8(unkSubStruct2* arg0) { +void fn_1_88B8(unkSubStruct2 *arg0) +{ ModelData sp120; Mtx spF0; Mtx spC0; @@ -46,8 +48,8 @@ void fn_1_88B8(unkSubStruct2* arg0) { s32 var_r21; s32 var_r20; s32 var_r19; - unkSubStruct3* temp_r26; - unkSubStruct* var_r31; + unkSubStruct3 *temp_r26; + unkSubStruct *var_r31; mtxRot(sp60, arg0->unk18.x, arg0->unk18.y, arg0->unk18.z); MTXScale(sp90, arg0->unk24.x, arg0->unk24.y, arg0->unk24.z); @@ -57,7 +59,7 @@ void fn_1_88B8(unkSubStruct2* arg0) { var_r29 = 0; var_r28 = 0; sp8 = 0; - + for (var_r27 = GX_TEXMAP0; var_r27 < arg0->unk4; var_r27++) { if (arg0->unk34[var_r27] != 0) { temp_r26 = &lbl_1_bss_36C.unk3C[arg0->unk34[var_r27]]; @@ -73,11 +75,13 @@ void fn_1_88B8(unkSubStruct2* arg0) { if ((temp_r26->unk0->bmp->dataFmt == 7) || (temp_r26->unk0->bmp->dataFmt == 8)) { GXSetTevColor(GX_TEVREG2, temp_r26->unk48); GXSetTevColorIn(var_r29, GX_CC_ZERO, GX_CC_C2, GX_CC_RASC, GX_CC_ZERO); - } else { + } + else { GXSetTevColorIn(var_r29, GX_CC_ZERO, GX_CC_TEXC, GX_CC_RASC, GX_CC_ZERO); } GXSetTevAlphaIn(var_r29, GX_CA_ZERO, GX_CA_TEXA, GX_CA_RASA, GX_CA_ZERO); - } else { + } + else { sp2C.a = temp_r26->unk48.a; GXSetTevColor(GX_TEVREG2, sp2C); GXSetTevColorIn(var_r29, GX_CC_CPREV, GX_CC_TEXC, GX_CC_A2, GX_CC_ZERO); @@ -141,7 +145,8 @@ void fn_1_88B8(unkSubStruct2* arg0) { if (var_r27 == GX_TEXMAP0) { GXSetTevColorIn(var_r29, GX_CC_ONE, GX_CC_ZERO, GX_CC_TEXC, GX_CC_ZERO); GXSetTevAlphaIn(var_r29, GX_CA_ZERO, GX_CA_ZERO, GX_CA_ZERO, GX_CA_TEXA); - } else { + } + else { GXSetTevColorIn(var_r29, GX_CC_CPREV, GX_CC_ZERO, GX_CC_TEXC, GX_CC_ZERO); GXSetTevAlphaIn(var_r29, GX_CA_ZERO, GX_CA_ZERO, GX_CA_ZERO, GX_CA_APREV); } @@ -153,7 +158,8 @@ void fn_1_88B8(unkSubStruct2* arg0) { var_r28++; if (temp_r26->unk4D != 0) { HuSprTexLoad(temp_r26->unk0, 0, var_r27, 1, 1, 1); - } else { + } + else { HuSprTexLoad(temp_r26->unk0, 0, var_r27, 0, 0, 1); } } @@ -161,7 +167,7 @@ void fn_1_88B8(unkSubStruct2* arg0) { GXSetNumTevStages((s16)var_r29); GXSetNumTexGens((s16)var_r28); var_r31 = arg0->unk3C; - + for (var_r24 = 0; var_r24 < arg0->unk2; var_r24++, var_r31++) { if ((var_r31->unk34 != 0) && ((var_r31->unk34 & 4) == 0)) { switch (var_r31->unk30) { @@ -169,7 +175,8 @@ void fn_1_88B8(unkSubStruct2* arg0) { mtxRot(sp60, var_r31->unkC.x, var_r31->unkC.y, var_r31->unkC.z); if (var_r31->unk31 == 2) { MTXConcat(lbl_1_bss_36C.unk0, sp60, sp60); - } else if (var_r31->unk31 == 1) { + } + else if (var_r31->unk31 == 1) { MTXRotDeg(sp90, 0x59, CRot.y); MTXConcat(sp90, sp60, sp60); } @@ -185,7 +192,8 @@ void fn_1_88B8(unkSubStruct2* arg0) { MTXIdentity(sp90); } MTXConcat(sp90, sp60, sp60); - } else if (var_r31->unk31 == 1) { + } + else if (var_r31->unk31 == 1) { MTXRotDeg(sp90, 0x59, CRot.y); MTXConcat(sp90, sp60, sp60); } @@ -206,7 +214,8 @@ void fn_1_88B8(unkSubStruct2* arg0) { GXSetBlendMode(GX_BM_BLEND, GX_BL_SRCALPHA, GX_BL_INVSRCALPHA, GX_LO_NOOP); if ((var_r31->unk34 & 0x10) != 0) { GXSetZMode(0, GX_LEQUAL, 1); - } else { + } + else { GXSetZMode(1, GX_LEQUAL, 0); } sp120.attr = 0; @@ -214,7 +223,8 @@ void fn_1_88B8(unkSubStruct2* arg0) { GXSetNumChans(1); if ((var_r31->unk34 & 8) != 0) { var_r25 = GX_SRC_VTX; - } else { + } + else { var_r25 = GX_SRC_REG; } switch (var_r31->unk32) { @@ -235,7 +245,7 @@ void fn_1_88B8(unkSubStruct2* arg0) { GXSetVtxDesc(GX_VA_CLR0, GX_INDEX16); GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_CLR0, GX_CLR_RGBA, GX_RGBA8, 0); GXSetArray(GX_VA_CLR0, var_r31->unk44, 4); - + for (var_r27 = 0; var_r27 < var_r31->unk33; var_r27++) { GXSetVtxDesc(var_r27 + GX_VA_TEX0, GX_INDEX16); GXSetVtxAttrFmt(GX_VTXFMT0, var_r27 + GX_VA_TEX0, GX_TEX_ST, GX_F32, 0); @@ -249,52 +259,59 @@ void fn_1_88B8(unkSubStruct2* arg0) { } } -void fn_1_95C0(ModelData* arg0, Mtx arg1) { +void fn_1_95C0(ModelData *arg0, Mtx arg1) +{ Mtx sp38; Mtx sp8; s32 var_r30; - unkSubStruct2* var_r31; + unkSubStruct2 *var_r31; var_r31 = lbl_1_bss_36C.unk40; GXLoadPosMtxImm(arg1, 0); - PSMTXInverse(arg1, sp38); - PSMTXTranspose(sp38, sp8); + MTXInverse(arg1, sp38); + MTXTranspose(sp38, sp8); GXLoadNrmMtxImm(sp8, 0); HmfInverseMtxF3X3(Hu3DCameraMtx, lbl_1_bss_36C.unk0); - + for (var_r30 = 0; var_r30 < lbl_1_bss_36C.unk30; var_r30++, var_r31++) { if ((var_r31->unk8 != 0) && ((var_r31->unk8 & 2) != 0) && ((var_r31->unk8 & 4) == 0)) { if ((u8)omPauseChk() == 0) { if (var_r31->unk30) { var_r31->unk30(var_r31); } - if (var_r31->unk8 == 0) continue; + if (var_r31->unk8 == 0) + continue; fn_1_9DC8(var_r31); - if (var_r31->unk8 == 0) continue; + if (var_r31->unk8 == 0) + continue; } fn_1_88B8(var_r31); } } } -unkSubStruct2* fn_1_96EC(s16 arg0) { +unkSubStruct2 *fn_1_96EC(s16 arg0) +{ return &lbl_1_bss_36C.unk40[arg0]; } -unkSubStruct* fn_1_9708(s16 arg0, s16 arg1) { +unkSubStruct *fn_1_9708(s16 arg0, s16 arg1) +{ return &lbl_1_bss_36C.unk40[arg0].unk3C[arg1]; } -AnimData** fn_1_9734(s16 arg0) { +AnimData **fn_1_9734(s16 arg0) +{ return &lbl_1_bss_36C.unk3C[arg0].unk0; } -void fn_1_9750(unkStruct6** arg0, s16 arg1, f32 arg8, f32 arg9) { +void fn_1_9750(unkStruct6 **arg0, s16 arg1, f32 arg8, f32 arg9) +{ s32 var_r30; - unkStruct6* var_r31; - + unkStruct6 *var_r31; + var_r31 = *arg0 = HuMemDirectMallocNum(HEAP_SYSTEM, arg1 * sizeof(unkStruct6), MEMORY_DEFAULT_NUM); - + for (var_r30 = 0; var_r30 < arg1; var_r31++, var_r30++) { var_r31->unk0.x = (-0.5f * arg8); var_r31->unk0.y = (0.5f * arg9); @@ -311,13 +328,14 @@ void fn_1_9750(unkStruct6** arg0, s16 arg1, f32 arg8, f32 arg9) { } } -void fn_1_98D4(Vec** arg0, s16 arg1, Vec* arg2) { +void fn_1_98D4(Vec **arg0, s16 arg1, Vec *arg2) +{ s32 var_r29; s32 var_r28; - Vec* var_r31; + Vec *var_r31; var_r31 = *arg0 = HuMemDirectMallocNum(HEAP_SYSTEM, arg1 * sizeof(Vec[4]), MEMORY_DEFAULT_NUM); - + for (var_r29 = 0; var_r29 < arg1; var_r29++) { for (var_r28 = 0; var_r28 < 4; var_r31++, arg2++, var_r28++) { var_r31->x = arg2->x; @@ -327,13 +345,14 @@ void fn_1_98D4(Vec** arg0, s16 arg1, Vec* arg2) { } } -void fn_1_9974(GXColor** arg0, s16 arg1, GXColor* arg2) { +void fn_1_9974(GXColor **arg0, s16 arg1, GXColor *arg2) +{ s32 var_r29; s32 var_r28; - GXColor* var_r31; + GXColor *var_r31; var_r31 = *arg0 = HuMemDirectMallocNum(HEAP_SYSTEM, arg1 * sizeof(GXColor[4]), MEMORY_DEFAULT_NUM); - + for (var_r29 = 0; var_r29 < arg1; var_r29++) { for (var_r28 = 0; var_r28 < 4; var_r31++, arg2++, var_r28++) { var_r31->r = arg2->r; @@ -344,12 +363,13 @@ void fn_1_9974(GXColor** arg0, s16 arg1, GXColor* arg2) { } } -void fn_1_9A1C(Vec** arg0, s16 arg1, Vec* arg2) { +void fn_1_9A1C(Vec **arg0, s16 arg1, Vec *arg2) +{ s32 var_r29; - Vec* var_r31; + Vec *var_r31; var_r31 = *arg0 = HuMemDirectMallocNum(HEAP_SYSTEM, arg1 * sizeof(Vec), MEMORY_DEFAULT_NUM); - + for (var_r29 = 0; var_r29 < arg1; var_r31++, arg2++, var_r29++) { var_r31->x = arg2->x; var_r31->y = arg2->y; @@ -357,10 +377,11 @@ void fn_1_9A1C(Vec** arg0, s16 arg1, Vec* arg2) { } } -void fn_1_9AA8(HsfVector2f** arg0, s16 arg1, HsfVector2f* arg2) { +void fn_1_9AA8(HsfVector2f **arg0, s16 arg1, HsfVector2f *arg2) +{ s32 var_r28; s32 var_r29; - HsfVector2f* var_r31; + HsfVector2f *var_r31; var_r31 = *arg0 = HuMemDirectMallocNum(HEAP_SYSTEM, arg1 * sizeof(HsfVector2f[4]), MEMORY_DEFAULT_NUM); @@ -372,29 +393,20 @@ void fn_1_9AA8(HsfVector2f** arg0, s16 arg1, HsfVector2f* arg2) { } } -void fn_1_9B40(unkSubStruct* arg0) { - void* sp8; +void fn_1_9B40(unkSubStruct *arg0) +{ + void *sp8; s32 var_r29; s32 var_r31; - void* temp_r28; + void *temp_r28; + + Vec sp1C[4] = { { -50.0f, 50.0f, 0.0f }, { 50.0f, 50.0f, 0.0f }, { 50.0f, -50.0f, 0.0f }, { -50.0f, -50.0f, 0.0f } }; + GXColor spC[4] = { { 0xFF, 0xFF, 0xFF, 0xFF }, { 0xFF, 0xFF, 0xFF, 0xFF }, { 0xFF, 0xFF, 0xFF, 0xFF }, { 0xFF, 0xFF, 0xFF, 0xFF } }; - Vec sp1C[4] = { - { -50.0f, 50.0f, 0.0f }, - { 50.0f, 50.0f, 0.0f }, - { 50.0f, -50.0f, 0.0f }, - { -50.0f, -50.0f, 0.0f } - }; - GXColor spC[4] = { - { 0xFF, 0xFF, 0xFF, 0xFF }, - { 0xFF, 0xFF, 0xFF, 0xFF }, - { 0xFF, 0xFF, 0xFF, 0xFF }, - { 0xFF, 0xFF, 0xFF, 0xFF } - }; - for (var_r31 = 0; var_r31 < 4; var_r31++) { arg0->unk40[var_r31] = sp1C[var_r31]; } - + for (var_r31 = 0; var_r31 < 4; var_r31++) { arg0->unk44[var_r31] = spC[var_r31]; } @@ -405,7 +417,7 @@ void fn_1_9B40(unkSubStruct* arg0) { sp8 = temp_r28; GXBeginDisplayList(temp_r28, 0x100U); GXBegin(GX_QUADS, GX_VTXFMT0, 4); - + for (var_r31 = 0; var_r31 < 4; var_r31++) { GXPosition1x16(var_r31); GXNormal1x16(0); @@ -417,24 +429,26 @@ void fn_1_9B40(unkSubStruct* arg0) { arg0->unk38 = GXEndDisplayList(); } -void fn_1_9DC8(unkSubStruct2* arg0) { +void fn_1_9DC8(unkSubStruct2 *arg0) +{ s32 temp_r0; s32 var_r25; s32 var_r26; s32 var_r27; - unkSubStruct* var_r28; - unkSubStruct3* temp_r30; - unkSubStruct4* var_r31; + unkSubStruct *var_r28; + unkSubStruct3 *temp_r30; + unkSubStruct4 *var_r31; var_r27 = 0; var_r28 = arg0->unk3C; - + for (var_r25 = 0; var_r25 < arg0->unk2; var_r25++, var_r28++) { if ((var_r28->unk34 & 4) != 0) { var_r27++; - } else { + } + else { var_r31 = var_r28->unk54; - + for (var_r26 = 0; var_r26 < var_r28->unk33; var_r26++, var_r31++) { temp_r30 = &lbl_1_bss_36C.unk3C[arg0->unk34[var_r26]]; var_r31->unk24 &= ~4; @@ -458,30 +472,37 @@ void fn_1_9DC8(unkSubStruct2* arg0) { if ((var_r31->unk24 & 0x10) != 0) { var_r31->unk24 |= 8; var_r31->unk0--; - } else if ((var_r31->unk24 & 0x40) != 0) { + } + else if ((var_r31->unk24 & 0x40) != 0) { var_r31->unk24 = (var_r31->unk24 & 0xF0) | 2; var_r31->unk0 -= 2; - } else if ((var_r31->unk24 & 0x20) != 0) { + } + else if ((var_r31->unk24 & 0x20) != 0) { var_r31->unk0 = 0; } var_r31->unk24 |= 4; - } else if (var_r31->unk0 < 0) { + } + else if (var_r31->unk0 < 0) { if ((var_r31->unk24 & 0x10) != 0) { var_r31->unk24 |= 8; var_r31->unk0 = 0; - } else if ((var_r31->unk24 & 0x20) != 0) { + } + else if ((var_r31->unk24 & 0x20) != 0) { if ((var_r31->unk24 & 0x40) != 0) { var_r31->unk24 = (var_r31->unk24 & 0xF0) | 1; var_r31->unk0 = 1; - } else { + } + else { var_r31->unk0 = temp_r30->unk4C - 1; } - } else if ((var_r31->unk24 & 0x40) != 0) { + } + else if ((var_r31->unk24 & 0x40) != 0) { var_r31->unk24 |= 8; var_r31->unk0 = 0; } var_r31->unk24 |= 4; - } else { + } + else { var_r31->unk24 &= ~8; } if (var_r31->unk0 != var_r31->unk1) { @@ -501,11 +522,13 @@ void fn_1_9DC8(unkSubStruct2* arg0) { if ((var_r31->unk24 & 0x40) == 0) { if (var_r31->unk0 <= 0) { var_r31->unk0 = temp_r30->unk4C; - } else { + } + else { var_r31->unk0 = 0; } } - } else if ((var_r28->unk34 & 0x80000000) != 0) { + } + else if ((var_r28->unk34 & 0x80000000) != 0) { fn_1_A800(arg0->unk0); } var_r27++; @@ -524,15 +547,16 @@ void fn_1_9DC8(unkSubStruct2* arg0) { } } -s16 fn_1_A2D0(u8 arg0, u8 arg1) { +s16 fn_1_A2D0(u8 arg0, u8 arg1) +{ s32 var_r29; s32 var_r28; - unkSubStruct* var_r30; - unkSubStruct2* var_r31; - void* temp_r25; + unkSubStruct *var_r30; + unkSubStruct2 *var_r31; + void *temp_r25; var_r31 = lbl_1_bss_36C.unk40 + 1; - + for (var_r29 = 1; var_r29 < lbl_1_bss_36C.unk30; var_r29++, var_r31++) { if (var_r31->unk8 == 0) { break; @@ -562,7 +586,7 @@ s16 fn_1_A2D0(u8 arg0, u8 arg1) { var_r31->unk70.x = var_r31->unk70.y = var_r31->unk70.z = 0.0f; var_r31->unk64.x = var_r31->unk64.y = var_r31->unk64.z = 0.0f; var_r31->unk60 = 0; - + for (var_r29 = 0; var_r29 < 0x20; var_r29++) { var_r31->unk7C[var_r29] = 0; } @@ -575,8 +599,7 @@ s16 fn_1_A2D0(u8 arg0, u8 arg1) { var_r30->unk30 = 0; var_r30->unk31 = 2; var_r30->unk32 = 0; - - + var_r30->unk4C.r = var_r30->unk4C.g = var_r30->unk4C.b = 0; var_r30->unk4C.a = 0xFF; var_r30->unk50.r = var_r30->unk50.g = var_r30->unk50.b = 0xFF; @@ -587,14 +610,14 @@ s16 fn_1_A2D0(u8 arg0, u8 arg1) { var_r30->unk54[var_r28].unk28 = 1.0f; var_r30->unk54[var_r28].unk2C = 0.0f; } - + var_r30->unk0.x = var_r30->unk0.y = var_r30->unk0.z = 0.0f; var_r30->unkC.x = var_r30->unkC.y = var_r30->unkC.z = 0.0f; var_r30->unk18.x = var_r30->unk18.y = var_r30->unk18.z = 1.0f; var_r30->unk68.x = var_r30->unk68.y = var_r30->unk68.z = 0.0f; var_r30->unk5C.x = var_r30->unk5C.y = var_r30->unk5C.z = 0.0f; var_r30->unk58 = 0; - + for (var_r28 = 0; var_r28 < 0x10; var_r28++) { var_r30->unk74[var_r28] = 0; } @@ -615,7 +638,7 @@ s16 fn_1_A2D0(u8 arg0, u8 arg1) { DCFlushRangeNoSync(var_r31->unk4C, var_r31->unk48); var_r30 = var_r31->unk3C; var_r31->unk48 = 0; - + for (var_r29 = 0; var_r29 < arg0; var_r29++, var_r30++) { var_r30->unk3C = var_r31->unk4C + var_r31->unk48; var_r31->unk48 += var_r30->unk38; @@ -626,9 +649,10 @@ s16 fn_1_A2D0(u8 arg0, u8 arg1) { return var_r31->unk0; } -void fn_1_A800(s16 arg0) { +void fn_1_A800(s16 arg0) +{ s32 var_r30; - unkSubStruct2* temp_r31; + unkSubStruct2 *temp_r31; if (arg0 != 0) { temp_r31 = &lbl_1_bss_36C.unk40[arg0]; @@ -648,7 +672,7 @@ void fn_1_A800(s16 arg0) { if (temp_r31->unk5C != NULL) { HuMemDirectFree(temp_r31->unk5C); } - + for (var_r30 = 0; var_r30 < temp_r31->unk4; var_r30++) { fn_1_AF48(temp_r31->unk34[var_r30]); } @@ -659,23 +683,25 @@ void fn_1_A800(s16 arg0) { } } -void fn_1_A920(s16 arg0, s16 arg1, u8 arg2) { +void fn_1_A920(s16 arg0, s16 arg1, u8 arg2) +{ lbl_1_bss_36C.unk36 = arg0; lbl_1_bss_36C.unk38 = arg1; lbl_1_bss_36C.unk3A = arg2; } -s16 fn_1_A94C(u32 arg0, s16 arg1, s16 arg2) { - AnimData* var_r30; +s16 fn_1_A94C(u32 arg0, s16 arg1, s16 arg2) +{ + AnimData *var_r30; f32 var_f31; f32 var_f30; s32 var_r29; - unkSubStruct3* var_r31; + unkSubStruct3 *var_r31; var_r31 = lbl_1_bss_36C.unk3C + 1; for (var_r29 = 1; var_r29 < lbl_1_bss_36C.unk32; var_r29++, var_r31++) { if ((var_r31->unk6 != 0) && (var_r31->unk8 == arg0)) { - break; + break; } } if (var_r29 < lbl_1_bss_36C.unk32) { @@ -694,16 +720,18 @@ s16 fn_1_A94C(u32 arg0, s16 arg1, s16 arg2) { var_r30 = HuSprAnimMake(arg1, arg2, 2); var_r30->bmp->data = HuMemDirectMallocNum(HEAP_SYSTEM, arg2 * (arg1 * 2), MEMORY_DEFAULT_NUM); arg1 = arg2 = 0; - } else { + } + else { var_r30 = HuSprAnimRead(HuDataReadNum(arg0, 0x10000000)); } if ((arg1 == 0) || (arg2 == 0)) { arg1 = var_r30->bmp->sizeX; arg2 = var_r30->bmp->sizeY; var_f31 = var_f30 = 1.0f; - } else { - var_f31 = arg1 / (f32) var_r30->bmp->sizeX; - var_f30 = arg2 / (f32) var_r30->bmp->sizeY; + } + else { + var_f31 = arg1 / (f32)var_r30->bmp->sizeX; + var_f30 = arg2 / (f32)var_r30->bmp->sizeY; } var_r31->unk0 = var_r30; var_r31->unk4E = arg1; @@ -723,24 +751,25 @@ s16 fn_1_A94C(u32 arg0, s16 arg1, s16 arg2) { } var_r31->unk48.r = var_r31->unk48.g = var_r31->unk48.b = 0xFF; var_r31->unk48.a = 0xFF; - PSMTXIdentity(var_r31->unk18); + MTXIdentity(var_r31->unk18); var_r31->unkC.x = var_r31->unkC.y = var_r31->unkC.z = 0.0f; return var_r29; } -void fn_1_ACF4(s16 arg0, s16 arg1, s16 arg2, s16 arg3, s16 arg4, s16 arg5) { +void fn_1_ACF4(s16 arg0, s16 arg1, s16 arg2, s16 arg3, s16 arg4, s16 arg5) +{ f32 var_f31; f32 var_f30; - AnimData* var_r30; - unkSubStruct3* var_r31; + AnimData *var_r30; + unkSubStruct3 *var_r31; var_r31 = &lbl_1_bss_36C.unk3C[arg0]; HuSprAnimKill(var_r31->unk0); var_r31->unk8 |= 0xFFFF0000; var_r30 = HuSprAnimMake(arg2, arg3, arg1); var_r30->bmp->data = HuMemDirectMallocNum(HEAP_SYSTEM, arg3 * (var_r30->bmp->pixSize * arg2), 0x10000000U); - var_f31 = arg4 / (f32) var_r30->bmp->sizeX; - var_f30 = arg5 / (f32) var_r30->bmp->sizeY; + var_f31 = arg4 / (f32)var_r30->bmp->sizeX; + var_f30 = arg5 / (f32)var_r30->bmp->sizeY; var_r31->unk0 = var_r30; var_r31->unk4E = arg2; var_r31->unk50 = arg3; @@ -755,8 +784,9 @@ void fn_1_ACF4(s16 arg0, s16 arg1, s16 arg2, s16 arg3, s16 arg4, s16 arg5) { var_r31->unk48.a = 0xFF; } -void fn_1_AF48(s16 arg0) { - unkSubStruct3* temp_r31; +void fn_1_AF48(s16 arg0) +{ + unkSubStruct3 *temp_r31; temp_r31 = &lbl_1_bss_36C.unk3C[arg0]; if (temp_r31->unk8 != 0) { @@ -770,7 +800,8 @@ void fn_1_AF48(s16 arg0) { } } -u8 fn_1_AFC8(s16 arg0, u8 arg1, s32 arg2, s16 arg3, s16 arg4) { +u8 fn_1_AFC8(s16 arg0, u8 arg1, s32 arg2, s16 arg3, s16 arg4) +{ s32 temp_r3; temp_r3 = fn_1_A94C(arg2, arg3, arg4); @@ -781,14 +812,16 @@ u8 fn_1_AFC8(s16 arg0, u8 arg1, s32 arg2, s16 arg3, s16 arg4) { return temp_r3; } -u8 fn_1_B038(s16 arg0, u8 arg1, s32 arg2) { +u8 fn_1_B038(s16 arg0, u8 arg1, s32 arg2) +{ u8 var_r31; s32 var_r30; u8 var_r29; if ((var_r30 = fn_1_A94C(arg2, 0, 0)) == 0) { var_r31 = 0; - } else { + } + else { fn_1_B0B8(arg0, arg1, var_r30); var_r31 = var_r30; } @@ -796,12 +829,13 @@ u8 fn_1_B038(s16 arg0, u8 arg1, s32 arg2) { return var_r29; } -s32 fn_1_B0B8(s16 arg0, u8 arg1, s16 arg2) { +s32 fn_1_B0B8(s16 arg0, u8 arg1, s16 arg2) +{ s32 var_r27; - unkSubStruct* var_r29; - unkSubStruct2* temp_r28; - unkSubStruct3* temp_r30; - unkSubStruct4* temp_r31; + unkSubStruct *var_r29; + unkSubStruct2 *temp_r28; + unkSubStruct3 *temp_r30; + unkSubStruct4 *temp_r31; if (arg2 == 0) { return 0; @@ -814,7 +848,7 @@ s32 fn_1_B0B8(s16 arg0, u8 arg1, s16 arg2) { temp_r28->unk34[arg1] = arg2; temp_r30 = &lbl_1_bss_36C.unk3C[arg2]; var_r29 = temp_r28->unk3C; - + for (var_r27 = 0; var_r27 < temp_r28->unk2; var_r27++, var_r29++) { if (arg1 == 0) { var_r29->unk40[0].x = -0.5f * temp_r30->unk4E; @@ -851,13 +885,14 @@ s32 fn_1_B0B8(s16 arg0, u8 arg1, s16 arg2) { return 1; } -void fn_1_B634(s32 arg0) { +void fn_1_B634(s32 arg0) +{ s32 var_r28; s32 var_r27; s16 var_r26; - unkSubStruct2* temp_r31; - unkSubStruct3* temp_r30; - unkSubStruct3* temp_r29; + unkSubStruct2 *temp_r31; + unkSubStruct3 *temp_r30; + unkSubStruct3 *temp_r29; for (var_r28 = 1; var_r28 < lbl_1_bss_36C.unk30; var_r28++) { if ((s16)var_r28 != 0) { @@ -878,7 +913,7 @@ void fn_1_B634(s32 arg0) { if (temp_r31->unk5C != NULL) { HuMemDirectFree(temp_r31->unk5C); } - + for (var_r27 = 0; var_r27 < temp_r31->unk4; var_r27++) { var_r26 = temp_r31->unk34[var_r27]; temp_r29 = &lbl_1_bss_36C.unk3C[var_r26]; @@ -898,7 +933,7 @@ void fn_1_B634(s32 arg0) { } } } - + for (var_r28 = 1; var_r28 < lbl_1_bss_36C.unk32; var_r28++) { temp_r30 = &lbl_1_bss_36C.unk3C[(s16)var_r28]; if (temp_r30->unk8 != 0) { @@ -916,8 +951,9 @@ void fn_1_B634(s32 arg0) { Hu3DModelKill(lbl_1_bss_36C.unk34); } -void fn_1_B864(s16 arg0, f32 arg8, f32 arg9, f32 argA) { - unkSubStruct2* temp_r31; +void fn_1_B864(s16 arg0, f32 arg8, f32 arg9, f32 argA) +{ + unkSubStruct2 *temp_r31; if (arg0 != 0) { temp_r31 = &lbl_1_bss_36C.unk40[arg0]; @@ -930,9 +966,10 @@ void fn_1_B864(s16 arg0, f32 arg8, f32 arg9, f32 argA) { } } -void fn_1_B8D0(s16 arg0, s16 arg1, f32 arg8, f32 arg9, f32 argA) { - unkSubStruct* temp_r31; - unkSubStruct2* temp_r30; +void fn_1_B8D0(s16 arg0, s16 arg1, f32 arg8, f32 arg9, f32 argA) +{ + unkSubStruct *temp_r31; + unkSubStruct2 *temp_r30; if (arg0 != 0) { temp_r30 = &lbl_1_bss_36C.unk40[arg0]; @@ -945,10 +982,11 @@ void fn_1_B8D0(s16 arg0, s16 arg1, f32 arg8, f32 arg9, f32 argA) { } } -void fn_1_B940(s16 arg0, f32 arg8, f32 arg9, f32 argA) { +void fn_1_B940(s16 arg0, f32 arg8, f32 arg9, f32 argA) +{ s32 var_r29; - unkSubStruct* var_r31; - unkSubStruct2* temp_r30; + unkSubStruct *var_r31; + unkSubStruct2 *temp_r30; if (arg0 != 0) { temp_r30 = &lbl_1_bss_36C.unk40[arg0]; @@ -961,8 +999,9 @@ void fn_1_B940(s16 arg0, f32 arg8, f32 arg9, f32 argA) { } } -void fn_1_B9B4(s16 arg0, f32 arg8, f32 arg9, f32 argA) { - unkSubStruct2* temp_r31; +void fn_1_B9B4(s16 arg0, f32 arg8, f32 arg9, f32 argA) +{ + unkSubStruct2 *temp_r31; if (arg0 != 0) { temp_r31 = &lbl_1_bss_36C.unk40[arg0]; @@ -975,9 +1014,10 @@ void fn_1_B9B4(s16 arg0, f32 arg8, f32 arg9, f32 argA) { } } -void fn_1_BA38(s16 arg0, s16 arg1, f32 arg8, f32 arg9, f32 argA) { - unkSubStruct* temp_r31; - unkSubStruct2* temp_r30; +void fn_1_BA38(s16 arg0, s16 arg1, f32 arg8, f32 arg9, f32 argA) +{ + unkSubStruct *temp_r31; + unkSubStruct2 *temp_r30; if (arg0 != 0) { temp_r30 = &lbl_1_bss_36C.unk40[arg0]; @@ -990,15 +1030,16 @@ void fn_1_BA38(s16 arg0, s16 arg1, f32 arg8, f32 arg9, f32 argA) { } } -void fn_1_BAC0(s16 arg0, f32 arg8, f32 arg9, f32 argA) { +void fn_1_BAC0(s16 arg0, f32 arg8, f32 arg9, f32 argA) +{ s32 var_r29; - unkSubStruct* var_r31; - unkSubStruct2* temp_r30; + unkSubStruct *var_r31; + unkSubStruct2 *temp_r30; if (arg0 != 0) { temp_r30 = &lbl_1_bss_36C.unk40[arg0]; var_r31 = temp_r30->unk3C; - + for (var_r29 = 0; var_r29 < temp_r30->unk2; var_r29++, var_r31++) { var_r31->unk0.x += arg8; var_r31->unk0.y += arg9; @@ -1007,8 +1048,9 @@ void fn_1_BAC0(s16 arg0, f32 arg8, f32 arg9, f32 argA) { } } -void fn_1_BB4C(s16 arg0, f32 arg8, f32 arg9, f32 argA) { - unkSubStruct2* temp_r31; +void fn_1_BB4C(s16 arg0, f32 arg8, f32 arg9, f32 argA) +{ + unkSubStruct2 *temp_r31; if (arg0 != 0) { temp_r31 = &lbl_1_bss_36C.unk40[arg0]; @@ -1021,9 +1063,10 @@ void fn_1_BB4C(s16 arg0, f32 arg8, f32 arg9, f32 argA) { } } -void fn_1_BBB8(s16 arg0, s16 arg1, f32 arg8, f32 arg9, f32 argA) { - unkSubStruct* temp_r31; - unkSubStruct2* temp_r30; +void fn_1_BBB8(s16 arg0, s16 arg1, f32 arg8, f32 arg9, f32 argA) +{ + unkSubStruct *temp_r31; + unkSubStruct2 *temp_r30; if (arg0 != 0) { temp_r30 = &lbl_1_bss_36C.unk40[arg0]; @@ -1036,10 +1079,11 @@ void fn_1_BBB8(s16 arg0, s16 arg1, f32 arg8, f32 arg9, f32 argA) { } } -void fn_1_BC28(s16 arg0, f32 arg8, f32 arg9, f32 argA) { +void fn_1_BC28(s16 arg0, f32 arg8, f32 arg9, f32 argA) +{ s32 var_r29; - unkSubStruct* var_r31; - unkSubStruct2* temp_r30; + unkSubStruct *var_r31; + unkSubStruct2 *temp_r30; if (arg0 != 0) { temp_r30 = &lbl_1_bss_36C.unk40[arg0]; @@ -1052,8 +1096,9 @@ void fn_1_BC28(s16 arg0, f32 arg8, f32 arg9, f32 argA) { } } -void fn_1_BC9C(s16 arg0, f32 arg8, f32 arg9, f32 argA) { - unkSubStruct2* temp_r31; +void fn_1_BC9C(s16 arg0, f32 arg8, f32 arg9, f32 argA) +{ + unkSubStruct2 *temp_r31; if (arg0 != 0) { temp_r31 = &lbl_1_bss_36C.unk40[arg0]; @@ -1066,9 +1111,10 @@ void fn_1_BC9C(s16 arg0, f32 arg8, f32 arg9, f32 argA) { } } -void fn_1_BD08(s16 arg0, s16 arg1, f32 arg8, f32 arg9, f32 argA) { - unkSubStruct* temp_r31; - unkSubStruct2* temp_r30; +void fn_1_BD08(s16 arg0, s16 arg1, f32 arg8, f32 arg9, f32 argA) +{ + unkSubStruct *temp_r31; + unkSubStruct2 *temp_r30; if (arg0 != 0) { temp_r30 = &lbl_1_bss_36C.unk40[arg0]; @@ -1081,10 +1127,11 @@ void fn_1_BD08(s16 arg0, s16 arg1, f32 arg8, f32 arg9, f32 argA) { } } -void fn_1_BD78(s16 arg0, f32 arg8, f32 arg9, f32 argA) { +void fn_1_BD78(s16 arg0, f32 arg8, f32 arg9, f32 argA) +{ s32 var_r29; - unkSubStruct* var_r31; - unkSubStruct2* temp_r30; + unkSubStruct *var_r31; + unkSubStruct2 *temp_r30; if (arg0 != 0) { temp_r30 = &lbl_1_bss_36C.unk40[arg0]; @@ -1097,8 +1144,9 @@ void fn_1_BD78(s16 arg0, f32 arg8, f32 arg9, f32 argA) { } } -void fn_1_BDEC(s16 arg0, s32 arg1) { - unkSubStruct2* temp_r31; +void fn_1_BDEC(s16 arg0, s32 arg1) +{ + unkSubStruct2 *temp_r31; if (arg0 != 0) { temp_r31 = &lbl_1_bss_36C.unk40[arg0]; @@ -1106,9 +1154,10 @@ void fn_1_BDEC(s16 arg0, s32 arg1) { } } -void fn_1_BE30(s16 arg0, s16 arg1, s32 arg2) { - unkSubStruct* temp_r30; - unkSubStruct2* temp_r31; +void fn_1_BE30(s16 arg0, s16 arg1, s32 arg2) +{ + unkSubStruct *temp_r30; + unkSubStruct2 *temp_r31; if (arg0 != 0) { temp_r31 = &lbl_1_bss_36C.unk40[arg0]; @@ -1119,23 +1168,25 @@ void fn_1_BE30(s16 arg0, s16 arg1, s32 arg2) { } } -void fn_1_BEA0(s16 arg0, s32 arg1) { +void fn_1_BEA0(s16 arg0, s32 arg1) +{ s32 var_r30; - unkSubStruct* temp_r29; - unkSubStruct2* temp_r31; + unkSubStruct *temp_r29; + unkSubStruct2 *temp_r31; if (arg0 != 0) { temp_r31 = &lbl_1_bss_36C.unk40[arg0]; temp_r29 = temp_r31->unk3C; - + for (var_r30 = 0; var_r30 < temp_r31->unk2; var_r30++) { temp_r29->unk34 |= arg1; } } } -void fn_1_BF10(s16 arg0, u32 arg1) { - unkSubStruct2* temp_r31; +void fn_1_BF10(s16 arg0, u32 arg1) +{ + unkSubStruct2 *temp_r31; if (arg0 != 0) { temp_r31 = &lbl_1_bss_36C.unk40[arg0]; @@ -1143,9 +1194,10 @@ void fn_1_BF10(s16 arg0, u32 arg1) { } } -void fn_1_BF54(s16 arg0, s16 arg1, u32 arg2) { - unkSubStruct* temp_r30; - unkSubStruct2* temp_r31; +void fn_1_BF54(s16 arg0, s16 arg1, u32 arg2) +{ + unkSubStruct *temp_r30; + unkSubStruct2 *temp_r31; if (arg0 != 0) { temp_r31 = &lbl_1_bss_36C.unk40[arg0]; @@ -1156,10 +1208,11 @@ void fn_1_BF54(s16 arg0, s16 arg1, u32 arg2) { } } -void fn_1_BFC4(s16 arg0, u32 arg1) { +void fn_1_BFC4(s16 arg0, u32 arg1) +{ s32 var_r30; - unkSubStruct* temp_r29; - unkSubStruct2* temp_r31; + unkSubStruct *temp_r29; + unkSubStruct2 *temp_r31; if (arg0 != 0) { temp_r31 = &lbl_1_bss_36C.unk40[arg0]; @@ -1171,9 +1224,10 @@ void fn_1_BFC4(s16 arg0, u32 arg1) { } } -s32 fn_1_C034(s16 arg0, s32 arg1) { - unkSubStruct2* temp_r31; - +s32 fn_1_C034(s16 arg0, s32 arg1) +{ + unkSubStruct2 *temp_r31; + if (arg0 == 0) { return 0; } @@ -1185,9 +1239,10 @@ s32 fn_1_C034(s16 arg0, s32 arg1) { return 0; } -s16 fn_1_C090(s16 arg0, s16 arg1, s32 arg2) { - unkSubStruct* temp_r30; - unkSubStruct2* temp_r31; +s16 fn_1_C090(s16 arg0, s16 arg1, s32 arg2) +{ + unkSubStruct *temp_r30; + unkSubStruct2 *temp_r31; if (arg0 != 0) { temp_r31 = &lbl_1_bss_36C.unk40[arg0]; @@ -1195,7 +1250,8 @@ s16 fn_1_C090(s16 arg0, s16 arg1, s32 arg2) { temp_r30 = &temp_r31->unk3C[arg1]; if ((temp_r30->unk34 & arg2) != 0) { arg0 = 1; - } else { + } + else { arg0 = 0; } } @@ -1203,9 +1259,10 @@ s16 fn_1_C090(s16 arg0, s16 arg1, s32 arg2) { return arg0; } -void fn_1_C110(s16 arg0, s16 arg1, u8 arg2, u8 arg3, u8 arg4, u8 arg5) { - unkSubStruct* temp_r31; - unkSubStruct2* temp_r30; +void fn_1_C110(s16 arg0, s16 arg1, u8 arg2, u8 arg3, u8 arg4, u8 arg5) +{ + unkSubStruct *temp_r31; + unkSubStruct2 *temp_r30; if (arg0 != 0) { temp_r30 = &lbl_1_bss_36C.unk40[arg0]; @@ -1219,15 +1276,16 @@ void fn_1_C110(s16 arg0, s16 arg1, u8 arg2, u8 arg3, u8 arg4, u8 arg5) { } } -void fn_1_C184(s16 arg0, u8 arg1, u8 arg2, u8 arg3, u8 arg4) { +void fn_1_C184(s16 arg0, u8 arg1, u8 arg2, u8 arg3, u8 arg4) +{ s32 var_r29; - unkSubStruct* var_r31; - unkSubStruct2* temp_r30; + unkSubStruct *var_r31; + unkSubStruct2 *temp_r30; if (arg0 != 0) { temp_r30 = &lbl_1_bss_36C.unk40[arg0]; var_r31 = temp_r30->unk3C; - + for (var_r29 = 0; var_r29 < temp_r30->unk2; var_r29++, var_r31++) { var_r31->unk50.r = arg1; var_r31->unk50.g = arg2; @@ -1237,9 +1295,10 @@ void fn_1_C184(s16 arg0, u8 arg1, u8 arg2, u8 arg3, u8 arg4) { } } -void fn_1_C1FC(s16 arg0, s16 arg1, u8 arg2) { - unkSubStruct* temp_r30; - unkSubStruct2* temp_r31; +void fn_1_C1FC(s16 arg0, s16 arg1, u8 arg2) +{ + unkSubStruct *temp_r30; + unkSubStruct2 *temp_r31; if (arg0 != 0) { temp_r31 = &lbl_1_bss_36C.unk40[arg0]; @@ -1250,24 +1309,26 @@ void fn_1_C1FC(s16 arg0, s16 arg1, u8 arg2) { } } -void fn_1_C264(s16 arg0, u8 arg1) { +void fn_1_C264(s16 arg0, u8 arg1) +{ s32 var_r29; - unkSubStruct2* temp_r31; - unkSubStruct* var_r30; + unkSubStruct2 *temp_r31; + unkSubStruct *var_r30; if (arg0 != 0) { temp_r31 = &lbl_1_bss_36C.unk40[arg0]; var_r30 = temp_r31->unk3C; - + for (var_r29 = 0; var_r29 < temp_r31->unk2; var_r29++, var_r30++) { var_r30->unk30 = arg1; } } } -void fn_1_C2D0(s16 arg0, s16 arg1, u8 arg2) { - unkSubStruct2* temp_r31; - unkSubStruct* var_r30; +void fn_1_C2D0(s16 arg0, s16 arg1, u8 arg2) +{ + unkSubStruct2 *temp_r31; + unkSubStruct *var_r30; if (arg0 != 0) { temp_r31 = &lbl_1_bss_36C.unk40[arg0]; @@ -1278,10 +1339,11 @@ void fn_1_C2D0(s16 arg0, s16 arg1, u8 arg2) { } } -void fn_1_C338(s16 arg0, u8 arg1) { +void fn_1_C338(s16 arg0, u8 arg1) +{ s32 var_r29; - unkSubStruct2* temp_r31; - unkSubStruct* var_r30; + unkSubStruct2 *temp_r31; + unkSubStruct *var_r30; if (arg0 != 0) { temp_r31 = &lbl_1_bss_36C.unk40[arg0]; @@ -1293,9 +1355,10 @@ void fn_1_C338(s16 arg0, u8 arg1) { } } -void fn_1_C3A4(s16 arg0, s16 arg1, u8 arg2) { - unkSubStruct2* temp_r31; - unkSubStruct* var_r30; +void fn_1_C3A4(s16 arg0, s16 arg1, u8 arg2) +{ + unkSubStruct2 *temp_r31; + unkSubStruct *var_r30; if (arg0 != 0) { temp_r31 = &lbl_1_bss_36C.unk40[arg0]; @@ -1306,9 +1369,10 @@ void fn_1_C3A4(s16 arg0, s16 arg1, u8 arg2) { } } -void fn_1_C410(s16 arg0, s16 arg1, u8 arg2, u8 arg3) { - unkSubStruct2* temp_r31; - unkSubStruct* var_r30; +void fn_1_C410(s16 arg0, s16 arg1, u8 arg2, u8 arg3) +{ + unkSubStruct2 *temp_r31; + unkSubStruct *var_r30; if (arg0 != 0) { temp_r31 = &lbl_1_bss_36C.unk40[arg0]; @@ -1319,17 +1383,18 @@ void fn_1_C410(s16 arg0, s16 arg1, u8 arg2, u8 arg3) { } } -void fn_1_C488(s16 arg0, u8 arg1) { +void fn_1_C488(s16 arg0, u8 arg1) +{ s32 var_r28; s32 var_r30; - unkSubStruct* var_r31; - unkSubStruct2* temp_r29; + unkSubStruct *var_r31; + unkSubStruct2 *temp_r29; if (arg0 != 0) { temp_r29 = &lbl_1_bss_36C.unk40[arg0]; - var_r31 = (unkSubStruct*)&temp_r29->unk3C; //! BAD WHY + var_r31 = (unkSubStruct *)&temp_r29->unk3C; //! BAD WHY (void)temp_r29; - + for (var_r28 = 0; var_r28 < temp_r29->unk2; var_r28++, var_r31++) { for (var_r30 = 0; var_r30 < var_r31->unk33; var_r30++) { var_r31->unk54[var_r30].unk24 = arg1; @@ -1338,9 +1403,10 @@ void fn_1_C488(s16 arg0, u8 arg1) { } } -void fn_1_C520(s16 arg0, s16 arg1, f32 arg8) { - unkSubStruct2* temp_r31; - unkSubStruct* var_r30; +void fn_1_C520(s16 arg0, s16 arg1, f32 arg8) +{ + unkSubStruct2 *temp_r31; + unkSubStruct *var_r30; if (arg0 != 0) { temp_r31 = &lbl_1_bss_36C.unk40[arg0]; @@ -1351,9 +1417,10 @@ void fn_1_C520(s16 arg0, s16 arg1, f32 arg8) { } } -void fn_1_C58C(s16 arg0, s16 arg1, u8 arg2, f32 arg8) { - unkSubStruct2* temp_r31; - unkSubStruct* var_r30; +void fn_1_C58C(s16 arg0, s16 arg1, u8 arg2, f32 arg8) +{ + unkSubStruct2 *temp_r31; + unkSubStruct *var_r30; if (arg0 != 0) { temp_r31 = &lbl_1_bss_36C.unk40[arg0]; @@ -1364,16 +1431,17 @@ void fn_1_C58C(s16 arg0, s16 arg1, u8 arg2, f32 arg8) { } } -void fn_1_C604(s16 arg0, f32 arg8) { - unkSubStruct* volatile sp8; +void fn_1_C604(s16 arg0, f32 arg8) +{ + unkSubStruct *volatile sp8; s32 var_r29; - unkSubStruct2* temp_r31; + unkSubStruct2 *temp_r31; s32 var_r30; if (arg0 != 0) { temp_r31 = &lbl_1_bss_36C.unk40[arg0]; sp8 = temp_r31->unk3C; - + for (var_r29 = 0; var_r29 < temp_r31->unk2; var_r29++) { for (var_r30 = 0; var_r30 < sp8->unk33; var_r30++) { sp8->unk54[var_r30].unk28 = arg8; @@ -1382,9 +1450,10 @@ void fn_1_C604(s16 arg0, f32 arg8) { } } -void fn_1_C69C(s16 arg0, s16 arg1, u8 arg2) { - unkSubStruct2* temp_r31; - unkSubStruct* var_r30; +void fn_1_C69C(s16 arg0, s16 arg1, u8 arg2) +{ + unkSubStruct2 *temp_r31; + unkSubStruct *var_r30; if (arg0 != 0) { temp_r31 = &lbl_1_bss_36C.unk40[arg0]; @@ -1395,9 +1464,10 @@ void fn_1_C69C(s16 arg0, s16 arg1, u8 arg2) { } } -void fn_1_C70C(s16 arg0, s16 arg1, u8 arg2, u8 arg3) { - unkSubStruct2* temp_r31; - unkSubStruct* var_r30; +void fn_1_C70C(s16 arg0, s16 arg1, u8 arg2, u8 arg3) +{ + unkSubStruct2 *temp_r31; + unkSubStruct *var_r30; if (arg0 != 0) { temp_r31 = &lbl_1_bss_36C.unk40[arg0]; @@ -1410,10 +1480,11 @@ void fn_1_C70C(s16 arg0, s16 arg1, u8 arg2, u8 arg3) { // ... -void fn_1_C784(s16 arg0, u8 arg1) { - unkSubStruct* volatile sp8; +void fn_1_C784(s16 arg0, u8 arg1) +{ + unkSubStruct *volatile sp8; s32 var_r29; - unkSubStruct2* temp_r31; + unkSubStruct2 *temp_r31; s32 var_r30; if (arg0 != 0) { @@ -1427,8 +1498,9 @@ void fn_1_C784(s16 arg0, u8 arg1) { } } -void fn_1_C81C(s16 arg0, u8 arg1) { - unkSubStruct3* var_r31; +void fn_1_C81C(s16 arg0, u8 arg1) +{ + unkSubStruct3 *var_r31; if (arg0 != 0) { var_r31 = &lbl_1_bss_36C.unk3C[arg0]; var_r31->unk4 = arg1; diff --git a/src/REL/m417Dll/main.c b/src/REL/m417Dll/main.c index 02a55063..db0d47a6 100644 --- a/src/REL/m417Dll/main.c +++ b/src/REL/m417Dll/main.c @@ -79,7 +79,7 @@ void ObjectSetup(void) sp8.x = sp8.z = 0.0f; sp8.y = lbl_1_data_18.z; mtxRot(sp38, lbl_1_data_18.x, lbl_1_data_18.y, 0.0f); - PSMTXMultVec(sp38, &sp8, &sp8); + MTXMultVec(sp38, &sp8, &sp8); Hu3DGLightPosAimSetV(lbl_1_bss_8[0], &sp8, &sp14); lbl_1_data_28.x = 200.0f; lbl_1_data_28.y = 3000.0f; @@ -481,18 +481,18 @@ void fn_1_310C(float arg8, float arg9, float argA, float *arg0, float *arg1, flo Mtx sp8; if (arg8 != 0.0f) { - PSMTXRotRad(sp38, 88, 0.017453292f * arg8); + MTXRotRad(sp38, 88, 0.017453292f * arg8); } else { - PSMTXIdentity(sp38); + MTXIdentity(sp38); } if (arg9 != 0.0f) { - PSMTXRotRad(sp8, 89, 0.017453292f * arg9); - PSMTXConcat(sp38, sp8, sp38); + MTXRotRad(sp8, 89, 0.017453292f * arg9); + MTXConcat(sp38, sp8, sp38); } if (argA != 0.0f) { - PSMTXRotRad(sp8, 90, 0.017453292f * argA); - PSMTXConcat(sp38, sp8, sp38); + MTXRotRad(sp8, 90, 0.017453292f * argA); + MTXConcat(sp38, sp8, sp38); } fn_1_30D8(NULL, arg0, arg1, arg2); } diff --git a/src/REL/m417Dll/player.c b/src/REL/m417Dll/player.c index ca8f7206..81f282b0 100644 --- a/src/REL/m417Dll/player.c +++ b/src/REL/m417Dll/player.c @@ -270,22 +270,22 @@ void fn_1_7C8C(omObjData *object) var_r31->unk_70 = 0.02f; if (var_r31->unk_0C) { Vec sp18 = { 0.0f, 1.0f, 0.0f }; - PSMTXRotAxisRad(var_r31->unk_1C4, &sp18, 0.017453292f * var_r31->unk_64); + MTXRotAxisRad(var_r31->unk_1C4, &sp18, 0.017453292f * var_r31->unk_64); } else { Vec spC = { 0.0f, 1.0f, 0.0f }; - PSMTXIdentity(var_r31->unk_1C4); + MTXIdentity(var_r31->unk_1C4); C_QUATRotAxisRad(&var_r31->unk_184, &spC, 0.0f); var_r31->unk_194 = var_r31->unk_184; - PSQUATInverse(&var_r31->unk_194, &var_r31->unk_1A4); + QUATInverse(&var_r31->unk_194, &var_r31->unk_1A4); var_r31->unk_1B4 = var_r31->unk_1A4; var_r31->unk_164 = var_r31->unk_194; var_r31->unk_174 = var_r31->unk_194; var_r31->unk_144 = 1.0f; var_r31->unk_D4.z += 50.0f; } - PSMTXInverse(var_r31->unk_1C4, var_r31->unk_1F4); - PSMTXCopy(var_r31->unk_1F4, var_r31->unk_224); + MTXInverse(var_r31->unk_1C4, var_r31->unk_1F4); + MTXCopy(var_r31->unk_1F4, var_r31->unk_224); var_r31->unk_134 = var_r31->unk_138 = 0.0f; var_r31->unk_12C = 1.0f; var_r31->unk_08 = -1; @@ -634,7 +634,7 @@ void fn_1_9298(omObjData *object) else if (var_r31->unk_B4.x < 0.0f) { var_r31->unk_B4.x += 360.0f; } - PSMTXRotAxisRad(var_r31->unk_1C4, &sp8, 0.017453292f * var_r31->unk_B4.x); + MTXRotAxisRad(var_r31->unk_1C4, &sp8, 0.017453292f * var_r31->unk_B4.x); } object->rot.y = var_r31->unk_68 = var_r31->unk_B4.x - 180.0f; object->trans.x = var_r31->unk_D4.x = var_r31->unk_F8.x = var_r31->unk_C8.x = var_r31->unk_B4.z * sind(var_r31->unk_B4.x); @@ -836,7 +836,7 @@ void fn_1_9C14(omObjData *object) if (fn_1_26F8() == 2) { sp1C.y += -5.8333335f * var_r31->unk_148; } - PSMTXMultVec(var_r31->unk_224, &sp1C, &sp1C); + MTXMultVec(var_r31->unk_224, &sp1C, &sp1C); VECAdd(&sp1C, &var_r31->unk_E0, &sp1C); sp10 = sp1C; sp10.y = 0.0f; @@ -849,13 +849,13 @@ void fn_1_9C14(omObjData *object) sp1C.y = 80.0f; var_r31->unk_EC = sp1C; spC = atan2d(sp1C.x, sp1C.z); - PSMTXMultVec(var_r31->unk_1C4, &sp1C, &sp1C); + MTXMultVec(var_r31->unk_1C4, &sp1C, &sp1C); VECAdd(&sp1C, &var_r31->unk_F8, &var_r31->unk_D4); if (var_r31->unk_13C >= 0.95f) { var_r31->unk_3C = 1; return; } - PSQUATNormalize(&var_r31->unk_194, &sp28); + QUATNormalize(&var_r31->unk_194, &sp28); if (sp28.w < cosd(25)) { var_r31->unk_3C = 1; } @@ -893,7 +893,7 @@ void fn_1_9FF0(omObjData *object) } } var_r31->unk_1B4 = var_r31->unk_1A4; - PSMTXCopy(var_r31->unk_1F4, var_r31->unk_224); + MTXCopy(var_r31->unk_1F4, var_r31->unk_224); var_r31->unk_104 = var_r31->unk_F8; var_f31 = fn_1_75BC(); for (var_r30 = 0; var_r30 < 8; var_r30++) { @@ -1054,12 +1054,12 @@ void fn_1_9FF0(omObjData *object) C_QUATRotAxisRad(&sp3C, &sp8, M_PI); C_QUATSlerp(&var_r31->unk_184, &sp3C, &var_r31->unk_184, 0.027777778f); } - PSQUATMultiply(&var_r31->unk_174, &var_r31->unk_184, &var_r31->unk_194); - PSQUATMultiply(&var_r31->unk_164, &var_r31->unk_194, &var_r31->unk_194); - PSQUATMultiply(&sp2C, &var_r31->unk_194, &var_r31->unk_194); - PSMTXQuat(var_r31->unk_1C4, &var_r31->unk_194); - PSMTXInverse(var_r31->unk_1C4, var_r31->unk_1F4); - PSQUATInverse(&var_r31->unk_194, &var_r31->unk_1A4); + QUATMultiply(&var_r31->unk_174, &var_r31->unk_184, &var_r31->unk_194); + QUATMultiply(&var_r31->unk_164, &var_r31->unk_194, &var_r31->unk_194); + QUATMultiply(&sp2C, &var_r31->unk_194, &var_r31->unk_194); + MTXQuat(var_r31->unk_1C4, &var_r31->unk_194); + MTXInverse(var_r31->unk_1C4, var_r31->unk_1F4); + QUATInverse(&var_r31->unk_194, &var_r31->unk_1A4); } } @@ -1071,7 +1071,7 @@ void fn_1_AD24(omObjData *object) Hu3DModelPosSetV(object->model[0], &var_r30->unk_D4); Hu3DModelRotSet(object->model[0], 0.0f, var_r30->unk_64, 0.0f); Hu3DModelPosSetV(object->model[1], &var_r30->unk_F8); - PSMTXCopy(var_r30->unk_1C4, Hu3DData[object->model[1]].unk_F0); + MTXCopy(var_r30->unk_1C4, Hu3DData[object->model[1]].unk_F0); } void fn_1_ADC4(omObjData *object) diff --git a/src/REL/m417Dll/water.c b/src/REL/m417Dll/water.c index 4313fa29..6217da9f 100644 --- a/src/REL/m417Dll/water.c +++ b/src/REL/m417Dll/water.c @@ -567,13 +567,13 @@ void fn_1_4E64(omObjData *object) var_r31->unk_24 = 1.0f; } } - PSMTXTrans(spC8, var_r31->unk_04.x, var_r31->unk_04.y, var_r31->unk_04.z); - PSMTXRotRad(sp98, 89, 0.017453292f * var_r31->unk_10); - PSMTXConcat(spC8, sp98, sp68); + MTXTrans(spC8, var_r31->unk_04.x, var_r31->unk_04.y, var_r31->unk_04.z); + MTXRotRad(sp98, 89, 0.017453292f * var_r31->unk_10); + MTXConcat(spC8, sp98, sp68); var_f31 = var_r31->unk_18 * var_r31->unk_1C; - PSMTXScale(spC8, var_f31, var_f31, var_f31 * var_r31->unk_28); - PSMTXConcat(sp68, spC8, sp98); - PSMTXInverse(sp98, spC8); + MTXScale(spC8, var_f31, var_f31, var_f31 * var_r31->unk_28); + MTXConcat(sp68, spC8, sp98); + MTXInverse(sp98, spC8); PSMTXReorder(spC8, sp38); PSMTXROMultVecArray(sp38, lbl_1_bss_178.unk_2C, lbl_1_bss_178.unk_34, lbl_1_bss_178.unk_18); sp2C.x = (0.15f * var_r31->unk_18) * (var_r31->unk_24 * sind(var_r31->unk_10)); @@ -761,7 +761,7 @@ void fn_1_604C(ModelData *arg0, Mtx arg1) DCStoreRangeNoSync(&sp10, 4); PPCSync(); GXLoadPosMtxImm(arg1, 0); - PSMTXInvXpose(arg1, sp98); + MTXInvXpose(arg1, sp98); GXLoadNrmMtxImm(sp98, 0); GXSetNumChans(1); GXSetChanCtrl(GX_COLOR0A0, GX_FALSE, GX_SRC_REG, GX_SRC_VTX, 0, GX_DF_CLAMP, GX_AF_NONE); @@ -773,29 +773,29 @@ void fn_1_604C(ModelData *arg0, Mtx arg1) HuSprTexLoad(lbl_1_bss_60, 0, 3, GX_MIRROR, GX_MIRROR, GX_LINEAR); GXSetNumTexGens(5); C_MTXLightPerspective(sp38, 35.0f, 1.2f, 0.5f, -0.5f, 0.5f, 0.5f); - PSMTXInverse(Hu3DCameraMtx, sp98); - PSMTXConcat(sp98, arg1, sp98); - PSMTXConcat(sp38, Hu3DCameraMtx, sp68); - PSMTXConcat(sp68, sp98, sp68); + MTXInverse(Hu3DCameraMtx, sp98); + MTXConcat(sp98, arg1, sp98); + MTXConcat(sp38, Hu3DCameraMtx, sp68); + MTXConcat(sp68, sp98, sp68); sp68[1][3] -= 44.0f; GXLoadTexMtxImm(sp68, 30, GX_MTX3x4); GXSetTexCoordGen2(GX_TEXCOORD0, GX_TG_MTX3x4, GX_TG_POS, 30, GX_FALSE, 125); C_MTXLightPerspective(sp38, 70.0f, 1.0f, 0.5f, -0.5f, 0.5f, 0.5f); - PSMTXInverse(Hu3DCameraMtx, sp98); - PSMTXConcat(sp98, arg1, sp98); - PSMTXConcat(sp38, Hu3DCameraMtx, sp68); - PSMTXConcat(sp68, sp98, sp68); + MTXInverse(Hu3DCameraMtx, sp98); + MTXConcat(sp98, arg1, sp98); + MTXConcat(sp38, Hu3DCameraMtx, sp68); + MTXConcat(sp68, sp98, sp68); GXLoadTexMtxImm(sp68, 36, GX_MTX3x4); GXSetTexCoordGen2(GX_TEXCOORD2, GX_TG_MTX3x4, GX_TG_POS, 36, GX_FALSE, 125); - PSMTXRotRad(sp68, 90, 0.017453292f * lbl_1_bss_178.unk_6B8); + MTXRotRad(sp68, 90, 0.017453292f * lbl_1_bss_178.unk_6B8); GXLoadTexMtxImm(sp68, 39, GX_MTX2x4); GXSetTexCoordGen2(GX_TEXCOORD3, GX_TG_MTX2x4, GX_TG_TEXCOORD0, 39, GX_FALSE, 125); - PSMTXScale(sp98, 1.2f, -1.2f, 1.2f); - PSMTXConcat(sp68, sp98, sp68); + MTXScale(sp98, 1.2f, -1.2f, 1.2f); + MTXConcat(sp68, sp98, sp68); GXLoadTexMtxImm(sp68, 42, GX_MTX2x4); GXSetTexCoordGen2(GX_TEXCOORD4, GX_TG_MTX2x4, GX_TG_TEXCOORD0, 42, GX_FALSE, 125); - PSMTXScale(sp98, 0.49f, -0.49f, 0.49f); - PSMTXConcat(sp98, Hu3DCameraMtx, sp68); + MTXScale(sp98, 0.49f, -0.49f, 0.49f); + MTXConcat(sp98, Hu3DCameraMtx, sp68); sp68[0][3] = 0.5f; sp68[1][3] = 0.5f; GXLoadTexMtxImm(sp68, 33, GX_MTX2x4); @@ -804,18 +804,18 @@ void fn_1_604C(ModelData *arg0, Mtx arg1) GXSetIndTexOrder(GX_INDTEXSTAGE0, GX_TEXCOORD1, GX_TEXMAP1); GXSetIndTexCoordScale(GX_INDTEXSTAGE0, GX_ITS_1, GX_ITS_1); GXSetTevIndWarp(GX_TEVSTAGE0, GX_INDTEXSTAGE0, GX_TRUE, GX_FALSE, GX_ITM_0); - PSMTXScale(sp68, -0.5f, -0.5f, 0.5f); + MTXScale(sp68, -0.5f, -0.5f, 0.5f); GXSetIndTexMtx(GX_ITM_0, (float(*)[3])sp68, -2); GXSetIndTexOrder(GX_INDTEXSTAGE1, GX_TEXCOORD1, GX_TEXMAP1); GXSetIndTexCoordScale(GX_INDTEXSTAGE1, GX_ITS_1, GX_ITS_1); GXSetTevIndWarp(GX_TEVSTAGE1, GX_INDTEXSTAGE1, GX_TRUE, GX_FALSE, GX_ITM_1); - PSMTXScale(sp68, 0.5f, 0.5f, 0.5f); + MTXScale(sp68, 0.5f, 0.5f, 0.5f); GXSetIndTexMtx(GX_ITM_1, (float(*)[3])sp68, 0); GXSetIndTexOrder(GX_INDTEXSTAGE2, GX_TEXCOORD1, GX_TEXMAP1); GXSetIndTexCoordScale(GX_INDTEXSTAGE2, GX_ITS_1, GX_ITS_1); GXSetTevIndWarp(GX_TEVSTAGE2, GX_INDTEXSTAGE2, GX_TRUE, GX_FALSE, GX_ITM_2); GXSetTevIndWarp(GX_TEVSTAGE3, GX_INDTEXSTAGE2, GX_TRUE, GX_FALSE, GX_ITM_2); - PSMTXScale(sp68, -0.65f, -0.65f, 0.65f); + MTXScale(sp68, -0.65f, -0.65f, 0.65f); GXSetIndTexMtx(GX_ITM_2, (float(*)[3])sp68, -3); GXSetNumTevStages(5); GXSetTevColor(GX_TEVREG0, sp14); diff --git a/src/REL/m419Dll/main.c b/src/REL/m419Dll/main.c index e0dfba50..83ae359e 100755 --- a/src/REL/m419Dll/main.c +++ b/src/REL/m419Dll/main.c @@ -17,7 +17,7 @@ #include "ext_math.h" typedef struct { - /* 0x00 */ omObjData* unk00; + /* 0x00 */ omObjData *unk00; /* 0x04 */ char unk04[0xB4]; } StructBssC8; // Size 0xB8 @@ -109,8 +109,8 @@ typedef struct { void fn_1_57C(s16 arg0); void fn_1_AD0(s16 arg0); void fn_1_F58(void); -void fn_1_2254(ModelData* model, ParticleData* particle, Mtx matrix); -void fn_1_2744(ModelData* model, ParticleData* particle, Mtx matrix); +void fn_1_2254(ModelData *model, ParticleData *particle, Mtx matrix); +void fn_1_2744(ModelData *model, ParticleData *particle, Mtx matrix); void fn_1_47E4(void); void fn_1_4B20(void); void fn_1_9AF0(void); @@ -135,52 +135,32 @@ s32 lbl_1_bss_580; StructBss200 lbl_1_bss_200[4]; StructBss1E8 lbl_1_bss_1E8[2]; StructBss190 lbl_1_bss_190[2]; -Process* lbl_1_bss_180[4]; +Process *lbl_1_bss_180[4]; StructBssC8 lbl_1_bss_C8; Vec lbl_1_bss_BC; Vec lbl_1_bss_B0; Vec lbl_1_bss_A4; -void* lbl_1_bss_84[8]; -void* lbl_1_bss_64[8]; +void *lbl_1_bss_84[8]; +void *lbl_1_bss_64[8]; u8 lbl_1_bss_60; Vec lbl_1_bss_0[8]; s32 lbl_1_data_0[] = { 0, 1, 2, 3, 4, 5, 6, 7 }; -s32 lbl_1_data_20[] = { - DATA_MAKE_NUM(DATADIR_MARIOMOT, 0), - DATA_MAKE_NUM(DATADIR_MARIOMOT, 2), - DATA_MAKE_NUM(DATADIR_MARIOMOT, 3), - DATA_MAKE_NUM(DATADIR_MARIOMOT, 21), - DATA_MAKE_NUM(DATADIR_MARIOMOT, 26), - DATA_MAKE_NUM(DATADIR_MARIOMOT, 27), - DATA_MAKE_NUM(DATADIR_M419, 0), - DATA_MAKE_NUM(DATADIR_MARIOMOT, 25), - DATA_MAKE_NUM(DATADIR_MARIOMOT, 75), - DATA_MAKE_NUM(DATADIR_MARIOMOT, 13), - DATA_MAKE_NUM(DATADIR_MARIOMOT, 16) -}; +s32 lbl_1_data_20[] = { DATA_MAKE_NUM(DATADIR_MARIOMOT, 0), DATA_MAKE_NUM(DATADIR_MARIOMOT, 2), DATA_MAKE_NUM(DATADIR_MARIOMOT, 3), + DATA_MAKE_NUM(DATADIR_MARIOMOT, 21), DATA_MAKE_NUM(DATADIR_MARIOMOT, 26), DATA_MAKE_NUM(DATADIR_MARIOMOT, 27), DATA_MAKE_NUM(DATADIR_M419, 0), + DATA_MAKE_NUM(DATADIR_MARIOMOT, 25), DATA_MAKE_NUM(DATADIR_MARIOMOT, 75), DATA_MAKE_NUM(DATADIR_MARIOMOT, 13), + DATA_MAKE_NUM(DATADIR_MARIOMOT, 16) }; -s32 lbl_1_data_4C[] = { - DATA_MAKE_NUM(DATADIR_MARIOMOT, 79), - DATA_MAKE_NUM(DATADIR_MARIOMOT, 27), - DATA_MAKE_NUM(DATADIR_MARIOMOT, 75), - DATA_MAKE_NUM(DATADIR_MARIOMOT, 22) -}; +s32 lbl_1_data_4C[] = { DATA_MAKE_NUM(DATADIR_MARIOMOT, 79), DATA_MAKE_NUM(DATADIR_MARIOMOT, 27), DATA_MAKE_NUM(DATADIR_MARIOMOT, 75), + DATA_MAKE_NUM(DATADIR_MARIOMOT, 22) }; -Vec lbl_1_data_5C[] = { - { 0.0f, 0.0f, 35.0f }, - { 0.0f, 0.0f, 35.0f }, - { 0.0f, 0.0f, 35.0f }, - { 0.0f, 0.0f, 35.0f }, - { 0.0f, 0.0f, 35.0f }, - { 0.0f, 0.0f, 35.0f }, - { 0.0f, 0.0f, 35.0f }, - { 0.0f, 0.0f, 35.0f } -}; +Vec lbl_1_data_5C[] = { { 0.0f, 0.0f, 35.0f }, { 0.0f, 0.0f, 35.0f }, { 0.0f, 0.0f, 35.0f }, { 0.0f, 0.0f, 35.0f }, { 0.0f, 0.0f, 35.0f }, + { 0.0f, 0.0f, 35.0f }, { 0.0f, 0.0f, 35.0f }, { 0.0f, 0.0f, 35.0f } }; -void ObjectSetup(void) { - Process* temp_r3; +void ObjectSetup(void) +{ + Process *temp_r3; temp_r3 = omInitObjMan(50, 0x2000); omGameSysInit(temp_r3); @@ -218,7 +198,8 @@ void ObjectSetup(void) { WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 60); } -void fn_1_4A0(void) { +void fn_1_4A0(void) +{ s16 i; Hu3DLayerHookSet(1, fn_1_57C); @@ -229,10 +210,11 @@ void fn_1_4A0(void) { } } -void fn_1_57C(s16 arg0) { +void fn_1_57C(s16 arg0) +{ Vec sp14; Vec sp8; - ModelData* temp_r30; + ModelData *temp_r30; s16 var_r31; temp_r30 = &Hu3DData[lbl_1_bss_5BE]; @@ -266,14 +248,15 @@ void fn_1_57C(s16 arg0) { GXCopyTex(lbl_1_bss_64[lbl_1_bss_60], 0); } -void fn_1_848(ModelData* arg0, Mtx arg1) { +void fn_1_848(ModelData *arg0, Mtx arg1) +{ Mtx44 sp10; GXColor spC; s16 i; C_MTXOrtho(sp10, 0.0f, 480.0f, 0.0f, 640.0f, 0.0f, 8000.0f); GXSetProjection(sp10, GX_ORTHOGRAPHIC); - PSMTXIdentity(arg1); + MTXIdentity(arg1); GXLoadPosMtxImm(arg1, GX_PNMTX0); GXClearVtxDesc(); GXSetVtxDesc(GX_VA_POS, GX_DIRECT); @@ -302,7 +285,8 @@ void fn_1_848(ModelData* arg0, Mtx arg1) { GXSetZTexture(GX_ZT_DISABLE, GX_TF_Z8, 0); } -void fn_1_AD0(s16 arg0) { +void fn_1_AD0(s16 arg0) +{ GXTexObj sp58; GXTexObj sp38; Vec sp2C; @@ -341,16 +325,17 @@ void fn_1_AD0(s16 arg0) { GXEnd(); } -void fn_1_F58(void) { - void* var_r29; - StructBss1E8* temp_r26; - StructBss200* temp_r31; - Process* var_r25; +void fn_1_F58(void) +{ + void *var_r29; + StructBss1E8 *temp_r26; + StructBss200 *temp_r31; + Process *var_r25; float temp_f31; s16 var_r30; s32 var_r22; s32 var_r23; - AnimData* var_r21; + AnimData *var_r21; s32 i; s32 j; @@ -474,7 +459,8 @@ void fn_1_F58(void) { var_r25 = HuPrcChildCreate(fn_1_9AF0, 0x2000, 0x3000, 0, HuPrcCurrentGet()); var_r25->user_data = temp_r31; lbl_1_bss_180[i] = var_r25; - } else { + } + else { temp_r31->unk02 = CharModelCreate(lbl_1_data_0[GWPlayerCfg[i].character], 2); Hu3DModelLayerSet(temp_r31->unk00, 1); CharModelLayerSetAll(2); @@ -559,25 +545,30 @@ void fn_1_F58(void) { HuPrcChildCreate(fn_1_104A0, 0x1000, 0x1000, 0, HuPrcCurrentGet()); } -float fn_1_1F84(float arg0, float arg1) { +float fn_1_1F84(float arg0, float arg1) +{ float var_f31; float var_f30; if (arg0 > 600.0f - arg1) { var_f31 = 600.0f + 200.0f * ((800.0f - (arg0 + arg1)) / 200.0f); - } else if (arg0 < -(600.0f - arg1)) { + } + else if (arg0 < -(600.0f - arg1)) { var_f31 = 600.0f + 200.0f * ((800.0f - ABS_INV(arg0 - arg1)) / 200.0f); - } else { + } + else { var_f31 = 800.0f; } return var_f31; } -float fn_1_20AC(float arg0, float arg1) { +float fn_1_20AC(float arg0, float arg1) +{ return fn_1_1F84(arg0, arg1); } -float fn_1_21D4(float arg0) { +float fn_1_21D4(float arg0) +{ while (arg0 >= 360.0f || arg0 < 0.0f) { if (arg0 >= 360.0f) { arg0 -= 360.0f; @@ -589,9 +580,10 @@ float fn_1_21D4(float arg0) { return arg0; } -void fn_1_2254(ModelData* model, ParticleData* particle, Mtx matrix) { - HsfanimStruct01* var_r31; - StructBss200* temp_r28; +void fn_1_2254(ModelData *model, ParticleData *particle, Mtx matrix) +{ + HsfanimStruct01 *var_r31; + StructBss200 *temp_r28; float var_f31; float temp_f29; float var_f30; @@ -639,7 +631,7 @@ void fn_1_2254(ModelData* model, ParticleData* particle, Mtx matrix) { var_r31 = particle->unk_48; for (k = 0; k < particle->unk_30; k++, var_r31++) { if (var_r31->unk14.x != 0.0f) { - PSVECAdd(&var_r31->unk08, &var_r31->unk34, &var_r31->unk34); + VECAdd(&var_r31->unk08, &var_r31->unk34, &var_r31->unk34); var_r31->unk08.x *= 0.95f; var_r31->unk08.z *= 0.95f; if (var_r31->unk08.y > 0.1f) { @@ -669,9 +661,10 @@ void fn_1_2254(ModelData* model, ParticleData* particle, Mtx matrix) { } } -void fn_1_2744(ModelData* model, ParticleData* particle, Mtx matrix) { - HsfanimStruct01* var_r31; - StructBss200* temp_r28; +void fn_1_2744(ModelData *model, ParticleData *particle, Mtx matrix) +{ + HsfanimStruct01 *var_r31; + StructBss200 *temp_r28; float temp_f31; float temp_f30; s32 var_r27; @@ -729,7 +722,7 @@ void fn_1_2744(ModelData* model, ParticleData* particle, Mtx matrix) { var_r31->unk20 = -1.0f; } if (var_r31->unk14.x != 0.0f && var_r31->unk24 != 0.0f) { - PSVECAdd(&var_r31->unk08, &var_r31->unk34, &var_r31->unk34); + VECAdd(&var_r31->unk08, &var_r31->unk34, &var_r31->unk34); if (var_r31->unk08.y > 1.0f) { var_r31->unk08.y -= 0.3f; } @@ -754,8 +747,9 @@ void fn_1_2744(ModelData* model, ParticleData* particle, Mtx matrix) { } } -s32 fn_1_2BDC(StructBss190* arg0) { - StructBss200* temp_r31; +s32 fn_1_2BDC(StructBss190 *arg0) +{ + StructBss200 *temp_r31; Vec sp24; Vec sp18; Vec spC; @@ -777,7 +771,8 @@ s32 fn_1_2BDC(StructBss190* arg0) { return var_r28; } -void fn_1_2DFC(StructBss190* arg0) { +void fn_1_2DFC(StructBss190 *arg0) +{ float temp_f31; float var_f26; float var_f25; @@ -817,13 +812,14 @@ void fn_1_2DFC(StructBss190* arg0) { } } -void fn_1_32F8(void) { - StructBss200* temp_r31; +void fn_1_32F8(void) +{ + StructBss200 *temp_r31; float var_f31; s32 var_r29; s32 i; - var_r29 = (s32) HuPrcCurrentGet()->user_data; + var_r29 = (s32)HuPrcCurrentGet()->user_data; temp_r31 = &lbl_1_bss_200[var_r29]; for (i = 0, var_f31 = 1.0f; i < 30; i++, var_f31 -= 0.033333335f) { Hu3DModelAmbSet(temp_r31->unk00, 1.0f, var_f31, var_f31); @@ -844,9 +840,10 @@ void fn_1_32F8(void) { } } -void fn_1_344C(void) { - StructBss190* temp_r31; - StructBss200* temp_r30; +void fn_1_344C(void) +{ + StructBss190 *temp_r31; + StructBss200 *temp_r30; Vec spAC; Vec spA0; Vec sp94; @@ -887,7 +884,8 @@ void fn_1_344C(void) { Hu3DMotionSet(temp_r31->unk00, temp_r31->unk04); Hu3DModelAttrSet(temp_r31->unk00, HU3D_MOTATTR_LOOP); Hu3DModelTPLvlSet(temp_r31->unk00, 1.0f); - } else { + } + else { Hu3DModelAttrReset(temp_r31->unk02, 1); } Hu3DModelAttrReset(temp_r31->unk00, 1); @@ -910,14 +908,16 @@ void fn_1_344C(void) { temp_r30 = &lbl_1_bss_200[var_r25]; if (GWPlayerCfg[temp_r30->unk28].group == 0) { sp5C = 150.0f; - } else { + } + else { sp5C = 400.0f; } if (temp_r31->unk18 < sp5C) { if (temp_r31->unk18 < sp5C && temp_r31->unk18 > sp5C - 50.0f) { var_f23 = 15.0f; sp58 = 0.9f; - } else { + } + else { sp6C = atan2d(temp_r31->unk14 - temp_r30->unk54, temp_r31->unk1C - temp_r30->unk5C); temp_r31->unk0C = fn_1_21D4(180.0f + temp_r31->unk0C); temp_r31->unk0C = sp6C - (temp_r31->unk0C - sp6C); @@ -985,12 +985,14 @@ void fn_1_344C(void) { temp_r30->unk94 = 3.0f; lbl_1_bss_5BC = 1; HuAudFXPlay(0x5E6); - } else { + } + else { temp_r30->unk90 = 6.75f; temp_r30->unk98 = 0.99f; HuAudFXPlay(0x5E2); } - } else if (temp_r30->unk24 == 0) { + } + else if (temp_r30->unk24 == 0) { temp_r30->unk34 = 4; HuAudPlayerVoicePlay(temp_r30->unk28, 0x128); HuAudFXPlay(0x5E9); @@ -1004,7 +1006,8 @@ void fn_1_344C(void) { } if (var_r24 & 1) { Hu3DModelAttrReset(var_r22, 1); - } else { + } + else { Hu3DModelAttrSet(var_r22, 1); } var_r24++; @@ -1024,7 +1027,8 @@ fn_1_344C_label: } Hu3DModelAttrSet(temp_r31->unk00, 1); Hu3DModelAttrSet(temp_r31->unk02, 1); - } else { + } + else { if (temp_r31->unk08 == 0) { temp_r30 = &lbl_1_bss_200[var_r25]; sp6C = atan2d(temp_r31->unk14 - temp_r30->unk54, temp_r31->unk1C - temp_r30->unk5C); @@ -1054,11 +1058,12 @@ fn_1_344C_label: } } -void fn_1_47E4(void) { - StructBss1E8* var_r31; - StructBss190* var_r30; - ModelData* temp_r29; - Process* temp_r3; +void fn_1_47E4(void) +{ + StructBss1E8 *var_r31; + StructBss190 *var_r30; + ModelData *temp_r29; + Process *temp_r3; s32 var_r27; var_r31 = &lbl_1_bss_1E8[0]; @@ -1077,7 +1082,8 @@ void fn_1_47E4(void) { lbl_1_bss_580++; var_r30 = &lbl_1_bss_190[1]; Hu3DMotionShiftSet(var_r31->unk00, var_r31->unk02[4], 0.0f, 5.0f, HU3D_MOTATTR_NONE); - } else { + } + else { Hu3DMotionShiftSet(var_r31->unk00, var_r31->unk02[3], 0.0f, 5.0f, HU3D_MOTATTR_NONE); } HuPrcVSleep(); @@ -1119,11 +1125,12 @@ void fn_1_47E4(void) { } } -void fn_1_4B20(void) { - StructBss1E8* var_r31; - StructBss190* var_r30; - Process* temp_r3; - ModelData* temp_r29; +void fn_1_4B20(void) +{ + StructBss1E8 *var_r31; + StructBss190 *var_r30; + Process *temp_r3; + ModelData *temp_r29; s32 var_r27; var_r31 = &lbl_1_bss_1E8[1]; @@ -1142,7 +1149,8 @@ void fn_1_4B20(void) { lbl_1_bss_580++; var_r30 = &lbl_1_bss_190[1]; Hu3DMotionShiftSet(var_r31->unk00, var_r31->unk02[4], 0.0f, 5.0f, HU3D_MOTATTR_NONE); - } else { + } + else { Hu3DMotionShiftSet(var_r31->unk00, var_r31->unk02[3], 0.0f, 5.0f, HU3D_MOTATTR_NONE); } HuPrcVSleep(); @@ -1183,63 +1191,72 @@ void fn_1_4B20(void) { } } -s8 fn_1_4E54(s32 arg0, s32 arg1) { - StructBss200* temp_r31; +s8 fn_1_4E54(s32 arg0, s32 arg1) +{ + StructBss200 *temp_r31; s8 var_r30; temp_r31 = &lbl_1_bss_200[arg0]; if (GWPlayerCfg[arg0].iscom == 0) { (arg1 != 0) ? (var_r30 = HuPadStkY[temp_r31->unk30]) : (var_r30 = HuPadStkX[temp_r31->unk30]); - } else { + } + else { (arg1 != 0) ? (var_r30 = temp_r31->unkA1) : (var_r30 = temp_r31->unkA0); } return var_r30; } -u8 fn_1_4F0C(s32 arg0, s32 arg1) { - StructBss200* temp_r31; +u8 fn_1_4F0C(s32 arg0, s32 arg1) +{ + StructBss200 *temp_r31; s8 var_r30; temp_r31 = &lbl_1_bss_200[arg0]; if (GWPlayerCfg[arg0].iscom == 0) { (arg1 != 0) ? (var_r30 = HuPadTrigR[temp_r31->unk30]) : (var_r30 = HuPadTrigL[temp_r31->unk30]); - } else { + } + else { (arg1 != 0) ? (var_r30 = temp_r31->unkA2) : (var_r30 = temp_r31->unkA3); } return var_r30; } -u16 fn_1_4FCC(s32 arg0) { - StructBss200* temp_r31; +u16 fn_1_4FCC(s32 arg0) +{ + StructBss200 *temp_r31; u16 var_r30; temp_r31 = &lbl_1_bss_200[arg0]; if (GWPlayerCfg[arg0].iscom == 0) { var_r30 = HuPadBtnDown[temp_r31->unk30]; - } else { + } + else { var_r30 = temp_r31->unkA6; } return var_r30; } -u16 fn_1_5038(s32 arg0) { - StructBss200* temp_r31; +u16 fn_1_5038(s32 arg0) +{ + StructBss200 *temp_r31; u16 var_r30; temp_r31 = &lbl_1_bss_200[arg0]; if (GWPlayerCfg[arg0].iscom == 0) { var_r30 = HuPadBtn[temp_r31->unk30]; - } else { + } + else { var_r30 = temp_r31->unkA4; } return var_r30; } -s32 fn_1_50A4(StructBss200* arg0, float arg1, s32 arg2) { +s32 fn_1_50A4(StructBss200 *arg0, float arg1, s32 arg2) +{ Vec sp2C; Vec sp20; Vec sp14; - StructBss200* temp_r30; + StructBss200 *temp_r30; s32 var_r28; float var_f27; float var_f28; @@ -1261,7 +1278,8 @@ s32 fn_1_50A4(StructBss200* arg0, float arg1, s32 arg2) { return var_r28; } -s32 fn_1_52E8(StructBss200* arg0) { +s32 fn_1_52E8(StructBss200 *arg0) +{ float var_f25; float var_f24; s32 var_r28; @@ -1287,7 +1305,8 @@ s32 fn_1_52E8(StructBss200* arg0) { return var_r28; } -float fn_1_5858(float arg0, float arg1, float arg2) { +float fn_1_5858(float arg0, float arg1, float arg2) +{ float var_f31; float var_f30; @@ -1305,7 +1324,8 @@ float fn_1_5858(float arg0, float arg1, float arg2) { return var_f30; } -float fn_1_595C(float arg0, float arg1, StructBss200* arg2) { +float fn_1_595C(float arg0, float arg1, StructBss200 *arg2) +{ Vec sp2C; Vec sp20; Vec sp14; @@ -1316,28 +1336,33 @@ float fn_1_595C(float arg0, float arg1, StructBss200* arg2) { return VECMagXZ(&sp14); } -float fn_1_5AD8(float arg0, float arg1) { +float fn_1_5AD8(float arg0, float arg1) +{ float var_f31; if (arg0 > arg1) { var_f31 = fn_1_21D4(arg0 - arg1); if (var_f31 < 180.0f) { var_f31 = fn_1_21D4(arg1 + var_f31 + 180.0f); - } else { + } + else { var_f31 = fn_1_21D4(arg1 - var_f31); } - } else { + } + else { var_f31 = fn_1_21D4(arg1 - arg0); if (var_f31 < 180.0f) { var_f31 = fn_1_21D4(arg0 + var_f31 + 180.0f); - } else { + } + else { var_f31 = fn_1_21D4(arg0 - var_f31); } } return var_f31; } -s32 fn_1_5F34(StructBss200* arg0, float arg1) { +s32 fn_1_5F34(StructBss200 *arg0, float arg1) +{ s32 var_r31; float var_f25; float var_f24; @@ -1345,17 +1370,15 @@ s32 fn_1_5F34(StructBss200* arg0, float arg1) { var_f25 = fn_1_1F84(arg0->unk5C, arg0->unk8C); var_f24 = fn_1_1F84(arg0->unk54, arg0->unk8C); var_r31 = 0; - if (arg0->unk54 > var_f25 - arg0->unk8C - arg1 - || arg0->unk54 < -(var_f25 - arg0->unk8C - arg1) - || arg0->unk5C > var_f24 - arg0->unk8C - arg1 - || arg0->unk5C < -(var_f24 - arg0->unk8C - arg1)) - { + if (arg0->unk54 > var_f25 - arg0->unk8C - arg1 || arg0->unk54 < -(var_f25 - arg0->unk8C - arg1) || arg0->unk5C > var_f24 - arg0->unk8C - arg1 + || arg0->unk5C < -(var_f24 - arg0->unk8C - arg1)) { var_r31 = 1; } return var_r31; } -void fn_1_628C(StructBss200* arg0) { +void fn_1_628C(StructBss200 *arg0) +{ Vec spC; HuSetVecF(&spC, fn_1_4E54(arg0->unk28, 0) / 4.0f, 0.0, -fn_1_4E54(arg0->unk28, 1) / 4.0f); @@ -1373,10 +1396,11 @@ void fn_1_628C(StructBss200* arg0) { } } -void fn_1_65C0(Vec* arg0, StructBss200** arg1) { +void fn_1_65C0(Vec *arg0, StructBss200 **arg1) +{ float temp_f31; - StructBss200* temp_r31; - StructBss200* temp_r30; + StructBss200 *temp_r31; + StructBss200 *temp_r30; s32 var_r28; s32 i; @@ -1387,7 +1411,8 @@ void fn_1_65C0(Vec* arg0, StructBss200** arg1) { temp_f31 = ABS_INV(temp_r31->unk54 - temp_r30->unk54) / 2.0f; if (temp_r31->unk54 > temp_r30->unk54) { arg0[i].x = temp_r31->unk54 - temp_f31; - } else { + } + else { arg0[i].x = temp_r30->unk54 - temp_f31; } temp_r31 = arg1[i]; @@ -1396,14 +1421,16 @@ void fn_1_65C0(Vec* arg0, StructBss200** arg1) { temp_f31 = ABS_INV(temp_r31->unk5C - temp_r30->unk5C) / 2.0f; if (temp_r31->unk5C > temp_r30->unk5C) { arg0[i].z = temp_r31->unk5C - temp_f31; - } else { + } + else { arg0[i].z = temp_r30->unk5C - temp_f31; } } } -s32 fn_1_67A0(float arg0, float arg1, StructBss200* arg2, StructBss200** arg3) { - StructBss200* var_r31; +s32 fn_1_67A0(float arg0, float arg1, StructBss200 *arg2, StructBss200 **arg3) +{ + StructBss200 *var_r31; StructBss200 sp5C; float var_f29; s32 var_r27; @@ -1435,9 +1462,10 @@ s32 fn_1_67A0(float arg0, float arg1, StructBss200* arg2, StructBss200** arg3) { return var_r27; } -s32 fn_1_6D04(void) { - StructBss200* sp8[3]; - StructBss200* var_r29; +s32 fn_1_6D04(void) +{ + StructBss200 *sp8[3]; + StructBss200 *var_r29; s32 var_r30; s32 var_r28; s32 i; @@ -1445,7 +1473,8 @@ s32 fn_1_6D04(void) { for (i = 0, var_r30 = 0; i < 4; i++) { if (i == lbl_1_bss_5AC) { var_r29 = &lbl_1_bss_200[i]; - } else { + } + else { sp8[var_r30++] = &lbl_1_bss_200[i]; } } @@ -1489,13 +1518,14 @@ s32 fn_1_6D04(void) { return var_r28; } -float fn_1_6E9C(StructBss200* arg0) { +float fn_1_6E9C(StructBss200 *arg0) +{ s32 sp88[3]; s32 sp50[2]; float sp44; float var_f20; float sp48[2]; - StructBss200* sp7C[3]; + StructBss200 *sp7C[3]; s32 var_r29; s32 var_r28; s32 i; @@ -1510,7 +1540,8 @@ float fn_1_6E9C(StructBss200* arg0) { if (sp44 < arg0->unk8C + sp7C[i]->unk8C + 100.0f) { sp88[i] = 1; var_r28++; - } else { + } + else { sp88[i] = -1; } } @@ -1536,17 +1567,19 @@ float fn_1_6E9C(StructBss200* arg0) { var_f20 = fn_1_5AD8(sp48[0], sp48[1]); break; } - if (var_f20 != -1.0f); + if (var_f20 != -1.0f) + ; if (var_f20 != -1.0f) { var_f20 = fn_1_21D4(var_f20); } return var_f20; } -void fn_1_78B4(StructBss200* arg0) { - StructBss200* temp_r18; - StructBss200* var_r17; - StructBss200* sp224[3]; +void fn_1_78B4(StructBss200 *arg0) +{ + StructBss200 *temp_r18; + StructBss200 *var_r17; + StructBss200 *sp224[3]; Vec sp254[3]; Vec sp230[3]; s32 sp218[3]; @@ -1638,7 +1671,8 @@ void fn_1_78B4(StructBss200* arg0) { if (var_f26 > 700.0f) { sp218[var_r30] = 1; sp120++; - } else { + } + else { sp218[var_r30] = 0; } if (var_f26 > var_f30) { @@ -1659,7 +1693,8 @@ void fn_1_78B4(StructBss200* arg0) { } arg0->unkBC = var_r21; arg0->unkCC = var_f27; - } else { + } + else { var_r21 = arg0->unkBC; var_f27 = arg0->unkCC; } @@ -1676,7 +1711,8 @@ void fn_1_78B4(StructBss200* arg0) { var_f28 = 800.0 * cosd(arg0->unkC4); } } - } else { + } + else { arg0->unkAC = 0; arg0->unkB4 = 0; arg0->unkBC = -1; @@ -1703,11 +1739,13 @@ void fn_1_78B4(StructBss200* arg0) { var_f28 = 800.0 * cosd(arg0->unkC4); if (fn_1_5F34(arg0, 10.0f)) { arg0->unkB0 &= ~0x20; - } else { + } + else { arg0->unkB0 |= 0x20; } } - } else { + } + else { if (arg0->unk54 >= 0.0f && arg0->unk5C < 0.0f) { sp138[0] = 0; sp138[1] = 1; @@ -1790,17 +1828,21 @@ void fn_1_78B4(StructBss200* arg0) { if (frandmod(2) != 0) { arg0->unkB0 |= 4; arg0->unkC0 = 30; - } else { + } + else { arg0->unkB0 |= 8; arg0->unkC0 = 30; } - } else if (sp130[0] != 0) { + } + else if (sp130[0] != 0) { arg0->unkB0 |= 4; arg0->unkC0 = 30; - } else if (sp130[1] != 0) { + } + else if (sp130[1] != 0) { arg0->unkB0 |= 8; arg0->unkC0 = 30; - } else { + } + else { arg0->unkB0 |= 0x10; } } @@ -1808,12 +1850,14 @@ void fn_1_78B4(StructBss200* arg0) { var_f27 = fn_1_21D4(atan2d(arg0->unk54, arg0->unk5C)); if (arg0->unkB0 & 4) { var_f27 += 10.0f; - } else { + } + else { var_f27 -= 10.0f; } var_f29 = 800.0 * sind(var_f27); var_f28 = 800.0 * cosd(var_f27); - } else { + } + else { var_f29 = arg0->unk54; var_f28 = arg0->unk5C; } @@ -1830,7 +1874,8 @@ void fn_1_78B4(StructBss200* arg0) { } if (var_f26 < 30.0f) { sp128 = 10.0f; - } else { + } + else { sp128 = 50.0f; } var_f27 = fn_1_21D4(atan2d(var_f29 - arg0->unk54, var_f28 - arg0->unk5C)); @@ -1839,9 +1884,10 @@ void fn_1_78B4(StructBss200* arg0) { } } -void fn_1_9AF0(void) { - StructBss200* temp_r31; - StructBss200* temp_r29; +void fn_1_9AF0(void) +{ + StructBss200 *temp_r31; + StructBss200 *temp_r29; Vec sp6C; float sp44; float sp40; @@ -1895,7 +1941,8 @@ void fn_1_9AF0(void) { HuAudPlayerVoicePlay(temp_r31->unk28, 0x119); } temp_r31->unk44--; - } else { + } + else { CharModelMotionShiftSet(lbl_1_data_0[GWPlayerCfg[temp_r31->unk28].character], temp_r31->unk06[7], 0.0f, 10.0f, HU3D_MOTATTR_NONE); temp_r31->unk44 = 20; temp_r31->unk34 = 6; @@ -1905,7 +1952,8 @@ void fn_1_9AF0(void) { if (temp_r31->unk44 != 0) { Hu3DModelAttrReset(temp_r31->unk00, HU3D_MOTATTR_LOOP); temp_r31->unk44--; - } else if (Hu3DMotionEndCheck(temp_r31->unk00) == 1) { + } + else if (Hu3DMotionEndCheck(temp_r31->unk00) == 1) { CharModelMotionShiftSet(lbl_1_data_0[GWPlayerCfg[temp_r31->unk28].character], temp_r31->unk06[4], 0.0f, 8.0f, HU3D_MOTATTR_LOOP); temp_r31->unk44 = 10; temp_r31->unk34 = 7; @@ -1914,7 +1962,8 @@ void fn_1_9AF0(void) { case 7: if (temp_r31->unk44 != 0) { temp_r31->unk44--; - } else { + } + else { CharModelMotionSpeedSet(lbl_1_data_0[GWPlayerCfg[temp_r31->unk28].character], 2.0f); temp_r31->unk34 = 0; } @@ -1935,15 +1984,19 @@ void fn_1_9AF0(void) { if (temp_r31->unk90 >= 8.0f) { if (temp_r31->unk34 != 3) { temp_r31->unk34 = 3; - CharModelMotionShiftSet(lbl_1_data_0[GWPlayerCfg[temp_r31->unk28].character], temp_r31->unk06[2], 0.0f, 8.0f, HU3D_MOTATTR_LOOP); + CharModelMotionShiftSet( + lbl_1_data_0[GWPlayerCfg[temp_r31->unk28].character], temp_r31->unk06[2], 0.0f, 8.0f, HU3D_MOTATTR_LOOP); } - } else if (temp_r31->unk34 != 2) { + } + else if (temp_r31->unk34 != 2) { temp_r31->unk34 = 2; - CharModelMotionShiftSet(lbl_1_data_0[GWPlayerCfg[temp_r31->unk28].character], temp_r31->unk06[1], 0.0f, 8.0f, HU3D_MOTATTR_LOOP); + CharModelMotionShiftSet( + lbl_1_data_0[GWPlayerCfg[temp_r31->unk28].character], temp_r31->unk06[1], 0.0f, 8.0f, HU3D_MOTATTR_LOOP); } temp_r31->unk54 += sp6C.x * temp_r31->unk94; temp_r31->unk5C += sp6C.z * temp_r31->unk94; - } else if (temp_r31->unk34 != 0) { + } + else if (temp_r31->unk34 != 0) { temp_r31->unk34 = 0; CharModelMotionSet(lbl_1_data_0[GWPlayerCfg[temp_r31->unk28].character], temp_r31->unk06[4]); CharModelMotionSpeedSet(lbl_1_data_0[GWPlayerCfg[temp_r31->unk28].character], 2.0f); @@ -1979,7 +2032,8 @@ void fn_1_9AF0(void) { HuPrcVSleep(); } Hu3DModelRotSet(temp_r31->unk00, temp_r31->unk68, 0.0f, temp_r31->unk70); - } else { + } + else { omVibrate(temp_r31->unk28, 12, 4, 2); HuAudPlayerVoicePlay(temp_r31->unk28, 0x123); HuAudFXPlay(0x5EC); @@ -1999,7 +2053,8 @@ void fn_1_9AF0(void) { var_f28 = fn_1_21D4(atan2d(temp_r31->unk54 - temp_r29->unk54, temp_r31->unk5C - temp_r29->unk5C)); if (ABS_INV(var_f28 - temp_r31->unk6C) > 90.0f && ABS_INV(var_f28 - temp_r31->unk6C) < 270.0f) { CharModelMotionShiftSet(lbl_1_data_0[GWPlayerCfg[temp_r31->unk28].character], temp_r31->unk18, 0.0f, 5.0f, HU3D_MOTATTR_NONE); - } else { + } + else { CharModelMotionShiftSet(lbl_1_data_0[GWPlayerCfg[temp_r31->unk28].character], temp_r31->unk1A, 0.0f, 5.0f, HU3D_MOTATTR_NONE); } sp44 = temp_r31->unk58; @@ -2026,7 +2081,8 @@ void fn_1_9AF0(void) { } } -float fn_1_ADFC(s32 arg0, float arg1, float arg2) { +float fn_1_ADFC(s32 arg0, float arg1, float arg2) +{ float temp_f31; float var_f29; @@ -2037,16 +2093,19 @@ float fn_1_ADFC(s32 arg0, float arg1, float arg2) { if (temp_f31 > 0.0f) { var_f29 = -var_f29; } - } else { + } + else { var_f29 = temp_f31 / arg0; } - } else { + } + else { var_f29 = temp_f31 / arg0; } return var_f29; } -void fn_1_B054(StructBss200* arg0) { +void fn_1_B054(StructBss200 *arg0) +{ StructBss200 sp23C; float sp230[3]; float sp198[2]; @@ -2067,9 +2126,9 @@ void fn_1_B054(StructBss200* arg0) { float var_f31; s32 var_r21; s32 var_r20; - StructBss200* temp_r30; - StructBss200* var_r29; - StructBss200* temp_r28; + StructBss200 *temp_r30; + StructBss200 *var_r29; + StructBss200 *temp_r28; s32 var_r19; s32 var_r18; s32 var_r17; @@ -2079,7 +2138,7 @@ void fn_1_B054(StructBss200* arg0) { arg0->unkA0 = arg0->unkA1 = 0; arg0->unkA3 = arg0->unkA2 = 0; arg0->unkA4 = arg0->unkA6 = 0; - switch(GWPlayerCfg[arg0->unk28].diff) { + switch (GWPlayerCfg[arg0->unk28].diff) { case 0: var_r19 = 60; break; @@ -2106,14 +2165,17 @@ void fn_1_B054(StructBss200* arg0) { sp230[2] = fn_1_21D4(sp230[0] - sp230[1]); if (sp230[2] < 180.0f) { sp230[2] = fn_1_21D4(sp230[1] + sp230[2] + 180.0f); - } else { + } + else { sp230[2] = fn_1_21D4(sp230[1] - sp230[2]); } - } else { + } + else { sp230[2] = fn_1_21D4(sp230[1] - sp230[0]); if (sp230[2] < 180.0f) { sp230[2] = fn_1_21D4(sp230[0] + sp230[2] + 180.0f); - } else { + } + else { sp230[2] = fn_1_21D4(sp230[0] - sp230[2]); } } @@ -2137,17 +2199,21 @@ void fn_1_B054(StructBss200* arg0) { if (arg0->unkAC != 2) { if (fn_1_6D04() != 0) { arg0->unkAC = 0; - } else { + } + else { if (ABS_INV(temp_r30->unk54) > 600.0f && ABS_INV(temp_r30->unk5C) > 600.0f) { if (var_r21 <= 0) { arg0->unkAC = 0; - } else { + } + else { arg0->unkAC = 2; } - } else { + } + else { if (var_r21 <= 0) { arg0->unkAC = 0; - } else { + } + else { arg0->unkAC = 1; } } @@ -2258,7 +2324,8 @@ void fn_1_B054(StructBss200* arg0) { } if (sp198[0] < sp198[1]) { sp180 += sp198[0]; - } else { + } + else { sp180 += sp198[1]; } sp180 = fn_1_21D4(sp180); @@ -2267,7 +2334,8 @@ void fn_1_B054(StructBss200* arg0) { var_f30 = arg0->unk54 + sp194 * sind(sp180); var_f29 = arg0->unk5C + sp194 * cosd(sp180); var_f31 = fn_1_21D4(atan2d(var_f30 - arg0->unk54, var_f29 - arg0->unk5C)); - } else { + } + else { arg0->unkAC = 1; } break; @@ -2297,7 +2365,8 @@ void fn_1_B054(StructBss200* arg0) { if (ABS_INV(fn_1_21D4(arg0->unk6C - var_f31)) > 180.0f) { arg0->unkA0 = -30; var_r29->unk9C = arg0->unk98; - } else { + } + else { arg0->unkA0 = 30; var_r29->unk9C = -arg0->unk98; } @@ -2309,7 +2378,8 @@ void fn_1_B054(StructBss200* arg0) { if (VECMagXZ(&sp20C) > 10.0f) { if (ABS_INV(arg0->unk6C - var_f31) < 90.0f || ABS_INV(arg0->unk6C - var_f31) > 270.0f) { arg0->unkA4 |= 0x100; - } else { + } + else { arg0->unkA4 |= 0x200; var_r29->unk9C = -var_r29->unk9C; } @@ -2350,15 +2420,18 @@ void fn_1_B054(StructBss200* arg0) { if (arg0->unkB8 == 0) { arg0->unkB8 = 60; } - } else if (var_r18 == -1) { + } + else if (var_r18 == -1) { arg0->unkAC = 2; if (ABS_INV(arg0->unk6C - var_f31) < 90.0f || ABS_INV(arg0->unk6C - var_f31) > 270.0f) { arg0->unkA4 |= 0x100; - } else { + } + else { arg0->unkA4 |= 0x200; var_r29->unk9C = -var_r29->unk9C; } - } else { + } + else { arg0->unkA0 = 30; } } @@ -2367,8 +2440,9 @@ void fn_1_B054(StructBss200* arg0) { } } -void fn_1_DECC(void) { - StructBss200* temp_r31; +void fn_1_DECC(void) +{ + StructBss200 *temp_r31; s32 i; temp_r31 = HuPrcCurrentGet()->user_data; @@ -2383,7 +2457,8 @@ void fn_1_DECC(void) { } } -s32 fn_1_DF3C(StructBss200* arg0) { +s32 fn_1_DF3C(StructBss200 *arg0) +{ s32 var_r31; s32 var_r30; @@ -2398,27 +2473,27 @@ s32 fn_1_DF3C(StructBss200* arg0) { return var_r31; } -void fn_1_DF98(void) { +void fn_1_DF98(void) +{ float var_f27; float var_f25; float var_f26; - StructBss200* temp_r31; - StructBss200* temp_r30; + StructBss200 *temp_r31; + StructBss200 *temp_r30; s32 var_r25; s32 var_r29; s32 var_r28; s32 sp90; - Process* sp8C; + Process *sp8C; s32 sp88; s32 sp84; s32 sp80; s32 sp7C; - Process* sp78; + Process *sp78; temp_r31 = HuPrcCurrentGet()->user_data; temp_r31->unk34 = 0; - temp_r31->unkA8 = temp_r31->unkAC = temp_r31->unkB0 - = temp_r31->unkB4 = temp_r31->unkB8 = temp_r31->unk50 = 0; + temp_r31->unkA8 = temp_r31->unkAC = temp_r31->unkB0 = temp_r31->unkB4 = temp_r31->unkB8 = temp_r31->unk50 = 0; temp_r31->unkC0 = 0; temp_r31->unk38 = 0; temp_r31->unkD0 = 0; @@ -2441,7 +2516,7 @@ void fn_1_DF98(void) { if (temp_r31->unk3C != 0) { if (temp_r31->unk48 == 300) { sp8C = HuPrcChildCreate(fn_1_32F8, 0x2000, 0x1000, 0, HuPrcCurrentGet()); - sp8C->user_data = (void*) temp_r31->unk28; + sp8C->user_data = (void *)temp_r31->unk28; } if (temp_r31->unk48-- == 0) { temp_r31->unk3C = 0; @@ -2456,7 +2531,8 @@ void fn_1_DF98(void) { case 8: if (temp_r31->unk44 != 0) { temp_r31->unk44--; - } else { + } + else { Hu3DMotionShiftSet(temp_r31->unk00, temp_r31->unk06[0], 0.0f, 5.0f, HU3D_MOTATTR_LOOP); temp_r31->unk34 = 0; } @@ -2478,7 +2554,8 @@ void fn_1_DF98(void) { } if (temp_r31->unk44 != 0) { temp_r31->unk44--; - } else { + } + else { Hu3DMotionSet(temp_r31->unk00, temp_r31->unk06[5]); Hu3DModelAttrReset(temp_r31->unk00, HU3D_MOTATTR_LOOP); temp_r31->unk34 = 6; @@ -2520,7 +2597,8 @@ void fn_1_DF98(void) { if (fn_1_5038(temp_r31->unk28) & 0x100) { Hu3DMotionShiftSet(temp_r31->unk00, temp_r31->unk06[1], 0.0f, 8.0f, HU3D_MOTATTR_LOOP); Hu3DMotionShiftSpeedSet(temp_r31->unk00, 2.0f); - } else { + } + else { Hu3DMotionShiftSet(temp_r31->unk00, temp_r31->unk06[1], 0.0f, 8.0f, HU3D_MOTATTR_LOOP | HU3D_MOTATTR_REV); Hu3DMotionShiftSpeedSet(temp_r31->unk00, 2.0f); } @@ -2529,14 +2607,16 @@ void fn_1_DF98(void) { HuAudFXStop(var_r25); } } - } else { + } + else { if (temp_r31->unk34 != 3) { temp_r31->unk34 = 3; temp_r31->unk50 = 0; if (fn_1_5038(temp_r31->unk28) & 0x100) { Hu3DMotionShiftSet(temp_r31->unk00, temp_r31->unk06[2], 0.0f, 8.0f, HU3D_MOTATTR_LOOP); Hu3DMotionShiftSpeedSet(temp_r31->unk00, 2.0f); - } else { + } + else { Hu3DMotionShiftSet(temp_r31->unk00, temp_r31->unk06[2], 0.0f, 8.0f, HU3D_MOTATTR_LOOP | HU3D_MOTATTR_REV); Hu3DMotionShiftSpeedSet(temp_r31->unk00, 2.0f); } @@ -2549,7 +2629,8 @@ void fn_1_DF98(void) { if (temp_r31->unk3C != 1) { sp88 = 8; sp84 = 32; - } else { + } + else { sp88 = 7; sp84 = 22; } @@ -2564,12 +2645,14 @@ void fn_1_DF98(void) { if (temp_r31->unk50 >= 50) { temp_r31->unk50 -= 50; } - } else { + } + else { if (temp_r31->unk50 >= 30) { temp_r31->unk50 -= 30; } } - } else { + } + else { if (ABS_INV(fn_1_4E54(temp_r31->unk28, 0)) <= 20) { if (temp_r31->unk34 != 0) { temp_r31->unk34 = 0; @@ -2579,7 +2662,8 @@ void fn_1_DF98(void) { HuAudFXStop(var_r25); } } - } else { + } + else { if (temp_r31->unk34 != 1) { temp_r31->unk34 = 1; Hu3DMotionShiftSet(temp_r31->unk00, temp_r31->unk06[3], 0.0f, 8.0f, HU3D_MOTATTR_LOOP); @@ -2603,7 +2687,8 @@ void fn_1_DF98(void) { } temp_r31->unk54 = temp_r31->unk60; temp_r31->unk5C = temp_r31->unk64; - } else { + } + else { temp_r30->unk24 = 1; temp_r30->unk40 = temp_r31->unk28; } @@ -2622,7 +2707,8 @@ void fn_1_DF98(void) { } temp_r31->unk54 = temp_r31->unk60; temp_r31->unk5C = temp_r31->unk64; - } else { + } + else { temp_r30->unk24 = 1; temp_r30->unk40 = temp_r31->unk28; } @@ -2631,7 +2717,8 @@ void fn_1_DF98(void) { } if (temp_r31->unkD8 == temp_r31->unk54 && temp_r31->unkDC == temp_r31->unk5C) { temp_r31->unkD0++; - } else { + } + else { temp_r31->unkD8 = temp_r31->unk54; temp_r31->unkDC = temp_r31->unk5C; temp_r31->unkD0 = 0; @@ -2650,7 +2737,8 @@ void fn_1_DF98(void) { if (temp_r31->unk28 != 0) { HuAudFXPlay(0x5EA); } - } else { + } + else { if (temp_r31->unk28 == 0) { HuAudFXPlay(0x5EA); } @@ -2663,7 +2751,8 @@ void fn_1_DF98(void) { if (temp_r31->unk28 != 0) { HuAudFXPlay(0x5E3); } - } else { + } + else { if (temp_r31->unk28 == 0) { HuAudFXPlay(0x5E3); } @@ -2688,7 +2777,8 @@ void fn_1_DF98(void) { if (sp7C & 1) { Hu3DModelAttrReset(temp_r31->unk00, 1); Hu3DModelAttrReset(temp_r31->unk04, 1); - } else { + } + else { Hu3DModelAttrSet(temp_r31->unk00, 1); Hu3DModelAttrSet(temp_r31->unk04, 1); } @@ -2706,7 +2796,8 @@ void fn_1_DF98(void) { HuPrcVSleep(); } Hu3DModelAttrSet(temp_r31->unk00, 1); - } else { + } + else { var_f26 = temp_r31->unk98; Hu3DMotionShiftSet(temp_r31->unk00, temp_r31->unk06[3], 0.0f, 2.0f, HU3D_MOTATTR_LOOP); if (fn_1_21D4(temp_r31->unk6C) != 0.0f) { @@ -2737,8 +2828,9 @@ void fn_1_DF98(void) { } } -void fn_1_F73C(void) { - StructBss200* var_r31; +void fn_1_F73C(void) +{ + StructBss200 *var_r31; float var_f31; s32 var_r30; s32 var_r29; @@ -2772,8 +2864,9 @@ void fn_1_F73C(void) { } } -void fn_1_F9BC(void) { - StructBss200* temp_r31; +void fn_1_F9BC(void) +{ + StructBss200 *temp_r31; float temp_f26; float temp_f28; float temp_f27; @@ -2864,8 +2957,9 @@ void fn_1_F9BC(void) { CharModelMotionSpeedSet(lbl_1_data_0[GWPlayerCfg[temp_r31->unk28].character], 2.0f); } -void fn_1_10258(s32 arg0) { - StructBss200* var_r30; +void fn_1_10258(s32 arg0) +{ + StructBss200 *var_r30; float temp_f31; float temp_f30; float temp_f29; @@ -2891,7 +2985,8 @@ void fn_1_10258(s32 arg0) { } HuAudSStreamPlay(1); Hu3DMotionShiftSet(var_r30->unk00, var_r30->unk16, 0.0f, 5.0f, HU3D_MOTATTR_NONE); - } else { + } + else { for (lbl_1_bss_5A4 = 0; lbl_1_bss_5A4 < 60; lbl_1_bss_5A4++) { HuPrcVSleep(); } @@ -2899,7 +2994,8 @@ void fn_1_10258(s32 arg0) { } } -void fn_1_104A0(void) { +void fn_1_104A0(void) +{ while (TRUE) { if (omSysExitReq == 1) { WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 60); @@ -2915,7 +3011,8 @@ void fn_1_104A0(void) { } } -void fn_1_10500(void) { +void fn_1_10500(void) +{ s16 temp_r28; s16 temp_r30; s16 var_r29; @@ -2966,7 +3063,8 @@ void fn_1_10500(void) { if (lbl_1_bss_5A8 == lbl_1_bss_5AC) { GWPlayerCoinWinSet(lbl_1_bss_5A8, 10); temp_r30 = MGSeqWinCreate(GWPlayerCfg[lbl_1_bss_5A8].character, -1, -1, -1); - } else { + } + else { for (i = 0, var_r27 = 0; i < 4; i++) { if (i != lbl_1_bss_5AC) { sp8[var_r27++] = i; diff --git a/src/REL/m421Dll/main.c b/src/REL/m421Dll/main.c index 24d109e2..8ab50b74 100644 --- a/src/REL/m421Dll/main.c +++ b/src/REL/m421Dll/main.c @@ -131,7 +131,7 @@ void ObjectSetup(void) sp8.x = sp8.z = 0.0f; sp8.y = lbl_1_data_18.z; mtxRot(sp2C, lbl_1_data_18.x, lbl_1_data_18.y, 0.0f); - PSMTXMultVec(sp2C, &sp8, &lbl_1_data_28); + MTXMultVec(sp2C, &sp8, &lbl_1_data_28); Hu3DGLightPosAimSetV(lbl_1_bss_12[0], &lbl_1_data_28, &lbl_1_data_40); Hu3DShadowPosSet(&lbl_1_data_28, &lbl_1_data_34, &lbl_1_data_40); lbl_1_bss_10 = lbl_1_bss_E = lbl_1_bss_C = -1; @@ -647,7 +647,7 @@ void fn_1_38FC(ModelData *model, Mtx mtx) float var_f30; float var_f29; - PSMTXIdentity(spC); + MTXIdentity(spC); GXLoadPosMtxImm(spC, 0); GXSetNumChans(1); GXSetChanCtrl(GX_COLOR0A0, GX_FALSE, GX_SRC_REG, GX_SRC_VTX, 0, GX_DF_CLAMP, GX_AF_NONE); diff --git a/src/REL/m422Dll/main.c b/src/REL/m422Dll/main.c index 15c1186f..b51c3e68 100755 --- a/src/REL/m422Dll/main.c +++ b/src/REL/m422Dll/main.c @@ -14,8 +14,9 @@ #include "game/sprite.h" #include "game/wipe.h" -#include "ext_math.h" #include "dolphin.h" +#include "ext_math.h" + typedef struct { /* 0x00 */ s32 unk00; @@ -62,16 +63,16 @@ typedef struct { /* 0x2C */ s32 unk2C; } StructDataF0; // Size 0x30 -void fn_1_B480(omObjData* arg0); +void fn_1_B480(omObjData *arg0); StructBss104 lbl_1_bss_104[3][8]; StructBss54 lbl_1_bss_54[11]; -omObjData* lbl_1_bss_50; -omObjData* lbl_1_bss_4C; -omObjData* lbl_1_bss_3C[4]; -omObjData* lbl_1_bss_38; +omObjData *lbl_1_bss_50; +omObjData *lbl_1_bss_4C; +omObjData *lbl_1_bss_3C[4]; +omObjData *lbl_1_bss_38; s32 lbl_1_bss_34; -Process* lbl_1_bss_30; +Process *lbl_1_bss_30; s16 lbl_1_bss_2E; s16 lbl_1_bss_2C; s32 lbl_1_bss_28; @@ -86,140 +87,59 @@ float lbl_1_bss_8; float lbl_1_bss_4; float lbl_1_bss_0; -const float lbl_1_rodata_10[12] = { - 25.0f, 95.0f, 25.0f, - 75.0f, 75.0f, 75.0f, - 35.0f, 35.0f, 35.0f, - 25.0f, 50.0f, 50.0f -}; +const float lbl_1_rodata_10[12] = { 25.0f, 95.0f, 25.0f, 75.0f, 75.0f, 75.0f, 35.0f, 35.0f, 35.0f, 25.0f, 50.0f, 50.0f }; -const float lbl_1_rodata_40[12] = { - 75.0f, 0.0f, 75.0f, - 0.0f, 0.0f, 0.0f, - 20.0f, 20.0f, 20.0f, - 50.0f, 0.0f, 0.0f -}; +const float lbl_1_rodata_40[12] = { 75.0f, 0.0f, 75.0f, 0.0f, 0.0f, 0.0f, 20.0f, 20.0f, 20.0f, 50.0f, 0.0f, 0.0f }; -const float lbl_1_rodata_70[12] = { - 75.0f, 0.0f, 37.0f, - 0.0f, 0.0f, 0.0f, - 0.0f, 0.0f, 0.0f, - 70.0f, 0.0f, 0.0f -}; +const float lbl_1_rodata_70[12] = { 75.0f, 0.0f, 37.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 70.0f, 0.0f, 0.0f }; -const float lbl_1_rodata_A0[12] = { - 0.0f, 0.0f, 0.0f, - 0.0f, 0.0f, 0.0f, - 0.0f, 0.0f, 0.0f, - 75.0f, 50.0f, 0.0f -}; +const float lbl_1_rodata_A0[12] = { 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 75.0f, 50.0f, 0.0f }; -const float lbl_1_rodata_D0[12] = { - 0.0f, 0.0f, 0.0f, - 0.0f, 0.0f, 0.0f, - 0.0f, 0.0f, 0.0f, - 0.0f, 0.0f, 0.0f -}; +const float lbl_1_rodata_D0[12] = { 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f }; -const float lbl_1_rodata_100[12] = { - 30.0f, 30.0f, 30.0f, - 30.0f, 30.0f, 30.0f, - 40.0f, 40.0f, 40.0f, - 0.0f, 0.0f, 0.0f -}; +const float lbl_1_rodata_100[12] = { 30.0f, 30.0f, 30.0f, 30.0f, 30.0f, 30.0f, 40.0f, 40.0f, 40.0f, 0.0f, 0.0f, 0.0f }; -const float lbl_1_rodata_130[12] = { - 290.0f, 290.0f, 290.0f, - 370.0f, 370.0f, 370.0f, - 450.0f, 450.0f, 450.0f, - 0.0f, 0.0f, 0.0f -}; +const float lbl_1_rodata_130[12] = { 290.0f, 290.0f, 290.0f, 370.0f, 370.0f, 370.0f, 450.0f, 450.0f, 450.0f, 0.0f, 0.0f, 0.0f }; -s32 lbl_1_data_0[] = { - DATA_MAKE_NUM(DATADIR_MGCONST, 41), - DATA_MAKE_NUM(DATADIR_MGCONST, 40), - DATA_MAKE_NUM(DATADIR_MGCONST, 51), - DATA_MAKE_NUM(DATADIR_MGCONST, 51), - DATA_MAKE_NUM(DATADIR_MGCONST, 8), - DATA_MAKE_NUM(DATADIR_M422, 51), - DATA_MAKE_NUM(DATADIR_MGCONST, 0), - DATA_MAKE_NUM(DATADIR_MGCONST, 37), - DATA_MAKE_NUM(DATADIR_MGCONST, 36), - DATA_MAKE_NUM(DATADIR_MGCONST, 51), - DATA_MAKE_NUM(DATADIR_MGCONST, 51), - DATA_MAKE_NUM(DATADIR_MGCONST, 8), - DATA_MAKE_NUM(DATADIR_M422, 51), - DATA_MAKE_NUM(DATADIR_MGCONST, 12), - DATA_MAKE_NUM(DATADIR_MGCONST, 12), - DATA_MAKE_NUM(DATADIR_MGCONST, 12) -}; +s32 lbl_1_data_0[] = { DATA_MAKE_NUM(DATADIR_MGCONST, 41), DATA_MAKE_NUM(DATADIR_MGCONST, 40), DATA_MAKE_NUM(DATADIR_MGCONST, 51), + DATA_MAKE_NUM(DATADIR_MGCONST, 51), DATA_MAKE_NUM(DATADIR_MGCONST, 8), DATA_MAKE_NUM(DATADIR_M422, 51), DATA_MAKE_NUM(DATADIR_MGCONST, 0), + DATA_MAKE_NUM(DATADIR_MGCONST, 37), DATA_MAKE_NUM(DATADIR_MGCONST, 36), DATA_MAKE_NUM(DATADIR_MGCONST, 51), DATA_MAKE_NUM(DATADIR_MGCONST, 51), + DATA_MAKE_NUM(DATADIR_MGCONST, 8), DATA_MAKE_NUM(DATADIR_M422, 51), DATA_MAKE_NUM(DATADIR_MGCONST, 12), DATA_MAKE_NUM(DATADIR_MGCONST, 12), + DATA_MAKE_NUM(DATADIR_MGCONST, 12) }; -s32 lbl_1_data_40[] = { - 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x005E0000, 0x00190000, 0x006C0000, 0x00890000, - 0x00840000, 0x00100000, 0x000C0000, 0x00800000 -}; +s32 lbl_1_data_40[] = { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x005E0000, 0x00190000, 0x006C0000, 0x00890000, 0x00840000, 0x00100000, + 0x000C0000, 0x00800000 }; -s32 lbl_1_data_A0[] = { - DATA_MAKE_NUM(DATADIR_MARIOMOT, 0), - DATA_MAKE_NUM(DATADIR_MARIOMOT, 2), - DATA_MAKE_NUM(DATADIR_MARIOMOT, 3), - DATA_MAKE_NUM(DATADIR_M422, 0), - DATA_MAKE_NUM(DATADIR_M422, 8), - DATA_MAKE_NUM(DATADIR_MARIOMOT, 6), - DATA_MAKE_NUM(DATADIR_MARIOMOT, 23), - DATA_MAKE_NUM(DATADIR_MARIOMOT, 24) -}; +s32 lbl_1_data_A0[] = { DATA_MAKE_NUM(DATADIR_MARIOMOT, 0), DATA_MAKE_NUM(DATADIR_MARIOMOT, 2), DATA_MAKE_NUM(DATADIR_MARIOMOT, 3), + DATA_MAKE_NUM(DATADIR_M422, 0), DATA_MAKE_NUM(DATADIR_M422, 8), DATA_MAKE_NUM(DATADIR_MARIOMOT, 6), DATA_MAKE_NUM(DATADIR_MARIOMOT, 23), + DATA_MAKE_NUM(DATADIR_MARIOMOT, 24) }; u32 lbl_1_data_C0[] = { 0, 0, 0, 1, 1, 0, 0, 0 }; u8 lbl_1_data_E0[] = { 0, 0, 0, 1, 0, 1, 1 }; u8 lbl_1_data_E7[] = { 8, 8, 8, 0, 12, 0, 8, 8, 0 }; StructDataF0 lbl_1_data_F0[12][10] = { 0 }; -char* lbl_1_data_1828[] = { - "m422al01-cube8", - "m422al02-cyl143", - "m422al03-cube11", - "m422am01-cyl76", - "m422am02-cube13", - "m422am03-cube12", - "m422as01-cube9", - "m422test11-cube9", - "m422test12-cube9", - "m422m09m-m422m09m", - "coin", - "m422a04-sphere2", - "m422m09m-m422m09m", - "m422m09m-m422m09m", - "m422m09m-m422m09m", - "m422m09m-m422m09m", - "m422m09m-m422m09m", - "m422m09m-m422m09m", - "m422m09m-m422m09m", - "m422m09m-m422m09m" -}; +char *lbl_1_data_1828[] + = { "m422al01-cube8", "m422al02-cyl143", "m422al03-cube11", "m422am01-cyl76", "m422am02-cube13", "m422am03-cube12", "m422as01-cube9", + "m422test11-cube9", "m422test12-cube9", "m422m09m-m422m09m", "coin", "m422a04-sphere2", "m422m09m-m422m09m", "m422m09m-m422m09m", + "m422m09m-m422m09m", "m422m09m-m422m09m", "m422m09m-m422m09m", "m422m09m-m422m09m", "m422m09m-m422m09m", "m422m09m-m422m09m" }; s32 lbl_1_data_1878[11] = { 0 }; s32 lbl_1_data_18A4[2] = { 0 }; s32 lbl_1_data_18AC = -1; s32 lbl_1_data_18B0 = -1; -float lbl_1_data_18B4[][4] = { - { 0.0f, 300.0f, 450.0f, 180.0f }, - { -200.0f, 0.0f, 1050.0f, 180.0f }, - { 0.0f, 0.0f, 1050.0f, 180.0f }, - { 200.0f, 0.0f, 1050.0f, 180.0f } -}; +float lbl_1_data_18B4[][4] + = { { 0.0f, 300.0f, 450.0f, 180.0f }, { -200.0f, 0.0f, 1050.0f, 180.0f }, { 0.0f, 0.0f, 1050.0f, 180.0f }, { 200.0f, 0.0f, 1050.0f, 180.0f } }; s32 lbl_1_data_18F4[] = { 0, 0 }; float lbl_1_data_18FC = 1.0f; // unused s32 lbl_1_data_1900 = -1; -void fn_1_A0(void) { +void fn_1_A0(void) +{ Center.x += 10.0 * (((HuPadBtn[0] & 2) != 0) - ((HuPadBtn[0] & 1) != 0)); Center.z -= 10.0 * (((HuPadBtn[0] & 8) != 0) - ((HuPadBtn[0] & 4) != 0)); Center.y += ((HuPadTrigL[0] - HuPadTrigR[0]) / 128.0) * 30.0; @@ -227,7 +147,8 @@ void fn_1_A0(void) { CRot.x += HuPadSubStkY[0] / -16.0; } -void fn_1_2FC(omObjData* arg0) { +void fn_1_2FC(omObjData *arg0) +{ Mtx sp254; s32 sp1CC; s32 sp1C8; @@ -260,9 +181,9 @@ void fn_1_2FC(omObjData* arg0) { float temp_f26; float phi_f29; float phi_f28; - StructDataF0* temp_r28; - StructDataF0* temp_r29; - StructBss3CData* temp_r31; + StructDataF0 *temp_r28; + StructDataF0 *temp_r29; + StructBss3CData *temp_r31; s32 var_r19; s32 phi_r23; s32 phi_r26; @@ -289,19 +210,19 @@ void fn_1_2FC(omObjData* arg0) { temp_f24 = lbl_1_data_18B4[temp_r31->unk00][2] - arg0->trans.z; sp14C = 270.0 + atan2d(temp_f25, temp_f24) - CRot.y; sp148 = sqrtf(temp_f25 * temp_f25 + temp_f24 * temp_f24); - sp148 = (sp148 > 100.0f) ? 72.0f - : (sp148 < 12.0f) ? 0.0f - : (72.0f * (sp148 / 100.0f)); + sp148 = (sp148 > 100.0f) ? 72.0f : (sp148 < 12.0f) ? 0.0f : (72.0f * (sp148 / 100.0f)); sp154 = sp148 * cosd(sp14C); sp150 = sp148 * sind(sp14C); if (sp148 == 0.0f) { temp_r31->unk20 = 0; } - } else if (temp_r31->unk20 == 1) { + } + else if (temp_r31->unk20 == 1) { if (temp_r31->unk0C != -1) { sp154 = HuPadStkX[temp_r31->unk0C]; sp150 = HuPadStkY[temp_r31->unk0C]; - } else { + } + else { float sp238[7] = { 0 }; float sp21C[7] = { 0 }; float sp1EC[] = { -400.0f, -550.0f, -700.0f, -800.0f }; @@ -319,20 +240,22 @@ void fn_1_2FC(omObjData* arg0) { sp144 = (i < 10) ? (i * 4 + 43 + phi_r23) : ((i - 10) * 10 + 83 + phi_r23); if (temp_r28->unk04 != 0 && !(temp_r28->unk14 < 0.0f)) { Hu3DModelObjPosGet(lbl_1_bss_38->model[sp144], lbl_1_data_1828[temp_r28->unk00], &sp1D0); - phi_r26 = (s32) (300.0f + sp1D0.x + 2000.0f) / 100 - 20; + phi_r26 = (s32)(300.0f + sp1D0.x + 2000.0f) / 100 - 20; phi_r26--; for (phi_r22 = 0; phi_r22 < 3; phi_r26++, phi_r22++) { if (phi_r26 >= 0 && phi_r26 < 7 && arg0->trans.z + 50.0f >= sp1D0.z - lbl_1_rodata_10[temp_r28->unk00] - lbl_1_rodata_70[temp_r28->unk00] - && sp1D0.x - lbl_1_rodata_10[temp_r28->unk00] - lbl_1_rodata_70[temp_r28->unk00] - 50.0f < (phi_r26 - 3) * 100 && sp1D0.x + lbl_1_rodata_10[temp_r28->unk00] + lbl_1_rodata_70[temp_r28->unk00] + 50.0f > (phi_r26 - 3) * 100) - { + && sp1D0.x - lbl_1_rodata_10[temp_r28->unk00] - lbl_1_rodata_70[temp_r28->unk00] - 50.0f < (phi_r26 - 3) * 100 + && sp1D0.x + lbl_1_rodata_10[temp_r28->unk00] + lbl_1_rodata_70[temp_r28->unk00] + 50.0f > (phi_r26 - 3) * 100) { if (temp_r28->unk00 < 10) { if (sp238[phi_r26] < sp1D0.z + lbl_1_rodata_10[temp_r28->unk00] + lbl_1_rodata_70[temp_r28->unk00]) { sp238[phi_r26] = sp1D0.z + lbl_1_rodata_10[temp_r28->unk00] + lbl_1_rodata_70[temp_r28->unk00]; } - } else { + } + else { if (sp21C[phi_r26] < sp1D0.z + lbl_1_rodata_10[temp_r28->unk00] + lbl_1_rodata_70[temp_r28->unk00]) { - sp21C[phi_r26] = sp1D0.z + lbl_1_rodata_10[temp_r28->unk00] + lbl_1_rodata_70[temp_r28->unk00] + (temp_r28->unk00 < 11); + sp21C[phi_r26] = sp1D0.z + lbl_1_rodata_10[temp_r28->unk00] + lbl_1_rodata_70[temp_r28->unk00] + + (temp_r28->unk00 < 11); } } } @@ -340,13 +263,12 @@ void fn_1_2FC(omObjData* arg0) { } } } - phi_r26 = (s32) (300.0f + arg0->trans.x + 2000.0f) / 100 - 20; - phi_r26 = (phi_r26 < 0) ? 0 - : (phi_r26 >= 7) ? 6 - : phi_r26; + phi_r26 = (s32)(300.0f + arg0->trans.x + 2000.0f) / 100 - 20; + phi_r26 = (phi_r26 < 0) ? 0 : (phi_r26 >= 7) ? 6 : phi_r26; for (i = 0, phi_r22 = phi_r26; i < 7; i++) { var_r19 = ((temp_r31->unk00 / 2) % 2 == 0) ? i : (6 - i); - if (sp21C[phi_r22] - 60.0 * fabs(phi_r22 - phi_r26) < sp21C[var_r19] - 60.0 * fabs(var_r19 - phi_r26) && sp238[var_r19] < sp21C[var_r19]) { + if (sp21C[phi_r22] - 60.0 * fabs(phi_r22 - phi_r26) < sp21C[var_r19] - 60.0 * fabs(var_r19 - phi_r26) + && sp238[var_r19] < sp21C[var_r19]) { phi_r22 = var_r19; } } @@ -359,8 +281,11 @@ void fn_1_2FC(omObjData* arg0) { } sp140 = arg0->trans.z - (temp_r31->unk00 == 0 ? -100.0f : 700.0f); sp13C = (((sp238[phi_r22] > sp140 - 400.0f || sp140 > 550.0f) ? phi_r23 - : (sp140 > 500.0f) ? ((sp140 - 500.0f) / 50.0f) * phi_r23 + (1.0f - (sp140 - 500.0f) / 50.0f) * phi_r22 - : phi_r22) - 3.0f) * 100.0f - arg0->trans.x; + : (sp140 > 500.0f) ? ((sp140 - 500.0f) / 50.0f) * phi_r23 + (1.0f - (sp140 - 500.0f) / 50.0f) * phi_r22 + : phi_r22) + - 3.0f) + * 100.0f + - arg0->trans.x; { float sp1C4[] = { -21.0f, 0.0f, 15.0f }; float sp1B8[] = { 60.0f, 65.0f, 53.0f }; @@ -370,23 +295,18 @@ void fn_1_2FC(omObjData* arg0) { var_r18 = (temp_r31->unk14 / 5) % 3; var_r18 = (temp_r31->unk00 == 0) ? (arg0->trans.z < 200.0f ? 0 : 1) : 2; sp13C /= 20.0f; - sp13C = (sp13C < -1.0f) ? sp13C - : (sp13C > 1.0f) ? 1.0f - : sp13C; + sp13C = (sp13C < -1.0f) ? sp13C : (sp13C > 1.0f) ? 1.0f : sp13C; sp138 = (sp13C < 0.0f) ? -sp13C : sp13C; sp134 = 1.0f - sp138; - sp154 = (sp13C < 0.0f) - ? (36.0f * sp134 + sp138 * sp1C4[var_r18]) - : (36.0f * sp134 + sp138 * sp1B8[var_r18]); - sp150 = (sp13C < 0.0f) - ? (42.0f * sp134 + sp138 * sp1AC[var_r18]) - : (42.0f * sp134 + sp138 * sp1A0[var_r18]); + sp154 = (sp13C < 0.0f) ? (36.0f * sp134 + sp138 * sp1C4[var_r18]) : (36.0f * sp134 + sp138 * sp1B8[var_r18]); + sp150 = (sp13C < 0.0f) ? (42.0f * sp134 + sp138 * sp1AC[var_r18]) : (42.0f * sp134 + sp138 * sp1A0[var_r18]); } temp_f23 = temp_r31->unk38 - sp154; temp_f22 = temp_r31->unk3C - sp150; if (sqrtf(temp_f23 * temp_f23 + temp_f22 * temp_f22) > 50.0f) { temp_r31->unk40++; - } else { + } + else { temp_r31->unk40 = 0; } if (temp_r31->unk40 >= 2) { @@ -404,40 +324,39 @@ void fn_1_2FC(omObjData* arg0) { sp12C = arg0->trans.z; phi_r25 = 4; arg0->trans.z += 9.375; - if (temp_r31->unk00 == 0 - && lbl_1_data_1900 != -1 - && arg0->trans.z > (arg0->trans.y > 0.0f ? 620.0f : 1400.0f) + 50.0f - && sp12C <= (arg0->trans.y > 0.0f ? 620.0f : 1400.0f) + 50.0f) - { + if (temp_r31->unk00 == 0 && lbl_1_data_1900 != -1 && arg0->trans.z > (arg0->trans.y > 0.0f ? 620.0f : 1400.0f) + 50.0f + && sp12C <= (arg0->trans.y > 0.0f ? 620.0f : 1400.0f) + 50.0f) { HuAudFXStop(lbl_1_data_1900); lbl_1_data_1900 = -1; } temp_r31->unk30 -= 1.0f; - arg0->trans.y += (arg0->trans.z > (arg0->trans.y > 0.0f ? 620.0f : 1400.0f) - 50.0f) - ? temp_r31->unk30 : 0.0f; - if (temp_r31->unk00 == 0 && lbl_1_data_1900 == -1 && arg0->trans.z > 670.0f && arg0->trans.z < 1450.0f && arg0->trans.y == 0.0f && sp130 > 0.0f) { + arg0->trans.y += (arg0->trans.z > (arg0->trans.y > 0.0f ? 620.0f : 1400.0f) - 50.0f) ? temp_r31->unk30 : 0.0f; + if (temp_r31->unk00 == 0 && lbl_1_data_1900 == -1 && arg0->trans.z > 670.0f && arg0->trans.z < 1450.0f && arg0->trans.y == 0.0f + && sp130 > 0.0f) { lbl_1_data_1900 = HuAudFXPlay(0x612); } if (arg0->trans.z < 1400.0f && arg0->trans.y <= 0.0f) { arg0->trans.y = 0.0f; temp_r31->unk30 = 0.0f; } - arg0->rot.y += (arg0->rot.y < 0.0f) ? 360 - : (arg0->rot.y > 360.0f) ? -360 : 0; + arg0->rot.y += (arg0->rot.y < 0.0f) ? 360 : (arg0->rot.y > 360.0f) ? -360 : 0; arg0->rot.y = (arg0->rot.y > 140.0f && arg0->rot.y < 220.0f) ? 180.0f - : (arg0->rot.y < 180.0f) ? (40.0f + arg0->rot.y) - : (arg0->rot.y > 180.0f) ? (arg0->rot.y - 40.0f) - : arg0->trans.y;; + : (arg0->rot.y < 180.0f) ? (40.0f + arg0->rot.y) + : (arg0->rot.y > 180.0f) ? (arg0->rot.y - 40.0f) + : arg0->trans.y; + ; if (lbl_1_bss_C % 4 < 3) { Hu3DModelAttrReset(arg0->model[0], 1); - } else { + } + else { Hu3DModelAttrSet(arg0->model[0], 1); } if (arg0->trans.y < -500.0f) { temp_r31->unk20 = 3; Hu3DModelAttrSet(arg0->model[0], 1); } - } else if (temp_r31->unk20 != 3 && temp_r31->unk20 != 4) { + } + else if (temp_r31->unk20 != 3 && temp_r31->unk20 != 4) { if (temp_r31->unk20 == 5) { if (temp_r31->unk24 == 0) { phi_r25 = 3; @@ -453,7 +372,8 @@ void fn_1_2FC(omObjData* arg0) { if (temp_r31->unk24 >= 31 && temp_r31->unk24 <= 38) { arg0->trans.x -= 150.0 * -sind(arg0->rot.y) / 7.0; arg0->trans.z -= 150.0 * -cosd(arg0->rot.y) / 7.0; - } else { + } + else { arg0->trans.x = lbl_1_data_F0[9][temp_r31->unk00].unk0C; arg0->trans.y = (temp_r31->unk00 == 0) ? 300 : 0; arg0->trans.z = lbl_1_data_F0[9][temp_r31->unk00].unk14; @@ -464,15 +384,16 @@ void fn_1_2FC(omObjData* arg0) { if (temp_r31->unk24 == 38) { temp_r31->unk20 = 1; } - } else { + } + else { float temp_f31 = 0.25 * sp154; float temp_f30 = 0.25 * -sp150; Vec sp194 = { 0.0f, 0.0f, 0.0f }; sp194.x = temp_f31; sp194.z = temp_f30; - PSMTXRotRad(sp254, 'y', MTXDegToRad(CRot.y)); - PSMTXMultVec(sp254, &sp194, &sp194); + MTXRotRad(sp254, 'y', MTXDegToRad(CRot.y)); + MTXMultVec(sp254, &sp194, &sp194); temp_f31 = sp194.x; temp_f30 = sp194.z; sp158 = sqrtf(temp_f31 * temp_f31 + temp_f30 * temp_f30); @@ -480,7 +401,8 @@ void fn_1_2FC(omObjData* arg0) { if (sp158 < 10.0f) { temp_r31->unk2C = temp_f31; temp_r31->unk34 += temp_f30; - } else { + } + else { temp_f31 /= sp158; temp_f30 /= sp158; sp158 = 10.0f; @@ -492,11 +414,13 @@ void fn_1_2FC(omObjData* arg0) { if (temp_r31->unk20 == 1) { if (temp_r31->unk28 >= 8.0f) { phi_r25 = 2; - } else { + } + else { phi_r25 = 1; } } - } else if (temp_r31->unk20 == 1) { + } + else if (temp_r31->unk20 == 1) { phi_r25 = 0; } if (lbl_1_bss_34 == 1005 && (temp_r31->unk20 == 1 || temp_r31->unk20 == 0)) { @@ -504,10 +428,7 @@ void fn_1_2FC(omObjData* arg0) { Hu3DModelAttrReset(arg0->model[0], HU3D_MOTATTR_LOOP); temp_r31->unk20 = 0; if (lbl_1_bss_8 == 1.0f && lbl_1_data_18F4[temp_r31->unk00 == 0 ? 0 : 1] > 0) { - s32 sp1FC[] = { - 0x122, 0x162, 0x1A2, 0x1E2, - 0x222, 0x262, 0x2A2, 0x2E2 - }; + s32 sp1FC[] = { 0x122, 0x162, 0x1A2, 0x1E2, 0x222, 0x262, 0x2A2, 0x2E2 }; HuAudFXPlay(sp1FC[temp_r31->unk08]); } @@ -540,28 +461,26 @@ void fn_1_2FC(omObjData* arg0) { } if (lbl_1_bss_34 > 1001) { for (phi_r24 = 0; phi_r24 < 12; phi_r24++) { - if (phi_r24 == 9 && lbl_1_bss_34 <= 1001) { - } + if (phi_r24 == 9 && lbl_1_bss_34 <= 1001) { } for (phi_r20 = 0; phi_r20 < (phi_r24 < 10 ? 4 : 10); phi_r20++) { temp_r29 = &lbl_1_data_F0[phi_r24][phi_r20]; - sp124 = (phi_r24 < 10) ? (phi_r24 * 4 + 43 + phi_r20) - : ((phi_r24 - 10) * 10 + 83 + phi_r20); + sp124 = (phi_r24 < 10) ? (phi_r24 * 4 + 43 + phi_r20) : ((phi_r24 - 10) * 10 + 83 + phi_r20); if (temp_r29->unk04 != 0 && temp_r29->unk2C <= 0) { Vec sp188; Hu3DModelObjPosGet(lbl_1_bss_38->model[sp124], lbl_1_data_1828[temp_r29->unk00], &sp188); if (((temp_r29->unk04 == 3 || (temp_r29->unk04 == 4 && sp188.y >= 250.0f)) && temp_r31->unk00 == 0) - || (((temp_r29->unk04 == 4 && sp188.y < 250.0f) || temp_r29->unk04 == 5 || temp_r29->unk04 == 6) && temp_r31->unk00 != 0)) - { + || (((temp_r29->unk04 == 4 && sp188.y < 250.0f) || temp_r29->unk04 == 5 || temp_r29->unk04 == 6) + && temp_r31->unk00 != 0)) { sp11C = sp188.x; sp118 = sp188.z; if (lbl_1_rodata_40[temp_r29->unk00] > 0.0f || lbl_1_rodata_70[temp_r29->unk00] > 0.0f) { sp11C = (arg0->trans.x < sp11C - lbl_1_rodata_40[temp_r29->unk00]) ? (sp11C - lbl_1_rodata_40[temp_r29->unk00]) - : (arg0->trans.x > sp11C + lbl_1_rodata_40[temp_r29->unk00]) ? (sp11C + lbl_1_rodata_40[temp_r29->unk00]) - : arg0->trans.x; + : (arg0->trans.x > sp11C + lbl_1_rodata_40[temp_r29->unk00]) ? (sp11C + lbl_1_rodata_40[temp_r29->unk00]) + : arg0->trans.x; sp118 = (arg0->trans.z < sp118 - lbl_1_rodata_70[temp_r29->unk00]) ? (sp118 - lbl_1_rodata_70[temp_r29->unk00]) - : (arg0->trans.z > sp118 + lbl_1_rodata_70[temp_r29->unk00]) ? (sp118 + lbl_1_rodata_70[temp_r29->unk00]) - : arg0->trans.z; + : (arg0->trans.z > sp118 + lbl_1_rodata_70[temp_r29->unk00]) ? (sp118 + lbl_1_rodata_70[temp_r29->unk00]) + : arg0->trans.z; } temp_f26 = sp11C - arg0->trans.x; phi_f28 = sp118 - arg0->trans.z; @@ -575,7 +494,8 @@ void fn_1_2FC(omObjData* arg0) { phi_f28 *= (50.0f + lbl_1_rodata_10[temp_r29->unk00]) / sp120; arg0->trans.x = sp11C - temp_f26; arg0->trans.z = sp118 - phi_f28; - } else { + } + else { temp_r29->unk04 = 0; lbl_1_data_18F4[temp_r31->unk00 == 0 ? 0 : 1] += (phi_r24 == 10 ? 1 : 5); CharModelCoinEffectCreate(-1, &sp188); @@ -653,20 +573,20 @@ void fn_1_2FC(omObjData* arg0) { phi_r25 = 0; } arg0->trans.x = lbl_1_data_F0[9][sp114].unk0C; - arg0->trans.z = (lbl_1_bss_8 > 163.0f) ? arg0->trans.z - : (lbl_1_bss_8 > 155.0f) ? (arg0->trans.z - 18.75) - : lbl_1_data_F0[9][sp114].unk14; + arg0->trans.z = (lbl_1_bss_8 > 163.0f) ? arg0->trans.z : (lbl_1_bss_8 > 155.0f) ? (arg0->trans.z - 18.75) : lbl_1_data_F0[9][sp114].unk14; } if (temp_r31->unk1C >= 0) { phi_r25 = temp_r31->unk1C; } if (phi_r25 >= 0 && phi_r25 != temp_r31->unk18) { - Hu3DMotionShiftSet(arg0->model[0], arg0->motion[phi_r25], 0.0f, lbl_1_data_E7[phi_r25], (lbl_1_data_E0[phi_r25] != 0) ? HU3D_MOTATTR_NONE : HU3D_MOTATTR_LOOP); + Hu3DMotionShiftSet(arg0->model[0], arg0->motion[phi_r25], 0.0f, lbl_1_data_E7[phi_r25], + (lbl_1_data_E0[phi_r25] != 0) ? HU3D_MOTATTR_NONE : HU3D_MOTATTR_LOOP); temp_r31->unk18 = phi_r25; } } -s32 fn_1_34BC(float arg0, float arg1, float arg2, s32 arg3, s32 arg4) { +s32 fn_1_34BC(float arg0, float arg1, float arg2, s32 arg3, s32 arg4) +{ Vec sp1C; float var_f27; float var_f28; @@ -675,7 +595,7 @@ s32 fn_1_34BC(float arg0, float arg1, float arg2, s32 arg3, s32 arg4) { float temp_f30; float var_f31; float sp18; - StructDataF0* temp_r31; + StructDataF0 *temp_r31; s32 var_r24; s32 i; s32 j; @@ -692,27 +612,19 @@ s32 fn_1_34BC(float arg0, float arg1, float arg2, s32 arg3, s32 arg4) { var_f25 = 50.0f + lbl_1_rodata_70[temp_r31->unk00]; var_f26 = 50.0f + lbl_1_rodata_70[temp_r31->unk00]; if (temp_r31->unk04 == 3) { - float sp28[][12] = { - { - -25.0f, -25.0f, -25.0f, - -6.6875f, -6.6875f, -6.6875f, - 62.765625f, 62.765625f, 62.765625f, - 51.99469f, 76.875f, 45.0f - }, - { - -27.647583f, -27.647583f, -27.647583f, - -9.64325f, -9.64325f, -9.64325f, - 60.49022f, 60.49022f, 60.49022f, - 51.99469f, 76.875f, 45.0f - } - }; + float sp28[][12] = { { -25.0f, -25.0f, -25.0f, -6.6875f, -6.6875f, -6.6875f, 62.765625f, 62.765625f, 62.765625f, 51.99469f, + 76.875f, 45.0f }, + { -27.647583f, -27.647583f, -27.647583f, -9.64325f, -9.64325f, -9.64325f, 60.49022f, 60.49022f, 60.49022f, 51.99469f, + 76.875f, 45.0f } }; var_f28 += sp28[temp_r31->unk08 == 0 ? 0 : 1][temp_r31->unk00]; var_f25 += 50.0f; var_f26 += 50.0f; - } else if (temp_r31->unk04 == 5 && temp_r31->unk08 == 0) { + } + else if (temp_r31->unk04 == 5 && temp_r31->unk08 == 0) { var_f28 += lbl_1_rodata_130[temp_r31->unk00]; - } else if (temp_r31->unk04 == 1) { + } + else if (temp_r31->unk04 == 1) { var_f27 = (temp_r31->unk0C < 0.0f ? -1 : 1) * 321; var_f28 = 880.0f - lbl_1_bss_0 * (100 - temp_r31->unk08); } @@ -721,11 +633,9 @@ s32 fn_1_34BC(float arg0, float arg1, float arg2, s32 arg3, s32 arg4) { } if (lbl_1_rodata_40[temp_r31->unk00] > 0.0f || var_f25 > 0.0f || var_f26 > 0.0f) { var_f27 = (arg0 < var_f27 - lbl_1_rodata_40[temp_r31->unk00]) ? (var_f27 - lbl_1_rodata_40[temp_r31->unk00]) - : (arg0 > var_f27 + lbl_1_rodata_40[temp_r31->unk00]) ? (var_f27 + lbl_1_rodata_40[temp_r31->unk00]) - : arg0; - var_f28 = (arg1 < var_f28 - var_f25) ? (var_f28 - var_f25) - : (arg1 > var_f28 + var_f26) ? (var_f28 + var_f26) - : arg1; + : (arg0 > var_f27 + lbl_1_rodata_40[temp_r31->unk00]) ? (var_f27 + lbl_1_rodata_40[temp_r31->unk00]) + : arg0; + var_f28 = (arg1 < var_f28 - var_f25) ? (var_f28 - var_f25) : (arg1 > var_f28 + var_f26) ? (var_f28 + var_f26) : arg1; } temp_f30 = var_f27 - arg0; var_f31 = var_f28 - arg1; @@ -743,8 +653,9 @@ s32 fn_1_34BC(float arg0, float arg1, float arg2, s32 arg3, s32 arg4) { return 0; } -void fn_1_3B74(omObjData* arg0) { - StructBss3CData* sp354[4]; +void fn_1_3B74(omObjData *arg0) +{ + StructBss3CData *sp354[4]; Vec sp348; s32 var_r20; s32 var_r19; @@ -773,7 +684,7 @@ void fn_1_3B74(omObjData* arg0) { float temp_f29; float temp_f30; float temp_f31; - StructDataF0* temp_r31; + StructDataF0 *temp_r31; s32 var_r21; s32 var_r28; s32 var_r27; @@ -786,10 +697,11 @@ void fn_1_3B74(omObjData* arg0) { } lbl_1_bss_C++; lbl_1_bss_0 = (lbl_1_bss_34 <= 1002) ? 1.5 - : (lbl_1_bss_34 == 1003) ? (7.5 * (lbl_1_bss_8 > 120.0f ? 1.0 : (0.2 + 0.8 * (lbl_1_bss_8 / 120.0)))) - : 0.0; - lbl_1_bss_4 = (lbl_1_bss_34 < 1005 && sp354[0]->unk20 >= 2 && sp354[0]->unk20 <= 5 - && !(lbl_1_bss_34 == 1003 && lbl_1_bss_8 <= 120.0f)) ? 7.5 : lbl_1_bss_0; + : (lbl_1_bss_34 == 1003) ? (7.5 * (lbl_1_bss_8 > 120.0f ? 1.0 : (0.2 + 0.8 * (lbl_1_bss_8 / 120.0)))) + : 0.0; + lbl_1_bss_4 = (lbl_1_bss_34 < 1005 && sp354[0]->unk20 >= 2 && sp354[0]->unk20 <= 5 && !(lbl_1_bss_34 == 1003 && lbl_1_bss_8 <= 120.0f)) + ? 7.5 + : lbl_1_bss_0; Hu3DMotionSpeedSet(arg0->model[1], 1.5 * lbl_1_bss_4 / 7.5); Hu3DMotionSpeedSet(arg0->model[3], 1.5 * lbl_1_bss_0 / 7.5); if (lbl_1_data_18B0 != -1) { @@ -798,9 +710,7 @@ void fn_1_3B74(omObjData* arg0) { HuAudFXVolSet(lbl_1_data_18B0, temp_f21 <= 0.001 ? 0 : 127); } if (lbl_1_bss_34 <= 1001) { - temp_f31 = (lbl_1_bss_34 == 1000 || lbl_1_bss_8 < 60.0f) ? 0.0 - : (lbl_1_bss_8 < 120.0f) ? (lbl_1_bss_8 - 60.0f) / 60.0 - : 1.0; + temp_f31 = (lbl_1_bss_34 == 1000 || lbl_1_bss_8 < 60.0f) ? 0.0 : (lbl_1_bss_8 < 120.0f) ? (lbl_1_bss_8 - 60.0f) / 60.0 : 1.0; temp_f31 = 1.0f - temp_f31; temp_f31 *= temp_f31; temp_f31 = 1.0f - temp_f31; @@ -844,15 +754,16 @@ void fn_1_3B74(omObjData* arg0) { var_r17 = sp22C + (lbl_1_bss_34 == 1003 && lbl_1_bss_C % 60 == 38 && lbl_1_bss_28 > 120); sp228 = (lbl_1_bss_34 == 1003 && lbl_1_bss_C % 60 == 0) ? (rand8() % 2 + 2) : 0; while (var_r19 > 0 || var_r18 > 0 || var_r17 > 0 || sp228 > 0) { - var_r27 = (rand8() % 2 == 0) - ? ((var_r17 != 0) ? 3 - : (sp228 != 0) ? 4 - : (var_r19 != 0) ? 1 - : (var_r18 != 0) ? 2 : 0) - : ((var_r17 != 0) ? 3 - : (var_r19 != 0) ? 1 - : (sp228 != 0) ? 4 - : (var_r18 != 0) ? 2 : 0); + var_r27 = (rand8() % 2 == 0) ? ((var_r17 != 0) ? 3 + : (sp228 != 0) ? 4 + : (var_r19 != 0) ? 1 + : (var_r18 != 0) ? 2 + : 0) + : ((var_r17 != 0) ? 3 + : (var_r19 != 0) ? 1 + : (sp228 != 0) ? 4 + : (var_r18 != 0) ? 2 + : 0); sp224++; if (sp224 > 8) { var_r19 -= (var_r27 == 1); @@ -860,18 +771,28 @@ void fn_1_3B74(omObjData* arg0) { var_r17 -= (var_r27 == 3); sp228 -= (var_r27 == 4); sp224 = 0; - } else if (var_r27 == 1 || var_r27 == 2 || var_r27 == 3 || var_r27 == 4) { + } + else if (var_r27 == 1 || var_r27 == 2 || var_r27 == 3 || var_r27 == 4) { var_r28 = (var_r27 != 4) ? (rand8() % 9) : 10; if (var_r27 == 1 && var_r20 != 0) { var_r28 = 9; i = 0; - } else if (var_r27 == 3 && sp22C != 0) { + } + else if (var_r27 == 3 && sp22C != 0) { var_r28 = 9; - i = (sp354[(lbl_1_bss_C % 3) + 1]->unk20 == 3 && (lbl_1_data_F0[9][lbl_1_bss_C % 3 + 1].unk04 == 0 || lbl_1_bss_34 != 1003)) ? (lbl_1_bss_C % 3 + 1) - : (sp354[(lbl_1_bss_C + 1) % 3 + 1]->unk20 == 3 && (lbl_1_data_F0[9][(lbl_1_bss_C + 1) % 3 + 1].unk04 == 0 || lbl_1_bss_34 != 1003)) ? ((lbl_1_bss_C + 1) % 3 + 1) - : (sp354[(lbl_1_bss_C + 2) % 3 + 1]->unk20 == 3 && (lbl_1_data_F0[9][(lbl_1_bss_C + 2) % 3 + 1].unk04 == 0 || lbl_1_bss_34 != 1003)) ? ((lbl_1_bss_C + 2) % 3 + 1) : 0; - } else { - if (var_r28 == 10 && (lbl_1_bss_28 / 60) / 15 + 1 <= 2 - lbl_1_bss_14 && rand8() % (((lbl_1_bss_28 / 60 - (1 - lbl_1_bss_14) * 15) * 3) + 1) == 0) { + i = (sp354[(lbl_1_bss_C % 3) + 1]->unk20 == 3 && (lbl_1_data_F0[9][lbl_1_bss_C % 3 + 1].unk04 == 0 || lbl_1_bss_34 != 1003)) + ? (lbl_1_bss_C % 3 + 1) + : (sp354[(lbl_1_bss_C + 1) % 3 + 1]->unk20 == 3 + && (lbl_1_data_F0[9][(lbl_1_bss_C + 1) % 3 + 1].unk04 == 0 || lbl_1_bss_34 != 1003)) + ? ((lbl_1_bss_C + 1) % 3 + 1) + : (sp354[(lbl_1_bss_C + 2) % 3 + 1]->unk20 == 3 + && (lbl_1_data_F0[9][(lbl_1_bss_C + 2) % 3 + 1].unk04 == 0 || lbl_1_bss_34 != 1003)) + ? ((lbl_1_bss_C + 2) % 3 + 1) + : 0; + } + else { + if (var_r28 == 10 && (lbl_1_bss_28 / 60) / 15 + 1 <= 2 - lbl_1_bss_14 + && rand8() % (((lbl_1_bss_28 / 60 - (1 - lbl_1_bss_14) * 15) * 3) + 1) == 0) { var_r28 = 11; } for (i = 0; i < (var_r27 != 4 ? 4 : 10); i++) { @@ -883,53 +804,45 @@ void fn_1_3B74(omObjData* arg0) { continue; } } - lbl_1_data_F0[var_r28][i].unk0C = (var_r27 != 3) - ? (rand8() % 7 - 3) * 100 - : ((rand8() % 2) * 2 - 1) * 1595; + lbl_1_data_F0[var_r28][i].unk0C = (var_r27 != 3) ? (rand8() % 7 - 3) * 100 : ((rand8() % 2) * 2 - 1) * 1595; if (i == 0 && lbl_1_bss_34 >= 1004 && var_r28 == 9) { lbl_1_data_F0[var_r28][i].unk0C = 0.0f; } - lbl_1_data_F0[var_r28][i].unk10 = (var_r27 == 1) ? 300 - : (var_r27 == 2) ? 0 - : (var_r27 == 3) ? 500 - : (var_r27 == 4) ? 300 : 0; - lbl_1_data_F0[var_r28][i].unk14 = (var_r27 == 1) ? -450 - : (var_r27 == 2) ? -450 - : (var_r27 == 3) ? 105 - : (var_r27 == 4) ? -150 : 0; + lbl_1_data_F0[var_r28][i].unk10 = (var_r27 == 1) ? 300 : (var_r27 == 2) ? 0 : (var_r27 == 3) ? 500 : (var_r27 == 4) ? 300 : 0; + lbl_1_data_F0[var_r28][i].unk14 = (var_r27 == 1) ? -450 : (var_r27 == 2) ? -450 : (var_r27 == 3) ? 105 : (var_r27 == 4) ? -150 : 0; lbl_1_data_F0[var_r28][i].unk14 += (var_r27 == 1) ? -(var_r28 <= 8 ? 0 : 0) - : (var_r27 == 2) ? -(var_r28 <= 8 ? (var_r28 / 3) * 80 : 0) - : (var_r27 == 4) ? -50 : 0; - lbl_1_data_F0[var_r28][i].unk14 += (var_r27 == 1) - ? ((var_r28 <= 2) ? 315.0 - : (var_r28 <= 5) ? 296.6875 - : (var_r28 <= 8) ? 227.234375 - : (var_r28 == 9) ? 200 : 0) : 0.0; + : (var_r27 == 2) ? -(var_r28 <= 8 ? (var_r28 / 3) * 80 : 0) + : (var_r27 == 4) ? -50 + : 0; + lbl_1_data_F0[var_r28][i].unk14 += (var_r27 == 1) ? ((var_r28 <= 2) ? 315.0 + : (var_r28 <= 5) ? 296.6875 + : (var_r28 <= 8) ? 227.234375 + : (var_r28 == 9) ? 200 + : 0) + : 0.0; if (var_r27 == 1 || var_r27 == 4) { - float sp3C4[] = { - -25.0f, -25.0f, -25.0f, - -6.6875f, -6.6875f, -6.6875f, - 62.765625f, 62.765625f, 62.765625f, - 51.99469f, 76.875f, 45.0f, - -27.647583f, -27.647583f, -27.647583f, - -9.64325f, -9.64325f, -9.64325f, - 60.49022f, 60.49022f, 60.49022f, - 51.99469f, 76.875f, 45.0f - }; + float sp3C4[] = { -25.0f, -25.0f, -25.0f, -6.6875f, -6.6875f, -6.6875f, 62.765625f, 62.765625f, 62.765625f, 51.99469f, 76.875f, 45.0f, + -27.647583f, -27.647583f, -27.647583f, -9.64325f, -9.64325f, -9.64325f, 60.49022f, 60.49022f, 60.49022f, 51.99469f, 76.875f, + 45.0f }; var_f25 = lbl_1_data_F0[var_r28][i].unk0C; var_f24 = sp3C4[var_r28] + lbl_1_data_F0[var_r28][i].unk14; - } else if (var_r27 == 2) { + } + else if (var_r27 == 2) { var_f25 = lbl_1_data_F0[var_r28][i].unk0C; var_f24 = lbl_1_rodata_130[var_r28] + lbl_1_data_F0[var_r28][i].unk14; - } else if (var_r27 == 3) { + } + else if (var_r27 == 3) { var_f25 = (lbl_1_data_F0[var_r28][i].unk0C < 0.0f) ? -335 : 335; var_f24 = 830.0f - 94.0f * lbl_1_bss_0; - } else { + } + else { var_f25 = lbl_1_data_F0[var_r28][i].unk0C; var_f24 = lbl_1_data_F0[var_r28][i].unk14; } - if (fn_1_34BC(var_f25, var_f24, lbl_1_rodata_10[lbl_1_data_F0[var_r28][i].unk00] + lbl_1_rodata_40[lbl_1_data_F0[var_r28][i].unk00], var_r28, 0) != 0) { + if (fn_1_34BC( + var_f25, var_f24, lbl_1_rodata_10[lbl_1_data_F0[var_r28][i].unk00] + lbl_1_rodata_40[lbl_1_data_F0[var_r28][i].unk00], var_r28, 0) + != 0) { continue; } if (var_r27 == 3 && lbl_1_data_18A4[(lbl_1_data_F0[var_r28][i].unk0C < 0.0f) ? 0 : 1] > 0) { @@ -937,16 +850,12 @@ void fn_1_3B74(omObjData* arg0) { } if (var_r27 == 4) { for (var_r21 = 0; var_r21 < 10; var_r21++) { - if (lbl_1_data_F0[10][var_r21].unk04 != 0 - && fabs(lbl_1_data_F0[var_r28][i].unk14 - lbl_1_data_F0[10][var_r21].unk14) <= 100.0 - && fabs(lbl_1_data_F0[var_r28][i].unk0C - lbl_1_data_F0[10][var_r21].unk0C) <= 200.0) - { + if (lbl_1_data_F0[10][var_r21].unk04 != 0 && fabs(lbl_1_data_F0[var_r28][i].unk14 - lbl_1_data_F0[10][var_r21].unk14) <= 100.0 + && fabs(lbl_1_data_F0[var_r28][i].unk0C - lbl_1_data_F0[10][var_r21].unk0C) <= 200.0) { break; } - if (lbl_1_data_F0[11][var_r21].unk04 != 0 - && fabs(lbl_1_data_F0[var_r28][i].unk14 - lbl_1_data_F0[11][var_r21].unk14) <= 100.0 - && fabs(lbl_1_data_F0[var_r28][i].unk0C - lbl_1_data_F0[11][var_r21].unk0C) <= 200.0) - { + if (lbl_1_data_F0[11][var_r21].unk04 != 0 && fabs(lbl_1_data_F0[var_r28][i].unk14 - lbl_1_data_F0[11][var_r21].unk14) <= 100.0 + && fabs(lbl_1_data_F0[var_r28][i].unk0C - lbl_1_data_F0[11][var_r21].unk0C) <= 200.0) { break; } } @@ -961,10 +870,7 @@ void fn_1_3B74(omObjData* arg0) { lbl_1_bss_14++; } lbl_1_data_F0[var_r28][i].unk00 = var_r28; - lbl_1_data_F0[var_r28][i].unk04 = (var_r27 == 1) ? 3 - : (var_r27 == 2) ? 5 - : (var_r27 == 3) ? 1 - : (var_r27 == 4) ? 3 : 0; + lbl_1_data_F0[var_r28][i].unk04 = (var_r27 == 1) ? 3 : (var_r27 == 2) ? 5 : (var_r27 == 3) ? 1 : (var_r27 == 4) ? 3 : 0; lbl_1_data_F0[var_r28][i].unk08 = 0; lbl_1_data_F0[var_r28][i].unk2C = 0; lbl_1_data_F0[var_r28][i].unk18 = lbl_1_data_F0[var_r28][i].unk1C = lbl_1_data_F0[var_r28][i].unk20 = 0.0f; @@ -974,13 +880,15 @@ void fn_1_3B74(omObjData* arg0) { Hu3DModelAttrSet(arg0->model[sp220], HU3D_MOTATTR_PAUSE); Hu3DModelAttrReset(arg0->model[sp220], 1); Hu3DModelRotSet(arg0->model[sp220], 0.0f, 0.0f, 0.0f); - } else { + } + else { Hu3DModelAttrReset(arg0->model[i + (var_r28 == 10 ? 83 : 93)], 1); } if (var_r27 == 1 && var_r20 != 0) { var_r20--; sp354[0]->unk20 = 4; - } else if (var_r27 == 3 && sp22C != 0) { + } + else if (var_r27 == 3 && sp22C != 0) { sp22C--; sp354[i]->unk20 = 4; } @@ -988,7 +896,9 @@ void fn_1_3B74(omObjData* arg0) { lbl_1_data_18A4[(lbl_1_data_F0[var_r28][i].unk0C < 0.0f) ? 0 : 1] = 85; Hu3DMotionTimeSet(arg0->model[(lbl_1_data_F0[var_r28][i].unk0C < 0.0f) ? 6 : 5], 9.0f); if (var_r28 == 9 && lbl_1_bss_54[(lbl_1_data_F0[var_r28][i].unk0C < 0.0f) ? 7 : 6].unk00 < 3) { - lbl_1_bss_54[(lbl_1_data_F0[var_r28][i].unk0C < 0.0f) ? 7 : 6].unk04[lbl_1_bss_54[(lbl_1_data_F0[var_r28][i].unk0C < 0.0f) ? 7 : 6].unk00] = 0.0f; + lbl_1_bss_54[(lbl_1_data_F0[var_r28][i].unk0C < 0.0f) ? 7 : 6] + .unk04[lbl_1_bss_54[(lbl_1_data_F0[var_r28][i].unk0C < 0.0f) ? 7 : 6].unk00] + = 0.0f; lbl_1_bss_54[(lbl_1_data_F0[var_r28][i].unk0C < 0.0f) ? 7 : 6].unk00++; } } @@ -1008,29 +918,24 @@ void fn_1_3B74(omObjData* arg0) { for (i = 0; i < 12; i++) { for (j = 0; j < (i < 10 ? 4 : 10); j++) { temp_r31 = &lbl_1_data_F0[i][j]; - var_r25 = (i < 10) - ? (i * 4 + 43 + j) - : ((i - 10) * 10 + 83 + j); + var_r25 = (i < 10) ? (i * 4 + 43 + j) : ((i - 10) * 10 + 83 + j); sp348.x = sp348.y = sp348.z = 0.0f; if (temp_r31->unk04 == 0) { Hu3DModelAttrSet(arg0->model[var_r25], 1); - } else { + } + else { temp_r31->unk08++; temp_r31->unk24 += (temp_r31->unk00 == 10) ? 0 : 0; - temp_r31->unk24 += (temp_r31->unk24 < 0.0f) ? 360 - : (temp_r31->unk24 > 360.0f) ? -360 : 0; + temp_r31->unk24 += (temp_r31->unk24 < 0.0f) ? 360 : (temp_r31->unk24 > 360.0f) ? -360 : 0; Hu3DModelObjPosGet(arg0->model[var_r25], lbl_1_data_1828[temp_r31->unk00], &sp348); switch (temp_r31->unk04) { case 3: case 5: case 6: - if (temp_r31->unk00 >= 3 && temp_r31->unk00 >= 9 && temp_r31->unk04 == 3 - && temp_r31->unk14 < -120.0f && temp_r31->unk14 + lbl_1_bss_4 >= -120.0f) - { + if (temp_r31->unk00 >= 3 && temp_r31->unk00 >= 9 && temp_r31->unk04 == 3 && temp_r31->unk14 < -120.0f + && temp_r31->unk14 + lbl_1_bss_4 >= -120.0f) { sp218 = (500.0f + temp_r31->unk0C) / 100.0f; - sp218 = (sp218 < 0) ? 0 - : (sp218 >= 11) ? 10 - : sp218; + sp218 = (sp218 < 0) ? 0 : (sp218 >= 11) ? 10 : sp218; lbl_1_data_1878[sp218] = 15; Hu3DMotionShiftSet(arg0->model[sp218 + 8], arg0->motion[11], 20.0f, 15.0f, HU3D_MOTATTR_NONE); if (temp_r31->unk00 == 9 && lbl_1_bss_54[5].unk00 < 3) { @@ -1041,16 +946,14 @@ void fn_1_3B74(omObjData* arg0) { temp_r31->unk14 += (temp_r31->unk04 == 3 ? lbl_1_bss_4 : lbl_1_bss_0); if (lbl_1_bss_34 >= 1003 && lbl_1_bss_34 < 1005) { if ((temp_r31->unk04 == 3 && temp_r31->unk00 == 9 && temp_r31->unk14 >= 150.0f && temp_r31->unk14 - lbl_1_bss_4 < 150.0f) - || (temp_r31->unk04 == 6 && temp_r31->unk00 == 9 && temp_r31->unk08 == 1)) - { + || (temp_r31->unk04 == 6 && temp_r31->unk00 == 9 && temp_r31->unk08 == 1)) { sp354[j]->unk20 = 5; sp354[j]->unk24 = 0; lbl_1_bss_3C[j]->trans.x = temp_r31->unk0C; lbl_1_bss_3C[j]->trans.y = (j == 0 ? 300 : 0); lbl_1_bss_3C[j]->trans.z = temp_r31->unk14; - lbl_1_bss_3C[j]->rot.y = 180 + ((lbl_1_bss_20 == 4 && temp_r31->unk04 == 6) - ? (temp_r31->unk0C < 0.0f ? -45 : 45) - : 0); + lbl_1_bss_3C[j]->rot.y + = 180 + ((lbl_1_bss_20 == 4 && temp_r31->unk04 == 6) ? (temp_r31->unk0C < 0.0f ? -45 : 45) : 0); Hu3DMotionSpeedSet(arg0->model[j + 79], 1.0f); Hu3DMotionShiftSet(arg0->model[j + 79], arg0->motion[j + 22], 44.0f, 2.0f, HU3D_MOTATTR_NONE); Hu3DParticleCntSet(arg0->model[j + 39], j == 0 ? 15 : 0); @@ -1066,7 +969,8 @@ void fn_1_3B74(omObjData* arg0) { if (temp_r31->unk00 != 10) { if (temp_r31->unk00 != 9) { Hu3DMotionTimeSet(arg0->model[var_r25], 1.0f); - } else { + } + else { Hu3DMotionSet(arg0->model[var_r25], arg0->motion[j + 26]); Hu3DMotionTimeSet(arg0->model[var_r25], 1.0f); Hu3DMotionSpeedSet(arg0->model[var_r25], 1.0f); @@ -1081,22 +985,25 @@ void fn_1_3B74(omObjData* arg0) { temp_r31->unk1C = 0.0f; if (temp_r31->unk00 == 10) { Hu3DModelAttrSet(arg0->model[var_r25], HU3D_MOTATTR_LOOP); - } else if (temp_r31->unk00 != 9) { + } + else if (temp_r31->unk00 != 9) { Hu3DMotionTimeSet(arg0->model[var_r25], 2.0f); Hu3DModelAttrReset(arg0->model[var_r25], HU3D_MOTATTR_LOOP | HU3D_MOTATTR_PAUSE); - } else { + } + else { Hu3DMotionSet(arg0->model[var_r25], arg0->motion[(temp_r31->unk04 == 6) ? (j + 26) : (j + 30)]); Hu3DMotionTimeSet(arg0->model[var_r25], 1.0f); Hu3DMotionSpeedSet(arg0->model[var_r25], 1.0f); } temp_r31->unk04 = 7; Hu3DModelPosSet(arg0->model[var_r25], temp_r31->unk0C, temp_r31->unk10, temp_r31->unk14); - } else { - Hu3DModelPosSet(arg0->model[var_r25], - temp_r31->unk0C, + } + else { + Hu3DModelPosSet(arg0->model[var_r25], temp_r31->unk0C, ((temp_r31->unk00 >= 0 && temp_r31->unk00 < 10) - ? ((temp_r31->unk04 != 6 ? 300 : 0) + lbl_1_rodata_100[temp_r31->unk00]) - : temp_r31->unk10) + lbl_1_rodata_A0[temp_r31->unk00], + ? ((temp_r31->unk04 != 6 ? 300 : 0) + lbl_1_rodata_100[temp_r31->unk00]) + : temp_r31->unk10) + + lbl_1_rodata_A0[temp_r31->unk00], temp_r31->unk14 + lbl_1_rodata_D0[temp_r31->unk00]); } if (temp_r31->unk00 >= 10) { @@ -1105,31 +1012,24 @@ void fn_1_3B74(omObjData* arg0) { break; case 4: if (temp_r31->unk00 >= 0 && temp_r31->unk00 < 10) { - float sp394[] = { - 0.0f, 0.0f, 0.0f, 0.9f, 0.9f, 0.9f, - 1.75f, 1.75f, 1.75f, 0.0f, 0.0f, 0.0f - }; - s32 sp364[] = { - 42, 42, 42, 41, 41, 41, - 48, 48, 48, 27, 27, 27 - }; + float sp394[] = { 0.0f, 0.0f, 0.0f, 0.9f, 0.9f, 0.9f, 1.75f, 1.75f, 1.75f, 0.0f, 0.0f, 0.0f }; + s32 sp364[] = { 42, 42, 42, 41, 41, 41, 48, 48, 48, 27, 27, 27 }; if (temp_r31->unk00 >= 6 && temp_r31->unk00 <= 8) { temp_f29 = temp_r31->unk08; - temp_f27 = (temp_f29 <= 1.0f) ? 0.0 + temp_f27 = (temp_f29 <= 1.0f) ? 0.0 : (temp_f29 >= 30.0f && temp_f29 < 40.0f) ? -1.0 * (1.0 - (temp_f29 - 30.0f) / 9.0) - : (temp_f29 >= 40.0f) ? 1.0 - (temp_f29 - 40.0f) / 8.0 - : 1.0; - temp_f27 = (temp_f29 >= 40.0f) - ? -1.0 + (temp_f27 * 0.5 + temp_f27 * temp_f27 * 0.5) - : temp_f27; + : (temp_f29 >= 40.0f) ? 1.0 - (temp_f29 - 40.0f) / 8.0 + : 1.0; + temp_f27 = (temp_f29 >= 40.0f) ? -1.0 + (temp_f27 * 0.5 + temp_f27 * temp_f27 * 0.5) : temp_f27; temp_f27 = (temp_f29 <= 1.0f) ? 0.0 - : (temp_f29 < 23.0f) ? 1.0 - : (temp_f29 < 32.0f) ? 0.5 - : (temp_f29 < 40.0f) ? -0.8 - : (-1.0 - 0.4 * (1.0 - (temp_f29 - 40.0f) / 8.0)); + : (temp_f29 < 23.0f) ? 1.0 + : (temp_f29 < 32.0f) ? 0.5 + : (temp_f29 < 40.0f) ? -0.8 + : (-1.0 - 0.4 * (1.0 - (temp_f29 - 40.0f) / 8.0)); temp_r31->unk14 -= (lbl_1_bss_4 * sp394[temp_r31->unk00] / 4.0) * temp_f27; - } else { + } + else { temp_r31->unk14 -= lbl_1_bss_4 * sp394[temp_r31->unk00] / 4.0; } if (temp_r31->unk08 >= sp364[temp_r31->unk00]) { @@ -1137,14 +1037,16 @@ void fn_1_3B74(omObjData* arg0) { temp_r31->unk04 = 5; temp_r31->unk08 = 0; } - } else { + } + else { temp_r31->unk1C -= 1.0f; temp_r31->unk10 += temp_r31->unk1C; temp_r31->unk14 += 1.25 * lbl_1_bss_4; if (temp_r31->unk10 <= 0.0f) { if (temp_r31->unk1C < -10.0f && temp_r31->unk00 == 10) { temp_r31->unk1C = 9.0f; - } else { + } + else { temp_r31->unk1C = 0.0f; temp_r31->unk10 = 0.0f; temp_r31->unk04 = 5; @@ -1152,9 +1054,9 @@ void fn_1_3B74(omObjData* arg0) { } } } - Hu3DModelPosSet(arg0->model[var_r25], - temp_r31->unk0C, - lbl_1_rodata_A0[temp_r31->unk00] + ((temp_r31->unk00 >= 0 && temp_r31->unk00 < 10) ? (300.0f + lbl_1_rodata_100[temp_r31->unk00]) : temp_r31->unk10), + Hu3DModelPosSet(arg0->model[var_r25], temp_r31->unk0C, + lbl_1_rodata_A0[temp_r31->unk00] + + ((temp_r31->unk00 >= 0 && temp_r31->unk00 < 10) ? (300.0f + lbl_1_rodata_100[temp_r31->unk00]) : temp_r31->unk10), temp_r31->unk14 + lbl_1_rodata_D0[temp_r31->unk00]); if (temp_r31->unk00 >= 10) { Hu3DModelRotSet(arg0->model[var_r25], 0.0f, temp_r31->unk24, 0.0f); @@ -1176,14 +1078,9 @@ void fn_1_3B74(omObjData* arg0) { temp_r31->unk04 = 2; temp_r31->unk08 = 0; } - Hu3DModelPosSet(arg0->model[var_r25], - temp_r31->unk0C, - temp_r31->unk10 + lbl_1_rodata_A0[temp_r31->unk00], + Hu3DModelPosSet(arg0->model[var_r25], temp_r31->unk0C, temp_r31->unk10 + lbl_1_rodata_A0[temp_r31->unk00], temp_r31->unk14 + lbl_1_rodata_D0[temp_r31->unk00]); - Hu3DModelRotSet(arg0->model[var_r25], - 9.0f, - (temp_r31->unk0C < 0.0f) ? -31 : 31, - (temp_r31->unk0C < 0.0f) ? -18 : 18); + Hu3DModelRotSet(arg0->model[var_r25], 9.0f, (temp_r31->unk0C < 0.0f) ? -31 : 31, (temp_r31->unk0C < 0.0f) ? -18 : 18); break; case 2: temp_r31->unk1C -= (temp_r31->unk00 != 9) ? 0.625 : 0.9; @@ -1195,15 +1092,14 @@ void fn_1_3B74(omObjData* arg0) { temp_r31->unk1C = 0.0f; temp_r31->unk04 = 6; temp_r31->unk08 = 0; - Hu3DModelPosSet(arg0->model[var_r25], - temp_r31->unk0C, - temp_r31->unk10 + lbl_1_rodata_A0[temp_r31->unk00] + lbl_1_rodata_100[temp_r31->unk00] + lbl_1_rodata_100[temp_r31->unk00], + Hu3DModelPosSet(arg0->model[var_r25], temp_r31->unk0C, + temp_r31->unk10 + lbl_1_rodata_A0[temp_r31->unk00] + lbl_1_rodata_100[temp_r31->unk00] + + lbl_1_rodata_100[temp_r31->unk00], temp_r31->unk14 + lbl_1_rodata_D0[temp_r31->unk00]); Hu3DModelRotSet(arg0->model[var_r25], 0.0f, (temp_r31->unk0C < 0.0f) ? -31 : 31, 0.0f); - } else { - Hu3DModelPosSet(arg0->model[var_r25], - temp_r31->unk0C, - temp_r31->unk10 + lbl_1_rodata_A0[temp_r31->unk00], + } + else { + Hu3DModelPosSet(arg0->model[var_r25], temp_r31->unk0C, temp_r31->unk10 + lbl_1_rodata_A0[temp_r31->unk00], temp_r31->unk14 + lbl_1_rodata_D0[temp_r31->unk00]); } break; @@ -1220,8 +1116,7 @@ void fn_1_3B74(omObjData* arg0) { } temp_r31->unk04 = 0; } - Hu3DModelPosSet(arg0->model[var_r25], - temp_r31->unk0C, + Hu3DModelPosSet(arg0->model[var_r25], temp_r31->unk0C, (temp_r31->unk00 >= 0 && temp_r31->unk00 < 9) ? (300.0f + lbl_1_rodata_100[temp_r31->unk00]) : temp_r31->unk10, temp_r31->unk14 + lbl_1_rodata_D0[temp_r31->unk00]); Hu3DModelPosSet(arg0->model[var_r25], temp_r31->unk0C, temp_r31->unk10, temp_r31->unk14); @@ -1246,12 +1141,12 @@ void fn_1_3B74(omObjData* arg0) { } } if (i == 9 && lbl_1_bss_18 != 0) { - ModelData* sp204 = &Hu3DData[arg0->model[j + 39]]; - ParticleData* sp200 = sp204->unk_120; + ModelData *sp204 = &Hu3DData[arg0->model[j + 39]]; + ParticleData *sp200 = sp204->unk_120; if (sp200->unk_34 == 63) { - ModelData* temp_r23 = &Hu3DData[arg0->model[var_r25]]; - ModelData* temp_r22 = &Hu3DData[arg0->model[j + 39]]; + ModelData *temp_r23 = &Hu3DData[arg0->model[var_r25]]; + ModelData *temp_r22 = &Hu3DData[arg0->model[j + 39]]; temp_r22->pos.x = temp_r23->pos.x; temp_r22->pos.y = temp_r23->pos.y; @@ -1263,15 +1158,16 @@ void fn_1_3B74(omObjData* arg0) { } if (temp_r31->unk2C == 0 && (lbl_1_bss_34 == 1004 || lbl_1_bss_34 == 1005)) { if (temp_r31->unk00 != 9 - || (temp_r31->unk04 != 1 && temp_r31->unk04 != 2 && ((temp_r31->unk04 != 3 && temp_r31->unk04 != 6) || sp354[j]->unk20 > 5 || sp354[j]->unk20 < 3))) - { + || (temp_r31->unk04 != 1 && temp_r31->unk04 != 2 + && ((temp_r31->unk04 != 3 && temp_r31->unk04 != 6) || sp354[j]->unk20 > 5 || sp354[j]->unk20 < 3))) { temp_r31->unk2C = 1; } } temp_r31->unk2C += (temp_r31->unk2C > 0); if (temp_r31->unk2C != 0 && (temp_r31->unk2C % 2 == 0 || temp_r31->unk2C > 25)) { Hu3DModelAttrSet(arg0->model[var_r25], 1); - } else { + } + else { Hu3DModelAttrReset(arg0->model[var_r25], 1); } } @@ -1336,41 +1232,37 @@ void fn_1_3B74(omObjData* arg0) { espBankSet(lbl_1_data_40[i * 7 + 3], (lbl_1_data_18F4[i] / 10) % 10); } for (i = 0; i < 4; i++) { - ModelData* temp_r24 = &Hu3DData[lbl_1_bss_3C[i]->model[0]]; + ModelData *temp_r24 = &Hu3DData[lbl_1_bss_3C[i]->model[0]]; float temp_f19 = 0.0f; float sp1F0 = (temp_r24->unk_08 == lbl_1_bss_3C[i]->motion[3]) ? 0 : -1; float sp1EC = (temp_r24->unk_0C == lbl_1_bss_3C[i]->motion[3]) ? 0 : -1; - float sp1E8 = (sp1F0 == -1.0f) ? 0.0f - : (temp_r24->unk_64 < 4.0f) ? 0.0f + float sp1E8 = (sp1F0 == -1.0f) ? 0.0f + : (temp_r24->unk_64 < 4.0f) ? 0.0f : (temp_r24->unk_64 > 28.0f) ? 1.0f - : (temp_r24->unk_64 - 4.0f) / 24.0f; - float sp1E4 = (sp1EC == -1.0f) ? 0.0f - : (temp_r24->unk_84 < 4.0f) ? 0.0f + : (temp_r24->unk_64 - 4.0f) / 24.0f; + float sp1E4 = (sp1EC == -1.0f) ? 0.0f + : (temp_r24->unk_84 < 4.0f) ? 0.0f : (temp_r24->unk_84 > 28.0f) ? 1.0f - : (temp_r24->unk_84 - 4.0f) / 24.0f; - float temp_f18 = (temp_r24->unk_0C == -1) ? 0.0f - : (temp_r24->unk_80 == 0.0f) ? 1.0f - : (temp_r24->unk_7C / temp_r24->unk_80); + : (temp_r24->unk_84 - 4.0f) / 24.0f; + float temp_f18 = (temp_r24->unk_0C == -1) ? 0.0f : (temp_r24->unk_80 == 0.0f) ? 1.0f : (temp_r24->unk_7C / temp_r24->unk_80); temp_f19 = sp1E8 * (1.0f - temp_f18) + sp1E4 * temp_f18; if (!(temp_r24->attr & 1) && sp354[i]->unk20 != 3 && sp354[i]->unk20 != 4 && lbl_1_bss_3C[i]->trans.z < 1400.0f) { Hu3DModelAttrReset(lbl_1_bss_3C[i]->model[1], 1); - Hu3DModelPosSet(lbl_1_bss_3C[i]->model[1], - lbl_1_bss_3C[i]->trans.x, - (lbl_1_bss_3C[i]->trans.z < 620.0f) ? 5 : -295, + Hu3DModelPosSet(lbl_1_bss_3C[i]->model[1], lbl_1_bss_3C[i]->trans.x, (lbl_1_bss_3C[i]->trans.z < 620.0f) ? 5 : -295, lbl_1_bss_3C[i]->trans.z - 165.0f * temp_f19); - Hu3DModelScaleSet(lbl_1_bss_3C[i]->model[1], - 0.75 * (sp354[i]->unk08 == 5 ? 1.25 : 1.0), - 1.0f, - 1.25 * (sp354[i]->unk08 == 5 ? 1.25 : 1.0)); - } else { + Hu3DModelScaleSet( + lbl_1_bss_3C[i]->model[1], 0.75 * (sp354[i]->unk08 == 5 ? 1.25 : 1.0), 1.0f, 1.25 * (sp354[i]->unk08 == 5 ? 1.25 : 1.0)); + } + else { Hu3DModelAttrSet(lbl_1_bss_3C[i]->model[1], 1); } } } -void fn_1_89E0(omObjData* arg0) { - StructBss3CData* spC[4]; +void fn_1_89E0(omObjData *arg0) +{ + StructBss3CData *spC[4]; s32 sp8; s32 var_r29; s32 var_r30; @@ -1380,12 +1272,7 @@ void fn_1_89E0(omObjData* arg0) { spC[i] = lbl_1_bss_3C[i]->data; } for (i = 0; i < 11; i++) { - s32 sp1C[] = { - 0x60A, 0x60B, 0x60C, - 0x60D, 0x60E, 0x60F, - 0x611, 0x610, 0x007, - 0x013, 0x612 - }; + s32 sp1C[] = { 0x60A, 0x60B, 0x60C, 0x60D, 0x60E, 0x60F, 0x611, 0x610, 0x007, 0x013, 0x612 }; if (lbl_1_bss_54[i].unk00 > 3) { lbl_1_bss_54[i].unk00 = 3; @@ -1456,7 +1343,8 @@ void fn_1_89E0(omObjData* arg0) { if (lbl_1_data_18AC != -1) { HuAudSeqFadeOut(lbl_1_data_18AC, 100); } - } else { + } + else { var_r29 = 0; var_r30 = 0; for (i = 0; i < 4; i++) { @@ -1465,15 +1353,14 @@ void fn_1_89E0(omObjData* arg0) { } if (i == 0 && ((spC[0]->unk20 >= 2 && spC[0]->unk20 <= 4) || (spC[0]->unk20 == 4 && lbl_1_data_F0[9][0].unk14 < 70.0f))) { var_r30++; - } else if (i != 0 && spC[i]->unk20 >= 2 && spC[i]->unk20 <= 4) { + } + else if (i != 0 && spC[i]->unk20 >= 2 && spC[i]->unk20 <= 4) { var_r30++; } } if (MGSeqStatGet(lbl_1_bss_2E) == 0 - && ((lbl_1_bss_8 >= 150.0f && var_r29 == 0 && var_r30 == 0) - || (lbl_1_bss_8 >= 240.0f && var_r30 == 0) - || lbl_1_bss_8 >= 360.0f)) - { + && ((lbl_1_bss_8 >= 150.0f && var_r29 == 0 && var_r30 == 0) || (lbl_1_bss_8 >= 240.0f && var_r30 == 0) + || lbl_1_bss_8 >= 360.0f)) { lbl_1_bss_34++; lbl_1_bss_8 = 0.0f; GWPlayerCoinCollectSet(spC[0]->unk04, lbl_1_data_18F4[0]); @@ -1482,7 +1369,8 @@ void fn_1_89E0(omObjData* arg0) { GWPlayerCoinCollectSet(spC[3]->unk04, lbl_1_data_18F4[1]); if (lbl_1_data_18F4[0] == 0 && lbl_1_data_18F4[1] == 0) { HuAudSStreamPlay(4); - } else { + } + else { HuAudSStreamPlay(1); } } @@ -1504,8 +1392,9 @@ void fn_1_89E0(omObjData* arg0) { } } -void fn_1_9410(ModelData* model, ParticleData* particle, Mtx matrix) { - HsfanimStruct01* var_r31; +void fn_1_9410(ModelData *model, ParticleData *particle, Mtx matrix) +{ + HsfanimStruct01 *var_r31; float temp_f31; float temp_f30; s16 i; @@ -1549,10 +1438,10 @@ void fn_1_9410(ModelData* model, ParticleData* particle, Mtx matrix) { var_r31->unk40.b = 0xFF; var_r31->unk40.a = 0x60; var_r31->unk2C = 50.0f; - PSVECAdd(&var_r31->unk08, &var_r31->unk34, &var_r31->unk34); + VECAdd(&var_r31->unk08, &var_r31->unk34, &var_r31->unk34); } if (var_r31->unk00_s16 < 240) { - PSVECAdd(&var_r31->unk08, &var_r31->unk34, &var_r31->unk34); + VECAdd(&var_r31->unk08, &var_r31->unk34, &var_r31->unk34); var_r31->unk08.x *= 0.9f; var_r31->unk08.z *= 0.9f; var_r31->unk08.y *= 0.9f; @@ -1571,7 +1460,8 @@ void fn_1_9410(ModelData* model, ParticleData* particle, Mtx matrix) { } } -void fn_1_9900(omObjData* arg0) { +void fn_1_9900(omObjData *arg0) +{ s32 temp_r28; s32 i; s32 j; @@ -1614,7 +1504,7 @@ void fn_1_9900(omObjData* arg0) { Hu3DMotionSet(arg0->model[i + 8], arg0->motion[0]); Hu3DModelAttrSet(arg0->model[i + 8], HU3D_MOTATTR_LOOP); Hu3DModelAttrReset(arg0->model[i + 8], HU3D_MOTATTR_PAUSE); - Hu3DMotionTimeSet(arg0->model[i + 8], rand8() % (s32) Hu3DMotionMaxTimeGet(arg0->model[i + 8])); + Hu3DMotionTimeSet(arg0->model[i + 8], rand8() % (s32)Hu3DMotionMaxTimeGet(arg0->model[i + 8])); } arg0->model[19] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M422, 26)); Hu3DModelPosSet(arg0->model[19], 1800.0f, 0.0f, -22.0f); @@ -1624,37 +1514,23 @@ void fn_1_9900(omObjData* arg0) { Hu3DModelAttrSet(arg0->model[20], HU3D_MOTATTR_LOOP); for (i = 0; i < 10; i++) { for (j = 0; j < 4; j++) { - s32 spD0[] = { - DATA_MAKE_NUM(DATADIR_M422, 41), - DATA_MAKE_NUM(DATADIR_M422, 42), - DATA_MAKE_NUM(DATADIR_M422, 43), - DATA_MAKE_NUM(DATADIR_M422, 44), - DATA_MAKE_NUM(DATADIR_M422, 45), - DATA_MAKE_NUM(DATADIR_M422, 46), - DATA_MAKE_NUM(DATADIR_M422, 47), - DATA_MAKE_NUM(DATADIR_M422, 48), - DATA_MAKE_NUM(DATADIR_M422, 49), - DATA_MAKE_NUM(DATADIR_M422, 30) - }; - s32 sp30[] = { - DATA_MAKE_NUM(DATADIR_M422, 30), - DATA_MAKE_NUM(DATADIR_M422, 31), - DATA_MAKE_NUM(DATADIR_M422, 32), - DATA_MAKE_NUM(DATADIR_M422, 33), - DATA_MAKE_NUM(DATADIR_M422, 34), - DATA_MAKE_NUM(DATADIR_M422, 35), - DATA_MAKE_NUM(DATADIR_M422, 37), - DATA_MAKE_NUM(DATADIR_M422, 36) - }; + s32 spD0[] = { DATA_MAKE_NUM(DATADIR_M422, 41), DATA_MAKE_NUM(DATADIR_M422, 42), DATA_MAKE_NUM(DATADIR_M422, 43), + DATA_MAKE_NUM(DATADIR_M422, 44), DATA_MAKE_NUM(DATADIR_M422, 45), DATA_MAKE_NUM(DATADIR_M422, 46), DATA_MAKE_NUM(DATADIR_M422, 47), + DATA_MAKE_NUM(DATADIR_M422, 48), DATA_MAKE_NUM(DATADIR_M422, 49), DATA_MAKE_NUM(DATADIR_M422, 30) }; + s32 sp30[] = { DATA_MAKE_NUM(DATADIR_M422, 30), DATA_MAKE_NUM(DATADIR_M422, 31), DATA_MAKE_NUM(DATADIR_M422, 32), + DATA_MAKE_NUM(DATADIR_M422, 33), DATA_MAKE_NUM(DATADIR_M422, 34), DATA_MAKE_NUM(DATADIR_M422, 35), DATA_MAKE_NUM(DATADIR_M422, 37), + DATA_MAKE_NUM(DATADIR_M422, 36) }; temp_r28 = i * 4 + 43 + j; if (i == 9) { - StructBss3CData* var_r23 = lbl_1_bss_3C[j]->data; + StructBss3CData *var_r23 = lbl_1_bss_3C[j]->data; arg0->model[temp_r28] = Hu3DModelCreateFile(sp30[var_r23->unk08]); - } else if (j == 0) { + } + else if (j == 0) { arg0->model[temp_r28] = Hu3DModelCreateFile(spD0[i]); - } else { + } + else { arg0->model[temp_r28] = Hu3DModelLink(arg0->model[temp_r28 - j]); } Hu3DModelAttrSet(arg0->model[temp_r28], HU3D_MOTATTR_LOOP | HU3D_MOTATTR_PAUSE); @@ -1678,15 +1554,13 @@ void fn_1_9900(omObjData* arg0) { } for (i = 0; i < 2; i++) { for (j = 0; j < 10; j++) { - s32 sp28[] = { - DATA_MAKE_NUM(DATADIR_M422, 28), - DATA_MAKE_NUM(DATADIR_M422, 29) - }; + s32 sp28[] = { DATA_MAKE_NUM(DATADIR_M422, 28), DATA_MAKE_NUM(DATADIR_M422, 29) }; temp_r28 = i * 10 + 83 + j; if (j == 0) { arg0->model[temp_r28] = Hu3DModelCreateFile(sp28[i]); - } else { + } + else { arg0->model[temp_r28] = Hu3DModelLink(arg0->model[temp_r28 - j]); } Hu3DModelAttrSet(arg0->model[temp_r28], HU3D_MOTATTR_LOOP); @@ -1706,14 +1580,11 @@ void fn_1_9900(omObjData* arg0) { s32 sp50[] = { 0, 0, 1, 1, 1, 1, -2, 0, 0, 9, 9, 9, 9, -14, 10, 10 }; if (lbl_1_data_0[i] == DATA_MAKE_NUM(DATADIR_MGCONST, 12) || lbl_1_data_0[i] == DATA_MAKE_NUM(DATADIR_MGCONST, 0)) { - StructBss3CData* var_r22 = lbl_1_bss_3C[ - (i == 6) ? 0 - : (i == 13) ? 1 - : (i == 14) ? 2 : 3 - ]->data; + StructBss3CData *var_r22 = lbl_1_bss_3C[(i == 6) ? 0 : (i == 13) ? 1 : (i == 14) ? 2 : 3]->data; lbl_1_data_40[i] = espEntry(lbl_1_data_0[i] + var_r22->unk08, 0, 0); - } else { + } + else { lbl_1_data_40[i] = espEntry(lbl_1_data_0[i], 0, 0); } espDrawNoSet(lbl_1_data_40[i], 0); @@ -1764,9 +1635,10 @@ void fn_1_9900(omObjData* arg0) { arg0->func = fn_1_3B74; } -void fn_1_AC4C(omObjData* arg0) { +void fn_1_AC4C(omObjData *arg0) +{ s32 sp8[] = { 0, 1, 2, 3 }; - StructBss3CData* temp_r31; + StructBss3CData *temp_r31; s32 var_r27; s32 j; s32 i; @@ -1816,14 +1688,16 @@ void fn_1_AC4C(omObjData* arg0) { arg0->func = fn_1_2FC; } -void fn_1_B004(omObjData* arg0) { +void fn_1_B004(omObjData *arg0) +{ lbl_1_bss_34 = 1000; WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 60); arg0->func = fn_1_89E0; } -void ObjectSetup(void) { - omObjData* var_r30; +void ObjectSetup(void) +{ + omObjData *var_r30; s32 i; OSReport("******* M422 ObjectSetup *********\n"); @@ -1868,8 +1742,9 @@ void ObjectSetup(void) { lbl_1_bss_50 = omAddObjEx(lbl_1_bss_30, 102, 0, 0, -1, fn_1_B004); } -void fn_1_B480(omObjData* arg0) { - StructBss3CData* var_r30; +void fn_1_B480(omObjData *arg0) +{ + StructBss3CData *var_r30; s32 i; if (WipeStatGet() == 0) { diff --git a/src/REL/m423Dll/main.c b/src/REL/m423Dll/main.c index c063e916..a511fc2d 100755 --- a/src/REL/m423Dll/main.c +++ b/src/REL/m423Dll/main.c @@ -26,7 +26,7 @@ typedef struct { /* 0x04 */ s32 unk04; /* 0x08 */ s32 unk08; /* 0x0C */ s32 unk0C; - /* 0x10 */ void* unk10; + /* 0x10 */ void *unk10; } StructBssD0Data; // Size 0x14 typedef struct { @@ -36,8 +36,8 @@ typedef struct { } StructData0; // Size 0x1C typedef struct { - /* 0x00 */ StructBssD0Data* unk00; - /* 0x04 */ AnimData* unk04; + /* 0x00 */ StructBssD0Data *unk00; + /* 0x04 */ AnimData *unk04; } StructM423_00; // Size 8 typedef struct { @@ -54,19 +54,19 @@ typedef struct { /* 0x04 */ s16 unk04; /* 0x06 */ char unk06[2]; /* 0x08 */ Vec unk08; - /* 0x14 */ Vec* unk14; - /* 0x18 */ Vec* unk18; - /* 0x1C */ GXColor* unk1C; - /* 0x20 */ StructM423_01* unk20; + /* 0x14 */ Vec *unk14; + /* 0x18 */ Vec *unk18; + /* 0x1C */ GXColor *unk1C; + /* 0x20 */ StructM423_01 *unk20; /* 0x24 */ float unk24[4]; /* 0x34 */ u32 unk34; - /* 0x38 */ void* unk38; + /* 0x38 */ void *unk38; } StructM423_02; // Size 0x3C typedef struct { /* 0x00 */ s16 unk00; /* 0x02 */ s16 unk02; - /* 0x04 */ StructM423_02* unk04; + /* 0x04 */ StructM423_02 *unk04; } StructM423_03; // Size 8 typedef struct { @@ -99,13 +99,13 @@ typedef struct struct_m423_05 { /* 0x2C */ s32 unk2C; /* 0x30 */ u32 unk30; /* 0x34 */ s32 unk34; - /* 0x38 */ AnimData* unk38; - /* 0x3C */ StructM423_04* unk3C; - /* 0x40 */ Vec* unk40; + /* 0x38 */ AnimData *unk38; + /* 0x3C */ StructM423_04 *unk3C; + /* 0x40 */ Vec *unk40; /* 0x44 */ float (*unk44)[2]; - /* 0x48 */ void* unk48; - /* 0x4C */ void* unk4C; - /* 0x50 */ ModelData* unk50; + /* 0x48 */ void *unk48; + /* 0x4C */ void *unk4C; + /* 0x50 */ ModelData *unk50; } StructM423_05; // Size 0x54 typedef struct { @@ -151,15 +151,15 @@ typedef struct { typedef struct { /* 0x000 */ StructM423_0A unk00[16]; - /* 0x200 */ AnimData* unk200; + /* 0x200 */ AnimData *unk200; /* 0x204 */ s32 unk204; - /* 0x208 */ void* unk208; - /* 0x20C */ StructM423_08* unk20C; - /* 0x210 */ StructM423_09* unk210; - /* 0x214 */ GXColor* unk214; + /* 0x208 */ void *unk208; + /* 0x20C */ StructM423_08 *unk20C; + /* 0x210 */ StructM423_09 *unk210; + /* 0x214 */ GXColor *unk214; /* 0x218 */ s32 unk218; /* 0x21C */ s32 unk21C; - /* 0x220 */ void* unk220; + /* 0x220 */ void *unk220; } StructM423_0B; // Size 0x224 typedef struct { @@ -284,100 +284,100 @@ typedef struct { typedef struct { /* 0x00 */ s32 unk00; /* 0x04 */ s32 unk04; - /* 0x08 */ AnimData* unk08; + /* 0x08 */ AnimData *unk08; } StructBssA4Data; // Size 0xC -void fn_1_318(omObjData* arg0); -void fn_1_3B0(omObjData* arg0); -void fn_1_DFC(omObjData* arg0); -void fn_1_E60(omObjData* arg0); +void fn_1_318(omObjData *arg0); +void fn_1_3B0(omObjData *arg0); +void fn_1_DFC(omObjData *arg0); +void fn_1_E60(omObjData *arg0); void fn_1_F10(void); -void fn_1_F60(omObjData* arg0); -void fn_1_11A4(omObjData* arg0); +void fn_1_F60(omObjData *arg0); +void fn_1_11A4(omObjData *arg0); void fn_1_1238(void); -void fn_1_12A0(ModelData* arg0, Mtx arg1); -s32 fn_1_13A0(StructBssD0Data* arg0); +void fn_1_12A0(ModelData *arg0, Mtx arg1); +s32 fn_1_13A0(StructBssD0Data *arg0); void fn_1_1444(s32 arg0); -void fn_1_14A0(ModelData* arg0, Mtx arg1); +void fn_1_14A0(ModelData *arg0, Mtx arg1); s32 fn_1_18FC(void); -void fn_1_1B5C(ModelData* arg0, StructM423_02* arg1); -void fn_1_1F5C(ModelData* arg0, StructM423_02* arg1); -void fn_1_2290(ModelData* arg0, StructM423_02* arg1); -void fn_1_2624(ModelData* arg0, StructM423_02* arg1); +void fn_1_1B5C(ModelData *arg0, StructM423_02 *arg1); +void fn_1_1F5C(ModelData *arg0, StructM423_02 *arg1); +void fn_1_2290(ModelData *arg0, StructM423_02 *arg1); +void fn_1_2624(ModelData *arg0, StructM423_02 *arg1); void fn_1_29B8(s32 arg0); -void fn_1_29BC(ModelData* arg0, Mtx arg1); +void fn_1_29BC(ModelData *arg0, Mtx arg1); void fn_1_2C08(s32 arg0); void fn_1_34D8(void); -void fn_1_3528(omObjData* arg0); -void fn_1_3898(omObjData* arg0); +void fn_1_3528(omObjData *arg0); +void fn_1_3898(omObjData *arg0); void fn_1_3A64(void); void fn_1_3A8C(void); void fn_1_3BFC(void); -void fn_1_3FE0(omObjData* arg0); -void fn_1_4778(omObjData* arg0); -void fn_1_5D18(omObjData* arg0); +void fn_1_3FE0(omObjData *arg0); +void fn_1_4778(omObjData *arg0); +void fn_1_5D18(omObjData *arg0); void fn_1_77D0(void); s32 fn_1_781C(void); s32 fn_1_791C(void); void fn_1_7AA8(s32 arg0); void fn_1_82C8(s32 arg0, s32 arg1, s32 arg2); -void fn_1_8338(omObjData* arg0); -void fn_1_8CB4(omObjData* arg0); +void fn_1_8338(omObjData *arg0); +void fn_1_8CB4(omObjData *arg0); void fn_1_95C4(void); -void fn_1_9614(omObjData* arg0); -void fn_1_98A0(omObjData* arg0); +void fn_1_9614(omObjData *arg0); +void fn_1_98A0(omObjData *arg0); void fn_1_A9AC(void); s32 fn_1_A9D4(s32 arg0, Vec arg1, Vec arg2); void fn_1_AC0C(s32 arg0, Vec arg1); void fn_1_AC80(s32 arg0, Vec arg1); s32 fn_1_AE64(s32 arg0); void fn_1_AEE8(s32 arg0); -StructBssA8Data* fn_1_B13C(s32 arg0); +StructBssA8Data *fn_1_B13C(s32 arg0); void fn_1_B1A4(void); -s32 fn_1_B304(StructBssA8Data** arg0); +s32 fn_1_B304(StructBssA8Data **arg0); void fn_1_B430(void); -void fn_1_BCD8(Vec* arg0, Vec* arg1, Vec* arg2, float arg3, s32 arg4, s32 arg5); -s32 fn_1_C498(Vec* arg0, Vec* arg1, Vec* arg2, Vec* arg3, float arg4, s32 arg5); +void fn_1_BCD8(Vec *arg0, Vec *arg1, Vec *arg2, float arg3, s32 arg4, s32 arg5); +s32 fn_1_C498(Vec *arg0, Vec *arg1, Vec *arg2, Vec *arg3, float arg4, s32 arg5); void fn_1_D930(void); -void fn_1_DA38(omObjData* arg0); +void fn_1_DA38(omObjData *arg0); void fn_1_DBC8(void); s32 fn_1_DC24(Vec arg0, Vec arg1, float arg2, float arg3, float arg4, GXColor arg5); s32 fn_1_DD70(Vec arg0, Vec arg1, float arg2, float arg3, float arg4, float arg5, GXColor arg6); void fn_1_E1BC(void); -void fn_1_E290(omObjData* arg0); +void fn_1_E290(omObjData *arg0); void fn_1_E330(void); s32 fn_1_E334(Vec arg0, Vec arg1, float arg2); void fn_1_E460(void); -void fn_1_E4EC(omObjData* arg0); +void fn_1_E4EC(omObjData *arg0); void fn_1_E60C(void); s32 fn_1_E678(void); -void fn_1_EF44(ModelData* arg0, Mtx arg1); +void fn_1_EF44(ModelData *arg0, Mtx arg1); s32 fn_1_F574(Vec arg0, float arg1, s32 arg2); void fn_1_F690(void); -void fn_1_F6E0(omObjData* arg0); -void fn_1_FA40(omObjData* arg0); +void fn_1_F6E0(omObjData *arg0); +void fn_1_FA40(omObjData *arg0); void fn_1_FF98(void); void fn_1_10028(s32 arg0); void fn_1_100DC(void); -void fn_1_10480(omObjData* arg0); +void fn_1_10480(omObjData *arg0); void fn_1_10540(s32 arg0, s32 arg1, s32 arg2, float arg3); void fn_1_106D8(s32 arg0); void fn_1_10BC8(void); -void fn_1_11008(StructBssD0Data* arg0, void* arg1, s16 arg2, GXTexWrapMode arg3, s32 arg4, s32 arg5); -s16 fn_1_11114(AnimData* arg0, s16 arg1); -void fn_1_11900(ModelData* arg0, Mtx arg1); +void fn_1_11008(StructBssD0Data *arg0, void *arg1, s16 arg2, GXTexWrapMode arg3, s32 arg4, s32 arg5); +s16 fn_1_11114(AnimData *arg0, s16 arg1); +void fn_1_11900(ModelData *arg0, Mtx arg1); float fn_1_121DC(float arg0, float arg1); float fn_1_122F4(float arg0, float arg1, float arg2); float fn_1_12544(float arg0, float arg1, float arg2); -void fn_1_1293C(Mtx arg0, Vec* arg1); -s32 fn_1_12C6C(Vec* arg0, Vec* arg1, float* arg2); -float fn_1_12E68(Vec* arg0, Vec* arg1, s32 arg2); -void fn_1_129F0(Vec* arg0, Vec* arg1, Vec* arg2, float* arg3); -void fn_1_1334C(float* arg0, Vec* arg1, Vec* arg2, Vec* arg3, Vec* arg4); -float fn_1_1367C(Vec* arg0, Vec* arg1, Vec* arg2, Vec* arg3, float* arg4); -s32 fn_1_137C4(Vec* arg0, Vec* arg1, Vec* arg2, Vec* arg3, float arg4, s32 arg5); +void fn_1_1293C(Mtx arg0, Vec *arg1); +s32 fn_1_12C6C(Vec *arg0, Vec *arg1, float *arg2); +float fn_1_12E68(Vec *arg0, Vec *arg1, s32 arg2); +void fn_1_129F0(Vec *arg0, Vec *arg1, Vec *arg2, float *arg3); +void fn_1_1334C(float *arg0, Vec *arg1, Vec *arg2, Vec *arg3, Vec *arg4); +float fn_1_1367C(Vec *arg0, Vec *arg1, Vec *arg2, Vec *arg3, float *arg4); +s32 fn_1_137C4(Vec *arg0, Vec *arg1, Vec *arg2, Vec *arg3, float arg4, s32 arg5); -Process* lbl_1_bss_120; +Process *lbl_1_bss_120; s32 lbl_1_bss_11C; s32 lbl_1_bss_118; s32 lbl_1_bss_114; @@ -390,73 +390,52 @@ s32 lbl_1_bss_FC; s32 lbl_1_bss_EC[4]; s32 lbl_1_bss_DC[4]; s32 lbl_1_bss_D8; -omObjData* lbl_1_bss_D4; -omObjData* lbl_1_bss_D0; -omObjData* lbl_1_bss_CC; -omObjData* lbl_1_bss_BC[4]; -omObjData* lbl_1_bss_B8; -omObjData* lbl_1_bss_AC[3]; -omObjData* lbl_1_bss_A8; -omObjData* lbl_1_bss_A4; -omObjData* lbl_1_bss_A0; -omObjData* lbl_1_bss_9C; -omObjData* lbl_1_bss_98; -StructBss94Data* lbl_1_bss_94; +omObjData *lbl_1_bss_D4; +omObjData *lbl_1_bss_D0; +omObjData *lbl_1_bss_CC; +omObjData *lbl_1_bss_BC[4]; +omObjData *lbl_1_bss_B8; +omObjData *lbl_1_bss_AC[3]; +omObjData *lbl_1_bss_A8; +omObjData *lbl_1_bss_A4; +omObjData *lbl_1_bss_A0; +omObjData *lbl_1_bss_9C; +omObjData *lbl_1_bss_98; +StructBss94Data *lbl_1_bss_94; s32 lbl_1_bss_90; -omObjData* lbl_1_bss_8C; +omObjData *lbl_1_bss_8C; s32 lbl_1_bss_88; s32 lbl_1_bss_84; s32 lbl_1_bss_80; s32 lbl_1_bss_7C; -StructBssA8Data* lbl_1_bss_40[15]; -StructBssA8Data* lbl_1_bss_4[15]; +StructBssA8Data *lbl_1_bss_40[15]; +StructBssA8Data *lbl_1_bss_4[15]; s32 lbl_1_bss_0; -StructData0 lbl_1_data_0[] = { - { { 342.45f, 0.0f, 0.0f }, { 0.0f, 275.0f, 128.0f }, 550.0f }, - { { 6.0f, 0.0f, 0.0f }, { 0.0f, 190.0f, 0.0f }, 550.0f } -}; +StructData0 lbl_1_data_0[] + = { { { 342.45f, 0.0f, 0.0f }, { 0.0f, 275.0f, 128.0f }, 550.0f }, { { 6.0f, 0.0f, 0.0f }, { 0.0f, 190.0f, 0.0f }, 550.0f } }; -StructData0 lbl_1_data_38[] = { - { { 22.0f, 180.0f, 0.0f }, { -250.0f, 120.00001f, 0.0f }, 160.0f }, - { { 22.0f, 180.0f, 0.0f }, { 0.0f, 120.00001f, 0.0f }, 160.0f }, - { { 22.0f, 180.0f, 0.0f }, { 250.0f, 120.00001f, 0.0f }, 160.0f }, - { { -45.0f, 180.0f, 0.0f }, { -250.0f, 75.0f, 0.0f }, 180.0f }, - { { -45.0f, 180.0f, 0.0f }, { 0.0f, 75.0f, 0.0f }, 180.0f }, - { { -45.0f, 180.0f, 0.0f }, { 250.0f, 75.0f, 0.0f }, 180.0f }, - { { -45.0f, 0.0f, 0.0f }, { -250.0f, 95.0f, 0.0f }, 150.0f }, - { { -45.0f, 0.0f, 0.0f }, { 0.0f, 95.0f, 0.0f }, 150.0f }, - { { -45.0f, 0.0f, 0.0f }, { 250.0f, 95.0f, 0.0f }, 150.0f }, - { { -45.0f, 0.0f, 0.0f }, { 0.0f, 95.0f, -850.0f }, 150.0f } -}; +StructData0 lbl_1_data_38[] + = { { { 22.0f, 180.0f, 0.0f }, { -250.0f, 120.00001f, 0.0f }, 160.0f }, { { 22.0f, 180.0f, 0.0f }, { 0.0f, 120.00001f, 0.0f }, 160.0f }, + { { 22.0f, 180.0f, 0.0f }, { 250.0f, 120.00001f, 0.0f }, 160.0f }, { { -45.0f, 180.0f, 0.0f }, { -250.0f, 75.0f, 0.0f }, 180.0f }, + { { -45.0f, 180.0f, 0.0f }, { 0.0f, 75.0f, 0.0f }, 180.0f }, { { -45.0f, 180.0f, 0.0f }, { 250.0f, 75.0f, 0.0f }, 180.0f }, + { { -45.0f, 0.0f, 0.0f }, { -250.0f, 95.0f, 0.0f }, 150.0f }, { { -45.0f, 0.0f, 0.0f }, { 0.0f, 95.0f, 0.0f }, 150.0f }, + { { -45.0f, 0.0f, 0.0f }, { 250.0f, 95.0f, 0.0f }, 150.0f }, { { -45.0f, 0.0f, 0.0f }, { 0.0f, 95.0f, -850.0f }, 150.0f } }; -Vec lbl_1_data_150[] = { - 0.0f, 0.0f, -850.0f, - -250.0f, 0.0f, 0.0f, - 0.0f, 0.0f, 0.0f, - 250.0f, 0.0f, 0.0f -}; +Vec lbl_1_data_150[] = { 0.0f, 0.0f, -850.0f, -250.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 250.0f, 0.0f, 0.0f }; -Vec lbl_1_data_180[] = { - 0.0f, 0.0f, -850.0f, - 850.0f, 0.0f, 0.0f, - 1200.0f, 0.0f, 0.0f, - 1650.0f, 0.0f, 0.0f -}; +Vec lbl_1_data_180[] = { 0.0f, 0.0f, -850.0f, 850.0f, 0.0f, 0.0f, 1200.0f, 0.0f, 0.0f, 1650.0f, 0.0f, 0.0f }; -Vec lbl_1_data_1B0[] = { - { -250.0f, 45.0f, 500.0f }, - { 0.0f, 45.0f, 500.0f }, - { 250.0f, 45.0f, 500.0f } -}; +Vec lbl_1_data_1B0[] = { { -250.0f, 45.0f, 500.0f }, { 0.0f, 45.0f, 500.0f }, { 250.0f, 45.0f, 500.0f } }; Vec lbl_1_data_1D4 = { 1000.0f, 2000.0f, 1000.0f }; Vec lbl_1_data_1E0 = { 0.0f, 1.0f, 0.0f }; Vec lbl_1_data_1EC = { 0.0f, 0.0f, -450.0f }; -void ObjectSetup(void) { - Process* var_r30; - CameraData* var_r29; +void ObjectSetup(void) +{ + Process *var_r30; + CameraData *var_r29; s32 i; OSReport("******* M426ObjectSetup *********\n"); @@ -499,7 +478,8 @@ Vec lbl_1_data_21C = { 0.0f, 0.0f, 0.0f }; Vec lbl_1_data_228 = { -1.0f, -2.0f, -1.0f }; GXColor lbl_1_data_234 = { 0xFF, 0xFF, 0xFF, 0xFF }; -void fn_1_318(omObjData* arg0) { +void fn_1_318(omObjData *arg0) +{ s32 var_r31; var_r31 = Hu3DGLightCreateV(&lbl_1_data_21C, &lbl_1_data_228, &lbl_1_data_234); @@ -520,8 +500,9 @@ void fn_1_318(omObjData* arg0) { s32 lbl_1_data_238[] = { 0, 4, 2, 3, 1, 5 }; s32 lbl_1_data_250[] = { 186, 186, 186, 240, 240, 240 }; -void fn_1_3B0(omObjData* arg0) { - CameraData* var_r28; +void fn_1_3B0(omObjData *arg0) +{ + CameraData *var_r28; float var_f31; s32 temp_r27; s32 var_r30; @@ -580,7 +561,8 @@ void fn_1_3B0(omObjData* arg0) { if ((var_r30 & 0x10) && lbl_1_bss_D8 == -1) { lbl_1_bss_D8 = HuAudSeqPlay(0x46); } - } else { + } + else { var_r30 = 0; } if (lbl_1_bss_11C == -1 || var_r30 == 0) { @@ -632,22 +614,27 @@ void fn_1_3B0(omObjData* arg0) { } if (lbl_1_bss_DC[0] > lbl_1_bss_DC[1] && lbl_1_bss_DC[0] > lbl_1_bss_DC[2]) { i = 0; - } else if (lbl_1_bss_DC[1] > lbl_1_bss_DC[0] && lbl_1_bss_DC[1] > lbl_1_bss_DC[2]) { + } + else if (lbl_1_bss_DC[1] > lbl_1_bss_DC[0] && lbl_1_bss_DC[1] > lbl_1_bss_DC[2]) { i = 1; - } else if (lbl_1_bss_DC[2] > lbl_1_bss_DC[0] && lbl_1_bss_DC[2] > lbl_1_bss_DC[1]) { + } + else if (lbl_1_bss_DC[2] > lbl_1_bss_DC[0] && lbl_1_bss_DC[2] > lbl_1_bss_DC[1]) { i = 2; - } else { + } + else { i = frand() & 3; if (i > 2) { i = 2; - } else if (i < 0) { + } + else if (i < 0) { i = 0; } } fn_1_106D8(i + 6); lbl_1_bss_114 = 10; lbl_1_bss_108 = 0; - } else { + } + else { lbl_1_bss_11C = MGSeqWinCreate(lbl_1_bss_EC[3], -1, -1, -1); fn_1_7AA8(0); for (i = 0; i < 4; i++) { @@ -678,7 +665,8 @@ void fn_1_3B0(omObjData* arg0) { fn_1_E60(arg0); } -void fn_1_DFC(omObjData* arg0) { +void fn_1_DFC(omObjData *arg0) +{ if (WipeStatGet() == 0) { fn_1_1238(); fn_1_3A64(); @@ -694,7 +682,8 @@ void fn_1_DFC(omObjData* arg0) { } } -void fn_1_E60(omObjData* arg0) { +void fn_1_E60(omObjData *arg0) +{ s32 var_r30; var_r30 = 0; @@ -711,17 +700,20 @@ void fn_1_E60(omObjData* arg0) { } } -s32 fn_1_F00(void) { +s32 fn_1_F00(void) +{ return lbl_1_bss_114; } -void fn_1_F10(void) { +void fn_1_F10(void) +{ lbl_1_bss_D0 = omAddObjEx(lbl_1_bss_120, 0x7F, 8, 0, -1, fn_1_F60); } -void fn_1_F60(omObjData* arg0) { - StructBssD0Data* temp_r30; - ModelData* temp_r29; +void fn_1_F60(omObjData *arg0) +{ + StructBssD0Data *temp_r30; + ModelData *temp_r29; temp_r30 = arg0->data = HuMemDirectMallocNum(HEAP_SYSTEM, sizeof(*temp_r30), MEMORY_DEFAULT_NUM); memset(temp_r30, 0, sizeof(*temp_r30)); @@ -741,7 +733,7 @@ void fn_1_F60(omObjData* arg0) { temp_r30->unk00 = 160; temp_r30->unk04 = 160; temp_r30->unk08 = GXGetTexBufferSize(temp_r30->unk00, temp_r30->unk04, 5, 0, 0); - temp_r30->unk10 = HuMemDirectMallocNum(HEAP_DATA, temp_r30->unk08, (u32) temp_r29->unk_48); + temp_r30->unk10 = HuMemDirectMallocNum(HEAP_DATA, temp_r30->unk08, (u32)temp_r29->unk_48); temp_r30->unk0C = 0.0f; arg0->model[4] = fn_1_13A0(temp_r30); Hu3DModelCameraSet(arg0->model[4], 5); @@ -751,11 +743,13 @@ void fn_1_F60(omObjData* arg0) { arg0->func = fn_1_11A4; } -void fn_1_11A4(omObjData* arg0) { +void fn_1_11A4(omObjData *arg0) +{ fn_1_2C08(arg0->model[5]); } -void fn_1_11D8(omObjData* arg0) { +void fn_1_11D8(omObjData *arg0) +{ fn_1_1444(arg0->model[4]); arg0->model[4] = -1; fn_1_29B8(arg0->model[5]); @@ -763,15 +757,17 @@ void fn_1_11D8(omObjData* arg0) { arg0->func = NULL; } -void fn_1_1238(void) { +void fn_1_1238(void) +{ fn_1_11D8(lbl_1_bss_D0); } GXColor lbl_1_data_298 = { 0x00, 0x00, 0x00, 0xFF }; -void fn_1_12A0(ModelData* arg0, Mtx arg1) { - StructBssD0Data* temp_r31; - CameraData* var_r30; +void fn_1_12A0(ModelData *arg0, Mtx arg1) +{ + StructBssD0Data *temp_r31; + CameraData *var_r30; temp_r31 = arg0->unk_120; var_r30 = &Hu3DCamera[1]; @@ -788,9 +784,10 @@ void fn_1_12A0(ModelData* arg0, Mtx arg1) { fn_1_10BC8(); } -s32 fn_1_13A0(StructBssD0Data* arg0) { - StructM423_00* var_r31; - ModelData* temp_r30; +s32 fn_1_13A0(StructBssD0Data *arg0) +{ + StructM423_00 *var_r31; + ModelData *temp_r30; s32 var_r29; var_r29 = Hu3DHookFuncCreate(fn_1_14A0); @@ -802,9 +799,10 @@ s32 fn_1_13A0(StructBssD0Data* arg0) { return var_r29; } -void fn_1_1444(s32 arg0) { - StructM423_00* var_r31; - ModelData* var_r30; +void fn_1_1444(s32 arg0) +{ + StructM423_00 *var_r31; + ModelData *var_r30; if (arg0 >= 0) { var_r30 = &Hu3DData[arg0]; @@ -813,37 +811,21 @@ void fn_1_1444(s32 arg0) { } } -f32 lbl_1_data_29C[] = { - -400.0f, 400.0f, 0.0f, - 400.0f, 400.0f, 0.0f, - 400.0f, 0.0f, 0.0f, - -400.0f, 0.0f, 0.0f -}; +f32 lbl_1_data_29C[] = { -400.0f, 400.0f, 0.0f, 400.0f, 400.0f, 0.0f, 400.0f, 0.0f, 0.0f, -400.0f, 0.0f, 0.0f }; -f32 lbl_1_data_2CC[] = { - 0.0f, 0.0f, - 1.0f, 0.0f, - 1.0f, 0.75f, - 0.0f, 0.75f -}; +f32 lbl_1_data_2CC[] = { 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, 0.75f, 0.0f, 0.75f }; -f32 lbl_1_data_2EC[] = { - 0.0f, 0.0f, - 1.2f, 0.0f, - 1.2f, 0.75f, - 0.0f, 0.75f -}; +f32 lbl_1_data_2EC[] = { 0.0f, 0.0f, 1.2f, 0.0f, 1.2f, 0.75f, 0.0f, 0.75f }; -GXColor lbl_1_data_30C[] = { - { 0x40, 0x40, 0x40, 0xFF } -}; +GXColor lbl_1_data_30C[] = { { 0x40, 0x40, 0x40, 0xFF } }; GXColor lbl_1_data_310 = { 0x00, 0x00, 0x00, 0x80 }; -void fn_1_14A0(ModelData* arg0, Mtx arg1) { - CameraData* var_r28; - StructM423_00* temp_r29; - StructBssD0Data* temp_r30; +void fn_1_14A0(ModelData *arg0, Mtx arg1) +{ + CameraData *var_r28; + StructM423_00 *temp_r29; + StructBssD0Data *temp_r30; Mtx spC; s16 i; @@ -855,7 +837,7 @@ void fn_1_14A0(ModelData* arg0, Mtx arg1) { return; } GXLoadPosMtxImm(arg1, GX_PNMTX0); - PSMTXInvXpose(arg1, spC); + MTXInvXpose(arg1, spC); GXLoadNrmMtxImm(spC, GX_PNMTX0); GXSetTevColor(GX_TEVREG2, lbl_1_data_310); GXSetNumTevStages(2); @@ -874,7 +856,8 @@ void fn_1_14A0(ModelData* arg0, Mtx arg1) { GXSetTevOp(GX_TEVSTAGE1, GX_REPLACE); GXSetTevColorIn(GX_TEVSTAGE1, GX_CC_CPREV, GX_CC_C2, GX_CC_TEXA, GX_CC_ZERO); GXSetTevColorOp(GX_TEVSTAGE1, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, GX_TEVPREV); - } else { + } + else { GXSetTevOp(GX_TEVSTAGE1, GX_REPLACE); GXSetTevColorIn(GX_TEVSTAGE1, GX_CC_CPREV, GX_CC_ZERO, GX_CC_ZERO, GX_CC_ZERO); GXSetTevColorOp(GX_TEVSTAGE1, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, GX_TEVPREV); @@ -912,21 +895,15 @@ void fn_1_14A0(ModelData* arg0, Mtx arg1) { } } -s32 lbl_1_data_314[][2] = { - { 20, 10 }, { 20, 7 }, { 10, 10 }, { 10, 10 } -}; +s32 lbl_1_data_314[][2] = { { 20, 10 }, { 20, 7 }, { 10, 10 }, { 10, 10 } }; -Vec lbl_1_data_334[] = { - { 0.0f, 100.0f, -1100.0f }, - { 0.0f, 200.0f, -1000.0f }, - { -225.0f, 100.0f, -1000.0f }, - { 225.0f, 100.0f, -1000.0f } -}; +Vec lbl_1_data_334[] = { { 0.0f, 100.0f, -1100.0f }, { 0.0f, 200.0f, -1000.0f }, { -225.0f, 100.0f, -1000.0f }, { 225.0f, 100.0f, -1000.0f } }; -s32 fn_1_18FC(void) { - ModelData* temp_r30; - StructM423_03* var_r29; - StructM423_02* temp_r31; +s32 fn_1_18FC(void) +{ + ModelData *temp_r30; + StructM423_03 *var_r29; + StructM423_02 *temp_r31; s32 var_r27; s32 i; @@ -970,23 +947,20 @@ s32 fn_1_18FC(void) { return var_r27; } -Vec lbl_1_data_364[] = { - { -200.0f, 0.0f, -1100.0f }, - { -200.0f, 200.0f, -1050.0f }, - { 200.0f, 200.0f, -1050.0f } -}; +Vec lbl_1_data_364[] = { { -200.0f, 0.0f, -1100.0f }, { -200.0f, 200.0f, -1050.0f }, { 200.0f, 200.0f, -1050.0f } }; GXColor lbl_1_data_388 = { 0xFF, 0xFF, 0xFF, 0xFF }; -void fn_1_1B5C(ModelData* arg0, StructM423_02* arg1) { +void fn_1_1B5C(ModelData *arg0, StructM423_02 *arg1) +{ float var_f31; float var_f30; float var_f29; - Vec* var_r27; - GXColor* var_r26; - StructM423_01* var_r28; - void* var_r25; - void* var_r23; + Vec *var_r27; + GXColor *var_r26; + StructM423_01 *var_r28; + void *var_r25; + void *var_r23; s32 i; s32 j; @@ -1006,7 +980,8 @@ void fn_1_1B5C(ModelData* arg0, StructM423_02* arg1) { var_r28->unk02 = i; if (i == 0 || i == 9 || j == 0 || j == 19) { var_r28->unk04 = 1; - } else { + } + else { var_r28->unk04 = 0; } var_r28->unk06 = 0; @@ -1050,14 +1025,15 @@ void fn_1_1B5C(ModelData* arg0, StructM423_02* arg1) { GXColor lbl_1_data_3AB = { 0xFF, 0xFF, 0xFF, 0xFF }; -void fn_1_1F5C(ModelData* arg0, StructM423_02* arg1) { +void fn_1_1F5C(ModelData *arg0, StructM423_02 *arg1) +{ float var_f31; float var_f30; float var_f29; - Vec* var_r27; - GXColor* var_r26; - void* var_r25; - void* var_r23; + Vec *var_r27; + GXColor *var_r26; + void *var_r25; + void *var_r23; s32 i; s32 j; @@ -1110,15 +1086,16 @@ void fn_1_1F5C(ModelData* arg0, StructM423_02* arg1) { GXColor lbl_1_data_3AF = { 0xFF, 0xFF, 0xFF, 0xFF }; -void fn_1_2290(ModelData* arg0, StructM423_02* arg1) { +void fn_1_2290(ModelData *arg0, StructM423_02 *arg1) +{ float var_f31; float var_f30; float var_f29; float var_f28; - Vec* var_r27; - GXColor* var_r26; - void* var_r25; - void* var_r23; + Vec *var_r27; + GXColor *var_r26; + void *var_r25; + void *var_r23; s32 i; s32 j; @@ -1175,15 +1152,16 @@ void fn_1_2290(ModelData* arg0, StructM423_02* arg1) { GXColor lbl_1_data_3B3 = { 0xFF, 0xFF, 0xFF, 0xFF }; -void fn_1_2624(ModelData* arg0, StructM423_02* arg1) { +void fn_1_2624(ModelData *arg0, StructM423_02 *arg1) +{ float var_f31; float var_f30; float var_f29; float var_f28; - Vec* var_r27; - GXColor* var_r26; - void* var_r25; - void* var_r23; + Vec *var_r27; + GXColor *var_r26; + void *var_r25; + void *var_r23; s32 i; s32 j; @@ -1238,18 +1216,18 @@ void fn_1_2624(ModelData* arg0, StructM423_02* arg1) { HuMemDirectFree(var_r25); } -void fn_1_29B8(s32 arg0) { -} +void fn_1_29B8(s32 arg0) { } -void fn_1_29BC(ModelData* arg0, Mtx arg1) { - StructM423_03* temp_r30; - StructM423_02* temp_r31; +void fn_1_29BC(ModelData *arg0, Mtx arg1) +{ + StructM423_03 *temp_r30; + StructM423_02 *temp_r31; Mtx sp8; s16 i; temp_r30 = arg0->unk_120; GXLoadPosMtxImm(arg1, GX_PNMTX0); - PSMTXInvXpose(arg1, sp8); + MTXInvXpose(arg1, sp8); GXLoadNrmMtxImm(sp8, GX_PNMTX0); GXSetLineWidth(6, GX_TO_ZERO); GXSetNumTevStages(1); @@ -1284,26 +1262,27 @@ void fn_1_29BC(ModelData* arg0, Mtx arg1) { } } -void fn_1_2C08(s32 arg0) { +void fn_1_2C08(s32 arg0) +{ Vec sp3C; Vec sp30; Vec sp24; - Vec* var_r25; - Vec* var_r24; - Vec* temp_r27; - Vec* temp_r29; + Vec *var_r25; + Vec *var_r24; + Vec *temp_r27; + Vec *temp_r29; float temp_f31; float temp_f28; float temp_f30; float var_f29; float var_f27; - StructM423_02* temp_r30; - StructM423_01* var_r28; - StructBssA8Data* var_r31; - StructM423_03* var_r17; - ModelData* sp20; - ModelData* sp1C; - StructM423_01* sp18; + StructM423_02 *temp_r30; + StructM423_01 *var_r28; + StructBssA8Data *var_r31; + StructM423_03 *var_r17; + ModelData *sp20; + ModelData *sp1C; + StructM423_01 *sp18; s32 var_r20; s32 temp_r19; s32 temp_r18; @@ -1330,30 +1309,28 @@ void fn_1_2C08(s32 arg0) { if (var_r28->unk04 != 0) { continue; } - PSVECSubtract(var_r24, var_r25, &sp30); - temp_f31 = PSVECMag(&sp30); + VECSubtract(var_r24, var_r25, &sp30); + temp_f31 = VECMag(&sp30); if (temp_f31 >= 0.0f) { - PSVECScale(&sp30, &sp30, 0.05f); - PSVECAdd(&var_r28->unk08, &sp30, &var_r28->unk08); - temp_f31 = PSVECMag(&var_r28->unk08); + VECScale(&sp30, &sp30, 0.05f); + VECAdd(&var_r28->unk08, &sp30, &var_r28->unk08); + temp_f31 = VECMag(&var_r28->unk08); if (temp_f31 > 10.0f) { - PSVECNormalize(&var_r28->unk08, &var_r28->unk08); - PSVECScale(&var_r28->unk08, &var_r28->unk08, 10.0f); + VECNormalize(&var_r28->unk08, &var_r28->unk08); + VECScale(&var_r28->unk08, &var_r28->unk08, 10.0f); } } - PSVECAdd(var_r25, &var_r28->unk08, var_r25); - PSVECScale(&var_r28->unk08, &var_r28->unk08, 0.5f); + VECAdd(var_r25, &var_r28->unk08, var_r25); + VECScale(&var_r28->unk08, &var_r28->unk08, 0.5f); } for (i = 0; i < 15; i++, var_r31++) { if (var_r31->unk06 == 0 || var_r31->unk0C != 3) { continue; } spC = 0; - PSVECSubtract(&var_r31->unk38, &var_r31->unk74, &sp30); - if (var_r31->unk38.x > -225.0f && var_r31->unk38.x < 225.0f - && var_r31->unk38.y > 0.0f && var_r31->unk38.y < 200.0f - && var_r31->unk38.z > -1150.0f && var_r31->unk38.z < -950.0f) - { + VECSubtract(&var_r31->unk38, &var_r31->unk74, &sp30); + if (var_r31->unk38.x > -225.0f && var_r31->unk38.x < 225.0f && var_r31->unk38.y > 0.0f && var_r31->unk38.y < 200.0f + && var_r31->unk38.z > -1150.0f && var_r31->unk38.z < -950.0f) { var_f27 = 0.005f * var_r31->unk38.y; var_f29 = -900.0f - (150.0f + var_f27 * 50.0f); if (var_r31->unk38.z - 20.0 < var_f29) { @@ -1375,14 +1352,14 @@ void fn_1_2C08(s32 arg0) { sp24.x = var_r31->unk5C.z; sp24.z = -var_r31->unk5C.x; sp24.y = 0.0f; - temp_f31 = 0.05 * PSVECMag(&sp24); + temp_f31 = 0.05 * VECMag(&sp24); if (temp_f31 > 0.00001f) { - PSMTXRotAxisRad(sp48, &sp24, temp_f31); - PSMTXConcat(sp48, sp1C->unk_F0, sp1C->unk_F0); + MTXRotAxisRad(sp48, &sp24, temp_f31); + MTXConcat(sp48, sp1C->unk_F0, sp1C->unk_F0); } temp_f31 = 0.0133333336f * fabs(var_f29 - (var_r31->unk38.z - 20.0)); - var_r31->unk50.z += temp_f31 * 0.4f; - PSVECScale(&var_r31->unk50, &var_r31->unk50, 0.95f); + var_r31->unk50.z += temp_f31 * 0.4f; + VECScale(&var_r31->unk50, &var_r31->unk50, 0.95f); var_r31->unk50.y *= 0.0f; var_r31->unk50.x *= 0.75f; sp14 = (var_r31->unk38.x - -225.0f) / 22.5f; @@ -1410,33 +1387,36 @@ void fn_1_2C08(s32 arg0) { } temp_r29 = &temp_r30->unk14[temp_r21]; temp_r27 = &temp_r30->unk18[temp_r21]; - PSVECSubtract(&sp3C, temp_r29, &sp30); + VECSubtract(&sp3C, temp_r29, &sp30); sp30.z = 0.0f; - temp_f31 = PSVECMag(&sp30); + temp_f31 = VECMag(&sp30); if (temp_f31 > 400.0f) { continue; } if (temp_f31 > 20.0) { temp_f30 = 0.0025f * (400.0f - temp_f31); temp_f30 = temp_f30 * temp_f30; - PSVECNormalize(&sp30, &sp30); - PSVECScale(&sp30, &sp30, 20.0f * (temp_f30 * temp_f30)); + VECNormalize(&sp30, &sp30); + VECScale(&sp30, &sp30, 20.0f * (temp_f30 * temp_f30)); temp_r29->x += 0.5f * (temp_r27->x + sp30.x - temp_r29->x); temp_r29->y += 0.5f * (temp_r27->y + sp30.y - temp_r29->y); temp_r29->z += 0.5f * (temp_r27->z - temp_f30 * temp_f28 - temp_r29->z); - } else { + } + else { temp_f30 = cosd(0.0025f * temp_f31 * 90.0f); if (temp_f31 != 0.0f) { - PSVECNormalize(&sp30, &sp30); - } else { + VECNormalize(&sp30, &sp30); + } + else { sp30.x = sp30.y = sp30.z = 0.0f; } - PSVECScale(&sp30, &sp30, temp_f30 * temp_f30 * 20.0f); + VECScale(&sp30, &sp30, temp_f30 * temp_f30 * 20.0f); temp_r29->z += 0.5f * (temp_r27->z - temp_f30 * temp_f28 - temp_r29->z); } } } - } else { + } + else { var_r31->unk10 = 0; } } @@ -1444,61 +1424,31 @@ void fn_1_2C08(s32 arg0) { PPCSync(); } -void fn_1_34D8(void) { +void fn_1_34D8(void) +{ lbl_1_bss_CC = omAddObjEx(lbl_1_bss_120, 0x81, 20, 6, -1, fn_1_3528); } -Vec lbl_1_data_3B8[] = { - -1300.0f, 300.0f, -2350.0f, - -800.0f, 200.0f, -2250.0f, - 800.0f, 200.0f, -2250.0f, - 1300.0f, 300.0f, -2350.0f, - -1000.0f, 300.0f, -2350.0f, - 1000.0f, 300.0f, -2350.0f, - -1200.0f, 400.0f, -2450.0f, - -800.0f, 400.0f, -2450.0f, - 800.0f, 400.0f, -2450.0f, - 1200.0f, 400.0f, -2450.0f, - -1400.0f, 200.0f, -2250.0f, - 1400.0f, 200.0f, -2250.0f, - -1400.0f, 400.0f, -2450.0f, - 1400.0f, 400.0f, -2450.0f, - -900.0f, 500.0f, -2550.0f, - 900.0f, 500.0f, -2550.0f, - -1200.0f, 500.0f, -2550.0f, - 1200.0f, 500.0f, -2550.0f, - -1100.0f, 200.0f, -2250.0f, - 1100.0f, 200.0f, -2250.0f -}; +Vec lbl_1_data_3B8[] = { -1300.0f, 300.0f, -2350.0f, -800.0f, 200.0f, -2250.0f, 800.0f, 200.0f, -2250.0f, 1300.0f, 300.0f, -2350.0f, -1000.0f, 300.0f, + -2350.0f, 1000.0f, 300.0f, -2350.0f, -1200.0f, 400.0f, -2450.0f, -800.0f, 400.0f, -2450.0f, 800.0f, 400.0f, -2450.0f, 1200.0f, 400.0f, -2450.0f, + -1400.0f, 200.0f, -2250.0f, 1400.0f, 200.0f, -2250.0f, -1400.0f, 400.0f, -2450.0f, 1400.0f, 400.0f, -2450.0f, -900.0f, 500.0f, -2550.0f, 900.0f, + 500.0f, -2550.0f, -1200.0f, 500.0f, -2550.0f, 1200.0f, 500.0f, -2550.0f, -1100.0f, 200.0f, -2250.0f, 1100.0f, 200.0f, -2250.0f }; -s32 lbl_1_data_4A8[] = { - 0, 1, 0, 1, 2, 2, 1, 0, - 1, 2, 0, 1, 2, 0, 1, 2, - 0, 1, 2, 1, 0 -}; +s32 lbl_1_data_4A8[] = { 0, 1, 0, 1, 2, 2, 1, 0, 1, 2, 0, 1, 2, 0, 1, 2, 0, 1, 2, 1, 0 }; -s32 lbl_1_data_4FC[] = { - DATA_MAKE_NUM(DATADIR_M423, 12), - DATA_MAKE_NUM(DATADIR_M423, 15), - DATA_MAKE_NUM(DATADIR_M423, 18) -}; +s32 lbl_1_data_4FC[] = { DATA_MAKE_NUM(DATADIR_M423, 12), DATA_MAKE_NUM(DATADIR_M423, 15), DATA_MAKE_NUM(DATADIR_M423, 18) }; -s32 lbl_1_data_508[] = { - DATA_MAKE_NUM(DATADIR_M423, 13), - DATA_MAKE_NUM(DATADIR_M423, 14), - DATA_MAKE_NUM(DATADIR_M423, 16), - DATA_MAKE_NUM(DATADIR_M423, 17), - DATA_MAKE_NUM(DATADIR_M423, 19), - DATA_MAKE_NUM(DATADIR_M423, 20) -}; +s32 lbl_1_data_508[] = { DATA_MAKE_NUM(DATADIR_M423, 13), DATA_MAKE_NUM(DATADIR_M423, 14), DATA_MAKE_NUM(DATADIR_M423, 16), + DATA_MAKE_NUM(DATADIR_M423, 17), DATA_MAKE_NUM(DATADIR_M423, 19), DATA_MAKE_NUM(DATADIR_M423, 20) }; s16 lbl_1_data_520[] = { 0, 2, 4 }; -void fn_1_3528(omObjData* arg0) { +void fn_1_3528(omObjData *arg0) +{ float var_f30; float var_f29; float temp_f31; - StructBssCCData* var_r30; + StructBssCCData *var_r30; s32 temp_r27; s32 var_r28; s32 i; @@ -1525,7 +1475,8 @@ void fn_1_3528(omObjData* arg0) { Hu3DModelPosSet(var_r28, lbl_1_data_3B8[i].x, lbl_1_data_3B8[i].y, lbl_1_data_3B8[i].z); if (var_r30->unk00 != 1) { Hu3DModelRotSet(var_r28, 0.0f, temp_f31, 0.0f); - } else { + } + else { Hu3DModelRotSet(var_r28, 10.0f, temp_f31, 0.0f); } Hu3DModelScaleSet(var_r28, 1.8f, 1.8f, 1.8f); @@ -1541,8 +1492,9 @@ void fn_1_3528(omObjData* arg0) { s16 lbl_1_data_526[] = { 0, 2, 4 }; s16 lbl_1_data_52C[] = { 1, 3, 5, 0 }; -void fn_1_3898(omObjData* arg0) { - StructBssCCData* var_r31; +void fn_1_3898(omObjData *arg0) +{ + StructBssCCData *var_r31; s32 var_r28; s32 i; @@ -1552,13 +1504,16 @@ void fn_1_3898(omObjData* arg0) { if (var_r31->unk06 > 0) { var_r28 = 1; var_r31->unk06--; - } else if (var_r31->unk0A > 0) { + } + else if (var_r31->unk0A > 0) { if (var_r31->unk08 > 0) { var_r31->unk08--; - } else if (var_r31->unk0A > 0) { + } + else if (var_r31->unk0A > 0) { var_r28 = 1; var_r31->unk0A--; - } else { + } + else { var_r31->unk08 = 0; var_r31->unk0A = 0; } @@ -1567,24 +1522,28 @@ void fn_1_3898(omObjData* arg0) { var_r31->unk02 = var_r28; if (var_r31->unk02 == 0) { Hu3DMotionShiftSet(arg0->model[i], arg0->motion[lbl_1_data_526[var_r31->unk00]], 0.0f, 8.0f, HU3D_MOTATTR_LOOP); - } else { + } + else { Hu3DMotionShiftSet(arg0->model[i], arg0->motion[lbl_1_data_52C[var_r31->unk00]], 0.0f, 8.0f, HU3D_MOTATTR_LOOP); } } } } -void fn_1_3A58(omObjData* arg0) { +void fn_1_3A58(omObjData *arg0) +{ arg0->func = NULL; } -void fn_1_3A64(void) { +void fn_1_3A64(void) +{ fn_1_3A58(lbl_1_bss_CC); } -void fn_1_3A8C(void) { - omObjData* var_r29; - StructBssCCData* var_r31; +void fn_1_3A8C(void) +{ + omObjData *var_r29; + StructBssCCData *var_r31; s32 i; if (lbl_1_bss_CC == NULL) { @@ -1595,14 +1554,16 @@ void fn_1_3A8C(void) { for (i = 0; i < 20; i++, var_r31++) { if (var_r31->unk06 > 0 || var_r31->unk0A > 0) { var_r31->unk08 = 0; - } else { + } + else { var_r31->unk08 = (1.0f / 127) * frand7() * 0.25f * 60.0f; } var_r31->unk0A = ((1.0f / 127) * frand7() + 2.0f) * 60.0f; } } -void fn_1_3BFC(void) { +void fn_1_3BFC(void) +{ s32 sp8[4]; s32 temp_r28; s32 temp_r27; @@ -1618,7 +1579,8 @@ void fn_1_3BFC(void) { for (i = 0, var_r29 = 0; i < 4; i++) { if (GWPlayerCfgGroupGet(i) == 0) { sp8[3] = i; - } else { + } + else { sp8[var_r29] = i; var_r29++; } @@ -1633,10 +1595,11 @@ void fn_1_3BFC(void) { sp8[1] = 2; sp8[2] = 3; sp8[3] = 0; - } else { + } + else { for (i = 0; i < 32; i++) { - temp_r28 = (s16) (frand() & 0xFFF) % 3; - temp_r27 = (s16) (frand() & 0xFFF) % 3; + temp_r28 = (s16)(frand() & 0xFFF) % 3; + temp_r27 = (s16)(frand() & 0xFFF) % 3; if (temp_r28 != temp_r27) { var_r29 = sp8[temp_r27]; sp8[temp_r27] = sp8[temp_r28]; @@ -1655,7 +1618,8 @@ void fn_1_3BFC(void) { if (GWPlayerCfg[lbl_1_bss_BC[i]->work[0]].iscom) { lbl_1_bss_FC = 1; } - } else { + } + else { lbl_1_bss_EC[var_r26] = GWPlayerCfg[lbl_1_bss_BC[i]->work[0]].character; var_r26++; lbl_1_bss_BC[i]->work[1] = 1; @@ -1679,47 +1643,23 @@ void fn_1_3BFC(void) { } } -u32 lbl_1_data_534[][2] = { - { DATA_MAKE_NUM(DATADIR_MARIOMOT, 0), -1 }, - { DATA_MAKE_NUM(DATADIR_MARIOMOT, 2), -1 }, - { DATA_MAKE_NUM(DATADIR_MARIOMOT, 3), -1 }, - { 0, 0 }, - { 0, 1 }, - { 0, 2 }, - { DATA_MAKE_NUM(DATADIR_MARIOMOT, 23), -1 }, - { DATA_MAKE_NUM(DATADIR_MARIOMOT, 24), -1 } -}; +u32 lbl_1_data_534[][2] + = { { DATA_MAKE_NUM(DATADIR_MARIOMOT, 0), -1 }, { DATA_MAKE_NUM(DATADIR_MARIOMOT, 2), -1 }, { DATA_MAKE_NUM(DATADIR_MARIOMOT, 3), -1 }, { 0, 0 }, + { 0, 1 }, { 0, 2 }, { DATA_MAKE_NUM(DATADIR_MARIOMOT, 23), -1 }, { DATA_MAKE_NUM(DATADIR_MARIOMOT, 24), -1 } }; -s32 lbl_1_data_574[] = { - DATA_MAKE_NUM(DATADIR_M423, 58), - DATA_MAKE_NUM(DATADIR_M423, 26), - DATA_MAKE_NUM(DATADIR_M423, 34) -}; +s32 lbl_1_data_574[] = { DATA_MAKE_NUM(DATADIR_M423, 58), DATA_MAKE_NUM(DATADIR_M423, 26), DATA_MAKE_NUM(DATADIR_M423, 34) }; -u32 lbl_1_data_580[][2] = { - { DATA_MAKE_NUM(DATADIR_MARIOMOT, 0), -1 }, - { DATA_MAKE_NUM(DATADIR_MARIOMOT, 2), -1 }, - { DATA_MAKE_NUM(DATADIR_MARIOMOT, 3), -1 }, - { 0, 0 }, - { 0, 1 }, - { 0, 2 }, - { 0, 3 }, - { DATA_MAKE_NUM(DATADIR_MARIOMOT, 11), -1 }, - { DATA_MAKE_NUM(DATADIR_MARIOMOT, 6), -1 }, - { DATA_MAKE_NUM(DATADIR_MARIOMOT, 23), -1 }, - { DATA_MAKE_NUM(DATADIR_MARIOMOT, 24), -1 } -}; +u32 lbl_1_data_580[][2] = { { DATA_MAKE_NUM(DATADIR_MARIOMOT, 0), -1 }, { DATA_MAKE_NUM(DATADIR_MARIOMOT, 2), -1 }, + { DATA_MAKE_NUM(DATADIR_MARIOMOT, 3), -1 }, { 0, 0 }, { 0, 1 }, { 0, 2 }, { 0, 3 }, { DATA_MAKE_NUM(DATADIR_MARIOMOT, 11), -1 }, + { DATA_MAKE_NUM(DATADIR_MARIOMOT, 6), -1 }, { DATA_MAKE_NUM(DATADIR_MARIOMOT, 23), -1 }, { DATA_MAKE_NUM(DATADIR_MARIOMOT, 24), -1 } }; -s32 lbl_1_data_5D8[] = { - DATA_MAKE_NUM(DATADIR_M423, 42), - DATA_MAKE_NUM(DATADIR_M423, 66), - DATA_MAKE_NUM(DATADIR_M423, 50), - DATA_MAKE_NUM(DATADIR_M423, 74) -}; +s32 lbl_1_data_5D8[] + = { DATA_MAKE_NUM(DATADIR_M423, 42), DATA_MAKE_NUM(DATADIR_M423, 66), DATA_MAKE_NUM(DATADIR_M423, 50), DATA_MAKE_NUM(DATADIR_M423, 74) }; -void fn_1_3FE0(omObjData* arg0) { +void fn_1_3FE0(omObjData *arg0) +{ float var_f31; - StructBssBCData* temp_r31; + StructBssBCData *temp_r31; s32 i; temp_r31 = arg0->data = HuMemDirectMallocNum(HEAP_SYSTEM, sizeof(*temp_r31), MEMORY_DEFAULT_NUM); @@ -1760,7 +1700,8 @@ void fn_1_3FE0(omObjData* arg0) { for (i = 0; i < 11; i++) { if (lbl_1_data_580[i][1] == -1) { arg0->motion[i] = CharModelMotionCreate(temp_r31->unk02, lbl_1_data_580[i][0]); - } else { + } + else { arg0->motion[i] = Hu3DJointMotionFile(arg0->model[0], lbl_1_data_5D8[lbl_1_data_580[i][1]] + temp_r31->unk02); } } @@ -1799,11 +1740,13 @@ void fn_1_3FE0(omObjData* arg0) { } temp_r31->unk84 = i; arg0->func = fn_1_5D18; - } else { + } + else { for (i = 0; i < 8; i++) { if (lbl_1_data_534[i][1] == -1) { arg0->motion[i] = CharModelMotionCreate(temp_r31->unk02, lbl_1_data_534[i][0]); - } else { + } + else { arg0->motion[i] = Hu3DJointMotionFile(arg0->model[0], lbl_1_data_574[lbl_1_data_534[i][1]] + temp_r31->unk02); } } @@ -1833,7 +1776,8 @@ Vec lbl_1_data_5E8 = { 0.0f, 20.0f, 50.0f }; GXColor lbl_1_data_5F4 = { 0xFF, 0xFF, 0xFF, 0x10 }; GXColor lbl_1_data_5F8 = { 0xFF, 0xFF, 0xFF, 0x40 }; -void fn_1_4778(omObjData* arg0) { +void fn_1_4778(omObjData *arg0) +{ Mtx sp11C; Vec sp110; Vec sp104; @@ -1842,8 +1786,8 @@ void fn_1_4778(omObjData* arg0) { float temp_f29; float temp_f30; float var_f25; - StructBssBCData* temp_r31; - ModelData* temp_r27; + StructBssBCData *temp_r31; + ModelData *temp_r27; s32 temp_r26; s16 var_r25; s16 var_r24; @@ -1975,7 +1919,8 @@ void fn_1_4778(omObjData* arg0) { temp_f30 = fabs(fn_1_121DC(arg0->rot.y, temp_r31->unk78)); if (temp_f30 < 10.0f) { arg0->rot.y += temp_f30; - } else { + } + else { arg0->rot.y += 10.0f; } sp104 = lbl_1_data_5E8; @@ -2059,8 +2004,8 @@ void fn_1_4778(omObjData* arg0) { if (temp_r26 == -1 || temp_r31->unk5C == -1) { temp_r31->unk18 = 3; } - PSVECSubtract(&temp_r31->unkD4, &temp_r31->unkC8, &spF8); - PSVECNormalize(&spF8, &spF8); + VECSubtract(&temp_r31->unkD4, &temp_r31->unkC8, &spF8); + VECNormalize(&spF8, &spF8); temp_f27 = 15.0f; spF8.x *= temp_r31->unk60 * cosd(temp_f27); spF8.z *= temp_r31->unk60 * cosd(temp_f27); @@ -2078,9 +2023,11 @@ void fn_1_4778(omObjData* arg0) { temp_f29 = (temp_r31->unk60 - 15.000001f) / 30.0f; if (temp_f29 > 0.66f) { HuAudFXPlay(0x61B); - } else if (temp_f29 > 0.33f) { + } + else if (temp_f29 > 0.33f) { HuAudFXPlay(0x61C); - } else { + } + else { HuAudFXPlay(0x61D); } temp_r31->unk18 = 9; @@ -2128,15 +2075,16 @@ void fn_1_4778(omObjData* arg0) { GXColor lbl_1_data_630 = { 0xFF, 0xFF, 0xFF, 0x14 }; -void fn_1_5D18(omObjData* arg0) { +void fn_1_5D18(omObjData *arg0) +{ Vec sp60; Vec sp54; Vec sp48; float var_f30; float var_f31; float var_f29; - StructBssBCData* temp_r31; - ModelData* temp_r27; + StructBssBCData *temp_r31; + ModelData *temp_r27; s16 var_r26; s16 var_r25; s16 var_r28; @@ -2181,7 +2129,8 @@ void fn_1_5D18(omObjData* arg0) { case 1: if (fabs(var_r28) > 8.0) { var_f30 = 0.125f * var_r28; - } else { + } + else { var_f30 = 0.0f; } temp_r31->unk1C[temp_r31->unk58] = var_f30; @@ -2194,14 +2143,17 @@ void fn_1_5D18(omObjData* arg0) { var_f30 *= 0.06666667f; if (var_f30 > 25.0f) { var_f30 = 25.0f; - } else if (var_f30 < -25.0f) { + } + else if (var_f30 < -25.0f) { var_f30 = -25.0f; } if (0.0f == var_f30) { var_r25 = 0; - } else if (fabs(var_f30) < 10.0) { + } + else if (fabs(var_f30) < 10.0) { var_r25 = 1; - } else { + } + else { var_r25 = 2; } if (temp_r31->unk16 != var_r25 && CharModelMotionShiftIDGet(temp_r31->unk02) == -1) { @@ -2217,9 +2169,11 @@ void fn_1_5D18(omObjData* arg0) { } if (var_r28 == 0.0f) { var_f29 = 0.0f; - } else if (var_r28 < 0.0f) { + } + else if (var_r28 < 0.0f) { var_f29 = -90.0f; - } else { + } + else { var_f29 = 90.0f; } if (arg0->rot.y < var_f29 && (arg0->rot.y += 20.0f) > var_f29) { @@ -2240,7 +2194,8 @@ void fn_1_5D18(omObjData* arg0) { if (fn_1_F00() >= 7) { temp_r31->unk18 = 9; temp_r31->unk68 = 0; - } else if (temp_r31->unk10 & PAD_BUTTON_A) { + } + else if (temp_r31->unk10 & PAD_BUTTON_A) { if (var_r28 > 0) { temp_r27->unk_0C = -1; temp_r31->unk16 = 3; @@ -2259,7 +2214,8 @@ void fn_1_5D18(omObjData* arg0) { } if (lbl_1_bss_40[0]->unk1C < 36.0f) { var_f31 = lbl_1_bss_40[0]->unk68.z - arg0->trans.z; - } else { + } + else { var_f31 = lbl_1_bss_40[0]->unk38.z - arg0->trans.z; } if (var_f31 < -100.0f) { @@ -2268,9 +2224,11 @@ void fn_1_5D18(omObjData* arg0) { var_f31 = fabs(var_f31); if (var_f31 >= 300.0f) { temp_r31->unk8C = 13.5f; - } else if (var_f31 <= 100.0f) { + } + else if (var_f31 <= 100.0f) { temp_r31->unk8C = 6.5f; - } else { + } + else { temp_r31->unk8C = 10.0f; } } @@ -2279,7 +2237,8 @@ void fn_1_5D18(omObjData* arg0) { temp_r31->unk8C = 10.0f; } temp_r31->unk18 = 2; - } else if (var_r28 < 0) { + } + else if (var_r28 < 0) { temp_r27->unk_0C = -1; temp_r31->unk16 = 5; CharModelMotionSet(temp_r31->unk02, arg0->motion[temp_r31->unk16]); @@ -2297,7 +2256,8 @@ void fn_1_5D18(omObjData* arg0) { } if (lbl_1_bss_40[0]->unk1C < 36.0f) { var_f31 = lbl_1_bss_40[0]->unk68.z - arg0->trans.z; - } else { + } + else { var_f31 = lbl_1_bss_40[0]->unk38.z - arg0->trans.z; } if (var_f31 > 100.0f) { @@ -2306,9 +2266,11 @@ void fn_1_5D18(omObjData* arg0) { var_f31 = fabs(var_f31); if (var_f31 >= 300.0f) { temp_r31->unk8C = 13.5f; - } else if (var_f31 <= 100.0f) { + } + else if (var_f31 <= 100.0f) { temp_r31->unk8C = 6.5f; - } else { + } + else { temp_r31->unk8C = 10.0f; } } @@ -2317,7 +2279,8 @@ void fn_1_5D18(omObjData* arg0) { temp_r31->unk8C = 10.0f; } temp_r31->unk18 = 4; - } else { + } + else { temp_r27->unk_0C = -1; temp_r31->unk16 = 7; CharModelMotionSet(temp_r31->unk02, arg0->motion[temp_r31->unk16]); @@ -2488,11 +2451,13 @@ void fn_1_5D18(omObjData* arg0) { temp_r31->unkE8 = arg0->trans.z; } -void fn_1_77C4(omObjData* arg0) { +void fn_1_77C4(omObjData *arg0) +{ arg0->func = NULL; } -void fn_1_77D0(void) { +void fn_1_77D0(void) +{ s32 i; for (i = 0; i < 4; i++) { @@ -2500,9 +2465,10 @@ void fn_1_77D0(void) { } } -s32 fn_1_781C(void) { - omObjData* temp_r29; - StructBssBCData* temp_r31; +s32 fn_1_781C(void) +{ + omObjData *temp_r29; + StructBssBCData *temp_r31; s32 i; for (i = 0; i < 4; i++) { @@ -2512,7 +2478,8 @@ s32 fn_1_781C(void) { if (temp_r31->unk18 != 0 || fabs(fn_1_121DC(temp_r29->rot.y, 0.0f)) > 1.0) { break; } - } else { + } + else { if (temp_r31->unk18 < 5) { break; } @@ -2524,9 +2491,10 @@ s32 fn_1_781C(void) { return 0; } -s32 fn_1_791C(void) { - omObjData* temp_r30; - StructBssBCData* temp_r31; +s32 fn_1_791C(void) +{ + omObjData *temp_r30; + StructBssBCData *temp_r31; s32 i; for (i = 0; i < 4; i++) { @@ -2536,7 +2504,8 @@ s32 fn_1_791C(void) { if (temp_r31->unk18 != 10 || fabs(fn_1_121DC(temp_r30->rot.y, 0.0f)) > 1.0 || CharModelMotionShiftIDGet(temp_r31->unk02) != -1) { break; } - } else { + } + else { if (temp_r31->unk18 != 10 || fabs(fn_1_121DC(temp_r30->rot.y, 0.0f)) > 1.0 || CharModelMotionShiftIDGet(temp_r31->unk02) != -1) { break; } @@ -2548,9 +2517,10 @@ s32 fn_1_791C(void) { return 0; } -void fn_1_7AA8(s32 arg0) { - omObjData* var_r29; - StructBssBCData* temp_r31; +void fn_1_7AA8(s32 arg0) +{ + omObjData *var_r29; + StructBssBCData *temp_r31; s32 i; for (i = 0; i < 4; i++) { @@ -2559,20 +2529,24 @@ void fn_1_7AA8(s32 arg0) { if (temp_r31->unk0A == 0) { if (temp_r31->unk0A == arg0) { temp_r31->unk18 = 11; - } else { + } + else { temp_r31->unk18 = 12; } - } else { + } + else { if (temp_r31->unk0A == arg0) { temp_r31->unk18 = 11; - } else { + } + else { temp_r31->unk18 = 12; } } } } -s32 fn_1_7B48(Vec* arg0, Vec* arg1, Vec* arg2, float arg3) { +s32 fn_1_7B48(Vec *arg0, Vec *arg1, Vec *arg2, float arg3) +{ Vec spA8[4]; Vec sp78[4]; Vec sp48[4]; @@ -2586,9 +2560,9 @@ s32 fn_1_7B48(Vec* arg0, Vec* arg1, Vec* arg2, float arg3) { float var_f30; float var_f27; float var_f26; - omObjData* temp_r31; - StructBssBCData* temp_r28; - ModelData* sp8; + omObjData *temp_r31; + StructBssBCData *temp_r28; + ModelData *sp8; if (lbl_1_bss_B8 == NULL) { return 0; @@ -2636,12 +2610,12 @@ s32 fn_1_7B48(Vec* arg0, Vec* arg1, Vec* arg2, float arg3) { spA8[3].x = temp_r31->trans.x + 0.5f * var_f31; spA8[3].y = temp_r31->trans.y - var_f27; spA8[3].z = temp_r31->trans.z - 0.5f * var_f30; - PSVECNormalize(arg1, &spC); - PSVECScale(&spC, &spC, arg3); - PSVECAdd(arg0, arg1, &sp30); - PSVECAdd(arg0, arg1, &sp24); - PSVECAdd(arg0, &spC, &sp3C); - PSVECAdd(&sp30, &spC, &sp30); + VECNormalize(arg1, &spC); + VECScale(&spC, &spC, arg3); + VECAdd(arg0, arg1, &sp30); + VECAdd(arg0, arg1, &sp24); + VECAdd(arg0, &spC, &sp3C); + VECAdd(&sp30, &spC, &sp30); sp48[0] = sp78[0]; sp48[1] = sp78[1]; sp48[2] = sp78[2]; @@ -2652,26 +2626,27 @@ s32 fn_1_7B48(Vec* arg0, Vec* arg1, Vec* arg2, float arg3) { fn_1_82C8(15, 1, 0); return 1; } - if (sp24.x >= sp78[0].x - arg3 && sp24.x <= sp78[2].x + arg3 - && sp24.y <= sp78[0].y + arg3 && sp24.y >= sp78[2].y - arg3 - && sp24.z <= sp78[0].z + arg3 && sp24.z >= spA8[3].z - arg3) - { + if (sp24.x >= sp78[0].x - arg3 && sp24.x <= sp78[2].x + arg3 && sp24.y <= sp78[0].y + arg3 && sp24.y >= sp78[2].y - arg3 + && sp24.z <= sp78[0].z + arg3 && sp24.z >= spA8[3].z - arg3) { if (temp_r28->unkEC > 0.0f && sp24.x > temp_r31->trans.x) { spC = *arg1; spC.y = 0.0f; - var_f26 = PSVECMag(&spC); + var_f26 = VECMag(&spC); arg2->x = 0.5f * var_f26 + temp_r28->unkEC; arg2->z = 0.0f; - } else if (temp_r28->unkEC < 0.0f && sp24.x < temp_r31->trans.x) { + } + else if (temp_r28->unkEC < 0.0f && sp24.x < temp_r31->trans.x) { spC = *arg1; spC.y = 0.0f; - var_f26 = PSVECMag(&spC); + var_f26 = VECMag(&spC); arg2->x = -(0.5f * var_f26) + temp_r28->unkEC; arg2->z = 0.0f; - } else { + } + else { if (fabs(arg1->x) > fabs(arg1->z)) { arg2->x *= -1.0f; - } else { + } + else { arg2->z *= -1.0f; } arg2->x *= 0.5f; @@ -2683,9 +2658,10 @@ s32 fn_1_7B48(Vec* arg0, Vec* arg1, Vec* arg2, float arg3) { return 0; } -void fn_1_82C8(s32 arg0, s32 arg1, s32 arg2) { - omObjData* var_r31; - StructBssBCData* var_r30; +void fn_1_82C8(s32 arg0, s32 arg1, s32 arg2) +{ + omObjData *var_r31; + StructBssBCData *var_r30; if (lbl_1_bss_B8 != NULL) { var_r31 = lbl_1_bss_B8; @@ -2698,19 +2674,16 @@ void fn_1_82C8(s32 arg0, s32 arg1, s32 arg2) { s32 lbl_1_data_668[] = { 3, 4, 5, 6 }; float lbl_1_data_678[] = { 0.6f, 0.65f, 0.7f, 0.7f }; -s32 lbl_1_data_688[][2] = { - { 30, 60 }, { 24, 48 }, { 12, 24 }, { 0, 12 } -}; +s32 lbl_1_data_688[][2] = { { 30, 60 }, { 24, 48 }, { 12, 24 }, { 0, 12 } }; -s32 lbl_1_data_6A8[][2] = { - { 36, 84 }, { 36, 78 }, { 33, 72 }, { 33, 66 } -}; +s32 lbl_1_data_6A8[][2] = { { 36, 84 }, { 36, 78 }, { 33, 72 }, { 33, 66 } }; -void fn_1_8338(omObjData* arg0) { +void fn_1_8338(omObjData *arg0) +{ float var_f31; float temp_f30; - StructBssBCData* temp_r31; - ModelData* sp8; + StructBssBCData *temp_r31; + ModelData *sp8; s32 var_r29; temp_r31 = arg0->data; @@ -2731,11 +2704,14 @@ void fn_1_8338(omObjData* arg0) { temp_r31->unkA8 = (1.0f / 127) * frand7(); if (lbl_1_bss_B8->trans.x >= 270.0f) { temp_r31->unk88 = -(0.4f + 0.3f * temp_r31->unkA8); - } else if (lbl_1_bss_B8->trans.x <= -270.0f) { + } + else if (lbl_1_bss_B8->trans.x <= -270.0f) { temp_r31->unk88 = 0.4f + 0.3f * temp_r31->unkA8; - } else if (frand() & 1) { + } + else if (frand() & 1) { temp_r31->unk88 = -(0.3f + 0.1f * temp_r31->unkA8); - } else { + } + else { temp_r31->unk88 = 0.3f + 0.1f * temp_r31->unkA8; } var_f31 = lbl_1_data_6A8[3][0]; @@ -2745,10 +2721,12 @@ void fn_1_8338(omObjData* arg0) { temp_f30 = lbl_1_data_688[temp_r31->unk08][1]; temp_r31->unk74 = var_f31 + (1.0f / 127) * frand7() * (temp_f30 - var_f31); temp_r31->unk98++; - } else { + } + else { if (frand() & 1) { temp_r31->unk88 = (1.0f / 127) * frand7() * lbl_1_data_678[temp_r31->unk08]; - } else { + } + else { temp_r31->unk88 = -((1.0f / 127) * frand7()) * lbl_1_data_678[temp_r31->unk08]; } var_f31 = lbl_1_data_6A8[temp_r31->unk08][0]; @@ -2778,11 +2756,14 @@ void fn_1_8338(omObjData* arg0) { if (temp_r31->unkA4 != 0) { if (lbl_1_bss_B8->trans.x >= 148.5f) { temp_r31->unk88 = -(0.4f + 0.3f * temp_r31->unkA8); - } else if (lbl_1_bss_B8->trans.x <= -148.5f) { + } + else if (lbl_1_bss_B8->trans.x <= -148.5f) { temp_r31->unk88 = 0.4f + 0.3f * temp_r31->unkA8; - } else if (lbl_1_bss_B8->trans.x > 0.0f) { + } + else if (lbl_1_bss_B8->trans.x > 0.0f) { temp_r31->unk88 = -(0.5f + 0.2f * temp_r31->unkA8); - } else { + } + else { temp_r31->unk88 = 0.5f + 0.2f * temp_r31->unkA8; } } @@ -2793,7 +2774,8 @@ void fn_1_8338(omObjData* arg0) { temp_r31->unk70 = 0; temp_r31->unk74 = 0; temp_r31->unkA4 = 0; - } else { + } + else { temp_r31->unk0E |= PAD_BUTTON_A; } break; @@ -2805,19 +2787,14 @@ void fn_1_8338(omObjData* arg0) { s32 lbl_1_data_6C8[] = { 60, 45, 30, 15 }; -float lbl_1_data_6D8[][2] = { - { 200.0f, 150.0f }, { 125.0f, 100.0f }, { 0.0f, 0.0f }, { 0.0f, 0.0f } -}; +float lbl_1_data_6D8[][2] = { { 200.0f, 150.0f }, { 125.0f, 100.0f }, { 0.0f, 0.0f }, { 0.0f, 0.0f } }; -s32 lbl_1_data_6F8[][2] = { - { 48, 150 }, { 39, 114 }, { 33, 90 }, { 21, 42 } -}; +s32 lbl_1_data_6F8[][2] = { { 48, 150 }, { 39, 114 }, { 33, 90 }, { 21, 42 } }; -s32 lbl_1_data_718[][2] = { - { 27, 39 }, { 15, 27 }, { 9, 15 }, { 0, 3 } -}; +s32 lbl_1_data_718[][2] = { { 27, 39 }, { 15, 27 }, { 9, 15 }, { 0, 3 } }; -void fn_1_8CB4(omObjData* arg0) { +void fn_1_8CB4(omObjData *arg0) +{ Vec spC; float temp_f29; float temp_f28; @@ -2825,9 +2802,9 @@ void fn_1_8CB4(omObjData* arg0) { float var_f31; float var_f26; float temp_f27; - StructBssBCData* temp_r31; - ModelData* sp8; - StructBssA8Data* temp_r30; + StructBssBCData *temp_r31; + ModelData *sp8; + StructBssA8Data *temp_r30; s32 var_r28; s32 var_r24; s32 i, j; @@ -2842,10 +2819,12 @@ void fn_1_8CB4(omObjData* arg0) { if (temp_r30->unk0C != 3 || temp_r30->unk08 != 0 || temp_r30->unk38.z <= -900.0f) { var_r25 = 1; } - } else { + } + else { var_r25 = 1; } - } else { + } + else { var_r25 = 1; } if (var_r25 != 0) { @@ -2866,11 +2845,8 @@ void fn_1_8CB4(omObjData* arg0) { if (var_r24 != 0) { for (i = 0; i < var_r24; i++) { temp_r30 = lbl_1_bss_4[i]; - if (temp_r30 == NULL || temp_r30->unk06 == 0 - || 0.0f == temp_r30->unk50.z - || fabs(temp_r30->unk38.x) >= 325.0 - || temp_r30->unk14 < temp_r31->unk94) - { + if (temp_r30 == NULL || temp_r30->unk06 == 0 || 0.0f == temp_r30->unk50.z || fabs(temp_r30->unk38.x) >= 325.0 + || temp_r30->unk14 < temp_r31->unk94) { continue; } var_r28 = (var_f26 - temp_r30->unk38.z) / temp_r30->unk50.z; @@ -2925,7 +2901,8 @@ void fn_1_8CB4(omObjData* arg0) { var_r28 += temp_r31->unk90; var_f30 += temp_r31->unkD4.x; var_f31 += temp_r31->unkD4.y; - } else { + } + else { var_r28 = 0; var_f30 = temp_r30->unk38.x; var_f31 = temp_r30->unk38.y; @@ -2939,9 +2916,11 @@ void fn_1_8CB4(omObjData* arg0) { temp_f27 = fabs(var_f30 - arg0->trans.x); if (var_r28 < 10 && temp_f27 > 120.00001f) { temp_r31->unk10 |= 0x100; - } else if (var_r28 < 5 && temp_f27 < 25.0f && var_f31 > 100.0f) { + } + else if (var_r28 < 5 && temp_f27 < 25.0f && var_f31 > 100.0f) { temp_r31->unk10 |= 0x100; - } else if (var_r28 > 20 && temp_f27 < 50.0) { + } + else if (var_r28 > 20 && temp_f27 < 50.0) { temp_r31->unk10 /= 2; } if (++temp_r31->unk6C > lbl_1_data_6C8[temp_r31->unk08]) { @@ -2950,25 +2929,20 @@ void fn_1_8CB4(omObjData* arg0) { } } -void fn_1_95C4(void) { +void fn_1_95C4(void) +{ lbl_1_bss_A8 = omAddObjEx(lbl_1_bss_120, 0x50, 0, 0, -1, fn_1_9614); } -s32 lbl_1_data_738[] = { - DATA_MAKE_NUM(DATADIR_M423, 4), - DATA_MAKE_NUM(DATADIR_M423, 5), - DATA_MAKE_NUM(DATADIR_M423, 6), - DATA_MAKE_NUM(DATADIR_M423, 7), - DATA_MAKE_NUM(DATADIR_M423, 8), - DATA_MAKE_NUM(DATADIR_M423, 9), - DATA_MAKE_NUM(DATADIR_M423, 10), - DATA_MAKE_NUM(DATADIR_M423, 11) -}; +s32 lbl_1_data_738[] + = { DATA_MAKE_NUM(DATADIR_M423, 4), DATA_MAKE_NUM(DATADIR_M423, 5), DATA_MAKE_NUM(DATADIR_M423, 6), DATA_MAKE_NUM(DATADIR_M423, 7), + DATA_MAKE_NUM(DATADIR_M423, 8), DATA_MAKE_NUM(DATADIR_M423, 9), DATA_MAKE_NUM(DATADIR_M423, 10), DATA_MAKE_NUM(DATADIR_M423, 11) }; -void fn_1_9614(omObjData* arg0) { - StructBssA8Data* var_r28; - StructBssA8Data* var_r31; - ModelData* var_r27; +void fn_1_9614(omObjData *arg0) +{ + StructBssA8Data *var_r28; + StructBssA8Data *var_r31; + ModelData *var_r27; s32 i; if (lbl_1_bss_EC[0] == -1) { @@ -2999,7 +2973,8 @@ void fn_1_9614(omObjData* arg0) { var_r31->unk68.x = var_r31->unk68.y = var_r31->unk68.z = 0.0f; if (i < 3) { var_r31->unk00 = Hu3DModelCreateFile(lbl_1_data_738[lbl_1_bss_EC[var_r31->unk04]]); - } else { + } + else { var_r31->unk00 = Hu3DModelLink(var_r28[var_r31->unk04].unk00); } Hu3DModelScaleSet(var_r31->unk00, 0.8f, 0.8f, 0.8f); @@ -3007,13 +2982,14 @@ void fn_1_9614(omObjData* arg0) { Hu3DModelCameraSet(var_r31->unk00, 5); Hu3DModelShadowSet(var_r31->unk00); var_r27 = &Hu3DData[var_r31->unk00]; - PSMTXIdentity(var_r27->unk_F0); + MTXIdentity(var_r27->unk_F0); } fn_1_B430(); arg0->func = fn_1_98A0; } -void fn_1_98A0(omObjData* arg0) { +void fn_1_98A0(omObjData *arg0) +{ Mtx spC4; Vec spB8; Vec spAC; @@ -3024,9 +3000,9 @@ void fn_1_98A0(omObjData* arg0) { float var_f25; float var_f31; float var_f22; - StructBssA8Data* var_r31; - StructBssA8Data* var_r30; - ModelData* temp_r27; + StructBssA8Data *var_r31; + StructBssA8Data *var_r30; + ModelData *temp_r27; s32 i, j; s32 var_r25; s32 var_r23; @@ -3047,7 +3023,8 @@ void fn_1_98A0(omObjData* arg0) { var_r31->unk14++; if (temp_f30 > 1.0f) { var_f31 = 1.0f; - } else { + } + else { var_f31 = temp_f30; } var_r31->unk38.x = var_r31->unk20.x + var_f31 * (var_r31->unk2C.x - var_r31->unk20.x); @@ -3055,10 +3032,12 @@ void fn_1_98A0(omObjData* arg0) { if (temp_f30 < 0.6f) { var_f31 = temp_f30 / 0.6f; var_f25 = 100.0f; - } else if (temp_f30 < 1.0f) { + } + else if (temp_f30 < 1.0f) { var_f31 = (temp_f30 - 0.6f) / 0.4f; var_f25 = 50.0f; - } else { + } + else { var_f31 = (temp_f30 - 1.0f) / 0.25f; var_f25 = 10.0f; } @@ -3073,10 +3052,10 @@ void fn_1_98A0(omObjData* arg0) { spAC.x = var_r31->unk50.z; spAC.z = -var_r31->unk50.x; spAC.y = 0.0f; - var_f31 = 0.05 * PSVECMag(&spAC); + var_f31 = 0.05 * VECMag(&spAC); if (var_f31 > 0.00001f) { - PSMTXRotAxisRad(spC4, &spAC, var_f31); - PSMTXConcat(spC4, temp_r27->unk_F0, temp_r27->unk_F0); + MTXRotAxisRad(spC4, &spAC, var_f31); + MTXConcat(spC4, temp_r27->unk_F0, temp_r27->unk_F0); } } Hu3DModelPosSet(var_r31->unk00, var_r31->unk38.x, var_r31->unk38.y, var_r31->unk38.z); @@ -3094,8 +3073,7 @@ void fn_1_98A0(omObjData* arg0) { if (var_r28 & 0x8000) { var_r25 = 1; } - if (var_r28 & 0x2000) { - } + if (var_r28 & 0x2000) { } if ((var_r28 & 0x4000) && var_r31->unk12 == 0 && var_r31->unk08 == 0) { var_f31 = VECMagXZ(&var_r31->unk50); sp94.x = 0.0f; @@ -3109,13 +3087,15 @@ void fn_1_98A0(omObjData* arg0) { var_r31->unk50 = sp88; var_r31->unk8C = 0.975f; var_r31->unk90 = -0.5f; - } else { + } + else { if (fabs(var_r31->unk38.x) > 1000.0) { Hu3DModelAttrSet(var_r31->unk00, HU3D_ATTR_DISPOFF); var_r31->unk0C = 0; var_r31->unk06 = 0; var_r31->unk14 = 0; - } else { + } + else { var_r31->unk38.x += var_r31->unk50.x; var_r31->unk38.y += var_r31->unk50.y; var_r31->unk38.z += var_r31->unk50.z; @@ -3126,51 +3106,52 @@ void fn_1_98A0(omObjData* arg0) { if (i == j || var_r30->unk06 == 0 || var_r30->unk08 != 0 || var_r30->unk0C != 3) { continue; } - PSVECSubtract(&var_r31->unk38, &var_r30->unk38, &spAC); - var_f31 = PSVECMag(&spAC); + VECSubtract(&var_r31->unk38, &var_r30->unk38, &spAC); + var_f31 = VECMag(&spAC); if (var_f31 < 40.0) { spA0 = var_r31->unk38; if (var_f31 != 0.0f) { temp_f30 = 40.0 - var_f31; - PSVECNormalize(&spAC, &spAC); - PSVECScale(&spAC, &spAC, temp_f30); - PSVECAdd(&var_r31->unk38, &spAC, &var_r31->unk38); - } else { + VECNormalize(&spAC, &spAC); + VECScale(&spAC, &spAC, temp_f30); + VECAdd(&var_r31->unk38, &spAC, &var_r31->unk38); + } + else { var_r31->unk38.x += 40.0; } - temp_f30 = PSVECMag(&var_r31->unk50); - var_f22 = PSVECMag(&var_r30->unk50); + temp_f30 = VECMag(&var_r31->unk50); + var_f22 = VECMag(&var_r30->unk50); var_f31 = 0.5f * (temp_f30 + var_f22); - if (PSVECMag(&var_r31->unk50) == 0.0f) { + if (VECMag(&var_r31->unk50) == 0.0f) { var_r31->unk50.x = 1.0f; } - PSVECNormalize(&var_r31->unk50, &var_r31->unk50); - PSVECSubtract(&var_r31->unk38, &var_r30->unk38, &spAC); - if (PSVECMag(&spAC) == 0.0f) { + VECNormalize(&var_r31->unk50, &var_r31->unk50); + VECSubtract(&var_r31->unk38, &var_r30->unk38, &spAC); + if (VECMag(&spAC) == 0.0f) { spAC.x = 1.0f; } - PSVECNormalize(&spAC, &spAC); - PSVECAdd(&var_r31->unk50, &spAC, &var_r31->unk50); - if (PSVECMag(&var_r31->unk50) == 0.0f) { + VECNormalize(&spAC, &spAC); + VECAdd(&var_r31->unk50, &spAC, &var_r31->unk50); + if (VECMag(&var_r31->unk50) == 0.0f) { var_r31->unk50.x = 1.0f; } - PSVECNormalize(&var_r31->unk50, &var_r31->unk50); - PSVECScale(&var_r31->unk50, &var_r31->unk50, var_f31); - if (PSVECMag(&var_r30->unk50) == 0.0f) { + VECNormalize(&var_r31->unk50, &var_r31->unk50); + VECScale(&var_r31->unk50, &var_r31->unk50, var_f31); + if (VECMag(&var_r30->unk50) == 0.0f) { var_r30->unk50.x = -1.0f; } - PSVECNormalize(&var_r30->unk50, &var_r30->unk50); - PSVECSubtract(&var_r30->unk38, &var_r31->unk38, &spAC); - if (PSVECMag(&spAC) == 0.0f) { + VECNormalize(&var_r30->unk50, &var_r30->unk50); + VECSubtract(&var_r30->unk38, &var_r31->unk38, &spAC); + if (VECMag(&spAC) == 0.0f) { spAC.x = 1.0f; } - PSVECNormalize(&spAC, &spAC); - PSVECAdd(&var_r30->unk50, &spAC, &var_r30->unk50); - if (PSVECMag(&var_r30->unk50) == 0.0f) { + VECNormalize(&spAC, &spAC); + VECAdd(&var_r30->unk50, &spAC, &var_r30->unk50); + if (VECMag(&var_r30->unk50) == 0.0f) { var_r30->unk50.x = -1.0f; } - PSVECNormalize(&var_r30->unk50, &var_r30->unk50); - PSVECScale(&var_r30->unk50, &var_r30->unk50, var_f31); + VECNormalize(&var_r30->unk50, &var_r30->unk50); + VECScale(&var_r30->unk50, &var_r30->unk50, var_f31); if (var_r28 = fn_1_C498(&spA0, &spAC, &spB8, &sp88, 20.0f, 1)) { if (var_r28 & 0x8000) { var_r25 = 1; @@ -3185,17 +3166,15 @@ void fn_1_98A0(omObjData* arg0) { var_r31->unk38.y = 20.0f; var_r31->unk50.y *= var_r31->unk90; var_r23 = 1; - if (var_r31->unk38.x >= -225.0f && var_r31->unk38.x <= 225.0f - && var_r31->unk38.z >= -1100.0f && var_r31->unk38.z <= -900.0f) - { - var_r25 = 1; + if (var_r31->unk38.x >= -225.0f && var_r31->unk38.x <= 225.0f && var_r31->unk38.z >= -1100.0f && var_r31->unk38.z <= -900.0f) { + var_r25 = 1; } if (fabs(var_r31->unk50.y) < 0.05f) { var_r31->unk50.y = 0.0f; } } if (var_r31->unk08 == 0) { - PSVECSubtract(&var_r31->unk38, &var_r31->unk74, &spAC); + VECSubtract(&var_r31->unk38, &var_r31->unk74, &spAC); if (fn_1_7B48(&var_r31->unk38, &var_r31->unk50, &sp88, 20.0f) != 0) { var_r31->unk50 = sp88; var_r31->unk08 = 1; @@ -3210,7 +3189,8 @@ void fn_1_98A0(omObjData* arg0) { if (var_r23 == 0) { var_r31->unk50.x *= var_r31->unk8C; var_r31->unk50.z *= var_r31->unk8C; - } else { + } + else { var_r31->unk50.x *= 0.995f * var_r31->unk8C; var_r31->unk50.z *= 0.995f * var_r31->unk8C; } @@ -3221,7 +3201,8 @@ void fn_1_98A0(omObjData* arg0) { var_r31->unk18++; if (var_r31->unk18 & 1) { Hu3DModelAttrReset(var_r31->unk00, HU3D_ATTR_DISPOFF); - } else { + } + else { Hu3DModelAttrSet(var_r31->unk00, HU3D_ATTR_DISPOFF); } if (var_r31->unk18 >= 120.0f) { @@ -3247,10 +3228,10 @@ void fn_1_98A0(omObjData* arg0) { spAC.x = var_r31->unk50.z; spAC.z = -var_r31->unk50.x; spAC.y = 0.0f; - var_f31 = 0.05 * PSVECMag(&spAC); + var_f31 = 0.05 * VECMag(&spAC); if (var_f31 > 0.00001f) { - PSMTXRotAxisRad(spC4, &spAC, var_f31); - PSMTXConcat(spC4, temp_r27->unk_F0, temp_r27->unk_F0); + MTXRotAxisRad(spC4, &spAC, var_f31); + MTXConcat(spC4, temp_r27->unk_F0, temp_r27->unk_F0); } Hu3DModelPosSet(var_r31->unk00, var_r31->unk38.x, var_r31->unk38.y, var_r31->unk38.z); break; @@ -3258,7 +3239,8 @@ void fn_1_98A0(omObjData* arg0) { var_r31->unk18++; if (var_r31->unk18 & 1) { Hu3DModelAttrReset(var_r31->unk00, HU3D_ATTR_DISPOFF); - } else { + } + else { Hu3DModelAttrSet(var_r31->unk00, HU3D_ATTR_DISPOFF); } if (var_r31->unk18 >= 120.0f) { @@ -3273,17 +3255,20 @@ void fn_1_98A0(omObjData* arg0) { } } -void fn_1_A9A0(omObjData* arg0) { +void fn_1_A9A0(omObjData *arg0) +{ arg0->func = NULL; } -void fn_1_A9AC(void) { +void fn_1_A9AC(void) +{ fn_1_A9A0(lbl_1_bss_A8); } -s32 fn_1_A9D4(s32 arg0, Vec arg1, Vec arg2) { - StructBssA8Data* var_r31; - ModelData* temp_r26; +s32 fn_1_A9D4(s32 arg0, Vec arg1, Vec arg2) +{ + StructBssA8Data *var_r31; + ModelData *temp_r26; s32 var_r27; s32 i; @@ -3326,12 +3311,13 @@ s32 fn_1_A9D4(s32 arg0, Vec arg1, Vec arg2) { Hu3DModelPosSet(var_r31->unk00, var_r31->unk38.x, var_r31->unk38.y, var_r31->unk38.z); Hu3DModelRotSet(var_r31->unk00, var_r31->unk44, var_r31->unk48, var_r31->unk4C); Hu3DModelAttrReset(var_r31->unk00, HU3D_ATTR_DISPOFF); - PSMTXIdentity(temp_r26->unk_F0); + MTXIdentity(temp_r26->unk_F0); return i; } -void fn_1_AC0C(s32 arg0, Vec arg1) { - StructBssA8Data* var_r31; +void fn_1_AC0C(s32 arg0, Vec arg1) +{ + StructBssA8Data *var_r31; if (lbl_1_bss_A8 != NULL) { var_r31 = lbl_1_bss_A8->data; @@ -3342,12 +3328,13 @@ void fn_1_AC0C(s32 arg0, Vec arg1) { } } -void fn_1_AC80(s32 arg0, Vec arg1) { +void fn_1_AC80(s32 arg0, Vec arg1) +{ Vec sp14; Vec sp8; float var_f31; - StructBssA8Data* var_r28; - StructBssA8Data* temp_r31; + StructBssA8Data *var_r28; + StructBssA8Data *temp_r31; if (lbl_1_bss_A8 == NULL) { return; @@ -3368,15 +3355,17 @@ void fn_1_AC80(s32 arg0, Vec arg1) { sp14 = temp_r31->unk38; var_f31 = -800.0f - sp14.z; temp_r31->unk1C = fabs(var_f31 / temp_r31->unk50.z); - PSVECScale(&arg1, &sp8, temp_r31->unk1C); - PSVECAdd(&sp14, &sp8, &temp_r31->unk68); - } else { + VECScale(&arg1, &sp8, temp_r31->unk1C); + VECAdd(&sp14, &sp8, &temp_r31->unk68); + } + else { temp_r31->unk1C = 1000; } } -s32 fn_1_AE64(s32 arg0) { - StructBssA8Data* temp_r31; +s32 fn_1_AE64(s32 arg0) +{ + StructBssA8Data *temp_r31; if (lbl_1_bss_A8 == NULL) { return -1; @@ -3391,9 +3380,10 @@ s32 fn_1_AE64(s32 arg0) { return temp_r31[arg0].unk0C; } -void fn_1_AEE8(s32 arg0) { - StructBssA8Data* var_r26; - StructBssA8Data* temp_r31; +void fn_1_AEE8(s32 arg0) +{ + StructBssA8Data *var_r26; + StructBssA8Data *temp_r31; if (lbl_1_bss_A8 == NULL) { return; @@ -3413,9 +3403,10 @@ void fn_1_AEE8(s32 arg0) { lbl_1_bss_104--; } -StructBssA8Data* fn_1_B13C(s32 arg0) { - StructBssA8Data* temp_r31; - StructBssA8Data* sp8; +StructBssA8Data *fn_1_B13C(s32 arg0) +{ + StructBssA8Data *temp_r31; + StructBssA8Data *sp8; if (lbl_1_bss_A8 == NULL) { return NULL; @@ -3430,10 +3421,11 @@ StructBssA8Data* fn_1_B13C(s32 arg0) { GXColor lbl_1_data_758 = { 0xFF, 0xFF, 0xFF, 0xFF }; -void fn_1_B1A4(void) { +void fn_1_B1A4(void) +{ Vec sp2C; - StructBssA8Data* sp10; - StructBssA8Data* var_r31; + StructBssA8Data *sp10; + StructBssA8Data *var_r31; s32 spC; s32 i; @@ -3455,12 +3447,13 @@ void fn_1_B1A4(void) { } } -s32 fn_1_B304(StructBssA8Data** arg0) { +s32 fn_1_B304(StructBssA8Data **arg0) +{ s32 var_r29; s32 i; - StructBssA8Data* var_r30; - StructBssA8Data* var_r28; - StructBssA8Data* var_r27; + StructBssA8Data *var_r30; + StructBssA8Data *var_r28; + StructBssA8Data *var_r27; if (lbl_1_bss_A8 == NULL) { return; @@ -3485,12 +3478,13 @@ s32 fn_1_B304(StructBssA8Data** arg0) { return var_r29; } -void fn_1_B430(void) { +void fn_1_B430(void) +{ Vec sp2C[8]; Vec sp20; Vec sp14; Vec sp8; - StructBss94Data* var_r31; + StructBss94Data *var_r31; s32 i; var_r31 = lbl_1_bss_94 = HuMemDirectMallocNum(HEAP_SYSTEM, 16 * sizeof(*lbl_1_bss_94), MEMORY_DEFAULT_NUM); @@ -3614,17 +3608,15 @@ void fn_1_B430(void) { fn_1_BCD8(sp2C, NULL, NULL, 0.1f, 0, 0x8006); } -s16 lbl_1_data_75C[][3] = { - { 0, 1, 2 }, { 1, 3, 2 }, { 6, 5, 4 }, { 5, 6, 7 }, - { 0, 2, 4 }, { 2, 6, 4 }, { 3, 1, 7 }, { 7, 1, 5 }, - { 2, 3, 6 }, { 3, 7, 6 }, { 1, 0, 4 }, { 1, 4, 5 } -}; +s16 lbl_1_data_75C[][3] = { { 0, 1, 2 }, { 1, 3, 2 }, { 6, 5, 4 }, { 5, 6, 7 }, { 0, 2, 4 }, { 2, 6, 4 }, { 3, 1, 7 }, { 7, 1, 5 }, { 2, 3, 6 }, + { 3, 7, 6 }, { 1, 0, 4 }, { 1, 4, 5 } }; -void fn_1_BCD8(Vec* arg0, Vec* arg1, Vec* arg2, float arg3, s32 arg4, s32 arg5) { +void fn_1_BCD8(Vec *arg0, Vec *arg1, Vec *arg2, float arg3, s32 arg4, s32 arg5) +{ Vec sp24[8]; Vec sp18; float var_f29; - StructBss94Data* var_r30; + StructBss94Data *var_r30; s32 i; s32 j; @@ -3678,10 +3670,7 @@ void fn_1_BCD8(Vec* arg0, Vec* arg1, Vec* arg2, float arg3, s32 arg4, s32 arg5) sp24[7].y = arg0[0].y - arg1->y; sp24[7].z = arg0[0].z + arg1->z; for (j = 0; j < 12; j++) { - fn_1_129F0(&sp24[lbl_1_data_75C[j][0]], - &sp24[lbl_1_data_75C[j][1]], - &sp24[lbl_1_data_75C[j][2]], - var_r30->unk44[j]); + fn_1_129F0(&sp24[lbl_1_data_75C[j][0]], &sp24[lbl_1_data_75C[j][1]], &sp24[lbl_1_data_75C[j][2]], var_r30->unk44[j]); var_r30->unk104[j][0] = sp24[lbl_1_data_75C[j][0]]; var_r30->unk104[j][1] = sp24[lbl_1_data_75C[j][1]]; var_r30->unk104[j][2] = sp24[lbl_1_data_75C[j][2]]; @@ -3739,8 +3728,9 @@ void fn_1_BCD8(Vec* arg0, Vec* arg1, Vec* arg2, float arg3, s32 arg4, s32 arg5) s32 lbl_1_data_7C4[] = { 1, 1, 0, 0, 2, 2 }; -s32 fn_1_C498(Vec* arg0, Vec* arg1, Vec* arg2, Vec* arg3, float arg4, s32 arg5) { - StructBss94Data* var_r31; +s32 fn_1_C498(Vec *arg0, Vec *arg1, Vec *arg2, Vec *arg3, float arg4, s32 arg5) +{ + StructBss94Data *var_r31; Vec sp140[6]; Vec sp134; Vec sp128; @@ -3780,7 +3770,8 @@ s32 fn_1_C498(Vec* arg0, Vec* arg1, Vec* arg2, Vec* arg3, float arg4, s32 arg5) *arg2 = sp134; var_r26 = 0; } - } else { + } + else { if (arg0->x < var_r31->unk34 - arg4 && sp134.x >= var_r31->unk34 - arg4 - 1.0f) { sp134.x = var_r31->unk34 - arg4; *arg2 = sp134; @@ -3795,7 +3786,8 @@ s32 fn_1_C498(Vec* arg0, Vec* arg1, Vec* arg2, Vec* arg3, float arg4, s32 arg5) *arg2 = sp134; var_r26 = 1; } - } else { + } + else { if (arg0->y < var_r31->unk34 - arg4 && sp134.y >= var_r31->unk34 - arg4 - 1.0f) { sp134.y = var_r31->unk34 - arg4; *arg2 = sp134; @@ -3810,7 +3802,8 @@ s32 fn_1_C498(Vec* arg0, Vec* arg1, Vec* arg2, Vec* arg3, float arg4, s32 arg5) *arg2 = sp134; var_r26 = 2; } - } else { + } + else { if (arg0->z < var_r31->unk34 - arg4 && sp134.z >= var_r31->unk34 - arg4 - 1.0f) { sp134.z = var_r31->unk34 - arg4; *arg2 = sp134; @@ -3820,11 +3813,8 @@ s32 fn_1_C498(Vec* arg0, Vec* arg1, Vec* arg2, Vec* arg3, float arg4, s32 arg5) break; case 4: arg4 = 0.0f; - PSVECSubtract(&sp134, &var_r31->unk04, &sp128); - if (fabs(sp128.x) < var_r31->unk10.x + arg4 - && fabs(sp128.y) < var_r31->unk10.y + arg4 - && fabs(sp128.z) < var_r31->unk10.z + arg4) - { + VECSubtract(&sp134, &var_r31->unk04, &sp128); + if (fabs(sp128.x) < var_r31->unk10.x + arg4 && fabs(sp128.y) < var_r31->unk10.y + arg4 && fabs(sp128.z) < var_r31->unk10.z + arg4) { for (j = 0; j < 6; j++) { if (var_r31->unk40 & (1 << j)) { var_r24 = fn_1_12C6C(arg0, &sp134, var_r31->unk44[j * 2]); @@ -3869,9 +3859,11 @@ s32 fn_1_C498(Vec* arg0, Vec* arg1, Vec* arg2, Vec* arg3, float arg4, s32 arg5) sp110.z = fabs(var_r31->unk44[0][2]); if (sp110.x > sp110.y && sp110.x > sp110.z) { var_r24 = 0; - } else if (sp110.y > sp110.x && sp110.y > sp110.z) { + } + else if (sp110.y > sp110.x && sp110.y > sp110.z) { var_r24 = 1; - } else { + } + else { var_r24 = 2; } sp140[0] = var_r31->unk104[0][0]; @@ -3915,33 +3907,36 @@ s32 fn_1_C498(Vec* arg0, Vec* arg1, Vec* arg2, Vec* arg3, float arg4, s32 arg5) if (var_f19 >= var_r31->unk04.y && var_f19 <= var_r31->unk10.y) { spC8.z = spC8.y; spC8.y = 0.0f; - PSVECSubtract(&spC8, &var_r31->unk04, &sp128); + VECSubtract(&spC8, &var_r31->unk04, &sp128); sp128.y = 0.0f; - if (PSVECMag(&sp128) == 0.0f) { + if (VECMag(&sp128) == 0.0f) { sp128.z = 1.0f; - } else { - PSVECNormalize(&sp128, &sp128); } - PSVECScale(&sp128, &sp128, var_r31->unk34 + arg4 + 1.0f); + else { + VECNormalize(&sp128, &sp128); + } + VECScale(&sp128, &sp128, var_r31->unk34 + arg4 + 1.0f); arg2->x = sp128.x + var_r31->unk04.x; arg2->z = sp128.z + var_r31->unk04.z; arg2->y = var_f19; sp2C = var_f30; var_r26 = 99; } - } else { + } + else { sp2C = var_f30; - PSVECSubtract(&sp134, &var_r31->unk04, &sp128); + VECSubtract(&sp134, &var_r31->unk04, &sp128); var_f30 = VECMagXZ(&sp128); if (var_f30 < var_r31->unk34 + arg4 && sp134.y >= var_r31->unk04.y && sp134.y <= var_r31->unk10.y) { - PSVECSubtract(&sp134, &var_r31->unk04, &sp128); + VECSubtract(&sp134, &var_r31->unk04, &sp128); sp128.y = 0.0f; - if (PSVECMag(&sp128) == 0.0f) { + if (VECMag(&sp128) == 0.0f) { sp128.z = 1.0f; - } else { - PSVECNormalize(&sp128, &sp128); } - PSVECScale(&sp128, &sp128, var_r31->unk34 + arg4 + 1.0f); + else { + VECNormalize(&sp128, &sp128); + } + VECScale(&sp128, &sp128, var_r31->unk34 + arg4 + 1.0f); arg2->x = var_r31->unk04.x + sp128.x; arg2->z = var_r31->unk04.z + sp128.z; arg2->y = sp134.y; @@ -3958,7 +3953,8 @@ s32 fn_1_C498(Vec* arg0, Vec* arg1, Vec* arg2, Vec* arg3, float arg4, s32 arg5) var_f30 = 1.0f; sp128.x = 0.0f; sp128.z = 1.0f; - } else { + } + else { var_f30 = 1.0f / var_f30; } spC8.x = sp128.x * var_f30; @@ -3977,16 +3973,18 @@ s32 fn_1_C498(Vec* arg0, Vec* arg1, Vec* arg2, Vec* arg3, float arg4, s32 arg5) var_f30 = 1.0f; sp128.x = 0.0f; sp128.z = 1.0f; - } else { + } + else { var_f30 = 1.0f / var_f30; } sp128.x = sp128.x * var_f30 - spD4.x; sp128.z = sp128.z * var_f30 - spD4.z; sp128.y = 0.0f; - if (PSVECMag(&sp128) == 0.0f) { + if (VECMag(&sp128) == 0.0f) { sp128.z = 1.0f; - } else { - PSVECNormalize(&sp128, &sp128); + } + else { + VECNormalize(&sp128, &sp128); } var_f30 = VECMagXZ(arg1); arg3->x = sp128.x * var_f30 * var_r31->unk3C; @@ -4046,12 +4044,13 @@ s32 fn_1_C498(Vec* arg0, Vec* arg1, Vec* arg2, Vec* arg3, float arg4, s32 arg5) return 0; } -void fn_1_D930(void) { - omObjData* var_r30; - StructBssA4Data* var_r31; - AnimData* var_r27; - StructM423_05* var_r29; - ModelData* var_r28; +void fn_1_D930(void) +{ + omObjData *var_r30; + StructBssA4Data *var_r31; + AnimData *var_r27; + StructM423_05 *var_r29; + ModelData *var_r28; s32 sp8; var_r30 = lbl_1_bss_A4 = omAddObjEx(lbl_1_bss_120, 0xBF, 0, 0, -1, fn_1_DA38); @@ -4067,11 +4066,12 @@ void fn_1_D930(void) { var_r29->unk20 = 0; } -void fn_1_DA38(omObjData* arg0) { - StructBssA4Data* temp_r30; - ModelData* var_r27; - StructM423_05* temp_r29; - StructM423_04* var_r31; +void fn_1_DA38(omObjData *arg0) +{ + StructBssA4Data *temp_r30; + ModelData *var_r27; + StructM423_05 *temp_r29; + StructM423_04 *var_r31; s32 i; temp_r30 = arg0->data; @@ -4106,9 +4106,10 @@ void fn_1_DA38(omObjData* arg0) { } } -void fn_1_DBC8(void) { - omObjData* temp_r31; - StructBssA4Data* temp_r30; +void fn_1_DBC8(void) +{ + omObjData *temp_r31; + StructBssA4Data *temp_r30; temp_r31 = lbl_1_bss_A4; temp_r30 = temp_r31->data; @@ -4117,12 +4118,13 @@ void fn_1_DBC8(void) { temp_r31->func = NULL; } -inline s32 fn_1_DC24(Vec arg0, Vec arg1, float arg2, float arg3, float arg4, GXColor arg5) { - omObjData* var_r27; - StructBssA4Data* temp_r28; - ModelData* var_r26; - StructM423_05* temp_r30; - StructM423_04* var_r31; +inline s32 fn_1_DC24(Vec arg0, Vec arg1, float arg2, float arg3, float arg4, GXColor arg5) +{ + omObjData *var_r27; + StructBssA4Data *temp_r28; + ModelData *var_r26; + StructM423_05 *temp_r30; + StructM423_04 *var_r31; s32 i; var_r27 = lbl_1_bss_A4; @@ -4160,7 +4162,8 @@ inline s32 fn_1_DC24(Vec arg0, Vec arg1, float arg2, float arg3, float arg4, GXC return i; } -s32 fn_1_DD70(Vec arg0, Vec arg1, float arg2, float arg3, float arg4, float arg5, GXColor arg6) { +s32 fn_1_DD70(Vec arg0, Vec arg1, float arg2, float arg3, float arg4, float arg5, GXColor arg6) +{ Vec sp60; Vec sp54; float temp_f31; @@ -4170,7 +4173,7 @@ s32 fn_1_DD70(Vec arg0, Vec arg1, float arg2, float arg3, float arg4, float arg5 sp54.x = arg1.z; sp54.z = arg1.x; sp54.y = 0.0f; - PSVECNormalize(&sp54, &sp54); + VECNormalize(&sp54, &sp54); temp_f31 = 0.5f * arg4; sp60.x = arg0.x + sp54.x * temp_f31; sp60.y = arg0.y + sp54.y * temp_f31; @@ -4183,8 +4186,9 @@ s32 fn_1_DD70(Vec arg0, Vec arg1, float arg2, float arg3, float arg4, float arg5 return (sp20 << 16) | sp1C; } -void fn_1_E1BC(void) { - omObjData* var_r31; +void fn_1_E1BC(void) +{ + omObjData *var_r31; s32 var_r29; s32 i; @@ -4197,8 +4201,9 @@ void fn_1_E1BC(void) { var_r31->stat |= 0x100; } -void fn_1_E290(omObjData* arg0) { - ModelData* var_r28; +void fn_1_E290(omObjData *arg0) +{ + ModelData *var_r28; s32 temp_r30; s32 i; @@ -4211,12 +4216,12 @@ void fn_1_E290(omObjData* arg0) { } } -void fn_1_E330(void) { -} +void fn_1_E330(void) { } -s32 fn_1_E334(Vec arg0, Vec arg1, float arg2) { - omObjData* var_r31; - ModelData* var_r26; +s32 fn_1_E334(Vec arg0, Vec arg1, float arg2) +{ + omObjData *var_r31; + ModelData *var_r26; s32 temp_r29; s32 i; @@ -4240,8 +4245,9 @@ s32 fn_1_E334(Vec arg0, Vec arg1, float arg2) { return i; } -void fn_1_E460(void) { - omObjData* temp_r3; +void fn_1_E460(void) +{ + omObjData *temp_r3; temp_r3 = lbl_1_bss_9C = omAddObjEx(lbl_1_bss_120, 0xBF, 1, 0, -1, fn_1_E4EC); temp_r3->model[0] = fn_1_E678(); @@ -4249,10 +4255,11 @@ void fn_1_E460(void) { Hu3DModelLayerSet(temp_r3->model[0], 2); } -void fn_1_E4EC(omObjData* arg0) { - ModelData* var_r29; - StructM423_0B* var_r28; - StructM423_0A* var_r31; +void fn_1_E4EC(omObjData *arg0) +{ + ModelData *var_r29; + StructM423_0B *var_r28; + StructM423_0A *var_r31; s32 i; var_r29 = &Hu3DData[arg0->model[0]]; @@ -4265,7 +4272,8 @@ void fn_1_E4EC(omObjData* arg0) { var_r31->unk00++; if (var_r31->unk00 < 12.0f) { var_r31->unk04 += 0.058333337f; - } else { + } + else { var_r31->unk04 += 0.025000002f; var_r31->unk10 -= 0.050000004f; } @@ -4275,10 +4283,11 @@ void fn_1_E4EC(omObjData* arg0) { } } -void fn_1_E60C(void) { - omObjData* temp_r31; - ModelData* var_r30; - StructM423_0B* var_r29; +void fn_1_E60C(void) +{ + omObjData *temp_r31; + ModelData *var_r30; + StructM423_0B *var_r29; temp_r31 = lbl_1_bss_9C; var_r30 = &Hu3DData[temp_r31->model[0]]; @@ -4287,17 +4296,18 @@ void fn_1_E60C(void) { temp_r31->func = NULL; } -s32 fn_1_E678(void) { +s32 fn_1_E678(void) +{ float sp88[32][2]; float sp8[32]; float temp_f28; float temp_f30; float temp_f29; float var_f31; - ModelData* temp_r27; - StructM423_0B* var_r30; - StructM423_09* var_r29; - StructM423_08* var_r28; + ModelData *temp_r27; + StructM423_0B *var_r30; + StructM423_09 *var_r29; + StructM423_08 *var_r28; s32 var_r26; s32 i; @@ -4399,18 +4409,11 @@ s32 fn_1_E678(void) { return var_r26; } -GXColor lbl_1_data_7FC[] = { - { 0x66, 0x00, 0x00, 0xFF }, - { 0x00, 0x00, 0x66, 0xFF }, - { 0x66, 0x00, 0x5B, 0xFF }, - { 0x00, 0x66, 0x00, 0xFF }, - { 0x42, 0x00, 0x4C, 0xFF }, - { 0x47, 0x28, 0x00, 0xFF }, - { 0x66, 0x66, 0x00, 0xFF }, - { 0x00, 0x00, 0x00, 0xFF } -}; +GXColor lbl_1_data_7FC[] = { { 0x66, 0x00, 0x00, 0xFF }, { 0x00, 0x00, 0x66, 0xFF }, { 0x66, 0x00, 0x5B, 0xFF }, { 0x00, 0x66, 0x00, 0xFF }, + { 0x42, 0x00, 0x4C, 0xFF }, { 0x47, 0x28, 0x00, 0xFF }, { 0x66, 0x66, 0x00, 0xFF }, { 0x00, 0x00, 0x00, 0xFF } }; -void fn_1_EF44(ModelData* arg0, Mtx arg1) { +void fn_1_EF44(ModelData *arg0, Mtx arg1) +{ Mtx sp124; Mtx spF4; Mtx spC4; @@ -4419,8 +4422,8 @@ void fn_1_EF44(ModelData* arg0, Mtx arg1) { Mtx sp34; GXTexObj sp14; GXColor sp10 = { 0xCC, 0xCC, 0xCC, 0x7F }; - StructM423_0B* temp_r30; - StructM423_0A* var_r31; + StructM423_0B *temp_r30; + StructM423_0A *var_r31; s32 i; temp_r30 = arg0->unk_120; @@ -4428,8 +4431,8 @@ void fn_1_EF44(ModelData* arg0, Mtx arg1) { GXSetTexCopyDst(640, 480, GX_TF_RGB5A3, GX_FALSE); GXCopyTex(temp_r30->unk208, GX_FALSE); GXPixModeSync(); - PSMTXTrans(spF4, -400.0f, 400.0f, -700.0f); - PSMTXConcat(Hu3DCameraMtx, spF4, sp64); + MTXTrans(spF4, -400.0f, 400.0f, -700.0f); + MTXConcat(Hu3DCameraMtx, spF4, sp64); GXLoadPosMtxImm(sp64, GX_PNMTX0); GXSetNumChans(1); GXSetChanCtrl(GX_COLOR0A0, GX_FALSE, GX_SRC_REG, GX_SRC_VTX, GX_LIGHT_NULL, GX_DF_CLAMP, GX_AF_NONE); @@ -4439,10 +4442,10 @@ void fn_1_EF44(ModelData* arg0, Mtx arg1) { HuSprTexLoad(temp_r30->unk200, 0, 1, GX_REPEAT, GX_REPEAT, GX_LINEAR); GXSetNumTexGens(2); C_MTXLightPerspective(sp94, 41.5f, 1.2f, 0.5555555f, -0.5f, 0.5555555f, 0.5f); - PSMTXConcat(sp94, Hu3DCameraMtx, sp94); - PSMTXInverse(Hu3DCameraMtx, sp34); - PSMTXConcat(sp34, sp64, sp124); - PSMTXConcat(sp94, sp124, spF4); + MTXConcat(sp94, Hu3DCameraMtx, sp94); + MTXInverse(Hu3DCameraMtx, sp34); + MTXConcat(sp34, sp64, sp124); + MTXConcat(sp94, sp124, spF4); GXLoadTexMtxImm(spF4, GX_TEXMTX0, GX_MTX3x4); GXSetTexCoordGen2(GX_TEXCOORD0, GX_TG_MTX3x4, GX_TG_POS, GX_TEXMTX0, GX_FALSE, GX_PTIDENTITY); GXSetTexCoordGen2(GX_TEXCOORD1, GX_TG_MTX2x4, GX_TG_TEXCOORD0, GX_TEXMTX1, GX_FALSE, GX_PTIDENTITY); @@ -4450,8 +4453,8 @@ void fn_1_EF44(ModelData* arg0, Mtx arg1) { GXSetIndTexOrder(GX_INDTEXSTAGE0, GX_TEXCOORD1, GX_TEXMAP1); GXSetTevIndWarp(GX_TEVSTAGE0, GX_INDTEXSTAGE0, GX_TRUE, GX_FALSE, GX_ITM_0); GXSetIndTexCoordScale(GX_INDTEXSTAGE0, GX_ITS_1, GX_ITS_1); - PSMTXScale(spF4, -0.5f, -0.5f, 0.5f); - GXSetIndTexMtx(GX_ITM_0, (float(*)[3]) spF4, -1); + MTXScale(spF4, -0.5f, -0.5f, 0.5f); + GXSetIndTexMtx(GX_ITM_0, (float(*)[3])spF4, -1); GXSetNumTevStages(1); GXSetTevColor(GX_TEVREG1, sp10); GXSetTevOrder(GX_TEVSTAGE0, GX_TEXCOORD0, GX_TEXMAP0, GX_COLOR0A0); @@ -4478,17 +4481,17 @@ void fn_1_EF44(ModelData* arg0, Mtx arg1) { } lbl_1_data_7FC[var_r31->unk02].a = 255.0f * var_r31->unk10; GXSetTevColor(GX_TEVREG0, lbl_1_data_7FC[var_r31->unk02]); - PSMTXTrans(spF4, var_r31->unk14.x, var_r31->unk14.y, var_r31->unk14.z); - PSMTXRotRad(sp124, 'Z', MTXDegToRad(var_r31->unk0C)); - PSMTXConcat(spF4, sp124, spF4); - PSMTXScale(spC4, var_r31->unk04 * var_r31->unk08, var_r31->unk04 * var_r31->unk08, var_r31->unk04 * var_r31->unk08); - PSMTXConcat(spF4, spC4, spF4); - PSMTXConcat(Hu3DCameraMtx, spF4, sp64); + MTXTrans(spF4, var_r31->unk14.x, var_r31->unk14.y, var_r31->unk14.z); + MTXRotRad(sp124, 'Z', MTXDegToRad(var_r31->unk0C)); + MTXConcat(spF4, sp124, spF4); + MTXScale(spC4, var_r31->unk04 * var_r31->unk08, var_r31->unk04 * var_r31->unk08, var_r31->unk04 * var_r31->unk08); + MTXConcat(spF4, spC4, spF4); + MTXConcat(Hu3DCameraMtx, spF4, sp64); GXLoadPosMtxImm(sp64, GX_PNMTX0); - PSMTXConcat(sp34, sp64, sp124); - PSMTXConcat(sp94, sp124, spF4); + MTXConcat(sp34, sp64, sp124); + MTXConcat(sp94, sp124, spF4); GXLoadTexMtxImm(spF4, GX_TEXMTX0, GX_MTX3x4); - PSMTXRotRad(sp124, 'Z', MTXDegToRad(-var_r31->unk0C)); + MTXRotRad(sp124, 'Z', MTXDegToRad(-var_r31->unk0C)); GXLoadTexMtxImm(sp124, GX_TEXMTX1, GX_MTX2x4); GXCallDisplayList(temp_r30->unk220, temp_r30->unk21C); } @@ -4496,11 +4499,12 @@ void fn_1_EF44(ModelData* arg0, Mtx arg1) { GXSetTevDirect(GX_TEVSTAGE0); } -s32 fn_1_F574(Vec arg0, float arg1, s32 arg2) { - omObjData* var_r29; - ModelData* var_r28; - StructM423_0B* var_r26; - StructM423_0A* var_r31; +s32 fn_1_F574(Vec arg0, float arg1, s32 arg2) +{ + omObjData *var_r29; + ModelData *var_r28; + StructM423_0B *var_r26; + StructM423_0A *var_r31; s32 var_r27; s32 i; @@ -4527,34 +4531,24 @@ s32 fn_1_F574(Vec arg0, float arg1, s32 arg2) { } } -void fn_1_F690(void) { +void fn_1_F690(void) +{ lbl_1_bss_98 = omAddObjEx(lbl_1_bss_120, 0xFE, 0, 0, -1, fn_1_F6E0); } -s32 lbl_1_data_81C[] = { - DATA_MAKE_NUM(DATADIR_MGCONST, 12), - DATA_MAKE_NUM(DATADIR_MGCONST, 13), - DATA_MAKE_NUM(DATADIR_MGCONST, 14), - DATA_MAKE_NUM(DATADIR_MGCONST, 15), - DATA_MAKE_NUM(DATADIR_MGCONST, 16), - DATA_MAKE_NUM(DATADIR_MGCONST, 17), - DATA_MAKE_NUM(DATADIR_MGCONST, 18), - DATA_MAKE_NUM(DATADIR_MGCONST, 19) -}; +s32 lbl_1_data_81C[] = { DATA_MAKE_NUM(DATADIR_MGCONST, 12), DATA_MAKE_NUM(DATADIR_MGCONST, 13), DATA_MAKE_NUM(DATADIR_MGCONST, 14), + DATA_MAKE_NUM(DATADIR_MGCONST, 15), DATA_MAKE_NUM(DATADIR_MGCONST, 16), DATA_MAKE_NUM(DATADIR_MGCONST, 17), DATA_MAKE_NUM(DATADIR_MGCONST, 18), + DATA_MAKE_NUM(DATADIR_MGCONST, 19) }; s16 lbl_1_data_83C[] = { 0x7F, 0x7F, 0x7F, 0x100 }; -s16 lbl_1_data_844[][2] = { - { -75, 10 }, { -61, -14 }, { -47, 10 }, { 0, 0 }, - { -12, -8 }, { -12, -8 }, { 6, -8 }, { 6, -8 }, - { 24, -8 }, { 24, -8 }, { 42, -8 }, { 42, -8 }, - { 60, -8 }, { 60, -8 }, { -12, 10 }, { -12, 10 }, - { 6, 10 }, { 6, 10 }, { 24, 10 }, { 24, 10 }, - { 42, 10 }, { 42, 10 }, { 60, 10 }, { 60, 10 } -}; +s16 lbl_1_data_844[][2] = { { -75, 10 }, { -61, -14 }, { -47, 10 }, { 0, 0 }, { -12, -8 }, { -12, -8 }, { 6, -8 }, { 6, -8 }, { 24, -8 }, { 24, -8 }, + { 42, -8 }, { 42, -8 }, { 60, -8 }, { 60, -8 }, { -12, 10 }, { -12, 10 }, { 6, 10 }, { 6, 10 }, { 24, 10 }, { 24, 10 }, { 42, 10 }, { 42, 10 }, + { 60, 10 }, { 60, 10 } }; -void fn_1_F6E0(omObjData* arg0) { - StructM423_0C* var_r31; +void fn_1_F6E0(omObjData *arg0) +{ + StructM423_0C *var_r31; s32 sp8; s32 var_r29; s32 i; @@ -4586,7 +4580,8 @@ void fn_1_F6E0(omObjData* arg0) { if (!(i & 1)) { var_r29 = espEntry(DATA_MAKE_NUM(DATADIR_M423, 24), 0x40, 0); var_r31->unk10[i] = var_r29; - } else { + } + else { var_r29 = espEntry(DATA_MAKE_NUM(DATADIR_M423, 25), 0x20, 0); var_r31->unk10[i] = var_r29; } @@ -4609,12 +4604,13 @@ void fn_1_F6E0(omObjData* arg0) { } } -void fn_1_FA40(omObjData* arg0) { +void fn_1_FA40(omObjData *arg0) +{ float var_f31; float var_f28; float temp_f30; float temp_f29; - StructM423_0C* temp_r31; + StructM423_0C *temp_r31; s32 temp_r28; s32 temp_r29; s32 i; @@ -4627,7 +4623,8 @@ void fn_1_FA40(omObjData* arg0) { if (temp_r31->unk0C != 0) { var_f31 = 1.0 + 0.8f * sind(180.0f * (temp_r31->unk0C / 20.0f)); temp_r31->unk0C--; - } else { + } + else { var_f31 = 1.0f; } var_f31 = 1.0f; @@ -4644,11 +4641,13 @@ void fn_1_FA40(omObjData* arg0) { if (!(i & 1)) { espPosSet(temp_r31->unk10[i], temp_f30, temp_f29); espScaleSet(temp_r31->unk10[i], 1.0f, 1.0f); - } else { + } + else { temp_r29 = (i - 4) / 2; if (temp_r28 > temp_r29) { temp_r31->unk190[temp_r29][0] = 1; - } else { + } + else { temp_r31->unk190[temp_r29][0] = 0; } if (temp_r31->unk190[temp_r29][0] != 0) { @@ -4656,7 +4655,8 @@ void fn_1_FA40(omObjData* arg0) { temp_r31->unk190[temp_r29][1]++; var_f31 = 3.0f - 2.0f * (temp_r31->unk190[temp_r29][1] / 15.0f); var_f28 = temp_r31->unk190[temp_r29][1] / 15.0f; - } else { + } + else { var_f31 = 1.0f; var_f28 = 1.0f; } @@ -4664,15 +4664,17 @@ void fn_1_FA40(omObjData* arg0) { espPosSet(temp_r31->unk10[i], temp_f30, temp_f29); espTPLvlSet(temp_r31->unk10[i], var_f28); espScaleSet(temp_r31->unk10[i], var_f31, var_f31); - } else { + } + else { espDispOff(temp_r31->unk10[i]); } } } } -void fn_1_FF10(omObjData* arg0) { - StructM423_0C* temp_r29; +void fn_1_FF10(omObjData *arg0) +{ + StructM423_0C *temp_r29; s32 i; if (arg0 && arg0->data) { @@ -4685,19 +4687,22 @@ void fn_1_FF10(omObjData* arg0) { } } -void fn_1_FF98(void) { +void fn_1_FF98(void) +{ fn_1_FF10(lbl_1_bss_98); } -void fn_1_10028(s32 arg0) { - StructM423_0C* temp_r30; +void fn_1_10028(s32 arg0) +{ + StructM423_0C *temp_r30; s32 i; temp_r30 = lbl_1_bss_98->data; for (i = 0; i < 24; i++) { if (arg0 != 0) { espDispOn(temp_r30->unk10[i]); - } else { + } + else { espDispOff(temp_r30->unk10[i]); } if (i >= 4 && (i & 1)) { @@ -4706,8 +4711,9 @@ void fn_1_10028(s32 arg0) { } } -void fn_1_100DC(void) { - omObjData* temp_r3; +void fn_1_100DC(void) +{ + omObjData *temp_r3; s32 i; Hu3DCameraCreate(1); @@ -4738,7 +4744,8 @@ void fn_1_100DC(void) { omAddObjEx(lbl_1_bss_120, 0xFF, 0, 0, -1, fn_1_10480); } -void fn_1_10480(omObjData* arg0) { +void fn_1_10480(omObjData *arg0) +{ CRotM[1].x = CRotM[0].x; CRotM[1].y = CRotM[0].y; CRotM[1].z = CRotM[0].z; @@ -4748,16 +4755,17 @@ void fn_1_10480(omObjData* arg0) { CZoomM[1] = CZoomM[0]; } -void fn_1_1052C(void) { -} +void fn_1_1052C(void) { } -s32 fn_1_10530(void) { +s32 fn_1_10530(void) +{ return lbl_1_bss_84; } -void fn_1_10540(s32 arg0, s32 arg1, s32 arg2, f32 arg3) { - StructData0* temp_r31; - StructData0* temp_r30; +void fn_1_10540(s32 arg0, s32 arg1, s32 arg2, f32 arg3) +{ + StructData0 *temp_r31; + StructData0 *temp_r30; temp_r31 = &lbl_1_data_0[arg1]; temp_r30 = &lbl_1_data_0[arg2]; @@ -4770,13 +4778,12 @@ void fn_1_10540(s32 arg0, s32 arg1, s32 arg2, f32 arg3) { CZoomM[arg0] = temp_r31->unk18 + arg3 * (temp_r30->unk18 - temp_r31->unk18); } -float lbl_1_data_8A4[] = { - 95.0f, 95.0f, 135.0f, 95.0f, 95.0f, 125.0f, 135.0f, 125.0f -}; +float lbl_1_data_8A4[] = { 95.0f, 95.0f, 135.0f, 95.0f, 95.0f, 125.0f, 135.0f, 125.0f }; -void fn_1_106D8(s32 arg0) { +void fn_1_106D8(s32 arg0) +{ float var_f31; - StructBssBCData* var_r30; + StructBssBCData *var_r30; s32 var_r29; if (lbl_1_bss_90 != arg0) { @@ -4790,7 +4797,8 @@ void fn_1_106D8(s32 arg0) { lbl_1_bss_80 = 0; if (arg0 != 0) { lbl_1_bss_7C = frand(); - } else { + } + else { lbl_1_bss_7C = 0; } lbl_1_bss_90 = arg0; @@ -4802,9 +4810,10 @@ void fn_1_106D8(s32 arg0) { case 2: lbl_1_bss_80++; if (lbl_1_bss_7C & 1) { - var_f31 = cosd((float) lbl_1_bss_80); - } else { - var_f31 = -cosd((float) lbl_1_bss_80); + var_f31 = cosd((float)lbl_1_bss_80); + } + else { + var_f31 = -cosd((float)lbl_1_bss_80); } CRotM->y = 23.0f * var_f31 + lbl_1_data_38[arg0].unk00.y; break; @@ -4814,7 +4823,8 @@ void fn_1_106D8(s32 arg0) { lbl_1_bss_80++; if (lbl_1_bss_7C & 1) { CRotM->y = lbl_1_data_38[arg0].unk00.y - 45.0f + 0.5f * lbl_1_bss_80; - } else { + } + else { CRotM->y = lbl_1_data_38[arg0].unk00.y + 45.0f - 0.5f * lbl_1_bss_80; } break; @@ -4837,14 +4847,15 @@ void fn_1_106D8(s32 arg0) { } } -void fn_1_10BC8(void) { +void fn_1_10BC8(void) +{ Mtx44 sp64; Mtx sp34; Vec sp28; Vec sp1C; Vec sp10; GXColor spC; - CameraData* var_r31; + CameraData *var_r31; var_r31 = &Hu3DCamera[0]; if (var_r31->fov <= 0.0f) { @@ -4886,30 +4897,33 @@ void fn_1_10BC8(void) { GXEnd(); } -void fn_1_11008(StructBssD0Data* arg0, void* arg1, s16 arg2, GXTexWrapMode arg3, s32 arg4, s32 arg5) { +void fn_1_11008(StructBssD0Data *arg0, void *arg1, s16 arg2, GXTexWrapMode arg3, s32 arg4, s32 arg5) +{ GXTexObj sp18; - StructBssD0Data* var_r31; + StructBssD0Data *var_r31; var_r31 = arg0; GXInitTexObj(&sp18, arg1, var_r31->unk00, var_r31->unk04, GX_TF_RGB5A3, arg3, arg3, GX_FALSE); if (arg5 != 0) { GXInitTexObjLOD(&sp18, GX_LINEAR, GX_LINEAR, 0.0f, 0.0f, 0.0f, GX_FALSE, GX_FALSE, GX_ANISO_1); - } else { + } + else { GXInitTexObjLOD(&sp18, GX_NEAR, GX_NEAR, 0.0f, 0.0f, 0.0f, GX_FALSE, GX_FALSE, GX_ANISO_1); } GXLoadTexObj(&sp18, arg2); } -s16 fn_1_11114(AnimData* arg0, s16 arg1) { +s16 fn_1_11114(AnimData *arg0, s16 arg1) +{ s16 var_r23; s16 i; - ModelData* temp_r27; - StructM423_05* var_r31; - StructM423_04* var_r29; - Vec* var_r25; - float (*var_r28)[2]; - void* var_r24; - void* var_r22; + ModelData *temp_r27; + StructM423_05 *var_r31; + StructM423_04 *var_r29; + Vec *var_r25; + float(*var_r28)[2]; + void *var_r24; + void *var_r22; var_r23 = Hu3DHookFuncCreate(fn_1_11900); temp_r27 = &Hu3DData[var_r23]; @@ -4987,17 +5001,18 @@ s16 fn_1_11114(AnimData* arg0, s16 arg1) { return var_r23; } -s16 fn_1_115C4(s16 arg0) { +s16 fn_1_115C4(s16 arg0) +{ s32 temp_r24; s16 var_r22; s16 i; - ModelData* temp_r23; - ModelData* temp_r27; - StructM423_05* temp_r26; - StructM423_05* var_r31; - StructM423_04* var_r30; - Vec* var_r25; - float (*var_r29)[2]; + ModelData *temp_r23; + ModelData *temp_r27; + StructM423_05 *temp_r26; + StructM423_05 *var_r31; + StructM423_04 *var_r30; + Vec *var_r25; + float(*var_r29)[2]; temp_r23 = &Hu3DData[arg0]; temp_r26 = temp_r23->unk_120; @@ -5051,21 +5066,12 @@ s16 fn_1_115C4(s16 arg0) { return var_r22; } -Vec lbl_1_data_8C4[] = { - { -0.5f, 0.5f, 0.0f }, - { 0.5f, 0.5f, 0.0f }, - { 0.5f, -0.5f, 0.0f }, - { -0.5f, -0.5f, 0.0f } -}; +Vec lbl_1_data_8C4[] = { { -0.5f, 0.5f, 0.0f }, { 0.5f, 0.5f, 0.0f }, { 0.5f, -0.5f, 0.0f }, { -0.5f, -0.5f, 0.0f } }; -float lbl_1_data_8F4[][2] = { - { 0.0f, 0.0f }, - { 0.25f, 0.0f }, - { 0.25f, 0.25f }, - { 0.0f, 0.25f } -}; +float lbl_1_data_8F4[][2] = { { 0.0f, 0.0f }, { 0.25f, 0.0f }, { 0.25f, 0.25f }, { 0.0f, 0.25f } }; -void fn_1_11900(ModelData* arg0, Mtx arg1) { +void fn_1_11900(ModelData *arg0, Mtx arg1) +{ Mtx sp128; Mtx spF8; Mtx spC8; @@ -5073,16 +5079,16 @@ void fn_1_11900(ModelData* arg0, Mtx arg1) { Vec sp68[4]; Vec sp38[4]; ROMtx sp8; - StructM423_05* temp_r31; - StructM423_04* var_r29; - Vec* var_r30; - float (*var_r28)[2]; - Vec* temp_r27; - Vec* temp_r24; + StructM423_05 *temp_r31; + StructM423_04 *var_r29; + Vec *var_r30; + float(*var_r28)[2]; + Vec *temp_r27; + Vec *temp_r24; s16 var_r21; s16 var_r20; s16 var_r19; - void (*var_r18)(ModelData*, struct struct_m423_05*, Mtx); + void (*var_r18)(ModelData *, struct struct_m423_05 *, Mtx); s16 i; s16 j; @@ -5101,18 +5107,22 @@ void fn_1_11900(ModelData* arg0, Mtx arg1) { if (shadowModelDrawF != 0) { GXSetTevColorIn(GX_TEVSTAGE0, GX_CC_ONE, GX_CC_ZERO, GX_CC_ZERO, GX_CC_ZERO); GXSetZMode(GX_FALSE, GX_LEQUAL, GX_FALSE); - } else { + } + else { var_r21 = temp_r31->unk38->bmp->dataFmt & 0xF; if (var_r21 == 7 || var_r21 == 8) { GXSetTevColorIn(GX_TEVSTAGE0, GX_CC_ZERO, GX_CC_ONE, GX_CC_RASC, GX_CC_ZERO); - } else { + } + else { GXSetTevColorIn(GX_TEVSTAGE0, GX_CC_ZERO, GX_CC_TEXC, GX_CC_RASC, GX_CC_ZERO); } if (temp_r31->unk22 & 1) { GXSetZMode(GX_FALSE, GX_LEQUAL, GX_FALSE); - } else if (arg0->attr & 2) { + } + else if (arg0->attr & 2) { GXSetZMode(GX_TRUE, GX_LEQUAL, GX_TRUE); - } else { + } + else { GXSetZMode(GX_TRUE, GX_LEQUAL, GX_FALSE); } } @@ -5136,7 +5146,7 @@ void fn_1_11900(ModelData* arg0, Mtx arg1) { break; } if (HmfInverseMtxF3X3(arg1, sp128) == 0) { - PSMTXIdentity(sp128); + MTXIdentity(sp128); } PSMTXReorder(sp128, sp8); if (temp_r31->unk4C) { @@ -5157,29 +5167,31 @@ void fn_1_11900(ModelData* arg0, Mtx arg1) { var_r30++; var_r30->x = var_r30->y = var_r30->z = 0.0f; var_r30++; - } else if (!var_r29->unk34) { + } + else if (!var_r29->unk34) { temp_r27 = sp98; temp_r24 = sp38; - PSVECScale(temp_r24++, temp_r27, var_r29->unk30); - PSVECAdd(temp_r27++, &var_r29->unk38, var_r30++); - PSVECScale(temp_r24++, temp_r27, var_r29->unk30); - PSVECAdd(temp_r27++, &var_r29->unk38, var_r30++); - PSVECScale(temp_r24++, temp_r27, var_r29->unk30); - PSVECAdd(temp_r27++, &var_r29->unk38, var_r30++); - PSVECScale(temp_r24++, temp_r27, var_r29->unk30); - PSVECAdd(temp_r27++, &var_r29->unk38, var_r30++); - } else { - PSVECScale(&lbl_1_data_8C4[0], &sp98[0], var_r29->unk30); - PSVECScale(&lbl_1_data_8C4[1], &sp98[1], var_r29->unk30); - PSVECScale(&lbl_1_data_8C4[2], &sp98[2], var_r29->unk30); - PSVECScale(&lbl_1_data_8C4[3], &sp98[3], var_r29->unk30); - PSMTXRotRad(spC8, 'Z', var_r29->unk34); - PSMTXConcat(sp128, spC8, spF8); - PSMTXMultVecArray(spF8, sp98, sp68, 4); - PSVECAdd(&sp68[0], &var_r29->unk38, var_r30++); - PSVECAdd(&sp68[1], &var_r29->unk38, var_r30++); - PSVECAdd(&sp68[2], &var_r29->unk38, var_r30++); - PSVECAdd(&sp68[3], &var_r29->unk38, var_r30++); + VECScale(temp_r24++, temp_r27, var_r29->unk30); + VECAdd(temp_r27++, &var_r29->unk38, var_r30++); + VECScale(temp_r24++, temp_r27, var_r29->unk30); + VECAdd(temp_r27++, &var_r29->unk38, var_r30++); + VECScale(temp_r24++, temp_r27, var_r29->unk30); + VECAdd(temp_r27++, &var_r29->unk38, var_r30++); + VECScale(temp_r24++, temp_r27, var_r29->unk30); + VECAdd(temp_r27++, &var_r29->unk38, var_r30++); + } + else { + VECScale(&lbl_1_data_8C4[0], &sp98[0], var_r29->unk30); + VECScale(&lbl_1_data_8C4[1], &sp98[1], var_r29->unk30); + VECScale(&lbl_1_data_8C4[2], &sp98[2], var_r29->unk30); + VECScale(&lbl_1_data_8C4[3], &sp98[3], var_r29->unk30); + MTXRotRad(spC8, 'Z', var_r29->unk34); + MTXConcat(sp128, spC8, spF8); + MTXMultVecArray(spF8, sp98, sp68, 4); + VECAdd(&sp68[0], &var_r29->unk38, var_r30++); + VECAdd(&sp68[1], &var_r29->unk38, var_r30++); + VECAdd(&sp68[2], &var_r29->unk38, var_r30++); + VECAdd(&sp68[3], &var_r29->unk38, var_r30++); } } var_r29 = temp_r31->unk3C; @@ -5193,7 +5205,8 @@ void fn_1_11900(ModelData* arg0, Mtx arg1) { (*var_r28)[1] = 0.25f * var_r19 + lbl_1_data_8F4[j][1]; } } - } else { + } + else { for (i = 0; i < temp_r31->unk26; i++, var_r29++) { for (j = 0; j < 4; j++, var_r28++) { (*var_r28)[0] = 4.0f * lbl_1_data_8F4[j][0]; @@ -5230,40 +5243,47 @@ void fn_1_11900(ModelData* arg0, Mtx arg1) { } } -float fn_1_121DC(float arg0, float arg1) { +float fn_1_121DC(float arg0, float arg1) +{ float var_f31; if (arg0 >= 360.0f) { arg0 -= 360.0f; - } else if (arg0 < 0.0f) { + } + else if (arg0 < 0.0f) { arg0 += 360.0f; } if (arg1 >= 360.0f) { arg1 -= 360.0f; - } else if (arg1 < 0.0f) { + } + else if (arg1 < 0.0f) { arg1 += 360.0f; } var_f31 = arg0 - arg1; if (var_f31 <= -180.0f) { var_f31 += 360.0f; - } else if (var_f31 >= 180.0f) { + } + else if (var_f31 >= 180.0f) { var_f31 -= 360.0f; } return var_f31; } -float fn_1_122F4(float arg0, float arg1, float arg2) { +float fn_1_122F4(float arg0, float arg1, float arg2) +{ float var_f30; float var_f31; if (arg0 >= 360.0) { arg0 -= 360.0; - } else if (arg0 < 0.0) { + } + else if (arg0 < 0.0) { arg0 += 360.0; } if (arg1 >= 360.0) { arg1 -= 360.0; - } else if (arg1 < 0.0) { + } + else if (arg1 < 0.0) { arg1 += 360.0; } var_f30 = arg0 - arg1 + 360.0; @@ -5273,33 +5293,39 @@ float fn_1_122F4(float arg0, float arg1, float arg2) { if (var_f30 < 180.0) { if (var_f30 <= arg2) { var_f31 = var_f30; - } else { + } + else { var_f31 = arg2; } - } else { + } + else { if (360.0 - var_f30 <= arg2) { var_f31 = -(360.0 - var_f30); - } else { + } + else { var_f31 = -arg2; } } var_f31 += arg1; if (var_f31 >= 360.0) { var_f31 -= 360.0; - } else if (var_f31 < 0.0) { + } + else if (var_f31 < 0.0) { var_f31 += 360.0; } return var_f31; } -float fn_1_12544(float arg0, float arg1, float arg2) { +float fn_1_12544(float arg0, float arg1, float arg2) +{ float var_f28; var_f28 = fn_1_121DC(arg2, arg1); return fn_1_122F4(arg2, arg1, fabs(var_f28 * arg0)); } -void fn_1_1293C(Mtx arg0, Vec* arg1) { +void fn_1_1293C(Mtx arg0, Vec *arg1) +{ Vec sp8; sp8.x = arg0[0][0] * arg1->x + arg0[0][1] * arg1->y + arg0[0][2] * arg1->z; @@ -5308,7 +5334,8 @@ void fn_1_1293C(Mtx arg0, Vec* arg1) { *arg1 = sp8; } -void fn_1_129F0(Vec* arg0, Vec* arg1, Vec* arg2, float* arg3) { +void fn_1_129F0(Vec *arg0, Vec *arg1, Vec *arg2, float *arg3) +{ Vec sp18; Vec spC; float var_f30; @@ -5327,7 +5354,8 @@ void fn_1_129F0(Vec* arg0, Vec* arg1, Vec* arg2, float* arg3) { var_f30 = sqrtf(var_f29); if (var_f30 != 0.0f) { var_f30 = 1.0f / var_f30; - } else { + } + else { var_f30 = 0.0f; } arg3[0] *= var_f30; @@ -5336,7 +5364,8 @@ void fn_1_129F0(Vec* arg0, Vec* arg1, Vec* arg2, float* arg3) { arg3[3] = -(arg3[0] * arg0->x + arg3[1] * arg0->y + arg3[2] * arg0->z); } -s32 fn_1_12C6C(Vec* arg0, Vec* arg1, float* arg2) { +s32 fn_1_12C6C(Vec *arg0, Vec *arg1, float *arg2) +{ float temp_f31; float temp_f30; @@ -5351,7 +5380,8 @@ s32 fn_1_12C6C(Vec* arg0, Vec* arg1, float* arg2) { return 0; } -float fn_1_12D6C(Vec* arg0, Vec* arg1, s32 arg2, float arg3, float arg4) { +float fn_1_12D6C(Vec *arg0, Vec *arg1, s32 arg2, float arg3, float arg4) +{ float var_f31; float var_f30; float var_f29; @@ -5382,11 +5412,10 @@ float fn_1_12D6C(Vec* arg0, Vec* arg1, s32 arg2, float arg3, float arg4) { return var_f27; } -u8 lbl_1_data_914[][2] = { - { 0, 1 }, { 1, 2 }, { 2, 0 } -}; +u8 lbl_1_data_914[][2] = { { 0, 1 }, { 1, 2 }, { 2, 0 } }; -float fn_1_12E68(Vec* arg0, Vec* arg1, s32 arg2) { +float fn_1_12E68(Vec *arg0, Vec *arg1, s32 arg2) +{ float var_f31; float var_f30; float var_f29; @@ -5418,7 +5447,8 @@ float fn_1_12E68(Vec* arg0, Vec* arg1, s32 arg2) { } } return 1.0f; - } else { + } + else { for (i = 1; i < 3; i++) { var_f29 = fn_1_12D6C(&arg0[lbl_1_data_914[i][0]], &arg0[lbl_1_data_914[i][1]], arg2, var_f31, var_f30); if (var_f29 == 0.0f) { @@ -5432,7 +5462,8 @@ float fn_1_12E68(Vec* arg0, Vec* arg1, s32 arg2) { } } -void fn_1_1334C(float* arg0, Vec* arg1, Vec* arg2, Vec* arg3, Vec* arg4) { +void fn_1_1334C(float *arg0, Vec *arg1, Vec *arg2, Vec *arg3, Vec *arg4) +{ float temp_f26; float temp_f25; float temp_f24; @@ -5469,7 +5500,8 @@ void fn_1_1334C(float* arg0, Vec* arg1, Vec* arg2, Vec* arg3, Vec* arg4) { var_f28 = temp_f26 * temp_f31 + temp_f25 * temp_f30 + temp_f24 * temp_f29; if (var_f28 != 0.0f) { var_f28 = -(temp_f26 * (var_f22 - var_f19) + temp_f25 * (var_f21 - var_f18) + temp_f24 * (var_f20 - spC)) / var_f28; - } else { + } + else { var_f28 = 0.0f; } arg4->x = arg1->x + var_f28 * arg2->x; @@ -5477,7 +5509,8 @@ void fn_1_1334C(float* arg0, Vec* arg1, Vec* arg2, Vec* arg3, Vec* arg4) { arg4->z = arg1->z + var_f28 * arg2->z; } -float fn_1_1367C(Vec* arg0, Vec* arg1, Vec* arg2, Vec* arg3, f32* arg4) { +float fn_1_1367C(Vec *arg0, Vec *arg1, Vec *arg2, Vec *arg3, f32 *arg4) +{ Vec sp38; Vec sp2C; Vec sp20; @@ -5488,22 +5521,23 @@ float fn_1_1367C(Vec* arg0, Vec* arg1, Vec* arg2, Vec* arg3, f32* arg4) { arg0->z = 0.0f; arg1->z = 0.0f; arg2->z = 0.0f; - PSVECSubtract(arg1, arg0, &sp2C); - PSVECSubtract(arg2, arg0, &sp20); + VECSubtract(arg1, arg0, &sp2C); + VECSubtract(arg2, arg0, &sp20); temp_f31 = (sp2C.x * sp20.x + sp2C.y * sp20.y) / (sp2C.x * sp2C.x + sp2C.y * sp2C.y); if (arg4 != NULL) { *arg4 = temp_f31; } - PSVECScale(&sp2C, &sp14, temp_f31); - PSVECAdd(&sp2C, &sp14, &sp38); + VECScale(&sp2C, &sp14, temp_f31); + VECAdd(&sp2C, &sp14, &sp38); if (arg3 != NULL) { *arg3 = sp38; } - PSVECSubtract(arg2, &sp38, &sp8); - return PSVECMag(&sp8); + VECSubtract(arg2, &sp38, &sp8); + return VECMag(&sp8); } -s32 fn_1_137C4(Vec* arg0, Vec* arg1, Vec* arg2, Vec* arg3, float arg4, s32 arg5) { +s32 fn_1_137C4(Vec *arg0, Vec *arg1, Vec *arg2, Vec *arg3, float arg4, s32 arg5) +{ Vec sp40; Vec sp34; Vec sp28; @@ -5514,31 +5548,30 @@ s32 fn_1_137C4(Vec* arg0, Vec* arg1, Vec* arg2, Vec* arg3, float arg4, s32 arg5) f32 temp_f28; f32 var_f31; - PSVECAdd(arg1, arg2, &sp28); + VECAdd(arg1, arg2, &sp28); *arg3 = sp28; - PSVECNormalize(arg2, &sp1C); - PSVECScale(&sp1C, &sp1C, arg4); - PSVECAdd(arg1, &sp1C, &sp40); - PSVECAdd(&sp28, &sp1C, &sp34); - PSVECNormalize(arg2, &sp1C); - PSVECScale(&sp1C, &sp10, -arg4); + VECNormalize(arg2, &sp1C); + VECScale(&sp1C, &sp1C, arg4); + VECAdd(arg1, &sp1C, &sp40); + VECAdd(&sp28, &sp1C, &sp34); + VECNormalize(arg2, &sp1C); + VECScale(&sp1C, &sp10, -arg4); switch (arg5) { case 0: if (sp40.y >= arg0[0].y && sp34.y < arg0[0].y) { if (sp1C.y == 0.0f) { var_f31 = 0.0f; - } else { + } + else { var_f31 = (arg0[0].y - arg1->y) / sp1C.y; } temp_f30 = arg1->x + var_f31 * sp1C.x; temp_f28 = arg1->z + var_f31 * sp1C.z; - if (temp_f30 >= arg0[0].x && temp_f30 <= arg0[2].x - && temp_f28 >= arg0[0].z && temp_f28 <= arg0[2].z) - { + if (temp_f30 >= arg0[0].x && temp_f30 <= arg0[2].x && temp_f28 >= arg0[0].z && temp_f28 <= arg0[2].z) { arg3->x = temp_f30; arg3->y = arg0[0].y + arg4 + 1.0f; arg3->z = temp_f28; - PSVECAdd((Vec*) &arg3, &sp10, (Vec*) &arg3); + VECAdd((Vec *)&arg3, &sp10, (Vec *)&arg3); return 1; } } @@ -5547,18 +5580,17 @@ s32 fn_1_137C4(Vec* arg0, Vec* arg1, Vec* arg2, Vec* arg3, float arg4, s32 arg5) if (sp40.y <= arg0[0].y && sp34.y > arg0[0].y) { if (sp1C.y == 0.0f) { var_f31 = 0.0f; - } else { + } + else { var_f31 = (arg0[0].y - arg1->y) / sp1C.y; } temp_f30 = arg1->x + var_f31 * sp1C.x; temp_f28 = arg1->z + var_f31 * sp1C.z; - if (temp_f30 >= arg0[0].x && temp_f30 <= arg0[2].x - && temp_f28 <= arg0[0].z && temp_f28 >= arg0[2].z) - { + if (temp_f30 >= arg0[0].x && temp_f30 <= arg0[2].x && temp_f28 <= arg0[0].z && temp_f28 >= arg0[2].z) { arg3->x = temp_f30; arg3->y = arg0[0].y - arg4 - 1.0f; arg3->z = temp_f28; - PSVECAdd((Vec*) &arg3, &sp10, (Vec*) &arg3); + VECAdd((Vec *)&arg3, &sp10, (Vec *)&arg3); return 1; } } @@ -5567,18 +5599,17 @@ s32 fn_1_137C4(Vec* arg0, Vec* arg1, Vec* arg2, Vec* arg3, float arg4, s32 arg5) if (sp40.x <= arg0[0].x && sp34.x > arg0[0].x) { if (sp1C.x == 0.0f) { var_f31 = 0.0f; - } else { + } + else { var_f31 = (arg0[0].x - arg1->x) / sp1C.x; } temp_f29 = arg1->y + var_f31 * sp1C.y; temp_f28 = arg1->z + var_f31 * sp1C.z; - if (temp_f29 <= arg0[0].y && temp_f29 >= arg0[2].y - && temp_f28 >= arg0[0].z && temp_f28 <= arg0[2].z) - { + if (temp_f29 <= arg0[0].y && temp_f29 >= arg0[2].y && temp_f28 >= arg0[0].z && temp_f28 <= arg0[2].z) { arg3->x = arg0[0].x - arg4 - 1.0f; arg3->y = temp_f29; arg3->z = temp_f28; - PSVECAdd((Vec*) &arg3, &sp10, (Vec*) &arg3); + VECAdd((Vec *)&arg3, &sp10, (Vec *)&arg3); return 1; } } @@ -5587,18 +5618,17 @@ s32 fn_1_137C4(Vec* arg0, Vec* arg1, Vec* arg2, Vec* arg3, float arg4, s32 arg5) if (sp40.x >= arg0[0].x && sp34.x < arg0[0].x) { if (sp1C.x == 0.0f) { var_f31 = 0.0f; - } else { + } + else { var_f31 = (arg0[0].x - arg1->x) / sp1C.x; } temp_f29 = arg1->y + var_f31 * sp1C.y; temp_f28 = arg1->z + var_f31 * sp1C.z; - if (temp_f29 <= arg0[0].y && temp_f29 >= arg0[2].y - && temp_f28 <= arg0[0].z && temp_f28 >= arg0[2].z) - { + if (temp_f29 <= arg0[0].y && temp_f29 >= arg0[2].y && temp_f28 <= arg0[0].z && temp_f28 >= arg0[2].z) { arg3->x = arg0[0].x + arg4 + 1.0f; arg3->y = temp_f29; arg3->z = temp_f28; - PSVECAdd((Vec*) &arg3, &sp10, (Vec*) &arg3); + VECAdd((Vec *)&arg3, &sp10, (Vec *)&arg3); return 1; } } @@ -5607,18 +5637,17 @@ s32 fn_1_137C4(Vec* arg0, Vec* arg1, Vec* arg2, Vec* arg3, float arg4, s32 arg5) if (sp40.z >= arg0[0].z && sp34.z < arg0[0].z) { if (sp1C.z == 0.0f) { var_f31 = 0.0f; - } else { + } + else { var_f31 = (arg0[0].z - arg1->z) / sp1C.z; } temp_f30 = arg1->x + var_f31 * sp1C.x; temp_f29 = arg1->y + var_f31 * sp1C.y; - if (temp_f30 >= arg0[0].x && temp_f30 <= arg0[2].x - && temp_f29 <= arg0[0].y && temp_f29 >= arg0[2].y) - { + if (temp_f30 >= arg0[0].x && temp_f30 <= arg0[2].x && temp_f29 <= arg0[0].y && temp_f29 >= arg0[2].y) { arg3->x = temp_f30; arg3->y = temp_f29; arg3->z = arg0[0].z + arg4 + 1.0f; - PSVECAdd((Vec*) &arg3, &sp10, (Vec*) &arg3); + VECAdd((Vec *)&arg3, &sp10, (Vec *)&arg3); return 1; } } @@ -5627,18 +5656,17 @@ s32 fn_1_137C4(Vec* arg0, Vec* arg1, Vec* arg2, Vec* arg3, float arg4, s32 arg5) if (sp40.z <= arg0[0].z && sp34.z > arg0[0].z) { if (sp1C.z == 0.0f) { var_f31 = 0.0f; - } else { + } + else { var_f31 = (arg0[0].z - arg1->z) / sp1C.z; } temp_f30 = arg1->x + var_f31 * sp1C.x; temp_f29 = arg1->y + var_f31 * sp1C.y; - if (temp_f30 <= arg0[0].x && temp_f30 >= arg0[2].x - && temp_f29 <= arg0[0].y && temp_f29 >= arg0[2].y) - { + if (temp_f30 <= arg0[0].x && temp_f30 >= arg0[2].x && temp_f29 <= arg0[0].y && temp_f29 >= arg0[2].y) { arg3->x = temp_f30; arg3->y = temp_f29; arg3->z = arg0[0].z - arg4 - 1.0f; - PSVECAdd((Vec*) &arg3, &sp10, (Vec*) &arg3); + VECAdd((Vec *)&arg3, &sp10, (Vec *)&arg3); return 1; } } diff --git a/src/REL/m424Dll/ball.c b/src/REL/m424Dll/ball.c index 800f1775..5114c552 100644 --- a/src/REL/m424Dll/ball.c +++ b/src/REL/m424Dll/ball.c @@ -1,7 +1,6 @@ #include "REL/m424Dll.h" #include "ext_math.h" -#include "string.h" #include "game/audio.h" #include "game/chrman.h" #include "game/data.h" @@ -11,6 +10,8 @@ #include "game/hsfmotion.h" #include "game/pad.h" #include "game/sprite.h" +#include "string.h" + // STRUCT typedef struct _M424DllBallStruct { @@ -45,10 +46,10 @@ typedef struct _M424DllBallStruct { Vec unk40; Vec unk4C; Vec unk58; - void* unk64; // sizeof 0x40 + void *unk64; // sizeof 0x40 char unk68[0x3C]; u8 unkA4; - void* unkA8; // sizeof 0x40 + void *unkA8; // sizeof 0x40 char unkAC[0x3C]; s32 unkE8; s32 unkEC; @@ -56,8 +57,8 @@ typedef struct _M424DllBallStruct { typedef struct _M424DllBallStruct3 { u8 unk0; - M424DllBallStruct2* unk4; - M424DllBallStruct2* unk8; + M424DllBallStruct2 *unk4; + M424DllBallStruct2 *unk8; } M424DllBallStruct3; typedef struct _M424BallStruct4 { @@ -73,45 +74,45 @@ typedef struct _M424BallStruct4 { } M424BallStruct4; // BSS -void* lbl_1_bss_5BC[0x20]; -omObjData* lbl_1_bss_5AC[4]; -omObjData* lbl_1_bss_594[6]; +void *lbl_1_bss_5BC[0x20]; +omObjData *lbl_1_bss_5AC[4]; +omObjData *lbl_1_bss_594[6]; M424DllBallStruct2 lbl_1_bss_60[9]; s32 lbl_1_bss_5C; u8 lbl_1_bss_58; // PROTO f32 fn_1_25C0(void); -void fn_1_28A0(omObjData* object); -void fn_1_2E3C(omObjData* object); -void fn_1_31C0(omObjData* object); -void fn_1_37FC(omObjData* object); -void fn_1_4220(omObjData* object); -void fn_1_469C(omObjData* object); -u8 fn_1_48D0(omObjData* object, u8, u8); +void fn_1_28A0(omObjData *object); +void fn_1_2E3C(omObjData *object); +void fn_1_31C0(omObjData *object); +void fn_1_37FC(omObjData *object); +void fn_1_4220(omObjData *object); +void fn_1_469C(omObjData *object); +u8 fn_1_48D0(omObjData *object, u8, u8); void fn_1_4A90(s16); void fn_1_6038(void); -void* fn_1_6078(s32); +void *fn_1_6078(s32); void fn_1_61AC(void); s32 fn_1_627C(void); void fn_1_6230(s16, Mtx); -void fn_1_62D0(s32, u32*); +void fn_1_62D0(s32, u32 *); f32 fn_1_640C(f32, f32, f32); f32 fn_1_6D10(Vec, Vec, f32, Vec, Vec, f32); f32 fn_1_709C(Vec, Vec, f32, f32); f32 fn_1_7420(Vec, Vec, f32, f32); -void fn_1_77C4(Vec, Vec, Vec, f32, Vec*, Vec*); -void fn_1_79FC(Vec*, Vec*, f32, Vec*, Vec*, f32, f32); -void fn_1_7CA0(Vec, Vec, f32, Vec*); +void fn_1_77C4(Vec, Vec, Vec, f32, Vec *, Vec *); +void fn_1_79FC(Vec *, Vec *, f32, Vec *, Vec *, f32, f32); +void fn_1_7CA0(Vec, Vec, f32, Vec *); void fn_1_8924(u8, u8); void fn_1_8AA8(s32, s32); s32 fn_1_8C78(s32, s32); -s32 fn_1_907C(Vec*, Vec*); +s32 fn_1_907C(Vec *, Vec *); - -void fn_1_2720(Process* arg0) { +void fn_1_2720(Process *arg0) +{ u32 sp8[10]; - omObjData* var_r30; + omObjData *var_r30; s32 temp_r28; s32 var_r29; s32 var_r31; @@ -122,7 +123,7 @@ void fn_1_2720(Process* arg0) { } fn_1_62D0(8, sp8); sp8[8] = 8; - + for (var_r31 = 0, var_r29 = 0; var_r31 < 4; var_r31++) { if (GWPlayerCfg[var_r31].group != 0) { var_r30 = omAddObjEx(arg0, 0x3E, 3, 11, 0, fn_1_28A0); @@ -132,7 +133,7 @@ void fn_1_2720(Process* arg0) { var_r29++; } } - + for (var_r31 = 0; var_r31 < 6; var_r29++, var_r31++) { var_r30 = omAddObjEx(arg0, 0x3F, 2, 5, 0, fn_1_4220); lbl_1_bss_594[var_r31] = var_r30; @@ -143,27 +144,20 @@ void fn_1_2720(Process* arg0) { fn_1_6038(); } -void fn_1_2880(void) { +void fn_1_2880(void) +{ fn_1_61AC(); } -u32 lbl_1_data_150[11] = { - 0, 2, 3, 8, 10, - 9, 20, 22, 23, 24, - 0x370021 -}; -Vec lbl_1_data_17C[4] = { - { -100.0f, 200.0f, -100.0f }, - { 300.0f, 200.0f, -100.0f }, - { -300.0f, 200.0f, 300.0f }, - { 300.0f, 200.0f, 0.0f } -}; +u32 lbl_1_data_150[11] = { 0, 2, 3, 8, 10, 9, 20, 22, 23, 24, 0x370021 }; +Vec lbl_1_data_17C[4] = { { -100.0f, 200.0f, -100.0f }, { 300.0f, 200.0f, -100.0f }, { -300.0f, 200.0f, 300.0f }, { 300.0f, 200.0f, 0.0f } }; -void fn_1_28A0(omObjData* object) { +void fn_1_28A0(omObjData *object) +{ Vec sp8; f32 temp_f31; f32 temp_f30; - M424DllBallStruct* var_r31; + M424DllBallStruct *var_r31; s32 var_r29; s32 temp_r28; s32 var_r27; @@ -212,9 +206,12 @@ void fn_1_28A0(omObjData* object) { for (var_r29 = 0; var_r29 < 11; var_r29++) { if (lbl_1_data_150[var_r29] + 0xFFC90000 != 0x21) { object->motion[var_r29] = CharModelMotionCreate(var_r31->unk1, lbl_1_data_150[var_r29]); - } else if (var_r31->unk1 == 5) { - object->motion[var_r29] = Hu3DJointMotion(object->model[0], HuDataSelHeapReadNum(var_r31->unk1 + lbl_1_data_150[var_r29], 0x10000000, HEAP_DATA)); - } else { + } + else if (var_r31->unk1 == 5) { + object->motion[var_r29] + = Hu3DJointMotion(object->model[0], HuDataSelHeapReadNum(var_r31->unk1 + lbl_1_data_150[var_r29], 0x10000000, HEAP_DATA)); + } + else { object->motion[var_r29] = object->motion[0]; } if (lbl_1_data_150[var_r29] == 0x16 || lbl_1_data_150[var_r29] == 0x14) { @@ -230,11 +227,12 @@ void fn_1_28A0(omObjData* object) { object->func = fn_1_2E3C; } -void fn_1_2E38(void) {} +void fn_1_2E38(void) { } -void fn_1_2E3C(omObjData* object) { +void fn_1_2E3C(omObjData *object) +{ s32 temp_r29; - M424DllBallStruct* temp_r31; + M424DllBallStruct *temp_r31; temp_r29 = object->model[0]; temp_r31 = object->data; @@ -242,13 +240,15 @@ void fn_1_2E3C(omObjData* object) { if ((fn_1_FE0() == 4) && ((temp_r31->unk7 & 2) == 0)) { if (temp_r31->unk5 != 0) { fn_1_31C0(object); - } else { + } + else { temp_r31->unk10 = HuPadStkX[temp_r31->unk4]; temp_r31->unk12 = HuPadStkY[temp_r31->unk4]; temp_r31->unk14 = HuPadBtnDown[temp_r31->unk4]; temp_r31->unk16 = HuPadBtn[temp_r31->unk4]; } - } else { + } + else { temp_r31->unk10 = temp_r31->unk12 = 0; temp_r31->unk14 = temp_r31->unk16 = 0; } @@ -289,13 +289,15 @@ void fn_1_2E3C(omObjData* object) { temp_r31->unk18 = 7; temp_r31->unk34.x += fn_1_25C0(); temp_r31->unk34.y = 50.0f; - } else { + } + else { temp_r31->unkC = 0; temp_r31->unk20 += 3.0f; temp_r31->unk4C.y += -1.46f; if (temp_r31->unk1 != 5) { temp_r31->unk18 = 6; - } else { + } + else { temp_r31->unk18 = 0xA; } } @@ -308,13 +310,14 @@ void fn_1_2E3C(omObjData* object) { } } -void fn_1_31C0(omObjData* object) { +void fn_1_31C0(omObjData *object) +{ Vec sp10; s32 spC; s16 sp8; f32 temp_f31; f32 temp_f30; - M424DllBallStruct* temp_r31; + M424DllBallStruct *temp_r31; s16 temp_r30; s16 var_r29; s16 var_r28; @@ -325,7 +328,7 @@ void fn_1_31C0(omObjData* object) { spC = object->model[0]; sp8 = temp_r31->unk18; temp_r30 = temp_r31->unk6; - + var_r29 = var_r28 = var_r26 = var_r25 = 0; switch (temp_r31->unk8) { case 2: @@ -341,18 +344,22 @@ void fn_1_31C0(omObjData* object) { if (temp_f30 < 0.0f) { var_r29 = (-sp10.z * (48.0f + (6.0f * temp_r30))); var_r28 = (-sp10.x * (48.0f + (6.0f * temp_r30))); - } else { + } + else { var_r29 = (sp10.z * (48.0f + (6.0f * temp_r30))); var_r28 = (sp10.x * (48.0f + (6.0f * temp_r30))); } - } else if (temp_f30 < 0.0f) { + } + else if (temp_f30 < 0.0f) { var_r29 = (sp10.z * (48.0f + (6.0f * temp_r30))); var_r28 = (sp10.x * (48.0f + (6.0f * temp_r30))); - } else { + } + else { var_r29 = (-sp10.z * (48.0f + (6.0f * temp_r30))); var_r28 = (-sp10.x * (48.0f + (6.0f * temp_r30))); } - } else { + } + else { var_r29 = temp_r31->unk10; var_r28 = temp_r31->unk12; } @@ -364,7 +371,8 @@ void fn_1_31C0(omObjData* object) { sp10.z = cosd(temp_f31); var_r29 = (48.0f * sp10.x); var_r28 = (48.0f * sp10.z); - } else { + } + else { var_r29 = temp_r31->unk10; var_r28 = temp_r31->unk12; } @@ -376,13 +384,14 @@ void fn_1_31C0(omObjData* object) { temp_r31->unk16 = var_r25; } -void fn_1_37FC(omObjData* object) { +void fn_1_37FC(omObjData *object) +{ s16 spA; s16 sp8; f32 var_f30; f32 var_f28; f32 temp_f27; - M424DllBallStruct* temp_r31; + M424DllBallStruct *temp_r31; s16 temp_r30; s16 temp_r29; s16 var_r28; @@ -407,7 +416,8 @@ void fn_1_37FC(omObjData* object) { if (temp_r31->unk20 >= 6.0f) { var_r28 = 2; var_r27 = 1; - } else { + } + else { var_r28 = 1; var_r27 = 1; } @@ -419,7 +429,8 @@ void fn_1_37FC(omObjData* object) { temp_r31->unk28 -= 0.5f * temp_r31->unk2C; } temp_r31->unk20 *= 1.0 + 0.25 * cosd(90.0f * (temp_r31->unk28 / (0.5f * temp_r31->unk2C))); - } else { + } + else { temp_r31->unk28 = 0.0f; temp_r31->unk20 = 0.0f; var_r28 = 0; @@ -427,7 +438,8 @@ void fn_1_37FC(omObjData* object) { } if (temp_r31->unkC != 0) { temp_r31->unk4C.y = -2.4333334f; - } else { + } + else { temp_r31->unk4C.y += -2.4333334f; } break; @@ -435,7 +447,8 @@ void fn_1_37FC(omObjData* object) { var_r27 = 0; if ((Hu3DData[temp_r25].unk_0C == -1) && (CharModelMotionEndCheck(temp_r31->unk1) != 0)) { temp_r31->unk4C.y += -2.4333334f; - } else { + } + else { temp_r31->unk4C.y = 0.0f; } if (temp_r31->unkC != 0) { @@ -444,7 +457,8 @@ void fn_1_37FC(omObjData* object) { temp_r31->unkD = 0; var_r28 = 5; var_r27 = 0; - } else { + } + else { temp_r31->unk4C.y *= -0.1f; temp_r31->unkC = 0; var_r28 = 4; @@ -478,7 +492,8 @@ void fn_1_37FC(omObjData* object) { var_r27 = 1; if (temp_r31->unkE8 == 1) { temp_r31->unkEC = HuAudCharVoicePlay(temp_r31->unk1, 0x11A); - } else if ((temp_r31->unkE8 > 90.0f) && (temp_r31->unkEC != -1)) { + } + else if ((temp_r31->unkE8 > 90.0f) && (temp_r31->unkEC != -1)) { HuAudFXStop(temp_r31->unkEC); temp_r31->unkEC = -1; } @@ -506,7 +521,8 @@ void fn_1_37FC(omObjData* object) { if ((temp_r31->unk7 & 4) != 0) { if ((temp_r31->unkA & 2) != 0) { Hu3DModelAttrSet(temp_r25, 1); - } else { + } + else { Hu3DModelAttrReset(temp_r25, 1); } if (--temp_r31->unkA == 0) { @@ -544,18 +560,19 @@ void fn_1_37FC(omObjData* object) { omSetSca(object, temp_r31->unk1C, temp_r31->unk1C, temp_r31->unk1C); } -void fn_1_4220(omObjData* object) { +void fn_1_4220(omObjData *object) +{ s32 sp14[3] = { 0x370013, 0x370014, 0x370015 }; Vec sp8; f32 temp_f31; f32 temp_f30; - M424DllBallStruct* var_r31; + M424DllBallStruct *var_r31; s32 var_r29; s32 temp_r28; s32 var_r27; object->model[0] = var_r27 = Hu3DModelCreateFile(0x370012); - + for (var_r29 = 0; var_r29 < 3; var_r29++) { object->motion[var_r29] = Hu3DJointMotion(var_r27, HuDataSelHeapReadNum(sp14[var_r29], 0x10000000, HEAP_DATA)); } @@ -584,7 +601,8 @@ void fn_1_4220(omObjData* object) { sp8.x = 350.0f; sp8.y = 200.0f; sp8.z = 50.0f; - } else { + } + else { temp_f31 = 40.0f; temp_f31 = 105.0f + ((temp_f31 * temp_r28) + (temp_f31 * (fn_1_627C() / 65536.0f))); temp_f30 = 125.0f; @@ -608,21 +626,22 @@ void fn_1_4220(omObjData* object) { object->func = fn_1_469C; } -fn_1_4698(void) {} +fn_1_4698(void) { } -void fn_1_469C(omObjData* object) { +void fn_1_469C(omObjData *object) +{ s32 temp_r27; s16 var_r28; s16 var_r30; - M424DllBallStruct* temp_r31; + M424DllBallStruct *temp_r31; temp_r31 = object->data; temp_r27 = object->model[0]; var_r30 = temp_r31->unk18; temp_r31->unk58 = temp_r31->unk34; - + temp_r31->unk4C.x = temp_r31->unk4C.z = 0.0f; - switch (temp_r31->unk8) { /* irregular */ + switch (temp_r31->unk8) { /* irregular */ case 3: var_r30 = 2; var_r28 = 1; @@ -642,7 +661,7 @@ void fn_1_469C(omObjData* object) { case 2: var_r30 = 0; var_r28 = 1; - + temp_r31->unk4C.x = temp_r31->unk4C.z = 0.0f; temp_r31->unk4C.y += -0.97333336f; break; @@ -651,13 +670,14 @@ void fn_1_469C(omObjData* object) { if (var_r30 != temp_r31->unk1A) { temp_r31->unk1A = var_r30; temp_r31->unk18 = var_r30; - Hu3DMotionShiftSet(temp_r27, object->motion[temp_r31->unk18], 0.0f, 8.0f, (u32) var_r28); + Hu3DMotionShiftSet(temp_r27, object->motion[temp_r31->unk18], 0.0f, 8.0f, (u32)var_r28); temp_r31->unk2C = Hu3DMotionMaxTimeGet(temp_r31->unk1); } } -u8 fn_1_48D0(omObjData* object, u8 arg1, u8 arg2) { - M424DllBallStruct2* temp_r31; +u8 fn_1_48D0(omObjData *object, u8 arg1, u8 arg2) +{ + M424DllBallStruct2 *temp_r31; s32 var_r30; s32 var_r28; @@ -676,7 +696,7 @@ u8 fn_1_48D0(omObjData* object, u8 arg1, u8 arg2) { temp_r31->unkA = var_r30; Hu3DModelLayerSet(var_r30, 1); Hu3DModelShadowSet(var_r30); - PSMTXIdentity(temp_r31->unkC); + MTXIdentity(temp_r31->unkC); temp_r31->unk3C.x = object->trans.x; temp_r31->unk3C.y = 100.0f + object->trans.y; temp_r31->unk3C.z = object->trans.z; @@ -687,28 +707,30 @@ u8 fn_1_48D0(omObjData* object, u8 arg1, u8 arg2) { temp_r31->unk6 = 0; if (arg2 != 0) { temp_r31->unk91 = arg1; - } else { + } + else { temp_r31->unk91 = 0xFFU; } return var_r28; } -void fn_1_4A90(s16 arg0) { +void fn_1_4A90(s16 arg0) +{ Mtx sp50; Mtx sp20; Vec sp14; Vec sp8; f32 var_f31; f32 var_f30; - M424DllBallStruct2* var_r31; - M424DllBallStruct* temp_r30; + M424DllBallStruct2 *var_r31; + M424DllBallStruct *temp_r30; s32 var_r29; if (omPauseChk() == 0) { var_r31 = lbl_1_bss_60; var_f31 = fn_1_213C(); mtxRot(sp20, 0.0f, var_f31, 0.0f); - + for (var_r29 = 0; var_r29 < lbl_1_bss_58; var_r29++, var_r31++) { temp_r30 = var_r31->unk0->data; var_r31->unk48 = var_r31->unk54; @@ -716,20 +738,20 @@ void fn_1_4A90(s16 arg0) { var_r31->unk78.x = var_r31->unk78.y = var_r31->unk78.z = 0.0f; switch (var_r31->unk4) { case 1: - PSMTXTrans(sp50, var_r31->unk3C.x, var_r31->unk3C.y, var_r31->unk3C.z); - PSMTXConcat(sp20, sp50, sp50); + MTXTrans(sp50, var_r31->unk3C.x, var_r31->unk3C.y, var_r31->unk3C.z); + MTXConcat(sp20, sp50, sp50); var_r31->unk48.x = sp50[0][3]; var_r31->unk48.y = sp50[1][3]; var_r31->unk48.z = sp50[2][3]; - PSVECSubtract(&var_r31->unk48, &var_r31->unk3C, &var_r31->unk78); - PSVECSubtract(&var_r31->unk3C, &var_r31->unk54, &sp14); - PSVECAdd(&temp_r30->unk4C, &sp14, &var_r31->unk84); - PSVECAdd(&var_r31->unk84, &var_r31->unk78, &var_r31->unk6C); + VECSubtract(&var_r31->unk48, &var_r31->unk3C, &var_r31->unk78); + VECSubtract(&var_r31->unk3C, &var_r31->unk54, &sp14); + VECAdd(&temp_r30->unk4C, &sp14, &var_r31->unk84); + VECAdd(&var_r31->unk84, &var_r31->unk78, &var_r31->unk6C); var_r31->unk84.y = 0.0f; var_r31->unk4 = 2; break; case 3: - PSVECSubtract(&var_r31->unk3C, &var_r31->unk60, &var_r31->unk6C); + VECSubtract(&var_r31->unk3C, &var_r31->unk60, &var_r31->unk6C); var_r31->unk84 = var_r31->unk6C; break; case 4: @@ -740,15 +762,16 @@ void fn_1_4A90(s16 arg0) { case 2: var_r31->unk6C.y = 0.0f; var_r31->unk6C.x = var_r31->unk6C.z = 0.0f; - PSVECSubtract(&var_r31->unk3C, &var_r31->unk54, &sp14); - PSVECAdd(&temp_r30->unk4C, &sp14, &var_r31->unk84); + VECSubtract(&var_r31->unk3C, &var_r31->unk54, &sp14); + VECAdd(&temp_r30->unk4C, &sp14, &var_r31->unk84); var_r31->unk6C = var_r31->unk84; break; case 5: if ((var_r31->unk6 & 2) != 0) { Hu3DModelAttrSet(var_r31->unk8, 1); Hu3DModelAttrSet(var_r31->unkA, 1); - } else { + } + else { Hu3DModelAttrReset(var_r31->unk8, 1); Hu3DModelAttrReset(var_r31->unkA, 1); } @@ -766,18 +789,19 @@ void fn_1_4A90(s16 arg0) { for (var_r29 = 0; var_r29 < lbl_1_bss_58; var_r29++, var_r31++) { if (var_r31->unk4 != 6) { if (var_r31->unk4 == 1) { - PSVECSubtract(&var_r31->unk3C, &var_r31->unk48, &sp14); + VECSubtract(&var_r31->unk3C, &var_r31->unk48, &sp14); sp8.x = sp14.z; sp8.y = 0.0f; sp8.z = -sp14.x; - var_f30 = PSVECMag(&sp8); + var_f30 = VECMag(&sp8); if (var_f30 > 0.01f) { - PSMTXRotAxisRad(sp50, &sp8, MTXDegToRad(var_f30)); - PSMTXConcat(sp20, sp50, sp50); - } else { - PSMTXCopy(sp20, sp50); + MTXRotAxisRad(sp50, &sp8, MTXDegToRad(var_f30)); + MTXConcat(sp20, sp50, sp50); } - PSMTXConcat(sp50, var_r31->unkC, var_r31->unkC); + else { + MTXCopy(sp20, sp50); + } + MTXConcat(sp50, var_r31->unkC, var_r31->unkC); fn_1_6230(var_r31->unk8, var_r31->unkC); fn_1_6230(var_r31->unkA, var_r31->unkC); } @@ -789,7 +813,7 @@ void fn_1_4A90(s16 arg0) { } Hu3DModelPosSet(var_r31->unk8, var_r31->unk3C.x, var_r31->unk3C.y, var_r31->unk3C.z); Hu3DModelPosSet(var_r31->unkA, var_r31->unk3C.x, var_r31->unk3C.y, var_r31->unk3C.z); - PSVECSubtract(&var_r31->unk3C, &var_r31->unk54, &sp14); + VECSubtract(&var_r31->unk3C, &var_r31->unk54, &sp14); var_r31->unk6C = sp14; var_r31->unk54 = var_r31->unk3C; temp_r30 = var_r31->unk0->data; @@ -806,7 +830,8 @@ void fn_1_4A90(s16 arg0) { } } -void fn_1_5018(void) { +void fn_1_5018(void) +{ M424DllBallStruct3 sp27C[32]; Vec sp270; Vec sp264; @@ -819,8 +844,8 @@ void fn_1_5018(void) { f32 var_f30; f32 var_f29; f32 temp_f28; - M424DllBallStruct2* var_r31; - M424DllBallStruct2* var_r30; + M424DllBallStruct2 *var_r31; + M424DllBallStruct2 *var_r30; s32 var_r29; s32 var_r28; s32 var_r27; @@ -831,7 +856,7 @@ void fn_1_5018(void) { for (var_r28 = 0; var_r28 < lbl_1_bss_58; var_r28++, var_r31++) { var_r31->unk90 = 1; } - + for (var_r26 = 0, var_f29 = 1.0f; var_r26 < 0x80; var_f29 -= var_f30, var_r26++) { var_r29 = 0; var_f30 = var_f29; @@ -861,7 +886,8 @@ void fn_1_5018(void) { } if (var_r31->unk4 == 1) { var_f31 = fn_1_7420(var_r31->unk60, var_r31->unk84, 100.0f, 700.0f); - } else { + } + else { var_f31 = fn_1_7420(var_r31->unk60, var_r31->unk6C, 100.0f, 700.0f); } if (var_f31 >= 0.0f && var_f31 <= var_f29) { @@ -879,7 +905,8 @@ void fn_1_5018(void) { } if (var_r31->unk4 == 1) { var_f31 = fn_1_709C(var_r31->unk60, var_r31->unk84, 100.0f, 250.0f); - } else { + } + else { var_f31 = fn_1_709C(var_r31->unk60, var_r31->unk6C, 100.0f, 250.0f); } if (var_f31 >= 0.0f && var_f31 <= var_f29) { @@ -896,26 +923,32 @@ void fn_1_5018(void) { } } } - + var_r30 = lbl_1_bss_60; for (var_r25 = 0; var_r25 < lbl_1_bss_58; var_r25++, var_r30++) { if ((var_r31 != var_r30) && (var_r30->unk4 < 4)) { if ((var_r31->unk4 == 1) && (var_r30->unk4 == 1)) { var_f31 = fn_1_6D10(var_r31->unk60, var_r31->unk84, 100.0f, var_r30->unk60, var_r30->unk84, 100.0f); - } else { + } + else { var_f31 = fn_1_6D10(var_r31->unk60, var_r31->unk6C, 100.0f, var_r30->unk60, var_r30->unk6C, 100.0f); } - if ((var_f31 < 0.0f) || (var_f31 > var_f29)) continue; + if ((var_f31 < 0.0f) || (var_f31 > var_f29)) + continue; var_r31->unk90 = 1; var_r30->unk90 = 1; - if (var_f31 > var_f30) continue; + if (var_f31 > var_f30) + continue; if (var_f31 < var_f30) { var_r29 = 0; - } else { + } + else { for (var_r27 = 0; var_r27 < var_r29; var_r27++) { - if ((sp27C[var_r27].unk4 == var_r30) && (sp27C[var_r27].unk8 == var_r31)) break; + if ((sp27C[var_r27].unk4 == var_r30) && (sp27C[var_r27].unk8 == var_r31)) + break; } - if (var_r27 < var_r29) continue; + if (var_r27 < var_r29) + continue; } sp27C[var_r29].unk0 = 3; sp27C[var_r29].unk4 = var_r31; @@ -926,7 +959,8 @@ void fn_1_5018(void) { } } } - if (var_r29 == 0) break; + if (var_r29 == 0) + break; var_r31 = lbl_1_bss_60; for (var_r28 = 0; var_r28 < lbl_1_bss_58; var_r28++, var_r31++) { var_r31->unk60.x += var_r31->unk6C.x * var_f30; @@ -947,11 +981,11 @@ void fn_1_5018(void) { var_r31 = sp27C[var_r28].unk4; sp240 = var_r31->unk60; sp240.y = 0.0f; - PSVECNormalize(&sp240, &sp228); + VECNormalize(&sp240, &sp228); sp228.x = -sp228.x; sp228.y = 0.0f; sp228.z = -sp228.z; - temp_f28 = PSVECMag(&sp240); + temp_f28 = VECMag(&sp240); temp_f28 -= 600.0f; var_r31->unk60.x += temp_f28 * sp228.x; var_r31->unk60.z += temp_f28 * sp228.z; @@ -960,8 +994,9 @@ void fn_1_5018(void) { if (var_r31->unk4 == 1) { fn_1_7CA0(var_r31->unk84, sp228, 0.8f, &sp24C); var_r31->unk84 = sp24C; - PSVECAdd(&var_r31->unk84, &var_r31->unk78, &var_r31->unk6C); - } else { + VECAdd(&var_r31->unk84, &var_r31->unk78, &var_r31->unk6C); + } + else { fn_1_7CA0(var_r31->unk6C, sp228, 0.8f, &sp24C); var_r31->unk6C = sp24C; var_r31->unk84 = var_r31->unk6C; @@ -971,8 +1006,8 @@ void fn_1_5018(void) { var_r31 = sp27C[var_r28].unk4; sp240 = var_r31->unk60; sp240.y = 0.0f; - PSVECNormalize(&sp240, &sp228); - temp_f28 = PSVECMag(&sp240); + VECNormalize(&sp240, &sp228); + temp_f28 = VECMag(&sp240); temp_f28 = 350.0f; var_r31->unk60.x = temp_f28 * sp228.x; var_r31->unk60.z = temp_f28 * sp228.z; @@ -981,8 +1016,9 @@ void fn_1_5018(void) { if (var_r31->unk4 == 1) { fn_1_7CA0(var_r31->unk84, sp228, 0.8f, &sp24C); var_r31->unk84 = sp24C; - PSVECAdd(&var_r31->unk84, &var_r31->unk78, &var_r31->unk6C); - } else { + VECAdd(&var_r31->unk84, &var_r31->unk78, &var_r31->unk6C); + } + else { fn_1_7CA0(var_r31->unk6C, sp228, 0.8f, &sp24C); var_r31->unk6C = sp24C; var_r31->unk84 = var_r31->unk6C; @@ -995,22 +1031,25 @@ void fn_1_5018(void) { fn_1_79FC(&var_r30->unk3C, &var_r30->unk6C, 100.0f, &var_r31->unk3C, &var_r31->unk6C, 100.0f, 0.8f); var_r31->unk84 = var_r31->unk6C; var_r30->unk84 = var_r30->unk6C; - } else if (var_r30->unk4 == 3) { + } + else if (var_r30->unk4 == 3) { fn_1_79FC(&var_r31->unk3C, &var_r31->unk6C, 100.0f, &var_r30->unk3C, &var_r30->unk6C, 100.0f, 0.8f); var_r31->unk84 = var_r31->unk6C; var_r30->unk84 = var_r30->unk6C; - } else if ((var_r31->unk4 == 1) && (var_r30->unk4 == 1)) { + } + else if ((var_r31->unk4 == 1) && (var_r30->unk4 == 1)) { fn_1_77C4(var_r31->unk60, var_r31->unk84, var_r30->unk60, 0.8f, &sp24C, &sp258); fn_1_77C4(var_r30->unk60, var_r30->unk84, var_r31->unk60, 0.8f, &sp270, &sp264); - PSVECAdd(&sp24C, &sp264, &var_r31->unk84); - PSVECAdd(&sp258, &sp270, &var_r30->unk84); - PSVECAdd(&var_r31->unk84, &var_r31->unk78, &var_r31->unk6C); - PSVECAdd(&var_r30->unk84, &var_r30->unk78, &var_r30->unk6C); - } else { + VECAdd(&sp24C, &sp264, &var_r31->unk84); + VECAdd(&sp258, &sp270, &var_r30->unk84); + VECAdd(&var_r31->unk84, &var_r31->unk78, &var_r31->unk6C); + VECAdd(&var_r30->unk84, &var_r30->unk78, &var_r30->unk6C); + } + else { fn_1_77C4(var_r31->unk60, var_r31->unk6C, var_r30->unk60, 0.8f, &sp24C, &sp258); fn_1_77C4(var_r30->unk60, var_r30->unk6C, var_r31->unk60, 0.8f, &sp270, &sp264); - PSVECAdd(&sp24C, &sp264, &var_r31->unk6C); - PSVECAdd(&sp258, &sp270, &var_r30->unk6C); + VECAdd(&sp24C, &sp264, &var_r31->unk6C); + VECAdd(&sp258, &sp270, &var_r30->unk6C); var_r31->unk84 = var_r31->unk6C; var_r30->unk84 = var_r30->unk6C; } @@ -1026,19 +1065,22 @@ void fn_1_5018(void) { } } -void fn_1_6038(void) { +void fn_1_6038(void) +{ s32 var_r31; - + for (var_r31 = 0; var_r31 < 0x20; var_r31++) { lbl_1_bss_5BC[var_r31] = 0; } } -void* fn_1_6078(s32 arg0) { +void *fn_1_6078(s32 arg0) +{ s32 var_r31; - + for (var_r31 = 0; var_r31 < 0x20; var_r31++) { - if (lbl_1_bss_5BC[var_r31] == 0) break; + if (lbl_1_bss_5BC[var_r31] == 0) + break; } if (var_r31 == 0x20) { return NULL; @@ -1047,11 +1089,13 @@ void* fn_1_6078(s32 arg0) { return lbl_1_bss_5BC[var_r31]; } -void fn_1_6118(void* arg0) { +void fn_1_6118(void *arg0) +{ s32 var_r31; - + for (var_r31 = 0; var_r31 < 0x20; var_r31++) { - if (lbl_1_bss_5BC[var_r31] == arg0) break; + if (lbl_1_bss_5BC[var_r31] == arg0) + break; } if (var_r31 != 0x20) { HuMemDirectFree(lbl_1_bss_5BC[var_r31]); @@ -1059,9 +1103,10 @@ void fn_1_6118(void* arg0) { } } -void fn_1_61AC(void) { +void fn_1_61AC(void) +{ s32 var_r31; - + for (var_r31 = 0; var_r31 < 0x20; var_r31++) { if (lbl_1_bss_5BC[var_r31]) { HuMemDirectFree(lbl_1_bss_5BC[var_r31]); @@ -1070,22 +1115,25 @@ void fn_1_61AC(void) { } } -void fn_1_6230(s16 arg0, Mtx arg1) { - ModelData* var_r31; +void fn_1_6230(s16 arg0, Mtx arg1) +{ + ModelData *var_r31; var_r31 = &Hu3DData[arg0]; - PSMTXCopy(arg1, var_r31->unk_F0); + MTXCopy(arg1, var_r31->unk_F0); } u32 lbl_1_data_1D8 = 0x41C64E6D; -s32 fn_1_627C(void) { +s32 fn_1_627C(void) +{ lbl_1_data_1D8 *= 0x41C64E6D; lbl_1_data_1D8 += 0x3039; return lbl_1_data_1D8 >> 0x10; } -void fn_1_62D0(s32 arg0, u32* arg1) { +void fn_1_62D0(s32 arg0, u32 *arg1) +{ s32 var_r31; s32 temp_r30; u32 temp_r29; @@ -1093,7 +1141,7 @@ void fn_1_62D0(s32 arg0, u32* arg1) { for (var_r31 = 0; var_r31 < arg0; var_r31++) { arg1[var_r31] = var_r31; } - + for (var_r31 = 0; var_r31 < arg0 - 1; var_r31++) { temp_r30 = (arg0 * (fn_1_627C() / 65536.0f)); temp_r29 = arg1[var_r31]; @@ -1102,19 +1150,22 @@ void fn_1_62D0(s32 arg0, u32* arg1) { } } -f32 fn_1_640C(f32 arg0, f32 arg1, f32 arg2) { +f32 fn_1_640C(f32 arg0, f32 arg1, f32 arg2) +{ f32 var_f31; if (arg0 > 180.0f) { arg0 -= 360.0f; - } else { + } + else { if (arg0 <= -180.0f) { arg0 += 360.0f; } } if (arg1 > 180.0f) { arg1 -= 360.0f; - } else { + } + else { if (arg1 <= -180.0f) { arg1 += 360.0f; } @@ -1122,7 +1173,8 @@ f32 fn_1_640C(f32 arg0, f32 arg1, f32 arg2) { var_f31 = arg0 - arg1; if (var_f31 > 180.0f) { var_f31 -= 360.0f; - } else { + } + else { if (var_f31 <= -180.0f) { var_f31 += 360.0f; } @@ -1137,26 +1189,29 @@ f32 fn_1_640C(f32 arg0, f32 arg1, f32 arg2) { return arg0; } -void fn_1_6574(Mtx arg0, f32 arg8, f32 arg9, f32 argA) { +void fn_1_6574(Mtx arg0, f32 arg8, f32 arg9, f32 argA) +{ Mtx sp38; Mtx sp8; - + if (argA != 0.0f) { - PSMTXRotRad(arg0, 0x5A, MTXDegToRad(argA)); - } else { - PSMTXIdentity(arg0); + MTXRotRad(arg0, 0x5A, MTXDegToRad(argA)); + } + else { + MTXIdentity(arg0); } if (arg8 != 0.0f) { - PSMTXRotRad(sp38, 0x58, MTXDegToRad(arg8)); - PSMTXConcat(sp38, arg0, arg0); + MTXRotRad(sp38, 0x58, MTXDegToRad(arg8)); + MTXConcat(sp38, arg0, arg0); } if (arg9 != 0.0f) { - PSMTXRotRad(sp8, 0x59, MTXDegToRad(arg9)); - PSMTXConcat(sp8, arg0, arg0); + MTXRotRad(sp8, 0x59, MTXDegToRad(arg9)); + MTXConcat(sp8, arg0, arg0); } } -void fn_1_6694(M424BallStruct4* arg0, Vec* arg1) { +void fn_1_6694(M424BallStruct4 *arg0, Vec *arg1) +{ f32 temp_f29; f32 var_f28; @@ -1181,7 +1236,8 @@ void fn_1_6694(M424BallStruct4* arg0, Vec* arg1) { } } -void fn_1_6A30(M424BallStruct4* arg0, Vec* arg1) { +void fn_1_6A30(M424BallStruct4 *arg0, Vec *arg1) +{ f32 temp_f29; f32 var_f27; @@ -1201,7 +1257,8 @@ void fn_1_6A30(M424BallStruct4* arg0, Vec* arg1) { } } -f32 fn_1_6D10(Vec arg0, Vec arg1, f32 arg2, Vec arg3, Vec arg4, f32 arg5) { +f32 fn_1_6D10(Vec arg0, Vec arg1, f32 arg2, Vec arg3, Vec arg4, f32 arg5) +{ f32 temp_f30; f32 temp_f29; f32 temp_f28; @@ -1210,10 +1267,10 @@ f32 fn_1_6D10(Vec arg0, Vec arg1, f32 arg2, Vec arg3, Vec arg4, f32 arg5) { f32 temp_f25; f32 var_f23; - PSVECSubtract(&arg3, &arg0, &arg3); - PSVECSubtract(&arg4, &arg1, &arg4); + VECSubtract(&arg3, &arg0, &arg3); + VECSubtract(&arg4, &arg1, &arg4); temp_f29 = arg2 + arg5; - if (PSVECMag(&arg3) > temp_f29 + PSVECMag(&arg4)) { + if (VECMag(&arg3) > temp_f29 + VECMag(&arg4)) { return -1.0f; } temp_f29 *= temp_f29; @@ -1236,7 +1293,8 @@ f32 fn_1_6D10(Vec arg0, Vec arg1, f32 arg2, Vec arg3, Vec arg4, f32 arg5) { return temp_f28; } -f32 fn_1_709C(Vec arg0, Vec arg1, f32 arg2, f32 arg3) { +f32 fn_1_709C(Vec arg0, Vec arg1, f32 arg2, f32 arg3) +{ Vec sp20; Vec sp14; f32 temp_f30; @@ -1252,7 +1310,7 @@ f32 fn_1_709C(Vec arg0, Vec arg1, f32 arg2, f32 arg3) { sp14 = arg1; sp14.y = 0.0f; temp_f29 = arg3 + arg2; - if (PSVECMag(&sp20) > temp_f29 + PSVECMag(&sp14)) { + if (VECMag(&sp20) > temp_f29 + VECMag(&sp14)) { return -1.0f; } temp_f29 *= temp_f29; @@ -1275,7 +1333,8 @@ f32 fn_1_709C(Vec arg0, Vec arg1, f32 arg2, f32 arg3) { return temp_f28; } -f32 fn_1_7420(Vec arg0, Vec arg1, f32 arg2, f32 arg3) { +f32 fn_1_7420(Vec arg0, Vec arg1, f32 arg2, f32 arg3) +{ Vec sp20; Vec sp14; f32 temp_f30; @@ -1285,16 +1344,16 @@ f32 fn_1_7420(Vec arg0, Vec arg1, f32 arg2, f32 arg3) { f32 temp_f26; f32 temp_f25; f32 var_f23; - + sp20 = arg0; sp20.y = 0.0f; sp14 = arg1; sp14.y = 0.0f; temp_f29 = arg3 - arg2; - if (PSVECMag(&sp20) > temp_f29) { + if (VECMag(&sp20) > temp_f29) { return 0.0f; } - if (PSVECMag(&sp20) > temp_f29 + PSVECMag(&sp14)) { + if (VECMag(&sp20) > temp_f29 + VECMag(&sp14)) { return -1.0f; } temp_f29 *= temp_f29; @@ -1317,7 +1376,8 @@ f32 fn_1_7420(Vec arg0, Vec arg1, f32 arg2, f32 arg3) { return temp_f28; } -void fn_1_77C4(Vec arg0, Vec arg1, Vec arg2, f32 arg3, Vec* arg4, Vec* arg5) { +void fn_1_77C4(Vec arg0, Vec arg1, Vec arg2, f32 arg3, Vec *arg4, Vec *arg5) +{ Vec sp38; Vec sp2C; Vec sp20; @@ -1328,17 +1388,17 @@ void fn_1_77C4(Vec arg0, Vec arg1, Vec arg2, f32 arg3, Vec* arg4, Vec* arg5) { f32 var_f28; sp38 = arg1; - var_f31 = PSVECMag(&sp38); + var_f31 = VECMag(&sp38); if (var_f31 < 0.01f) { arg4->x = arg4->y = arg4->z = 0.0f; arg5->x = arg5->y = arg5->z = 0.0f; return; } - PSVECNormalize(&sp38, &sp38); + VECNormalize(&sp38, &sp38); var_f31 = var_f31 * arg3; - PSVECSubtract(&arg2, &arg0, &sp2C); - PSVECNormalize(&sp2C, &sp2C); - var_f28 = PSVECDotProduct(&sp38, &sp2C); + VECSubtract(&arg2, &arg0, &sp2C); + VECNormalize(&sp2C, &sp2C); + var_f28 = VECDotProduct(&sp38, &sp2C); if (var_f28 < 0.0f) { arg4->x = arg1.x; arg4->y = arg1.y; @@ -1350,11 +1410,12 @@ void fn_1_77C4(Vec arg0, Vec arg1, Vec arg2, f32 arg3, Vec* arg4, Vec* arg5) { temp_f30 = var_f31 - temp_f29; if (temp_f30 < 0.01f) { arg4->x = arg4->y = arg4->z = 0.0f; - } else { - PSVECCrossProduct(&sp38, &sp2C, &sp14); - PSVECNormalize(&sp14, &sp14); - PSVECCrossProduct(&sp2C, &sp14, &sp20); - PSVECNormalize(&sp20, &sp20); + } + else { + VECCrossProduct(&sp38, &sp2C, &sp14); + VECNormalize(&sp14, &sp14); + VECCrossProduct(&sp2C, &sp14, &sp20); + VECNormalize(&sp20, &sp20); arg4->x = sp20.x * temp_f30; arg4->y = sp20.y * temp_f30; arg4->z = sp20.z * temp_f30; @@ -1364,7 +1425,8 @@ void fn_1_77C4(Vec arg0, Vec arg1, Vec arg2, f32 arg3, Vec* arg4, Vec* arg5) { arg5->z = sp2C.z * temp_f29; } -void fn_1_79FC(Vec* arg0, Vec* arg1, f32 arg2, Vec* arg3, Vec* arg4, f32 arg5, f32 arg6) { +void fn_1_79FC(Vec *arg0, Vec *arg1, f32 arg2, Vec *arg3, Vec *arg4, f32 arg5, f32 arg6) +{ Vec sp38; Vec sp2C; f32 temp_f31; @@ -1374,28 +1436,30 @@ void fn_1_79FC(Vec* arg0, Vec* arg1, f32 arg2, Vec* arg3, Vec* arg4, f32 arg5, f arg1->x *= arg6; arg1->y *= arg6; arg1->z *= arg6; - PSVECSubtract(arg0, arg3, &sp38); - PSVECNormalize(&sp38, &sp2C); - temp_f31 = (arg2 + arg5) - PSVECMag(&sp38); + VECSubtract(arg0, arg3, &sp38); + VECNormalize(&sp38, &sp2C); + temp_f31 = (arg2 + arg5) - VECMag(&sp38); if (temp_f31 > 0.01f) { - PSVECSubtract(arg1, arg4, &sp38); - if (PSVECMag(&sp38) < 0.01f) { + VECSubtract(arg1, arg4, &sp38); + if (VECMag(&sp38) < 0.01f) { arg0->x += sp2C.x * temp_f31; arg0->y += sp2C.y * temp_f31; arg0->z += sp2C.z * temp_f31; - } else { - PSVECNormalize(&sp38, &sp38); + } + else { + VECNormalize(&sp38, &sp38); arg0->x -= sp38.x * temp_f31; arg0->y -= sp38.y * temp_f31; arg0->z -= sp38.z * temp_f31; } } fn_1_7CA0(*arg1, sp2C, 1.0f, arg1); - PSVECSubtract(arg4, arg1, &sp38); - var_f30 = PSVECMag(&sp38); - if (var_f30 < 0.01f) return; - PSVECNormalize(&sp38, &sp38); - var_f29 = PSVECDotProduct(&sp2C, &sp38); + VECSubtract(arg4, arg1, &sp38); + var_f30 = VECMag(&sp38); + if (var_f30 < 0.01f) + return; + VECNormalize(&sp38, &sp38); + var_f29 = VECDotProduct(&sp2C, &sp38); if (var_f29 > 0.0f) { arg1->x += var_f30 * (sp2C.x * var_f29); arg1->y += var_f30 * (sp2C.y * var_f29); @@ -1403,14 +1467,15 @@ void fn_1_79FC(Vec* arg0, Vec* arg1, f32 arg2, Vec* arg3, Vec* arg4, f32 arg5, f } } -void fn_1_7CA0(Vec arg0, Vec arg1, f32 arg2, Point3d* arg3) { +void fn_1_7CA0(Vec arg0, Vec arg1, f32 arg2, Point3d *arg3) +{ f32 var_f31; *arg3 = arg0; arg3->x *= arg2; arg3->y *= arg2; arg3->z *= arg2; - var_f31 = PSVECDotProduct(&arg1, arg3); + var_f31 = VECDotProduct(&arg1, arg3); if (var_f31 < 0.0f) { arg3->x -= 2.0f * arg1.x * var_f31; arg3->y -= 2.0f * arg1.y * var_f31; @@ -1418,7 +1483,8 @@ void fn_1_7CA0(Vec arg0, Vec arg1, f32 arg2, Point3d* arg3) { } } -f32 fn_1_7DD0(Vec* arg0) { +f32 fn_1_7DD0(Vec *arg0) +{ f32 temp_f30; f32 temp_f29; @@ -1429,24 +1495,28 @@ f32 fn_1_7DD0(Vec* arg0) { arg0->x *= temp_f29; arg0->y *= temp_f29; arg0->z *= temp_f29; - } else { + } + else { arg0->x = arg0->y = arg0->z = 0.0f; } return temp_f30; } -f32 fn_1_7F68(Vec arg0, Vec arg1, Vec* arg2, f32 arg8) { +f32 fn_1_7F68(Vec arg0, Vec arg1, Vec *arg2, f32 arg8) +{ if (arg8 <= 0.0f) { arg2->x = arg0.x; arg2->y = arg0.y; arg2->z = arg0.z; arg8 = 0.0f; - } else if (arg8 >= 1.0f) { + } + else if (arg8 >= 1.0f) { arg2->x = (arg0.x + arg1.x); arg2->y = (arg0.y + arg1.y); arg2->z = (arg0.z + arg1.z); arg8 = 1.0f; - } else { + } + else { arg2->x = (arg0.x + (arg8 * arg1.x)); arg2->y = (arg0.y + (arg8 * arg1.y)); arg2->z = (arg0.z + (arg8 * arg1.z)); @@ -1454,7 +1524,8 @@ f32 fn_1_7F68(Vec arg0, Vec arg1, Vec* arg2, f32 arg8) { return arg8; } -f32 fn_1_8040(Vec arg0, Vec arg1, Vec arg2) { +f32 fn_1_8040(Vec arg0, Vec arg1, Vec arg2) +{ f32 temp_f30; f32 var_f31; @@ -1466,23 +1537,27 @@ f32 fn_1_8040(Vec arg0, Vec arg1, Vec arg2) { return var_f31; } -f32 fn_1_80FC(Vec* arg0, Vec* arg1, Vec* arg2) { +f32 fn_1_80FC(Vec *arg0, Vec *arg1, Vec *arg2) +{ Vec sp44; f32 var_f30; if (0.0f == (arg2->x * arg2->x) + (arg2->y * arg2->y) + (arg2->z * arg2->z)) { - return ((arg0->x - arg1->x) * (arg0->x - arg1->x)) + ((arg0->y - arg1->y) * (arg0->y - arg1->y)) + ((arg0->z - arg1->z) * (arg0->z - arg1->z)); + return ((arg0->x - arg1->x) * (arg0->x - arg1->x)) + ((arg0->y - arg1->y) * (arg0->y - arg1->y)) + + ((arg0->z - arg1->z) * (arg0->z - arg1->z)); } var_f30 = fn_1_8040(*arg0, *arg1, *arg2); fn_1_7F68(*arg1, *arg2, &sp44, var_f30); return ((arg0->x - sp44.x) * (arg0->x - sp44.x)) + ((arg0->y - sp44.y) * (arg0->y - sp44.y)) + ((arg0->z - sp44.z) * (arg0->z - sp44.z)); } -f32 fn_1_8438(Vec* arg0, Vec* arg1, Vec* arg2, Vec* arg3, Vec* arg4) { +f32 fn_1_8438(Vec *arg0, Vec *arg1, Vec *arg2, Vec *arg3, Vec *arg4) +{ f32 var_f27; if (0.0f == ((arg2->z * arg2->z) + ((arg2->x * arg2->x) + (arg2->y * arg2->y)))) { - return ((arg0->z - arg1->z) * (arg0->z - arg1->z)) + (((arg0->x - arg1->x) * (arg0->x - arg1->x)) + ((arg0->y - arg1->y) * (arg0->y - arg1->y))); + return ((arg0->z - arg1->z) * (arg0->z - arg1->z)) + + (((arg0->x - arg1->x) * (arg0->x - arg1->x)) + ((arg0->y - arg1->y) * (arg0->y - arg1->y))); } var_f27 = fn_1_8040(*arg0, *arg1, *arg2); fn_1_7F68(*arg1, *arg2, arg3, var_f27); @@ -1492,8 +1567,9 @@ f32 fn_1_8438(Vec* arg0, Vec* arg1, Vec* arg2, Vec* arg3, Vec* arg4) { return fn_1_7DD0(arg4); } -void fn_1_88E8(u8 arg0, f32 arg8, f32 arg9, f32 argA) { - M424DllBallStruct2* temp_r31; +void fn_1_88E8(u8 arg0, f32 arg8, f32 arg9, f32 argA) +{ + M424DllBallStruct2 *temp_r31; temp_r31 = &lbl_1_bss_60[arg0]; temp_r31->unk4 = 3; @@ -1502,51 +1578,58 @@ void fn_1_88E8(u8 arg0, f32 arg8, f32 arg9, f32 argA) { temp_r31->unk3C.z = argA; } -void fn_1_8924(u8 arg0, u8 arg1) { - M424DllBallStruct2* temp_r31; +void fn_1_8924(u8 arg0, u8 arg1) +{ + M424DllBallStruct2 *temp_r31; temp_r31 = &lbl_1_bss_60[arg0]; temp_r31->unk4 = arg1; } -u8 fn_1_8950(u8 arg0) { - M424DllBallStruct2* temp_r31; +u8 fn_1_8950(u8 arg0) +{ + M424DllBallStruct2 *temp_r31; temp_r31 = &lbl_1_bss_60[arg0]; return temp_r31->unk4; } -u8 fn_1_897C(u8 arg0) { - M424DllBallStruct2* temp_r31; +u8 fn_1_897C(u8 arg0) +{ + M424DllBallStruct2 *temp_r31; temp_r31 = &lbl_1_bss_60[arg0]; return temp_r31->unk5; } -u8 fn_1_89A8(u8 arg0) { - M424DllBallStruct2* temp_r31; +u8 fn_1_89A8(u8 arg0) +{ + M424DllBallStruct2 *temp_r31; temp_r31 = &lbl_1_bss_60[arg0]; return temp_r31->unk91; } -Vec* fn_1_89D4(u8 arg0) { - M424DllBallStruct2* temp_r31; +Vec *fn_1_89D4(u8 arg0) +{ + M424DllBallStruct2 *temp_r31; temp_r31 = &lbl_1_bss_60[arg0]; return &temp_r31->unk3C; } -Vec* fn_1_8A00(u8 arg0) { - M424DllBallStruct2* temp_r31; +Vec *fn_1_8A00(u8 arg0) +{ + M424DllBallStruct2 *temp_r31; temp_r31 = &lbl_1_bss_60[arg0]; return &temp_r31->unk6C; } -s32 fn_1_8A2C(void) { - M424DllBallStruct2* var_r31; - M424DllBallStruct* temp_r30; +s32 fn_1_8A2C(void) +{ + M424DllBallStruct2 *var_r31; + M424DllBallStruct *temp_r30; s32 var_r29; var_r31 = lbl_1_bss_60; @@ -1559,9 +1642,10 @@ s32 fn_1_8A2C(void) { return 1; } -void fn_1_8AA8(s32 arg0, s32 arg1) { +void fn_1_8AA8(s32 arg0, s32 arg1) +{ Vec spC; - M424DllBallStruct2* temp_r31; + M424DllBallStruct2 *temp_r31; s32 var_r27; s32 var_r29; s32 var_r30; @@ -1570,7 +1654,7 @@ void fn_1_8AA8(s32 arg0, s32 arg1) { for (var_r30 = 0; var_r30 < lbl_1_bss_58; var_r30++) { temp_r31 = &lbl_1_bss_60[var_r30]; if (temp_r31->unk4 != 6) { - PSVECAdd(&temp_r31->unk60, &temp_r31->unk6C, &temp_r31->unk3C); + VECAdd(&temp_r31->unk60, &temp_r31->unk6C, &temp_r31->unk3C); if ((temp_r31->unk4 < 3) && (fn_1_907C(&temp_r31->unk3C, &spC) != 0)) { temp_r31->unk3C = spC; } @@ -1583,7 +1667,7 @@ void fn_1_8AA8(s32 arg0, s32 arg1) { } } } - + for (var_r30 = 0, var_r29 = arg0; var_r30 < lbl_1_bss_58; var_r30++) { temp_r31 = &lbl_1_bss_60[var_r30]; var_r27 = 0; @@ -1594,7 +1678,8 @@ void fn_1_8AA8(s32 arg0, s32 arg1) { if ((var_r27 != 0) && (var_r29 > 0)) { var_r29 -= 1; var_r30 -= 1; - } else { + } + else { var_r29 = arg0; } } @@ -1602,27 +1687,28 @@ void fn_1_8AA8(s32 arg0, s32 arg1) { fn_1_C2E0(0); } -s32 fn_1_8C78(s32 arg0, s32 arg1) { +s32 fn_1_8C78(s32 arg0, s32 arg1) +{ Vec sp38; Vec sp2C; Vec sp20; Vec sp14; - Vec* sp10; + Vec *sp10; f32 temp_f31; f32 var_f30; s32 var_r31; - M424DllBallStruct2* temp_r30; - M424DllBallStruct2* temp_r29; - Vec* var_r28; - Vec* var_r27; - M424DllBallStruct* temp_r26; - M424DllBallStruct* temp_r25; + M424DllBallStruct2 *temp_r30; + M424DllBallStruct2 *temp_r29; + Vec *var_r28; + Vec *var_r27; + M424DllBallStruct *temp_r26; + M424DllBallStruct *temp_r25; temp_r30 = &lbl_1_bss_60[arg0]; temp_r26 = temp_r30->unk0->data; var_r28 = fn_1_89D4(arg0); sp38 = *var_r28; - + for (var_r31 = 0; var_r31 < lbl_1_bss_58; var_r31++) { if (var_r31 != arg0) { if (fn_1_8950(var_r31) < 3) { @@ -1630,23 +1716,24 @@ s32 fn_1_8C78(s32 arg0, s32 arg1) { temp_r25 = temp_r29->unk0->data; var_r27 = fn_1_89D4(var_r31); sp2C = *var_r27; - PSVECSubtract(&sp2C, &sp38, &sp20); - var_f30 = PSVECMag(&sp20); + VECSubtract(&sp2C, &sp38, &sp20); + var_f30 = VECMag(&sp20); if (var_f30 < 200.0f) { if (var_f30 > 0.0f) { temp_f31 = 1.0f / var_f30; sp20.x *= temp_f31; sp20.y *= temp_f31; sp20.z *= temp_f31; - } else { + } + else { sp20.x = 0.0f; sp20.y = 0.0f; sp20.z = 1.0f; } temp_f31 = 1.0f + (0.5f * (200.0f - var_f30)); if (temp_f31 > 0.0f) { - PSVECScale(&sp20, &sp20, temp_f31); - PSVECAdd(&sp2C, &sp20, &sp2C); + VECScale(&sp20, &sp20, temp_f31); + VECAdd(&sp2C, &sp20, &sp2C); *var_r27 = sp2C; if ((temp_r29->unk4 < 3) && (fn_1_907C(&sp2C, &sp14) != 0)) { sp2C = sp14; @@ -1657,8 +1744,8 @@ s32 fn_1_8C78(s32 arg0, s32 arg1) { } } if (temp_f31 > 0.0f) { - PSVECScale(&sp20, &sp20, -1.0f); - PSVECAdd(&sp38, &sp20, &sp38); + VECScale(&sp20, &sp20, -1.0f); + VECAdd(&sp38, &sp20, &sp38); *var_r28 = sp38; if ((temp_r30->unk4 < 3) && (fn_1_907C(&sp38, &sp14) != 0)) { sp38 = sp14; @@ -1679,7 +1766,8 @@ s32 fn_1_8C78(s32 arg0, s32 arg1) { return arg1; } -s32 fn_1_907C(Vec* arg0, Vec* arg1) { +s32 fn_1_907C(Vec *arg0, Vec *arg1) +{ Vec sp10; f32 temp_f29; f32 temp_f28; @@ -1695,7 +1783,8 @@ s32 fn_1_907C(Vec* arg0, Vec* arg1) { temp_f26 = 1.0f / var_f27; sp10.x *= temp_f26; sp10.z *= temp_f26; - } else { + } + else { sp10.x = 1.0f; sp10.z = 0.0f; } diff --git a/src/REL/m424Dll/claw.c b/src/REL/m424Dll/claw.c index bae108e8..b9472555 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; @@ -178,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; @@ -608,13 +609,13 @@ void fn_1_9A64(omObjData *arg0) fn_1_C878(arg0->model[1], "hook1", sp74, 0); fn_1_C878(arg0->model[2], "hook2", sp74, 1); fn_1_C878(arg0->model[3], "hook3", sp74, 1); - PSMTXCopy(sp74, sp44); + MTXCopy(sp74, sp44); 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); + MTXCopy(sp44, sp74); fn_1_C878(arg0->model[4], lbl_1_data_21C[var_r29], sp74, 1); temp_r31->unkCC[var_r29] = temp_r31->unk3C[var_r29]; temp_r31->unk3C[var_r29].x = sp74[0][3]; @@ -625,14 +626,14 @@ void fn_1_9A64(omObjData *arg0) sp2C.x = 0.0f; sp2C.y = temp_r31->unk174.y; sp2C.z = 0.0f; - PSVECSubtract(&temp_r31->unk174, &sp2C, &sp20); - var_f31 = PSVECMag(&sp20); + VECSubtract(&temp_r31->unk174, &sp2C, &sp20); + var_f31 = VECMag(&sp20); if (var_f31 != 0.0f) { - PSVECNormalize(&sp20, &sp20); - PSVECScale(&sp20, &sp20, 0.9f * var_f31); - PSVECAdd(&sp2C, &sp20, &temp_r31->unk174); + VECNormalize(&sp20, &sp20); + VECScale(&sp20, &sp20, 0.9f * var_f31); + VECAdd(&sp2C, &sp20, &temp_r31->unk174); } - PSVECAdd(&temp_r31->unk30, &temp_r31->unk174, &sp38); + VECAdd(&temp_r31->unk30, &temp_r31->unk174, &sp38); fn_1_88E8(temp_r31->unk168, sp38.x, sp38.y, sp38.z); } temp_r31->unk164 = 1; @@ -911,7 +912,7 @@ s32 fn_1_B9E0(Vec *arg0, Vec *arg1, f32 arg8, Vec *arg2, s32 arg3) var_r28 = 0; var_r24 = lbl_1_bss_6D8; temp_r31 = var_r24->data; - PSVECAdd(arg0, arg1, &sp24); + VECAdd(arg0, arg1, &sp24); spC = *arg1; *arg2 = *arg0; temp_f30 = 5.0f + arg8; @@ -923,10 +924,10 @@ s32 fn_1_B9E0(Vec *arg0, Vec *arg1, f32 arg8, Vec *arg2, s32 arg3) for (var_r29 = 0; var_r29 < 0xC; var_r29++) { if (var_r28 != 0) { sp24 = *arg2; - PSVECSubtract(&sp24, arg0, &spC); + VECSubtract(&sp24, arg0, &spC); } - PSVECSubtract(&sp24, &temp_r31->unk3C[var_r29], &sp18); - var_f29 = PSVECMag(&sp18); + VECSubtract(&sp24, &temp_r31->unk3C[var_r29], &sp18); + var_f29 = VECMag(&sp18); if (var_f29 < temp_f30) { if (0.0f == var_f29) { var_f29 = temp_f30; @@ -939,9 +940,9 @@ s32 fn_1_B9E0(Vec *arg0, Vec *arg1, f32 arg8, Vec *arg2, s32 arg3) temp_r31->unk15C = 1; } else { - PSVECNormalize(&sp18, &sp18); - PSVECScale(&sp18, &sp18, temp_f30); - PSVECAdd(&temp_r31->unk3C[var_r29], &sp18, arg2); + VECNormalize(&sp18, &sp18); + VECScale(&sp18, &sp18, temp_f30); + VECAdd(&temp_r31->unk3C[var_r29], &sp18, arg2); } var_r28 = 1; } @@ -951,43 +952,43 @@ s32 fn_1_B9E0(Vec *arg0, Vec *arg1, f32 arg8, Vec *arg2, s32 arg3) for (var_r29 = 0; var_r29 < 0xC; var_r29++) { if (var_r28 != 0) { sp24 = *arg2; - PSVECSubtract(&sp24, arg0, &spC); + VECSubtract(&sp24, arg0, &spC); } var_r26 = 0; sp60 = temp_r31->unk3C[var_r29]; - PSVECAdd(&temp_r31->unkCC[var_r29], &spC, &sp54); - PSVECSubtract(&sp60, &sp54, &sp18); - PSVECSubtract(&sp24, &sp54, &sp48); + VECAdd(&temp_r31->unkCC[var_r29], &spC, &sp54); + VECSubtract(&sp60, &sp54, &sp18); + VECSubtract(&sp24, &sp54, &sp48); temp_f26 = (sp18.z * sp18.z) + ((sp18.x * sp18.x) + (sp18.y * sp18.y)); if (temp_f26 != 0.0f) { var_f24 = (sp18.x * sp48.x) + (sp18.y * sp48.y) + (sp18.z * sp48.z); temp_f27 = var_f24 / temp_f26; if (temp_f27 >= 0.0f) { if (temp_f27 <= 1.0f) { - PSVECScale(&sp18, &sp18, temp_f27); - PSVECAdd(&sp54, &sp18, &sp3C); - PSVECSubtract(&sp24, &sp3C, &sp30); - var_f29 = PSVECMag(&sp30); + VECScale(&sp18, &sp18, temp_f27); + VECAdd(&sp54, &sp18, &sp3C); + VECSubtract(&sp24, &sp3C, &sp30); + var_f29 = VECMag(&sp30); if (var_f29 == 0.0f) { - if (PSVECMag(&sp18) <= 0.0f) { + if (VECMag(&sp18) <= 0.0f) { sp18.x = sp18.y = 0.0f; sp18.z = 1.0f; } - PSVECNormalize(&sp18, &sp30); - PSVECScale(&sp30, &sp30, temp_f30); - PSVECAdd(&sp60, &sp30, arg2); + VECNormalize(&sp18, &sp30); + VECScale(&sp30, &sp30, temp_f30); + VECAdd(&sp60, &sp30, arg2); var_r28 = 1; var_r26 = 1; } else if (var_f29 < temp_f30) { - if (PSVECMag(&sp30) <= 0.0f) { + if (VECMag(&sp30) <= 0.0f) { sp30.x = sp30.y = 0.0f; sp30.z = 1.0f; } - PSVECNormalize(&sp30, &sp30); - PSVECScale(&sp30, &sp30, temp_f30); - PSVECAdd(&sp3C, &sp30, arg2); + VECNormalize(&sp30, &sp30); + VECScale(&sp30, &sp30, temp_f30); + VECAdd(&sp3C, &sp30, arg2); var_r28 = 1; var_r26 = 1; } @@ -995,31 +996,31 @@ s32 fn_1_B9E0(Vec *arg0, Vec *arg1, f32 arg8, Vec *arg2, s32 arg3) } } if (var_r26 == 0) { - PSVECSubtract(&sp24, &sp60, &sp18); - var_f29 = PSVECMag(&sp18); + VECSubtract(&sp24, &sp60, &sp18); + var_f29 = VECMag(&sp18); if (var_f29 < temp_f30) { if (var_f29 <= 0.0f) { sp18.x = sp18.y = 0.0f; sp18.z = 1.0f; } - PSVECNormalize(&sp18, &sp18); - PSVECScale(&sp18, &sp18, temp_f30); - PSVECAdd(&temp_r31->unk3C[var_r29], &sp18, arg2); + VECNormalize(&sp18, &sp18); + VECScale(&sp18, &sp18, temp_f30); + VECAdd(&temp_r31->unk3C[var_r29], &sp18, arg2); var_r28 = 1; var_r26 = 1; } } if (var_r26 == 0) { - PSVECSubtract(&sp24, &sp54, &sp18); - var_f29 = PSVECMag(&sp18); + VECSubtract(&sp24, &sp54, &sp18); + var_f29 = VECMag(&sp18); if (var_f29 < temp_f30) { if (var_f29 <= 0.0f) { sp18.x = sp18.y = 0.0f; sp18.z = 1.0f; } - PSVECNormalize(&sp18, &sp18); - PSVECScale(&sp18, &sp18, temp_f30); - PSVECAdd(&temp_r31->unk3C[var_r29], &sp18, arg2); + VECNormalize(&sp18, &sp18); + VECScale(&sp18, &sp18, temp_f30); + VECAdd(&temp_r31->unk3C[var_r29], &sp18, arg2); var_r28 = 1; var_r26 = 1; } @@ -1045,7 +1046,7 @@ s32 fn_1_B9E0(Vec *arg0, Vec *arg1, f32 arg8, Vec *arg2, s32 arg3) if (var_r28 != 0) { if (--arg3 > 0) { sp24 = *arg2; - PSVECSubtract(&sp24, arg0, &spC); + VECSubtract(&sp24, arg0, &spC); if (fn_1_B9E0(arg0, &spC, arg8, &sp24, arg3) != 0) { *arg2 = sp24; } @@ -1077,8 +1078,8 @@ s32 fn_1_C210(Vec *arg0) sp1C.x = temp_r31->unk30.x; sp1C.y = -120.00001f + temp_r31->unk30.y; sp1C.z = temp_r31->unk30.z; - PSVECSubtract(arg0, &sp1C, &sp10); - if ((spC = PSVECMag(&sp10)) < 50.0f) { + VECSubtract(arg0, &sp1C, &sp10); + if ((spC = VECMag(&sp10)) < 50.0f) { var_r29 = 1; } } @@ -1118,7 +1119,7 @@ void fn_1_C2E0(s32 arg0) spC = fn_1_8A00(var_r30); sp28 = *temp_r28; sp4C = temp_r27->unk60; - PSVECSubtract(temp_r28, &sp4C, &sp40); + VECSubtract(temp_r28, &sp4C, &sp40); if (fn_1_B9E0(&sp4C, &sp40, 100.0f, &sp34, 0x10) != 0) { *temp_r28 = sp34; sp4C = sp34; @@ -1141,7 +1142,7 @@ void fn_1_C2E0(s32 arg0) if (fn_1_C210(&sp4C) != 0) { temp_r31->unk168 = var_r30; temp_r31->unk170 = fn_1_897C(var_r30); - PSVECSubtract(&sp4C, &temp_r31->unk30, &temp_r31->unk174); + VECSubtract(&sp4C, &temp_r31->unk30, &temp_r31->unk174); fn_1_88E8(temp_r31->unk168, sp4C.x, sp4C.y, sp4C.z); } } @@ -1174,8 +1175,8 @@ void fn_1_C604(s32 arg0, s32 arg1) var_r28 = &lbl_1_bss_60[var_r30]; var_r31 = fn_1_89D4(var_r30); sp24 = *var_r31; - PSVECSubtract(&sp24, &sp30, &sp18); - var_f30 = PSVECMag(&sp18); + VECSubtract(&sp24, &sp30, &sp18); + var_f30 = VECMag(&sp18); if (var_f30 < 200.0f) { if (var_f30 > 0.0f) { temp_f31 = 1.0f / var_f30; @@ -1228,11 +1229,11 @@ s32 fn_1_C878(s16 arg0, const char *arg1, Mtx arg2, s32 arg3) lbl_1_bss_6C4 = 0; } mtxRot(sp14, temp_r31->rot.x, temp_r31->rot.y, temp_r31->rot.z); - PSMTXScale(sp44, temp_r31->scale.x, temp_r31->scale.y, temp_r31->scale.z); - PSMTXConcat(sp14, sp44, sp44); + MTXScale(sp44, temp_r31->scale.x, temp_r31->scale.y, temp_r31->scale.z); + MTXConcat(sp14, sp44, sp44); mtxTransCat(sp44, temp_r31->pos.x, temp_r31->pos.y, temp_r31->pos.z); if (arg3 != 0) { - PSMTXConcat(arg2, sp44, sp44); + MTXConcat(arg2, sp44, sp44); } fn_1_C99C(temp_r30->root, sp44, arg1, arg2); return lbl_1_bss_6C8; @@ -1263,21 +1264,21 @@ void fn_1_C99C(HsfObject *arg0, Mtx arg1, const char *arg2, Mtx arg3) 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); + MTXCopy(arg1, spF8); OSReport("OBJ MTX CHECK ERROR %s \n", arg0->name); } 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); + MTXScale(spF8, var_r31->scale.x, var_r31->scale.y, var_r31->scale.z); + MTXConcat(spC8, spF8, spF8); mtxTransCat(spF8, var_r31->pos.x, var_r31->pos.y, var_r31->pos.z); - PSMTXConcat(arg1, spF8, spF8); + MTXConcat(arg1, spF8, spF8); } if (lbl_1_bss_6C0 != 0) { OSReport("%s \n", arg0->name); } if (strcmp(arg2, arg0->name) == 0) { - PSMTXCopy(spF8, arg3); + MTXCopy(spF8, arg3); lbl_1_bss_6C8 = 1; } for (var_r25 = 0; var_r25 < arg0->data.childrenCount; var_r25++) { @@ -1290,21 +1291,21 @@ void fn_1_C99C(HsfObject *arg0, Mtx arg1, const char *arg2, Mtx arg3) 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); + MTXCopy(spF8, sp68); OSReport("OBJ MTX CHECK ERROR %s \n", temp_r28->name); } 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); + MTXScale(sp68, var_r30->scale.x, var_r30->scale.y, var_r30->scale.z); + MTXConcat(sp98, sp68, sp68); mtxTransCat(sp68, var_r30->pos.x, var_r30->pos.y, var_r30->pos.z); - PSMTXConcat(spF8, sp68, sp68); + MTXConcat(spF8, sp68, sp68); } if (lbl_1_bss_6C0 != 0) { OSReport("%s \n", temp_r28->name); } if (strcmp(arg2, temp_r28->name) == 0) { - PSMTXCopy(sp68, arg3); + MTXCopy(sp68, arg3); lbl_1_bss_6C8 = 1; } for (var_r24 = 0; var_r24 < temp_r28->data.childrenCount; var_r24++) { @@ -1317,21 +1318,21 @@ void fn_1_C99C(HsfObject *arg0, Mtx arg1, const char *arg2, Mtx arg3) 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); + MTXCopy(sp68, sp8); OSReport("OBJ MTX CHECK ERROR %s \n", temp_r27->name); } 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); + MTXScale(sp8, var_r29->scale.x, var_r29->scale.y, var_r29->scale.z); + MTXConcat(sp38, sp8, sp8); mtxTransCat(sp8, var_r29->pos.x, var_r29->pos.y, var_r29->pos.z); - PSMTXConcat(sp68, sp8, sp8); + MTXConcat(sp68, sp8, sp8); } if (lbl_1_bss_6C0 != 0) { OSReport("%s \n", temp_r27->name); } if (strcmp(arg2, temp_r27->name) == 0) { - PSMTXCopy(sp8, arg3); + MTXCopy(sp8, arg3); lbl_1_bss_6C8 = 1; } for (var_r23 = 0; var_r23 < temp_r27->data.childrenCount; var_r23++) { diff --git a/src/REL/m424Dll/map.c b/src/REL/m424Dll/map.c index 7215c532..4536b396 100644 --- a/src/REL/m424Dll/map.c +++ b/src/REL/m424Dll/map.c @@ -1,9 +1,10 @@ #include "REL/m424Dll.h" -#include "math.h" #include "game/audio.h" #include "game/hsfman.h" #include "game/hsfmotion.h" +#include "math.h" + // STRUCT typedef struct _M424DllMapStruct { @@ -20,8 +21,8 @@ typedef struct _M424DllMapStruct { } M424DllMapStruct; // sizeof 0x54 // BSS -Process* lbl_1_bss_54; -omObjData* lbl_1_bss_50; +Process *lbl_1_bss_54; +omObjData *lbl_1_bss_50; // DATA Vec lbl_1_data_E0 = { 0.0f, 3000.0f, 1.0f }; @@ -29,12 +30,13 @@ Vec lbl_1_data_EC = { 0.0f, 1.0f, 0.0f }; Vec lbl_1_data_F8 = { 0.0f, 0.0f, 0.0f }; // PROTO -void fn_1_1BB8(omObjData*); -void fn_1_1E1C(omObjData*); -void fn_1_2130(omObjData*); +void fn_1_1BB8(omObjData *); +void fn_1_1E1C(omObjData *); +void fn_1_2130(omObjData *); void fn_1_2438(f32); -omObjData* fn_1_1AB8(Process* arg0) { +omObjData *fn_1_1AB8(Process *arg0) +{ lbl_1_bss_54 = arg0; lbl_1_bss_50 = omAddObjEx(arg0, 0x7F, 6, 0, -1, fn_1_1BB8); lbl_1_bss_50->data = NULL; @@ -44,12 +46,14 @@ omObjData* fn_1_1AB8(Process* arg0) { return lbl_1_bss_50; } -void fn_1_1B8C(void) { +void fn_1_1B8C(void) +{ fn_1_2130(lbl_1_bss_50); } -void fn_1_1BB8(omObjData* arg0) { - M424DllMapStruct* var_r30; +void fn_1_1BB8(omObjData *arg0) +{ + M424DllMapStruct *var_r30; var_r30 = arg0->data = HuMemDirectMallocNum(HEAP_SYSTEM, 0x54, 0x10000000); memset(var_r30, 0, 0x54); @@ -82,9 +86,10 @@ void fn_1_1BB8(omObjData* arg0) { arg0->func = fn_1_1E1C; } -void fn_1_1E1C(omObjData* arg0) { +void fn_1_1E1C(omObjData *arg0) +{ f32 temp_f31; - M424DllMapStruct* temp_r31; + M424DllMapStruct *temp_r31; temp_r31 = arg0->data; if (temp_r31->unk40 > 0) { @@ -108,8 +113,9 @@ void fn_1_1E1C(omObjData* arg0) { if (temp_r31->unk0 > 0.04f) { temp_r31->unk0 = 0.04f; } - if (temp_r31->unk38 != -1) break; - + if (temp_r31->unk38 != -1) + break; + temp_r31->unk38 = HuAudFXPlay(0x626); break; default: @@ -120,8 +126,8 @@ void fn_1_1E1C(omObjData* arg0) { } temp_f31 = temp_r31->unk0 / 0.04f; if (temp_r31->unk38 != -1) { - HuAudFXVolSet(temp_r31->unk38, (s16) (-8191.0f * (1.0f - temp_f31))); - HuAudFXPitchSet(temp_r31->unk38, (s16) (127.0f * temp_f31)); + HuAudFXVolSet(temp_r31->unk38, (s16)(-8191.0f * (1.0f - temp_f31))); + HuAudFXPitchSet(temp_r31->unk38, (s16)(127.0f * temp_f31)); if (temp_f31 <= 0.0f) { HuAudFXStop(temp_r31->unk38); temp_r31->unk38 = -1; @@ -130,16 +136,18 @@ void fn_1_1E1C(omObjData* arg0) { } break; } - + if (temp_r31->unk48 != 0) { if (temp_r31->unk4C != 0) { temp_r31->unk4C = (temp_r31->unk4C - 1); - } else { + } + else { temp_r31->unk48 = (temp_r31->unk48 - 1); if (temp_r31->unk48 != 0) { Hu3DModelAttrReset(arg0->model[4], 1); Hu3DModelAttrSet(arg0->model[5], 1); - } else { + } + else { Hu3DModelAttrSet(arg0->model[4], 1); Hu3DModelAttrReset(arg0->model[5], 1); if (temp_r31->unk50 != -1) { @@ -150,16 +158,18 @@ void fn_1_1E1C(omObjData* arg0) { } } temp_r31->unk4 = (20.0f * temp_r31->unk0); - PSMTXRotRad(temp_r31->unk8, 0x59, MTXDegToRad(temp_r31->unk4)); + MTXRotRad(temp_r31->unk8, 0x59, MTXDegToRad(temp_r31->unk4)); Hu3DMotionSpeedSet(arg0->model[1], temp_r31->unk0); } -void fn_1_2130(omObjData* arg0) { +void fn_1_2130(omObjData *arg0) +{ arg0->func = NULL; } -f32 fn_1_213C(void) { - M424DllMapStruct* var_r31; +f32 fn_1_213C(void) +{ + M424DllMapStruct *var_r31; if (!lbl_1_bss_50) { return 0.0f; } @@ -170,17 +180,19 @@ f32 fn_1_213C(void) { return var_r31->unk4; } -void fn_1_21B0(Mtx arg0) { - M424DllMapStruct* var_r31; +void fn_1_21B0(Mtx arg0) +{ + M424DllMapStruct *var_r31; if (lbl_1_bss_50 && lbl_1_bss_50->data) { var_r31 = lbl_1_bss_50->data; - PSMTXCopy(var_r31->unk8, *(Mtx*)&arg0); + MTXCopy(var_r31->unk8, *(Mtx *)&arg0); } } -void fn_1_2220(Vec* arg0, Vec* arg1) { +void fn_1_2220(Vec *arg0, Vec *arg1) +{ Vec spC; - M424DllMapStruct* temp_r30; + M424DllMapStruct *temp_r30; if (lbl_1_bss_50 && lbl_1_bss_50->data) { temp_r30 = lbl_1_bss_50->data; @@ -188,23 +200,25 @@ void fn_1_2220(Vec* arg0, Vec* arg1) { spC.x = (temp_r30->unk8[0][0] * arg0->x) + (temp_r30->unk8[0][2] * arg0->z); spC.z = (temp_r30->unk8[2][0] * arg0->x) + (temp_r30->unk8[2][2] * arg0->z); spC.y = arg0->y; - } else { + } + else { spC = *arg0; } - PSVECSubtract(&spC, arg0, &spC); + VECSubtract(&spC, arg0, &spC); *arg1 = spC; } } -void fn_1_2438(f32 arg0) { - M424DllMapStruct* spC; - HsfAttribute* var_r31; - ModelData* temp_r30; - HsfData* temp_r29; +void fn_1_2438(f32 arg0) +{ + M424DllMapStruct *spC; + HsfAttribute *var_r31; + ModelData *temp_r30; + HsfData *temp_r29; s32 var_r28; - HsfBitmap* var_r27; - omObjData* var_r26; - + HsfBitmap *var_r27; + omObjData *var_r26; + if (lbl_1_bss_50 && lbl_1_bss_50->data) { var_r26 = lbl_1_bss_50; spC = lbl_1_bss_50->data; @@ -213,7 +227,8 @@ void fn_1_2438(f32 arg0) { var_r31 = temp_r30->hsfData->attribute; for (var_r28 = 0; var_r28 < temp_r29->attributeCnt; var_r28++, var_r31++) { var_r27 = var_r31->bitmap; - if (strcmp("cr_dk2", var_r27->name) == 0) break; + if (strcmp("cr_dk2", var_r27->name) == 0) + break; } if (var_r28 < temp_r29->attributeCnt) { var_r31->unk30 += arg0; @@ -221,9 +236,10 @@ void fn_1_2438(f32 arg0) { } } -void fn_1_252C(f32 arg8, s32 arg0) { - omObjData* sp10; - M424DllMapStruct* temp_r31; +void fn_1_252C(f32 arg8, s32 arg0) +{ + omObjData *sp10; + M424DllMapStruct *temp_r31; if (lbl_1_bss_50 && lbl_1_bss_50->data) { sp10 = lbl_1_bss_50; @@ -234,9 +250,10 @@ void fn_1_252C(f32 arg8, s32 arg0) { } } -f32 fn_1_25C0(void) { - omObjData* sp8; - M424DllMapStruct* temp_r31; +f32 fn_1_25C0(void) +{ + omObjData *sp8; + M424DllMapStruct *temp_r31; if (!lbl_1_bss_50) { return 0.0f; @@ -252,9 +269,10 @@ f32 fn_1_25C0(void) { return 0.0f; } -void fn_1_2670(s32 arg0, s32 arg1) { - omObjData* temp_r30; - M424DllMapStruct* temp_r31; +void fn_1_2670(s32 arg0, s32 arg1) +{ + omObjData *temp_r30; + M424DllMapStruct *temp_r31; if (lbl_1_bss_50 && lbl_1_bss_50->data) { temp_r30 = lbl_1_bss_50; @@ -267,17 +285,9 @@ void fn_1_2670(s32 arg0, s32 arg1) { } // UNUSED (guessing types) -M424DllMainStruct lbl_1_data_10C = { - { 0.0f, 0.0f, 5500.0f }, - { -3950.0f, 0.0f, -0.7f }, - 0.6f -}; +M424DllMainStruct lbl_1_data_10C = { { 0.0f, 0.0f, 5500.0f }, { -3950.0f, 0.0f, -0.7f }, 0.6f }; GXColor lbl_1_data_128 = { 0xFF, 0xFF, 0xFF, 0xFF }; -M424DllMainStruct lbl_1_data_12C = { - { 0.0f, 5500.0f, -3950.0f }, - { 0.0f, 1.0f, 0.0f }, - 0.0f -}; +M424DllMainStruct lbl_1_data_12C = { { 0.0f, 5500.0f, -3950.0f }, { 0.0f, 1.0f, 0.0f }, 0.0f }; -s32 lbl_1_data_148[2] = {0}; +s32 lbl_1_data_148[2] = { 0 }; diff --git a/src/REL/m425Dll/main.c b/src/REL/m425Dll/main.c index 2c2d321c..b6762117 100644 --- a/src/REL/m425Dll/main.c +++ b/src/REL/m425Dll/main.c @@ -562,18 +562,18 @@ void fn_1_14CC(Mtx arg0, float arg8, float arg9, float argA) Mtx sp38; Mtx sp8; if (argA != 0.0f) { - PSMTXRotRad(arg0, 0x5A, MTXDegToRad(argA)); + MTXRotRad(arg0, 0x5A, MTXDegToRad(argA)); } else { - PSMTXIdentity(arg0); + MTXIdentity(arg0); } if (arg8 != 0.0f) { - PSMTXRotRad(sp38, 0x58, MTXDegToRad(arg8)); - PSMTXConcat(sp38, arg0, arg0); + MTXRotRad(sp38, 0x58, MTXDegToRad(arg8)); + MTXConcat(sp38, arg0, arg0); } if (arg9 != 0.0f) { - PSMTXRotRad(sp8, 0x59, MTXDegToRad(arg9)); - PSMTXConcat(sp8, arg0, arg0); + MTXRotRad(sp8, 0x59, MTXDegToRad(arg9)); + MTXConcat(sp8, arg0, arg0); } } @@ -1374,7 +1374,7 @@ void fn_1_5044(s16 sp8) var_r31->unk_2C[1].unk_04 = 0; var_r31->unk_2C[1].unk_48 = 0x80; for (var_r30 = 0; var_r30 < (var_r31->unk_28 * var_r31->unk_2A); var_r30++) { - PSMTXIdentity(var_r31->unk_2C[var_r30].unk_14); + MTXIdentity(var_r31->unk_2C[var_r30].unk_14); var_r31->unk_2C[var_r30].unk_08.x = var_r31->unk_2C[var_r30].unk_08.y = var_r31->unk_2C[var_r30].unk_08.z = 0.0f; } for (var_r30 = 0; var_r30 < var_r31->unk_28; var_r30++) { @@ -1503,8 +1503,8 @@ void fn_1_5C20(ModelData *var_r27, Mtx sp8) GXSetChanAmbColor(GX_COLOR0A0, var_r31->unk_20); GXSetChanMatColor(GX_COLOR0A0, var_r31->unk_24); GXLoadPosMtxImm(sp8, 0); - PSMTXInverse(sp8, sp5C); - PSMTXTranspose(sp5C, sp2C); + MTXInverse(sp8, sp5C); + MTXTranspose(sp5C, sp2C); GXLoadNrmMtxImm(sp2C, 0); GXSetBlendMode(GX_BM_BLEND, GX_BL_SRCALPHA, GX_BL_INVSRCALPHA, GX_LO_NOOP); GXSetZMode(1, GX_LEQUAL, 1); @@ -1512,7 +1512,7 @@ void fn_1_5C20(ModelData *var_r27, Mtx sp8) var_r28 = 0; spC = 0; for (var_r29 = GX_TEXMAP0; var_r29 < var_r31->unk_28; var_r29++) { - PSMTXRotRad(var_r31->unk_2C[var_r29].unk_14, 0x5A, 0.0f); + MTXRotRad(var_r31->unk_2C[var_r29].unk_14, 0x5A, 0.0f); mtxTransCat( var_r31->unk_2C[var_r29].unk_14, var_r31->unk_2C[var_r29].unk_08.x, var_r31->unk_2C[var_r29].unk_08.y, var_r31->unk_2C[var_r29].unk_08.z); switch (var_r31->unk_2C[var_r29].unk_04) { diff --git a/src/REL/m425Dll/thwomp.c b/src/REL/m425Dll/thwomp.c index a47e9bd9..3f02dce6 100644 --- a/src/REL/m425Dll/thwomp.c +++ b/src/REL/m425Dll/thwomp.c @@ -1665,7 +1665,7 @@ void fn_1_DE3C(M425DllUnkStruct4 *arg0, ModelData *model) sp8.x = arg0->unk_180[var_r26].x - arg0->unk_180[var_r29].x; sp8.y = arg0->unk_180[var_r26].y - arg0->unk_180[var_r29].y; sp8.z = arg0->unk_180[var_r26].z - arg0->unk_180[var_r29].z; - PSVECCrossProduct(&sp14, &sp8, &sp20); + VECCrossProduct(&sp14, &sp8, &sp20); sp20.x *= -1.0f; sp20.y *= -1.0f; sp20.z *= -1.0f; @@ -1685,7 +1685,7 @@ void fn_1_DE3C(M425DllUnkStruct4 *arg0, ModelData *model) } } for (var_r30 = 0; var_r30 < arg0->unk_110; var_r30++) { - PSVECNormalize(&arg0->unk_188[var_r30], &arg0->unk_188[var_r30]); + VECNormalize(&arg0->unk_188[var_r30], &arg0->unk_188[var_r30]); } } @@ -1803,7 +1803,7 @@ void fn_1_E210(s32 arg0) sp8.x = sind(var_r31->unk_E4) * cosd(var_r31->unk_E0); sp8.z = cosd(var_r31->unk_E4) * cosd(var_r31->unk_E0); sp8.y = sind(var_r31->unk_E0); - PSVECNormalize(&sp8, &sp8); + VECNormalize(&sp8, &sp8); var_r28 = &Hu3DLocalLight[var_r27->unk_38[0]]; var_r28->unk_1C.x = 1000.0f * sp8.x; var_r28->unk_1C.y = 1000.0f * sp8.y; @@ -2093,7 +2093,7 @@ void fn_1_101C4(ModelData *var_r29, Mtx var_r28) var_r31 = var_r29->unk_120; GXLoadPosMtxImm(var_r28, 0); - PSMTXInvXpose(var_r28, sp50); + MTXInvXpose(var_r28, sp50); GXLoadNrmMtxImm(sp50, 0); var_r27 = fn_1_115D4(var_r29, Hu3DCameraMtx, Hu3DCameraMtxXPose, 4.0f); if (omPauseChk() == 0) { @@ -2129,7 +2129,7 @@ void fn_1_101C4(ModelData *var_r29, Mtx var_r28) GXSetZCompLoc(0); GXSetBlendMode(GX_BM_BLEND, GX_BL_SRCALPHA, GX_BL_INVSRCALPHA, GX_LO_NOOP); if (HmfInverseMtxF3X3(var_r28, sp50) == 0) { - PSMTXIdentity(sp50); + MTXIdentity(sp50); } PSMTXReorder(sp50, sp20); GXClearVtxDesc(); @@ -2418,7 +2418,7 @@ void fn_1_112FC(void) var_r31->unk_04.y = var_r31->unk_10.y * var_r31->unk_1C; var_r31->unk_04.z = var_r31->unk_10.z * var_r31->unk_1C; var_r31->unk_1C *= 0.95f; - PSVECAdd(&var_r31->unk_30, &var_r31->unk_04, &var_r31->unk_30); + VECAdd(&var_r31->unk_30, &var_r31->unk_04, &var_r31->unk_30); if (++var_r31->unk_40 >= 0xF) { var_r31->unk_40 = 0; var_r31->unk_28 = 0.0f; @@ -2503,7 +2503,7 @@ void fn_1_116E4(ModelData *arg1, LightData *var_r31, s16 sp8, Mtx spC, Mtx sp10, break; case 1: GXInitLightAttn(&lbl_1_bss_688, 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f); - PSVECScale(&var_r31->unk_28, &var_r31->unk_1C, -100000.0f); + VECScale(&var_r31->unk_28, &var_r31->unk_1C, -100000.0f); break; case 2: GXInitLightAttn(&lbl_1_bss_688, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f); @@ -2511,8 +2511,8 @@ void fn_1_116E4(ModelData *arg1, LightData *var_r31, s16 sp8, Mtx spC, Mtx sp10, break; } if ((var_r31->unk_00 & 0x8000) != 0) { - PSMTXMultVec(spC, &var_r31->unk_28, &lbl_1_bss_67C); - PSMTXMultVec(sp10, &var_r31->unk_1C, &lbl_1_bss_670); + MTXMultVec(spC, &var_r31->unk_28, &lbl_1_bss_67C); + MTXMultVec(sp10, &var_r31->unk_1C, &lbl_1_bss_670); GXInitLightPos(&lbl_1_bss_688, lbl_1_bss_670.x, lbl_1_bss_670.y, lbl_1_bss_670.z); } else { @@ -2692,7 +2692,7 @@ void fn_1_11EE0(ModelData *var_r24, Mtx var_r21) GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_TEX0, GX_TEX_ST, GX_RGBA6, 0); GXSetArray(GX_VA_TEX0, var_r31->unk_44, 8); if (HmfInverseMtxF3X3(var_r21, sp128) == 0) { - PSMTXIdentity(sp128); + MTXIdentity(sp128); } PSMTXReorder(sp128, &sp8[0]); if (var_r31->unk_4C) { @@ -2718,27 +2718,27 @@ void fn_1_11EE0(ModelData *var_r24, Mtx var_r21) if (!var_r29->unk_2C) { var_r28 = &sp98[0]; var_r27 = &sp38[0]; - PSVECScale(var_r27++, var_r28, var_r29->unk_28); - PSVECAdd(var_r28++, &var_r29->unk_30, var_r30++); - PSVECScale(var_r27++, var_r28, var_r29->unk_28); - PSVECAdd(var_r28++, &var_r29->unk_30, var_r30++); - PSVECScale(var_r27++, var_r28, var_r29->unk_28); - PSVECAdd(var_r28++, &var_r29->unk_30, var_r30++); - PSVECScale(var_r27++, var_r28, var_r29->unk_28); - PSVECAdd(var_r28++, &var_r29->unk_30, var_r30++); + VECScale(var_r27++, var_r28, var_r29->unk_28); + VECAdd(var_r28++, &var_r29->unk_30, var_r30++); + VECScale(var_r27++, var_r28, var_r29->unk_28); + VECAdd(var_r28++, &var_r29->unk_30, var_r30++); + VECScale(var_r27++, var_r28, var_r29->unk_28); + VECAdd(var_r28++, &var_r29->unk_30, var_r30++); + VECScale(var_r27++, var_r28, var_r29->unk_28); + VECAdd(var_r28++, &var_r29->unk_30, var_r30++); } else { - PSVECScale(lbl_1_data_19C, &sp98[0], var_r29->unk_28); - PSVECScale(&lbl_1_data_19C[1], &sp98[1], var_r29->unk_28); - PSVECScale(&lbl_1_data_19C[2], &sp98[2], var_r29->unk_28); - PSVECScale(&lbl_1_data_19C[3], &sp98[3], var_r29->unk_28); - PSMTXRotRad(spC8, 0x5A, var_r29->unk_2C); - PSMTXConcat(sp128, spC8, spF8); - PSMTXMultVecArray(spF8, &sp98[0], &sp68[0], 4); - PSVECAdd(&sp68[0], &var_r29->unk_30, var_r30++); - PSVECAdd(&sp68[1], &var_r29->unk_30, var_r30++); - PSVECAdd(&sp68[2], &var_r29->unk_30, var_r30++); - PSVECAdd(&sp68[3], &var_r29->unk_30, var_r30++); + VECScale(lbl_1_data_19C, &sp98[0], var_r29->unk_28); + VECScale(&lbl_1_data_19C[1], &sp98[1], var_r29->unk_28); + VECScale(&lbl_1_data_19C[2], &sp98[2], var_r29->unk_28); + VECScale(&lbl_1_data_19C[3], &sp98[3], var_r29->unk_28); + MTXRotRad(spC8, 0x5A, var_r29->unk_2C); + MTXConcat(sp128, spC8, spF8); + MTXMultVecArray(spF8, &sp98[0], &sp68[0], 4); + VECAdd(&sp68[0], &var_r29->unk_30, var_r30++); + VECAdd(&sp68[1], &var_r29->unk_30, var_r30++); + VECAdd(&sp68[2], &var_r29->unk_30, var_r30++); + VECAdd(&sp68[3], &var_r29->unk_30, var_r30++); } var_r20 = var_r29->unk_40 & 3; var_r19 = (var_r29->unk_40 >> 2) & 3; diff --git a/src/REL/m426Dll/main.c b/src/REL/m426Dll/main.c index 127a05d5..9a80a823 100644 --- a/src/REL/m426Dll/main.c +++ b/src/REL/m426Dll/main.c @@ -3045,7 +3045,7 @@ void fn_1_80DC(ModelData *arg0, Mtx arg1) if (!HmfInverseMtxF3X3(arg1, sp128)) { MTXIdentity(sp128); } - MTXReorder(sp128, sp8); + PSMTXReorder(sp128, sp8); if (var_r31->unk_4C) { var_r18 = var_r31->unk_4C; var_r18(arg0, var_r31, arg1); @@ -3053,7 +3053,7 @@ void fn_1_80DC(ModelData *arg0, Mtx arg1) var_r29 = var_r31->unk_3C; var_r30 = var_r31->unk_40; var_r26 = var_r31->unk_44; - MTXROMultVecArray(sp8, lbl_1_data_22C, &sp38[0], 4); + PSMTXROMultVecArray(sp8, lbl_1_data_22C, &sp38[0], 4); for (var_r23 = 0; var_r23 < var_r31->unk_24; var_r23++, var_r29++) { if (!var_r29->unk_28) { var_r30->x = var_r30->y = var_r30->z = 0.0f; diff --git a/src/REL/m428Dll/main.c b/src/REL/m428Dll/main.c index cd2f3688..1ee62c82 100644 --- a/src/REL/m428Dll/main.c +++ b/src/REL/m428Dll/main.c @@ -617,7 +617,7 @@ void fn_1_261C(omObjData *object) } } -u32 fn_1_26E0(void) +s32 fn_1_26E0(void) { return lbl_1_bss_7C; } @@ -786,7 +786,7 @@ void fn_1_2E2C(s32 var_r26) GXSetTevAlphaIn(GX_TEVSTAGE0, GX_CA_ZERO, GX_CA_ZERO, GX_CA_ZERO, GX_CA_KONST); GXSetTevAlphaOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, GX_TEVPREV); GXSetNumChans(0); - PSMTXIdentity(sp8C); + MTXIdentity(sp8C); GXLoadPosMtxImm(sp8C, 0); GXSetZMode(0, GX_ALWAYS, GX_TRUE); GXSetNumChans(1); @@ -820,7 +820,7 @@ void fn_1_2E2C(s32 var_r26) var_r25 = Hu3DShadowData.unk_02 * Hu3DShadowData.unk_02; } C_MTXLookAt(Hu3DCameraMtx, &Hu3DShadowData.unk_14, &Hu3DShadowData.unk_2C, &Hu3DShadowData.unk_20); - PSMTXCopy(Hu3DCameraMtx, Hu3DShadowData.unk_38); + MTXCopy(Hu3DCameraMtx, Hu3DShadowData.unk_38); shadowModelDrawF = 1; GXInvalidateTexAll(); GXSetFog(GX_FOG_NONE, 0.0f, 0.0f, 0.0f, 0.0f, BGColor); @@ -870,11 +870,11 @@ void fn_1_2E2C(s32 var_r26) Hu3DModelShadowSet(var_r29->unk_00[var_r30]); Hu3DShadowData.unk_00 = (s8)(var_r29->unk_20[var_r30] * var_r24); mtxRot(sp5C, var_r31->rot.x, var_r31->rot.y, var_r31->rot.z); - PSMTXScale(spBC, var_r31->scale.x, var_r31->scale.y, var_r31->scale.z); - PSMTXConcat(sp5C, spBC, spBC); + MTXScale(spBC, var_r31->scale.x, var_r31->scale.y, var_r31->scale.z); + MTXConcat(sp5C, spBC, spBC); mtxTransCat(spBC, var_r31->pos.x, var_r31->pos.y, var_r31->pos.z); - PSMTXConcat(Hu3DCameraMtx, spBC, sp8C); - PSMTXConcat(sp8C, var_r31->unk_F0, sp8C); + MTXConcat(Hu3DCameraMtx, spBC, sp8C); + MTXConcat(sp8C, var_r31->unk_F0, sp8C); Hu3DDraw(var_r31, sp8C, &var_r31->scale); Hu3DModelShadowReset(var_r29->unk_00[var_r30]); } @@ -908,7 +908,7 @@ void fn_1_2E2C(s32 var_r26) GXSetTevAlphaIn(GX_TEVSTAGE0, GX_CA_ZERO, GX_CA_ZERO, GX_CA_ZERO, GX_CA_KONST); GXSetTevAlphaOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, GX_TEVPREV); GXSetNumChans(0); - PSMTXIdentity(sp8C); + MTXIdentity(sp8C); GXLoadPosMtxImm(sp8C, 0); GXSetZMode(0, GX_ALWAYS, 1); GXSetNumChans(1); @@ -966,7 +966,7 @@ void fn_1_3B64(void) GXSetTevAlphaOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, GX_TEVPREV); GXSetNumTexGens(1); GXSetNumTevStages(1); - PSMTXIdentity(sp34); + MTXIdentity(sp34); GXLoadPosMtxImm(sp34, 0); GXSetZMode(0, GX_LEQUAL, GX_FALSE); GXBegin(GX_QUADS, GX_VTXFMT0, 4); diff --git a/src/REL/m428Dll/map.c b/src/REL/m428Dll/map.c index cadec1d3..ce4c7764 100644 --- a/src/REL/m428Dll/map.c +++ b/src/REL/m428Dll/map.c @@ -402,8 +402,8 @@ u8 fn_1_5370(M433DllUnkStruct2 *arg0, Vec *arg1) for (var_r27 = 0; var_r27 < arg0->unk_08; var_r27++, var_r31++) { sp8 = *arg1; sp8.y = 0.0f; - PSVECSubtract(&sp8, &var_r31->unk_00, &sp20); - var_f30 = PSVECMag(&sp20); + VECSubtract(&sp8, &var_r31->unk_00, &sp20); + var_f30 = VECMag(&sp20); if (!(var_f30 > (400.0f + var_r31->unk_20)) && (var_r31->unk_2C != 0.0f)) { var_r24 = 0; for (var_r28 = 0; var_r28 < 3; var_r28++) { @@ -413,8 +413,8 @@ u8 fn_1_5370(M433DllUnkStruct2 *arg0, Vec *arg1) } var_r23 = &arg0->unk_00[var_r31->unk_0C[var_r28]]; var_r25 = &arg0->unk_00[var_r31->unk_0C[var_r26]]; - PSVECSubtract(var_r25, var_r23, &sp20); - PSVECSubtract(arg1, var_r25, &sp14); + VECSubtract(var_r25, var_r23, &sp20); + VECSubtract(arg1, var_r25, &sp14); var_f31 = (sp20.x * sp14.y) - (sp20.y * sp14.x); if ((var_f31 * var_r31->unk_2C) < 0.0) { var_r24 = 1; @@ -484,15 +484,15 @@ void fn_1_5684(HsfData *arg0, HsfObject *arg1) var_r31->unk_00.z /= 3.0f; var_r31->unk_20 = 0.0f; for (var_r28 = 0; var_r28 < 3; var_r28++) { - PSVECSubtract(&((Vec *)var_r29->data)[var_r30->indices[var_r28][0]], &var_r31->unk_00, &sp18); - var_f31 = PSVECMag(&sp18); + VECSubtract(&((Vec *)var_r29->data)[var_r30->indices[var_r28][0]], &var_r31->unk_00, &sp18); + var_f31 = VECMag(&sp18); if (var_f31 > var_r31->unk_20) { var_r31->unk_20 = var_f31; } } var_r31->unk_00.y = 0.0f; - PSVECSubtract(&((Vec *)var_r29->data)[var_r30->strip.indices[1][0]], &((Vec *)var_r29->data)[var_r30->strip.indices[0][0]], &sp18); - PSVECSubtract(&((Vec *)var_r29->data)[var_r30->strip.indices[2][0]], &((Vec *)var_r29->data)[var_r30->strip.indices[0][0]], &spC); + VECSubtract(&((Vec *)var_r29->data)[var_r30->strip.indices[1][0]], &((Vec *)var_r29->data)[var_r30->strip.indices[0][0]], &sp18); + VECSubtract(&((Vec *)var_r29->data)[var_r30->strip.indices[2][0]], &((Vec *)var_r29->data)[var_r30->strip.indices[0][0]], &spC); var_r31->unk_24 = (sp18.y * spC.z) - (sp18.z * spC.y); var_r31->unk_28 = (sp18.z * spC.x) - (sp18.x * spC.z); var_r31->unk_2C = (sp18.x * spC.y) - (sp18.y * spC.x); @@ -514,14 +514,14 @@ void fn_1_5684(HsfData *arg0, HsfObject *arg1) var_r31->unk_00.z *= 0.25f; var_r31->unk_20 = 0.0f; for (var_r28 = 0; var_r28 < 4; var_r28++) { - PSVECSubtract(&((Vec *)var_r29->data)[var_r30->indices[var_r28][0]], &var_r31->unk_00, &sp18); - var_f31 = PSVECMag(&sp18); + VECSubtract(&((Vec *)var_r29->data)[var_r30->indices[var_r28][0]], &var_r31->unk_00, &sp18); + var_f31 = VECMag(&sp18); if (var_f31 > var_r31->unk_20) { var_r31->unk_20 = var_f31; } } - PSVECSubtract(&((Vec *)var_r29->data)[var_r30->strip.indices[1][0]], &((Vec *)var_r29->data)[var_r30->strip.indices[0][0]], &sp18); - PSVECSubtract(&((Vec *)var_r29->data)[var_r30->strip.indices[2][0]], &((Vec *)var_r29->data)[var_r30->strip.indices[1][0]], &spC); + VECSubtract(&((Vec *)var_r29->data)[var_r30->strip.indices[1][0]], &((Vec *)var_r29->data)[var_r30->strip.indices[0][0]], &sp18); + VECSubtract(&((Vec *)var_r29->data)[var_r30->strip.indices[2][0]], &((Vec *)var_r29->data)[var_r30->strip.indices[1][0]], &spC); var_r31->unk_24 = (sp18.y * spC.z) - (sp18.z * spC.y); var_r31->unk_28 = (sp18.z * spC.x) - (sp18.x * spC.z); var_r31->unk_2C = (sp18.x * spC.y) - (sp18.y * spC.x); @@ -719,12 +719,12 @@ void fn_1_6280(ModelData *arg1, ParticleData *particle, Mtx matrix) } break; } - PSVECAdd(&var_r31->unk34, &var_r31->unk08, &var_r31->unk34); + VECAdd(&var_r31->unk34, &var_r31->unk08, &var_r31->unk34); if (particle->unk_04.x != 0.0f) { sp8 = particle->unk_04; sp8.x *= var_r31->unk2C / 28.0f; sp8.y = (((u8)var_r31->unk2C & 1) != 0 ? 1.0f : -1.0f) * (sp8.x * (0.05f + (s32)(0.2f * (fn_1_7500() / 65536.0f)))); - PSVECAdd(&var_r31->unk34, &sp8, &var_r31->unk34); + VECAdd(&var_r31->unk34, &sp8, &var_r31->unk34); } } DCFlushRange(particle->unk_48, particle->unk_30 * sizeof(HsfanimStruct01)); @@ -810,7 +810,7 @@ void fn_1_7430(void) void fn_1_74B4(s16 arg0, Mtx arg1) { ModelData *var_r31 = &Hu3DData[arg0]; - PSMTXCopy(arg1, var_r31->unk_F0); + MTXCopy(arg1, var_r31->unk_F0); } u32 lbl_1_data_14C = 0x41C64E6D; @@ -884,18 +884,18 @@ void fn_1_77F8(Mtx arg0, float arg8, float arg9, float argA) Mtx sp8; if (argA != 0.0f) { - PSMTXRotRad(arg0, 0x5A, MTXDegToRad(argA)); + MTXRotRad(arg0, 0x5A, MTXDegToRad(argA)); } else { - PSMTXIdentity(arg0); + MTXIdentity(arg0); } if (arg8 != 0.0f) { - PSMTXRotRad(sp38, 0x58, MTXDegToRad(arg8)); - PSMTXConcat(sp38, arg0, arg0); + MTXRotRad(sp38, 0x58, MTXDegToRad(arg8)); + MTXConcat(sp38, arg0, arg0); } if (arg9 != 0.0f) { - PSMTXRotRad(sp8, 0x59, MTXDegToRad(arg9)); - PSMTXConcat(sp8, arg0, arg0); + MTXRotRad(sp8, 0x59, MTXDegToRad(arg9)); + MTXConcat(sp8, arg0, arg0); } } @@ -1137,8 +1137,8 @@ void fn_1_939C(float *arg0, float (*arg1)[3], float (*arg2)[3], s32 var_r28) arg0[0] = 0.0f; for (var_r30 = 1; var_r30 < var_r28; var_r30++) { - PSVECSubtract((Vec *)&arg1[var_r30], (Vec *)&arg1[var_r30 - 1], &sp8); - arg0[var_r30] = arg0[var_r30 - 1] + PSVECMag(&sp8); + VECSubtract((Vec *)&arg1[var_r30], (Vec *)&arg1[var_r30 - 1], &sp8); + arg0[var_r30] = arg0[var_r30 - 1] + VECMag(&sp8); } for (var_r27 = 0; var_r27 < 3; var_r27++) { for (var_r30 = 0; var_r30 < var_r28; var_r30++) { diff --git a/src/REL/m429Dll/main.c b/src/REL/m429Dll/main.c index e37af222..01040112 100644 --- a/src/REL/m429Dll/main.c +++ b/src/REL/m429Dll/main.c @@ -403,9 +403,9 @@ void fn_1_1D70(s16 arg0, char *arg1, Vec *arg2, Mtx arg3) var_r30 = &Hu3DData[arg0]; Hu3DModelObjMtxGet(arg0, arg1, spC); - PSMTXConcat(var_r30->unk_F0, spC, spC); + MTXConcat(var_r30->unk_F0, spC, spC); if (NULL != arg3) { - PSMTXCopy(spC, arg3); + MTXCopy(spC, arg3); } arg2->x = spC[0][3]; arg2->y = spC[1][3]; diff --git a/src/REL/m430Dll/main.c b/src/REL/m430Dll/main.c index f7320e52..d848689f 100644 --- a/src/REL/m430Dll/main.c +++ b/src/REL/m430Dll/main.c @@ -118,7 +118,7 @@ void ObjectSetup(void) sp8.x = sp8.z = 0.0f; sp8.y = lbl_1_data_18.z; mtxRot(sp20, lbl_1_data_18.x, lbl_1_data_18.y, 0.0f); - PSMTXMultVec(sp20, &sp8, &sp8); + MTXMultVec(sp20, &sp8, &sp8); Hu3DGLightPosAimSetV(lbl_1_bss_26, &sp8, &sp14); Hu3DShadowPosSet(&sp8, &lbl_1_data_34, &sp14); lbl_1_bss_24 = lbl_1_bss_22 = lbl_1_bss_20 = -1; diff --git a/src/REL/m430Dll/player.c b/src/REL/m430Dll/player.c index e42fbd99..ca486592 100644 --- a/src/REL/m430Dll/player.c +++ b/src/REL/m430Dll/player.c @@ -278,8 +278,8 @@ void fn_1_BBC4(Process *process) sp14.x = CenterM[0].x + (CZoomM[0] * (sind(CRotM[0].y) * cosd(CRotM[0].x))); sp14.y = CenterM[0].y + (CZoomM[0] * -sind(CRotM[0].x)); sp14.z = CenterM[0].z + (CZoomM[0] * (cosd(CRotM[0].y) * cosd(CRotM[0].x))); - PSVECSubtract(CenterM, &sp14, &sp8); - PSVECNormalize(&sp8, &sp8); + VECSubtract(CenterM, &sp14, &sp8); + VECNormalize(&sp8, &sp8); HuAudFXListnerSetEX(&sp14, &sp8, 100000.0f, 566.6667f, 0.0f, 300.0f, 300.0f); } @@ -296,8 +296,8 @@ void fn_1_BE24(omObjData *object) sp14.x = CenterM[0].x + (CZoomM[0] * (sind(CRotM[0].y) * cosd(CRotM[0].x))); sp14.y = CenterM[0].y + (CZoomM[0] * -sind(CRotM[0].x)); sp14.z = CenterM[0].z + (CZoomM[0] * (cosd(CRotM[0].y) * cosd(CRotM[0].x))); - PSVECSubtract(CenterM, &sp14, &sp8); - PSVECNormalize(&sp8, &sp8); + VECSubtract(CenterM, &sp14, &sp8); + VECNormalize(&sp8, &sp8); HuAudFXListnerUpdate(&sp14, &sp8); } @@ -1619,7 +1619,7 @@ void fn_1_10948(ModelData *var_r29, Mtx var_r30) Mtx sp8; M430PlayerBss170Struct *var_r31 = var_r29->unk_120; GXLoadPosMtxImm(var_r30, 0); - PSMTXInvXpose(var_r30, sp8); + MTXInvXpose(var_r30, sp8); GXLoadNrmMtxImm(sp8, 0); GXSetNumTevStages(1); GXSetNumTexGens(1); diff --git a/src/REL/m430Dll/water.c b/src/REL/m430Dll/water.c index f9b938a2..4cdcef5c 100644 --- a/src/REL/m430Dll/water.c +++ b/src/REL/m430Dll/water.c @@ -202,10 +202,13 @@ void fn_1_4CB4(omObjData *object) u32 spC[1] = { DATA_MAKE_NUM(DATADIR_M430, 0x01) }; s32 sp8[1]; - 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 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) }; + 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]; @@ -481,10 +484,10 @@ void fn_1_6180(M430DllWork *work) sp28.x = sp1C.x; sp28.y = 0.0f; sp28.z = sp1C.z - 450000.0f; - PSVECSubtract(&sp28, &sp1C, &sp10); - PSVECNormalize(&sp10, &sp10); - PSVECScale(&sp10, &sp10, 6000.0f); - PSVECAdd(&sp1C, &sp10, &sp28); + VECSubtract(&sp28, &sp1C, &sp10); + VECNormalize(&sp10, &sp10); + VECScale(&sp10, &sp10, 6000.0f); + VECAdd(&sp1C, &sp10, &sp28); Hu3DModelPosSetV(work->unk_18, &sp28); if ((fn_1_4070() >= 2) && (fn_1_4030() != 0)) { if ((lbl_1_bss_40 != 0) && (lbl_1_bss_48 >= work->unk_04.x)) { @@ -494,10 +497,10 @@ void fn_1_6180(M430DllWork *work) sp28.x = 0.0f; sp28.y = 0.0f; sp28.z = work->unk_20 - fn_1_7FBC(work->unk_00); - PSVECSubtract(&sp28, &sp1C, &sp10); - PSVECNormalize(&sp10, &sp10); - PSVECScale(&sp10, &sp10, 5000.0f); - PSVECAdd(&sp1C, &sp10, &sp28); + VECSubtract(&sp28, &sp1C, &sp10); + VECNormalize(&sp10, &sp10); + VECScale(&sp10, &sp10, 5000.0f); + VECAdd(&sp1C, &sp10, &sp28); sp28.y += 237.5f; Hu3DModelPosSet(work->unk_1A, 0.0f, 593.75f, work->unk_20); var_r30 = ((ParticleData *)Hu3DData[work->unk_1A].unk_120)->unk_48; @@ -742,8 +745,8 @@ void fn_1_732C(omObjData *object, M430DllUnkStruct2 *arg1) var_r29 = 1; } else { - PSVECSubtract(&arg1->unk_18, &arg1->unk_0C, &sp8); - var_f31 = PSVECMag(&sp8); + VECSubtract(&arg1->unk_18, &arg1->unk_0C, &sp8); + var_f31 = VECMag(&sp8); if (var_f31 < 50.0f) { var_r29 = 1; } @@ -758,7 +761,7 @@ void fn_1_732C(omObjData *object, M430DllUnkStruct2 *arg1) arg1->unk_38 = 200.0f + frandmod(0x258); arg1->unk_28 = 400.0f; } - PSVECSubtract(&arg1->unk_18, &arg1->unk_0C, &sp8); + VECSubtract(&arg1->unk_18, &arg1->unk_0C, &sp8); arg1->unk_30 = atan2d(sp8.x, sp8.z); arg1->unk_2C = fn_1_48B0(arg1->unk_2C, arg1->unk_30, 0.08f); arg1->unk_28 += 0.05f * (300.0f - arg1->unk_28); @@ -822,7 +825,7 @@ void fn_1_7848(omObjData *object) var_r31->unk_08.x = var_f31 * sind(var_f30); var_r31->unk_08.y = 0.0f; var_r31->unk_08.z = var_f31 * cosd(var_f30); - PSVECAdd(&var_r31->unk_14, &var_r31->unk_08, &var_r31->unk_08); + VECAdd(&var_r31->unk_14, &var_r31->unk_08, &var_r31->unk_08); var_r31->unk_38 = 60.0f - (0.13483146f * var_f31); var_r31->unk_28 = frandmod(0x168); if (frandmod(0x3E8) < 0x1F4) { @@ -857,7 +860,7 @@ void fn_1_7CAC(omObjData *object) if (fn_1_4070() >= 4) { for (var_r29 = 0; var_r29 < var_r28; var_r29++, work++) { sp8 = 0; - PSVECSubtract(&work->unk_14, &work->unk_08, &spC); + VECSubtract(&work->unk_14, &work->unk_08, &spC); work->unk_2C = atan2d(spC.x, spC.z); work->unk_28 = fn_1_48B0(work->unk_28, work->unk_2C + work->unk_3C, 0.08f); work->unk_24 += (0.05f * (600.0f - work->unk_24)); @@ -883,9 +886,9 @@ void fn_1_7EAC(omObjData *object, M430DllWork2 *var_r31) for (var_r30 = 0; var_r30 < var_r28; var_r30++, var_r31++) { Hu3DModelPosSet(var_r31->unk_00, var_r31->unk_08.x, var_r31->unk_08.y, var_r31->unk_08.z + var_f31); var_r29 = &Hu3DData[var_r31->unk_00].unk_F0; - PSMTXRotRad(*var_r29, 0x59, 0.017453292f * var_r31->unk_28); - PSMTXRotRad(sp8, 0x5A, 0.017453292f * var_r31->unk_38); - PSMTXConcat(*var_r29, sp8, *var_r29); + MTXRotRad(*var_r29, 0x59, 0.017453292f * var_r31->unk_28); + MTXRotRad(sp8, 0x5A, 0.017453292f * var_r31->unk_38); + MTXConcat(*var_r29, sp8, *var_r29); Hu3DModelAttrReset(var_r31->unk_00, HU3D_ATTR_DISPOFF); } } @@ -1062,8 +1065,8 @@ void fn_1_86B4(omObjData *object, M430DllBss60Struct *arg1) sp14.z = 2000.0f + arg1->unk_24; if (lbl_1_bss_5C != 0) { for (var_r29 = 0; var_r29 < 0x1B8; var_r29++) { - PSVECSubtract(var_r28, &sp14, &sp8); - var_f31 = 0.00025f * PSVECMag(&sp8); + VECSubtract(var_r28, &sp14, &sp8); + var_f31 = 0.00025f * VECMag(&sp8); if (var_f31 < 0.3f) { var_r30->a = -1; } @@ -1080,8 +1083,8 @@ void fn_1_86B4(omObjData *object, M430DllBss60Struct *arg1) } else { for (var_r29 = 0; var_r29 < 0x1B8; var_r29++) { - PSVECSubtract(var_r28, &sp14, &sp8); - var_f31 = 0.00025f * PSVECMag(&sp8); + VECSubtract(var_r28, &sp14, &sp8); + var_f31 = 0.00025f * VECMag(&sp8); if (var_f31 < 0.25f) { var_r30->a = -0x1A; } @@ -1105,7 +1108,7 @@ void fn_1_86B4(omObjData *object, M430DllBss60Struct *arg1) var_r29 = (0x14 - var_r23) * 0x16; var_r27 = &arg1->unk_30[0x1B8 - var_r29]; while (var_r29-- != 0) { - PSVECAdd(var_r28, var_r27, var_r26); + VECAdd(var_r28, var_r27, var_r26); var_r28++; var_r27++; var_r26++; @@ -1113,7 +1116,7 @@ void fn_1_86B4(omObjData *object, M430DllBss60Struct *arg1) var_r29 = var_r23 * 0x16; var_r27 = arg1->unk_30; while (var_r29-- != 0) { - PSVECAdd(var_r28, var_r27, var_r26); + VECAdd(var_r28, var_r27, var_r26); var_r28++; var_r27++; var_r26++; @@ -1186,7 +1189,7 @@ void fn_1_8CE0(ModelData *model, Mtx matrix) } var_r31->unk_10 = 1; fn_1_963C(model, matrix, var_r31->unk_00); - PSMTXCopy(matrix, sp134); + MTXCopy(matrix, sp134); if (fn_1_4030() != 0) { var_f30 = 1.0f; var_f31 = fn_1_BB54(var_r31->unk_00); @@ -1195,12 +1198,12 @@ void fn_1_8CE0(ModelData *model, Mtx matrix) var_f30 = 1.5f; var_f31 = 0.0f; } - PSMTXTrans(sp164, var_f31 - fn_1_BB54(var_r31->unk_00), 0.0f, 0.0f); - PSMTXConcat(sp134, sp164, sp134); - PSMTXScale(sp194, var_f30, 1.0f, 1.0f); - PSMTXConcat(sp134, sp194, sp134); + MTXTrans(sp164, var_f31 - fn_1_BB54(var_r31->unk_00), 0.0f, 0.0f); + MTXConcat(sp134, sp164, sp134); + MTXScale(sp194, var_f30, 1.0f, 1.0f); + MTXConcat(sp134, sp194, sp134); GXLoadPosMtxImm(sp134, 0); - PSMTXInvXpose(sp134, sp194); + MTXInvXpose(sp134, sp194); GXLoadNrmMtxImm(sp194, 0); GXSetNumChans(1); GXSetChanCtrl(GX_COLOR0A0, 0, GX_SRC_REG, GX_SRC_VTX, 0, GX_DF_CLAMP, GX_AF_NONE); @@ -1221,25 +1224,25 @@ void fn_1_8CE0(ModelData *model, Mtx matrix) else { C_MTXLightPerspective(sp104, 41.5f, 1.2f, 0.5f, -0.5f, 0.5f, 0.5f); } - PSMTXInverse(Hu3DCameraMtx, spD4); - PSMTXConcat(spD4, sp134, spD4); - PSMTXConcat(sp104, Hu3DCameraMtx, spA4); - PSMTXConcat(spA4, spD4, spD4); + MTXInverse(Hu3DCameraMtx, spD4); + MTXConcat(spD4, sp134, spD4); + MTXConcat(sp104, Hu3DCameraMtx, spA4); + MTXConcat(spA4, spD4, spD4); GXLoadTexMtxImm(spD4, 0x1E, GX_MTX3x4); GXSetTexCoordGen2(GX_TEXCOORD0, GX_TG_MTX3x4, GX_TG_POS, 0x1E, GX_FALSE, 0x7D); C_MTXLightPerspective(sp104, 70.0f, 0.5f, 0.5f, -0.5f, 0.5f, 0.5f); - PSMTXInverse(Hu3DCameraMtx, sp74); - PSMTXConcat(sp74, sp134, sp74); - PSMTXConcat(sp104, Hu3DCameraMtx, sp44); - PSMTXConcat(sp44, sp74, sp74); + MTXInverse(Hu3DCameraMtx, sp74); + MTXConcat(sp74, sp134, sp74); + MTXConcat(sp104, Hu3DCameraMtx, sp44); + MTXConcat(sp44, sp74, sp74); GXLoadTexMtxImm(sp74, 0x24, GX_MTX3x4); GXSetTexCoordGen2(GX_TEXCOORD2, GX_TG_MTX3x4, GX_TG_POS, 0x24, GX_FALSE, 0x7D); - PSMTXRotRad(sp164, 0x58, 1.5707964f); + MTXRotRad(sp164, 0x58, 1.5707964f); var_f31 = 0.00075f * var_f30; - PSMTXScale(sp194, var_f31, -0.003f, 0.00075f); - PSMTXConcat(sp164, sp194, sp164); - PSMTXTrans(sp194, (var_r31->unk_1C & 0x3FF) / (1024.0f * var_f31), 0.0f, (0.7f * var_r31->unk_28) - (0.3f * var_r31->unk_24)); - PSMTXConcat(sp164, sp194, sp164); + MTXScale(sp194, var_f31, -0.003f, 0.00075f); + MTXConcat(sp164, sp194, sp164); + MTXTrans(sp194, (var_r31->unk_1C & 0x3FF) / (1024.0f * var_f31), 0.0f, (0.7f * var_r31->unk_28) - (0.3f * var_r31->unk_24)); + MTXConcat(sp164, sp194, sp164); sp164[0][1] = -0.001f; GXLoadTexMtxImm(sp164, 0x21, GX_MTX2x4); GXSetTexCoordGen2(GX_TEXCOORD1, GX_TG_MTX2x4, GX_TG_POS, 0x21, GX_FALSE, 0x7D); @@ -1247,12 +1250,12 @@ void fn_1_8CE0(ModelData *model, Mtx matrix) GXSetIndTexOrder(GX_INDTEXSTAGE0, GX_TEXCOORD1, GX_TEXMAP1); GXSetIndTexCoordScale(GX_INDTEXSTAGE0, GX_ITS_1, GX_ITS_1); GXSetTevIndWarp(0, 0, GX_TRUE, GX_FALSE, 1); - PSMTXScale(sp164, -0.25f, -0.5f, 0.5f); + MTXScale(sp164, -0.25f, -0.5f, 0.5f); GXSetIndTexMtx(GX_ITM_0, (float(*)[3])sp164, -4); GXSetIndTexOrder(GX_INDTEXSTAGE1, GX_TEXCOORD1, GX_TEXMAP1); GXSetIndTexCoordScale(GX_INDTEXSTAGE1, GX_ITS_1, GX_ITS_1); GXSetTevIndWarp(1, 1, GX_TRUE, GX_FALSE, 2); - PSMTXScale(sp164, 0.4f, 0.5f, 0.5f); + MTXScale(sp164, 0.4f, 0.5f, 0.5f); GXSetIndTexMtx(GX_ITM_1, (float(*)[3])sp164, -1); GXSetNumTevStages(2); GXSetTevColor(GX_TEVREG0, sp14); @@ -1320,10 +1323,10 @@ void fn_1_963C(ModelData *model, Mtx matrix, u32 var_r31) var_f30 = 1.5f; var_f31 = 0.0f; } - PSMTXTrans(spD0, var_f31, 0.0f, ((lbl_1_bss_60[var_r31].unk_28 + lbl_1_bss_60[var_r31].unk_24) - 2500.0f) - 2000.0f); - PSMTXScale(sp100, var_f30, 1.0f, 1.0f); - PSMTXConcat(spD0, sp100, spD0); - PSMTXConcat(Hu3DCameraMtx, spD0, spA0); + MTXTrans(spD0, var_f31, 0.0f, ((lbl_1_bss_60[var_r31].unk_28 + lbl_1_bss_60[var_r31].unk_24) - 2500.0f) - 2000.0f); + MTXScale(sp100, var_f30, 1.0f, 1.0f); + MTXConcat(spD0, sp100, spD0); + MTXConcat(Hu3DCameraMtx, spD0, spA0); GXLoadPosMtxImm(spA0, 0); GXSetNumChans(1); GXSetChanCtrl(GX_COLOR0A0, GX_FALSE, GX_SRC_REG, GX_SRC_VTX, 0, GX_DF_CLAMP, GX_AF_NONE); @@ -1331,26 +1334,26 @@ void fn_1_963C(ModelData *model, Mtx matrix, u32 var_r31) HuSprTexLoad(lbl_1_bss_148, 0, 1, GX_CLAMP, GX_CLAMP, GX_LINEAR); GXSetNumTexGens(2); C_MTXLightPerspective(sp70, 70.0f, 0.5f, 0.5f, -0.5f, 0.5f, 0.5f); - PSMTXInverse(Hu3DCameraMtx, sp40); - PSMTXConcat(sp40, spA0, sp40); - PSMTXConcat(sp70, Hu3DCameraMtx, sp10); - PSMTXConcat(sp10, sp40, sp40); + MTXInverse(Hu3DCameraMtx, sp40); + MTXConcat(sp40, spA0, sp40); + MTXConcat(sp70, Hu3DCameraMtx, sp10); + MTXConcat(sp10, sp40, sp40); GXLoadTexMtxImm(sp40, 0x21, GX_MTX3x4); GXSetTexCoordGen2(GX_TEXCOORD1, GX_TG_MTX3x4, GX_TG_POS, 0x21, GX_FALSE, 0x7D); - PSMTXRotRad(spD0, 0x58, 1.5707964f); + MTXRotRad(spD0, 0x58, 1.5707964f); var_f31 = 0.00075f * var_f30; - PSMTXScale(sp100, var_f31, -0.003f, 0.00075f); - PSMTXConcat(spD0, sp100, spD0); - PSMTXTrans(sp100, (lbl_1_bss_60[var_r31].unk_1C & 0x3FF) / (1024.0f * var_f31), 0.0f, + MTXScale(sp100, var_f31, -0.003f, 0.00075f); + MTXConcat(spD0, sp100, spD0); + MTXTrans(sp100, (lbl_1_bss_60[var_r31].unk_1C & 0x3FF) / (1024.0f * var_f31), 0.0f, 0.3f * (lbl_1_bss_60[var_r31].unk_28 + lbl_1_bss_60[var_r31].unk_24)); - PSMTXConcat(spD0, sp100, spD0); + MTXConcat(spD0, sp100, spD0); GXLoadTexMtxImm(spD0, 0x1E, GX_MTX2x4); GXSetTexCoordGen2(GX_TEXCOORD0, GX_TG_MTX2x4, GX_TG_POS, 0x1E, GX_FALSE, 0x7D); GXSetNumIndStages(1); GXSetIndTexOrder(GX_INDTEXSTAGE0, GX_TEXCOORD0, GX_TEXMAP0); GXSetIndTexCoordScale(GX_INDTEXSTAGE0, GX_ITS_1, GX_ITS_1); GXSetTevIndWarp(0, 0, GX_TRUE, GX_FALSE, 1); - PSMTXScale(spD0, 0.5f, 0.6f, 0.6f); + MTXScale(spD0, 0.5f, 0.6f, 0.6f); GXSetIndTexMtx(GX_ITM_0, (float(*)[3])spD0, -1); GXSetNumTevStages(1); GXSetTevColor(GX_TEVREG0, spC); @@ -1432,18 +1435,18 @@ void fn_1_9C90(ModelData *model, Mtx matrix) sp28.x = sp1C.x; sp28.y = 0.0f; sp28.z = sp1C.z - 450000.0f; - PSVECSubtract(&sp28, &sp1C, &sp10); - PSVECNormalize(&sp10, &sp10); - PSVECScale(&sp10, &sp10, 8000.0f); - PSVECAdd(&sp1C, &sp10, &sp28); - PSMTXTrans(spF4, sp28.x, sp28.y, sp28.z); + VECSubtract(&sp28, &sp1C, &sp10); + VECNormalize(&sp10, &sp10); + VECScale(&sp10, &sp10, 8000.0f); + VECAdd(&sp1C, &sp10, &sp28); + MTXTrans(spF4, sp28.x, sp28.y, sp28.z); var_f31 = 1.0f; if (fn_1_4030() == 0) { var_f31 = 1.5f; - PSMTXScale(sp124, var_f31, 1.0f, 1.0f); - PSMTXConcat(spF4, sp124, spF4); + MTXScale(sp124, var_f31, 1.0f, 1.0f); + MTXConcat(spF4, sp124, spF4); } - PSMTXConcat(Hu3DCameraMtx, spF4, spC4); + MTXConcat(Hu3DCameraMtx, spF4, spC4); GXLoadPosMtxImm(spC4, 0); GXSetNumChans(1); GXSetChanCtrl(GX_COLOR0A0, 0, GX_SRC_REG, GX_SRC_VTX, 0, GX_DF_CLAMP, GX_AF_NONE); @@ -1451,24 +1454,24 @@ void fn_1_9C90(ModelData *model, Mtx matrix) HuSprTexLoad(lbl_1_bss_148, 0, 1, GX_CLAMP, GX_CLAMP, GX_LINEAR); GXSetNumTexGens(2); C_MTXLightPerspective(sp94, 70.0f, 0.5f, 0.5f, -0.5f, 0.5f, 0.5f); - PSMTXInverse(Hu3DCameraMtx, sp64); - PSMTXConcat(sp64, spC4, sp64); - PSMTXConcat(sp94, Hu3DCameraMtx, sp34); - PSMTXConcat(sp34, sp64, sp64); + MTXInverse(Hu3DCameraMtx, sp64); + MTXConcat(sp64, spC4, sp64); + MTXConcat(sp94, Hu3DCameraMtx, sp34); + MTXConcat(sp34, sp64, sp64); GXLoadTexMtxImm(sp64, 0x21, GX_MTX3x4); GXSetTexCoordGen2(GX_TEXCOORD1, GX_TG_MTX3x4, GX_TG_POS, 0x21, GX_FALSE, 0x7D); var_f30 = 0.00075f * var_f31; - PSMTXScale(spF4, var_f30, -0.005f, 0.00075f); - PSMTXTrans(sp124, (lbl_1_bss_60[var_r31].unk_1C & 0x3FF) / (1024.0f * var_f30), + MTXScale(spF4, var_f30, -0.005f, 0.00075f); + MTXTrans(sp124, (lbl_1_bss_60[var_r31].unk_1C & 0x3FF) / (1024.0f * var_f30), 0.03f * -(lbl_1_bss_60[var_r31].unk_28 + lbl_1_bss_60[var_r31].unk_24), 0.0f); - PSMTXConcat(spF4, sp124, spF4); + MTXConcat(spF4, sp124, spF4); GXLoadTexMtxImm(spF4, 0x1E, GX_MTX2x4); GXSetTexCoordGen2(GX_TEXCOORD0, GX_TG_MTX2x4, GX_TG_POS, 0x1E, GX_FALSE, 0x7D); GXSetNumIndStages(1); GXSetIndTexOrder(GX_INDTEXSTAGE0, GX_TEXCOORD0, GX_TEXMAP0); GXSetIndTexCoordScale(GX_INDTEXSTAGE0, GX_ITS_1, GX_ITS_1); GXSetTevIndWarp(0, 0, GX_TRUE, GX_FALSE, 1); - PSMTXScale(spF4, 0.5f, 0.6f, 0.6f); + MTXScale(spF4, 0.5f, 0.6f, 0.6f); GXSetIndTexMtx(GX_ITM_0, (float(*)[3])spF4, -1); GXSetNumTevStages(1); GXSetTevColor(GX_TEVREG0, spC); @@ -1522,37 +1525,37 @@ void fn_1_A3A8(ModelData *model, Mtx matrix) var_f31 = 0.0f; } if (lbl_1_bss_5C != 0) { - PSMTXTrans(sp18, var_f31, 0.0f, 300.0f + (lbl_1_bss_60[var_r31].unk_28 + lbl_1_bss_60[var_r31].unk_24)); + MTXTrans(sp18, var_f31, 0.0f, 300.0f + (lbl_1_bss_60[var_r31].unk_28 + lbl_1_bss_60[var_r31].unk_24)); GXSetTevColor(GX_TEVREG0, sp10); } else { - PSMTXTrans(sp18, var_f31, -150.0f, lbl_1_bss_60[var_r31].unk_28 + lbl_1_bss_60[var_r31].unk_24); + MTXTrans(sp18, var_f31, -150.0f, lbl_1_bss_60[var_r31].unk_28 + lbl_1_bss_60[var_r31].unk_24); GXSetTevColor(GX_TEVREG0, sp14); } - PSMTXScale(sp48, var_f30, 1.0f, 1.0f); - PSMTXConcat(sp18, sp48, sp18); - PSMTXConcat(Hu3DCameraMtx, sp18, sp18); + MTXScale(sp48, var_f30, 1.0f, 1.0f); + MTXConcat(sp18, sp48, sp18); + MTXConcat(Hu3DCameraMtx, sp18, sp18); GXLoadPosMtxImm(sp18, 0); GXSetNumChans(1); GXSetChanCtrl(GX_COLOR0A0, GX_FALSE, GX_SRC_REG, GX_SRC_VTX, 0, GX_DF_CLAMP, GX_AF_NONE); HuSprTexLoad(lbl_1_bss_144, 0, 0, GX_REPEAT, GX_REPEAT, GX_LINEAR); HuSprTexLoad(lbl_1_bss_140, 0, 1, GX_REPEAT, GX_REPEAT, GX_LINEAR); GXSetNumTexGens(2); - PSMTXRotRad(sp18, 0x58, 1.5707964f); + MTXRotRad(sp18, 0x58, 1.5707964f); var_f31 = 0.004f * var_f30; - PSMTXScale(sp48, var_f31, -0.004f, 0.004f); - PSMTXConcat(sp18, sp48, sp18); - PSMTXTrans(sp48, (lbl_1_bss_60[var_r31].unk_1C & 0x3FF) / (512.0f * var_f31), 0.0f, + MTXScale(sp48, var_f31, -0.004f, 0.004f); + MTXConcat(sp18, sp48, sp18); + MTXTrans(sp48, (lbl_1_bss_60[var_r31].unk_1C & 0x3FF) / (512.0f * var_f31), 0.0f, (1.2499999f * (lbl_1_bss_60[var_r31].unk_1C % 400)) + (lbl_1_bss_60[var_r31].unk_28 + lbl_1_bss_60[var_r31].unk_24)); - PSMTXConcat(sp18, sp48, sp18); + MTXConcat(sp18, sp48, sp18); GXLoadTexMtxImm(sp18, 0x1E, GX_MTX2x4); GXSetTexCoordGen2(GX_TEXCOORD0, GX_TG_MTX2x4, GX_TG_POS, 0x1E, GX_FALSE, 0x7D); - PSMTXRotRad(sp18, 0x58, 1.5707964f); + MTXRotRad(sp18, 0x58, 1.5707964f); var_f31 = 0.004f * var_f30; - PSMTXScale(sp48, var_f31, -0.004f, 0.004f); - PSMTXConcat(sp18, sp48, sp18); - PSMTXTrans(sp48, (lbl_1_bss_60[var_r31].unk_1C % 300) / (150.0f * var_f31), 0.0f, lbl_1_bss_60[var_r31].unk_28 + lbl_1_bss_60[var_r31].unk_24); - PSMTXConcat(sp18, sp48, sp18); + MTXScale(sp48, var_f31, -0.004f, 0.004f); + MTXConcat(sp18, sp48, sp18); + MTXTrans(sp48, (lbl_1_bss_60[var_r31].unk_1C % 300) / (150.0f * var_f31), 0.0f, lbl_1_bss_60[var_r31].unk_28 + lbl_1_bss_60[var_r31].unk_24); + MTXConcat(sp18, sp48, sp18); GXLoadTexMtxImm(sp18, 0x21, GX_MTX2x4); GXSetTexCoordGen2(GX_TEXCOORD1, GX_TG_MTX2x4, GX_TG_POS, 0x21, GX_FALSE, 0x7D); GXSetNumTevStages(2); @@ -1635,8 +1638,8 @@ void fn_1_AD04(ModelData *model, ParticleData *particle, Mtx matrix) } for (var_r31 = particle->unk_48, var_r29 = 0; var_r29 < particle->unk_30; var_r29++, var_r31++) { if (var_r31->unk00_s16 != 0) { - PSVECAdd(&var_r31->unk34, &var_r31->unk08, &var_r31->unk34); - PSVECScale(&var_r31->unk08, &var_r31->unk08, 0.97f); + VECAdd(&var_r31->unk34, &var_r31->unk08, &var_r31->unk34); + VECScale(&var_r31->unk08, &var_r31->unk08, 0.97f); if (var_r31->unk00_s16 < 24.0f) { var_r31->unk40.a = 0.9f * var_r31->unk40.a; } @@ -1720,7 +1723,7 @@ void fn_1_B394(ModelData *model, ParticleData *var_r30, Mtx matrix) for (var_r31 = var_r30->unk_48, var_r29 = 0; var_r29 < var_r30->unk_30; var_r29++, var_r31++) { if (var_r31->unk00_s16 != 0) { var_r31->unk00_s16--; - PSVECAdd(&var_r31->unk34, &var_r31->unk08, &var_r31->unk34); + VECAdd(&var_r31->unk34, &var_r31->unk08, &var_r31->unk34); var_r31->unk2C += 0.5f; if (var_r31->unk00_s16 < 30.0) { var_r31->unk40.a = 0.98f * var_r31->unk40.a; @@ -1760,7 +1763,7 @@ void fn_1_B570(s32 arg0, Vec *arg1, float arg8, float arg9, Vec *arg2) if (!(frandmod(0x3E8) > (1000.0f * arg9))) { var_r27 = 2; var_f28 = 40.0f; - PSVECScale(arg2, &sp1C, 0.2f); + VECScale(arg2, &sp1C, 0.2f); sp1C.x = 0.0f; for (var_r29 = 0; var_r29 < var_r30->unk_30; var_r29++, var_r31++) { if (var_r31->unk00_s16 == 0) { @@ -1778,7 +1781,7 @@ void fn_1_B570(s32 arg0, Vec *arg1, float arg8, float arg9, Vec *arg2) var_r31->unk08.x = sp28.x * var_f31; var_r31->unk08.z = sp28.z * var_f31; var_r31->unk08.y = 0.0f; - PSVECAdd(&var_r31->unk08, &sp1C, &var_r31->unk08); + VECAdd(&var_r31->unk08, &sp1C, &var_r31->unk08); var_f31 = 0.001f * frandmod(0x3E8); var_f31 += (1.0f - var_f31) * (0.3f * arg9); var_r31->unk30 = frandmod(0x168); diff --git a/src/REL/m431Dll/main.c b/src/REL/m431Dll/main.c index 44ae5974..4aec497d 100644 --- a/src/REL/m431Dll/main.c +++ b/src/REL/m431Dll/main.c @@ -1274,7 +1274,7 @@ void fn_1_4028(Work2110 *arg0) temp_r31->unk18++; temp_f31 = temp_r31->unk18 / (VERSION_NTSC ? 54.0f : 45.0f); if (temp_f31 >= 1.0f) { - temp_r31->unk18 = VERSION_NTSC ? 54 : 45; + temp_r31->unk18 = VERSION_NTSC ? 54 : 45; temp_f31 = 1.0f; } temp_f31 = cosd(temp_f31 * 90.0f); diff --git a/src/REL/m433Dll/main.c b/src/REL/m433Dll/main.c index df35b851..6e36fe20 100644 --- a/src/REL/m433Dll/main.c +++ b/src/REL/m433Dll/main.c @@ -395,12 +395,12 @@ void fn_1_227C(Vec *arg0, Vec *arg1) { Vec sp10; - PSVECSubtract(arg1, arg0, &sp10); + VECSubtract(arg1, arg0, &sp10); Center = *arg1; CRot.x = atan2d(sp10.y, sqrtf((sp10.x * sp10.x) + (sp10.z * sp10.z))); CRot.y = atan2d(-sp10.x, -sp10.z); CRot.z = 0.0f; - CZoom = PSVECMag(&sp10); + CZoom = VECMag(&sp10); } void fn_1_2484(float arg8, float arg9, float argA, float argB, float argC, float argD) diff --git a/src/REL/m433Dll/map.c b/src/REL/m433Dll/map.c index 57695003..40aab323 100644 --- a/src/REL/m433Dll/map.c +++ b/src/REL/m433Dll/map.c @@ -779,18 +779,18 @@ void fn_1_541C(Mtx arg0, float arg8, float arg9, float argA) Mtx sp8; if (argA != 0.0f) { - PSMTXRotRad(arg0, 0x5A, MTXDegToRad(argA)); + MTXRotRad(arg0, 0x5A, MTXDegToRad(argA)); } else { - PSMTXIdentity(arg0); + MTXIdentity(arg0); } if (arg8 != 0.0f) { - PSMTXRotRad(sp38, 0x58, MTXDegToRad(arg8)); - PSMTXConcat(sp38, arg0, arg0); + MTXRotRad(sp38, 0x58, MTXDegToRad(arg8)); + MTXConcat(sp38, arg0, arg0); } if (arg9 != 0.0f) { - PSMTXRotRad(sp8, 0x59, MTXDegToRad(arg9)); - PSMTXConcat(sp8, arg0, arg0); + MTXRotRad(sp8, 0x59, MTXDegToRad(arg9)); + MTXConcat(sp8, arg0, arg0); } } diff --git a/src/REL/m433Dll/player.c b/src/REL/m433Dll/player.c index 21b2ff60..7b69466d 100644 --- a/src/REL/m433Dll/player.c +++ b/src/REL/m433Dll/player.c @@ -629,7 +629,7 @@ void fn_1_60C0(omObjData *object) if (work->unk_04 >= 0) { HuAudFXPlay(lbl_1_data_150[work->unk_04][0]); } - PSVECSubtract(&var_r28->unk_128, &work->unk_128, &spC); + VECSubtract(&var_r28->unk_128, &work->unk_128, &spC); work->unk_A8 = atan2d(spC.x, spC.z); work->unk_AC = 0.15f; work->unk_B0 = 0.0f; @@ -686,7 +686,7 @@ void fn_1_60C0(omObjData *object) } break; } - PSVECAdd(&work->unk_128, &work->unk_134, &work->unk_128); + VECAdd(&work->unk_128, &work->unk_134, &work->unk_128); if (fn_1_10ECC(work->unk_14) >= 2) { fn_1_B194(object); } @@ -716,7 +716,7 @@ void fn_1_682C(omObjData *object) Vec sp40[2] = { { 130.0f, 0.0f, -50.0f }, { 250.0f, 0.0f, 50.0f } }; Vec sp28[2] = { { 150.0f, 0.0f, 100.0f }, { 300.0f, 0.0f, -100.0f } }; var_r27 = work->unk_14C->data; - PSVECAdd(&work->unk_128, &work->unk_134, &work->unk_128); + VECAdd(&work->unk_128, &work->unk_134, &work->unk_128); fn_1_B194(object); fn_1_722C(object); switch (work->unk_74) { @@ -782,15 +782,15 @@ void fn_1_682C(omObjData *object) break; case 1: if (work->unk_84 == 1) { - PSVECSubtract(&work->unk_140, &work->unk_128, &sp10); + VECSubtract(&work->unk_140, &work->unk_128, &sp10); sp10.y = 0.0f; - var_f31 = PSVECMag(&sp10); + var_f31 = VECMag(&sp10); if (var_f31 < 20.0f) { var_f31 = 0.01f; work->unk_84++; } else { - if (PSVECMag(&sp10) >= 100.0f) { + if (VECMag(&sp10) >= 100.0f) { var_f31 = 100.0f; } var_f31 = 0.2f + (0.008f * var_f31); @@ -826,14 +826,14 @@ void fn_1_682C(omObjData *object) } break; case 2: - PSVECSubtract(&work->unk_140, &work->unk_128, &sp10); + VECSubtract(&work->unk_140, &work->unk_128, &sp10); sp10.y = 0.0f; - var_f31 = PSVECMag(&sp10); + var_f31 = VECMag(&sp10); if (var_f31 < 10.0f) { var_f31 = 0.01f; } else { - if (PSVECMag(&sp10) >= 100.0f) { + if (VECMag(&sp10) >= 100.0f) { var_f31 = 100.0f; } var_f31 = 0.2f + (0.008f * var_f31); @@ -875,7 +875,7 @@ void fn_1_682C(omObjData *object) sp1C.x = Center.x + (CZoom * (sind(CRot.y) * cosd(CRot.x))); sp1C.y = Center.y + (CZoom * -sind(CRot.x)); sp1C.z = Center.z + (CZoom * (cosd(CRot.y) * cosd(CRot.x))); - PSVECSubtract(&sp1C, &work->unk_128, &sp10); + VECSubtract(&sp1C, &work->unk_128, &sp10); work->unk_A8 = atan2d(sp10.x, sp10.z); } if (fn_1_B6E0(object) != 0) { @@ -1060,10 +1060,10 @@ void fn_1_74D4(omObjData *object) } } if ((work->unk_14 == fn_1_107B0(&sp1C)) && (fn_1_10900() >= (60.0f * (0.8f - (0.4f * work->unk_C0)))) && (work->unk_6C != 0)) { - PSVECSubtract(&sp1C, &work->unk_128, &sp10); + VECSubtract(&sp1C, &work->unk_128, &sp10); sp10.y = 0.0f; - var_f31 = PSVECMag(&sp10); - if (PSVECMag(&sp10) >= 20.0f) { + var_f31 = VECMag(&sp10); + if (VECMag(&sp10) >= 20.0f) { if (var_f31 >= 50.0f) { var_f31 = 50.0f; } @@ -1076,9 +1076,9 @@ void fn_1_74D4(omObjData *object) var_r29 = 0; } if (work->unk_F8 != 0) { - PSVECSubtract(&work->unk_108, &work->unk_128, &sp10); + VECSubtract(&work->unk_108, &work->unk_128, &sp10); sp10.y = 0.0f; - var_f31 = PSVECMag(&sp10); + var_f31 = VECMag(&sp10); if (var_f31 >= 10.0f) { if (var_f31 >= 50.0f) { var_f31 = 50.0f; @@ -1096,9 +1096,9 @@ void fn_1_74D4(omObjData *object) var_r29 = 0; } if (var_r29 != 0) { - PSVECSubtract(&work->unk_FC, &work->unk_128, &sp10); + VECSubtract(&work->unk_FC, &work->unk_128, &sp10); sp10.y = 0.0f; - var_f31 = PSVECMag(&sp10); + var_f31 = VECMag(&sp10); var_f31 -= 100.0f * (1.25f * (2.0f - work->unk_C0)); if (var_f31 >= 10.0f) { if (var_f31 >= 70.0f) { @@ -1121,9 +1121,9 @@ void fn_1_74D4(omObjData *object) if (work->unk_14 == fn_1_10740(&sp1C)) { if (work->unk_68 == 0) { if (fn_1_11004(work->unk_14, work->unk_18) != 0) { - PSVECSubtract(&sp1C, &work->unk_128, &sp10); + VECSubtract(&sp1C, &work->unk_128, &sp10); sp10.y = 0.0f; - var_f31 = PSVECMag(&sp10); + var_f31 = VECMag(&sp10); if (var_f31 >= 30.000002f) { if (var_f31 >= 70.0f) { var_f31 = 70.0f; @@ -1159,9 +1159,9 @@ void fn_1_74D4(omObjData *object) else { if (fn_1_10614(&sp1C) != 0) { if (work->unk_E8 != 0) { - PSVECSubtract(&work->unk_114, &sp1C, &sp10); + VECSubtract(&work->unk_114, &sp1C, &sp10); sp10.y = 0.0f; - var_f31 = PSVECMag(&sp10); + var_f31 = VECMag(&sp10); if (var_f31 < 0.05f) { work->unk_DC = 0.0f; work->unk_E0 = 0.0f; @@ -1219,12 +1219,12 @@ void fn_1_8408(omObjData *object) if ((work->unk_14 == fn_1_107B0(&sp14)) && (fn_1_108C4() >= 12.0f)) { if (((var_r30->unk_6C == 0) && (work->unk_6C == 0)) || (fn_1_108C4() < 0x3E8)) { if ((work->unk_30 == 0) || (var_r30->unk_30 == 0)) { - PSVECSubtract(&sp14, &work->unk_128, &sp8); + VECSubtract(&sp14, &work->unk_128, &sp8); sp8.y = 0.0f; - var_f31 = PSVECMag(&sp8) - (100.0f * (2.0f * work->unk_C0)); - PSVECSubtract(&sp14, &var_r30->unk_128, &sp8); + var_f31 = VECMag(&sp8) - (100.0f * (2.0f * work->unk_C0)); + VECSubtract(&sp14, &var_r30->unk_128, &sp8); sp8.y = 0.0f; - var_f30 = PSVECMag(&sp8) - (100.0f * (2.0f * var_r30->unk_C0)); + var_f30 = VECMag(&sp8) - (100.0f * (2.0f * var_r30->unk_C0)); if ((work->unk_30 != 0) || (work->unk_60 != 0)) { var_f31 = 2000.0f; } @@ -1333,10 +1333,10 @@ s32 fn_1_8938(u32 var_r27, Vec *var_r29) for (var_r30 = 0; var_r30 <= 0xA; var_r30++) { sp14.x = 230.0f; for (var_r31 = 0; var_r31 <= 0xA; var_r31++) { - PSVECSubtract(&sp14, &sp2C[0], &sp20); - var_f31 = PSVECMag(&sp20); - PSVECSubtract(&sp14, &sp2C[1], &sp20); - var_f31 *= PSVECMag(&sp20); + VECSubtract(&sp14, &sp2C[0], &sp20); + var_f31 = VECMag(&sp20); + VECSubtract(&sp14, &sp2C[1], &sp20); + var_f31 *= VECMag(&sp20); if (var_f31 > var_f30) { var_f30 = var_f31; sp8 = sp14; @@ -1415,7 +1415,7 @@ void fn_1_8BD0(omObjData *object) } if ((var_r29 != 0) && (work->unk_24 == 0.0f)) { fn_1_10B20(0.0f, &sp14); - PSVECSubtract(&sp14, &work->unk_128, &sp8); + VECSubtract(&sp14, &work->unk_128, &sp8); work->unk_A8 = atan2d(sp8.x, sp8.z); work->unk_AC = 0.1f; work->unk_B0 = 0.0f; @@ -1569,9 +1569,9 @@ void fn_1_9688(omObjData *object) work->unk_140 = sp2C; var_f31 = fn_1_10848(); if ((var_f31 <= 0.8f) && (var_f31 >= 0.02f) && (var_r29->unk_64 == 0)) { - PSVECSubtract(&sp2C, &work->unk_128, &sp20); + VECSubtract(&sp2C, &work->unk_128, &sp20); sp20.y = 0.0f; - var_f30 = PSVECMag(&sp20); + var_f30 = VECMag(&sp20); work->unk_98 = var_f30; if (var_f30 <= 200.0f) { if ((var_f31 >= 0.2f) && (var_f30 <= 70.0f) && (var_f31 >= (0.2f + (0.001f * var_f30))) && (fn_1_10FDC() >= 1)) { @@ -1626,7 +1626,7 @@ void fn_1_9688(omObjData *object) } work->unk_90 = 60.0f * var_f31; } - PSVECSubtract(&sp2C, &work->unk_128, &sp20); + VECSubtract(&sp2C, &work->unk_128, &sp20); work->unk_A8 = atan2d(sp20.x, sp20.z); work->unk_AC = 0.2f; work->unk_B0 = 0.0f; @@ -1664,7 +1664,7 @@ void fn_1_9688(omObjData *object) } work->unk_64 = 0; fn_1_B4D4(object, 9); - PSVECSubtract(&sp2C, &work->unk_128, &sp20); + VECSubtract(&sp2C, &work->unk_128, &sp20); work->unk_A8 = atan2d(sp20.x, sp20.z); work->unk_AC = 0.1f; work->unk_90 = 0x186A0; @@ -1727,7 +1727,7 @@ void fn_1_9688(omObjData *object) } work->unk_64 = 0; fn_1_B4D4(object, 6); - PSVECSubtract(&sp2C, &work->unk_128, &sp20); + VECSubtract(&sp2C, &work->unk_128, &sp20); work->unk_A8 = atan2d(sp20.x, sp20.z); work->unk_AC = 0.1f; work->unk_90 = 0x186A0; @@ -1756,7 +1756,7 @@ void fn_1_9688(omObjData *object) if (work->unk_64 != 0) { sp2C = work->unk_128; sp2C.y = 11.0f; - PSVECSubtract(&var_r29->unk_128, &work->unk_128, &sp20); + VECSubtract(&var_r29->unk_128, &work->unk_128, &sp20); var_f29 = 180.0 + (atan2d(sp20.x, sp20.z)); var_f29 += frandmod(0xB4) - 90.0f; var_f30 = 200.0f * work->unk_98; @@ -1817,14 +1817,14 @@ void fn_1_A618(omObjData *object) case 0: if ((work->unk_7C == 0) && (work->unk_78 == 0) && (work->unk_80 == 0) && (work->unk_30 = 0, work->unk_68 = 0, ((work->unk_34 == 0) != 0)) && (fn_1_11004(work->unk_14, work->unk_18) != 0) && (fn_1_10FDC() < 3) && (work->unk_14 == fn_1_10740(&sp20))) { - PSVECSubtract(&sp20, &work->unk_128, &sp14); + VECSubtract(&sp20, &work->unk_128, &sp14); sp14.y = 0.0f; - if (!(PSVECMag(&sp14) > 500.0f)) { + if (!(VECMag(&sp14) > 500.0f)) { fn_1_10B20(0.5f, &sp20); sp20.y -= lbl_1_data_E0[work->unk_00]; - PSVECSubtract(&sp20, &work->unk_128, &sp14); + VECSubtract(&sp20, &work->unk_128, &sp14); sp14.y = 0.0f; - if ((PSVECMag(&sp14) < 200.0f) && (sp20.y >= 50.0f)) { + if ((VECMag(&sp14) < 200.0f) && (sp20.y >= 50.0f)) { work->unk_5C = 1; } if (((work->unk_1C & 0x200) != 0) && (work->unk_5C != 0)) { @@ -1837,7 +1837,7 @@ void fn_1_A618(omObjData *object) var_f30 = 0.5f; work->unk_124 = (2.0f * -sp20.y) / (var_f30 * var_f30); work->unk_134.y = 0.016666668f * (-work->unk_124 * var_f30); - PSVECSubtract(&sp20, &work->unk_128, &sp14); + VECSubtract(&sp20, &work->unk_128, &sp14); sp14.y = 0.0f; work->unk_134.x = 0.016666668f * (sp14.x / 0.5f); work->unk_134.z = 0.016666668f * (sp14.z / 0.5f); @@ -1967,8 +1967,8 @@ void fn_1_AB88(omObjData *object) fn_1_10B20(0.0f, &sp1C); if ((sp1C.x * work->unk_128.x) > 0.0f) { sp1C.y = work->unk_128.y; - PSVECSubtract(&sp1C, &work->unk_128, &sp10); - if (PSVECMag(&sp10) < 60.000004f) { + VECSubtract(&sp1C, &work->unk_128, &sp10); + if (VECMag(&sp10) < 60.000004f) { if (frandmod(0x64) < 0x1E) { fn_1_10740(&sp1C); sp1C.x *= -0.5f; @@ -2016,9 +2016,9 @@ void fn_1_B194(omObjData *object) for (var_r28 = 0; var_r28 < 4; var_r28++) { if (var_r29 != var_r28) { var_r30 = lbl_1_bss_7D0[var_r28]->data; - PSVECSubtract(&var_r31->unk_128, &var_r30->unk_128, &sp8); + VECSubtract(&var_r31->unk_128, &var_r30->unk_128, &sp8); sp8.y = 0.0f; - var_f31 = PSVECMag(&sp8); + var_f31 = VECMag(&sp8); if (var_f31 < (var_r31->unk_120 + var_r30->unk_120)) { if (var_f31 > 0.0f) { var_f31 = 0.5f * ((var_r31->unk_120 + var_r30->unk_120) - var_f31); @@ -2028,10 +2028,10 @@ void fn_1_B194(omObjData *object) sp8.x = frandmod(0x3E8) - 0x1F4; sp8.z = frandmod(0x3E8) - 0x1F4; } - PSVECNormalize(&sp8, &sp8); - PSVECScale(&sp8, &sp8, var_f31); - PSVECAdd(&var_r31->unk_128, &sp8, &var_r31->unk_128); - PSVECSubtract(&var_r30->unk_128, &sp8, &var_r30->unk_128); + VECNormalize(&sp8, &sp8); + VECScale(&sp8, &sp8, var_f31); + VECAdd(&var_r31->unk_128, &sp8, &var_r31->unk_128); + VECSubtract(&var_r30->unk_128, &sp8, &var_r30->unk_128); } } } @@ -2199,7 +2199,7 @@ void fn_1_BD48(omObjData *object) work->unk_B8 = 0.0f; work->unk_BC.x = work->unk_BC.y = 0.0f; work->unk_BC.z = 1.0f; - PSMTXIdentity(work->unk_C8); + MTXIdentity(work->unk_C8); work->unk_18 = 0; object->func = fn_1_C240; } @@ -2219,7 +2219,7 @@ void fn_1_C240(omObjData *object) work->unk_B8 = 0.0f; work->unk_BC.x = work->unk_BC.y = 0.0f; work->unk_BC.z = 1.0f; - PSMTXIdentity(work->unk_C8); + MTXIdentity(work->unk_C8); work->unk_00 = 1; break; case 10: @@ -2296,14 +2296,14 @@ s32 fn_1_C6B0(omObjData *object) fn_1_D338(&work->unk_F8); fn_1_D180(&work->unk_F8); work->unk_B8 = work->unk_A8 * (8.0f * lbl_1_data_48C[work->unk_6C]); - PSVECSubtract(&work->unk_3C, &work->unk_30, &sp8); + VECSubtract(&work->unk_3C, &work->unk_30, &sp8); sp8.y = 0.0f; - if (PSVECMag(&sp8) <= 0.0f) { + if (VECMag(&sp8) <= 0.0f) { work->unk_BC.x = work->unk_BC.y = 0.0f; work->unk_BC.z = 1.0f; } else { - PSVECNormalize(&sp8, &sp8); + VECNormalize(&sp8, &sp8); work->unk_BC.x = -sp8.z; work->unk_BC.y = 0.0f; work->unk_BC.z = sp8.x; @@ -2324,9 +2324,9 @@ s32 fn_1_C6B0(omObjData *object) } work->unk_10 = 1; if (work->unk_B8 != 0.0f) { - PSMTXRotAxisRad(sp14, &work->unk_BC, 0.017453292f * work->unk_B8); - PSMTXConcat(sp14, work->unk_C8, work->unk_C8); - PSMTXCopy(work->unk_C8, Hu3DData[object->model[0]].unk_F0); + MTXRotAxisRad(sp14, &work->unk_BC, 0.017453292f * work->unk_B8); + MTXConcat(sp14, work->unk_C8, work->unk_C8); + MTXCopy(work->unk_C8, Hu3DData[object->model[0]].unk_F0); } work->unk_48 += 0.016666668f; work->unk_08 = fn_1_D4E0(&work->unk_F8, &work->unk_30, &work->unk_4C, work->unk_48); @@ -2389,15 +2389,15 @@ void fn_1_CB98(omObjData *object) var_f31 = 0.0f; } var_f31 = (var_f30 - var_f31) / 21.0f; - PSMTXCopy(work->unk_C8, sp20); + MTXCopy(work->unk_C8, sp20); var_f28 = (work->unk_B8 * (1.2f * work->unk_A8)) / 21.0f; - PSMTXRotAxisRad(sp50, &work->unk_BC, MTXDegToRad(-var_f28)); + MTXRotAxisRad(sp50, &work->unk_BC, MTXDegToRad(-var_f28)); for (var_r29 = 0; var_r29 < 0x15; var_r29++) { Hu3DModelAttrReset(object->model[var_r29 + 9], HU3D_ATTR_DISPOFF); fn_1_D4E0(&work->unk_F8, &sp14, &sp8, var_f30); Hu3DModelPosSetV(object->model[var_r29 + 9], &sp14); - PSMTXCopy(sp20, Hu3DData[object->model[var_r29 + 9]].unk_F0); - PSMTXConcat(sp50, sp20, sp20); + MTXCopy(sp20, Hu3DData[object->model[var_r29 + 9]].unk_F0); + MTXConcat(sp50, sp20, sp20); var_f30 -= var_f31; } work->unk_F8.unk_04 = var_f29; @@ -2430,19 +2430,19 @@ void fn_1_CDB8(M433PlayerWork2Sub *arg0, Vec *arg1, Vec *arg2, u32 arg3, float a spC.x = arg1->x + (arg0->unk_08 * (arg2->x - arg1->x)); spC.y = arg0->unk_0C; spC.z = arg1->z + (arg0->unk_08 * (arg2->z - arg1->z)); - PSVECSubtract(arg2, &spC, &sp18); - var_f30 = PSVECMag(&sp18); - PSVECSubtract(&spC, arg1, &sp18); - var_f30 += PSVECMag(&sp18); + VECSubtract(arg2, &spC, &sp18); + var_f30 = VECMag(&sp18); + VECSubtract(&spC, arg1, &sp18); + var_f30 += VECMag(&sp18); } else { - PSVECSubtract(arg2, arg1, &sp18); - var_f30 = PSVECMag(&sp18); + VECSubtract(arg2, arg1, &sp18); + var_f30 = VECMag(&sp18); } } else { - PSVECSubtract(arg2, arg1, &sp18); - var_f30 = PSVECMag(&sp18); + VECSubtract(arg2, arg1, &sp18); + var_f30 = VECMag(&sp18); } var_f31 = var_f30 / (arg8 * lbl_1_data_4D4[arg3].z); arg0->unk_00 = var_f31; @@ -2452,9 +2452,9 @@ void fn_1_CDB8(M433PlayerWork2Sub *arg0, Vec *arg1, Vec *arg2, u32 arg3, float a arg0->unk_38 = *arg2; arg0->unk_1C = arg2->y - arg1->y; arg0->unk_24 = -980.0f; - PSVECSubtract(arg2, arg1, &sp18); + VECSubtract(arg2, arg1, &sp18); sp18.y = 0.0f; - arg0->unk_10 = PSVECMag(&sp18); + arg0->unk_10 = VECMag(&sp18); arg0->unk_18 = 0.0f; if (var_f31 > 0.0f) { arg0->unk_20 = (arg0->unk_1C - (0.5f * (-980.0f * (var_f31 * var_f31)))) / var_f31; @@ -2555,9 +2555,9 @@ s32 fn_1_D4E0(M433PlayerWork2Sub *arg0, Vec *arg1, Vec *arg2, float arg8) } arg0->unk_04 = arg8; if (arg0->unk_10 > 0.0f) { - PSVECSubtract(&arg0->unk_38, &arg0->unk_2C, &spC); + VECSubtract(&arg0->unk_38, &arg0->unk_2C, &spC); spC.y = 0.0f; - PSVECNormalize(&spC, &spC); + VECNormalize(&spC, &spC); } else { spC.x = spC.y = spC.z = 0.0f; @@ -2568,7 +2568,7 @@ s32 fn_1_D4E0(M433PlayerWork2Sub *arg0, Vec *arg1, Vec *arg2, float arg8) arg1->x = arg0->unk_2C.x + (spC.x * var_f30); arg1->y = arg0->unk_2C.y + var_f29; arg1->z = arg0->unk_2C.z + (spC.z * var_f30); - PSVECSubtract(arg1, &sp18, arg2); + VECSubtract(arg1, &sp18, arg2); if (arg8 >= arg0->unk_00) { return 1; } @@ -2582,7 +2582,7 @@ void fn_1_D6A8(ModelData *model, ParticleData *particle, Mtx matrix) for (var_r31 = particle->unk_48, var_r29 = 0; var_r29 < particle->unk_30; var_r29++, var_r31++) { if (var_r31->unk00_s16 != 0) { - PSVECAdd(&var_r31->unk34, &var_r31->unk08, &var_r31->unk34); + VECAdd(&var_r31->unk34, &var_r31->unk08, &var_r31->unk34); var_r31->unk08.x *= 0.92f; var_r31->unk08.z *= 0.92f; var_r31->unk08.y += -0.27222225f; @@ -3421,9 +3421,9 @@ float fn_1_10B20(float arg8, Vec *arg0) } var_r31->unk_04 = var_f31; if (var_r31->unk_10 > 0.0f) { - PSVECSubtract(&var_r31->unk_38, &var_r31->unk_2C, &sp14); + VECSubtract(&var_r31->unk_38, &var_r31->unk_2C, &sp14); sp14.y = 0.0f; - PSVECNormalize(&sp14, &sp14); + VECNormalize(&sp14, &sp14); } else { sp14.x = sp14.y = sp14.z = 0.0f; @@ -3434,7 +3434,7 @@ float fn_1_10B20(float arg8, Vec *arg0) arg0->x = var_r31->unk_2C.x + (sp14.x * var_f29); arg0->y = var_r31->unk_2C.y + var_f28; arg0->z = var_r31->unk_2C.z + (sp14.z * var_f29); - PSVECSubtract(arg0, &sp8, &sp20); + VECSubtract(arg0, &sp8, &sp20); var_f31 >= var_r31->unk_00; var_r31->unk_04 = var_f30; return var_f30 + arg8; @@ -3462,7 +3462,7 @@ s32 fn_1_10D24(Vec *sp8) var_r31 = lbl_1_bss_7CC->data; fn_1_10D24_inline(&spC); - PSVECSubtract(&spC, &var_r31->unk_30, &sp18); + VECSubtract(&spC, &var_r31->unk_30, &sp18); if ((spC.x * var_r31->unk_30.x) >= 0.0f) { return 0; } @@ -3470,8 +3470,8 @@ s32 fn_1_10D24(Vec *sp8) return 0; } var_f31 = fabs(var_r31->unk_30.x / sp18.x); - PSVECScale(&sp18, &sp18, var_f31); - PSVECAdd(&var_r31->unk_30, &sp18, sp8); + VECScale(&sp18, &sp18, var_f31); + VECAdd(&var_r31->unk_30, &sp18, sp8); return 1; } @@ -3535,9 +3535,9 @@ float fn_1_11098(Vec *arg0, Vec *arg1, Vec *arg2) float var_f31; float var_f30; - PSVECSubtract(arg1, arg0, &sp10); - var_f31 = PSVECDotProduct(&sp10, arg2); - var_f30 = -PSVECSquareMag(arg2); + VECSubtract(arg1, arg0, &sp10); + var_f31 = VECDotProduct(&sp10, arg2); + var_f30 = -VECSquareMag(arg2); if (var_f30 != 0.0f) { var_f31 /= var_f30; } @@ -3555,16 +3555,16 @@ float fn_1_11130(Vec *arg0, Vec *arg1, Vec *arg2, Vec *arg3) float var_f29; float var_f28; - PSVECSubtract(arg1, arg0, &sp28); - PSVECSubtract(arg3, arg2, &sp1C); - PSVECSubtract(&sp28, &sp1C, &sp28); - if (PSVECMag(&sp28) <= 0.0f) { + VECSubtract(arg1, arg0, &sp28); + VECSubtract(arg3, arg2, &sp1C); + VECSubtract(&sp28, &sp1C, &sp28); + if (VECMag(&sp28) <= 0.0f) { sp34 = *arg0; } else { - PSVECSubtract(arg0, arg2, &sp10); - var_f30 = PSVECDotProduct(&sp10, &sp28); - var_f29 = -PSVECSquareMag(&sp28); + VECSubtract(arg0, arg2, &sp10); + var_f30 = VECDotProduct(&sp10, &sp28); + var_f29 = -VECSquareMag(&sp28); if (var_f29 != 0.0f) { var_f30 /= var_f29; } @@ -3576,9 +3576,9 @@ float fn_1_11130(Vec *arg0, Vec *arg1, Vec *arg2, Vec *arg3) else if (var_f31 > 1.0f) { var_f31 = 1.0f; } - PSVECScale(&sp28, &sp1C, var_f31); - PSVECAdd(arg0, &sp1C, &sp34); + VECScale(&sp28, &sp1C, var_f31); + VECAdd(arg0, &sp1C, &sp34); } - PSVECSubtract(arg2, &sp34, &sp28); - return PSVECMag(&sp28); + VECSubtract(arg2, &sp34, &sp28); + return VECMag(&sp28); } diff --git a/src/REL/m438Dll/main.c b/src/REL/m438Dll/main.c index cb329774..b8d481ff 100644 --- a/src/REL/m438Dll/main.c +++ b/src/REL/m438Dll/main.c @@ -158,7 +158,7 @@ typedef struct M438UnkStruct { s8 unk_55; s8 unk_56; u8 unk_57; - M438UnkSubStruct* unk_58; + M438UnkSubStruct *unk_58; u8 unk_5C; char unk5D[0x3]; Vec unk_60; @@ -175,7 +175,7 @@ typedef struct M438UnkStruct2 { Vec unk_0C; char unk18[0xC]; Vec unk_24; - void (*unk_30)(struct M438UnkStruct2*); + void (*unk_30)(struct M438UnkStruct2 *); char unk34[8]; M438UnkStruct *unk_3C; char unk40[0x20]; @@ -575,88 +575,51 @@ void fn_1_1174(omObjData *object) } } -Vec lbl_1_data_68[11][8] = { - { - { -528.6f, 0.0f, 350.7f }, - { -375.7f, 0.0f, 243.0f }, - { -214.2f, 0.0f, 331.4f }, - { -173.3f, 0.0f, 523.7f }, - { 15.000001f, 0.0f, 505.7f }, - { 148.59999f, 0.0f, 393.0f }, - { 0.0f, 1.0f, 0.0f }, - }, +Vec lbl_1_data_68[11][8] = { { + { -528.6f, 0.0f, 350.7f }, + { -375.7f, 0.0f, 243.0f }, + { -214.2f, 0.0f, 331.4f }, + { -173.3f, 0.0f, 523.7f }, + { 15.000001f, 0.0f, 505.7f }, + { 148.59999f, 0.0f, 393.0f }, + { 0.0f, 1.0f, 0.0f }, + }, { { -198.7f, 0.0f, -122.899994f }, - { -11.599999f, 0.0f, -177.1f }, - { 63.4f, 0.0f, -349.7f }, - { 277.09999f, 0.0f, -296.4f }, - { 397.5f, 0.0f, -470.2f }, - { 0.0f, 1.0f, 0.0f }, + { -11.599999f, 0.0f, -177.1f }, + { 63.4f, 0.0f, -349.7f }, + { 277.09999f, 0.0f, -296.4f }, + { 397.5f, 0.0f, -470.2f }, + { 0.0f, 1.0f, 0.0f }, }, { { -421.0f, 0.0f, -471.3f }, { -270.1f, 0.0f, -460.0f }, { -153.1f, 0.0f, -356.5f }, - { 12.4f, 0.0f, -473.99997f }, - { 0.0f, 1.0f, 0.0f }, + { 12.4f, 0.0f, -473.99997f }, + { 0.0f, 1.0f, 0.0f }, }, { - { -545.10004f, 0.0f, -318.9f }, + { -545.10004f, 0.0f, -318.9f }, { -469.0f, 0.0f, -154.1f }, - { -313.4, 0.0f, -170.09999f }, + { -313.4, 0.0f, -170.09999f }, { -250.0f, 0.0f, -32.8f }, - { 0.0f, 1.0f, 0.0f }, - }, - { - { -155.6f, 0.0f, 19.5f }, - { -34.3f, 0.0f, 96.6f }, - { -63.9f, 0.0f, 240.00002f }, - { 37.5f, 0.0f, 402.8f }, - { 0.0f, 1.0f, 0.0f } - }, - { - { 207.5f, 0.0f, -163.2f }, - { 270.1f, 0.0f, -104.799995f }, - { 402.19998f, 0.0f, -102.4f }, - { 511.49997f, 0.0f, -25.099998f }, - { 627.3f, 0.0f, -142.0f }, - { 0.0f, 1.0f, 0.0f } + { 0.0f, 1.0f, 0.0f }, }, + { { -155.6f, 0.0f, 19.5f }, { -34.3f, 0.0f, 96.6f }, { -63.9f, 0.0f, 240.00002f }, { 37.5f, 0.0f, 402.8f }, { 0.0f, 1.0f, 0.0f } }, + { { 207.5f, 0.0f, -163.2f }, { 270.1f, 0.0f, -104.799995f }, { 402.19998f, 0.0f, -102.4f }, { 511.49997f, 0.0f, -25.099998f }, + { 627.3f, 0.0f, -142.0f }, { 0.0f, 1.0f, 0.0f } }, { { -601.0f, 0.0f, 97.799995f }, - { -516.80005f, 0.0f, 60.000004f }, + { -516.80005f, 0.0f, 60.000004f }, { -417.7f, 0.0f, 92.9f }, - { -309.40002f, 0.0f, 76.1f }, - { 0.0f, 1.0f, 0.0f }, + { -309.40002f, 0.0f, 76.1f }, + { 0.0f, 1.0f, 0.0f }, }, - { - { 82.8f, 0.0f, 164.2f }, - { 179.40001f, 0.0f, 179.8f }, - { 241.00002f, 0.0f, 87.1f }, - { 323.0f, 0.0f, 38.800003f }, - { 0.0f, 1.0f, 0.0f } - }, - { - { 243.4f, 0.0f, 573.5f }, - { 227.7f, 0.0f, 461.2f }, - { 319.30002f, 0.0f, 400.6f }, - { 342.30002f, 0.0f, 310.0f }, - { 0.0f, 1.0f, 0.0f } - }, - { - { 357.69998f, 0.0f, 146.8f }, - { 418.80002f, 0.0f, 225.0f }, - { 503.2f, 0.0f, 234.69998f }, - { 548.1f, 0.0f, 321.19998f }, - { 0.0f, 1.0f, 0.0f } - }, - { - { -100.0f, 0.0f, 0.0f }, - { 0.0f, 0.0f, -100.0f }, - { 100.0f, 0.0f, 0.0f }, - { 0.0f, 1.0f, 0.0f } - } -}; + { { 82.8f, 0.0f, 164.2f }, { 179.40001f, 0.0f, 179.8f }, { 241.00002f, 0.0f, 87.1f }, { 323.0f, 0.0f, 38.800003f }, { 0.0f, 1.0f, 0.0f } }, + { { 243.4f, 0.0f, 573.5f }, { 227.7f, 0.0f, 461.2f }, { 319.30002f, 0.0f, 400.6f }, { 342.30002f, 0.0f, 310.0f }, { 0.0f, 1.0f, 0.0f } }, + { { 357.69998f, 0.0f, 146.8f }, { 418.80002f, 0.0f, 225.0f }, { 503.2f, 0.0f, 234.69998f }, { 548.1f, 0.0f, 321.19998f }, { 0.0f, 1.0f, 0.0f } }, + { { -100.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, -100.0f }, { 100.0f, 0.0f, 0.0f }, { 0.0f, 1.0f, 0.0f } } }; void fn_1_1204(omObjData *object) { M438StructBss298 *var_r31; @@ -951,7 +914,8 @@ void fn_1_2070(omObjData *object) var_r31->unk_10.y = var_r31->unk_28.y + (var_f31 * (var_r31->unk_40.y - var_r31->unk_28.y)); var_r31->unk_10.z = var_r31->unk_28.z + (var_f31 * (var_r31->unk_40.z - var_r31->unk_28.z)); var_r31->unk_130 = var_r31->unk_134 + (var_f31 * (var_r31->unk_138 - var_r31->unk_134)); - } else { + } + else { fn_1_9420(2.0f * var_f31, (float *)&var_r31->unk_04, var_r31->unk_F4, (float(*)[3]) & var_r31->unk_64, var_r31->unk_88, 3); fn_1_9420(2.0f * var_f31, (float *)&var_r31->unk_10, var_r31->unk_100, (float(*)[3]) & var_r31->unk_AC, var_r31->unk_D0, 3); var_r31->unk_130 = fn_1_8EEC(2.0f * var_f31, var_r31->unk_124, var_r31->unk_10C, var_r31->unk_118, 3); @@ -1473,12 +1437,14 @@ void fn_1_35C0(omObjData *object) var_r31->unk_22 = var_r28; var_r31->unk_20 = var_r28; CharModelMotionShiftSet(var_r31->unk_01, object->motion[8], 0.0f, 8.0f, var_r27); - } else { + } + else { switch (var_r28) { case 0: case 1: case 2: - if (var_r31->unk_20 != 0 && CharModelMotionShiftIDGet(var_r31->unk_01) >= 0) break; + if (var_r31->unk_20 != 0 && CharModelMotionShiftIDGet(var_r31->unk_01) >= 0) + break; default: var_r31->unk_22 = var_r28; var_r31->unk_20 = var_r28; @@ -1590,7 +1556,6 @@ void fn_1_4724(omObjData *object) object->func = fn_1_4984; } - void fn_1_4984(omObjData *object) { Vec sp8; @@ -1645,7 +1610,7 @@ void fn_1_4984(omObjData *object) } lbl_1_bss_4 = fn_1_10258(0x3C, 1); fn_1_11018(lbl_1_bss_4, 0, 0x45000F); - lbl_1_bss_DE4.unk_40[lbl_1_bss_4].unk_30 = fn_1_5D4C; + lbl_1_bss_DE4.unk_40[lbl_1_bss_4].unk_30 = fn_1_5D4C; fn_1_11890(lbl_1_bss_4, var_r31->unk_10.x, 50.0f + var_r31->unk_10.y, var_r31->unk_10.z); fn_1_124CC(lbl_1_bss_4, 1); lbl_1_bss_8++; @@ -1708,7 +1673,7 @@ void fn_1_4F50(omObjData *object) var_r31->unk_00++; case 1: var_r31->unk_34 = var_r31->unk_10; - + for (var_r28 = 0, var_r26 = 0; var_r28 < 4; var_r28++) { var_r29 = lbl_1_bss_DC4[var_r28]->data; if ((var_r29->unk_07 != 0) && ((var_r29->unk_07 & 2) == 0)) { @@ -1723,17 +1688,20 @@ void fn_1_4F50(omObjData *object) if (var_r31->unk_1C.y <= -180.0f) { var_r31->unk_1C.y += 360.0f; } - + for (var_r28 = 0; var_r28 < var_r26; var_r28++) { var_f31 = fn_1_E5A4(sp8[var_r28], object->rot.y); if (var_f31 < 0.0f) { var_f27 = -var_f31; - } else { + } + else { var_f27 = var_f31; } - if (var_f27 > (20.0f + object->work[1])) continue; + if (var_f27 > (20.0f + object->work[1])) + continue; object->work[0]--; - if (object->work[0] != 0 && ((fn_1_7DB4() & 0xF) != 0)) continue; + if (object->work[0] != 0 && ((fn_1_7DB4() & 0xF) != 0)) + continue; var_r31->unk_04.y = sp8[var_r28]; var_r31->unk_1C.y = sp8[var_r28]; var_r31->unk_28.y = 16.333334f; @@ -1781,7 +1749,8 @@ void fn_1_4F50(omObjData *object) sp18 = var_r31->unk_10; sp18.y = 0.0f; var_f30 = VECMag(&sp18); - if (var_f30 <= 700.0f) break; + if (var_f30 <= 700.0f) + break; var_r31->unk_02 = 1; if (fn_1_DA64(atan2d(sp18.x, sp18.z)) != 0) { var_r31->unk_02 = 0x78; @@ -1804,7 +1773,8 @@ void fn_1_4F50(omObjData *object) case 4: var_r31->unk_28.y += -3.0625f; var_r31->unk_10.y += var_r31->unk_28.y; - if (var_r31->unk_10.y > 0.0f) break; + if (var_r31->unk_10.y > 0.0f) + break; var_r31->unk_10.y = 0.0f; var_r31->unk_34 = var_r31->unk_10; Hu3DModelAttrReset(object->model[0], HU3D_MOTATTR_LOOP); @@ -1848,7 +1818,8 @@ void fn_1_4F50(omObjData *object) var_r29 = lbl_1_bss_DC4[var_r28]->data; VECSubtract(&var_r29->unk_6C, &var_r31->unk_10, &sp18); var_f30 = VECMag(&sp18); - if (var_f30 >= 200.0f || var_r29->unk_20 == 7) continue; + if (var_f30 >= 200.0f || var_r29->unk_20 == 7) + continue; omVibrate(var_r29->unk_00, 0xC, 4, 2); var_r29->unk_07 |= 2; var_r29->unk_0D = 0; @@ -1860,7 +1831,8 @@ void fn_1_4F50(omObjData *object) if (fabs(fn_1_E5A4(var_r29->unk_28, var_r29->unk_7C)) > 90.0) { var_r29->unk_7C = 180.0f + var_r29->unk_28; var_r29->unk_14 = 0; - } else { + } + else { var_r29->unk_7C = var_r29->unk_28; var_r29->unk_14 = 1; } @@ -1875,7 +1847,8 @@ void fn_1_4F50(omObjData *object) omSetRot(object, var_r31->unk_1C.x, var_r31->unk_1C.y, var_r31->unk_1C.z); } -void fn_1_5D4C(M438UnkStruct2 *arg0) { +void fn_1_5D4C(M438UnkStruct2 *arg0) +{ s16 sp8; f32 temp_f31; f32 temp_f30; @@ -1883,13 +1856,13 @@ void fn_1_5D4C(M438UnkStruct2 *arg0) { f32 temp_f28; f32 temp_f27; s32 var_r29; - M438UnkStruct* var_r31; + M438UnkStruct *var_r31; sp8 = 0; - switch (arg0->unk_60) { /* irregular */ + switch (arg0->unk_60) { /* irregular */ case 0: temp_f27 = 360.0f / arg0->unk_02; - + var_r31 = &arg0->unk_3C[0]; for (var_r29 = 0; var_r29 < arg0->unk_02; var_r29++, var_r31++) { var_r31->unk_6C.x = sind(temp_f27 * var_r29) * (0.8f + (0.1f * (2.0f * ((1.0f / 32768.0f) * (fn_1_7DB4() - 0x8000))))); @@ -1909,7 +1882,7 @@ void fn_1_5D4C(M438UnkStruct2 *arg0) { arg0->unk_7C--; temp_f31 = (48.0f - arg0->unk_7C) / 48.0f; temp_f28 = arg0->unk_7C / 48.0f; - + var_r31 = arg0->unk_3C; for (var_r29 = 0; var_r29 < arg0->unk_02; var_r29++, var_r31++) { var_r31->unk_00.x += 12.5f * temp_f28 * var_r31->unk_6C.x; @@ -1935,7 +1908,7 @@ void fn_1_62BC(M438UnkStruct2 *arg0) s16 sp8; M438UnkStruct *var_r31; - + sp8 = 0; switch (arg0->unk_60) { case 0: @@ -1957,9 +1930,10 @@ void fn_1_62BC(M438UnkStruct2 *arg0) } } -void fn_1_63B0(M438UnkStruct2* arg0) { +void fn_1_63B0(M438UnkStruct2 *arg0) +{ Vec sp8; - M438UnkStruct* var_r31; + M438UnkStruct *var_r31; f32 var_f31; f32 temp_f30; f32 var_f29; @@ -1970,10 +1944,8 @@ void fn_1_63B0(M438UnkStruct2* arg0) { for (var_r29 = 0; var_r29 < arg0->unk_02; var_r29++, var_r31++) { switch (var_r31->unk_5C) { case 0: - var_f29 = atan2d(arg0->unk_80, arg0->unk_84) < 0 - ? -atan2d(arg0->unk_80, arg0->unk_84) - : atan2d(arg0->unk_80, arg0->unk_84); - + var_f29 = atan2d(arg0->unk_80, arg0->unk_84) < 0 ? -atan2d(arg0->unk_80, arg0->unk_84) : atan2d(arg0->unk_80, arg0->unk_84); + if (var_f29 > 90.0f) { var_f29 = 180.0f - var_f29; } @@ -1984,7 +1956,7 @@ void fn_1_63B0(M438UnkStruct2* arg0) { var_r31->unk_00.x = sp8.x; var_r31->unk_00.y = 0.0f; var_r31->unk_00.z = sp8.z; - + for (var_f31 = 0.0f, sp8.y = 0.0f; var_f31 < (arg0->unk_8C - 40.0f); var_f31 += sp8.y) { sp8.y += 0.8f; } @@ -2000,7 +1972,8 @@ void fn_1_63B0(M438UnkStruct2* arg0) { temp_f30 = 3.75f + (1.75f * ((1.0f / 65536.0f) * fn_1_7DB4())); var_r31->unk_60.x = (temp_f30 * (0.1f + ((0.9f * var_f29) / 90.0f))); var_r31->unk_60.y = var_r31->unk_60.z = temp_f30; - } else { + } + else { var_r31->unk_33 = 0; var_r31->unk_54 = 0; var_r31->unk_55 = 0; @@ -2044,9 +2017,10 @@ void fn_1_63B0(M438UnkStruct2* arg0) { } } -void fn_1_6A3C(M438UnkStruct2* arg0) { +void fn_1_6A3C(M438UnkStruct2 *arg0) +{ Vec sp8; - M438UnkStruct* var_r31; + M438UnkStruct *var_r31; f32 temp_f31; f32 temp_f30; f32 temp_f29; @@ -2056,7 +2030,7 @@ void fn_1_6A3C(M438UnkStruct2* arg0) { var_r31 = arg0->unk_3C; var_r28 = 0; - + for (var_r27 = 0; var_r27 < arg0->unk_02; var_r27++, var_r31++) { if ((arg0->unk_7C != 0) && (var_r31->unk_7A == 0)) { var_r31->unk_5C = 0; @@ -2077,7 +2051,8 @@ void fn_1_6A3C(M438UnkStruct2* arg0) { var_r31->unk_6C.z = 100.0f * (0.1f * sp8.z); var_r31->unk_78 = (s32)(24.0f * ((1.0f / 65536.0f) * fn_1_7DB4())) + 1; var_r31->unk_7A = 1; - } else { + } + else { temp_f30 = (180.0f * ((1.0f / 65536.0f) * fn_1_7DB4())) - 90.0f; temp_f29 = 125.0f * ((1.0f / 65536.0f) * fn_1_7DB4()); sp8.x = sind(temp_f30); @@ -2103,7 +2078,8 @@ void fn_1_6A3C(M438UnkStruct2* arg0) { var_r31->unk_18.x = temp_f31; var_r31->unk_18.y = temp_f31; var_r31->unk_18.z = temp_f31; - } else if (arg0->unk_7C != 0) { + } + else if (arg0->unk_7C != 0) { var_r31->unk_33 = 0; var_r31->unk_54 = 0; var_r31->unk_55 = 0; @@ -2113,10 +2089,11 @@ void fn_1_6A3C(M438UnkStruct2* arg0) { var_r31->unk_18.x = temp_f31; var_r31->unk_18.y = 1.5f * temp_f31; var_r31->unk_18.z = temp_f31; - } else { + } + else { var_r29 = fn_1_10258(8, 1); fn_1_11018(var_r29, 0, 0x45000A); - lbl_1_bss_DE4.unk_40[var_r29].unk_30 = (void (*)(M438UnkStruct2*)) fn_1_7300; + lbl_1_bss_DE4.unk_40[var_r29].unk_30 = (void (*)(M438UnkStruct2 *))fn_1_7300; fn_1_11890(var_r29, arg0->unk_0C.x + var_r31->unk_00.x, arg0->unk_0C.y + var_r31->unk_00.y, arg0->unk_0C.z + var_r31->unk_00.z); fn_1_12100(var_r29, 4); fn_1_124CC(var_r29, 1); @@ -2134,7 +2111,8 @@ void fn_1_6A3C(M438UnkStruct2* arg0) { var_r31->unk_58->unk_24 = 0x11; if (var_r31->unk_7A != 0) { var_r31->unk_58->unk_28 = 0.5f; - } else { + } + else { var_r31->unk_58->unk_28 = 0.5f; } var_r31->unk_58->unk_2C = 0.0f; @@ -2156,7 +2134,8 @@ void fn_1_6A3C(M438UnkStruct2* arg0) { if ((var_r31->unk_58->unk_24 & 8) != 0) { if (var_r31->unk_7A != 0) { var_r31->unk_5C = 3; - } else { + } + else { var_r31->unk_5C = 0; } } @@ -2171,9 +2150,10 @@ void fn_1_6A3C(M438UnkStruct2* arg0) { } } -void fn_1_7300(M438UnkStruct2* arg0) { +void fn_1_7300(M438UnkStruct2 *arg0) +{ Vec sp8; - M438UnkStruct* var_r31; + M438UnkStruct *var_r31; f32 temp_f29; f32 temp_f30; f32 temp_f31; @@ -2181,33 +2161,32 @@ void fn_1_7300(M438UnkStruct2* arg0) { s32 var_r29; var_r31 = arg0->unk_3C; - + switch (arg0->unk_60) { case 0: arg0->unk_24.x = arg0->unk_24.y = arg0->unk_24.z = temp_f31 = 0.01f; arg0->unk_7C = Hu3DModelCreateFile(0x45000B); arg0->unk_7E = (s32)(30.0f * ((1.0f / 65536.0f) * fn_1_7DB4())) + 30; - + for (var_r29 = 0; var_r29 < arg0->unk_02; var_r29++, var_r31++) { var_r31->unk_38 |= 4; } arg0->unk_60++; case 1: arg0->unk_24.z += 0.008f; - + arg0->unk_24.x = arg0->unk_24.y = arg0->unk_24.z; Hu3DModelPosSetV(arg0->unk_7C, &arg0->unk_0C); Hu3DModelScaleSetV(arg0->unk_7C, &arg0->unk_24); if (--arg0->unk_7E == 0) { Hu3DModelKill(arg0->unk_7C); arg0->unk_7C = 0; - + for (var_r29 = 0; var_r29 < arg0->unk_02; var_r29++, var_r31++) { var_r31->unk_5C = 1; } arg0->unk_80 = arg0->unk_24.x; - - + arg0->unk_24.x = arg0->unk_24.y = arg0->unk_24.z = 1.0f; arg0->unk_60++; } @@ -2215,7 +2194,7 @@ void fn_1_7300(M438UnkStruct2* arg0) { } var_r28 = 0; var_r31 = arg0->unk_3C; - + for (var_r29 = 0; var_r29 < arg0->unk_02; var_r29++, var_r31++) { switch (var_r31->unk_5C) { case 1: @@ -2450,32 +2429,36 @@ float fn_1_7EDC(float arg8, float arg9, float argA) arg8 = arg9 + (var_f31 * argA); if (arg8 > 180.0f) { arg8 -= 360.0f; - } else if (arg8 <= -180.0f) { + } + else if (arg8 <= -180.0f) { arg8 += 360.0f; } return arg8; } -void fn_1_8044(Mtx arg0, f32 arg8, f32 arg9, f32 argA) { +void fn_1_8044(Mtx arg0, f32 arg8, f32 arg9, f32 argA) +{ Mtx sp38; Mtx sp8; - + if (0.0f != argA) { - PSMTXRotRad(arg0, 0x5A, MTXDegToRad(argA)); - } else { - PSMTXIdentity(arg0); + MTXRotRad(arg0, 0x5A, MTXDegToRad(argA)); + } + else { + MTXIdentity(arg0); } if (0.0f != arg8) { - PSMTXRotRad(sp38, 0x58, MTXDegToRad(arg8)); - PSMTXConcat(sp38, arg0, arg0); + MTXRotRad(sp38, 0x58, MTXDegToRad(arg8)); + MTXConcat(sp38, arg0, arg0); } if (0.0f != arg9) { - PSMTXRotRad(sp8, 0x59, MTXDegToRad(arg9)); - PSMTXConcat(sp8, arg0, arg0); + MTXRotRad(sp8, 0x59, MTXDegToRad(arg9)); + MTXConcat(sp8, arg0, arg0); } } -void fn_1_8164(Mtx arg0, Vec* arg1) { +void fn_1_8164(Mtx arg0, Vec *arg1) +{ f32 temp_f29; f32 var_f28; @@ -2500,7 +2483,8 @@ void fn_1_8164(Mtx arg0, Vec* arg1) { } } -void fn_1_8500(Mtx arg0, Vec* arg1) { +void fn_1_8500(Mtx arg0, Vec *arg1) +{ f32 temp_f29; f32 var_f28; @@ -2511,7 +2495,8 @@ void fn_1_8500(Mtx arg0, Vec* arg1) { arg1->x = atan2d(temp_f29, var_f28); } -f32 fn_1_8750(f32 arg8, f32 arg9, f32 argA, f32 argB) { +f32 fn_1_8750(f32 arg8, f32 arg9, f32 argA, f32 argB) +{ f32 temp_f31; f32 var_f30; @@ -2520,22 +2505,25 @@ f32 fn_1_8750(f32 arg8, f32 arg9, f32 argA, f32 argB) { return var_f30; } -void fn_1_87C8(f32* arg0, f32* arg1, f32* arg2, f32* arg3, f32 arg8) { +void fn_1_87C8(f32 *arg0, f32 *arg1, f32 *arg2, f32 *arg3, f32 arg8) +{ s32 var_r31; - + for (var_r31 = 0; var_r31 < 3; var_r31++) { *arg3++ = fn_1_8750(arg8, *arg0++, *arg1++, *arg2++); } } -f32 fn_1_88E4(f32 arg8, f32 arg9, f32 argA, f32 argB) { +f32 fn_1_88E4(f32 arg8, f32 arg9, f32 argA, f32 argB) +{ f32 var_f31; var_f31 = 2.0 * ((arg8 - 1.0) * arg9 + (1.0 - (2.0 * arg8)) * argA + (arg8 * argB)); return var_f31; } -void fn_1_895C(f32* arg0, f32* arg1, f32* arg2, f32* arg3, f32 arg8) { +void fn_1_895C(f32 *arg0, f32 *arg1, f32 *arg2, f32 *arg3, f32 arg8) +{ f32 spC[3]; f32 var_f29; s32 var_r31; @@ -2672,7 +2660,6 @@ void fn_1_9040(float *arg0, Vec *arg1, float arg2[3][3], s32 arg3) } } - void fn_1_9420(float arg8, float *arg0, float *arg1, float arg2[3][3], float arg3[3][3], s32 arg4) { float sp48[16]; @@ -2692,7 +2679,8 @@ void fn_1_9420(float arg8, float *arg0, float *arg1, float arg2[3][3], float arg } } -f32 fn_1_9634(Vec* arg0) { +f32 fn_1_9634(Vec *arg0) +{ f32 var_f30; f32 var_f29; var_f30 = (arg0->x * arg0->x) + (arg0->y * arg0->y) + (arg0->z * arg0->z); @@ -2702,24 +2690,28 @@ f32 fn_1_9634(Vec* arg0) { arg0->x *= var_f29; arg0->y *= var_f29; arg0->z *= var_f29; - } else { + } + else { arg0->x = arg0->y = arg0->z = 0.0f; } return var_f30; } -f32 fn_1_97CC(Vec arg0, Vec arg1, Vec* arg2, f32 arg8) { +f32 fn_1_97CC(Vec arg0, Vec arg1, Vec *arg2, f32 arg8) +{ if (arg8 <= 0.0f) { arg2->x = arg0.x; arg2->y = arg0.y; arg2->z = arg0.z; arg8 = 0.0f; - } else if (arg8 >= 1.0f) { + } + else if (arg8 >= 1.0f) { arg2->x = (arg0.x + arg1.x); arg2->y = (arg0.y + arg1.y); arg2->z = (arg0.z + arg1.z); arg8 = 1.0f; - } else { + } + else { arg2->x = (arg0.x + (arg8 * arg1.x)); arg2->y = (arg0.y + (arg8 * arg1.y)); arg2->z = (arg0.z + (arg8 * arg1.z)); @@ -2727,7 +2719,8 @@ f32 fn_1_97CC(Vec arg0, Vec arg1, Vec* arg2, f32 arg8) { return arg8; } -f32 fn_1_98A4(Vec arg0, Vec arg1, Vec arg2) { +f32 fn_1_98A4(Vec arg0, Vec arg1, Vec arg2) +{ f32 temp_f30; f32 var_f31; @@ -2739,21 +2732,24 @@ f32 fn_1_98A4(Vec arg0, Vec arg1, Vec arg2) { return var_f31; } -f32 fn_1_9960(Vec* arg0, Vec* arg1, Vec* arg2) { +f32 fn_1_9960(Vec *arg0, Vec *arg1, Vec *arg2) +{ Vec sp44; f32 var_f31; f32 var_f30; f32 temp_f29; if (0.0f == ((arg2->z * arg2->z) + ((arg2->x * arg2->x) + (arg2->y * arg2->y)))) { - return ((arg0->z - arg1->z) * (arg0->z - arg1->z)) + (((arg0->x - arg1->x) * (arg0->x - arg1->x)) + ((arg0->y - arg1->y) * (arg0->y - arg1->y))); + return ((arg0->z - arg1->z) * (arg0->z - arg1->z)) + + (((arg0->x - arg1->x) * (arg0->x - arg1->x)) + ((arg0->y - arg1->y) * (arg0->y - arg1->y))); } var_f31 = fn_1_98A4(*arg0, *arg1, *arg2); fn_1_97CC(*arg1, *arg2, &sp44, var_f31); return ((arg0->z - sp44.z) * (arg0->z - sp44.z)) + (((arg0->x - sp44.x) * (arg0->x - sp44.x)) + ((arg0->y - sp44.y) * (arg0->y - sp44.y))); } -f32 fn_1_9C9C(Vec* arg0, Vec* arg1, Vec* arg2, Vec* arg3, Vec* arg4) { +f32 fn_1_9C9C(Vec *arg0, Vec *arg1, Vec *arg2, Vec *arg3, Vec *arg4) +{ f32 sp44; f32 sp40; f32 sp3C; @@ -2778,7 +2774,8 @@ f32 fn_1_9C9C(Vec* arg0, Vec* arg1, Vec* arg2, Vec* arg3, Vec* arg4) { f64 temp_f31_3; if (0.0f == ((arg2->z * arg2->z) + ((arg2->x * arg2->x) + (arg2->y * arg2->y)))) { - return ((arg0->z - arg1->z) * (arg0->z - arg1->z)) + (((arg0->x - arg1->x) * (arg0->x - arg1->x)) + ((arg0->y - arg1->y) * (arg0->y - arg1->y))); + return ((arg0->z - arg1->z) * (arg0->z - arg1->z)) + + (((arg0->x - arg1->x) * (arg0->x - arg1->x)) + ((arg0->y - arg1->y) * (arg0->y - arg1->y))); } var_f27 = fn_1_98A4(*arg0, *arg1, *arg2); fn_1_97CC(*arg1, *arg2, arg3, var_f27); @@ -2789,7 +2786,8 @@ f32 fn_1_9C9C(Vec* arg0, Vec* arg1, Vec* arg2, Vec* arg3, Vec* arg4) { return fn_1_9634(arg4); } -f32 fn_1_A14C(Vec* arg0, Vec* arg1, Vec* arg2, Vec* arg3) { +f32 fn_1_A14C(Vec *arg0, Vec *arg1, Vec *arg2, Vec *arg3) +{ f32 temp_f31; f32 var_f30; f32 var_f29; @@ -2809,14 +2807,17 @@ f32 fn_1_A14C(Vec* arg0, Vec* arg1, Vec* arg2, Vec* arg3) { if (var_f28 >= var_f27) { if (var_f28 >= var_f26) { var_r30 = 1; - } else { + } + else { var_r30 = 0x100; } var_r31 = var_r30; - } else { + } + else { if (var_f27 >= var_f26) { var_r29 = 0x10; - } else { + } + else { var_r29 = 0x100; } var_r31 = var_r29; @@ -2827,30 +2828,38 @@ f32 fn_1_A14C(Vec* arg0, Vec* arg1, Vec* arg2, Vec* arg3) { return var_f30; } var_f29 = ((arg3->z * (arg0->x - arg2->x)) - (arg3->x * (arg0->z - arg2->z))) / temp_f31; - } else if (0.0f == (temp_f31 = (arg3->y * arg1->x) - (arg3->x * arg1->y))) { + } + else if (0.0f == (temp_f31 = (arg3->y * arg1->x) - (arg3->x * arg1->y))) { return var_f30; - } else { + } + else { var_f29 = ((arg3->x * (arg0->y - arg2->y)) - (arg3->y * (arg0->x - arg2->x))) / temp_f31; } - } else if ((var_r31 & 0x30) != 0) { + } + else if ((var_r31 & 0x30) != 0) { if ((0.0f != arg1->x) || (0.0f != arg1->y)) { if (0.0f == (temp_f31 = (arg3->y * arg1->x) - (arg3->x * arg1->y))) { return var_f30; } var_f29 = ((arg3->x * (arg0->y - arg2->y)) - (arg3->y * (arg0->x - arg2->x))) / temp_f31; - } else if (0.0f == (temp_f31 = (arg3->z * arg1->y) - (arg3->y * arg1->z))) { + } + else if (0.0f == (temp_f31 = (arg3->z * arg1->y) - (arg3->y * arg1->z))) { return var_f30; - } else { + } + else { var_f29 = ((arg3->y * (arg0->z - arg2->z)) - (arg3->z * (arg0->y - arg2->y))) / temp_f31; } - } else if ((0.0f != arg1->x) || (0.0f != arg1->z)) { + } + else if ((0.0f != arg1->x) || (0.0f != arg1->z)) { if (0.0f == (temp_f31 = (arg3->x * arg1->z) - (arg3->z * arg1->x))) { return var_f30; } var_f29 = ((arg3->z * (arg0->x - arg2->x)) - (arg3->x * (arg0->z - arg2->z))) / temp_f31; - } else if (0.0f == (temp_f31 = (arg3->z * arg1->y) - (arg3->y * arg1->z))) { + } + else if (0.0f == (temp_f31 = (arg3->z * arg1->y) - (arg3->y * arg1->z))) { return var_f30; - } else { + } + else { var_f29 = ((arg3->y * (arg0->z - arg2->z)) - (arg3->z * (arg0->y - arg2->y))) / temp_f31; } return var_f29; @@ -2871,11 +2880,31 @@ void fn_1_A688(omObjData *object) { } Vec lbl_1_data_514 = { -850.0f, 0.0f, -850.0f }; s32 lbl_1_data_520[25] = { - -0x62, -0x61, -0x60, -0x5F, -0x5E, - -0x32, -0x31, -0x30, -0x2F, -0x2E, - -0x2, -0x1, 0x0, 0x1, 0x2, - 0x2E, 0x2F, 0x30, 0x31, 0x32, - 0x5E, 0x5F, 0x60, 0x61, 0x62, + -0x62, + -0x61, + -0x60, + -0x5F, + -0x5E, + -0x32, + -0x31, + -0x30, + -0x2F, + -0x2E, + -0x2, + -0x1, + 0x0, + 0x1, + 0x2, + 0x2E, + 0x2F, + 0x30, + 0x31, + 0x32, + 0x5E, + 0x5F, + 0x60, + 0x61, + 0x62, }; u32 lbl_1_data_584[25] = { @@ -2906,18 +2935,20 @@ u32 lbl_1_data_584[25] = { 0x50, }; -#define getData(v, off) &( &( *OM_GET_DATA_PTR(lbl_1_bss_DBC, M438UnkType) )[ (u32)(0.028235294f * (v.x - off)) ] )[ (u32)(0.028235294f * (v.z - off)) * 0x30 ] +#define getData(v, off) \ + &(&(*OM_GET_DATA_PTR(lbl_1_bss_DBC, M438UnkType))[(u32)(0.028235294f * (v.x - off))])[(u32)(0.028235294f * (v.z - off)) * 0x30] -void fn_1_A68C(ModelData* model, Mtx matrix) { +void fn_1_A68C(ModelData *model, Mtx matrix) +{ Vec sp14; Vec sp8; - M438StructBss298* var_r30; + M438StructBss298 *var_r30; f32 var_f31; - omObjData* temp_r27; + omObjData *temp_r27; s32 var_r28; s32 var_r29; - u8* temp_r26; - u8* var_r25; + u8 *temp_r26; + u8 *var_r25; M438MainWork *temp_r31; if ((u8)omPauseChk() == 0) { @@ -2929,9 +2960,9 @@ void fn_1_A68C(ModelData* model, Mtx matrix) { var_f31 = 0.0f; for (var_f31 = 0.0f; var_f31 < (35.416668f + var_r30->unk_14); var_f31 += 35.416668f) { - PSVECScale(&var_r30->unk_24, &sp8, var_f31); - PSVECAdd(&var_r30->unk_18, &sp8, &sp14); - PSVECSubtract(&sp14, &lbl_1_data_514, &sp14); + VECScale(&var_r30->unk_24, &sp8, var_f31); + VECAdd(&var_r30->unk_18, &sp8, &sp14); + VECSubtract(&sp14, &lbl_1_data_514, &sp14); // @todo make this look nicer // var_r25 = getData(sp14, 0); @@ -2946,12 +2977,12 @@ void fn_1_A68C(ModelData* model, Mtx matrix) { } } for (var_r29 = 0; var_r29 < 4; var_r29++) { - if ((omObjData* ) lbl_1_bss_DC4[var_r29]) { + if ((omObjData *)lbl_1_bss_DC4[var_r29]) { temp_r27 = lbl_1_bss_DC4[var_r29]; temp_r31 = temp_r27->data; if ((temp_r31) && (temp_r31->unk_68 != 0)) { temp_r31->unk_68 = 0; - PSVECAdd(&temp_r31->unk_6C, &temp_r31->unk_4C, &sp14); + VECAdd(&temp_r31->unk_6C, &temp_r31->unk_4C, &sp14); temp_r31->unk_64 = fn_1_AE18(temp_r27->work[0], temp_r31->unk_7C, &sp14, &temp_r31->unk_58); } } @@ -2960,7 +2991,8 @@ void fn_1_A68C(ModelData* model, Mtx matrix) { } } -u32 fn_1_A8FC(Vec* arg0, f32 arg8) { +u32 fn_1_A8FC(Vec *arg0, f32 arg8) +{ Vec sp2C; Vec sp20; Vec sp14; @@ -2976,11 +3008,11 @@ u32 fn_1_A8FC(Vec* arg0, f32 arg8) { var_r30 = 0; var_r28 = 0; temp_f28 = 100.0f * (4.5f - (2.0f * arg8)); - var_f31 = PSVECMag(arg0); + var_f31 = VECMag(arg0); if (var_f31 > 280.0f) { if (var_f31 > 560.0f) { var_r28 = 1; - PSVECNormalize(arg0, &sp14); + VECNormalize(arg0, &sp14); } var_f31 -= 280.0f; var_f31 *= 0.12987013f; @@ -2999,17 +3031,17 @@ u32 fn_1_A8FC(Vec* arg0, f32 arg8) { sp8.x = sind(temp_r31->unk_08); sp8.y = 0.0f; sp8.z = cosd(temp_r31->unk_08); - PSVECScale(&sp8, &sp20, 600.0f + (100.0f * (8.0f * arg8))); + VECScale(&sp8, &sp20, 600.0f + (100.0f * (8.0f * arg8))); var_f30 = fn_1_B440(arg0, &sp2C, &sp20); if (var_f30 > -0.2f && var_f30 < 1.0f) { - PSVECScale(&sp20, &sp20, var_f30); - PSVECAdd(&sp2C, &sp20, &sp2C); - PSVECSubtract(&sp2C, arg0, &sp20); - var_f31 = PSVECMag(&sp20); - if (var_f31 < temp_f28) { + VECScale(&sp20, &sp20, var_f30); + VECAdd(&sp2C, &sp20, &sp2C); + VECSubtract(&sp2C, arg0, &sp20); + var_f31 = VECMag(&sp20); + if (var_f31 < temp_f28) { var_f29 = 0.0f; if (var_r28 != 0) { - var_f29 = PSVECDotProduct(&sp14, &sp8); + var_f29 = VECDotProduct(&sp14, &sp8); var_f29 = 1.0 - fabs(var_f29); } var_f31 = (1.0f / temp_f28) * (temp_f28 - var_f31); @@ -3026,8 +3058,8 @@ u32 fn_1_A8FC(Vec* arg0, f32 arg8) { } break; default: - PSVECSubtract(arg0, &sp2C, &sp20); - var_f31 = PSVECMag(&sp20); + VECSubtract(arg0, &sp2C, &sp20); + var_f31 = VECMag(&sp20); if (var_f31 < 600.0f) { var_f31 = 800.0f - var_f31; var_f31 = 20.0f + (0.1f * var_f31); @@ -3073,14 +3105,15 @@ Vec lbl_1_data_69C[9] = { s32 lbl_1_data_708[9] = { 0, -19, -18, -17, -1, 1, 0x11, 0x12, 0x13 }; s32 lbl_1_data_72C[9] = { 0, -38, -54, -34, -3, 3, 0x22, 0x36, 0x26 }; -s32 fn_1_AE18(u32 arg0, f32 arg8, Vec* arg1, Vec* arg2) { +s32 fn_1_AE18(u32 arg0, f32 arg8, Vec *arg1, Vec *arg2) +{ s32 sp58[9]; Vec sp4C; Vec sp40; Vec sp34; Vec sp28; Vec sp1C; - u8* sp18; + u8 *sp18; u32 sp14; u32 sp10; f32 var_f31; @@ -3091,16 +3124,16 @@ s32 fn_1_AE18(u32 arg0, f32 arg8, Vec* arg1, Vec* arg2) { s32 var_r30; u32 var_r29; s32 var_r28; - u16* temp_r27; + u16 *temp_r27; s32 var_r26; M438MainWork *var_r25; - u8* temp_r24; + u8 *temp_r24; s32 var_r23; - u8* var_r22; - u16* var_r21; + u8 *var_r22; + u16 *var_r21; u32 var_r19; u32 var_r18; - u8* temp_r17; + u8 *temp_r17; memset(lbl_1_bss_C, 0, 0x288); sp40 = *arg1; @@ -3113,9 +3146,9 @@ s32 fn_1_AE18(u32 arg0, f32 arg8, Vec* arg1, Vec* arg2) { temp_f28 = var_r25->unk_3C; var_r19 = 0x2710; var_r18 = 0; - + for (var_r30 = 0; var_r30 < 9; var_r30++) { - PSVECAdd(&sp40, &lbl_1_data_60C[var_r30], &sp34); + VECAdd(&sp40, &lbl_1_data_60C[var_r30], &sp34); sp18 = temp_r17 + lbl_1_data_5E8[var_r30]; (void)temp_r17; var_r21 = &(&lbl_1_bss_C[lbl_1_data_708[var_r30]])[0xAB]; @@ -3123,12 +3156,13 @@ s32 fn_1_AE18(u32 arg0, f32 arg8, Vec* arg1, Vec* arg2) { var_r29 = 0; var_r22 = sp18; sp28 = sp34; - + for (var_r23 = 0; var_r23 < 3; var_r23++) { for (var_r28 = 0; var_r28 < 9; var_r28++) { temp_r24 = var_r22 + lbl_1_data_5E8[var_r28]; - PSVECAdd(&sp28, &lbl_1_data_60C[var_r28], &sp4C); - if ((lbl_1_bss_DBC->data <= temp_r24) && (((u8*)lbl_1_bss_DBC->data + 0x900 > temp_r24) && (fabs(sp4C.x) < 850.0) && (fabs(sp4C.z) < 850.0))) { + VECAdd(&sp28, &lbl_1_data_60C[var_r28], &sp4C); + if ((lbl_1_bss_DBC->data <= temp_r24) + && (((u8 *)lbl_1_bss_DBC->data + 0x900 > temp_r24) && (fabs(sp4C.x) < 850.0) && (fabs(sp4C.z) < 850.0))) { var_f31++; temp_r27 = &var_r21[lbl_1_data_708[var_r28]]; if (*temp_r27 == 0) { @@ -3142,9 +3176,9 @@ s32 fn_1_AE18(u32 arg0, f32 arg8, Vec* arg1, Vec* arg2) { for (var_r26 = 0; var_r26 < 4; var_r26++) { if (var_r26 != arg0) { var_r25 = lbl_1_bss_DC4[var_r26]->data; - PSVECSubtract(&sp4C, &var_r25->unk_6C, &sp1C); + VECSubtract(&sp4C, &var_r25->unk_6C, &sp1C); sp1C.y = 0.0f; - var_f30 = PSVECMag(&sp1C); + var_f30 = VECMag(&sp1C); if (var_f30 < var_f29) { var_f30 = var_f29 - var_f30; var_f30 *= (40.0f / var_f29); @@ -3153,7 +3187,8 @@ s32 fn_1_AE18(u32 arg0, f32 arg8, Vec* arg1, Vec* arg2) { } } *temp_r27 = ++var_r31; - } else { + } + else { var_r31 = *temp_r27; } var_r29 += var_r31; @@ -3163,7 +3198,7 @@ s32 fn_1_AE18(u32 arg0, f32 arg8, Vec* arg1, Vec* arg2) { } } } - PSVECAdd(&sp28, &lbl_1_data_69C[var_r30], &sp28); + VECAdd(&sp28, &lbl_1_data_69C[var_r30], &sp28); var_r22 += lbl_1_data_678[var_r30]; var_r21 = &var_r21[lbl_1_data_72C[var_r30]]; var_f31 *= 2.0f; @@ -3185,14 +3220,15 @@ s32 fn_1_AE18(u32 arg0, f32 arg8, Vec* arg1, Vec* arg2) { return 0; } -f32 fn_1_B440(Vec* arg0, Vec* arg1, Vec* arg2) { +f32 fn_1_B440(Vec *arg0, Vec *arg1, Vec *arg2) +{ Vec sp10; f32 temp_f30; f32 var_f31; - - PSVECSubtract(arg1, arg0, &sp10); - var_f31 = PSVECDotProduct(&sp10, arg2); - temp_f30 = -PSVECSquareMag(arg2); + + VECSubtract(arg1, arg0, &sp10); + var_f31 = VECDotProduct(&sp10, arg2); + temp_f30 = -VECSquareMag(arg2); if (temp_f30 != 0.0f) { var_f31 /= temp_f30; } diff --git a/src/REL/m438Dll/map.c b/src/REL/m438Dll/map.c index ee37c2c3..58f7e686 100644 --- a/src/REL/m438Dll/map.c +++ b/src/REL/m438Dll/map.c @@ -1,11 +1,12 @@ #include "REL/m438Dll.h" #include "ext_math.h" -#include "string.h" #include "game/hsfanim.h" #include "game/hsfmotion.h" #include "game/sprite.h" #include "game/wipe.h" +#include "string.h" + // STRUCT typedef struct M438MapStruct { @@ -32,8 +33,8 @@ typedef struct M438MapStruct2 { Vec unk30; Vec unk3C; union { - M438MainWork4* unk48; - HsfObject* unk48o; + M438MainWork4 *unk48; + HsfObject *unk48o; }; } M438MapStruct2; @@ -45,56 +46,51 @@ typedef struct M438MapStruct3 { } M438MapStruct3; // BSS -omObjData* lbl_1_bss_108C[6]; -HsfanimStruct01* lbl_1_bss_E34[0x96]; +omObjData *lbl_1_bss_108C[6]; +HsfanimStruct01 *lbl_1_bss_E34[0x96]; s32 lbl_1_bss_E30; s32 lbl_1_bss_E2C; s32 lbl_1_bss_E28; // DATA -char* lbl_1_data_848[] = { - "iwa_s1", "iwa_s2", "iwa_s3", "iwa_s4", "iwa_s5", - "iwa_s6", "iwa_s7", "iwa_s8", "iwa_s9", - "iwa_s10", "iwa_s11", "iwa_s12", "iwa_s13", - "iwa_s14", "iwa_s15", "iwa_s16", "iwa_s17", - "iwa_s18", "iwa_s19", "iwa_s20", "iwa_s21", - "iwa_s22", "iwa_s23", "iwa_s24", "iwa_s25", - "iwa_s26", "iwa_s27", "iwa_s28", "iwa_s29", - "iwa_s30", "iwa_s31", "iwa_s32" -}; +char *lbl_1_data_848[] = { "iwa_s1", "iwa_s2", "iwa_s3", "iwa_s4", "iwa_s5", "iwa_s6", "iwa_s7", "iwa_s8", "iwa_s9", "iwa_s10", "iwa_s11", "iwa_s12", + "iwa_s13", "iwa_s14", "iwa_s15", "iwa_s16", "iwa_s17", "iwa_s18", "iwa_s19", "iwa_s20", "iwa_s21", "iwa_s22", "iwa_s23", "iwa_s24", "iwa_s25", + "iwa_s26", "iwa_s27", "iwa_s28", "iwa_s29", "iwa_s30", "iwa_s31", "iwa_s32" }; // PROTO -void fn_1_B54C(omObjData*); -void fn_1_BF20(omObjData*); +void fn_1_B54C(omObjData *); +void fn_1_BF20(omObjData *); void fn_1_CAB0(f32); -void fn_1_C764(ModelData* model, ParticleData* particle, Mtx matrix); -void fn_1_C8E8(ModelData* model, ParticleData* particle, Mtx matrix); -void fn_1_D3FC(ModelData* model, ParticleData* particle, Mtx matrix); -void fn_1_D57C(Vec*, f32); -void fn_1_E034(Mtx, Vec*); +void fn_1_C764(ModelData *model, ParticleData *particle, Mtx matrix); +void fn_1_C8E8(ModelData *model, ParticleData *particle, Mtx matrix); +void fn_1_D3FC(ModelData *model, ParticleData *particle, Mtx matrix); +void fn_1_D57C(Vec *, f32); +void fn_1_E034(Mtx, Vec *); -void fn_1_B4D8(Process* arg0) { - omObjData* var_r31; +void fn_1_B4D8(Process *arg0) +{ + omObjData *var_r31; lbl_1_bss_E30 = 0; var_r31 = lbl_1_bss_108C[0] = omAddObjEx(arg0, 0x20, 8, 0, -1, fn_1_B54C); var_r31->work[0] = 0; } -void fn_1_B548(void) {} +void fn_1_B548(void) { } -void fn_1_B54C(omObjData* arg0) { +void fn_1_B54C(omObjData *arg0) +{ Vec sp20; Vec sp14; Vec sp8; s32 var_r30; s32 var_r29; - HsfObject* var_r26; + HsfObject *var_r26; s32 var_r27; - M438MapStruct2* var_r28; - HsfanimStruct01* var_r25; - M438MapStruct* var_r24; - M438MapStruct3* temp_r23; + M438MapStruct2 *var_r28; + HsfanimStruct01 *var_r25; + M438MapStruct *var_r24; + M438MapStruct3 *temp_r23; arg0->data = HuMemDirectMallocNum(HEAP_SYSTEM, 0x108C, 0x10000000); temp_r23 = arg0->data; @@ -116,29 +112,29 @@ void fn_1_B54C(omObjData* arg0) { var_r29 = Hu3DTexScrollCreate(arg0->model[1], "lafall"); Hu3DTexScrollPosMoveSet(var_r29, 0.0f, -(1.0f / 60.0f), 0.0f); var_r29 = 0; - + var_r27 = Hu3DParticleCreate(HuSprAnimReadFile(0x45000C), 0x32); arg0->model[3] = var_r27; Hu3DModelLayerSet(var_r27, 3); Hu3DParticleHookSet(var_r27, fn_1_C764); for (var_r30 = 0; var_r30 < 0x32; var_r30++, var_r29++) { - lbl_1_bss_E34[var_r29] = &((ParticleData*)(Hu3DData[var_r27].unk_120))->unk_48[var_r30]; + lbl_1_bss_E34[var_r29] = &((ParticleData *)(Hu3DData[var_r27].unk_120))->unk_48[var_r30]; } - + var_r27 = Hu3DParticleCreate(HuSprAnimReadFile(0x45000D), 0x32); arg0->model[4] = var_r27; Hu3DModelLayerSet(var_r27, 3); Hu3DParticleHookSet(var_r27, fn_1_C764); for (var_r30 = 0; var_r30 < 0x32; var_r30++, var_r29++) { - lbl_1_bss_E34[var_r29] = &((ParticleData*)(Hu3DData[var_r27].unk_120))->unk_48[var_r30]; + lbl_1_bss_E34[var_r29] = &((ParticleData *)(Hu3DData[var_r27].unk_120))->unk_48[var_r30]; } - + var_r27 = Hu3DParticleCreate(HuSprAnimReadFile(0x45000E), 0x32); arg0->model[5] = var_r27; Hu3DModelLayerSet(var_r27, 3); Hu3DParticleHookSet(var_r27, fn_1_C764); for (var_r30 = 0; var_r30 < 0x32; var_r30++, var_r29++) { - lbl_1_bss_E34[var_r29] = &((ParticleData*)(Hu3DData[var_r27].unk_120))->unk_48[var_r30]; + lbl_1_bss_E34[var_r29] = &((ParticleData *)(Hu3DData[var_r27].unk_120))->unk_48[var_r30]; } for (var_r30 = 0; var_r30 < 0x95; var_r30++) { for (var_r29 = 1; var_r29 < 0x96; var_r29++) { @@ -155,24 +151,24 @@ void fn_1_B54C(omObjData* arg0) { lbl_1_bss_E34[var_r30]->unk40.a = 0; lbl_1_bss_E34[var_r30]->unk00 = 0; } - + var_r27 = Hu3DParticleCreate(HuSprAnimReadFile(0x45000F), 0x32); arg0->model[6] = var_r27; Hu3DModelLayerSet(var_r27, 3); Hu3DParticleHookSet(var_r27, fn_1_C8E8); - var_r25 = &((ParticleData*)(Hu3DData[var_r27].unk_120))->unk_48[0]; + var_r25 = &((ParticleData *)(Hu3DData[var_r27].unk_120))->unk_48[0]; for (var_r30 = 0; var_r30 < 0x32; var_r30++, var_r25++) { var_r25->unk2C = 0.0f; var_r25->unk40.a = 0; var_r25->unk00 = 0; } - + var_r27 = Hu3DParticleCreate(HuSprAnimReadFile(0x450010), 0x1F4); arg0->model[7] = var_r27; Hu3DModelLayerSet(var_r27, 2); Hu3DParticleBlendModeSet(var_r27, 1); Hu3DParticleHookSet(var_r27, fn_1_D3FC); - var_r25 = &((ParticleData*)(Hu3DData[var_r27].unk_120))->unk_48[0]; + var_r25 = &((ParticleData *)(Hu3DData[var_r27].unk_120))->unk_48[0]; for (var_r30 = 0; var_r30 < 0x1F4; var_r30++, var_r25++) { var_r25->unk2C = 0.0f; var_r25->unk40.a = 0; @@ -191,27 +187,27 @@ void fn_1_B54C(omObjData* arg0) { sp8.x = sp8.y = sp8.z = 100000.0f; for (var_r29 = 0; var_r29 < var_r26->data.vertex->count; var_r29++) { - if (((Vec*)var_r26->data.vertex->data)[var_r29].x > sp14.x) { - sp14.x = ((Vec*)var_r26->data.vertex->data)[var_r29].x; + if (((Vec *)var_r26->data.vertex->data)[var_r29].x > sp14.x) { + sp14.x = ((Vec *)var_r26->data.vertex->data)[var_r29].x; } - if (((Vec*)var_r26->data.vertex->data)[var_r29].y > sp14.y) { - sp14.y = ((Vec*)var_r26->data.vertex->data)[var_r29].y; + if (((Vec *)var_r26->data.vertex->data)[var_r29].y > sp14.y) { + sp14.y = ((Vec *)var_r26->data.vertex->data)[var_r29].y; } - if (((Vec*)var_r26->data.vertex->data)[var_r29].z > sp14.z) { - sp14.z = ((Vec*)var_r26->data.vertex->data)[var_r29].z; + if (((Vec *)var_r26->data.vertex->data)[var_r29].z > sp14.z) { + sp14.z = ((Vec *)var_r26->data.vertex->data)[var_r29].z; } - if (((Vec*)var_r26->data.vertex->data)[var_r29].x < sp8.x) { - sp8.x = ((Vec*)var_r26->data.vertex->data)[var_r29].x; + if (((Vec *)var_r26->data.vertex->data)[var_r29].x < sp8.x) { + sp8.x = ((Vec *)var_r26->data.vertex->data)[var_r29].x; } - if (((Vec*)var_r26->data.vertex->data)[var_r29].y < sp8.y) { - sp8.y = ((Vec*)var_r26->data.vertex->data)[var_r29].y; + if (((Vec *)var_r26->data.vertex->data)[var_r29].y < sp8.y) { + sp8.y = ((Vec *)var_r26->data.vertex->data)[var_r29].y; } - if (((Vec*)var_r26->data.vertex->data)[var_r29].z < sp8.z) { - sp8.z = ((Vec*)var_r26->data.vertex->data)[var_r29].z; + if (((Vec *)var_r26->data.vertex->data)[var_r29].z < sp8.z) { + sp8.z = ((Vec *)var_r26->data.vertex->data)[var_r29].z; } } - PSVECAdd(&sp14, &sp8, &sp20); - PSVECScale(&sp20, &sp20, 0.5f); + VECAdd(&sp14, &sp8, &sp20); + VECScale(&sp20, &sp20, 0.5f); var_r28->unk24 = sp20; var_r28->unk30 = var_r28->unk24; var_r28->unk8 = (360.0 + atan2d(sp20.x, sp20.z)); @@ -241,7 +237,7 @@ Vec lbl_1_data_8D8[4][2] = { { -867.0f, -80.0f, -485.0f }, }, { - { -917.0f, -80.0f, -857.0f }, + { -917.0f, -80.0f, -857.0f }, { -817.0f, -80.0f, -1030.0f }, }, { @@ -249,12 +245,13 @@ Vec lbl_1_data_8D8[4][2] = { { 867.0f, -80.0f, -485.0f }, }, { - { 917.0f, -80.0f, -857.0f }, + { 917.0f, -80.0f, -857.0f }, { 817.0f, -80.0f, -1030.0f }, }, }; -void fn_1_BF20(omObjData* arg0) { +void fn_1_BF20(omObjData *arg0) +{ Mtx sp5C; Mtx sp2C; Vec sp20; @@ -264,18 +261,18 @@ void fn_1_BF20(omObjData* arg0) { f32 temp_f30; f32 temp_f31; s32 var_r29; - M438MapStruct2* var_r31; - M438MapStruct* var_r30; - M438MapStruct3* temp_r28; + M438MapStruct2 *var_r31; + M438MapStruct *var_r30; + M438MapStruct3 *temp_r28; temp_r28 = arg0->data; temp_r28->unk0++; var_r31 = &temp_r28->unk4; - + for (var_r29 = 0; var_r29 < 0x20; var_r29++, var_r31++) { if ((var_r31->unk0 == 0) && (var_r31->unk4 != 0)) { temp_f29 = var_r31->unk30.y; - PSVECAdd(&var_r31->unk30, &var_r31->unk3C, &var_r31->unk30); + VECAdd(&var_r31->unk30, &var_r31->unk3C, &var_r31->unk30); var_r31->unk3C.x *= 0.92f; var_r31->unk3C.z *= 0.92f; var_r31->unk3C.y += -0.27222225f; @@ -290,22 +287,22 @@ void fn_1_BF20(omObjData* arg0) { sp14.x = sind(90.0f + var_r31->unk8); sp14.z = cosd(90.0f + var_r31->unk8); sp14.y = 0.0f; - PSMTXRotAxisRad(sp5C, &sp14, MTXDegToRad(var_r31->unkC)); + MTXRotAxisRad(sp5C, &sp14, MTXDegToRad(var_r31->unkC)); sp14.x = sp14.z = 0.0f; sp14.y = 1.0f; - PSMTXRotAxisRad(sp2C, &sp14, MTXDegToRad(var_r31->unk14)); - PSMTXConcat(sp2C, sp5C, sp5C); + MTXRotAxisRad(sp2C, &sp14, MTXDegToRad(var_r31->unk14)); + MTXConcat(sp2C, sp5C, sp5C); sp14.x = sind(var_r31->unk8); sp14.z = cosd(var_r31->unk8); sp14.y = 0.0f; - PSMTXRotAxisRad(sp2C, &sp14, MTXDegToRad(var_r31->unk1C)); - PSMTXConcat(sp2C, sp5C, sp5C); + MTXRotAxisRad(sp2C, &sp14, MTXDegToRad(var_r31->unk1C)); + MTXConcat(sp2C, sp5C, sp5C); fn_1_E034(sp5C, &sp20); var_r31->unk48->unk_28.x = sp20.x; var_r31->unk48->unk_28.y = sp20.y; var_r31->unk48->unk_28.z = sp20.z; - PSMTXInverse(sp5C, sp5C); - PSMTXMultVec(sp5C, &var_r31->unk24, &sp8); + MTXInverse(sp5C, sp5C); + MTXMultVec(sp5C, &var_r31->unk24, &sp8); var_r31->unk48->unk_1C.x = (var_r31->unk30.x - sp8.x); var_r31->unk48->unk_1C.y = (var_r31->unk30.y - sp8.y); var_r31->unk48->unk_1C.z = (var_r31->unk30.z - sp8.z); @@ -316,16 +313,18 @@ void fn_1_BF20(omObjData* arg0) { } if ((temp_r28->unk0 & 1) == 0) { var_r30 = &temp_r28->unk984; - + for (var_r29 = 0; var_r29 < 0x32; var_r29++, var_r30++) { - if (var_r30->unk0 != 0) continue; + if (var_r30->unk0 != 0) + continue; var_r30->unk0 = 1; var_r30->unk18 = frandmod(0x168); if (frandmod(0x64) < 0x14) { var_r30->unkC.x = (0.8f * (frandmod(0x7D0) - 0x3E8)); var_r30->unkC.y = -80.0f; var_r30->unkC.z = ((-1.2f * frandmod(0x3E8)) - 1000.0f); - } else { + } + else { temp_f31 = frandmod(0x168); temp_f30 = 800.0f + (0.25f * frandmod(0x3E8)); var_r30->unkC.x = (temp_f30 * sind(temp_f31)); @@ -353,13 +352,13 @@ void fn_1_BF20(omObjData* arg0) { Hu3DModelScaleSet(var_r30->unk4, var_r30->unk1C, var_r30->unk1C, var_r30->unk1C); } } - + for (var_r29 = 0; var_r29 < 4; var_r29++) { - PSVECSubtract(&lbl_1_data_8D8[var_r29][1], &lbl_1_data_8D8[var_r29][0], &sp14); + VECSubtract(&lbl_1_data_8D8[var_r29][1], &lbl_1_data_8D8[var_r29][0], &sp14); temp_f31 = 0.001f * frandmod(0x3E8); - PSVECScale(&sp14, &sp14, temp_f31); - PSVECAdd(&lbl_1_data_8D8[var_r29][0], &sp14, &sp8); - PSVECScale(&sp8, &sp8, 0.98f); + VECScale(&sp14, &sp14, temp_f31); + VECAdd(&lbl_1_data_8D8[var_r29][0], &sp14, &sp8); + VECScale(&sp8, &sp8, 0.98f); fn_1_D57C(&sp8, 0.03f); } if ((lbl_1_bss_E30 == 0) && (WipeStatGet() == 0)) { @@ -369,16 +368,17 @@ void fn_1_BF20(omObjData* arg0) { } } -void fn_1_C764(ModelData* model, ParticleData* particle, Mtx matrix) { - HsfanimStruct01* var_r31; +void fn_1_C764(ModelData *model, ParticleData *particle, Mtx matrix) +{ + HsfanimStruct01 *var_r31; s32 var_r29; u16 temp_r0; var_r31 = particle->unk_48; - + for (var_r29 = 0; var_r29 < particle->unk_30; var_r29++, var_r31++) { if (var_r31->unk00_s16 != 0) { - PSVECAdd(&var_r31->unk34, &var_r31->unk08, &var_r31->unk34); + VECAdd(&var_r31->unk34, &var_r31->unk08, &var_r31->unk34); var_r31->unk08.x *= 0.95f; var_r31->unk08.z *= 0.95f; var_r31->unk08.y += -0.27222225f; @@ -395,20 +395,21 @@ void fn_1_C764(ModelData* model, ParticleData* particle, Mtx matrix) { DCStoreRange(particle->unk_48, particle->unk_30 * 0x44); } -void fn_1_C8E8(ModelData* model, ParticleData* particle, Mtx matrix) { - HsfanimStruct01* var_r31; +void fn_1_C8E8(ModelData *model, ParticleData *particle, Mtx matrix) +{ + HsfanimStruct01 *var_r31; s32 var_r29; u16 temp_r0; var_r31 = particle->unk_48; - + for (var_r29 = 0; var_r29 < particle->unk_30; var_r29++, var_r31++) { if (var_r31->unk00_s16 != 0) { - PSVECAdd(&var_r31->unk34, &var_r31->unk08, &var_r31->unk34); + VECAdd(&var_r31->unk34, &var_r31->unk08, &var_r31->unk34); var_r31->unk08.x *= 0.92f; var_r31->unk08.z *= 0.92f; var_r31->unk2C += 5.0f; - var_r31->unk40.a *= 0.99f; + var_r31->unk40.a *= 0.99f; if (var_r31->unk00_s16 < 24.0f) { var_r31->unk40.a = 0.9f * var_r31->unk40.a; } @@ -422,20 +423,21 @@ void fn_1_C8E8(ModelData* model, ParticleData* particle, Mtx matrix) { DCStoreRange(particle->unk_48, particle->unk_30 * 0x44); } -void fn_1_CAB0(f32 arg8) { +void fn_1_CAB0(f32 arg8) +{ Vec sp8; f32 temp_f31; f32 temp_f30; f32 temp_f28; f32 temp_f27; - HsfanimStruct01* var_r31; + HsfanimStruct01 *var_r31; s32 var_r30; u32 var_r29; temp_f28 = 20.0f; temp_f27 = 7.0f; var_r29 = 0x19; - + for (var_r30 = 0; var_r30 < 0x96; var_r30++) { var_r31 = lbl_1_bss_E34[var_r30]; if (var_r31->unk00_s16 == 0) { @@ -445,12 +447,12 @@ void fn_1_CAB0(f32 arg8) { sp8.x = sind(temp_f31); sp8.y = 0.0f; sp8.z = cosd(temp_f31); - + temp_f31 = arg8 + (((0.002f * frandmod(0x3E8)) - 1.0f)) * temp_f27; var_r31->unk34.x = 7.5 * sind(temp_f31) * 100.0; var_r31->unk34.y = 0.2f * frandmod(0x3E8); var_r31->unk34.z = 7.5 * cosd(temp_f31) * 100.0; - + temp_f30 = 1.6666667f * (4.0f + (0.014f * frandmod(0x3E8))); var_r31->unk08.x = sp8.x * temp_f30; var_r31->unk08.z = sp8.z * temp_f30; @@ -462,10 +464,11 @@ void fn_1_CAB0(f32 arg8) { var_r31->unk40.r = var_r31->unk40.g = var_r31->unk40.b = 0xFF; var_r29--; - if (var_r29 < 1) break; + if (var_r29 < 1) + break; } } - var_r31 = ((ParticleData*)(Hu3DData[lbl_1_bss_108C[0]->model[6]].unk_120))->unk_48; + var_r31 = ((ParticleData *)(Hu3DData[lbl_1_bss_108C[0]->model[6]].unk_120))->unk_48; var_r29 = 0xF; for (var_r30 = 0; var_r30 < 0x32; var_r30++, var_r31++) { if (var_r31->unk00_s16 == 0) { @@ -475,12 +478,12 @@ void fn_1_CAB0(f32 arg8) { sp8.x = sind(temp_f31); sp8.y = 0.0f; sp8.z = cosd(temp_f31); - + temp_f31 = arg8 + (((0.002f * frandmod(0x3E8)) - 1.0f)) * temp_f27; var_r31->unk34.x = 7.5 * sind(temp_f31) * 100.0; var_r31->unk34.y = 0.2f * frandmod(0x3E8); var_r31->unk34.z = 7.5 * cosd(temp_f31) * 100.0; - + temp_f30 = 1.6666667f * -(0.01f * frandmod(0x3E8)); var_r31->unk08.x = sp8.x * temp_f30; var_r31->unk08.z = sp8.z * temp_f30; @@ -495,13 +498,15 @@ void fn_1_CAB0(f32 arg8) { var_r31->unk40.b = (60.0f * temp_f31) + 54.0f; var_r29--; - if (var_r29 < 1) break; + if (var_r29 < 1) + break; } } } -void fn_1_D3FC(ModelData* model, ParticleData* particle, Mtx matrix) { - HsfanimStruct01* var_r31; +void fn_1_D3FC(ModelData *model, ParticleData *particle, Mtx matrix) +{ + HsfanimStruct01 *var_r31; s32 var_r29; u16 temp_r0; @@ -509,7 +514,7 @@ void fn_1_D3FC(ModelData* model, ParticleData* particle, Mtx matrix) { var_r31 = particle->unk_48; for (var_r29 = 0; var_r29 < particle->unk_30; var_r29++, var_r31++) { if (var_r31->unk00_s16 != 0) { - PSVECAdd(&var_r31->unk34, &var_r31->unk08, &var_r31->unk34); + VECAdd(&var_r31->unk34, &var_r31->unk08, &var_r31->unk34); var_r31->unk08.y += -0.27222225f; if (var_r31->unk00_s16 < 12.0f) { var_r31->unk40.a = (0.8f * var_r31->unk40.a); @@ -525,17 +530,18 @@ void fn_1_D3FC(ModelData* model, ParticleData* particle, Mtx matrix) { DCStoreRange(particle->unk_48, particle->unk_30 * 0x44); } -void fn_1_D57C(Vec* arg0, f32 arg1) { +void fn_1_D57C(Vec *arg0, f32 arg1) +{ Vec sp8; f32 temp_f31; f32 temp_f29; - HsfanimStruct01* var_r31; + HsfanimStruct01 *var_r31; s32 var_r30; u32 var_r29; - var_r31 = ((ParticleData*)(Hu3DData[lbl_1_bss_108C[0]->model[7]].unk_120))->unk_48; + var_r31 = ((ParticleData *)(Hu3DData[lbl_1_bss_108C[0]->model[7]].unk_120))->unk_48; var_r29 = (u32)(3.0f + (15.0f * arg1)); - + for (var_r30 = 0; var_r30 < 0x1F4; var_r30++, var_r31++) { if (var_r31->unk00_s16 == 0) { var_r31->unk00_s16 = 60.0f * (0.3f + (0.0003f * frandmod(0x3E8))); @@ -557,28 +563,30 @@ void fn_1_D57C(Vec* arg0, f32 arg1) { var_r31->unk40.a = (frandmod(0x46) + 0x64); temp_f31 = 0.001f * frandmod(0x3E8); - var_r31->unk40.r = 177.0f + (78.0f * temp_f31); - var_r31->unk40.g = 60.0f + (129.0f * temp_f31); - var_r31->unk40.b = 30.0f + (122.0f * temp_f31); + var_r31->unk40.r = 177.0f + (78.0f * temp_f31); + var_r31->unk40.g = 60.0f + (129.0f * temp_f31); + var_r31->unk40.b = 30.0f + (122.0f * temp_f31); var_r29--; - if (var_r29 < 1) break; + if (var_r29 < 1) + break; } } } -s32 fn_1_DA64(f32 arg8) { - M438MapStruct3* var_r28; +s32 fn_1_DA64(f32 arg8) +{ + M438MapStruct3 *var_r28; s32 var_r29; s32 var_r30; - M438MapStruct2* var_r31; + M438MapStruct2 *var_r31; float var_f31; float var_f29; var_r28 = lbl_1_bss_108C[0]->data; var_r29 = 0; var_r31 = &var_r28->unk4; - + for (var_r30 = 0; var_r30 < 0x20; var_r30++, var_r31++) { var_f31 = fn_1_E5A4(var_r31->unk8, arg8); if ((fabs(var_f31) < 12.0) && (var_r31->unk0 != 0)) { @@ -608,17 +616,18 @@ s32 fn_1_DA64(f32 arg8) { return var_r29; } -s32 fn_1_DEA0(f32 arg8) { - M438MapStruct3* var_r28; +s32 fn_1_DEA0(f32 arg8) +{ + M438MapStruct3 *var_r28; s32 var_r29; s32 var_r30; - M438MapStruct2* var_r31; + M438MapStruct2 *var_r31; f32 var_f31; var_r28 = lbl_1_bss_108C[0]->data; var_r29 = 0; var_r31 = &var_r28->unk4; - + for (var_r30 = 0; var_r30 < 0x20; var_r30++, var_r31++) { var_f31 = fn_1_E5A4(var_r31->unk8, arg8); if ((fabs(var_f31) < 8.0) && (var_r31->unk0 != 0)) { @@ -629,7 +638,8 @@ s32 fn_1_DEA0(f32 arg8) { return var_r29; } -f32 fn_1_DF70(f32 arg8, f32 arg9) { +f32 fn_1_DF70(f32 arg8, f32 arg9) +{ f32 temp_f30; f32 var_f31; @@ -637,13 +647,15 @@ f32 fn_1_DF70(f32 arg8, f32 arg9) { var_f31 = 180.0 * (atan2f(arg9, arg8) / M_PI); if (var_f31 < 0.0f) { var_f31 += temp_f30; - } else if (var_f31 >= temp_f30) { + } + else if (var_f31 >= temp_f30) { var_f31 -= temp_f30; } return var_f31; } -void fn_1_E034(Mtx arg0, Vec* arg1) { +void fn_1_E034(Mtx arg0, Vec *arg1) +{ f32 var_f26; f32 temp_f25; @@ -659,7 +671,8 @@ void fn_1_E034(Mtx arg0, Vec* arg1) { arg1->y = fn_1_DF70(var_f26, temp_f25); } -f32 fn_1_E488(f32 arg8, f32 arg9, f32 argA) { +f32 fn_1_E488(f32 arg8, f32 arg9, f32 argA) +{ f32 var_f31; var_f31 = fmodf((arg9 - arg8), 360.0); @@ -676,7 +689,8 @@ f32 fn_1_E488(f32 arg8, f32 arg9, f32 argA) { return var_f31; } -f32 fn_1_E5A4(f32 arg8, f32 arg9) { +f32 fn_1_E5A4(f32 arg8, f32 arg9) +{ f32 var_f31; var_f31 = fmodf((arg9 - arg8), 360.0); diff --git a/src/REL/m440Dll/main.c b/src/REL/m440Dll/main.c index d7653b96..db82808e 100644 --- a/src/REL/m440Dll/main.c +++ b/src/REL/m440Dll/main.c @@ -1276,7 +1276,7 @@ void fn_1_57B4(unkStruct6 *arg0) var_r31->unkB8.z *= 0.5f; } } - PSMTXScale(sp14, var_r31->unk88.x, var_r31->unk88.y, var_r31->unk88.z); + MTXScale(sp14, var_r31->unk88.x, var_r31->unk88.y, var_r31->unk88.z); mtxTransCat(sp14, -var_r31->unk7C.x, -var_r31->unk7C.y, -var_r31->unk7C.z); mtxRotCat(sp14, var_r31->unkA0.x, var_r31->unkA0.y, var_r31->unkA0.z); mtxTransCat(sp14, var_r31->unk94.x + var_r31->unk7C.x, var_r31->unk94.y + var_r31->unk7C.y, var_r31->unk94.z + var_r31->unk7C.z); @@ -1288,14 +1288,14 @@ void fn_1_57B4(unkStruct6 *arg0) else { var_r29 = var_r31->unk18[var_r28]; } - PSMTXMultVec(sp14, &temp_r26[var_r29], &sp8); + MTXMultVec(sp14, &temp_r26[var_r29], &sp8); arg0->unkC[var_r29].x = sp8.x; arg0->unkC[var_r29].y = sp8.y; arg0->unkC[var_r29].z = sp8.z; } if ((arg0->unk2 & 2) != 0) { var_r29 = var_r31->unk1E; - PSMTXMultVec(sp14, &temp_r26[var_r29], &sp8); + MTXMultVec(sp14, &temp_r26[var_r29], &sp8); arg0->unkC[var_r29].x = sp8.x; arg0->unkC[var_r29].y = sp8.y; arg0->unkC[var_r29].z = sp8.z; @@ -1359,7 +1359,7 @@ void fn_1_5C2C(s16 arg0, HsfObject *arg1, unkStruct6 *arg2, u16 arg3) var_r22 = NULL; } var_r25 = &arg1->data.base; - PSMTXScale(sp68, var_r25->scale.x, var_r25->scale.y, var_r25->scale.z); + MTXScale(sp68, var_r25->scale.x, var_r25->scale.y, var_r25->scale.z); mtxRotCat(sp68, var_r25->rot.x, var_r25->rot.y, var_r25->rot.z); mtxTransCat(sp68, var_r25->pos.x, var_r25->pos.y, var_r25->pos.z); @@ -1375,7 +1375,7 @@ void fn_1_5C2C(s16 arg0, HsfObject *arg1, unkStruct6 *arg2, u16 arg3) var_r27 = arg2->unk24[var_r30].unk18[var_r28]; var_r23 = arg2->unk24[var_r30].unk0[var_r28].unk0; } - PSMTXMultVec(sp68, &((Vec *)(arg1->data.vertex->data))[var_r23], &sp38); + MTXMultVec(sp68, &((Vec *)(arg1->data.vertex->data))[var_r23], &sp38); arg2->unkC[var_r27] = sp38; sp44[var_r28] = arg2->unkC[var_r27]; arg2->unk14[var_r27] = arg2->unk18[var_r23]; @@ -1860,7 +1860,7 @@ void fn_1_806C(ModelData *arg0, Mtx arg1) temp_r27(temp_r31); } GXLoadPosMtxImm(arg1, 0); - PSMTXInvXpose(arg1, sp14); + MTXInvXpose(arg1, sp14); GXLoadNrmMtxImm(sp14, 0); fn_1_8AC4(arg1); sp10.r = (temp_r31->unk28->unkB[0] * arg0->unk_58.x); @@ -1974,7 +1974,7 @@ void fn_1_8470(unkStruct12 *arg0, unkStruct13 *arg1) if (var_f31 < 0.1) { var_f31 = 0.1f; } - PSMTXCopy(lbl_1_bss_30, sp10); + MTXCopy(lbl_1_bss_30, sp10); mtxScaleCat(sp10, var_f31, var_f31, var_f31); GXLoadTexMtxImm(sp10, 0x24, GX_MTX2x4); var_r31++; @@ -2050,31 +2050,31 @@ void fn_1_8AC4(Mtx arg0) var_r29 = &Hu3DGlobalLight[0]; sp34 = var_r29->unk_28; if ((var_r29->unk_00 & 0x8000) != 0) { - PSMTXMultVecSR(Hu3DCameraMtx, &sp34, &sp34); + MTXMultVecSR(Hu3DCameraMtx, &sp34, &sp34); } var_f30 = VECDotProduct(&sp34, &sp10); var_f30 *= 10000.0f; OSf32tos16(&var_f30, &temp_r31); if (temp_r31 == -0x2710) { - PSMTXScale(lbl_1_bss_30, 0.0f, 0.0f, 0.0f); + MTXScale(lbl_1_bss_30, 0.0f, 0.0f, 0.0f); return; } C_VECHalfAngle(&sp34, &sp10, &sp28); sp28.x = -sp28.x; sp28.y = -sp28.y; sp28.z = -sp28.z; - PSMTXInvXpose(arg0, sp70); + MTXInvXpose(arg0, sp70); if (temp_r31 == 0x2710) { - PSMTXIdentity(sp40); + MTXIdentity(sp40); } else { VECCrossProduct(&sp28, &sp10, &sp1C); var_f29 = acosf(VECDotProduct(&sp10, &sp28)); - PSMTXRotAxisRad(sp40, &sp1C, var_f29); + MTXRotAxisRad(sp40, &sp1C, var_f29); } - PSMTXConcat(sp40, sp70, spA0); - PSMTXTrans(sp40, 0.5f, 0.5f, 0.0f); - PSMTXConcat(sp40, spA0, lbl_1_bss_30); + MTXConcat(sp40, sp70, spA0); + MTXTrans(sp40, 0.5f, 0.5f, 0.0f); + MTXConcat(sp40, spA0, lbl_1_bss_30); } void fn_1_8D1C(void) @@ -2097,7 +2097,7 @@ void fn_1_8D1C(void) if (var_r30 == 5) { C_MTXOrtho(sp60, 0.0f, 480.0f, 0.0f, 640.0f, 0.0f, 10.0f); GXSetProjection(sp60, GX_ORTHOGRAPHIC); - PSMTXIdentity(sp30); + MTXIdentity(sp30); GXLoadPosMtxImm(sp30, 0); GXClearVtxDesc(); GXSetVtxDesc(GX_VA_POS, GX_DIRECT); @@ -2491,9 +2491,9 @@ void fn_1_9C04(ModelData *arg0, Mtx arg1) } else { fn_1_A328(&temp_r30->unk2C, &sp38, &var_r29->unk48, 4); - PSMTXRotRad(spC8, 0x5A, 0.017453292f * var_r29->unk44); - PSMTXConcat(sp128, spC8, sp98); - PSMTXMultVecArray(sp98, &sp38, &sp8, 4); + MTXRotRad(spC8, 0x5A, 0.017453292f * var_r29->unk44); + MTXConcat(sp128, spC8, sp98); + MTXMultVecArray(sp98, &sp38, &sp8, 4); VECAdd(&sp8, &var_r29->unk54, var_r31++); VECAdd(&sp14, &var_r29->unk54, var_r31++); VECAdd(&sp20, &var_r29->unk54, var_r31++); diff --git a/src/REL/m440Dll/object.c b/src/REL/m440Dll/object.c index 00d59251..5eb6cb5c 100644 --- a/src/REL/m440Dll/object.c +++ b/src/REL/m440Dll/object.c @@ -10,12 +10,10 @@ #include "string.h" #include "version.h" - #ifdef __MWERKS__ #include "game/audio.h" #endif - // bss omObjData *lbl_1_bss_C0[4]; s16 lbl_1_bss_B8[4]; @@ -1025,7 +1023,7 @@ u8 fn_1_E8AC(omObjData *arg0, unkObjStruct *arg1) arg1->unk24.z = (1050.0 * sind(var_f31)); } arg1->unk30.y = 0.0f; - PSMTXRotRad(temp_r29->unk_F0, 0x59, 0.017453292f * arg1->unk68); + MTXRotRad(temp_r29->unk_F0, 0x59, 0.017453292f * arg1->unk68); arg1->unk60++; if (lbl_1_data_1D8 == 0) { fn_1_18E0(); @@ -1044,7 +1042,7 @@ u8 fn_1_E8AC(omObjData *arg0, unkObjStruct *arg1) arg1->unk18.y = fn_1_93D0(lbl_1_bss_78.y, 1400.0f + lbl_1_bss_78.y, 0.0f, var_f31); arg1->unk18.z = lbl_1_bss_78.z + (var_f31 * (arg1->unk24.z - lbl_1_bss_78.x)); arg1->unk30.x = 180.0f * var_f31; - PSMTXRotRad(temp_r29->unk_F0, 0x59, 0.017453292f * arg1->unk68); + MTXRotRad(temp_r29->unk_F0, 0x59, 0.017453292f * arg1->unk68); break; case 3: fn_1_F4D4(arg1, 15, 8); diff --git a/src/REL/m441Dll/main.c b/src/REL/m441Dll/main.c index e6143406..bc0d7e77 100644 --- a/src/REL/m441Dll/main.c +++ b/src/REL/m441Dll/main.c @@ -403,9 +403,9 @@ void fn_1_1D70(s16 arg0, char *arg1, Vec *arg2, Mtx arg3) var_r30 = &Hu3DData[arg0]; Hu3DModelObjMtxGet(arg0, arg1, spC); - PSMTXConcat(var_r30->unk_F0, spC, spC); + MTXConcat(var_r30->unk_F0, spC, spC); if (NULL != arg3) { - PSMTXCopy(spC, arg3); + MTXCopy(spC, arg3); } arg2->x = spC[0][3]; arg2->y = spC[1][3]; diff --git a/src/REL/m442Dll/main.c b/src/REL/m442Dll/main.c index 28beaccd..53dd649a 100644 --- a/src/REL/m442Dll/main.c +++ b/src/REL/m442Dll/main.c @@ -1489,7 +1489,7 @@ void fn_1_485C(ModelData *model, Mtx mtx) var_r29 = Hu3DCamera; C_MTXOrtho(sp100, 0.0f, 480.0f, 0.0f, 640.0f, 0.0f, 100.0f); GXSetProjection(sp100, GX_ORTHOGRAPHIC); - PSMTXIdentity(spD0); + MTXIdentity(spD0); GXLoadPosMtxImm(spD0, 0); GXSetNumChans(1); GXSetChanCtrl(GX_COLOR0A0, GX_FALSE, GX_SRC_REG, GX_SRC_REG, 0, GX_DF_CLAMP, GX_AF_NONE); @@ -1529,7 +1529,7 @@ void fn_1_485C(ModelData *model, Mtx mtx) GXSetVtxDesc(GX_VA_TEX0, GX_DIRECT); C_MTXPerspective(sp40, var_r29->fov, var_r29->aspect, var_r29->near, var_r29->far); GXSetProjection(sp40, GX_PERSPECTIVE); - PSMTXInverse(mtx, spA0); + MTXInverse(mtx, spA0); spA0[0][3] = spA0[1][3] = spA0[2][3] = 0.0f; PSMTXReorder(spA0, sp70); PSMTXROMultVecArray(sp70, &lbl_1_data_1C0[0], &sp10, 4); @@ -1585,7 +1585,7 @@ void fn_1_54C8(ModelData *model, Mtx mtx) fn_1_8520(&lbl_1_bss_C05C[1], 0); C_MTXOrtho(sp5C, 0.0f, 480.0f, 0.0f, 640.0f, 0.0f, 100.0f); GXSetProjection(sp5C, GX_ORTHOGRAPHIC); - PSMTXIdentity(sp2C); + MTXIdentity(sp2C); GXLoadPosMtxImm(sp2C, 0); GXSetZMode(GX_FALSE, GX_LEQUAL, GX_FALSE); GXSetNumTexGens(2); @@ -1734,9 +1734,9 @@ void fn_1_5EDC(ModelData *model, float (*mtx)[4]) s32 var_r30; var_r31 = model->unk_120; - PSMTXInverse(mtx, spC); + MTXInverse(mtx, spC); spC[0][3] = spC[1][3] = spC[2][3] = 0.0f; - PSMTXConcat(mtx, &spC[0], mtx); + MTXConcat(mtx, &spC[0], mtx); GXLoadPosMtxImm(mtx, 0); GXSetZMode(GX_TRUE, GX_LEQUAL, GX_TRUE); GXSetNumTexGens(1); diff --git a/src/REL/m443Dll/main.c b/src/REL/m443Dll/main.c index 5b22d7c6..acf8f914 100644 --- a/src/REL/m443Dll/main.c +++ b/src/REL/m443Dll/main.c @@ -495,15 +495,15 @@ void fn_1_1D8C(omObjData *object) lbl_1_bss_4 = HuAudSStreamPlay(0xB); } var_f31 = (float)object->work[0] / lbl_1_data_F0[object->work[1]]; - PSVECSubtract(&lbl_1_data_60[object->work[1] + 1], &lbl_1_data_60[object->work[1]], &sp8); - PSVECScale(&sp8, &sp8, var_f31); - PSVECAdd(&lbl_1_data_60[object->work[1]], &sp8, &sp8); + VECSubtract(&lbl_1_data_60[object->work[1] + 1], &lbl_1_data_60[object->work[1]], &sp8); + VECScale(&sp8, &sp8, var_f31); + VECAdd(&lbl_1_data_60[object->work[1]], &sp8, &sp8); Center.x = sp8.x; Center.y = sp8.y; Center.z = sp8.z; - PSVECSubtract(&lbl_1_data_A8[object->work[1] + 1], &lbl_1_data_A8[object->work[1]], &sp8); - PSVECScale(&sp8, &sp8, var_f31); - PSVECAdd(&lbl_1_data_A8[object->work[1]], &sp8, &sp8); + VECSubtract(&lbl_1_data_A8[object->work[1] + 1], &lbl_1_data_A8[object->work[1]], &sp8); + VECScale(&sp8, &sp8, var_f31); + VECAdd(&lbl_1_data_A8[object->work[1]], &sp8, &sp8); CRot.x = sp8.x; CRot.y = sp8.y; CRot.z = 0.0f; @@ -922,7 +922,7 @@ void fn_1_3D78(ModelData *arg0, Mtx arg1) { Mtx spC; - PSMTXIdentity(spC); + MTXIdentity(spC); GXLoadPosMtxImm(spC, 0); GXSetNumChans(1); GXSetChanCtrl(GX_COLOR0A0, GX_FALSE, GX_SRC_REG, GX_SRC_VTX, 0, GX_DF_CLAMP, GX_AF_NONE); @@ -1094,13 +1094,13 @@ void fn_1_4444(Vec *arg0, Vec *arg1) Vec sp10; float var_f30; - PSVECSubtract(arg1, arg0, &sp10); + VECSubtract(arg1, arg0, &sp10); Center = *arg1; var_f30 = (sp10.x * sp10.x) + (sp10.z * sp10.z); CRot.x = atan2d(sp10.y, sqrtf(var_f30)); CRot.y = atan2d(-sp10.x, -sp10.z); CRot.z = 0.0f; - CZoom = PSVECMag(&sp10); + CZoom = VECMag(&sp10); } void fn_1_464C(float arg8, float arg9, float argA, float argB, float argC, float argD) @@ -1116,13 +1116,13 @@ void fn_1_464C(float arg8, float arg9, float argA, float argB, float argC, float sp30.x = argB; sp30.y = argC; sp30.z = argD; - PSVECSubtract(&sp30, &sp3C, &sp24); + VECSubtract(&sp30, &sp3C, &sp24); Center = sp30; var_f30 = (sp24.x * sp24.x) + (sp24.z * sp24.z); CRot.x = atan2d(sp24.y, sqrtf(var_f30)); CRot.y = atan2d(-sp24.x, -sp24.z); CRot.z = 0.0f; - CZoom = PSVECMag(&sp24); + CZoom = VECMag(&sp24); } float fn_1_488C(float arg8, float arg9, float argA) diff --git a/src/REL/m443Dll/map.c b/src/REL/m443Dll/map.c index 48aef505..d79414dc 100644 --- a/src/REL/m443Dll/map.c +++ b/src/REL/m443Dll/map.c @@ -132,11 +132,11 @@ void fn_1_4D14(omObjData *object) var_r30 = fn_1_40AC(lbl_1_data_240[var_r29 + 1]); mtxRot(sp5C, var_r30->unk_28.x, var_r30->unk_28.y, 0.0f); sp8.z = var_r30->unk_34; - PSMTXMultVec(sp5C, &sp8, &sp14); - PSVECAdd(&var_r30->unk_1C, &sp14, &sp20); + MTXMultVec(sp5C, &sp8, &sp14); + VECAdd(&var_r30->unk_1C, &sp14, &sp20); sp2C[var_r29].y += var_f31; - PSMTXMultVec(sp5C, &sp2C[var_r29], &sp14); - PSVECAdd(&sp20, &sp14, &sp20); + MTXMultVec(sp5C, &sp2C[var_r29], &sp14); + VECAdd(&sp20, &sp14, &sp20); Hu3DModelPosSetV(object->model[var_r29 + 9], &sp20); Hu3DModelRotSet(object->model[var_r29 + 9], var_r30->unk_28.x, var_r30->unk_28.y, 0.0f); Hu3DModelScaleSet(object->model[var_r29 + 9], 0.15f, 0.15f, 0.15f); diff --git a/src/REL/m443Dll/player.c b/src/REL/m443Dll/player.c index ee7e5237..fb293d09 100644 --- a/src/REL/m443Dll/player.c +++ b/src/REL/m443Dll/player.c @@ -382,7 +382,7 @@ void fn_1_5BD4(omObjData *object) break; } fn_1_7340(object); - PSVECAdd(&temp_r31->unkC4, &temp_r31->unkD0, &temp_r31->unkC4); + VECAdd(&temp_r31->unkC4, &temp_r31->unkD0, &temp_r31->unkC4); fn_1_7130(object); fn_1_69B4(object); @@ -428,11 +428,11 @@ void fn_1_6458(omObjData *object) var_r29 = 1; } fn_1_7340(object); - PSVECAdd(&temp_r31->unkC4, &temp_r31->unkD0, &temp_r31->unkC4); + VECAdd(&temp_r31->unkC4, &temp_r31->unkD0, &temp_r31->unkC4); fn_1_7130(object); fn_1_69B4(object); temp_r31->unk100->unk_1C = temp_r31->unkDC; - PSVECAdd(&temp_r31->unk100->unk_1C, &temp_r31->unk100->unk_54, &temp_r31->unk100->unk_1C); + VECAdd(&temp_r31->unk100->unk_1C, &temp_r31->unk100->unk_54, &temp_r31->unk100->unk_1C); if ((fn_1_42E4() == 3) && (var_r29 != 0)) { fn_1_43AC(object->work[0]); temp_r31->unk108 = 0; @@ -451,11 +451,11 @@ void fn_1_6674(omObjData *object) temp_r31->unk14 = 0; temp_r31->unk18 = 0.0f; fn_1_7340(object); - PSVECAdd(&temp_r31->unkC4, &temp_r31->unkD0, &temp_r31->unkC4); + VECAdd(&temp_r31->unkC4, &temp_r31->unkD0, &temp_r31->unkC4); fn_1_7130(object); fn_1_69B4(object); temp_r31->unk100->unk_1C = temp_r31->unkDC; - PSVECAdd(&temp_r31->unk100->unk_1C, &temp_r31->unk100->unk_54, &temp_r31->unk100->unk_1C); + VECAdd(&temp_r31->unk100->unk_1C, &temp_r31->unk100->unk_54, &temp_r31->unk100->unk_1C); if (fn_1_42E4() == 5) { temp_r31->unk1C = 0; temp_r31->unk34 = 0; @@ -468,7 +468,7 @@ void fn_1_6750(omObjData *object) M443DllWorkStruct *temp_r31; temp_r31 = object->data; - PSVECAdd(&temp_r31->unkC4, &temp_r31->unkD0, &temp_r31->unkC4); + VECAdd(&temp_r31->unkC4, &temp_r31->unkD0, &temp_r31->unkC4); fn_1_7130(object); fn_1_69B4(object); switch (temp_r31->unk34) { @@ -673,9 +673,9 @@ void fn_1_7130(omObjData *object) for (var_r28 = 0; var_r28 < 4; var_r28++) { if (var_r29 != var_r28) { temp_r30 = lbl_1_bss_90[var_r28]->data; - PSVECSubtract(&temp_r31->unkC4, &temp_r30->unkC4, &sp8); + VECSubtract(&temp_r31->unkC4, &temp_r30->unkC4, &sp8); sp8.y = 0.0f; - var_f31 = PSVECMag(&sp8); + var_f31 = VECMag(&sp8); if (var_f31 < (temp_r31->unkC0 + temp_r30->unkC0)) { if (var_f31 > 0.0f) { var_f31 = 0.5f * ((temp_r31->unkC0 + temp_r30->unkC0) - var_f31); @@ -685,10 +685,10 @@ void fn_1_7130(omObjData *object) sp8.x = (frandmod(0x3E8) - 0x1F4); sp8.z = (frandmod(0x3E8) - 0x1F4); } - PSVECNormalize(&sp8, &sp8); - PSVECScale(&sp8, &sp8, var_f31); - PSVECAdd(&temp_r31->unkC4, &sp8, &temp_r31->unkC4); - PSVECSubtract(&temp_r30->unkC4, &sp8, &temp_r30->unkC4); + VECNormalize(&sp8, &sp8); + VECScale(&sp8, &sp8, var_f31); + VECAdd(&temp_r31->unkC4, &sp8, &temp_r31->unkC4); + VECSubtract(&temp_r30->unkC4, &sp8, &temp_r30->unkC4); } } } @@ -1139,7 +1139,7 @@ void fn_1_8E34(s32 arg0) for (var_r29 = 0; var_r29 < temp_r30->unk_30; var_r29++, var_r31++) { if (var_r31->unk00_s16 != 0) { - PSVECAdd(&var_r31->unk34, &var_r31->unk08, &var_r31->unk34); + VECAdd(&var_r31->unk34, &var_r31->unk08, &var_r31->unk34); var_r31->unk08.z -= 0.3f; var_r31->unk2C += 2.0f; var_r31->unk40.a *= 0.98f; diff --git a/src/REL/m447dll/block.c b/src/REL/m447dll/block.c index fcd1280b..939c795b 100755 --- a/src/REL/m447dll/block.c +++ b/src/REL/m447dll/block.c @@ -161,13 +161,13 @@ void fn_1_9374(UnkM447Struct_01 *arg0) Mtx sp8; temp_r30 = &Hu3DData[arg0->unk58[arg0->unk00]]; - PSMTXIdentity(temp_r30->unk_F0); - PSMTXRotRad(sp8, 'x', MTXDegToRad(arg0->unk1C.x)); - PSMTXConcat(temp_r30->unk_F0, sp8, temp_r30->unk_F0); - PSMTXRotRad(sp8, 'y', MTXDegToRad(arg0->unk1C.y)); - PSMTXConcat(temp_r30->unk_F0, sp8, temp_r30->unk_F0); - PSMTXRotRad(sp8, 'z', MTXDegToRad(arg0->unk1C.z)); - PSMTXConcat(temp_r30->unk_F0, sp8, temp_r30->unk_F0); + MTXIdentity(temp_r30->unk_F0); + MTXRotRad(sp8, 'x', MTXDegToRad(arg0->unk1C.x)); + MTXConcat(temp_r30->unk_F0, sp8, temp_r30->unk_F0); + MTXRotRad(sp8, 'y', MTXDegToRad(arg0->unk1C.y)); + MTXConcat(temp_r30->unk_F0, sp8, temp_r30->unk_F0); + MTXRotRad(sp8, 'z', MTXDegToRad(arg0->unk1C.z)); + MTXConcat(temp_r30->unk_F0, sp8, temp_r30->unk_F0); Hu3DModelPosSet(arg0->unk58[arg0->unk00], arg0->unk10.x, arg0->unk10.y, arg0->unk10.z); Hu3DModelPosSet(arg0->unk58[20], arg0->unk10.x, arg0->unk10.y - 100.0f, arg0->unk10.z); Hu3DModelPosSet(arg0->unk58[21], arg0->unk10.x, arg0->unk10.y, arg0->unk10.z + 120.0f * arg0->unk54); diff --git a/src/REL/m448Dll/main.c b/src/REL/m448Dll/main.c index 1ee1eb09..0fccc340 100755 --- a/src/REL/m448Dll/main.c +++ b/src/REL/m448Dll/main.c @@ -201,7 +201,7 @@ void fn_1_4FC(ModelData *model, Mtx matrix) GXSetViewport(0.0f, 0.0f, 640.0f, 480.0f, 0.0f, 1.0f); C_MTXOrtho(sp98, 0.0f, 1.0f, 0.0f, 1.0f, 0.0f, 1.0f); GXSetProjection(sp98, GX_ORTHOGRAPHIC); - PSMTXIdentity(spC8); + MTXIdentity(spC8); GXLoadPosMtxImm(spC8, GX_PNMTX0); GXSetNumTevStages(1); GXSetNumTexGens(1); @@ -454,8 +454,8 @@ void fn_1_1338(omObjData *arg0) sp178 = lbl_1_rodata_100; sp178.x = var_f20; sp178.z = -sp118; - PSMTXRotRad(sp184, 'y', MTXDegToRad(CRot.y)); - PSMTXMultVec(sp184, &sp178, &sp178); + MTXRotRad(sp184, 'y', MTXDegToRad(CRot.y)); + MTXMultVec(sp184, &sp178, &sp178); var_f20 = sp178.x; sp118 = -sp178.z; } diff --git a/src/REL/m449Dll/main.c b/src/REL/m449Dll/main.c index be72261b..be902879 100644 --- a/src/REL/m449Dll/main.c +++ b/src/REL/m449Dll/main.c @@ -1288,19 +1288,19 @@ void fn_1_758(omObjData *var_r29) sp124 = ((-90.175 <= lbl_1_bss_18) && (lbl_1_bss_18 <= -90.0f)) != 0 ? -90.175 : ((-90.0f <= lbl_1_bss_18) && (lbl_1_bss_18 <= -89.825) ? -89.825 : lbl_1_bss_18); - PSMTXRotRad(sp304, 0x78, 0.017453292f * (10.0f * var_r31->unk_5C)); - PSMTXRotRad(sp364, 0x7A, 0.017453292f * (10.0f * -var_r31->unk_58)); - PSMTXConcat(sp364, sp304, sp364); - PSMTXRotRad(sp304, 0x79, 0.017453292f * sp124); - PSMTXRotRad(sp334, 0x78, 0.017453292f * (15.0f * var_r31->unk_5C)); - PSMTXConcat(sp334, sp304, sp334); - PSMTXRotRad(sp304, 0x7A, 0.017453292f * (15.0f * -var_r31->unk_58)); - PSMTXConcat(sp304, sp334, sp334); + MTXRotRad(sp304, 0x78, 0.017453292f * (10.0f * var_r31->unk_5C)); + MTXRotRad(sp364, 0x7A, 0.017453292f * (10.0f * -var_r31->unk_58)); + MTXConcat(sp364, sp304, sp364); + MTXRotRad(sp304, 0x79, 0.017453292f * sp124); + MTXRotRad(sp334, 0x78, 0.017453292f * (15.0f * var_r31->unk_5C)); + MTXConcat(sp334, sp304, sp334); + MTXRotRad(sp304, 0x7A, 0.017453292f * (15.0f * -var_r31->unk_58)); + MTXConcat(sp304, sp334, sp334); Hu3DMtxRotGet(sp334, &sp2A8); sp2B4.x = var_r31->unk_60[var_r30]; sp2B4.y = var_r31->unk_70[var_r30]; sp2B4.z = var_r31->unk_80[var_r30]; - PSMTXMultVec(sp364, &sp2B4, &sp2B4); + MTXMultVec(sp364, &sp2B4, &sp2B4); Hu3DModelPosSet(var_r29->model[var_r30 + 0xC], sp2D8.x + sp2B4.x, sp2D8.y + sp2B4.y, sp2D8.z + sp2B4.z); Hu3DModelRotSet(var_r29->model[var_r30 + 0xC], 10.0f * var_r31->unk_5C, 0.0f, 10.0f * -var_r31->unk_58); Hu3DModelRotSet(var_r29->model[var_r30 + 0xC], sp2A8.x, sp2A8.y, sp2A8.z); @@ -1716,7 +1716,7 @@ void fn_1_7F94(ModelData *model, ParticleData *particle, Mtx matrix) var_r31->unk2C = 50.0f; } if (var_r31->unk00_s16 < 0xF0) { - PSVECAdd(&var_r31->unk08, &var_r31->unk34, &var_r31->unk34); + VECAdd(&var_r31->unk08, &var_r31->unk34, &var_r31->unk34); var_r31->unk08.x *= 0.9f; var_r31->unk08.z *= 0.9f; var_r31->unk08.y *= 0.9f; diff --git a/src/REL/m453Dll/main.c b/src/REL/m453Dll/main.c index 2c099d2d..9db313c7 100644 --- a/src/REL/m453Dll/main.c +++ b/src/REL/m453Dll/main.c @@ -941,8 +941,8 @@ void fn_1_23E0(omObjData *object) case 4: var_r24 = fn_1_82AC(sp38); for (var_r30 = 0; var_r30 < var_r24; var_r30++) { - PSVECSubtract(&sp38[var_r30], &var_r31->unk_2C, &sp8); - sp20[var_r30] = PSVECMag(&sp8); + VECSubtract(&sp38[var_r30], &var_r31->unk_2C, &sp8); + sp20[var_r30] = VECMag(&sp8); } for (var_r30 = 0; var_r30 < (var_r24 - 1); var_r30++) { for (var_r29 = var_r30 + 1; var_r29 < var_r24; var_r29++) { @@ -1144,14 +1144,14 @@ s32 fn_1_36DC(void) for (var_r29 = var_r30 + 1; var_r29 < 4; var_r29++) { var_r27 = lbl_1_bss_3C[var_r29]->data; if (var_r27->unk_07 != 0) { - PSVECSubtract(&var_r28->unk_2C, &var_r27->unk_2C, &sp8); - var_f31 = PSVECMag(&sp8); + VECSubtract(&var_r28->unk_2C, &var_r27->unk_2C, &sp8); + var_f31 = VECMag(&sp8); if (var_f31 < 80.0f) { - PSVECNormalize(&sp8, &sp8); + VECNormalize(&sp8, &sp8); var_f30 = 0.0001f + (0.5f * (80.0f - var_f31)); - PSVECScale(&sp8, &sp8, var_f30); - PSVECAdd(&sp14[var_r30], &sp8, &sp14[var_r30]); - PSVECSubtract(&sp14[var_r29], &sp8, &sp14[var_r29]); + VECScale(&sp8, &sp8, var_f30); + VECAdd(&sp14[var_r30], &sp8, &sp14[var_r30]); + VECSubtract(&sp14[var_r29], &sp8, &sp14[var_r29]); var_r28->unk_0E++; var_r27->unk_0E++; var_r26++; @@ -1164,7 +1164,7 @@ s32 fn_1_36DC(void) var_r25 = lbl_1_bss_3C[var_r30]; var_r31 = var_r25->data; if (var_r31->unk_07 != 0) { - PSVECAdd(&var_r31->unk_2C, &sp14[var_r30], &var_r31->unk_2C); + VECAdd(&var_r31->unk_2C, &sp14[var_r30], &var_r31->unk_2C); if (var_r31->unk_2C.x > 660.0f) { var_r31->unk_2C.x = 660.0f; } @@ -1237,8 +1237,8 @@ void fn_1_3BB4(Vec *arg0, Vec *arg1) var_r30 = fn_1_844C(sp18); var_f31 = 2000.0f; for (var_r31 = 0; var_r31 < var_r30; var_r31++) { - PSVECSubtract(&sp18[var_r31], arg0, &spC); - var_f30 = PSVECMag(&spC); + VECSubtract(&sp18[var_r31], arg0, &spC); + var_f30 = VECMag(&spC); if (!(var_f30 >= var_f31)) { var_f31 = var_f30; *arg1 = sp18[var_r31]; @@ -1403,18 +1403,18 @@ void fn_1_4574(Mtx arg0, float arg8, float arg9, float argA) Mtx sp38; Mtx sp8; if (argA != 0.0f) { - PSMTXRotRad(arg0, 0x5A, 0.017453292f * argA); + MTXRotRad(arg0, 0x5A, 0.017453292f * argA); } else { - PSMTXIdentity(arg0); + MTXIdentity(arg0); } if (arg8 != 0.0f) { - PSMTXRotRad(sp38, 0x58, 0.017453292f * arg8); - PSMTXConcat(sp38, arg0, arg0); + MTXRotRad(sp38, 0x58, 0.017453292f * arg8); + MTXConcat(sp38, arg0, arg0); } if (arg9 != 0.0f) { - PSMTXRotRad(sp8, 0x59, 0.017453292f * arg9); - PSMTXConcat(sp8, arg0, arg0); + MTXRotRad(sp8, 0x59, 0.017453292f * arg9); + MTXConcat(sp8, arg0, arg0); } } // TODO figue out type of arg0 @@ -1570,8 +1570,8 @@ void fn_1_5290(float *arg0, float (*arg1)[3], float (*arg2)[3], s32 arg3) arg0[0] = 0.0f; for (var_r30 = 1; var_r30 < arg3; var_r30++) { - PSVECSubtract((Vec *)&arg1[var_r30], (Vec *)&arg1[var_r30 - 1], &sp8); - arg0[var_r30] = arg0[var_r30 - 1] + PSVECMag(&sp8); + VECSubtract((Vec *)&arg1[var_r30], (Vec *)&arg1[var_r30 - 1], &sp8); + arg0[var_r30] = arg0[var_r30 - 1] + VECMag(&sp8); } for (var_r27 = 0; var_r27 < 3; var_r27++) { for (var_r30 = 0; var_r30 < arg3; var_r30++) { diff --git a/src/REL/m453Dll/map.c b/src/REL/m453Dll/map.c index 86a363d1..6771a755 100644 --- a/src/REL/m453Dll/map.c +++ b/src/REL/m453Dll/map.c @@ -514,12 +514,12 @@ void fn_1_6EB4(omObjData *object) Mtx sp8; s32 var_r30; - PSMTXTrans(sp38, object->trans.x, object->trans.y, object->trans.z); + MTXTrans(sp38, object->trans.x, object->trans.y, object->trans.z); mtxRot(sp8, object->rot.x, object->rot.y, object->rot.z); - PSMTXConcat(sp38, sp8, sp38); + MTXConcat(sp38, sp8, sp38); for (var_r30 = 0; var_r30 < 6; var_r30++) { - PSMTXTrans(sp8, lbl_1_data_A88[var_r30].x, lbl_1_data_A88[var_r30].y, lbl_1_data_A88[var_r30].z); - PSMTXConcat(sp38, sp8, sp8); + MTXTrans(sp8, lbl_1_data_A88[var_r30].x, lbl_1_data_A88[var_r30].y, lbl_1_data_A88[var_r30].z); + MTXConcat(sp38, sp8, sp8); Hu3DModelPosSet(object->model[var_r30 + 1], sp8[0][3], sp8[1][3], sp8[2][3]); Hu3DModelRotSet(object->model[var_r30 + 1], object->rot.x, object->rot.y, object->rot.z); } @@ -685,12 +685,12 @@ void fn_1_73C4(omObjData *object) break; } } - PSMTXTrans(sp8, object->trans.x, object->trans.y, object->trans.z); + MTXTrans(sp8, object->trans.x, object->trans.y, object->trans.z); mtxRot(sp38, object->rot.x, object->rot.y, object->rot.z); - PSMTXConcat(sp8, sp38, sp8); + MTXConcat(sp8, sp38, sp8); for (var_r28 = 0; var_r28 < 6; var_r28++) { - PSMTXTrans(sp38, lbl_1_data_A88[var_r28].x, lbl_1_data_A88[var_r28].y, lbl_1_data_A88[var_r28].z); - PSMTXConcat(sp8, sp38, sp38); + MTXTrans(sp38, lbl_1_data_A88[var_r28].x, lbl_1_data_A88[var_r28].y, lbl_1_data_A88[var_r28].z); + MTXConcat(sp8, sp38, sp38); Hu3DModelPosSet(object->model[var_r28 + 1], sp38[0][3], sp38[1][3], sp38[2][3]); Hu3DModelRotSet(object->model[var_r28 + 1], object->rot.x, object->rot.y, object->rot.z); } @@ -825,16 +825,16 @@ s32 fn_1_7CE0(float arg8, float arg9, Vec *arg0) var_r28 -= 6; fn_1_7BB0(var_r27, &sp10); sp10 = lbl_1_data_A88[var_r27]; - PSMTXTrans(sp4C, var_r31->trans.x, var_r31->trans.y, var_r31->trans.z); + MTXTrans(sp4C, var_r31->trans.x, var_r31->trans.y, var_r31->trans.z); mtxRot(sp1C, var_r31->rot.x, var_r31->rot.y, var_r31->rot.z); - PSMTXConcat(sp4C, sp1C, sp4C); - PSMTXTrans(sp1C, sp10.x, sp10.y, sp10.z); - PSMTXConcat(sp4C, sp1C, sp4C); + MTXConcat(sp4C, sp1C, sp4C); + MTXTrans(sp1C, sp10.x, sp10.y, sp10.z); + MTXConcat(sp4C, sp1C, sp4C); var_r30 = lbl_1_data_AFC[var_r28]; var_r23 = lbl_1_data_B14[var_r28]; for (var_r24 = 0; var_r24 < var_r23; var_r24++) { - PSMTXTrans(sp1C, var_r30->x, var_r30->y, var_r30->z); - PSMTXConcat(sp4C, sp1C, sp1C); + MTXTrans(sp1C, var_r30->x, var_r30->y, var_r30->z); + MTXConcat(sp4C, sp1C, sp1C); arg0->x = sp1C[0][3]; arg0->y = sp1C[1][3]; arg0->z = sp1C[2][3]; @@ -930,17 +930,17 @@ s32 fn_1_844C(Vec *arg0) var_r30 = lbl_1_bss_A4[lbl_1_bss_9C]; var_r27 = var_r30->data; var_r23 = fn_1_8250(var_r27, sp8); - PSMTXTrans(sp50, var_r30->trans.x, var_r30->trans.y, var_r30->trans.z); + MTXTrans(sp50, var_r30->trans.x, var_r30->trans.y, var_r30->trans.z); mtxRot(sp20, var_r30->rot.x, var_r30->rot.y, var_r30->rot.z); - PSMTXConcat(sp50, sp20, sp50); + MTXConcat(sp50, sp20, sp50); for (var_r29 = 0; var_r29 < var_r23; var_r29++) { fn_1_7BB0(sp8[var_r29], arg0); var_r26 = fn_1_7BFC(var_r27, sp8[var_r29]) - 6; arg0->x += lbl_1_data_B2C[var_r26].x; arg0->y += lbl_1_data_B2C[var_r26].y; arg0->z += lbl_1_data_B2C[var_r26].z; - PSMTXTrans(sp20, arg0->x, arg0->y, arg0->z); - PSMTXConcat(sp50, sp20, sp20); + MTXTrans(sp20, arg0->x, arg0->y, arg0->z); + MTXConcat(sp50, sp20, sp20); arg0->x = sp20[0][3]; arg0->y = sp20[1][3]; arg0->z = sp20[2][3]; @@ -991,7 +991,7 @@ s32 fn_1_867C(Vec *arg0, Vec *arg1) if ((var_r28->rot.x > 0.0f) || (var_r28->rot.x <= -90.0f)) { return 0; } - PSVECSubtract(arg0, &var_r28->trans, &sp3C); + VECSubtract(arg0, &var_r28->trans, &sp3C); sp3C.z = sp3C.z / cosd(var_r28->rot.x); var_f24 = arg0->z; var_f25 = arg0->x; @@ -1002,29 +1002,29 @@ s32 fn_1_867C(Vec *arg0, Vec *arg1) } var_r24 -= 6; sp48 = lbl_1_data_A88[var_r19]; - PSVECSubtract(&sp3C, &sp48, &sp3C); + VECSubtract(&sp3C, &sp48, &sp3C); var_r30 = lbl_1_data_B74[var_r24][0]; var_r29 = lbl_1_data_B74[var_r24][1]; var_r21 = lbl_1_data_BA4[var_r24]; for (var_r31 = 0; var_r31 < var_r21; var_r31++) { var_r27 = (var_r31 + 1) % var_r21; - PSVECSubtract(var_r30 + var_r27, var_r30 + var_r31, &sp24); - PSVECSubtract(&sp3C, var_r30 + var_r27, &sp18); - PSVECCrossProduct(&sp24, &sp18, &spC); + VECSubtract(var_r30 + var_r27, var_r30 + var_r31, &sp24); + VECSubtract(&sp3C, var_r30 + var_r27, &sp18); + VECCrossProduct(&sp24, &sp18, &spC); if (!(spC.y < 0.0f)) { - PSVECSubtract(var_r29 + var_r27, var_r30 + var_r27, &sp24); - PSVECSubtract(&sp3C, var_r29 + var_r27, &sp18); - PSVECCrossProduct(&sp24, &sp18, &spC); + VECSubtract(var_r29 + var_r27, var_r30 + var_r27, &sp24); + VECSubtract(&sp3C, var_r29 + var_r27, &sp18); + VECCrossProduct(&sp24, &sp18, &spC); if (!(spC.y < 0.0f)) { - PSVECSubtract(var_r29 + var_r31, var_r29 + var_r27, &sp24); - PSVECSubtract(&sp3C, var_r29 + var_r31, &sp18); - PSVECCrossProduct(&sp24, &sp18, &spC); + VECSubtract(var_r29 + var_r31, var_r29 + var_r27, &sp24); + VECSubtract(&sp3C, var_r29 + var_r31, &sp18); + VECCrossProduct(&sp24, &sp18, &spC); if (!(spC.y < 0.0f)) { - PSVECSubtract(var_r30 + var_r31, var_r29 + var_r31, &sp24); - PSVECSubtract(&sp3C, var_r30 + var_r31, &sp18); - PSVECCrossProduct(&sp24, &sp18, &spC); + VECSubtract(var_r30 + var_r31, var_r29 + var_r31, &sp24); + VECSubtract(&sp3C, var_r30 + var_r31, &sp18); + VECCrossProduct(&sp24, &sp18, &spC); if (!(spC.y < 0.0f)) { - PSVECSubtract(var_r30 + var_r27, var_r30 + var_r31, &sp24); + VECSubtract(var_r30 + var_r27, var_r30 + var_r31, &sp24); var_f30 = (((sp3C.z * sp24.z) + (((sp3C.y * sp24.y) + ((sp3C.x * sp24.x) - (sp24.x * var_r30[var_r31].x))) - (sp24.y * var_r30[var_r31].y))) - (sp24.z * var_r30[var_r31].z)) @@ -1032,9 +1032,9 @@ s32 fn_1_867C(Vec *arg0, Vec *arg1) sp30.x = var_r30[var_r31].x + (var_f30 * sp24.x); sp30.y = var_r30[var_r31].y + (var_f30 * sp24.y); sp30.z = var_r30[var_r31].z + (var_f30 * sp24.z); - PSVECSubtract(&sp30, &sp3C, &spC); - var_f28 = PSVECMag(&spC); - PSVECSubtract(var_r29 + var_r27, var_r29 + var_r31, &sp18); + VECSubtract(&sp30, &sp3C, &spC); + var_f28 = VECMag(&spC); + VECSubtract(var_r29 + var_r27, var_r29 + var_r31, &sp18); var_f29 = (((sp3C.z * sp18.z) + (((sp3C.y * sp18.y) + ((sp3C.x * sp18.x) - (sp18.x * var_r29[var_r31].x))) - (sp18.y * var_r29[var_r31].y))) - (sp18.z * var_r29[var_r31].z)) @@ -1042,8 +1042,8 @@ s32 fn_1_867C(Vec *arg0, Vec *arg1) sp30.x = var_r29[var_r31].x + (var_f29 * sp18.x); sp30.y = var_r29[var_r31].y + (var_f29 * sp18.y); sp30.z = var_r29[var_r31].z + (var_f29 * sp18.z); - PSVECSubtract(&sp30, &sp3C, &spC); - var_f27 = PSVECMag(&spC); + VECSubtract(&sp30, &sp3C, &spC); + var_f27 = VECMag(&spC); if (var_f28 == 0.0f) { var_f31 = var_f30; } diff --git a/src/REL/m455Dll/main.c b/src/REL/m455Dll/main.c index fa1c4b5b..667d1084 100644 --- a/src/REL/m455Dll/main.c +++ b/src/REL/m455Dll/main.c @@ -67,7 +67,7 @@ void ObjectSetup(void) lbl_1_bss_8.x = lbl_1_data_44.x - lbl_1_data_38.x; lbl_1_bss_8.y = lbl_1_data_44.y - lbl_1_data_38.y; lbl_1_bss_8.z = lbl_1_data_44.z - lbl_1_data_38.z; - PSVECNormalize(&lbl_1_bss_8, &lbl_1_bss_8); + VECNormalize(&lbl_1_bss_8, &lbl_1_bss_8); light = Hu3DGLightCreateV(&lbl_1_data_38, &lbl_1_bss_8, &lbl_1_data_50); Hu3DGLightInfinitytSet(light); Hu3DGLightStaticSet(light, 1); diff --git a/src/REL/m456Dll/main.c b/src/REL/m456Dll/main.c index 9c760c47..97e8ffb5 100644 --- a/src/REL/m456Dll/main.c +++ b/src/REL/m456Dll/main.c @@ -146,7 +146,7 @@ void ObjectSetup(void) lbl_1_bss_8.x = lbl_1_data_44.x - lbl_1_data_38.x; lbl_1_bss_8.y = lbl_1_data_44.y - lbl_1_data_38.y; lbl_1_bss_8.z = lbl_1_data_44.z - lbl_1_data_38.z; - PSVECNormalize(&lbl_1_bss_8, &lbl_1_bss_8); + VECNormalize(&lbl_1_bss_8, &lbl_1_bss_8); var_r29 = Hu3DGLightCreateV(&lbl_1_data_38, &lbl_1_bss_8, &lbl_1_data_50); Hu3DGLightInfinitytSet(var_r29); Hu3DGLightStaticSet(var_r29, 1); @@ -714,7 +714,7 @@ void fn_1_1304(omObjData *var_r30) var_r28 = 0x40000001; if ((fn_1_3B0() == 5) && (var_r31->unk_00_field3 == 0) && (lbl_1_bss_64 == 1)) { var_r25 = omGetGroupMemberListEx(HuPrcCurrentGet(), 0); - PSVECSubtract(&var_r25[*lbl_1_bss_70]->trans, &var_r30->trans, &sp8); + VECSubtract(&var_r25[*lbl_1_bss_70]->trans, &var_r30->trans, &sp8); var_r30->rot.y = fn_1_2090(var_r30->rot.y, atan2d(sp8.x, sp8.z), 0.1f); } if (fn_1_3B0() == 0xB) { diff --git a/src/REL/m458Dll/main.c b/src/REL/m458Dll/main.c index f7242c46..3b261cd0 100644 --- a/src/REL/m458Dll/main.c +++ b/src/REL/m458Dll/main.c @@ -329,8 +329,8 @@ void fn_1_4C8(omObjData *object) Vec sp1B0 = { 0.0f, 0.0f, 0.0f }; sp1B0.x = var_f31; sp1B0.z = var_f30; - PSMTXRotRad(sp1E0, 0x79, 0.017453292f * CRot.y); - PSMTXMultVec(sp1E0, &sp1B0, &sp1B0); + MTXRotRad(sp1E0, 0x79, 0.017453292f * CRot.y); + MTXMultVec(sp1E0, &sp1B0, &sp1B0); var_f31 = sp1B0.x; var_f30 = sp1B0.z; } diff --git a/src/REL/m460Dll/main.c b/src/REL/m460Dll/main.c index 123f1c3e..52ca989b 100644 --- a/src/REL/m460Dll/main.c +++ b/src/REL/m460Dll/main.c @@ -153,7 +153,7 @@ void ObjectSetup(void) sp8.x = sp8.z = 0.0f; sp8.y = lbl_1_data_18.z; mtxRot(sp2C, lbl_1_data_18.x, lbl_1_data_18.y, 0.0f); - PSMTXMultVec(sp2C, &sp8, &lbl_1_data_28); + MTXMultVec(sp2C, &sp8, &lbl_1_data_28); Hu3DGLightPosAimSetV(lbl_1_bss_1A[0], &lbl_1_data_28, &lbl_1_data_40); Hu3DShadowPosSet(&lbl_1_data_28, &lbl_1_data_34, &lbl_1_data_40); lbl_1_bss_18 = lbl_1_bss_16 = lbl_1_bss_14 = lbl_1_bss_12 = lbl_1_bss_10 = -1; @@ -474,15 +474,15 @@ void fn_1_2564(omObjData *object) var_f31 *= -1.0f; } var_f31 = object->work[0] / var_f31; - PSVECSubtract(&lbl_1_data_4C[object->work[1] + var_r24], &lbl_1_data_4C[object->work[1]], &sp20); - PSVECScale(&sp20, &sp20, var_f31); - PSVECAdd(&lbl_1_data_4C[object->work[1]], &sp20, &sp20); + VECSubtract(&lbl_1_data_4C[object->work[1] + var_r24], &lbl_1_data_4C[object->work[1]], &sp20); + VECScale(&sp20, &sp20, var_f31); + VECAdd(&lbl_1_data_4C[object->work[1]], &sp20, &sp20); Center.x = sp20.x; Center.y = sp20.y; Center.z = sp20.z; - PSVECSubtract(&lbl_1_data_70[object->work[1] + var_r24], &lbl_1_data_70[object->work[1]], &sp20); - PSVECScale(&sp20, &sp20, var_f31); - PSVECAdd(&lbl_1_data_70[object->work[1]], &sp20, &sp20); + VECSubtract(&lbl_1_data_70[object->work[1] + var_r24], &lbl_1_data_70[object->work[1]], &sp20); + VECScale(&sp20, &sp20, var_f31); + VECAdd(&lbl_1_data_70[object->work[1]], &sp20, &sp20); CRot.x = sp20.x; CRot.y = sp20.y; CRot.z = 0.0f; @@ -683,8 +683,8 @@ void fn_1_3618(omObjData *var_r28) sp10[2] = var_r31->unk_44.unk_08 * var_r31->unk_40; sp10[3] = var_r31->unk_44.unk_0C * var_r31->unk_40; Hu3DCameraPerspectiveSet(var_r31->unk_3C, var_r31->unk_10, var_r31->unk_14, var_r31->unk_18, var_f31); - Hu3DCameraViewportSet( - var_r31->unk_3C, var_r31->unk_44.unk_00 - (0.5f * sp10[2]), var_r31->unk_44.unk_04 - (0.5f * sp10[3]), sp10[2], sp10[3], 0.0f, 1.0f); + Hu3DCameraViewportSet(var_r31->unk_3C, var_r31->unk_44.unk_00 - (0.5f * sp10[2]), var_r31->unk_44.unk_04 - (0.5f * sp10[3]), sp10[2], + sp10[3], 0.0f, 1.0f); sp10[0] = var_r31->unk_44.unk_00 - (0.5f * sp10[2]); sp10[1] = var_r31->unk_44.unk_04 - (0.5f * sp10[3]); sp8[0] = var_r31->unk_44.unk_00 + (0.5f * sp10[2]); @@ -731,7 +731,7 @@ void fn_1_3BC0(ModelData *model, Mtx mtx) DCStoreRange(&lbl_1_data_B8, 4); C_MTXPerspective(spC, 41.5f, 1.2f, 100.0f, 5500.0f); GXSetProjection(spC, GX_PERSPECTIVE); - PSMTXIdentity(sp3C); + MTXIdentity(sp3C); GXLoadPosMtxImm(sp3C, 0); GXSetNumChans(1); GXSetChanCtrl(GX_COLOR0A0, GX_FALSE, GX_SRC_REG, GX_SRC_VTX, 0, GX_DF_CLAMP, GX_AF_NONE); @@ -948,12 +948,12 @@ void fn_1_4388(Vec *sp8, Vec *var_r31) float var_f30; float var_f29; - PSVECSubtract(var_r31, sp8, &sp10); + VECSubtract(var_r31, sp8, &sp10); Center = *var_r31; CRot.x = atan2d(sp10.y, sqrtf((sp10.x * sp10.x) + (sp10.z * sp10.z))); CRot.y = atan2d(-sp10.x, -sp10.z); CRot.z = 0.0f; - CZoom = PSVECMag(&sp10); + CZoom = VECMag(&sp10); } void fn_1_4590(float arg8, float arg9, float argA, float argB, float argC, float argD) @@ -968,12 +968,12 @@ void fn_1_4590(float arg8, float arg9, float argA, float argB, float argC, float sp30.x = argB; sp30.y = argC; sp30.z = argD; - PSVECSubtract(&sp30, &sp3C, &sp24); + VECSubtract(&sp30, &sp3C, &sp24); Center = sp30; CRot.x = atan2d(sp24.y, sqrtf((sp24.x * sp24.x) + (sp24.z * sp24.z))); CRot.y = atan2d(-sp24.x, -sp24.z); CRot.z = 0.0f; - CZoom = PSVECMag(&sp24); + CZoom = VECMag(&sp24); } float fn_1_47D0(float arg8, float arg9, float argA) diff --git a/src/REL/m460Dll/map.c b/src/REL/m460Dll/map.c index c2fea221..609dad13 100644 --- a/src/REL/m460Dll/map.c +++ b/src/REL/m460Dll/map.c @@ -270,9 +270,9 @@ void fn_1_6C00(omObjData *object) fn_1_7DA8(object, &sp14, 1); } } - PSVECSubtract(&var_r31->unk_48, &var_r31->unk_3C, &sp8); - PSVECScale(&sp8, &sp8, 0.4f); - PSVECAdd(&var_r31->unk_3C, &sp8, &sp14); + VECSubtract(&var_r31->unk_48, &var_r31->unk_3C, &sp8); + VECScale(&sp8, &sp8, 0.4f); + VECAdd(&var_r31->unk_3C, &sp8, &sp14); sp14.y += var_r31->unk_34; Hu3DModelPosSetV(var_r31->unk_2C, &sp14); var_r31->unk_30++; @@ -366,7 +366,7 @@ void fn_1_7790(ModelData *model, Mtx mtx) DCStoreRange(&lbl_1_data_378, 4); C_MTXPerspective(sp2C, 41.5f, 1.2f, 100.0f, 5500.0f); GXSetProjection(sp2C, GX_PERSPECTIVE); - PSMTXIdentity(sp5C); + MTXIdentity(sp5C); GXLoadPosMtxImm(sp5C, 0); GXSetNumChans(1); GXSetChanCtrl(GX_COLOR0A0, 0, GX_SRC_REG, GX_SRC_VTX, 0, GX_DF_CLAMP, GX_AF_NONE); @@ -409,7 +409,7 @@ void fn_1_7B94(s32 arg0) var_r30 = Hu3DData[arg0].unk_120; for (var_r31 = var_r30->unk_48, var_r29 = 0; var_r29 < var_r30->unk_30; var_r29++, var_r31++) { if (var_r31->unk00_s16 != 0) { - PSVECAdd(&var_r31->unk34, &var_r31->unk08, &var_r31->unk34); + VECAdd(&var_r31->unk34, &var_r31->unk08, &var_r31->unk34); switch (var_r31->unk02) { case 0: var_r31->unk2C += 1.0f; @@ -464,7 +464,7 @@ void fn_1_7DA8(omObjData *object, Vec *arg1, u32 arg2) sp1C.x = 100.0f * ((0.0026f * frandmod(0x3E8)) - 1.3f); sp1C.y = 0.0f; sp1C.z = 100.0f * ((0.000100000005f * frandmod(0x3E8)) - 0.05f); - PSVECAdd(&sp1C, arg1, &var_r31->unk34); + VECAdd(&sp1C, arg1, &var_r31->unk34); var_r31->unk30 = 0.0031415902f * frandmod(0x3E8); switch (arg2) { case 0: @@ -485,7 +485,7 @@ void fn_1_7DA8(omObjData *object, Vec *arg1, u32 arg2) if (frandmod(0x3E8) < 0x1F4) { sp1C.x *= -1.0f; } - PSVECAdd(&sp1C, arg1, &var_r31->unk34); + VECAdd(&sp1C, arg1, &var_r31->unk34); var_r31->unk00 = 60.0f * (0.2f + (0.0005f * frandmod(0x3E8))); var_r31->unk08.x = 1.6666667f * ((0.000100000005f * frandmod(0x3E8)) - 0.05f); var_r31->unk08.y = -1.6666667f * (0.2f + (0.0003f * frandmod(0x3E8))); diff --git a/src/REL/m460Dll/player.c b/src/REL/m460Dll/player.c index 740af4a2..ccb4b58e 100644 --- a/src/REL/m460Dll/player.c +++ b/src/REL/m460Dll/player.c @@ -218,7 +218,7 @@ void fn_1_4F6C(omObjData *object) } break; } - PSVECAdd(&var_r31->unk_60, &var_r31->unk_6C, &var_r31->unk_60); + VECAdd(&var_r31->unk_60, &var_r31->unk_6C, &var_r31->unk_60); fn_1_57D8(object); if (fn_1_414C() == 2) { var_r31->unk_2C = 0; @@ -343,7 +343,7 @@ void fn_1_5168(omObjData *object) break; } } - PSVECAdd(&var_r31->unk_60, &var_r31->unk_6C, &var_r31->unk_60); + VECAdd(&var_r31->unk_60, &var_r31->unk_6C, &var_r31->unk_60); fn_1_57D8(object); if ((fn_1_4164() == 5) && (var_r27 != 0)) { var_r31->unk_2C = 0; @@ -390,7 +390,7 @@ void fn_1_55EC(omObjData *object) fn_1_5CE0(object, 0); break; } - PSVECAdd(&var_r31->unk_60, &var_r31->unk_6C, &var_r31->unk_60); + VECAdd(&var_r31->unk_60, &var_r31->unk_6C, &var_r31->unk_60); fn_1_57D8(object); if (var_r31->unk_84 >= 0) { sp8 = var_r31->unk_60; @@ -426,15 +426,15 @@ s32 fn_1_58C8(omObjData *object, float arg8, float arg9) var_r31 = object->data; var_r30 = 0; - PSVECSubtract(&var_r31->unk_78, &var_r31->unk_60, &spC); + VECSubtract(&var_r31->unk_78, &var_r31->unk_60, &spC); spC.y = 0.0f; - var_f31 = PSVECMag(&spC); + var_f31 = VECMag(&spC); if (var_f31 < arg9) { var_f31 = 0.0f; var_r30 = 1; } else { - if (PSVECMag(&spC) >= 100.0f) { + if (VECMag(&spC) >= 100.0f) { var_f31 = 100.0f; } var_f31 = 0.2f + (0.008f * var_f31); @@ -636,12 +636,12 @@ void fn_1_61F4(omObjData *object) object->trans.z += 11.666667f; } else { - var_f31 = PSVECMag(&sp10); + var_f31 = VECMag(&sp10); if (var_f31 < 20.0f) { var_f31 = 0.0f; } else { - if (PSVECMag(&sp10) >= 100.0f) { + if (VECMag(&sp10) >= 100.0f) { var_f31 = 100.0f; } var_f31 = 0.2f + (0.008f * var_f31); diff --git a/src/REL/m461Dll/main.c b/src/REL/m461Dll/main.c index 2c18e8cd..0d20a7d3 100644 --- a/src/REL/m461Dll/main.c +++ b/src/REL/m461Dll/main.c @@ -403,9 +403,9 @@ void fn_1_1D70(s16 arg0, char *arg1, Vec *arg2, Mtx arg3) var_r30 = &Hu3DData[arg0]; Hu3DModelObjMtxGet(arg0, arg1, spC); - PSMTXConcat(var_r30->unk_F0, spC, spC); + MTXConcat(var_r30->unk_F0, spC, spC); if (NULL != arg3) { - PSMTXCopy(spC, arg3); + MTXCopy(spC, arg3); } arg2->x = spC[0][3]; arg2->y = spC[1][3]; @@ -1186,7 +1186,8 @@ s32 lbl_1_data_128[8][5] = { 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] = { DATA_MAKE_NUM(DATADIR_M461, 0x04), DATA_MAKE_NUM(DATADIR_M461, 0x05), DATA_MAKE_NUM(DATADIR_M461, 0x06), DATA_MAKE_NUM(DATADIR_M461, 0x07) }; +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 }; diff --git a/src/REL/m462Dll/main.c b/src/REL/m462Dll/main.c index 7efd0602..ff5c24f1 100755 --- a/src/REL/m462Dll/main.c +++ b/src/REL/m462Dll/main.c @@ -78,9 +78,9 @@ void fn_1_44D8(void); void fn_1_4BC4(void); void fn_1_69C0(void); void fn_1_7D40(void); -void fn_1_545C(ModelData* model, ParticleData* particle, Mtx matrix); -void fn_1_594C(ModelData* model, ParticleData* particle, Mtx matrix); -void fn_1_5DE4(ModelData* model, ParticleData* particle, Mtx matrix); +void fn_1_545C(ModelData *model, ParticleData *particle, Mtx matrix); +void fn_1_594C(ModelData *model, ParticleData *particle, Mtx matrix); +void fn_1_5DE4(ModelData *model, ParticleData *particle, Mtx matrix); void fn_1_7DA0(void); s32 fn_1_1880(float arg0, float arg1, float arg2, s32 arg3, s32 arg4); @@ -93,48 +93,28 @@ s32 lbl_1_bss_3D8; StructBss340 lbl_1_bss_340[1]; StructBss70 lbl_1_bss_70[10]; StructBss70 lbl_1_bss_28; -omObjData* lbl_1_bss_24; +omObjData *lbl_1_bss_24; Vec lbl_1_bss_18; Vec lbl_1_bss_C; Vec lbl_1_bss_0; s32 lbl_1_data_0[] = { 0, 1, 2, 3, 4, 5, 6, 7 }; -s32 lbl_1_data_20[] = { - DATA_MAKE_NUM(DATADIR_MARIOMOT, 79), - DATA_MAKE_NUM(DATADIR_MARIOMOT, 27), - DATA_MAKE_NUM(DATADIR_MARIOMOT, 75), - DATA_MAKE_NUM(DATADIR_MARIOMOT, 22) -}; +s32 lbl_1_data_20[] = { DATA_MAKE_NUM(DATADIR_MARIOMOT, 79), DATA_MAKE_NUM(DATADIR_MARIOMOT, 27), DATA_MAKE_NUM(DATADIR_MARIOMOT, 75), + DATA_MAKE_NUM(DATADIR_MARIOMOT, 22) }; -Vec lbl_1_data_30[] = { - { 0.0f, 0.0f, 35.0f }, - { 0.0f, 0.0f, 35.0f }, - { 0.0f, 0.0f, 35.0f }, - { 0.0f, 0.0f, 35.0f }, - { 0.0f, 0.0f, 35.0f }, - { 0.0f, 0.0f, 35.0f }, - { 0.0f, 0.0f, 35.0f }, - { 0.0f, 0.0f, 35.0f } -}; +Vec lbl_1_data_30[] = { { 0.0f, 0.0f, 35.0f }, { 0.0f, 0.0f, 35.0f }, { 0.0f, 0.0f, 35.0f }, { 0.0f, 0.0f, 35.0f }, { 0.0f, 0.0f, 35.0f }, + { 0.0f, 0.0f, 35.0f }, { 0.0f, 0.0f, 35.0f }, { 0.0f, 0.0f, 35.0f } }; -Vec lbl_1_data_90[] = { - { -900.0f, 143.0f, -1020.0f }, - { -677.0f, 143.0f, -1020.0f }, - { 900.0f, 0.0f, -1150.0f }, - { -307.0f, 182.0f, -1575.0f } -}; +Vec lbl_1_data_90[] = { { -900.0f, 143.0f, -1020.0f }, { -677.0f, 143.0f, -1020.0f }, { 900.0f, 0.0f, -1150.0f }, { -307.0f, 182.0f, -1575.0f } }; -s32 lbl_1_data_C0[][5] = { - { 50, 80, 90, 95, 100 }, - { 5, 55, 85, 95, 100 }, - { 0, 5, 55, 90, 100 } -}; +s32 lbl_1_data_C0[][5] = { { 50, 80, 90, 95, 100 }, { 5, 55, 85, 95, 100 }, { 0, 5, 55, 90, 100 } }; float lbl_1_data_FC[] = { 0.3f, 0.5f, 0.7f, 0.9f, 1.0f }; -void ObjectSetup(void) { - Process* temp_r3; +void ObjectSetup(void) +{ + Process *temp_r3; temp_r3 = omInitObjMan(50, 0x2000); omGameSysInit(temp_r3); @@ -172,15 +152,16 @@ void ObjectSetup(void) { WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 60); } -void fn_1_4A0(void) { +void fn_1_4A0(void) +{ float temp_f31; float temp_f30; - void* var_r27; - StructBss340* temp_r31; - StructBss70* temp_r29; - Process* var_r25; - AnimData* var_r24; - AnimData* spC[4]; + void *var_r27; + StructBss340 *temp_r31; + StructBss70 *temp_r29; + Process *var_r25; + AnimData *var_r24; + AnimData *spC[4]; s16 var_r30; s16 var_r23; s16 sp8; @@ -292,7 +273,8 @@ void fn_1_4A0(void) { var_r27 = HuDataSelHeapReadNum(DATA_MAKE_NUM(DATADIR_M462, 12), MEMORY_DEFAULT_NUM, HEAP_DATA); var_r30 = Hu3DModelCreate(var_r27); var_r23 = var_r30; - } else { + } + else { var_r30 = Hu3DModelLink(var_r23); } temp_r29->unk00 = var_r30; @@ -389,7 +371,8 @@ void fn_1_4A0(void) { HuPrcChildCreate(fn_1_7D40, 0x1000, 0x1000, 0, HuPrcCurrentGet()); } -float fn_1_14B4(float arg0) { +float fn_1_14B4(float arg0) +{ while (arg0 >= 360.0f || arg0 < 0.0f) { if (arg0 >= 360.0f) { arg0 -= 360.0f; @@ -401,24 +384,29 @@ float fn_1_14B4(float arg0) { return arg0; } -float fn_1_1534(float arg0, float arg1) { +float fn_1_1534(float arg0, float arg1) +{ float var_f31; if (arg0 > 750.0f - arg1) { var_f31 = 750.0f; - } else if (arg0 < -(750.0f - arg1)) { + } + else if (arg0 < -(750.0f - arg1)) { var_f31 = 750.0f; - } else { + } + else { var_f31 = 750.0f; } return var_f31; } -float fn_1_15B4(float arg0, float arg1) { +float fn_1_15B4(float arg0, float arg1) +{ return fn_1_1534(arg0, arg1); } -void fn_1_1634(void) { +void fn_1_1634(void) +{ float var_f31; float temp_f30; s32 i; @@ -434,7 +422,8 @@ void fn_1_1634(void) { } } -void fn_1_16F8(void) { +void fn_1_16F8(void) +{ s32 i; for (i = 0; i < 6; i++) { @@ -442,7 +431,8 @@ void fn_1_16F8(void) { } } -void fn_1_174C(void) { +void fn_1_174C(void) +{ s32 i; for (i = 0; i < 6; i++) { @@ -450,12 +440,14 @@ void fn_1_174C(void) { } } -void fn_1_17A0(s32 arg0, s32 arg1) { +void fn_1_17A0(s32 arg0, s32 arg1) +{ s32 var_r31; if (arg1 != 0) { var_r31 = 2; - } else { + } + else { var_r31 = 4; } HuSprBankSet(lbl_1_bss_3DC, var_r31, arg0 % 10); @@ -463,13 +455,14 @@ void fn_1_17A0(s32 arg0, s32 arg1) { HuSprAttrReset(lbl_1_bss_3DC, var_r31 + 1, HUSPR_ATTR_DISPOFF); } -s32 fn_1_1880(float arg0, float arg1, float arg2, s32 arg3, s32 arg4) { +s32 fn_1_1880(float arg0, float arg1, float arg2, s32 arg3, s32 arg4) +{ Vec sp34; Vec sp28; Vec sp1C; s32 i; - StructBss70* temp_r30; - StructBss340* var_r29; + StructBss70 *temp_r30; + StructBss340 *var_r29; if (arg3 > 10) { arg3 = 10; @@ -498,7 +491,8 @@ s32 fn_1_1880(float arg0, float arg1, float arg2, s32 arg3, s32 arg4) { return 0; } -s32 fn_1_1BD4(StructBss70* arg0) { +s32 fn_1_1BD4(StructBss70 *arg0) +{ float var_f31; float var_f30; s32 var_r31; @@ -525,7 +519,8 @@ s32 fn_1_1BD4(StructBss70* arg0) { return var_r31; } -void fn_1_1E10(StructBss70* arg0) { +void fn_1_1E10(StructBss70 *arg0) +{ Vec sp104; Vec spF8; Vec spEC; @@ -541,8 +536,8 @@ void fn_1_1E10(StructBss70* arg0) { float spB0; float spAC; float spA0; - StructBss70* var_r30; - StructBss70* temp_r28; + StructBss70 *var_r30; + StructBss70 *temp_r28; s32 temp_r19; s32 var_r21; s32 i; @@ -583,7 +578,8 @@ void fn_1_1E10(StructBss70* arg0) { spC0 = var_f19 - var_f26; if (spC0 > 0.0f) { spBC = -0.5f; - } else { + } + else { spBC = 0.5f; } if (ABS_INV(var_f19 - var_f26) > 180.0f) { @@ -626,13 +622,14 @@ block_end: arg0->unk14.z = spB4; } -void fn_1_2FDC(StructBss70* arg0) { +void fn_1_2FDC(StructBss70 *arg0) +{ Vec spF0; Vec spE4; Vec spD8; s32 i; - StructBss340* var_r30; - StructBss70* temp_r25; + StructBss340 *var_r30; + StructBss70 *temp_r25; float var_f31; s32 var_r23; s32 var_r20; @@ -655,12 +652,14 @@ void fn_1_2FDC(StructBss70* arg0) { var_f31 += 30.0f * frandf() - 60.0f; var_f31 = fn_1_14B4(var_f31); arg0->unk20 = var_f31; - } else if (ABS_INV(arg0->unk14.x) > 550.0f) { + } + else if (ABS_INV(arg0->unk14.x) > 550.0f) { var_f31 = fn_1_14B4(180.0 + atan2d(arg0->unk14.x, 0.0)); var_f31 += 10.0f * frandf() - 20.0f; var_f31 = fn_1_14B4(var_f31); arg0->unk20 = var_f31; - } else if (frandmod(3) != 0) { + } + else if (frandmod(3) != 0) { for (i = 0, var_r23 = 0; i < 10; i++) { if (i == arg0->unk0C) { continue; @@ -679,13 +678,15 @@ void fn_1_2FDC(StructBss70* arg0) { if (var_r23 == 1 && ABS_INV(var_r30->unk4C.x) < 650.0f) { temp_r25 = &lbl_1_bss_70[spAC[0]]; var_f31 = fn_1_14B4(atan2d(arg0->unk40 - arg0->unk14.x, arg0->unk44 - arg0->unk14.z)); - } else { + } + else { var_f31 = fn_1_14B4(180.0 + atan2d(arg0->unk14.x, arg0->unk14.z)); var_f31 += 30.0f * frandf() - 60.0f; var_f31 = fn_1_14B4(var_f31); arg0->unk20 = var_f31; } - } else { + } + else { var_f31 = 360.0f * frandf(); arg0->unk20 = var_f31; } @@ -713,15 +714,15 @@ void fn_1_2FDC(StructBss70* arg0) { var_f31 = fn_1_14B4(atan2d(arg0->unk40 - arg0->unk14.x, arg0->unk44 - arg0->unk14.z)); arg0->unk14.x += arg0->unk34 * sind(var_f31); arg0->unk14.z += arg0->unk34 * cosd(var_f31); - if (fn_1_1BD4(arg0)) { - } + if (fn_1_1BD4(arg0)) { } if (fn_1_1880(arg0->unk14.x, arg0->unk14.z, 50.0f, 10, arg0->unk0C) != 0) { arg0->unk14.x = arg0->unk24; arg0->unk14.z = arg0->unk28; arg0->unk38 = 100; arg0->unk3C = 0; } - } else { + } + else { arg0->unk38 = 100; arg0->unk3C = 0; } @@ -735,8 +736,9 @@ void fn_1_2FDC(StructBss70* arg0) { } } -void fn_1_44D8(void) { - StructBss70* temp_r31; +void fn_1_44D8(void) +{ + StructBss70 *temp_r31; float temp_f30; float var_f31; s32 i; @@ -763,7 +765,8 @@ void fn_1_44D8(void) { } } -void fn_1_4644(StructBss70* arg0) { +void fn_1_4644(StructBss70 *arg0) +{ float temp_f26; float temp_f25; float var_f27; @@ -778,7 +781,8 @@ void fn_1_4644(StructBss70* arg0) { arg0->unk20 = 90.0f; var_f27 = -700.0f + temp_f26 - 500.0f; var_f24 = 8.333333f; - } else { + } + else { arg0->unk14.x = 700.0f - temp_f26; arg0->unk20 = 270.0f; var_f27 = 700.0f - temp_f26 + 500.0f; @@ -808,7 +812,8 @@ void fn_1_4644(StructBss70* arg0) { Hu3DModelPosSet(arg0->unk00, arg0->unk14.x, 0.0f, arg0->unk14.z); } -void fn_1_4BC4(void) { +void fn_1_4BC4(void) +{ s32 spC; float sp8; float temp_f23; @@ -816,9 +821,9 @@ void fn_1_4BC4(void) { float var_f28; float var_f30; float var_f29; - StructBss70* temp_r31; - StructBss340* var_r28; - StructBss340* var_r30; + StructBss70 *temp_r31; + StructBss340 *var_r28; + StructBss340 *var_r30; s32 temp_r27; s32 temp_r24; s32 var_r26; @@ -843,7 +848,8 @@ loop_1: } } if (i > 4) { - while (TRUE); + while (TRUE) + ; } temp_r31->unk34 = 6.75f * lbl_1_data_FC[i]; temp_r31->unk38 = 0; @@ -854,8 +860,8 @@ loop_1: fn_1_4644(temp_r31); temp_r31->unk10 = 0; if (FALSE) { - default: - fn_1_2FDC(temp_r31); + default: + fn_1_2FDC(temp_r31); } Hu3DModelPosSet(temp_r31->unk00, temp_r31->unk14.x, temp_r31->unk14.y, temp_r31->unk14.z); Hu3DModelRotSet(temp_r31->unk00, 0.0f, temp_r31->unk20, 0.0f); @@ -869,19 +875,23 @@ loop_1: if (ABS_INV(var_r28->unk4C.z - temp_r31->unk14.z) > 250.0f) { if (temp_r31->unk14.x > 0.0f) { var_f30 = 10.0f; - } else { + } + else { var_f30 = -10.0f; } - } else { + } + else { if (var_r28->unk4C.x > temp_r31->unk14.x) { var_f30 = -10.0f; - } else { + } + else { var_f30 = 10.0f; } } if (var_f30 > 0.0f) { Hu3DModelRotSet(temp_r31->unk00, 0.0f, 90.0f, 0.0f); - } else { + } + else { Hu3DModelRotSet(temp_r31->unk00, 0.0f, 270.0f, 0.0f); } Hu3DMotionSet(temp_r31->unk00, temp_r31->unk04[1]); @@ -911,7 +921,8 @@ loop_1: temp_r31->unk2C = fn_1_14B4(atan2d(temp_r31->unk14.x - var_r30->unk4C.x, temp_r31->unk14.z - var_r30->unk4C.z)); Hu3DMotionTimeSet(temp_r31->unk02, 0.0f); Hu3DModelAttrReset(temp_r31->unk02, HU3D_ATTR_DISPOFF); - Hu3DModelPosSet(temp_r31->unk02, var_r30->unk4C.x + var_r30->unk84 * sind(temp_r31->unk2C), temp_r31->unk14.y + 50.0f, var_r30->unk4C.z + var_r30->unk84 * cosd(temp_r31->unk2C)); + Hu3DModelPosSet(temp_r31->unk02, var_r30->unk4C.x + var_r30->unk84 * sind(temp_r31->unk2C), temp_r31->unk14.y + 50.0f, + var_r30->unk4C.z + var_r30->unk84 * cosd(temp_r31->unk2C)); i = 0; var_f29 = temp_r31->unk14.x; var_f28 = temp_r31->unk14.z; @@ -943,9 +954,10 @@ loop_1: } } -void fn_1_545C(ModelData* model, ParticleData* particle, Mtx matrix) { - HsfanimStruct01* var_r31; - StructBss340* temp_r28; +void fn_1_545C(ModelData *model, ParticleData *particle, Mtx matrix) +{ + HsfanimStruct01 *var_r31; + StructBss340 *temp_r28; float var_f30; float var_f31; float temp_f29; @@ -996,7 +1008,7 @@ void fn_1_545C(ModelData* model, ParticleData* particle, Mtx matrix) { if (var_r31->unk14.x == 0.0f) { continue; } - PSVECAdd(&var_r31->unk08, &var_r31->unk34, &var_r31->unk34); + VECAdd(&var_r31->unk08, &var_r31->unk34, &var_r31->unk34); var_r31->unk08.x *= 0.95f; var_r31->unk08.z *= 0.95f; if (var_r31->unk08.y > 0.1f) { @@ -1025,9 +1037,10 @@ void fn_1_545C(ModelData* model, ParticleData* particle, Mtx matrix) { } } -void fn_1_594C(ModelData* model, ParticleData* particle, Mtx matrix) { - HsfanimStruct01* var_r31; - StructBss340* temp_r28; +void fn_1_594C(ModelData *model, ParticleData *particle, Mtx matrix) +{ + HsfanimStruct01 *var_r31; + StructBss340 *temp_r28; float temp_f31; float temp_f30; s32 var_r27; @@ -1088,7 +1101,7 @@ void fn_1_594C(ModelData* model, ParticleData* particle, Mtx matrix) { if (var_r31->unk14.x == 0.0f || var_r31->unk24 == 0.0f) { continue; } - PSVECAdd(&var_r31->unk08, &var_r31->unk34, &var_r31->unk34); + VECAdd(&var_r31->unk08, &var_r31->unk34, &var_r31->unk34); if (var_r31->unk08.y > 1.0f) { var_r31->unk08.y -= 0.3f; } @@ -1112,9 +1125,10 @@ void fn_1_594C(ModelData* model, ParticleData* particle, Mtx matrix) { } } -void fn_1_5DE4(ModelData* model, ParticleData* particle, Mtx matrix) { - HsfanimStruct01* var_r31; - StructBss340* temp_r28; +void fn_1_5DE4(ModelData *model, ParticleData *particle, Mtx matrix) +{ + HsfanimStruct01 *var_r31; + StructBss340 *temp_r28; float temp_f31; float temp_f30; s32 var_r27; @@ -1175,7 +1189,7 @@ void fn_1_5DE4(ModelData* model, ParticleData* particle, Mtx matrix) { if (var_r31->unk14.x == 0.0f || var_r31->unk24 == 0.0f) { continue; } - PSVECAdd(&var_r31->unk08, &var_r31->unk34, &var_r31->unk34); + VECAdd(&var_r31->unk08, &var_r31->unk34, &var_r31->unk34); if (var_r31->unk08.y > 1.0f) { var_r31->unk08.y -= 0.3f; } @@ -1199,8 +1213,9 @@ void fn_1_5DE4(ModelData* model, ParticleData* particle, Mtx matrix) { } } -s8 fn_1_627C(s32 arg0, s32 arg1) { - StructBss340* temp_r31; +s8 fn_1_627C(s32 arg0, s32 arg1) +{ + StructBss340 *temp_r31; s8 var_r30; temp_r31 = &lbl_1_bss_340[arg0]; @@ -1208,8 +1223,9 @@ s8 fn_1_627C(s32 arg0, s32 arg1) { return var_r30; } -u8 fn_1_62F0(s32 arg0, s32 arg1) { - StructBss340* temp_r31; +u8 fn_1_62F0(s32 arg0, s32 arg1) +{ + StructBss340 *temp_r31; s8 var_r30; temp_r31 = &lbl_1_bss_340[arg0]; @@ -1217,8 +1233,9 @@ u8 fn_1_62F0(s32 arg0, s32 arg1) { return var_r30; } -u16 fn_1_636C(s32 arg0) { - StructBss340* temp_r31; +u16 fn_1_636C(s32 arg0) +{ + StructBss340 *temp_r31; u16 var_r30; temp_r31 = &lbl_1_bss_340[arg0]; @@ -1226,8 +1243,9 @@ u16 fn_1_636C(s32 arg0) { return var_r30; } -u16 fn_1_63B4(s32 arg0) { - StructBss340* temp_r31; +u16 fn_1_63B4(s32 arg0) +{ + StructBss340 *temp_r31; u16 var_r30; temp_r31 = &lbl_1_bss_340[arg0]; @@ -1235,11 +1253,12 @@ u16 fn_1_63B4(s32 arg0) { return var_r30; } -s32 fn_1_63FC(StructBss340* arg0) { +s32 fn_1_63FC(StructBss340 *arg0) +{ Vec sp24; Vec sp18; Vec spC; - StructBss70* temp_r31; + StructBss70 *temp_r31; s32 var_r28; s32 i; @@ -1257,7 +1276,8 @@ s32 fn_1_63FC(StructBss340* arg0) { return var_r28; } -s32 fn_1_65D0(StructBss340* arg0) { +s32 fn_1_65D0(StructBss340 *arg0) +{ float var_f31; float var_f30; s32 sp8; @@ -1279,7 +1299,8 @@ s32 fn_1_65D0(StructBss340* arg0) { return sp8; } -float fn_1_67F0(float arg0, float arg1, float arg2) { +float fn_1_67F0(float arg0, float arg1, float arg2) +{ float var_f30; float var_f31; @@ -1297,8 +1318,9 @@ float fn_1_67F0(float arg0, float arg1, float arg2) { return var_f30; } -void fn_1_68F4(void) { - StructBss340* temp_r31; +void fn_1_68F4(void) +{ + StructBss340 *temp_r31; s32 i; temp_r31 = HuPrcCurrentGet()->user_data; @@ -1313,19 +1335,21 @@ void fn_1_68F4(void) { } } -s32 fn_1_6964(StructBss340* arg0) { +s32 fn_1_6964(StructBss340 *arg0) +{ return (arg0->unk2C == 4 || arg0->unk2C == 5 || arg0->unk2C == 6); } -void fn_1_69C0(void) { +void fn_1_69C0(void) +{ float var_f23; float var_f27; float var_f26; - StructBss340* temp_r31; + StructBss340 *temp_r31; s16 var_r29; s32 var_r24; s32 var_r23; - Process* var_r22; + Process *var_r22; s32 var_r26; s32 var_r25; s32 var_r28; @@ -1353,7 +1377,8 @@ void fn_1_69C0(void) { case 8: if (temp_r31->unk3C != 0) { temp_r31->unk3C--; - } else { + } + else { Hu3DMotionShiftSet(temp_r31->unk00, temp_r31->unk06[0], 0.0f, 5.0f, HU3D_MOTATTR_LOOP); temp_r31->unk2C = 0; } @@ -1374,7 +1399,8 @@ void fn_1_69C0(void) { } if (temp_r31->unk3C != 0) { temp_r31->unk3C--; - } else { + } + else { Hu3DMotionSet(temp_r31->unk00, temp_r31->unk06[5]); Hu3DModelAttrReset(temp_r31->unk00, HU3D_MOTATTR_LOOP); temp_r31->unk2C = 6; @@ -1416,7 +1442,8 @@ void fn_1_69C0(void) { if (fn_1_63B4(temp_r31->unk20) & PAD_BUTTON_A) { Hu3DMotionShiftSet(temp_r31->unk00, temp_r31->unk06[1], 0.0f, 8.0f, HU3D_MOTATTR_LOOP); Hu3DMotionShiftSpeedSet(temp_r31->unk00, 2.0f); - } else { + } + else { Hu3DMotionShiftSet(temp_r31->unk00, temp_r31->unk06[1], 0.0f, 8.0f, HU3D_MOTATTR_LOOP | HU3D_MOTATTR_REV); Hu3DMotionShiftSpeedSet(temp_r31->unk00, 2.0f); } @@ -1424,14 +1451,16 @@ void fn_1_69C0(void) { HuAudFXStop(var_r29); } } - } else { + } + else { if (temp_r31->unk2C != 3) { temp_r31->unk2C = 3; temp_r31->unk48 = 0; if (fn_1_63B4(temp_r31->unk20) & PAD_BUTTON_A) { Hu3DMotionShiftSet(temp_r31->unk00, temp_r31->unk06[2], 0.0f, 8.0f, HU3D_MOTATTR_LOOP); Hu3DMotionShiftSpeedSet(temp_r31->unk00, 2.0f); - } else { + } + else { Hu3DMotionShiftSet(temp_r31->unk00, temp_r31->unk06[2], 0.0f, 8.0f, HU3D_MOTATTR_LOOP | HU3D_MOTATTR_REV); Hu3DMotionShiftSpeedSet(temp_r31->unk00, 2.0f); } @@ -1443,7 +1472,8 @@ void fn_1_69C0(void) { if (temp_r31->unk34 != 1) { var_r24 = 8; var_r23 = 32; - } else { + } + else { var_r24 = 7; var_r23 = 22; } @@ -1458,12 +1488,14 @@ void fn_1_69C0(void) { if (temp_r31->unk48 >= 50) { temp_r31->unk48 -= 50; } - } else { + } + else { if (temp_r31->unk48 >= 30) { temp_r31->unk48 -= 30; } } - } else { + } + else { if (ABS_INV(fn_1_627C(temp_r31->unk20, 0)) <= 20) { if (temp_r31->unk2C != 0) { temp_r31->unk2C = 0; @@ -1472,7 +1504,8 @@ void fn_1_69C0(void) { HuAudFXStop(var_r29); } } - } else { + } + else { if (temp_r31->unk2C != 1) { temp_r31->unk2C = 1; Hu3DMotionShiftSet(temp_r31->unk00, temp_r31->unk06[3], 0.0f, 8.0f, HU3D_MOTATTR_LOOP); @@ -1481,10 +1514,8 @@ void fn_1_69C0(void) { } } } - if (fn_1_63FC(temp_r31) != -1) { - } - if ((spA4 = fn_1_65D0(temp_r31)) != -1) { - } + if (fn_1_63FC(temp_r31) != -1) { } + if ((spA4 = fn_1_65D0(temp_r31)) != -1) { } break; } Hu3DModelPosSet(temp_r31->unk00, temp_r31->unk4C.x, temp_r31->unk4C.y, temp_r31->unk4C.z); @@ -1522,7 +1553,8 @@ void fn_1_69C0(void) { if (var_r25 & 1) { Hu3DModelAttrReset(temp_r31->unk00, HU3D_ATTR_DISPOFF); Hu3DModelAttrReset(temp_r31->unk04, HU3D_ATTR_DISPOFF); - } else { + } + else { Hu3DModelAttrSet(temp_r31->unk00, HU3D_ATTR_DISPOFF); Hu3DModelAttrSet(temp_r31->unk04, HU3D_ATTR_DISPOFF); } @@ -1542,7 +1574,8 @@ void fn_1_69C0(void) { Hu3DModelAttrSet(temp_r31->unk00, HU3D_ATTR_DISPOFF); HuAudSStreamPlay(4); HuPrcSleep(180); - } else { + } + else { var_f26 = temp_r31->unk90; Hu3DMotionShiftSet(temp_r31->unk00, temp_r31->unk06[3], 0.0f, 2.0f, HU3D_MOTATTR_LOOP); if (fn_1_14B4(temp_r31->unk60.y) != 0.0f) { @@ -1576,10 +1609,10 @@ void fn_1_69C0(void) { } } -void fn_1_7D3C(void) { -} +void fn_1_7D3C(void) { } -void fn_1_7D40(void) { +void fn_1_7D40(void) +{ while (TRUE) { if (omSysExitReq == 1) { WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 60); @@ -1595,7 +1628,8 @@ void fn_1_7D40(void) { } } -void fn_1_7DA0(void) { +void fn_1_7DA0(void) +{ s16 temp_r31; s16 var_r30; s16 temp_r26; @@ -1644,7 +1678,8 @@ void fn_1_7DA0(void) { HuPrcVSleep(); } lbl_1_bss_3E4 = 5; - } else { + } + else { lbl_1_bss_3E4 = 5; } while (lbl_1_bss_3E4 < 6) { diff --git a/src/REL/m463Dll/main.c b/src/REL/m463Dll/main.c index a964b9ca..8304c1b3 100755 --- a/src/REL/m463Dll/main.c +++ b/src/REL/m463Dll/main.c @@ -68,14 +68,14 @@ typedef struct { } StructData134; // Size 0x18 s16 fn_1_4474(void); -void fn_1_659C(omObjData* arg0); +void fn_1_659C(omObjData *arg0); StructBss51C lbl_1_bss_51C[9]; StructBss35C lbl_1_bss_35C[28]; -omObjData* lbl_1_bss_358; -omObjData* lbl_1_bss_354; -omObjData* lbl_1_bss_330[9]; -omObjData* lbl_1_bss_32C; +omObjData *lbl_1_bss_358; +omObjData *lbl_1_bss_354; +omObjData *lbl_1_bss_330[9]; +omObjData *lbl_1_bss_32C; HsfanimStruct00 lbl_1_bss_5C[9]; s32 lbl_1_bss_58; s32 lbl_1_bss_54; @@ -83,7 +83,7 @@ s32 lbl_1_bss_50; char lbl_1_bss_4C[4]; // unused s32 lbl_1_bss_48; s32 lbl_1_bss_44; -Process* lbl_1_bss_40; +Process *lbl_1_bss_40; s32 lbl_1_bss_3C; s32 lbl_1_bss_38; s32 lbl_1_bss_34; @@ -101,17 +101,9 @@ char lbl_1_bss_8[4]; // unused s32 lbl_1_bss_4; s32 lbl_1_bss_0; -s32 lbl_1_data_0[9] = { - DATA_MAKE_NUM(DATADIR_M458, 38), - DATA_MAKE_NUM(DATADIR_M458, 38), - DATA_MAKE_NUM(DATADIR_M458, 38), - DATA_MAKE_NUM(DATADIR_M458, 38), - DATA_MAKE_NUM(DATADIR_M458, 38), - DATA_MAKE_NUM(DATADIR_M458, 38), - DATA_MAKE_NUM(DATADIR_M458, 38), - DATA_MAKE_NUM(DATADIR_M458, 38), - DATA_MAKE_NUM(DATADIR_M458, 38) -}; +s32 lbl_1_data_0[9] = { DATA_MAKE_NUM(DATADIR_M458, 38), DATA_MAKE_NUM(DATADIR_M458, 38), DATA_MAKE_NUM(DATADIR_M458, 38), + DATA_MAKE_NUM(DATADIR_M458, 38), DATA_MAKE_NUM(DATADIR_M458, 38), DATA_MAKE_NUM(DATADIR_M458, 38), DATA_MAKE_NUM(DATADIR_M458, 38), + DATA_MAKE_NUM(DATADIR_M458, 38), DATA_MAKE_NUM(DATADIR_M458, 38) }; s32 lbl_1_data_24[9] = { 0 }; @@ -129,17 +121,8 @@ s32 lbl_1_data_48[9] = { u32 lbl_1_data_6C[9] = { 0, 0, 0, 0, 0, 0, 0, 1, 0 }; -u32 lbl_1_data_90[] = { - DATA_MAKE_NUM(DATADIR_BKOOPA, 8), - 0, - 0, - DATA_MAKE_NUM(DATADIR_BKOOPA, 10), - 0, - DATA_MAKE_NUM(DATADIR_M458, 42), - DATA_MAKE_NUM(DATADIR_M458, 40), - DATA_MAKE_NUM(DATADIR_M458, 41), - DATA_MAKE_NUM(DATADIR_M458, 39) -}; +u32 lbl_1_data_90[] = { DATA_MAKE_NUM(DATADIR_BKOOPA, 8), 0, 0, DATA_MAKE_NUM(DATADIR_BKOOPA, 10), 0, DATA_MAKE_NUM(DATADIR_M458, 42), + DATA_MAKE_NUM(DATADIR_M458, 40), DATA_MAKE_NUM(DATADIR_M458, 41), DATA_MAKE_NUM(DATADIR_M458, 39) }; u8 lbl_1_data_B4[9] = { 0, 0, 0, 1, 1, 1, 0, 1, 1 }; u8 lbl_1_data_BD[9] = { 0, 0, 0, 1, 1, 1, 0, 1, 1 }; @@ -157,7 +140,8 @@ s32 lbl_1_data_154 = -1; // unused float lbl_1_data_158[] = { -90.0f, 0.0f, 525.0f, 180.0f, 90.0f, 0.0f, 525.0f, 180.0f }; -void fn_1_A0(void) { +void fn_1_A0(void) +{ if (HuPadBtnDown[0] & PAD_BUTTON_B) { Center.x = lbl_1_bss_330[0]->trans.x; Center.y = lbl_1_bss_330[0]->trans.y; @@ -176,9 +160,10 @@ void fn_1_A0(void) { s32 lbl_1_data_184 = -1; -void fn_1_4C8(omObjData* arg0) { - ModelData* temp_r24; - ModelData* temp_r29; +void fn_1_4C8(omObjData *arg0) +{ + ModelData *temp_r24; + ModelData *temp_r29; float temp_f31; float temp_f30; float var_f28; @@ -190,17 +175,17 @@ void fn_1_4C8(omObjData* arg0) { float var_f22; float var_f21; float var_f20; - StructBss330Data* temp_r31; + StructBss330Data *temp_r31; s16 var_r28; s32 temp_r27; s32 var_r26; s32 var_r25; s32 var_r23; s32 var_r22; - StructBss330Data* temp_r21; + StructBss330Data *temp_r21; s32 var_r20; s32 var_r19; - StructBss330Data* temp_r18; + StructBss330Data *temp_r18; s32 var_r17; float sp180[2]; s32 spE0; @@ -210,18 +195,18 @@ void fn_1_4C8(omObjData* arg0) { s32 spD0; s32 spCC; s32 spC8; - StructBss330Data* spC4; + StructBss330Data *spC4; s32 spC0; s32 spBC; - StructBss330Data* spB8; + StructBss330Data *spB8; s32 spB4; u32 spB0; float spAC; s32 spA8; s32 spA4; s32 spA0; - StructBss330Data* sp9C; - ModelData* sp98; + StructBss330Data *sp9C; + ModelData *sp98; float sp94; float sp90; s32 sp8C; @@ -240,7 +225,8 @@ void fn_1_4C8(omObjData* arg0) { } if (temp_r31->unk0C != -1) { var_r22 = (HuPadBtnDown[temp_r31->unk0C] & PAD_BUTTON_A) ? 1 : 0; - } else { + } + else { temp_r31->unk14 += (temp_r31->unk14 < 0x10000); if (temp_r31->unk14 == 30) { var_r22 = 1; @@ -251,12 +237,11 @@ void fn_1_4C8(omObjData* arg0) { var_r26 = 0; var_r25 = 0; if (temp_r31->unk0C != -1) { - var_r26 = (HuPadStkX[temp_r31->unk0C] < -20) ? -1 - : (HuPadStkX[temp_r31->unk0C] > 20) ? 1 : 0; - var_r25 = (-HuPadStkY[temp_r31->unk0C] < -20) ? -1 - : (-HuPadStkY[temp_r31->unk0C] > 20) ? 1 : 0; + var_r26 = (HuPadStkX[temp_r31->unk0C] < -20) ? -1 : (HuPadStkX[temp_r31->unk0C] > 20) ? 1 : 0; + var_r25 = (-HuPadStkY[temp_r31->unk0C] < -20) ? -1 : (-HuPadStkY[temp_r31->unk0C] > 20) ? 1 : 0; var_r22 = (HuPadBtnDown[temp_r31->unk0C] & PAD_BUTTON_A) ? 1 : 0; - } else { + } + else { if (lbl_1_bss_54 == 1) { temp_r31->unk14 = rand8() % 64 + 30; } @@ -278,16 +263,16 @@ void fn_1_4C8(omObjData* arg0) { spCC = 0; if (var_r17 != temp_r31->unk00) { if (fabs(500.0 * temp_r31->unk3C - arg0->trans.x) < 10.0) { - spE0 = spDC = (arg0->trans.x < -250.0) ? -1 - : (arg0->trans.x > 250.0) ? 1 : 0; - } else { + spE0 = spDC = (arg0->trans.x < -250.0) ? -1 : (arg0->trans.x > 250.0) ? 1 : 0; + } + else { spE0 = (arg0->trans.x < 0.0f) ? -1 : 0; spDC = spE0 + 1; } if (fabs(500.0 * temp_r31->unk40 - arg0->trans.z) < 10.0) { - spD8 = spD4 = (arg0->trans.z < -250.0) ? -1 - : (arg0->trans.z > 250.0) ? 1 : 0; - } else { + spD8 = spD4 = (arg0->trans.z < -250.0) ? -1 : (arg0->trans.z > 250.0) ? 1 : 0; + } + else { spD8 = (arg0->trans.z < 0.0f) ? -1 : 0; spD4 = spD8 + 1; } @@ -309,14 +294,16 @@ void fn_1_4C8(omObjData* arg0) { if (var_r26 * (500.0 * temp_r31->unk3C - arg0->trans.x) < 0.0) { temp_r31->unk3C += var_r26; } - if (fabs(500.0 * temp_r31->unk3C - arg0->trans.x) < 10.0 && var_r26 != 0 && temp_r31->unk3C + var_r26 >= -1 && temp_r31->unk3C + var_r26 <= 1) { + if (fabs(500.0 * temp_r31->unk3C - arg0->trans.x) < 10.0 && var_r26 != 0 && temp_r31->unk3C + var_r26 >= -1 + && temp_r31->unk3C + var_r26 <= 1) { temp_r31->unk3C += var_r26; } var_f23 = ((500.0 * temp_r31->unk3C - arg0->trans.x) / 0.25) / 1.75; if (var_r25 * (500.0 * temp_r31->unk40 - arg0->trans.z) < 0.0) { temp_r31->unk40 += var_r25; } - if (fabs(500.0 * temp_r31->unk40 - arg0->trans.z) < 10.0 && var_r25 != 0 && temp_r31->unk40 + var_r25 >= -1 && temp_r31->unk40 + var_r25 <= 1) { + if (fabs(500.0 * temp_r31->unk40 - arg0->trans.z) < 10.0 && var_r25 != 0 && temp_r31->unk40 + var_r25 >= -1 + && temp_r31->unk40 + var_r25 <= 1) { temp_r31->unk40 += var_r25; } var_f22 = ((500.0 * temp_r31->unk40 - arg0->trans.z) / -0.25) / 1.75; @@ -332,8 +319,8 @@ void fn_1_4C8(omObjData* arg0) { sp1A0.x = temp_f31; sp1A0.z = temp_f30; - PSMTXRotRad(sp1D0, 'y', MTXDegToRad(CRot.y)); - PSMTXMultVec(sp1D0, &sp1A0, &sp1A0); + MTXRotRad(sp1D0, 'y', MTXDegToRad(CRot.y)); + MTXMultVec(sp1D0, &sp1A0, &sp1A0); temp_f31 = sp1A0.x; temp_f30 = sp1A0.z; var_f28 = sqrtf(temp_f31 * temp_f31 + temp_f30 * temp_f30); @@ -341,7 +328,8 @@ void fn_1_4C8(omObjData* arg0) { if (var_f28 < 10.0f) { temp_r31->unk2C = temp_f31; temp_r31->unk34 += temp_f30; - } else { + } + else { temp_f31 /= var_f28; temp_f30 /= var_f28; var_f28 = 10.0f; @@ -352,10 +340,12 @@ void fn_1_4C8(omObjData* arg0) { arg0->rot.y = atan2d(temp_r31->unk2C, temp_r31->unk34); if (temp_r31->unk28 >= 8.0f) { var_r28 = 2; - } else { + } + else { var_r28 = 2; } - } else { + } + else { var_r28 = 0; } } @@ -372,14 +362,13 @@ void fn_1_4C8(omObjData* arg0) { if (lbl_1_bss_54 == 0) { Hu3DModelAttrReset(arg0->model[0], HU3D_ATTR_DISPOFF); if (temp_r31->unk00 < 4) { - temp_r31->unk38 = (temp_r31->unk00 == 0) ? 0 - : (temp_r31->unk00 == 1) ? 2 - : (temp_r31->unk00 == 2) ? 6 : 8; + temp_r31->unk38 = (temp_r31->unk00 == 0) ? 0 : (temp_r31->unk00 == 1) ? 2 : (temp_r31->unk00 == 2) ? 6 : 8; temp_r31->unk3C = temp_r31->unk38 % 3 - 1; temp_r31->unk40 = temp_r31->unk38 / 3 - 1; arg0->trans.x = 500.0 * temp_r31->unk3C; arg0->trans.z = 500.0 * temp_r31->unk40; - } else { + } + else { do { temp_r31->unk38 = rand8() % 9; for (spC8 = 0; spC8 < temp_r31->unk00; spC8++) { @@ -446,9 +435,7 @@ void fn_1_4C8(omObjData* arg0) { for (var_r23 = 0; var_r23 < 4; var_r23++) { temp_r18 = lbl_1_bss_330[var_r23]->data; if (!(fabs(500.0 * temp_r18->unk3C - lbl_1_bss_330[var_r23]->trans.x) < 1.0) - || !(fabs(500.0 * temp_r18->unk40 - lbl_1_bss_330[var_r23]->trans.z) < 1.0) - || temp_r18->unk20 != 0) - { + || !(fabs(500.0 * temp_r18->unk40 - lbl_1_bss_330[var_r23]->trans.z) < 1.0) || temp_r18->unk20 != 0) { break; } } @@ -461,7 +448,8 @@ void fn_1_4C8(omObjData* arg0) { if (temp_r31->unk5C != 0) { if (arg0->trans.y < -15000.0f) { Hu3DModelAttrSet(arg0->model[0], HU3D_ATTR_DISPOFF); - } else { + } + else { arg0->trans.y -= 77.0f; } } @@ -503,8 +491,7 @@ void fn_1_4C8(omObjData* arg0) { temp_f26 = (lbl_1_bss_54 - 210) / 4.0; temp_f26 = (temp_f26 > 1.0f) ? 1.0f : temp_f26; espAttrReset(lbl_1_data_24[temp_r31->unk38], HUSPR_ATTR_DISPOFF); - espPosSet(lbl_1_data_24[temp_r31->unk38], - 290.0f + spB4 * sp194[spB0], + espPosSet(lbl_1_data_24[temp_r31->unk38], 290.0f + spB4 * sp194[spB0], sp188[spB0] + 0.5 * (64.0f * (1.0f - spAC) * 0.5 + sp1AC[temp_r31->unk08 != -1 ? temp_r31->unk08 : 8])); espScaleSet(lbl_1_data_24[temp_r31->unk38], 0.5 * temp_f26, 0.5 * temp_f26); } @@ -534,9 +521,11 @@ void fn_1_4C8(omObjData* arg0) { if (temp_r31->unk08 == -1 && lbl_1_bss_54 == 1) { HuAudFXPlay(0x3A); } - } else if (arg0->trans.y < -40000.0f) { + } + else if (arg0->trans.y < -40000.0f) { Hu3DModelAttrSet(arg0->model[0], HU3D_ATTR_DISPOFF); - } else { + } + else { arg0->trans.y -= 77.0f; } break; @@ -549,7 +538,8 @@ void fn_1_4C8(omObjData* arg0) { temp_r31->unk1C++; if (temp_r31->unk1C <= 60) { arg0->rot.y = -180.0 * (temp_r31->unk1C / 60.0); - } else { + } + else { Hu3DMotionTimeSet(arg0->model[0], 120.0f); var_r28 = 0; temp_r31->unk18 = 0; @@ -583,22 +573,25 @@ void fn_1_4C8(omObjData* arg0) { if (temp_r31->unk1C < 180) { var_f20 = 0.0f; var_f21 = 1.0f; - } else { + } + else { var_f20 = 1.0f; var_f21 = 0.5f; } - temp_r24->scale.x = var_f20 + var_f21 * sind((float) (temp_r31->unk1C % 180)); + temp_r24->scale.x = var_f20 + var_f21 * sind((float)(temp_r31->unk1C % 180)); temp_r24->scale.y = temp_r24->scale.z = temp_r24->scale.x; if (temp_r31->unk1C < 180) { temp_r31->unk1C += 6; - } else { + } + else { temp_r31->unk1C += 18; } if (temp_r31->unk1C >= 360) { temp_r31->unk1C = 360; Hu3DModelRotSet(arg0->model[1], 0.0f, 0.0f, 0.0f); } - } else { + } + else { sp98 = &Hu3DData[arg0->model[1]]; temp_r31->unk1C += 4; if (temp_r31->unk1C > 720) { @@ -640,7 +633,8 @@ void fn_1_4C8(omObjData* arg0) { temp_r31->unk58 = 150; } Hu3DModelAttrSet(arg0->model[1], HU3D_ATTR_DISPOFF); - } else if (temp_r27 > 8) { + } + else if (temp_r27 > 8) { if (temp_r31->unk20 == 5) { if (Hu3DMotionTimeGet(arg0->model[0]) >= Hu3DMotionMaxTimeGet(arg0->model[0])) { var_r28 = 0; @@ -667,12 +661,14 @@ void fn_1_4C8(omObjData* arg0) { temp_r31->unk18 = 0; temp_r31->unk1C = 0; } - } else { + } + else { if (temp_r27 < 4) { temp_r29->pos.y += 10.0f + 0.5f * temp_r27; temp_r29->scale.x += 0.1f * sind(4.0f * temp_r27); temp_r29->scale.y = temp_r29->scale.z = temp_r29->scale.x; - } else { + } + else { var_f24 = 255 - (temp_r27 << 5); var_f24 = var_f24 * (1.0f / 255); Hu3DModelTPLvlSet(arg0->model[1], var_f24); @@ -734,13 +730,11 @@ void fn_1_4C8(omObjData* arg0) { var_r28 = temp_r31->unk24; } if (var_r28 >= 0 && var_r28 != temp_r31->unk20) { - Hu3DMotionShiftSet(arg0->model[0], - arg0->motion[var_r28], - lbl_1_data_EC[var_r28], + Hu3DMotionShiftSet(arg0->model[0], arg0->motion[var_r28], lbl_1_data_EC[var_r28], (temp_r31->unk08 != -1) ? lbl_1_data_C8[var_r28] : lbl_1_data_110[var_r28], - (var_r28 == 7) ? HU3D_MOTATTR_PAUSE + (var_r28 == 7) ? HU3D_MOTATTR_PAUSE : (temp_r31->unk08 != -1 ? lbl_1_data_B4[var_r28] : lbl_1_data_BD[var_r28]) ? 0 - : HU3D_MOTATTR_LOOP); + : HU3D_MOTATTR_LOOP); temp_r31->unk20 = var_r28; } temp_r31->unk58 -= (temp_r31->unk58 > -1); @@ -759,15 +753,16 @@ float lbl_1_data_1B8 = 3500.0f; float lbl_1_data_1BC = 100.0f; float lbl_1_data_1C0 = -59.0f; -void fn_1_3264(omObjData* arg0) { +void fn_1_3264(omObjData *arg0) +{ float temp_f29; float var_f31; float temp_f26; float temp_f27; float temp_f28; - StructBss330Data* spC[9]; - ModelData* temp_r29; - ModelData* temp_r28; + StructBss330Data *spC[9]; + ModelData *temp_r29; + ModelData *temp_r28; s32 var_r27; s32 i; s32 j; @@ -807,10 +802,8 @@ void fn_1_3264(omObjData* arg0) { } for (i = 0; i < 9; i++) { temp_r28 = &Hu3DData[lbl_1_bss_32C->model[i + 1]]; - Hu3DModelPosSet(lbl_1_bss_32C->model[i + 1], - (500.0 + 200.0f * temp_f29) * (lbl_1_bss_51C[i].unk00 - 1), - 0.9 * temp_r28->pos.y + 0.1 * lbl_1_bss_51C[spC[0]->unk38].unk08, - (500.0 + 200.0f * temp_f29) * (lbl_1_bss_51C[i].unk04 - 1)); + Hu3DModelPosSet(lbl_1_bss_32C->model[i + 1], (500.0 + 200.0f * temp_f29) * (lbl_1_bss_51C[i].unk00 - 1), + 0.9 * temp_r28->pos.y + 0.1 * lbl_1_bss_51C[spC[0]->unk38].unk08, (500.0 + 200.0f * temp_f29) * (lbl_1_bss_51C[i].unk04 - 1)); for (j = 0; j < 9; j++) { if (i == spC[j]->unk38) { lbl_1_bss_330[j]->trans.x = (500.0 + 200.0f * temp_f29) * (lbl_1_bss_51C[i].unk00 - 1); @@ -824,14 +817,9 @@ void fn_1_3264(omObjData* arg0) { } { s32 var_r26 = lbl_1_data_1B4; - float sp30[][6] = { - { 3500.0f, 0.0f, 100.0f, 0.0f, -59.0f, 0.0f }, - { 3200.0f, 0.0f, 100.0f, 0.0f, -30.0f, 0.0f }, - { 3800.0f, 0.0f, 100.0f, 0.0f, -30.0f, 0.0f }, - { 2000.0f, 0.0f, 200.0f, 0.0f, -30.0f, 0.0f }, - { 4000.0f, 0.0f, 200.0f, 0.0f, -89.0f, 0.0f }, - { 2700.0f, 0.0f, 200.0f, 0.0f, -30.0f, 0.0f } - }; + float sp30[][6] = { { 3500.0f, 0.0f, 100.0f, 0.0f, -59.0f, 0.0f }, { 3200.0f, 0.0f, 100.0f, 0.0f, -30.0f, 0.0f }, + { 3800.0f, 0.0f, 100.0f, 0.0f, -30.0f, 0.0f }, { 2000.0f, 0.0f, 200.0f, 0.0f, -30.0f, 0.0f }, + { 4000.0f, 0.0f, 200.0f, 0.0f, -89.0f, 0.0f }, { 2700.0f, 0.0f, 200.0f, 0.0f, -30.0f, 0.0f } }; if (lbl_1_bss_38 != -1 && lbl_1_bss_38 != 9) { sp30[5][1] = lbl_1_bss_330[lbl_1_bss_38]->trans.x; @@ -878,7 +866,8 @@ void fn_1_3264(omObjData* arg0) { if (lbl_1_bss_1C == 0) { lbl_1_bss_20 = 1.0 - 0.95 * (1.0f - lbl_1_bss_20); var_f31 = lbl_1_bss_20; - } else { + } + else { lbl_1_bss_20 += 0.008333333333333333; lbl_1_bss_20 = (lbl_1_bss_20 > 1.0f) ? 1.0f : lbl_1_bss_20; var_f31 = 0.5 + -0.5 * cosd(180.0f * lbl_1_bss_20); @@ -902,53 +891,31 @@ void fn_1_3264(omObjData* arg0) { lbl_1_data_134.unk10 = 2.0 * (rand8() / 255.0) - 1.0; lbl_1_data_134.unk14 = 2.0 * (rand8() / 255.0) - 1.0; lbl_1_data_134.unk10 = 0.0f; - temp_f28 = (lbl_1_data_134.unk10 - lbl_1_data_134.unk08) * (lbl_1_data_134.unk10 - lbl_1_data_134.unk08) + (lbl_1_data_134.unk14 - lbl_1_data_134.unk0C) * (lbl_1_data_134.unk14 - lbl_1_data_134.unk0C); + temp_f28 = (lbl_1_data_134.unk10 - lbl_1_data_134.unk08) * (lbl_1_data_134.unk10 - lbl_1_data_134.unk08) + + (lbl_1_data_134.unk14 - lbl_1_data_134.unk0C) * (lbl_1_data_134.unk14 - lbl_1_data_134.unk0C); } while (sqrtf(temp_f28) < 0.75); } - lbl_1_data_134.unk04 = (lbl_1_data_134.unk04 > 24) ? 24 - : (lbl_1_data_134.unk04 > 0) ? lbl_1_data_134.unk04 : 0; + lbl_1_data_134.unk04 = (lbl_1_data_134.unk04 > 24) ? 24 : (lbl_1_data_134.unk04 > 0) ? lbl_1_data_134.unk04 : 0; temp_f26 = lbl_1_data_134.unk08; temp_f27 = lbl_1_data_134.unk0C; temp_f26 *= lbl_1_data_134.unk04 * 2; temp_f27 *= lbl_1_data_134.unk04 * 2; lbl_1_data_134.unk00 = !lbl_1_data_134.unk00; - lbl_1_data_134.unk04 = (lbl_1_data_134.unk04 > 24) ? 23 - : (lbl_1_data_134.unk04 - 1 > 0) ? (lbl_1_data_134.unk04 - 1) : 0; + lbl_1_data_134.unk04 = (lbl_1_data_134.unk04 > 24) ? 23 : (lbl_1_data_134.unk04 - 1 > 0) ? (lbl_1_data_134.unk04 - 1) : 0; Center.x = 0.0f; Center.y = 100.0f + temp_f27; } } -s16 fn_1_4474(void) { - AnimData* var_r29; - void* var_r28; +s16 fn_1_4474(void) +{ + AnimData *var_r29; + void *var_r28; s16 var_r31; s16 var_r30; - HsfanimStruct00 sp8 = { - 0x96, - { 0x00, 0x00 }, - 50.0f, - 0.0f, - 65.0f, - { 0.0f, -0.195f, 0.0f }, - 80.0f, - 0.99f, - 40.0f, - 0.999f, - 4, - { - { 0xFF, 0xFF, 0x20, 0xFF }, - { 0xFF, 0xFF, 0x00, 0xFF }, - { 0xFF, 0xFF, 0x80, 0xFF }, - { 0xFF, 0xFF, 0xFF, 0xFF } - }, - { - { 0xFF, 0xFF, 0xFF, 0x00 }, - { 0xFF, 0xFF, 0xFF, 0x00 }, - { 0xFF, 0xFF, 0xFF, 0x00 }, - { 0xFF, 0xFF, 0xFF, 0x00 } - } - }; + HsfanimStruct00 sp8 = { 0x96, { 0x00, 0x00 }, 50.0f, 0.0f, 65.0f, { 0.0f, -0.195f, 0.0f }, 80.0f, 0.99f, 40.0f, 0.999f, 4, + { { 0xFF, 0xFF, 0x20, 0xFF }, { 0xFF, 0xFF, 0x00, 0xFF }, { 0xFF, 0xFF, 0x80, 0xFF }, { 0xFF, 0xFF, 0xFF, 0xFF } }, + { { 0xFF, 0xFF, 0xFF, 0x00 }, { 0xFF, 0xFF, 0xFF, 0x00 }, { 0xFF, 0xFF, 0xFF, 0x00 }, { 0xFF, 0xFF, 0xFF, 0x00 } } }; lbl_1_bss_5C[lbl_1_bss_58] = sp8; var_r28 = HuDataSelHeapReadNum(DATA_MAKE_NUM(DATADIR_BOARD, 107), MEMORY_DEFAULT_NUM, HEAP_DATA); @@ -963,8 +930,9 @@ s16 fn_1_4474(void) { return var_r31; } -void fn_1_45F8(omObjData* arg0) { - StructBss330Data* sp14[9]; +void fn_1_45F8(omObjData *arg0) +{ + StructBss330Data *sp14[9]; float spC[2]; s32 sp8; s32 var_r29; @@ -974,15 +942,8 @@ void fn_1_45F8(omObjData* arg0) { s32 i; for (i = 0; i < 28; i++) { - s32 sp38[] = { - 0x7F1, 0x7F2, 0x7F7, 0x7F8, - 0x7F9, 0x7FA, 0x7FB, 0x7FC, - 0x7FD, 0x7FE, 0x7FF, 0x800, - 0x801, 0x802, 0x803, 0x804, - 0x7FB, 0x7FC, 0x7FD, 0x7FE, - 0x7FF, 0x800, 0x801, 0x802, - 0x803, 0x804, 0x7FB, 0x7FC - }; + s32 sp38[] = { 0x7F1, 0x7F2, 0x7F7, 0x7F8, 0x7F9, 0x7FA, 0x7FB, 0x7FC, 0x7FD, 0x7FE, 0x7FF, 0x800, 0x801, 0x802, 0x803, 0x804, 0x7FB, 0x7FC, + 0x7FD, 0x7FE, 0x7FF, 0x800, 0x801, 0x802, 0x803, 0x804, 0x7FB, 0x7FC }; if (lbl_1_bss_35C[i].unk00 > 3) { lbl_1_bss_35C[i].unk00 = 3; @@ -1056,7 +1017,8 @@ void fn_1_45F8(omObjData* arg0) { if (lbl_1_bss_51C[sp14[i]->unk38].unk0C != 0) { sp14[i]->unk18 = 3; sp14[i]->unk1C = 0; - } else { + } + else { sp14[i]->unk5C = 1; } } @@ -1082,7 +1044,8 @@ void fn_1_45F8(omObjData* arg0) { if (var_r29 >= 9 || lbl_1_bss_0 == 0) { MGSeqParamSet(lbl_1_data_14E, 2, -1); lbl_1_data_14E = -1; - } else { + } + else { lbl_1_bss_0 -= (lbl_1_bss_0 > 0); MGSeqParamSet(lbl_1_data_14E, 1, (lbl_1_bss_0 + 59) / 60); } @@ -1140,7 +1103,8 @@ void fn_1_45F8(omObjData* arg0) { lbl_1_bss_50 = 1007; lbl_1_bss_54 = 0; } - } else { + } + else { lbl_1_bss_50 = 1005; lbl_1_bss_54 = 0; } @@ -1152,13 +1116,15 @@ void fn_1_45F8(omObjData* arg0) { if (lbl_1_bss_38 != 9) { if (lbl_1_bss_38 < 9) { HuAudSStreamPlay(1); - } else { + } + else { HuAudSStreamPlay(1); } if (lbl_1_bss_38 < 4 && sp14[lbl_1_bss_38]->unk04 != -1) { GWPlayerCoinWinSet(sp14[lbl_1_bss_38]->unk04, 10); } - } else if (lbl_1_bss_38 == 9) { + } + else if (lbl_1_bss_38 == 9) { HuAudSStreamPlay(4); } } @@ -1175,8 +1141,9 @@ void fn_1_45F8(omObjData* arg0) { } } -void fn_1_53A0(omObjData* arg0) { - StructBss330Data* sp50[9]; +void fn_1_53A0(omObjData *arg0) +{ + StructBss330Data *sp50[9]; s32 i; for (i = 0; i < 9; i++) { @@ -1191,10 +1158,7 @@ void fn_1_53A0(omObjData* arg0) { lbl_1_bss_51C[i].unk04 = i / 3; lbl_1_bss_51C[i].unk08 = 0.0f; lbl_1_bss_51C[i].unk0C = 1; - Hu3DModelPosSet(lbl_1_bss_32C->model[i + 1], - 500.0 * (lbl_1_bss_51C[i].unk00 - 1), - -16.666666f, - 500.0 * (lbl_1_bss_51C[i].unk04 - 1)); + Hu3DModelPosSet(lbl_1_bss_32C->model[i + 1], 500.0 * (lbl_1_bss_51C[i].unk00 - 1), -16.666666f, 500.0 * (lbl_1_bss_51C[i].unk04 - 1)); Hu3DModelScaleSet(lbl_1_bss_32C->model[i + 1], 1.6666666f, 1.6666666f, 1.6666666f); Hu3DModelAttrSet(arg0->model[i + 1], HU3D_MOTATTR_PAUSE); Hu3DModelShadowMapSet(arg0->model[i + 1]); @@ -1215,22 +1179,13 @@ void fn_1_53A0(omObjData* arg0) { arg0->func = fn_1_3264; } -s32 lbl_1_data_1E4[] = { - DATA_MAKE_NUM(DATADIR_M458, 19), - DATA_MAKE_NUM(DATADIR_M458, 20), - DATA_MAKE_NUM(DATADIR_M458, 21), - DATA_MAKE_NUM(DATADIR_M458, 22), - DATA_MAKE_NUM(DATADIR_M458, 23), - DATA_MAKE_NUM(DATADIR_M458, 24), - DATA_MAKE_NUM(DATADIR_M458, 25), - DATA_MAKE_NUM(DATADIR_M458, 26), - DATA_MAKE_NUM(DATADIR_M458, 27), - DATA_MAKE_NUM(DATADIR_M458, 28), - DATA_MAKE_NUM(DATADIR_M458, 29) -}; +s32 lbl_1_data_1E4[] = { DATA_MAKE_NUM(DATADIR_M458, 19), DATA_MAKE_NUM(DATADIR_M458, 20), DATA_MAKE_NUM(DATADIR_M458, 21), + DATA_MAKE_NUM(DATADIR_M458, 22), DATA_MAKE_NUM(DATADIR_M458, 23), DATA_MAKE_NUM(DATADIR_M458, 24), DATA_MAKE_NUM(DATADIR_M458, 25), + DATA_MAKE_NUM(DATADIR_M458, 26), DATA_MAKE_NUM(DATADIR_M458, 27), DATA_MAKE_NUM(DATADIR_M458, 28), DATA_MAKE_NUM(DATADIR_M458, 29) }; -void fn_1_5850(omObjData* arg0) { - StructBss330Data* temp_r31; +void fn_1_5850(omObjData *arg0) +{ + StructBss330Data *temp_r31; s32 sp10[] = { 0, 1, 2, 3 }; s32 var_r25; s32 var_r28; @@ -1246,13 +1201,15 @@ void fn_1_5850(omObjData* arg0) { for (i = 0; i <= temp_r31->unk00 - 4; i++) { do { var_r28++; - } while (GWPlayerCfg[0].character == var_r28 || GWPlayerCfg[1].character == var_r28 || GWPlayerCfg[2].character == var_r28 || GWPlayerCfg[3].character == var_r28); + } while (GWPlayerCfg[0].character == var_r28 || GWPlayerCfg[1].character == var_r28 || GWPlayerCfg[2].character == var_r28 + || GWPlayerCfg[3].character == var_r28); } temp_r31->unk08 = (var_r28 == 8) ? -1 : var_r28; temp_r31->unk0C = -1; temp_r31->unk04 = -1; temp_r31->unk10 = 0; - } else { + } + else { for (i = 0; i < 4; i++) { for (j = 0; j < 4; j++) { if (i == GWPlayerCfg[j].group) { @@ -1277,13 +1234,15 @@ void fn_1_5850(omObjData* arg0) { temp_r31->unk48 = -1; if (temp_r31->unk08 != -1) { arg0->model[0] = CharModelCreate(temp_r31->unk08, 4); - } else { + } + else { arg0->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_BKOOPA, 7)); } omSetTra(arg0, 0.0f, temp_r31->unk00 == 0 ? 0 : 300, 0.0f); if (temp_r31->unk08 != -1) { omSetSca(arg0, 2.5f, 2.5f, 2.5f); - } else { + } + else { omSetSca(arg0, 2.0f, 2.0f, 2.0f); } for (i = 0; i < 9; i++) { @@ -1291,7 +1250,8 @@ void fn_1_5850(omObjData* arg0) { if (temp_r31->unk00 < 4 || (i != 1 && i != 2)) { arg0->motion[i] = CharModelMotionCreate(temp_r31->unk08, lbl_1_data_48[i] + (lbl_1_data_6C[i] ? temp_r31->unk08 : 0)); } - } else if (lbl_1_data_90[i] != 0) { + } + else if (lbl_1_data_90[i] != 0) { arg0->motion[i] = Hu3DJointMotionFile(arg0->model[0], lbl_1_data_90[i]); } } @@ -1314,7 +1274,8 @@ void fn_1_5850(omObjData* arg0) { for (i = 0; i < 9; i++) { if (temp_r31->unk00 == 0) { arg0->model[i + 2] = Hu3DModelCreateFile(lbl_1_data_1E4[i]); - } else { + } + else { arg0->model[i + 2] = Hu3DModelLink(lbl_1_bss_330[0]->model[i + 2]); } Hu3DMotionTimeSet(arg0->model[i + 2], 10.0f); @@ -1328,7 +1289,8 @@ void fn_1_5850(omObjData* arg0) { arg0->func = fn_1_4C8; } -void fn_1_60A4(omObjData* arg0) { +void fn_1_60A4(omObjData *arg0) +{ lbl_1_bss_50 = 1000; lbl_1_bss_54 = 0; lbl_1_bss_48 = 0; @@ -1338,8 +1300,9 @@ void fn_1_60A4(omObjData* arg0) { arg0->func = fn_1_45F8; } -void ObjectSetup(void) { - omObjData* var_r30; +void ObjectSetup(void) +{ + omObjData *var_r30; s32 i; OSReport("******* M463 ObjectSetup *********\n"); @@ -1396,9 +1359,10 @@ void ObjectSetup(void) { lbl_1_bss_358 = omAddObjEx(lbl_1_bss_40, 103, 0, 0, -1, fn_1_60A4); } -void fn_1_659C(omObjData* arg0) { - StructBss330Data* spC[9]; - void* sp8; +void fn_1_659C(omObjData *arg0) +{ + StructBss330Data *spC[9]; + void *sp8; s32 var_r31; s32 var_r30; diff --git a/src/REL/modeltestDll/main.c b/src/REL/modeltestDll/main.c index b2887739..2b99a635 100644 --- a/src/REL/modeltestDll/main.c +++ b/src/REL/modeltestDll/main.c @@ -308,8 +308,7 @@ void fn_1_29C(omObjData *arg0) lbl_1_bss_864[var_r31] = Hu3DParManCreate(temp_r28, 0x1F4, &lbl_1_data_168[0]); Hu3DParManAttrSet(lbl_1_bss_864[var_r31], 0x864); Hu3DParticleBlendModeSet(Hu3DParManModelIDGet(lbl_1_bss_864[var_r31]), 1U); - Hu3DParManPosSet( - lbl_1_bss_864[var_r31], (100.0 * sind(36.0f * var_r31)), 0.0f, 100.0 * cosd(36.0f * var_r31)); + Hu3DParManPosSet(lbl_1_bss_864[var_r31], (100.0 * sind(36.0f * var_r31)), 0.0f, 100.0 * cosd(36.0f * var_r31)); Hu3DParManRotSet(lbl_1_bss_864[var_r31], -90.0f, 0.0f, 0.0f); } @@ -596,10 +595,10 @@ void fn_1_20F4(void) Hu3DModelObjMtxGet(temp_r3, lbl_1_data_D8[(var_r29 * 2) + 1], spC0); Hu3DMtxTransGet(spC0, &sp18); - PSMTXInverse(sp30, sp60); + MTXInverse(sp30, sp60); Hu3DModelObjMtxGet(temp_r3, lbl_1_data_D8[(var_r29 * 2) + 1], spC0); Hu3DMtxTransGet(spC0, &sp18); - PSMTXMultVec(sp60, &sp18, &sp18); + MTXMultVec(sp60, &sp18, &sp18); temp_f27 = atan2d(sp18.z, sp18.x); temp_r31 = &lbl_1_bss_40[var_r29 * 2]; @@ -654,7 +653,7 @@ void fn_1_28F8(Point3d *arg0, Point3d *arg1) cam = &Hu3DCamera[0]; C_MTXLookAt(sp18, &cam->pos, &cam->up, &cam->target); - PSMTXMultVec(sp18, arg0, &spC); + MTXMultVec(sp18, arg0, &spC); temp_f31 = (1.2f * (spC.z * (sind(cam->fov / 2) / (cosd(cam->fov / 2))))); temp_f30 = (spC.z * (sind(cam->fov / 2) / (cosd(cam->fov / 2)))); @@ -795,10 +794,10 @@ void fn_1_2B68(ModelData *mdl, Mtx arg1) GXSetBlendMode(GX_BM_BLEND, GX_BL_SRCALPHA, GX_BL_INVSRCALPHA, GX_LO_NOOP); GXSetAlphaCompare(GX_GEQUAL, 1U, GX_AOP_AND, GX_GEQUAL, 1U); GXSetZCompLoc(0U); - PSMTXIdentity(arg1); + MTXIdentity(arg1); GXLoadPosMtxImm(arg1, 0U); - PSMTXInvXpose(arg1, sp90); + MTXInvXpose(arg1, sp90); GXLoadNrmMtxImm(sp90, 0); GXSetTevOrder(GX_TEVSTAGE0, GX_TEXCOORD0, GX_TEXMAP0, GX_COLOR0A0); @@ -812,7 +811,7 @@ void fn_1_2B68(ModelData *mdl, Mtx arg1) GXLoadTexObj(&sp30, GX_TEXMAP0); GXSetNumIndStages(1U); - PSMTXScale(sp150, 0.1f, 0.1f, 0.0f); + MTXScale(sp150, 0.1f, 0.1f, 0.0f); sp18[0][0] = sp150[0][0]; sp18[0][1] = sp150[0][1]; sp18[0][2] = 0.0f; @@ -820,12 +819,12 @@ void fn_1_2B68(ModelData *mdl, Mtx arg1) sp18[1][1] = sp150[1][1]; sp18[1][2] = 0.0f; - PSMTXRotRad(spF0, 0x58, -1.5707964f); + MTXRotRad(spF0, 0x58, -1.5707964f); mtxRot(spF0, 0.0f, 0.0f, 0.0f); temp_f31 = 0.0015625f; - PSMTXScale(sp120, temp_f31, temp_f31, temp_f31); - PSMTXConcat(sp120, spF0, sp150); - PSMTXTrans(spC0, 0.5f, 0.0f, 0.5f); + MTXScale(sp120, temp_f31, temp_f31, temp_f31); + MTXConcat(sp120, spF0, sp150); + MTXTrans(spC0, 0.5f, 0.0f, 0.5f); GXLoadTexMtxImm(sp150, 0x1EU, GX_MTX2x4); GXSetTexCoordGen2(GX_TEXCOORD0, GX_TG_MTX2x4, GX_TG_POS, 0x1EU, 0U, 0x7DU); GXSetIndTexOrder(GX_INDTEXSTAGE0, GX_TEXCOORD0, GX_TEXMAP1); diff --git a/src/REL/w01Dll/main.c b/src/REL/w01Dll/main.c index 350880e2..6cf2beb7 100755 --- a/src/REL/w01Dll/main.c +++ b/src/REL/w01Dll/main.c @@ -1,6 +1,20 @@ -#include "REL/w01Dll.h" +#include "game/board/main.h" #include "REL/board_executor.h" +#include "REL/w01Dll.h" #include "game/audio.h" +#include "game/board/audio.h" +#include "game/board/boo_house.h" +#include "game/board/com.h" +#include "game/board/lottery.h" +#include "game/board/map_object.h" +#include "game/board/model.h" +#include "game/board/player.h" +#include "game/board/shop.h" +#include "game/board/space.h" +#include "game/board/star.h" +#include "game/board/ui.h" +#include "game/board/view.h" +#include "game/board/window.h" #include "game/chrman.h" #include "game/data.h" #include "game/gamework_data.h" @@ -13,20 +27,6 @@ #include "game/process.h" #include "game/window.h" #include "game/wipe.h" -#include "game/board/audio.h" -#include "game/board/boo_house.h" -#include "game/board/com.h" -#include "game/board/lottery.h" -#include "game/board/main.h" -#include "game/board/model.h" -#include "game/board/player.h" -#include "game/board/shop.h" -#include "game/board/space.h" -#include "game/board/star.h" -#include "game/board/ui.h" -#include "game/board/view.h" -#include "game/board/window.h" -#include "game/board/map_object.h" #include "dolphin.h" #include "ext_math.h" @@ -162,42 +162,40 @@ static void fn_1_9920(omObjData *arg0); static void fn_1_9A24(Bss20Work *arg0); static void fn_1_9BBC(Bss20Work *arg0); - -static BoardMapObject lbl_1_data_0[MAPOBJ_MAX] = { - { { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 1.0f, 1.0f, 1.0f }, DATA_MAKE_NUM(DATADIR_W01, 8) }, - { { 0.0f, 700.0f, 300.0f }, { 0.0f, 0.0f, 0.0f }, { 1.0f, 1.0f, 1.0f }, DATA_MAKE_NUM(DATADIR_W01, 9) }, - { { -2025.0f, 100.0f, 1950.0f }, { 0.0f, 0.0f, 0.0f }, { 1.0f, 1.0f, 1.0f }, DATA_MAKE_NUM(DATADIR_BGUEST, 0) }, - { { 1725.0f, 200.0f, -1650.0f }, { 0.0f, 0.0f, 0.0f }, { 1.0f, 1.0f, 1.0f }, DATA_MAKE_NUM(DATADIR_BGUEST, 0) }, - { { 2757.974f, 200.0f, -536.781f }, { 0.0f, 0.0f, 0.0f }, { 1.0f, 1.0f, 1.0f }, DATA_MAKE_NUM(DATADIR_BGUEST, 0) }, - { { -2750.0f, 300.0f, -2150.0f }, { 0.0f, 0.0f, 0.0f }, { 1.0f, 1.0f, 1.0f }, DATA_MAKE_NUM(DATADIR_BGUEST, 0) }, - { { -2550.0f, 300.0f, -2250.0f }, { 0.0f, 0.0f, 0.0f }, { 1.0f, 1.0f, 1.0f }, DATA_MAKE_NUM(DATADIR_W01, 12) }, - { { -2550.0f, 300.0f, -2250.0f }, { 0.0f, 0.0f, 0.0f }, { 1.0f, 1.0f, 1.0f }, DATA_MAKE_NUM(DATADIR_W01, 13) }, - { { -2550.0f, 300.0f, -2250.0f }, { 0.0f, 0.0f, 0.0f }, { 1.0f, 1.0f, 1.0f }, DATA_MAKE_NUM(DATADIR_W01, 14) }, - { { -2550.0f, 300.0f, -2250.0f }, { 0.0f, 0.0f, 0.0f }, { 1.0f, 1.0f, 1.0f }, DATA_MAKE_NUM(DATADIR_W01, 15) }, - { { -2550.0f, 300.0f, -2250.0f }, { 0.0f, 0.0f, 0.0f }, { 1.0f, 1.0f, 1.0f }, DATA_MAKE_NUM(DATADIR_W01, 16) }, - { { -2550.0f, 300.0f, -2250.0f }, { 0.0f, 0.0f, 0.0f }, { 1.0f, 1.0f, 1.0f }, DATA_MAKE_NUM(DATADIR_W01, 16) }, - { { -2550.0f, 300.0f, -2250.0f }, { 0.0f, 0.0f, 0.0f }, { 1.0f, 1.0f, 1.0f }, DATA_MAKE_NUM(DATADIR_W01, 16) }, - { { -2550.0f, 300.0f, -2250.0f }, { 0.0f, 0.0f, 0.0f }, { 1.0f, 1.0f, 1.0f }, DATA_MAKE_NUM(DATADIR_W01, 17) }, - { { -2550.0f, 300.0f, -2250.0f }, { 0.0f, 0.0f, 0.0f }, { 1.0f, 1.0f, 1.0f }, DATA_MAKE_NUM(DATADIR_W01, 18) }, - { { -2550.0f, 300.0f, -2250.0f }, { 0.0f, 0.0f, 0.0f }, { 1.0f, 1.0f, 1.0f }, DATA_MAKE_NUM(DATADIR_W01, 18) }, - { { 3000.0f, 200.0f, -450.0f }, { 0.0f, 0.0f, 0.0f }, { 1.0f, 1.0f, 1.0f }, DATA_MAKE_NUM(DATADIR_W01, 21) }, - { { 3000.0f, 200.0f, -450.0f }, { 0.0f, 0.0f, 0.0f }, { 1.0f, 1.0f, 1.0f }, DATA_MAKE_NUM(DATADIR_W01, 22) }, - { { 3000.0f, 200.0f, -450.0f }, { 0.0f, 0.0f, 0.0f }, { 1.0f, 1.0f, 1.0f }, DATA_MAKE_NUM(DATADIR_W01, 23) }, - { { 3000.0f, 200.0f, -450.0f }, { 0.0f, 0.0f, 0.0f }, { 1.0f, 1.0f, 1.0f }, DATA_MAKE_NUM(DATADIR_W01, 24) }, - { { 3000.0f, 200.0f, -450.0f }, { 0.0f, 0.0f, 0.0f }, { 1.0f, 1.0f, 1.0f }, DATA_MAKE_NUM(DATADIR_W01, 25) }, - { { 3000.0f, 200.0f, -450.0f }, { 0.0f, 0.0f, 0.0f }, { 1.0f, 1.0f, 1.0f }, DATA_MAKE_NUM(DATADIR_W01, 26) }, - { { 3000.0f, 200.0f, -450.0f }, { 0.0f, 0.0f, 0.0f }, { 1.0f, 1.0f, 1.0f }, DATA_MAKE_NUM(DATADIR_W01, 27) }, - { { 1200.0f, 0.0f, 1200.0f }, { 0.0f, 0.0f, 0.0f }, { 1.0f, 1.0f, 1.0f }, DATA_MAKE_NUM(DATADIR_W01, 3) }, - { { 1200.0f, 0.0f, 1200.0f }, { 0.0f, 0.0f, 0.0f }, { 1.0f, 1.0f, 1.0f }, DATA_MAKE_NUM(DATADIR_W01, 4) }, - { { 1200.0f, 0.0f, 1200.0f }, { 0.0f, 0.0f, 0.0f }, { 1.0f, 1.0f, 1.0f }, DATA_MAKE_NUM(DATADIR_W01, 4) }, - { { 1200.0f, 0.0f, 1200.0f }, { 0.0f, 0.0f, 0.0f }, { 1.0f, 1.0f, 1.0f }, DATA_MAKE_NUM(DATADIR_W01, 4) }, - { { 1200.0f, 0.0f, 1200.0f }, { 0.0f, 0.0f, 0.0f }, { 1.0f, 1.0f, 1.0f }, DATA_MAKE_NUM(DATADIR_W01, 5) }, - { { -1800.0f, 200.0f, -900.0f }, { 0.0f, 0.0f, 0.0f }, { 1.0f, 1.0f, 1.0f }, DATA_MAKE_NUM(DATADIR_W01, 3) }, - { { -1800.0f, 200.0f, -900.0f }, { 0.0f, 0.0f, 0.0f }, { 1.0f, 1.0f, 1.0f }, DATA_MAKE_NUM(DATADIR_W01, 4) }, - { { -1800.0f, 200.0f, -900.0f }, { 0.0f, 0.0f, 0.0f }, { 1.0f, 1.0f, 1.0f }, DATA_MAKE_NUM(DATADIR_W01, 4) }, - { { -1800.0f, 200.0f, -900.0f }, { 0.0f, 0.0f, 0.0f }, { 1.0f, 1.0f, 1.0f }, DATA_MAKE_NUM(DATADIR_W01, 4) }, - { { -1800.0f, 200.0f, -900.0f }, { 0.0f, 0.0f, 0.0f }, { 1.0f, 1.0f, 1.0f }, DATA_MAKE_NUM(DATADIR_W01, 5) } -}; +static BoardMapObject lbl_1_data_0[MAPOBJ_MAX] + = { { { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 1.0f, 1.0f, 1.0f }, DATA_MAKE_NUM(DATADIR_W01, 8) }, + { { 0.0f, 700.0f, 300.0f }, { 0.0f, 0.0f, 0.0f }, { 1.0f, 1.0f, 1.0f }, DATA_MAKE_NUM(DATADIR_W01, 9) }, + { { -2025.0f, 100.0f, 1950.0f }, { 0.0f, 0.0f, 0.0f }, { 1.0f, 1.0f, 1.0f }, DATA_MAKE_NUM(DATADIR_BGUEST, 0) }, + { { 1725.0f, 200.0f, -1650.0f }, { 0.0f, 0.0f, 0.0f }, { 1.0f, 1.0f, 1.0f }, DATA_MAKE_NUM(DATADIR_BGUEST, 0) }, + { { 2757.974f, 200.0f, -536.781f }, { 0.0f, 0.0f, 0.0f }, { 1.0f, 1.0f, 1.0f }, DATA_MAKE_NUM(DATADIR_BGUEST, 0) }, + { { -2750.0f, 300.0f, -2150.0f }, { 0.0f, 0.0f, 0.0f }, { 1.0f, 1.0f, 1.0f }, DATA_MAKE_NUM(DATADIR_BGUEST, 0) }, + { { -2550.0f, 300.0f, -2250.0f }, { 0.0f, 0.0f, 0.0f }, { 1.0f, 1.0f, 1.0f }, DATA_MAKE_NUM(DATADIR_W01, 12) }, + { { -2550.0f, 300.0f, -2250.0f }, { 0.0f, 0.0f, 0.0f }, { 1.0f, 1.0f, 1.0f }, DATA_MAKE_NUM(DATADIR_W01, 13) }, + { { -2550.0f, 300.0f, -2250.0f }, { 0.0f, 0.0f, 0.0f }, { 1.0f, 1.0f, 1.0f }, DATA_MAKE_NUM(DATADIR_W01, 14) }, + { { -2550.0f, 300.0f, -2250.0f }, { 0.0f, 0.0f, 0.0f }, { 1.0f, 1.0f, 1.0f }, DATA_MAKE_NUM(DATADIR_W01, 15) }, + { { -2550.0f, 300.0f, -2250.0f }, { 0.0f, 0.0f, 0.0f }, { 1.0f, 1.0f, 1.0f }, DATA_MAKE_NUM(DATADIR_W01, 16) }, + { { -2550.0f, 300.0f, -2250.0f }, { 0.0f, 0.0f, 0.0f }, { 1.0f, 1.0f, 1.0f }, DATA_MAKE_NUM(DATADIR_W01, 16) }, + { { -2550.0f, 300.0f, -2250.0f }, { 0.0f, 0.0f, 0.0f }, { 1.0f, 1.0f, 1.0f }, DATA_MAKE_NUM(DATADIR_W01, 16) }, + { { -2550.0f, 300.0f, -2250.0f }, { 0.0f, 0.0f, 0.0f }, { 1.0f, 1.0f, 1.0f }, DATA_MAKE_NUM(DATADIR_W01, 17) }, + { { -2550.0f, 300.0f, -2250.0f }, { 0.0f, 0.0f, 0.0f }, { 1.0f, 1.0f, 1.0f }, DATA_MAKE_NUM(DATADIR_W01, 18) }, + { { -2550.0f, 300.0f, -2250.0f }, { 0.0f, 0.0f, 0.0f }, { 1.0f, 1.0f, 1.0f }, DATA_MAKE_NUM(DATADIR_W01, 18) }, + { { 3000.0f, 200.0f, -450.0f }, { 0.0f, 0.0f, 0.0f }, { 1.0f, 1.0f, 1.0f }, DATA_MAKE_NUM(DATADIR_W01, 21) }, + { { 3000.0f, 200.0f, -450.0f }, { 0.0f, 0.0f, 0.0f }, { 1.0f, 1.0f, 1.0f }, DATA_MAKE_NUM(DATADIR_W01, 22) }, + { { 3000.0f, 200.0f, -450.0f }, { 0.0f, 0.0f, 0.0f }, { 1.0f, 1.0f, 1.0f }, DATA_MAKE_NUM(DATADIR_W01, 23) }, + { { 3000.0f, 200.0f, -450.0f }, { 0.0f, 0.0f, 0.0f }, { 1.0f, 1.0f, 1.0f }, DATA_MAKE_NUM(DATADIR_W01, 24) }, + { { 3000.0f, 200.0f, -450.0f }, { 0.0f, 0.0f, 0.0f }, { 1.0f, 1.0f, 1.0f }, DATA_MAKE_NUM(DATADIR_W01, 25) }, + { { 3000.0f, 200.0f, -450.0f }, { 0.0f, 0.0f, 0.0f }, { 1.0f, 1.0f, 1.0f }, DATA_MAKE_NUM(DATADIR_W01, 26) }, + { { 3000.0f, 200.0f, -450.0f }, { 0.0f, 0.0f, 0.0f }, { 1.0f, 1.0f, 1.0f }, DATA_MAKE_NUM(DATADIR_W01, 27) }, + { { 1200.0f, 0.0f, 1200.0f }, { 0.0f, 0.0f, 0.0f }, { 1.0f, 1.0f, 1.0f }, DATA_MAKE_NUM(DATADIR_W01, 3) }, + { { 1200.0f, 0.0f, 1200.0f }, { 0.0f, 0.0f, 0.0f }, { 1.0f, 1.0f, 1.0f }, DATA_MAKE_NUM(DATADIR_W01, 4) }, + { { 1200.0f, 0.0f, 1200.0f }, { 0.0f, 0.0f, 0.0f }, { 1.0f, 1.0f, 1.0f }, DATA_MAKE_NUM(DATADIR_W01, 4) }, + { { 1200.0f, 0.0f, 1200.0f }, { 0.0f, 0.0f, 0.0f }, { 1.0f, 1.0f, 1.0f }, DATA_MAKE_NUM(DATADIR_W01, 4) }, + { { 1200.0f, 0.0f, 1200.0f }, { 0.0f, 0.0f, 0.0f }, { 1.0f, 1.0f, 1.0f }, DATA_MAKE_NUM(DATADIR_W01, 5) }, + { { -1800.0f, 200.0f, -900.0f }, { 0.0f, 0.0f, 0.0f }, { 1.0f, 1.0f, 1.0f }, DATA_MAKE_NUM(DATADIR_W01, 3) }, + { { -1800.0f, 200.0f, -900.0f }, { 0.0f, 0.0f, 0.0f }, { 1.0f, 1.0f, 1.0f }, DATA_MAKE_NUM(DATADIR_W01, 4) }, + { { -1800.0f, 200.0f, -900.0f }, { 0.0f, 0.0f, 0.0f }, { 1.0f, 1.0f, 1.0f }, DATA_MAKE_NUM(DATADIR_W01, 4) }, + { { -1800.0f, 200.0f, -900.0f }, { 0.0f, 0.0f, 0.0f }, { 1.0f, 1.0f, 1.0f }, DATA_MAKE_NUM(DATADIR_W01, 4) }, + { { -1800.0f, 200.0f, -900.0f }, { 0.0f, 0.0f, 0.0f }, { 1.0f, 1.0f, 1.0f }, DATA_MAKE_NUM(DATADIR_W01, 5) } }; s16 lbl_1_bss_6C4[MAPOBJ_MAX]; @@ -249,23 +247,18 @@ static s16 lbl_1_data_52C = -1; static s16 lbl_1_data_52E = -1; static s16 lbl_1_data_530 = -1; -static s32 lbl_1_data_534[] = { - DATA_MAKE_NUM(DATADIR_W01, 30), - -1 -}; +static s32 lbl_1_data_534[] = { DATA_MAKE_NUM(DATADIR_W01, 30), -1 }; -static s32 lbl_1_data_53C[] = { - DATA_MAKE_NUM(DATADIR_BGUEST, 1), - -1 -}; +static s32 lbl_1_data_53C[] = { DATA_MAKE_NUM(DATADIR_BGUEST, 1), -1 }; -void BoardCreate(void) { +void BoardCreate(void) +{ BoardMapObject *temp_r30; s32 sp8; s32 i; sp8 = GWBoardGet(); - lbl_1_bss_0 = (UnkBoardDataStruct*) GWSystem.board_data; + lbl_1_bss_0 = (UnkBoardDataStruct *)GWSystem.board_data; BoardSpaceInit(DATA_MAKE_NUM(DATADIR_W01, 0)); lbl_1_data_528 = BoardModelCreate(DATA_MAKE_NUM(DATADIR_W01, 1), NULL, 0); fn_8006DDE8(lbl_1_data_528, -1.0f); @@ -289,7 +282,8 @@ void BoardCreate(void) { if (temp_r30->data_num != -1) { if (i == 2 || i == 3 || i == 4 || i == 5) { lbl_1_bss_6C0 = lbl_1_data_53C; - } else { + } + else { lbl_1_bss_6C0 = NULL; } lbl_1_bss_6C4[i] = BoardModelCreate(temp_r30->data_num, lbl_1_bss_6C0, 0); @@ -317,7 +311,8 @@ void BoardCreate(void) { BoardJunctionMaskSet(0x3000); } -void BoardDestroy(void) { +void BoardDestroy(void) +{ s32 i; fn_1_4864(); @@ -351,17 +346,18 @@ void BoardDestroy(void) { BoardSpaceDestroy(); } -static void fn_1_730(void) { +static void fn_1_730(void) +{ s16 var_r31; var_r31 = BoardModelIDGet(lbl_1_data_528); Hu3DModelLightInfoSet(var_r31, 1); } -static void fn_1_774(void) { -} +static void fn_1_774(void) { } -static s32 fn_1_778(void) { +static s32 fn_1_778(void) +{ s32 temp_r31; s32 temp_r30; u32 temp_r29; @@ -371,12 +367,14 @@ static s32 fn_1_778(void) { temp_r29 = BoardSpaceFlagGet(0, temp_r30); if (temp_r29 & 0x800) { fn_1_77EC(temp_r31, temp_r30); - } else if (temp_r29 & 0x400) { + } + else if (temp_r29 & 0x400) { fn_1_7528(temp_r31, temp_r30); } } -static s32 fn_1_814(void) { +static s32 fn_1_814(void) +{ s32 temp_r27; s32 var_r30; s32 var_r29; @@ -394,7 +392,8 @@ static s32 fn_1_814(void) { if (lbl_1_bss_0->unk00_field0 != 0) { return 0; } - } else if (temp_r31->flag & 0x1000) { + } + else if (temp_r31->flag & 0x1000) { if (lbl_1_bss_0->unk00_field0 != 1) { return 0; } @@ -410,7 +409,8 @@ static s32 fn_1_814(void) { var_r29 = 0; var_r26 = temp_r31->link[var_r30]; break; - } else if (temp_r28->flag & 0x4000) { + } + else if (temp_r28->flag & 0x4000) { var_r29 = 1; var_r26 = temp_r31->link[var_r30]; break; @@ -424,7 +424,8 @@ static s32 fn_1_814(void) { return 0; } -static void fn_1_9E8(void) { +static void fn_1_9E8(void) +{ BoardModelVisibilitySet(lbl_1_bss_6C4[6], 1); BoardModelVisibilitySet(lbl_1_bss_6C4[7], 0); BoardModelVisibilitySet(lbl_1_bss_6C4[8], 0); @@ -459,10 +460,10 @@ static void fn_1_9E8(void) { BoardModelHookSet(lbl_1_bss_6C4[21], "m_goraund_01-flag1", lbl_1_bss_6C4[22]); } -static void fn_1_D00(void) { -} +static void fn_1_D00(void) { } -static void fn_1_D04(void) { +static void fn_1_D04(void) +{ Vec sp3C; Vec sp30; Vec sp24; @@ -526,7 +527,8 @@ static void fn_1_D04(void) { if (GWPlayer[temp_r30].com) { if (var_r26 != 0) { BoardComKeySetLeft(); - } else { + } + else { BoardComKeySetRight(); } } @@ -578,13 +580,15 @@ static void fn_1_D04(void) { HuPrcEnd(); } -static void fn_1_1254(void) { +static void fn_1_1254(void) +{ BoardWinKill(); CharModelDataClose(-1); lbl_1_bss_4 = NULL; } -static void fn_1_128C(void) { +static void fn_1_128C(void) +{ lbl_1_bss_4 = HuPrcChildCreate(fn_1_D04, 0x2003, 0x2000, 0, boardMainProc); HuPrcDestructorSet2(lbl_1_bss_4, fn_1_1254); while (lbl_1_bss_4) { @@ -592,7 +596,8 @@ static void fn_1_128C(void) { } } -static void fn_1_130C(void) { +static void fn_1_130C(void) +{ Vec sp20; Vec sp14; Vec sp8; @@ -644,7 +649,8 @@ static void fn_1_130C(void) { BoardPlayerMotionStart(temp_r31, 1, 0x40000001); } -static s32 fn_1_157C(void) { +static s32 fn_1_157C(void) +{ s32 temp_r31; s16 temp_curr; @@ -653,23 +659,27 @@ static s32 fn_1_157C(void) { BoardRollDispSet(0); if (temp_r31 == 0x200000) { fn_1_130C(); - } else if (temp_r31 == 0x400000) { + } + else if (temp_r31 == 0x400000) { fn_1_128C(); } BoardRollDispSet(1); } -static void fn_1_1670(void) { +static void fn_1_1670(void) +{ if (lbl_1_bss_0->unk00_field0 == 0) { BoardModelVisibilitySet(lbl_1_bss_6C4[2], 1); BoardModelVisibilitySet(lbl_1_bss_6C4[3], 0); - } else { + } + else { BoardModelVisibilitySet(lbl_1_bss_6C4[2], 0); BoardModelVisibilitySet(lbl_1_bss_6C4[3], 1); } } -static void fn_1_1700(void) { +static void fn_1_1700(void) +{ Vec sp8; Mtx sp14; @@ -683,7 +693,8 @@ static void fn_1_1700(void) { BoardSpaceFlagPosGet(1, 0x2000, &sp8); BoardModelMotionTimeSet(lbl_1_bss_6AE, lbl_1_bss_644); lbl_1_bss_63C = -90.0f; - } else { + } + else { BoardSpaceFlagPosGet(1, 0x1000, &sp8); BoardModelMotionTimeSet(lbl_1_bss_6AE, 0.0f); lbl_1_bss_63C = 90.0f; @@ -694,13 +705,14 @@ static void fn_1_1700(void) { BoardModelExistDupe(lbl_1_bss_6C4[0], 1); BoardModelExistDupe(lbl_1_bss_6C4[1], 1); fn_8006DDE8(lbl_1_bss_6C4[1], 500.0f); - PSMTXIdentity(sp14); + MTXIdentity(sp14); BoardModelMtxSet(lbl_1_bss_6C4[0], &sp14); fn_1_1670(); } } -static void fn_1_1990(void) { +static void fn_1_1990(void) +{ Vec sp10; float var_f31; s32 var_r29; @@ -715,7 +727,8 @@ static void fn_1_1990(void) { temp_r31 = BoardSpaceGet(1, var_r29); if (lbl_1_bss_0->unk00_field0 == 0) { var_r30 = temp_r31->link[0]; - } else { + } + else { BoardSpaceLinkTargetListGet(1, var_r29, sp8); var_r30 = sp8[0]; } @@ -736,18 +749,21 @@ static void fn_1_1990(void) { } if (temp_r31->flag & 8) { lbl_1_bss_6B3 = 1; - } else { + } + else { lbl_1_bss_6B3 = 0; } } -static void fn_1_1AD8(BoardCameraData *camera) { +static void fn_1_1AD8(BoardCameraData *camera) +{ camera->pos = lbl_1_bss_630; camera->up = lbl_1_bss_624; camera->target = lbl_1_bss_618; } -static void fn_1_1B3C(void) { +static void fn_1_1B3C(void) +{ Vec sp3C; Vec sp30; Vec sp24; @@ -763,25 +779,28 @@ static void fn_1_1B3C(void) { sp24 = lbl_1_bss_648; spC = lbl_1_bss_654; BoardMTXCalcLookAt(sp48, &spC, &sp18, &sp24); - PSMTXTranspose(sp48, lbl_1_bss_678); - PSMTXRotRad(sp48, 'z', MTXDegToRad(lbl_1_bss_660.z)); - PSMTXConcat(lbl_1_bss_678, sp48, lbl_1_bss_678); - } else { + MTXTranspose(sp48, lbl_1_bss_678); + MTXRotRad(sp48, 'z', MTXDegToRad(lbl_1_bss_660.z)); + MTXConcat(lbl_1_bss_678, sp48, lbl_1_bss_678); + } + else { if (sp30.z != 0.0f || sp30.x != 0.0f) { lbl_1_bss_660.y = atan2d(sp30.x, sp30.z); lbl_1_bss_660.x = -atan2d(sp30.y, VECMagXZ(&sp30)); - } else { + } + else { lbl_1_bss_660.x = lbl_1_bss_660.y = 0.0f; } - PSMTXRotRad(lbl_1_bss_678, 'z', MTXDegToRad(lbl_1_bss_660.z)); - PSMTXRotRad(sp48, 'x', MTXDegToRad(lbl_1_bss_660.x)); - PSMTXConcat(sp48, lbl_1_bss_678, lbl_1_bss_678); - PSMTXRotRad(sp48, 'y', MTXDegToRad(lbl_1_bss_660.y)); - PSMTXConcat(sp48, lbl_1_bss_678, lbl_1_bss_678); + MTXRotRad(lbl_1_bss_678, 'z', MTXDegToRad(lbl_1_bss_660.z)); + MTXRotRad(sp48, 'x', MTXDegToRad(lbl_1_bss_660.x)); + MTXConcat(sp48, lbl_1_bss_678, lbl_1_bss_678); + MTXRotRad(sp48, 'y', MTXDegToRad(lbl_1_bss_660.y)); + MTXConcat(sp48, lbl_1_bss_678, lbl_1_bss_678); } } -static void fn_1_1EE4(void) { +static void fn_1_1EE4(void) +{ Bss10Work *temp_r31; if (lbl_1_bss_10) { @@ -790,7 +809,8 @@ static void fn_1_1EE4(void) { } } -static void fn_1_1F2C(omObjData *arg0) { +static void fn_1_1F2C(omObjData *arg0) +{ Bss10Work *temp_r31 = OM_GET_WORK_PTR(arg0, Bss10Work); if (temp_r31->unk00_field0 != 0 || BoardIsKill()) { @@ -801,7 +821,8 @@ static void fn_1_1F2C(omObjData *arg0) { fn_1_1FA4(); } -static void fn_1_1FA4(void) { +static void fn_1_1FA4(void) +{ Vec sp18; Vec spC; float temp_f28; @@ -818,7 +839,8 @@ static void fn_1_1FA4(void) { if (spC.x != 0.0f || spC.z != 0.0f) { temp_f29 = atan2f(spC.y, VECMagXZ(&spC)); temp_f28 = atan2f(-spC.x, -spC.z); - } else { + } + else { temp_f29 = temp_f28 = 0.0f; return; } @@ -830,7 +852,8 @@ static void fn_1_1FA4(void) { BoardModelPosGet(lbl_1_bss_6C4[1], &sp18); if (lbl_1_bss_0->unk00_field0 == 0) { var_f27 = -2500.0f; - } else { + } + else { var_f27 = 2500.0f; } sp18.x = sp18.x + var_f27 * sin(1.4137166738510132); // TODO: should be sind(81) @@ -839,7 +862,8 @@ static void fn_1_1FA4(void) { VECSubtract(&sp18, &lbl_1_bss_630, &spC); VECScale(&spC, &spC, lbl_1_bss_66C); VECAdd(&spC, &lbl_1_bss_630, &lbl_1_bss_630); - } else { + } + else { if (lbl_1_bss_66C < 0.08f) { lbl_1_bss_66C += 0.00066666666f; } @@ -853,7 +877,8 @@ static void fn_1_1FA4(void) { } } -static float fn_1_2524(void) { +static float fn_1_2524(void) +{ Vec sp24; Vec sp18; Vec spC; @@ -883,10 +908,12 @@ static float fn_1_2524(void) { var_f30 = atan2d(spC.x, spC.z); if (var_f30 > 0.0f) { var_f30 = 45.0f; - } else { + } + else { var_f30 = -45.0f; } - } else { + } + else { var_r29 = GWPlayer[lbl_1_bss_6B4].port; sp8 = HuPadStkX[var_r29]; OSs16tof32(&sp8, &var_f30); @@ -895,7 +922,8 @@ static float fn_1_2524(void) { return var_f30; } -static void fn_1_276C(void) { +static void fn_1_276C(void) +{ Vec sp58; Vec sp40; Vec sp34; @@ -916,16 +944,19 @@ static void fn_1_276C(void) { if (lbl_1_bss_660.z > 22.5f) { BoardPlayerMotionStart(lbl_1_bss_6B4, lbl_1_bss_5CC[1], 0); BoardPlayerMotionTimeSet(lbl_1_bss_6B4, temp_f26); - } else if (lbl_1_bss_660.z < -22.5f) { + } + else if (lbl_1_bss_660.z < -22.5f) { BoardPlayerMotionStart(lbl_1_bss_6B4, lbl_1_bss_5CC[1], 0); BoardPlayerMotionTimeSet(lbl_1_bss_6B4, temp_f26); - } else { + } + else { BoardPlayerMotionShiftSet(lbl_1_bss_6B4, lbl_1_bss_5CC[0], 0.0f, 10.0f, HU3D_MOTATTR_LOOP); } fn_1_2F18(); } -static void fn_1_2F18(void) { +static void fn_1_2F18(void) +{ Vec sp3C; Vec sp30; Vec sp24; @@ -948,16 +979,17 @@ static void fn_1_2F18(void) { if (sp18.z != 0.0f || sp18.x != 0.0f) { sp24.y = atan2d(sp18.x, sp18.z); sp24.x = -atan2d(sp18.y, VECMagXZ(&sp18)); - } else { + } + else { sp24.x = sp24.y = 0.0f; } - PSMTXTrans(spD8, 0.0f, 180.0f, 0.0f); - PSMTXRotRad(spA8, 'x', MTXDegToRad(sp24.x)); - PSMTXRotRad(sp78, 'y', MTXDegToRad(sp24.y)); - PSMTXRotRad(sp48, 'z', MTXDegToRad(var_f29)); - PSMTXConcat(spA8, sp48, sp48); - PSMTXConcat(sp78, sp48, sp48); - PSMTXConcat(sp48, spD8, spD8); + MTXTrans(spD8, 0.0f, 180.0f, 0.0f); + MTXRotRad(spA8, 'x', MTXDegToRad(sp24.x)); + MTXRotRad(sp78, 'y', MTXDegToRad(sp24.y)); + MTXRotRad(sp48, 'z', MTXDegToRad(var_f29)); + MTXConcat(spA8, sp48, sp48); + MTXConcat(sp78, sp48, sp48); + MTXConcat(sp48, spD8, spD8); sp30.x = spD8[0][3]; sp30.y = spD8[1][3]; sp30.z = spD8[2][3]; @@ -984,7 +1016,8 @@ static void fn_1_2F18(void) { static s16 lbl_1_data_580 = -1; -static void fn_1_3350(void) { +static void fn_1_3350(void) +{ Vec sp8; s16 temp_r3; ModelData *temp_r30; @@ -993,7 +1026,8 @@ static void fn_1_3350(void) { lbl_1_bss_674 += 0.002f; if (lbl_1_bss_670 > 0.18f) { lbl_1_bss_670 = 0.18f; - } else if (lbl_1_bss_670 < 0.18f) { + } + else if (lbl_1_bss_670 < 0.18f) { lbl_1_bss_670 += lbl_1_bss_674; } temp_r3 = BoardModelIDGet(lbl_1_bss_6AE); @@ -1008,18 +1042,14 @@ static void fn_1_3350(void) { lbl_1_bss_640 += VECMag(&sp8); } -static s32 lbl_1_data_594[8][2] = { - { DATA_MAKE_NUM(DATADIR_W01, 34), DATA_MAKE_NUM(DATADIR_W01, 42) }, - { DATA_MAKE_NUM(DATADIR_W01, 35), DATA_MAKE_NUM(DATADIR_W01, 43) }, - { DATA_MAKE_NUM(DATADIR_W01, 36), DATA_MAKE_NUM(DATADIR_W01, 44) }, - { DATA_MAKE_NUM(DATADIR_W01, 37), DATA_MAKE_NUM(DATADIR_W01, 45) }, - { DATA_MAKE_NUM(DATADIR_W01, 38), DATA_MAKE_NUM(DATADIR_W01, 46) }, - { DATA_MAKE_NUM(DATADIR_W01, 39), DATA_MAKE_NUM(DATADIR_W01, 47) }, - { DATA_MAKE_NUM(DATADIR_W01, 40), DATA_MAKE_NUM(DATADIR_W01, 48) }, - { DATA_MAKE_NUM(DATADIR_W01, 41), DATA_MAKE_NUM(DATADIR_W01, 49) } -}; +static s32 lbl_1_data_594[8][2] + = { { DATA_MAKE_NUM(DATADIR_W01, 34), DATA_MAKE_NUM(DATADIR_W01, 42) }, { DATA_MAKE_NUM(DATADIR_W01, 35), DATA_MAKE_NUM(DATADIR_W01, 43) }, + { DATA_MAKE_NUM(DATADIR_W01, 36), DATA_MAKE_NUM(DATADIR_W01, 44) }, { DATA_MAKE_NUM(DATADIR_W01, 37), DATA_MAKE_NUM(DATADIR_W01, 45) }, + { DATA_MAKE_NUM(DATADIR_W01, 38), DATA_MAKE_NUM(DATADIR_W01, 46) }, { DATA_MAKE_NUM(DATADIR_W01, 39), DATA_MAKE_NUM(DATADIR_W01, 47) }, + { DATA_MAKE_NUM(DATADIR_W01, 40), DATA_MAKE_NUM(DATADIR_W01, 48) }, { DATA_MAKE_NUM(DATADIR_W01, 41), DATA_MAKE_NUM(DATADIR_W01, 49) } }; -static void fn_1_3514(s32 arg0) { +static void fn_1_3514(s32 arg0) +{ s32 temp_r30; s32 i; @@ -1029,7 +1059,8 @@ static void fn_1_3514(s32 arg0) { } } -static void fn_1_35B4(s32 arg0) { +static void fn_1_35B4(s32 arg0) +{ s32 i; for (i = 0; i < 2; i++) { @@ -1038,7 +1069,8 @@ static void fn_1_35B4(s32 arg0) { } } -static void fn_1_3624(void) { +static void fn_1_3624(void) +{ Mtx sp48; Vec sp3C; Vec sp30; @@ -1075,7 +1107,8 @@ static void fn_1_3624(void) { lbl_1_bss_6AC = BoardSpaceFlagPosGet(1, 0x2000, &sp3C); var_r25 = BoardSpaceFlagSearch(0, 0x1000); var_f30 = -1.0f; - } else { + } + else { BoardModelMotionTimeSet(lbl_1_bss_6AE, 0.0f); lbl_1_bss_63C = 90.0f; lbl_1_bss_6AC = BoardSpaceFlagPosGet(1, 0x1000, &sp3C); @@ -1099,7 +1132,7 @@ static void fn_1_3624(void) { lbl_1_bss_630.x = lbl_1_bss_618.x + 1000.0 * (sind(sp30.y) * cosd(sp30.x)); lbl_1_bss_630.y = lbl_1_bss_618.y + 1000.0 * -sind(sp30.x); lbl_1_bss_630.z = lbl_1_bss_618.z + 1000.0 * (cosd(sp30.y) * cosd(sp30.x)); - PSMTXRotRad(lbl_1_bss_678, 'y', MTXDegToRad(lbl_1_bss_63C)); + MTXRotRad(lbl_1_bss_678, 'y', MTXDegToRad(lbl_1_bss_63C)); BoardModelMtxSet(lbl_1_bss_6C4[0], &lbl_1_bss_678); BoardPlayerMtxSet(lbl_1_bss_6B4, &lbl_1_bss_678); BoardModelRotSet(lbl_1_bss_6C4[0], 0.0f, 0.0f, 0.0f); @@ -1124,16 +1157,18 @@ static void fn_1_3624(void) { BoardModelPosSetV(lbl_1_bss_6C4[0], &lbl_1_bss_654); BoardPlayerPosSetV(lbl_1_bss_6B4, &lbl_1_bss_654); if (BoardPlayerSizeGet(lbl_1_bss_6B4) != 1) { - PSMTXTrans(sp48, 0.0f, 30.0f, 0.0f); - } else { - PSMTXTrans(sp48, 0.0f, 400.0f, 250.0f); + MTXTrans(sp48, 0.0f, 30.0f, 0.0f); + } + else { + MTXTrans(sp48, 0.0f, 400.0f, 250.0f); } BoardModelMtxSet(lbl_1_bss_6C4[0], &lbl_1_bss_678); - PSMTXConcat(lbl_1_bss_678, sp48, sp48); + MTXConcat(lbl_1_bss_678, sp48, sp48); BoardPlayerMtxSet(lbl_1_bss_6B4, &sp48); if (lbl_1_bss_0->unk00_field0 == 0) { var_f29 = -lbl_1_bss_670; - } else { + } + else { var_f29 = lbl_1_bss_670; } BoardModelMotionSpeedSet(lbl_1_bss_6AE, var_f29); @@ -1141,22 +1176,24 @@ static void fn_1_3624(void) { if (BoardModelMotionTimeGet(lbl_1_bss_6AE) <= 0.0f) { break; } - } else { + } + else { if (BoardModelMotionTimeGet(lbl_1_bss_6AE) >= lbl_1_bss_644) { break; } } HuPrcVSleep(); } - PSMTXIdentity(lbl_1_bss_678); + MTXIdentity(lbl_1_bss_678); fn_1_4864(); HuAudFXStop(temp_r19); fn_1_1EE4(); fn_1_98EC(); if (BoardPlayerSizeGet(lbl_1_bss_6B4) == 1) { - PSMTXTrans(sp48, 0.0f, 400.0f, 250.0f); - } else { - PSMTXTrans(sp48, 0.0f, 30.0f, 0.0f); + MTXTrans(sp48, 0.0f, 400.0f, 250.0f); + } + else { + MTXTrans(sp48, 0.0f, 30.0f, 0.0f); } BoardModelMtxSet(lbl_1_bss_6C4[0], &lbl_1_bss_678); BoardPlayerMtxSet(lbl_1_bss_6B4, &sp48); @@ -1196,11 +1233,13 @@ static void fn_1_3624(void) { lbl_1_bss_6B2 = 1; } -static void fn_1_45F4(void) { +static void fn_1_45F4(void) +{ if (lbl_1_bss_6B2 != 0) { if (lbl_1_bss_0->unk00_field0 == 0) { lbl_1_bss_0->unk00_field0 = 1; - } else { + } + else { lbl_1_bss_0->unk00_field0 = 0; } lbl_1_bss_6B2 = 0; @@ -1220,7 +1259,8 @@ static void fn_1_45F4(void) { BoardStatusShowSetAll(1); } -static void fn_1_4774(void) { +static void fn_1_4774(void) +{ float sp8[2]; float var_f31; float var_f30; @@ -1234,14 +1274,16 @@ static void fn_1_4774(void) { HuWinMesSet(lbl_1_data_580, MAKE_MESSID(13, 5)); } -static void fn_1_4864(void) { +static void fn_1_4864(void) +{ if (lbl_1_data_580 != -1) { HuWinKill(lbl_1_data_580); lbl_1_data_580 = -1; } } -static s32 fn_1_48B4(void) { +static s32 fn_1_48B4(void) +{ Vec sp20; Vec sp14; Vec sp8; @@ -1286,7 +1328,8 @@ static s32 fn_1_48B4(void) { if (GWPlayer[lbl_1_bss_6B4].com) { if (BoardPlayerCoinsGet(lbl_1_bss_6B4) >= 5) { BoardComKeySetUp(); - } else { + } + else { BoardComKeySetDown(); } } @@ -1340,7 +1383,8 @@ static s32 fn_1_48B4(void) { return 0; } -static void fn_1_4E14(void) { +static void fn_1_4E14(void) +{ if (fn_1_48B4() != 0) { fn_1_3624(); fn_1_45F4(); @@ -1348,12 +1392,14 @@ static void fn_1_4E14(void) { HuPrcEnd(); } -static void fn_1_4FA8(void) { +static void fn_1_4FA8(void) +{ BoardWinKill(); lbl_1_bss_8 = NULL; } -static void fn_1_4FD8(void) { +static void fn_1_4FD8(void) +{ lbl_1_bss_6B4 = GWSystem.player_curr; BoardRollDispSet(0); if (BoardPlayerSizeGet(lbl_1_bss_6B4) == 2 || GWPlayer[lbl_1_bss_6B4].bowser_suit) { @@ -1367,7 +1413,8 @@ static void fn_1_4FD8(void) { BoardRollDispSet(1); } -static void fn_1_50D4(void) { +static void fn_1_50D4(void) +{ Vec sp20; Vec sp14; Vec sp8; @@ -1398,11 +1445,13 @@ static void fn_1_50D4(void) { } if (!(temp_r31->flag & 0x80)) { sp14 = temp_r31->pos; - } else { + } + else { if (var_r29 >= 3) { if (BoardRandFloat() < 0.5f) { var_r26 = 1; - } else { + } + else { var_r26 = 0; } var_r27 = var_r26; @@ -1426,7 +1475,8 @@ static void fn_1_50D4(void) { } } -static void fn_1_53B8(void) { +static void fn_1_53B8(void) +{ s32 i; for (i = 0; i < 24; i++) { @@ -1440,21 +1490,14 @@ static void fn_1_53B8(void) { static s32 lbl_1_data_5D4 = -1; static s32 lbl_1_data_5D8 = -1; -static s16 lbl_1_data_5DC[2][4] = { - { 24, 25, 26, 27 }, - { 29, 30, 31, 32 } -}; +static s16 lbl_1_data_5DC[2][4] = { { 24, 25, 26, 27 }, { 29, 30, 31, 32 } }; -static char *lbl_1_data_604[] = { - "chara1", "chara2", "chara3" -}; +static char *lbl_1_data_604[] = { "chara1", "chara2", "chara3" }; -static float lbl_1_data_610[2][2] = { - { 90.0f, 0.0f }, - { 0.0f, 270.0f } -}; +static float lbl_1_data_610[2][2] = { { 90.0f, 0.0f }, { 0.0f, 270.0f } }; -static void fn_1_543C(void) { +static void fn_1_543C(void) +{ float var_f31; s16 temp_r28; s16 temp_r29; @@ -1477,19 +1520,22 @@ static void fn_1_543C(void) { } if (lbl_1_bss_0->unk01[0] != 0) { var_f31 = 0.0f; - } else { + } + else { var_f31 = 90.0f; } BoardModelRotSet(lbl_1_bss_6C4[27], 0.0f, var_f31, 0.0f); if (lbl_1_bss_0->unk01[1] != 0) { var_f31 = -90.0f; - } else { + } + else { var_f31 = 0.0f; } BoardModelRotSet(lbl_1_bss_6C4[32], 0.0f, var_f31, 0.0f); } -static void fn_1_5694(s32 arg0) { +static void fn_1_5694(s32 arg0) +{ s16 temp_r29; s16 temp_r30; s16 i; @@ -1504,7 +1550,8 @@ static void fn_1_5694(s32 arg0) { BoardModelMotionSpeedSet(temp_r30, 1.0f); BoardModelAttrReset(temp_r30, 0x40000002); } - } else { + } + else { BoardModelMotionSpeedSet(temp_r29, 0.0f); BoardModelAttrSet(temp_r29, 0x40000002); for (i = 0; i < 3; i++) { @@ -1515,7 +1562,8 @@ static void fn_1_5694(s32 arg0) { } } -static void fn_1_586C(s32 arg0, s32 arg1) { +static void fn_1_586C(s32 arg0, s32 arg1) +{ lbl_1_bss_29 = arg0; lbl_1_bss_26 = arg1; BoardRollDispSet(0); @@ -1527,7 +1575,8 @@ static void fn_1_586C(s32 arg0, s32 arg1) { BoardRollDispSet(1); } -static void fn_1_592C(void) { +static void fn_1_592C(void) +{ s16 temp_r30; s16 var_r28; @@ -1536,7 +1585,8 @@ static void fn_1_592C(void) { BoardPlayerIdleSet(GWSystem.player_curr); if (lbl_1_bss_29 == 0) { var_r28 = lbl_1_bss_6C4[23]; - } else { + } + else { var_r28 = lbl_1_bss_6C4[28]; } BoardCameraTargetModelSet(var_r28); @@ -1553,11 +1603,13 @@ static void fn_1_592C(void) { HuPrcEnd(); } -static void fn_1_5B2C(void) { +static void fn_1_5B2C(void) +{ lbl_1_bss_14 = NULL; } -static void fn_1_5B40(void) { +static void fn_1_5B40(void) +{ s16 spC[] = { 27, 32 }; s16 temp_r30; s32 temp_r31; @@ -1579,11 +1631,13 @@ static void fn_1_5B40(void) { } } -static BOOL fn_1_5CD0(void) { +static BOOL fn_1_5CD0(void) +{ return lbl_1_bss_18 ? FALSE : TRUE; } -static void fn_1_5D08(void) { +static void fn_1_5D08(void) +{ Bss18Work *temp_r31; float var_f30; float var_f31; @@ -1593,7 +1647,8 @@ static void fn_1_5D08(void) { if (lbl_1_bss_29 == 0) { var_r28 = lbl_1_bss_6C4[23]; - } else { + } + else { var_r28 = lbl_1_bss_6C4[28]; } while (TRUE) { @@ -1632,12 +1687,14 @@ static void fn_1_5D08(void) { temp_r31->unk04 = var_r28; if (BoardPlayerSizeGet(GWSystem.player_curr) == 2) { temp_r31->unk00_field3 = 1; - } else { + } + else { temp_r31->unk00_field3 = 0; } } -static void fn_1_6098(omObjData *arg0) { +static void fn_1_6098(omObjData *arg0) +{ Bss18Work *temp_r31 = OM_GET_WORK_PTR(arg0, Bss18Work); s32 temp_r0; @@ -1666,7 +1723,8 @@ static void fn_1_6098(omObjData *arg0) { } } -static void fn_1_6194(Bss18Work *arg0, omObjData *arg1) { +static void fn_1_6194(Bss18Work *arg0, omObjData *arg1) +{ Mtx sp38; Vec sp2C; Vec sp20; @@ -1704,7 +1762,8 @@ static void fn_1_6194(Bss18Work *arg0, omObjData *arg1) { arg0->unk01 = 0; } -static void fn_1_63F0(Bss18Work *arg0, omObjData *arg1) { +static void fn_1_63F0(Bss18Work *arg0, omObjData *arg1) +{ Vec sp10; float temp_f29; float var_f27; @@ -1716,7 +1775,8 @@ static void fn_1_63F0(Bss18Work *arg0, omObjData *arg1) { BoardPlayerIdleSet(GWSystem.player_curr); if (GWPlayer[GWSystem.player_curr].bowser_suit) { BoardModelHookSet(arg0->unk04, lbl_1_data_604[lbl_1_bss_28], BoardBowserSuitModelGet()); - } else { + } + else { BoardModelHookSet(arg0->unk04, lbl_1_data_604[lbl_1_bss_28], BoardPlayerModelGet(GWSystem.player_curr)); } var_r24 = lbl_1_bss_6C4[lbl_1_data_5DC[lbl_1_bss_29][lbl_1_bss_28]]; @@ -1763,7 +1823,8 @@ static void fn_1_63F0(Bss18Work *arg0, omObjData *arg1) { arg0->unk01++; } -static void fn_1_6A14(Bss18Work *arg0, omObjData *arg1) { +static void fn_1_6A14(Bss18Work *arg0, omObjData *arg1) +{ Vec sp20; Vec sp14; Vec sp8; @@ -1784,7 +1845,8 @@ static void fn_1_6A14(Bss18Work *arg0, omObjData *arg1) { arg0->unk01 = 0; } -static void fn_1_6BC0(Bss18Work *arg0, omObjData *arg1) { +static void fn_1_6BC0(Bss18Work *arg0, omObjData *arg1) +{ Vec sp14; Vec sp8; float var_f28; @@ -1831,7 +1893,8 @@ static void fn_1_6BC0(Bss18Work *arg0, omObjData *arg1) { arg0->unk01++; } -static void fn_1_6FB4(Bss18Work *arg0, omObjData *arg1) { +static void fn_1_6FB4(Bss18Work *arg0, omObjData *arg1) +{ Vec sp40; Vec sp34; Vec sp28; @@ -1864,7 +1927,8 @@ static void fn_1_6FB4(Bss18Work *arg0, omObjData *arg1) { } if (lbl_1_bss_29 == 0) { var_r24 = lbl_1_bss_0->unk01[lbl_1_bss_29] ^ 1; - } else { + } + else { var_r24 = lbl_1_bss_0->unk01[lbl_1_bss_29]; } temp_r29 = BoardSpaceGet(0, lbl_1_bss_26); @@ -1889,7 +1953,8 @@ static void fn_1_6FB4(Bss18Work *arg0, omObjData *arg1) { } } -static void fn_1_7528(s32 arg0, s32 arg1) { +static void fn_1_7528(s32 arg0, s32 arg1) +{ Vec sp30; Vec sp24; Vec sp18; @@ -1905,7 +1970,8 @@ static void fn_1_7528(s32 arg0, s32 arg1) { temp_f30 = VECDistance(&sp18, &sp30); if (temp_f31 < temp_f30) { lbl_1_bss_29 = 0; - } else { + } + else { lbl_1_bss_29 = 1; } BoardCameraTargetModelSet(lbl_1_bss_6C4[sp14[lbl_1_bss_29]]); @@ -1917,7 +1983,8 @@ static void fn_1_7528(s32 arg0, s32 arg1) { HuPrcSleep(12); } -static void fn_1_77EC(s32 arg0, s32 arg1) { +static void fn_1_77EC(s32 arg0, s32 arg1) +{ lbl_1_bss_6B4 = arg0; lbl_1_bss_6B0 = 0; lbl_1_bss_8 = HuPrcChildCreate(fn_1_7894, 0x2003, 0x2000, 0, boardMainProc); @@ -1927,7 +1994,8 @@ static void fn_1_77EC(s32 arg0, s32 arg1) { } } -static void fn_1_7894(void) { +static void fn_1_7894(void) +{ lbl_1_bss_6B1 = 1; WipeColorSet(0, 0, 0); WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 21); @@ -1939,7 +2007,8 @@ static void fn_1_7894(void) { HuPrcEnd(); } -static void fn_1_7A64(void) { +static void fn_1_7A64(void) +{ Vec sp34; Vec sp28; Vec sp1C; @@ -1969,7 +2038,8 @@ static void fn_1_7A64(void) { lbl_1_bss_63C = -90.0f; lbl_1_bss_6AC = BoardSpaceFlagPosGet(1, 0x2000, &sp34); var_r20 = BoardSpaceFlagSearch(1, 0x1000); - } else { + } + else { BoardModelMotionTimeSet(lbl_1_bss_6AE, 0.0f); lbl_1_bss_63C = 90.0f; lbl_1_bss_6AC = BoardSpaceFlagPosGet(1, 0x1000, &sp34); @@ -1977,7 +2047,7 @@ static void fn_1_7A64(void) { } lbl_1_bss_654 = sp34; BoardCameraMotionStartEx(lbl_1_bss_6C4[0], NULL, NULL, 2400.0f, -1.0f, 2); - PSMTXRotRad(lbl_1_bss_678, 'y', MTXDegToRad(lbl_1_bss_63C)); + MTXRotRad(lbl_1_bss_678, 'y', MTXDegToRad(lbl_1_bss_63C)); BoardModelMtxSet(lbl_1_bss_6C4[0], &lbl_1_bss_678); BoardModelRotSet(lbl_1_bss_6C4[0], 0.0f, 0.0f, 0.0f); fn_1_3350(); @@ -1998,7 +2068,8 @@ static void fn_1_7A64(void) { BoardModelMtxSet(lbl_1_bss_6C4[0], &lbl_1_bss_678); if (lbl_1_bss_0->unk00_field0 == 0) { var_f30 = -lbl_1_bss_670; - } else { + } + else { var_f30 = lbl_1_bss_670; } BoardModelMotionSpeedSet(lbl_1_bss_6AE, var_f30); @@ -2008,7 +2079,8 @@ static void fn_1_7A64(void) { WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, -1); var_r28 = 1; } - } else { + } + else { if (BoardModelMotionTimeGet(lbl_1_bss_6AE) >= lbl_1_bss_644 - 20.0f && var_r28 == 0) { WipeColorSet(0, 0, 0); WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, -1); @@ -2026,7 +2098,7 @@ static void fn_1_7A64(void) { while (lbl_1_bss_C) { HuPrcVSleep(); } - PSMTXIdentity(lbl_1_bss_678); + MTXIdentity(lbl_1_bss_678); BoardModelMtxSet(lbl_1_bss_6C4[0], &lbl_1_bss_678); lbl_1_bss_660.x = 0.0f; lbl_1_bss_660.z = 0.0f; @@ -2044,7 +2116,8 @@ static void fn_1_7A64(void) { static s8 lbl_1_data_633 = -1; -static void fn_1_852C(void) { +static void fn_1_852C(void) +{ BssCWork *temp_r30; BssCData *temp_r31; Vec spC; @@ -2083,7 +2156,8 @@ static void fn_1_852C(void) { if (lbl_1_bss_0->unk00_field0 == 0) { temp_r31->unk08 = -0.18f; BoardModelMotionTimeSet(temp_r31->unk04, temp_f31); - } else { + } + else { temp_r31->unk08 = 0.18f; BoardModelMotionTimeSet(temp_r31->unk04, 0.0f); } @@ -2094,13 +2168,15 @@ static void fn_1_852C(void) { BoardCameraTargetModelSet(lbl_1_bss_6C4[0]); } -static void fn_1_87AC(void) { +static void fn_1_87AC(void) +{ if (lbl_1_bss_C) { OM_GET_WORK_PTR(lbl_1_bss_C, BssCWork)->unk00_field0 = 1; } } -static void fn_1_87E0(omObjData *arg0) { +static void fn_1_87E0(omObjData *arg0) +{ BssCWork *temp_r30 = OM_GET_WORK_PTR(arg0, BssCWork); BssCData *temp_r31; s32 i; @@ -2121,7 +2197,8 @@ static void fn_1_87E0(omObjData *arg0) { temp_r31 = &temp_r30->unk04[i]; if (temp_r31->unk02 != 0) { temp_r31->unk02--; - } else { + } + else { switch (temp_r31->unk00) { case 0: fn_1_8988(temp_r31, arg0); @@ -2146,7 +2223,8 @@ static void fn_1_87E0(omObjData *arg0) { } } -static void fn_1_8988(BssCData *arg0, omObjData *arg1) { +static void fn_1_8988(BssCData *arg0, omObjData *arg1) +{ Vec sp20; Vec sp14; Vec sp8; @@ -2161,18 +2239,10 @@ static void fn_1_8988(BssCData *arg0, omObjData *arg1) { arg0->unk00 = 1; } -static s32 lbl_1_data_634[8] = { - 0x00000123, - 0x00000163, - 0x000001A3, - 0x000001E3, - 0x00000223, - 0x00000263, - 0x000002A3, - 0x000002E3 -}; +static s32 lbl_1_data_634[8] = { 0x00000123, 0x00000163, 0x000001A3, 0x000001E3, 0x00000223, 0x00000263, 0x000002A3, 0x000002E3 }; -static void fn_1_8A50(BssCData *arg0, omObjData *arg1) { +static void fn_1_8A50(BssCData *arg0, omObjData *arg1) +{ if (lbl_1_data_633 == -1) { BoardCameraTargetPlayerSet(arg0->unk01); lbl_1_data_633 = arg0->unk01; @@ -2186,7 +2256,8 @@ static void fn_1_8A50(BssCData *arg0, omObjData *arg1) { omVibrate(arg0->unk01, 12, 4, 2); } -static void fn_1_8B6C(BssCData *arg0, omObjData *arg1) { +static void fn_1_8B6C(BssCData *arg0, omObjData *arg1) +{ ModelData *temp_r29; HsfObject *var_r30; Vec sp20; @@ -2233,7 +2304,8 @@ static void fn_1_8B6C(BssCData *arg0, omObjData *arg1) { BoardModelMotionTimeSet(lbl_1_bss_6AE, temp_f30); } -static void fn_1_8DDC(BssCData *arg0, omObjData *arg1) { +static void fn_1_8DDC(BssCData *arg0, omObjData *arg1) +{ ModelData *temp_r29; HsfObject *var_r30; Vec *var_r27; @@ -2262,17 +2334,19 @@ static void fn_1_8DDC(BssCData *arg0, omObjData *arg1) { var_r27 = &arg0->unk14; var_r26 = &sp30; BoardMTXCalcLookAt(sp54, var_r26, &sp48, var_r27); - PSMTXTranspose(sp54, arg0->unk20); - } else { + MTXTranspose(sp54, arg0->unk20); + } + else { if (sp24.z != 0.0f || sp24.x != 0.0f) { sp3C.y = atan2d(sp24.x, sp24.z); sp3C.x = -atan2d(sp24.y, VECMagXZ(&sp24)); - } else { + } + else { sp3C.x = sp3C.y = 0.0f; } - PSMTXRotRad(sp54, 'x', MTXDegToRad(sp3C.x)); - PSMTXRotRad(arg0->unk20, 'y', MTXDegToRad(sp3C.y)); - PSMTXConcat(arg0->unk20, sp54, arg0->unk20); + MTXRotRad(sp54, 'x', MTXDegToRad(sp3C.x)); + MTXRotRad(arg0->unk20, 'y', MTXDegToRad(sp3C.y)); + MTXConcat(arg0->unk20, sp54, arg0->unk20); } BoardPlayerPosSetV(arg0->unk01, &sp30); BoardPlayerRotSet(arg0->unk01, 0.0f, 0.0f, 0.0f); @@ -2284,13 +2358,14 @@ static void fn_1_8DDC(BssCData *arg0, omObjData *arg1) { } } -static void fn_1_918C(BssCData *arg0, omObjData *arg1) { +static void fn_1_918C(BssCData *arg0, omObjData *arg1) +{ Vec sp20; Vec sp14; Vec sp8; s32 var_r30; - PSMTXIdentity(arg0->unk20); + MTXIdentity(arg0->unk20); var_r30 = BoardSpaceLinkFlagSearch(0, arg0->unk06, 0x40); BoardSpacePosGet(0, var_r30, &sp20); BoardPlayerPosGet(arg0->unk01, &sp14); @@ -2301,7 +2376,8 @@ static void fn_1_918C(BssCData *arg0, omObjData *arg1) { arg0->unk00 = 5; } -static void fn_1_927C(BssCData *arg0, omObjData *arg1) { +static void fn_1_927C(BssCData *arg0, omObjData *arg1) +{ s32 temp_r3; if (!GWPlayer[arg0->unk01].moving) { @@ -2313,7 +2389,8 @@ static void fn_1_927C(BssCData *arg0, omObjData *arg1) { } } -static void fn_1_932C(BssCData *arg0) { +static void fn_1_932C(BssCData *arg0) +{ BoardSpace *temp_r30; BoardSpace *var_r26; Vec sp20[2]; @@ -2340,7 +2417,8 @@ static void fn_1_932C(BssCData *arg0) { } if (lbl_1_bss_0->unk00_field0 == 0) { BoardSpaceFlagPosGet(0, 0x1000, &sp14); - } else { + } + else { BoardSpaceFlagPosGet(0, 0x2000, &sp14); } for (i = 0; i < 2; i++) { @@ -2348,12 +2426,14 @@ static void fn_1_932C(BssCData *arg0) { } if (spC[0] < spC[1]) { arg0->unk06 = sp8[0]; - } else { + } + else { arg0->unk06 = sp8[1]; } } -static s32 fn_1_94A8(BssCData *arg0) { +static s32 fn_1_94A8(BssCData *arg0) +{ Vec sp14; s16 spC[4]; float sp8; @@ -2373,7 +2453,8 @@ static s32 fn_1_94A8(BssCData *arg0) { var_r31 = BoardSpaceGet(1, var_r30); if (lbl_1_bss_0->unk00_field0 == 0) { var_r29 = var_r31->link[0]; - } else { + } + else { BoardSpaceLinkTargetListGet(1, var_r30, spC); var_r29 = spC[0]; } @@ -2389,7 +2470,8 @@ static s32 fn_1_94A8(BssCData *arg0) { if (var_r28) { var_r31 = var_r28; break; - } else { + } + else { var_r28 = var_r31; } } @@ -2398,12 +2480,14 @@ static s32 fn_1_94A8(BssCData *arg0) { } if (var_r31->flag & 8) { return 1; - } else { + } + else { return 0; } } -static void fn_1_95F4(BssCData *arg0) { +static void fn_1_95F4(BssCData *arg0) +{ HsfObject *var_r30; ModelData *temp_r29; Vec sp2C; @@ -2418,7 +2502,8 @@ static void fn_1_95F4(BssCData *arg0) { if (lbl_1_bss_0->unk00_field0 == 0) { BoardModelMotionTimeSet(arg0->unk04, temp_f30); BoardModelMotionSpeedSet(arg0->unk04, -0.18f); - } else { + } + else { BoardModelMotionTimeSet(arg0->unk04, 0.0f); BoardModelMotionSpeedSet(arg0->unk04, 0.18f); } @@ -2448,7 +2533,8 @@ static void fn_1_95F4(BssCData *arg0) { arg0->unk10 = var_f31; } -static void fn_1_97F4(void) { +static void fn_1_97F4(void) +{ Bss20Work *temp_r30; Bss20Data *var_r31; s32 i; @@ -2468,13 +2554,15 @@ static void fn_1_97F4(void) { } } -static void fn_1_98EC(void) { +static void fn_1_98EC(void) +{ if (lbl_1_bss_20) { OM_GET_WORK_PTR(lbl_1_bss_20, Bss20Work)->unk00_field0 = 1; } } -static void fn_1_9920(omObjData *arg0) { +static void fn_1_9920(omObjData *arg0) +{ Bss20Work *temp_r31; s32 i; @@ -2493,25 +2581,28 @@ static void fn_1_9920(omObjData *arg0) { } if (temp_r31->unk01 != 0) { temp_r31->unk01--; - } else { + } + else { temp_r31->unk01 = 2; fn_1_9A24(temp_r31); } fn_1_9BBC(temp_r31); } -static void fn_1_9A24(Bss20Work *arg0) { +static void fn_1_9A24(Bss20Work *arg0) +{ Bss20Data *temp_r31; Mtx sp8; s32 i; s32 j; if (lbl_1_bss_6B1 != 0) { - PSMTXTrans(sp8, 0.0f, 50.0f, -100.0f); - } else { - PSMTXTrans(sp8, 0.0f, 70.0f, -100.0f); + MTXTrans(sp8, 0.0f, 50.0f, -100.0f); } - PSMTXConcat(lbl_1_bss_678, sp8, sp8); + else { + MTXTrans(sp8, 0.0f, 70.0f, -100.0f); + } + MTXConcat(lbl_1_bss_678, sp8, sp8); for (i = 0; i < 4; i++) { for (j = 0; j < 20; j++) { temp_r31 = &arg0->unk04[j]; @@ -2532,7 +2623,8 @@ static void fn_1_9A24(Bss20Work *arg0) { } } -static void fn_1_9BBC(Bss20Work *arg0) { +static void fn_1_9BBC(Bss20Work *arg0) +{ Bss20Data *temp_r31; s32 i; @@ -2545,7 +2637,8 @@ static void fn_1_9BBC(Bss20Work *arg0) { if (temp_r31->unk00 == 0) { temp_r31->unk00 = -1; BoardModelVisibilitySet(temp_r31->unk02, 0); - } else { + } + else { if (temp_r31->unk00 <= 3) { temp_r31->unk04 = sind(30.0f * temp_r31->unk00); } diff --git a/src/REL/w03Dll/condor.c b/src/REL/w03Dll/condor.c index 4c8327dd..c42f53b3 100644 --- a/src/REL/w03Dll/condor.c +++ b/src/REL/w03Dll/condor.c @@ -482,7 +482,7 @@ void fn_1_3F5C(s32 arg0) BoardModelMotionStart(lbl_1_data_310, 2, 0x40000001); BoardModelMotionStart(lbl_1_data_310, 1, 0x40000001); BoardModelRotYSet(lbl_1_data_310, 0.0f); - PSMTXIdentity(sp38); + MTXIdentity(sp38); BoardModelMtxSet(lbl_1_data_310, &sp38); sp20.x = 0.0f; @@ -624,13 +624,13 @@ void fn_1_4424(w03StructUnk2 *arg0) sp30 = sp48; sp18 = sp54; BoardMTXCalcLookAt(spA8, &sp18, &sp24, &sp30); - PSMTXTranspose(spA8, spA8); + MTXTranspose(spA8, spA8); MTXRotDeg(spD8, 'z', temp_f30); - PSMTXTrans(sp108, 0.0f, -350.0f, 0.0f); - PSMTXConcat(spD8, sp108, sp108); - PSMTXConcat(spA8, sp108, sp108); - PSMTXTrans(sp78, sp54.x, sp54.y, sp54.z); - PSMTXConcat(sp78, sp108, sp78); + MTXTrans(sp108, 0.0f, -350.0f, 0.0f); + MTXConcat(spD8, sp108, sp108); + MTXConcat(spA8, sp108, sp108); + MTXTrans(sp78, sp54.x, sp54.y, sp54.z); + MTXConcat(sp78, sp108, sp78); Hu3DMtxTransGet(sp78, &temp_r27->unk_08); BoardModelPosSetV(temp_r27->model, &temp_r27->unk_08); BoardModelVisibilitySet(temp_r27->model, 1); @@ -1078,16 +1078,16 @@ void fn_1_5C5C(omObjData *arg0, w03UnkStruct5 *arg1) sp20.y = 1.0f; BoardMTXCalcLookAt(sp110, &sp14, &sp20, &sp8); - PSMTXTranspose(sp110, sp110); + MTXTranspose(sp110, sp110); MTXRotDeg(spE0, 'z', -arg1->unk_04); - PSMTXTrans(sp50, 0.0f, -600.0f, 0.0f); - PSMTXConcat(spE0, sp50, sp50); - PSMTXConcat(sp110, sp50, sp50); - PSMTXTrans(sp80, sp44.x, sp44.y, sp44.z); - PSMTXConcat(sp80, sp50, sp80); + MTXTrans(sp50, 0.0f, -600.0f, 0.0f); + MTXConcat(spE0, sp50, sp50); + MTXConcat(sp110, sp50, sp50); + MTXTrans(sp80, sp44.x, sp44.y, sp44.z); + MTXConcat(sp80, sp50, sp80); Hu3DMtxTransGet(sp80, &sp44); MTXRotDeg(spB0, 'y', atan2d(-sp2C.x, -sp2C.z)); - PSMTXConcat(spB0, spE0, sp110); + MTXConcat(spB0, spE0, sp110); BoardModelMtxSet(lbl_1_data_310, &sp110); BoardModelPosSetV(lbl_1_data_310, &sp44); BoardCameraRotSet(-20.0f, atan2d(sp2C.x, sp2C.z)); diff --git a/src/REL/w03Dll/mg_item.c b/src/REL/w03Dll/mg_item.c index 18332aa2..a7d31165 100644 --- a/src/REL/w03Dll/mg_item.c +++ b/src/REL/w03Dll/mg_item.c @@ -742,12 +742,12 @@ void fn_1_B0A4(s32 arg0) } if (temp_r29 == 5) { - PSMTXTrans(sp18, 0.0f, -50.0f, 0.0f); + MTXTrans(sp18, 0.0f, -50.0f, 0.0f); BoardModelMtxSet(temp_r30->unk_06[i], &sp18); } if ((temp_r29 == 6) || (temp_r29 == 7)) { - PSMTXTrans(sp18, 0.0f, 0.0f, 8.0f); + MTXTrans(sp18, 0.0f, 0.0f, 8.0f); BoardModelMtxSet(temp_r30->unk_06[i], &sp18); } } diff --git a/src/REL/w03Dll/statue.c b/src/REL/w03Dll/statue.c index de10197b..a31fc5a8 100644 --- a/src/REL/w03Dll/statue.c +++ b/src/REL/w03Dll/statue.c @@ -1,17 +1,18 @@ -#include "dolphin.h" #include "REL/executor.h" -#include "game/process.h" -#include "game/data.h" -#include "game/gamework_data.h" #include "REL/w03Dll.h" +#include "dolphin.h" #include "game/audio.h" +#include "game/board/main.h" #include "game/board/model.h" #include "game/board/player.h" #include "game/board/space.h" #include "game/board/ui.h" +#include "game/data.h" +#include "game/gamework_data.h" #include "game/hsfman.h" -#include "game/board/main.h" #include "game/objsub.h" +#include "game/process.h" + #include "ext_math.h" @@ -29,17 +30,16 @@ void fn_1_2818(void); void fn_1_2A40(void); void fn_1_2B44(void); -//data +// data s16 lbl_1_data_280 = -1; s16 lbl_1_data_282 = -1; s16 lbl_1_data_284 = -1; s16 lbl_1_data_286 = -1; s32 lbl_1_data_288 = -1; -//BSS Extern +// BSS Extern - -//BSS +// BSS s8 lbl_1_bss_6F; s8 lbl_1_bss_6E; s16 lbl_1_bss_6C; @@ -48,12 +48,13 @@ s16 lbl_1_bss_68; GXTexObj lbl_1_bss_48; char lbl_1_bss_44[4]; char lbl_1_bss_38[12]; -void* lbl_1_bss_34; +void *lbl_1_bss_34; f32 lbl_1_bss_30; s8 lbl_1_bss_2C; -Process* lbl_1_bss_28; +Process *lbl_1_bss_28; -void fn_1_12C8(void) { +void fn_1_12C8(void) +{ BoardRollDispSet(0); lbl_1_bss_28 = HuPrcChildCreate(&fn_1_1358, 0x2003, 0x2000, 0, boardMainProc); HuPrcDestructorSet2(lbl_1_bss_28, &fn_1_152C); @@ -65,7 +66,8 @@ void fn_1_12C8(void) { BoardRollDispSet(1); } -void fn_1_1358(void) { +void fn_1_1358(void) +{ s32 cur_player_index; s32 unkC; @@ -76,7 +78,8 @@ void fn_1_1358(void) { if ((BoardSpaceFlagGet(0, GWPlayer[cur_player_index].space_curr) & 0x2000)) { lbl_1_bss_6E = 0; lbl_1_bss_6C = lbl_1_bss_C[3]; - } else { + } + else { lbl_1_bss_6E = 1; lbl_1_bss_6C = lbl_1_bss_C[4]; } @@ -84,7 +87,8 @@ void fn_1_1358(void) { if (fn_1_1650(cur_player_index) != 0) { if (fn_1_1D1C() != 0) { fn_1_1ED4(cur_player_index); - } else { + } + else { fn_1_20E0(cur_player_index); } if (lbl_1_bss_2C) { @@ -106,7 +110,8 @@ void fn_1_1358(void) { HuPrcEnd(); } -void fn_1_152C(void) { +void fn_1_152C(void) +{ BoardConfettiKill(); if (lbl_1_data_282 != -1) { @@ -123,7 +128,8 @@ void fn_1_152C(void) { lbl_1_bss_28 = NULL; } -s32 fn_1_15E8(void) { +s32 fn_1_15E8(void) +{ BoardModelVisibilitySet(lbl_1_bss_6C, 1); if (lbl_1_data_284 != -1) { @@ -134,7 +140,8 @@ s32 fn_1_15E8(void) { return 1; } -s32 fn_1_1650(s32 arg0) { +s32 fn_1_1650(s32 arg0) +{ Point3d sp38; Point3d sp2C; Point3d sp20; @@ -144,14 +151,14 @@ s32 fn_1_1650(s32 arg0) { s32 temp2; BoardPlayerIdleSet(arg0); - + if (lbl_1_bss_0->unk2) { BoardWinCreate(0, MAKE_MESSID(22, 0), -1); BoardWinWait(); BoardWinKill(); return 0; } - + temp2 = BoardSpaceLinkFlagSearch(0, GWPlayer[arg0].space_curr, 0x02000000); BoardSpacePosGet(0, temp2, &sp38); BoardPlayerPosGet(arg0, &sp2C); @@ -170,14 +177,14 @@ s32 fn_1_1650(s32 arg0) { while (GWPlayer[arg0].moving) { HuPrcVSleep(); } - + BoardStatusShowSetAll(0); BoardPlayerMotBlendSet(arg0, 0xB4, 0xF); while (BoardPlayerMotBlendCheck(arg0) == 0) { HuPrcVSleep(); } - + BoardPlayerIdleSet(arg0); BoardWinCreate(2, MAKE_MESSID(22, 1), 2); BoardWinWait(); @@ -187,7 +194,8 @@ s32 fn_1_1650(s32 arg0) { if (GWPlayer[arg0].com) { if (BoardRandMod(0x64) > 0x32U) { BoardComKeySetLeft(); - } else { + } + else { BoardComKeySetRight(); } } @@ -200,56 +208,35 @@ s32 fn_1_1650(s32 arg0) { BoardMusStart(1, 0x19, 0x7F, 0); HuAudFXPlay(0x435); sp8.y = BoardModelRotYGet(lbl_1_bss_6C); - + while (BoardDAngleCalcRange(&sp8.y, 180.0f, 2.0f) == 0) { BoardModelRotYSet(lbl_1_bss_6C, sp8.y); HuPrcVSleep(); } - + HuAudFXPlay(0x445); BoardModelRotYSet(lbl_1_bss_6C, 180.0f); - + while (BoardMusStatusGet(1) != 0) { HuPrcVSleep(); } return 1; } -s32 lbl_1_data_290[] = { - DATA_MAKE_NUM(DATADIR_MARIOMOT, 98), - DATA_MAKE_NUM(DATADIR_LUIGIMOT, 98), - DATA_MAKE_NUM(DATADIR_PEACHMOT, 98), - DATA_MAKE_NUM(DATADIR_YOSHIMOT, 98), - DATA_MAKE_NUM(DATADIR_WARIOMOT, 98), - DATA_MAKE_NUM(DATADIR_DONKEYMOT, 98), - DATA_MAKE_NUM(DATADIR_DAISYMOT, 98), - DATA_MAKE_NUM(DATADIR_WALUIGIMOT, 98) -}; +s32 lbl_1_data_290[] = { DATA_MAKE_NUM(DATADIR_MARIOMOT, 98), DATA_MAKE_NUM(DATADIR_LUIGIMOT, 98), DATA_MAKE_NUM(DATADIR_PEACHMOT, 98), + DATA_MAKE_NUM(DATADIR_YOSHIMOT, 98), DATA_MAKE_NUM(DATADIR_WARIOMOT, 98), DATA_MAKE_NUM(DATADIR_DONKEYMOT, 98), + DATA_MAKE_NUM(DATADIR_DAISYMOT, 98), DATA_MAKE_NUM(DATADIR_WALUIGIMOT, 98) }; -s32 lbl_1_data_2B0[] = { - DATA_MAKE_NUM(DATADIR_MARIOMOT, 51), - DATA_MAKE_NUM(DATADIR_LUIGIMOT, 51), - DATA_MAKE_NUM(DATADIR_PEACHMOT, 51), - DATA_MAKE_NUM(DATADIR_YOSHIMOT, 51), - DATA_MAKE_NUM(DATADIR_WARIOMOT, 51), - DATA_MAKE_NUM(DATADIR_DONKEYMOT, 51), - DATA_MAKE_NUM(DATADIR_DAISYMOT, 51), - DATA_MAKE_NUM(DATADIR_WALUIGIMOT, 51) -}; +s32 lbl_1_data_2B0[] = { DATA_MAKE_NUM(DATADIR_MARIOMOT, 51), DATA_MAKE_NUM(DATADIR_LUIGIMOT, 51), DATA_MAKE_NUM(DATADIR_PEACHMOT, 51), + DATA_MAKE_NUM(DATADIR_YOSHIMOT, 51), DATA_MAKE_NUM(DATADIR_WARIOMOT, 51), DATA_MAKE_NUM(DATADIR_DONKEYMOT, 51), + DATA_MAKE_NUM(DATADIR_DAISYMOT, 51), DATA_MAKE_NUM(DATADIR_WALUIGIMOT, 51) }; -s32 lbl_1_data_2D0[] = { - 0x00000125, 0x00000165, 0x000001A5, - 0x000001E5, 0x00000225, 0x00000265, - 0x000002A5, 0x000002E5 -}; +s32 lbl_1_data_2D0[] = { 0x00000125, 0x00000165, 0x000001A5, 0x000001E5, 0x00000225, 0x00000265, 0x000002A5, 0x000002E5 }; -s32 lbl_1_data_2F0[] = { - 0x0000012E, 0x0000016E, 0x000001AE, - 0x000001EE, 0x0000022E, 0x0000026E, - 0x000002AE, 0x000002EE -}; +s32 lbl_1_data_2F0[] = { 0x0000012E, 0x0000016E, 0x000001AE, 0x000001EE, 0x0000022E, 0x0000026E, 0x000002AE, 0x000002EE }; -void fn_1_19DC(s32 arg0, s32 arg1) { +void fn_1_19DC(s32 arg0, s32 arg1) +{ s32 temp_r30; s32 temp_r5; s32 temp_r5_2; @@ -263,7 +250,8 @@ void fn_1_19DC(s32 arg0, s32 arg1) { lbl_1_bss_6A = 8; lbl_1_bss_68 = lbl_1_data_282; var_r29 = lbl_1_data_2F0[GWPlayer[arg0].character]; - } else { + } + else { lbl_1_bss_6A = 7; lbl_1_bss_68 = 1; var_r29 = lbl_1_data_2D0[GWPlayer[arg0].character]; @@ -284,11 +272,10 @@ void fn_1_19DC(s32 arg0, s32 arg1) { while (BoardPlayerMotionEndCheck(arg0) == 0) { HuPrcVSleep(); - } HuPrcSleep(60); - + if (arg1 != 0) { BoardPlayerMotionShiftSet(arg0, lbl_1_bss_68, 0.0f, 8.0f, HU3D_MOTATTR_NONE); HuPrcSleep(9); @@ -315,7 +302,8 @@ void fn_1_19DC(s32 arg0, s32 arg1) { } } -s32 fn_1_1D1C(void) { +s32 fn_1_1D1C(void) +{ s32 sp34; s32 sp30; s32 sp2C; @@ -330,11 +318,7 @@ s32 fn_1_1D1C(void) { s32 maxTurn; s32 sp8[3] = { 70, 50, 45 }; - s32 sp14[3][3] = { - {3, 5, 22}, - {5, 10, 35}, - {5, 15, 35} - }; + s32 sp14[3][3] = { { 3, 5, 22 }, { 5, 10, 35 }, { 5, 15, 35 } }; while (BoardMusStatusGet(1) != 0) { HuPrcVSleep(); @@ -352,23 +336,26 @@ s32 fn_1_1D1C(void) { } modRand = BoardRandMod(100); - if (modRand < sp8[var_r31] ) { + if (modRand < sp8[var_r31]) { return 1; } modRand2 = BoardRandMod(100 - sp8[var_r31]); if (modRand2 < sp14[var_r31][0]) { lbl_1_bss_2C = 3; - } else if (modRand2 < sp14[var_r31][1]) { + } + else if (modRand2 < sp14[var_r31][1]) { lbl_1_bss_2C = 2; - } else { + } + else { lbl_1_bss_2C = 1; } return 0; } -void fn_1_1ED4(s32 arg0) { +void fn_1_1ED4(s32 arg0) +{ Point3d spC; f32 sp8; @@ -383,12 +370,12 @@ void fn_1_1ED4(s32 arg0) { spC.y += 700.0f; BoardConfettiCreate(&spC, 0x64, 300.0f); sp8 = BoardModelRotYGet(lbl_1_bss_6C); - + while (BoardDAngleCalcRange(&sp8, 0.0f, 30.0f) == 0) { BoardModelRotYSet(lbl_1_data_284, sp8); HuPrcVSleep(); } - + omVibrate(arg0, 0xC, 4, 2); BoardMusStart(1, 0x1A, 0x7F, 0); BoardModelRotYSet(lbl_1_data_284, 0.0f); @@ -399,7 +386,7 @@ void fn_1_1ED4(s32 arg0) { } BoardPlayerIdleSet(arg0); - + while (BoardMusStatusGet(1) != 0) { HuPrcVSleep(); } @@ -411,7 +398,8 @@ void fn_1_1ED4(s32 arg0) { BoardConfettiStop(); } -void fn_1_20E0(s32 arg0) { +void fn_1_20E0(s32 arg0) +{ Point3d sp24; Point3d sp18; Point3d spC; @@ -436,28 +424,28 @@ void fn_1_20E0(s32 arg0) { omVibrate(arg0, 0xC, 4, 2); BoardModelRotYSet(lbl_1_data_284, 0.0f); BoardModelRotYSet(lbl_1_bss_6C, 0.0f); - + while (BoardFilterFadePauseCheck() == 0) { HuPrcVSleep(); } - + BoardMusStart(1, 0x1B, 0x7F, 0); HuAudFXPlay(0x44A); fn_1_2A40(); lbl_1_bss_30 = 0.0f; - + while (lbl_1_bss_30 < 128.0f) { HuPrcVSleep(); lbl_1_bss_30 += 12.0f; } - + if (lbl_1_bss_30 > 128.0f) { lbl_1_bss_30 = 128.0f; } HuPrcSleep(40); lbl_1_bss_30 = 128.0f; - + while (lbl_1_bss_30 > 0.0f) { HuPrcVSleep(); lbl_1_bss_30 -= 12.0f; @@ -475,13 +463,13 @@ void fn_1_20E0(s32 arg0) { BoardCameraMotionStartEx(-1, NULL, NULL, 1360.0f, -1.0f, 13); BoardCameraMotionWait(); } - + BoardPlayerIdleSet(arg0); while (BoardMusStatusGet(1) != 0) { HuPrcVSleep(); } - + BoardAudSeqPause(0, 0, 1000); BoardWinCreate(2, MAKE_MESSID(22, 5), 2); BoardWinWait(); @@ -504,16 +492,16 @@ void fn_1_20E0(s32 arg0) { for (var_f31 = 100.0f; var_f31 > 0.0f; var_f31 -= 2.0f) { BoardCameraQuakeSet(0xA, var_f31); - HuPrcVSleep(); + HuPrcVSleep(); } - + BoardCameraQuakeReset(); if (lbl_1_data_288 != 0) { HuAudFXStop(lbl_1_data_288); lbl_1_data_288 = -1; } - + fn_1_2818(); omVibrate(arg0, 0xC, 0xC, 0); HuAudFXPlay(0x438); @@ -530,7 +518,8 @@ void fn_1_20E0(s32 arg0) { HuPrcSleep(0x3C); } -void fn_1_26E0(s32 arg0) { +void fn_1_26E0(s32 arg0) +{ Point3d sp20; Point3d sp14; Point3d sp8; @@ -555,11 +544,12 @@ void fn_1_26E0(s32 arg0) { BoardPlayerIdleSet(arg0); } -void fn_1_2818(void) { +void fn_1_2818(void) +{ s16 temp_r29; s16 temp_r30; s16 j; - s16 sp8[3] = {0x0002, 0x003E, 0x007A}; + s16 sp8[3] = { 0x0002, 0x003E, 0x007A }; temp_r29 = (4 - lbl_1_bss_2C) * 60; BoardModelMotionStart(lbl_1_bss_C[1], 0, 0); @@ -570,19 +560,21 @@ void fn_1_2818(void) { for (j = 0; j < ARRAY_COUNT(sp8); j++) { if (temp_r30 == sp8[j]) { HuAudFXPlay(0x446); - } + } } HuPrcVSleep(); - } else { + } + else { break; - } + } } BoardModelAttrSet(lbl_1_bss_C[1], 0x40000002); HuPrcSleep(0x3C); } -s32 fn_1_2930(s32 arg0) { +s32 fn_1_2930(s32 arg0) +{ lbl_1_bss_0->unk0--; if (lbl_1_bss_0->unk0 <= 0) { @@ -605,14 +597,16 @@ s32 fn_1_2930(s32 arg0) { return 0; } -void fn_1_2A40(void) { +void fn_1_2A40(void) +{ lbl_1_bss_30 = 0.0f; lbl_1_bss_34 = HuMemDirectMallocNum(HEAP_SYSTEM, 0x96000, MEMORY_DEFAULT_NUM); - lbl_1_data_286 = Hu3DHookFuncCreate((void*)&fn_1_2B44); + lbl_1_data_286 = Hu3DHookFuncCreate((void *)&fn_1_2B44); Hu3DModelLayerSet(lbl_1_data_286, 3); } -void fn_1_2AC0(void) { +void fn_1_2AC0(void) +{ if (lbl_1_bss_34) { HuMemDirectFree(lbl_1_bss_34); lbl_1_bss_34 = NULL; @@ -624,15 +618,16 @@ void fn_1_2AC0(void) { } } -void fn_1_2B44(void) { +void fn_1_2B44(void) +{ Mtx44 sp50; Mtx sp20; GXColor sp14; GXColor sp10; GXColor spC; u8 sp8; - GXColor sp1C = {0xFF, 0xFF, 0xFF, 0xFF}; - GXColor sp18 = {0xFF, 0xFF, 0xFF, 0xFF}; + GXColor sp1C = { 0xFF, 0xFF, 0xFF, 0xFF }; + GXColor sp18 = { 0xFF, 0xFF, 0xFF, 0xFF }; f32 temp_f28 = 0.0f; f32 temp_f30 = 640.0f; @@ -644,7 +639,7 @@ void fn_1_2B44(void) { GXLoadTexObj(&lbl_1_bss_48, GX_TEXMAP0); C_MTXOrtho(sp50, temp_f27, temp_f29, temp_f28, temp_f30, 0.0f, 10.0f); GXSetProjection(sp50, GX_ORTHOGRAPHIC); - PSMTXIdentity(sp20); + MTXIdentity(sp20); GXLoadPosMtxImm(sp20, 0); GXSetCurrentMtx(0); GXSetViewport(0.0f, 0.0f, temp_f30, 1.0f + temp_f29, 0.0f, 1.0f); diff --git a/src/REL/w06Dll/mg_item.c b/src/REL/w06Dll/mg_item.c index 0c83a033..6313eb6d 100755 --- a/src/REL/w06Dll/mg_item.c +++ b/src/REL/w06Dll/mg_item.c @@ -1,6 +1,15 @@ #include "REL/w06Dll.h" #include "game/audio.h" +#include "game/board/audio.h" +#include "game/board/com.h" +#include "game/board/main.h" +#include "game/board/model.h" +#include "game/board/player.h" +#include "game/board/space.h" +#include "game/board/ui.h" +#include "game/board/window.h" #include "game/data.h" +#include "game/frand.h" #include "game/gamework_data.h" #include "game/hsfanim.h" #include "game/hsfman.h" @@ -10,15 +19,7 @@ #include "game/process.h" #include "game/sprite.h" #include "game/window.h" -#include "game/frand.h" -#include "game/board/audio.h" -#include "game/board/com.h" -#include "game/board/main.h" -#include "game/board/model.h" -#include "game/board/player.h" -#include "game/board/space.h" -#include "game/board/ui.h" -#include "game/board/window.h" + #include "dolphin.h" #include "ext_math.h" @@ -132,7 +133,8 @@ static s8 lbl_1_data_1AD[3] = { 0, 0, 0 }; static s16 lbl_1_data_1B0 = -1; static omObjData *lbl_1_data_1B4[3] = { NULL, NULL, NULL }; -void fn_1_D70(void) { +void fn_1_D70(void) +{ Vec sp20; Vec sp14; Vec sp8; @@ -157,7 +159,8 @@ void fn_1_D70(void) { } } -void fn_1_F6C(void) { +void fn_1_F6C(void) +{ s32 i; for (i = 0; i < 3; i++) { @@ -173,7 +176,8 @@ void fn_1_F6C(void) { } } -void fn_1_1054(void) { +void fn_1_1054(void) +{ BoardRollDispSet(0); lbl_1_bss_18 = HuPrcChildCreate(fn_1_1148, 0x2003, 0x3800, 0, boardMainProc); HuPrcDestructorSet2(lbl_1_bss_18, fn_1_10E4); @@ -183,7 +187,8 @@ void fn_1_1054(void) { BoardRollDispSet(1); } -static void fn_1_10E4(void) { +static void fn_1_10E4(void) +{ fn_1_43DC(); if (lbl_1_data_1A8 != -1) { HuWinKill(lbl_1_data_1A8); @@ -192,7 +197,8 @@ static void fn_1_10E4(void) { lbl_1_bss_18 = NULL; } -static void fn_1_1148(void) { +static void fn_1_1148(void) +{ s32 temp_r3; s32 temp_r31; @@ -205,7 +211,8 @@ static void fn_1_1148(void) { HuPrcEnd(); } -static void fn_1_11B0(void) { +static void fn_1_11B0(void) +{ float sp8[2]; float var_f31; float var_f30; @@ -219,7 +226,8 @@ static void fn_1_11B0(void) { HuWinMesSet(lbl_1_data_1A8, MAKE_MESSID(48, 25)); } -static s32 fn_1_12A0(s32 arg0) { +static s32 fn_1_12A0(s32 arg0) +{ Vec sp38; Vec sp2C; Vec sp20; @@ -285,7 +293,8 @@ static s32 fn_1_12A0(s32 arg0) { return 1; } -static void fn_1_15CC(s32 arg0) { +static void fn_1_15CC(s32 arg0) +{ s8 sp8[] = { 80, 50 }; s32 var_r28; s16 temp_r26; @@ -343,7 +352,8 @@ static void fn_1_15CC(s32 arg0) { BoardWinCreate(2, MAKE_MESSID(48, 41), 6); BoardWinWait(); BoardWinKill(); - } else { + } + else { for (var_r31 = 0; var_r31 < 3; var_r31++) { if (lbl_1_bss_30[var_r31] == 0) { lbl_1_bss_33 = var_r31; @@ -400,7 +410,8 @@ static void fn_1_15CC(s32 arg0) { } } -static void fn_1_1BE0(s32 arg0, s32 arg1) { +static void fn_1_1BE0(s32 arg0, s32 arg1) +{ Vec sp18; Vec spC; s16 temp_r30; @@ -420,7 +431,8 @@ static void fn_1_1BE0(s32 arg0, s32 arg1) { fn_1_2048(-1, 4); } -static void fn_1_1CB0(s32 arg0) { +static void fn_1_1CB0(s32 arg0) +{ while (!BoardModelMotionEndCheck(lbl_1_bss_3C[arg0])) { HuPrcVSleep(); } @@ -430,7 +442,8 @@ static void fn_1_1CB0(s32 arg0) { } } -static void fn_1_1D5C(s32 arg0) { +static void fn_1_1D5C(s32 arg0) +{ s8 spC[] = { 0x20, 0x40, 0x60 }; s16 sp10[] = { -100, 0, 100 }; s32 sp8; @@ -442,7 +455,8 @@ static void fn_1_1D5C(s32 arg0) { } } -static void fn_1_1E30(s32 arg0) { +static void fn_1_1E30(s32 arg0) +{ s8 spC[] = { 0x20, 0x40, 0x60 }; s16 sp10[] = { -100, 0, 100 }; s32 sp8; @@ -454,7 +468,8 @@ static void fn_1_1E30(s32 arg0) { } } -static void fn_1_1F08(s32 arg0) { +static void fn_1_1F08(s32 arg0) +{ s32 i; s32 j; @@ -477,7 +492,8 @@ static void fn_1_1F08(s32 arg0) { } } -static void fn_1_2048(s32 arg0, s32 arg1) { +static void fn_1_2048(s32 arg0, s32 arg1) +{ Data1B4Work *temp_r30; s32 i; @@ -490,7 +506,8 @@ static void fn_1_2048(s32 arg0, s32 arg1) { } } -static void fn_1_20CC(s32 arg0) { +static void fn_1_20CC(s32 arg0) +{ Data1B4Work *temp_r30; s32 i; @@ -504,7 +521,8 @@ static void fn_1_20CC(s32 arg0) { } } -static s32 fn_1_2174(s32 arg0) { +static s32 fn_1_2174(s32 arg0) +{ Data1B4Work *temp_r31; if (!lbl_1_data_1B4[arg0]) { @@ -514,7 +532,8 @@ static s32 fn_1_2174(s32 arg0) { return temp_r31->unk02; } -static s16 fn_1_21CC(s32 arg0) { +static s16 fn_1_21CC(s32 arg0) +{ Data1B4Work *temp_r31; if (!lbl_1_data_1B4[arg0]) { @@ -524,7 +543,8 @@ static s16 fn_1_21CC(s32 arg0) { return temp_r31->unk06; } -static void fn_1_2220(s32 arg0, s32 arg1, s32 arg2) { +static void fn_1_2220(s32 arg0, s32 arg1, s32 arg2) +{ Mtx sp18; Vec spC; omObjData *temp_r3; @@ -555,7 +575,7 @@ static void fn_1_2220(s32 arg0, s32 arg1, s32 arg2) { temp_r3->rot.y = 0.0f; temp_r3->rot.z = 0.0f; if (arg2 == 5) { - PSMTXTrans(sp18, 0.0f, -50.0f, 0.0f); + MTXTrans(sp18, 0.0f, -50.0f, 0.0f); BoardModelMtxSet(temp_r31->unk06, &sp18); } BoardModelPosSet(temp_r31->unk06, temp_r3->trans.x, temp_r3->trans.y, temp_r3->trans.z); @@ -563,7 +583,8 @@ static void fn_1_2220(s32 arg0, s32 arg1, s32 arg2) { BoardModelLayerSet(temp_r31->unk06, 2); } -static void fn_1_243C(omObjData *arg0) { +static void fn_1_243C(omObjData *arg0) +{ Vec sp14; Vec sp8; Data1B4Work *temp_r31; @@ -592,7 +613,8 @@ static void fn_1_243C(omObjData *arg0) { sp8.y += 200.0f; arg0->trans.y = (sp8.y - sp14.y) / 30.0f; arg0->rot.z = 0.01f; - } else { + } + else { arg0->rot.z += 0.033333335f; if (arg0->rot.z > 1.0f) { arg0->rot.z = 1.0f; @@ -617,7 +639,8 @@ static void fn_1_243C(omObjData *arg0) { BoardModelPosGet(lbl_1_bss_3C[temp_r31->unk00_field2], &sp8); arg0->trans.y = (sp8.y - sp14.y) / 30.0f; arg0->rot.z = 1.0f; - } else { + } + else { arg0->rot.z -= 0.033333335f; if (arg0->rot.z < 0.001f) { arg0->rot.z = 0.001f; @@ -644,11 +667,13 @@ static void fn_1_243C(omObjData *arg0) { BoardPlayerPosGet(temp_r31->unk00_field1, &sp8); arg0->rot.x = (sp8.x - sp14.x) / 30.0f; arg0->rot.z = (sp8.z - sp14.z) / 30.0f; - } else if (temp_r31->unk08 < 30) { + } + else if (temp_r31->unk08 < 30) { sp14.x += arg0->rot.x; sp14.z += arg0->rot.z; BoardModelPosSetV(temp_r31->unk06, &sp14); - } else { + } + else { BoardPlayerPosGet(temp_r31->unk00_field1, &sp8); arg0->trans.x = sp8.x; arg0->trans.y = sp8.y; @@ -669,13 +694,10 @@ static void fn_1_243C(omObjData *arg0) { } } -static s8 lbl_1_data_1C5[14] = { - 1, 1, 3, 3, 2, - 2, 2, 1, 2, 3, - 0, 4, 5, 0 -}; +static s8 lbl_1_data_1C5[14] = { 1, 1, 3, 3, 2, 2, 2, 1, 2, 3, 0, 4, 5, 0 }; -static s32 fn_1_2A1C(s32 arg0) { +static s32 fn_1_2A1C(s32 arg0) +{ s32 var_r29; s32 var_r28; s32 var_r30; @@ -696,24 +718,30 @@ static s32 fn_1_2A1C(s32 arg0) { if (var_r29 > var_r28) { if (var_r29 > var_r30) { var_r31 = 0; - } else if (var_r30 > var_r28) { + } + else if (var_r30 > var_r28) { var_r31 = 2; - } else { + } + else { var_r31 = 1; } - } else { + } + else { if (var_r28 > var_r30) { var_r31 = 1; - } else if (var_r30 > var_r29) { + } + else if (var_r30 > var_r29) { var_r31 = 2; - } else { + } + else { var_r31 = 0; } } return var_r31; } -static void fn_1_2B60(s32 arg0) { +static void fn_1_2B60(s32 arg0) +{ omObjData *temp_r3; Bss24Work *temp_r31; @@ -728,7 +756,8 @@ static void fn_1_2B60(s32 arg0) { temp_r31->unk02 = 1; } -static void fn_1_2C18(void) { +static void fn_1_2C18(void) +{ Bss24Work *var_r27; if (lbl_1_bss_24) { @@ -737,7 +766,8 @@ static void fn_1_2C18(void) { } } -static void fn_1_2D90(s32 arg0) { +static void fn_1_2D90(s32 arg0) +{ Bss24Work *var_r31; if (lbl_1_bss_24) { @@ -746,7 +776,8 @@ static void fn_1_2D90(s32 arg0) { } } -static s32 fn_1_2DD0(void) { +static s32 fn_1_2DD0(void) +{ Bss24Work *var_r31; if (!lbl_1_bss_24) { @@ -756,7 +787,8 @@ static s32 fn_1_2DD0(void) { return var_r31->unk01; } -static u32 fn_1_2E18(Bss24Work *arg0) { +static u32 fn_1_2E18(Bss24Work *arg0) +{ s32 temp_r31; s32 var_r30; @@ -774,7 +806,8 @@ static u32 fn_1_2E18(Bss24Work *arg0) { return var_r30; } -static void fn_1_2EF4(omObjData *arg0) { +static void fn_1_2EF4(omObjData *arg0) +{ Vec sp14; Vec sp8; float var_f30; @@ -794,12 +827,14 @@ static void fn_1_2EF4(omObjData *arg0) { } if (lbl_1_bss_30[0] != 0) { var_r25 = 1; - } else { + } + else { var_r25 = 0; } if (lbl_1_bss_30[2] != 0) { var_r26 = 1; - } else { + } + else { var_r26 = 2; } switch (temp_r30->unk01) { @@ -820,13 +855,16 @@ static void fn_1_2EF4(omObjData *arg0) { if (lbl_1_bss_30[0] == 0 && lbl_1_bss_30[1] == 0) { if (BoardRandMod(100) < 50) { var_r29 = 1; - } else { + } + else { var_r29 = 2; } - } else { + } + else { if (lbl_1_bss_30[0] == 0) { var_r29 = 2; - } else if (lbl_1_bss_30[1] == 0) { + } + else if (lbl_1_bss_30[1] == 0) { var_r29 = 1; } } @@ -884,7 +922,8 @@ static void fn_1_2EF4(omObjData *arg0) { } } -static void fn_1_3470(void) { +static void fn_1_3470(void) +{ omObjData *temp_r3; Bss28Work *temp_r31; @@ -901,7 +940,8 @@ static void fn_1_3470(void) { temp_r31->unk0A = BoardModelMotionCreate(lbl_1_bss_C[4], DATA_MAKE_NUM(DATADIR_W06, 23)); } -static void fn_1_3560(s32 arg0) { +static void fn_1_3560(s32 arg0) +{ Bss28Work *temp_r31; if (!lbl_1_bss_28) { @@ -910,13 +950,15 @@ static void fn_1_3560(s32 arg0) { temp_r31 = OM_GET_WORK_PTR(lbl_1_bss_28, Bss28Work); temp_r31->unk00_field1 = arg0; if (arg0 != 1) { - (void) 0; - } else { + (void)0; + } + else { temp_r31->unk06 = 20; } } -static s32 fn_1_35BC(void) { +static s32 fn_1_35BC(void) +{ Bss28Work *temp_r31; if (!lbl_1_bss_28) { @@ -926,7 +968,8 @@ static s32 fn_1_35BC(void) { return temp_r31->unk00_field1; } -static void fn_1_3604(s32 arg0) { +static void fn_1_3604(s32 arg0) +{ Bss28Work *temp_r31; if (!lbl_1_bss_28) { @@ -949,7 +992,8 @@ static void fn_1_3604(s32 arg0) { } } -static void fn_1_3698(s8 arg0) { +static void fn_1_3698(s8 arg0) +{ Vec sp24; Vec sp18; Vec spC; @@ -976,7 +1020,8 @@ static void fn_1_3698(s8 arg0) { if (ABS(temp_f31) >= 300.0f) { var_f30 = 40.0f; temp_r31->unk06 *= 2; - } else { + } + else { var_f30 = 20.0f; } VECSubtract(&sp18, &sp24, &spC); @@ -986,7 +1031,8 @@ static void fn_1_3698(s8 arg0) { BoardModelMotionSpeedSet(lbl_1_bss_C[4], 2.0f); } -static void fn_1_3974(omObjData *arg0) { +static void fn_1_3974(omObjData *arg0) +{ Vec sp30; Vec sp24; s32 sp8; @@ -1012,7 +1058,8 @@ static void fn_1_3974(omObjData *arg0) { fn_1_3560(4); return; } - } else { + } + else { temp_r31->unk03++; } fn_1_3560(1); @@ -1062,7 +1109,8 @@ static void fn_1_3974(omObjData *arg0) { } } -static void fn_1_4070(void) { +static void fn_1_4070(void) +{ Bss2CWork *temp_r31; lbl_1_bss_1C = 0; @@ -1074,7 +1122,8 @@ static void fn_1_4070(void) { temp_r31->unk04 = MGSeqTimerCreateXY(temp_r31->unk01, 288, 64); } -static void fn_1_4124(void) { +static void fn_1_4124(void) +{ Bss2CWork *temp_r31; if (!lbl_1_bss_2C) { @@ -1086,7 +1135,8 @@ static void fn_1_4124(void) { temp_r31->unk00_field0 = 1; } -static void fn_1_4194(omObjData *arg0) { +static void fn_1_4194(omObjData *arg0) +{ Bss2CWork *temp_r31; temp_r31 = OM_GET_WORK_PTR(arg0, Bss2CWork); @@ -1107,7 +1157,8 @@ static void fn_1_4194(omObjData *arg0) { } if (temp_r31->unk01 != 0) { temp_r31->unk01--; - } else { + } + else { MGSeqParamSet(temp_r31->unk04, 2, -1); temp_r31->unk04 = -1; lbl_1_bss_1C = 1; @@ -1117,7 +1168,8 @@ static void fn_1_4194(omObjData *arg0) { temp_r31->unk02 = 60; } -static void fn_1_42AC(s16 arg0) { +static void fn_1_42AC(s16 arg0) +{ ParticleData *var_r31; lbl_1_bss_20 = HuSprAnimReadFile(DATA_MAKE_NUM(DATADIR_EFFECT, 0)); @@ -1132,7 +1184,8 @@ static void fn_1_42AC(s16 arg0) { var_r31->unk_02 = arg0; } -static void fn_1_43DC(void) { +static void fn_1_43DC(void) +{ if (lbl_1_data_1B0 != -1) { Hu3DModelKill(lbl_1_data_1B0); lbl_1_data_1B0 = -1; @@ -1143,7 +1196,8 @@ static void fn_1_43DC(void) { } } -static void fn_1_4460(ModelData *model, ParticleData *particle, Mtx matrix) { +static void fn_1_4460(ModelData *model, ParticleData *particle, Mtx matrix) +{ HsfanimStruct01 *var_r31; Vec sp8; float var_f31; diff --git a/src/REL/ztardll/main.c b/src/REL/ztardll/main.c index e1e91168..0d20bade 100644 --- a/src/REL/ztardll/main.c +++ b/src/REL/ztardll/main.c @@ -1515,10 +1515,10 @@ void fn_1_7414(ModelData *model, Mtx matrix) GXInitTexObj(&spC, Hu3DShadowData.unk_04, Hu3DShadowData.unk_02, Hu3DShadowData.unk_02, 1, GX_CLAMP, GX_CLAMP, GX_FALSE); GXInitTexObjLOD(&spC, GX_LINEAR, GX_LINEAR, 0.0f, 0.0f, 0.0f, GX_FALSE, GX_FALSE, GX_ANISO_1); GXLoadTexObj(&spC, GX_TEXMAP0); - PSMTXInverse(Hu3DCameraMtx, sp5C); - PSMTXConcat(sp5C, matrix, sp8C); - PSMTXConcat(Hu3DShadowData.unk_68, Hu3DShadowData.unk_38, sp2C); - PSMTXConcat(sp2C, sp8C, sp8C); + MTXInverse(Hu3DCameraMtx, sp5C); + MTXConcat(sp5C, matrix, sp8C); + MTXConcat(Hu3DShadowData.unk_68, Hu3DShadowData.unk_38, sp2C); + MTXConcat(sp2C, sp8C, sp8C); GXLoadTexMtxImm(sp8C, 0x39, GX_MTX3x4); GXSetTexCoordGen2(GX_TEXCOORD0, GX_TG_MTX3x4, GX_TG_POS, 0x39, GX_FALSE, 0x7D); GXSetTevOrder(GX_TEVSTAGE0, GX_TEXCOORD0, GX_TEXMAP0, GX_COLOR0A0);