From 9dda63419d4453f2fd8870de8d0011c638b6c5ab Mon Sep 17 00:00:00 2001
From: thecozies <collinpferguson@gmail.com>
Date: Fri, 24 Dec 2021 09:06:47 -0600
Subject: [PATCH] added WATER_PLUNGE_UPWARP define

---
 include/config/config_movement.h | 3 +++
 src/game/mario.c                 | 5 +++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/include/config/config_movement.h b/include/config/config_movement.h
index f40cbce01..08b443b42 100644
--- a/include/config/config_movement.h
+++ b/include/config/config_movement.h
@@ -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. --
 
diff --git a/src/game/mario.c b/src/game/mario.c
index 757c7f0be..a2bd2565e 100644
--- a/src/game/mario.c
+++ b/src/game/mario.c
@@ -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;