diff --git a/ld/gamefiles.inc b/ld/gamefiles.inc
index 54bcedc3b..99c8e7718 100644
--- a/ld/gamefiles.inc
+++ b/ld/gamefiles.inc
@@ -3,20 +3,21 @@
 	build/ROMID/game/game_000000.o (section); \
 	build/ROMID/game/game_000090.o (section); \
 	build/ROMID/game/game_000130.o (section); \
-	build/ROMID/game/game_000840.o (section); \
-	build/ROMID/game/game_000850.o (section); \
-	build/ROMID/game/game_000860.o (section); \
-	build/ROMID/game/game_000870.o (section); \
+	build/ROMID/game/stubs/game_000840.o (section); \
+	build/ROMID/game/stubs/game_000850.o (section); \
+	build/ROMID/game/stubs/game_000860.o (section); \
+	build/ROMID/game/stubs/game_000870.o (section); \
 	build/ROMID/game/game_000880.o (section); \
-	build/ROMID/game/game_0008e0.o (section); \
-	build/ROMID/game/game_0008f0.o (section); \
-	build/ROMID/game/game_000900.o (section); \
-	build/ROMID/game/game_000910.o (section); \
+	build/ROMID/game/stubs/game_0008e0.o (section); \
+	build/ROMID/game/stubs/game_0008f0.o (section); \
+	build/ROMID/game/stubs/game_000900.o (section); \
+	build/ROMID/game/stubs/game_000910.o (section); \
 	build/ROMID/game/dlights.o (section); \
 	build/ROMID/game/game_005fd0.o (section); \
 	build/ROMID/game/game_006bd0.o (section); \
+	build/ROMID/game/stubs/game_00b180.o (section); \
 	build/ROMID/game/game_00b190.o (section); \
-	build/ROMID/game/game_00b200.o (section); \
+	build/ROMID/game/stubs/game_00b200.o (section); \
 	build/ROMID/game/game_00b210.o (section); \
 	build/ROMID/game/game_00b320.o (section); \
 	build/ROMID/game/game_00b480.o (section); \
@@ -34,7 +35,7 @@
 	build/ROMID/game/smoke/init.o (section); \
 	build/ROMID/game/sparks/init.o (section); \
 	build/ROMID/game/weather/init.o (section); \
-	build/ROMID/game/game_013540.o (section); \
+	build/ROMID/game/stubs/game_013540.o (section); \
 	build/ROMID/game/game_013550.o (section); \
 	build/ROMID/game/game_013cf0.o (section); \
 	build/ROMID/game/game_013ee0.o (section); \
@@ -44,13 +45,13 @@
 	build/ROMID/game/game_015010.o (section); \
 	build/ROMID/game/game_0150a0.o (section); \
 	build/ROMID/game/game_0151f0.o (section); \
-	build/ROMID/game/game_015260.o (section); \
-	build/ROMID/game/game_015270.o (section); \
+	build/ROMID/game/stubs/game_015260.o (section); \
+	build/ROMID/game/stubs/game_015270.o (section); \
 	build/ROMID/game/explosions/free.o (section); \
 	build/ROMID/game/smoke/free.o (section); \
-	build/ROMID/game/game_0153f0.o (section); \
-	build/ROMID/game/game_015400.o (section); \
-	build/ROMID/game/game_015410.o (section); \
+	build/ROMID/game/stubs/game_0153f0.o (section); \
+	build/ROMID/game/stubs/game_015400.o (section); \
+	build/ROMID/game/stubs/game_015410.o (section); \
 	build/ROMID/game/game_015420.o (section); \
 	build/ROMID/game/game_015470.o (section); \
 	build/ROMID/game/title.o (section); \
@@ -113,7 +114,7 @@
 	build/ROMID/game/menu/items.o (section); \
 	build/ROMID/game/game_0f09f0.o (section); \
 	build/ROMID/game/activemenu/activemenu.o (section); \
-	build/ROMID/game/game_102230.o (section); \
+	build/ROMID/game/stubs/game_102230.o (section); \
 	build/ROMID/game/game_102240.o (section); \
 	build/ROMID/game/cheats.o (section); \
 	build/ROMID/game/game_107fb0.o (section); \
@@ -127,7 +128,7 @@
 	build/ROMID/game/pad.o (section); \
 	build/ROMID/game/pak/pak.o (section); \
 	build/ROMID/game/debug.o (section); \
-	build/ROMID/game/game_11eff0.o (section); \
+	build/ROMID/game/stubs/game_11eff0.o (section); \
 	build/ROMID/game/data/ailists.o (section); \
 	build/ROMID/game/data/data_020df0.o (section); \
 	build/ROMID/game/game_11f000.o (section); \
@@ -165,9 +166,9 @@
 	build/ROMID/game/lang.o (section); \
 	build/ROMID/game/game_16e810.o (section); \
 	build/ROMID/game/game_173a00.o (section); \
-	build/ROMID/game/game_175f50.o (section); \
+	build/ROMID/game/stubs/game_175f50.o (section); \
 	build/ROMID/game/game_175f90.o (section); \
-	build/ROMID/game/game_176000.o (section); \
+	build/ROMID/game/stubs/game_176000.o (section); \
 	build/ROMID/game/game_176080.o (section); \
 	build/ROMID/game/utils.o (section); \
 	build/ROMID/game/mplayer/ingame.o (section); \
diff --git a/src/game/camdraw.c b/src/game/camdraw.c
index e95146432..4f18eebae 100644
--- a/src/game/camdraw.c
+++ b/src/game/camdraw.c
@@ -10,7 +10,7 @@
 #include "game/data/data_02da90.h"
 #include "game/game_0b3350.h"
 #include "game/game_0f09f0.h"
