diff --git a/src/ov_SC02_037/ov_SC02_037_jr_8013F350.c b/src/ov_SC02_037/ov_SC02_037_jr_8013F350.c index 49c2b9005..e7a6f2d72 100644 --- a/src/ov_SC02_037/ov_SC02_037_jr_8013F350.c +++ b/src/ov_SC02_037/ov_SC02_037_jr_8013F350.c @@ -5262,7 +5262,35 @@ DEFINE_func_8014D12C() /* dedup: shared engine-core @0x8014D12C (src/shared) */ DEFINE_func_8014D2A0() /* dedup: shared engine-core @0x8014D2A0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_037/nonmatchings/ov_SC02_037_jr_8013F350", func_8014D3E0); +extern int D_801C8540; +extern void func_8014D438(s32); + +void func_8014D3E0(void) +{ + __asm__ __volatile__( + ".set noreorder\n" + "addiu $sp, $sp, -24\n" + "lui $v1, 0x1f80\n" + "ori $v1, $v1, 0x03fc\n" + "sw $ra, 16($sp)\n" + "addu $t0, $v1, $zero\n" + "lw $t1, 0($t0)\n" + "nop\n" + "sw $sp, 0($t1)\n" + "addiu $t1, $t1, -4\n" + "addu $sp, $t1, $zero\n" + "jal func_8014D438\n" + "lui $at, %%hi(D_801C8540)\n" + "sw $v0, %%lo(D_801C8540)($at)\n" + "addiu $sp, $sp, 4\n" + "lw $sp, 0($sp)\n" + "lui $v0, %%hi(D_801C8540)\n" + "lw $v0, %%lo(D_801C8540)($v0)\n" + "lw $ra, 16($sp)\n" + "addiu $sp, $sp, 24\n" + : : : "memory"); +} + DEFINE_func_8014D438() /* dedup: shared engine-core @0x8014d438 (src/shared) */ @@ -5897,12 +5925,68 @@ DEFINE_func_8014F2E0() /* dedup: shared engine-core @0x8014f2e0 (src/shared) */ DEFINE_func_8014F3E8() /* dedup: shared engine-core @0x8014f3e8 (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_037/nonmatchings/ov_SC02_037_jr_8013F350", func_8014F468); +extern int D_801C8544; +extern s32 func_8014F4C0(s32); + +s32 func_8014F468(void) +{ + __asm__ __volatile__( + ".set noreorder\n" + "addiu $sp, $sp, -24\n" + "lui $v1, 0x1f80\n" + "ori $v1, $v1, 0x03fc\n" + "sw $ra, 16($sp)\n" + "addu $t0, $v1, $zero\n" + "lw $t1, 0($t0)\n" + "nop\n" + "sw $sp, 0($t1)\n" + "addiu $t1, $t1, -4\n" + "addu $sp, $t1, $zero\n" + "jal func_8014F4C0\n" + "lui $at, %%hi(D_801C8544)\n" + "sw $v0, %%lo(D_801C8544)($at)\n" + "addiu $sp, $sp, 4\n" + "lw $sp, 0($sp)\n" + "lui $v0, %%hi(D_801C8544)\n" + "lw $v0, %%lo(D_801C8544)($v0)\n" + "lw $ra, 16($sp)\n" + "addiu $sp, $sp, 24\n" + : : : "memory"); +} + DEFINE_func_8014F4C0() /* dedup: shared engine-core @0x8014f4c0 (src/shared) */ -INCLUDE_ASM("asm/ov_SC02_037/nonmatchings/ov_SC02_037_jr_8013F350", func_8014F6F4); +extern int D_801C8544; +extern int func_8014F74C(); + +int func_8014F6F4(void) +{ + __asm__ __volatile__( + ".set noreorder\n" + "addiu $sp, $sp, -24\n" + "lui $v1, 0x1f80\n" + "ori $v1, $v1, 0x03fc\n" + "sw $ra, 16($sp)\n" + "addu $t0, $v1, $zero\n" + "lw $t1, 0($t0)\n" + "nop\n" + "sw $sp, 0($t1)\n" + "addiu $t1, $t1, -4\n" + "addu $sp, $t1, $zero\n" + "jal func_8014F74C\n" + "lui $at, %%hi(D_801C8544)\n" + "sw $v0, %%lo(D_801C8544)($at)\n" + "addiu $sp, $sp, 4\n" + "lw $sp, 0($sp)\n" + "lui $v0, %%hi(D_801C8544)\n" + "lw $v0, %%lo(D_801C8544)($v0)\n" + "lw $ra, 16($sp)\n" + "addiu $sp, $sp, 24\n" + : : : "memory"); +} + DEFINE_func_8014F74C() /* dedup: shared engine-core @0x8014f74c (src/shared) */ diff --git a/src/ov_SC02_037/ov_SC02_037_jr_801549F8.c b/src/ov_SC02_037/ov_SC02_037_jr_801549F8.c index 3bc2868ac..e8f41ad31 100644 --- a/src/ov_SC02_037/ov_SC02_037_jr_801549F8.c +++ b/src/ov_SC02_037/ov_SC02_037_jr_801549F8.c @@ -1646,7 +1646,7 @@ extern s32 D_80126CDC; extern void func_8014CBD8(void); extern void func_8014CBE8(void); extern void func_8014CBF8(void *a0); -extern void func_8014D3E0(s32 a0); +extern void func_8014D3E0(); extern void func_8014D04C(void); extern void func_8014CCB4(void); extern void func_8014CC28(s32 a0); @@ -1716,8 +1716,8 @@ extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F24C(struct SubF24C *a0); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F468(void); -extern int func_8014F6F4(void); +extern s32 func_8014F468(); +extern int func_8014F6F4(); extern s32 func_8014F3E8(s32 param_1); extern int func_8014F74C(); extern s32 D_801152BC; diff --git a/src/ov_SC02_037/ov_SC02_037_jr_801555F4.c b/src/ov_SC02_037/ov_SC02_037_jr_801555F4.c index 465338012..91cde5f58 100644 --- a/src/ov_SC02_037/ov_SC02_037_jr_801555F4.c +++ b/src/ov_SC02_037/ov_SC02_037_jr_801555F4.c @@ -1640,7 +1640,7 @@ extern s32 D_80126CDC; extern void func_8014CBD8(void); extern void func_8014CBE8(void); extern void func_8014CBF8(void *a0); -extern void func_8014D3E0(s32 a0); +extern void func_8014D3E0(); extern void func_8014D04C(void); extern void func_8014CCB4(void); extern void func_8014CC28(s32 a0); @@ -1710,8 +1710,8 @@ extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F24C(struct SubF24C *a0); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F468(void); -extern int func_8014F6F4(void); +extern s32 func_8014F468(); +extern int func_8014F6F4(); extern s32 func_8014F3E8(s32 param_1); extern int func_8014F74C(); extern s32 D_801152BC; diff --git a/src/ov_SC02_037/ov_SC02_037_jr_801594E8.c b/src/ov_SC02_037/ov_SC02_037_jr_801594E8.c index d0078c8dd..420275f25 100644 --- a/src/ov_SC02_037/ov_SC02_037_jr_801594E8.c +++ b/src/ov_SC02_037/ov_SC02_037_jr_801594E8.c @@ -1640,7 +1640,7 @@ extern s32 D_80126CDC; extern void func_8014CBD8(void); extern void func_8014CBE8(void); extern void func_8014CBF8(void *a0); -extern void func_8014D3E0(s32 a0); +extern void func_8014D3E0(); extern void func_8014D04C(void); extern void func_8014CCB4(void); extern void func_8014CC28(s32 a0); @@ -1710,8 +1710,8 @@ extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F24C(struct SubF24C *a0); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F468(void); -extern int func_8014F6F4(void); +extern s32 func_8014F468(); +extern int func_8014F6F4(); extern s32 func_8014F3E8(s32 param_1); extern int func_8014F74C(); extern s32 D_801152BC; diff --git a/src/ov_SC02_037/ov_SC02_037_jr_80159C84.c b/src/ov_SC02_037/ov_SC02_037_jr_80159C84.c index 0e0d9d9fc..2451eb0f4 100644 --- a/src/ov_SC02_037/ov_SC02_037_jr_80159C84.c +++ b/src/ov_SC02_037/ov_SC02_037_jr_80159C84.c @@ -1637,7 +1637,7 @@ extern s32 D_80126CDC; extern void func_8014CBD8(void); extern void func_8014CBE8(void); extern void func_8014CBF8(void *a0); -extern void func_8014D3E0(s32 a0); +extern void func_8014D3E0(); extern void func_8014D04C(void); extern void func_8014CCB4(void); extern void func_8014CC28(s32 a0); @@ -1707,8 +1707,8 @@ extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F24C(struct SubF24C *a0); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F468(void); -extern int func_8014F6F4(void); +extern s32 func_8014F468(); +extern int func_8014F6F4(); extern s32 func_8014F3E8(s32 param_1); extern int func_8014F74C(); extern s32 D_801152BC; diff --git a/src/ov_SC02_037/ov_SC02_037_jr_8015A3C8.c b/src/ov_SC02_037/ov_SC02_037_jr_8015A3C8.c index c7f100a51..319a40263 100644 --- a/src/ov_SC02_037/ov_SC02_037_jr_8015A3C8.c +++ b/src/ov_SC02_037/ov_SC02_037_jr_8015A3C8.c @@ -1619,7 +1619,7 @@ extern s32 D_80126CDC; extern void func_8014CBD8(void); extern void func_8014CBE8(void); extern void func_8014CBF8(void *a0); -extern void func_8014D3E0(s32 a0); +extern void func_8014D3E0(); extern void func_8014D04C(void); extern void func_8014CCB4(void); extern void func_8014CC28(s32 a0); @@ -1689,8 +1689,8 @@ extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F24C(struct SubF24C *a0); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F468(void); -extern int func_8014F6F4(void); +extern s32 func_8014F468(); +extern int func_8014F6F4(); extern s32 func_8014F3E8(s32 param_1); extern int func_8014F74C(); extern s32 D_801152BC; diff --git a/src/ov_SC02_037/ov_SC02_037_jr_8016AE5C.c b/src/ov_SC02_037/ov_SC02_037_jr_8016AE5C.c index 1145e3b83..33ed33b5a 100644 --- a/src/ov_SC02_037/ov_SC02_037_jr_8016AE5C.c +++ b/src/ov_SC02_037/ov_SC02_037_jr_8016AE5C.c @@ -1639,7 +1639,7 @@ extern s32 D_80126CDC; extern void func_8014CBD8(void); extern void func_8014CBE8(void); extern void func_8014CBF8(void *a0); -extern void func_8014D3E0(s32 a0); +extern void func_8014D3E0(); extern void func_8014D04C(void); extern void func_8014CCB4(void); extern void func_8014CC28(s32 a0); @@ -1709,8 +1709,8 @@ extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F24C(struct SubF24C *a0); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F468(void); -extern int func_8014F6F4(void); +extern s32 func_8014F468(); +extern int func_8014F6F4(); extern s32 func_8014F3E8(s32 param_1); extern int func_8014F74C(); extern s32 D_801152BC; diff --git a/src/ov_SC02_037/ov_SC02_037_jr_80171B4C.c b/src/ov_SC02_037/ov_SC02_037_jr_80171B4C.c index 77c3e3a83..0e04a9afe 100644 --- a/src/ov_SC02_037/ov_SC02_037_jr_80171B4C.c +++ b/src/ov_SC02_037/ov_SC02_037_jr_80171B4C.c @@ -1683,7 +1683,7 @@ extern s32 D_80126CDC; extern void func_8014CBD8(void); extern void func_8014CBE8(void); extern void func_8014CBF8(void *a0); -extern void func_8014D3E0(s32 a0); +extern void func_8014D3E0(); extern void func_8014D04C(void); extern void func_8014CCB4(void); extern void func_8014CC28(s32 a0); @@ -1753,8 +1753,8 @@ extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F24C(struct SubF24C *a0); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F468(void); -extern int func_8014F6F4(void); +extern s32 func_8014F468(); +extern int func_8014F6F4(); extern s32 func_8014F3E8(s32 param_1); extern int func_8014F74C(); extern s32 D_801152BC; diff --git a/src/ov_SC02_037/ov_SC02_037_jr_801789AC.c b/src/ov_SC02_037/ov_SC02_037_jr_801789AC.c index 61a3f575e..b7010fbd4 100644 --- a/src/ov_SC02_037/ov_SC02_037_jr_801789AC.c +++ b/src/ov_SC02_037/ov_SC02_037_jr_801789AC.c @@ -1720,7 +1720,7 @@ extern s32 D_80126CDC; extern void func_8014CBD8(void); extern void func_8014CBE8(void); extern void func_8014CBF8(void *a0); -extern void func_8014D3E0(s32 a0); +extern void func_8014D3E0(); extern void func_8014D04C(void); extern void func_8014CCB4(void); extern void func_8014CC28(s32 a0); @@ -1790,8 +1790,8 @@ extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F24C(struct SubF24C *a0); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F468(void); -extern int func_8014F6F4(void); +extern s32 func_8014F468(); +extern int func_8014F6F4(); extern s32 func_8014F3E8(s32 param_1); extern int func_8014F74C(); extern s32 D_801152BC; diff --git a/src/ov_SC02_037/ov_SC02_037_jr_8017AE2C.c b/src/ov_SC02_037/ov_SC02_037_jr_8017AE2C.c index c867f8cc9..ddb4f8ebb 100644 --- a/src/ov_SC02_037/ov_SC02_037_jr_8017AE2C.c +++ b/src/ov_SC02_037/ov_SC02_037_jr_8017AE2C.c @@ -1720,7 +1720,7 @@ extern s32 D_80126CDC; extern void func_8014CBD8(void); extern void func_8014CBE8(void); extern void func_8014CBF8(void *a0); -extern void func_8014D3E0(s32 a0); +extern void func_8014D3E0(); extern void func_8014D04C(void); extern void func_8014CCB4(void); extern void func_8014CC28(s32 a0); @@ -1790,8 +1790,8 @@ extern void func_8014F1F4(void); extern s32 func_8014F2E0(s32 a0, s16 *a1, s16 *a2); extern s32 func_8014F24C(struct SubF24C *a0); extern s32 func_8014F2E0(s32 arg0, s16 * arg1, s16 * arg2); -extern s32 func_8014F468(void); -extern int func_8014F6F4(void); +extern s32 func_8014F468(); +extern int func_8014F6F4(); extern s32 func_8014F3E8(s32 param_1); extern int func_8014F74C(); extern s32 D_801152BC;