From cbce26e2726bbc12d46b8d78c18718c4b2d804ae Mon Sep 17 00:00:00 2001
From: Drew T <50529377+Druthulu@users.noreply.github.com>
Date: Mon, 24 Aug 2026 22:42:53 -0600
Subject: [PATCH] =?UTF-8?q?feat(decomp):=20A-prop=20lane=20S59=20sweep=201?=
 =?UTF-8?q?=20=E2=80=94=2038=20banked=20of=2080=20staged,=20zero=20model?=
 =?UTF-8?q?=20tokens?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The population that banked 0/117 on three consecutive passes banks 38/80 with
the S59 fixes, attributed against the 21:04 baseline classes:
  29  the closeness-2 ordinal cluster (value/offset swap -> candidate pairing
      adjudicated by match_one at draft time)
   4  the near-0 TU-integration class (K&R definitions + the arity pre-pass;
      func_80162CCC x3 overlays among them — 42 engine_core.h caller decls
      kept no-proto for the banked set, byte-neutral for empty calls)
   5  drafts the old pipeline refused or mis-staged
Every bank is whole-binary SHA-verified by gate_stage/harvest_verify (G3/P9).
---
 src/ov_MAIN_012/ov_MAIN_012_jr_801549F8.c |  2 +-
 src/ov_MAIN_012/ov_MAIN_012_jr_801555F4.c |  2 +-
 src/ov_MAIN_012/ov_MAIN_012_jr_801594E8.c |  2 +-
 src/ov_MAIN_012/ov_MAIN_012_jr_80159C84.c |  2 +-
 src/ov_MAIN_012/ov_MAIN_012_jr_8015A3C8.c | 24 ++++++-
 src/ov_MAIN_012/ov_MAIN_012_jr_8016AE5C.c |  2 +-
 src/ov_MAIN_012/ov_MAIN_012_jr_80171B4C.c |  2 +-
 src/ov_MAIN_012/ov_MAIN_012_jr_801789AC.c |  2 +-
 src/ov_MAIN_012/ov_MAIN_012_jr_8017C3BC.c |  2 +-
 src/ov_MAIN_012/ov_MAIN_012_jr_8017CA18.c |  2 +-
 src/ov_MAIN_012/ov_MAIN_012_jr_8017CF3C.c |  2 +-
 src/ov_SC02_003/ov_SC02_003_jr_8018173C.c | 78 ++++++++++++++++++++-
 src/ov_SC02_011/ov_SC02_011_jr_8017AE2C.c | 12 +++-
 src/ov_SC02_016/ov_SC02_016_jr_8017DC70.c | 12 +++-
 src/ov_SC02_017/ov_SC02_017_jr_8017DF34.c | 12 +++-
 src/ov_SC02_037/ov_SC02_037_jr_801549F8.c |  2 +-
 src/ov_SC02_037/ov_SC02_037_jr_801555F4.c |  2 +-
 src/ov_SC02_037/ov_SC02_037_jr_801594E8.c |  2 +-
 src/ov_SC02_037/ov_SC02_037_jr_80159C84.c |  2 +-
 src/ov_SC02_037/ov_SC02_037_jr_8015A3C8.c | 24 ++++++-
 src/ov_SC02_037/ov_SC02_037_jr_8016AE5C.c |  2 +-
 src/ov_SC02_037/ov_SC02_037_jr_80171B4C.c |  2 +-
 src/ov_SC02_037/ov_SC02_037_jr_801789AC.c |  2 +-
 src/ov_SC02_037/ov_SC02_037_jr_8017AE2C.c |  2 +-
 src/ov_SC03_007/ov_SC03_007_jr_8017AE2C.c | 12 +++-
 src/ov_SC03_010/ov_SC03_010_jr_8017C730.c | 69 ++++++++++++++++++-
 src/ov_SC03_013/ov_SC03_013_jr_8017C730.c | 69 ++++++++++++++++++-
 src/ov_SC03_029/ov_SC03_029_jr_8017DC70.c | 43 +++++++++++-
 src/ov_SC03_031/ov_SC03_031_jr_8017DB5C.c | 13 +++-
 src/ov_SC03_095/ov_SC03_095_jr_8017BEBC.c | 38 +++++++++-
 src/ov_SC03_107/ov_SC03_107_jr_801549F8.c |  2 +-
 src/ov_SC03_107/ov_SC03_107_jr_801555F4.c |  2 +-
 src/ov_SC03_107/ov_SC03_107_jr_801594E8.c |  2 +-
 src/ov_SC03_107/ov_SC03_107_jr_80159C84.c |  2 +-
 src/ov_SC03_107/ov_SC03_107_jr_8015A3C8.c | 24 ++++++-
 src/ov_SC03_107/ov_SC03_107_jr_8016AE5C.c |  2 +-
 src/ov_SC03_107/ov_SC03_107_jr_80171B4C.c |  2 +-
 src/ov_SC03_107/ov_SC03_107_jr_801789AC.c |  2 +-
 src/ov_SC04_000/ov_SC04_000_jr_8017BEBC.c | 12 +++-
 src/ov_SC04_006/ov_SC04_006_jr_8017BEBC.c | 12 +++-
 src/ov_SC04_007/ov_SC04_007_jr_8017BEBC.c | 30 +++++++-
 src/ov_SC04_019/ov_SC04_019_jr_8017AE2C.c | 36 +++++++++-
 src/ov_SC04_019/ov_SC04_019_jr_80183E6C.c | 18 ++++-
 src/ov_SC05_017/ov_SC05_017_jr_8017AE2C.c | 72 +++++++++++++++++--
 src/ov_SC05_017/ov_SC05_017_jr_80182A74.c | 36 +++++++++-
 src/ov_SC06_011/ov_SC06_011_jr_8017BEBC.c | 13 +++-
 src/ov_SC06_018/ov_SC06_018_jr_8017C24C.c | 55 ++++++++++++++-
 src/ov_SC06_020/ov_SC06_020_jr_8017C24C.c | 15 +++-
 src/ov_SC06_024/ov_SC06_024_jr_801851E0.c | 12 +++-
 src/ov_SC06_032/ov_SC06_032_jr_8017C24C.c | 15 +++-
 src/shared/engine_core.h                  | 84 +++++++++++------------
 51 files changed, 778 insertions(+), 112 deletions(-)

diff --git a/src/ov_MAIN_012/ov_MAIN_012_jr_801549F8.c b/src/ov_MAIN_012/ov_MAIN_012_jr_801549F8.c
index df0e0bddd..7dfac32e7 100644
--- a/src/ov_MAIN_012/ov_MAIN_012_jr_801549F8.c
+++ b/src/ov_MAIN_012/ov_MAIN_012_jr_801549F8.c
@@ -1491,7 +1491,7 @@ extern void func_8014AB7C();
 extern void func_8014AC10();
 extern void func_8014AA28(void);
 extern void func_8014AB5C(void);
-extern void func_80162CCC(void);
+extern void func_80162CCC();
 extern void func_8014AB7C(s32 arg0);
 extern void func_8014ABF0(void);
 extern void func_8014AC10(s32 arg0);
diff --git a/src/ov_MAIN_012/ov_MAIN_012_jr_801555F4.c b/src/ov_MAIN_012/ov_MAIN_012_jr_801555F4.c
index a5367f34a..c7d291634 100644
--- a/src/ov_MAIN_012/ov_MAIN_012_jr_801555F4.c
+++ b/src/ov_MAIN_012/ov_MAIN_012_jr_801555F4.c
@@ -1485,7 +1485,7 @@ extern void func_8014AB7C();
 extern void func_8014AC10();
 extern void func_8014AA28(void);
 extern void func_8014AB5C(void);
-extern void func_80162CCC(void);
+extern void func_80162CCC();
 extern void func_8014AB7C(s32 arg0);
 extern void func_8014ABF0(void);
 extern void func_8014AC10(s32 arg0);
diff --git a/src/ov_MAIN_012/ov_MAIN_012_jr_801594E8.c b/src/ov_MAIN_012/ov_MAIN_012_jr_801594E8.c
index 942e95ae3..fc0b94ee8 100644
--- a/src/ov_MAIN_012/ov_MAIN_012_jr_801594E8.c
+++ b/src/ov_MAIN_012/ov_MAIN_012_jr_801594E8.c
@@ -1485,7 +1485,7 @@ extern void func_8014AB7C();
 extern void func_8014AC10();
 extern void func_8014AA28(void);
 extern void func_8014AB5C(void);
-extern void func_80162CCC(void);
+extern void func_80162CCC();
 extern void func_8014AB7C(s32 arg0);
 extern void func_8014ABF0(void);
 extern void func_8014AC10(s32 arg0);
diff --git a/src/ov_MAIN_012/ov_MAIN_012_jr_80159C84.c b/src/ov_MAIN_012/ov_MAIN_012_jr_80159C84.c
index 3b14e5b9c..5203d7647 100644
--- a/src/ov_MAIN_012/ov_MAIN_012_jr_80159C84.c
+++ b/src/ov_MAIN_012/ov_MAIN_012_jr_80159C84.c
@@ -1482,7 +1482,7 @@ extern void func_8014AB7C();
 extern void func_8014AC10();
 extern void func_8014AA28(void);
 extern void func_8014AB5C(void);
-extern void func_80162CCC(void);
+extern void func_80162CCC();
 extern void func_8014AB7C(s32 arg0);
 extern void func_8014ABF0(void);
 extern void func_8014AC10(s32 arg0);
diff --git a/src/ov_MAIN_012/ov_MAIN_012_jr_8015A3C8.c b/src/ov_MAIN_012/ov_MAIN_012_jr_8015A3C8.c
index ca7433250..d045b07d6 100644
--- a/src/ov_MAIN_012/ov_MAIN_012_jr_8015A3C8.c
+++ b/src/ov_MAIN_012/ov_MAIN_012_jr_8015A3C8.c
@@ -1463,7 +1463,7 @@ extern void func_8014AB7C();
 extern void func_8014AC10();
 extern void func_8014AA28(void);
 extern void func_8014AB5C(void);
-extern void func_80162CCC(void);
+extern void func_80162CCC();
 extern void func_8014AB7C(s32 arg0);
 extern void func_8014ABF0(void);
 extern void func_8014AC10(s32 arg0);
@@ -6162,7 +6162,25 @@ DEFINE_func_80162B1C()  /* dedup: shared engine-core @0x80162b1c (src/shared) */
 void func_80162CC4(void) {
 }
 
-INCLUDE_ASM("asm/ov_MAIN_012/nonmatchings/ov_MAIN_012_jr_8015A3C8", func_80162CCC);
+extern void func_80016714(void *a0, s32 a1);
+
+    void func_80162CCC(a0)
+u8 *a0;
+{
+        u8 *s0 = a0;
+        u16 *p = *(u16 **)(s0 + 0x20);
+        if (p != 0) {
+            s32 a1;
+            if (*p == 1) {
+                a1 = 0x84;
+            } else {
+                a1 = 0x38;
+            }
+            func_80016714(p, a1);
+        }
+        func_80016714(s0, 0x68);
+    }
+
 
 DEFINE_func_80162D28()  /* dedup: shared engine-core @0x80162d28 (src/shared) */
 
