From 9a91dfa453e26fb88a901317ea751e2faed0739b Mon Sep 17 00:00:00 2001
From: MysterD <myster@d>
Date: Thu, 24 Sep 2020 18:54:30 -0700
Subject: [PATCH] Allow bubbled players to go through vanish cap walls

---
 src/game/mario.c                   | 2 ++
 src/game/mario_actions_automatic.c | 1 +
 2 files changed, 3 insertions(+)

diff --git a/src/game/mario.c b/src/game/mario.c
index 67624c0d..7fd17716 100644
--- a/src/game/mario.c
+++ b/src/game/mario.c
@@ -397,6 +397,8 @@ void mario_set_bubbled(struct MarioState* m) {
     gCamera->cutscene = 0;
     m->statusForCamera->action = m->action;
     m->statusForCamera->cameraEvent = 0;
+    m->marioObj->activeFlags |= ACTIVE_FLAG_MOVE_THROUGH_GRATE;
+
     extern s16 gCutsceneTimer;
     gCutsceneTimer = 0;
 
diff --git a/src/game/mario_actions_automatic.c b/src/game/mario_actions_automatic.c
index dd650564..89f1ba89 100644
--- a/src/game/mario_actions_automatic.c
+++ b/src/game/mario_actions_automatic.c
@@ -942,6 +942,7 @@ s32 act_bubbled(struct MarioState* m) {
 
     // pop bubble
     if (m->playerIndex == 0 && distanceToPlayer < 120 && is_player_active(targetMarioState) && m->numLives != -1) {
+        m->marioObj->activeFlags &= ~ACTIVE_FLAG_MOVE_THROUGH_GRATE;
         m->hurtCounter = 0;
         m->healCounter = 31;
         m->health = 0x100;