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
@@ -334,7 +334,7 @@ enum PLACE { FIRST_PLACE, SECOND_PLACE, THIRD_PLACE, FOURTH_PLACE };
 // player->unk_046
 
 /* The first time you touch a penguin or bat, and anytime you touch a thwomp during a
-   race will set a flag which will cause your next spinout to be instant (i.e. no 
+   race will set a flag which will cause your next spinout to be instant (i.e. no
    sliding forward). Probably half-implemented code to prevent sliding through enemies,
    but causes this bug */
 #define CRITTER_TOUCH 0x2 // Touched a penguin, bat or thwomp
@@ -344,19 +344,21 @@ enum PLACE { FIRST_PLACE, SECOND_PLACE, THIRD_PLACE, FOURTH_PLACE };
 // player->oobProps
 /* Deals with the lower out of bounds (OOB) plane on levels. Represented by fluids (water / lava)
   or nothing for Rainbow Road and Skyscraper. */
-#define UNDER_OOB_OR_FLUID_LEVEL 0x1 // Set while mostly under the plane. Does not necessarily trigger Lakitu on Koopa Troopa Beach.
+#define UNDER_OOB_OR_FLUID_LEVEL \
+    0x1 // Set while mostly under the plane. Does not necessarily trigger Lakitu on Koopa Troopa Beach.
 #define PASS_OOB_OR_FLUID_LEVEL 0x2 // Set when passing through the lower plane in either direction
 // The next two are also activated when passing through the lower plane.
 #define UNDER_FLUID_LEVEL 0x4 // Stays active until Lakitu places back on track
-#define UNDER_OOB_LEVEL 0x8 // Active while under a non-fluid OOB plane. Is momentarily active when passing through fluids.
-
+#define UNDER_OOB_LEVEL \
+    0x8 // Active while under a non-fluid OOB plane. Is momentarily active when passing through fluids.
 
 /* UNK_002 has something to do with player animations. Each player has a 32-bit
 flag broken into 8 groups of 4 bits. Those 4 bits affect how each of the 8 players
 appear to the specified player */
 #define CHANGING_ANIMATION 0x1 // Seems to be set when the kart animation has to change.
-#define UNK_002_UNKNOWN_0x2 0x2 
-#define UNK_002_UNKNOWN_0x4 0x4 /* Unclear, but has to do with viewing the side of player. At least tends to change if target
+#define UNK_002_UNKNOWN_0x2 0x2
+#define UNK_002_UNKNOWN_0x4                                                                                            \
+    0x4                  /* Unclear, but has to do with viewing the side of player. At least tends to change if target \
 player spins. Something  with avoding rollover of aniamation frame data? */
 #define SIDE_OF_KART 0x8 // Seems to be whether you are in a rectangle shooting out from both sides of target player
 
@@ -368,62 +370,64 @@ player spins. Something  with avoding rollover of aniamation frame data? */
 #define EXPLOSION 0x1000 // Big shock looking graphic when starting tumble
 
 // player->lakituProps
