diff --git a/config/dedup.us.yaml b/config/dedup.us.yaml index 1da7c437e..5baae8ba3 100644 --- a/config/dedup.us.yaml +++ b/config/dedup.us.yaml @@ -14901,3 +14901,10 @@ groups: func: DEFINE_func_801819F4 vram: 0x801819F4 binaries: [ov_SC02_000, ov_SC02_003] + - id: E_func_80182894 + tier: h_exact + hash: d93adf008748ca6b275a216340a891f177d49eb4 + source: src/shared/engine_core.h + func: DEFINE_func_80182894 + vram: 0x80182894 + 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 b0d36637b..ef27a898d 100644 --- a/src/ov_SC02_000/ov_SC02_000_jr_8018173C.c +++ b/src/ov_SC02_000/ov_SC02_000_jr_8018173C.c @@ -3115,35 +3115,7 @@ INCLUDE_ASM("asm/ov_SC02_000/nonmatchings/ov_SC02_000_jr_8018173C", func_8018285 -extern Blk8 D_801E6C7C; -extern s32 D_8018EAE8; -extern s32 D_8018ECF0; - -extern s32 func_80171CC4(void *a0, void *a1); -extern void func_8014BB0C(void); -extern void func_8014BDC8(void); -extern void func_8014BEC0(void); -extern void func_80154274(s32 *a0, s32 a1); -extern void func_80154B4C(u8 *a0, s32 a1); -extern s32 func_80146A6C(s32 a0, void *a1, s32 a2, s32 a3, s32 a4, s32 a5, s32 a6); - -void func_80182894(void *a0) { - Blk8 buffer; - s32 *v0; - - buffer = D_801E6C7C; - if (func_80171CC4(a0, (void *)&buffer)) { - func_8014BB0C(); - func_8014BDC8(); - ((void (*)(void *))func_8014BEC0)(a0); - v0 = (s32 *)a0; - func_80154274(v0, (s32)&D_8018EAE8); - func_80154B4C((u8 *)a0, (s32)&D_8018ECF0); - func_80146A6C(0x18, a0, 0, 0, 0, 0, 0); - *(u8 *)((s32)a0 + 0x4D) += 1; - *(u8 *)((s32)a0 + 0x214) += 1; - } -} +DEFINE_func_80182894() /* dedup: shared engine-core @0x80182894 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_000/nonmatchings/ov_SC02_000_jr_8018173C", func_80182964); 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 5450d6b79..ccdf763fb 100644 --- a/src/ov_SC02_003/ov_SC02_003_jr_8018173C.c +++ b/src/ov_SC02_003/ov_SC02_003_jr_8018173C.c @@ -2968,7 +2968,7 @@ INCLUDE_ASM("asm/ov_SC02_003/nonmatchings/ov_SC02_003_jr_8018173C", func_801827C INCLUDE_ASM("asm/ov_SC02_003/nonmatchings/ov_SC02_003_jr_8018173C", func_80182854); -INCLUDE_ASM("asm/ov_SC02_003/nonmatchings/ov_SC02_003_jr_8018173C", func_80182894); +DEFINE_func_80182894() /* dedup: shared engine-core @0x80182894 (src/shared) */ INCLUDE_ASM("asm/ov_SC02_003/nonmatchings/ov_SC02_003_jr_8018173C", func_80182964); diff --git a/src/shared/engine_core.h b/src/shared/engine_core.h index 7ff004d30..3dd908e6a 100644 --- a/src/shared/engine_core.h +++ b/src/shared/engine_core.h @@ -61287,6 +61287,34 @@ func_8012A018((s32)&func_80181D2C, 0x2); \ } +#define DEFINE_func_80182894() \ + extern Blk8 D_801E6C7C; \ + extern s32 D_8018EAE8; \ + extern s32 D_8018ECF0; \ + extern s32 func_80171CC4(void *a0, void *a1); \ + extern void func_8014BB0C(void); \ + extern void func_8014BDC8(void); \ + extern void func_8014BEC0(void); \ + extern void func_80154274(s32 *a0, s32 a1); \ + extern void func_80154B4C(u8 *a0, s32 a1); \ + extern s32 func_80146A6C(s32 a0, void *a1, s32 a2, s32 a3, s32 a4, s32 a5, s32 a6); \ + void func_80182894(void *a0) { \ + Blk8 buffer; \ + s32 *v0; \ + buffer = D_801E6C7C; \ + if (func_80171CC4(a0, (void *)&buffer)) { \ + func_8014BB0C(); \ + func_8014BDC8(); \ + ((void (*)(void *))func_8014BEC0)(a0); \ + v0 = (s32 *)a0; \ + func_80154274(v0, (s32)&D_8018EAE8); \ + func_80154B4C((u8 *)a0, (s32)&D_8018ECF0); \ + func_80146A6C(0x18, a0, 0, 0, 0, 0, 0); \ + *(u8 *)((s32)a0 + 0x4D) += 1; \ + *(u8 *)((s32)a0 + 0x214) += 1; \ + } \ + } + #endif #define DEFINE_func_80128EA8() \ @@ -151979,4 +152007,32 @@ func_8012A018((s32)&func_80181D2C, 0x2); \ } +#define DEFINE_func_80182894() \ + extern Blk8 D_801E6C7C; \ + extern s32 D_8018EAE8; \ + extern s32 D_8018ECF0; \ + extern s32 func_80171CC4(void *a0, void *a1); \ + extern void func_8014BB0C(void); \ + extern void func_8014BDC8(void); \ + extern void func_8014BEC0(void); \ + extern void func_80154274(s32 *a0, s32 a1); \ + extern void func_80154B4C(u8 *a0, s32 a1); \ + extern s32 func_80146A6C(s32 a0, void *a1, s32 a2, s32 a3, s32 a4, s32 a5, s32 a6); \ + void func_80182894(void *a0) { \ + Blk8 buffer; \ + s32 *v0; \ + buffer = D_801E6C7C; \ + if (func_80171CC4(a0, (void *)&buffer)) { \ + func_8014BB0C(); \ + func_8014BDC8(); \ + ((void (*)(void *))func_8014BEC0)(a0); \ + v0 = (s32 *)a0; \ + func_80154274(v0, (s32)&D_8018EAE8); \ + func_80154B4C((u8 *)a0, (s32)&D_8018ECF0); \ + func_80146A6C(0x18, a0, 0, 0, 0, 0, 0); \ + *(u8 *)((s32)a0 + 0x4D) += 1; \ + *(u8 *)((s32)a0 + 0x214) += 1; \ + } \ + } + #endif