From ec876b20177f1b2c30bdab62cadba7efbff1d083 Mon Sep 17 00:00:00 2001
From: Agent X <44549182+Agent-11@users.noreply.github.com>
Date: Sat, 16 Dec 2023 10:06:58 -0500
Subject: [PATCH] Make PVP hitboxes a little more small

---
 src/game/interaction.c      | 2 +-
 src/game/object_collision.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/game/interaction.c b/src/game/interaction.c
index da6d61e0..fd291f6c 100644
--- a/src/game/interaction.c
+++ b/src/game/interaction.c
@@ -209,7 +209,7 @@ static u32 determine_interaction_internal(struct MarioState *m, struct Object *o
                     interaction = INT_KICK;
                 }
             }
-            if (m->flags & MARIO_TRIPPING) {
+            if (m->flags & MARIO_TRIPPING && gCoopCompatibility) {
                 // 180 degrees total, or 90 each way
                 if (-0x4000 <= dYawToObject && dYawToObject <= 0x4000) {
                     interaction = INT_TRIP;
diff --git a/src/game/object_collision.c b/src/game/object_collision.c
index 7670d139..57b4767e 100644
--- a/src/game/object_collision.c
+++ b/src/game/object_collision.c
@@ -39,7 +39,7 @@ int detect_player_hitbox_overlap(struct MarioState* local, struct MarioState* re
     f32 dx = aTorso[0] - bTorso[0];
     UNUSED f32 sp30 = sp3C - sp38;
     f32 dz = aTorso[2] - bTorso[2];
-    f32 collisionRadius = (a->hitboxRadius + b->hitboxRadius) * (gCoopCompatibility ? 2.25f : 1.75f); // 1.5f before
+    f32 collisionRadius = (a->hitboxRadius + b->hitboxRadius) * (gCoopCompatibility ? 2.25f : 1.6f); // 1.5f before
     f32 distance = sqrtf(dx * dx + dz * dz);
 
     if (collisionRadius * scale > distance) {