@@ -6524,7 +6542,7 @@ void func_801647A4(int param_1) {
 DEFINE_func_80164864()  /* dedup: shared engine-core @0x80164864 (src/shared) */
 
 
-extern void func_80162CCC(void);
+extern void func_80162CCC();
 extern void func_80164ACC();
 
 // @class: regalloc-order — wave-3 real-TU crack (§42a); cracked at Max.
diff --git a/src/ov_MAIN_012/ov_MAIN_012_jr_8016AE5C.c b/src/ov_MAIN_012/ov_MAIN_012_jr_8016AE5C.c
index 39801d8a2..a94cab2a0 100644
--- a/src/ov_MAIN_012/ov_MAIN_012_jr_8016AE5C.c
+++ b/src/ov_MAIN_012/ov_MAIN_012_jr_8016AE5C.c
@@ -1483,7 +1483,7 @@ extern void func_8014AB7C();
 extern void func_8014AC10();
 extern void func_8014AA28(void);
 extern void func_8014AB5C(void);
-extern void func_80162CCC(void);
+extern void func_80162CCC();
 extern void func_8014AB7C(s32 arg0);
 extern void func_8014ABF0(void);
 extern void func_8014AC10(s32 arg0);
diff --git a/src/ov_MAIN_012/ov_MAIN_012_jr_80171B4C.c b/src/ov_MAIN_012/ov_MAIN_012_jr_80171B4C.c
index 0b36fa86a..2fb05edf2 100644
--- a/src/ov_MAIN_012/ov_MAIN_012_jr_80171B4C.c
+++ b/src/ov_MAIN_012/ov_MAIN_012_jr_80171B4C.c
@@ -1527,7 +1527,7 @@ extern void func_8014AB7C();
 extern void func_8014AC10();
 extern void func_8014AA28(void);
 extern void func_8014AB5C(void);
-extern void func_80162CCC(void);
+extern void func_80162CCC();
 extern void func_8014AB7C(s32 arg0);
 extern void func_8014ABF0(void);
 extern void func_8014AC10(s32 arg0);
diff --git a/src/ov_MAIN_012/ov_MAIN_012_jr_801789AC.c b/src/ov_MAIN_012/ov_MAIN_012_jr_801789AC.c
index 60832e019..80cd15ac4 100644
--- a/src/ov_MAIN_012/ov_MAIN_012_jr_801789AC.c
+++ b/src/ov_MAIN_012/ov_MAIN_012_jr_801789AC.c
@@ -1563,7 +1563,7 @@ extern void func_8014AB7C();
 extern void func_8014AC10();
 extern void func_8014AA28(void);
 extern void func_8014AB5C(void);
-extern void func_80162CCC(void);
+extern void func_80162CCC();
 extern void func_8014AB7C(s32 arg0);
 extern void func_8014ABF0(void);
 extern void func_8014AC10(s32 arg0);
diff --git a/src/ov_MAIN_012/ov_MAIN_012_jr_8017C3BC.c b/src/ov_MAIN_012/ov_MAIN_012_jr_8017C3BC.c
index d2b1fb7da..cec5ed72b 100644
--- a/src/ov_MAIN_012/ov_MAIN_012_jr_8017C3BC.c
+++ b/src/ov_MAIN_012/ov_MAIN_012_jr_8017C3BC.c
@@ -1569,7 +1569,7 @@ extern void func_8014AB7C();
 extern void func_8014AC10();
 extern void func_8014AA28(void);
 extern void func_8014AB5C(void);
-extern void func_80162CCC(void);
+extern void func_80162CCC();
 extern void func_8014AB7C(s32 arg0);
 extern void func_8014ABF0(void);
 extern void func_8014AC10(s32 arg0);
diff --git a/src/ov_MAIN_012/ov_MAIN_012_jr_8017CA18.c b/src/ov_MAIN_012/ov_MAIN_012_jr_8017CA18.c
index 6c65c9e6d..8af38d099 100644
--- a/src/ov_MAIN_012/ov_MAIN_012_jr_8017CA18.c
+++ b/src/ov_MAIN_012/ov_MAIN_012_jr_8017CA18.c
@@ -1569,7 +1569,7 @@ extern void func_8014AB7C();
 extern void func_8014AC10();
 extern void func_8014AA28(void);
 extern void func_8014AB5C(void);
-extern void func_80162CCC(void);
+extern void func_80162CCC();
 extern void func_8014AB7C(s32 arg0);
 extern void func_8014ABF0(void);
 extern void func_8014AC10(s32 arg0);
diff --git a/src/ov_MAIN_012/ov_MAIN_012_jr_8017CF3C.c b/src/ov_MAIN_012/ov_MAIN_012_jr_8017CF3C.c
index 8e34c0c3a..d1d3ece29 100644
--- a/src/ov_MAIN_012/ov_MAIN_012_jr_8017CF3C.c
+++ b/src/ov_MAIN_012/ov_MAIN_012_jr_8017CF3C.c
@@ -1569,7 +1569,7 @@ extern void func_8014AB7C();
 extern void func_8014AC10();
 extern void func_8014AA28(void);
 extern void func_8014AB5C(void);
-extern void func_80162CCC(void);
+extern void func_80162CCC();
 extern void func_8014AB7C(s32 arg0);
 extern void func_8014ABF0(void);
 extern void func_8014AC10(s32 arg0);
diff --git a/src/ov_SC02_003/ov_SC02_003_jr_8018173C.c b/src/ov_SC02_003/ov_SC02_003_jr_8018173C.c
index b303ccc45..24ca11d8f 100644
--- a/src/ov_SC02_003/ov_SC02_003_jr_8018173C.c
+++ b/src/ov_SC02_003/ov_SC02_003_jr_8018173C.c
@@ -2806,9 +2806,44 @@ DEFINE_func_80181934()  /* dedup: shared engine-core @0x80181934 (src/shared) */
 
 DEFINE_func_801819F4()  /* dedup: shared engine-core @0x801819F4 (src/shared) */
 
-INCLUDE_ASM("asm/ov_SC02_003/nonmatchings/ov_SC02_003_jr_8018173C", func_80181A94);
+extern u8 D_80126948[];
+extern void func_8012A094(s32 a0);
+extern void func_80181AD4();
+extern void func_80181D2C(u8*);
+
+void func_80181A94() {
+    extern u8 D_80126948[];
+    extern void func_80181AD4();
+    extern void func_8012A094(s32 a0);
+    extern void func_80181D2C(u8 *a0);
+    func_80181AD4(D_80126948);
+    func_8012A094((s32)D_80126948);
+    func_80181D2C(D_80126948);
+}
+
+
+extern s16 D_801274E8;
+extern u16 D_80126B5E;
+extern void func_8012A018(s32 a, s32 b);
+extern void func_80181D2C(u8*);
+
+void func_80181AD4(arg0)
+void *arg0;
+{
+    D_801274E8 = D_80126B5E;
+    *(s32 *)((s32)arg0 + 0xC) = 0x12C;
+    *(s32 *)((s32)arg0 + 0x14) = 0x190;
+    *(s16 *)((s32)arg0 + 0x20) = 0x80;
+    *(s16 *)((s32)arg0 + 0x22) = 0x800;
+    *(s16 *)((s32)arg0 + 0x30) = -0x80;
+    *(s16 *)((s32)arg0 + 0x24) = 0;
+    *(s16 *)((s32)arg0 + 0x2E) = 0;
+    *(s16 *)((s32)arg0 + 0x32) = -0xC8;
+    *(s32 *)((s32)arg0 + 0x9C) = 0;
+    *(u8 *)((s32)arg0 + 0xA0) = 0;
+    func_8012A018((s32)func_80181D2C, 2);
+}
 
-INCLUDE_ASM("asm/ov_SC02_003/nonmatchings/ov_SC02_003_jr_8018173C", func_80181AD4);
 
 DEFINE_func_80181B4C()  /* dedup: shared engine-core @0x80181B4C (src/shared) */
 
@@ -3426,7 +3461,44 @@ void func_80183C9C(s32 a0) {
 
 INCLUDE_ASM("asm/ov_SC02_003/nonmatchings/ov_SC02_003_jr_8018173C", func_80183D80);
 
-INCLUDE_ASM("asm/ov_SC02_003/nonmatchings/ov_SC02_003_jr_8018173C", func_80183DD8);
+
+extern s32 D_801DF720;
+extern s32 D_801DFBA8;
+extern void func_8001C214(s32 a0, s32 a1);
+extern void func_8014659C(void);
+extern void func_80146CA0(void *a0);
+extern void func_80146E90(s32 *a0, s32 a1);
+extern void func_80149374(s32 a0, s32 a1);
+
+void func_80183DD8(a0)
+s32 a0;
+{
+    extern void func_8001C214(s32 a0, s32 a1);
+    extern s32 D_801DFBA8;
+    extern s32 D_801DF720;
+
+    s32 iVar1;
+    s32 iVar2;
+    s32 iVar3;
+    s32 iVar4;
+
+    iVar2 = *(s32 *)(a0 + 0x4c);
+    iVar1 = ((s32 (*)(void))func_8014659C)();
+    *(s32 *)(a0 + 0x20) = iVar1;
+    if (iVar1 != 0) {
+        func_8001C214(iVar1, (s32)&D_801DFBA8);
+        *(s32 *)(iVar1 + 4) |= 0x40;
+        *(s32 *)(iVar1 + 0x20) = (s32)&D_801DF720;
+        func_80149374(iVar2, a0 + 4);
+        iVar3 = *(s32 *)(a0 + 0x20);
+        iVar4 = *(s32 *)(iVar2 + 0x20);
+        *(Blk16 *)(iVar3 + 0x34) = *(Blk16 *)(iVar4 + 0x34);
+        *(Blk16 *)(iVar3 + 0x44) = *(Blk16 *)(iVar4 + 0x44);
+        func_80146E90((s32 *)a0, 0x10);
+        func_80146CA0((void *)a0);
+    }
+}
+
 
 extern void func_80146CA0(void *a0);
 extern void func_80146DE8(s32 *a0, s32 a1, s32 a2, s32 a3);
diff --git a/src/ov_SC02_011/ov_SC02_011_jr_8017AE2C.c b/src/ov_SC02_011/ov_SC02_011_jr_8017AE2C.c
index ea7146b39..1b46b401b 100644
--- a/src/ov_SC02_011/ov_SC02_011_jr_8017AE2C.c
+++ b/src/ov_SC02_011/ov_SC02_011_jr_8017AE2C.c
@@ -10987,7 +10987,17 @@ void func_8018964C(void *arg0) {
 }
 
 
-INCLUDE_ASM("asm/ov_SC02_011/nonmatchings/ov_SC02_011_jr_8017AE2C", func_80189674);
+extern short D_801D4494;
+extern void func_8012A828(s32 a0, void *a1);
+
+void func_80189674(a0)
+s32 a0;
+{
+    *(s16 *)(a0 + 0x2) = 14;
+    func_8012A828(a0, &(*(u8 *)&D_801D4494));
+    *(s32 *)(a0 + 0x1C) = 0x1e;
+}
+
 
 #include "common.h"
 
diff --git a/src/ov_SC02_016/ov_SC02_016_jr_8017DC70.c b/src/ov_SC02_016/ov_SC02_016_jr_8017DC70.c
index a1160e3c4..380e2debe 100644
--- a/src/ov_SC02_016/ov_SC02_016_jr_8017DC70.c
+++ b/src/ov_SC02_016/ov_SC02_016_jr_8017DC70.c
@@ -4427,7 +4427,17 @@ void func_80181E18(void *arg0) {
 }
 
 
-INCLUDE_ASM("asm/ov_SC02_016/nonmatchings/ov_SC02_016_jr_8017DC70", func_80181E40);
+extern u8 D_801B02EC[];
+extern void func_8012A828(s32, s32);
+
+void func_80181E40(a0)
+s32 a0;
+{
+    *(s16 *)(a0 + 0x2) = 14;
+    func_8012A828(a0, &(*(u8 *)D_801B02EC));
+    *(s32 *)(a0 + 0x1C) = 0x1e;
+}
+
 
 extern u16 D_80126B62;
 extern s32 func_8012B8E4(s32 arg0, s32 arg1);
diff --git a/src/ov_SC02_017/ov_SC02_017_jr_8017DF34.c b/src/ov_SC02_017/ov_SC02_017_jr_8017DF34.c
index 46d0b9eeb..30ec0beb2 100644
--- a/src/ov_SC02_017/ov_SC02_017_jr_8017DF34.c
+++ b/src/ov_SC02_017/ov_SC02_017_jr_8017DF34.c
@@ -7834,7 +7834,17 @@ void func_80187840(void *arg0) {
 }
 
 
-INCLUDE_ASM("asm/ov_SC02_017/nonmatchings/ov_SC02_017_jr_8017DF34", func_80187868);
+extern u8 D_801E190C[];
+extern void func_8012A828(s32 a0, void *a1);
+
+void func_80187868(a0)
+s32 a0;
+{
+    *(s16 *)(a0 + 0x2) = 14;
+    func_8012A828(a0, &(*(u8 *)D_801E190C));
+    *(s32 *)(a0 + 0x1C) = 0x1e;
+}
+
 
 extern s32 func_8012B8E4(s32 arg0, s32 arg1);
 extern s32 func_8012BEE8(s32 a0);
diff --git a/src/ov_SC02_037/ov_SC02_037_jr_801549F8.c b/src/ov_SC02_037/ov_SC02_037_jr_801549F8.c
index 70c4c638a..2d699d70e 100644
--- a/src/ov_SC02_037/ov_SC02_037_jr_801549F8.c
+++ b/src/ov_SC02_037/ov_SC02_037_jr_801549F8.c
@@ -1508,7 +1508,7 @@ extern void func_8014AB7C();
 extern void func_8014AC10();
 extern void func_8014AA28(void);
 extern void func_8014AB5C(void);
-extern void func_80162CCC(void);
+extern void func_80162CCC();
 extern void func_8014AB7C(s32 arg0);
 extern void func_8014ABF0(void);
 extern void func_8014AC10(s32 arg0);
diff --git a/src/ov_SC02_037/ov_SC02_037_jr_801555F4.c b/src/ov_SC02_037/ov_SC02_037_jr_801555F4.c
index 81b3ffb41..97de84523 100644
--- a/src/ov_SC02_037/ov_SC02_037_jr_801555F4.c
+++ b/src/ov_SC02_037/ov_SC02_037_jr_801555F4.c
@@ -1502,7 +1502,7 @@ extern void func_8014AB7C();
 extern void func_8014AC10();
 extern void func_8014AA28(void);
 extern void func_8014AB5C(void);
-extern void func_80162CCC(void);
+extern void func_80162CCC();
 extern void func_8014AB7C(s32 arg0);
 extern void func_8014ABF0(void);
 extern void func_8014AC10(s32 arg0);
diff --git a/src/ov_SC02_037/ov_SC02_037_jr_801594E8.c b/src/ov_SC02_037/ov_SC02_037_jr_801594E8.c
index 6956be86d..e7e01aa13 100644
--- a/src/ov_SC02_037/ov_SC02_037_jr_801594E8.c
+++ b/src/ov_SC02_037/ov_SC02_037_jr_801594E8.c
@@ -1502,7 +1502,7 @@ extern void func_8014AB7C();
 extern void func_8014AC10();
 extern void func_8014AA28(void);
 extern void func_8014AB5C(void);
-extern void func_80162CCC(void);
+extern void func_80162CCC();
 extern void func_8014AB7C(s32 arg0);
 extern void func_8014ABF0(void);
 extern void func_8014AC10(s32 arg0);
diff --git a/src/ov_SC02_037/ov_SC02_037_jr_80159C84.c b/src/ov_SC02_037/ov_SC02_037_jr_80159C84.c
index 961dc3b07..555bf5190 100644
--- a/src/ov_SC02_037/ov_SC02_037_jr_80159C84.c
+++ b/src/ov_SC02_037/ov_SC02_037_jr_80159C84.c
@@ -1499,7 +1499,7 @@ extern void func_8014AB7C();
 extern void func_8014AC10();
 extern void func_8014AA28(void);
 extern void func_8014AB5C(void);
-extern void func_80162CCC(void);
+extern void func_80162CCC();
 extern void func_8014AB7C(s32 arg0);
 extern void func_8014ABF0(void);
 extern void func_8014AC10(s32 arg0);
diff --git a/src/ov_SC02_037/ov_SC02_037_jr_8015A3C8.c b/src/ov_SC02_037/ov_SC02_037_jr_8015A3C8.c
index 411f57ecc..fe313f67e 100644
--- a/src/ov_SC02_037/ov_SC02_037_jr_8015A3C8.c
+++ b/src/ov_SC02_037/ov_SC02_037_jr_8015A3C8.c
@@ -1481,7 +1481,7 @@ extern void func_8014AB7C();
 extern void func_8014AC10();
 extern void func_8014AA28(void);
 extern void func_8014AB5C(void);
-extern void func_80162CCC(void);
+extern void func_80162CCC();
 extern void func_8014AB7C(s32 arg0);
 extern void func_8014ABF0(void);
 extern void func_8014AC10(s32 arg0);
@@ -6184,7 +6184,25 @@ DEFINE_func_80162B1C()  /* dedup: shared engine-core @0x80162b1c (src/shared) */
 void func_80162CC4(void) {
 }
 
-INCLUDE_ASM("asm/ov_SC02_037/nonmatchings/ov_SC02_037_jr_8015A3C8", func_80162CCC);
+extern void func_80016714(void *a0, s32 a1);
+
+    void func_80162CCC(a0)
+u8 *a0;
+{
+        u8 *s0 = a0;
+        u16 *p = *(u16 **)(s0 + 0x20);
+        if (p != 0) {
+            s32 a1;
+            if (*p == 1) {
+                a1 = 0x84;
+            } else {
+                a1 = 0x38;
+            }
+            func_80016714(p, a1);
+        }
+        func_80016714(s0, 0x68);
+    }
+
 
 DEFINE_func_80162D28()  /* dedup: shared engine-core @0x80162d28 (src/shared) */
 
@@ -6547,7 +6565,7 @@ void func_801647A4(int param_1) {
 DEFINE_func_80164864()  /* dedup: shared engine-core @0x80164864 (src/shared) */
 
 
-extern void func_80162CCC(void);
+extern void func_80162CCC();
 extern void func_80164ACC();
 
 // @class: regalloc-order — wave-3 real-TU crack (§42a); cracked at Max.
diff --git a/src/ov_SC02_037/ov_SC02_037_jr_8016AE5C.c b/src/ov_SC02_037/ov_SC02_037_jr_8016AE5C.c
index d1566332e..1cb4d1bfc 100644
--- a/src/ov_SC02_037/ov_SC02_037_jr_8016AE5C.c
+++ b/src/ov_SC02_037/ov_SC02_037_jr_8016AE5C.c
@@ -1501,7 +1501,7 @@ extern void func_8014AB7C();
 extern void func_8014AC10();
 extern void func_8014AA28(void);
 extern void func_8014AB5C(void);
-extern void func_80162CCC(void);
+extern void func_80162CCC();
 extern void func_8014AB7C(s32 arg0);
 extern void func_8014ABF0(void);
 extern void func_8014AC10(s32 arg0);
diff --git a/src/ov_SC02_037/ov_SC02_037_jr_80171B4C.c b/src/ov_SC02_037/ov_SC02_037_jr_80171B4C.c
index fce64d005..ebb40515f 100644
--- a/src/ov_SC02_037/ov_SC02_037_jr_80171B4C.c
+++ b/src/ov_SC02_037/ov_SC02_037_jr_80171B4C.c
@@ -1545,7 +1545,7 @@ extern void func_8014AB7C();
 extern void func_8014AC10();
 extern void func_8014AA28(void);
 extern void func_8014AB5C(void);
-extern void func_80162CCC(void);
+extern void func_80162CCC();
 extern void func_8014AB7C(s32 arg0);
 extern void func_8014ABF0(void);
 extern void func_8014AC10(s32 arg0);
diff --git a/src/ov_SC02_037/ov_SC02_037_jr_801789AC.c b/src/ov_SC02_037/ov_SC02_037_jr_801789AC.c
index 364e3bbb0..742efa8d3 100644
--- a/src/ov_SC02_037/ov_SC02_037_jr_801789AC.c
+++ b/src/ov_SC02_037/ov_SC02_037_jr_801789AC.c
@@ -1582,7 +1582,7 @@ extern void func_8014AB7C();
 extern void func_8014AC10();
 extern void func_8014AA28(void);
 extern void func_8014AB5C(void);
-extern void func_80162CCC(void);
+extern void func_80162CCC();
 extern void func_8014AB7C(s32 arg0);
 extern void func_8014ABF0(void);
 extern void func_8014AC10(s32 arg0);
diff --git a/src/ov_SC02_037/ov_SC02_037_jr_8017AE2C.c b/src/ov_SC02_037/ov_SC02_037_jr_8017AE2C.c
index 6b44774ab..82ba89828 100644
--- a/src/ov_SC02_037/ov_SC02_037_jr_8017AE2C.c
+++ b/src/ov_SC02_037/ov_SC02_037_jr_8017AE2C.c
@@ -1582,7 +1582,7 @@ extern void func_8014AB7C();
 extern void func_8014AC10();
 extern void func_8014AA28(void);
 extern void func_8014AB5C(void);
-extern void func_80162CCC(void);
+extern void func_80162CCC();
 extern void func_8014AB7C(s32 arg0);
 extern void func_8014ABF0(void);
 extern void func_8014AC10(s32 arg0);
diff --git a/src/ov_SC03_007/ov_SC03_007_jr_8017AE2C.c b/src/ov_SC03_007/ov_SC03_007_jr_8017AE2C.c
index 5133207e6..10c308290 100644
--- a/src/ov_SC03_007/ov_SC03_007_jr_8017AE2C.c
+++ b/src/ov_SC03_007/ov_SC03_007_jr_8017AE2C.c
@@ -4505,7 +4505,17 @@ void func_8017E2C0(s32 a0) {
 }
 
 
-INCLUDE_ASM("asm/ov_SC03_007/nonmatchings/ov_SC03_007_jr_8017AE2C", func_8017E2FC);
+extern u8 D_801BB034;
+extern void func_8012A828(s32 a0, void *a1);
+
+void func_8017E2FC(a0)
+s32 a0;
+{
+    *(s16 *)(a0 + 0x2) = 5;
+    func_8012A828(a0, &D_801BB034);
+    *(s32 *)(a0 + 0x1C) = 0x17;
+}
+
 
 
 extern s32 func_8012BEE8(s32 arg);
diff --git a/src/ov_SC03_010/ov_SC03_010_jr_8017C730.c b/src/ov_SC03_010/ov_SC03_010_jr_8017C730.c
index 1760e8d65..5ebe5cf41 100644
--- a/src/ov_SC03_010/ov_SC03_010_jr_8017C730.c
+++ b/src/ov_SC03_010/ov_SC03_010_jr_8017C730.c
@@ -4386,11 +4386,74 @@ void func_8017FA5C(void *a0)
 }
 
 
-INCLUDE_ASM("asm/ov_SC03_010/nonmatchings/ov_SC03_010_jr_8017C730", func_8017FAD4);
+extern void func_8012B0B4(unsigned int *param_1, int param_2, int param_3);
 
-INCLUDE_ASM("asm/ov_SC03_010/nonmatchings/ov_SC03_010_jr_8017C730", func_8017FB4C);
+void func_8017FAD4(a0)
+void *a0;
+{
+    s32 result;
+
+    func_8012B0B4((unsigned int *)&result, *(int *)((s32)a0 + 0xDC), 0x100);
+
+    *(s32 *)((s32)a0 + 0x8) = result;
+    *(s16 *)((s32)a0 + 0xA) += *(s16 *)((s32)a0 + 0xE2);
+    *(s32 *)((s32)a0 + 0xDC) += 0x18;
+
+    if (*(s32 *)((s32)a0 + 0xDC) < 0x800) {
+        return;
+    }
+
+    *(s16 *)((s32)a0 + 0x34) = 3;
+    *(s16 *)((s32)a0 + 0x2) = 1;
+    *(s32 *)((s32)a0 + 0x1C) = 0xA;
+}
+
+
+extern void func_8012B0B4(unsigned int *param_1, int param_2, int param_3);
+
+void func_8017FB4C(a0)
+void *a0;
+{
+    s32 result;
+
+    func_8012B0B4((unsigned int *)&result, *(int *)((s32)a0 + 0xDC), 0x100);
+
+    *(s32 *)((s32)a0 + 0x8) = result;
+    *(s16 *)((s32)a0 + 0xA) += *(s16 *)((s32)a0 + 0xE2);
+    *(s32 *)((s32)a0 + 0xDC) += 0x18;
+
+    if (*(s32 *)((s32)a0 + 0xDC) < 0x800) {
+        return;
+    }
+
+    *(s16 *)((s32)a0 + 0x34) = 4;
+    *(s16 *)((s32)a0 + 0x2) = 1;
+    *(s32 *)((s32)a0 + 0x1C) = 0xA;
+}
+
+
+extern void func_8012B0B4(unsigned int *param_1, int param_2, int param_3);
+
+void func_8017FBC4(a0)
+void *a0;
+{
+    s32 result;
+
+    func_8012B0B4((unsigned int *)&result, *(int *)((s32)a0 + 0xDC), 0x100);
+
+    *(s32 *)((s32)a0 + 0x8) = result;
+    *(s16 *)((s32)a0 + 0xA) += *(s16 *)((s32)a0 + 0xE2);
+    *(s32 *)((s32)a0 + 0xDC) += 0x18;
+
+    if (*(s32 *)((s32)a0 + 0xDC) < 0x1000) {
+        return;
+    }
+
+    *(s16 *)((s32)a0 + 0x34) = 3;
+    *(s16 *)((s32)a0 + 0x2) = 1;
+    *(s32 *)((s32)a0 + 0x1C) = 0xA;
+}
 
-INCLUDE_ASM("asm/ov_SC03_010/nonmatchings/ov_SC03_010_jr_8017C730", func_8017FBC4);
 
 
 extern void func_8012B0B4(unsigned int *param_1, int param_2, int param_3);
diff --git a/src/ov_SC03_013/ov_SC03_013_jr_8017C730.c b/src/ov_SC03_013/ov_SC03_013_jr_8017C730.c
index 264859343..f82503e0e 100644
--- a/src/ov_SC03_013/ov_SC03_013_jr_8017C730.c
+++ b/src/ov_SC03_013/ov_SC03_013_jr_8017C730.c
@@ -4628,11 +4628,74 @@ void func_80180A94(void *a0)
 }
 
 
-INCLUDE_ASM("asm/ov_SC03_013/nonmatchings/ov_SC03_013_jr_8017C730", func_80180B0C);
+extern void func_8012B0B4(unsigned int *param_1, int param_2, int param_3);
 
-INCLUDE_ASM("asm/ov_SC03_013/nonmatchings/ov_SC03_013_jr_8017C730", func_80180B84);
+void func_80180B0C(a0)
+void *a0;
+{
+    s32 result;
+
+    func_8012B0B4((unsigned int *)&result, *(int *)((s32)a0 + 0xDC), 0x100);
+
+    *(s32 *)((s32)a0 + 0x8) = result;
+    *(s16 *)((s32)a0 + 0xA) += *(s16 *)((s32)a0 + 0xE2);
+    *(s32 *)((s32)a0 + 0xDC) += 0x18;
+
+    if (*(s32 *)((s32)a0 + 0xDC) < 0x800) {
+        return;
+    }
+
+    *(s16 *)((s32)a0 + 0x34) = 3;
+    *(s16 *)((s32)a0 + 0x2) = 1;
+    *(s32 *)((s32)a0 + 0x1C) = 0xA;
+}
+
+
+extern void func_8012B0B4(unsigned int *param_1, int param_2, int param_3);
+
+void func_80180B84(a0)
+void *a0;
+{
+    s32 result;
+
+    func_8012B0B4((unsigned int *)&result, *(int *)((s32)a0 + 0xDC), 0x100);
+
+    *(s32 *)((s32)a0 + 0x8) = result;
+    *(s16 *)((s32)a0 + 0xA) += *(s16 *)((s32)a0 + 0xE2);
+    *(s32 *)((s32)a0 + 0xDC) += 0x18;
+
+    if (*(s32 *)((s32)a0 + 0xDC) < 0x800) {
+        return;
+    }
+
+    *(s16 *)((s32)a0 + 0x34) = 4;
+    *(s16 *)((s32)a0 + 0x2) = 1;
+    *(s32 *)((s32)a0 + 0x1C) = 0xA;
+}
+
+
+extern void func_8012B0B4(unsigned int *param_1, int param_2, int param_3);
+
+void func_80180BFC(a0)
+void *a0;
+{
+    s32 result;
+
+    func_8012B0B4((unsigned int *)&result, *(int *)((s32)a0 + 0xDC), 0x100);
+
+    *(s32 *)((s32)a0 + 0x8) = result;
+    *(s16 *)((s32)a0 + 0xA) += *(s16 *)((s32)a0 + 0xE2);
+    *(s32 *)((s32)a0 + 0xDC) += 0x18;
+
+    if (*(s32 *)((s32)a0 + 0xDC) < 0x1000) {
+        return;
+    }
+
+    *(s16 *)((s32)a0 + 0x34) = 3;
+    *(s16 *)((s32)a0 + 0x2) = 1;
+    *(s32 *)((s32)a0 + 0x1C) = 0xA;
+}
 
-INCLUDE_ASM("asm/ov_SC03_013/nonmatchings/ov_SC03_013_jr_8017C730", func_80180BFC);
 
 
 extern void func_8012B0B4(unsigned int *param_1, int param_2, int param_3);
diff --git a/src/ov_SC03_029/ov_SC03_029_jr_8017DC70.c b/src/ov_SC03_029/ov_SC03_029_jr_8017DC70.c
index c8102079c..11c5779a7 100644
--- a/src/ov_SC03_029/ov_SC03_029_jr_8017DC70.c
+++ b/src/ov_SC03_029/ov_SC03_029_jr_8017DC70.c
@@ -5848,7 +5848,7 @@ struct Mtx32_80184008 { s32 w[8]; };
 
 extern void func_8012B23C(s32 a0);
 extern s32  func_80184520(s32 a0);
-extern s32  func_80184580(void *a0, void *a1);
+extern s32  func_80184580();
 extern void func_8012ADE4(s32 a0);
 extern s32  func_8012B864(s32 a0);
 extern void RotMatrixY(s32 a0, void *a1);
@@ -6130,7 +6130,46 @@ s32 func_80184520(s32 a0) {
 }
 
 
-INCLUDE_ASM("asm/ov_SC03_029/nonmatchings/ov_SC03_029_jr_8017DC70", func_80184580);
+
+extern s32 func_80133784(s32 a0, void *a1, s32 a2);
+extern s32 func_80134510(s32 arg);
+
+s32 func_80184580(a0, a1)
+void *a0;
+SVECTOR *a1;
+{
+    SVECTOR tmp;
+    SVECTOR in;
+    SVECTOR out;
+
+    if ((func_80133784(1, a0, (s32)a1) & 0x8000) != 0) {
+        return 0;
+    }
+
+    tmp.vx = a1->vx;
+    tmp.vy = a1->vy;
+    tmp.vz = a1->vz;
+
+    if (func_80134510((s32)&tmp) == 0) {
+        return 0;
+    }
+
+    in.vx = tmp.vx;
+    in.vy = tmp.vy;
+    in.vz = tmp.vz;
+    out.vx = tmp.vx;
+    out.vy = tmp.vy + 8;
+    out.vz = tmp.vz;
+
+    if ((func_80133784(1, &in, (s32)&out) & 0x2000) == 0
+        || *((u8 *)&out + 6) != 2) {
+        a1->vy = tmp.vy;
+        return 1;
+    }
+
+    return 0;
+}
+
 
 
 extern void (*D_801C4954[])(void);
diff --git a/src/ov_SC03_031/ov_SC03_031_jr_8017DB5C.c b/src/ov_SC03_031/ov_SC03_031_jr_8017DB5C.c
index 8540f1e1d..fe9719b80 100644
--- a/src/ov_SC03_031/ov_SC03_031_jr_8017DB5C.c
+++ b/src/ov_SC03_031/ov_SC03_031_jr_8017DB5C.c
@@ -4172,7 +4172,18 @@ void func_801811EC(void *a0)
 }
 
 
