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 35973a46f..52f54bc8b 100644
--- a/src/ov_SC03_107/ov_SC03_107_jr_801549F8.c
+++ b/src/ov_SC03_107/ov_SC03_107_jr_801549F8.c
@@ -1172,7 +1172,7 @@ extern void func_80147118(s32 a0);
 extern void func_8014BDE8(s32 a0);
 extern short func_801508F8(s32 a0);
 extern void func_8014B5B0(s32 *a0);
-extern void func_80161D88(s32 a0);
+extern void func_80161D88();
 extern void func_801463A0(void);
 extern s32 D_80127098;
 extern s32 D_80127094;
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 9b80b9e22..a6d0ad1ed 100644
--- a/src/ov_SC03_107/ov_SC03_107_jr_801555F4.c
+++ b/src/ov_SC03_107/ov_SC03_107_jr_801555F4.c
@@ -1166,7 +1166,7 @@ extern void func_80147118(s32 a0);
 extern void func_8014BDE8(s32 a0);
 extern short func_801508F8(s32 a0);
 extern void func_8014B5B0(s32 *a0);
-extern void func_80161D88(s32 a0);
+extern void func_80161D88();
 extern void func_801463A0(void);
 extern s32 D_80127098;
 extern s32 D_80127094;
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 6891166ac..0faf6db12 100644
--- a/src/ov_SC03_107/ov_SC03_107_jr_801594E8.c
+++ b/src/ov_SC03_107/ov_SC03_107_jr_801594E8.c
@@ -1166,7 +1166,7 @@ extern void func_80147118(s32 a0);
 extern void func_8014BDE8(s32 a0);
 extern short func_801508F8(s32 a0);
 extern void func_8014B5B0(s32 *a0);
-extern void func_80161D88(s32 a0);
+extern void func_80161D88();
 extern void func_801463A0(void);
 extern s32 D_80127098;
 extern s32 D_80127094;
@@ -2060,7 +2060,7 @@ extern void func_80161450(void *a0);
 extern void func_80157A8C(int);
 extern void func_80154A74(int, int);
 extern void func_8015795C(int param_1);
-extern void func_80161D20(s32 a0, s32 a1);
+extern void func_80161D20();
 extern void func_80157A8C(s32 a0);
 extern void func_8016706C(s32 a0);
 extern u8 D_800D51AC[];
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 b3d9eb542..8e8dcb593 100644
--- a/src/ov_SC03_107/ov_SC03_107_jr_80159C84.c
+++ b/src/ov_SC03_107/ov_SC03_107_jr_80159C84.c
@@ -1163,7 +1163,7 @@ extern void func_80147118(s32 a0);
 extern void func_8014BDE8(s32 a0);
 extern short func_801508F8(s32 a0);
 extern void func_8014B5B0(s32 *a0);
-extern void func_80161D88(s32 a0);
+extern void func_80161D88();
 extern void func_801463A0(void);
 extern s32 D_80127098;
 extern s32 D_80127094;
@@ -2057,7 +2057,7 @@ extern void func_80161450(void *a0);
 extern void func_80157A8C(int);
 extern void func_80154A74(int, int);
 extern void func_8015795C(int param_1);
-extern void func_80161D20(s32 a0, s32 a1);
+extern void func_80161D20();
 extern void func_80157A8C(s32 a0);
 extern void func_8016706C(s32 a0);
 extern u8 D_800D51AC[];
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 07a4f7f18..80b9a8e22 100644
--- a/src/ov_SC03_107/ov_SC03_107_jr_8015A3C8.c
+++ b/src/ov_SC03_107/ov_SC03_107_jr_8015A3C8.c
@@ -1144,7 +1144,7 @@ extern void func_80147118(s32 a0);
 extern void func_8014BDE8(s32 a0);
 extern short func_801508F8(s32 a0);
 extern void func_8014B5B0(s32 *a0);
-extern void func_80161D88(s32 a0);
+extern void func_80161D88();
 extern void func_801463A0(void);
 extern s32 D_80127098;
 extern s32 D_80127094;
@@ -2037,7 +2037,7 @@ extern void func_80161450(void *a0);
 extern void func_80157A8C(int);
 extern void func_80154A74(int, int);
 extern void func_8015795C(int param_1);
