From 459cb1544fc719c8723a47731a309049532d6235 Mon Sep 17 00:00:00 2001
From: Sunk <69110309+Sunketchupm@users.noreply.github.com>
Date: Tue, 8 Oct 2024 18:12:34 -0400
Subject: [PATCH] Potential fix for more common tripping

"Trip" here refers to 1 damage kicks
---
 src/game/interaction.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/game/interaction.c b/src/game/interaction.c
index 37ace1a82..dd344ee01 100644
--- a/src/game/interaction.c
+++ b/src/game/interaction.c
@@ -672,7 +672,8 @@ u32 determine_knockback_action(struct MarioState *m, UNUSED s32 arg) {
             if (!is_player_active(m2)) { continue; }
             if (m2->marioObj == NULL) { continue; }
             if (m2->marioObj != m->interactObj) { continue; }
-            if (m2->flags & MARIO_KICKING) { scaler = 2.0f; }
+            // Redundent check in case the kicking flag somehow gets missed
+            if (m2->action == ACT_JUMP_KICK || m2->flags & MARIO_KICKING) { scaler = 2.0f; }
             else if (m2->action == ACT_DIVE) { scaler = 1 + fabs(m2->forwardVel * 0.01f); }
             else if ((m2->flags & MARIO_PUNCHING)) { scaler = 0.2f; hasBeenPunched = TRUE; }
             if (m2->flags & MARIO_METAL_CAP) { scaler *= 1.25f; }