-INCLUDE_ASM("asm/ov_SC03_031/nonmatchings/ov_SC03_031_jr_8017DB5C", func_801813B4);
+extern char D_801BF364[];
+extern void func_8012A828(s32*, s32);
+
+void func_801813B4(param_1)
+int param_1;
+{
+    *(short *)(param_1 + 2) = 4;
+    *(short *)(param_1 + 0x34) = 0;
+    func_8012A828(param_1, &D_801BF364);
+    *(int *)(param_1 + 0x1c) = 0x14;
+}
+
 
 INCLUDE_ASM("asm/ov_SC03_031/nonmatchings/ov_SC03_031_jr_8017DB5C", func_801813F8);
 
diff --git a/src/ov_SC03_095/ov_SC03_095_jr_8017BEBC.c b/src/ov_SC03_095/ov_SC03_095_jr_8017BEBC.c
index f8bb1df20..bd5395275 100644
--- a/src/ov_SC03_095/ov_SC03_095_jr_8017BEBC.c
+++ b/src/ov_SC03_095/ov_SC03_095_jr_8017BEBC.c
@@ -3487,11 +3487,45 @@ void func_8017D618(s32 a0) {
 }
 
 
-INCLUDE_ASM("asm/ov_SC03_095/nonmatchings/ov_SC03_095_jr_8017BEBC", func_8017D704);
+extern void func_8012CBA4(s32 a0);
+extern void func_8012DFD4(u8 *a0);
+
+void func_8017D704(a0)
+s32 a0;
+{
+    s32 t;
+
+    func_8012CBA4(a0);
+    t = *(s32 *)(a0 + 0x1C) - 1;
+    *(s32 *)(a0 + 0x1C) = t;
+    if (t == 0) {
+        *(s32 *)(a0 + 0x1C) = 0x1e;
+        *(s16 *)(a0 + 0x2) = 0x4;
+    }
+    func_8012DFD4((u8 *)a0);
+}
+
 
 INCLUDE_ASM("asm/ov_SC03_095/nonmatchings/ov_SC03_095_jr_8017BEBC", func_8017D758);
 
