diff --git a/config/dedup.us.yaml b/config/dedup.us.yaml index 2f8737572..34f6c2471 100644 --- a/config/dedup.us.yaml +++ b/config/dedup.us.yaml @@ -14614,3 +14614,10 @@ groups: func: DEFINE_func_8017E5CC vram: 0x8017E5CC binaries: [ov_SC04_018, ov_SC04_019] + - id: E_func_8018B158 + tier: h_exact + hash: d5ee5732b43b65de197ee366b6abe1257a55c86d + source: src/shared/engine_core.h + func: DEFINE_func_8018B158 + vram: 0x8018B158 + 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 6ce254e52..3f02db314 100644 --- a/src/ov_SC04_018/ov_SC04_018_jr_80188E1C.c +++ b/src/ov_SC04_018/ov_SC04_018_jr_80188E1C.c @@ -4462,15 +4462,7 @@ INCLUDE_ASM("asm/ov_SC04_018/nonmatchings/ov_SC04_018_jr_80188E1C", func_8018AFF INCLUDE_ASM("asm/ov_SC04_018/nonmatchings/ov_SC04_018_jr_80188E1C", func_8018B0AC); -extern void func_8012E8E0(s32 a0, s32 a1); -extern u8 D_801E04F8[]; - -void func_8018B158(s32 a0) { - *(s16 *)(a0 + 0x2) = 1; - func_8012E8E0(a0, (s32)&D_801E04F8); - *(s16 *)(a0 + 0xFE) = 0; - *(s16 *)(a0 + 0xFC) = 0x80; -} +DEFINE_func_8018B158() /* dedup: shared engine-core @0x8018B158 (src/shared) */ /* 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 908afea2f..5eecf98a7 100644 --- a/src/ov_SC04_019/ov_SC04_019_jr_80188E1C.c +++ b/src/ov_SC04_019/ov_SC04_019_jr_80188E1C.c @@ -3890,7 +3890,7 @@ INCLUDE_ASM("asm/ov_SC04_019/nonmatchings/ov_SC04_019_jr_80188E1C", func_8018AFF INCLUDE_ASM("asm/ov_SC04_019/nonmatchings/ov_SC04_019_jr_80188E1C", func_8018B0AC); -INCLUDE_ASM("asm/ov_SC04_019/nonmatchings/ov_SC04_019_jr_80188E1C", func_8018B158); +DEFINE_func_8018B158() /* dedup: shared engine-core @0x8018B158 (src/shared) */ extern void func_8012B200(u8 *a0); diff --git a/src/shared/engine_core.h b/src/shared/engine_core.h index 0b4318ab1..0b6b48b7e 100644 --- a/src/shared/engine_core.h +++ b/src/shared/engine_core.h @@ -60540,6 +60540,16 @@ func_80184C90((s32)arg0); \ } +#define DEFINE_func_8018B158() \ + extern void func_8012E8E0(s32 a0, s32 a1); \ + extern u8 D_801E04F8[]; \ + void func_8018B158(s32 a0) { \ + *(s16 *)(a0 + 0x2) = 1; \ + func_8012E8E0(a0, (s32)&D_801E04F8); \ + *(s16 *)(a0 + 0xFE) = 0; \ + *(s16 *)(a0 + 0xFC) = 0x80; \ + } + #endif #define DEFINE_func_80128EA8() \ @@ -150485,4 +150495,14 @@ func_80184C90((s32)arg0); \ } +#define DEFINE_func_8018B158() \ + extern void func_8012E8E0(s32 a0, s32 a1); \ + extern u8 D_801E04F8[]; \ + void func_8018B158(s32 a0) { \ + *(s16 *)(a0 + 0x2) = 1; \ + func_8012E8E0(a0, (s32)&D_801E04F8); \ + *(s16 *)(a0 + 0xFE) = 0; \ + *(s16 *)(a0 + 0xFC) = 0x80; \ + } + #endif