From 7c8241395928d685dcce9a3721950baffc51082e Mon Sep 17 00:00:00 2001 From: Drew T <50529377+Druthulu@users.noreply.github.com> Date: Tue, 18 Aug 2026 10:26:34 -0600 Subject: [PATCH] feat(decomp): propagate func_80185D10 (gate lane) --- config/dedup.us.yaml | 7 +++++ src/ov_SC04_018/ov_SC04_018_jr_8017AE2C.c | 18 +------------ src/ov_SC04_019/ov_SC04_019_jr_8017AE2C.c | 18 +------------ src/shared/engine_core.h | 32 +++++++++++++++++++++++ 4 files changed, 41 insertions(+), 34 deletions(-) diff --git a/config/dedup.us.yaml b/config/dedup.us.yaml index 9512ded8ed..8408978669 100644 --- a/config/dedup.us.yaml +++ b/config/dedup.us.yaml @@ -15258,3 +15258,10 @@ groups: func: DEFINE_func_801805BC vram: 0x801805BC binaries: [ov_SC03_014, ov_SC03_015] + - id: E_func_80185D10 + tier: h_exact + hash: 501b28459c94b05d99417b269fdcaca1d6548f55 + source: src/shared/engine_core.h + func: DEFINE_func_80185D10 + vram: 0x80185D10 + 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 995d993952..1578e76daa 100644 --- a/src/ov_SC04_018/ov_SC04_018_jr_8017AE2C.c +++ b/src/ov_SC04_018/ov_SC04_018_jr_8017AE2C.c @@ -8155,20 +8155,4 @@ void *func_80185C6C(void *a0) { } -extern u16 D_80126B5E; -extern u16 D_80126B62; -extern u16 D_80126B66; - -extern void func_8012F2E8(s32 a0, s32 a1, s32 a2); -extern s32 func_8012CB64(s32 a0, s32 a1, s32 a2, s32 a3, s32 a4); - -s32 func_80185D10(void *a0) { - s16 out[3]; - s16 in[3]; - - in[0] = D_80126B5E; - in[1] = D_80126B62; - in[2] = D_80126B66; - func_8012F2E8((s32)a0, (s32)in, (s32)out); - return func_8012CB64((s32)out, -0x80, 0x80, -0x60, 0); -} +DEFINE_func_80185D10() /* dedup: shared engine-core @0x80185D10 (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 ddd05451e5..b716088018 100644 --- a/src/ov_SC04_019/ov_SC04_019_jr_8017AE2C.c +++ b/src/ov_SC04_019/ov_SC04_019_jr_8017AE2C.c @@ -8091,20 +8091,4 @@ void *func_80185C6C(void *a0) { -extern void func_8012F2E8(s32 a0, s32 a1, s32 a2); -extern s32 func_8012CB64(s32 a0, s32 a1, s32 a2, s32 a3, s32 a4); - -s32 func_80185D10(void *a0) { - - extern u16 D_80126B5E; - extern u16 D_80126B62; - extern u16 D_80126B66; - s16 out[3]; - s16 in[3]; - - in[0] = D_80126B5E; - in[1] = D_80126B62; - in[2] = D_80126B66; - func_8012F2E8((s32)a0, (s32)in, (s32)out); - return func_8012CB64((s32)out, -0x80, 0x80, -0x60, 0); -} +DEFINE_func_80185D10() /* dedup: shared engine-core @0x80185D10 (src/shared) */ diff --git a/src/shared/engine_core.h b/src/shared/engine_core.h index 2027a0f450..ef8793b21c 100644 --- a/src/shared/engine_core.h +++ b/src/shared/engine_core.h @@ -65924,6 +65924,22 @@ ((void (*)(void *))func_8017D0F8)(a0); \ } +#define DEFINE_func_80185D10() \ + extern u16 D_80126B5E; \ + extern u16 D_80126B62; \ + extern u16 D_80126B66; \ + extern void func_8012F2E8(s32 a0, s32 a1, s32 a2); \ + extern s32 func_8012CB64(s32 a0, s32 a1, s32 a2, s32 a3, s32 a4); \ + s32 func_80185D10(void *a0) { \ + s16 out[3]; \ + s16 in[3]; \ + in[0] = D_80126B5E; \ + in[1] = D_80126B62; \ + in[2] = D_80126B66; \ + func_8012F2E8((s32)a0, (s32)in, (s32)out); \ + return func_8012CB64((s32)out, -0x80, 0x80, -0x60, 0); \ + } + #endif #define DEFINE_func_80128EA8() \ @@ -161253,4 +161269,20 @@ ((void (*)(void *))func_8017D0F8)(a0); \ } +#define DEFINE_func_80185D10() \ + extern u16 D_80126B5E; \ + extern u16 D_80126B62; \ + extern u16 D_80126B66; \ + extern void func_8012F2E8(s32 a0, s32 a1, s32 a2); \ + extern s32 func_8012CB64(s32 a0, s32 a1, s32 a2, s32 a3, s32 a4); \ + s32 func_80185D10(void *a0) { \ + s16 out[3]; \ + s16 in[3]; \ + in[0] = D_80126B5E; \ + in[1] = D_80126B62; \ + in[2] = D_80126B66; \ + func_8012F2E8((s32)a0, (s32)in, (s32)out); \ + return func_8012CB64((s32)out, -0x80, 0x80, -0x60, 0); \ + } + #endif