diff --git a/src/ov_SC02_021/ov_SC02_021.c b/src/ov_SC02_021/ov_SC02_021.c index d483b3c04..b9d957f74 100644 --- a/src/ov_SC02_021/ov_SC02_021.c +++ b/src/ov_SC02_021/ov_SC02_021.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_021/nonmatchings/ov_SC02_021", 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_021/nonmatchings/ov_SC02_021", func_80128ED8); @@ -149,7 +157,12 @@ INCLUDE_ASM("asm/ov_SC02_021/nonmatchings/ov_SC02_021", func_8012A464); DEFINE_func_8012A4BC() /* dedup: shared engine-core @0x8012A4BC (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_021/nonmatchings/ov_SC02_021", func_8012A568); +extern void func_8012A598(void *a0); + void func_8012A568(void (*a0)(void)) { + ((void (*)(void))func_8012A598)(); + a0(); + } + INCLUDE_ASM("asm/ov_SC02_021/nonmatchings/ov_SC02_021", 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_021/nonmatchings/ov_SC02_021", 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_021/nonmatchings/ov_SC02_021", 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_021/nonmatchings/ov_SC02_021", func_8012E014); INCLUDE_ASM("asm/ov_SC02_021/nonmatchings/ov_SC02_021", func_8012E138); -INCLUDE_ASM("asm/ov_SC02_021/nonmatchings/ov_SC02_021", 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_021/nonmatchings/ov_SC02_021", 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_021/nonmatchings/ov_SC02_021", func_80138BE0); -INCLUDE_ASM("asm/ov_SC02_021/nonmatchings/ov_SC02_021", 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_021/nonmatchings/ov_SC02_021", 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_021/nonmatchings/ov_SC02_021", 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) */ @@ -4775,7 +4819,11 @@ INCLUDE_ASM("asm/ov_SC02_021/nonmatchings/ov_SC02_021", func_8017D254); INCLUDE_ASM("asm/ov_SC02_021/nonmatchings/ov_SC02_021", func_8017D294); -INCLUDE_ASM("asm/ov_SC02_021/nonmatchings/ov_SC02_021", func_8017D328); +extern s32 func_800D1EBC(void); + void func_8017D328(void) { + func_800D1EBC(); + } + INCLUDE_ASM("asm/ov_SC02_021/nonmatchings/ov_SC02_021", func_8017D348); @@ -4833,13 +4881,21 @@ INCLUDE_ASM("asm/ov_SC02_021/nonmatchings/ov_SC02_021", func_8017EE50); INCLUDE_ASM("asm/ov_SC02_021/nonmatchings/ov_SC02_021", func_8017EE68); -INCLUDE_ASM("asm/ov_SC02_021/nonmatchings/ov_SC02_021", func_8017EED8); +extern void func_80029514(s32 arg); + void func_8017EED8(void) { + func_80029514(0xFA); + } + INCLUDE_ASM("asm/ov_SC02_021/nonmatchings/ov_SC02_021", func_8017EEF8); INCLUDE_ASM("asm/ov_SC02_021/nonmatchings/ov_SC02_021", func_8017EF3C); -INCLUDE_ASM("asm/ov_SC02_021/nonmatchings/ov_SC02_021", func_8017EF90); +extern void func_800D0F4C(s32 arg); + void func_8017EF90(void) { + func_800D0F4C(0x57); + } + INCLUDE_ASM("asm/ov_SC02_021/nonmatchings/ov_SC02_021", func_8017EFB0); @@ -4851,7 +4907,10 @@ INCLUDE_ASM("asm/ov_SC02_021/nonmatchings/ov_SC02_021", func_8017F0C4); INCLUDE_ASM("asm/ov_SC02_021/nonmatchings/ov_SC02_021", func_8017F1B4); -INCLUDE_ASM("asm/ov_SC02_021/nonmatchings/ov_SC02_021", func_8017F220); +s32 func_8017F220(void) { + return 0x19; + } + INCLUDE_ASM("asm/ov_SC02_021/nonmatchings/ov_SC02_021", func_8017F228); @@ -4861,13 +4920,21 @@ INCLUDE_ASM("asm/ov_SC02_021/nonmatchings/ov_SC02_021", func_8017F2FC); INCLUDE_ASM("asm/ov_SC02_021/nonmatchings/ov_SC02_021", func_8017F40C); -INCLUDE_ASM("asm/ov_SC02_021/nonmatchings/ov_SC02_021", func_8017F448); +extern s32 func_8012AD50(void *a0); + void func_8017F448(void) { + ((s32 (*)(void))func_8012AD50)(); + } + INCLUDE_ASM("asm/ov_SC02_021/nonmatchings/ov_SC02_021", func_8017F468); INCLUDE_ASM("asm/ov_SC02_021/nonmatchings/ov_SC02_021", func_8017F590); -INCLUDE_ASM("asm/ov_SC02_021/nonmatchings/ov_SC02_021", func_8017F5CC); +void func_8017F5CC(void *a0) { + *(short *)((char *)a0 + 0x2) = *(unsigned short *)((char *)a0 + 0x2) + 1; + *(int *)((char *)a0 + 0x14) = 0x20000; + } + INCLUDE_ASM("asm/ov_SC02_021/nonmatchings/ov_SC02_021", func_8017F5E4);