From c7df4eb0719e6baee0876c50142f847548e20931 Mon Sep 17 00:00:00 2001 From: Isaac0-dev <62234577+Isaac0-dev@users.noreply.github.com> Date: Wed, 5 Mar 2025 23:04:52 +1000 Subject: [PATCH] fixed interaction flags when a mod doesn't specify an interaction type --- src/game/interaction.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/game/interaction.c b/src/game/interaction.c index 6edf0fc54..f57d10049 100644 --- a/src/game/interaction.c +++ b/src/game/interaction.c @@ -166,8 +166,7 @@ u32 determine_interaction(struct MarioState *m, struct Object *o) { if ((interaction == 0 || interaction & INT_LUA) && action & ACT_FLAG_ATTACKING) { u32 flags = (MARIO_PUNCHING | MARIO_KICKING | MARIO_TRIPPING); - if ((action == ACT_PUNCHING || action == ACT_MOVE_PUNCHING || action == ACT_JUMP_KICK) || - ((m->flags & flags) && (interaction & INT_LUA))) { + if (m->flags & flags) { s16 dYawToObject = mario_obj_angle_to_object(m, o) - m->faceAngle[1]; if (m->flags & MARIO_PUNCHING) {