-INCLUDE_ASM("asm/ov_SC03_095/nonmatchings/ov_SC03_095_jr_8017BEBC", func_8017D7B0);
+extern void func_8012CBA4(s32 a0);
+extern void func_8012DFD4(u8 *a0);
+
+void func_8017D7B0(a0)
+s32 a0;
+{
+    s32 t;
+
+    func_8012CBA4(a0);
+    t = *(s32 *)(a0 + 0x1C) - 1;
+    *(s32 *)(a0 + 0x1C) = t;
+    if (t == 0) {
+        *(s32 *)(a0 + 0x1C) = 0x1e;
+        *(s16 *)(a0 + 0x2) = 0x4;
+    }
+    func_8012DFD4((u8 *)a0);
+}
+
 
 
 extern void func_8012DFD4(u8 *a0);
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 52f54bc8b..6ffe9476f 100644
--- a/src/ov_SC03_107/ov_SC03_107_jr_801549F8.c
+++ b/src/ov_SC03_107/ov_SC03_107_jr_801549F8.c
@@ -1495,7 +1495,7 @@ extern void func_8014AB7C();
 extern void func_8014AC10();
 extern void func_8014AA28(void);
 extern void func_8014AB5C(void);
-extern void func_80162CCC(void);
+extern void func_80162CCC();
 extern void func_8014AB7C(s32 arg0);
 extern void func_8014ABF0(void);
 extern void func_8014AC10(s32 arg0);
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 a6d0ad1ed..b989399b3 100644
--- a/src/ov_SC03_107/ov_SC03_107_jr_801555F4.c
+++ b/src/ov_SC03_107/ov_SC03_107_jr_801555F4.c
@@ -1489,7 +1489,7 @@ extern void func_8014AB7C();
 extern void func_8014AC10();
 extern void func_8014AA28(void);
 extern void func_8014AB5C(void);
