diff options
| author | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2025-11-25 11:32:34 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-11-25 18:32:34 +0200 |
| commit | 2f2f37a7345d889aa1072b10e3a5022ad1bd15f1 (patch) | |
| tree | 5844529921578f759ec79e96769f8d809bc0c350 /src/Z2AudioLib/Z2SceneMgr.cpp | |
| parent | cd3d634133040864768d9cc7364b02ce1f22e99b (diff) | |
Misc fixes (#2860)
* Misc matches
* Remove more old dol2asm stuff
* Remove dCcS::SetMass-related fakematches
No longer necessary with the PCH for some reason.
* Use attention types enum in more places
* Remove more dol2asm stuff
* Clean up matDL_dis.py
Diffstat (limited to 'src/Z2AudioLib/Z2SceneMgr.cpp')
| -rw-r--r-- | src/Z2AudioLib/Z2SceneMgr.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/Z2AudioLib/Z2SceneMgr.cpp b/src/Z2AudioLib/Z2SceneMgr.cpp index b1402c1fa9..4b07ca8cce 100644 --- a/src/Z2AudioLib/Z2SceneMgr.cpp +++ b/src/Z2AudioLib/Z2SceneMgr.cpp @@ -187,7 +187,6 @@ void Z2SceneMgr::setFadeInStart(u8 param_0) { } /* 802B6AF8-802B995C 2B1438 2E64+00 8/0 1/1 0/0 .text setSceneName__10Z2SceneMgrFPcll */ -// NONMATCHING JSULink<JAIStream>::getNext() inlining void Z2SceneMgr::setSceneName(char* spotName, s32 room, s32 layer) { JAISoundID bgm_id = -1; JAISound* sound; @@ -1982,9 +1981,12 @@ void Z2SceneMgr::load2ndDynamicWave() { } /* 802BA294-802BA56C 2B4BD4 02D8+00 1/0 2/2 0/0 .text sceneBgmStart__10Z2SceneMgrFv */ -// NONMATCHING regalloc +// NONMATCHING - extra BGM_ID load void Z2SceneMgr::sceneBgmStart() { + OS_REPORT("[Z2SceneMgr::sceneBgmStart] %08x", BGM_ID.mId.mFullId); + inGame = true; + BOOL r28 = FALSE; setSceneExist(true); Z2GetStatusMgr()->setPauseFlag(0); @@ -1992,7 +1994,7 @@ void Z2SceneMgr::sceneBgmStart() { return; } - if (!BGM_ID.isAnonymous() && Z2GetStatusMgr()->getDemoStatus() != 11) { + if (!BGM_ID.isAnonymous() && !r28 && Z2GetStatusMgr()->getDemoStatus() != 11) { bool var; switch (BGM_ID.mId.mBytes.b0) { case 1: @@ -2144,5 +2146,3 @@ bool Z2SceneMgr::loadBgmWave(u32 wave) { } return false; } - -/* 8039BFA8-8039BFA8 028608 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ |