From a97e7466bf6d4ebf14d8dbfe824f0bdab7dad253 Mon Sep 17 00:00:00 2001
From: Agent X <44549182+Agent-11@users.noreply.github.com>
Date: Mon, 26 Sep 2022 22:10:39 -0400
Subject: [PATCH] God mode check for lava wall boost (#201)

* God mode check for lava wall boost

Thanks to Skeltan for finding it

* Prevent potential cutscene breaks
---
 src/game/mario.c                  | 1 -
 src/game/mario_actions_airborne.c | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/game/mario.c b/src/game/mario.c
index 057c26226..d714ea9c0 100644
--- a/src/game/mario.c
+++ b/src/game/mario.c
@@ -1543,7 +1543,6 @@ void update_mario_inputs(struct MarioState *m) {
     debug_print_speed_action_normal(m);
 
     if (Cheats.enabled && Cheats.moonJump && m->controller->buttonDown & L_TRIG) {
-        set_mario_action(m, ACT_FREEFALL, 0);
         m->faceAngle[1] = m->intendedYaw - approach_s32((s16)(m->intendedYaw - m->faceAngle[1]), 0, 0x800, 0x800);
         m->vel[1] = 30;
     }
diff --git a/src/game/mario_actions_airborne.c b/src/game/mario_actions_airborne.c
index 98d61a630..bf1bafc6a 100644
--- a/src/game/mario_actions_airborne.c
+++ b/src/game/mario_actions_airborne.c
@@ -53,6 +53,7 @@ void play_knockback_sound(struct MarioState *m) {
 #endif
 
 s32 lava_boost_on_wall(struct MarioState *m) {
+    if (Cheats.enabled && Cheats.godMode) { return; }
     m->faceAngle[1] = atan2s(m->wallNormal[2], m->wallNormal[0]);
 
     if (m->forwardVel < 24.0f) {