From c50794773c2a4af8cb3a0c8e2bb82ae0fb89f7b7 Mon Sep 17 00:00:00 2001 From: MysterD Date: Wed, 14 Oct 2020 23:20:43 -0700 Subject: [PATCH] Allow bubbled players to go through elevators --- src/game/behaviors/elevator.inc.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/game/behaviors/elevator.inc.c b/src/game/behaviors/elevator.inc.c index b7a38d6e..1410ec06 100644 --- a/src/game/behaviors/elevator.inc.c +++ b/src/game/behaviors/elevator.inc.c @@ -155,4 +155,11 @@ struct SpawnParticlesInfo D_8032F3FC = { 0, 5, MODEL_WHITE_PARTICLE_DL, 0, void bhv_elevator_loop(void) { cur_obj_call_action_function(sElevatorActions); + + // allow bubbled players to pass through + if (gMarioStates[0].action == ACT_BUBBLED) { + cur_obj_become_intangible(); + } else { + cur_obj_become_tangible(); + } }