diff --git a/src/ov_SC03_107/ov_SC03_107_jr_8013F350.c b/src/ov_SC03_107/ov_SC03_107_jr_8013F350.c
index c7036fb8e..1464c57c9 100644
--- a/src/ov_SC03_107/ov_SC03_107_jr_8013F350.c
+++ b/src/ov_SC03_107/ov_SC03_107_jr_8013F350.c
@@ -5110,7 +5110,35 @@ DEFINE_func_8014D12C()  /* dedup: shared engine-core @0x8014D12C (src/shared) */
 DEFINE_func_8014D2A0()  /* dedup: shared engine-core @0x8014D2A0 (src/shared) */
 
 
-INCLUDE_ASM("asm/ov_SC03_107/nonmatchings/ov_SC03_107_jr_8013F350", func_8014D3E0);
+extern int D_8019A8A0;
+extern void func_8014D438(s32);
+
+void func_8014D3E0(void)
+{
+    __asm__ __volatile__(
+        ".set noreorder\n"
+        "addiu $sp, $sp, -24\n"
+        "lui   $v1, 0x1f80\n"
+        "ori   $v1, $v1, 0x03fc\n"
+        "sw    $ra, 16($sp)\n"
+        "addu  $t0, $v1, $zero\n"
+        "lw    $t1, 0($t0)\n"
+        "nop\n"
+        "sw    $sp, 0($t1)\n"
+        "addiu $t1, $t1, -4\n"
+        "addu  $sp, $t1, $zero\n"
+        "jal   func_8014D438\n"
+        "lui   $at, %%hi(D_8019A8A0)\n"
+        "sw    $v0, %%lo(D_8019A8A0)($at)\n"
+        "addiu $sp, $sp, 4\n"
+        "lw    $sp, 0($sp)\n"
+        "lui   $v0, %%hi(D_8019A8A0)\n"
+        "lw    $v0, %%lo(D_8019A8A0)($v0)\n"
+        "lw    $ra, 16($sp)\n"
+        "addiu $sp, $sp, 24\n"
+        : : : "memory");
+}
+
 
 DEFINE_func_8014D438()  /* dedup: shared engine-core @0x8014d438 (src/shared) */
 
@@ -5741,12 +5769,68 @@ DEFINE_func_8014F2E0()  /* dedup: shared engine-core @0x8014f2e0 (src/shared) */
 DEFINE_func_8014F3E8()  /* dedup: shared engine-core @0x8014f3e8 (src/shared) */
 
 
-INCLUDE_ASM("asm/ov_SC03_107/nonmatchings/ov_SC03_107_jr_8013F350", func_8014F468);
+extern int D_8019A8A4;
+extern s32 func_8014F4C0(s32);
+
+s32 func_8014F468(void)
+{
+    __asm__ __volatile__(
+        ".set noreorder\n"
+        "addiu $sp, $sp, -24\n"
+        "lui   $v1, 0x1f80\n"
+        "ori   $v1, $v1, 0x03fc\n"
+        "sw    $ra, 16($sp)\n"
+        "addu  $t0, $v1, $zero\n"
+        "lw    $t1, 0($t0)\n"
+        "nop\n"
+        "sw    $sp, 0($t1)\n"
+        "addiu $t1, $t1, -4\n"
+        "addu  $sp, $t1, $zero\n"
+        "jal   func_8014F4C0\n"
+        "lui   $at, %%hi(D_8019A8A4)\n"
+        "sw    $v0, %%lo(D_8019A8A4)($at)\n"
+        "addiu $sp, $sp, 4\n"
+        "lw    $sp, 0($sp)\n"
+        "lui   $v0, %%hi(D_8019A8A4)\n"
+        "lw    $v0, %%lo(D_8019A8A4)($v0)\n"
+        "lw    $ra, 16($sp)\n"
+        "addiu $sp, $sp, 24\n"
+        : : : "memory");
+}
+
 
 DEFINE_func_8014F4C0()  /* dedup: shared engine-core @0x8014f4c0 (src/shared) */
 
 