-#include "game/game_102230.h"
+#include "game/stubs/game_102230.h"
 #include "game/game_157db0.h"
 #include "game/lang.h"
 #include "game/pak/pak.h"
@@ -3037,7 +3037,7 @@ glabel var7f1b7320
 /*  f14c194:	35380080 */ 	ori	$t8,$t1,0x80
 /*  f14c198:	a05803f4 */ 	sb	$t8,0x3f4($v0)
 /*  f14c19c:	8faa0030 */ 	lw	$t2,0x30($sp)
-/*  f14c1a0:	0fc4088c */ 	jal	func0f102230
+/*  f14c1a0:	0fc4088c */ 	jal	stub0f102230
 /*  f14c1a4:	ac2a1448 */ 	sw	$t2,%lo(g_MpPlayerNum)($at)
 /*  f14c1a8:	3c018007 */ 	lui	$at,%hi(g_MpPlayerNum)
 /*  f14c1ac:	ac201448 */ 	sw	$zero,%lo(g_MpPlayerNum)($at)
diff --git a/src/game/core.c b/src/game/core.c
index 3cdb9de4f..1183f6776 100644
--- a/src/game/core.c
+++ b/src/game/core.c
@@ -32,7 +32,7 @@
 #include "game/smoke/init.h"
 #include "game/sparks/init.h"
 #include "game/weather/init.h"
-#include "game/game_013540.h"
+#include "game/stubs/game_013540.h"
 #include "game/game_013550.h"
 #include "game/game_013cf0.h"
 #include "game/game_0147a0.h"
@@ -41,13 +41,13 @@
 #include "game/game_015010.h"
 #include "game/game_0150a0.h"
 #include "game/game_0151f0.h"
-#include "game/game_015260.h"
-#include "game/game_015270.h"
+#include "game/stubs/game_015260.h"
+#include "game/stubs/game_015270.h"
 #include "game/explosions/free.h"
 #include "game/smoke/free.h"
-#include "game/game_0153f0.h"
-#include "game/game_015400.h"
-#include "game/game_015410.h"
+#include "game/stubs/game_0153f0.h"
+#include "game/stubs/game_015400.h"
+#include "game/stubs/game_015410.h"
 #include "game/game_015420.h"
 #include "game/game_015470.h"
 #include "game/title.h"
@@ -388,7 +388,7 @@ void coreLoadStage(s32 stagenum)
 	func0f0099a4();
 	func0f0147d0();
 	func0f0147f8();
-	func0f013540();
+	stub0f013540();
 	func0f0139f0();
 	frUnloadData();
 
@@ -2255,21 +2255,21 @@ void coreUnloadStage(void)
 	if (g_Vars.stagenum < NUM_STAGES) {
 		s32 bank = langGetLangBankIndexFromStagenum(g_Vars.stagenum);
 		langClearBank(bank);
-		func0f015270();
+		stub0f015270();
 	}
 
 	func0f014f10();
 	explosionsFree();
 	smokeFree();
-	func0f015400();
-	func0f015410();
+	stub0f015400();
+	stub0f015410();
 	func0f015420();
-	func0f0153f0();
+	stub0f0153f0();
 	func0f014fe0();
 	func0f015010();
 	weatherFree();
 	func0f0151f0();
-	func0f015260();
+	stub0f015260();
 	func0f015470();
 	func0f0150a0();
 	func0f16d9fc();
diff --git a/src/game/game_006bd0.c b/src/game/game_006bd0.c
index c1267e645..b8fd0a28c 100644
--- a/src/game/game_006bd0.c
+++ b/src/game/game_006bd0.c
@@ -4549,11 +4549,3 @@ const u32 var7f1a7eac[] = {0x00000090};
 //
 //	return gdl;
 //}
-
-GLOBAL_ASM(
-glabel func0f00b180
-/*  f00b180:	03e00008 */ 	jr	$ra
-/*  f00b184:	00000000 */ 	nop
-/*  f00b188:	00000000 */ 	nop
-/*  f00b18c:	00000000 */ 	nop
-);
diff --git a/src/game/game_166e40.c b/src/game/game_166e40.c
index e44bb59f2..37626928b 100644
--- a/src/game/game_166e40.c
+++ b/src/game/game_166e40.c
@@ -8,7 +8,7 @@
 #include "game/data/data_020df0.h"
 #include "game/data/data_02da90.h"
 #include "game/game_166e40.h"
-#include "game/game_175f50.h"
+#include "game/stubs/game_175f50.h"
 #include "gvars/gvars.h"
 #include "lib/lib_074f0.h"
 #include "lib/lib_0d0a0.h"
@@ -189,7 +189,7 @@ glabel func0f167054
 /*  f167094:	02012824 */ 	and	$a1,$s0,$at
 /*  f167098:	00a08025 */ 	or	$s0,$a1,$zero
 /*  f16709c:	00402025 */ 	or	$a0,$v0,$zero
-/*  f1670a0:	0fc5d7d6 */ 	jal	func0f175f58
+/*  f1670a0:	0fc5d7d6 */ 	jal	stub0f175f58
 /*  f1670a4:	24060010 */ 	addiu	$a2,$zero,0x10
 /*  f1670a8:	10000004 */ 	b	.L0f1670bc
 /*  f1670ac:	00000000 */ 	nop
