From 6ce809a9722d5173738d4641ba9ab566e8ac4816 Mon Sep 17 00:00:00 2001 From: JordanLongstaff Date: Thu, 3 Apr 2025 23:06:28 -0400 Subject: [PATCH] Revert "Simplify a bit" This reverts commit ffa68c130fede6962bb4488b85c9ec61ccc60170. --- soh/soh/Enhancements/timesaver_hook_handlers.cpp | 6 ++++++ soh/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c | 6 ++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/soh/soh/Enhancements/timesaver_hook_handlers.cpp b/soh/soh/Enhancements/timesaver_hook_handlers.cpp index 27a19422d..573037156 100644 --- a/soh/soh/Enhancements/timesaver_hook_handlers.cpp +++ b/soh/soh/Enhancements/timesaver_hook_handlers.cpp @@ -725,6 +725,12 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_li if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipMiscInteractions"), IS_RANDO)) { EnHeishi2* enHeishi2 = va_arg(args, EnHeishi2*); enHeishi2->unk_2F2[0] = 0; + + if (enHeishi2->cameraId != MAIN_CAM) { + Play_ClearCamera(gPlayState, enHeishi2->cameraId); + Play_ChangeCameraStatus(gPlayState, MAIN_CAM, CAM_STAT_ACTIVE); + } + *should = false; } break; diff --git a/soh/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c b/soh/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c index 9098adf38..bee702671 100644 --- a/soh/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c +++ b/soh/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c @@ -510,8 +510,10 @@ void func_80A53F30(EnHeishi2* this, PlayState* play) { } gate = (BgGateShutter*)this->gate; if ((this->unk_2F2[0] == 0) || (gate->openingState == 0)) { - Play_ClearCamera(play, this->cameraId); - Play_ChangeCameraStatus(play, MAIN_CAM, CAM_STAT_ACTIVE); + if (GameInteractor_Should(VB_PLAY_KAKARIKO_GATE_CS, true, this)) { + Play_ClearCamera(play, this->cameraId); + Play_ChangeCameraStatus(play, MAIN_CAM, CAM_STAT_ACTIVE); + } if ((this->unk_30A != 2)) { if (this->unk_30A == 0) { this->actor.textId = 0x2015;