Clang Format

Author: MegaMech

include/PR/abi.h

@@ -822,7 +822,13 @@ typedef short ENVMIX_STATE[40];
 /*
  * See aEnvMixer for more info.
  */
-#define aEnvSetup1Alt(pkt,initialVolReverb,rampReverbL,rampReverbR,rampLeft,rampRight) { Acmd *_a = (Acmd *)pkt; _a->words.w0 = (_SHIFTL(A_ENVSETUP1, 24, 8) | _SHIFTL(initialVolReverb, 16, 8) | (_SHIFTL(rampReverbL, 8, 8)) | _SHIFTL(rampReverbR, 0, 8)); _a->words.w1 = _SHIFTL(rampLeft, 16, 16) | _SHIFTL(rampRight, 0, 16); }
+#define aEnvSetup1Alt(pkt, initialVolReverb, rampReverbL, rampReverbR, rampLeft, rampRight) \
+    {                                                                                       \
+        Acmd* _a = (Acmd*) pkt;                                                             \
+        _a->words.w0 = (_SHIFTL(A_ENVSETUP1, 24, 8) | _SHIFTL(initialVolReverb, 16, 8) |    \
+                        (_SHIFTL(rampReverbL, 8, 8)) | _SHIFTL(rampReverbR, 0, 8));         \
+        _a->words.w1 = _SHIFTL(rampLeft, 16, 16) | _SHIFTL(rampRight, 0, 16);               \
+    }
 
 /*
  * See aEnvMixer for more info.

include/common_structs.h

@@ -253,7 +253,7 @@ typedef struct {
     /* 0x0006 */ u16 unk_006;
     /* 0x0008 */ s16 lapCount;
     /* 0x000A */ char unk_00A[0x2];
-    /* 0x000C */ s32 triggers;    // Bitflag.
+    /* 0x000C */ s32 triggers;        // Bitflag.
     /* 0x0010 */ s16 currentItemCopy; // Has no effect on what item the players has, It is just a synced copy
     /* 0x0012 */ s16 unk_012;
     /* 0x0014 */ Vec3f pos;

include/defines.h

@@ -73,12 +73,12 @@
 
 // Float version required for matching
 #ifdef VERSION_EU
-#define COURSE_TIMER_ITER 0.020041665999999999    // 1 / 50
-    #ifdef AVOID_UB
-    #define COURSE_TIMER_ITER_f 0.020041665999999999f // 1 / 50
-    #else
-    #define COURSE_TIMER_ITER_f 0.01666666f //! 1 / 60 - Float unchanged in EU
-    #endif
+#define COURSE_TIMER_ITER 0.020041665999999999 // 1 / 50
+#ifdef AVOID_UB
+#define COURSE_TIMER_ITER_f 0.020041665999999999f // 1 / 50
+#else
+#define COURSE_TIMER_ITER_f 0.01666666f //! 1 / 60 - Float unchanged in EU
+#endif
 #else
 #define COURSE_TIMER_ITER 0.01666666    // 1 / 60
 #define COURSE_TIMER_ITER_f 0.01666666f // 1 / 60
@@ -331,37 +331,39 @@ enum PLACE { FIRST_PLACE, SECOND_PLACE, THIRD_PLACE, FOURTH_PLACE };
 /*
  * @brief triggers indicating that an effect should be applied to a kart
  */