diff --git a/src/game/gfxmemory.c b/src/game/gfxmemory.c
index 1b289838f..7070b3dc9 100644
--- a/src/game/gfxmemory.c
+++ b/src/game/gfxmemory.c
@@ -8,7 +8,7 @@
 #include "game/data/data_020df0.h"
 #include "game/data/data_02da90.h"
 #include "game/gfxmemory.h"
-#include "game/game_175f50.h"
+#include "game/stubs/game_175f50.h"
 #include "gvars/gvars.h"
 #include "lib/lib_074f0.h"
 #include "lib/lib_0d0a0.h"
diff --git a/src/game/game_000840.c b/src/game/stubs/game_000840.c
similarity index 93%
rename from src/game/game_000840.c
rename to src/game/stubs/game_000840.c
index 221019f0b..efb20a934 100644
--- a/src/game/game_000840.c
+++ b/src/game/stubs/game_000840.c
@@ -10,7 +10,7 @@
 #include "gvars/gvars.h"
 #include "types.h"
 
-void func0f000840(void)
+void stub0f000840(void)
 {
 	// empty
 }
diff --git a/src/game/game_000850.c b/src/game/stubs/game_000850.c
similarity index 85%
rename from src/game/game_000850.c
rename to src/game/stubs/game_000850.c
index f05e7fda7..67f6a60aa 100644
--- a/src/game/game_000850.c
+++ b/src/game/stubs/game_000850.c
@@ -7,11 +7,11 @@
 #include "game/data/data_01a3a0.h"
 #include "game/data/data_020df0.h"
 #include "game/data/data_02da90.h"
-#include "game/game_000850.h"
+#include "game/stubs/game_000850.h"
 #include "gvars/gvars.h"
 #include "types.h"
 
-void func0f000850(void)
+void stub0f000850(void)
 {
 	// empty
 }
diff --git a/src/game/game_000860.c b/src/game/stubs/game_000860.c
similarity index 85%
rename from src/game/game_000860.c
rename to src/game/stubs/game_000860.c
index 147ed41c1..9607bfbe8 100644
--- a/src/game/game_000860.c
+++ b/src/game/stubs/game_000860.c
@@ -7,11 +7,11 @@
 #include "game/data/data_01a3a0.h"
 #include "game/data/data_020df0.h"
 #include "game/data/data_02da90.h"
-#include "game/game_000860.h"
+#include "game/stubs/game_000860.h"
 #include "gvars/gvars.h"
 #include "types.h"
 
-void func0f000860(void)
+void stub0f000860(void)
 {
 	// empty
 }
diff --git a/src/game/game_000870.c b/src/game/stubs/game_000870.c
similarity index 85%
rename from src/game/game_000870.c
rename to src/game/stubs/game_000870.c
index 969f80b27..b07293eff 100644
--- a/src/game/game_000870.c
+++ b/src/game/stubs/game_000870.c
@@ -7,11 +7,11 @@
 #include "game/data/data_01a3a0.h"
 #include "game/data/data_020df0.h"
 #include "game/data/data_02da90.h"
-#include "game/game_000870.h"
+#include "game/stubs/game_000870.h"
 #include "gvars/gvars.h"
 #include "types.h"
 
-void func0f000870(void)
+void stub0f000870(void)
 {
 	// empty
 }
diff --git a/src/game/game_0008e0.c b/src/game/stubs/game_0008e0.c
similarity index 85%
rename from src/game/game_0008e0.c
rename to src/game/stubs/game_0008e0.c
index 5c3145790..3f9cdf1ee 100644
--- a/src/game/game_0008e0.c
+++ b/src/game/stubs/game_0008e0.c
@@ -7,11 +7,11 @@
 #include "game/data/data_01a3a0.h"
 #include "game/data/data_020df0.h"
 #include "game/data/data_02da90.h"
-#include "game/game_0008e0.h"
+#include "game/stubs/game_0008e0.h"
 #include "gvars/gvars.h"
 #include "types.h"
 
-void func0f0008e0(void)
+void stub0f0008e0(void)
 {
 	// empty
 }
diff --git a/src/game/game_0008f0.c b/src/game/stubs/game_0008f0.c
similarity index 85%
rename from src/game/game_0008f0.c
rename to src/game/stubs/game_0008f0.c
index fbf88712a..66b6b299a 100644
--- a/src/game/game_0008f0.c
+++ b/src/game/stubs/game_0008f0.c
@@ -7,11 +7,11 @@
 #include "game/data/data_01a3a0.h"
 #include "game/data/data_020df0.h"
 #include "game/data/data_02da90.h"
-#include "game/game_0008f0.h"
+#include "game/stubs/game_0008f0.h"
 #include "gvars/gvars.h"
 #include "types.h"
 
-void func0f0008f0(void)
+void stub0f0008f0(void)
 {
 	// empty
 }
diff --git a/src/game/game_000900.c b/src/game/stubs/game_000900.c
similarity index 85%
rename from src/game/game_000900.c
rename to src/game/stubs/game_000900.c
index 470288730..772e105a4 100644
--- a/src/game/game_000900.c
+++ b/src/game/stubs/game_000900.c
@@ -7,11 +7,11 @@
 #include "game/data/data_01a3a0.h"
 #include "game/data/data_020df0.h"
 #include "game/data/data_02da90.h"
-#include "game/game_000900.h"
+#include "game/stubs/game_000900.h"
 #include "gvars/gvars.h"
 #include "types.h"
 
-void func0f000900(void)
+void stub0f000900(void)
 {
 	// empty
 }
