From ba8bc922209d75cebb3a232da091d0b8d176f15e Mon Sep 17 00:00:00 2001 From: Drew T <50529377+Druthulu@users.noreply.github.com> Date: Thu, 13 Aug 2026 11:39:55 -0600 Subject: [PATCH] feat(phase-30 S49): propagate func_8017DBC4 (adapt lane) --- config/dedup.us.yaml | 7 +++++++ src/ov_SC03_014/ov_SC03_014_jr_8017AE2C.c | 17 +---------------- src/ov_SC03_015/ov_SC03_015_jr_8017AE2C.c | 17 +---------------- src/ov_SC03_024/ov_SC03_024_jr_8017AE2C.c | 17 +---------------- src/ov_SC03_118/ov_SC03_118_jr_8017AE2C.c | 17 +---------------- src/ov_SC03_119/ov_SC03_119_jr_8017AE2C.c | 17 +---------------- src/ov_SC06_000/ov_SC06_000_jr_8017AE2C.c | 17 +---------------- 7 files changed, 13 insertions(+), 96 deletions(-) diff --git a/config/dedup.us.yaml b/config/dedup.us.yaml index a5f69b271..fa0a0d51d 100644 --- a/config/dedup.us.yaml +++ b/config/dedup.us.yaml @@ -14327,3 +14327,10 @@ groups: func: DEFINE_func_8018B388 vram: 0x8018B388 binaries: [ov_SC04_018, ov_SC04_019] + - id: E_func_8017DBC4 + tier: h_exact + hash: de7db63b6c9140cfd6d1c953fbd4a000ff8ad06b + source: src/shared/engine_core.h + func: DEFINE_func_8017DBC4 + vram: 0x8017DBC4 + binaries: [ov_SC06_000, ov_SC03_014, ov_SC03_015, ov_SC03_024, ov_SC03_118, ov_SC03_119] diff --git a/src/ov_SC03_014/ov_SC03_014_jr_8017AE2C.c b/src/ov_SC03_014/ov_SC03_014_jr_8017AE2C.c index 39006e935..389426226 100644 --- a/src/ov_SC03_014/ov_SC03_014_jr_8017AE2C.c +++ b/src/ov_SC03_014/ov_SC03_014_jr_8017AE2C.c @@ -4438,22 +4438,7 @@ void func_8017DB74(u8 *a0) { } -extern s16 func_80171AB0(s32 a0, void *a1); -extern void func_80171A1C(u8*); -void func_8017DBC4(u8 * a0) -{ - - extern s32 D_801151D4; - s16 buf[3]; - s32 *p; - p = (s32 *)D_801151D4; - buf[0] = (s16)p[0xF]; /* 0x3C */ - buf[1] = (s16)p[0x10]; /* 0x40 */ - buf[2] = (s16)p[0x11]; /* 0x44 */ - if (func_80171AB0(a0, buf) == 0) { - ((void (*)(void *))func_80171A1C)((void *)a0); - } -} +DEFINE_func_8017DBC4() /* dedup: shared engine-core @0x8017DBC4 (src/shared) */ extern void func_80171A1C(u8 *a0); diff --git a/src/ov_SC03_015/ov_SC03_015_jr_8017AE2C.c b/src/ov_SC03_015/ov_SC03_015_jr_8017AE2C.c index 082172b41..21ff25f0c 100644 --- a/src/ov_SC03_015/ov_SC03_015_jr_8017AE2C.c +++ b/src/ov_SC03_015/ov_SC03_015_jr_8017AE2C.c @@ -4384,22 +4384,7 @@ void func_8017DB74(u8 *a0) { } -extern s16 func_80171AB0(s32 a0, void *a1); -extern void func_80171A1C(u8*); -void func_8017DBC4(u8 * a0) -{ - - extern s32 D_801151D4; - s16 buf[3]; - s32 *p; - p = (s32 *)D_801151D4; - buf[0] = (s16)p[0xF]; /* 0x3C */ - buf[1] = (s16)p[0x10]; /* 0x40 */ - buf[2] = (s16)p[0x11]; /* 0x44 */ - if (func_80171AB0(a0, buf) == 0) { - ((void (*)(void *))func_80171A1C)((void *)a0); - } -} +DEFINE_func_8017DBC4() /* dedup: shared engine-core @0x8017DBC4 (src/shared) */ diff --git a/src/ov_SC03_024/ov_SC03_024_jr_8017AE2C.c b/src/ov_SC03_024/ov_SC03_024_jr_8017AE2C.c index c62a373e6..75d7b60c3 100644 --- a/src/ov_SC03_024/ov_SC03_024_jr_8017AE2C.c +++ b/src/ov_SC03_024/ov_SC03_024_jr_8017AE2C.c @@ -4382,22 +4382,7 @@ void func_8017DB74(u8 *a0) { } -extern s16 func_80171AB0(s32 a0, void *a1); -extern void func_80171A1C(u8*); -void func_8017DBC4(u8 * a0) -{ - - extern s32 D_801151D4; - s16 buf[3]; - s32 *p; - p = (s32 *)D_801151D4; - buf[0] = (s16)p[0xF]; /* 0x3C */ - buf[1] = (s16)p[0x10]; /* 0x40 */ - buf[2] = (s16)p[0x11]; /* 0x44 */ - if (func_80171AB0(a0, buf) == 0) { - ((void (*)(void *))func_80171A1C)((void *)a0); - } -} +DEFINE_func_8017DBC4() /* dedup: shared engine-core @0x8017DBC4 (src/shared) */ diff --git a/src/ov_SC03_118/ov_SC03_118_jr_8017AE2C.c b/src/ov_SC03_118/ov_SC03_118_jr_8017AE2C.c index 934124663..025710c5c 100644 --- a/src/ov_SC03_118/ov_SC03_118_jr_8017AE2C.c +++ b/src/ov_SC03_118/ov_SC03_118_jr_8017AE2C.c @@ -4348,22 +4348,7 @@ void func_8017DB74(u8 *a0) { } -extern s16 func_80171AB0(s32 a0, void *a1); -extern void func_80171A1C(u8*); -void func_8017DBC4(u8 * a0) -{ - - extern s32 D_801151D4; - s16 buf[3]; - s32 *p; - p = (s32 *)D_801151D4; - buf[0] = (s16)p[0xF]; /* 0x3C */ - buf[1] = (s16)p[0x10]; /* 0x40 */ - buf[2] = (s16)p[0x11]; /* 0x44 */ - if (func_80171AB0(a0, buf) == 0) { - ((void (*)(void *))func_80171A1C)((void *)a0); - } -} +DEFINE_func_8017DBC4() /* dedup: shared engine-core @0x8017DBC4 (src/shared) */ diff --git a/src/ov_SC03_119/ov_SC03_119_jr_8017AE2C.c b/src/ov_SC03_119/ov_SC03_119_jr_8017AE2C.c index bab3c6b83..d985c9ed9 100644 --- a/src/ov_SC03_119/ov_SC03_119_jr_8017AE2C.c +++ b/src/ov_SC03_119/ov_SC03_119_jr_8017AE2C.c @@ -4342,22 +4342,7 @@ void func_8017DB74(u8 *a0) { } -extern s16 func_80171AB0(s32 a0, void *a1); -extern void func_80171A1C(u8*); -void func_8017DBC4(u8 * a0) -{ - - extern s32 D_801151D4; - s16 buf[3]; - s32 *p; - p = (s32 *)D_801151D4; - buf[0] = (s16)p[0xF]; /* 0x3C */ - buf[1] = (s16)p[0x10]; /* 0x40 */ - buf[2] = (s16)p[0x11]; /* 0x44 */ - if (func_80171AB0(a0, buf) == 0) { - ((void (*)(void *))func_80171A1C)((void *)a0); - } -} +DEFINE_func_8017DBC4() /* dedup: shared engine-core @0x8017DBC4 (src/shared) */ diff --git a/src/ov_SC06_000/ov_SC06_000_jr_8017AE2C.c b/src/ov_SC06_000/ov_SC06_000_jr_8017AE2C.c index 53d520049..337dfac34 100644 --- a/src/ov_SC06_000/ov_SC06_000_jr_8017AE2C.c +++ b/src/ov_SC06_000/ov_SC06_000_jr_8017AE2C.c @@ -4354,22 +4354,7 @@ void func_8017DB74(u8 *a0) { } -extern s16 func_80171AB0(s32 a0, void *a1); -extern void func_80171A1C(u8*); -void func_8017DBC4(u8 * a0) -{ - - extern s32 D_801151D4; - s16 buf[3]; - s32 *p; - p = (s32 *)D_801151D4; - buf[0] = (s16)p[0xF]; /* 0x3C */ - buf[1] = (s16)p[0x10]; /* 0x40 */ - buf[2] = (s16)p[0x11]; /* 0x44 */ - if (func_80171AB0(a0, buf) == 0) { - ((void (*)(void *))func_80171A1C)((void *)a0); - } -} +DEFINE_func_8017DBC4() /* dedup: shared engine-core @0x8017DBC4 (src/shared) */