From 14680f0d2524c7705021f4cd3daaa61f803c160c Mon Sep 17 00:00:00 2001 From: Isaac0-dev <62234577+Isaac0-dev@users.noreply.github.com> Date: Thu, 13 Feb 2025 20:03:34 +1000 Subject: [PATCH] fix custom moveset attacks --- src/game/interaction.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/game/interaction.c b/src/game/interaction.c index e1dd7cb22..54fe3b649 100644 --- a/src/game/interaction.c +++ b/src/game/interaction.c @@ -160,7 +160,7 @@ u32 determine_interaction(struct MarioState *m, struct Object *o) { } } - if (interaction == 0 && action & ACT_FLAG_ATTACKING) { + 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))) {