diff --git a/src/ov_SC04_015/ov_SC04_015_jr_80140608.c b/src/ov_SC04_015/ov_SC04_015_jr_80140608.c index 16ed9a789..47eb98079 100644 --- a/src/ov_SC04_015/ov_SC04_015_jr_80140608.c +++ b/src/ov_SC04_015/ov_SC04_015_jr_80140608.c @@ -1426,7 +1426,40 @@ void func_80141A60(void) } -INCLUDE_ASM("asm/ov_SC04_015/nonmatchings/ov_SC04_015_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_SC04_015/ov_SC04_015_jr_8017AE2C.c b/src/ov_SC04_015/ov_SC04_015_jr_8017AE2C.c index a592f2a69..961672741 100644 --- a/src/ov_SC04_015/ov_SC04_015_jr_8017AE2C.c +++ b/src/ov_SC04_015/ov_SC04_015_jr_8017AE2C.c @@ -3669,7 +3669,31 @@ void func_8017DB70(void *a0) { } -INCLUDE_ASM("asm/ov_SC04_015/nonmatchings/ov_SC04_015_jr_8017AE2C", func_8017DBAC); + + + + + + + + + + + + + + + + +extern void func_8017DBEC(s32 a0, s32 a1); +extern void func_8017DD2C(void *a0); +void func_8017DBAC(s32 arg0) +{ + volatile unsigned char new_var; + func_8017DBEC(arg0, arg0 + 0xA0); + ; + func_8017DD2C((void *) arg0); +} void func_8017DBE0(u8 *a0) { *(s8 *)(a0 + 0xA0) = 0x6;