diff --git a/src/ov_SC03_107/ov_SC03_107_jr_80171B4C.c b/src/ov_SC03_107/ov_SC03_107_jr_80171B4C.c index 298de5753..dc3e17c89 100644 --- a/src/ov_SC03_107/ov_SC03_107_jr_80171B4C.c +++ b/src/ov_SC03_107/ov_SC03_107_jr_80171B4C.c @@ -3361,7 +3361,13 @@ DEFINE_func_80172760() /* dedup: shared engine-core @0x80172760 (src/shared) */ DEFINE_func_80172780() /* dedup: shared engine-core @0x80172780 (src/shared) */ -INCLUDE_ASM("asm/ov_SC03_107/nonmatchings/ov_SC03_107_jr_80171B4C", func_801727D0); +extern void (*D_80185A28[])(void); + +s32 func_801727D0(void *a0) +{ + D_80185A28[*(u8 *)((s32)a0 + 0x214)](); +} + DEFINE_func_8017280C() /* dedup: shared engine-core @0x8017280c (src/shared) */ diff --git a/src/ov_SC03_107/ov_SC03_107_jr_801789AC.c b/src/ov_SC03_107/ov_SC03_107_jr_801789AC.c index eedf9e6a4..0d3d08e90 100644 --- a/src/ov_SC03_107/ov_SC03_107_jr_801789AC.c +++ b/src/ov_SC03_107/ov_SC03_107_jr_801789AC.c @@ -3259,7 +3259,7 @@ extern void func_80172710(void); extern void func_80174684(void *); extern void func_80172738(void); extern s16 D_80126B30; -extern s32 func_801727D0(void *a0); +extern s32 func_801727D0(); extern void func_80172780(void *a0); extern void func_80172844(u8 *a0); extern void func_8017280C(u8 *a0); diff --git a/src/shared/engine_core.h b/src/shared/engine_core.h index ad8e8c5c8..144b3b2fe 100644 --- a/src/shared/engine_core.h +++ b/src/shared/engine_core.h @@ -10874,7 +10874,7 @@ extern void func_80172710(void); \ extern void func_80174684(void *); \ extern void func_80172738(void); \ - extern s32 func_801727D0(void *a0); \ + extern s32 func_801727D0(); \ extern void func_80172780(void *a0); \ extern void func_80172844(u8 *a0); \ extern void func_8017280C(u8 *a0); \ @@ -20248,7 +20248,7 @@ extern void func_80174684(void *); \ extern void func_80172738(void); \ extern s16 D_80126B30; \ - extern s32 func_801727D0(void *a0); \ + extern s32 func_801727D0(); \ extern void func_80172780(void *a0); \ extern void func_80172844(u8 *a0); \ extern void func_8017280C(u8 *a0); \ @@ -28963,7 +28963,7 @@ extern void func_80174684(void *); \ extern void func_80172738(void); \ extern s16 D_80126B30; \ - extern s32 func_801727D0(void *a0); \ + extern s32 func_801727D0(); \ extern void func_80172780(void *a0); \ extern void func_80172844(u8 *a0); \ extern void func_8017280C(u8 *a0); \ @@ -45671,7 +45671,7 @@ extern void func_80174684(void *); \ extern void func_80172738(void); \ extern s16 D_80126B30; \ - extern s32 func_801727D0(void *a0); \ + extern s32 func_801727D0(); \ extern void func_80172780(void *a0); \ extern void func_80172844(u8 *a0); \ extern void func_8017280C(u8 *a0); \ @@ -49883,7 +49883,7 @@ extern void func_80174684(void *); \ extern void func_80172738(void); \ extern s16 D_80126B30; \ - extern s32 func_801727D0(void *a0); \ + extern s32 func_801727D0(); \ extern void func_80172780(void *a0); \ extern void func_80172844(u8 *a0); \ extern void func_8017280C(u8 *a0); \ @@ -55936,7 +55936,7 @@ extern void func_80174684(void *); \ extern void func_80172738(void); \ extern s16 D_80126B30; \ - extern s32 func_801727D0(void *a0); \ + extern s32 func_801727D0(); \ extern void func_80172780(void *a0); \ extern void func_80172844(u8 *a0); \ extern void func_8017280C(u8 *a0); \ @@ -59502,7 +59502,7 @@ extern void func_80174684(void *); \ extern void func_80172738(void); \ extern s16 D_80126B30; \ - extern s32 func_801727D0(void *a0); \ + extern s32 func_801727D0(); \ extern void func_80172780(void *a0); \ extern void func_80172844(u8 *a0); \ extern void func_8017280C(u8 *a0); \ @@ -73237,7 +73237,7 @@ #define DEFINE_func_80172780() \ extern void func_80174684(void *); \ extern s16 D_80126B30; \ - extern s32 func_801727D0(void *a0); \ + extern s32 func_801727D0(); \ void func_80172780(void *a0) { \ *(struct S8_80172780 *)&D_80126B30 = *(struct S8_80172780 *)a0; \ func_80174684((void *)func_801727D0); \ @@ -100383,7 +100383,7 @@ extern void func_80172710(void); \ extern void func_80174684(void *); \ extern void func_80172738(void); \ - extern s32 func_801727D0(void *a0); \ + extern s32 func_801727D0(); \ extern void func_80172780(void *a0); \ extern void func_80172844(u8 *a0); \ extern void func_8017280C(u8 *a0); \ @@ -109757,7 +109757,7 @@ extern void func_80174684(void *); \ extern void func_80172738(void); \ extern s16 D_80126B30; \ - extern s32 func_801727D0(void *a0); \ + extern s32 func_801727D0(); \ extern void func_80172780(void *a0); \ extern void func_80172844(u8 *a0); \ extern void func_8017280C(u8 *a0); \ @@ -118472,7 +118472,7 @@ extern void func_80174684(void *); \ extern void func_80172738(void); \ extern s16 D_80126B30; \ - extern s32 func_801727D0(void *a0); \ + extern s32 func_801727D0(); \ extern void func_80172780(void *a0); \ extern void func_80172844(u8 *a0); \ extern void func_8017280C(u8 *a0); \ @@ -135180,7 +135180,7 @@ extern void func_80174684(void *); \ extern void func_80172738(void); \ extern s16 D_80126B30; \ - extern s32 func_801727D0(void *a0); \ + extern s32 func_801727D0(); \ extern void func_80172780(void *a0); \ extern void func_80172844(u8 *a0); \ extern void func_8017280C(u8 *a0); \ @@ -139392,7 +139392,7 @@ extern void func_80174684(void *); \ extern void func_80172738(void); \ extern s16 D_80126B30; \ - extern s32 func_801727D0(void *a0); \ + extern s32 func_801727D0(); \ extern void func_80172780(void *a0); \ extern void func_80172844(u8 *a0); \ extern void func_8017280C(u8 *a0); \ @@ -145445,7 +145445,7 @@ extern void func_80174684(void *); \ extern void func_80172738(void); \ extern s16 D_80126B30; \ - extern s32 func_801727D0(void *a0); \ + extern s32 func_801727D0(); \ extern void func_80172780(void *a0); \ extern void func_80172844(u8 *a0); \ extern void func_8017280C(u8 *a0); \ @@ -149011,7 +149011,7 @@ extern void func_80174684(void *); \ extern void func_80172738(void); \ extern s16 D_80126B30; \ - extern s32 func_801727D0(void *a0); \ + extern s32 func_801727D0(); \ extern void func_80172780(void *a0); \ extern void func_80172844(u8 *a0); \ extern void func_8017280C(u8 *a0); \