Match Z2SceneMgr::sceneBgmStart (#2923)

4 files changed, 6 insertions, 9 deletions

diff --git a/configure.py b/configure.py
index 9c75cb1079..11712533c1 100755
--- a/configure.py
+++ b/configure.py
@@ -1103,10 +1103,10 @@ config.libs = [
             Object(MatchingFor(ALL_GCN), "Z2AudioLib/Z2SeMgr.cpp"),
             Object(MatchingFor(ALL_GCN), "Z2AudioLib/Z2SeqMgr.cpp"),
             Object(MatchingFor(ALL_GCN), "Z2AudioLib/Z2StatusMgr.cpp"),
-            Object(NonMatching, "Z2AudioLib/Z2SceneMgr.cpp"),
+            Object(Equivalent, "Z2AudioLib/Z2SceneMgr.cpp"), # weak func order
             Object(MatchingFor(ALL_GCN), "Z2AudioLib/Z2FxLineMgr.cpp"),
             Object(MatchingFor(ALL_GCN), "Z2AudioLib/Z2SoundInfo.cpp"),
-            Object(Equivalent, "Z2AudioLib/Z2Audience.cpp"),
+            Object(Equivalent, "Z2AudioLib/Z2Audience.cpp"), # weak func order
             Object(MatchingFor(ALL_GCN), "Z2AudioLib/Z2SoundObject.cpp"),
             Object(MatchingFor(ALL_GCN), "Z2AudioLib/Z2SoundObjMgr.cpp"),
             Object(MatchingFor(ALL_GCN), "Z2AudioLib/Z2Creature.cpp"),
diff --git a/include/JSystem/JAudio2/JAISound.h b/include/JSystem/JAudio2/JAISound.h
index 171215323f..2a7fc1c0f9 100644
--- a/include/JSystem/JAudio2/JAISound.h
+++ b/include/JSystem/JAudio2/JAISound.h
@@ -20,8 +20,8 @@ public:
 
     JAISoundID() {}
 
-    bool isAnonymous() const { return id_.composite_ == 0xFFFFFFFF; }
-    void setAnonymous() { id_.composite_ = 0xFFFFFFFF; }
+    bool isAnonymous() const { return id_.composite_ == -1; }
+    void setAnonymous() { id_.composite_ = -1; }
 
     union {
         u32 composite_;
diff --git a/src/JSystem/JAudio2/JAISeq.cpp b/src/JSystem/JAudio2/JAISeq.cpp
index bcde6d8734..cd42f1d70a 100644
--- a/src/JSystem/JAudio2/JAISeq.cpp
+++ b/src/JSystem/JAudio2/JAISeq.cpp
@@ -97,15 +97,14 @@ void JAISeq::releaseChildTracks_() {
 }
 
 bool JAISeq::prepare_getSeqData_() {
-    JAISoundID id(soundID_);  // fakematch, should be using getID but it messes up stack
-    if (id.isAnonymous()) {
+    if (getID().isAnonymous()) {
         return true;
     }
 
     JAISeqDataMgr* seqDataMgr = inner_.seqMgr->getSeqDataMgr();
     JUT_ASSERT(162, seqDataMgr);
 
-    switch (seqDataMgr->getSeqData(id, &inner_.mSeqData)) {
+    switch (seqDataMgr->getSeqData(getID(), &inner_.mSeqData)) {
     case 0:
         OS_REPORT("Failed In Loading Sequence Data:SEQ(0x%08x)\n", getID());
         status_.state.unk = 2;
diff --git a/src/Z2AudioLib/Z2SceneMgr.cpp b/src/Z2AudioLib/Z2SceneMgr.cpp
index 91189b4fa3..6c1a917716 100644
--- a/src/Z2AudioLib/Z2SceneMgr.cpp
+++ b/src/Z2AudioLib/Z2SceneMgr.cpp
@@ -182,7 +182,6 @@ void Z2SceneMgr::setFadeInStart(u8 fadeType) {
     inGame = true;
 }
 
-// NONMATCHING JSULink<JAIStream>::getNext() inlining
 void Z2SceneMgr::setSceneName(char* spot, s32 room, s32 layer) {
     OS_REPORT("[Z2SceneMgr::setSceneName] spot = %s, room = %d, layer = %d\n", spot, room, layer);
     JAISoundID bgm_id = -1;
@@ -1927,7 +1926,6 @@ void Z2SceneMgr::load2ndDynamicWave() {
     }
 }
 
-// NONMATCHING - extra BGM_ID load
 void Z2SceneMgr::sceneBgmStart() {
     OS_REPORT("[Z2SceneMgr::sceneBgmStart] %08x\n", *(u32*)&BGM_ID);
     inGame = true;