-INCLUDE_ASM("asm/ov_SC03_107/nonmatchings/ov_SC03_107_jr_8013F350", func_8014F6F4);
+extern int D_8019A8A4;
+extern int func_8014F74C();
+
+int func_8014F6F4(void)
+{
+    __asm__ __volatile__(
+        ".set noreorder\n"
+        "addiu $sp, $sp, -24\n"
+        "lui   $v1, 0x1f80\n"
+        "ori   $v1, $v1, 0x03fc\n"
+        "sw    $ra, 16($sp)\n"
+        "addu  $t0, $v1, $zero\n"
+        "lw    $t1, 0($t0)\n"
+        "nop\n"
+        "sw    $sp, 0($t1)\n"
+        "addiu $t1, $t1, -4\n"
+        "addu  $sp, $t1, $zero\n"
+        "jal   func_8014F74C\n"
+        "lui   $at, %%hi(D_8019A8A4)\n"
+        "sw    $v0, %%lo(D_8019A8A4)($at)\n"
+        "addiu $sp, $sp, 4\n"
+        "lw    $sp, 0($sp)\n"
+        "lui   $v0, %%hi(D_8019A8A4)\n"
+        "lw    $v0, %%lo(D_8019A8A4)($v0)\n"
+        "lw    $ra, 16($sp)\n"
+        "addiu $sp, $sp, 24\n"
+        : : : "memory");
+}
+
 
 DEFINE_func_8014F74C()  /* dedup: shared engine-core @0x8014f74c (src/shared) */
 
diff --git a/src/ov_SC03_107/ov_SC03_107_jr_801549F8.c b/src/ov_SC03_107/ov_SC03_107_jr_801549F8.c
index 3ec956b95..35973a46f 100644
--- a/src/ov_SC03_107/ov_SC03_107_jr_801549F8.c
+++ b/src/ov_SC03_107/ov_SC03_107_jr_801549F8.c
@@ -1632,7 +1632,7 @@ extern void func_8014CB9C(struct Packed8 *a0);
 extern s32 D_80126CDC;
 extern void func_8014CBD8(void);
 extern void func_8014CBF8(void *a0);
-extern void func_8014D3E0(s32 a0);
+extern void func_8014D3E0();
 extern void func_8014D04C(void);
 extern void func_8014CCB4(void);
 extern void func_8014CC28(s32 a0);
@@ -1700,8 +1700,8 @@ extern void func_8014F1F4(void);
 extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2);
 extern s32 func_8014F24C(struct SubF24C *a0);
 extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2);
-extern s32 func_8014F468(void);
-extern int func_8014F6F4(void);
+extern s32 func_8014F468();
+extern int func_8014F6F4();
 extern s32 func_8014F3E8(s32 param_1);
 extern int func_8014F74C();
 extern s32 D_801152BC;
diff --git a/src/ov_SC03_107/ov_SC03_107_jr_801555F4.c b/src/ov_SC03_107/ov_SC03_107_jr_801555F4.c
index 0a5be556a..85cc77875 100644
--- a/src/ov_SC03_107/ov_SC03_107_jr_801555F4.c
+++ b/src/ov_SC03_107/ov_SC03_107_jr_801555F4.c
@@ -1626,7 +1626,7 @@ extern void func_8014CB9C(struct Packed8 *a0);
 extern s32 D_80126CDC;
 extern void func_8014CBD8(void);
 extern void func_8014CBF8(void *a0);
-extern void func_8014D3E0(s32 a0);
+extern void func_8014D3E0();
 extern void func_8014D04C(void);
 extern void func_8014CCB4(void);
 extern void func_8014CC28(s32 a0);
@@ -1694,8 +1694,8 @@ extern void func_8014F1F4(void);
 extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2);
 extern s32 func_8014F24C(struct SubF24C *a0);
 extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2);
