From 541def8f298ad72af3c460101074aa2753c2505e Mon Sep 17 00:00:00 2001 From: Dragorn421 Date: Sat, 9 Apr 2022 12:33:40 +0200 Subject: [PATCH] Remove useless `// clang-format off` --- src/code/code_800EC960.c | 1 - src/code/code_800FD970.c | 5 ++--- src/code/graph.c | 2 -- src/code/z_en_a_keep.c | 11 +++++------ 4 files changed, 7 insertions(+), 12 deletions(-) diff --git a/src/code/code_800EC960.c b/src/code/code_800EC960.c index a07583921a..17e17ab4aa 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..5b7cf41562 100644 --- a/src/code/code_800FD970.c +++ b/src/code/code_800FD970.c @@ -75,8 +75,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/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);