-extern void func_80162CCC(void);
+extern void func_80162CCC();
 extern void func_8014AB7C(s32 arg0);
 extern void func_8014ABF0(void);
 extern void func_8014AC10(s32 arg0);
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 0faf6db12..4c10fd579 100644
--- a/src/ov_SC03_107/ov_SC03_107_jr_801594E8.c
+++ b/src/ov_SC03_107/ov_SC03_107_jr_801594E8.c
@@ -1489,7 +1489,7 @@ extern void func_8014AB7C();
 extern void func_8014AC10();
 extern void func_8014AA28(void);
 extern void func_8014AB5C(void);
-extern void func_80162CCC(void);
+extern void func_80162CCC();
 extern void func_8014AB7C(s32 arg0);
 extern void func_8014ABF0(void);
 extern void func_8014AC10(s32 arg0);
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 8e8dcb593..ca3e3261f 100644
--- a/src/ov_SC03_107/ov_SC03_107_jr_80159C84.c
+++ b/src/ov_SC03_107/ov_SC03_107_jr_80159C84.c
@@ -1486,7 +1486,7 @@ extern void func_8014AB7C();
 extern void func_8014AC10();
 extern void func_8014AA28(void);
 extern void func_8014AB5C(void);
-extern void func_80162CCC(void);
+extern void func_80162CCC();
 extern void func_8014AB7C(s32 arg0);
 extern void func_8014ABF0(void);
 extern void func_8014AC10(s32 arg0);
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 80b9a8e22..9fefd35ae 100644
--- a/src/ov_SC03_107/ov_SC03_107_jr_8015A3C8.c
+++ b/src/ov_SC03_107/ov_SC03_107_jr_8015A3C8.c
@@ -1467,7 +1467,7 @@ extern void func_8014AB7C();
 extern void func_8014AC10();
 extern void func_8014AA28(void);
 extern void func_8014AB5C(void);
-extern void func_80162CCC(void);
+extern void func_80162CCC();
 extern void func_8014AB7C(s32 arg0);
 extern void func_8014ABF0(void);
 extern void func_8014AC10(s32 arg0);
@@ -6201,7 +6201,25 @@ DEFINE_func_80162B1C()  /* dedup: shared engine-core @0x80162b1c (src/shared) */
 void func_80162CC4(void) {
 }
 
-INCLUDE_ASM("asm/ov_SC03_107/nonmatchings/ov_SC03_107_jr_8015A3C8", func_80162CCC);
+extern void func_80016714(void *a0, s32 a1);
+
+    void func_80162CCC(a0)
+u8 *a0;
+{
+        u8 *s0 = a0;
+        u16 *p = *(u16 **)(s0 + 0x20);
+        if (p != 0) {
+            s32 a1;
+            if (*p == 1) {
+                a1 = 0x84;
+            } else {
+                a1 = 0x38;
+            }
+            func_80016714(p, a1);
+        }
+        func_80016714(s0, 0x68);
+    }
+
 
 DEFINE_func_80162D28()  /* dedup: shared engine-core @0x80162d28 (src/shared) */
 
