diff --git a/config/dedup.us.yaml b/config/dedup.us.yaml index be38047cc..6e4c55233 100644 --- a/config/dedup.us.yaml +++ b/config/dedup.us.yaml @@ -14887,3 +14887,10 @@ groups: func: DEFINE_func_8018419C vram: 0x8018419C binaries: [ov_SC02_000, ov_SC02_003] + - id: E_func_80181C10 + tier: h_exact + hash: c5e707fbb45ddacab36aea0360f539ed9244014a + source: src/shared/engine_core.h + func: DEFINE_func_80181C10 + vram: 0x80181C10 + 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 38b4d7ace..ae9387d5d 100644 --- a/src/ov_SC02_000/ov_SC02_000_jr_8018173C.c +++ b/src/ov_SC02_000/ov_SC02_000_jr_8018173C.c @@ -2969,39 +2969,7 @@ void func_80181B4C(void) #include "common.h" -extern s32 D_80126954; -extern s32 D_8012695C; -extern s16 D_80126968; -extern s16 D_8012696A; -extern s16 D_8012696C; -extern s16 D_80126976; -extern s16 D_80126978; -extern s16 D_8012697A; -extern s32 D_801269E4; -extern u8 D_801269E8; -extern s16 D_801274E8; -extern u16 D_80126B5E; -extern void func_8012A018(s32 a, s32 b); -extern void func_80181D2C(u8 *param_1); - -void func_80181C10(void) { - D_80126954 = 0x12C; - D_8012695C = 0x190; - D_80126968 = 0x80; - D_8012696A = 0x800; - D_80126978 = -0x80; - D_8012696C = 0; - D_80126976 = 0; - D_8012697A = -0xC8; - D_801269E4 = 0; - D_801269E8 = 0; - D_801274E8 = D_80126B5E; - func_8012A018((s32)func_80181D2C, 2); - D_80126954 = 0x96; - D_8012695C = 0x64; - D_80126968 = 0x120; - D_80126978 = -0x60; -} +DEFINE_func_80181C10() /* dedup: shared engine-core @0x80181C10 (src/shared) */ DEFINE_func_80181CE0() /* dedup: shared engine-core @0x80181CE0 (src/shared) */ 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 a6becebb1..ca8e2dd50 100644 --- a/src/ov_SC02_003/ov_SC02_003_jr_8018173C.c +++ b/src/ov_SC02_003/ov_SC02_003_jr_8018173C.c @@ -2793,7 +2793,7 @@ INCLUDE_ASM("asm/ov_SC02_003/nonmatchings/ov_SC02_003_jr_8018173C", func_80181AD INCLUDE_ASM("asm/ov_SC02_003/nonmatchings/ov_SC02_003_jr_8018173C", func_80181B4C); -INCLUDE_ASM("asm/ov_SC02_003/nonmatchings/ov_SC02_003_jr_8018173C", func_80181C10); +DEFINE_func_80181C10() /* dedup: shared engine-core @0x80181C10 (src/shared) */ DEFINE_func_80181CE0() /* dedup: shared engine-core @0x80181CE0 (src/shared) */ diff --git a/src/shared/engine_core.h b/src/shared/engine_core.h index 05c881028..ab348e528 100644 --- a/src/shared/engine_core.h +++ b/src/shared/engine_core.h @@ -61214,6 +61214,40 @@ } \ } +#define DEFINE_func_80181C10() \ + extern s32 D_80126954; \ + extern s32 D_8012695C; \ + extern s16 D_80126968; \ + extern s16 D_8012696A; \ + extern s16 D_8012696C; \ + extern s16 D_80126976; \ + extern s16 D_80126978; \ + extern s16 D_8012697A; \ + extern s32 D_801269E4; \ + extern u8 D_801269E8; \ + extern s16 D_801274E8; \ + extern u16 D_80126B5E; \ + extern void func_8012A018(s32 a, s32 b); \ + extern void func_80181D2C(u8 *param_1); \ + void func_80181C10(void) { \ + D_80126954 = 0x12C; \ + D_8012695C = 0x190; \ + D_80126968 = 0x80; \ + D_8012696A = 0x800; \ + D_80126978 = -0x80; \ + D_8012696C = 0; \ + D_80126976 = 0; \ + D_8012697A = -0xC8; \ + D_801269E4 = 0; \ + D_801269E8 = 0; \ + D_801274E8 = D_80126B5E; \ + func_8012A018((s32)func_80181D2C, 2); \ + D_80126954 = 0x96; \ + D_8012695C = 0x64; \ + D_80126968 = 0x120; \ + D_80126978 = -0x60; \ + } + #endif #define DEFINE_func_80128EA8() \ @@ -151833,4 +151867,38 @@ } \ } +#define DEFINE_func_80181C10() \ + extern s32 D_80126954; \ + extern s32 D_8012695C; \ + extern s16 D_80126968; \ + extern s16 D_8012696A; \ + extern s16 D_8012696C; \ + extern s16 D_80126976; \ + extern s16 D_80126978; \ + extern s16 D_8012697A; \ + extern s32 D_801269E4; \ + extern u8 D_801269E8; \ + extern s16 D_801274E8; \ + extern u16 D_80126B5E; \ + extern void func_8012A018(s32 a, s32 b); \ + extern void func_80181D2C(u8 *param_1); \ + void func_80181C10(void) { \ + D_80126954 = 0x12C; \ + D_8012695C = 0x190; \ + D_80126968 = 0x80; \ + D_8012696A = 0x800; \ + D_80126978 = -0x80; \ + D_8012696C = 0; \ + D_80126976 = 0; \ + D_8012697A = -0xC8; \ + D_801269E4 = 0; \ + D_801269E8 = 0; \ + D_801274E8 = D_80126B5E; \ + func_8012A018((s32)func_80181D2C, 2); \ + D_80126954 = 0x96; \ + D_8012695C = 0x64; \ + D_80126968 = 0x120; \ + D_80126978 = -0x60; \ + } + #endif