From 581e27d7f41ae66fe135406fe18773b7e72fb666 Mon Sep 17 00:00:00 2001 From: Drew T <50529377+Druthulu@users.noreply.github.com> Date: Tue, 30 Jun 2026 06:39:20 -0600 Subject: [PATCH] =?UTF-8?q?feat(phase-23):=20lora-grind=20gate=20=E2=80=94?= =?UTF-8?q?=20+14=20fns=20x0=20propagated=20(fleet=2063.78%)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/ov_SC02_016/ov_SC02_016.c | 96 ++++++++++++++++++++++++++++++----- 1 file changed, 82 insertions(+), 14 deletions(-) diff --git a/src/ov_SC02_016/ov_SC02_016.c b/src/ov_SC02_016/ov_SC02_016.c index aed004d30..846c7a3e0 100644 --- a/src/ov_SC02_016/ov_SC02_016.c +++ b/src/ov_SC02_016/ov_SC02_016.c @@ -73,7 +73,15 @@ DEFINE_func_80128D60() /* dedup: shared engine-core @0x80128D60 (src/shared) */ DEFINE_func_80128DB4() /* dedup: shared engine-core @0x80128DB4 (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_016/nonmatchings/ov_SC02_016", func_80128EA8); +void func_80128EA8(s32 a0, s32 a1, s32 a2) +{ + *(s32 *)((s32)a1 + 0x0) = a2; + *(s16 *)((s32)a1 + 0x4) = 0; + *(s16 *)((s32)a1 + 0x6) = (*(s32 *)((s32)a2 + 0x4)) & 0x3F; + *(s16 *)((s32)a0 + 0x28) = *(s16 *)((s32)a2 + 0x0); + *(s16 *)((s32)a0 + 0x2A) = *(s16 *)((s32)a2 + 0x2); + } + INCLUDE_ASM("asm/ov_SC02_016/nonmatchings/ov_SC02_016", func_80128ED8); @@ -149,7 +157,12 @@ INCLUDE_ASM("asm/ov_SC02_016/nonmatchings/ov_SC02_016", func_8012A464); DEFINE_func_8012A4BC() /* dedup: shared engine-core @0x8012A4BC (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_016/nonmatchings/ov_SC02_016", func_8012A568); +extern void func_8012A598(void *a0); + void func_8012A568(void (*a0)(void)) { + ((void (*)(void))func_8012A598)(); + a0(); + } + INCLUDE_ASM("asm/ov_SC02_016/nonmatchings/ov_SC02_016", func_8012A598); @@ -189,7 +202,10 @@ DEFINE_func_8012AD44() /* dedup: shared engine-core @0x8012AD44 (src/shared) */ DEFINE_func_8012AD50() /* dedup: shared engine-core @0x8012AD50 (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_016/nonmatchings/ov_SC02_016", func_8012AD64); +void func_8012AD64(s32 *a0, s16 a1) { + *(s16 *)((s32)a0 + 0x34) = a1; + } + DEFINE_func_8012AD6C() /* dedup: shared engine-core @0x8012AD6C (src/shared) */ @@ -265,7 +281,10 @@ DEFINE_func_8012BEE8() /* dedup: shared engine-core @0x8012BEE8 (src/shared) */ DEFINE_func_8012BF10() /* dedup: shared engine-core @0x8012BF10 (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_016/nonmatchings/ov_SC02_016", func_8012BF4C); +void func_8012BF4C(s32 *a0, s32 a1) { + *(s32 *)((s32)a0 + 0x1C) = a1; + } + DEFINE_func_8012BF54() /* dedup: shared engine-core @0x8012BF54 (src/shared) */ @@ -379,7 +398,10 @@ INCLUDE_ASM("asm/ov_SC02_016/nonmatchings/ov_SC02_016", func_8012E014); INCLUDE_ASM("asm/ov_SC02_016/nonmatchings/ov_SC02_016", func_8012E138); -INCLUDE_ASM("asm/ov_SC02_016/nonmatchings/ov_SC02_016", func_8012E27C); +s32 func_8012E27C(void) { + return 0x1; + } + DEFINE_func_8012E284() /* dedup: shared engine-core @0x8012E284 (src/shared) */ @@ -601,7 +623,13 @@ DEFINE_func_80132DC4() /* dedup: shared engine-core @0x80132DC4 (src/shared) */ DEFINE_func_80132E6C() /* dedup: shared engine-core @0x80132E6C (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_016/nonmatchings/ov_SC02_016", func_80132EC4); +void func_80132EC4(s32 *a0, s16 a1) { + while (*a0 != 0) { + *(s16 *)((s32)a0 + 0x4) = a1; + a0 = (s32 *)((s32)a0 + 0x8); + } + } + DEFINE_func_80132EF4() /* dedup: shared engine-core @0x80132EF4 (src/shared) */ @@ -749,7 +777,16 @@ DEFINE_func_80138B88() /* dedup: shared engine-core @0x80138B88 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_016/nonmatchings/ov_SC02_016", func_80138BE0); -INCLUDE_ASM("asm/ov_SC02_016/nonmatchings/ov_SC02_016", func_80138C30); +void func_80138C30(void * a0) +{ + s16 v1 = *(s16 *)((s32)a0 + 0x4); + if (v1 == 4) { + *(s16 *)((s32)a0 + 0x4) = 2; + } else { + *(s32 *)((s32)a0 + 0x8) |= 0x800; + } + } + INCLUDE_ASM("asm/ov_SC02_016/nonmatchings/ov_SC02_016", func_80138C60); @@ -4413,7 +4450,14 @@ DEFINE_func_80174604() /* dedup: shared engine-core @0x80174604 (src/shared) */ DEFINE_func_80174630() /* dedup: shared engine-core @0x80174630 (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_016/nonmatchings/ov_SC02_016", func_80174650); +extern s32 D_801270BC; + extern s32 D_801150F8; + s32 func_80174650(s32 _arg0) +{ + D_801270BC = D_801270BC | 1; + D_801150F8 = 0; + } + DEFINE_func_80174674() /* dedup: shared engine-core @0x80174674 (src/shared) */ @@ -4785,7 +4829,11 @@ INCLUDE_ASM("asm/ov_SC02_016/nonmatchings/ov_SC02_016", func_8017CF40); INCLUDE_ASM("asm/ov_SC02_016/nonmatchings/ov_SC02_016", func_8017CFAC); -INCLUDE_ASM("asm/ov_SC02_016/nonmatchings/ov_SC02_016", func_8017D038); +extern void func_8012C218(void *a0); + void func_8017D038(void) { + ((void (*)(void))func_8012C218)(); + } + INCLUDE_ASM("asm/ov_SC02_016/nonmatchings/ov_SC02_016", func_8017D058); @@ -4839,7 +4887,11 @@ INCLUDE_ASM("asm/ov_SC02_016/nonmatchings/ov_SC02_016", func_8017EC30); INCLUDE_ASM("asm/ov_SC02_016/nonmatchings/ov_SC02_016", func_8017EC70); -INCLUDE_ASM("asm/ov_SC02_016/nonmatchings/ov_SC02_016", func_8017ED10); +extern void func_800D1EBC(void); + void func_8017ED10(void) { + func_800D1EBC(); + } + INCLUDE_ASM("asm/ov_SC02_016/nonmatchings/ov_SC02_016", func_8017ED30); @@ -4905,7 +4957,11 @@ INCLUDE_ASM("asm/ov_SC02_016/nonmatchings/ov_SC02_016", func_8018003C); INCLUDE_ASM("asm/ov_SC02_016/nonmatchings/ov_SC02_016", func_801800E4); -INCLUDE_ASM("asm/ov_SC02_016/nonmatchings/ov_SC02_016", func_80180134); +extern s32 func_8012AD50(void *a0); + void func_80180134(void) { + ((void (*)(void))func_8012AD50)(); + } + INCLUDE_ASM("asm/ov_SC02_016/nonmatchings/ov_SC02_016", func_80180154); @@ -4913,7 +4969,11 @@ INCLUDE_ASM("asm/ov_SC02_016/nonmatchings/ov_SC02_016", func_801802C8); INCLUDE_ASM("asm/ov_SC02_016/nonmatchings/ov_SC02_016", func_8018035C); -INCLUDE_ASM("asm/ov_SC02_016/nonmatchings/ov_SC02_016", func_801804D4); +extern void func_8002D4C8(s32 arg0, s32 arg1); + void func_801804D4(void) { + func_8002D4C8(0x6AA, 0); + } + INCLUDE_ASM("asm/ov_SC02_016/nonmatchings/ov_SC02_016", func_801804F8); @@ -5027,7 +5087,11 @@ INCLUDE_ASM("asm/ov_SC02_016/nonmatchings/ov_SC02_016", func_801829D8); INCLUDE_ASM("asm/ov_SC02_016/nonmatchings/ov_SC02_016", func_80182D54); -INCLUDE_ASM("asm/ov_SC02_016/nonmatchings/ov_SC02_016", func_80182E14); +extern void func_8012A4BC(void); + void func_80182E14(void) { + func_8012A4BC(); + } + INCLUDE_ASM("asm/ov_SC02_016/nonmatchings/ov_SC02_016", func_80182E34); @@ -5037,7 +5101,11 @@ INCLUDE_ASM("asm/ov_SC02_016/nonmatchings/ov_SC02_016", func_80182FE8); INCLUDE_ASM("asm/ov_SC02_016/nonmatchings/ov_SC02_016", func_80183194); -INCLUDE_ASM("asm/ov_SC02_016/nonmatchings/ov_SC02_016", func_801831D0); +extern s32 func_8012AD50(void *a0); + void func_801831D0(void) { + ((s32 (*)(void))func_8012AD50)(); + } + INCLUDE_ASM("asm/ov_SC02_016/nonmatchings/ov_SC02_016", func_801831F0);