diff --git a/config/dedup.us.yaml b/config/dedup.us.yaml index beae310db..a04464019 100644 --- a/config/dedup.us.yaml +++ b/config/dedup.us.yaml @@ -15272,3 +15272,10 @@ groups: func: DEFINE_func_80180D38 vram: 0x80180D38 binaries: [ov_SC04_018, ov_SC04_019] + - id: E_func_80184460 + tier: h_exact + hash: 8a34c85574c2f4b4eb00e7353b8be9c76a717f39 + source: src/shared/engine_core.h + func: DEFINE_func_80184460 + vram: 0x80184460 + 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 60fde5d7c..d6b5d7e0a 100644 --- a/src/ov_SC04_018/ov_SC04_018_jr_8017AE2C.c +++ b/src/ov_SC04_018/ov_SC04_018_jr_8017AE2C.c @@ -6982,18 +6982,7 @@ INCLUDE_ASM("asm/ov_SC04_018/nonmatchings/ov_SC04_018_jr_8017AE2C", func_8018441 -extern s32 func_80184BAC(s32 arg0, s32 arg1); -extern void func_80183E20(void *arg0); - -void func_80184460(void *arg0) { - s32 v1; - - v1 = *(s32 *)((char *)arg0 + 0xCC); - *(s32 *)((char *)v1 + 0xB0) = 2; - if (func_80184BAC(6, 0x14) != 0) { - func_80183E20(arg0); - } -} +DEFINE_func_80184460() /* dedup: shared engine-core @0x80184460 (src/shared) */ extern s32 func_80184BAC(s32 a0, s32 a1); 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 2b3c9783d..c6b98e110 100644 --- a/src/ov_SC04_019/ov_SC04_019_jr_8017AE2C.c +++ b/src/ov_SC04_019/ov_SC04_019_jr_8017AE2C.c @@ -6877,18 +6877,7 @@ INCLUDE_ASM("asm/ov_SC04_019/nonmatchings/ov_SC04_019_jr_8017AE2C", func_8018441 -extern s32 func_80184BAC(s32 arg0, s32 arg1); -extern void func_80183E20(void *arg0); - -void func_80184460(void *arg0) { - s32 v1; - - v1 = *(s32 *)((char *)arg0 + 0xCC); - *(s32 *)((char *)v1 + 0xB0) = 2; - if (func_80184BAC(6, 0x14) != 0) { - func_80183E20(arg0); - } -} +DEFINE_func_80184460() /* dedup: shared engine-core @0x80184460 (src/shared) */ extern s32 func_80184BAC(s32 a0, s32 a1); diff --git a/src/shared/engine_core.h b/src/shared/engine_core.h index c637af631..54f19f299 100644 --- a/src/shared/engine_core.h +++ b/src/shared/engine_core.h @@ -65981,6 +65981,18 @@ return (s32)func_80172710; \ } +#define DEFINE_func_80184460() \ + extern s32 func_80184BAC(s32 arg0, s32 arg1); \ + extern void func_80183E20(void *arg0); \ + void func_80184460(void *arg0) { \ + s32 v1; \ + v1 = *(s32 *)((char *)arg0 + 0xCC); \ + *(s32 *)((char *)v1 + 0xB0) = 2; \ + if (func_80184BAC(6, 0x14) != 0) { \ + func_80183E20(arg0); \ + } \ + } + #endif #define DEFINE_func_80128EA8() \ @@ -161367,4 +161379,16 @@ return (s32)func_80172710; \ } +#define DEFINE_func_80184460() \ + extern s32 func_80184BAC(s32 arg0, s32 arg1); \ + extern void func_80183E20(void *arg0); \ + void func_80184460(void *arg0) { \ + s32 v1; \ + v1 = *(s32 *)((char *)arg0 + 0xCC); \ + *(s32 *)((char *)v1 + 0xB0) = 2; \ + if (func_80184BAC(6, 0x14) != 0) { \ + func_80183E20(arg0); \ + } \ + } + #endif