merge fixes

Rozelette · Oct 13, 2024 · a6ccf4f · a6ccf4f
1 parent b91e6d0
commit a6ccf4f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git 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
@@ -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 &&