From 54f7575330c4f155e9924f45ad5cb25696104fc5 Mon Sep 17 00:00:00 2001
From: Drew T <50529377+Druthulu@users.noreply.github.com>
Date: Sat, 15 Aug 2026 00:30:01 -0600
Subject: [PATCH] feat(phase-31): propagate func_8017FA58 (gate lane)

---
 config/dedup.us.yaml                      |  7 +++++++
 src/ov_SC04_018/ov_SC04_018_jr_8017AE2C.c | 13 +-----------
 src/ov_SC04_019/ov_SC04_019_jr_8017AE2C.c |  2 +-
 src/shared/engine_core.h                  | 24 +++++++++++++++++++++++
 4 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/config/dedup.us.yaml b/config/dedup.us.yaml
index 5a380d495..f410735af 100644
--- a/config/dedup.us.yaml
+++ b/config/dedup.us.yaml
@@ -14838,3 +14838,10 @@ groups:
     func: DEFINE_func_8017DAC4
     vram: 0x8017DAC4
     binaries: [ov_SC04_018, ov_SC04_019, ov_SC05_017]
+  - id: E_func_8017FA58
+    tier: h_exact
+    hash: 6c1baed5f87613f12b2b0db2510416729b55b6e8
+    source: src/shared/engine_core.h
+    func: DEFINE_func_8017FA58
+    vram: 0x8017FA58
+    binaries: [ov_SC04_018, ov_SC04_019]
diff --git a/src/ov_SC04_018/ov_SC04_018_jr_8017AE2C.c b/src/ov_SC04_018/ov_SC04_018_jr_8017AE2C.c
index 50f9038d7..2ed134b28 100644
--- a/src/ov_SC04_018/ov_SC04_018_jr_8017AE2C.c
+++ b/src/ov_SC04_018/ov_SC04_018_jr_8017AE2C.c
@@ -5166,18 +5166,7 @@ extern void func_80029124(s32 arg0, s32 arg1);
 
 #include "common.h"
 
-extern s32 func_80184BD0(u8 a0, u8 a1, u8 a2, u8 a3);
-extern void func_8017F500(void *a0);
-
-void func_8017FA58(void *a0) {
-    s32 v0;
-
-    *(s32 *)(*(s32 *)((s32)a0 + 0xCC) + 0xB0) = 2;
-    v0 = func_80184BD0(0xB, 0, 0x17, 0);
-    if (v0) {
-        func_8017F500(a0);
-    }
-}
+DEFINE_func_8017FA58()  /* dedup: shared engine-core @0x8017FA58 (src/shared) */
 
 
 #include "common.h"
diff --git a/src/ov_SC04_019/ov_SC04_019_jr_8017AE2C.c b/src/ov_SC04_019/ov_SC04_019_jr_8017AE2C.c
index 59be3d576..0f4d0c5ce 100644
--- a/src/ov_SC04_019/ov_SC04_019_jr_8017AE2C.c
+++ b/src/ov_SC04_019/ov_SC04_019_jr_8017AE2C.c
@@ -5186,7 +5186,7 @@ void func_8017FA34(void) {
 }
 
 
-INCLUDE_ASM("asm/ov_SC04_019/nonmatchings/ov_SC04_019_jr_8017AE2C", func_8017FA58);
+DEFINE_func_8017FA58()  /* dedup: shared engine-core @0x8017FA58 (src/shared) */
 
 DEFINE_func_8017FAAC()  /* dedup: shared engine-core @0x8017FAAC (src/shared) */
 
diff --git a/src/shared/engine_core.h b/src/shared/engine_core.h
index 4b851db94..72b397756 100644
--- a/src/shared/engine_core.h
+++ b/src/shared/engine_core.h
@@ -61090,6 +61090,18 @@
         } while (i < 3); \
     }
 
+#define DEFINE_func_8017FA58() \
+    extern s32 func_80184BD0(u8 a0, u8 a1, u8 a2, u8 a3); \
+    extern void func_8017F500(void *a0); \
+    void func_8017FA58(void *a0) { \
+        s32 v0; \
+        *(s32 *)(*(s32 *)((s32)a0 + 0xCC) + 0xB0) = 2; \
+        v0 = func_80184BD0(0xB, 0, 0x17, 0); \
+        if (v0) { \
+            func_8017F500(a0); \
+        } \
+    }
+
 #endif
 
 #define DEFINE_func_80128EA8() \
@@ -151585,4 +151597,16 @@
         } while (i < 3); \
     }
 
+#define DEFINE_func_8017FA58() \
+    extern s32 func_80184BD0(u8 a0, u8 a1, u8 a2, u8 a3); \
+    extern void func_8017F500(void *a0); \
+    void func_8017FA58(void *a0) { \
+        s32 v0; \
+        *(s32 *)(*(s32 *)((s32)a0 + 0xCC) + 0xB0) = 2; \
+        v0 = func_80184BD0(0xB, 0, 0x17, 0); \
+        if (v0) { \
+            func_8017F500(a0); \
+        } \
+    }
+
 #endif