From 0f68eda61ee3e973955cc4ca5970d7c3a69077ec Mon Sep 17 00:00:00 2001 From: Drew T <50529377+Druthulu@users.noreply.github.com> Date: Tue, 25 Aug 2026 19:17:19 -0600 Subject: [PATCH] chore(decomp): commit in-tree banked work before the serial lane --- src/ov_MAIN_012/ov_MAIN_012_jr_8017CF3C.c | 10 +++++++++- src/ov_SC01_001/ov_SC01_001_jr_8017D2DC.c | 10 +++++++++- src/ov_SC01_005/ov_SC01_005_jr_8017ED5C.c | 14 +++++++++++++- 3 files changed, 31 insertions(+), 3 deletions(-) diff --git a/src/ov_MAIN_012/ov_MAIN_012_jr_8017CF3C.c b/src/ov_MAIN_012/ov_MAIN_012_jr_8017CF3C.c index 6722cfb3c9..f0c5907552 100644 --- a/src/ov_MAIN_012/ov_MAIN_012_jr_8017CF3C.c +++ b/src/ov_MAIN_012/ov_MAIN_012_jr_8017CF3C.c @@ -4440,7 +4440,15 @@ void func_8017DF40(s32 arg0) { INCLUDE_ASM("asm/ov_MAIN_012/nonmatchings/ov_MAIN_012_jr_8017CF3C", func_8017E22C); -INCLUDE_ASM("asm/ov_MAIN_012/nonmatchings/ov_MAIN_012_jr_8017CF3C", func_8017E254); +s32 func_8017E254(void) +{ + extern s16 D_80185B00; + extern s16 D_80185B02; + extern void (*D_801827D8[])(void); + D_801827D8[D_80185B00](); + return ((u32)D_80185B02) >> 31; +} + INCLUDE_ASM("asm/ov_MAIN_012/nonmatchings/ov_MAIN_012_jr_8017CF3C", func_8017E298); diff --git a/src/ov_SC01_001/ov_SC01_001_jr_8017D2DC.c b/src/ov_SC01_001/ov_SC01_001_jr_8017D2DC.c index 70a6bb39a1..bcc2fc219f 100644 --- a/src/ov_SC01_001/ov_SC01_001_jr_8017D2DC.c +++ b/src/ov_SC01_001/ov_SC01_001_jr_8017D2DC.c @@ -4493,7 +4493,15 @@ s32 param_1; } -INCLUDE_ASM("asm/ov_SC01_001/nonmatchings/ov_SC01_001_jr_8017D2DC", func_80180890); +extern s32 D_801EDA1C; +extern s32 func_80182B00(s32 arg0); + +void func_80180890(s32 arg0) { + if (func_80182B00(arg0) != 0 || D_801EDA1C != 0) { + *(s16 *)(arg0 + 2) = 1; + } +} + extern void (*D_80188E10[])(void); diff --git a/src/ov_SC01_005/ov_SC01_005_jr_8017ED5C.c b/src/ov_SC01_005/ov_SC01_005_jr_8017ED5C.c index ad94af4f85..4777850535 100644 --- a/src/ov_SC01_005/ov_SC01_005_jr_8017ED5C.c +++ b/src/ov_SC01_005/ov_SC01_005_jr_8017ED5C.c @@ -3559,7 +3559,19 @@ void func_80180FB0(s32 param_1) } -INCLUDE_ASM("asm/ov_SC01_005/nonmatchings/ov_SC01_005_jr_8017ED5C", func_80180FFC); +extern u8 D_801BC5F8[]; + +void func_80180FFC(s32 a0) { + s32 v0; + v0 = func_80180BDC(a0); + if ((v0 << 16) != 0) { + return; + } + func_8012A828(a0, &D_801BC5F8); + *(s32 *)(a0 + 0x1c) = 0x28; + *(u16 *)(a0 + 2) += 1; +} + extern u8 D_801BC680[]; extern void func_8012A828(s32 a0, void *a1);