From a6ccf4f018248a9fef38ac953924d8b849c6f100 Mon Sep 17 00:00:00 2001 From: rozlette Date: Sun, 13 Oct 2024 02:16:03 -0500 Subject: [PATCH] merge fixes --- soh/src/code/z_demo.c | 4 ++-- soh/src/overlays/actors/ovl_player_actor/z_player.c | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/soh/src/code/z_demo.c b/soh/src/code/z_demo.c index 6fd1d744f6b..ae09be4e728 100644 --- a/soh/src/code/z_demo.c +++ b/soh/src/code/z_demo.c @@ -2230,13 +2230,13 @@ void Cutscene_HandleConditionalTriggers(PlayState* play) { CHECK_QUEST_ITEM(QUEST_MEDALLION_SHADOW) && LINK_IS_ADULT && !Flags_GetEventChkInf(EVENTCHKINF_RETURNED_TO_TEMPLE_OF_TIME_WITH_ALL_MEDALLIONS) && - scene == SCENE_TEMPLE_OF_TIME) + (scene == SCENE_TEMPLE_OF_TIME) ))) { Flags_SetEventChkInf(EVENTCHKINF_RETURNED_TO_TEMPLE_OF_TIME_WITH_ALL_MEDALLIONS); gSaveContext.entranceIndex = ENTR_TEMPLE_OF_TIME_0; gSaveContext.cutsceneIndex = 0xFFF8; } else if (!Flags_GetEventChkInf(EVENTCHKINF_WATCHED_GANONS_CASTLE_COLLAPSE_CAUGHT_BY_GERUDO) && - scene == SCENE_GANON_BOSS)) { + (scene == SCENE_GANON_BOSS)) { Flags_SetEventChkInf(EVENTCHKINF_WATCHED_GANONS_CASTLE_COLLAPSE_CAUGHT_BY_GERUDO); gSaveContext.entranceIndex = ENTR_GANON_BOSS_0; gSaveContext.cutsceneIndex = 0xFFF0; diff --git a/soh/src/overlays/actors/ovl_player_actor/z_player.c b/soh/src/overlays/actors/ovl_player_actor/z_player.c index d212bd1ba5a..12e67e539b7 100644 --- a/soh/src/overlays/actors/ovl_player_actor/z_player.c +++ b/soh/src/overlays/actors/ovl_player_actor/z_player.c @@ -10215,7 +10215,6 @@ void Player_Init(Actor* thisx, PlayState* play2) { } if ((sp50 == 0) || (sp50 < -1)) { - titleFileSize = scene->titleFile.vromEnd - scene->titleFile.vromStart; if (GameInteractor_Should(VB_SHOW_TITLE_CARD, gSaveContext.showTitleCard)) { if ((gSaveContext.sceneSetupIndex < 4) && EntranceDB_RetrieveLayer(gSaveContext.entranceIndex, gSaveContext.sceneSetupIndex)->displayTitleCard &&