mirror/BFM-decomp
1
0
Fork 0
mirror of https://github.com/Druthulu/BFM-decomp synced 2026-09-26 21:36:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Drew T
2026-08-12 12:56:05 -06:00
parent 2f5063a707
commit e766ed4d71
3 changed files with 232 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ov_SC04_002/ov_SC04_002_jr_8017BEBC.c
+80 -3
View File
@@ -626,7 +626,6 @@ extern s32 func_8014F4C0();
extern s32 func_8014F468(void);
extern int func_8014F74C();
extern int func_8014F6F4(void);
extern u8 D_800D3918[];
extern s32 D_801152BC;
extern int func_8014F74C(s32 arg0);
extern s32 func_8014FA70(s32 a0);
@@ -6196,10 +6195,13 @@ extern void func_8012C218(void *a0);
extern s32 D_801A91FC;
extern s32 D_801A9208;
extern u8 D_800D3918[];
extern s32 D_80126D50;
void func_801841D8(s32 param_1) {
/* [T51] scoped in from file scope: a file-scope decl of these symbols constrains every
LATER function in this TU, which blocks a byte-true decl of a different type.
Declaration-only move (cookbook §103); the whole-binary byte-gate is the arbiter. */
extern u8 D_800D3918[];
s32 s0 = param_1;
s32 v;
@@ -6652,7 +6654,82 @@ extern void func_8012A828(s32, void*);
}
INCLUDE_ASM("asm/ov_SC04_002/nonmatchings/ov_SC04_002_jr_8017BEBC", func_80185DA8);
/* Layout-identical to `struct S80190C84` (src/shared/engine_types.h:1337), which IS
* visible in the destination TU via ../shared/engine_core.h; a fresh tag is used here
* only so the standalone match_one compile (no engine_core.h on its -I path) works. */
typedef struct { s16 f0, f2, f4, f6, f8, fA, fC, fE; s32 f10; } St_80182784_80185DA8;
extern void ApplyMatrixSV(void *a0, void *a1, void *a2);
extern void func_8012EC04(s32 param_1, s32 param_2, s32 *param_3);
extern void func_8012F14C(s32 a0, s32 a1, s32 a2);
extern s32 func_8012C51C(void *a0, s32 a1);
extern void func_8012C218(void *a0);
extern void func_8012A828(s32 a0, void *a1);
extern void func_8012B23C(s32 a0);
extern s32 func_80013350(s32 a0, void *a1);
extern void func_8001C924(s32 a0, void *a1);
extern s32 func_80186544(s32 a0);
void func_80185DA8(s32 a0) {
extern u8 D_800D3918[];
extern short D_801BDCD0;
extern u8 D_801B765C[];
extern u8 D_801B500C[];
extern u8 D_801B7624[];
extern u8 D_801BD950[];
St_80182784_80185DA8 s;
s32 buf[8];
u16 out[4];
u16 sv[4];
s32 temp;
if (*(s32 *)(a0 + 0x94) == 6) {
sv[1] = 0;
sv[0] = 0;
sv[2] = 0x20;
ApplyMatrixSV((void *)(*(s32 *)(a0 + 0x20) + 0x34), sv, sv);
func_8012EC04(a0, 7, buf);
((void (*)(s32 *, u8 *, u16 *))func_8012F14C)(buf, D_800D3918, out);
s.f0 = out[0] + sv[0];
s.f2 = out[1];
s.f4 = out[2] + sv[2];
s.f6 = 0x1FA;
s.f8 = 0;
s.fA = 0;
s.fC = 0x7FFF;
s.fE = *(u16 *)(*(s32 *)(a0 + 0x20) + 0x12);
s.f10 = 0;
temp = func_8012C51C(&s, a0);
*(s32 *)(a0 + 0xCC) = temp;
if (temp != 0) {
func_8001C924(*(s32 *)(a0 + 0x20), D_801B765C);
func_8012A828(a0, D_801B500C);
*(s32 *)(a0 + 0xE0) |= 1;
}
}
if (*(s32 *)(a0 + 0xE0) & 1) {
if (*(s32 *)(a0 + 0xE0) & 2) {
if (func_80013350(a0 + 4, (void *)(*(s32 *)(a0 + 0xCC) + 4)) < 0x1801) {
func_8012C218(*(void **)(a0 + 0xCC));
func_8001C924(*(s32 *)(a0 + 0x20), D_801B7624);
func_8012A828(a0, &D_801BDCD0);
*(s32 *)(a0 + 0x94) = 7;
*(s32 *)(a0 + 0xCC) = 0;
*(s32 *)(a0 + 0xE0) &= ~3;
}
}
}
if (*(s32 *)(a0 + 0x90) == (s32)&D_801BDCD0 && (*(u16 *)(a0 + 0x72) & 0x4000)) {
func_8012A828(a0, D_801BD950);
*(s16 *)(a0 + 0x2) = 2;
func_8012B23C(a0);
func_80186544(a0);
}
}
INCLUDE_ASM("asm/ov_SC04_002/nonmatchings/ov_SC04_002_jr_8017BEBC", func_80185F98);
src/ov_SC04_005/ov_SC04_005_jr_8017BEBC.c
+76 -2
View File
@@ -626,7 +626,6 @@ extern s32 func_8014F4C0();
extern s32 func_8014F468(void);
extern int func_8014F74C();
extern int func_8014F6F4(void);
extern u8 D_800D3918[];
extern s32 D_801152BC;
extern int func_8014F74C(s32 arg0);
extern s32 func_8014FA70(s32 a0);
@@ -6913,7 +6912,82 @@ extern void func_8012A828(s32 a0, s32 a1);
}
INCLUDE_ASM("asm/ov_SC04_005/nonmatchings/ov_SC04_005_jr_8017BEBC", func_80185178);
/* Layout-identical to `struct S80190C84` (src/shared/engine_types.h:1337), which IS
* visible in the destination TU via ../shared/engine_core.h; a fresh tag is used here
* only so the standalone match_one compile (no engine_core.h on its -I path) works. */
typedef struct { s16 f0, f2, f4, f6, f8, fA, fC, fE; s32 f10; } St_80182784_80185178;
extern void ApplyMatrixSV(void *a0, void *a1, void *a2);
extern void func_8012EC04(s32 param_1, s32 param_2, s32 *param_3);
extern void func_8012F14C(s32 a0, s32 a1, s32 a2);
extern s32 func_8012C51C(void *a0, s32 a1);
extern void func_8012C218(void *a0);
extern void func_8012A828(s32, s32);
extern void func_8012B23C(s32 a0);
extern s32 func_80013350(s32 a0, void *a1);
extern void func_8001C924(s32 a0, void *a1);
extern s32 func_80185914(s32 a0);
void func_80185178(s32 a0) {
extern u8 D_800D3918[];
extern short D_801BE75C;
extern u8 D_801B80E8[];
extern u8 D_801B5A98[];
extern u8 D_801B80B0[];
extern u8 D_801BE3DC[];
St_80182784_80185178 s;
s32 buf[8];
u16 out[4];
u16 sv[4];
s32 temp;
if (*(s32 *)(a0 + 0x94) == 6) {
sv[1] = 0;
sv[0] = 0;
sv[2] = 0x20;
ApplyMatrixSV((void *)(*(s32 *)(a0 + 0x20) + 0x34), sv, sv);
func_8012EC04(a0, 7, buf);
((void (*)(s32 *, u8 *, u16 *))func_8012F14C)(buf, D_800D3918, out);
s.f0 = out[0] + sv[0];
s.f2 = out[1];
s.f4 = out[2] + sv[2];
s.f6 = 0x1FA;
s.f8 = 0;
s.fA = 0;
s.fC = 0x7FFF;
s.fE = *(u16 *)(*(s32 *)(a0 + 0x20) + 0x12);
s.f10 = 0;
temp = func_8012C51C(&s, a0);
*(s32 *)(a0 + 0xCC) = temp;
if (temp != 0) {
func_8001C924(*(s32 *)(a0 + 0x20), D_801B80E8);
((void (*)(s32, void *))func_8012A828)(a0, D_801B5A98);
*(s32 *)(a0 + 0xE0) |= 1;
}
}
if (*(s32 *)(a0 + 0xE0) & 1) {
if (*(s32 *)(a0 + 0xE0) & 2) {
if (func_80013350(a0 + 4, (void *)(*(s32 *)(a0 + 0xCC) + 4)) < 0x1801) {
func_8012C218(*(void **)(a0 + 0xCC));
func_8001C924(*(s32 *)(a0 + 0x20), D_801B80B0);
((void (*)(s32, void *))func_8012A828)(a0, &D_801BE75C);
*(s32 *)(a0 + 0x94) = 7;
*(s32 *)(a0 + 0xCC) = 0;
*(s32 *)(a0 + 0xE0) &= ~3;
}
}
}
if (*(s32 *)(a0 + 0x90) == (s32)&D_801BE75C && (*(u16 *)(a0 + 0x72) & 0x4000)) {
((void (*)(s32, void *))func_8012A828)(a0, D_801BE3DC);
*(s16 *)(a0 + 0x2) = 2;
func_8012B23C(a0);
func_80185914(a0);
}
}
INCLUDE_ASM("asm/ov_SC04_005/nonmatchings/ov_SC04_005_jr_8017BEBC", func_80185368);
src/ov_SC04_007/ov_SC04_007_jr_8017BEBC.c
+76 -2
View File
@@ -627,7 +627,6 @@ extern s32 func_8014F4C0();
extern s32 func_8014F468(void);
extern int func_8014F74C();
extern int func_8014F6F4(void);
extern u8 D_800D3918[];
extern s32 D_801152BC;
extern int func_8014F74C(s32 arg0);
extern s32 func_8014FA70(s32 a0);
@@ -5726,7 +5725,82 @@ extern void func_8012A828(s32 a0, s32 a1);
}
INCLUDE_ASM("asm/ov_SC04_007/nonmatchings/ov_SC04_007_jr_8017BEBC", func_801817E4);
/* Layout-identical to `struct S80190C84` (src/shared/engine_types.h:1337), which IS
* visible in the destination TU via ../shared/engine_core.h; a fresh tag is used here
* only so the standalone match_one compile (no engine_core.h on its -I path) works. */
typedef struct { s16 f0, f2, f4, f6, f8, fA, fC, fE; s32 f10; } St_80182784_801817E4;
extern void ApplyMatrixSV(void *a0, void *a1, void *a2);
extern void func_8012EC04(s32 param_1, s32 param_2, s32 *param_3);
extern void func_8012F14C(s32 a0, s32 a1, s32 a2);
extern s32 func_8012C51C(void *a0, s32 a1);
extern void func_8012C218(void *a0);
extern void func_8012A828(s32, s32);
extern void func_8012B23C(s32 a0);
extern s32 func_80013350(s32 a0, void *a1);
extern void func_8001C924(s32 a0, void *a1);
extern s32 func_80181F80(s32 a0);
void func_801817E4(s32 a0) {
extern u8 D_800D3918[];
extern short D_801A0E04;
extern u8 D_8019A790[];
extern u8 D_80198140[];
extern u8 D_8019A758[];
extern u8 D_801A0A84[];
St_80182784_801817E4 s;
s32 buf[8];
u16 out[4];
u16 sv[4];
s32 temp;
if (*(s32 *)(a0 + 0x94) == 6) {
sv[1] = 0;
sv[0] = 0;
sv[2] = 0x20;
ApplyMatrixSV((void *)(*(s32 *)(a0 + 0x20) + 0x34), sv, sv);
func_8012EC04(a0, 7, buf);
((void (*)(s32 *, u8 *, u16 *))func_8012F14C)(buf, D_800D3918, out);
s.f0 = out[0] + sv[0];
s.f2 = out[1];
s.f4 = out[2] + sv[2];
s.f6 = 0x1FA;
s.f8 = 0;
s.fA = 0;
s.fC = 0x7FFF;
s.fE = *(u16 *)(*(s32 *)(a0 + 0x20) + 0x12);
s.f10 = 0;
temp = func_8012C51C(&s, a0);
*(s32 *)(a0 + 0xCC) = temp;
if (temp != 0) {
func_8001C924(*(s32 *)(a0 + 0x20), D_8019A790);
((void (*)(s32, void *))func_8012A828)(a0, D_80198140);
*(s32 *)(a0 + 0xE0) |= 1;
}
}
if (*(s32 *)(a0 + 0xE0) & 1) {
if (*(s32 *)(a0 + 0xE0) & 2) {
if (func_80013350(a0 + 4, (void *)(*(s32 *)(a0 + 0xCC) + 4)) < 0x1801) {
func_8012C218(*(void **)(a0 + 0xCC));
func_8001C924(*(s32 *)(a0 + 0x20), D_8019A758);
((void (*)(s32, void *))func_8012A828)(a0, &D_801A0E04);
*(s32 *)(a0 + 0x94) = 7;
*(s32 *)(a0 + 0xCC) = 0;
*(s32 *)(a0 + 0xE0) &= ~3;
}
}
}
if (*(s32 *)(a0 + 0x90) == (s32)&D_801A0E04 && (*(u16 *)(a0 + 0x72) & 0x4000)) {
((void (*)(s32, void *))func_8012A828)(a0, D_801A0A84);
*(s16 *)(a0 + 0x2) = 2;
func_8012B23C(a0);
func_80181F80(a0);
}
}
INCLUDE_ASM("asm/ov_SC04_007/nonmatchings/ov_SC04_007_jr_8017BEBC", func_801819D4);