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

feat(decomp): worker gate — +2 fns x0 propagated (fleet 95.2%)

Browse Source
This commit is contained in:
Drew T
2026-08-14 04:11:28 -06:00
parent 41eccd062e
commit 4651e70e1e
1 changed files with 104 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ov_SC06_024/ov_SC06_024_jr_80186F00.c
+104 -2
View File
@@ -4180,7 +4180,65 @@ void func_8018906C(s32 p) {
}
INCLUDE_ASM("asm/ov_SC06_024/nonmatchings/ov_SC06_024_jr_80186F00", func_80189108);
extern SVECTOR D_801BC570[];
extern s32 func_8012BEE8();
extern s32 func_8012CBF4(s32 a0);
extern s32 *D_80126B78;
extern s32 *D_80126B90;
extern s32 func_80132EF4(s32 a0, s32 a1);
extern s32 func_80135888(s32 a0, s32 a1, s32 a2, s32 a3);
extern s32 func_80146A6C(s32 a0, void *a1, s32 a2, s32 a3, s32 a4, s32 a5, s32 a6);
extern u8 D_801152A8[];
extern void func_80049CAC(s32 a0, s32 a1);
extern void func_8012C218(s32);
extern void func_8012F568(s32 a0, s32 a1, s32 a2, s32 a3, s32 a4, s32 a5);
void func_80189108(s32 param_1)
{
MATRIX mat;
SVECTOR sv;
SVECTOR b;
SVECTOR c;
SVECTOR flag;
s32 iVar;
sv.vx = *(u16 *)(*(s32 *)(param_1 + 0x20) + 0x10);
sv.vy = *(u16 *)(*(s32 *)(param_1 + 0x20) + 0x12);
sv.vz = 0;
func_80049CAC((s32)&sv, (s32)&mat);
gte_SetRotMatrix(&mat);
gte_SetTransMatrix(*(s32 *)(param_1 + 0x20) + 0x34);
RotTransSV(&D_801BC570[0], &b, &flag);
RotTransSV(&D_801BC570[1], &c, &flag);
if (func_80135888((s32)D_80126B78, (s32)D_80126B90, (s32)&b, (s32)&c) != 0) {
s16 sVar1 = *(s16 *)(param_1 + 0xFE);
func_8012F568(1, 1, sVar1, 0x50, (s32)&c, (s32)D_801152A8);
} else {
*(u16 *)(*(s32 *)(param_1 + 0x20) + 0x14) =
*(u16 *)(*(s32 *)(param_1 + 0x20) + 0x14) - 0x100;
iVar = func_8012CBF4(param_1);
if (iVar != 0) {
s16 sVar1 = *(s16 *)(param_1 + 6);
s16 sVar2 = *(s16 *)(param_1 + 0xA);
s16 sVar3 = *(s16 *)(param_1 + 0xE);
func_80146A6C(6, (void *)param_1, sVar1, sVar2, sVar3, 0, 0);
iVar = func_80132EF4(param_1, 0x22);
if (iVar != 0) {
*(u16 *)(iVar + 0x34) = 0x2000;
}
} else {
iVar = func_8012BEE8(param_1);
if (iVar == 0) {
return;
}
}
}
((void (*)(void *))func_8012C218)((void *)param_1);
}
INCLUDE_ASM("asm/ov_SC06_024/nonmatchings/ov_SC06_024_jr_80186F00", func_801892C0);
@@ -6696,7 +6754,51 @@ void func_8018D7EC(s32 a0) {
void func_8018D8DC(void) {
}
INCLUDE_ASM("asm/ov_SC06_024/nonmatchings/ov_SC06_024_jr_80186F00", func_8018D8E4);
extern s32 func_8004787C(s32 a0);
extern s32 func_80047948(s32 a0);
extern void func_8012B370(int a0);
void func_8018D8E4(s32 a0)
{
register s32 s0 asm("$16") = a0;
register s32 v0 asm("$2");
register s32 v1 asm("$3");
s32 temp;
v0 = *(s16 *)(*(s32 *)(s0 + 0x20) + 0x14);
if (v0 < 0x401) {
v0 = *(u16 *)(s0 + 0xFC);
v1 = *(u16 *)(s0 + 0xFE);
v0 = v0 + 1;
v1 = v1 + v0;
*(u16 *)(s0 + 0xFC) = v0;
*(u16 *)(s0 + 0xFE) = v1;
v0 = *(u16 *)(*(s32 *)(s0 + 0x20) + 0x14);
v0 = v0 + v1;
*(u16 *)(*(s32 *)(s0 + 0x20) + 0x14) = v0;
v0 = *(u16 *)(s0 + 0xA);
v0 = v0 - 4;
*(u16 *)(s0 + 0xA) = v0;
v0 = func_80047948(*(s16 *)(*(s32 *)(s0 + 0x20) + 0x12));
v0 = v0 << 6;
v1 = *(s32 *)(s0 + 0x4);
v1 = v1 + v0;
*(s32 *)(s0 + 0x4) = v1;
v0 = func_8004787C(*(s16 *)(*(s32 *)(s0 + 0x20) + 0x12));
v0 = v0 << 6;
v1 = *(s32 *)(s0 + 0xC);
v1 = v1 - v0;
*(s32 *)(s0 + 0xC) = v1;
} else {
*(u16 *)(s0 + 0x2) = 0x3;
*(s32 *)(s0 + 0x1C) = 0x1E;
*(u16 *)(s0 + 0x98) = 0;
}
func_8012B370(s0);
}
extern void func_8012B370(int a0);