diff --git a/src/800.c b/src/800.c
index 966867a76..8f6e69f74 100644
--- a/src/800.c
+++ b/src/800.c
@@ -606,7 +606,13 @@ INCLUDE_ASM("asm/nonmatchings/800", func_80012B04);
 
 INCLUDE_ASM("asm/nonmatchings/800", func_80012B58);
 
-INCLUDE_ASM("asm/nonmatchings/800", func_80012C6C);
+extern s32 func_80012CB8(s32 a0, s32 a1, s32 a2);
+
+s32 func_80012C6C(s32 a0, s32 a1, s32 a2)
+{
+    s32 s0 = a0;
+    return (s16)(s0 + func_80012CB8((s16)s0, (s16)a1, (s16)a2));
+}
 
 INCLUDE_ASM("asm/nonmatchings/800", func_80012CB8);
 
diff --git a/src/boot.c b/src/boot.c
index 39d4f4a02..a4bf98a3d 100644
--- a/src/boot.c
+++ b/src/boot.c
@@ -617,7 +617,14 @@ void func_80011C8C(u16 arg0) {
 
 INCLUDE_ASM("asm/nonmatchings/boot", func_80011CFC);
 
-INCLUDE_ASM("asm/nonmatchings/boot", func_80011D54);
+extern u8 D_800AF630[];
+
+void func_80011D54(u16 arg0) {
+    register u8 *p = D_800AF630;
+
+    *(u16 *)(p + 0xA3CC) = arg0;
+    *(u16 *)(p + 0xA3CE) = 0;
+}
 
 extern s32 D_80074780;