diff --git a/config/dedup.us.yaml b/config/dedup.us.yaml index bb567fc2f7..0ec98d1898 100644 --- a/config/dedup.us.yaml +++ b/config/dedup.us.yaml @@ -14817,3 +14817,10 @@ groups: func: DEFINE_func_8018B614 vram: 0x8018B614 binaries: [ov_SC04_018, ov_SC04_019] + - id: E_func_8018C1E0 + tier: h_exact + hash: 5fb4815cc3aa53413cfb656da14781076dd0fb9c + source: src/shared/engine_core.h + func: DEFINE_func_8018C1E0 + vram: 0x8018C1E0 + 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 55e2b7696e..40f94ea22c 100644 --- a/src/ov_SC04_018/ov_SC04_018_jr_80188E1C.c +++ b/src/ov_SC04_018/ov_SC04_018_jr_80188E1C.c @@ -4752,21 +4752,7 @@ INCLUDE_ASM("asm/ov_SC04_018/nonmatchings/ov_SC04_018_jr_80188E1C", func_8018C11 #include "common.h" -extern s32 aF801848DC(void *) __asm__("func_801848DC"); -extern s32 func_80178BF8(); /* TU-canonical (ov_SC04_018_jr_8017AE2C.c L2539) */ -extern void func_80172710(void); /* TU-canonical (ov_SC04_018_jr_8017AE2C.c L2231) */ - -s32 func_8018C1E0(void *a0) { - if (*(u16 *)(*(s32 *)((s32)a0 + 0x64) + 0x2) != 3) { - return 0; - } - if (aF801848DC(a0) == 0) { - return 0; - } - *(s16 *)(*(s32 *)((s32)a0 + 0x64) + 0x2) = 4; - func_80178BF8(); - return (s32)func_80172710; -} +DEFINE_func_8018C1E0() /* dedup: shared engine-core @0x8018C1E0 (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 8120934e86..7c7330e639 100644 --- a/src/ov_SC04_019/ov_SC04_019_jr_80188E1C.c +++ b/src/ov_SC04_019/ov_SC04_019_jr_80188E1C.c @@ -4159,7 +4159,7 @@ INCLUDE_ASM("asm/ov_SC04_019/nonmatchings/ov_SC04_019_jr_80188E1C", func_8018C0B INCLUDE_ASM("asm/ov_SC04_019/nonmatchings/ov_SC04_019_jr_80188E1C", func_8018C114); -INCLUDE_ASM("asm/ov_SC04_019/nonmatchings/ov_SC04_019_jr_80188E1C", func_8018C1E0); +DEFINE_func_8018C1E0() /* dedup: shared engine-core @0x8018C1E0 (src/shared) */ extern void func_80184CB8(s32*, s32); diff --git a/src/shared/engine_core.h b/src/shared/engine_core.h index 8551189ae6..fa1768d09d 100644 --- a/src/shared/engine_core.h +++ b/src/shared/engine_core.h @@ -61008,6 +61008,22 @@ func_8018B564(a0); \ } +#define DEFINE_func_8018C1E0() \ + extern s32 aF801848DC(void *) __asm__("func_801848DC"); \ + extern s32 func_80178BF8(); /* TU-canonical (ov_SC04_018_jr_8017AE2C.c L2539) */ \ + extern void func_80172710(void); /* TU-canonical (ov_SC04_018_jr_8017AE2C.c L2231) */ \ + s32 func_8018C1E0(void *a0) { \ + if (*(u16 *)(*(s32 *)((s32)a0 + 0x64) + 0x2) != 3) { \ + return 0; \ + } \ + if (aF801848DC(a0) == 0) { \ + return 0; \ + } \ + *(s16 *)(*(s32 *)((s32)a0 + 0x64) + 0x2) = 4; \ + func_80178BF8(); \ + return (s32)func_80172710; \ + } + #endif #define DEFINE_func_80128EA8() \ @@ -151421,4 +151437,20 @@ func_8018B564(a0); \ } +#define DEFINE_func_8018C1E0() \ + extern s32 aF801848DC(void *) __asm__("func_801848DC"); \ + extern s32 func_80178BF8(); /* TU-canonical (ov_SC04_018_jr_8017AE2C.c L2539) */ \ + extern void func_80172710(void); /* TU-canonical (ov_SC04_018_jr_8017AE2C.c L2231) */ \ + s32 func_8018C1E0(void *a0) { \ + if (*(u16 *)(*(s32 *)((s32)a0 + 0x64) + 0x2) != 3) { \ + return 0; \ + } \ + if (aF801848DC(a0) == 0) { \ + return 0; \ + } \ + *(s16 *)(*(s32 *)((s32)a0 + 0x64) + 0x2) = 4; \ + func_80178BF8(); \ + return (s32)func_80172710; \ + } + #endif