encounter/tp
0
0
Fork 0
mirror of https://github.com/encounter/tp.git synced 2026-07-11 06:18:46 -07:00
Code Issues Packages Projects Releases Wiki Activity

Match Z2SceneMgr::sceneBgmStart (#2923)

Browse Source
This commit is contained in:
LagoLunatic
2025-12-06 21:09:16 -08: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
configure.py
+2 -2
View File
@@ -1103,10 +1103,10 @@ config.libs = [
Object(MatchingFor(ALL_GCN), "Z2AudioLib/Z2SeMgr.cpp"), Object(MatchingFor(ALL_GCN), "Z2AudioLib/Z2SeMgr.cpp"),
Object(MatchingFor(ALL_GCN), "Z2AudioLib/Z2SeqMgr.cpp"), Object(MatchingFor(ALL_GCN), "Z2AudioLib/Z2SeqMgr.cpp"),
Object(MatchingFor(ALL_GCN), "Z2AudioLib/Z2StatusMgr.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/Z2FxLineMgr.cpp"),
Object(MatchingFor(ALL_GCN), "Z2AudioLib/Z2SoundInfo.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/Z2SoundObject.cpp"),
Object(MatchingFor(ALL_GCN), "Z2AudioLib/Z2SoundObjMgr.cpp"), Object(MatchingFor(ALL_GCN), "Z2AudioLib/Z2SoundObjMgr.cpp"),
Object(MatchingFor(ALL_GCN), "Z2AudioLib/Z2Creature.cpp"), Object(MatchingFor(ALL_GCN), "Z2AudioLib/Z2Creature.cpp"),
include/JSystem/JAudio2/JAISound.h
+2 -2
View File
@@ -20,8 +20,8 @@ public:
JAISoundID() {} JAISoundID() {}
bool isAnonymous() const { return id_.composite_ == 0xFFFFFFFF; } bool isAnonymous() const { return id_.composite_ == -1; }
void setAnonymous() { id_.composite_ = 0xFFFFFFFF; } void setAnonymous() { id_.composite_ = -1; }
union { union {
u32 composite_; u32 composite_;
src/JSystem/JAudio2/JAISeq.cpp
+2 -3
View File
@@ -97,15 +97,14 @@ void JAISeq::releaseChildTracks_() {
} }
bool JAISeq::prepare_getSeqData_() { bool JAISeq::prepare_getSeqData_() {
JAISoundID id(soundID_); // fakematch, should be using getID but it messes up stack if (getID().isAnonymous()) {
if (id.isAnonymous()) {
return true; return true;
} }
JAISeqDataMgr* seqDataMgr = inner_.seqMgr->getSeqDataMgr(); JAISeqDataMgr* seqDataMgr = inner_.seqMgr->getSeqDataMgr();
JUT_ASSERT(162, seqDataMgr); JUT_ASSERT(162, seqDataMgr);
switch (seqDataMgr->getSeqData(id, &inner_.mSeqData)) { switch (seqDataMgr->getSeqData(getID(), &inner_.mSeqData)) {
case 0: case 0:
OS_REPORT("Failed In Loading Sequence Data:SEQ(0x%08x)\n", getID()); OS_REPORT("Failed In Loading Sequence Data:SEQ(0x%08x)\n", getID());
status_.state.unk = 2; status_.state.unk = 2;
src/Z2AudioLib/Z2SceneMgr.cpp
-2
View File
@@ -182,7 +182,6 @@ void Z2SceneMgr::setFadeInStart(u8 fadeType) {
inGame = true; inGame = true;
} }
// NONMATCHING JSULink<JAIStream>::getNext() inlining
void Z2SceneMgr::setSceneName(char* spot, s32 room, s32 layer) { void Z2SceneMgr::setSceneName(char* spot, s32 room, s32 layer) {
OS_REPORT("[Z2SceneMgr::setSceneName] spot = %s, room = %d, layer = %d\n", spot, room, layer); OS_REPORT("[Z2SceneMgr::setSceneName] spot = %s, room = %d, layer = %d\n", spot, room, layer);
JAISoundID bgm_id = -1; JAISoundID bgm_id = -1;
@@ -1927,7 +1926,6 @@ void Z2SceneMgr::load2ndDynamicWave() {
} }
} }
// NONMATCHING - extra BGM_ID load
void Z2SceneMgr::sceneBgmStart() { void Z2SceneMgr::sceneBgmStart() {
OS_REPORT("[Z2SceneMgr::sceneBgmStart] %08x\n", *(u32*)&BGM_ID); OS_REPORT("[Z2SceneMgr::sceneBgmStart] %08x\n", *(u32*)&BGM_ID);
inGame = true; inGame = true;