From a72dbe779da1c695d3ab7ef13d246202b3158027 Mon Sep 17 00:00:00 2001 From: MelonSpeedruns Date: Sat, 11 Apr 2026 10:22:58 -0400 Subject: [PATCH 1/2] Don't allow quick transform while in the STAR tent --- src/d/actor/d_a_alink_dusk.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/d/actor/d_a_alink_dusk.cpp b/src/d/actor/d_a_alink_dusk.cpp index 95218268ac..342efe9610 100644 --- a/src/d/actor/d_a_alink_dusk.cpp +++ b/src/d/actor/d_a_alink_dusk.cpp @@ -32,6 +32,12 @@ void daAlink_c::handleQuickTransform() { mDoCPd_c::getCpadInfo(PAD_1).mPressedButtonFlags = 0; + // Don't allow quick transform while in the STAR tent. + if (checkStageName("R_SP161")) { + Z2GetAudioMgr()->seStart(Z2SE_SYS_ERROR, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); + return; + } + // Ensure that the Z Button is not dimmed if (meterDrawPtr->getButtonZAlpha() != 1.f) { Z2GetAudioMgr()->seStart(Z2SE_SYS_ERROR, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); From 8522d33935a1af76b984c35fe3a5183da234067d Mon Sep 17 00:00:00 2001 From: MelonSpeedruns Date: Sat, 11 Apr 2026 11:38:36 -0400 Subject: [PATCH 2/2] Moved check for event running & Added sfx if trying to quick transform while in a cutscene --- src/d/actor/d_a_alink_dusk.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/d/actor/d_a_alink_dusk.cpp b/src/d/actor/d_a_alink_dusk.cpp index 342efe9610..ae4cb2e96c 100644 --- a/src/d/actor/d_a_alink_dusk.cpp +++ b/src/d/actor/d_a_alink_dusk.cpp @@ -9,11 +9,6 @@ void daAlink_c::handleQuickTransform() { return; } - // Ensure that link is not in a cutscene. - if (checkEventRun()) { - return; - } - // Check to see if Link has the ability to transform. if (!dComIfGs_isEventBit(dSv_event_flag_c::M_077)) { return; @@ -30,6 +25,12 @@ void daAlink_c::handleQuickTransform() { return; } + // Ensure that link is not in a cutscene. + if (checkEventRun()) { + Z2GetAudioMgr()->seStart(Z2SE_SYS_ERROR, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); + return; + } + mDoCPd_c::getCpadInfo(PAD_1).mPressedButtonFlags = 0; // Don't allow quick transform while in the STAR tent.