From eb167dbe9fe690b9fd6258ad24984e4216463d91 Mon Sep 17 00:00:00 2001
From: Agent X <44549182+Agent-11@users.noreply.github.com>
Date: Tue, 12 Dec 2023 18:20:01 -0500
Subject: [PATCH] Remove pvp tripping and make hitboxes a bit bigger

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

diff --git a/src/game/interaction.c b/src/game/interaction.c
index 62e791a9..da6d61e0 100644
--- a/src/game/interaction.c
+++ b/src/game/interaction.c
@@ -193,7 +193,8 @@ static u32 determine_interaction_internal(struct MarioState *m, struct Object *o
     }
 
     if (interaction == 0 && action & ACT_FLAG_ATTACKING) {
-        if (m->flags & (MARIO_PUNCHING | MARIO_KICKING | MARIO_TRIPPING)) {
+        u32 flags = gCoopCompatibility ? (MARIO_PUNCHING | MARIO_KICKING | MARIO_TRIPPING) : (MARIO_PUNCHING | MARIO_KICKING);
+        if (m->flags & flags) {
             s16 dYawToObject = mario_obj_angle_to_object(m, o) - m->faceAngle[1];
 
             if (m->flags & MARIO_PUNCHING) {
diff --git a/src/game/object_collision.c b/src/game/object_collision.c
index b6e48033..7670d139 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.5f);
+    f32 collisionRadius = (a->hitboxRadius + b->hitboxRadius) * (gCoopCompatibility ? 2.25f : 1.75f); // 1.5f before
     f32 distance = sqrtf(dx * dx + dz * dz);
 
     if (collisionRadius * scale > distance) {