Added 46 degree wallkicks toggle

This commit is contained in:
Reonu
2021-06-29 19:35:07 +01:00
parent 4bab6123a7
commit 287b6d2d02
3 changed files with 9 additions and 1 deletions

View File

@@ -8,6 +8,7 @@ This is a fork of the ultrasm64 repo by CrashOveride which includes the followin
- exposed ceilings fix
- No false ledgegrabs fix *
- Jump kick fix *
- 46 degree wallkicks *
- Instant Input patch by Wiseguy (Removes all input lag caused by good emulators and plugins)
- pole fix
- Mario head skip *

View File

@@ -70,6 +70,8 @@
#define NO_FALSE_LEDGEGRABS
// 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
// 46 degree walkicks
//#define WALLKICKS_46_DEGREES
// Disables fall damage
#define NO_FALL_DAMAGE
// Disables the scream that mario makes when falling off a great height (this is separate from actual fall damage)

View File

@@ -9,6 +9,8 @@
#include "interaction.h"
#include "mario_step.h"
#include "config.h"
static s16 sMovingSandSpeeds[] = { 12, 8, 4, 0 };
struct Surface gWaterSurfacePseudoFloor = {
@@ -490,8 +492,11 @@ s32 perform_air_quarter_step(struct MarioState *m, Vec3f intendedPos, u32 stepAr
if (m->wall->type == SURFACE_BURNING) {
return AIR_STEP_HIT_LAVA_WALL;
}
#ifdef WALLKICKS_46_DEGREES
if (wallDYaw < -0x5F00 || wallDYaw > 0x5700) {
#else
if (wallDYaw < -0x6000 || wallDYaw > 0x6000) {
#endif
m->flags |= MARIO_UNKNOWN_30;
return AIR_STEP_HIT_WALL;
}