diff --git a/src/game/level_update.c b/src/game/level_update.c index 8e62b50c9..14857b3d0 100644 --- a/src/game/level_update.c +++ b/src/game/level_update.c @@ -400,6 +400,8 @@ void set_mario_initial_action(struct MarioState *m, u32 spawnType, u32 actionArg void init_mario_after_warp(void) { struct ObjectWarpNode *spawnNode = area_get_warp_node(sWarpDest.nodeId); + if (spawnNode == NULL) { spawnNode = gCurrentArea->warpNodes; } + if (spawnNode == NULL) { return; } u32 marioSpawnType = get_mario_spawn_type(spawnNode->object); if (gMarioState->action != ACT_UNINITIALIZED) {