-#define HIT_BANANA_TRIGGER              0x1 // hits a banana
-#define HIGH_TUMBLE_TRIGGER             0x2 // hit by a red shell, blue shell, or hit a mole
-#define LOW_TUMBLE_TRIGGER              0x4 // hit by a green shell
-#define DRIVING_SPINOUT_TRIGGER        0x80 // spinning out from erratic driving
-#define THWOMP_SQUISH_TRIGGER         0x100 // stomped by thwomp
-#define SHROOM_TRIGGER                0x200 // being boosted by trigger a mushroom
-#define BOO_TRIGGER                   0x800 // being a boo
-#define UNUSED_TRIGGER_0x1000        0x1000 // Unused
-#define STAR_TRIGGER                 0x2000 // Starting a star
-#define LIGHTNING_STRIKE_TRIGGER     0x4000 // Struck by lightning
-#define BOOST_RAMP_WOOD_TRIGGER      0x8000 // being boosted by a ramp
-#define UNUSED_TRIGGER_0x20000      0x20000 // Unused
-#define DRAG_ITEM_EFFECT            0x40000 // holding a non-shell item behind you
-#define HIT_PADDLE_BOAT_TRIGGER     0x80000 // hit paddle boat
-#define UNUSED_TRIGGER_0x10000     0x100000 // Unused
-#define SPINOUT_TRIGGER            0x200000 // hit crab or spiny spinout or losing versus race
-#define VERTICAL_TUMBLE_TRIGGER    0x400000 // hitting a fake item / bomb / snowman / car / train
+#define HIT_BANANA_TRIGGER 0x1              // hits a banana
+#define HIGH_TUMBLE_TRIGGER 0x2             // hit by a red shell, blue shell, or hit a mole
+#define LOW_TUMBLE_TRIGGER 0x4              // hit by a green shell
+#define DRIVING_SPINOUT_TRIGGER 0x80        // spinning out from erratic driving
+#define THWOMP_SQUISH_TRIGGER 0x100         // stomped by thwomp
+#define SHROOM_TRIGGER 0x200                // being boosted by trigger a mushroom
+#define BOO_TRIGGER 0x800                   // being a boo
+#define UNUSED_TRIGGER_0x1000 0x1000        // Unused
+#define STAR_TRIGGER 0x2000                 // Starting a star
+#define LIGHTNING_STRIKE_TRIGGER 0x4000     // Struck by lightning
+#define BOOST_RAMP_WOOD_TRIGGER 0x8000      // being boosted by a ramp
+#define UNUSED_TRIGGER_0x20000 0x20000      // Unused
+#define DRAG_ITEM_EFFECT 0x40000            // holding a non-shell item behind you
+#define HIT_PADDLE_BOAT_TRIGGER 0x80000     // hit paddle boat
+#define UNUSED_TRIGGER_0x10000 0x100000     // Unused
+#define SPINOUT_TRIGGER 0x200000            // hit crab or spiny spinout or losing versus race
+#define VERTICAL_TUMBLE_TRIGGER 0x400000    // hitting a fake item / bomb / snowman / car / train
 #define BOOST_RAMP_ASPHALT_TRIGGER 0x800000 // being boosted by a boost pad
-#define HIT_BY_STAR_TRIGGER       0x1000000 // being hit by a star
-#define START_BOOST_TRIGGER       0x2000000 // Start boost
-#define LOSE_BATTLE_EFFECT        0x4000000 // When losing battle mode
-#define BECOME_BOMB_EFFECT        0x8000000 // When becoming a bomb in battle mode
-#define START_SPINOUT_TRIGGER    0x10000000 // Spinning out by holding gas at start of race
+#define HIT_BY_STAR_TRIGGER 0x1000000       // being hit by a star
+#define START_BOOST_TRIGGER 0x2000000       // Start boost
+#define LOSE_BATTLE_EFFECT 0x4000000        // When losing battle mode
+#define BECOME_BOMB_EFFECT 0x8000000        // When becoming a bomb in battle mode
+#define START_SPINOUT_TRIGGER 0x10000000    // Spinning out by holding gas at start of race
 
 #define ALL_TRIGGERS (0xFFFFFFFF)
 #define RACING_SPINOUT_TRIGGERS (SPINOUT_TRIGGER | DRIVING_SPINOUT_TRIGGER | HIT_BANANA_TRIGGER) // 0x200081
