hackern64/HackerSM64
0
0
Fork 0
mirror of https://github.com/HackerN64/HackerSM64.git synced 2026-01-21 10:35:32 -08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #238 from Reonu/develop/refactor__water-upwarp-define

Browse Source 
Added WATER_PLUNGE_UPWARP define
This commit is contained in:
Reonu
2021-12-24 18:11:52 +00:00
committed by GitHub
parent d1e9c84326 9dda63419d
commit eb0f4792b7
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/config/config_movement.h
View File

@@ -78,6 +78,9 @@
// Disable BLJs and crush SimpleFlips's dreams
//#define DISABLE_BLJ
// Re-enable upwarping when entering water. Forces you to only enter water from the top
// #define WATER_PLUNGE_UPWARP
// -- Compatibility safeguards. Don't mess with these unless you know what you're doing. --

5
src/game/mario.c
View File

@@ -1131,8 +1131,9 @@ s32 set_water_plunge_action(struct MarioState *m) {
m->forwardVel = m->forwardVel / 4.0f;
m->vel[1] = m->vel[1] / 2.0f;
// !BUG: Causes waterbox upwarp
// m->pos[1] = m->waterLevel - 100;
#ifdef WATER_PLUNGE_UPWARP
m->pos[1] = m->waterLevel - 100;
#endif
m->faceAngle[2] = 0;