From b1aa5bceddf759d13f001aea36a655fc4bea037d Mon Sep 17 00:00:00 2001 From: Drew T <50529377+Druthulu@users.noreply.github.com> Date: Mon, 24 Aug 2026 12:26:58 -0600 Subject: [PATCH] =?UTF-8?q?feat(decomp):=20free=20A-prop=20sibling=20lane?= =?UTF-8?q?=20(maintenance=20pass)=20=E2=80=94=20zero=20model=20tokens?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/md_SC03_135/md_SC03_135.c | 10 +++++++++- src/ov_SC03_024/ov_SC03_024_jr_8017DF84.c | 20 ++++++++++++++++++-- src/ov_SC03_024/ov_SC03_024_jr_80183BF8.c | 2 +- 3 files changed, 28 insertions(+), 4 deletions(-) diff --git a/src/md_SC03_135/md_SC03_135.c b/src/md_SC03_135/md_SC03_135.c index 0dd3973f8..b13119ae9 100644 --- a/src/md_SC03_135/md_SC03_135.c +++ b/src/md_SC03_135/md_SC03_135.c @@ -928,7 +928,15 @@ void func_801E5A34(s32 a0, s32 a1, s32 a2) { } -INCLUDE_ASM("asm/md_SC03_135/nonmatchings/md_SC03_135", func_801E5A7C); +extern s32 D_801EAC70; +extern s32 D_801EADF0; +extern void func_80016714(void *a0, s32 a1); + +void func_801E5A7C(void) { + func_80016714(&D_801EAC70, 0x180); + D_801EADF0 = 0; +} + INCLUDE_ASM("asm/md_SC03_135/nonmatchings/md_SC03_135", func_801E5AAC); diff --git a/src/ov_SC03_024/ov_SC03_024_jr_8017DF84.c b/src/ov_SC03_024/ov_SC03_024_jr_8017DF84.c index 0681a7abf..442af69ea 100644 --- a/src/ov_SC03_024/ov_SC03_024_jr_8017DF84.c +++ b/src/ov_SC03_024/ov_SC03_024_jr_8017DF84.c @@ -5425,7 +5425,23 @@ void func_801822E8(void *a0) } -INCLUDE_ASM("asm/ov_SC03_024/nonmatchings/ov_SC03_024_jr_8017DF84", func_80182360); +extern void func_8012AD44(s32 *a0, s16 a1); +extern void func_8012B200(u8*); +extern void func_801828B0(void *a0); + +void func_80182360(void *arg0) +{ + void *a0; + + *(s32 *)((s32)arg0 + 0x1C) = 4; + ((void (*)(void *))func_8012B200)(arg0); + func_8012AD44((s32 *)arg0, 5); + a0 = *(void **)((s32)arg0 + 0xD0); + if (a0 != NULL) { + func_801828B0(a0); + } +} + void func_801823B4(s32 arg0) { @@ -5764,7 +5780,7 @@ INCLUDE_ASM("asm/ov_SC03_024/nonmatchings/ov_SC03_024_jr_8017DF84", func_80182A3 extern s32 func_8012BEE8(s32 a0); extern s32 func_8012C658(s32 arg0, s32 arg1, s32 arg2); extern int func_80178970(void); -extern void func_80182360(s32 a0); +extern void func_80182360(); void func_80182AE0(s32 arg0) { s32 self; diff --git a/src/ov_SC03_024/ov_SC03_024_jr_80183BF8.c b/src/ov_SC03_024/ov_SC03_024_jr_80183BF8.c index 17a876214..680601364 100644 --- a/src/ov_SC03_024/ov_SC03_024_jr_80183BF8.c +++ b/src/ov_SC03_024/ov_SC03_024_jr_80183BF8.c @@ -2880,7 +2880,7 @@ extern void func_8018295C(void *a0); extern void func_801829F8(void); extern void func_80182A00(void); extern void func_80182A08(void *arg0); -extern void func_80182360(s32 a0); +extern void func_80182360(); extern void func_80182AE0(s32 arg0); extern void func_801823B4(s32 a0); extern void func_80182B50(s32 arg0);