diff --git a/src/game/game_000910.c b/src/game/stubs/game_000910.c
similarity index 85%
rename from src/game/game_000910.c
rename to src/game/stubs/game_000910.c
index a9ea1c8b3..06e69b007 100644
--- a/src/game/game_000910.c
+++ b/src/game/stubs/game_000910.c
@@ -7,11 +7,11 @@
 #include "game/data/data_01a3a0.h"
 #include "game/data/data_020df0.h"
 #include "game/data/data_02da90.h"
-#include "game/game_000910.h"
+#include "game/stubs/game_000910.h"
 #include "gvars/gvars.h"
 #include "types.h"
 
-void func0f000910(void)
+void stub0f000910(void)
 {
 	// empty
 }
diff --git a/src/game/stubs/game_00b180.c b/src/game/stubs/game_00b180.c
new file mode 100644
index 000000000..e41d11e03
--- /dev/null
+++ b/src/game/stubs/game_00b180.c
@@ -0,0 +1,9 @@
+#include <ultra64.h>
+
+GLOBAL_ASM(
+glabel stub0f00b180
+/*  f00b180:	03e00008 */ 	jr	$ra
+/*  f00b184:	00000000 */ 	nop
+/*  f00b188:	00000000 */ 	nop
+/*  f00b18c:	00000000 */ 	nop
+);
diff --git a/src/game/game_00b200.c b/src/game/stubs/game_00b200.c
similarity index 93%
rename from src/game/game_00b200.c
rename to src/game/stubs/game_00b200.c
index b35e49fb5..0712af7d6 100644
--- a/src/game/game_00b200.c
+++ b/src/game/stubs/game_00b200.c
@@ -10,7 +10,7 @@
 #include "gvars/gvars.h"
 #include "types.h"
 
-void func0f00b200(void)
+void stub0f00b200(void)
 {
 	// empty
 }
diff --git a/src/game/game_013540.c b/src/game/stubs/game_013540.c
similarity index 93%
rename from src/game/game_013540.c
rename to src/game/stubs/game_013540.c
index 9d9d3a230..7ebe4981e 100644
--- a/src/game/game_013540.c
+++ b/src/game/stubs/game_013540.c
@@ -10,7 +10,7 @@
 #include "gvars/gvars.h"
 #include "types.h"
 
-void func0f013540(void)
+void stub0f013540(void)
 {
 	// empty
 }
diff --git a/src/game/game_015260.c b/src/game/stubs/game_015260.c
similarity index 85%
rename from src/game/game_015260.c
rename to src/game/stubs/game_015260.c
index bef3198e7..981958f22 100644
--- a/src/game/game_015260.c
+++ b/src/game/stubs/game_015260.c
@@ -7,11 +7,11 @@
 #include "game/data/data_01a3a0.h"
 #include "game/data/data_020df0.h"
 #include "game/data/data_02da90.h"
-#include "game/game_015260.h"
+#include "game/stubs/game_015260.h"
 #include "gvars/gvars.h"
 #include "types.h"
 
-void func0f015260(void)
+void stub0f015260(void)
 {
 	// empty
 }
diff --git a/src/game/game_015270.c b/src/game/stubs/game_015270.c
similarity index 85%
rename from src/game/game_015270.c
rename to src/game/stubs/game_015270.c
index ba28ab44d..308e973ea 100644
--- a/src/game/game_015270.c
+++ b/src/game/stubs/game_015270.c
@@ -7,11 +7,11 @@
 #include "game/data/data_01a3a0.h"
 #include "game/data/data_020df0.h"
 #include "game/data/data_02da90.h"
-#include "game/game_015270.h"
+#include "game/stubs/game_015270.h"
 #include "gvars/gvars.h"
 #include "types.h"
 
-void func0f015270(void)
+void stub0f015270(void)
 {
 	// empty
 }
diff --git a/src/game/game_0153f0.c b/src/game/stubs/game_0153f0.c
similarity index 93%
rename from src/game/game_0153f0.c
rename to src/game/stubs/game_0153f0.c
index ef714e188..e97744eb8 100644
--- a/src/game/game_0153f0.c
+++ b/src/game/stubs/game_0153f0.c
@@ -10,7 +10,7 @@
 #include "gvars/gvars.h"
 #include "types.h"
 
-void func0f0153f0(void)
+void stub0f0153f0(void)
 {
 	// empty
 }
diff --git a/src/game/game_015400.c b/src/game/stubs/game_015400.c
similarity index 85%
rename from src/game/game_015400.c
rename to src/game/stubs/game_015400.c
index caa4e42d5..cef89139c 100644
--- a/src/game/game_015400.c
+++ b/src/game/stubs/game_015400.c
@@ -7,11 +7,11 @@
 #include "game/data/data_01a3a0.h"
 #include "game/data/data_020df0.h"
 #include "game/data/data_02da90.h"
-#include "game/game_015400.h"
+#include "game/stubs/game_015400.h"
 #include "gvars/gvars.h"
 #include "types.h"
 
-void func0f015400(void)
+void stub0f015400(void)
 {
 	// empty
 }
diff --git a/src/game/game_015410.c b/src/game/stubs/game_015410.c
similarity index 85%
rename from src/game/game_015410.c
rename to src/game/stubs/game_015410.c
index d1b2890ec..a0af1ffb1 100644
--- a/src/game/game_015410.c
+++ b/src/game/stubs/game_015410.c
@@ -7,11 +7,11 @@
 #include "game/data/data_01a3a0.h"
 #include "game/data/data_020df0.h"
 #include "game/data/data_02da90.h"
-#include "game/game_015410.h"
+#include "game/stubs/game_015410.h"
 #include "gvars/gvars.h"
 #include "types.h"
 
