From f0ad3dd7d05fd512baa79a68332327bd55bb4b7f Mon Sep 17 00:00:00 2001
From: MysterD <myster@d>
Date: Fri, 28 Jan 2022 00:03:39 -0800
Subject: [PATCH] Prevent 'exit course' from doing the wrong warp sometimes

---
 src/game/level_update.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/game/level_update.c b/src/game/level_update.c
index 9a10e5a1..977224bb 100644
--- a/src/game/level_update.c
+++ b/src/game/level_update.c
@@ -827,10 +827,7 @@ s16 level_trigger_warp(struct MarioState *m, s32 warpOp) {
                 break;
 
             case WARP_OP_EXIT:
-                sSourceWarpNodeId = WARP_NODE_WARP_FLOOR;
-                if (area_get_warp_node(sSourceWarpNodeId) == NULL) {
-                    sSourceWarpNodeId = WARP_NODE_DEATH;
-                }
+                sSourceWarpNodeId = WARP_NODE_DEATH;
                 sDelayedWarpTimer = 20;
                 play_transition(WARP_TRANSITION_FADE_INTO_CIRCLE, 0x14, 0x00, 0x00, 0x00);
                 break;