diff --git a/soh/soh/Enhancements/timesaver_hook_handlers.cpp b/soh/soh/Enhancements/timesaver_hook_handlers.cpp index 573037156..27a19422d 100644 --- a/soh/soh/Enhancements/timesaver_hook_handlers.cpp +++ b/soh/soh/Enhancements/timesaver_hook_handlers.cpp @@ -725,12 +725,6 @@ 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 bee702671..9098adf38 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,10 +510,8 @@ void func_80A53F30(EnHeishi2* this, PlayState* play) { } gate = (BgGateShutter*)this->gate; if ((this->unk_2F2[0] == 0) || (gate->openingState == 0)) { - if (GameInteractor_Should(VB_PLAY_KAKARIKO_GATE_CS, true, this)) { - Play_ClearCamera(play, this->cameraId); - Play_ChangeCameraStatus(play, MAIN_CAM, CAM_STAT_ACTIVE); - } + 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;