diff --git a/src/800.c b/src/800.c
index e62238b07..24735b629 100644
--- a/src/800.c
+++ b/src/800.c
@@ -6255,7 +6255,11 @@ endReason:
 INCLUDE_ASM("asm/nonmatchings/800", CdReadSectorReadyCB);
 #endif
 
-INCLUDE_ASM("asm/nonmatchings/800", func_8001A9D8);
+extern s32 CdQueueBusy(void);
+
+void func_8001A9D8(void) {
+    CdQueueBusy();
+}
 
 
 void func_8001A9F8(s32 a0)
diff --git a/src/800c3.c b/src/800c3.c
index 7475fa6ff..16da982ff 100644
--- a/src/800c3.c
+++ b/src/800c3.c
@@ -353,7 +353,86 @@ __asm__(
     ".set reorder\n"
 );
 
-INCLUDE_ASM("asm/nonmatchings/800c3", func_8005D588);
+
+__asm__(
+    "    .set noat\n"
+    "    .set noreorder\n"
+    "    .section .text\n"
+    "    .globl func_8005D588\n"
+    "func_8005D588:\n"
+    ".word 0x3C038007\n"
+    ".word 0x8C6329B0\n"
+    ".word 0x3C028007\n"
+    ".word 0x8C4229AC\n"
+    ".word 0x27BDFFE0\n"
+    ".word 0xAFB00010\n"
+    ".word 0x00808021\n"
+    ".word 0xAFBF001C\n"
+    ".word 0xAFB20018\n"
+    ".word 0xAFB10014\n"
+    ".word 0x00031840\n"
+    ".word 0x2C420001\n"
+    ".word 0x00628825\n"
+    ".word 0x12300031\n"
+    ".word 0x32020001\n"
+    ".word 0x3C018007\n"
+    ".word 0xAC202994\n"
+    ".word 0x10400012\n"
+    ".word 0x24020001\n"
+    ".word 0x3C128008\n"
+    ".word 0x26528998\n"
+    ".word 0x8E420000\n"
+    ".word 0x3C018007\n"
+    ".word 0xAC2029AC\n"
+    ".word 0x28420096\n"
+    ".word 0x14400008\n"
+    ".word 0x00000000\n"
+    ".word 0x3C048007\n"
+    ".word 0x8C842990\n"
+    ".word 0x3C028007\n"
+    ".word 0x8C422960\n"
+    ".word 0x00000000\n"
+    ".word 0x0040F809\n"
+    ".word 0x00000000\n"
+    ".word 0x08017588\n"
+    ".word 0xAE400000\n"
+    ".word 0x3C018007\n"
+    ".word 0xAC2229AC\n"
+    ".word 0x32020002\n"
+    ".word 0x10400012\n"
+    ".word 0x24030001\n"
+    ".word 0x3C108008\n"
+    ".word 0x2610899C\n"
+    ".word 0x8E020000\n"
+    ".word 0x3C018007\n"
+    ".word 0xAC2329B0\n"
+    ".word 0x28420096\n"
+    ".word 0x14400008\n"
+    ".word 0x00000000\n"
+    ".word 0x3C048007\n"
+    ".word 0x8C842990\n"
+    ".word 0x3C028007\n"
+    ".word 0x8C422960\n"
+    ".word 0x00000000\n"
+    ".word 0x0040F809\n"
+    ".word 0x248400F0\n"
+    ".word 0x0801759E\n"
+    ".word 0xAE000000\n"
+    ".word 0x3C018007\n"
+    ".word 0xAC2029B0\n"
+    ".word 0x24020001\n"
+    ".word 0x3C018007\n"
+    ".word 0xAC222994\n"
+    ".word 0x02201021\n"
+    ".word 0x8FBF001C\n"
+    ".word 0x8FB20018\n"
+    ".word 0x8FB10014\n"
+    ".word 0x8FB00010\n"
+    ".word 0x03E00008\n"
+    ".word 0x27BD0020\n"
+    "    .set reorder\n"
+    "    .set at\n"
+);
 
 void func_8005D6A0(void) {
     extern s32 D_8007898C;