@@ -6563,7 +6581,7 @@ void func_801647A4(int param_1) {
 DEFINE_func_80164864()  /* dedup: shared engine-core @0x80164864 (src/shared) */
 
 
-extern void func_80162CCC(void);
+extern void func_80162CCC();
 extern void func_80164ACC();
 
 // @class: regalloc-order — wave-3 real-TU crack (§42a); cracked at Max.
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 fc45fa2db..7f5a7806f 100644
--- a/src/ov_SC03_107/ov_SC03_107_jr_8016AE5C.c
+++ b/src/ov_SC03_107/ov_SC03_107_jr_8016AE5C.c
@@ -1487,7 +1487,7 @@ extern void func_8014AB7C();
 extern void func_8014AC10();
 extern void func_8014AA28(void);
 extern void func_8014AB5C(void);
-extern void func_80162CCC(void);
+extern void func_80162CCC();
 extern void func_8014AB7C(s32 arg0);
 extern void func_8014ABF0(void);
 extern void func_8014AC10(s32 arg0);
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 a96463db9..4475ce3c0 100644
--- a/src/ov_SC03_107/ov_SC03_107_jr_80171B4C.c
+++ b/src/ov_SC03_107/ov_SC03_107_jr_80171B4C.c
@@ -1531,7 +1531,7 @@ extern void func_8014AB7C();
 extern void func_8014AC10();
 extern void func_8014AA28(void);
 extern void func_8014AB5C(void);
-extern void func_80162CCC(void);
+extern void func_80162CCC();
 extern void func_8014AB7C(s32 arg0);
 extern void func_8014ABF0(void);
 extern void func_8014AC10(s32 arg0);
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 c1ea5b72d..ab01e9fdf 100644
--- a/src/ov_SC03_107/ov_SC03_107_jr_801789AC.c
+++ b/src/ov_SC03_107/ov_SC03_107_jr_801789AC.c
@@ -1563,7 +1563,7 @@ extern void func_8014AB7C();
 extern void func_8014AC10();
 extern void func_8014AA28(void);
 extern void func_8014AB5C(void);
-extern void func_80162CCC(void);
+extern void func_80162CCC();
 extern void func_8014AB7C(s32 arg0);
 extern void func_8014ABF0(void);
 extern void func_8014AC10(s32 arg0);
diff --git a/src/ov_SC04_000/ov_SC04_000_jr_8017BEBC.c b/src/ov_SC04_000/ov_SC04_000_jr_8017BEBC.c
index f9f9b17b3..f436b657f 100644
--- a/src/ov_SC04_000/ov_SC04_000_jr_8017BEBC.c
+++ b/src/ov_SC04_000/ov_SC04_000_jr_8017BEBC.c
@@ -5801,7 +5801,17 @@ void func_80181208(s32 a0) {
 }
 
 
-INCLUDE_ASM("asm/ov_SC04_000/nonmatchings/ov_SC04_000_jr_8017BEBC", func_80181248);
+extern u8 D_801A69C8;
+extern void func_8012A828(s32, s32);
+
+void func_80181248(a0)
+s32 a0;
+{
+    *(s16 *)(a0 + 0x2) = 6;
+    func_8012A828(a0, &D_801A69C8);
+    *(s32 *)(a0 + 0x1C) = 0x17;
+}
+
 
 extern s32 func_8012BEE8(s32 a0);
     void func_80181288(s32 arg0) {
diff --git a/src/ov_SC04_006/ov_SC04_006_jr_8017BEBC.c b/src/ov_SC04_006/ov_SC04_006_jr_8017BEBC.c
index d30469703..996803bc7 100644
--- a/src/ov_SC04_006/ov_SC04_006_jr_8017BEBC.c
+++ b/src/ov_SC04_006/ov_SC04_006_jr_8017BEBC.c
@@ -4367,7 +4367,17 @@ void func_8017EAA0(s32 a0) {
 }
 
 
-INCLUDE_ASM("asm/ov_SC04_006/nonmatchings/ov_SC04_006_jr_8017BEBC", func_8017EAE0);
+extern u8 D_8019AE0C;
+extern void func_8012A828(s32, s32);
+
+void func_8017EAE0(a0)
+s32 a0;
+{
+    *(s16 *)(a0 + 0x2) = 6;
+    func_8012A828(a0, &D_8019AE0C);
+    *(s32 *)(a0 + 0x1C) = 0x17;
+}
+
 
 extern s32 func_8012BEE8(s32 arg);
     void func_8017EB20(void *a0) {
diff --git a/src/ov_SC04_007/ov_SC04_007_jr_8017BEBC.c b/src/ov_SC04_007/ov_SC04_007_jr_8017BEBC.c
index 71e0fb031..76afd1bbd 100644
--- a/src/ov_SC04_007/ov_SC04_007_jr_8017BEBC.c
+++ b/src/ov_SC04_007/ov_SC04_007_jr_8017BEBC.c
@@ -5829,7 +5829,35 @@ void func_80180894(s32 param_1, s32 param_2)
 
 INCLUDE_ASM("asm/ov_SC04_007/nonmatchings/ov_SC04_007_jr_8017BEBC", func_80180B64);
 
-INCLUDE_ASM("asm/ov_SC04_007/nonmatchings/ov_SC04_007_jr_8017BEBC", func_80180CA0);
+extern u8 D_801A0A84[];
+extern s32 func_8012C354(s32 a0, s32 a1);
+extern s32 func_80143994(s32 a0, s32 a1);
+extern u8 D_80198034[];
+extern u8 D_80198150[];
+extern void func_8012A828(s32, s32);
+extern void func_8012B2CC(s32 a0);
+
+void func_80180CA0(a0)
+s32 a0;
+{
+    extern u8 D_80198034[];
+    extern u8 D_80198150[];
+    extern u8 D_801A0A84[];
+
+    if (func_8012C354(a0, (s32)D_80198034) != 0) {
+        *(u8 *)(a0 + 0xC0) = 1;
+        *(s32 *)(a0 + 0xBC) = (s32)D_80198150;
+        *(s32 *)(a0 + 0xB4) = -1;
+        ((void (*)(s32, void *))func_8012A828)(a0, (void *)&(*(s32 *)D_801A0A84));
+        func_80143994(a0, 0x2000);
+        *(s16 *)(a0 + 0x2) = 3;
+        *(s32 *)(a0 + 0xEC) = rand();
+        *(s32 *)(a0 + 0xF0) = (rand() % 32) + 0x10;
+        *(s32 *)(a0 + 0xF4) = 2;
+        func_8012B2CC(a0);
+    }
+}
+
 
 INCLUDE_ASM("asm/ov_SC04_007/nonmatchings/ov_SC04_007_jr_8017BEBC", func_80180D50);
 
diff --git a/src/ov_SC04_019/ov_SC04_019_jr_8017AE2C.c b/src/ov_SC04_019/ov_SC04_019_jr_8017AE2C.c
index 061491ae2..30d117d3f 100644
--- a/src/ov_SC04_019/ov_SC04_019_jr_8017AE2C.c
+++ b/src/ov_SC04_019/ov_SC04_019_jr_8017AE2C.c
@@ -5801,7 +5801,23 @@ void func_80180618(void *arg0) {
 }
 
 
-INCLUDE_ASM("asm/ov_SC04_019/nonmatchings/ov_SC04_019_jr_8017AE2C", func_8018067C);
+extern int func_80178970(void);
+extern s32 D_801B9DF8;
+extern void func_8012A828(s32 *a0, s32 a1);
+extern void func_80178D18(void);
+
+void func_8018067C(arg0)
+void * arg0;
+{
+
+    extern s32 D_801B9DF8;
+    if (func_80178970() != 0) {
+        ((void (*)(s32))func_80178D18)((s32)arg0);
+        *(short *)((char *)arg0 + 0x2) = 3;
+        ((void (*)(s32, s32))func_8012A828)((int)arg0, (int)&(*(short *)&D_801B9DF8));
+    }
+}
+
 
 extern void func_80185F54(void *, s32, s32);
 extern s32 func_80185BE0(s32);
@@ -7379,7 +7395,23 @@ extern s32 func_80184FA4(void);
 
 INCLUDE_ASM("asm/ov_SC04_019/nonmatchings/ov_SC04_019_jr_8017AE2C", func_80183BC4);
 
-INCLUDE_ASM("asm/ov_SC04_019/nonmatchings/ov_SC04_019_jr_8017AE2C", func_80183C28);
+extern int func_80178970(void);
+extern s32 D_801B9C50;
+extern void func_8012A828(s32 *a0, s32 a1);
+extern void func_80178D18(void);
+
+void func_80183C28(arg0)
+void * arg0;
+{
+
+    extern s32 D_801B9C50;
+    if (func_80178970() != 0) {
+        ((void (*)(s32))func_80178D18)((s32)arg0);
+        *(short *)((char *)arg0 + 0x2) = 3;
+        ((void (*)(s32, s32))func_8012A828)((int)arg0, (int)&(*(short *)&D_801B9C50));
+    }
+}
+
 
 extern s32 func_80184FA4(void);
 extern short D_80192150;
diff --git a/src/ov_SC04_019/ov_SC04_019_jr_80183E6C.c b/src/ov_SC04_019/ov_SC04_019_jr_80183E6C.c
index 145b3c4ba..7415b76dd 100644
--- a/src/ov_SC04_019/ov_SC04_019_jr_80183E6C.c
+++ b/src/ov_SC04_019/ov_SC04_019_jr_80183E6C.c
@@ -3204,7 +3204,23 @@ void func_801843C4(s32 *a0) {
 }
 
 
-INCLUDE_ASM("asm/ov_SC04_019/nonmatchings/ov_SC04_019_jr_80183E6C", func_80184410);
+extern int func_80178970(void);
+extern short D_8019224C;
+extern void func_80178D18(void);
+extern void func_80184CB8(s32 *a0, s32 a1);
+
+void func_80184410(arg0)
+void * arg0;
+{
+
+    extern short D_8019224C;
+    if (func_80178970() != 0) {
+        ((void (*)(s32))func_80178D18)((s32)arg0);
+        *(short *)((char *)arg0 + 0x2) = 12;
+        ((void (*)(s32, s32))func_80184CB8)((int)arg0, (int)&D_8019224C);
+    }
+}
+
 
 
 
diff --git a/src/ov_SC05_017/ov_SC05_017_jr_8017AE2C.c b/src/ov_SC05_017/ov_SC05_017_jr_8017AE2C.c
index f494abfac..d3e6e1afe 100644
--- a/src/ov_SC05_017/ov_SC05_017_jr_8017AE2C.c
+++ b/src/ov_SC05_017/ov_SC05_017_jr_8017AE2C.c
@@ -5139,7 +5139,23 @@ void func_8017EF78(s32 a0) {
 }
 
 
-INCLUDE_ASM("asm/ov_SC05_017/nonmatchings/ov_SC05_017_jr_8017AE2C", func_8017EFFC);
+extern int func_80178970(void);
+extern s32 D_801B9DB4;
+extern void func_8012A828(s32, s32);
+extern void func_80178D18(void);
+
+void func_8017EFFC(arg0)
+void * arg0;
+{
+
+    extern s32 D_801B9DB4;
+    if (func_80178970() != 0) {
+        ((void (*)(s32))func_80178D18)((s32)arg0);
+        *(short *)((char *)arg0 + 0x2) = 3;
+        ((void (*)(s32, s32))func_8012A828)((int)arg0, (int)&(*(short *)&D_801B9DB4));
+    }
+}
+
 
 void func_8017F04C(void *a0) {
     extern short D_80191160;
@@ -5764,7 +5780,23 @@ void func_8017FE28(void *arg0) {
 
 INCLUDE_ASM("asm/ov_SC05_017/nonmatchings/ov_SC05_017_jr_8017AE2C", func_8017FEBC);
 
-INCLUDE_ASM("asm/ov_SC05_017/nonmatchings/ov_SC05_017_jr_8017AE2C", func_8017FF6C);
+extern int func_80178970(void);
+extern short D_80191364;
+extern void func_80178D18(void);
+extern void func_801849B8(s32 *a0, s32 a1);
+
+void func_8017FF6C(arg0)
+void * arg0;
+{
+
+    extern short D_80191364;
+    if (func_80178970() != 0) {
+        ((void (*)(s32))func_80178D18)((s32)arg0);
+        *(short *)((char *)arg0 + 0x2) = 5;
+        ((void (*)(s32, s32))func_801849B8)((int)arg0, (int)&D_80191364);
+    }
+}
+
 
 
 extern void func_80178CBC(s32 a0, s32 a1);
@@ -6587,7 +6619,23 @@ ladder_done:
 }
 
 
-INCLUDE_ASM("asm/ov_SC05_017/nonmatchings/ov_SC05_017_jr_8017AE2C", func_80181414);
+extern int func_80178970(void);
+extern short D_80191530;
+extern void func_80178D18(void);
+extern void func_801849B8(s32 *a0, s32 a1);
+
+void func_80181414(arg0)
+void * arg0;
+{
+
+    extern short D_80191530;
+    if (func_80178970() != 0) {
+        ((void (*)(s32))func_80178D18)((s32)arg0);
+        *(short *)((char *)arg0 + 0x2) = 5;
+        ((void (*)(s32, s32))func_801849B8)((int)arg0, (int)&D_80191530);
+    }
+}
+
 
 
 extern void func_80178CBC(s32 a0, s32 a1);
@@ -7177,7 +7225,23 @@ void func_80182410(int param_1)
 
 INCLUDE_ASM("asm/ov_SC05_017/nonmatchings/ov_SC05_017_jr_8017AE2C", func_80182448);
 
-INCLUDE_ASM("asm/ov_SC05_017/nonmatchings/ov_SC05_017_jr_8017AE2C", func_801824AC);
+extern int func_80178970(void);
+extern s32 D_801B9C0C;
+extern void func_8012A828(s32, s32);
+extern void func_80178D18(void);
+
+void func_801824AC(arg0)
+void * arg0;
+{
+
+    extern s32 D_801B9C0C;
+    if (func_80178970() != 0) {
+        ((void (*)(s32))func_80178D18)((s32)arg0);
+        *(short *)((char *)arg0 + 0x2) = 3;
+        ((void (*)(s32, s32))func_8012A828)((int)arg0, (int)&(*(short *)&D_801B9C0C));
+    }
+}
+
 
 extern s32 func_80184CA4(s32 a0);
 extern short D_80191AB8;
diff --git a/src/ov_SC05_017/ov_SC05_017_jr_80182A74.c b/src/ov_SC05_017/ov_SC05_017_jr_80182A74.c
index ddd70cdb9..c10bd7967 100644
--- a/src/ov_SC05_017/ov_SC05_017_jr_80182A74.c
+++ b/src/ov_SC05_017/ov_SC05_017_jr_80182A74.c
@@ -3035,7 +3035,23 @@ void func_80182DCC(s32 *a0) {
 }
 
 
-INCLUDE_ASM("asm/ov_SC05_017/nonmatchings/ov_SC05_017_jr_80182A74", func_80182E18);
+extern int func_80178970(void);
+extern short D_80191C44;
+extern void func_80178D18(void);
+extern void func_801849B8(s32 *a0, s32 a1);
+
+void func_80182E18(arg0)
+void * arg0;
+{
+
+    extern short D_80191C44;
+    if (func_80178970() != 0) {
+        ((void (*)(s32))func_80178D18)((s32)arg0);
+        *(short *)((char *)arg0 + 0x2) = 6;
+        ((void (*)(s32, s32))func_801849B8)((int)arg0, (int)&D_80191C44);
+    }
+}
+
 
 
 extern s32 func_801848AC(s32 arg0, s32 arg1);
@@ -3050,7 +3066,23 @@ void func_80182E68(s32 *a0) {
 }
 
 
-INCLUDE_ASM("asm/ov_SC05_017/nonmatchings/ov_SC05_017_jr_80182A74", func_80182EB4);
+extern int func_80178970(void);
+extern short D_80191C44;
+extern void func_80178D18(void);
+extern void func_801849B8(s32 *a0, s32 a1);
+
+void func_80182EB4(arg0)
+void * arg0;
+{
+
+    extern short D_80191C44;
+    if (func_80178970() != 0) {
+        ((void (*)(s32))func_80178D18)((s32)arg0);
+        *(short *)((char *)arg0 + 0x2) = 12;
+        ((void (*)(s32, s32))func_801849B8)((int)arg0, (int)&D_80191C44);
+    }
+}
+
 
 
 
diff --git a/src/ov_SC06_011/ov_SC06_011_jr_8017BEBC.c b/src/ov_SC06_011/ov_SC06_011_jr_8017BEBC.c
index e518467a2..f7429dc6e 100644
--- a/src/ov_SC06_011/ov_SC06_011_jr_8017BEBC.c
+++ b/src/ov_SC06_011/ov_SC06_011_jr_8017BEBC.c
@@ -4738,7 +4738,18 @@ void func_8017FAB4(s32 a0)
 }
 
 
-INCLUDE_ASM("asm/ov_SC06_011/nonmatchings/ov_SC06_011_jr_8017BEBC", func_8017FC7C);
+extern char D_801A8CE8[];
+extern void func_8012A828(s32 *a0, s32 a1);
+
+void func_8017FC7C(param_1)
+int param_1;
+{
+    *(short *)(param_1 + 2) = 4;
+    *(short *)(param_1 + 0x34) = 0;
+    func_8012A828(param_1, &D_801A8CE8);
+    *(int *)(param_1 + 0x1c) = 0x14;
+}
+
 
 extern u8 D_801A0848[];
 extern s32 D_801A88F8;
diff --git a/src/ov_SC06_018/ov_SC06_018_jr_8017C24C.c b/src/ov_SC06_018/ov_SC06_018_jr_8017C24C.c
index 5abb244b7..75dc8dbd0 100644
--- a/src/ov_SC06_018/ov_SC06_018_jr_8017C24C.c
+++ b/src/ov_SC06_018/ov_SC06_018_jr_8017C24C.c
@@ -6826,7 +6826,48 @@ void func_80183444(void *a0)
 }
 
 
-INCLUDE_ASM("asm/ov_SC06_018/nonmatchings/ov_SC06_018_jr_8017C24C", func_80183464);
+extern s32 func_8012C354(s32 a0, void *a1);
+extern u8 D_801AD514[];
+extern u8 D_801AD548[];
+extern u8 D_801B244C[];
+extern u8 D_801B4A8C[];
+extern void func_8001C214(s32 a0, s32 a1);
+extern void func_8012A828(s32 a0, void *a1);
+extern void func_8012B030();
+extern void func_8012B23C(s32 a0);
+
+void func_80183464(a0)
+s32 a0;
+{
+
+    extern u8 D_801AD514[];
+    extern u8 D_801B244C[];
+    extern u8 D_801B4A8C[];
+    extern u8 D_801AD548[];
+
+    s32 v0;
+
+    v0 = func_8012C354(a0, (s32)D_801AD514);
+    if (v0 != 0) {
+        if (*(s16 *)(a0 + 0x70) != 0) {
+            func_8001C214(*(s32 *)(a0 + 0x20), (s32)D_801B244C);
+        }
+        *(u8 *)(a0 + 0xC0) = 1;
+        *(s32 *)(a0 + 0xB4) = 0xFFFFDFDF;
+        func_8012B030(a0);
+        *(s16 *)(a0 + 0xAE) = 0x2100;
+        func_8012A828(a0, D_801B4A8C);
+        *(u16 *)(a0 + 2) = *(u16 *)(a0 + 2) + 1;
+        func_8012B23C(a0);
+        *(void **)(a0 + 0xBC) = D_801AD548;
+        *(u32 *)(a0 + 0xC4) = *(u32 *)(a0 + 0xC4) | 2;
+        *(u16 *)(*(s32 *)(a0 + 0x20) + 0x2C) = *(u16 *)(*(s32 *)(a0 + 0x20) + 0x2C) | 0x10;
+        *(s16 *)(*(s32 *)(a0 + 0x20) + 0x18) = 0x2400;
+        *(s16 *)(*(s32 *)(a0 + 0x20) + 0x1A) = 0x2400;
+        *(s16 *)(*(s32 *)(a0 + 0x20) + 0x1C) = 0x2400;
+    }
+}
+
 
 void func_80183554(void) {
 }
@@ -8185,7 +8226,17 @@ void func_80185320(s32 p) {
 }
 
 
-INCLUDE_ASM("asm/ov_SC06_018/nonmatchings/ov_SC06_018_jr_8017C24C", func_80185400);
+extern u8 D_801CC358[];
+extern void func_8012A828(s32 a0, void *a1);
+
+void func_80185400(a0)
+s32 a0;
+{
+    *(s16 *)(a0 + 0x2) = 27;
+    func_8012A828(a0, &(*(u8 *)D_801CC358));
+    *(s32 *)(a0 + 0x1C) = 0x20;
+}
+
 
 extern u8 D_801B5164[];
 extern void func_8012F214(s32, s32, s32);
diff --git a/src/ov_SC06_020/ov_SC06_020_jr_8017C24C.c b/src/ov_SC06_020/ov_SC06_020_jr_8017C24C.c
index a6fd6c4f9..3f03997bb 100644
--- a/src/ov_SC06_020/ov_SC06_020_jr_8017C24C.c
+++ b/src/ov_SC06_020/ov_SC06_020_jr_8017C24C.c
@@ -3783,7 +3783,20 @@ void func_8017E4E0(s32 p)
 }
 
 
-INCLUDE_ASM("asm/ov_SC06_020/nonmatchings/ov_SC06_020_jr_8017C24C", func_8017E630);
+extern s32 D_801B5D08;
+extern void func_8012A828(s32 a0, void *a1);
+
+void func_8017E630(arg0)
+void *arg0;
+{
+    extern void func_8012A828(s32, void*);
+    extern s32 D_801B5D08;
+
+    ((void (*)(void *, void *))func_8012A828)(arg0, &D_801B5D08);
+    *(s16 *)((u8 *)arg0 + 0x2) = 0xd;
+    *(s32 *)((u8 *)arg0 + 0x1C) = 0x28;
+}
+
 
 INCLUDE_ASM("asm/ov_SC06_020/nonmatchings/ov_SC06_020_jr_8017C24C", func_8017E670);
 
diff --git a/src/ov_SC06_024/ov_SC06_024_jr_801851E0.c b/src/ov_SC06_024/ov_SC06_024_jr_801851E0.c
index 180ae9779..835ef88de 100644
--- a/src/ov_SC06_024/ov_SC06_024_jr_801851E0.c
+++ b/src/ov_SC06_024/ov_SC06_024_jr_801851E0.c
@@ -3156,7 +3156,17 @@ void func_8018588C(s32 p) {
 }
 
 
-INCLUDE_ASM("asm/ov_SC06_024/nonmatchings/ov_SC06_024_jr_801851E0", func_8018596C);
+extern short D_801D33F4;
+extern void func_8012A828(s32 a0, void *a1);
+
+void func_8018596C(a0)
+s32 a0;
+{
+    *(s16 *)(a0 + 0x2) = 27;
+    func_8012A828(a0, &(*(u8 *)&D_801D33F4));
+    *(s32 *)(a0 + 0x1C) = 0x20;
+}
+
 
 INCLUDE_ASM("asm/ov_SC06_024/nonmatchings/ov_SC06_024_jr_801851E0", func_801859AC);
 
diff --git a/src/ov_SC06_032/ov_SC06_032_jr_8017C24C.c b/src/ov_SC06_032/ov_SC06_032_jr_8017C24C.c
index 69ef40ab4..36356815d 100644
--- a/src/ov_SC06_032/ov_SC06_032_jr_8017C24C.c
+++ b/src/ov_SC06_032/ov_SC06_032_jr_8017C24C.c
@@ -4396,7 +4396,20 @@ void func_8017F114(s32 p)
 }
 
 
