mirror/BFM-decomp
1
0
Fork 0
mirror of https://github.com/Druthulu/BFM-decomp synced 2026-10-04 08:21:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

feat(phase-30 S48-T6): propagate func_80183834 to its zero-crack siblings

Browse Source
This commit is contained in:
Drew T
2026-08-12 18:27:17 -06:00
parent 9066ffcd06
commit a4fafab85e
5 changed files with 174 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ov_SC02_000/ov_SC02_000_jr_80180D6C.c
+83 -1
View File
@@ -2986,7 +2986,89 @@ void func_80180D6C(s32 param_1) {
*(s32 *)(param_1 + 0x2c) = *(s16 *)(param_1 + 0xe);
}
INCLUDE_ASM("asm/ov_SC02_000/nonmatchings/ov_SC02_000_jr_80180D6C", func_8018127C);
extern void func_8017F950(void);
extern s32 D_801270D8;
extern s16 D_8018E6CC;
extern s16 D_8018E6D0;
extern s32 ratan2(s32, s32);
extern s32 rand(void);
extern void func_8012B2CC(s32 a0);
extern void func_8012B23C(s32 a0);
extern void func_8012B14C(s32 a0, s32 a1);
extern void func_8012A828(s32 a0, void *a1);
extern u8 D_8018E718[];
extern u8 D_801A68A4[];
extern void (*D_8018E9C4[])();
extern s32 func_8012C044(s32 a0);
extern void func_8012C098(void);
extern void func_8012C218(void *a0);
extern s32 D_801270CC;
void func_8018127C(s32 param_1) {
s32 obj;
s32 ang;
u16 t;
if ((*(u16 *)(param_1 + 0x5C) & 1) != 0) {
func_8017F950();
}
if ((*(u16 *)(param_1 + 0x70) & 0x400) != 0 && D_801270D8 != 0 &&
*(u16 *)(param_1 + 0x2) != 0xA) {
*(u16 *)(param_1 + 0x2) = 0xA;
*(u16 *)(param_1 + 0x98) = 0;
*(s32 *)(param_1 + 0x1C) = 0x3C;
*(u16 *)(param_1 + 0x5C) = 0;
*(u16 *)(*(s32 *)(param_1 + 0x20) + 0x12) =
((((ratan2(*(s16 *)(param_1 + 0xE) - D_8018E6D0,
D_8018E6CC - *(s16 *)(param_1 + 0x6)) -
0x400) &
0xFFF) +
0x800) &
0xFFF);
if (*(s16 *)(param_1 + 0x6) > 0x180) {
obj = *(s32 *)(param_1 + 0x20);
ang = *(s16 *)(obj + 0x12);
*(u16 *)(obj + 0x12) = (rand() & 1) ? ang - 0x400 : ang + 0x400;
}
func_8012B2CC(param_1);
func_8012B23C(param_1);
func_8012B14C(param_1, (s32)&D_8018E718);
func_8012A828(param_1, &D_801A68A4);
}
if (*(u16 *)param_1 != 0x2F) {
return;
}
D_8018E9C4[*(u16 *)(param_1 + 0x2)](param_1);
*(u16 *)(param_1 + 0xDE) = *(u16 *)(param_1 + 0xDE) + 1;
t = *(u16 *)(param_1 + 0x86);
if (t != 0) {
*(u16 *)(param_1 + 0x86) = t - 1;
if (*(u16 *)(param_1 + 0x86) != 0) {
return;
}
}
if (func_8012C044(param_1) == 0) {
return;
}
switch ((s32)((u32)*(u16 *)(param_1 + 0x70) << 0x10) >> 0x18) {
case 0:
case 1:
case 2:
case 5:
case 6:
((void (*)(s32))func_8012C098)(param_1);
return;
case 3:
case 7:
((void (*)(s32))func_8012C218)(param_1);
return;
case 4:
D_801270CC = D_801270CC - 1;
((void (*)(s32))func_8012C218)(param_1);
return;
}
}
extern void func_8012E364(void);
void func_80181498(void) {
src/ov_SC02_003/ov_SC02_003_jr_80180D6C.c
+83 -1
View File
@@ -2986,7 +2986,89 @@ void func_80180D6C(s32 param_1) {
*(s32 *)(param_1 + 0x2c) = *(s16 *)(param_1 + 0xe);
}
INCLUDE_ASM("asm/ov_SC02_003/nonmatchings/ov_SC02_003_jr_80180D6C", func_8018127C);
extern void func_8017F950(void);
extern s32 D_801270D8;
extern s16 D_8018E6CC;
extern s16 D_8018E6D0;
extern s32 ratan2(s32, s32);
extern s32 rand(void);
extern void func_8012B2CC(s32 a0);
extern void func_8012B23C(s32 a0);
extern void func_8012B14C(s32 a0, s32 a1);
extern void func_8012A828(s32 a0, void *a1);
extern u8 D_8018E718[];
extern u8 D_801A68A4[];
extern void (*D_8018E9C4[])();
extern s32 func_8012C044(s32 a0);
extern void func_8012C098(void);
extern void func_8012C218(void *a0);
extern s32 D_801270CC;
void func_8018127C(s32 param_1) {
s32 obj;
s32 ang;
u16 t;
if ((*(u16 *)(param_1 + 0x5C) & 1) != 0) {
func_8017F950();
}
if ((*(u16 *)(param_1 + 0x70) & 0x400) != 0 && D_801270D8 != 0 &&
*(u16 *)(param_1 + 0x2) != 0xA) {
*(u16 *)(param_1 + 0x2) = 0xA;
*(u16 *)(param_1 + 0x98) = 0;
*(s32 *)(param_1 + 0x1C) = 0x3C;
*(u16 *)(param_1 + 0x5C) = 0;
*(u16 *)(*(s32 *)(param_1 + 0x20) + 0x12) =
((((ratan2(*(s16 *)(param_1 + 0xE) - D_8018E6D0,
D_8018E6CC - *(s16 *)(param_1 + 0x6)) -
0x400) &
0xFFF) +
0x800) &
0xFFF);
if (*(s16 *)(param_1 + 0x6) > 0x180) {
obj = *(s32 *)(param_1 + 0x20);
ang = *(s16 *)(obj + 0x12);
*(u16 *)(obj + 0x12) = (rand() & 1) ? ang - 0x400 : ang + 0x400;
}
func_8012B2CC(param_1);
func_8012B23C(param_1);
func_8012B14C(param_1, (s32)&D_8018E718);
func_8012A828(param_1, &D_801A68A4);
}
if (*(u16 *)param_1 != 0x2F) {
return;
}
D_8018E9C4[*(u16 *)(param_1 + 0x2)](param_1);
*(u16 *)(param_1 + 0xDE) = *(u16 *)(param_1 + 0xDE) + 1;
t = *(u16 *)(param_1 + 0x86);
if (t != 0) {
*(u16 *)(param_1 + 0x86) = t - 1;
if (*(u16 *)(param_1 + 0x86) != 0) {
return;
}
}
if (func_8012C044(param_1) == 0) {
return;
}
switch ((s32)((u32)*(u16 *)(param_1 + 0x70) << 0x10) >> 0x18) {
case 0:
case 1:
case 2:
case 5:
case 6:
((void (*)(s32))func_8012C098)(param_1);
return;
case 3:
case 7:
((void (*)(s32))func_8012C218)(param_1);
return;
case 4:
D_801270CC = D_801270CC - 1;
((void (*)(s32))func_8012C218)(param_1);
return;
}
}
extern void func_8012E364(void);
void func_80181498(void) {