diff --git a/config/dedup.us.yaml b/config/dedup.us.yaml index 6e4c552332..1da7c437e5 100644 --- a/config/dedup.us.yaml +++ b/config/dedup.us.yaml @@ -14894,3 +14894,10 @@ groups: func: DEFINE_func_80181C10 vram: 0x80181C10 binaries: [ov_SC02_000, ov_SC02_003] + - id: E_func_801819F4 + tier: h_exact + hash: 77651e743ba349b617037ba9f6c163911b3de4f3 + source: src/shared/engine_core.h + func: DEFINE_func_801819F4 + vram: 0x801819F4 + 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 ae9387d5d2..b0d36637b5 100644 --- a/src/ov_SC02_000/ov_SC02_000_jr_8018173C.c +++ b/src/ov_SC02_000/ov_SC02_000_jr_8018173C.c @@ -2866,52 +2866,7 @@ void func_80181934(void) #include "common.h" -extern s32 D_80126954; -extern s32 D_8012695C; -extern s16 D_80126968; -extern s16 D_8012696A; -extern s16 D_80126978; -extern u16 D_80126B5E; -extern s16 D_8012696C; -extern s16 D_80126976; -extern s16 D_8012697A; -extern s32 D_801269E4; -extern u8 D_801269E8; -extern s16 D_801274E8; -extern void func_8012A018(s32 a0, s32 a1); -extern void func_80181D2C(u8 *a0); - -void func_801819F4(void) { - register s32 v0 __asm__("$2"); - register u16 v1 __asm__("$3"); - - v0 = 0x64; - D_80126954 = v0; - - v0 = 0x190; - D_8012695C = v0; - - v0 = 0x155; - D_80126968 = v0; - - v0 = 0x800; - D_8012696A = v0; - - v0 = -0x80; - D_80126978 = v0; - - v0 = 0xC8; - v1 = D_80126B5E; - - D_8012696C = 0; - D_80126976 = 0; - D_8012697A = v0; - D_801269E4 = 0; - D_801269E8 = 0; - D_801274E8 = v1; - - func_8012A018((s32)&func_80181D2C, 0x2); -} +DEFINE_func_801819F4() /* dedup: shared engine-core @0x801819F4 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_000/nonmatchings/ov_SC02_000_jr_8018173C", func_80181A94); 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 ca8e2dd509..5450d6b794 100644 --- a/src/ov_SC02_003/ov_SC02_003_jr_8018173C.c +++ b/src/ov_SC02_003/ov_SC02_003_jr_8018173C.c @@ -2785,7 +2785,7 @@ DEFINE_func_80181914() /* dedup: shared engine-core @0x80181914 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_003/nonmatchings/ov_SC02_003_jr_8018173C", func_80181934); -INCLUDE_ASM("asm/ov_SC02_003/nonmatchings/ov_SC02_003_jr_8018173C", func_801819F4); +DEFINE_func_801819F4() /* dedup: shared engine-core @0x801819F4 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_003/nonmatchings/ov_SC02_003_jr_8018173C", func_80181A94); diff --git a/src/shared/engine_core.h b/src/shared/engine_core.h index ab348e5284..7ff004d304 100644 --- a/src/shared/engine_core.h +++ b/src/shared/engine_core.h @@ -61248,6 +61248,45 @@ D_80126978 = -0x60; \ } +#define DEFINE_func_801819F4() \ + extern s32 D_80126954; \ + extern s32 D_8012695C; \ + extern s16 D_80126968; \ + extern s16 D_8012696A; \ + extern s16 D_80126978; \ + extern u16 D_80126B5E; \ + extern s16 D_8012696C; \ + extern s16 D_80126976; \ + extern s16 D_8012697A; \ + extern s32 D_801269E4; \ + extern u8 D_801269E8; \ + extern s16 D_801274E8; \ + extern void func_8012A018(s32 a0, s32 a1); \ + extern void func_80181D2C(u8 *a0); \ + void func_801819F4(void) { \ + register s32 v0 __asm__("$2"); \ + register u16 v1 __asm__("$3"); \ + v0 = 0x64; \ + D_80126954 = v0; \ + v0 = 0x190; \ + D_8012695C = v0; \ + v0 = 0x155; \ + D_80126968 = v0; \ + v0 = 0x800; \ + D_8012696A = v0; \ + v0 = -0x80; \ + D_80126978 = v0; \ + v0 = 0xC8; \ + v1 = D_80126B5E; \ + D_8012696C = 0; \ + D_80126976 = 0; \ + D_8012697A = v0; \ + D_801269E4 = 0; \ + D_801269E8 = 0; \ + D_801274E8 = v1; \ + func_8012A018((s32)&func_80181D2C, 0x2); \ + } + #endif #define DEFINE_func_80128EA8() \ @@ -151901,4 +151940,43 @@ D_80126978 = -0x60; \ } +#define DEFINE_func_801819F4() \ + extern s32 D_80126954; \ + extern s32 D_8012695C; \ + extern s16 D_80126968; \ + extern s16 D_8012696A; \ + extern s16 D_80126978; \ + extern u16 D_80126B5E; \ + extern s16 D_8012696C; \ + extern s16 D_80126976; \ + extern s16 D_8012697A; \ + extern s32 D_801269E4; \ + extern u8 D_801269E8; \ + extern s16 D_801274E8; \ + extern void func_8012A018(s32 a0, s32 a1); \ + extern void func_80181D2C(u8 *a0); \ + void func_801819F4(void) { \ + register s32 v0 __asm__("$2"); \ + register u16 v1 __asm__("$3"); \ + v0 = 0x64; \ + D_80126954 = v0; \ + v0 = 0x190; \ + D_8012695C = v0; \ + v0 = 0x155; \ + D_80126968 = v0; \ + v0 = 0x800; \ + D_8012696A = v0; \ + v0 = -0x80; \ + D_80126978 = v0; \ + v0 = 0xC8; \ + v1 = D_80126B5E; \ + D_8012696C = 0; \ + D_80126976 = 0; \ + D_8012697A = v0; \ + D_801269E4 = 0; \ + D_801269E8 = 0; \ + D_801274E8 = v1; \ + func_8012A018((s32)&func_80181D2C, 0x2); \ + } + #endif