From d96feaf4a4940767e87f965cb5f1190b72b92d23 Mon Sep 17 00:00:00 2001 From: Sarge-117 Date: Tue, 6 Sep 2022 14:00:09 -0700 Subject: [PATCH] Tidy up chain platform cutscene check --- .../actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/soh/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c b/soh/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c index edaaed341..07deab277 100644 --- a/soh/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c +++ b/soh/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c @@ -99,16 +99,14 @@ void BgJyaLift_DelayMove(BgJyaLift* this, GlobalContext* globalCtx) { // The cutscene of the platform lowering will show the central room in an unloaded state if // Link is not standing on the platform as it lowers. Therefore check for the Sunlight arrows // enhancement and if it's enabled, check that Link is on the platform. Otherwise skip it. - if (gSaveContext.n64ddFlag && (CVar_GetS32("gSunlightArrows", 0) || Randomizer_GetSettingValue(RSK_SUNLIGHT_ARROWS))) { - if (GET_PLAYER(globalCtx)->actor.world.pos.x > -19.0f && GET_PLAYER(globalCtx)->actor.world.pos.x < 139.0f && - GET_PLAYER(globalCtx)->actor.world.pos.z > -1172.0f && GET_PLAYER(globalCtx)->actor.world.pos.z < -1009.0f) { - OnePointCutscene_Init(globalCtx, 3430, -99, &this->dyna.actor, MAIN_CAM); - } - BgJyaLift_SetupMove(this); - } else { + if (!(CVar_GetS32("gSunlightArrows", 0) || Randomizer_GetSettingValue(RSK_SUNLIGHT_ARROWS)) || + (GET_PLAYER(globalCtx)->actor.world.pos.x > -19.0f && + GET_PLAYER(globalCtx)->actor.world.pos.x < 139.0f && + GET_PLAYER(globalCtx)->actor.world.pos.z > -1172.0f && + GET_PLAYER(globalCtx)->actor.world.pos.z < -1009.0f)) { OnePointCutscene_Init(globalCtx, 3430, -99, &this->dyna.actor, MAIN_CAM); - BgJyaLift_SetupMove(this); } + BgJyaLift_SetupMove(this); } } }