diff --git a/config/dedup.us.yaml b/config/dedup.us.yaml
index bc2d2cf98..d419277d3 100644
--- a/config/dedup.us.yaml
+++ b/config/dedup.us.yaml
@@ -15636,3 +15636,17 @@ groups:
     func: DEFINE_func_8017D6AC
     vram: 0x8017D6AC
     binaries: [ov_SC02_039, ov_SC03_108]
+  - id: E_func_80181B84
+    tier: h_exact
+    hash: 7678540574197b420f17571673856a74783eb9d5
+    source: src/shared/engine_core.h
+    func: DEFINE_func_80181B84
+    vram: 0x80181B84
+    binaries: [ov_SC03_093, ov_SC07_007]
+  - id: E_func_8016F0AC
+    tier: h_exact
+    hash: 8eaa5e59bf160652c661e17ec2f29582b2f72134
+    source: src/shared/engine_core.h
+    func: DEFINE_func_8016F0AC
+    vram: 0x8016F0AC
+    binaries: [ov_SC01_077, ov_SC01_005, ov_SC01_006, ov_SC03_001, ov_SC01_000, ov_SC01_001, ov_SC02_000, ov_SC02_003, ov_SC03_002, ov_SC03_006, ov_SC04_000, ov_SC04_018, ov_SC04_019, ov_SC05_000, ov_SC06_000, ov_SC07_000, ov_SC01_004, ov_SC01_008, ov_SC01_009, ov_SC01_074, ov_SC01_080, ov_SC01_084, ov_SC02_004, ov_SC02_005, ov_SC02_011, ov_SC02_015, ov_SC02_016, ov_SC02_017, ov_SC02_021, ov_SC02_026, ov_SC02_027, ov_SC02_028, ov_SC02_031, ov_SC02_035, ov_SC02_039, ov_SC02_041, ov_SC03_003, ov_SC03_007, ov_SC03_010, ov_SC03_011, ov_SC03_012, ov_SC03_013, ov_SC03_014, ov_SC03_015, ov_SC03_023, ov_SC03_024, ov_SC03_028, ov_SC03_029, ov_SC03_030, ov_SC03_031, ov_SC03_089, ov_SC03_090, ov_SC03_091, ov_SC03_092, ov_SC03_093, ov_SC03_094, ov_SC03_095, ov_SC03_096, ov_SC03_097, ov_SC03_098, ov_SC03_099, ov_SC03_100, ov_SC03_101, ov_SC03_102, ov_SC03_103, ov_SC03_104, ov_SC03_105, ov_SC03_108, ov_SC03_109, ov_SC03_110, ov_SC03_111, ov_SC03_112, ov_SC03_113, ov_SC03_114, ov_SC03_115, ov_SC03_116, ov_SC03_117, ov_SC03_118, ov_SC03_119, ov_SC03_121, ov_SC03_124, ov_SC03_125, ov_SC03_126, ov_SC04_002, ov_SC04_003, ov_SC04_004, ov_SC04_005, ov_SC04_006, ov_SC04_007, ov_SC04_008, ov_SC04_009, ov_SC04_010, ov_SC04_011, ov_SC04_012, ov_SC04_015, ov_SC04_016, ov_SC04_020, ov_SC04_021, ov_SC05_001, ov_SC05_002, ov_SC05_003, ov_SC05_004, ov_SC05_005, ov_SC05_006, ov_SC05_007, ov_SC05_008, ov_SC05_009, ov_SC05_010, ov_SC05_011, ov_SC05_017, ov_SC05_018, ov_SC05_019, ov_SC06_006, ov_SC06_008, ov_SC06_010, ov_SC06_011, ov_SC06_013, ov_SC06_014, ov_SC06_015, ov_SC06_016, ov_SC06_018, ov_SC06_020, ov_SC06_022, ov_SC06_024, ov_SC06_025, ov_SC06_027, ov_SC06_029, ov_SC06_030, ov_SC06_032, ov_SC06_033, ov_SC07_001, ov_SC07_002, ov_SC07_008, ov_SC07_009, ov_SC07_006, ov_SC07_007, ov_SC07_010, ov_SC07_011, ov_MAIN_012, ov_SC02_037, ov_SC03_107]
diff --git a/config/overlays.mk b/config/overlays.mk
index 02b60e829..4c3340902 100644
--- a/config/overlays.mk
+++ b/config/overlays.mk
@@ -4903,6 +4903,7 @@ build/src/ov_SC07_007/ov_SC07_007_jr_8015A3C8.o: JTBL_PADS := 0,4  # §8e pads (
 build/src/ov_SC07_007/ov_SC07_007_jr_80171B4C.o: JTBL_PADS := 0,0  # §8e pads (jtbl_carve.py) tables=+0x0,+0x20
 build/src/ov_SC07_007/ov_SC07_007_jr_801789AC.o: JTBL_PADS := 0,0  # §8e pads (jtbl_carve.py) tables=+0x0,+0x18
 build/src/ov_SC07_007/ov_SC07_007_jr_80179B74.o: JTBL_PADS := 0,4  # §8e pads (jtbl_carve.py) tables=+0x0,+0x90
+build/src/ov_SC07_007/ov_SC07_007_jr_8017BEBC.o: JTBL_PADS := 0,0  # §8e pads (jtbl_carve.py) tables=+0x0,+0x20
 build/src/ov_SC07_007/ov_SC07_007_o0c.o: JTBL_PADS := 0,4,4,4  # §8e pads (jtbl_carve.py) tables=+0x0,+0x38,+0xa8,+0x118
 ov_SC07_007_CHECK_SHA  := config/check.ov_SC07_007.sha
 ov_SC07_007_SYMBOLS    := config/symbols.ov_SC07_007.txt
diff --git a/config/splat.ov_SC07_007.yaml b/config/splat.ov_SC07_007.yaml
index d8b39f76d..92046f8f0 100644
--- a/config/splat.ov_SC07_007.yaml
+++ b/config/splat.ov_SC07_007.yaml
@@ -158,7 +158,7 @@ segments:
       - [0x9e318, data, tail16]
       - [0x9e31c, .rodata, ov_SC07_007_jr_8017AE2C]  # Phase-26 §8 jtbl-rodata carve (jtbl_carve.py)
       - [0x9e330, .rodata, ov_SC07_007_jr_8017BEBC]  # Phase-26 §8 jtbl-rodata carve (jtbl_carve.py)
-      - [0x9e350, data, tail17]
+      - [0x9e368, data, tail17]
       - [0x9F9DC, bin, trailing]    # final 3 bytes (EOF not 4-aligned; spimdisasm drops a partial word)
   - [0x9F9DF]   # EOF marker = the 0.4.dec byte length
 # @TRAILING@ (above) is replaced by tools/new_overlay.sh: for a non-4-aligned overlay it becomes
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 33f794a49..7051e6708 100644
--- a/src/ov_MAIN_012/ov_MAIN_012_jr_8016AE5C.c
+++ b/src/ov_MAIN_012/ov_MAIN_012_jr_8016AE5C.c
@@ -4826,14 +4826,7 @@ DEFINE_func_8016EFC8()  /* dedup: shared engine-core @0x8016efc8 (src/shared) */
 DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016f094 (src/shared) */
 
 
