From 835657d70db744c7f577fd25e05ae75ec90d19da Mon Sep 17 00:00:00 2001 From: Drew T <50529377+Druthulu@users.noreply.github.com> Date: Tue, 21 Jul 2026 13:37:19 -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_119/ov_SC03_119_jr_80140608.c | 35 ++++++++++++++++++++++- src/ov_SC03_119/ov_SC03_119_jr_8017FB84.c | 28 +++++++++++++++++- 2 files changed, 61 insertions(+), 2 deletions(-) diff --git a/src/ov_SC03_119/ov_SC03_119_jr_80140608.c b/src/ov_SC03_119/ov_SC03_119_jr_80140608.c index 9a1cfa686..dc4993234 100644 --- a/src/ov_SC03_119/ov_SC03_119_jr_80140608.c +++ b/src/ov_SC03_119/ov_SC03_119_jr_80140608.c @@ -1426,7 +1426,40 @@ void func_80141A60(void) } -INCLUDE_ASM("asm/ov_SC03_119/nonmatchings/ov_SC03_119_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_119/ov_SC03_119_jr_8017FB84.c b/src/ov_SC03_119/ov_SC03_119_jr_8017FB84.c index cfd453fa4..76e048ba8 100644 --- a/src/ov_SC03_119/ov_SC03_119_jr_8017FB84.c +++ b/src/ov_SC03_119/ov_SC03_119_jr_8017FB84.c @@ -3829,7 +3829,33 @@ extern s32 func_8012A828(void *a0, void *a1); } -INCLUDE_ASM("asm/ov_SC03_119/nonmatchings/ov_SC03_119_jr_8017FB84", func_801848D8); + + + + + + + + + + + + + + + + +void func_801848D8(void *a0) +{ + unsigned int new_var; + s32 v1 = *((s32 *) (((s32) a0) + 0xcc)); +__asm__ __volatile__("" ::: "memory"); + *((s32 *) (v1 + 0xe0)) |= 0x20000000; +__asm__ __volatile__("" ::: "memory"); + new_var = *((s32 *) (((s32) a0) + 0xd0)); + v1 = new_var; + *((s32 *) (v1 + 0xe0)) |= 0x20000000; +} INCLUDE_ASM("asm/ov_SC03_119/nonmatchings/ov_SC03_119_jr_8017FB84", func_8018490C);