3 files changed, 40 insertions, 34 deletions

diff --git a/src/engine/cable_club.c b/src/engine/cable_club.c
index 7a85f2b6c..c61a1d01c 100644
--- a/src/engine/cable_club.c
+++ b/src/engine/cable_club.c
@@ -68,7 +68,7 @@ static void sub_8083B6C(void);
 static void sub_8083CA4(u8 taskId);
 
 extern void sub_80831F8(u8 taskId);
-extern void call_map_music_set_to_zero(void);
+extern void Overworld_ResetMapMusic(void);
 extern void sub_810FEFC(void);
 extern void sub_8047CD8(void);
 extern void sub_805559C(void);
@@ -708,7 +708,7 @@ static void sub_808382C(u8 taskId)
 
 static void sub_8083958(void)
 {
-    call_map_music_set_to_zero();
+    Overworld_ResetMapMusic();
     LoadPlayerParty();
     SavePlayerBag();
     sub_810FEFC();
diff --git a/src/engine/script.c b/src/engine/script.c
index f049b96fc..8625cfdc2 100644
--- a/src/engine/script.c
+++ b/src/engine/script.c
@@ -3,6 +3,14 @@
 #include "event_data.h"
 
 #define RAM_SCRIPT_MAGIC 51
+#define SCRIPT_STACK_SIZE 20
+
+enum
+{
+    SCRIPT_MODE_STOPPED,
+    SCRIPT_MODE_BYTECODE,
+    SCRIPT_MODE_NATIVE,
+};
 
 EWRAM_DATA u8 *gUnknown_0202E8AC = NULL;
 
@@ -19,66 +27,66 @@ void InitScriptContext(struct ScriptContext *ctx, void *cmdTable, void *cmdTable
 {
     s32 i;
 
-    ctx->mode = 0;
-    ctx->scriptPtr = 0;
+    ctx->mode = SCRIPT_MODE_STOPPED;
+    ctx->scriptPtr = NULL;
     ctx->stackDepth = 0;
-    ctx->nativePtr = 0;
+    ctx->nativePtr = NULL;
     ctx->cmdTable = cmdTable;
     ctx->cmdTableEnd = cmdTableEnd;
 
     for (i = 0; i < 4; i++)
         ctx->data[i] = 0;
 
-    for (i = 0; i < 20; i++)
+    for (i = 0; i < SCRIPT_STACK_SIZE; i++)
         ctx->stack[i] = 0;
 }
 
 u8 SetupBytecodeScript(struct ScriptContext *ctx, const u8 *ptr)
 {
     ctx->scriptPtr = ptr;
-    ctx->mode = 1;
+    ctx->mode = SCRIPT_MODE_BYTECODE;
     return 1;
 }
 
 void SetupNativeScript(struct ScriptContext *ctx, bool8 (*ptr)(void))
 {
-    ctx->mode = 2;
+    ctx->mode = SCRIPT_MODE_NATIVE;
     ctx->nativePtr = ptr;
 }
 
 void StopScript(struct ScriptContext *ctx)
 {
-    ctx->mode = 0;
-    ctx->scriptPtr = 0;
+    ctx->mode = SCRIPT_MODE_STOPPED;
+    ctx->scriptPtr = NULL;
 }
 
-u8 RunScriptCommand(struct ScriptContext *ctx)
+bool8 RunScriptCommand(struct ScriptContext *ctx)
 {
-    if (ctx->mode == 0)
-        return 0;
+    if (ctx->mode == SCRIPT_MODE_STOPPED)
+        return FALSE;
 
     switch (ctx->mode)
     {
-    case 0:
-        return 0;
-    case 2:
+    case SCRIPT_MODE_STOPPED:
+        return FALSE;
+    case SCRIPT_MODE_NATIVE:
         if (ctx->nativePtr)
         {
             if (ctx->nativePtr() == TRUE)
-                ctx->mode = 1;
-            return 1;
+                ctx->mode = SCRIPT_MODE_BYTECODE;
+            return TRUE;
         }
-        ctx->mode = 1;
-    case 1:
+        ctx->mode = SCRIPT_MODE_BYTECODE;
+    case SCRIPT_MODE_BYTECODE:
         while (1)
         {
             u8 cmdCode;
-            ScrCmdFunc *func;
+            ScrCmdFunc *cmdFunc;
 
-            if (!ctx->scriptPtr)
+            if (ctx->scriptPtr == NULL)
             {
-                ctx->mode = 0;
-                return 0;
+                ctx->mode = SCRIPT_MODE_STOPPED;
+                return FALSE;
             }
 
             if (ctx->scriptPtr == gNullScriptPtr)
@@ -89,25 +97,25 @@ u8 RunScriptCommand(struct ScriptContext *ctx)
 
             cmdCode = *(ctx->scriptPtr);
             ctx->scriptPtr++;
-            func = &ctx->cmdTable[cmdCode];
+            cmdFunc = &ctx->cmdTable[cmdCode];
 
-            if (func >= ctx->cmdTableEnd)
+            if (cmdFunc >= ctx->cmdTableEnd)
             {
-                ctx->mode = 0;
-                return 0;
+                ctx->mode = SCRIPT_MODE_STOPPED;
+                return FALSE;
             }
 
-            if ((*func)(ctx) == 1)
-                return 1;
+            if ((*cmdFunc)(ctx) == TRUE)
+                return TRUE;
         }
     }
 
-    return 1;
+    return TRUE;
 }
 
 u8 ScriptPush(struct ScriptContext *ctx, const u8 *ptr)
 {
-    if (ctx->stackDepth + 1 >= 20)
+    if (ctx->stackDepth + 1 >= SCRIPT_STACK_SIZE)
     {
         return 1;
     }
diff --git a/src/engine/sound.c b/src/engine/sound.c
index 91f5e06a3..a6a61c0b5 100644
--- a/src/engine/sound.c
+++ b/src/engine/sound.c
@@ -81,8 +81,6 @@ void MapMusicMain(void)
         PlayBGM(sCurrentMapMusic);
         break;
     case 2:
-    case 3:
-    case 4:
         break;
     case 5:
         if (IsBGMStopped())