-void func0f015410(void)
+void stub0f015410(void)
 {
 	// empty
 }
diff --git a/src/game/game_102230.c b/src/game/stubs/game_102230.c
similarity index 93%
rename from src/game/game_102230.c
rename to src/game/stubs/game_102230.c
index 8afbf641d..ef2343adf 100644
--- a/src/game/game_102230.c
+++ b/src/game/stubs/game_102230.c
@@ -10,7 +10,7 @@
 #include "gvars/gvars.h"
 #include "types.h"
 
-void func0f102230(void)
+void stub0f102230(void)
 {
 	// empty
 }
diff --git a/src/game/game_11eff0.c b/src/game/stubs/game_11eff0.c
similarity index 92%
rename from src/game/game_11eff0.c
rename to src/game/stubs/game_11eff0.c
index 392ab2046..9ffe90e8f 100644
--- a/src/game/game_11eff0.c
+++ b/src/game/stubs/game_11eff0.c
@@ -10,7 +10,7 @@
 #include "gvars/gvars.h"
 #include "types.h"
 
-bool func0f11eff0(s32 arg0)
+bool stub0f11eff0(s32 arg0)
 {
 	return arg0;
 }
diff --git a/src/game/game_175f50.c b/src/game/stubs/game_175f50.c
similarity index 67%
rename from src/game/game_175f50.c
rename to src/game/stubs/game_175f50.c
index 3c792f701..ebc6122eb 100644
--- a/src/game/game_175f50.c
+++ b/src/game/stubs/game_175f50.c
@@ -7,26 +7,26 @@
 #include "game/data/data_01a3a0.h"
 #include "game/data/data_020df0.h"
 #include "game/data/data_02da90.h"
-#include "game/game_175f50.h"
+#include "game/stubs/game_175f50.h"
 #include "gvars/gvars.h"
 #include "types.h"
 
-void func0f175f50(void)
+void stub0f175f50(void)
 {
 	// empty
 }
 
-void func0f175f58(s32 arg0, s32 arg1, s32 arg2)
+void stub0f175f58(s32 arg0, s32 arg1, s32 arg2)
 {
 	// empty
 }
 
-bool func0f175f68(s32 arg0, s32 arg1)
+bool stub0f175f68(s32 arg0, s32 arg1)
 {
 	return false;
 }
 
-void func0f175f78(s32 arg0, s32 arg1, s32 arg2)
+void stub0f175f78(s32 arg0, s32 arg1, s32 arg2)
 {
 	// empty
 }
diff --git a/src/game/game_176000.c b/src/game/stubs/game_176000.c
similarity index 56%
rename from src/game/game_176000.c
rename to src/game/stubs/game_176000.c
index a4e140c3e..c8e8c1255 100644
--- a/src/game/game_176000.c
+++ b/src/game/stubs/game_176000.c
@@ -10,42 +10,42 @@
 #include "gvars/gvars.h"
 #include "types.h"
 
-s32 func0f176000(s32 arg0)
+s32 stub0f176000(s32 arg0)
 {
 	return arg0;
 }
 
-s32 func0f176008(s32 arg0, s32 arg1, s32 arg2, s32 arg3)
+s32 stub0f176008(s32 arg0, s32 arg1, s32 arg2, s32 arg3)
 {
 	return arg0;
 }
 
-s32 func0f17601c(s32 arg0, s32 arg1, s32 arg2, s32 arg3)
+s32 stub0f17601c(s32 arg0, s32 arg1, s32 arg2, s32 arg3)
 {
 	return arg0;
 }
 
-s32 func0f176030(s32 arg0, s32 arg1, s32 arg2, s32 arg3)
+s32 stub0f176030(s32 arg0, s32 arg1, s32 arg2, s32 arg3)
 {
 	return arg0;
 }
 
-s32 func0f176044(s32 arg0, s32 arg1, s32 arg2, s32 arg3)
+s32 stub0f176044(s32 arg0, s32 arg1, s32 arg2, s32 arg3)
 {
 	return arg0;
 }
 
-void func0f176058(f32 arg0)
+void stub0f176058(f32 arg0)
 {
 	// empty
 }
 
-s32 func0f176060(s32 arg0, s32 arg1, s32 arg2, s32 arg3)
+s32 stub0f176060(s32 arg0, s32 arg1, s32 arg2, s32 arg3)
 {
 	return arg0;
 }
 
-void func0f176074(void)
+void stub0f176074(void)
 {
 	// empty
 }
diff --git a/src/include/game/game_006bd0.h b/src/include/game/game_006bd0.h
index 1543a27c8..ff6d9dfce 100644
--- a/src/include/game/game_006bd0.h
+++ b/src/include/game/game_006bd0.h
@@ -19,6 +19,5 @@ void nbombCreate(struct coord *pos, struct prop *prop);
 f32 gasGetDoorFrac(s32 tagnum);
 Gfx *func0f00a490(Gfx *gdl);
 Gfx *gasRender(Gfx *gdl);
-void func0f00b180(void);
 
 #endif
diff --git a/src/include/game/game_175f50.h b/src/include/game/game_175f50.h
deleted file mode 100644
index 29a2a46b1..000000000
--- a/src/include/game/game_175f50.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef IN_GAME_GAME_175F50_H
-#define IN_GAME_GAME_175F50_H
-#include <ultra64.h>
-#include "types.h"
-
-void func0f175f50(void);
-void func0f175f58(s32 arg0, s32 arg1, s32 arg2);
-bool func0f175f68(s32 arg0, s32 arg1);
-void func0f175f78(s32 arg0, s32 arg1, s32 arg2);
-
-#endif
diff --git a/src/include/game/game_000840.h b/src/include/game/stubs/game_000840.h
similarity index 81%
rename from src/include/game/game_000840.h
rename to src/include/game/stubs/game_000840.h
index 9c1c1e2a9..2687d6e44 100644
--- a/src/include/game/game_000840.h
+++ b/src/include/game/stubs/game_000840.h
@@ -3,6 +3,6 @@
 #include <ultra64.h>
 #include "types.h"
 
