From 62341f4a48162117db5532b24bfa939b7e338721 Mon Sep 17 00:00:00 2001 From: Drew T <50529377+Druthulu@users.noreply.github.com> Date: Fri, 14 Aug 2026 05:14:31 -0600 Subject: [PATCH] feat(phase-30 S49): propagate func_8017D964 (adapt lane) --- config/dedup.us.yaml | 7 +++++++ src/ov_SC07_000/ov_SC07_000_jr_8017BEBC.c | 6 +----- src/ov_SC07_001/ov_SC07_001_jr_8017BEBC.c | 6 +----- src/shared/engine_core.h | 12 ++++++++++++ 4 files changed, 21 insertions(+), 10 deletions(-) diff --git a/config/dedup.us.yaml b/config/dedup.us.yaml index 3c79bc1cc4..4bac5682c3 100644 --- a/config/dedup.us.yaml +++ b/config/dedup.us.yaml @@ -14516,3 +14516,10 @@ groups: func: DEFINE_func_80182120 vram: 0x80182120 binaries: [ov_SC04_018, ov_SC04_019] + - id: E_func_8017D964 + tier: h_exact + hash: 511a8b68802b6800ebb271e89b28604ee53e3401 + source: src/shared/engine_core.h + func: DEFINE_func_8017D964 + vram: 0x8017D964 + binaries: [ov_SC07_000, ov_SC07_001] diff --git a/src/ov_SC07_000/ov_SC07_000_jr_8017BEBC.c b/src/ov_SC07_000/ov_SC07_000_jr_8017BEBC.c index 52a1a6b5d4..b18cbf9488 100644 --- a/src/ov_SC07_000/ov_SC07_000_jr_8017BEBC.c +++ b/src/ov_SC07_000/ov_SC07_000_jr_8017BEBC.c @@ -3606,11 +3606,7 @@ s32 func_8017D920(s32 a0) { -extern s32 func_800167F0(s32 a0); - -s32 func_8017D964(void) { - return (func_800167F0(0) & 0xffff) != 0; -} +DEFINE_func_8017D964() /* dedup: shared engine-core @0x8017D964 (src/shared) */ diff --git a/src/ov_SC07_001/ov_SC07_001_jr_8017BEBC.c b/src/ov_SC07_001/ov_SC07_001_jr_8017BEBC.c index 4ef4dd0888..0080c01cf9 100644 --- a/src/ov_SC07_001/ov_SC07_001_jr_8017BEBC.c +++ b/src/ov_SC07_001/ov_SC07_001_jr_8017BEBC.c @@ -3629,11 +3629,7 @@ s32 func_8017D920(s32 a0) { -extern s32 func_800167F0(s32 a0); - -s32 func_8017D964(void) { - return (func_800167F0(0) & 0xffff) != 0; -} +DEFINE_func_8017D964() /* dedup: shared engine-core @0x8017D964 (src/shared) */ diff --git a/src/shared/engine_core.h b/src/shared/engine_core.h index 1ff8de8eee..ddc29425eb 100644 --- a/src/shared/engine_core.h +++ b/src/shared/engine_core.h @@ -60231,6 +60231,12 @@ func_80184ED4((s32)arg0, (s32)&(*(short *)D_801B66D8), 0x1, 0x40); \ } +#define DEFINE_func_8017D964() \ + extern s32 func_800167F0(s32 a0); \ + s32 func_8017D964(void) { \ + return (func_800167F0(0) & 0xffff) != 0; \ + } + #endif #define DEFINE_func_80128EA8() \ @@ -149867,4 +149873,10 @@ func_80184ED4((s32)arg0, (s32)&(*(short *)D_801B66D8), 0x1, 0x40); \ } +#define DEFINE_func_8017D964() \ + extern s32 func_800167F0(s32 a0); \ + s32 func_8017D964(void) { \ + return (func_800167F0(0) & 0xffff) != 0; \ + } + #endif