From 65011c53be388ca7c29958b926c50fee71a3657f Mon Sep 17 00:00:00 2001 From: aMannus Date: Sun, 21 Jan 2024 18:10:03 +0100 Subject: [PATCH] Unlock early GBK door --- soh/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/soh/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c b/soh/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c index 290e809f6..2faf1026a 100644 --- a/soh/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c +++ b/soh/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c @@ -260,7 +260,11 @@ void DoorShutter_Init(Actor* thisx, PlayState* play2) { DoorShutter_SetupAction(this, DoorShutter_SetupType); this->unk_16B = phi_a3; if (this->doorType == SHUTTER_KEY_LOCKED || this->doorType == SHUTTER_BOSS) { - if (!Flags_GetSwitch(play, this->dyna.actor.params & 0x3F)) { + // Unlock early Ganon's Boss Key doors to allow access to the pots there when "Shuffle Pots" is on. + uint8_t unlockForShufflePots = play->sceneNum == SCENE_GANONS_TOWER && + Randomizer_GetSettingValue(RSK_SHUFFLE_POTS) && + this->dyna.actor.world.pos.y == 800; + if (!Flags_GetSwitch(play, this->dyna.actor.params & 0x3F) && !unlockForShufflePots) { this->unk_16E = 10; } Actor_SetFocus(&this->dyna.actor, 60.0f);