diff --git a/config/dedup.us.yaml b/config/dedup.us.yaml index 9ace2a004..d4f2db7f8 100644 --- a/config/dedup.us.yaml +++ b/config/dedup.us.yaml @@ -14572,3 +14572,10 @@ groups: func: DEFINE_func_8017C628 vram: 0x8017C628 binaries: [ov_SC03_010, ov_SC03_011, ov_SC03_013] + - id: E_func_8017C1E8 + tier: h_exact + hash: 72bf44a01e749c0f130c158864fbc6ce045c81cd + source: src/shared/engine_core.h + func: DEFINE_func_8017C1E8 + vram: 0x8017C1E8 + binaries: [ov_SC01_005, ov_SC01_006] diff --git a/src/ov_SC01_005/ov_SC01_005_jr_8017AE2C.c b/src/ov_SC01_005/ov_SC01_005_jr_8017AE2C.c index e1ad9a0bb..076bdcb6c 100644 --- a/src/ov_SC01_005/ov_SC01_005_jr_8017AE2C.c +++ b/src/ov_SC01_005/ov_SC01_005_jr_8017AE2C.c @@ -3398,17 +3398,7 @@ void aF8017C150(void *a0) INCLUDE_ASM("asm/ov_SC01_005/nonmatchings/ov_SC01_005_jr_8017AE2C", func_8017C18C); -extern void func_80147060(u8 *a0); -extern void func_80171A1C(u8 *a0); -extern s32 func_80174650(s32); - -void func_8017C1E8(void *a0) { - if (*(u16 *)(a0 + 0xB8) & 0x8000) { - func_80147060((u8 *)a0); - func_80171A1C((u8 *)a0); - func_80174650((s32)a0); - } -} +DEFINE_func_8017C1E8() /* dedup: shared engine-core @0x8017C1E8 (src/shared) */ DEFINE_func_8017C238() /* dedup: shared engine-core @0x8017C238 (src/shared) */ diff --git a/src/ov_SC01_006/ov_SC01_006_jr_8017AE2C.c b/src/ov_SC01_006/ov_SC01_006_jr_8017AE2C.c index a49f7321d..a1f206f32 100644 --- a/src/ov_SC01_006/ov_SC01_006_jr_8017AE2C.c +++ b/src/ov_SC01_006/ov_SC01_006_jr_8017AE2C.c @@ -3381,7 +3381,7 @@ void aF8017C150(void *a0) INCLUDE_ASM("asm/ov_SC01_006/nonmatchings/ov_SC01_006_jr_8017AE2C", func_8017C18C); -INCLUDE_ASM("asm/ov_SC01_006/nonmatchings/ov_SC01_006_jr_8017AE2C", func_8017C1E8); +DEFINE_func_8017C1E8() /* dedup: shared engine-core @0x8017C1E8 (src/shared) */ DEFINE_func_8017C238() /* dedup: shared engine-core @0x8017C238 (src/shared) */ diff --git a/src/shared/engine_core.h b/src/shared/engine_core.h index 7d80419e2..eda1d6e3a 100644 --- a/src/shared/engine_core.h +++ b/src/shared/engine_core.h @@ -60452,6 +60452,18 @@ ((void (*)(u8 *))func_80171A04)(a0); \ } +#define DEFINE_func_8017C1E8() \ + extern void func_80147060(u8 *a0); \ + extern void func_80171A1C(u8 *a0); \ + extern s32 func_80174650(s32); \ + void func_8017C1E8(void *a0) { \ + if (*(u16 *)(a0 + 0xB8) & 0x8000) { \ + func_80147060((u8 *)a0); \ + func_80171A1C((u8 *)a0); \ + func_80174650((s32)a0); \ + } \ + } + #endif #define DEFINE_func_80128EA8() \ @@ -150309,4 +150321,16 @@ ((void (*)(u8 *))func_80171A04)(a0); \ } +#define DEFINE_func_8017C1E8() \ + extern void func_80147060(u8 *a0); \ + extern void func_80171A1C(u8 *a0); \ + extern s32 func_80174650(s32); \ + void func_8017C1E8(void *a0) { \ + if (*(u16 *)(a0 + 0xB8) & 0x8000) { \ + func_80147060((u8 *)a0); \ + func_80171A1C((u8 *)a0); \ + func_80174650((s32)a0); \ + } \ + } + #endif