-#define LAKITU_RETRIEVAL 0x1 // While lakitu is grabbing you, but before the scene transition of being placed on the track
-#define HELD_BY_LAKITU   0x2
-#define LAKITU_FIZZLE    0x4 // Disintegration and reintegration effect when transitioning from retrieval to placement
-#define LAKITU_SCENE     0x8 // the whole segment from when lakitu is called to when you regain control
-#define FRIGID_EFFECT   0x10 // Cold colors on Sherbet Land after in frigid water
-#define THAWING_EFFECT  0x20 // Regaining usual colors post frigid effect
-#define FROZEN_EFFECT   0x80 // In the ice cube
-#define WENT_OVER_OOB  0x100 // Player went over (or is on) an OOB area. Cancelled if touch back in bounds
-#define LAKITU_LAVA   0x1000 // smoky effect when retrieved from lava
-#define LAKITU_WATER  0x2000 // dripping effect when retreived from water
+#define LAKITU_RETRIEVAL \
+    0x1 // While lakitu is grabbing you, but before the scene transition of being placed on the track
+#define HELD_BY_LAKITU 0x2
+#define LAKITU_FIZZLE 0x4   // Disintegration and reintegration effect when transitioning from retrieval to placement
+#define LAKITU_SCENE 0x8    // the whole segment from when lakitu is called to when you regain control
+#define FRIGID_EFFECT 0x10  // Cold colors on Sherbet Land after in frigid water
+#define THAWING_EFFECT 0x20 // Regaining usual colors post frigid effect
+#define FROZEN_EFFECT 0x80  // In the ice cube
+#define WENT_OVER_OOB 0x100 // Player went over (or is on) an OOB area. Cancelled if touch back in bounds
+#define LAKITU_LAVA 0x1000  // smoky effect when retrieved from lava
+#define LAKITU_WATER 0x2000 // dripping effect when retreived from water
 
 // player->kartProps
-#define BACK_UP               0x1
-#define RIGHT_TURN            0x2 // non-drifting (more than 5 degrees)
-#define LEFT_TURN             0x4 // non-drifting (more than 5 degrees)
-#define MOVE_BACKWARDS        0x8 // includes lakitu
-#define LOSE_GP_RACE         0x10 // pointless, only unsets itself
-#define THROTTLE             0x20 // Closely tied to just pressing A. Possible exception for AB-spins
-#define EARLY_SPINOUT_RIGHT  0x40 // Spinning out while facing right (not actually used for anything)
-#define EARLY_SPINOUT_LEFT   0x80 // Spinning out while facing left
-#define POST_TUMBLE_GAS     0x100 // Causes particles after a vertical tumble, I think
-#define BECOME_INVISIBLE    0x200
-#define UNUSED_0x400        0x400 // locked behind 0x800 (func_80091440)
-#define UNUSED_0x800        0x800 // locked behind 0x400 (func_8002B830 -> func_800911B4)
-#define UNUSED_0x1000      0x1000 // 0x1000 locked behind 0x400 (func_8002B830 -> func_800911B4)
-#define UNUSED_0x2000      0x2000 // 0x2000 locked behind 0x400 and 0x800 (func_8002B830 -> func_800911B4, apply_effect -> func_80091298,
-                                  // func_80091440)
-#define DRIVING_SPINOUT    0x4000
+#define BACK_UP 0x1
+#define RIGHT_TURN 0x2           // non-drifting (more than 5 degrees)
+#define LEFT_TURN 0x4            // non-drifting (more than 5 degrees)
+#define MOVE_BACKWARDS 0x8       // includes lakitu
+#define LOSE_GP_RACE 0x10        // pointless, only unsets itself
+#define THROTTLE 0x20            // Closely tied to just pressing A. Possible exception for AB-spins
+#define EARLY_SPINOUT_RIGHT 0x40 // Spinning out while facing right (not actually used for anything)
+#define EARLY_SPINOUT_LEFT 0x80  // Spinning out while facing left
+#define POST_TUMBLE_GAS 0x100    // Causes particles after a vertical tumble, I think
+#define BECOME_INVISIBLE 0x200
+#define UNUSED_0x400 0x400   // locked behind 0x800 (func_80091440)
+#define UNUSED_0x800 0x800   // locked behind 0x400 (func_8002B830 -> func_800911B4)
+#define UNUSED_0x1000 0x1000 // 0x1000 locked behind 0x400 (func_8002B830 -> func_800911B4)
+#define UNUSED_0x2000 \
+    0x2000 // 0x2000 locked behind 0x400 and 0x800 (func_8002B830 -> func_800911B4, apply_effect -> func_80091298,
+           // func_80091440)
+#define DRIVING_SPINOUT 0x4000
 #define UNKNOWN_BATTLE_VAR 0x8000 // 0x8000 something battle related, unclear if ever set
 
 /*
  * @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

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;