From bc5fc67da230b395d926ed8261d30e434ac1479a Mon Sep 17 00:00:00 2001
From: t0mtee <33041004+t0mtee@users.noreply.github.com>
Date: Sun, 28 Jun 2026 11:14:44 +0100
Subject: [PATCH] Fix audio bug, re-enable condition

---
 src/Z2AudioLib/Z2SceneMgr.cpp | 4 ++--
 src/d/d_s_play.cpp            | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Z2AudioLib/Z2SceneMgr.cpp b/src/Z2AudioLib/Z2SceneMgr.cpp
index 1b2152fcb7..76b8cb96ac 100644
--- a/src/Z2AudioLib/Z2SceneMgr.cpp
+++ b/src/Z2AudioLib/Z2SceneMgr.cpp
@@ -75,7 +75,7 @@ void Z2SceneMgr::setFadeOutStart(u8 fadeType) {
     Z2GetSeqMgr()->bgmAllMute(33,  3.0f / 10.0f);
     Z2GetSeMgr()->seMoveVolumeAll(0.0f, 33);
     Z2GetSeqMgr()->setBattleBgmOff(true);
-    load1stWait = 40;
+    load1stWait = 1;
     timer = -1;
 }
 
@@ -1777,7 +1777,7 @@ void Z2SceneMgr::_load1stWaveInner_1() {
     if (field_0x1a && Z2GetSeqMgr()->checkBgmPlaying()) {
         OS_REPORT("[Z2SceneMgr::load1stDynamicWave]bgm StopCount = %d\n", 15);
         Z2GetSeqMgr()->bgmStop(15, 0);
-        load1stWait = -15;
+        load1stWait = -1;
     } else {
         _load1stWaveInner_2();
     }
diff --git a/src/d/d_s_play.cpp b/src/d/d_s_play.cpp
index d3a438a5cc..e54fa80b86 100644
--- a/src/d/d_s_play.cpp
+++ b/src/d/d_s_play.cpp
@@ -1418,8 +1418,8 @@ static int phase_2(dScnPly_c* i_this) {
 
 static int phase_3(dScnPly_c* i_this) {
     DuskLog.debug("777777777777777777777777777777\n");
-    if ((i_this->sceneCommand != NULL && !i_this->sceneCommand->sync()))
-    // || mDoAud_check1stDynamicWave())  // <------ THIS FUNC IS THE ISSUE OR AT LEAST PART OF IT
+    if ((i_this->sceneCommand != NULL && !i_this->sceneCommand->sync()) ||
+        mDoAud_check1stDynamicWave())
     {
         DuskLog.debug("waiting1......\n");
         return cPhs_INIT_e;