diff --git a/src/include/lib/lib_0bfb0.h b/src/include/lib/lib_0bfb0.h
index cab9c72e7..f4cbcd5e2 100644
--- a/src/include/lib/lib_0bfb0.h
+++ b/src/include/lib/lib_0bfb0.h
@@ -3,7 +3,7 @@
 #include <ultra64.h>
 #include "types.h"
 
-u32 func0000bfb0(void);
+void func0000bfb0(void);
 void func0000bfd0(char *arg0, char *arg1, s32 arg2);
 
 #endif
diff --git a/src/lib/lib_0bfb0.c b/src/lib/lib_0bfb0.c
index 52249e35f..6a68159ee 100644
--- a/src/lib/lib_0bfb0.c
+++ b/src/lib/lib_0bfb0.c
@@ -12,17 +12,10 @@
 #include "lib/lib_2fa00.h"
 #include "types.h"
 
-GLOBAL_ASM(
-glabel func0000bfb0
-/*     bfb0:	27bdffe8 */ 	addiu	$sp,$sp,-24
-/*     bfb4:	afbf0014 */ 	sw	$ra,0x14($sp)
-/*     bfb8:	0c003000 */ 	jal	rmonCreateThread
-/*     bfbc:	00000000 */ 	nop
-/*     bfc0:	8fbf0014 */ 	lw	$ra,0x14($sp)
-/*     bfc4:	27bd0018 */ 	addiu	$sp,$sp,0x18
-/*     bfc8:	03e00008 */ 	jr	$ra
-/*     bfcc:	00000000 */ 	nop
-);
+void func0000bfb0(void)
+{
+	rmonCreateThread();
+}
 
 void func0000bfd0(char *arg0, char *arg1, s32 arg2)
 {
diff --git a/src/lib/lib_0c000.c b/src/lib/lib_0c000.c
index 267b4244b..f8df1ec8b 100644
--- a/src/lib/lib_0c000.c
+++ b/src/lib/lib_0c000.c
@@ -203,6 +203,33 @@ glabel rmonLoop
 /*     c114:	27bd0060 */ 	addiu	$sp,$sp,0x60
 );
 
+// Mismatch because bss needs to be sprinkled around various files first
+//void rmonLoop(void *arg0)
+//{
+//	OSMesg msg = 0;
+//	OSIntMask mask;
+//	u8 stack2[4];
+//	u8 stack1[44];
+//	static u32 result; // var80094acc
+//
+//	osSetEventMesg(OS_EVENT_FAULT, &g_RmonMesgQueue, (OSMesg) 16);
+//	var80094ad0 = 0;
+//
+//	while (true) {
+//		do {
+//			osRecvMesg(&g_RmonMesgQueue, &msg, 1);
+//			mask = osSetIntMask(1);
+//			result = func0004e640();
+//		} while (!result);
+//
+//		osSetIntMask(mask);
+//
+//		// Beta versions have something like this here:
+//		//rmonDrawCrashScreen(result, stack1, stack2);
+//		//func00001b1c(true);
+//	}
+//}
+
 GLOBAL_ASM(
 glabel func0000c118
 /*     c118:	27bdfff0 */ 	addiu	$sp,$sp,-16
@@ -527,7 +554,7 @@ glabel func0000c4d4
 );
 
 GLOBAL_ASM(
-glabel func0000c548
+glabel rmonDrawCrashScreen
 /*     c548:	27bdff10 */ 	addiu	$sp,$sp,-240
 /*     c54c:	afa400f0 */ 	sw	$a0,0xf0($sp)
 /*     c550:	afbf003c */ 	sw	$ra,0x3c($sp)