diff --git a/asm/non_matchings/unknown_0B8920/func_800B7EB4.s b/asm/non_matchings/waves/func_800B7EB4.s
similarity index 100%
rename from asm/non_matchings/unknown_0B8920/func_800B7EB4.s
rename to asm/non_matchings/waves/func_800B7EB4.s
diff --git a/asm/non_matchings/unknown_0B8920/func_800B8134.s b/asm/non_matchings/waves/func_800B8134.s
similarity index 100%
rename from asm/non_matchings/unknown_0B8920/func_800B8134.s
rename to asm/non_matchings/waves/func_800B8134.s
diff --git a/asm/non_matchings/unknown_0B8920/func_800B82B4.s b/asm/non_matchings/waves/func_800B82B4.s
similarity index 100%
rename from asm/non_matchings/unknown_0B8920/func_800B82B4.s
rename to asm/non_matchings/waves/func_800B82B4.s
diff --git a/asm/non_matchings/unknown_0B8920/func_800B8C04.s b/asm/non_matchings/waves/func_800B8C04.s
similarity index 100%
rename from asm/non_matchings/unknown_0B8920/func_800B8C04.s
rename to asm/non_matchings/waves/func_800B8C04.s
diff --git a/asm/non_matchings/unknown_0B8920/func_800B92F4.s b/asm/non_matchings/waves/func_800B92F4.s
similarity index 100%
rename from asm/non_matchings/unknown_0B8920/func_800B92F4.s
rename to asm/non_matchings/waves/func_800B92F4.s
diff --git a/asm/non_matchings/unknown_0B8920/func_800B97A8.s b/asm/non_matchings/waves/func_800B97A8.s
similarity index 100%
rename from asm/non_matchings/unknown_0B8920/func_800B97A8.s
rename to asm/non_matchings/waves/func_800B97A8.s
diff --git a/asm/non_matchings/unknown_0B8920/func_800B9C18.s b/asm/non_matchings/waves/func_800B9C18.s
similarity index 100%
rename from asm/non_matchings/unknown_0B8920/func_800B9C18.s
rename to asm/non_matchings/waves/func_800B9C18.s
diff --git a/asm/non_matchings/unknown_0B8920/func_800BA288.s b/asm/non_matchings/waves/func_800BA288.s
similarity index 100%
rename from asm/non_matchings/unknown_0B8920/func_800BA288.s
rename to asm/non_matchings/waves/func_800BA288.s
diff --git a/asm/non_matchings/unknown_0B8920/func_800BA4B8.s b/asm/non_matchings/waves/func_800BA4B8.s
similarity index 100%
rename from asm/non_matchings/unknown_0B8920/func_800BA4B8.s
rename to asm/non_matchings/waves/func_800BA4B8.s
diff --git a/asm/non_matchings/unknown_0B8920/func_800BA8E4.s b/asm/non_matchings/waves/func_800BA8E4.s
similarity index 100%
rename from asm/non_matchings/unknown_0B8920/func_800BA8E4.s
rename to asm/non_matchings/waves/func_800BA8E4.s
diff --git a/asm/non_matchings/unknown_0B8920/func_800BB2F4.s b/asm/non_matchings/waves/func_800BB2F4.s
similarity index 100%
rename from asm/non_matchings/unknown_0B8920/func_800BB2F4.s
rename to asm/non_matchings/waves/func_800BB2F4.s
diff --git a/asm/non_matchings/unknown_0B8920/func_800BBE08.s b/asm/non_matchings/waves/func_800BBE08.s
similarity index 100%
rename from asm/non_matchings/unknown_0B8920/func_800BBE08.s
rename to asm/non_matchings/waves/func_800BBE08.s
diff --git a/asm/non_matchings/unknown_0B8920/func_800BBF78.s b/asm/non_matchings/waves/func_800BBF78.s
similarity index 100%
rename from asm/non_matchings/unknown_0B8920/func_800BBF78.s
rename to asm/non_matchings/waves/func_800BBF78.s
diff --git a/asm/non_matchings/unknown_0B8920/func_800BC6C8.s b/asm/non_matchings/waves/func_800BC6C8.s
similarity index 100%
rename from asm/non_matchings/unknown_0B8920/func_800BC6C8.s
rename to asm/non_matchings/waves/func_800BC6C8.s
diff --git a/asm/non_matchings/unknown_0B8920/func_800BCC70.s b/asm/non_matchings/waves/func_800BCC70.s
similarity index 100%
rename from asm/non_matchings/unknown_0B8920/func_800BCC70.s
rename to asm/non_matchings/waves/func_800BCC70.s
diff --git a/asm/non_matchings/unknown_0B8920/func_800BDC80.s b/asm/non_matchings/waves/func_800BDC80.s
similarity index 100%
rename from asm/non_matchings/unknown_0B8920/func_800BDC80.s
rename to asm/non_matchings/waves/func_800BDC80.s
diff --git a/asm/non_matchings/unknown_0B8920/func_800BE654.s b/asm/non_matchings/waves/func_800BE654.s
similarity index 100%
rename from asm/non_matchings/unknown_0B8920/func_800BE654.s
rename to asm/non_matchings/waves/func_800BE654.s
diff --git a/asm/non_matchings/unknown_0B8920/func_800BEEB4.s b/asm/non_matchings/waves/func_800BEEB4.s
similarity index 100%
rename from asm/non_matchings/unknown_0B8920/func_800BEEB4.s
rename to asm/non_matchings/waves/func_800BEEB4.s
diff --git a/asm/non_matchings/unknown_0B8920/func_800BEFC4.s b/asm/non_matchings/waves/func_800BEFC4.s
similarity index 100%
rename from asm/non_matchings/unknown_0B8920/func_800BEFC4.s
rename to asm/non_matchings/waves/func_800BEFC4.s
diff --git a/asm/non_matchings/unknown_0B8920/func_800BF3E4.s b/asm/non_matchings/waves/func_800BF3E4.s
similarity index 100%
rename from asm/non_matchings/unknown_0B8920/func_800BF3E4.s
rename to asm/non_matchings/waves/func_800BF3E4.s
diff --git a/asm/non_matchings/unknown_0B8920/func_800BF524.s b/asm/non_matchings/waves/func_800BF524.s
similarity index 100%
rename from asm/non_matchings/unknown_0B8920/func_800BF524.s
rename to asm/non_matchings/waves/func_800BF524.s
diff --git a/asm/non_matchings/unknown_0B8920/func_800BF634.s b/asm/non_matchings/waves/func_800BF634.s
similarity index 100%
rename from asm/non_matchings/unknown_0B8920/func_800BF634.s
rename to asm/non_matchings/waves/func_800BF634.s
diff --git a/asm/non_matchings/unknown_0B8920/func_800BFE98.s b/asm/non_matchings/waves/func_800BFE98.s
similarity index 100%
rename from asm/non_matchings/unknown_0B8920/func_800BFE98.s
rename to asm/non_matchings/waves/func_800BFE98.s
diff --git a/asm/non_matchings/unknown_0B8920/func_800BFFDC.s b/asm/non_matchings/waves/func_800BFFDC.s
similarity index 100%
rename from asm/non_matchings/unknown_0B8920/func_800BFFDC.s
rename to asm/non_matchings/waves/func_800BFFDC.s
diff --git a/src/stacks.c b/src/stacks.c
index 6ead5787..7dedc8a9 100644
--- a/src/stacks.c
+++ b/src/stacks.c
@@ -4,7 +4,7 @@
 #include "stacks.h"
 
 // This file only contains .bss variables and needs to be located just before 
