diff --git a/config/dedup.us.yaml b/config/dedup.us.yaml index a80bc6c7a..59c4a9f21 100644 --- a/config/dedup.us.yaml +++ b/config/dedup.us.yaml @@ -14789,3 +14789,10 @@ groups: func: DEFINE_func_80181648 vram: 0x80181648 binaries: [ov_SC04_018, ov_SC04_019] + - id: E_func_801803BC + tier: h_exact + hash: b5a1123a68cdd6ffb4b1d1c334577cc3d3e498bc + source: src/shared/engine_core.h + func: DEFINE_func_801803BC + vram: 0x801803BC + 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 0c62e200f..cb09d5ac4 100644 --- a/src/ov_SC04_018/ov_SC04_018_jr_8017AE2C.c +++ b/src/ov_SC04_018/ov_SC04_018_jr_8017AE2C.c @@ -5400,24 +5400,7 @@ void func_8018034C(void *arg0) { #include "common.h" -extern void func_8012E88C(s32); -extern void func_8012A828(s32 *a0, s32 a1); -extern void func_80184C90(s32); -extern void func_80184ED4(s32, s32, s32, s32); -extern void func_80185FB8(s32, s32, s32); - -extern s32 D_801B9DF8; -extern short D_801B65C8; - -void func_801803BC(void *arg0) { - s32 s0 = (s32)arg0; - *(short *)((char *)s0 + 0x2) = 3; - func_8012E88C(s0); - func_8012A828((s32 *)s0, (s32)&(*(short *)&D_801B9DF8)); - func_80184C90(s0); - func_80184ED4(s0, (s32)&D_801B65C8, 0, 0x40); - func_80185FB8(s0, 0xC, 0x1); -} +DEFINE_func_801803BC() /* dedup: shared engine-core @0x801803BC (src/shared) */ DEFINE_func_8018042C() /* dedup: shared engine-core @0x8018042C (src/shared) */ 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 fc6f3215d..bdedc5f73 100644 --- a/src/ov_SC04_019/ov_SC04_019_jr_8017AE2C.c +++ b/src/ov_SC04_019/ov_SC04_019_jr_8017AE2C.c @@ -5378,7 +5378,7 @@ void func_8018034C(void *arg0) { } -INCLUDE_ASM("asm/ov_SC04_019/nonmatchings/ov_SC04_019_jr_8017AE2C", func_801803BC); +DEFINE_func_801803BC() /* dedup: shared engine-core @0x801803BC (src/shared) */ DEFINE_func_8018042C() /* dedup: shared engine-core @0x8018042C (src/shared) */ diff --git a/src/shared/engine_core.h b/src/shared/engine_core.h index 49b0afb85..b3706c3cd 100644 --- a/src/shared/engine_core.h +++ b/src/shared/engine_core.h @@ -60960,6 +60960,24 @@ func_80181998(); \ } +#define DEFINE_func_801803BC() \ + extern void func_8012E88C(s32); \ + extern void func_8012A828(s32 *a0, s32 a1); \ + extern void func_80184C90(s32); \ + extern void func_80184ED4(s32, s32, s32, s32); \ + extern void func_80185FB8(s32, s32, s32); \ + extern s32 D_801B9DF8; \ + extern short D_801B65C8; \ + void func_801803BC(void *arg0) { \ + s32 s0 = (s32)arg0; \ + *(short *)((char *)s0 + 0x2) = 3; \ + func_8012E88C(s0); \ + func_8012A828((s32 *)s0, (s32)&(*(short *)&D_801B9DF8)); \ + func_80184C90(s0); \ + func_80184ED4(s0, (s32)&D_801B65C8, 0, 0x40); \ + func_80185FB8(s0, 0xC, 0x1); \ + } + #endif #define DEFINE_func_80128EA8() \ @@ -151325,4 +151343,22 @@ func_80181998(); \ } +#define DEFINE_func_801803BC() \ + extern void func_8012E88C(s32); \ + extern void func_8012A828(s32 *a0, s32 a1); \ + extern void func_80184C90(s32); \ + extern void func_80184ED4(s32, s32, s32, s32); \ + extern void func_80185FB8(s32, s32, s32); \ + extern s32 D_801B9DF8; \ + extern short D_801B65C8; \ + void func_801803BC(void *arg0) { \ + s32 s0 = (s32)arg0; \ + *(short *)((char *)s0 + 0x2) = 3; \ + func_8012E88C(s0); \ + func_8012A828((s32 *)s0, (s32)&(*(short *)&D_801B9DF8)); \ + func_80184C90(s0); \ + func_80184ED4(s0, (s32)&D_801B65C8, 0, 0x40); \ + func_80185FB8(s0, 0xC, 0x1); \ + } + #endif