-extern void func_80161D20(s32 a0, s32 a1);
+extern void func_80161D20();
 extern void func_80157A8C(s32 a0);
 extern void func_8016706C(s32 a0);
 extern u8 D_800D51AC[];
@@ -4848,7 +4848,12 @@ DEFINE_func_8015FA44()  /* dedup: shared engine-core @0x8015fa44 (src/shared) */
 DEFINE_func_8015FA78()  /* dedup: shared engine-core @0x8015fa78 (src/shared) */
 
 
-INCLUDE_ASM("asm/ov_SC03_107/nonmatchings/ov_SC03_107_jr_8015A3C8", func_8015FAAC);
+extern void (*D_80184E8C[])(void);
+
+    void func_8015FAAC(void *a0) {
+        D_80184E8C[*(u16 *)((s32)a0 + 0x2)]();
+    }
+
 
 
 extern s32 func_801612B8(void *a0, s32 a1);
@@ -5075,7 +5080,12 @@ DEFINE_func_801600D0()  /* dedup: shared engine-core @0x801600d0 (src/shared) */
 DEFINE_func_80160104()  /* dedup: shared engine-core @0x80160104 (src/shared) */
 
 
-INCLUDE_ASM("asm/ov_SC03_107/nonmatchings/ov_SC03_107_jr_8015A3C8", func_80160138);
+extern void (*D_80184F1C[])(void);
+
+    void func_80160138(void *a0) {
+        D_80184F1C[*(u16 *)((s32)a0 + 0x2)]();
+    }
+
 
 DEFINE_func_80160174()  /* dedup: shared engine-core @0x80160174 (src/shared) */
 
@@ -5118,7 +5128,12 @@ DEFINE_func_80160334()  /* dedup: shared engine-core @0x80160334 (src/shared) */
 DEFINE_func_80160368()  /* dedup: shared engine-core @0x80160368 (src/shared) */
 
 
-INCLUDE_ASM("asm/ov_SC03_107/nonmatchings/ov_SC03_107_jr_8015A3C8", func_8016039C);
+extern void (*D_80184F2C[])(void);
+
+    void func_8016039C(void *a0) {
+        D_80184F2C[*(u16 *)((s32)a0 + 0x2)]();
+    }
+
 
 DEFINE_func_801603D8()  /* dedup: shared engine-core @0x801603d8 (src/shared) */
 
@@ -5220,7 +5235,12 @@ DEFINE_func_801607E4()  /* dedup: shared engine-core @0x801607e4 (src/shared) */
 DEFINE_func_80160818()  /* dedup: shared engine-core @0x80160818 (src/shared) */
 
 
-INCLUDE_ASM("asm/ov_SC03_107/nonmatchings/ov_SC03_107_jr_8015A3C8", func_8016084C);
+extern void (*D_80184F34[])(void);
+
+    void func_8016084C(void *a0) {
+        D_80184F34[*(u16 *)((s32)a0 + 0x2)]();
+    }
+
 
 DEFINE_func_80160888()  /* dedup: shared engine-core @0x80160888 (src/shared) */
 
@@ -5293,7 +5313,13 @@ DEFINE_func_80160ACC()  /* dedup: shared engine-core @0x80160acc (src/shared) */
 DEFINE_func_80160B00()  /* dedup: shared engine-core @0x80160b00 (src/shared) */
 
 
-INCLUDE_ASM("asm/ov_SC03_107/nonmatchings/ov_SC03_107_jr_8015A3C8", func_80160B34);
+extern void (*D_80184F40[])(void);
+
+    s32 func_80160B34(void *a0)
+{
+        D_80184F40[*(u16 *)((s32)a0 + 0x2)]();
+    }
+
 
 DEFINE_func_80160B70()  /* dedup: shared engine-core @0x80160b70 (src/shared) */
 
@@ -5696,12 +5722,37 @@ void aF80161CD0(int param_1, unsigned int param_2)
 }
 
 
-INCLUDE_ASM("asm/ov_SC03_107/nonmatchings/ov_SC03_107_jr_8015A3C8", func_80161D20);
+extern void func_80147324(s32 arg0);
+extern u16 D_80184FA0[];
+
+    void func_80161D20(int param_1, u32 param_2)
+    {
+        if (param_2 < 8) {
+            func_80147324(D_80184FA0[param_2]);
+        }
+        return;
+    }
+
 
 DEFINE_func_80161D58()  /* dedup: shared engine-core @0x80161d58 (src/shared) */
 
 