-// unknown_0B8920.c; that is why this is "located" at 0x800B7D1F.
+// waves.c; that is why this is "located" at 0x800B7D1F.
 
 /************ .bss ************/
 
diff --git a/src/unknown_0B8920.c b/src/waves.c
similarity index 79%
rename from src/unknown_0B8920.c
rename to src/waves.c
index ca7f29fd..b6cffa03 100644
--- a/src/unknown_0B8920.c
+++ b/src/waves.c
@@ -225,9 +225,9 @@ void func_800B7D20(void) {
     D_800E3188 = NULL;
 }
 
-GLOBAL_ASM("asm/non_matchings/unknown_0B8920/func_800B7EB4.s")
-GLOBAL_ASM("asm/non_matchings/unknown_0B8920/func_800B8134.s")
-GLOBAL_ASM("asm/non_matchings/unknown_0B8920/func_800B82B4.s")
+GLOBAL_ASM("asm/non_matchings/waves/func_800B7EB4.s")
+GLOBAL_ASM("asm/non_matchings/waves/func_800B8134.s")
+GLOBAL_ASM("asm/non_matchings/waves/func_800B82B4.s")
 
 void func_800B8B8C(void) {
     s32 temp_v0;
@@ -244,7 +244,7 @@ void func_800B8B8C(void) {
     }
 }
 
