diff --git a/config/dedup.us.yaml b/config/dedup.us.yaml index 29a48e2b5..2377d04f7 100644 --- a/config/dedup.us.yaml +++ b/config/dedup.us.yaml @@ -14411,3 +14411,10 @@ groups: func: DEFINE_func_80182A7C vram: 0x80182A7C binaries: [ov_SC04_018, ov_SC04_019] + - id: E_func_80183890 + tier: h_exact + hash: 72636551710077cf5419b5f1ebd370347672a350 + source: src/shared/engine_core.h + func: DEFINE_func_80183890 + vram: 0x80183890 + binaries: [ov_SC04_018, ov_SC04_019] diff --git a/src/ov_SC04_018/ov_SC04_018_jr_8017AE2C.c b/src/ov_SC04_018/ov_SC04_018_jr_8017AE2C.c index 78646d2b5..16d12748e 100644 --- a/src/ov_SC04_018/ov_SC04_018_jr_8017AE2C.c +++ b/src/ov_SC04_018/ov_SC04_018_jr_8017AE2C.c @@ -6676,7 +6676,7 @@ INCLUDE_ASM("asm/ov_SC04_018/nonmatchings/ov_SC04_018_jr_8017AE2C", func_801837E DEFINE_func_80183838() /* dedup: shared engine-core @0x80183838 (src/shared) */ -INCLUDE_ASM("asm/ov_SC04_018/nonmatchings/ov_SC04_018_jr_8017AE2C", func_80183890); +DEFINE_func_80183890() /* dedup: shared engine-core @0x80183890 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_018/nonmatchings/ov_SC04_018_jr_8017AE2C", func_801838E0); diff --git a/src/ov_SC04_019/ov_SC04_019_jr_8017AE2C.c b/src/ov_SC04_019/ov_SC04_019_jr_8017AE2C.c index dd725ca7f..ce705b3aa 100644 --- a/src/ov_SC04_019/ov_SC04_019_jr_8017AE2C.c +++ b/src/ov_SC04_019/ov_SC04_019_jr_8017AE2C.c @@ -6607,19 +6607,7 @@ DEFINE_func_80183838() /* dedup: shared engine-core @0x80183838 (src/shared) */ #include "common.h" -extern int func_80178970(void); -extern void func_80178D18(void); -extern void func_80184CB8(s32*, s32); - -void func_80183890(void * arg0) { - - extern short D_80192030; - if (func_80178970() != 0) { - ((void (*)(s32))func_80178D18)((s32)arg0); - *(short *)((char *)arg0 + 0x2) = 8; - ((void (*)(s32, s32))func_80184CB8)((int)arg0, (int)&D_80192030); - } -} +DEFINE_func_80183890() /* dedup: shared engine-core @0x80183890 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_019/nonmatchings/ov_SC04_019_jr_8017AE2C", func_801838E0); diff --git a/src/shared/engine_core.h b/src/shared/engine_core.h index 5d73b1758..5a762339b 100644 --- a/src/shared/engine_core.h +++ b/src/shared/engine_core.h @@ -60078,6 +60078,19 @@ } \ } +#define DEFINE_func_80183890() \ + extern int func_80178970(void); \ + extern void func_80178D18(void); \ + extern void func_80184CB8(s32*, s32); \ + void func_80183890(void * arg0) { \ + extern short D_80192030; \ + if (func_80178970() != 0) { \ + ((void (*)(s32))func_80178D18)((s32)arg0); \ + *(short *)((char *)arg0 + 0x2) = 8; \ + ((void (*)(s32, s32))func_80184CB8)((int)arg0, (int)&D_80192030); \ + } \ + } + #endif #define DEFINE_func_80128EA8() \ @@ -149561,4 +149574,17 @@ } \ } +#define DEFINE_func_80183890() \ + extern int func_80178970(void); \ + extern void func_80178D18(void); \ + extern void func_80184CB8(s32*, s32); \ + void func_80183890(void * arg0) { \ + extern short D_80192030; \ + if (func_80178970() != 0) { \ + ((void (*)(s32))func_80178D18)((s32)arg0); \ + *(short *)((char *)arg0 + 0x2) = 8; \ + ((void (*)(s32, s32))func_80184CB8)((int)arg0, (int)&D_80192030); \ + } \ + } + #endif