From 169cd9fa44bc658212199b35ab6ec49c1347e20e Mon Sep 17 00:00:00 2001 From: Prince Frizzy Date: Sat, 26 Feb 2022 05:50:45 -0500 Subject: [PATCH] Revise this fix in mario_actions_automatic.c Have Mario drop off the pole if it doesn't exist instead of just returning POLE_NONE. --- src/game/mario_actions_automatic.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/game/mario_actions_automatic.c b/src/game/mario_actions_automatic.c index 6b70202e..abca6f3d 100644 --- a/src/game/mario_actions_automatic.c +++ b/src/game/mario_actions_automatic.c @@ -65,7 +65,14 @@ void play_climbing_sounds(struct MarioState *m, s32 b) { s32 set_pole_position(struct MarioState *m, f32 offsetY) { if (m->usedObj == NULL) { m->usedObj = cur_obj_find_nearest_pole(); } - if (m->usedObj == NULL) { return POLE_NONE; } + + // This is here so if somehow a pole despawns while you are on it. + // You will just drop from it. + if (m->usedObj == NULL) { + // If Mario is no longer interacting with the pole, stop the pole holding action. + set_mario_action(m, ACT_FREEFALL, 0); + return POLE_FELL_OFF; + } UNUSED s32 unused1; UNUSED s32 unused2;