diff --git a/config/dedup.us.yaml b/config/dedup.us.yaml index 2c026a736..bb567fc2f 100644 --- a/config/dedup.us.yaml +++ b/config/dedup.us.yaml @@ -14810,3 +14810,10 @@ groups: func: DEFINE_func_8018B660 vram: 0x8018B660 binaries: [ov_SC04_018, ov_SC04_019] + - id: E_func_8018B614 + tier: h_exact + hash: d4ff463109b6d059c80c32b101403d1379882232 + source: src/shared/engine_core.h + func: DEFINE_func_8018B614 + vram: 0x8018B614 + binaries: [ov_SC04_018, ov_SC04_019] diff --git a/src/ov_SC04_018/ov_SC04_018_jr_80188E1C.c b/src/ov_SC04_018/ov_SC04_018_jr_80188E1C.c index 2b40b4e74..55e2b7696 100644 --- a/src/ov_SC04_018/ov_SC04_018_jr_80188E1C.c +++ b/src/ov_SC04_018/ov_SC04_018_jr_80188E1C.c @@ -4573,21 +4573,7 @@ INCLUDE_ASM("asm/ov_SC04_018/nonmatchings/ov_SC04_018_jr_80188E1C", func_8018B5A #include "common.h" -extern s32 func_8018B5AC(void); -extern void func_8018B564(void *a0); - -void func_8018B614(void *a0) { - s32 s0; - - s0 = 1; - *(s32 *)(*(s32 *)((char *)a0 + 0xCC) + 0xB0) = s0; - - if (func_8018B5AC() != s0) { - return; - } - - func_8018B564(a0); -} +DEFINE_func_8018B614() /* dedup: shared engine-core @0x8018B614 (src/shared) */ #include "common.h" diff --git a/src/ov_SC04_019/ov_SC04_019_jr_80188E1C.c b/src/ov_SC04_019/ov_SC04_019_jr_80188E1C.c index ff12c8099..8120934e8 100644 --- a/src/ov_SC04_019/ov_SC04_019_jr_80188E1C.c +++ b/src/ov_SC04_019/ov_SC04_019_jr_80188E1C.c @@ -3996,7 +3996,7 @@ void func_8018B570(void *a0) { INCLUDE_ASM("asm/ov_SC04_019/nonmatchings/ov_SC04_019_jr_80188E1C", func_8018B5AC); -INCLUDE_ASM("asm/ov_SC04_019/nonmatchings/ov_SC04_019_jr_80188E1C", func_8018B614); +DEFINE_func_8018B614() /* dedup: shared engine-core @0x8018B614 (src/shared) */ DEFINE_func_8018B660() /* dedup: shared engine-core @0x8018B660 (src/shared) */ diff --git a/src/shared/engine_core.h b/src/shared/engine_core.h index bdc9d5b16..8551189ae 100644 --- a/src/shared/engine_core.h +++ b/src/shared/engine_core.h @@ -60995,6 +60995,19 @@ } \ } +#define DEFINE_func_8018B614() \ + extern s32 func_8018B5AC(void); \ + extern void func_8018B564(void *a0); \ + void func_8018B614(void *a0) { \ + s32 s0; \ + s0 = 1; \ + *(s32 *)(*(s32 *)((char *)a0 + 0xCC) + 0xB0) = s0; \ + if (func_8018B5AC() != s0) { \ + return; \ + } \ + func_8018B564(a0); \ + } + #endif #define DEFINE_func_80128EA8() \ @@ -151395,4 +151408,17 @@ } \ } +#define DEFINE_func_8018B614() \ + extern s32 func_8018B5AC(void); \ + extern void func_8018B564(void *a0); \ + void func_8018B614(void *a0) { \ + s32 s0; \ + s0 = 1; \ + *(s32 *)(*(s32 *)((char *)a0 + 0xCC) + 0xB0) = s0; \ + if (func_8018B5AC() != s0) { \ + return; \ + } \ + func_8018B564(a0); \ + } + #endif