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

---
 config/dedup.us.yaml                      |  7 +++++++
 src/ov_SC04_018/ov_SC04_018_jr_80188E1C.c | 11 +----------
 src/ov_SC04_019/ov_SC04_019_jr_80188E1C.c |  2 +-
 src/shared/engine_core.h                  | 20 ++++++++++++++++++++
 4 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/config/dedup.us.yaml b/config/dedup.us.yaml
index d4c2afabbc..2c026a736d 100644
--- a/config/dedup.us.yaml
+++ b/config/dedup.us.yaml
@@ -14803,3 +14803,10 @@ groups:
     func: DEFINE_func_8018BDA4
     vram: 0x8018BDA4
     binaries: [ov_SC04_018, ov_SC04_019]
+  - id: E_func_8018B660
+    tier: h_exact
+    hash: 92e9a1efdbf7c0262343b15f2b109aa6bd159631
+    source: src/shared/engine_core.h
+    func: DEFINE_func_8018B660
+    vram: 0x8018B660
+    binaries: [ov_SC04_018, ov_SC04_019]
diff --git a/src/ov_SC04_018/ov_SC04_018_jr_80188E1C.c b/src/ov_SC04_018/ov_SC04_018_jr_80188E1C.c
index 37e8d6075b..2b40b4e745 100644
--- a/src/ov_SC04_018/ov_SC04_018_jr_80188E1C.c
+++ b/src/ov_SC04_018/ov_SC04_018_jr_80188E1C.c
@@ -4592,16 +4592,7 @@ void func_8018B614(void *a0) {
 
 #include "common.h"
 
-void func_8018B660(s32 a0) {
-    s32 *v1;
-
-    v1 = *(s32 **)((s32)a0 + 0xCC);
-    *(s32 *)((s32)v1 + 0xB0) = 2;
-
-    if (func_8018B5AC() == 0) {
-        *(s16 *)((s32)a0 + 0x2) = 1;
-    }
-}
+DEFINE_func_8018B660()  /* dedup: shared engine-core @0x8018B660 (src/shared) */
 
 
 void func_8018B6A0(void *a0) {
diff --git a/src/ov_SC04_019/ov_SC04_019_jr_80188E1C.c b/src/ov_SC04_019/ov_SC04_019_jr_80188E1C.c
index 89d2daeb27..ff12c8099a 100644
--- a/src/ov_SC04_019/ov_SC04_019_jr_80188E1C.c
+++ b/src/ov_SC04_019/ov_SC04_019_jr_80188E1C.c
@@ -3998,7 +3998,7 @@ INCLUDE_ASM("asm/ov_SC04_019/nonmatchings/ov_SC04_019_jr_80188E1C", func_8018B5A
 
 INCLUDE_ASM("asm/ov_SC04_019/nonmatchings/ov_SC04_019_jr_80188E1C", func_8018B614);
 
-INCLUDE_ASM("asm/ov_SC04_019/nonmatchings/ov_SC04_019_jr_80188E1C", func_8018B660);
+DEFINE_func_8018B660()  /* dedup: shared engine-core @0x8018B660 (src/shared) */
 
 extern s32 func_8012E57C(s32 a0, s32 a1);
 
diff --git a/src/shared/engine_core.h b/src/shared/engine_core.h
index 0bbd4d9b4a..bdc9d5b16c 100644
--- a/src/shared/engine_core.h
+++ b/src/shared/engine_core.h
@@ -60985,6 +60985,16 @@
         *(s32 *)(a0 + 0xCC) = func_8012E57C(0x61, 0xA); \
     }
 
+#define DEFINE_func_8018B660() \
+    void func_8018B660(s32 a0) { \
+        s32 *v1; \
+        v1 = *(s32 **)((s32)a0 + 0xCC); \
+        *(s32 *)((s32)v1 + 0xB0) = 2; \
+        if (func_8018B5AC() == 0) { \
+            *(s16 *)((s32)a0 + 0x2) = 1; \
+        } \
+    }
+
 #endif
 
 #define DEFINE_func_80128EA8() \
@@ -151375,4 +151385,14 @@
         *(s32 *)(a0 + 0xCC) = func_8012E57C(0x61, 0xA); \
     }
 
+#define DEFINE_func_8018B660() \
+    void func_8018B660(s32 a0) { \
+        s32 *v1; \
+        v1 = *(s32 **)((s32)a0 + 0xCC); \
+        *(s32 *)((s32)v1 + 0xB0) = 2; \
+        if (func_8018B5AC() == 0) { \
+            *(s16 *)((s32)a0 + 0x2) = 1; \
+        } \
+    }
+
 #endif