-GLOBAL_ASM("asm/non_matchings/unknown_0B8920/func_800B8C04.s")
+GLOBAL_ASM("asm/non_matchings/waves/func_800B8C04.s")
 
 s32 func_800B9228(unk800DC918_04 * arg0){
     s32 v0 = 0;
@@ -259,13 +259,13 @@ s32 func_800B9228(unk800DC918_04 * arg0){
     return result;
 }
 
-GLOBAL_ASM("asm/non_matchings/unknown_0B8920/func_800B92F4.s")
-GLOBAL_ASM("asm/non_matchings/unknown_0B8920/func_800B97A8.s")
-GLOBAL_ASM("asm/non_matchings/unknown_0B8920/func_800B9C18.s")
-GLOBAL_ASM("asm/non_matchings/unknown_0B8920/func_800BA288.s")
-GLOBAL_ASM("asm/non_matchings/unknown_0B8920/func_800BA4B8.s")
-GLOBAL_ASM("asm/non_matchings/unknown_0B8920/func_800BA8E4.s")
-GLOBAL_ASM("asm/non_matchings/unknown_0B8920/func_800BB2F4.s")
+GLOBAL_ASM("asm/non_matchings/waves/func_800B92F4.s")
+GLOBAL_ASM("asm/non_matchings/waves/func_800B97A8.s")
+GLOBAL_ASM("asm/non_matchings/waves/func_800B9C18.s")
+GLOBAL_ASM("asm/non_matchings/waves/func_800BA288.s")
+GLOBAL_ASM("asm/non_matchings/waves/func_800BA4B8.s")
+GLOBAL_ASM("asm/non_matchings/waves/func_800BA8E4.s")
+GLOBAL_ASM("asm/non_matchings/waves/func_800BB2F4.s")
 
 void func_800BBE08(void);
 void func_800BBF78(s32 arg0);
@@ -275,16 +275,16 @@ void func_800BBDDC(s32 arg0) {
     func_800BBF78(arg0);
 }
 
-GLOBAL_ASM("asm/non_matchings/unknown_0B8920/func_800BBE08.s")
-GLOBAL_ASM("asm/non_matchings/unknown_0B8920/func_800BBF78.s")
-GLOBAL_ASM("asm/non_matchings/unknown_0B8920/func_800BC6C8.s")
-GLOBAL_ASM("asm/non_matchings/unknown_0B8920/func_800BCC70.s")
-GLOBAL_ASM("asm/non_matchings/unknown_0B8920/func_800BDC80.s")
-GLOBAL_ASM("asm/non_matchings/unknown_0B8920/func_800BE654.s")
-GLOBAL_ASM("asm/non_matchings/unknown_0B8920/func_800BEEB4.s")
-GLOBAL_ASM("asm/non_matchings/unknown_0B8920/func_800BEFC4.s")
-GLOBAL_ASM("asm/non_matchings/unknown_0B8920/func_800BF3E4.s")
-GLOBAL_ASM("asm/non_matchings/unknown_0B8920/func_800BF524.s")
-GLOBAL_ASM("asm/non_matchings/unknown_0B8920/func_800BF634.s")
-GLOBAL_ASM("asm/non_matchings/unknown_0B8920/func_800BFE98.s")
-GLOBAL_ASM("asm/non_matchings/unknown_0B8920/func_800BFFDC.s")
+GLOBAL_ASM("asm/non_matchings/waves/func_800BBE08.s")
+GLOBAL_ASM("asm/non_matchings/waves/func_800BBF78.s")
+GLOBAL_ASM("asm/non_matchings/waves/func_800BC6C8.s")
+GLOBAL_ASM("asm/non_matchings/waves/func_800BCC70.s")
+GLOBAL_ASM("asm/non_matchings/waves/func_800BDC80.s")
+GLOBAL_ASM("asm/non_matchings/waves/func_800BE654.s")
+GLOBAL_ASM("asm/non_matchings/waves/func_800BEEB4.s")
+GLOBAL_ASM("asm/non_matchings/waves/func_800BEFC4.s")
+GLOBAL_ASM("asm/non_matchings/waves/func_800BF3E4.s")
+GLOBAL_ASM("asm/non_matchings/waves/func_800BF524.s")
+GLOBAL_ASM("asm/non_matchings/waves/func_800BF634.s")
+GLOBAL_ASM("asm/non_matchings/waves/func_800BFE98.s")
+GLOBAL_ASM("asm/non_matchings/waves/func_800BFFDC.s")