Add BETTER_BOUNCE

This commit is contained in:
Arceveti
2021-10-05 10:53:36 -07:00
parent 9470c8fee5
commit bf4c068e6f
2 changed files with 10 additions and 0 deletions

View File

@@ -121,6 +121,8 @@
#define POLE_SWING
// If A and Z are pressed on the same frame, Mario will long jump instead of ground pound.
#define EASIER_LONG_JUMPS
// Holding A while bouncing on an enemy will bounce Mario higher
#define BETTER_BOUNCE
// Allows Mario to jump kick on steep surfaces that are set to be non slippery, instead of being forced to dive
#define JUMP_KICK_FIX
// Allow Mario to grab hangable ceilings from any state

View File

@@ -1299,7 +1299,11 @@ u32 interact_hit_from_below(struct MarioState *m, UNUSED u32 interactType, struc
#endif
return drop_and_set_mario_action(m, ACT_TWIRLING, 0);
} else {
#ifdef BETTER_BOUNCE
bounce_off_object(m, obj, (m->input & INPUT_A_DOWN) ? 60.0f : 30.0f);
#else
bounce_off_object(m, obj, 30.0f);
#endif
}
}
} else if (take_damage_and_knock_back(m, obj)) {
@@ -1337,7 +1341,11 @@ u32 interact_bounce_top(struct MarioState *m, UNUSED u32 interactType, struct Ob
#endif
return drop_and_set_mario_action(m, ACT_TWIRLING, 0);
} else {
#ifdef BETTER_BOUNCE
bounce_off_object(m, obj, (m->input & INPUT_A_DOWN) ? 60.0f : 30.0f);
#else
bounce_off_object(m, obj, 30.0f);
#endif
}
}
} else if (take_damage_and_knock_back(m, obj)) {