-extern s32 func_8014F468(void);
-extern int func_8014F6F4(void);
+extern s32 func_8014F468();
+extern int func_8014F6F4();
 extern s32 func_8014F3E8(s32 param_1);
 extern int func_8014F74C();
 extern s32 D_801152BC;
diff --git a/src/ov_SC03_107/ov_SC03_107_jr_801594E8.c b/src/ov_SC03_107/ov_SC03_107_jr_801594E8.c
index 5c3559b30..46b6add36 100644
--- a/src/ov_SC03_107/ov_SC03_107_jr_801594E8.c
+++ b/src/ov_SC03_107/ov_SC03_107_jr_801594E8.c
@@ -1626,7 +1626,7 @@ extern void func_8014CB9C(struct Packed8 *a0);
 extern s32 D_80126CDC;
 extern void func_8014CBD8(void);
 extern void func_8014CBF8(void *a0);
-extern void func_8014D3E0(s32 a0);
+extern void func_8014D3E0();
 extern void func_8014D04C(void);
 extern void func_8014CCB4(void);
 extern void func_8014CC28(s32 a0);
@@ -1694,8 +1694,8 @@ extern void func_8014F1F4(void);
 extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2);
 extern s32 func_8014F24C(struct SubF24C *a0);
 extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2);
-extern s32 func_8014F468(void);
-extern int func_8014F6F4(void);
+extern s32 func_8014F468();
+extern int func_8014F6F4();
 extern s32 func_8014F3E8(s32 param_1);
 extern int func_8014F74C();
 extern s32 D_801152BC;
diff --git a/src/ov_SC03_107/ov_SC03_107_jr_80159C84.c b/src/ov_SC03_107/ov_SC03_107_jr_80159C84.c
index ad0ca60be..8a27a8127 100644
--- a/src/ov_SC03_107/ov_SC03_107_jr_80159C84.c
+++ b/src/ov_SC03_107/ov_SC03_107_jr_80159C84.c
@@ -1623,7 +1623,7 @@ extern void func_8014CB9C(struct Packed8 *a0);
 extern s32 D_80126CDC;
 extern void func_8014CBD8(void);
 extern void func_8014CBF8(void *a0);
-extern void func_8014D3E0(s32 a0);
+extern void func_8014D3E0();
 extern void func_8014D04C(void);
 extern void func_8014CCB4(void);
 extern void func_8014CC28(s32 a0);
@@ -1691,8 +1691,8 @@ extern void func_8014F1F4(void);
 extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2);
 extern s32 func_8014F24C(struct SubF24C *a0);
 extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2);
-extern s32 func_8014F468(void);
-extern int func_8014F6F4(void);
+extern s32 func_8014F468();
+extern int func_8014F6F4();
 extern s32 func_8014F3E8(s32 param_1);
 extern int func_8014F74C();
 extern s32 D_801152BC;
diff --git a/src/ov_SC03_107/ov_SC03_107_jr_8015A3C8.c b/src/ov_SC03_107/ov_SC03_107_jr_8015A3C8.c
index 121b44a50..e3d2b6f4f 100644
--- a/src/ov_SC03_107/ov_SC03_107_jr_8015A3C8.c
+++ b/src/ov_SC03_107/ov_SC03_107_jr_8015A3C8.c
@@ -1604,7 +1604,7 @@ extern void func_8014CB9C(struct Packed8 *a0);
 extern s32 D_80126CDC;
 extern void func_8014CBD8(void);
 extern void func_8014CBF8(void *a0);
-extern void func_8014D3E0(s32 a0);
+extern void func_8014D3E0();
 extern void func_8014D04C(void);
 extern void func_8014CCB4(void);
 extern void func_8014CC28(s32 a0);
@@ -1672,8 +1672,8 @@ extern void func_8014F1F4(void);
 extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2);
 extern s32 func_8014F24C(struct SubF24C *a0);
 extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2);
-extern s32 func_8014F468(void);
-extern int func_8014F6F4(void);
+extern s32 func_8014F468();
+extern int func_8014F6F4();
 extern s32 func_8014F3E8(s32 param_1);
 extern int func_8014F74C();
 extern s32 D_801152BC;