-INCLUDE_ASM("asm/ov_SC03_107/nonmatchings/ov_SC03_107_jr_8015A3C8", func_80161D88);
+extern s32 D_800AE6A8;
+extern s32 D_800AE6B0;
+extern s32 D_80184FE4;
+extern s32 func_80029178(s32 arg);
+extern void func_80029124(s32, s32);
+extern void func_800D1734(void *);
+
+    void func_80161D88(void) {
+        if ((D_800AE6B0 & 0x80FFFFFF) == 0 && (D_800AE6A8 & 0x80FFFFFF) == 0 &&
+            (func_80029178(0x141) & 0xFF) != 0) {
+            func_80029124(0x141, 0);
+            func_80029124(0x95, 1);
+            func_800D1734(&D_80184FE4);
+        }
+    }
+
 
 extern s32 func_800291DC(s32);
 
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 c65f48d3a..fc45fa2db 100644
--- a/src/ov_SC03_107/ov_SC03_107_jr_8016AE5C.c
+++ b/src/ov_SC03_107/ov_SC03_107_jr_8016AE5C.c
@@ -1163,7 +1163,7 @@ extern void func_80147118(s32 a0);
 extern void func_8014BDE8(s32 a0);
 extern short func_801508F8(s32 a0);
 extern void func_8014B5B0(s32 *a0);
-extern void func_80161D88(s32 a0);
+extern void func_80161D88();
 extern void func_801463A0(void);
 extern s32 D_80127098;
 extern s32 D_80127094;
@@ -2057,7 +2057,7 @@ extern void func_80161450(void *a0);
 extern void func_80157A8C(int);
 extern void func_80154A74(int, int);
 extern void func_8015795C(int param_1);
-extern void func_80161D20(s32 a0, s32 a1);
+extern void func_80161D20();
 extern void func_80157A8C(s32 a0);
 extern void func_8016706C(s32 a0);
 extern u8 D_800D51AC[];
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 982ee7788..a96463db9 100644
--- a/src/ov_SC03_107/ov_SC03_107_jr_80171B4C.c
+++ b/src/ov_SC03_107/ov_SC03_107_jr_80171B4C.c
@@ -1207,7 +1207,7 @@ extern void func_80147118(s32 a0);
 extern void func_8014BDE8(s32 a0);
 extern short func_801508F8(s32 a0);
 extern void func_8014B5B0(s32 *a0);
-extern void func_80161D88(s32 a0);
+extern void func_80161D88();
 extern void func_801463A0(void);
 extern s32 D_80127098;
 extern s32 D_80127094;
@@ -2101,7 +2101,7 @@ extern void func_80161450(void *a0);
 extern void func_80157A8C(int);
 extern void func_80154A74(int, int);
 extern void func_8015795C(int param_1);
-extern void func_80161D20(s32 a0, s32 a1);
+extern void func_80161D20();
 extern void func_80157A8C(s32 a0);
 extern void func_8016706C(s32 a0);
 extern u8 D_800D51AC[];
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 3feb9a51e..f847f6f88 100644
--- a/src/ov_SC03_107/ov_SC03_107_jr_801789AC.c
+++ b/src/ov_SC03_107/ov_SC03_107_jr_801789AC.c
@@ -1242,7 +1242,7 @@ extern void func_80147118(s32 a0);
 extern void func_8014BDE8(s32 a0);
 extern short func_801508F8(s32 a0);
 extern void func_8014B5B0(s32 *a0);
-extern void func_80161D88(s32 a0);
+extern void func_80161D88();
 extern void func_801463A0(void);
 extern s32 D_80127098;
 extern s32 D_80127094;
@@ -2137,7 +2137,7 @@ extern void func_80161450(void *a0);
 extern void func_80157A8C(int);
 extern void func_80154A74(int, int);
 extern void func_8015795C(int param_1);
-extern void func_80161D20(s32 a0, s32 a1);
+extern void func_80161D20();
 extern void func_80157A8C(s32 a0);
 extern void func_8016706C(s32 a0);
 extern u8 D_800D51AC[];