-void func0f000840(void);
+void stub0f000840(void);
 
 #endif
diff --git a/src/include/game/game_000850.h b/src/include/game/stubs/game_000850.h
similarity index 81%
rename from src/include/game/game_000850.h
rename to src/include/game/stubs/game_000850.h
index a38d1bf5e..4218b55b2 100644
--- a/src/include/game/game_000850.h
+++ b/src/include/game/stubs/game_000850.h
@@ -3,6 +3,6 @@
 #include <ultra64.h>
 #include "types.h"
 
-void func0f000850(void);
+void stub0f000850(void);
 
 #endif
diff --git a/src/include/game/game_000860.h b/src/include/game/stubs/game_000860.h
similarity index 81%
rename from src/include/game/game_000860.h
rename to src/include/game/stubs/game_000860.h
index 0f9f9a631..7076d13c5 100644
--- a/src/include/game/game_000860.h
+++ b/src/include/game/stubs/game_000860.h
@@ -3,6 +3,6 @@
 #include <ultra64.h>
 #include "types.h"
 
-void func0f000860(void);
+void stub0f000860(void);
 
 #endif
diff --git a/src/include/game/game_000870.h b/src/include/game/stubs/game_000870.h
similarity index 81%
rename from src/include/game/game_000870.h
rename to src/include/game/stubs/game_000870.h
index d68cc69fe..a1f7e19bf 100644
--- a/src/include/game/game_000870.h
+++ b/src/include/game/stubs/game_000870.h
@@ -3,6 +3,6 @@
 #include <ultra64.h>
 #include "types.h"
 
-void func0f000870(void);
+void stub0f000870(void);
 
 #endif
diff --git a/src/include/game/game_0008e0.h b/src/include/game/stubs/game_0008e0.h
similarity index 81%
rename from src/include/game/game_0008e0.h
rename to src/include/game/stubs/game_0008e0.h
index ebdd555bc..67cd15b3e 100644
--- a/src/include/game/game_0008e0.h
+++ b/src/include/game/stubs/game_0008e0.h
@@ -3,6 +3,6 @@
 #include <ultra64.h>
 #include "types.h"
 
-void func0f0008e0(void);
+void stub0f0008e0(void);
 
 #endif
diff --git a/src/include/game/game_0008f0.h b/src/include/game/stubs/game_0008f0.h
similarity index 81%
rename from src/include/game/game_0008f0.h
rename to src/include/game/stubs/game_0008f0.h
index 1a0603114..e15c641e9 100644
--- a/src/include/game/game_0008f0.h
+++ b/src/include/game/stubs/game_0008f0.h
@@ -3,6 +3,6 @@
 #include <ultra64.h>
 #include "types.h"
 
-void func0f0008f0(void);
+void stub0f0008f0(void);
 
 #endif
diff --git a/src/include/game/game_000900.h b/src/include/game/stubs/game_000900.h
similarity index 81%
rename from src/include/game/game_000900.h
rename to src/include/game/stubs/game_000900.h
index 6c77f3eba..3bab034bd 100644
--- a/src/include/game/game_000900.h
+++ b/src/include/game/stubs/game_000900.h
@@ -3,6 +3,6 @@
 #include <ultra64.h>
 #include "types.h"
 
-void func0f000900(void);
+void stub0f000900(void);
 
 #endif
diff --git a/src/include/game/game_000910.h b/src/include/game/stubs/game_000910.h
similarity index 81%
rename from src/include/game/game_000910.h
rename to src/include/game/stubs/game_000910.h
index 3cc26db8c..77e1d77df 100644
--- a/src/include/game/game_000910.h
+++ b/src/include/game/stubs/game_000910.h
@@ -3,6 +3,6 @@
 #include <ultra64.h>
 #include "types.h"
 
-void func0f000910(void);
+void stub0f000910(void);
 
 #endif
diff --git a/src/include/game/stubs/game_00b180.h b/src/include/game/stubs/game_00b180.h
new file mode 100644
index 000000000..b767b0432
--- /dev/null
+++ b/src/include/game/stubs/game_00b180.h
@@ -0,0 +1,8 @@
+#ifndef IN_GAME_GAME_00B180_H
+#define IN_GAME_GAME_00B180_H
+#include <ultra64.h>
+#include "types.h"
+
+void stub0f00b180(void);
+
+#endif
diff --git a/src/include/game/game_00b200.h b/src/include/game/stubs/game_00b200.h
similarity index 81%
rename from src/include/game/game_00b200.h
rename to src/include/game/stubs/game_00b200.h
index ce1991a1f..497675a3b 100644
--- a/src/include/game/game_00b200.h
+++ b/src/include/game/stubs/game_00b200.h
@@ -3,6 +3,6 @@
 #include <ultra64.h>
 #include "types.h"
 
-void func0f00b200(void);
+void stub0f00b200(void);
 
 #endif
