diff --git a/build/lnk_template.sub b/build/lnk_template.sub
index 0348b74..1a054a5 100644
--- a/build/lnk_template.sub
+++ b/build/lnk_template.sub
@@ -102,6 +102,7 @@ input build\output\03bd80_sectionD.obj
 input build\output\0fcd20_sectionB.obj
 
 input build\output\scif.obj
+input build\output\serial_debug.obj
 
 ; USER LIBS
 library @DC_SDK@\shinobi\lib\cri_adxs.lib
diff --git a/scripts/build.sh b/scripts/build.sh
index 95cd1c1..cd701d6 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -24,7 +24,7 @@ rm -rf build/output
 mkdir build/output
 
 compile  src/010080_main.c
-assemble src/asm/0100bc_sound.src
+compile  src/0100bc_sound.c
 compile  src/010e90.c
 assemble src/asm/010fe8_unused.src
 compile  src/011120_asset_queues.c
@@ -100,6 +100,7 @@ assemble src/asm/03bd80_sectionD.src
 assemble src/asm/0fcd20_sectionB.src
 
 compile  src/scif.c
+compile  src/serial_debug.c
 
 wine $SHC_BIN/lnk.exe -sub=build\\lnk.sub
 
diff --git a/scripts/build_matching.sh b/scripts/build_matching.sh
index e0d0e56..f37b20a 100755
--- a/scripts/build_matching.sh
+++ b/scripts/build_matching.sh
@@ -23,7 +23,7 @@ mkdir build/output
 
 assemble src/asm/010000.src
 compile  src/010080_main.c
-assemble src/asm/0100bc_sound.src
+assemble src/asm/decompiled/0100bc_sound.src
 compile  src/010e90.c
 assemble src/asm/010fe8_unused.src
 assemble src/asm/decompiled/011120_asset_queues.src
diff --git a/scripts/run_tests.docker.sh b/scripts/run_tests.docker.sh
index 0c62c2e..fb202b6 100755
--- a/scripts/run_tests.docker.sh
+++ b/scripts/run_tests.docker.sh
@@ -28,14 +28,32 @@ rm -rf build/output
 mkdir build/output
 
 # 0100bc_sound
-assemble  src/asm/0100bc_sound.src
-compile  src/non_matching/_000188_8c0100bc_sound.c
+assemble  src/asm/decompiled/0100bc_sound.src
+compile  src/0100bc_sound.c
 
 $sh4objtest "tests/0100bc_sound/0100bc_initUknVol.php" "build/output/0100bc_sound_src.obj"
-$sh4objtest "tests/0100bc_sound/0100bc_initUknVol.php" "build/output/_000188_8c0100bc_sound_c.obj"
+$sh4objtest "tests/0100bc_sound/0100bc_initUknVol.php" "build/output/0100bc_sound_c.obj"
 
 $sh4objtest "tests/0100bc_sound/010128_midiSetVol.php" "build/output/0100bc_sound_src.obj"
-$sh4objtest "tests/0100bc_sound/010128_midiSetVol.php" "build/output/_000188_8c0100bc_sound_c.obj"
+$sh4objtest "tests/0100bc_sound/010128_midiSetVol.php" "build/output/0100bc_sound_c.obj"
+
+$sh4objtest "tests/0100bc_sound/0102d8_FUN.php" "build/output/0100bc_sound_src.obj"
+$sh4objtest "tests/0100bc_sound/0102d8_FUN.php" "build/output/0100bc_sound_c.obj"
+
+$sh4objtest "tests/0100bc_sound/010972_setAdxVol.php" "build/output/0100bc_sound_src.obj"
+$sh4objtest "tests/0100bc_sound/010972_setAdxVol.php" "build/output/0100bc_sound_c.obj"
+
+$sh4objtest "tests/0100bc_sound/010a40_FUN_adxVol.php" "build/output/0100bc_sound_src.obj"
+$sh4objtest "tests/0100bc_sound/010a40_FUN_adxVol.php" "build/output/0100bc_sound_c.obj"
+
+$sh4objtest "tests/0100bc_sound/010bae_FUN.php" "build/output/0100bc_sound_src.obj"
+$sh4objtest "tests/0100bc_sound/010bae_FUN.php" "build/output/0100bc_sound_c.obj"
+
+$sh4objtest "tests/0100bc_sound/010c2c_FUN.php" "build/output/0100bc_sound_src.obj"
+$sh4objtest "tests/0100bc_sound/010c2c_FUN.php" "build/output/0100bc_sound_c.obj"
+
+$sh4objtest "tests/0100bc_sound/010cd6_snd.php" "build/output/0100bc_sound_src.obj"
+$sh4objtest "tests/0100bc_sound/010cd6_snd.php" "build/output/0100bc_sound_c.obj"
 
 # 015ab8_title
 assemble  src/asm/decompiled/015ab8_title.src
