From b064d2b869b6637447e83ec2273e164705f8031a Mon Sep 17 00:00:00 2001 From: Drew T <50529377+Druthulu@users.noreply.github.com> Date: Fri, 14 Aug 2026 05:19:22 -0600 Subject: [PATCH] feat(phase-30 S49): propagate func_80182D0C (adapt lane) --- config/dedup.us.yaml | 7 +++++++ src/ov_SC04_018/ov_SC04_018_jr_8017AE2C.c | 7 +------ src/ov_SC04_019/ov_SC04_019_jr_8017AE2C.c | 6 +----- src/shared/engine_core.h | 14 ++++++++++++++ 4 files changed, 23 insertions(+), 11 deletions(-) diff --git a/config/dedup.us.yaml b/config/dedup.us.yaml index 4bac5682c3..1df4958c8f 100644 --- a/config/dedup.us.yaml +++ b/config/dedup.us.yaml @@ -14523,3 +14523,10 @@ groups: func: DEFINE_func_8017D964 vram: 0x8017D964 binaries: [ov_SC07_000, ov_SC07_001] + - id: E_func_80182D0C + tier: h_exact + hash: b5a16a9cd09de0930a799a5b7c756cbd1870ac18 + source: src/shared/engine_core.h + func: DEFINE_func_80182D0C + vram: 0x80182D0C + 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 861d55bb17..c9a4af40a5 100644 --- a/src/ov_SC04_018/ov_SC04_018_jr_8017AE2C.c +++ b/src/ov_SC04_018/ov_SC04_018_jr_8017AE2C.c @@ -6402,12 +6402,7 @@ void func_80182C98(void *a0) { INCLUDE_ASM("asm/ov_SC04_018/nonmatchings/ov_SC04_018_jr_8017AE2C", func_80182CD4); -extern s32 D_801D7E84; -extern s32 D_801D6C98; - -void func_80182D0C(void) { - D_801D6C98 = D_801D7E84; -} +DEFINE_func_80182D0C() /* dedup: shared engine-core @0x80182D0C (src/shared) */ 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 9638d88598..6430846def 100644 --- a/src/ov_SC04_019/ov_SC04_019_jr_8017AE2C.c +++ b/src/ov_SC04_019/ov_SC04_019_jr_8017AE2C.c @@ -6424,11 +6424,7 @@ void func_80182C98(void *a0) { INCLUDE_ASM("asm/ov_SC04_019/nonmatchings/ov_SC04_019_jr_8017AE2C", func_80182CD4); -extern s32 D_801D7E84; - extern s32 D_801D6C98; - void func_80182D0C(void) { - D_801D6C98 = D_801D7E84; - } +DEFINE_func_80182D0C() /* dedup: shared engine-core @0x80182D0C (src/shared) */ diff --git a/src/shared/engine_core.h b/src/shared/engine_core.h index ddc29425eb..887815686a 100644 --- a/src/shared/engine_core.h +++ b/src/shared/engine_core.h @@ -60237,6 +60237,13 @@ return (func_800167F0(0) & 0xffff) != 0; \ } +#define DEFINE_func_80182D0C() \ + extern s32 D_801D7E84; \ + extern s32 D_801D6C98; \ + void func_80182D0C(void) { \ + D_801D6C98 = D_801D7E84; \ + } + #endif #define DEFINE_func_80128EA8() \ @@ -149879,4 +149886,11 @@ return (func_800167F0(0) & 0xffff) != 0; \ } +#define DEFINE_func_80182D0C() \ + extern s32 D_801D7E84; \ + extern s32 D_801D6C98; \ + void func_80182D0C(void) { \ + D_801D6C98 = D_801D7E84; \ + } + #endif