3 files changed, 12 insertions, 13 deletions
diff --git a/src/Z2AudioLib/Z2SeMgr.cpp b/src/Z2AudioLib/Z2SeMgr.cpp
index 920ee7c900..4c3a4c7655 100644
--- a/src/Z2AudioLib/Z2SeMgr.cpp
+++ b/src/Z2AudioLib/Z2SeMgr.cpp
@@ -119,7 +119,7 @@ void Z2SeMgr::modHeightAtCamera(Vec const** param_0) {
             }
         }
         field_0x340[idx] = **param_0;
-        Vec cam_pos = Z2GetAudience()->getAudioCamPos();
+        Vec cam_pos = Z2GetAudience()->getAudioCamPos(0);
         if (field_0x340[idx].y > cam_pos.y) {
             field_0x340[idx].y = cam_pos.y;
         }
@@ -266,19 +266,19 @@ bool Z2SeMgr::seStart(JAISoundID i_soundID, Vec const* i_pos, u32 param_2, s8 i_
         break;
     case Z2SE_SY_TALK_START:
     case Z2SE_SY_TALK_END:
-        if (Z2GetSceneMgr()->getCurrentSceneNum() != 0) {
+        if (Z2GetStatusMgr()->getDemoStatus() != 0) {
             return false;
         }
         break;
     case Z2SE_SY_TALK_NEXT:
-        if (Z2GetSceneMgr()->isMovieDemo()) {
+        if (Z2GetStatusMgr()->isMovieDemo()) {
             i_soundID = Z2SE_SY_DEMO_MESSAGE_NEXT;
         }
         break;
     case Z2SE_SY_TALK_WIN_CLOSE:
-        if (Z2GetSceneMgr()->getCurrentSceneNum() == 1) {
+        if (Z2GetStatusMgr()->getDemoStatus() == 1) {
             i_soundID = Z2SE_SY_TALK_END;
-        } else if (Z2GetSceneMgr()->isMovieDemo()) {
+        } else if (Z2GetStatusMgr()->isMovieDemo()) {
             i_soundID = Z2SE_SY_DEMO_MESSAGE_END;
         }
         break;
@@ -287,11 +287,13 @@ bool Z2SeMgr::seStart(JAISoundID i_soundID, Vec const* i_pos, u32 param_2, s8 i_
             return false;
         }
         break;
-    case Z2SE_OBJ_CHANDELIER_SWING:
-        if (i_pos->y > Z2GetAudience()->getAudioCamPos().y) {
+    case Z2SE_OBJ_CHANDELIER_SWING: {
+        Vec tmp = Z2GetAudience()->getAudioCamPos(0);
+        if (i_pos->y > tmp.y) {
             return false;
         }
         break;
+    }
     case Z2SE_OBJ_CHANDLV5_SWING:
         i_volume = Z2Calc::getParamByExp(param_2, 35.0f, 261.0f, 0.4f, 0.05f, 1.0f,
                                          Z2Calc::CURVE_SIGN_2);
@@ -313,7 +315,8 @@ bool Z2SeMgr::seStart(JAISoundID i_soundID, Vec const* i_pos, u32 param_2, s8 i_
                                          Z2Calc::CURVE_SIGN_2);
         break;
     case Z2SE_OBJ_L8_B_FOG_FLY:
-        if (i_pos->y > Z2GetAudience()->getAudioCamPos().y) {
+        Vec tmp = Z2GetAudience()->getAudioCamPos(0);
+        if (i_pos->y > tmp.y) {
             return false;
         }
         break;
diff --git a/src/Z2AudioLib/Z2SoundMgr.cpp b/src/Z2AudioLib/Z2SoundMgr.cpp
index 5d1f8952df..f0de70d5a5 100644
--- a/src/Z2AudioLib/Z2SoundMgr.cpp
+++ b/src/Z2AudioLib/Z2SoundMgr.cpp
@@ -1,5 +1,4 @@
 //
-// Generated By: dol2asm
 // Translation Unit: Z2SoundMgr
 //
 
@@ -169,7 +168,6 @@ bool Z2SoundMgr::startSound(JAISoundID i_soundID, JAISoundHandle* i_handle,
 
 
 /* 802AA1B0-802AA270 2A4AF0 00C0+00 2/2 0/0 0/0 .text            calc__10Z2SoundMgrFv */
-// NONMATCHING extra load
 void Z2SoundMgr::calc() {
     mSeMgr.calc();
     if (!mSoundID.isAnonymous() && !isPlayingSoundID(mSoundID)) {
@@ -358,7 +356,6 @@ void Z2SoundMgr::initParams() {
 
 /* 802AA9E8-802AAAC4 2A5328 00DC+00 0/0 1/1 0/0 .text
  * multiVolumeSoundID__10Z2SoundMgrF10JAISoundIDf               */
-// NONMATCHING extra load
 void Z2SoundMgr::multiVolumeSoundID(JAISoundID i_soundID, f32 i_multi) {
     if (!i_soundID.isAnonymous() && Z2GetSoundInfo()->getSoundType(i_soundID) == 0) {
         JSUList<JAISe>* list =
@@ -373,7 +370,6 @@ void Z2SoundMgr::multiVolumeSoundID(JAISoundID i_soundID, f32 i_multi) {
 
 /* 802AAAC4-802AAB94 2A5404 00D0+00 1/1 0/0 0/0 .text isPlayingSoundID__10Z2SoundMgrF10JAISoundID
  */
-// NONMATCHING extra load
 bool Z2SoundMgr::isPlayingSoundID(JAISoundID i_soundID) {
     if (i_soundID.isAnonymous()) {
         return false;
diff --git a/src/Z2AudioLib/Z2WolfHowlMgr.cpp b/src/Z2AudioLib/Z2WolfHowlMgr.cpp
index f8030a3c77..5e51235357 100644
--- a/src/Z2AudioLib/Z2WolfHowlMgr.cpp
+++ b/src/Z2AudioLib/Z2WolfHowlMgr.cpp
@@ -463,7 +463,7 @@ void Z2WolfHowlMgr::startWindStoneSound(s8 param_0, Vec* param_1) {
     if (param_1 == NULL || Z2GetLink() == NULL || Z2GetLink()->getCurrentPos() == NULL) {
         return; 
     }
-    Vec local_60 = Z2GetAudience()->getAudioCamPos();
+    Vec local_60 = Z2GetAudience()->getAudioCamPos(0);
     f32 dVar13 = sqrtf(VECSquareDistance(param_1, &local_60));
     if (dVar13 > 2100.0f && field_0x04) {
         field_0x04->stop();