diff --git a/src/include/game/game_013540.h b/src/include/game/stubs/game_013540.h
similarity index 81%
rename from src/include/game/game_013540.h
rename to src/include/game/stubs/game_013540.h
index c25c15130..f512ea80f 100644
--- a/src/include/game/game_013540.h
+++ b/src/include/game/stubs/game_013540.h
@@ -3,6 +3,6 @@
 #include <ultra64.h>
 #include "types.h"
 
-void func0f013540(void);
+void stub0f013540(void);
 
 #endif
diff --git a/src/include/game/game_015260.h b/src/include/game/stubs/game_015260.h
similarity index 81%
rename from src/include/game/game_015260.h
rename to src/include/game/stubs/game_015260.h
index 342f167c0..199a0ff41 100644
--- a/src/include/game/game_015260.h
+++ b/src/include/game/stubs/game_015260.h
@@ -3,6 +3,6 @@
 #include <ultra64.h>
 #include "types.h"
 
-void func0f015260(void);
+void stub0f015260(void);
 
 #endif
diff --git a/src/include/game/game_015270.h b/src/include/game/stubs/game_015270.h
similarity index 81%
rename from src/include/game/game_015270.h
rename to src/include/game/stubs/game_015270.h
index 220d18e9e..a42609833 100644
--- a/src/include/game/game_015270.h
+++ b/src/include/game/stubs/game_015270.h
@@ -3,6 +3,6 @@
 #include <ultra64.h>
 #include "types.h"
 
-void func0f015270(void);
+void stub0f015270(void);
 
 #endif
diff --git a/src/include/game/game_0153f0.h b/src/include/game/stubs/game_0153f0.h
similarity index 81%
rename from src/include/game/game_0153f0.h
rename to src/include/game/stubs/game_0153f0.h
index 59e8d96a8..735326384 100644
--- a/src/include/game/game_0153f0.h
+++ b/src/include/game/stubs/game_0153f0.h
@@ -3,6 +3,6 @@
 #include <ultra64.h>
 #include "types.h"
 
-void func0f0153f0(void);
+void stub0f0153f0(void);
 
 #endif
diff --git a/src/include/game/game_015400.h b/src/include/game/stubs/game_015400.h
similarity index 81%
rename from src/include/game/game_015400.h
rename to src/include/game/stubs/game_015400.h
index 22bb9d061..ccb998075 100644
--- a/src/include/game/game_015400.h
+++ b/src/include/game/stubs/game_015400.h
@@ -3,6 +3,6 @@
 #include <ultra64.h>
 #include "types.h"
 
-void func0f015400(void);
+void stub0f015400(void);
 
 #endif
diff --git a/src/include/game/game_015410.h b/src/include/game/stubs/game_015410.h
similarity index 81%
rename from src/include/game/game_015410.h
rename to src/include/game/stubs/game_015410.h
index 27d5d689a..6723f2934 100644
--- a/src/include/game/game_015410.h
+++ b/src/include/game/stubs/game_015410.h
@@ -3,6 +3,6 @@
 #include <ultra64.h>
 #include "types.h"
 
-void func0f015410(void);
+void stub0f015410(void);
 
 #endif
diff --git a/src/include/game/game_102230.h b/src/include/game/stubs/game_102230.h
similarity index 81%
rename from src/include/game/game_102230.h
rename to src/include/game/stubs/game_102230.h
index 560244a88..9ecc2ee6b 100644
--- a/src/include/game/game_102230.h
+++ b/src/include/game/stubs/game_102230.h
@@ -3,6 +3,6 @@
 #include <ultra64.h>
 #include "types.h"
 
-void func0f102230(void);
+void stub0f102230(void);
 
 #endif
diff --git a/src/include/game/stubs/game_175f50.h b/src/include/game/stubs/game_175f50.h
new file mode 100644
index 000000000..ca9ff17e6
--- /dev/null
+++ b/src/include/game/stubs/game_175f50.h
@@ -0,0 +1,11 @@
+#ifndef IN_GAME_GAME_175F50_H
+#define IN_GAME_GAME_175F50_H
+#include <ultra64.h>
+#include "types.h"
+
+void stub0f175f50(void);
+void stub0f175f58(s32 arg0, s32 arg1, s32 arg2);
+bool stub0f175f68(s32 arg0, s32 arg1);
+void stub0f175f78(s32 arg0, s32 arg1, s32 arg2);
+
+#endif
diff --git a/src/include/game/game_176000.h b/src/include/game/stubs/game_176000.h
similarity index 100%
rename from src/include/game/game_176000.h
rename to src/include/game/stubs/game_176000.h
diff --git a/src/lib/main.c b/src/lib/main.c
index 98044f294..d025baeae 100644
--- a/src/lib/main.c
+++ b/src/lib/main.c
@@ -14,18 +14,19 @@
 #include "game/game_000000.h"
 #include "game/game_000090.h"
 #include "game/game_000130.h"
-#include "game/game_000840.h"
-#include "game/game_000850.h"
-#include "game/game_000860.h"
-#include "game/game_000870.h"
+#include "game/stubs/game_000840.h"
+#include "game/stubs/game_000850.h"
+#include "game/stubs/game_000860.h"
+#include "game/stubs/game_000870.h"
 #include "game/game_000880.h"
-#include "game/game_0008e0.h"
-#include "game/game_0008f0.h"
-#include "game/game_000900.h"
-#include "game/game_000910.h"
+#include "game/stubs/game_0008e0.h"
+#include "game/stubs/game_0008f0.h"
+#include "game/stubs/game_000900.h"
+#include "game/stubs/game_000910.h"
 #include "game/game_006bd0.h"
 #include "game/game_00b190.h"
