Merge pull request #145 from Henny022p/m4a

Sound

4 files changed, 7 insertions, 5 deletions

diff --git a/src/manager/manager15.c b/src/manager/manager15.c
index 295f14c7..25cc4f87 100644
--- a/src/manager/manager15.c
+++ b/src/manager/manager15.c
@@ -81,7 +81,7 @@ void sub_0805A370(Manager15* this) {
     if (this->manager.unk_0d) {
         LoadRoomEntityList((EntityData*)&gUnk_080E4C08);
         this->manager.action = 3;
-        SoundReq(SONG_RESET_UNK);
+        SoundReq(SONG_STOP_BGM);
     }
 }
 
diff --git a/src/manager/manager3.c b/src/manager/manager3.c
index acd83825..5be578f2 100644
--- a/src/manager/manager3.c
+++ b/src/manager/manager3.c
@@ -5,7 +5,7 @@
 #include "room.h"
 #include "player.h"
 #include "random.h"
-#include "functions.h"
+#include "audio.h"
 
 // Facilitates the usage of minish portals.
 
@@ -58,7 +58,7 @@ void sub_080576C0(Manager3* this) {
                              this->manager.unk_0e);
                 if (!this->manager.unk_0f) {
                     this->manager.unk_0f = 1;
-                    SoundReq(0x152);
+                    SoundReq(SFX_152);
                 }
             }
         }
diff --git a/src/manager/managerB.c b/src/manager/managerB.c
index ca298178..470ef89d 100644
--- a/src/manager/managerB.c
+++ b/src/manager/managerB.c
@@ -5,6 +5,7 @@
 #include "room.h"
 #include "area.h"
 #include "utils.h"
+#include "audio.h"
 #include "functions.h"
 
 /*
@@ -18,7 +19,7 @@
 void (*const ManagerB_ActionFuncs[])(Manager*);
 
 void sub_080585F0(Manager* this) {
-    // make a distincion if this is a controller (unk_0a = 0) or a helper (unk_0a = 1)
+    // make a distincion if this is a controller (volumeMasterTarget = 0) or a helper (volumeMasterTarget = 1)
     ManagerB_ActionFuncs[this->unk_0a](this);
 }
 
@@ -140,7 +141,7 @@ void ManagerBHelper_Monitor(ManagerBHelper* this, Entity* ent, u32 index) {
     this->manager.unk_0e++;
 }
 
-// case unk_0a is 1: The manager is a helper
+// case volumeMasterTarget is 1: The manager is a helper
 
 void ManagerBHelper_Main(Manager* this) {
     u8 i, anyRemaining;
diff --git a/src/manager/managerE.c b/src/manager/managerE.c
index 44bfb5a7..200a52d5 100644
--- a/src/manager/managerE.c
+++ b/src/manager/managerE.c
@@ -3,6 +3,7 @@
 #include "manager.h"
 #include "flags.h"
 #include "room.h"
+#include "audio.h"
 #include "functions.h"
 
 void sub_08058E60(ManagerE* this) {