diff --git a/config/dedup.us.yaml b/config/dedup.us.yaml index 7d12dc72d..fe3454926 100644 --- a/config/dedup.us.yaml +++ b/config/dedup.us.yaml @@ -14390,3 +14390,10 @@ groups: func: DEFINE_func_80181538 vram: 0x80181538 binaries: [ov_SC02_000, ov_SC02_003] + - id: E_func_80180190 + tier: h_exact + hash: d5684f9b3608a45c53bc6232cd268e671e1ff0e8 + source: src/shared/engine_core.h + func: DEFINE_func_80180190 + vram: 0x80180190 + 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 458b98c23..1abdbb772 100644 --- a/src/ov_SC04_018/ov_SC04_018_jr_8017AE2C.c +++ b/src/ov_SC04_018/ov_SC04_018_jr_8017AE2C.c @@ -5339,7 +5339,7 @@ extern void func_80178CBC(s32*, s32); } -INCLUDE_ASM("asm/ov_SC04_018/nonmatchings/ov_SC04_018_jr_8017AE2C", func_80180190); +DEFINE_func_80180190() /* dedup: shared engine-core @0x80180190 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_018/nonmatchings/ov_SC04_018_jr_8017AE2C", func_801801E0); 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 989c48466..cc50f7ee2 100644 --- a/src/ov_SC04_019/ov_SC04_019_jr_8017AE2C.c +++ b/src/ov_SC04_019/ov_SC04_019_jr_8017AE2C.c @@ -5331,19 +5331,7 @@ extern void func_80178CBC(s32 a0, s32 a1); #include "common.h" -extern int func_80178970(void); -extern void func_80178D18(void); -extern void func_80184CB8(s32*, s32); - -void func_80180190(void * arg0) { - - extern short D_8019181C; - if (func_80178970() != 0) { - ((void (*)(s32))func_80178D18)((s32)arg0); - *(short *)((char *)arg0 + 0x2) = 1; - ((void (*)(s32, s32))func_80184CB8)((int)arg0, (int)&D_8019181C); - } -} +DEFINE_func_80180190() /* dedup: shared engine-core @0x80180190 (src/shared) */ INCLUDE_ASM("asm/ov_SC04_019/nonmatchings/ov_SC04_019_jr_8017AE2C", func_801801E0); diff --git a/src/shared/engine_core.h b/src/shared/engine_core.h index 9c74df876..9ef21f43c 100644 --- a/src/shared/engine_core.h +++ b/src/shared/engine_core.h @@ -60039,6 +60039,19 @@ } \ } +#define DEFINE_func_80180190() \ + extern int func_80178970(void); \ + extern void func_80178D18(void); \ + extern void func_80184CB8(s32*, s32); \ + void func_80180190(void * arg0) { \ + extern short D_8019181C; \ + if (func_80178970() != 0) { \ + ((void (*)(s32))func_80178D18)((s32)arg0); \ + *(short *)((char *)arg0 + 0x2) = 1; \ + ((void (*)(s32, s32))func_80184CB8)((int)arg0, (int)&D_8019181C); \ + } \ + } + #endif #define DEFINE_func_80128EA8() \ @@ -149483,4 +149496,17 @@ } \ } +#define DEFINE_func_80180190() \ + extern int func_80178970(void); \ + extern void func_80178D18(void); \ + extern void func_80184CB8(s32*, s32); \ + void func_80180190(void * arg0) { \ + extern short D_8019181C; \ + if (func_80178970() != 0) { \ + ((void (*)(s32))func_80178D18)((s32)arg0); \ + *(short *)((char *)arg0 + 0x2) = 1; \ + ((void (*)(s32, s32))func_80184CB8)((int)arg0, (int)&D_8019181C); \ + } \ + } + #endif