diff --git a/config/dedup.us.yaml b/config/dedup.us.yaml index 78c2efd4f2..95a87934af 100644 --- a/config/dedup.us.yaml +++ b/config/dedup.us.yaml @@ -14768,3 +14768,10 @@ groups: func: DEFINE_func_8017FD88 vram: 0x8017FD88 binaries: [ov_SC04_018, ov_SC04_019] + - id: E_func_8017FD28 + tier: h_exact + hash: 3467556588c41dbb10aa5793e64f211bf2cce424 + source: src/shared/engine_core.h + func: DEFINE_func_8017FD28 + vram: 0x8017FD28 + 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 cd198103d8..11db4faf1f 100644 --- a/src/ov_SC04_018/ov_SC04_018_jr_8017AE2C.c +++ b/src/ov_SC04_018/ov_SC04_018_jr_8017AE2C.c @@ -5306,25 +5306,7 @@ void func_8017FCD8(void * arg0) { #include "common.h" -extern s32 func_801789AC(s32 arg0); -extern void func_80178D18(void); -extern void func_8012E88C(s32); -extern void func_8012A828(s32 *a0, s32 a1); - -extern short D_801B99A8; - -void func_8017FD28(s32 arg0) { - s32 s0 = arg0; - - s32 result = func_801789AC(arg0); - if (result != 0) { - ((void (*)(s32))func_80178D18)((s32)s0); - *(short *)((char *)s0 + 0x2) = 5; - *(short *)((char *)s0 + 0x34) = 1; - func_8012E88C((s32)s0); - func_8012A828((s32 *)s0, (s32)&D_801B99A8); - } -} +DEFINE_func_8017FD28() /* dedup: shared engine-core @0x8017FD28 (src/shared) */ #include "common.h" 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 5f0a7fefad..3280b683e5 100644 --- a/src/ov_SC04_019/ov_SC04_019_jr_8017AE2C.c +++ b/src/ov_SC04_019/ov_SC04_019_jr_8017AE2C.c @@ -5287,7 +5287,7 @@ void func_8017FCD8(void * arg0) { } -INCLUDE_ASM("asm/ov_SC04_019/nonmatchings/ov_SC04_019_jr_8017AE2C", func_8017FD28); +DEFINE_func_8017FD28() /* dedup: shared engine-core @0x8017FD28 (src/shared) */ DEFINE_func_8017FD88() /* dedup: shared engine-core @0x8017FD88 (src/shared) */ diff --git a/src/shared/engine_core.h b/src/shared/engine_core.h index 588b5fa99c..ffe84e35ba 100644 --- a/src/shared/engine_core.h +++ b/src/shared/engine_core.h @@ -60902,6 +60902,24 @@ } \ } +#define DEFINE_func_8017FD28() \ + extern s32 func_801789AC(s32 arg0); \ + extern void func_80178D18(void); \ + extern void func_8012E88C(s32); \ + extern void func_8012A828(s32 *a0, s32 a1); \ + extern short D_801B99A8; \ + void func_8017FD28(s32 arg0) { \ + s32 s0 = arg0; \ + s32 result = func_801789AC(arg0); \ + if (result != 0) { \ + ((void (*)(s32))func_80178D18)((s32)s0); \ + *(short *)((char *)s0 + 0x2) = 5; \ + *(short *)((char *)s0 + 0x34) = 1; \ + func_8012E88C((s32)s0); \ + func_8012A828((s32 *)s0, (s32)&D_801B99A8); \ + } \ + } + #endif #define DEFINE_func_80128EA8() \ @@ -151209,4 +151227,22 @@ } \ } +#define DEFINE_func_8017FD28() \ + extern s32 func_801789AC(s32 arg0); \ + extern void func_80178D18(void); \ + extern void func_8012E88C(s32); \ + extern void func_8012A828(s32 *a0, s32 a1); \ + extern short D_801B99A8; \ + void func_8017FD28(s32 arg0) { \ + s32 s0 = arg0; \ + s32 result = func_801789AC(arg0); \ + if (result != 0) { \ + ((void (*)(s32))func_80178D18)((s32)s0); \ + *(short *)((char *)s0 + 0x2) = 5; \ + *(short *)((char *)s0 + 0x34) = 1; \ + func_8012E88C((s32)s0); \ + func_8012A828((s32 *)s0, (s32)&D_801B99A8); \ + } \ + } + #endif