From 7b8cb0254f49d3d1373372478fde39f48c575ff4 Mon Sep 17 00:00:00 2001
From: Sunk <69110309+Sunketchupm@users.noreply.github.com>
Date: Thu, 12 Dec 2024 00:05:36 -0500
Subject: [PATCH] Make water punches have a range (#557)

---
 src/game/interaction.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/game/interaction.c b/src/game/interaction.c
index d5ec91a8b..f0ce6ad01 100644
--- a/src/game/interaction.c
+++ b/src/game/interaction.c
@@ -153,7 +153,11 @@ u32 determine_interaction(struct MarioState *m, struct Object *o) {
 
     // hack: make water punch actually do something
     if (interaction == 0 && m->action == ACT_WATER_PUNCH && o->oInteractType & INTERACT_PLAYER) {
-        interaction = INT_PUNCH;
+        s16 dYawToObject = mario_obj_angle_to_object(m, o) - m->faceAngle[1];
+        // 120 degrees total, or 60 each way
+        if (-0x2AAA <= dYawToObject && dYawToObject <= 0x2AAA) {
+            interaction = INT_PUNCH;
+        }
     }
 
     if (interaction == 0 && action & ACT_FLAG_ATTACKING) {