From 77313ee8fd199a42a64863c70a39601272296317 Mon Sep 17 00:00:00 2001
From: MysterD <myster@d>
Date: Sun, 7 Aug 2022 22:42:25 -0700
Subject: [PATCH] Prevent softlock when entering a cannon near water (Star
 Road)

---
 src/game/mario.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/game/mario.c b/src/game/mario.c
index 79e6ca30..128d6f66 100644
--- a/src/game/mario.c
+++ b/src/game/mario.c
@@ -1291,6 +1291,7 @@ s32 transition_submerged_to_walking(struct MarioState *m) {
  */
 s32 set_water_plunge_action(struct MarioState *m) {
     if (m->action == ACT_BUBBLED) { return FALSE; }
+    if (m->action == ACT_IN_CANNON) { return FALSE; }
 
     m->forwardVel = m->forwardVel / 4.0f;
     m->vel[1] = m->vel[1] / 2.0f;