Reformat to something more readable for me :3

src/decomp/game/mario_actions_object.c

@@ -21,98 +21,122 @@
  * Used by act_punching() to determine Mario's forward velocity during each
  * animation frame.
  */
-s8 sPunchingForwardVelocities[8] = { 0, 1, 1, 2, 3, 5, 7, 10 };
+s8 sPunchingForwardVelocities[8] = {0, 1, 1, 2, 3, 5, 7, 10};
 
-void animated_stationary_ground_step(struct MarioState *m, s32 animation, u32 endAction) {
+void animated_stationary_ground_step(struct MarioState *m, s32 animation, u32 endAction)
+{
     stationary_ground_step(m);
     set_mario_animation(m, animation);
-    if (is_anim_at_end(m)) {
+    if (is_anim_at_end(m))
+    {
         set_mario_action(m, endAction, 0);
     }
 }
 
-s32 mario_update_punch_sequence(struct MarioState *m) {
+s32 mario_update_punch_sequence(struct MarioState *m)
+{
     u32 endAction, crouchEndAction;
     s32 animFrame;
 
-    if (m->action & ACT_FLAG_MOVING) {
+    if (m->action & ACT_FLAG_MOVING)
+    {
         endAction = ACT_WALKING, crouchEndAction = ACT_CROUCH_SLIDE;
-    } else {
+    }
+    else
+    {
         endAction = ACT_IDLE, crouchEndAction = ACT_CROUCHING;
     }
 
-    switch (m->actionArg) {
+    switch (m->actionArg)
+    {
         case 0:
             play_sound(SOUND_MARIO_PUNCH_YAH, m->marioObj->header.gfx.cameraToObject);
-            // Fall-through:
+        // Fall-through:
         case 1:
             set_mario_animation(m, MARIO_ANIM_FIRST_PUNCH);
-            if (is_anim_past_end(m)) {
+            if (is_anim_past_end(m))
+            {
                 m->actionArg = 2;
-            } else {
+            }
+            else
+            {
                 m->actionArg = 1;
             }
 
-            if (m->marioObj->header.gfx.animInfo.animFrame >= 2) {
-                if (mario_check_object_grab(m)) {
+            if (m->marioObj->header.gfx.animInfo.animFrame >= 2)
+            {
+                if (mario_check_object_grab(m))
+                {
                     return TRUE;
                 }
 
                 m->flags |= MARIO_PUNCHING;
             }
 
-            if (m->actionArg == 2) {
-                m->marioBodyState->punchState = (0 << 6) | 4;
+            if (m->actionArg == 2)
+            {
+                m->marioBodyState->punchState = 0 << 6 | 4;
             }
             break;
 
         case 2:
             set_mario_animation(m, MARIO_ANIM_FIRST_PUNCH_FAST);
 
-            if (m->marioObj->header.gfx.animInfo.animFrame <= 0) {
+            if (m->marioObj->header.gfx.animInfo.animFrame <= 0)
+            {
                 m->flags |= MARIO_PUNCHING;
             }
 
-            if (m->input & INPUT_B_PRESSED) {
+            if (m->input & INPUT_B_PRESSED)
+            {
                 m->actionArg = 3;
             }
 
-            if (is_anim_at_end(m)) {
+            if (is_anim_at_end(m))
+            {
                 set_mario_action(m, endAction, 0);
             }
             break;
 
         case 3:
             play_sound(SOUND_MARIO_PUNCH_WAH, m->marioObj->header.gfx.cameraToObject);
-            // Fall-through:
+        // Fall-through:
         case 4:
             set_mario_animation(m, MARIO_ANIM_SECOND_PUNCH);
-            if (is_anim_past_end(m)) {
+            if (is_anim_past_end(m))
+            {
                 m->actionArg = 5;
-            } else {
+            }
+            else
+            {
                 m->actionArg = 4;
             }
 
-            if (m->marioObj->header.gfx.animInfo.animFrame > 0) {
+            if (m->marioObj->header.gfx.animInfo.animFrame > 0)
+            {
                 m->flags |= MARIO_PUNCHING;
             }
 
-            if (m->actionArg == 5) {
-                m->marioBodyState->punchState = (1 << 6) | 4;
+            if (m->actionArg == 5)
+            {
+                m->marioBodyState->punchState = 1 << 6 | 4;
             }
             break;
 
         case 5:
             set_mario_animation(m, MARIO_ANIM_SECOND_PUNCH_FAST);
-            if (m->marioObj->header.gfx.animInfo.animFrame <= 0) {
+            if (m->marioObj->header.gfx.animInfo.animFrame <= 0)
+            {
                 m->flags |= MARIO_PUNCHING;
             }
 
-            if (m->input & INPUT_B_PRESSED) {
+            if (m->input & INPUT_B_PRESSED)
+            {
                 m->actionArg = 6;
             }
 
-            if (is_anim_at_end(m)) {
+            if (is_anim_at_end(m))
+            {
                 set_mario_action(m, endAction, 0);
             }
             break;
@@ -120,15 +144,18 @@ s32 mario_update_punch_sequence(struct MarioState *m) {
         case 6:
             play_mario_action_sound(m, SOUND_MARIO_PUNCH_HOO, 1);
             animFrame = set_mario_animation(m, MARIO_ANIM_GROUND_KICK);
-            if (animFrame == 0) {
-                m->marioBodyState->punchState = (2 << 6) | 6;
+            if (animFrame == 0)
+            {
+                m->marioBodyState->punchState = 2 << 6 | 6;
             }
 
-            if (animFrame >= 0 && animFrame < 8) {
+            if (animFrame >= 0 && animFrame < 8)
+            {
                 m->flags |= MARIO_KICKING;
             }
 
-            if (is_anim_at_end(m)) {
+            if (is_anim_at_end(m))
+            {
                 set_mario_action(m, endAction, 0);
             }
             break;
@@ -138,11 +165,13 @@ s32 mario_update_punch_sequence(struct MarioState *m) {
             set_mario_animation(m, MARIO_ANIM_BREAKDANCE);
             animFrame = m->marioObj->header.gfx.animInfo.animFrame;
 
-            if (animFrame >= 2 && animFrame < 8) {
+            if (animFrame >= 2 && animFrame < 8)
+            {
                 m->flags |= MARIO_TRIPPING;
             }
 
-            if (is_anim_at_end(m)) {
+            if (is_anim_at_end(m))
+            {
                 set_mario_action(m, crouchEndAction, 0);
             }
             break;
@@ -151,26 +180,32 @@ s32 mario_update_punch_sequence(struct MarioState *m) {
     return FALSE;
 }
 
-s32 act_punching(struct MarioState *m) {
-    if (m->input & INPUT_UNKNOWN_10) {
+s32 act_punching(struct MarioState *m)
+{
+    if (m->input & INPUT_UNKNOWN_10)
+    {
         return drop_and_set_mario_action(m, ACT_SHOCKWAVE_BOUNCE, 0);
     }
 
-    if (m->input & (INPUT_NONZERO_ANALOG | INPUT_A_PRESSED | INPUT_OFF_FLOOR | INPUT_ABOVE_SLIDE)) {
+    if (m->input & (INPUT_NONZERO_ANALOG | INPUT_A_PRESSED | INPUT_OFF_FLOOR | INPUT_ABOVE_SLIDE))
+    {
         return check_common_action_exits(m);
     }
 
-    if (m->actionState == 0 && (m->input & INPUT_A_DOWN)) {
+    if (m->actionState == 0 && m->input & INPUT_A_DOWN)
+    {
         return set_mario_action(m, ACT_JUMP_KICK, 0);
     }
 
     m->actionState = 1;
-    if (m->actionArg == 0) {
+    if (m->actionArg == 0)
+    {
         m->actionTimer = 7;
     }
 
     mario_set_forward_vel(m, sPunchingForwardVelocities[m->actionTimer]);
-    if (m->actionTimer > 0) {
+    if (m->actionTimer > 0)
+    {
         m->actionTimer--;
     }
 
@@ -179,16 +214,20 @@ s32 act_punching(struct MarioState *m) {
     return FALSE;
 }
 
-s32 act_picking_up(struct MarioState *m) {
-    if (m->input & INPUT_UNKNOWN_10) {
+s32 act_picking_up(struct MarioState *m)
+{
+    if (m->input & INPUT_UNKNOWN_10)
+    {
         return drop_and_set_mario_action(m, ACT_SHOCKWAVE_BOUNCE, 0);
     }
 
-    if (m->input & INPUT_OFF_FLOOR) {
+    if (m->input & INPUT_OFF_FLOOR)
+    {
         return drop_and_set_mario_action(m, ACT_FREEFALL, 0);
     }
 
-    if (m->actionState == 0 && is_anim_at_end(m)) {
+    if (m->actionState == 0 && is_anim_at_end(m))
+    {
         //! While the animation is playing, it is possible for the used object
         // to unload. This allows you to pick up a vacant or newly loaded object
         // slot (cloning via fake object).
@@ -197,17 +236,23 @@ s32 act_picking_up(struct MarioState *m) {
         m->actionState = 1;
     }
 
-    if (m->actionState == 1) {
-        if (m->heldObj->oInteractionSubtype & INT_SUBTYPE_GRABS_MARIO) {
+    if (m->actionState == 1)
+    {
+        if (m->heldObj->oInteractionSubtype & INT_SUBTYPE_GRABS_MARIO)
+        {
             m->marioBodyState->grabPos = GRAB_POS_HEAVY_OBJ;
             set_mario_animation(m, MARIO_ANIM_GRAB_HEAVY_OBJECT);
-            if (is_anim_at_end(m)) {
+            if (is_anim_at_end(m))
+            {
                 set_mario_action(m, ACT_HOLD_HEAVY_IDLE, 0);
             }
-        } else {
+        }
+        else
+        {
             m->marioBodyState->grabPos = GRAB_POS_LIGHT_OBJ;
             set_mario_animation(m, MARIO_ANIM_PICK_UP_LIGHT_OBJ);
-            if (is_anim_at_end(m)) {
+            if (is_anim_at_end(m))
+            {
                 set_mario_action(m, ACT_HOLD_IDLE, 0);
             }
         }
@@ -217,19 +262,23 @@ s32 act_picking_up(struct MarioState *m) {
     return FALSE;
 }
 
-s32 act_dive_picking_up(struct MarioState *m) {
-    if (m->input & INPUT_UNKNOWN_10) {
+s32 act_dive_picking_up(struct MarioState *m)
+{
+    if (m->input & INPUT_UNKNOWN_10)
+    {
         return drop_and_set_mario_action(m, ACT_SHOCKWAVE_BOUNCE, 0);
     }
 
     //! Hands-free holding. Landing on a slope or being pushed off a ledge while
     // landing from a dive grab sets Mario's action to a non-holding action
     // without dropping the object, causing the hands-free holding glitch.
-    if (m->input & INPUT_OFF_FLOOR) {
+    if (m->input & INPUT_OFF_FLOOR)
+    {
         return set_mario_action(m, ACT_FREEFALL, 0);
     }
 
-    if (m->input & INPUT_ABOVE_SLIDE) {
+    if (m->input & INPUT_ABOVE_SLIDE)
+    {
         return set_mario_action(m, ACT_BEGIN_SLIDING, 0);
     }
 
@@ -237,16 +286,20 @@ s32 act_dive_picking_up(struct MarioState *m) {
     return FALSE;
 }
 
-s32 act_placing_down(struct MarioState *m) {
-    if (m->input & INPUT_UNKNOWN_10) {
+s32 act_placing_down(struct MarioState *m)
+{
+    if (m->input & INPUT_UNKNOWN_10)
+    {
         return drop_and_set_mario_action(m, ACT_SHOCKWAVE_BOUNCE, 0);
     }
 
-    if (m->input & INPUT_OFF_FLOOR) {
+    if (m->input & INPUT_OFF_FLOOR)
+    {
         return drop_and_set_mario_action(m, ACT_FREEFALL, 0);
     }
 
-    if (++m->actionTimer == 8) {
+    if (++m->actionTimer == 8)
+    {
         mario_drop_held_object(m);
     }
 
@@ -254,64 +307,77 @@ s32 act_placing_down(struct MarioState *m) {
     return FALSE;
 }
 
-s32 act_throwing(struct MarioState *m) {
-    if (m->heldObj && (m->heldObj->oInteractionSubtype & INT_SUBTYPE_HOLDABLE_NPC)) {
+s32 act_throwing(struct MarioState *m)
+{
+    if (m->heldObj && m->heldObj->oInteractionSubtype & INT_SUBTYPE_HOLDABLE_NPC)
+    {
         return set_mario_action(m, ACT_PLACING_DOWN, 0);
     }
 
-    if (m->input & INPUT_UNKNOWN_10) {
+    if (m->input & INPUT_UNKNOWN_10)
+    {
         return drop_and_set_mario_action(m, ACT_SHOCKWAVE_BOUNCE, 0);
     }
 
-    if (m->input & INPUT_OFF_FLOOR) {
+    if (m->input & INPUT_OFF_FLOOR)
+    {
         return drop_and_set_mario_action(m, ACT_FREEFALL, 0);
     }
 
-    if (++m->actionTimer == 7) {
+    if (++m->actionTimer == 7)
+    {
         mario_throw_held_object(m);
         play_sound_if_no_flag(m, SOUND_MARIO_WAH2, MARIO_MARIO_SOUND_PLAYED);
         play_sound_if_no_flag(m, SOUND_ACTION_THROW, MARIO_ACTION_SOUND_PLAYED);
-#ifdef VERSION_SH
+        #ifdef VERSION_SH
         queue_rumble_data(3, 50);
-#endif
+        #endif
     }
 
     animated_stationary_ground_step(m, MARIO_ANIM_GROUND_THROW, ACT_IDLE);
     return FALSE;
 }
 
-s32 act_heavy_throw(struct MarioState *m) {
-    if (m->input & INPUT_UNKNOWN_10) {
+s32 act_heavy_throw(struct MarioState *m)
+{
+    if (m->input & INPUT_UNKNOWN_10)
+    {
         return drop_and_set_mario_action(m, ACT_SHOCKWAVE_BOUNCE, 0);
     }
 
-    if (m->input & INPUT_OFF_FLOOR) {
+    if (m->input & INPUT_OFF_FLOOR)
+    {
         return drop_and_set_mario_action(m, ACT_FREEFALL, 0);
     }
 
-    if (++m->actionTimer == 13) {
+    if (++m->actionTimer == 13)
+    {
         mario_drop_held_object(m);
         play_sound_if_no_flag(m, SOUND_MARIO_WAH2, MARIO_MARIO_SOUND_PLAYED);
         play_sound_if_no_flag(m, SOUND_ACTION_THROW, MARIO_ACTION_SOUND_PLAYED);
-#ifdef VERSION_SH
+        #ifdef VERSION_SH
         queue_rumble_data(3, 50);
-#endif
+        #endif
     }
 
     animated_stationary_ground_step(m, MARIO_ANIM_HEAVY_THROW, ACT_IDLE);
     return FALSE;
 }
 
-s32 act_stomach_slide_stop(struct MarioState *m) {
-    if (m->input & INPUT_UNKNOWN_10) {
+s32 act_stomach_slide_stop(struct MarioState *m)
+{
+    if (m->input & INPUT_UNKNOWN_10)
+    {
         return set_mario_action(m, ACT_SHOCKWAVE_BOUNCE, 0);
     }
 
-    if (m->input & INPUT_OFF_FLOOR) {
+    if (m->input & INPUT_OFF_FLOOR)
+    {
         return set_mario_action(m, ACT_FREEFALL, 0);
     }
 
-    if (m->input & INPUT_ABOVE_SLIDE) {
+    if (m->input & INPUT_ABOVE_SLIDE)
+    {
         return set_mario_action(m, ACT_BEGIN_SLIDING, 0);
     }
 
@@ -319,20 +385,23 @@ s32 act_stomach_slide_stop(struct MarioState *m) {
     return FALSE;
 }
 
-s32 act_picking_up_bowser(struct MarioState *m) {
-    if (m->actionState == 0) {
+s32 act_picking_up_bowser(struct MarioState *m)
+{
+    if (m->actionState == 0)
+    {
         m->actionState = 1;
         m->angleVel[1] = 0;
         m->marioBodyState->grabPos = GRAB_POS_BOWSER;
         mario_grab_used_object(m);
-#ifdef VERSION_SH
+        #ifdef VERSION_SH
         queue_rumble_data(5, 80);
-#endif
+        #endif
         play_sound(SOUND_MARIO_HRMM, m->marioObj->header.gfx.cameraToObject);
     }
 
     set_mario_animation(m, MARIO_ANIM_GRAB_BOWSER);
-    if (is_anim_at_end(m)) {
+    if (is_anim_at_end(m))
+    {
         set_mario_action(m, ACT_HOLDING_BOWSER, 0);
     }
 
@@ -340,59 +409,78 @@ s32 act_picking_up_bowser(struct MarioState *m) {
     return FALSE;
 }
 
-s32 act_holding_bowser(struct MarioState *m) {
+s32 act_holding_bowser(struct MarioState *m)
+{
     s16 spin;
 
-    if (m->input & INPUT_B_PRESSED) {
-#ifndef VERSION_JP
-        if (m->angleVel[1] <= -0xE00 || m->angleVel[1] >= 0xE00) {
+    if (m->input & INPUT_B_PRESSED)
+    {
+        #ifndef VERSION_JP
+        if (m->angleVel[1] <= -0xE00 || m->angleVel[1] >= 0xE00)
+        {
             play_sound(SOUND_MARIO_SO_LONGA_BOWSER, m->marioObj->header.gfx.cameraToObject);
-        } else {
+        }
+        else
+        {
             play_sound(SOUND_MARIO_HERE_WE_GO, m->marioObj->header.gfx.cameraToObject);
         }
-#else
+        #else
         play_sound(SOUND_MARIO_HERE_WE_GO, m->marioObj->header.gfx.cameraToObject);
-#endif
+        #endif
         return set_mario_action(m, ACT_RELEASING_BOWSER, 0);
     }
 
-    if (m->angleVel[1] == 0) {
-        if (m->actionTimer++ > 120) {
+    if (m->angleVel[1] == 0)
+    {
+        if (m->actionTimer++ > 120)
+        {
             return set_mario_action(m, ACT_RELEASING_BOWSER, 1);
         }
 
         set_mario_animation(m, MARIO_ANIM_HOLDING_BOWSER);
-    } else {
+    }
+    else
+    {
         m->actionTimer = 0;
         set_mario_animation(m, MARIO_ANIM_SWINGING_BOWSER);
     }
 
-    if (m->intendedMag > 20.0f) {
-        if (m->actionArg == 0) {
+    if (m->intendedMag > 20.0f)
+    {
+        if (m->actionArg == 0)
+        {
             m->actionArg = 1;
             m->twirlYaw = m->intendedYaw;
-        } else {
+        }
+        else
+        {
             // spin = acceleration
             spin = (s16)(m->intendedYaw - m->twirlYaw) / 0x80;
 
-            if (spin < -0x80) {
+            if (spin < -0x80)
+            {
                 spin = -0x80;
             }
-            if (spin > 0x80) {
+            if (spin > 0x80)
+            {
                 spin = 0x80;
             }
 
             m->twirlYaw = m->intendedYaw;
             m->angleVel[1] += spin;
 
-            if (m->angleVel[1] > 0x1000) {
+            if (m->angleVel[1] > 0x1000)
+            {
                 m->angleVel[1] = 0x1000;
             }
-            if (m->angleVel[1] < -0x1000) {
+            if (m->angleVel[1] < -0x1000)
+            {
                 m->angleVel[1] = -0x1000;
             }
         }
-    } else {
+    }
+    else
+    {
         m->actionArg = 0;
         m->angleVel[1] = approach_s32(m->angleVel[1], 0, 64, 64);
     }
@@ -402,40 +490,50 @@ s32 act_holding_bowser(struct MarioState *m) {
     m->faceAngle[1] += m->angleVel[1];
 
     // play sound on overflow
-    if (m->angleVel[1] <= -0x100 && spin < m->faceAngle[1]) {
-#ifdef VERSION_SH
+    if (m->angleVel[1] <= -0x100 && spin < m->faceAngle[1])
+    {
+        #ifdef VERSION_SH
         queue_rumble_data(4, 20);
-#endif
+        #endif
         play_sound(SOUND_OBJ_BOWSER_SPINNING, m->marioObj->header.gfx.cameraToObject);
     }
-    if (m->angleVel[1] >= 0x100 && spin > m->faceAngle[1]) {
-#ifdef VERSION_SH
+    if (m->angleVel[1] >= 0x100 && spin > m->faceAngle[1])
+    {
+        #ifdef VERSION_SH
         queue_rumble_data(4, 20);
-#endif
+        #endif
         play_sound(SOUND_OBJ_BOWSER_SPINNING, m->marioObj->header.gfx.cameraToObject);
     }
 
     stationary_ground_step(m);
-    if (m->angleVel[1] >= 0) {
+    if (m->angleVel[1] >= 0)
+    {
         m->marioObj->header.gfx.angle[0] = -m->angleVel[1];
-    } else {
+    }
+    else
+    {
         m->marioObj->header.gfx.angle[0] = m->angleVel[1];
     }
 
     return FALSE;
 }
 
-s32 act_releasing_bowser(struct MarioState *m) {
-    if (++m->actionTimer == 1) {
-        if (m->actionArg == 0) {
-#ifdef VERSION_SH
+s32 act_releasing_bowser(struct MarioState *m)
+{
+    if (++m->actionTimer == 1)
+    {
+        if (m->actionArg == 0)
+        {
+            #ifdef VERSION_SH
             queue_rumble_data(4, 50);
-#endif
+            #endif
             mario_throw_held_object(m);
-        } else {
-#ifdef VERSION_SH
+        }
+        else
+        {
+            #ifdef VERSION_SH
             queue_rumble_data(4, 50);
-#endif
+            #endif
             mario_drop_held_object(m);
         }
     }
@@ -445,31 +543,38 @@ s32 act_releasing_bowser(struct MarioState *m) {
     return FALSE;
 }
 
-s32 check_common_object_cancels(struct MarioState *m) {
+s32 check_common_object_cancels(struct MarioState *m)
+{
     f32 waterSurface = m->waterLevel - 100;
-    if (m->pos[1] < waterSurface) {
+    if (m->pos[1] < waterSurface)
+    {
         return set_water_plunge_action(m);
     }
 
-    if (m->input & INPUT_SQUISHED) {
+    if (m->input & INPUT_SQUISHED)
+    {
         return drop_and_set_mario_action(m, ACT_SQUISHED, 0);
     }
 
-    if (m->health < 0x100) {
+    if (m->health < 0x100)
+    {
         return drop_and_set_mario_action(m, ACT_STANDING_DEATH, 0);
     }
 
     return FALSE;
 }
 
-s32 mario_execute_object_action(struct MarioState *m) {
+s32 mario_execute_object_action(struct MarioState *m)
+{
     s32 cancel;
 
-    if (check_common_object_cancels(m)) {
+    if (check_common_object_cancels(m))
+    {
         return TRUE;
     }
 
-    if (mario_update_quicksand(m, 0.5f)) {
+    if (mario_update_quicksand(m, 0.5f))
+    {
         return TRUE;
     }
 
@@ -488,7 +593,8 @@ s32 mario_execute_object_action(struct MarioState *m) {
     }
     /* clang-format on */
 
-    if (!cancel && (m->input & INPUT_IN_WATER)) {
+    if (!cancel && m->input & INPUT_IN_WATER)
+    {
         m->particleFlags |= PARTICLE_IDLE_WATER_WAVE;
     }