diff --git a/src/ov_SC03_107/ov_SC03_107_jr_8016AE5C.c b/src/ov_SC03_107/ov_SC03_107_jr_8016AE5C.c
index ddac5fc77..fa97dbe0e 100644
--- a/src/ov_SC03_107/ov_SC03_107_jr_8016AE5C.c
+++ b/src/ov_SC03_107/ov_SC03_107_jr_8016AE5C.c
@@ -1624,7 +1624,7 @@ extern void func_8014CB9C(struct Packed8 *a0);
 extern s32 D_80126CDC;
 extern void func_8014CBD8(void);
 extern void func_8014CBF8(void *a0);
-extern void func_8014D3E0(s32 a0);
+extern void func_8014D3E0();
 extern void func_8014D04C(void);
 extern void func_8014CCB4(void);
 extern void func_8014CC28(s32 a0);
@@ -1692,8 +1692,8 @@ extern void func_8014F1F4(void);
 extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2);
 extern s32 func_8014F24C(struct SubF24C *a0);
 extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2);
-extern s32 func_8014F468(void);
-extern int func_8014F6F4(void);
+extern s32 func_8014F468();
+extern int func_8014F6F4();
 extern s32 func_8014F3E8(s32 param_1);
 extern int func_8014F74C();
 extern s32 D_801152BC;
diff --git a/src/ov_SC03_107/ov_SC03_107_jr_80171B4C.c b/src/ov_SC03_107/ov_SC03_107_jr_80171B4C.c
index 8f5aff1fe..5d1de5298 100644
--- a/src/ov_SC03_107/ov_SC03_107_jr_80171B4C.c
+++ b/src/ov_SC03_107/ov_SC03_107_jr_80171B4C.c
@@ -1668,7 +1668,7 @@ extern void func_8014CB9C(struct Packed8 *a0);
 extern s32 D_80126CDC;
 extern void func_8014CBD8(void);
 extern void func_8014CBF8(void *a0);
-extern void func_8014D3E0(s32 a0);
+extern void func_8014D3E0();
 extern void func_8014D04C(void);
 extern void func_8014CCB4(void);
 extern void func_8014CC28(s32 a0);
@@ -1736,8 +1736,8 @@ extern void func_8014F1F4(void);
 extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2);
 extern s32 func_8014F24C(struct SubF24C *a0);
 extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2);
-extern s32 func_8014F468(void);
-extern int func_8014F6F4(void);
+extern s32 func_8014F468();
+extern int func_8014F6F4();
 extern s32 func_8014F3E8(s32 param_1);
 extern int func_8014F74C();
 extern s32 D_801152BC;
diff --git a/src/ov_SC03_107/ov_SC03_107_jr_801789AC.c b/src/ov_SC03_107/ov_SC03_107_jr_801789AC.c
index 9a5182e23..789264bdc 100644
--- a/src/ov_SC03_107/ov_SC03_107_jr_801789AC.c
+++ b/src/ov_SC03_107/ov_SC03_107_jr_801789AC.c
@@ -1703,7 +1703,7 @@ extern void func_8014CB9C(struct Packed8 *a0);
 extern s32 D_80126CDC;
 extern void func_8014CBD8(void);
 extern void func_8014CBF8(void *a0);
-extern void func_8014D3E0(s32 a0);
+extern void func_8014D3E0();
 extern void func_8014D04C(void);
 extern void func_8014CCB4(void);
 extern void func_8014CC28(s32 a0);
@@ -1771,8 +1771,8 @@ extern void func_8014F1F4(void);
 extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2);
 extern s32 func_8014F24C(struct SubF24C *a0);
 extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2);
-extern s32 func_8014F468(void);
-extern int func_8014F6F4(void);
+extern s32 func_8014F468();
+extern int func_8014F6F4();
 extern s32 func_8014F3E8(s32 param_1);
 extern int func_8014F74C();
 extern s32 D_801152BC;