From 77bb2039c8152d1fcec3226cf103ad0aecab1dea Mon Sep 17 00:00:00 2001 From: Drew T <50529377+Druthulu@users.noreply.github.com> Date: Thu, 13 Aug 2026 17:31:57 -0600 Subject: [PATCH] feat(phase-30 S49): propagate func_801E2AF4 (adapt lane) --- config/dedup.us.yaml | 7 +++++++ src/md_SC03_133/md_SC03_133.c | 3 ++- src/md_SC03_134/md_SC03_134.c | 3 ++- src/md_SC03_137/md_SC03_137.c | 3 ++- src/md_SC03_138/md_SC03_138.c | 8 ++------ src/shared/engine_core.h | 14 ++++++++++++++ 6 files changed, 29 insertions(+), 9 deletions(-) diff --git a/config/dedup.us.yaml b/config/dedup.us.yaml index 920ea48f6..08e7f4b33 100644 --- a/config/dedup.us.yaml +++ b/config/dedup.us.yaml @@ -14376,3 +14376,10 @@ groups: func: DEFINE_func_801EF964 vram: 0x801EF964 binaries: [md_SC03_073, md_SC03_074, md_SC03_075, md_SC03_078] + - id: E_func_801E2AF4 + tier: h_exact + hash: 2574c89bb8d0ba49a576fed5c2b9e52ae9e0eecb + source: src/shared/engine_core.h + func: DEFINE_func_801E2AF4 + vram: 0x801E2AF4 + binaries: [md_SC03_133, md_SC03_134, md_SC03_137, md_SC03_138] diff --git a/src/md_SC03_133/md_SC03_133.c b/src/md_SC03_133/md_SC03_133.c index 5a8925348..d756c6fdb 100644 --- a/src/md_SC03_133/md_SC03_133.c +++ b/src/md_SC03_133/md_SC03_133.c @@ -1,4 +1,5 @@ #include "common.h" +#include "../shared/engine_core.h" INCLUDE_ASM("asm/md_SC03_133/nonmatchings/md_SC03_133", func_801E25FC); @@ -179,7 +180,7 @@ void func_801E2AB8(void *a0) { } -INCLUDE_ASM("asm/md_SC03_133/nonmatchings/md_SC03_133", func_801E2AF4); +DEFINE_func_801E2AF4() /* dedup: shared engine-core @0x801E2AF4 (src/shared) */ /* MATRIX 0x20: short m[3][3] @0x00 (18B) + 2B pad, long t[3] @0x14 (PsyQ layout) */ diff --git a/src/md_SC03_134/md_SC03_134.c b/src/md_SC03_134/md_SC03_134.c index e065646ae..f04d0ce80 100644 --- a/src/md_SC03_134/md_SC03_134.c +++ b/src/md_SC03_134/md_SC03_134.c @@ -1,4 +1,5 @@ #include "common.h" +#include "../shared/engine_core.h" INCLUDE_ASM("asm/md_SC03_134/nonmatchings/md_SC03_134", func_801E25FC); @@ -179,7 +180,7 @@ void func_801E2AB8(void *a0) { } -INCLUDE_ASM("asm/md_SC03_134/nonmatchings/md_SC03_134", func_801E2AF4); +DEFINE_func_801E2AF4() /* dedup: shared engine-core @0x801E2AF4 (src/shared) */ /* MATRIX 0x20: short m[3][3] @0x00 (18B) + 2B pad, long t[3] @0x14 (PsyQ layout) */ diff --git a/src/md_SC03_137/md_SC03_137.c b/src/md_SC03_137/md_SC03_137.c index c258aee8b..32bc59758 100644 --- a/src/md_SC03_137/md_SC03_137.c +++ b/src/md_SC03_137/md_SC03_137.c @@ -1,4 +1,5 @@ #include "common.h" +#include "../shared/engine_core.h" INCLUDE_ASM("asm/md_SC03_137/nonmatchings/md_SC03_137", func_801E25FC); @@ -179,7 +180,7 @@ void func_801E2AB8(void *a0) { } -INCLUDE_ASM("asm/md_SC03_137/nonmatchings/md_SC03_137", func_801E2AF4); +DEFINE_func_801E2AF4() /* dedup: shared engine-core @0x801E2AF4 (src/shared) */ /* MATRIX 0x20: short m[3][3] @0x00 (18B) + 2B pad, long t[3] @0x14 (PsyQ layout) */ diff --git a/src/md_SC03_138/md_SC03_138.c b/src/md_SC03_138/md_SC03_138.c index 7f84e4f25..2c164e10b 100644 --- a/src/md_SC03_138/md_SC03_138.c +++ b/src/md_SC03_138/md_SC03_138.c @@ -1,4 +1,5 @@ #include "common.h" +#include "../shared/engine_core.h" INCLUDE_ASM("asm/md_SC03_138/nonmatchings/md_SC03_138", func_801E25FC); @@ -157,12 +158,7 @@ void func_801E2AB8(void *a0) { } -extern void func_801E2B1C(s32 param_1, s16 *param_2); - -void func_801E2AF4(s32 param_1) { - extern s16 D_801274E8; - func_801E2B1C(param_1, &D_801274E8); -} +DEFINE_func_801E2AF4() /* dedup: shared engine-core @0x801E2AF4 (src/shared) */ diff --git a/src/shared/engine_core.h b/src/shared/engine_core.h index dcb86c731..4b105b4e2 100644 --- a/src/shared/engine_core.h +++ b/src/shared/engine_core.h @@ -57272,6 +57272,13 @@ func_801EF98C(param_1, &D_801274E8); \ } +#define DEFINE_func_801E2AF4() \ + extern void func_801E2B1C(s32 param_1, s16 *param_2); \ + void func_801E2AF4(s32 param_1) { \ + extern s16 D_801274E8; \ + func_801E2B1C(param_1, &D_801274E8); \ + } + #endif #define DEFINE_func_80128EA8() \ @@ -143949,4 +143956,11 @@ func_801EF98C(param_1, &D_801274E8); \ } +#define DEFINE_func_801E2AF4() \ + extern void func_801E2B1C(s32 param_1, s16 *param_2); \ + void func_801E2AF4(s32 param_1) { \ + extern s16 D_801274E8; \ + func_801E2B1C(param_1, &D_801274E8); \ + } + #endif