From b4b578e52d373d95537560186cb6bebc21f4cfae Mon Sep 17 00:00:00 2001 From: Drew T <50529377+Druthulu@users.noreply.github.com> Date: Thu, 13 Aug 2026 11:41:29 -0600 Subject: [PATCH] feat(phase-30 S49): propagate func_8018042C (adapt lane) --- config/dedup.us.yaml | 7 ++++++ src/ov_SC04_018/ov_SC04_018_jr_8017AE2C.c | 15 +----------- src/ov_SC04_019/ov_SC04_019_jr_8017AE2C.c | 2 +- src/shared/engine_core.h | 30 +++++++++++++++++++++++ 4 files changed, 39 insertions(+), 15 deletions(-) diff --git a/config/dedup.us.yaml b/config/dedup.us.yaml index 1077d49a44..35e8121108 100644 --- a/config/dedup.us.yaml +++ b/config/dedup.us.yaml @@ -14348,3 +14348,10 @@ groups: func: DEFINE_func_80188990 vram: 0x80188990 binaries: [ov_SC03_118, ov_SC03_119] + - id: E_func_8018042C + tier: h_exact + hash: 52a02918a36e36aa6e465db2aadeb9245bbfaa62 + source: src/shared/engine_core.h + func: DEFINE_func_8018042C + vram: 0x8018042C + 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 3f07f807e4..a41d478fd7 100644 --- a/src/ov_SC04_018/ov_SC04_018_jr_8017AE2C.c +++ b/src/ov_SC04_018/ov_SC04_018_jr_8017AE2C.c @@ -5377,20 +5377,7 @@ void func_8018034C(void *arg0) { INCLUDE_ASM("asm/ov_SC04_018/nonmatchings/ov_SC04_018_jr_8017AE2C", func_801803BC); -extern void func_8012E88C(s32 a0); -extern void func_8012A828(s32*, s32); -extern void func_80184C90(s32 a0); -extern void func_80184ED4(s32 a0, s32 a1, s32 a2, s32 a3); -extern s32 D_801B9DF8; -extern short D_801B65B8; - -void func_8018042C(s32 a0) { - *(u16 *)(a0 + 2) = 6; - func_8012E88C(a0); - ((void (*)(s32, s32))func_8012A828)(a0, (s32)&D_801B9DF8); - func_80184C90(a0); - func_80184ED4(a0, (s32)&(*(s32 *)&D_801B65B8), 1, 0x60); -} +DEFINE_func_8018042C() /* dedup: shared engine-core @0x8018042C (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 e773e3c2f9..a5897cee01 100644 --- a/src/ov_SC04_019/ov_SC04_019_jr_8017AE2C.c +++ b/src/ov_SC04_019/ov_SC04_019_jr_8017AE2C.c @@ -5364,7 +5364,7 @@ void func_8018034C(void *arg0) { INCLUDE_ASM("asm/ov_SC04_019/nonmatchings/ov_SC04_019_jr_8017AE2C", func_801803BC); -INCLUDE_ASM("asm/ov_SC04_019/nonmatchings/ov_SC04_019_jr_8017AE2C", func_8018042C); +DEFINE_func_8018042C() /* dedup: shared engine-core @0x8018042C (src/shared) */ extern void (*D_801919C4[])(void); diff --git a/src/shared/engine_core.h b/src/shared/engine_core.h index ee6ffed5d7..9274a9bcb3 100644 --- a/src/shared/engine_core.h +++ b/src/shared/engine_core.h @@ -57209,6 +57209,21 @@ } \ } +#define DEFINE_func_8018042C() \ + extern void func_8012E88C(s32 a0); \ + extern void func_8012A828(s32*, s32); \ + extern void func_80184C90(s32 a0); \ + extern void func_80184ED4(s32 a0, s32 a1, s32 a2, s32 a3); \ + extern s32 D_801B9DF8; \ + extern short D_801B65B8; \ + void func_8018042C(s32 a0) { \ + *(u16 *)(a0 + 2) = 6; \ + func_8012E88C(a0); \ + ((void (*)(s32, s32))func_8012A828)(a0, (s32)&D_801B9DF8); \ + func_80184C90(a0); \ + func_80184ED4(a0, (s32)&(*(s32 *)&D_801B65B8), 1, 0x60); \ + } + #endif #define DEFINE_func_80128EA8() \ @@ -143823,4 +143838,19 @@ } \ } +#define DEFINE_func_8018042C() \ + extern void func_8012E88C(s32 a0); \ + extern void func_8012A828(s32*, s32); \ + extern void func_80184C90(s32 a0); \ + extern void func_80184ED4(s32 a0, s32 a1, s32 a2, s32 a3); \ + extern s32 D_801B9DF8; \ + extern short D_801B65B8; \ + void func_8018042C(s32 a0) { \ + *(u16 *)(a0 + 2) = 6; \ + func_8012E88C(a0); \ + ((void (*)(s32, s32))func_8012A828)(a0, (s32)&D_801B9DF8); \ + func_80184C90(a0); \ + func_80184ED4(a0, (s32)&(*(s32 *)&D_801B65B8), 1, 0x60); \ + } + #endif