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`

1 files changed, 3 insertions, 6 deletions

diff --git a/src/code/code_800FD970.c b/src/code/code_800FD970.c
index d1efcdc3a..cc9dc5e63 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;
 }