From f398dce9bf706e87bd4555bbc8ba0256f603985b Mon Sep 17 00:00:00 2001 From: Drew T <50529377+Druthulu@users.noreply.github.com> Date: Fri, 14 Aug 2026 07:35:48 -0600 Subject: [PATCH] feat(phase-30 S49): propagate func_8017CF5C (adapt lane) --- config/dedup.us.yaml | 7 +++++++ src/ov_SC01_008/ov_SC01_008_jr_8017BE9C.c | 5 +---- src/ov_SC06_006/ov_SC06_006_jr_8017BEBC.c | 5 +---- src/shared/engine_core.h | 12 ++++++++++++ 4 files changed, 21 insertions(+), 8 deletions(-) diff --git a/config/dedup.us.yaml b/config/dedup.us.yaml index 09c0f65c7..fd36b744a 100644 --- a/config/dedup.us.yaml +++ b/config/dedup.us.yaml @@ -14544,3 +14544,10 @@ groups: func: DEFINE_func_8017CE0C vram: 0x8017CE0C binaries: [ov_SC03_006, ov_SC02_016, ov_SC02_017, ov_SC03_029] + - id: E_func_8017CF5C + tier: h_exact + hash: 37f67f3adb2e4e2b3392abbf4d460a287e3a0242 + source: src/shared/engine_core.h + func: DEFINE_func_8017CF5C + vram: 0x8017CF5C + binaries: [ov_SC01_008, ov_SC06_006] diff --git a/src/ov_SC01_008/ov_SC01_008_jr_8017BE9C.c b/src/ov_SC01_008/ov_SC01_008_jr_8017BE9C.c index d87ebedbd..311d5a4b2 100644 --- a/src/ov_SC01_008/ov_SC01_008_jr_8017BE9C.c +++ b/src/ov_SC01_008/ov_SC01_008_jr_8017BE9C.c @@ -3249,10 +3249,7 @@ s32 func_8017CEE0(u8 *a0) { } -extern void func_800D1EBC(void); - void func_8017CF5C(void) { - func_800D1EBC(); - } +DEFINE_func_8017CF5C() /* dedup: shared engine-core @0x8017CF5C (src/shared) */ diff --git a/src/ov_SC06_006/ov_SC06_006_jr_8017BEBC.c b/src/ov_SC06_006/ov_SC06_006_jr_8017BEBC.c index 0371b8d03..f8761a502 100644 --- a/src/ov_SC06_006/ov_SC06_006_jr_8017BEBC.c +++ b/src/ov_SC06_006/ov_SC06_006_jr_8017BEBC.c @@ -3225,10 +3225,7 @@ s32 func_8017CEE0(u8 *a0) { } -extern void func_800D1EBC(void); -void func_8017CF5C(void) { - func_800D1EBC(); -} +DEFINE_func_8017CF5C() /* dedup: shared engine-core @0x8017CF5C (src/shared) */ diff --git a/src/shared/engine_core.h b/src/shared/engine_core.h index 964559f6e..d28be9c49 100644 --- a/src/shared/engine_core.h +++ b/src/shared/engine_core.h @@ -60355,6 +60355,12 @@ } \ } +#define DEFINE_func_8017CF5C() \ + extern void func_800D1EBC(void); \ + void func_8017CF5C(void) { \ + func_800D1EBC(); \ + } + #endif #define DEFINE_func_80128EA8() \ @@ -150115,4 +150121,10 @@ } \ } +#define DEFINE_func_8017CF5C() \ + extern void func_800D1EBC(void); \ + void func_8017CF5C(void) { \ + func_800D1EBC(); \ + } + #endif