From 6386f1f9c215c107ed22f908706ed533e8896af0 Mon Sep 17 00:00:00 2001 From: MysterD Date: Tue, 16 May 2023 00:37:30 -0700 Subject: [PATCH] Add backwards compatibility for cur_obj_is_mario_ground_pounding_platform() --- src/engine/level_script.c | 5 +++++ src/game/object_helpers.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/engine/level_script.c b/src/engine/level_script.c index 3ac827f2..9a4ce790 100644 --- a/src/engine/level_script.c +++ b/src/engine/level_script.c @@ -373,6 +373,11 @@ static void level_reset_globals(void) { gEnvFxBuffer = NULL; gEnvFxMode = ENVFX_MODE_NONE; + // clear area's level pool pointers + for (int i = 0; i < 8; i++) { + gAreas[i].unk04 = NULL; + } + // free models stored in dynos dynos_model_clear_pool(MODEL_POOL_LEVEL); } diff --git a/src/game/object_helpers.c b/src/game/object_helpers.c index f6e9682b..d67a58da 100644 --- a/src/game/object_helpers.c +++ b/src/game/object_helpers.c @@ -2627,7 +2627,7 @@ s32 cur_obj_is_mario_ground_pounding_platform(void) { if (!is_player_active(&gMarioStates[i])) { continue; } if (!gMarioStates[i].marioObj) { continue; } if (gMarioStates[i].marioObj->platform == o) { - if (determine_interaction(&gMarioStates[i], o) & INT_GROUND_POUND) { + if ((determine_interaction(&gMarioStates[i], o) & INT_GROUND_POUND) || (gMarioStates[i].action == ACT_GROUND_POUND_LAND)) { return TRUE; } }