mirror/BFM-decomp
1
0
Fork 0
mirror of https://github.com/Druthulu/BFM-decomp synced 2026-10-02 07:59:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

feat(phase-30 S49): propagate func_80183838 to its cousins (wave 7a)

Browse Source
This commit is contained in:
Drew T
2026-08-13 06:52:50 -06:00
parent a27518e730
commit dabd2d4cb7
4 changed files with 35 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/dedup.us.yaml
+7
View File
@@ -14313,3 +14313,10 @@ groups:
func: DEFINE_func_8017CF60
vram: 0x8017CF60
binaries: [ov_SC04_003, ov_SC04_006]
- id: E_func_80183838
tier: h_exact
hash: 66d459f2aad2b59f0e4e669da35014ddf56f0f4e
source: src/shared/engine_core.h
func: DEFINE_func_80183838
vram: 0x80183838
binaries: [ov_SC04_018, ov_SC04_019]
src/ov_SC04_018/ov_SC04_018_jr_8017AE2C.c
+1 -12
View File
@@ -6648,18 +6648,7 @@ INCLUDE_ASM("asm/ov_SC04_018/nonmatchings/ov_SC04_018_jr_8017AE2C", func_801837A
INCLUDE_ASM("asm/ov_SC04_018/nonmatchings/ov_SC04_018_jr_8017AE2C", func_801837EC);
extern s32 func_80184BAC(s32 a0, s32 a1);
extern void func_80184CB8(s32*, s32);
extern short D_80192030;
void func_80183838(s32 *a0) {
*(s32 *)((s32)a0[0x33] + 0xB0) = 2;
if (func_80184BAC(0xC, 0x14) != 0) {
return;
}
*(short *)((char *)a0 + 0x2) = 1;
((void (*)(s32 *, void *))func_80184CB8)(a0, (void *)&(*(s32 *)&D_80192030));
}
DEFINE_func_80183838() /* dedup: shared engine-core @0x80183838 (src/shared) */
INCLUDE_ASM("asm/ov_SC04_018/nonmatchings/ov_SC04_018_jr_8017AE2C", func_80183890);
src/ov_SC04_019/ov_SC04_019_jr_8017AE2C.c
+1 -1
View File
@@ -6594,7 +6594,7 @@ INCLUDE_ASM("asm/ov_SC04_019/nonmatchings/ov_SC04_019_jr_8017AE2C", func_801837A
INCLUDE_ASM("asm/ov_SC04_019/nonmatchings/ov_SC04_019_jr_8017AE2C", func_801837EC);
INCLUDE_ASM("asm/ov_SC04_019/nonmatchings/ov_SC04_019_jr_8017AE2C", func_80183838);
DEFINE_func_80183838() /* dedup: shared engine-core @0x80183838 (src/shared) */
INCLUDE_ASM("asm/ov_SC04_019/nonmatchings/ov_SC04_019_jr_8017AE2C", func_80183890);
src/shared/engine_core.h
+26
View File
@@ -57055,6 +57055,19 @@
return 0; \
}
#define DEFINE_func_80183838() \
extern s32 func_80184BAC(s32 a0, s32 a1); \
extern void func_80184CB8(s32*, s32); \
extern short D_80192030; \
void func_80183838(s32 *a0) { \
*(s32 *)((s32)a0[0x33] + 0xB0) = 2; \
if (func_80184BAC(0xC, 0x14) != 0) { \
return; \
} \
*(short *)((char *)a0 + 0x2) = 1; \
((void (*)(s32 *, void *))func_80184CB8)(a0, (void *)&(*(s32 *)&D_80192030)); \
}
#endif
#define DEFINE_func_80128EA8() \
@@ -143515,4 +143528,17 @@
return 0; \
}
#define DEFINE_func_80183838() \
extern s32 func_80184BAC(s32 a0, s32 a1); \
extern void func_80184CB8(s32*, s32); \
extern short D_80192030; \
void func_80183838(s32 *a0) { \
*(s32 *)((s32)a0[0x33] + 0xB0) = 2; \
if (func_80184BAC(0xC, 0x14) != 0) { \
return; \
} \
*(short *)((char *)a0 + 0x2) = 1; \
((void (*)(s32 *, void *))func_80184CB8)(a0, (void *)&(*(s32 *)&D_80192030)); \
}
#endif