From 541cad43d98692fd6929010e6461d785df359cc2 Mon Sep 17 00:00:00 2001 From: MegaMech <7255464+MegaMech@users.noreply.github.com> Date: Wed, 25 Sep 2024 14:13:07 +0000 Subject: [PATCH 1/2] Clang Format --- src/code_80091750.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/src/code_80091750.c b/src/code_80091750.c index aefdceb1d..bdf04ff25 100644 --- a/src/code_80091750.c +++ b/src/code_80091750.c @@ -8039,12 +8039,12 @@ void func_800A638C(struct_8018D9E0_entry* arg0) { } } -void func_800A66A8(struct_8018D9E0_entry *arg0, Unk_D_800E70A0 *arg1) { - Mtx *mtx; +void func_800A66A8(struct_8018D9E0_entry* arg0, Unk_D_800E70A0* arg1) { + Mtx* mtx; f32 tmp; static float x2, y2, z2; static float x1, y1, z1; - + mtx = &gGfxPool->mtxEffect[gMatrixEffectCount]; if (arg0->unk24 > 1.5) { arg0->unk24 *= 0.95; @@ -8060,7 +8060,15 @@ void func_800A66A8(struct_8018D9E0_entry *arg0, Unk_D_800E70A0 *arg1) { y2 += y1; z2 += z1; - if(x2); if(y2); if(z2); + if (x2) { + ; + } + if (y2) { + ; + } + if (z2) { + ; + } guScale(mtx, 1.2f, 1.2f, 1.2f); guRotate(mtx + 1, y2, 0.0f, 1.0f, 0.0f); @@ -8071,7 +8079,8 @@ void func_800A66A8(struct_8018D9E0_entry *arg0, Unk_D_800E70A0 *arg1) { guMtxCatL(mtx, mtx + 1, mtx); guTranslate(mtx + 1, arg1->column, arg1->row, 0.0f); guMtxCatL(mtx, mtx + 1, mtx); - gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->mtxEffect[gMatrixEffectCount++]), (G_MTX_NOPUSH | G_MTX_LOAD) | G_MTX_MODELVIEW); + gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->mtxEffect[gMatrixEffectCount++]), + (G_MTX_NOPUSH | G_MTX_LOAD) | G_MTX_MODELVIEW); gSPClearGeometryMode(gDisplayListHead++, G_LIGHTING); gDPSetCombineMode(gDisplayListHead++, G_CC_MODULATEIA, G_CC_MODULATEIA); gDPNoOp(gDisplayListHead++); From 7f01ae572bf261c8e58cfcde1edea52634482537 Mon Sep 17 00:00:00 2001 From: MegaMech Date: Wed, 25 Sep 2024 08:29:55 -0600 Subject: [PATCH 2/2] Update code_80091750.c --- src/code_80091750.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/code_80091750.c b/src/code_80091750.c index bdf04ff25..158a54760 100644 --- a/src/code_80091750.c +++ b/src/code_80091750.c @@ -8060,15 +8060,9 @@ void func_800A66A8(struct_8018D9E0_entry* arg0, Unk_D_800E70A0* arg1) { y2 += y1; z2 += z1; - if (x2) { - ; - } - if (y2) { - ; - } - if (z2) { - ; - } + // clang-format off + if (x2); if (y2); if (z2); + // clang-format on guScale(mtx, 1.2f, 1.2f, 1.2f); guRotate(mtx + 1, y2, 0.0f, 1.0f, 0.0f);