diff --git a/config/dedup.us.yaml b/config/dedup.us.yaml index 8346317bf..ae9d2b09c 100644 --- a/config/dedup.us.yaml +++ b/config/dedup.us.yaml @@ -14747,3 +14747,10 @@ groups: func: DEFINE_func_8017DBDC vram: 0x8017DBDC binaries: [ov_SC04_018, ov_SC04_019, ov_SC05_017] + - id: E_func_8017F174 + tier: h_exact + hash: 4af830585dfdacf3f07b30e6e656ae4f4fdd4967 + source: src/shared/engine_core.h + func: DEFINE_func_8017F174 + vram: 0x8017F174 + 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 5465fdbb7..f5a293660 100644 --- a/src/ov_SC04_018/ov_SC04_018_jr_8017AE2C.c +++ b/src/ov_SC04_018/ov_SC04_018_jr_8017AE2C.c @@ -4957,15 +4957,7 @@ INCLUDE_ASM("asm/ov_SC04_018/nonmatchings/ov_SC04_018_jr_8017AE2C", func_8017F13 #include "common.h" -extern void func_8014BB0C(void); -extern void func_8014BDC8(void); -extern void func_8002D4C8(s32 a0, s32 a1); - -void func_8017F174(void) { - func_8014BB0C(); - func_8014BDC8(); - ((s32 (*)(s32, s32))func_8002D4C8)(0x45C, 0); -} +DEFINE_func_8017F174() /* dedup: shared engine-core @0x8017F174 (src/shared) */ extern void func_80029514(int); 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 22f24479b..06c5f63c9 100644 --- a/src/ov_SC04_019/ov_SC04_019_jr_8017AE2C.c +++ b/src/ov_SC04_019/ov_SC04_019_jr_8017AE2C.c @@ -4980,7 +4980,7 @@ extern void func_80029124(s32 arg0, s32 arg1); INCLUDE_ASM("asm/ov_SC04_019/nonmatchings/ov_SC04_019_jr_8017AE2C", func_8017F138); -INCLUDE_ASM("asm/ov_SC04_019/nonmatchings/ov_SC04_019_jr_8017AE2C", func_8017F174); +DEFINE_func_8017F174() /* dedup: shared engine-core @0x8017F174 (src/shared) */ extern void func_80029514(int); void func_8017F1A8(void) { diff --git a/src/shared/engine_core.h b/src/shared/engine_core.h index 05a27ac60..f5bb6e84b 100644 --- a/src/shared/engine_core.h +++ b/src/shared/engine_core.h @@ -60860,6 +60860,16 @@ func_800D06E8(); \ } +#define DEFINE_func_8017F174() \ + extern void func_8014BB0C(void); \ + extern void func_8014BDC8(void); \ + extern void func_8002D4C8(s32 a0, s32 a1); \ + void func_8017F174(void) { \ + func_8014BB0C(); \ + func_8014BDC8(); \ + ((s32 (*)(s32, s32))func_8002D4C8)(0x45C, 0); \ + } + #endif #define DEFINE_func_80128EA8() \ @@ -151125,4 +151135,14 @@ func_800D06E8(); \ } +#define DEFINE_func_8017F174() \ + extern void func_8014BB0C(void); \ + extern void func_8014BDC8(void); \ + extern void func_8002D4C8(s32 a0, s32 a1); \ + void func_8017F174(void) { \ + func_8014BB0C(); \ + func_8014BDC8(); \ + ((s32 (*)(s32, s32))func_8002D4C8)(0x45C, 0); \ + } + #endif