-#include "game/game_00b200.h"
+#include "game/stubs/game_00b180.h"
+#include "game/stubs/game_00b200.h"
 #include "game/game_00b210.h"
 #include "game/game_00b320.h"
 #include "game/title.h"
@@ -38,7 +39,7 @@
 #include "game/core.h"
 #include "game/timing.h"
 #include "game/music.h"
-#include "game/game_175f50.h"
+#include "game/stubs/game_175f50.h"
 #include "game/game_175f90.h"
 #include "game/game_176080.h"
 #include "game/game_1a78b0.h"
@@ -487,7 +488,7 @@ glabel mainInit
 /*     d950:	00000000 */ 	nop
 /*     d954:	0fc59bdd */ 	jal	func0f166f74
 /*     d958:	00000000 */ 	nop
-/*     d95c:	0fc5d7d4 */ 	jal	func0f175f50
+/*     d95c:	0fc5d7d4 */ 	jal	stub0f175f50
 /*     d960:	00000000 */ 	nop
 /*     d964:	0fc5d7e4 */ 	jal	func0f175f90
 /*     d968:	00000000 */ 	nop
@@ -537,25 +538,25 @@ glabel mainInit
 /*     da14:	00000000 */ 	nop
 /*     da18:	0fc5b384 */ 	jal	frametimeInit
 /*     da1c:	00000000 */ 	nop
-/*     da20:	0fc02c80 */ 	jal	func0f00b200
+/*     da20:	0fc02c80 */ 	jal	stub0f00b200
 /*     da24:	00000000 */ 	nop
 /*     da28:	0c0026a0 */ 	jal	func00009a80
 /*     da2c:	00000000 */ 	nop
-/*     da30:	0fc0021c */ 	jal	func0f000870
+/*     da30:	0fc0021c */ 	jal	stub0f000870
 /*     da34:	00000000 */ 	nop
 /*     da38:	0fc00220 */ 	jal	func0f000880
 /*     da3c:	00000000 */ 	nop
-/*     da40:	0fc00238 */ 	jal	func0f0008e0
+/*     da40:	0fc00238 */ 	jal	stub0f0008e0
 /*     da44:	00000000 */ 	nop
-/*     da48:	0fc0023c */ 	jal	func0f0008f0
+/*     da48:	0fc0023c */ 	jal	stub0f0008f0
 /*     da4c:	00000000 */ 	nop
-/*     da50:	0fc00240 */ 	jal	func0f000900
+/*     da50:	0fc00240 */ 	jal	stub0f000900
 /*     da54:	00000000 */ 	nop
-/*     da58:	0fc02c60 */ 	jal	func0f00b180
+/*     da58:	0fc02c60 */ 	jal	stub0f00b180
 /*     da5c:	00000000 */ 	nop
-/*     da60:	0fc00244 */ 	jal	func0f000910
+/*     da60:	0fc00244 */ 	jal	stub0f000910
 /*     da64:	00000000 */ 	nop
-/*     da68:	0fc00210 */ 	jal	func0f000840
+/*     da68:	0fc00210 */ 	jal	stub0f000840
 /*     da6c:	00000000 */ 	nop
 /*     da70:	0fc62084 */ 	jal	mpSetDefaultSetup
 /*     da74:	00000000 */ 	nop
@@ -571,9 +572,9 @@ glabel mainInit
 /*     da9c:	00000000 */ 	nop
 /*     daa0:	0fc0004c */ 	jal	func0f000130
 /*     daa4:	00000000 */ 	nop
-/*     daa8:	0fc00214 */ 	jal	func0f000850
+/*     daa8:	0fc00214 */ 	jal	stub0f000850
 /*     daac:	00000000 */ 	nop
-/*     dab0:	0fc00218 */ 	jal	func0f000860
+/*     dab0:	0fc00218 */ 	jal	stub0f000860
 /*     dab4:	00000000 */ 	nop
 /*     dab8:	0fc00024 */ 	jal	func0f000090
 /*     dabc:	00000000 */ 	nop
@@ -749,7 +750,7 @@ const char var70053aa0[] = "          -ml0 -me0 -mgfx100 -mvtx50 -mt700 -ma400";
 //	func000070d0();
 //	func0f1a78b0();
 //	func0f166f74();
-//	func0f175f50();
+//	stub0f175f50();
 //	func0f175f90();
 //
 //	if (var8005d9b0) {
@@ -775,16 +776,16 @@ const char var70053aa0[] = "          -ml0 -me0 -mgfx100 -mvtx50 -mt700 -ma400";
 //	func00013790();
 //	func0f127910();
 //	frametimeInit();
-//	func0f00b200();
+//	stub0f00b200();
 //	func00009a80();
-//	func0f000870();
+//	stub0f000870();
 //	func0f000880();
-//	func0f0008e0();
-//	func0f0008f0();
-//	func0f000900();
-//	func0f00b180();
-//	func0f000910();
-//	func0f000840();
+//	stub0f0008e0();
+//	stub0f0008f0();
+//	stub0f000900();
+//	stub0f00b180();
+//	stub0f000910();
+//	stub0f000840();
 //	mpSetDefaultSetup();
 //	func0f14a328();
 //	func0f1189d8();
@@ -792,8 +793,8 @@ const char var70053aa0[] = "          -ml0 -me0 -mgfx100 -mvtx50 -mt700 -ma400";
 //	func000233c0();
 //	func0f000100();
 //	func0f000130();
-//	func0f000850();
-//	func0f000860();
+//	stub0f000850();
+//	stub0f000860();
 //	func0f000090();
 //	func00009bf8();
 //	func00009ec4(1);