diff --git a/src/ov_SC02_011/ov_SC02_011_jr_80140608.c b/src/ov_SC02_011/ov_SC02_011_jr_80140608.c index 80934e758..bf8ace69b 100644 --- a/src/ov_SC02_011/ov_SC02_011_jr_80140608.c +++ b/src/ov_SC02_011/ov_SC02_011_jr_80140608.c @@ -1429,7 +1429,40 @@ void func_80141A60(void) } -INCLUDE_ASM("asm/ov_SC02_011/nonmatchings/ov_SC02_011_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_SC02_011/ov_SC02_011_jr_8017AE2C.c b/src/ov_SC02_011/ov_SC02_011_jr_8017AE2C.c index 4cd1873a5..7f836dcb1 100644 --- a/src/ov_SC02_011/ov_SC02_011_jr_8017AE2C.c +++ b/src/ov_SC02_011/ov_SC02_011_jr_8017AE2C.c @@ -4007,7 +4007,33 @@ INCLUDE_ASM("asm/ov_SC02_011/nonmatchings/ov_SC02_011_jr_8017AE2C", func_8018234 INCLUDE_ASM("asm/ov_SC02_011/nonmatchings/ov_SC02_011_jr_8017AE2C", func_80182380); -INCLUDE_ASM("asm/ov_SC02_011/nonmatchings/ov_SC02_011_jr_8017AE2C", func_801823B8); + + + + + + + + + + + + + + + + +extern s32 D_80126CF0; +extern void func_80139914(s32 a0); +void func_801823B8(void) +{ + s32 p = D_80126CF0; + if (p != 0) + { + func_80139914(p); + D_80126CF0 = 0; + } +} INCLUDE_ASM("asm/ov_SC02_011/nonmatchings/ov_SC02_011_jr_8017AE2C", func_801823EC); @@ -5032,7 +5058,32 @@ INCLUDE_ASM("asm/ov_SC02_011/nonmatchings/ov_SC02_011_jr_8017AE2C", func_8018CB7 INCLUDE_ASM("asm/ov_SC02_011/nonmatchings/ov_SC02_011_jr_8017AE2C", func_8018CBBC); -INCLUDE_ASM("asm/ov_SC02_011/nonmatchings/ov_SC02_011_jr_8017AE2C", func_8018CC6C); + + + + + + + + + + + + + + + + +void func_8018CC6C(void *a0) +{ + s32 v1 = *((s32 *) (((s32) a0) + 0x20)); + int new_var; + *((s16 *) (((s32) a0) + 0x2)) = 0xA; + *((s16 *) (((s32) a0) + 0x5C)) = 0; + *((s16 *) (((s32) a0) + (new_var = 0x34))) = 0; + *((s32 *) (((s32) a0) + 0x1C)) = 0x8; + *((s16 *) (((s32) v1) + 0x2C)) |= 0x10; +} INCLUDE_ASM("asm/ov_SC02_011/nonmatchings/ov_SC02_011_jr_8017AE2C", func_8018CC9C);