From 4a6bfcdd21fb2dd6458a3c947b63372e5aa76e19 Mon Sep 17 00:00:00 2001 From: Dragorn421 Date: Fri, 29 Apr 2022 21:06:08 +0200 Subject: [PATCH] Cleanup `clang-format off` (#1195) * Run formatter * Remove useless `// clang-format off` * Improve manual formatting inside `clang-format off` blocks * Remove `// clang-format off` where used only for code style formatting * Remove some `// clang-format off` with a for loop "trick" * Reduce the size of `clang-format off` blocks * Remove one `clang-format off` by moving assignment to inside line * Revert "Remove some `// clang-format off` with a for loop "trick"" This reverts commit 30c344b800f22cc45cc30c8c88ce014715cdfed0. * Put some `// clang-format on` back on the same level as `off` --- src/code/code_800EC960.c | 1 - src/code/code_800FD970.c | 9 +- src/code/graph.c | 2 - src/code/ucode_disas.c | 3 +- src/code/z_en_a_keep.c | 11 +- src/code/z_en_item00.c | 12 +-- src/code/z_map_exp.c | 20 ++-- src/code/z_message_PAL.c | 12 ++- src/code/z_parameter.c | 102 +++++++++--------- .../actors/ovl_Demo_Effect/z_demo_effect.c | 3 +- 10 files changed, 90 insertions(+), 85 deletions(-) diff --git a/src/code/code_800EC960.c b/src/code/code_800EC960.c index 70ca112f53..34badb146b 100644 --- a/src/code/code_800EC960.c +++ b/src/code/code_800EC960.c @@ -1166,7 +1166,6 @@ OcarinaSongInfo gOcarinaSongNotes[OCARINA_SONG_MAX] = { // Lost Woods Memory Game { 0, { 0, 0, 0, 0, 0, 0, 0, 0 } }, }; -// clang-format on /** * BSS diff --git a/src/code/code_800FD970.c b/src/code/code_800FD970.c index d1efcdc3aa..cc9dc5e63c 100644 --- a/src/code/code_800FD970.c +++ b/src/code/code_800FD970.c @@ -62,9 +62,7 @@ u32 Rand_Next_Variable(u32* rndNum) { f32 Rand_ZeroOne_Variable(u32* rndNum) { u32 next = (*rndNum * 1664525) + 1013904223; - // clang-format off - *rndNum = next; sRandFloat = (next >> 9) | 0x3F800000; - // clang-format on + sRandFloat = ((*rndNum = next) >> 9) | 0x3F800000; return *((f32*)&sRandFloat) - 1.0f; } @@ -75,8 +73,7 @@ f32 Rand_ZeroOne_Variable(u32* rndNum) { f32 Rand_Centered_Variable(u32* rndNum) { u32 next = (*rndNum * 1664525) + 1013904223; - // clang-format off - *rndNum = next; sRandFloat = (next >> 9) | 0x3F800000; - // clang-format on + *rndNum = next; + sRandFloat = (next >> 9) | 0x3F800000; return *((f32*)&sRandFloat) - 1.5f; } diff --git a/src/code/graph.c b/src/code/graph.c index ecb6eb5067..e6e6956b2f 100644 --- a/src/code/graph.c +++ b/src/code/graph.c @@ -10,7 +10,6 @@ FaultClient sGraphFaultClient; CfbInfo sGraphCfbInfos[3]; FaultClient sGraphUcodeFaultClient; -// clang-format off UCodeInfo D_8012D230[3] = { { UCODE_F3DZEX, D_80155F50 }, { UCODE_UNK, NULL }, @@ -22,7 +21,6 @@ UCodeInfo D_8012D248[3] = { { UCODE_UNK, NULL }, { UCODE_S2DEX, D_80113070 }, }; -// clang-format on void Graph_FaultClient(void) { void* nextFb = osViGetNextFramebuffer(); diff --git a/src/code/ucode_disas.c b/src/code/ucode_disas.c index b2588cc539..ab0fe378e2 100644 --- a/src/code/ucode_disas.c +++ b/src/code/ucode_disas.c @@ -224,7 +224,8 @@ void UCodeDisas_ParseRenderMode(UCodeDisas* this, u32 mode) { // clang-format off if (this->enableLog == 0) {} else { osSyncPrintf("\nGBL_c1(%s, %s, %s, %s)|", - D_8012DDDC[0][a >> 12 & 3], D_8012DDDC[1][a >> 8 & 3], D_8012DDDC[2][a >> 4 & 3], D_8012DDDC[3][a >> 0 & 3]); } + D_8012DDDC[0][a >> 12 & 3], D_8012DDDC[1][a >> 8 & 3], D_8012DDDC[2][a >> 4 & 3], D_8012DDDC[3][a >> 0 & 3]); + } // clang-format on if (this->enableLog) { diff --git a/src/code/z_en_a_keep.c b/src/code/z_en_a_keep.c index 42a4a50614..bab2955771 100644 --- a/src/code/z_en_a_keep.c +++ b/src/code/z_en_a_keep.c @@ -139,9 +139,9 @@ void EnAObj_Init(Actor* thisx, GlobalContext* globalCtx) { EnAObj_SetupBlockRot(this, thisx->params); break; case A_OBJ_UNKNOWN_6: - // clang-format off - thisx->flags |= ACTOR_FLAG_0; this->dyna.bgId = 5; this->focusYoffset = 10.0f; - // clang-format on + this->focusYoffset = 10.0f; + thisx->flags |= ACTOR_FLAG_0; + this->dyna.bgId = 5; thisx->gravity = -2.0f; EnAObj_SetupWaitTalk(this, thisx->params); break; @@ -153,9 +153,8 @@ void EnAObj_Init(Actor* thisx, GlobalContext* globalCtx) { case A_OBJ_SIGNPOST_OBLONG: case A_OBJ_SIGNPOST_ARROW: thisx->textId = (this->textId & 0xFF) | 0x300; - // clang-format off - thisx->flags |= ACTOR_FLAG_0 | ACTOR_FLAG_3; thisx->targetArrowOffset = 500.0f; - // clang-format on + thisx->targetArrowOffset = 500.0f; + thisx->flags |= ACTOR_FLAG_0 | ACTOR_FLAG_3; this->focusYoffset = 45.0f; EnAObj_SetupWaitTalk(this, thisx->params); Collider_InitCylinder(globalCtx, &this->collider); diff --git a/src/code/z_en_item00.c b/src/code/z_en_item00.c index 684ce0d7c4..d9964a3ca3 100644 --- a/src/code/z_en_item00.c +++ b/src/code/z_en_item00.c @@ -924,14 +924,14 @@ s16 func_8001F404(s16 dropId) { } // This is convoluted but it seems like it must be a single condition to match - // clang-format off - if (((dropId == ITEM00_BOMBS_A || dropId == ITEM00_BOMBS_SPECIAL || dropId == ITEM00_BOMBS_B) && INV_CONTENT(ITEM_BOMB) == ITEM_NONE) || - ((dropId == ITEM00_ARROWS_SMALL || dropId == ITEM00_ARROWS_MEDIUM || dropId == ITEM00_ARROWS_LARGE) && INV_CONTENT(ITEM_BOW) == ITEM_NONE) || - ((dropId == ITEM00_MAGIC_LARGE || dropId == ITEM00_MAGIC_SMALL) && gSaveContext.magicLevel == 0) || - ((dropId == ITEM00_SEEDS) && INV_CONTENT(ITEM_SLINGSHOT) == ITEM_NONE)) { + if (((dropId == ITEM00_BOMBS_A || dropId == ITEM00_BOMBS_SPECIAL || dropId == ITEM00_BOMBS_B) && + INV_CONTENT(ITEM_BOMB) == ITEM_NONE) || + ((dropId == ITEM00_ARROWS_SMALL || dropId == ITEM00_ARROWS_MEDIUM || dropId == ITEM00_ARROWS_LARGE) && + INV_CONTENT(ITEM_BOW) == ITEM_NONE) || + ((dropId == ITEM00_MAGIC_LARGE || dropId == ITEM00_MAGIC_SMALL) && gSaveContext.magicLevel == 0) || + ((dropId == ITEM00_SEEDS) && INV_CONTENT(ITEM_SLINGSHOT) == ITEM_NONE)) { return -1; } - // clang-format on if (dropId == ITEM00_HEART && gSaveContext.healthCapacity == gSaveContext.health) { return ITEM00_RUPEE_GREEN; diff --git a/src/code/z_map_exp.c b/src/code/z_map_exp.c index b79182f75b..b641354b5e 100644 --- a/src/code/z_map_exp.c +++ b/src/code/z_map_exp.c @@ -410,9 +410,13 @@ void Minimap_Draw(GlobalContext* globalCtx) { osSyncPrintf("Game_play_demo_mode_check=%d\n", Gameplay_InCsMode(globalCtx)); // clang-format off if (!R_MINIMAP_DISABLED) { Audio_PlaySoundGeneral(NA_SE_SY_CAMERA_ZOOM_UP, &gSfxDefaultPos, 4, - &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); } - else { Audio_PlaySoundGeneral(NA_SE_SY_CAMERA_ZOOM_DOWN, &gSfxDefaultPos, 4, - &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); } + &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, + &gSfxDefaultReverb); + } else { + Audio_PlaySoundGeneral(NA_SE_SY_CAMERA_ZOOM_DOWN, &gSfxDefaultPos, 4, + &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, + &gSfxDefaultReverb); + } // clang-format on R_MINIMAP_DISABLED ^= 1; } @@ -492,9 +496,13 @@ void Minimap_Draw(GlobalContext* globalCtx) { if (CHECK_BTN_ALL(globalCtx->state.input[0].press.button, BTN_L) && !Gameplay_InCsMode(globalCtx)) { // clang-format off if (!R_MINIMAP_DISABLED) { Audio_PlaySoundGeneral(NA_SE_SY_CAMERA_ZOOM_UP, &gSfxDefaultPos, 4, - &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); } - else { Audio_PlaySoundGeneral(NA_SE_SY_CAMERA_ZOOM_DOWN, &gSfxDefaultPos, 4, - &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); } + &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, + &gSfxDefaultReverb); + } else { + Audio_PlaySoundGeneral(NA_SE_SY_CAMERA_ZOOM_DOWN, &gSfxDefaultPos, 4, + &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, + &gSfxDefaultReverb); + } // clang-format on R_MINIMAP_DISABLED ^= 1; } diff --git a/src/code/z_message_PAL.c b/src/code/z_message_PAL.c index efe15ab707..2ab4c850a1 100644 --- a/src/code/z_message_PAL.c +++ b/src/code/z_message_PAL.c @@ -743,7 +743,11 @@ u16 Message_DrawItemIcon(GlobalContext* globalCtx, u16 itemId, Gfx** p, u16 i) { MessageContext* msgCtx = &globalCtx->msgCtx; // clang-format off - if (msgCtx->msgMode == MSGMODE_TEXT_DISPLAYING) { Audio_PlaySoundGeneral(0, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); } + if (msgCtx->msgMode == MSGMODE_TEXT_DISPLAYING) { Audio_PlaySoundGeneral(0, &gSfxDefaultPos, 4, + &gSfxDefaultFreqAndVolScale, + &gSfxDefaultFreqAndVolScale, + &gSfxDefaultReverb); + } // clang-format on gDPPipeSync(gfx++); @@ -993,7 +997,11 @@ void Message_DrawText(GlobalContext* globalCtx, Gfx** gfxP) { break; case MESSAGE_BACKGROUND: // clang-format off - if (msgCtx->msgMode == MSGMODE_TEXT_DISPLAYING) { Audio_PlaySoundGeneral(0, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); } + if (msgCtx->msgMode == MSGMODE_TEXT_DISPLAYING) { Audio_PlaySoundGeneral(0, &gSfxDefaultPos, 4, + &gSfxDefaultFreqAndVolScale, + &gSfxDefaultFreqAndVolScale, + &gSfxDefaultReverb); + } // clang-format on gDPPipeSync(gfx++); gDPSetCombineMode(gfx++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM); diff --git a/src/code/z_parameter.c b/src/code/z_parameter.c index 24fc5e83dd..2cb507c0f4 100644 --- a/src/code/z_parameter.c +++ b/src/code/z_parameter.c @@ -1080,14 +1080,12 @@ void Interface_SetSceneRestrictions(GlobalContext* globalCtx) { s16 i; u8 currentScene; - // clang-format off - interfaceCtx->restrictions.hGauge = interfaceCtx->restrictions.bButton = - interfaceCtx->restrictions.aButton = interfaceCtx->restrictions.bottles = - interfaceCtx->restrictions.tradeItems = interfaceCtx->restrictions.hookshot = - interfaceCtx->restrictions.ocarina = interfaceCtx->restrictions.warpSongs = - interfaceCtx->restrictions.sunsSong = interfaceCtx->restrictions.farores = - interfaceCtx->restrictions.dinsNayrus = interfaceCtx->restrictions.all = 0; - // clang-format on + interfaceCtx->restrictions.hGauge = interfaceCtx->restrictions.bButton = interfaceCtx->restrictions.aButton = + interfaceCtx->restrictions.bottles = interfaceCtx->restrictions.tradeItems = + interfaceCtx->restrictions.hookshot = interfaceCtx->restrictions.ocarina = + interfaceCtx->restrictions.warpSongs = interfaceCtx->restrictions.sunsSong = + interfaceCtx->restrictions.farores = interfaceCtx->restrictions.dinsNayrus = + interfaceCtx->restrictions.all = 0; i = 0; @@ -2108,7 +2106,9 @@ void Interface_SetNaviCall(GlobalContext* globalCtx, u16 naviCallState) { (globalCtx->csCtx.state == CS_STATE_IDLE)) { // clang-format off if (naviCallState == 0x1E) { Audio_PlaySoundGeneral(NA_SE_VO_NAVY_CALL, &gSfxDefaultPos, 4, - &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); } + &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, + &gSfxDefaultReverb); + } // clang-format on if (naviCallState == 0x1D) { @@ -2155,7 +2155,8 @@ s32 Health_ChangeBy(GlobalContext* globalCtx, s16 healthChange) { // clang-format off if (healthChange > 0) { Audio_PlaySoundGeneral(NA_SE_SY_HP_RECOVER, &gSfxDefaultPos, 4, - &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); + &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, + &gSfxDefaultReverb); } else if (gSaveContext.doubleDefense && (healthChange < 0)) { healthChange >>= 1; osSyncPrintf("ハート減少半分！！＝%d\n", healthChange); // "Heart decrease halved!!＝%d" @@ -2914,48 +2915,41 @@ void Interface_InitVertices(GlobalContext* globalCtx) { interfaceCtx->actionVtx = Graph_Alloc(globalCtx->state.gfxCtx, 8 * sizeof(Vtx)); - // clang-format off - interfaceCtx->actionVtx[0].v.ob[0] = - interfaceCtx->actionVtx[2].v.ob[0] = -14; - interfaceCtx->actionVtx[1].v.ob[0] = - interfaceCtx->actionVtx[3].v.ob[0] = interfaceCtx->actionVtx[0].v.ob[0] + 28; + interfaceCtx->actionVtx[0].v.ob[0] = interfaceCtx->actionVtx[2].v.ob[0] = -14; + interfaceCtx->actionVtx[1].v.ob[0] = interfaceCtx->actionVtx[3].v.ob[0] = interfaceCtx->actionVtx[0].v.ob[0] + 28; - interfaceCtx->actionVtx[0].v.ob[1] = - interfaceCtx->actionVtx[1].v.ob[1] = 14; - interfaceCtx->actionVtx[2].v.ob[1] = - interfaceCtx->actionVtx[3].v.ob[1] = interfaceCtx->actionVtx[0].v.ob[1] - 28; + interfaceCtx->actionVtx[0].v.ob[1] = interfaceCtx->actionVtx[1].v.ob[1] = 14; + interfaceCtx->actionVtx[2].v.ob[1] = interfaceCtx->actionVtx[3].v.ob[1] = interfaceCtx->actionVtx[0].v.ob[1] - 28; - interfaceCtx->actionVtx[4].v.ob[0] = - interfaceCtx->actionVtx[6].v.ob[0] = -(XREG(21) / 2); - interfaceCtx->actionVtx[5].v.ob[0] = - interfaceCtx->actionVtx[7].v.ob[0] = interfaceCtx->actionVtx[4].v.ob[0] + XREG(21); + interfaceCtx->actionVtx[4].v.ob[0] = interfaceCtx->actionVtx[6].v.ob[0] = -(XREG(21) / 2); + interfaceCtx->actionVtx[5].v.ob[0] = interfaceCtx->actionVtx[7].v.ob[0] = + interfaceCtx->actionVtx[4].v.ob[0] + XREG(21); - interfaceCtx->actionVtx[4].v.ob[1] = - interfaceCtx->actionVtx[5].v.ob[1] = XREG(28) / 2; - interfaceCtx->actionVtx[6].v.ob[1] = - interfaceCtx->actionVtx[7].v.ob[1] = interfaceCtx->actionVtx[4].v.ob[1] - XREG(28); + interfaceCtx->actionVtx[4].v.ob[1] = interfaceCtx->actionVtx[5].v.ob[1] = XREG(28) / 2; + interfaceCtx->actionVtx[6].v.ob[1] = interfaceCtx->actionVtx[7].v.ob[1] = + interfaceCtx->actionVtx[4].v.ob[1] - XREG(28); for (i = 0; i < 8; i += 4) { - interfaceCtx->actionVtx[i].v.ob[2] = interfaceCtx->actionVtx[i+1].v.ob[2] = - interfaceCtx->actionVtx[i+2].v.ob[2] = interfaceCtx->actionVtx[i+3].v.ob[2] = 0; + interfaceCtx->actionVtx[i].v.ob[2] = interfaceCtx->actionVtx[i + 1].v.ob[2] = + interfaceCtx->actionVtx[i + 2].v.ob[2] = interfaceCtx->actionVtx[i + 3].v.ob[2] = 0; - interfaceCtx->actionVtx[i].v.flag = interfaceCtx->actionVtx[i+1].v.flag = - interfaceCtx->actionVtx[i+2].v.flag = interfaceCtx->actionVtx[i+3].v.flag = 0; + interfaceCtx->actionVtx[i].v.flag = interfaceCtx->actionVtx[i + 1].v.flag = + interfaceCtx->actionVtx[i + 2].v.flag = interfaceCtx->actionVtx[i + 3].v.flag = 0; interfaceCtx->actionVtx[i].v.tc[0] = interfaceCtx->actionVtx[i].v.tc[1] = - interfaceCtx->actionVtx[i+1].v.tc[1] = interfaceCtx->actionVtx[i+2].v.tc[0] = 0; - interfaceCtx->actionVtx[i+1].v.tc[0] = interfaceCtx->actionVtx[i+2].v.tc[1] = - interfaceCtx->actionVtx[i+3].v.tc[0] = interfaceCtx->actionVtx[i+3].v.tc[1] = 1024; + interfaceCtx->actionVtx[i + 1].v.tc[1] = interfaceCtx->actionVtx[i + 2].v.tc[0] = 0; + interfaceCtx->actionVtx[i + 1].v.tc[0] = interfaceCtx->actionVtx[i + 2].v.tc[1] = + interfaceCtx->actionVtx[i + 3].v.tc[0] = interfaceCtx->actionVtx[i + 3].v.tc[1] = 1024; - interfaceCtx->actionVtx[i].v.cn[0] = interfaceCtx->actionVtx[i+1].v.cn[0] = - interfaceCtx->actionVtx[i+2].v.cn[0] = interfaceCtx->actionVtx[i+3].v.cn[0] = - interfaceCtx->actionVtx[i].v.cn[1] = interfaceCtx->actionVtx[i+1].v.cn[1] = - interfaceCtx->actionVtx[i+2].v.cn[1] = interfaceCtx->actionVtx[i+3].v.cn[1] = - interfaceCtx->actionVtx[i].v.cn[2] = interfaceCtx->actionVtx[i+1].v.cn[2] = - interfaceCtx->actionVtx[i+2].v.cn[2] = interfaceCtx->actionVtx[i+3].v.cn[2] = 255; + interfaceCtx->actionVtx[i].v.cn[0] = interfaceCtx->actionVtx[i + 1].v.cn[0] = + interfaceCtx->actionVtx[i + 2].v.cn[0] = interfaceCtx->actionVtx[i + 3].v.cn[0] = + interfaceCtx->actionVtx[i].v.cn[1] = interfaceCtx->actionVtx[i + 1].v.cn[1] = + interfaceCtx->actionVtx[i + 2].v.cn[1] = interfaceCtx->actionVtx[i + 3].v.cn[1] = + interfaceCtx->actionVtx[i].v.cn[2] = interfaceCtx->actionVtx[i + 1].v.cn[2] = + interfaceCtx->actionVtx[i + 2].v.cn[2] = interfaceCtx->actionVtx[i + 3].v.cn[2] = 255; - interfaceCtx->actionVtx[i].v.cn[3] = interfaceCtx->actionVtx[i+1].v.cn[3] = - interfaceCtx->actionVtx[i+2].v.cn[3] = interfaceCtx->actionVtx[i+3].v.cn[3] = 255; + interfaceCtx->actionVtx[i].v.cn[3] = interfaceCtx->actionVtx[i + 1].v.cn[3] = + interfaceCtx->actionVtx[i + 2].v.cn[3] = interfaceCtx->actionVtx[i + 3].v.cn[3] = 255; } interfaceCtx->actionVtx[5].v.tc[0] = interfaceCtx->actionVtx[7].v.tc[0] = 1536; @@ -2969,25 +2963,25 @@ void Interface_InitVertices(GlobalContext* globalCtx) { interfaceCtx->beatingHeartVtx[2].v.ob[1] = interfaceCtx->beatingHeartVtx[3].v.ob[1] = -8; interfaceCtx->beatingHeartVtx[0].v.ob[2] = interfaceCtx->beatingHeartVtx[1].v.ob[2] = - interfaceCtx->beatingHeartVtx[2].v.ob[2] = interfaceCtx->beatingHeartVtx[3].v.ob[2] = 0; + interfaceCtx->beatingHeartVtx[2].v.ob[2] = interfaceCtx->beatingHeartVtx[3].v.ob[2] = 0; interfaceCtx->beatingHeartVtx[0].v.flag = interfaceCtx->beatingHeartVtx[1].v.flag = - interfaceCtx->beatingHeartVtx[2].v.flag = interfaceCtx->beatingHeartVtx[3].v.flag = 0; + interfaceCtx->beatingHeartVtx[2].v.flag = interfaceCtx->beatingHeartVtx[3].v.flag = 0; interfaceCtx->beatingHeartVtx[0].v.tc[0] = interfaceCtx->beatingHeartVtx[0].v.tc[1] = - interfaceCtx->beatingHeartVtx[1].v.tc[1] = interfaceCtx->beatingHeartVtx[2].v.tc[0] = 0; + interfaceCtx->beatingHeartVtx[1].v.tc[1] = interfaceCtx->beatingHeartVtx[2].v.tc[0] = 0; interfaceCtx->beatingHeartVtx[1].v.tc[0] = interfaceCtx->beatingHeartVtx[2].v.tc[1] = - interfaceCtx->beatingHeartVtx[3].v.tc[0] = interfaceCtx->beatingHeartVtx[3].v.tc[1] = 512; + interfaceCtx->beatingHeartVtx[3].v.tc[0] = interfaceCtx->beatingHeartVtx[3].v.tc[1] = 512; interfaceCtx->beatingHeartVtx[0].v.cn[0] = interfaceCtx->beatingHeartVtx[1].v.cn[0] = - interfaceCtx->beatingHeartVtx[2].v.cn[0] = interfaceCtx->beatingHeartVtx[3].v.cn[0] = - interfaceCtx->beatingHeartVtx[0].v.cn[1] = interfaceCtx->beatingHeartVtx[1].v.cn[1] = - interfaceCtx->beatingHeartVtx[2].v.cn[1] = interfaceCtx->beatingHeartVtx[3].v.cn[1] = - interfaceCtx->beatingHeartVtx[0].v.cn[2] = interfaceCtx->beatingHeartVtx[1].v.cn[2] = - interfaceCtx->beatingHeartVtx[2].v.cn[2] = interfaceCtx->beatingHeartVtx[3].v.cn[2] = - interfaceCtx->beatingHeartVtx[0].v.cn[3] = interfaceCtx->beatingHeartVtx[1].v.cn[3] = - interfaceCtx->beatingHeartVtx[2].v.cn[3] = interfaceCtx->beatingHeartVtx[3].v.cn[3] = 255; - // clang-format on + interfaceCtx->beatingHeartVtx[2].v.cn[0] = interfaceCtx->beatingHeartVtx[3].v.cn[0] = + interfaceCtx->beatingHeartVtx[0].v.cn[1] = interfaceCtx->beatingHeartVtx[1].v.cn[1] = + interfaceCtx->beatingHeartVtx[2].v.cn[1] = interfaceCtx->beatingHeartVtx[3].v.cn[1] = + interfaceCtx->beatingHeartVtx[0].v.cn[2] = interfaceCtx->beatingHeartVtx[1].v.cn[2] = + interfaceCtx->beatingHeartVtx[2].v.cn[2] = interfaceCtx->beatingHeartVtx[3].v.cn[2] = + interfaceCtx->beatingHeartVtx[0].v.cn[3] = interfaceCtx->beatingHeartVtx[1].v.cn[3] = + interfaceCtx->beatingHeartVtx[2].v.cn[3] = interfaceCtx->beatingHeartVtx[3].v.cn[3] = + 255; } void func_8008A8B8(GlobalContext* globalCtx, s32 topY, s32 bottomY, s32 leftX, s32 rightX) { diff --git a/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c b/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c index 40266557e2..452496a025 100644 --- a/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c +++ b/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c @@ -288,7 +288,8 @@ void DemoEffect_Init(Actor* thisx, GlobalContext* globalCtx2) { this->primXluColor[1] = 255; this->primXluColor[2] = 255; // clang-format off - this->envXluColor[0] = 200; this->envXluColor[1] = 50; this->envXluColor[2] = 255; // Sameline prevents reordering + // Sameline prevents reordering + this->envXluColor[0] = 200; this->envXluColor[1] = 50; this->envXluColor[2] = 255; // clang-format on break;