From 6e73f738fbaf9ec0af1f5109fc9bdb8ff65808d2 Mon Sep 17 00:00:00 2001 From: Drew T <50529377+Druthulu@users.noreply.github.com> Date: Tue, 18 Aug 2026 04:14:34 -0600 Subject: [PATCH] feat(decomp): propagate func_8017F154 (gate lane) --- config/dedup.us.yaml | 7 +++++++ src/ov_SC03_126/ov_SC03_126_jr_8017D5C0.c | 6 +----- src/ov_SC04_021/ov_SC04_021_jr_8017D5C0.c | 6 +----- src/ov_SC05_019/ov_SC05_019_jr_8017D5C0.c | 6 +----- src/shared/engine_core.h | 12 ++++++++++++ 5 files changed, 22 insertions(+), 15 deletions(-) diff --git a/config/dedup.us.yaml b/config/dedup.us.yaml index 5ef184e37..4eadd6486 100644 --- a/config/dedup.us.yaml +++ b/config/dedup.us.yaml @@ -15223,3 +15223,10 @@ groups: func: DEFINE_func_8018048C vram: 0x8018048C binaries: [ov_SC04_018, ov_SC04_019] + - id: E_func_8017F154 + tier: h_exact + hash: b6bbf0a0bb12c4ab91fdb8c2ac064561b3fa7cd8 + source: src/shared/engine_core.h + func: DEFINE_func_8017F154 + vram: 0x8017F154 + binaries: [ov_SC03_126, ov_SC04_021, ov_SC05_019] diff --git a/src/ov_SC03_126/ov_SC03_126_jr_8017D5C0.c b/src/ov_SC03_126/ov_SC03_126_jr_8017D5C0.c index 80e410bb5..be64478cd 100644 --- a/src/ov_SC03_126/ov_SC03_126_jr_8017D5C0.c +++ b/src/ov_SC03_126/ov_SC03_126_jr_8017D5C0.c @@ -3519,11 +3519,7 @@ s32 func_8017F14C(void) { -extern void (*D_80183110[])(void); - -void func_8017F154(void *a0) { - D_80183110[*(u16 *)((s32)a0 + 0x2)](); -} +DEFINE_func_8017F154() /* dedup: shared engine-core @0x8017F154 (src/shared) */ DEFINE_func_8017F190() /* dedup: shared engine-core @0x8017F190 (src/shared) */ diff --git a/src/ov_SC04_021/ov_SC04_021_jr_8017D5C0.c b/src/ov_SC04_021/ov_SC04_021_jr_8017D5C0.c index aa09edbec..cce12f294 100644 --- a/src/ov_SC04_021/ov_SC04_021_jr_8017D5C0.c +++ b/src/ov_SC04_021/ov_SC04_021_jr_8017D5C0.c @@ -3482,11 +3482,7 @@ s32 func_8017F14C(void) { -extern void (*D_80183110[])(void); - -void func_8017F154(void *a0) { - D_80183110[*(u16 *)((s32)a0 + 0x2)](); -} +DEFINE_func_8017F154() /* dedup: shared engine-core @0x8017F154 (src/shared) */ DEFINE_func_8017F190() /* dedup: shared engine-core @0x8017F190 (src/shared) */ diff --git a/src/ov_SC05_019/ov_SC05_019_jr_8017D5C0.c b/src/ov_SC05_019/ov_SC05_019_jr_8017D5C0.c index 912a7b752..a41db0436 100644 --- a/src/ov_SC05_019/ov_SC05_019_jr_8017D5C0.c +++ b/src/ov_SC05_019/ov_SC05_019_jr_8017D5C0.c @@ -3481,11 +3481,7 @@ s32 func_8017F14C(void) { -extern void (*D_80183110[])(void); - -void func_8017F154(void *a0) { - D_80183110[*(u16 *)((s32)a0 + 0x2)](); -} +DEFINE_func_8017F154() /* dedup: shared engine-core @0x8017F154 (src/shared) */ DEFINE_func_8017F190() /* dedup: shared engine-core @0x8017F190 (src/shared) */ diff --git a/src/shared/engine_core.h b/src/shared/engine_core.h index a0ffbad44..c560a40a0 100644 --- a/src/shared/engine_core.h +++ b/src/shared/engine_core.h @@ -65778,6 +65778,12 @@ D_801919C4[*(u16 *)((s32)a0 + 0x2)](); \ } +#define DEFINE_func_8017F154() \ + extern void (*D_80183110[])(void); \ + void func_8017F154(void *a0) { \ + D_80183110[*(u16 *)((s32)a0 + 0x2)](); \ + } + #endif #define DEFINE_func_80128EA8() \ @@ -160961,4 +160967,10 @@ D_801919C4[*(u16 *)((s32)a0 + 0x2)](); \ } +#define DEFINE_func_8017F154() \ + extern void (*D_80183110[])(void); \ + void func_8017F154(void *a0) { \ + D_80183110[*(u16 *)((s32)a0 + 0x2)](); \ + } + #endif