-#define RAMP_BOOST_TRIGGERS (BOOST_RAMP_ASPHALT_TRIGGER | BOOST_RAMP_WOOD_TRIGGER) // 0x00808000
-#define ANY_BOOST_TRIGGERS (RAMP_BOOST_TRIGGERS | SHROOM_TRIGGER) // 0x00808200
-#define STATE_TRANSITION_TRIGGERS (STAR_TRIGGER | BOO_TRIGGER | UNUSED_TRIGGER_0x1000 | UNUSED_TRIGGER_0x20000)// 0x00023800
-#define HIT_TRIGGERS (HIT_BY_STAR_TRIGGER | VERTICAL_TUMBLE_TRIGGER | \
-    LIGHTNING_STRIKE_TRIGGER | LOW_TUMBLE_TRIGGER | HIGH_TUMBLE_TRIGGER | THWOMP_SQUISH_TRIGGER) // 0x01404106
+#define RAMP_BOOST_TRIGGERS (BOOST_RAMP_ASPHALT_TRIGGER | BOOST_RAMP_WOOD_TRIGGER)               // 0x00808000
+#define ANY_BOOST_TRIGGERS (RAMP_BOOST_TRIGGERS | SHROOM_TRIGGER)                                // 0x00808200
+#define STATE_TRANSITION_TRIGGERS \
+    (STAR_TRIGGER | BOO_TRIGGER | UNUSED_TRIGGER_0x1000 | UNUSED_TRIGGER_0x20000) // 0x00023800
+#define HIT_TRIGGERS                                                                                 \
+    (HIT_BY_STAR_TRIGGER | VERTICAL_TUMBLE_TRIGGER | LIGHTNING_STRIKE_TRIGGER | LOW_TUMBLE_TRIGGER | \
+     HIGH_TUMBLE_TRIGGER | THWOMP_SQUISH_TRIGGER) // 0x01404106
 
 /**
  * @brief effect of player's

include/seq_ids.h

@@ -32,7 +32,7 @@ enum SeqId {
     SEQ_EVENT_CEREMONY_PRESENTATION_PART2_WIN,  // 0x1B (27)
     SEQ_EVENT_CEREMONY_TROPHY_CREDITS,          // 0x1C (28)
     SEQ_EVENT_CEREMONY_PRESENTATION_PART2_LOSE, // 0x1D (29)
-	SEQ_COUNT
+    SEQ_COUNT
 };
 
 #endif // SEQ_IDS_H

src/actors/blue_and_red_shells/update.inc.c

@@ -172,8 +172,8 @@ s16 func_802B3FD0(Player* owner, struct ShellActor* shell) {
         if (gPlayerBalloonCount[playerIndex] < 0) {
             continue;
         }
-        // dist_squared_bugged is not quite a 3D distance function, it doubles (rather than squares) the Z difference of the
-        // positions
+        // dist_squared_bugged is not quite a 3D distance function, it doubles (rather than squares) the Z difference of
+        // the positions
         playerToShellDistance = dist_squared_bugged(player->pos, shell->pos);
         if (playerToShellDistance < smallestDistance) {
             smallestDistance = playerToShellDistance;

src/actors/cow/render.inc.c

@@ -13,8 +13,7 @@
  * @param arg2
  */
 void render_actor_cow(Camera* camera, Mat4 arg1, struct Actor* arg2) {
-    if (distance_if_visible(camera->pos, arg2->pos, camera->rot[1], 0, gCameraZoom[camera - camera1],
-                                  4000000.0f) < 0) {
+    if (distance_if_visible(camera->pos, arg2->pos, camera->rot[1], 0, gCameraZoom[camera - camera1], 4000000.0f) < 0) {
         return;
     }
 

src/actors/fake_item_box/render.inc.c

@@ -25,7 +25,7 @@ void render_actor_fake_item_box(Camera* camera, struct FakeItemBox* fakeItemBox)
     f32 someMultiplier;
 
     if (distance_if_visible(camera->pos, fakeItemBox->pos, camera->rot[1], 2500.0f, gCameraZoom[camera - camera1],
-                                1000000.0f) < 0) {
+                            1000000.0f) < 0) {
         actor_not_rendered(camera, (struct Actor*) fakeItemBox);
         return;
     }

src/actors/falling_rock/render.inc.c

@@ -20,8 +20,8 @@ void render_actor_falling_rock(Camera* camera, struct FallingRock* rock) {
         return;
     }
 
-    height = distance_if_visible(camera->pos, rock->pos, camera->rot[1], 400.0f, gCameraZoom[camera - camera1],
-                                     4000000.0f);
+    height =
+        distance_if_visible(camera->pos, rock->pos, camera->rot[1], 400.0f, gCameraZoom[camera - camera1], 4000000.0f);
 
     if (height < 0.0f) {
         return;

src/actors/item_box/render.inc.c

@@ -27,7 +27,7 @@ void render_actor_item_box(Camera* camera, struct ItemBox* item_box) {
     f32 someMultiplier;
 
     temp_f0 = distance_if_visible(camera->pos, item_box->pos, camera->rot[1], 0.0f, gCameraZoom[camera - camera1],
-                                      4000000.0f);
+                                  4000000.0f);
     if (!(temp_f0 < 0.0f) && !(600000.0f < temp_f0)) {
         if ((item_box->state == 2) && (temp_f0 < 100000.0f)) {
             someRot[0] = 0;

src/actors/paddle_boat/render.inc.c

@@ -28,8 +28,7 @@ void render_actor_paddle_boat(Camera* arg0, struct PaddleWheelBoat* boat, UNUSED
         return;
     }
 
-    temp =
-        distance_if_visible(arg0->pos, boat->pos, arg0->rot[1], 90000.0f, gCameraZoom[arg0 - camera1], 9000000.0f);
+    temp = distance_if_visible(arg0->pos, boat->pos, arg0->rot[1], 90000.0f, gCameraZoom[arg0 - camera1], 9000000.0f);
 
     if (temp < 0.0f) {
         return;