diff --git a/config/dedup.us.yaml b/config/dedup.us.yaml index 61bc91ac7..350f7c0c2 100644 --- a/config/dedup.us.yaml +++ b/config/dedup.us.yaml @@ -14999,3 +14999,10 @@ groups: func: DEFINE_func_80188790 vram: 0x80188790 binaries: [ov_SC02_000, ov_SC02_003] + - id: E_func_80181820 + tier: h_exact + hash: 07c2791e5f29cd5836f8c46dacea4e3819c18737 + source: src/shared/engine_core.h + func: DEFINE_func_80181820 + vram: 0x80181820 + binaries: [ov_SC02_000, ov_SC02_003] diff --git a/src/ov_SC02_000/ov_SC02_000_jr_8018173C.c b/src/ov_SC02_000/ov_SC02_000_jr_8018173C.c index 793c1bde7..fa077ab9a 100644 --- a/src/ov_SC02_000/ov_SC02_000_jr_8018173C.c +++ b/src/ov_SC02_000/ov_SC02_000_jr_8018173C.c @@ -2782,36 +2782,7 @@ void func_8018173C(int param_1) { #include "common.h" -extern s32 D_80126954; -extern s32 D_8012695C; -extern s16 D_80126968; -extern s16 D_8012696A; -extern s16 D_80126976; -extern s16 D_8012696C; -extern s16 D_80126978; -extern s16 D_8012697A; -extern u8 D_80126948[]; -extern void func_8012A018(s32 a, s32 b); -extern void func_80181D2C(u8*); -extern void func_8012A094(s32 a0); - -void func_80181820(void) { - u8 *ptr; - - D_80126954 = 0x12C; - D_8012695C = 0x3E8; - D_80126968 = 0x80; - D_8012696A = 0x200; - D_80126976 = 0x50; - D_8012696C = 0; - D_80126978 = -0xC8; - D_8012697A = 0; - - func_8012A018((s32)func_80181D2C, 0); - ptr = D_80126948; - ((void (*)(void *))func_80181D2C)(ptr); - func_8012A094((s32)ptr); -} +DEFINE_func_80181820() /* dedup: shared engine-core @0x80181820 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_000/nonmatchings/ov_SC02_000_jr_8018173C", func_801818C0); diff --git a/src/ov_SC02_003/ov_SC02_003_jr_8018173C.c b/src/ov_SC02_003/ov_SC02_003_jr_8018173C.c index 28a46b220..dc09145ba 100644 --- a/src/ov_SC02_003/ov_SC02_003_jr_8018173C.c +++ b/src/ov_SC02_003/ov_SC02_003_jr_8018173C.c @@ -2777,7 +2777,7 @@ void func_8018173C(int param_1) { return; } -INCLUDE_ASM("asm/ov_SC02_003/nonmatchings/ov_SC02_003_jr_8018173C", func_80181820); +DEFINE_func_80181820() /* dedup: shared engine-core @0x80181820 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_003/nonmatchings/ov_SC02_003_jr_8018173C", func_801818C0); diff --git a/src/shared/engine_core.h b/src/shared/engine_core.h index 93a307542..15d3c6af8 100644 --- a/src/shared/engine_core.h +++ b/src/shared/engine_core.h @@ -61904,6 +61904,35 @@ } \ } +#define DEFINE_func_80181820() \ + extern s32 D_80126954; \ + extern s32 D_8012695C; \ + extern s16 D_80126968; \ + extern s16 D_8012696A; \ + extern s16 D_80126976; \ + extern s16 D_8012696C; \ + extern s16 D_80126978; \ + extern s16 D_8012697A; \ + extern u8 D_80126948[]; \ + extern void func_8012A018(s32 a, s32 b); \ + extern void func_80181D2C(u8*); \ + extern void func_8012A094(s32 a0); \ + void func_80181820(void) { \ + u8 *ptr; \ + D_80126954 = 0x12C; \ + D_8012695C = 0x3E8; \ + D_80126968 = 0x80; \ + D_8012696A = 0x200; \ + D_80126976 = 0x50; \ + D_8012696C = 0; \ + D_80126978 = -0xC8; \ + D_8012697A = 0; \ + func_8012A018((s32)func_80181D2C, 0); \ + ptr = D_80126948; \ + ((void (*)(void *))func_80181D2C)(ptr); \ + func_8012A094((s32)ptr); \ + } + #endif #define DEFINE_func_80128EA8() \ @@ -153213,4 +153242,33 @@ } \ } +#define DEFINE_func_80181820() \ + extern s32 D_80126954; \ + extern s32 D_8012695C; \ + extern s16 D_80126968; \ + extern s16 D_8012696A; \ + extern s16 D_80126976; \ + extern s16 D_8012696C; \ + extern s16 D_80126978; \ + extern s16 D_8012697A; \ + extern u8 D_80126948[]; \ + extern void func_8012A018(s32 a, s32 b); \ + extern void func_80181D2C(u8*); \ + extern void func_8012A094(s32 a0); \ + void func_80181820(void) { \ + u8 *ptr; \ + D_80126954 = 0x12C; \ + D_8012695C = 0x3E8; \ + D_80126968 = 0x80; \ + D_8012696A = 0x200; \ + D_80126976 = 0x50; \ + D_8012696C = 0; \ + D_80126978 = -0xC8; \ + D_8012697A = 0; \ + func_8012A018((s32)func_80181D2C, 0); \ + ptr = D_80126948; \ + ((void (*)(void *))func_80181D2C)(ptr); \ + func_8012A094((s32)ptr); \ + } + #endif