etc/sm64coopdx
0
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2024-11-25 13:35:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add backwards compatibility to ground pound checks

Browse source
This commit is contained in:
MysterD 2023-05-19 01:37:52 -07:00
parent 9d824c545d
commit 75861d365e
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/game/behaviors/blue_coin.inc.c
View file

@ -136,7 +136,7 @@ void bhv_blue_coin_switch_loop(void) {
// If Mario is on the switch and has ground-pounded, // If Mario is on the switch and has ground-pounded,
// recede and get ready to start ticking. // recede and get ready to start ticking.
if (gMarioObject && gMarioObject->platform == o) { 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 // Set to BLUE_COIN_SWITCH_ACT_RECEDING
o->oAction++; o->oAction++;

2
src/game/behaviors/thi_top.inc.c
View file

@ -32,7 +32,7 @@ void bhv_thi_tiny_island_top_loop(void) {
if (!(gTHIWaterDrained & 1)) { if (!(gTHIWaterDrained & 1)) {
if (o->oAction == 0) { if (o->oAction == 0) {
if (distanceToPlayer < 500.0f) 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++; o->oAction++;
cur_obj_spawn_particles(&D_8032F134); cur_obj_spawn_particles(&D_8032F134);
spawn_triangle_break_particles(20, 138, 0.3f, 3); spawn_triangle_break_particles(20, 138, 0.3f, 3);