-extern void func_8016F0E4(void);
-extern void func_80165770(void);
-void func_8016F0AC(void) {
-
-    extern u8 aD80126B58_8016F0AC __asm__("D_80126B58");
-    ((void (*)(void *))func_8016F0E4)(&aD80126B58_8016F0AC);
-    ((void (*)(void *))func_80165770)(&aD80126B58_8016F0AC);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC01_000/ov_SC01_000_jr_8016AB6C.c b/src/ov_SC01_000/ov_SC01_000_jr_8016AB6C.c
index e145f185f..ac2dc6ad9 100644
--- a/src/ov_SC01_000/ov_SC01_000_jr_8016AB6C.c
+++ b/src/ov_SC01_000/ov_SC01_000_jr_8016AB6C.c
@@ -3844,14 +3844,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC01_001/ov_SC01_001_jr_8016AB6C.c b/src/ov_SC01_001/ov_SC01_001_jr_8016AB6C.c
index fd99ea3d5..357277abf 100644
--- a/src/ov_SC01_001/ov_SC01_001_jr_8016AB6C.c
+++ b/src/ov_SC01_001/ov_SC01_001_jr_8016AB6C.c
@@ -3842,14 +3842,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC01_004/ov_SC01_004_jr_8016AB6C.c b/src/ov_SC01_004/ov_SC01_004_jr_8016AB6C.c
index 211c9f014..8f5010e31 100644
--- a/src/ov_SC01_004/ov_SC01_004_jr_8016AB6C.c
+++ b/src/ov_SC01_004/ov_SC01_004_jr_8016AB6C.c
@@ -3842,14 +3842,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC01_005/ov_SC01_005_jr_8016AB6C.c b/src/ov_SC01_005/ov_SC01_005_jr_8016AB6C.c
index 65f6880b3..a9c871ccd 100644
--- a/src/ov_SC01_005/ov_SC01_005_jr_8016AB6C.c
+++ b/src/ov_SC01_005/ov_SC01_005_jr_8016AB6C.c
@@ -3843,14 +3843,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC01_006/ov_SC01_006_jr_8016AB6C.c b/src/ov_SC01_006/ov_SC01_006_jr_8016AB6C.c
index 65f6880b3..a9c871ccd 100644
--- a/src/ov_SC01_006/ov_SC01_006_jr_8016AB6C.c
+++ b/src/ov_SC01_006/ov_SC01_006_jr_8016AB6C.c
@@ -3843,14 +3843,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC01_008/ov_SC01_008_jr_8016AB6C.c b/src/ov_SC01_008/ov_SC01_008_jr_8016AB6C.c
index 2f778d3b9..e8f4cd715 100644
--- a/src/ov_SC01_008/ov_SC01_008_jr_8016AB6C.c
+++ b/src/ov_SC01_008/ov_SC01_008_jr_8016AB6C.c
@@ -3842,14 +3842,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC01_009/ov_SC01_009_jr_8016AB6C.c b/src/ov_SC01_009/ov_SC01_009_jr_8016AB6C.c
index 3e070a1b6..b5e92e7d3 100644
--- a/src/ov_SC01_009/ov_SC01_009_jr_8016AB6C.c
+++ b/src/ov_SC01_009/ov_SC01_009_jr_8016AB6C.c
@@ -3842,14 +3842,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC01_074/ov_SC01_074_jr_8016AB6C.c b/src/ov_SC01_074/ov_SC01_074_jr_8016AB6C.c
index bcba81515..da2cf3b04 100644
--- a/src/ov_SC01_074/ov_SC01_074_jr_8016AB6C.c
+++ b/src/ov_SC01_074/ov_SC01_074_jr_8016AB6C.c
@@ -3842,14 +3842,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC01_077/ov_SC01_077_jr_8016AB6C.c b/src/ov_SC01_077/ov_SC01_077_jr_8016AB6C.c
index cf11106f4..a1d84493d 100644
--- a/src/ov_SC01_077/ov_SC01_077_jr_8016AB6C.c
+++ b/src/ov_SC01_077/ov_SC01_077_jr_8016AB6C.c
@@ -4014,13 +4014,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 #include "common.h"
 
diff --git a/src/ov_SC01_080/ov_SC01_080_jr_8016AB6C.c b/src/ov_SC01_080/ov_SC01_080_jr_8016AB6C.c
index a4c7ee2ab..4ae15211e 100644
--- a/src/ov_SC01_080/ov_SC01_080_jr_8016AB6C.c
+++ b/src/ov_SC01_080/ov_SC01_080_jr_8016AB6C.c
@@ -3842,14 +3842,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC01_084/ov_SC01_084_jr_8016AB6C.c b/src/ov_SC01_084/ov_SC01_084_jr_8016AB6C.c
index b6b159a8a..d12ff2a82 100644
--- a/src/ov_SC01_084/ov_SC01_084_jr_8016AB6C.c
+++ b/src/ov_SC01_084/ov_SC01_084_jr_8016AB6C.c
@@ -3843,14 +3843,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC02_000/ov_SC02_000_jr_8016AB6C.c b/src/ov_SC02_000/ov_SC02_000_jr_8016AB6C.c
index c6183eded..10ef46de5 100644
--- a/src/ov_SC02_000/ov_SC02_000_jr_8016AB6C.c
+++ b/src/ov_SC02_000/ov_SC02_000_jr_8016AB6C.c
@@ -3840,14 +3840,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC02_003/ov_SC02_003_jr_8016AB6C.c b/src/ov_SC02_003/ov_SC02_003_jr_8016AB6C.c
index c6183eded..10ef46de5 100644
--- a/src/ov_SC02_003/ov_SC02_003_jr_8016AB6C.c
+++ b/src/ov_SC02_003/ov_SC02_003_jr_8016AB6C.c
@@ -3840,14 +3840,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC02_004/ov_SC02_004_jr_8016AB6C.c b/src/ov_SC02_004/ov_SC02_004_jr_8016AB6C.c
index b87aab712..38141fc4b 100644
--- a/src/ov_SC02_004/ov_SC02_004_jr_8016AB6C.c
+++ b/src/ov_SC02_004/ov_SC02_004_jr_8016AB6C.c
@@ -3842,14 +3842,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC02_005/ov_SC02_005_jr_8016AB6C.c b/src/ov_SC02_005/ov_SC02_005_jr_8016AB6C.c
index 38b4c561a..f507bd553 100644
--- a/src/ov_SC02_005/ov_SC02_005_jr_8016AB6C.c
+++ b/src/ov_SC02_005/ov_SC02_005_jr_8016AB6C.c
@@ -3844,14 +3844,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC02_011/ov_SC02_011_jr_8016AB6C.c b/src/ov_SC02_011/ov_SC02_011_jr_8016AB6C.c
index b8c6c2209..7e6627728 100644
--- a/src/ov_SC02_011/ov_SC02_011_jr_8016AB6C.c
+++ b/src/ov_SC02_011/ov_SC02_011_jr_8016AB6C.c
@@ -3842,14 +3842,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC02_015/ov_SC02_015_jr_8016AB6C.c b/src/ov_SC02_015/ov_SC02_015_jr_8016AB6C.c
index ce704978a..aa4cf2156 100644
--- a/src/ov_SC02_015/ov_SC02_015_jr_8016AB6C.c
+++ b/src/ov_SC02_015/ov_SC02_015_jr_8016AB6C.c
@@ -3840,14 +3840,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC02_016/ov_SC02_016_jr_8016AB6C.c b/src/ov_SC02_016/ov_SC02_016_jr_8016AB6C.c
index b68b98d67..d30e71a70 100644
--- a/src/ov_SC02_016/ov_SC02_016_jr_8016AB6C.c
+++ b/src/ov_SC02_016/ov_SC02_016_jr_8016AB6C.c
@@ -3842,14 +3842,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC02_017/ov_SC02_017_jr_8016AB6C.c b/src/ov_SC02_017/ov_SC02_017_jr_8016AB6C.c
index 217ce0d04..722f7dcea 100644
--- a/src/ov_SC02_017/ov_SC02_017_jr_8016AB6C.c
+++ b/src/ov_SC02_017/ov_SC02_017_jr_8016AB6C.c
@@ -3842,14 +3842,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC02_021/ov_SC02_021_jr_8016AB6C.c b/src/ov_SC02_021/ov_SC02_021_jr_8016AB6C.c
index b41b0335e..ade325828 100644
--- a/src/ov_SC02_021/ov_SC02_021_jr_8016AB6C.c
+++ b/src/ov_SC02_021/ov_SC02_021_jr_8016AB6C.c
@@ -3842,14 +3842,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC02_026/ov_SC02_026_jr_8016AB6C.c b/src/ov_SC02_026/ov_SC02_026_jr_8016AB6C.c
index 8dbdd6c9e..cf25ffca4 100644
--- a/src/ov_SC02_026/ov_SC02_026_jr_8016AB6C.c
+++ b/src/ov_SC02_026/ov_SC02_026_jr_8016AB6C.c
@@ -3842,14 +3842,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC02_027/ov_SC02_027_jr_8016AB6C.c b/src/ov_SC02_027/ov_SC02_027_jr_8016AB6C.c
index c4cbfc451..d7c9b574b 100644
--- a/src/ov_SC02_027/ov_SC02_027_jr_8016AB6C.c
+++ b/src/ov_SC02_027/ov_SC02_027_jr_8016AB6C.c
@@ -3842,14 +3842,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC02_028/ov_SC02_028_jr_8016AB6C.c b/src/ov_SC02_028/ov_SC02_028_jr_8016AB6C.c
index 208f6580e..b1196662f 100644
--- a/src/ov_SC02_028/ov_SC02_028_jr_8016AB6C.c
+++ b/src/ov_SC02_028/ov_SC02_028_jr_8016AB6C.c
@@ -3842,14 +3842,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC02_031/ov_SC02_031_jr_8016AB6C.c b/src/ov_SC02_031/ov_SC02_031_jr_8016AB6C.c
index 637a59df7..d1db7f754 100644
--- a/src/ov_SC02_031/ov_SC02_031_jr_8016AB6C.c
+++ b/src/ov_SC02_031/ov_SC02_031_jr_8016AB6C.c
@@ -3842,14 +3842,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC02_035/ov_SC02_035_jr_8016AB6C.c b/src/ov_SC02_035/ov_SC02_035_jr_8016AB6C.c
index 97a33fe17..a9d73d980 100644
--- a/src/ov_SC02_035/ov_SC02_035_jr_8016AB6C.c
+++ b/src/ov_SC02_035/ov_SC02_035_jr_8016AB6C.c
@@ -3842,14 +3842,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
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 7d7d0dc66..a9ea70961 100644
--- a/src/ov_SC02_037/ov_SC02_037_jr_8016AE5C.c
+++ b/src/ov_SC02_037/ov_SC02_037_jr_8016AE5C.c
@@ -4934,14 +4934,7 @@ DEFINE_func_8016EFC8()  /* dedup: shared engine-core @0x8016efc8 (src/shared) */
 DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016f094 (src/shared) */
 
 
-extern void func_8016F0E4(void);
-extern void func_80165770(void);
-void func_8016F0AC(void) {
-
-    extern u8 aD80126B58_8016F0AC __asm__("D_80126B58");
-    ((void (*)(void *))func_8016F0E4)(&aD80126B58_8016F0AC);
-    ((void (*)(void *))func_80165770)(&aD80126B58_8016F0AC);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC02_039/ov_SC02_039_jr_8016AB6C.c b/src/ov_SC02_039/ov_SC02_039_jr_8016AB6C.c
index d257cc0e3..0a0d4c1f5 100644
--- a/src/ov_SC02_039/ov_SC02_039_jr_8016AB6C.c
+++ b/src/ov_SC02_039/ov_SC02_039_jr_8016AB6C.c
@@ -3842,14 +3842,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC02_041/ov_SC02_041_jr_8016AB6C.c b/src/ov_SC02_041/ov_SC02_041_jr_8016AB6C.c
index 10093358a..6e94a90af 100644
--- a/src/ov_SC02_041/ov_SC02_041_jr_8016AB6C.c
+++ b/src/ov_SC02_041/ov_SC02_041_jr_8016AB6C.c
@@ -3842,14 +3842,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC03_001/ov_SC03_001_jr_8016AB6C.c b/src/ov_SC03_001/ov_SC03_001_jr_8016AB6C.c
index 45b587cc6..3414199de 100644
--- a/src/ov_SC03_001/ov_SC03_001_jr_8016AB6C.c
+++ b/src/ov_SC03_001/ov_SC03_001_jr_8016AB6C.c
@@ -3842,14 +3842,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC03_002/ov_SC03_002_jr_8016AB6C.c b/src/ov_SC03_002/ov_SC03_002_jr_8016AB6C.c
index 4ce810b69..836ca243d 100644
--- a/src/ov_SC03_002/ov_SC03_002_jr_8016AB6C.c
+++ b/src/ov_SC03_002/ov_SC03_002_jr_8016AB6C.c
@@ -3842,14 +3842,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC03_003/ov_SC03_003_jr_8016AB6C.c b/src/ov_SC03_003/ov_SC03_003_jr_8016AB6C.c
index 64efcd044..c4e4ed06e 100644
--- a/src/ov_SC03_003/ov_SC03_003_jr_8016AB6C.c
+++ b/src/ov_SC03_003/ov_SC03_003_jr_8016AB6C.c
@@ -3842,14 +3842,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC03_006/ov_SC03_006_jr_8016AB6C.c b/src/ov_SC03_006/ov_SC03_006_jr_8016AB6C.c
index 2680e26d8..31423d37b 100644
--- a/src/ov_SC03_006/ov_SC03_006_jr_8016AB6C.c
+++ b/src/ov_SC03_006/ov_SC03_006_jr_8016AB6C.c
@@ -3842,14 +3842,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC03_007/ov_SC03_007_jr_8016AB6C.c b/src/ov_SC03_007/ov_SC03_007_jr_8016AB6C.c
index 0b9290216..0f25a9ca1 100644
--- a/src/ov_SC03_007/ov_SC03_007_jr_8016AB6C.c
+++ b/src/ov_SC03_007/ov_SC03_007_jr_8016AB6C.c
@@ -3842,14 +3842,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC03_010/ov_SC03_010_jr_8016AB6C.c b/src/ov_SC03_010/ov_SC03_010_jr_8016AB6C.c
index 446299b22..80539f626 100644
--- a/src/ov_SC03_010/ov_SC03_010_jr_8016AB6C.c
+++ b/src/ov_SC03_010/ov_SC03_010_jr_8016AB6C.c
@@ -3842,14 +3842,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC03_011/ov_SC03_011_jr_8016AB6C.c b/src/ov_SC03_011/ov_SC03_011_jr_8016AB6C.c
index bcf120fa1..8f5c74fec 100644
--- a/src/ov_SC03_011/ov_SC03_011_jr_8016AB6C.c
+++ b/src/ov_SC03_011/ov_SC03_011_jr_8016AB6C.c
@@ -3842,14 +3842,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC03_012/ov_SC03_012_jr_8016AB6C.c b/src/ov_SC03_012/ov_SC03_012_jr_8016AB6C.c
index 38e104526..0a98376ab 100644
--- a/src/ov_SC03_012/ov_SC03_012_jr_8016AB6C.c
+++ b/src/ov_SC03_012/ov_SC03_012_jr_8016AB6C.c
@@ -3842,14 +3842,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC03_013/ov_SC03_013_jr_8016AB6C.c b/src/ov_SC03_013/ov_SC03_013_jr_8016AB6C.c
index 18dbe580c..0fb9cbf17 100644
--- a/src/ov_SC03_013/ov_SC03_013_jr_8016AB6C.c
+++ b/src/ov_SC03_013/ov_SC03_013_jr_8016AB6C.c
@@ -3842,14 +3842,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC03_014/ov_SC03_014_jr_8016AB6C.c b/src/ov_SC03_014/ov_SC03_014_jr_8016AB6C.c
index 617141657..d361c9465 100644
--- a/src/ov_SC03_014/ov_SC03_014_jr_8016AB6C.c
+++ b/src/ov_SC03_014/ov_SC03_014_jr_8016AB6C.c
@@ -3842,14 +3842,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC03_015/ov_SC03_015_jr_8016AB6C.c b/src/ov_SC03_015/ov_SC03_015_jr_8016AB6C.c
index 9c223201e..0f3610bf9 100644
--- a/src/ov_SC03_015/ov_SC03_015_jr_8016AB6C.c
+++ b/src/ov_SC03_015/ov_SC03_015_jr_8016AB6C.c
@@ -1178,14 +1178,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC03_023/ov_SC03_023_jr_8016AB6C.c b/src/ov_SC03_023/ov_SC03_023_jr_8016AB6C.c
index e4d94b4e3..cb5a36cfd 100644
--- a/src/ov_SC03_023/ov_SC03_023_jr_8016AB6C.c
+++ b/src/ov_SC03_023/ov_SC03_023_jr_8016AB6C.c
@@ -3842,14 +3842,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC03_024/ov_SC03_024_jr_8016AB6C.c b/src/ov_SC03_024/ov_SC03_024_jr_8016AB6C.c
index 3963bee16..253f03e29 100644
--- a/src/ov_SC03_024/ov_SC03_024_jr_8016AB6C.c
+++ b/src/ov_SC03_024/ov_SC03_024_jr_8016AB6C.c
@@ -3842,14 +3842,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC03_028/ov_SC03_028_jr_8016AB6C.c b/src/ov_SC03_028/ov_SC03_028_jr_8016AB6C.c
index 1ed62f1cd..f1e88ae4b 100644
--- a/src/ov_SC03_028/ov_SC03_028_jr_8016AB6C.c
+++ b/src/ov_SC03_028/ov_SC03_028_jr_8016AB6C.c
@@ -3842,14 +3842,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC03_029/ov_SC03_029_jr_8016AB6C.c b/src/ov_SC03_029/ov_SC03_029_jr_8016AB6C.c
index 8b9218597..78026fb96 100644
--- a/src/ov_SC03_029/ov_SC03_029_jr_8016AB6C.c
+++ b/src/ov_SC03_029/ov_SC03_029_jr_8016AB6C.c
@@ -3842,14 +3842,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC03_030/ov_SC03_030_jr_8016AB6C.c b/src/ov_SC03_030/ov_SC03_030_jr_8016AB6C.c
index 5596a2cb1..b9d39b66a 100644
--- a/src/ov_SC03_030/ov_SC03_030_jr_8016AB6C.c
+++ b/src/ov_SC03_030/ov_SC03_030_jr_8016AB6C.c
@@ -3842,14 +3842,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC03_031/ov_SC03_031_jr_8016AB6C.c b/src/ov_SC03_031/ov_SC03_031_jr_8016AB6C.c
index 400bb2701..6f802f5c5 100644
--- a/src/ov_SC03_031/ov_SC03_031_jr_8016AB6C.c
+++ b/src/ov_SC03_031/ov_SC03_031_jr_8016AB6C.c
@@ -3842,14 +3842,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC03_089/ov_SC03_089_jr_8016AB6C.c b/src/ov_SC03_089/ov_SC03_089_jr_8016AB6C.c
index fce0c02e6..364a1784b 100644
--- a/src/ov_SC03_089/ov_SC03_089_jr_8016AB6C.c
+++ b/src/ov_SC03_089/ov_SC03_089_jr_8016AB6C.c
@@ -3842,14 +3842,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC03_090/ov_SC03_090_jr_8016AB6C.c b/src/ov_SC03_090/ov_SC03_090_jr_8016AB6C.c
index 5721779d9..fde13592c 100644
--- a/src/ov_SC03_090/ov_SC03_090_jr_8016AB6C.c
+++ b/src/ov_SC03_090/ov_SC03_090_jr_8016AB6C.c
@@ -3842,14 +3842,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC03_091/ov_SC03_091_jr_8016AB6C.c b/src/ov_SC03_091/ov_SC03_091_jr_8016AB6C.c
index dc323665f..a3b71a777 100644
--- a/src/ov_SC03_091/ov_SC03_091_jr_8016AB6C.c
+++ b/src/ov_SC03_091/ov_SC03_091_jr_8016AB6C.c
@@ -3842,14 +3842,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC03_092/ov_SC03_092_jr_8016AB6C.c b/src/ov_SC03_092/ov_SC03_092_jr_8016AB6C.c
index a9a3af9e3..8df7408f5 100644
--- a/src/ov_SC03_092/ov_SC03_092_jr_8016AB6C.c
+++ b/src/ov_SC03_092/ov_SC03_092_jr_8016AB6C.c
@@ -3842,14 +3842,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC03_093/ov_SC03_093_jr_8016AB6C.c b/src/ov_SC03_093/ov_SC03_093_jr_8016AB6C.c
index 6d402a39e..41b4ca8ab 100644
--- a/src/ov_SC03_093/ov_SC03_093_jr_8016AB6C.c
+++ b/src/ov_SC03_093/ov_SC03_093_jr_8016AB6C.c
@@ -3842,14 +3842,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC03_093/ov_SC03_093_jr_8017D898.c b/src/ov_SC03_093/ov_SC03_093_jr_8017D898.c
index dcd12ce09..107f9129f 100644
--- a/src/ov_SC03_093/ov_SC03_093_jr_8017D898.c
+++ b/src/ov_SC03_093/ov_SC03_093_jr_8017D898.c
@@ -5229,8 +5229,7 @@ void func_801818F0(s32 a0) {
 }
 
 
-void func_80181B84(void) {
-}
+DEFINE_func_80181B84()  /* dedup: shared engine-core @0x80181B84 (src/shared) */
 
 extern void func_8018208C(void *a0, s32 a1);
 
diff --git a/src/ov_SC03_094/ov_SC03_094_jr_8016AB6C.c b/src/ov_SC03_094/ov_SC03_094_jr_8016AB6C.c
index 3cd7d76db..0bbe43b09 100644
--- a/src/ov_SC03_094/ov_SC03_094_jr_8016AB6C.c
+++ b/src/ov_SC03_094/ov_SC03_094_jr_8016AB6C.c
@@ -3842,14 +3842,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC03_095/ov_SC03_095_jr_8016AB6C.c b/src/ov_SC03_095/ov_SC03_095_jr_8016AB6C.c
index 12d560a92..423ccbca8 100644
--- a/src/ov_SC03_095/ov_SC03_095_jr_8016AB6C.c
+++ b/src/ov_SC03_095/ov_SC03_095_jr_8016AB6C.c
@@ -3842,14 +3842,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC03_096/ov_SC03_096_jr_8016AB6C.c b/src/ov_SC03_096/ov_SC03_096_jr_8016AB6C.c
index 5e7dcf9f9..fc1c44e5a 100644
--- a/src/ov_SC03_096/ov_SC03_096_jr_8016AB6C.c
+++ b/src/ov_SC03_096/ov_SC03_096_jr_8016AB6C.c
@@ -3842,14 +3842,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC03_097/ov_SC03_097_jr_8016AB6C.c b/src/ov_SC03_097/ov_SC03_097_jr_8016AB6C.c
index fd949f813..2a0d3f114 100644
--- a/src/ov_SC03_097/ov_SC03_097_jr_8016AB6C.c
+++ b/src/ov_SC03_097/ov_SC03_097_jr_8016AB6C.c
@@ -3842,14 +3842,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC03_098/ov_SC03_098_jr_8016AB6C.c b/src/ov_SC03_098/ov_SC03_098_jr_8016AB6C.c
index 9ef5eb7ac..112ab7935 100644
--- a/src/ov_SC03_098/ov_SC03_098_jr_8016AB6C.c
+++ b/src/ov_SC03_098/ov_SC03_098_jr_8016AB6C.c
@@ -3842,14 +3842,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC03_099/ov_SC03_099_jr_8016AB6C.c b/src/ov_SC03_099/ov_SC03_099_jr_8016AB6C.c
index 14b10aaf5..41002a779 100644
--- a/src/ov_SC03_099/ov_SC03_099_jr_8016AB6C.c
+++ b/src/ov_SC03_099/ov_SC03_099_jr_8016AB6C.c
@@ -3842,14 +3842,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC03_100/ov_SC03_100_jr_8016AB6C.c b/src/ov_SC03_100/ov_SC03_100_jr_8016AB6C.c
index 9cc67a275..48e3c30c8 100644
--- a/src/ov_SC03_100/ov_SC03_100_jr_8016AB6C.c
+++ b/src/ov_SC03_100/ov_SC03_100_jr_8016AB6C.c
@@ -3842,14 +3842,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC03_101/ov_SC03_101_jr_8016AB6C.c b/src/ov_SC03_101/ov_SC03_101_jr_8016AB6C.c
index 1d327ab5b..7b47276fd 100644
--- a/src/ov_SC03_101/ov_SC03_101_jr_8016AB6C.c
+++ b/src/ov_SC03_101/ov_SC03_101_jr_8016AB6C.c
@@ -3842,14 +3842,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC03_102/ov_SC03_102_jr_8016AB6C.c b/src/ov_SC03_102/ov_SC03_102_jr_8016AB6C.c
index 0a4b2ce0f..0becf70ae 100644
--- a/src/ov_SC03_102/ov_SC03_102_jr_8016AB6C.c
+++ b/src/ov_SC03_102/ov_SC03_102_jr_8016AB6C.c
@@ -3842,14 +3842,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC03_103/ov_SC03_103_jr_8016AB6C.c b/src/ov_SC03_103/ov_SC03_103_jr_8016AB6C.c
index b7dddf195..c46cdc293 100644
--- a/src/ov_SC03_103/ov_SC03_103_jr_8016AB6C.c
+++ b/src/ov_SC03_103/ov_SC03_103_jr_8016AB6C.c
@@ -3842,14 +3842,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC03_104/ov_SC03_104_jr_8016AB6C.c b/src/ov_SC03_104/ov_SC03_104_jr_8016AB6C.c
index 54f27007d..1f29450d9 100644
--- a/src/ov_SC03_104/ov_SC03_104_jr_8016AB6C.c
+++ b/src/ov_SC03_104/ov_SC03_104_jr_8016AB6C.c
@@ -3842,14 +3842,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC03_105/ov_SC03_105_jr_8016AB6C.c b/src/ov_SC03_105/ov_SC03_105_jr_8016AB6C.c
index 0fa83e5c6..ec532cec3 100644
--- a/src/ov_SC03_105/ov_SC03_105_jr_8016AB6C.c
+++ b/src/ov_SC03_105/ov_SC03_105_jr_8016AB6C.c
@@ -3842,14 +3842,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
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 6031b43e9..1c78b9dac 100644
--- a/src/ov_SC03_107/ov_SC03_107_jr_8016AE5C.c
+++ b/src/ov_SC03_107/ov_SC03_107_jr_8016AE5C.c
@@ -4846,14 +4846,7 @@ DEFINE_func_8016EFC8()  /* dedup: shared engine-core @0x8016efc8 (src/shared) */
 DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016f094 (src/shared) */
 
 
-extern void func_8016F0E4(void);
-extern void func_80165770(void);
-void func_8016F0AC(void) {
-
-    extern u8 aD80126B58_8016F0AC __asm__("D_80126B58");
-    ((void (*)(void *))func_8016F0E4)(&aD80126B58_8016F0AC);
-    ((void (*)(void *))func_80165770)(&aD80126B58_8016F0AC);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC03_108/ov_SC03_108_jr_8016AB6C.c b/src/ov_SC03_108/ov_SC03_108_jr_8016AB6C.c
index 1abb1d6d3..edd9f10db 100644
--- a/src/ov_SC03_108/ov_SC03_108_jr_8016AB6C.c
+++ b/src/ov_SC03_108/ov_SC03_108_jr_8016AB6C.c
@@ -3792,14 +3792,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC03_109/ov_SC03_109_jr_8016AB6C.c b/src/ov_SC03_109/ov_SC03_109_jr_8016AB6C.c
index f638cdb53..c12fa8bfc 100644
--- a/src/ov_SC03_109/ov_SC03_109_jr_8016AB6C.c
+++ b/src/ov_SC03_109/ov_SC03_109_jr_8016AB6C.c
@@ -3842,14 +3842,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC03_110/ov_SC03_110_jr_8016AB6C.c b/src/ov_SC03_110/ov_SC03_110_jr_8016AB6C.c
index 2cdf11a6d..fb0c9ae0f 100644
--- a/src/ov_SC03_110/ov_SC03_110_jr_8016AB6C.c
+++ b/src/ov_SC03_110/ov_SC03_110_jr_8016AB6C.c
@@ -3842,14 +3842,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC03_111/ov_SC03_111_jr_8016AB6C.c b/src/ov_SC03_111/ov_SC03_111_jr_8016AB6C.c
index 8ee5b9283..bd6b17c43 100644
--- a/src/ov_SC03_111/ov_SC03_111_jr_8016AB6C.c
+++ b/src/ov_SC03_111/ov_SC03_111_jr_8016AB6C.c
@@ -3842,14 +3842,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC03_112/ov_SC03_112_jr_8016AB6C.c b/src/ov_SC03_112/ov_SC03_112_jr_8016AB6C.c
index 96ffdbf5d..a9dc04a4c 100644
--- a/src/ov_SC03_112/ov_SC03_112_jr_8016AB6C.c
+++ b/src/ov_SC03_112/ov_SC03_112_jr_8016AB6C.c
@@ -3841,14 +3841,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC03_113/ov_SC03_113_jr_8016AB6C.c b/src/ov_SC03_113/ov_SC03_113_jr_8016AB6C.c
index a987d3c6c..f7ebebbe2 100644
--- a/src/ov_SC03_113/ov_SC03_113_jr_8016AB6C.c
+++ b/src/ov_SC03_113/ov_SC03_113_jr_8016AB6C.c
@@ -3841,14 +3841,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC03_114/ov_SC03_114_jr_8016AB6C.c b/src/ov_SC03_114/ov_SC03_114_jr_8016AB6C.c
index c6a00049a..dca765030 100644
--- a/src/ov_SC03_114/ov_SC03_114_jr_8016AB6C.c
+++ b/src/ov_SC03_114/ov_SC03_114_jr_8016AB6C.c
@@ -3841,14 +3841,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC03_115/ov_SC03_115_jr_8016AB6C.c b/src/ov_SC03_115/ov_SC03_115_jr_8016AB6C.c
index f72a9ca29..8c923a1c5 100644
--- a/src/ov_SC03_115/ov_SC03_115_jr_8016AB6C.c
+++ b/src/ov_SC03_115/ov_SC03_115_jr_8016AB6C.c
@@ -3841,14 +3841,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC03_116/ov_SC03_116_jr_8016AB6C.c b/src/ov_SC03_116/ov_SC03_116_jr_8016AB6C.c
index 3509effbb..5b6ff67cb 100644
--- a/src/ov_SC03_116/ov_SC03_116_jr_8016AB6C.c
+++ b/src/ov_SC03_116/ov_SC03_116_jr_8016AB6C.c
@@ -3841,14 +3841,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC03_117/ov_SC03_117_jr_8016AB6C.c b/src/ov_SC03_117/ov_SC03_117_jr_8016AB6C.c
index 12e4838bf..bc668379d 100644
--- a/src/ov_SC03_117/ov_SC03_117_jr_8016AB6C.c
+++ b/src/ov_SC03_117/ov_SC03_117_jr_8016AB6C.c
@@ -3841,14 +3841,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC03_118/ov_SC03_118_jr_8016AB6C.c b/src/ov_SC03_118/ov_SC03_118_jr_8016AB6C.c
index 4f45651bd..2c39dd674 100644
--- a/src/ov_SC03_118/ov_SC03_118_jr_8016AB6C.c
+++ b/src/ov_SC03_118/ov_SC03_118_jr_8016AB6C.c
@@ -3841,14 +3841,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC03_119/ov_SC03_119_jr_8016AB6C.c b/src/ov_SC03_119/ov_SC03_119_jr_8016AB6C.c
index 4f45651bd..2c39dd674 100644
--- a/src/ov_SC03_119/ov_SC03_119_jr_8016AB6C.c
+++ b/src/ov_SC03_119/ov_SC03_119_jr_8016AB6C.c
@@ -3841,14 +3841,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC03_121/ov_SC03_121_jr_8016AB6C.c b/src/ov_SC03_121/ov_SC03_121_jr_8016AB6C.c
index 9901e0432..4e2c666a9 100644
--- a/src/ov_SC03_121/ov_SC03_121_jr_8016AB6C.c
+++ b/src/ov_SC03_121/ov_SC03_121_jr_8016AB6C.c
@@ -3841,14 +3841,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC03_124/ov_SC03_124_jr_8016AB6C.c b/src/ov_SC03_124/ov_SC03_124_jr_8016AB6C.c
index b0391568d..c08393eca 100644
--- a/src/ov_SC03_124/ov_SC03_124_jr_8016AB6C.c
+++ b/src/ov_SC03_124/ov_SC03_124_jr_8016AB6C.c
@@ -3841,14 +3841,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC03_125/ov_SC03_125_jr_8016AB6C.c b/src/ov_SC03_125/ov_SC03_125_jr_8016AB6C.c
index e1448eae9..a95444306 100644
--- a/src/ov_SC03_125/ov_SC03_125_jr_8016AB6C.c
+++ b/src/ov_SC03_125/ov_SC03_125_jr_8016AB6C.c
@@ -3841,14 +3841,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC03_126/ov_SC03_126_jr_8016AB6C.c b/src/ov_SC03_126/ov_SC03_126_jr_8016AB6C.c
index d800e325f..5a02d076f 100644
--- a/src/ov_SC03_126/ov_SC03_126_jr_8016AB6C.c
+++ b/src/ov_SC03_126/ov_SC03_126_jr_8016AB6C.c
@@ -3841,14 +3841,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC04_000/ov_SC04_000_jr_8016AB6C.c b/src/ov_SC04_000/ov_SC04_000_jr_8016AB6C.c
index 334acc3bd..645208ffe 100644
--- a/src/ov_SC04_000/ov_SC04_000_jr_8016AB6C.c
+++ b/src/ov_SC04_000/ov_SC04_000_jr_8016AB6C.c
@@ -3841,14 +3841,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC04_002/ov_SC04_002_jr_8016AB6C.c b/src/ov_SC04_002/ov_SC04_002_jr_8016AB6C.c
index 14786a17b..5d63abde8 100644
--- a/src/ov_SC04_002/ov_SC04_002_jr_8016AB6C.c
+++ b/src/ov_SC04_002/ov_SC04_002_jr_8016AB6C.c
@@ -3841,14 +3841,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC04_003/ov_SC04_003_jr_8016AB6C.c b/src/ov_SC04_003/ov_SC04_003_jr_8016AB6C.c
index 22c0e5f0e..e08576761 100644
--- a/src/ov_SC04_003/ov_SC04_003_jr_8016AB6C.c
+++ b/src/ov_SC04_003/ov_SC04_003_jr_8016AB6C.c
@@ -3841,14 +3841,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC04_004/ov_SC04_004_jr_8016AB6C.c b/src/ov_SC04_004/ov_SC04_004_jr_8016AB6C.c
index ec4141778..c77e17005 100644
--- a/src/ov_SC04_004/ov_SC04_004_jr_8016AB6C.c
+++ b/src/ov_SC04_004/ov_SC04_004_jr_8016AB6C.c
@@ -3841,14 +3841,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC04_005/ov_SC04_005_jr_8016AB6C.c b/src/ov_SC04_005/ov_SC04_005_jr_8016AB6C.c
index d426698bd..c0cf1be2c 100644
--- a/src/ov_SC04_005/ov_SC04_005_jr_8016AB6C.c
+++ b/src/ov_SC04_005/ov_SC04_005_jr_8016AB6C.c
@@ -3841,14 +3841,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC04_006/ov_SC04_006_jr_8016AB6C.c b/src/ov_SC04_006/ov_SC04_006_jr_8016AB6C.c
index b75fa4f5c..346cbd30c 100644
--- a/src/ov_SC04_006/ov_SC04_006_jr_8016AB6C.c
+++ b/src/ov_SC04_006/ov_SC04_006_jr_8016AB6C.c
@@ -3841,14 +3841,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC04_007/ov_SC04_007_jr_8016AB6C.c b/src/ov_SC04_007/ov_SC04_007_jr_8016AB6C.c
index cd1efd693..18256713a 100644
--- a/src/ov_SC04_007/ov_SC04_007_jr_8016AB6C.c
+++ b/src/ov_SC04_007/ov_SC04_007_jr_8016AB6C.c
@@ -3841,14 +3841,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC04_008/ov_SC04_008_jr_8016AB6C.c b/src/ov_SC04_008/ov_SC04_008_jr_8016AB6C.c
index d8f2ea777..6f34407cc 100644
--- a/src/ov_SC04_008/ov_SC04_008_jr_8016AB6C.c
+++ b/src/ov_SC04_008/ov_SC04_008_jr_8016AB6C.c
@@ -3841,14 +3841,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC04_009/ov_SC04_009_jr_8016AB6C.c b/src/ov_SC04_009/ov_SC04_009_jr_8016AB6C.c
index 1c6742267..2395493e4 100644
--- a/src/ov_SC04_009/ov_SC04_009_jr_8016AB6C.c
+++ b/src/ov_SC04_009/ov_SC04_009_jr_8016AB6C.c
@@ -3841,14 +3841,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC04_010/ov_SC04_010_jr_8016AB6C.c b/src/ov_SC04_010/ov_SC04_010_jr_8016AB6C.c
index dbc48d7bc..7de5d3696 100644
--- a/src/ov_SC04_010/ov_SC04_010_jr_8016AB6C.c
+++ b/src/ov_SC04_010/ov_SC04_010_jr_8016AB6C.c
@@ -3841,14 +3841,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC04_011/ov_SC04_011_jr_8016AB6C.c b/src/ov_SC04_011/ov_SC04_011_jr_8016AB6C.c
index d59671d3a..f813807c6 100644
--- a/src/ov_SC04_011/ov_SC04_011_jr_8016AB6C.c
+++ b/src/ov_SC04_011/ov_SC04_011_jr_8016AB6C.c
@@ -3841,14 +3841,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC04_012/ov_SC04_012_jr_8016AB6C.c b/src/ov_SC04_012/ov_SC04_012_jr_8016AB6C.c
index b331a3967..cb4ee059f 100644
--- a/src/ov_SC04_012/ov_SC04_012_jr_8016AB6C.c
+++ b/src/ov_SC04_012/ov_SC04_012_jr_8016AB6C.c
@@ -3841,14 +3841,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC04_015/ov_SC04_015_jr_8016AB6C.c b/src/ov_SC04_015/ov_SC04_015_jr_8016AB6C.c
index b5491c01e..ddd4b6a8d 100644
--- a/src/ov_SC04_015/ov_SC04_015_jr_8016AB6C.c
+++ b/src/ov_SC04_015/ov_SC04_015_jr_8016AB6C.c
@@ -3841,14 +3841,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC04_016/ov_SC04_016_jr_8016AB6C.c b/src/ov_SC04_016/ov_SC04_016_jr_8016AB6C.c
index b11b8bb89..582fb9392 100644
--- a/src/ov_SC04_016/ov_SC04_016_jr_8016AB6C.c
+++ b/src/ov_SC04_016/ov_SC04_016_jr_8016AB6C.c
@@ -3841,14 +3841,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC04_018/ov_SC04_018_jr_8016AB6C.c b/src/ov_SC04_018/ov_SC04_018_jr_8016AB6C.c
index 635a28881..0fbe0b911 100644
--- a/src/ov_SC04_018/ov_SC04_018_jr_8016AB6C.c
+++ b/src/ov_SC04_018/ov_SC04_018_jr_8016AB6C.c
@@ -3841,14 +3841,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC04_019/ov_SC04_019_jr_8016AB6C.c b/src/ov_SC04_019/ov_SC04_019_jr_8016AB6C.c
index 635a28881..0fbe0b911 100644
--- a/src/ov_SC04_019/ov_SC04_019_jr_8016AB6C.c
+++ b/src/ov_SC04_019/ov_SC04_019_jr_8016AB6C.c
@@ -3841,14 +3841,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC04_020/ov_SC04_020_jr_8016AB6C.c b/src/ov_SC04_020/ov_SC04_020_jr_8016AB6C.c
index 385d58fbc..6e6e35c75 100644
--- a/src/ov_SC04_020/ov_SC04_020_jr_8016AB6C.c
+++ b/src/ov_SC04_020/ov_SC04_020_jr_8016AB6C.c
@@ -3841,14 +3841,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC04_021/ov_SC04_021_jr_8016AB6C.c b/src/ov_SC04_021/ov_SC04_021_jr_8016AB6C.c
index d800e325f..5a02d076f 100644
--- a/src/ov_SC04_021/ov_SC04_021_jr_8016AB6C.c
+++ b/src/ov_SC04_021/ov_SC04_021_jr_8016AB6C.c
@@ -3841,14 +3841,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC05_000/ov_SC05_000_jr_8016AB6C.c b/src/ov_SC05_000/ov_SC05_000_jr_8016AB6C.c
index 343720366..75680dcc1 100644
--- a/src/ov_SC05_000/ov_SC05_000_jr_8016AB6C.c
+++ b/src/ov_SC05_000/ov_SC05_000_jr_8016AB6C.c
@@ -3839,14 +3839,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC05_001/ov_SC05_001_jr_8016AB6C.c b/src/ov_SC05_001/ov_SC05_001_jr_8016AB6C.c
index 1810cb0b3..c1d867ef5 100644
--- a/src/ov_SC05_001/ov_SC05_001_jr_8016AB6C.c
+++ b/src/ov_SC05_001/ov_SC05_001_jr_8016AB6C.c
@@ -3841,14 +3841,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC05_002/ov_SC05_002_jr_8016AB6C.c b/src/ov_SC05_002/ov_SC05_002_jr_8016AB6C.c
index 6d6fc6de8..b2ec1c5c4 100644
--- a/src/ov_SC05_002/ov_SC05_002_jr_8016AB6C.c
+++ b/src/ov_SC05_002/ov_SC05_002_jr_8016AB6C.c
@@ -3841,14 +3841,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC05_003/ov_SC05_003_jr_8016AB6C.c b/src/ov_SC05_003/ov_SC05_003_jr_8016AB6C.c
index c7c4f4270..f3daf19d2 100644
--- a/src/ov_SC05_003/ov_SC05_003_jr_8016AB6C.c
+++ b/src/ov_SC05_003/ov_SC05_003_jr_8016AB6C.c
@@ -3841,14 +3841,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC05_004/ov_SC05_004_jr_8016AB6C.c b/src/ov_SC05_004/ov_SC05_004_jr_8016AB6C.c
index c6b417d96..9c818d827 100644
--- a/src/ov_SC05_004/ov_SC05_004_jr_8016AB6C.c
+++ b/src/ov_SC05_004/ov_SC05_004_jr_8016AB6C.c
@@ -3841,14 +3841,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC05_005/ov_SC05_005_jr_8016AB6C.c b/src/ov_SC05_005/ov_SC05_005_jr_8016AB6C.c
index f480861e1..a4135dfb3 100644
--- a/src/ov_SC05_005/ov_SC05_005_jr_8016AB6C.c
+++ b/src/ov_SC05_005/ov_SC05_005_jr_8016AB6C.c
@@ -3841,14 +3841,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC05_006/ov_SC05_006_jr_8016AB6C.c b/src/ov_SC05_006/ov_SC05_006_jr_8016AB6C.c
index 80a975437..17beb6147 100644
--- a/src/ov_SC05_006/ov_SC05_006_jr_8016AB6C.c
+++ b/src/ov_SC05_006/ov_SC05_006_jr_8016AB6C.c
@@ -3841,14 +3841,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC05_007/ov_SC05_007_jr_8016AB6C.c b/src/ov_SC05_007/ov_SC05_007_jr_8016AB6C.c
index 56bcaf149..4b70cbe9c 100644
--- a/src/ov_SC05_007/ov_SC05_007_jr_8016AB6C.c
+++ b/src/ov_SC05_007/ov_SC05_007_jr_8016AB6C.c
@@ -3841,14 +3841,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC05_008/ov_SC05_008_jr_8016AB6C.c b/src/ov_SC05_008/ov_SC05_008_jr_8016AB6C.c
index feed44b71..d9c7a2476 100644
--- a/src/ov_SC05_008/ov_SC05_008_jr_8016AB6C.c
+++ b/src/ov_SC05_008/ov_SC05_008_jr_8016AB6C.c
@@ -3841,14 +3841,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC05_009/ov_SC05_009_jr_8016AB6C.c b/src/ov_SC05_009/ov_SC05_009_jr_8016AB6C.c
index 2aabb4e49..fd137b4d3 100644
--- a/src/ov_SC05_009/ov_SC05_009_jr_8016AB6C.c
+++ b/src/ov_SC05_009/ov_SC05_009_jr_8016AB6C.c
@@ -3841,14 +3841,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC05_010/ov_SC05_010_jr_8016AB6C.c b/src/ov_SC05_010/ov_SC05_010_jr_8016AB6C.c
index 08d21fb67..7ba15f5bd 100644
--- a/src/ov_SC05_010/ov_SC05_010_jr_8016AB6C.c
+++ b/src/ov_SC05_010/ov_SC05_010_jr_8016AB6C.c
@@ -3841,14 +3841,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC05_011/ov_SC05_011_jr_8016AB6C.c b/src/ov_SC05_011/ov_SC05_011_jr_8016AB6C.c
index 2c2bf03f6..d07abb43b 100644
--- a/src/ov_SC05_011/ov_SC05_011_jr_8016AB6C.c
+++ b/src/ov_SC05_011/ov_SC05_011_jr_8016AB6C.c
@@ -3841,14 +3841,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC05_017/ov_SC05_017_jr_8016AB6C.c b/src/ov_SC05_017/ov_SC05_017_jr_8016AB6C.c
index 01855acfc..ca88edcf0 100644
--- a/src/ov_SC05_017/ov_SC05_017_jr_8016AB6C.c
+++ b/src/ov_SC05_017/ov_SC05_017_jr_8016AB6C.c
@@ -3841,14 +3841,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC05_018/ov_SC05_018_jr_8016AB6C.c b/src/ov_SC05_018/ov_SC05_018_jr_8016AB6C.c
index 69ec67f2b..3a683f92a 100644
--- a/src/ov_SC05_018/ov_SC05_018_jr_8016AB6C.c
+++ b/src/ov_SC05_018/ov_SC05_018_jr_8016AB6C.c
@@ -3841,14 +3841,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC05_019/ov_SC05_019_jr_8016AB6C.c b/src/ov_SC05_019/ov_SC05_019_jr_8016AB6C.c
index d800e325f..5a02d076f 100644
--- a/src/ov_SC05_019/ov_SC05_019_jr_8016AB6C.c
+++ b/src/ov_SC05_019/ov_SC05_019_jr_8016AB6C.c
@@ -3841,14 +3841,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC06_000/ov_SC06_000_jr_8016AB6C.c b/src/ov_SC06_000/ov_SC06_000_jr_8016AB6C.c
index 87be57359..8aeceb3f4 100644
--- a/src/ov_SC06_000/ov_SC06_000_jr_8016AB6C.c
+++ b/src/ov_SC06_000/ov_SC06_000_jr_8016AB6C.c
@@ -3841,14 +3841,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC06_006/ov_SC06_006_jr_8016AB6C.c b/src/ov_SC06_006/ov_SC06_006_jr_8016AB6C.c
index b327da17c..157f97f86 100644
--- a/src/ov_SC06_006/ov_SC06_006_jr_8016AB6C.c
+++ b/src/ov_SC06_006/ov_SC06_006_jr_8016AB6C.c
@@ -3841,14 +3841,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC06_008/ov_SC06_008_jr_8016AB6C.c b/src/ov_SC06_008/ov_SC06_008_jr_8016AB6C.c
index 7bc4c0626..a090070d5 100644
--- a/src/ov_SC06_008/ov_SC06_008_jr_8016AB6C.c
+++ b/src/ov_SC06_008/ov_SC06_008_jr_8016AB6C.c
@@ -3841,14 +3841,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC06_010/ov_SC06_010_jr_8016AB6C.c b/src/ov_SC06_010/ov_SC06_010_jr_8016AB6C.c
index cebc3219b..7f1eff72f 100644
--- a/src/ov_SC06_010/ov_SC06_010_jr_8016AB6C.c
+++ b/src/ov_SC06_010/ov_SC06_010_jr_8016AB6C.c
@@ -3841,14 +3841,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC06_011/ov_SC06_011_jr_8016AB6C.c b/src/ov_SC06_011/ov_SC06_011_jr_8016AB6C.c
index 7327fbbf2..11ac4b369 100644
--- a/src/ov_SC06_011/ov_SC06_011_jr_8016AB6C.c
+++ b/src/ov_SC06_011/ov_SC06_011_jr_8016AB6C.c
@@ -3841,14 +3841,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC06_013/ov_SC06_013_jr_8016AB6C.c b/src/ov_SC06_013/ov_SC06_013_jr_8016AB6C.c
index fc7647531..8920e50d7 100644
--- a/src/ov_SC06_013/ov_SC06_013_jr_8016AB6C.c
+++ b/src/ov_SC06_013/ov_SC06_013_jr_8016AB6C.c
@@ -3841,14 +3841,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC06_014/ov_SC06_014_jr_8016AB6C.c b/src/ov_SC06_014/ov_SC06_014_jr_8016AB6C.c
index b139b2a89..c7312bdb1 100644
--- a/src/ov_SC06_014/ov_SC06_014_jr_8016AB6C.c
+++ b/src/ov_SC06_014/ov_SC06_014_jr_8016AB6C.c
@@ -3841,14 +3841,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC06_015/ov_SC06_015_jr_8016AB6C.c b/src/ov_SC06_015/ov_SC06_015_jr_8016AB6C.c
index c7d3decfc..54f5a5721 100644
--- a/src/ov_SC06_015/ov_SC06_015_jr_8016AB6C.c
+++ b/src/ov_SC06_015/ov_SC06_015_jr_8016AB6C.c
@@ -3841,14 +3841,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC06_016/ov_SC06_016_jr_8016AB6C.c b/src/ov_SC06_016/ov_SC06_016_jr_8016AB6C.c
index 7948e9f3a..374897b61 100644
--- a/src/ov_SC06_016/ov_SC06_016_jr_8016AB6C.c
+++ b/src/ov_SC06_016/ov_SC06_016_jr_8016AB6C.c
@@ -3841,14 +3841,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC06_018/ov_SC06_018_jr_8016AB6C.c b/src/ov_SC06_018/ov_SC06_018_jr_8016AB6C.c
index 8c4f82e40..cfb3db339 100644
--- a/src/ov_SC06_018/ov_SC06_018_jr_8016AB6C.c
+++ b/src/ov_SC06_018/ov_SC06_018_jr_8016AB6C.c
@@ -3841,14 +3841,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC06_020/ov_SC06_020_jr_8016AB6C.c b/src/ov_SC06_020/ov_SC06_020_jr_8016AB6C.c
index 9954c0f55..bd925b25c 100644
--- a/src/ov_SC06_020/ov_SC06_020_jr_8016AB6C.c
+++ b/src/ov_SC06_020/ov_SC06_020_jr_8016AB6C.c
@@ -3841,14 +3841,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC06_022/ov_SC06_022_jr_8016AB6C.c b/src/ov_SC06_022/ov_SC06_022_jr_8016AB6C.c
index 013fadde7..5e269b0f5 100644
--- a/src/ov_SC06_022/ov_SC06_022_jr_8016AB6C.c
+++ b/src/ov_SC06_022/ov_SC06_022_jr_8016AB6C.c
@@ -3841,14 +3841,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC06_024/ov_SC06_024_jr_8016AB6C.c b/src/ov_SC06_024/ov_SC06_024_jr_8016AB6C.c
index 9e3cc417f..a2cf6edd4 100644
--- a/src/ov_SC06_024/ov_SC06_024_jr_8016AB6C.c
+++ b/src/ov_SC06_024/ov_SC06_024_jr_8016AB6C.c
@@ -3841,14 +3841,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC06_025/ov_SC06_025_jr_8016AB6C.c b/src/ov_SC06_025/ov_SC06_025_jr_8016AB6C.c
index 3f044c350..348ba3e15 100644
--- a/src/ov_SC06_025/ov_SC06_025_jr_8016AB6C.c
+++ b/src/ov_SC06_025/ov_SC06_025_jr_8016AB6C.c
@@ -3841,14 +3841,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC06_027/ov_SC06_027_jr_8016AB6C.c b/src/ov_SC06_027/ov_SC06_027_jr_8016AB6C.c
index f6aae5127..1b6fe5572 100644
--- a/src/ov_SC06_027/ov_SC06_027_jr_8016AB6C.c
+++ b/src/ov_SC06_027/ov_SC06_027_jr_8016AB6C.c
@@ -3841,14 +3841,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC06_029/ov_SC06_029_jr_8016AB6C.c b/src/ov_SC06_029/ov_SC06_029_jr_8016AB6C.c
index 995b264ba..748fc8060 100644
--- a/src/ov_SC06_029/ov_SC06_029_jr_8016AB6C.c
+++ b/src/ov_SC06_029/ov_SC06_029_jr_8016AB6C.c
@@ -3841,14 +3841,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC06_030/ov_SC06_030_jr_8016AB6C.c b/src/ov_SC06_030/ov_SC06_030_jr_8016AB6C.c
index 9098f36bf..df7b67801 100644
--- a/src/ov_SC06_030/ov_SC06_030_jr_8016AB6C.c
+++ b/src/ov_SC06_030/ov_SC06_030_jr_8016AB6C.c
@@ -3841,14 +3841,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC06_032/ov_SC06_032_jr_8016AB6C.c b/src/ov_SC06_032/ov_SC06_032_jr_8016AB6C.c
index df56f4ad3..838fc53e4 100644
--- a/src/ov_SC06_032/ov_SC06_032_jr_8016AB6C.c
+++ b/src/ov_SC06_032/ov_SC06_032_jr_8016AB6C.c
@@ -3841,14 +3841,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC06_033/ov_SC06_033_jr_8016AB6C.c b/src/ov_SC06_033/ov_SC06_033_jr_8016AB6C.c
index 26f8300d6..bf15eafa5 100644
--- a/src/ov_SC06_033/ov_SC06_033_jr_8016AB6C.c
+++ b/src/ov_SC06_033/ov_SC06_033_jr_8016AB6C.c
@@ -3841,14 +3841,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC07_000/ov_SC07_000_jr_8016AB6C.c b/src/ov_SC07_000/ov_SC07_000_jr_8016AB6C.c
index d24047ea4..cb9ebb391 100644
--- a/src/ov_SC07_000/ov_SC07_000_jr_8016AB6C.c
+++ b/src/ov_SC07_000/ov_SC07_000_jr_8016AB6C.c
@@ -3841,14 +3841,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC07_001/ov_SC07_001_jr_8016AB6C.c b/src/ov_SC07_001/ov_SC07_001_jr_8016AB6C.c
index b637d8833..e5f2b62d6 100644
--- a/src/ov_SC07_001/ov_SC07_001_jr_8016AB6C.c
+++ b/src/ov_SC07_001/ov_SC07_001_jr_8016AB6C.c
@@ -3841,14 +3841,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC07_002/ov_SC07_002_jr_8016AB6C.c b/src/ov_SC07_002/ov_SC07_002_jr_8016AB6C.c
index 19a7f0a43..79f29654f 100644
--- a/src/ov_SC07_002/ov_SC07_002_jr_8016AB6C.c
+++ b/src/ov_SC07_002/ov_SC07_002_jr_8016AB6C.c
@@ -3841,14 +3841,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC07_006/ov_SC07_006_jr_8016AE5C.c b/src/ov_SC07_006/ov_SC07_006_jr_8016AE5C.c
index a58f79627..15afd3869 100644
--- a/src/ov_SC07_006/ov_SC07_006_jr_8016AE5C.c
+++ b/src/ov_SC07_006/ov_SC07_006_jr_8016AE5C.c
@@ -4748,14 +4748,7 @@ DEFINE_func_8016EFC8()  /* dedup: shared engine-core @0x8016EFC8 (src/shared) */
 DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016f094 (src/shared) */
 
 
-extern void func_8016F0E4(void);
-extern void func_80165770(void);
-void func_8016F0AC(void) {
-
-    extern u8 aD80126B58 __asm__("D_80126B58");
-    ((void (*)(void *))func_8016F0E4)(&aD80126B58);
-    ((void (*)(void *))func_80165770)(&aD80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC07_007/ov_SC07_007_jr_8016AE5C.c b/src/ov_SC07_007/ov_SC07_007_jr_8016AE5C.c
index 61cc496da..818c8d9fc 100644
--- a/src/ov_SC07_007/ov_SC07_007_jr_8016AE5C.c
+++ b/src/ov_SC07_007/ov_SC07_007_jr_8016AE5C.c
@@ -4736,14 +4736,7 @@ DEFINE_func_8016EFC8()  /* dedup: shared engine-core @0x8016EFC8 (src/shared) */
 DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016f094 (src/shared) */
 
 
-extern void func_8016F0E4(void);
-extern void func_80165770(void);
-void func_8016F0AC(void) {
-
-    extern u8 aD80126B58 __asm__("D_80126B58");
-    ((void (*)(void *))func_8016F0E4)(&aD80126B58);
-    ((void (*)(void *))func_80165770)(&aD80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC07_007/ov_SC07_007_jr_8017BEBC.c b/src/ov_SC07_007/ov_SC07_007_jr_8017BEBC.c
index bbe8525da..63ea2941b 100644
--- a/src/ov_SC07_007/ov_SC07_007_jr_8017BEBC.c
+++ b/src/ov_SC07_007/ov_SC07_007_jr_8017BEBC.c
@@ -7556,10 +7556,133 @@ void func_80181B28(s32 a0) {
 }
 
 
-void func_80181B84(void) {
+DEFINE_func_80181B84()  /* dedup: shared engine-core @0x80181B84 (src/shared) */
+
+#include "common.h"
+
+/* func_80181B8C — the 6-state cutscene/step machine driven by D_801C79A0.
+ *
+ * Two load-bearing levers (do NOT "clean these up"):
+ *
+ * §5a / §162 (cross-jump tail-merge).  Cases 0, 1, 3 and 4 all end with the
+ *   byte-identical 4-instruction tail
+ *       lui $v0,%hi(D_801C79A0); lw $v0,%lo(..)($v0); j .L80181DDC; addiu $v0,$v0,1
+ *   and the original keeps ALL FOUR copies, sharing only the 2-instruction store
+ *   block (.L80181DDC).  cc1 wants to collapse them, and it did so in two
+ *   different ways depending on register allocation:
+ *
+ *   (a) `register s32 t __asm__("$2")` in cases 0 and 3.  Left alone, cc1 homes
+ *       the D_801C79A0 reload of those two cases in $v1 (cases 1/4 get $v0).
+ *       With $v1 their tails no longer match case 5's `sw $v0`, so they miss the
+ *       depth-2 merge onto .L80181DDC, keep an inline `lui $at; sw $v1`, and
+ *       instead deep-merge into EACH OTHER at the shared `jal func_80181DFC`
+ *       (case 0 degenerates to `j` into case 3's body).  Pinning both to $v0
+ *       restores the target's four-copies-plus-shared-store shape.
+ *
+ *   (b) the volatile alias `vD_801C79A0` for case 3's reload ONLY.  Once case 3
+ *       is in $v0 its tail becomes an exact duplicate of case 1's and cc1
+ *       back-merges it (`beqz $v0,<case 1's lui>` + `j` — 2 instructions short).
+ *       A volatile MEM makes that tail non-equivalent and blocks the merge.
+ *       NOTE: it must be an __asm__-aliased volatile OBJECT, not
+ *       `*(volatile s32 *)&D_801C79A0` — the pointer cast materialises the
+ *       address (`lui`+`addiu %lo`+`lw 0(..)`) and costs one instruction, while
+ *       the aliased object keeps the folded `lui %hi` / `lw %lo(..)` pair.
+ *       (The TU's own idiom, cf. `aB9A02` in func_80181F4C.)
+ *
+ * §195-A: func_80181E38 is called with TWO arguments here even though the TU
+ * defines it as `void func_80181E38(s32)`; the unspecified-parameter-list
+ * declaration below is C89-compatible with that definition and is what puts
+ * D_801C79B0 in $a1 at both call sites.
+ */
+
+extern s32 D_80188710[];
+extern s32 D_801C799C;
+extern s32 D_801C79A0;
+extern volatile s32 vD_801C79A0 __asm__("D_801C79A0"); /* §5a cross-jump barrier */
+extern s32 D_801C79A4;
+extern s32 D_801C79AC;
+extern s32 D_801C79B0;
+
+extern void func_80181DFC(s32 arg0);
+extern s32 func_80181E28(void);
+extern void func_80181E38();
+extern s32 func_80181E50(s32 a0, s32 a1);
+extern s32 func_80181ED4(s32 a0, s32 a1);
+
+s32 func_80181B8C(void) {
+    s32 *p = &D_80188710[D_801C79A4 * 3];
+    s32 r0;
+    s32 r1;
+
+    switch (D_801C79A0) {
+    case 0:
+        func_80181DFC(D_801C79A4);
+        {
+            register s32 t __asm__("$2");
+            t = D_801C79A0 + 1;
+            D_801C79A0 = t;
+        }
+        return 0;
+    case 1:
+        if (func_80181E28() == 0) {
+            return 0;
+        }
+        if (p[0] <= D_801C799C) {
+            D_801C79AC = p[1];
+            func_80181E38(0, D_801C79B0);
+            func_80181E38(1, D_801C79B0);
+            D_801C79A0 = D_801C79A0 + 1;
+        }
+        return 0;
+    case 2:
+        r0 = func_80181E50(0, D_801C79B0);
+        r1 = func_80181E50(1, D_801C79B0);
+        if (r0 != 0) {
+            if (r1 != 0) {
+                D_801C79A4 = D_801C79A4 + 1;
+                D_801C79A0 = D_801C79A0 + 1;
+            }
+        }
+        return 0;
+    case 3:
+        func_80181E50(0, D_801C79B0);
+        func_80181E50(1, D_801C79B0);
+        if (D_801C79A4 < 0xD) {
+            func_80181DFC(D_801C79A4);
+        }
+        {
+            register s32 t __asm__("$2");
+            t = vD_801C79A0 + 1;
+            D_801C79A0 = t;
+        }
+        return 0;
+    case 4:
+        func_80181E50(0, D_801C79B0);
+        func_80181E50(1, D_801C79B0);
+        if (func_80181E28() == 0) {
+            return 0;
+        }
+        if (D_801C79AC <= D_801C799C) {
+            D_801C79A0 = D_801C79A0 + 1;
+        }
+        return 0;
+    case 5:
+        r0 = func_80181ED4(0, D_801C79B0);
+        r1 = func_80181ED4(1, D_801C79B0);
+        if (r0 != 0) {
+            if (r1 != 0) {
+                D_801C79B0 = D_801C79B0 ^ 1;
+                if (D_801C79A4 >= 0xD) {
+                    return 1;
+                }
+                D_801C79A0 = 1;
+            }
+        }
+        return 0;
+    }
+    return 0;
 }
 
-INCLUDE_ASM("asm/ov_SC07_007/nonmatchings/ov_SC07_007_jr_8017BEBC", func_80181B8C);
 
 void func_80181DFC(s32 arg0) {
     extern s32 D_801C7868;
diff --git a/src/ov_SC07_008/ov_SC07_008_jr_8016AB6C.c b/src/ov_SC07_008/ov_SC07_008_jr_8016AB6C.c
index efb872bc2..5ee0206f7 100644
--- a/src/ov_SC07_008/ov_SC07_008_jr_8016AB6C.c
+++ b/src/ov_SC07_008/ov_SC07_008_jr_8016AB6C.c
@@ -3840,14 +3840,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC07_009/ov_SC07_009_jr_8016AB6C.c b/src/ov_SC07_009/ov_SC07_009_jr_8016AB6C.c
index 7f62bd3b3..d6e378c15 100644
--- a/src/ov_SC07_009/ov_SC07_009_jr_8016AB6C.c
+++ b/src/ov_SC07_009/ov_SC07_009_jr_8016AB6C.c
@@ -3841,14 +3841,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016F094 (src/shared) */
 // @class: plumbing
 // @stuck: none — MATCH
 
-s32 func_8016F0AC()
-{
-    extern void func_8016F0E4(void);
-
-
-    ((void (*)(void *))func_8016F0E4)(&D_80126B58);
-    ((void (*)(void *))func_80165770)(&D_80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC07_010/ov_SC07_010_jr_8016AE5C.c b/src/ov_SC07_010/ov_SC07_010_jr_8016AE5C.c
index 6f46338b3..6eeb9035a 100644
--- a/src/ov_SC07_010/ov_SC07_010_jr_8016AE5C.c
+++ b/src/ov_SC07_010/ov_SC07_010_jr_8016AE5C.c
@@ -4188,13 +4188,7 @@ DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016f094 (src/shared) */
 extern void func_8016F0E4(void);
 extern void func_80165770(void);
 void aF8016F0AC(void) __asm__("func_8016F0AC");
-void aF8016F0AC(void)
-{
-
-    extern s32 D_80126B58;
-    ((void (*)(void *))func_8016F0E4)(&(*(u8 *)&D_80126B58));
-    ((void (*)(void *))func_80165770)(&(*(u8 *)&D_80126B58));
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/ov_SC07_011/ov_SC07_011_jr_8016AE5C.c b/src/ov_SC07_011/ov_SC07_011_jr_8016AE5C.c
index c2154b378..39875d9d6 100644
--- a/src/ov_SC07_011/ov_SC07_011_jr_8016AE5C.c
+++ b/src/ov_SC07_011/ov_SC07_011_jr_8016AE5C.c
@@ -4736,14 +4736,7 @@ DEFINE_func_8016EFC8()  /* dedup: shared engine-core @0x8016EFC8 (src/shared) */
 DEFINE_func_8016F094()  /* dedup: shared engine-core @0x8016f094 (src/shared) */
 
 
-extern void func_8016F0E4(void);
-extern void func_80165770(void);
-void func_8016F0AC(void) {
-
-    extern u8 aD80126B58 __asm__("D_80126B58");
-    ((void (*)(void *))func_8016F0E4)(&aD80126B58);
-    ((void (*)(void *))func_80165770)(&aD80126B58);
-}
+DEFINE_func_8016F0AC()  /* dedup: shared engine-core @0x8016F0AC (src/shared) */
 
 
 
diff --git a/src/shared/engine_core.h b/src/shared/engine_core.h
index fc5be0584..81057b89e 100644
--- a/src/shared/engine_core.h
+++ b/src/shared/engine_core.h
@@ -99148,6 +99148,19 @@
         } while (0); \
     }
 
+#define DEFINE_func_80181B84() \
+    void func_80181B84(void) { \
+    }
+
+#define DEFINE_func_8016F0AC() \
+    extern void func_8016F0E4(void); \
+    extern void func_80165770(void); \
+    void func_8016F0AC(void) { \
+        extern u8 aD80126B58 __asm__("D_80126B58"); \
+        ((void (*)(void *))func_8016F0E4)(&aD80126B58); \
+        ((void (*)(void *))func_80165770)(&aD80126B58); \
+    }
+
 #endif
 
 #define DEFINE_func_80128EA8() \
@@ -227701,4 +227714,17 @@
         } while (0); \
     }
 
+#define DEFINE_func_80181B84() \
+    void func_80181B84(void) { \
+    }
+
+#define DEFINE_func_8016F0AC() \
+    extern void func_8016F0E4(void); \
+    extern void func_80165770(void); \
+    void func_8016F0AC(void) { \
+        extern u8 aD80126B58 __asm__("D_80126B58"); \
+        ((void (*)(void *))func_8016F0E4)(&aD80126B58); \
+        ((void (*)(void *))func_80165770)(&aD80126B58); \
+    }
+
 #endif