Merge pull request #145 from Henny022p/m4a

Sound

1 files changed, 12 insertions, 11 deletions

diff --git a/src/script.c b/src/script.c
index 0710080c..105f7af2 100644
--- a/src/script.c
+++ b/src/script.c
@@ -9,6 +9,7 @@
 #include "utils.h"
 #include "save.h"
 #include "random.h"
+#include "audio.h"
 #include "functions.h"
 
 void InitScriptForEntity(Entity*, ScriptExecutionContext*, u16*);
@@ -137,10 +138,10 @@ void ScriptCommand_0807EEF4(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommand_0807EF3C(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommand_DoPostScriptAction(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommand_DoPostScriptAction2(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_PlaySound(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_PlayBgm(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommand_SoundReq(Entity* entity, ScriptExecutionContext* context);
-void ScriptCommand_SoundReq2(Entity* entity, ScriptExecutionContext* context);
-void ScriptCommand_SoundReq3(Entity* entity, ScriptExecutionContext* context);
-void ScriptCommand_SoundReq0x80100000(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_StopBgm(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommand_ModRupees(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommand_ModHealth(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommand_IncreaseMaxHealth(Entity* entity, ScriptExecutionContext* context);
@@ -283,10 +284,10 @@ const ScriptCommand gScriptCommands[] = { ScriptCommandNop,
                                           ScriptCommand_0807EF3C,
                                           ScriptCommand_DoPostScriptAction,
                                           ScriptCommand_DoPostScriptAction2,
+                                          ScriptCommand_PlaySound,
+                                          ScriptCommand_PlayBgm,
                                           ScriptCommand_SoundReq,
-                                          ScriptCommand_SoundReq2,
-                                          ScriptCommand_SoundReq3,
-                                          ScriptCommand_SoundReq0x80100000,
+                                          ScriptCommand_StopBgm,
                                           ScriptCommand_ModRupees,
                                           ScriptCommand_ModHealth,
                                           ScriptCommand_IncreaseMaxHealth,
@@ -1450,11 +1451,11 @@ void ScriptCommand_DoPostScriptAction2(Entity* entity, ScriptExecutionContext* c
     context->postScriptActions |= 1 << context->scriptInstructionPointer[1];
 }
 
-void ScriptCommand_SoundReq(Entity* entity, ScriptExecutionContext* context) {
+void ScriptCommand_PlaySound(Entity* entity, ScriptExecutionContext* context) {
     SoundReq(context->scriptInstructionPointer[1]);
 }
 
-void ScriptCommand_SoundReq2(Entity* entity, ScriptExecutionContext* context) {
+void ScriptCommand_PlayBgm(Entity* entity, ScriptExecutionContext* context) {
     if (context->scriptInstructionPointer[1] >= 100) {
         SoundReq(gArea.musicIndex);
     } else {
@@ -1462,12 +1463,12 @@ void ScriptCommand_SoundReq2(Entity* entity, ScriptExecutionContext* context) {
     }
 }
 
-void ScriptCommand_SoundReq3(Entity* entity, ScriptExecutionContext* context) {
+void ScriptCommand_SoundReq(Entity* entity, ScriptExecutionContext* context) {
     SoundReq(GetNextScriptCommandWordAfterCommandMetadata(context->scriptInstructionPointer));
 }
 
-void ScriptCommand_SoundReq0x80100000(Entity* entity, ScriptExecutionContext* context) {
-    SoundReq(SONG_RESET_UNK);
+void ScriptCommand_StopBgm(Entity* entity, ScriptExecutionContext* context) {
+    SoundReq(SONG_STOP_BGM);
 }
 
 void ScriptCommand_ModRupees(Entity* entity, ScriptExecutionContext* context) {