-INCLUDE_ASM("asm/ov_SC06_032/nonmatchings/ov_SC06_032_jr_8017C24C", func_8017F264);
+extern s32 D_801BD968;
+extern void func_8012A828(s32 a0, void *a1);
+
+void func_8017F264(arg0)
+void *arg0;
+{
+    extern void func_8012A828(s32, void*);
+    extern s32 D_801BD968;
+
+    ((void (*)(void *, void *))func_8012A828)(arg0, &D_801BD968);
+    *(s16 *)((u8 *)arg0 + 0x2) = 0xd;
+    *(s32 *)((u8 *)arg0 + 0x1C) = 0x28;
+}
+
 
 // @class: plumbing
 extern void func_8012F214(s32, s32, s32);
diff --git a/src/shared/engine_core.h b/src/shared/engine_core.h
index e1aec8438..3dc571787 100644
--- a/src/shared/engine_core.h
+++ b/src/shared/engine_core.h
@@ -337,7 +337,7 @@
     extern void func_8014659C(void); \
     extern void func_8001C810(s32 a0, s32 a1); \
     extern void func_80146CA0(void *a0); \
-    extern void func_80162CCC(void); \
+    extern void func_80162CCC(); \
     extern u16 D_800DF2E0; \
     extern s32 D_8018F510; \
     extern s32 D_8018F56C[]; \
@@ -9054,7 +9054,7 @@
     extern void func_8014AC10(); \
     extern void func_8014AA28(void); \
     extern void func_8014AB5C(void); \
-    extern void func_80162CCC(void); \
+    extern void func_80162CCC(); \
     extern void func_8014AB7C(s32 arg0); \
     extern void func_8014ABF0(void); \
     extern void func_80016714(void *a0, s32 a1); \
@@ -14851,7 +14851,7 @@
     extern void func_8014AC10(); \
     extern void func_8014AA28(void); \
     extern void func_8014AB5C(void); \
-    extern void func_80162CCC(void); \
+    extern void func_80162CCC(); \
     extern void func_8014AB7C(s32 arg0); \
     extern void func_8014ABF0(void); \
     extern void func_80016714(void *a0, s32 a1); \
@@ -18426,7 +18426,7 @@
     extern void func_8014AC10(); \
     extern void func_8014AA28(void); \
     extern void func_8014AB5C(void); \
-    extern void func_80162CCC(void); \
+    extern void func_80162CCC(); \
     extern void func_8014AB7C(s32 arg0); \
     extern void func_8014ABF0(void); \
     extern void func_80016714(void *a0, s32 a1); \
@@ -23626,7 +23626,7 @@
     extern void func_8014AC10(); \
     extern void func_8014AA28(void); \
     extern void func_8014AB5C(void); \
-    extern void func_80162CCC(void); \
+    extern void func_80162CCC(); \
     extern void func_8014AB7C(s32 arg0); \
     extern void func_8014ABF0(void); \
     extern void func_80016714(void *a0, s32 a1); \
@@ -26169,7 +26169,7 @@
     extern void func_8014AC10(); \
     extern void func_8014AA28(void); \
     extern void func_8014AB5C(void); \
-    extern void func_80162CCC(void); \
+    extern void func_80162CCC(); \
     extern void func_8014AB7C(s32 arg0); \
     extern void func_8014ABF0(void); \
     extern void func_80016714(void *a0, s32 a1); \
@@ -27151,7 +27151,7 @@
     extern void func_8014AC10(); \
     extern void func_8014AA28(void); \
     extern void func_8014AB5C(void); \
-    extern void func_80162CCC(void); \
+    extern void func_80162CCC(); \
     extern void func_8014AB7C(s32 arg0); \
     extern void func_8014ABF0(void); \
     extern void func_80016714(void *a0, s32 a1); \
@@ -30359,7 +30359,7 @@
     extern void func_8014AC10(); \
     extern void func_8014AA28(void); \
     extern void func_8014AB5C(void); \
-    extern void func_80162CCC(void); \
+    extern void func_80162CCC(); \
     extern void func_8014AB7C(s32 arg0); \
     extern void func_8014ABF0(void); \
     extern void func_80016714(void *a0, s32 a1); \
@@ -34057,7 +34057,7 @@
     extern void func_8014AC10(); \
     extern void func_8014AA28(void); \
     extern void func_8014AB5C(void); \
-    extern void func_80162CCC(void); \
+    extern void func_80162CCC(); \
     extern void func_8014AB7C(s32 arg0); \
     extern void func_8014ABF0(void); \
     extern void func_80016714(void *a0, s32 a1); \
@@ -37664,7 +37664,7 @@
     extern void func_8014AC10(); \
     extern void func_8014AA28(void); \
     extern void func_8014AB5C(void); \
-    extern void func_80162CCC(void); \
+    extern void func_80162CCC(); \
     extern void func_8014AB7C(s32 arg0); \
     extern void func_8014ABF0(void); \
     extern void func_80016714(void *a0, s32 a1); \
@@ -39011,7 +39011,7 @@
     extern void func_8014AC10(); \
     extern void func_8014AA28(void); \
     extern void func_8014AB5C(void); \
-    extern void func_80162CCC(void); \
+    extern void func_80162CCC(); \
     extern void func_8014AB7C(s32 arg0); \
     extern void func_8014ABF0(void); \
     extern void func_80016714(void *a0, s32 a1); \
@@ -42450,7 +42450,7 @@
     extern void func_8014AC10(); \
     extern void func_8014AA28(void); \
     extern void func_8014AB5C(void); \
-    extern void func_80162CCC(void); \
+    extern void func_80162CCC(); \
     extern void func_8014AB7C(s32 arg0); \
     extern void func_8014ABF0(void); \
     extern void func_80016714(void *a0, s32 a1); \