diff --git a/scripts/run_tests.sh b/scripts/run_tests.sh
index e75ea99..edefdad 100755
--- a/scripts/run_tests.sh
+++ b/scripts/run_tests.sh
@@ -28,32 +28,32 @@ rm -rf build/output
 mkdir build/output
 
 # 0100bc_sound
-assemble  src/asm/0100bc_sound.src
-compile  src/non_matching/_000188_8c0100bc_sound.c
+assemble  src/asm/decompiled/0100bc_sound.src
+compile  src/0100bc_sound.c
 
 $sh4objtest "tests/0100bc_sound/0100bc_initUknVol.php" "build/output/0100bc_sound_src.obj"
-$sh4objtest "tests/0100bc_sound/0100bc_initUknVol.php" "build/output/_000188_8c0100bc_sound_c.obj"
+$sh4objtest "tests/0100bc_sound/0100bc_initUknVol.php" "build/output/0100bc_sound_c.obj"
 
 $sh4objtest "tests/0100bc_sound/010128_midiSetVol.php" "build/output/0100bc_sound_src.obj"
-$sh4objtest "tests/0100bc_sound/010128_midiSetVol.php" "build/output/_000188_8c0100bc_sound_c.obj"
+$sh4objtest "tests/0100bc_sound/010128_midiSetVol.php" "build/output/0100bc_sound_c.obj"
 
 $sh4objtest "tests/0100bc_sound/0102d8_FUN.php" "build/output/0100bc_sound_src.obj"
-$sh4objtest "tests/0100bc_sound/0102d8_FUN.php" "build/output/_000188_8c0100bc_sound_c.obj"
+$sh4objtest "tests/0100bc_sound/0102d8_FUN.php" "build/output/0100bc_sound_c.obj"
 
 $sh4objtest "tests/0100bc_sound/010972_setAdxVol.php" "build/output/0100bc_sound_src.obj"
-$sh4objtest "tests/0100bc_sound/010972_setAdxVol.php" "build/output/_000188_8c0100bc_sound_c.obj"
+$sh4objtest "tests/0100bc_sound/010972_setAdxVol.php" "build/output/0100bc_sound_c.obj"
 
 $sh4objtest "tests/0100bc_sound/010a40_FUN_adxVol.php" "build/output/0100bc_sound_src.obj"
-$sh4objtest "tests/0100bc_sound/010a40_FUN_adxVol.php" "build/output/_000188_8c0100bc_sound_c.obj"
+$sh4objtest "tests/0100bc_sound/010a40_FUN_adxVol.php" "build/output/0100bc_sound_c.obj"
 
 $sh4objtest "tests/0100bc_sound/010bae_FUN.php" "build/output/0100bc_sound_src.obj"
-$sh4objtest "tests/0100bc_sound/010bae_FUN.php" "build/output/_000188_8c0100bc_sound_c.obj"
+$sh4objtest "tests/0100bc_sound/010bae_FUN.php" "build/output/0100bc_sound_c.obj"
 
 $sh4objtest "tests/0100bc_sound/010c2c_FUN.php" "build/output/0100bc_sound_src.obj"
