diff --git a/config/dedup.us.yaml b/config/dedup.us.yaml index 3487963c6..60d908829 100644 --- a/config/dedup.us.yaml +++ b/config/dedup.us.yaml @@ -15181,3 +15181,10 @@ groups: func: DEFINE_func_80181E58 vram: 0x80181E58 binaries: [ov_SC03_118, ov_SC03_119] + - id: E_func_8018178C + tier: h_exact + hash: 5b1ba7c9b95e24199d97df754d49bcdc8e9ac9c2 + source: src/shared/engine_core.h + func: DEFINE_func_8018178C + vram: 0x8018178C + 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 d1a2a9aa7..7a67eddb0 100644 --- a/src/ov_SC04_018/ov_SC04_018_jr_8017AE2C.c +++ b/src/ov_SC04_018/ov_SC04_018_jr_8017AE2C.c @@ -5868,12 +5868,7 @@ extern void func_80184CB8(s32*, s32); INCLUDE_ASM("asm/ov_SC04_018/nonmatchings/ov_SC04_018_jr_8017AE2C", func_80181738); -extern void func_80184CB8(s32*, s32); - extern short D_80191B34; - void func_8018178C(void * arg0) { - *(short *)((char *)arg0 + 0x2) = 9; - ((void (*)(s32, s32))func_80184CB8)((int)arg0, (int)&D_80191B34); - } +DEFINE_func_8018178C() /* dedup: shared engine-core @0x8018178C (src/shared) */ INCLUDE_ASM("asm/ov_SC04_018/nonmatchings/ov_SC04_018_jr_8017AE2C", func_801817B8); 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 f8243c937..5fe18d649 100644 --- a/src/ov_SC04_019/ov_SC04_019_jr_8017AE2C.c +++ b/src/ov_SC04_019/ov_SC04_019_jr_8017AE2C.c @@ -5822,12 +5822,7 @@ extern void func_80184CB8(s32*, s32); INCLUDE_ASM("asm/ov_SC04_019/nonmatchings/ov_SC04_019_jr_8017AE2C", func_80181738); -extern void func_80184CB8(s32*, s32); - extern short D_80191B34; - void func_8018178C(void * arg0) { - *(short *)((char *)arg0 + 0x2) = 9; - ((void (*)(s32, s32))func_80184CB8)((int)arg0, (int)&D_80191B34); - } +DEFINE_func_8018178C() /* dedup: shared engine-core @0x8018178C (src/shared) */ INCLUDE_ASM("asm/ov_SC04_019/nonmatchings/ov_SC04_019_jr_8017AE2C", func_801817B8); diff --git a/src/shared/engine_core.h b/src/shared/engine_core.h index dd69d617e..260f5bb2f 100644 --- a/src/shared/engine_core.h +++ b/src/shared/engine_core.h @@ -65722,6 +65722,14 @@ func_8012AD44((s32 *)self, 9); \ } +#define DEFINE_func_8018178C() \ + extern void func_80184CB8(s32*, s32); \ + extern short D_80191B34; \ + void func_8018178C(void * arg0) { \ + *(short *)((char *)arg0 + 0x2) = 9; \ + ((void (*)(s32, s32))func_80184CB8)((int)arg0, (int)&D_80191B34); \ + } + #endif #define DEFINE_func_80128EA8() \ @@ -160849,4 +160857,12 @@ func_8012AD44((s32 *)self, 9); \ } +#define DEFINE_func_8018178C() \ + extern void func_80184CB8(s32*, s32); \ + extern short D_80191B34; \ + void func_8018178C(void * arg0) { \ + *(short *)((char *)arg0 + 0x2) = 9; \ + ((void (*)(s32, s32))func_80184CB8)((int)arg0, (int)&D_80191B34); \ + } + #endif