@@ -43859,7 +43859,7 @@
     extern void func_8014AC10(); \
     extern void func_8014AA28(void); \
     extern void func_8014AB5C(void); \
-    extern void func_80162CCC(void); \
+    extern void func_80162CCC(); \
     extern void func_8014AB7C(s32 arg0); \
     extern void func_8014ABF0(void); \
     extern void func_80016714(void *a0, s32 a1); \
@@ -46598,7 +46598,7 @@
     extern void func_8014AC10(); \
     extern void func_8014AA28(void); \
     extern void func_8014AB5C(void); \
-    extern void func_80162CCC(void); \
+    extern void func_80162CCC(); \
     extern void func_8014AB7C(s32 arg0); \
     extern void func_8014ABF0(void); \
     extern void func_80016714(void *a0, s32 a1); \
@@ -48071,7 +48071,7 @@
     extern void func_8014AC10(); \
     extern void func_8014AA28(void); \
     extern void func_8014AB5C(void); \
-    extern void func_80162CCC(void); \
+    extern void func_80162CCC(); \
     extern void func_8014AB7C(s32 arg0); \
     extern void func_8014ABF0(void); \
     extern void func_80016714(void *a0, s32 a1); \
@@ -51813,7 +51813,7 @@
     extern void func_8014659C(void); \
     extern void func_8001C810(s32 a0, s32 a1); \
     extern void func_80146CA0(void *a0); \
-    extern void func_80162CCC(void); \
+    extern void func_80162CCC(); \
     void func_8017F90C(int param_1) { \
         extern u16 D_800DF2E0; \
         extern s32 D_8018DA2C; \
@@ -54127,7 +54127,7 @@
     extern void func_8014AC10(); \
     extern void func_8014AA28(void); \
     extern void func_8014AB5C(void); \
-    extern void func_80162CCC(void); \
+    extern void func_80162CCC(); \
     extern void func_8014AB7C(s32 arg0); \
     extern void func_8014ABF0(void); \
     extern void func_80016714(void *a0, s32 a1); \
@@ -57683,7 +57683,7 @@
     extern void func_8014AC10(); \
     extern void func_8014AA28(void); \
     extern void func_8014AB5C(void); \
-    extern void func_80162CCC(void); \
+    extern void func_80162CCC(); \
     extern void func_8014AB7C(s32 arg0); \
     extern void func_8014ABF0(void); \
     extern void func_80016714(void *a0, s32 a1); \
@@ -62778,7 +62778,7 @@
     extern void func_8014AC10(); \
     extern void func_8014AA28(void); \
     extern void func_8014AB5C(void); \
-    extern void func_80162CCC(void); \
+    extern void func_80162CCC(); \
     extern void func_8014AB7C(s32 arg0); \
     extern void func_8014ABF0(void); \
     extern void func_80016714(void *a0, s32 a1); \
@@ -67895,7 +67895,7 @@
     }
 
 #define DEFINE_func_80164DB0() \
-    extern void func_80162CCC(void); \
+    extern void func_80162CCC(); \
     void func_80164DB0(void) { \
         func_80162CCC(); \
     }
@@ -71698,7 +71698,7 @@
     }
 
 #define DEFINE_func_801650C4() \
-    extern void func_80162CCC(void); \
+    extern void func_80162CCC(); \
     extern void func_80165124(void *a0); \
     extern void func_801651B8(void *a0); \
     void func_801650C4(s32 *a0) { \
@@ -84126,7 +84126,7 @@
     }
 
 #define DEFINE_func_8014AB7C() \
-    extern void func_80162CCC(void); \
+    extern void func_80162CCC(); \
     extern s32 D_8011F9D0; \
     void func_8014AB7C(s32 arg0) { \
         u8 *p; \
@@ -86459,7 +86459,7 @@
     extern void func_801553C0(s32 a0); \
     extern void func_80147364(); \
     extern void func_80147324(s32 arg0); \
-    extern void func_80162CCC(void); \
+    extern void func_80162CCC(); \
     void func_8016432C(s32 a0) { \
         s32 s1 = a0; \
         s32 s0 = *(s32 *)(s1 + 0x4C); \
@@ -95624,7 +95624,7 @@
     extern void func_8014659C(void); \
     extern void func_8001C810(s32 a0, s32 a1); \
     extern void func_80146CA0(void *a0); \
-    extern void func_80162CCC(void); \
+    extern void func_80162CCC(); \
     extern u16 D_800DF2E0; \
     extern s32 D_8018F510; \
     extern s32 D_8018F56C[]; \
@@ -104452,7 +104452,7 @@
     extern void func_8014AC10(); \
     extern void func_8014AA28(void); \
     extern void func_8014AB5C(void); \
-    extern void func_80162CCC(void); \
+    extern void func_80162CCC(); \
     extern void func_8014AB7C(s32 arg0); \
     extern void func_8014ABF0(void); \
     extern void func_80016714(void *a0, s32 a1); \
@@ -110249,7 +110249,7 @@
     extern void func_8014AC10(); \
     extern void func_8014AA28(void); \
     extern void func_8014AB5C(void); \
-    extern void func_80162CCC(void); \
+    extern void func_80162CCC(); \
     extern void func_8014AB7C(s32 arg0); \
     extern void func_8014ABF0(void); \
     extern void func_80016714(void *a0, s32 a1); \
@@ -113824,7 +113824,7 @@
     extern void func_8014AC10(); \
     extern void func_8014AA28(void); \
     extern void func_8014AB5C(void); \
-    extern void func_80162CCC(void); \
+    extern void func_80162CCC(); \
     extern void func_8014AB7C(s32 arg0); \
     extern void func_8014ABF0(void); \
     extern void func_80016714(void *a0, s32 a1); \
@@ -119024,7 +119024,7 @@
     extern void func_8014AC10(); \
     extern void func_8014AA28(void); \
     extern void func_8014AB5C(void); \
-    extern void func_80162CCC(void); \
+    extern void func_80162CCC(); \
     extern void func_8014AB7C(s32 arg0); \
     extern void func_8014ABF0(void); \
     extern void func_80016714(void *a0, s32 a1); \
@@ -121567,7 +121567,7 @@
     extern void func_8014AC10(); \
     extern void func_8014AA28(void); \
     extern void func_8014AB5C(void); \
-    extern void func_80162CCC(void); \
+    extern void func_80162CCC(); \
     extern void func_8014AB7C(s32 arg0); \
     extern void func_8014ABF0(void); \
     extern void func_80016714(void *a0, s32 a1); \
@@ -122549,7 +122549,7 @@
     extern void func_8014AC10(); \
     extern void func_8014AA28(void); \
     extern void func_8014AB5C(void); \
-    extern void func_80162CCC(void); \
+    extern void func_80162CCC(); \
     extern void func_8014AB7C(s32 arg0); \
     extern void func_8014ABF0(void); \
     extern void func_80016714(void *a0, s32 a1); \
@@ -125757,7 +125757,7 @@
     extern void func_8014AC10(); \
     extern void func_8014AA28(void); \
     extern void func_8014AB5C(void); \
-    extern void func_80162CCC(void); \
+    extern void func_80162CCC(); \
     extern void func_8014AB7C(s32 arg0); \
     extern void func_8014ABF0(void); \
     extern void func_80016714(void *a0, s32 a1); \
@@ -129455,7 +129455,7 @@
     extern void func_8014AC10(); \
     extern void func_8014AA28(void); \
     extern void func_8014AB5C(void); \
-    extern void func_80162CCC(void); \
+    extern void func_80162CCC(); \
     extern void func_8014AB7C(s32 arg0); \
     extern void func_8014ABF0(void); \
     extern void func_80016714(void *a0, s32 a1); \
@@ -133062,7 +133062,7 @@
     extern void func_8014AC10(); \
     extern void func_8014AA28(void); \
     extern void func_8014AB5C(void); \
-    extern void func_80162CCC(void); \
+    extern void func_80162CCC(); \
     extern void func_8014AB7C(s32 arg0); \
     extern void func_8014ABF0(void); \
     extern void func_80016714(void *a0, s32 a1); \
@@ -134409,7 +134409,7 @@
     extern void func_8014AC10(); \
     extern void func_8014AA28(void); \
     extern void func_8014AB5C(void); \
-    extern void func_80162CCC(void); \
+    extern void func_80162CCC(); \
     extern void func_8014AB7C(s32 arg0); \
     extern void func_8014ABF0(void); \
     extern void func_80016714(void *a0, s32 a1); \
@@ -137848,7 +137848,7 @@
     extern void func_8014AC10(); \
     extern void func_8014AA28(void); \
     extern void func_8014AB5C(void); \
-    extern void func_80162CCC(void); \
+    extern void func_80162CCC(); \
     extern void func_8014AB7C(s32 arg0); \
     extern void func_8014ABF0(void); \
     extern void func_80016714(void *a0, s32 a1); \
@@ -139257,7 +139257,7 @@
     extern void func_8014AC10(); \
     extern void func_8014AA28(void); \
     extern void func_8014AB5C(void); \
-    extern void func_80162CCC(void); \
+    extern void func_80162CCC(); \
     extern void func_8014AB7C(s32 arg0); \
     extern void func_8014ABF0(void); \
     extern void func_80016714(void *a0, s32 a1); \
@@ -141996,7 +141996,7 @@
     extern void func_8014AC10(); \
     extern void func_8014AA28(void); \
     extern void func_8014AB5C(void); \
-    extern void func_80162CCC(void); \
+    extern void func_80162CCC(); \
     extern void func_8014AB7C(s32 arg0); \
     extern void func_8014ABF0(void); \
     extern void func_80016714(void *a0, s32 a1); \
@@ -143469,7 +143469,7 @@
     extern void func_8014AC10(); \
     extern void func_8014AA28(void); \
     extern void func_8014AB5C(void); \
-    extern void func_80162CCC(void); \
+    extern void func_80162CCC(); \
     extern void func_8014AB7C(s32 arg0); \
     extern void func_8014ABF0(void); \
     extern void func_80016714(void *a0, s32 a1); \
@@ -147211,7 +147211,7 @@
     extern void func_8014659C(void); \
     extern void func_8001C810(s32 a0, s32 a1); \
     extern void func_80146CA0(void *a0); \
-    extern void func_80162CCC(void); \
+    extern void func_80162CCC(); \
     void func_8017F90C(int param_1) { \
         extern u16 D_800DF2E0; \
         extern s32 D_8018DA2C; \
@@ -149525,7 +149525,7 @@
     extern void func_8014AC10(); \
     extern void func_8014AA28(void); \
     extern void func_8014AB5C(void); \
-    extern void func_80162CCC(void); \
+    extern void func_80162CCC(); \
     extern void func_8014AB7C(s32 arg0); \
     extern void func_8014ABF0(void); \
     extern void func_80016714(void *a0, s32 a1); \
@@ -153081,7 +153081,7 @@
     extern void func_8014AC10(); \
     extern void func_8014AA28(void); \
     extern void func_8014AB5C(void); \
-    extern void func_80162CCC(void); \
+    extern void func_80162CCC(); \
     extern void func_8014AB7C(s32 arg0); \
     extern void func_8014ABF0(void); \
     extern void func_80016714(void *a0, s32 a1); \
@@ -158176,7 +158176,7 @@
     extern void func_8014AC10(); \
     extern void func_8014AA28(void); \
     extern void func_8014AB5C(void); \
-    extern void func_80162CCC(void); \
+    extern void func_80162CCC(); \
     extern void func_8014AB7C(s32 arg0); \
     extern void func_8014ABF0(void); \
     extern void func_80016714(void *a0, s32 a1); \