mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-06-24 01:31:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

Match Z2SceneMgr::sceneBgmStart (#2923)

Browse Source
This commit is contained in:
LagoLunatic
2025-12-07 00:09:16 -05:00
committed by GitHub
parent fc31053cb6
commit cd94afafa0
4 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/JSystem/JAudio2/JAISeq.cpp
+2 -3
View File
@@ -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;
src/Z2AudioLib/Z2SceneMgr.cpp
-2
View File
@@ -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;