From 75861d365e6ac3cb375c1825185d90fb9d5ccded Mon Sep 17 00:00:00 2001 From: MysterD Date: Fri, 19 May 2023 01:37:52 -0700 Subject: [PATCH] Add backwards compatibility to ground pound checks --- src/game/behaviors/blue_coin.inc.c | 2 +- src/game/behaviors/thi_top.inc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/game/behaviors/blue_coin.inc.c b/src/game/behaviors/blue_coin.inc.c index d826f6385..72cd35d29 100644 --- a/src/game/behaviors/blue_coin.inc.c +++ b/src/game/behaviors/blue_coin.inc.c @@ -136,7 +136,7 @@ void bhv_blue_coin_switch_loop(void) { // If Mario is on the switch and has ground-pounded, // recede and get ready to start ticking. if (gMarioObject && gMarioObject->platform == o) { - if (determine_interaction(&gMarioStates[0], o) & INT_GROUND_POUND) { + if ((determine_interaction(&gMarioStates[0], o) & INT_GROUND_POUND) || (gMarioStates[0].action == ACT_GROUND_POUND_LAND)) { // Set to BLUE_COIN_SWITCH_ACT_RECEDING o->oAction++; diff --git a/src/game/behaviors/thi_top.inc.c b/src/game/behaviors/thi_top.inc.c index d9280e1e7..57dc17e17 100644 --- a/src/game/behaviors/thi_top.inc.c +++ b/src/game/behaviors/thi_top.inc.c @@ -32,7 +32,7 @@ void bhv_thi_tiny_island_top_loop(void) { if (!(gTHIWaterDrained & 1)) { if (o->oAction == 0) { if (distanceToPlayer < 500.0f) - if (marioState && !(marioState->action & ACT_FLAG_AIR) && (determine_interaction(marioState, o) & INT_GROUND_POUND) != 0) { + if (marioState && !(marioState->action & ACT_FLAG_AIR) && ((determine_interaction(marioState, o) & INT_GROUND_POUND) || (marioState->action == ACT_GROUND_POUND_LAND))) { o->oAction++; cur_obj_spawn_particles(&D_8032F134); spawn_triangle_break_particles(20, 138, 0.3f, 3);