From 51177eb672b877764499c0b874f23fefbe91aed2 Mon Sep 17 00:00:00 2001 From: Drew T <50529377+Druthulu@users.noreply.github.com> Date: Tue, 21 Jul 2026 13:34:02 -0600 Subject: [PATCH] =?UTF-8?q?feat(decomp):=20grinder=20gate=20=E2=80=94=20+2?= =?UTF-8?q?=20fns=20x0=20propagated=20(fleet=20None%)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/ov_SC03_001/ov_SC03_001_jr_80140608.c | 35 ++++++++++++++++++++++- src/ov_SC03_001/ov_SC03_001_jr_8017AE2C.c | 23 ++++++++++++++- 2 files changed, 56 insertions(+), 2 deletions(-) diff --git a/src/ov_SC03_001/ov_SC03_001_jr_80140608.c b/src/ov_SC03_001/ov_SC03_001_jr_80140608.c index 088f33051..a71293afb 100644 --- a/src/ov_SC03_001/ov_SC03_001_jr_80140608.c +++ b/src/ov_SC03_001/ov_SC03_001_jr_80140608.c @@ -1428,7 +1428,40 @@ void func_80141A60(void) } -INCLUDE_ASM("asm/ov_SC03_001/nonmatchings/ov_SC03_001_jr_80140608", func_80141B90); + + + + + + + + + + + + + + + + +extern void func_8013FAF8(s16, s16); +extern short D_800B9A02; +extern u8 D_801151C8[]; +extern s32 D_801151D0; +extern u16 D_80115116; +extern u16 D_80115112; +extern u8 D_800B9A15; +void func_80141B90(void) +{ + volatile char pad; + D_801151D0 = ((s32 *) D_801151C8)[*((u16 *) (&D_800B9A02))]; + ((void (*)(s32, s32))func_8013FAF8)(2, 3); + if (D_80115116 == 0) + { + *((s8 *) (&D_800B9A15)) = 0; + D_80115112 = D_80115112 + 1; + } +} DEFINE_func_80141C04() /* dedup: shared engine-core @0x80141C04 (src/shared) */ diff --git a/src/ov_SC03_001/ov_SC03_001_jr_8017AE2C.c b/src/ov_SC03_001/ov_SC03_001_jr_8017AE2C.c index b28379315..ed2f4ee05 100644 --- a/src/ov_SC03_001/ov_SC03_001_jr_8017AE2C.c +++ b/src/ov_SC03_001/ov_SC03_001_jr_8017AE2C.c @@ -5158,7 +5158,28 @@ void func_8018726C(void *a0) { INCLUDE_ASM("asm/ov_SC03_001/nonmatchings/ov_SC03_001_jr_8017AE2C", func_8018727C); -INCLUDE_ASM("asm/ov_SC03_001/nonmatchings/ov_SC03_001_jr_8017AE2C", func_80187318); + + + + + + + + + + + + + + + + +extern void func_8012A828(s32 arg0, s32 arg1); +void func_80187318(void *a0) +{ + s32 v0 = *((s32 *) (((s32) a0) + 0xD0)); + func_8012A828(v0, *((s32 *) ((*((s32 *) ((v0 = (s32) a0) + 0xD0))) + 0x4))); +} INCLUDE_ASM("asm/ov_SC03_001/nonmatchings/ov_SC03_001_jr_8017AE2C", func_80187344);