From 594c60be3ea028a60c9b3dbd7ff58d4ae5caca8e Mon Sep 17 00:00:00 2001 From: Archez Date: Wed, 15 May 2024 23:22:00 -0400 Subject: [PATCH] Prevent owl statue text on loading pause save (#398) --- mm/src/overlays/actors/ovl_player_actor/z_player.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mm/src/overlays/actors/ovl_player_actor/z_player.c b/mm/src/overlays/actors/ovl_player_actor/z_player.c index 2564dcbe0..94e56d609 100644 --- a/mm/src/overlays/actors/ovl_player_actor/z_player.c +++ b/mm/src/overlays/actors/ovl_player_actor/z_player.c @@ -10968,10 +10968,12 @@ void Player_Init(Actor* thisx, PlayState* play) { initMode = PLAYER_INITMODE_D; } - // When we have a pause save entrance, we need to override the init mode to ensure the loading is handled correctly + // 2S2H [Enhancement] When we have a pause save entrance, we need unset the values to prevent them from lingering + // Load into INITMODE_D for stationary Link spawn if (gSaveContext.save.shipSaveInfo.pauseSaveEntrance != -1) { - initMode = PLAYER_INITMODE_6; + initMode = PLAYER_INITMODE_D; gSaveContext.save.shipSaveInfo.pauseSaveEntrance = -1; + gSaveContext.save.isOwlSave = false; } D_8085D2CC[initMode](play, this);