-$sh4objtest "tests/0100bc_sound/010c2c_FUN.php" "build/output/_000188_8c0100bc_sound_c.obj"
+$sh4objtest "tests/0100bc_sound/010c2c_FUN.php" "build/output/0100bc_sound_c.obj"
 
 $sh4objtest "tests/0100bc_sound/010cd6_snd.php" "build/output/0100bc_sound_src.obj"
-$sh4objtest "tests/0100bc_sound/010cd6_snd.php" "build/output/_000188_8c0100bc_sound_c.obj"
+$sh4objtest "tests/0100bc_sound/010cd6_snd.php" "build/output/0100bc_sound_c.obj"
 
 # 015ab8_title
 assemble  src/asm/decompiled/015ab8_title.src
diff --git a/src/non_matching/_000188_8c0100bc_sound.c b/src/0100bc_sound.c
similarity index 100%
rename from src/non_matching/_000188_8c0100bc_sound.c
rename to src/0100bc_sound.c
diff --git a/src/011120_asset_queues.c b/src/011120_asset_queues.c
index f3c782e..aba84f2 100644
--- a/src/011120_asset_queues.c
+++ b/src/011120_asset_queues.c
@@ -2,7 +2,7 @@
 
 #include <shinobi.h>
 #include <string.h>
-#include "definitions.h"
+#include "serial_debug.h"
 #include "014a9c_tasks.h"
 #include "stdio.h"
 
diff --git a/src/012f44.c b/src/012f44.c
index 0832093..9806f85 100644
--- a/src/012f44.c
+++ b/src/012f44.c
@@ -2,7 +2,7 @@
 #include <shinobi.h>
 #include <njdef.h>
 #include "includes.h"
-#include "definitions.h"
+#include "serial_debug.h"
 #include "014a9c_tasks.h"
 #include "015ab8_title.h"
 #include "scif.h"
diff --git a/src/015ab8_title.c b/src/015ab8_title.c
index cc54804..c5c6c56 100644
--- a/src/015ab8_title.c
+++ b/src/015ab8_title.c
@@ -6,7 +6,7 @@
 #include <sg_sd.h>
 #include "014a9c_tasks.h"
 #include "015ab8_title.h"
-#include "definitions.h"
+#include "serial_debug.h"
 
 extern Bool getUknPvmBool_8c01432a();
 extern void freeQueues_8c011f7e();
diff --git a/src/asm/0100bc_sound.src b/src/asm/decompiled/0100bc_sound.src
similarity index 100%
rename from src/asm/0100bc_sound.src
rename to src/asm/decompiled/0100bc_sound.src
diff --git a/src/serial_debug.c b/src/serial_debug.c
new file mode 100644
index 0000000..2adadca
--- /dev/null
+++ b/src/serial_debug.c
@@ -0,0 +1,14 @@
+#include <stdarg.h>
+#include "scif.h"
+
+#if defined(SERIAL_DEBUG)
+void serialprintf(const char *fmt, ...) {
+    char buf[256];
+
+    va_list args;
+    va_start(args, fmt);
+    vsprintf(buf, fmt, args);
+    scif_puts(buf);
+    va_end(args);
+}
+#endif
diff --git a/src/definitions.h b/src/serial_debug.h
similarity index 84%
rename from src/definitions.h
rename to src/serial_debug.h
index e0be4f0..ac6510d 100644
--- a/src/definitions.h
+++ b/src/serial_debug.h
@@ -1,6 +1,3 @@
-#include <stdarg.h>
-#include "scif.h"
-
 #ifndef _DEFINITIONS_H_
 #define _DEFINITIONS_H_
 
@@ -25,16 +22,8 @@
 #define DEBUG_LEVEL LOG_LEVEL_TRACE
 #endif
 
-#ifdef SERIAL_DEBUG
-void serialprintf(const char *fmt, ...) {
-    char buf[256];
-
-    va_list args;
-    va_start(args, fmt);
-    vsprintf(buf, fmt, args);
-    scif_puts(buf);
-    va_end(args);
-}
+#if defined(SERIAL_DEBUG)
+void serialprintf(const char *fmt, ...);
 #endif
 
 #if defined(SERIAL_DEBUG) && DEBUG_LEVEL >= LOG_LEVEL_FATAL