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 S48-0b): jtbl family func_8015C32C — 2/2 blocked-binary siblings banked

Browse Source
This commit is contained in:
Drew T
2026-08-11 16:09:34 -06:00
parent 19fee49f56
commit 58b1d7aeea
5 changed files with 238 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/overlays.mk
+2 -2
View File
@@ -4923,7 +4923,7 @@ build/src/ov_MAIN_012/ov_MAIN_012_jr_8013F350.o: JTBL_PADS := 0,0,4,0,4,0,4 #
build/src/ov_MAIN_012/ov_MAIN_012_jr_801549F8.o: JTBL_PADS := 0,0 # §8e pads (jtbl_carve.py) tables=+0x0,+0x6c
build/src/ov_MAIN_012/ov_MAIN_012_jr_801594E8.o: JTBL_PADS := 0,0 # §8e pads (jtbl_carve.py) tables=+0x0,+0x20
build/src/ov_MAIN_012/ov_MAIN_012_jr_80159C84.o: JTBL_PADS := 0,4 # §8e pads (jtbl_carve.py) tables=+0x0,+0x20
build/src/ov_MAIN_012/ov_MAIN_012_jr_8015A3C8.o: JTBL_PADS := 0,4,4 # §8e pads (jtbl_carve.py) tables=+0x0,+0x20,+0x40
build/src/ov_MAIN_012/ov_MAIN_012_jr_8015A3C8.o: JTBL_PADS := 0,4,4,4 # §8e pads (jtbl_carve.py) tables=+0x0,+0x20,+0x40,+0x60
build/src/ov_MAIN_012/ov_MAIN_012_jr_80171B4C.o: JTBL_PADS := 0,0 # §8e pads (jtbl_carve.py) tables=+0x0,+0x20
build/src/ov_MAIN_012/ov_MAIN_012_jr_801789AC.o: JTBL_PADS := 0,0,0,4,4 # §8e pads (jtbl_carve.py) tables=+0x0,+0x18,+0x190,+0x220,+0x2b0
ov_MAIN_012_CHECK_SHA := config/check.ov_MAIN_012.sha
@@ -4988,7 +4988,7 @@ build/src/ov_SC03_107/ov_SC03_107_jr_8013F350.o: JTBL_PADS := 0,0,4,0,4,0,4 #
build/src/ov_SC03_107/ov_SC03_107_jr_801549F8.o: JTBL_PADS := 0,0 # §8e pads (jtbl_carve.py) tables=+0x0,+0x6c
build/src/ov_SC03_107/ov_SC03_107_jr_801594E8.o: JTBL_PADS := 0,0 # §8e pads (jtbl_carve.py) tables=+0x0,+0x20
build/src/ov_SC03_107/ov_SC03_107_jr_80159C84.o: JTBL_PADS := 0,4 # §8e pads (jtbl_carve.py) tables=+0x0,+0x20
build/src/ov_SC03_107/ov_SC03_107_jr_8015A3C8.o: JTBL_PADS := 0,4,4 # §8e pads (jtbl_carve.py) tables=+0x0,+0x20,+0x40
build/src/ov_SC03_107/ov_SC03_107_jr_8015A3C8.o: JTBL_PADS := 0,4,4,4 # §8e pads (jtbl_carve.py) tables=+0x0,+0x20,+0x40,+0x60
build/src/ov_SC03_107/ov_SC03_107_jr_80171B4C.o: JTBL_PADS := 0,0 # §8e pads (jtbl_carve.py) tables=+0x0,+0x20
build/src/ov_SC03_107/ov_SC03_107_jr_801789AC.o: JTBL_PADS := 0,0,0,4,4,0,0 # §8e pads (jtbl_carve.py) tables=+0x0,+0x18,+0x190,+0x220,+0x2b0,+0x2c4,+0x32c
ov_SC03_107_CHECK_SHA := config/check.ov_SC03_107.sha
config/splat.ov_MAIN_012.yaml
+1 -1
View File
@@ -126,7 +126,7 @@ segments:
- [0x5b730, .rodata, ov_MAIN_012_jr_80159C84] # Phase-26 §8 jtbl-rodata carve (jtbl_carve.py)
- [0x5b764, data, tail8]
- [0x5b768, .rodata, ov_MAIN_012_jr_8015A3C8] # Phase-26 §8 jtbl-rodata carve (jtbl_carve.py)
- [0x5b7c4, data, tail9]
- [0x5b7e4, data, tail9]
- [0x5b81c, .rodata, ov_MAIN_012_jr_8016AE5C] # Phase-26 §8 jtbl-rodata carve (jtbl_carve.py)
- [0x5b83c, data, tail10]
- [0x5b87c, .rodata, ov_MAIN_012_jr_80171B4C] # Phase-26 §8 jtbl-rodata carve (jtbl_carve.py)
config/splat.ov_SC03_107.yaml
+1 -1
View File
@@ -126,7 +126,7 @@ segments:
- [0x71f48, .rodata, ov_SC03_107_jr_80159C84] # Phase-26 §8 jtbl-rodata carve (jtbl_carve.py)
- [0x71f7c, data, tail8]
- [0x71f80, .rodata, ov_SC03_107_jr_8015A3C8] # Phase-26 §8 jtbl-rodata carve (jtbl_carve.py)
- [0x71fdc, data, tail9]
- [0x71ffc, data, tail9]
- [0x72034, .rodata, ov_SC03_107_jr_8016AE5C] # Phase-26 §8 jtbl-rodata carve (jtbl_carve.py)
- [0x72054, data, tail10]
- [0x72094, .rodata, ov_SC03_107_jr_80171B4C] # Phase-26 §8 jtbl-rodata carve (jtbl_carve.py)
src/ov_MAIN_012/ov_MAIN_012_jr_8015A3C8.c
+117 -1
View File
@@ -3194,7 +3194,123 @@ s32 func_8015C128(s32 param_1) {
}
INCLUDE_ASM("asm/ov_MAIN_012/nonmatchings/ov_MAIN_012_jr_8015A3C8", func_8015C32C);
extern void (*D_80180A1C[])(void *);
extern u16 D_800B99DA;
extern s32 func_80149FB0(s32 a0);
extern s32 func_801496D4(void*);
extern void func_80149704(void);
extern s32 func_801619A4(s32*);
extern s32 func_80149AA8(s32*);
extern void func_80149AD4(s32*);
extern s32 func_80149B54(s32*);
extern void func_80149BAC(s32*);
extern s32 func_801498E0(s32*);
extern s32 func_80149954(s32);
extern s32 func_80149A64(s32*);
extern void func_800CCCC0(s32 a0);
extern int func_80148AFC(void *a0);
extern void func_8001382C(s32 a0, void *a1, void *a2);
extern void func_80146DB8(s32 *a0, s32 *a1);
extern void func_80147A84(s32 a0);
extern void func_801473EC(s32*);
extern void func_8014C010(s32 a0, s32 a1);
extern void func_80147324(s32 a0);
extern void func_8014D738(void);
extern void func_8014CC28(s32);
extern s32 func_8014F3E8(s32);
extern s32 func_80146E98(s32 a0);
extern void func_80147078(s32 *a0, s16 a1);
extern s32 func_8015BE94();
extern void func_80159BE4(s32 a0);
extern void func_8015C0C4(s32 a0);
extern void func_8015C6E0(s32*);
void func_8015C32C(s32 arg0) {
s32 iVar2;
u32 uVar4;
s32 vin[4];
s32 vout[4];
func_80149FB0(arg0);
if (((s32 (*)(s32))func_801496D4)(arg0) != 0) {
D_80180A1C[*(u16 *)arg0]((void *)arg0);
((void (*)(s32))func_80149704)(arg0);
return;
}
switch (((s32 (*)(s32))func_801619A4)(arg0)) {
case 0:
case 1:
case 6:
if (((s32 (*)(s32))func_80149AA8)(arg0) != 0) {
D_80180A1C[*(u16 *)arg0]((void *)arg0);
((void (*)(s32))func_80149AD4)(arg0);
return;
}
if (((s32 (*)(s32))func_80149B54)(arg0) != 0) {
D_80180A1C[*(u16 *)arg0]((void *)arg0);
((void (*)(s32))func_80149BAC)(arg0);
return;
}
break;
case 3:
((void (*)(s32))func_801498E0)(arg0);
break;
case 4:
((void (*)(s32))func_80149954)(arg0);
break;
case 5:
if (((s32 (*)(s32))func_80149A64)(arg0) != 0) {
D_80180A1C[*(u16 *)arg0]((void *)arg0);
func_800CCCC0(arg0);
return;
}
}
if ((func_80148AFC((void *)arg0) & 0xff) != 0) {
vin[0] = 0;
vin[1] = 0;
vin[2] = -0x4000;
func_8001382C((s32)*(s16 *)(*(s32 *)(arg0 + 0x20) + 0x12), vin, vout);
*(s32 *)(arg0 + 0x234) += vout[0];
*(s32 *)(arg0 + 0x238) += vout[1];
*(s32 *)(arg0 + 0x23c) += vout[2];
}
func_8001382C((s16)-*(u16 *)(*(s32 *)(arg0 + 0x20) + 0x12), (void *)(arg0 + 0x234), vout);
func_80146DB8((s32 *)arg0, vout);
func_80147A84(arg0);
((void (*)(s32))func_801473EC)(arg0);
if ((D_800B99DA & 3) == 0) {
func_8014C010(arg0, 1);
func_80147324(0x65f);
}
if (((s32 (*)(s32))func_8014D738)(arg0) != 0) {
D_80180A1C[*(u16 *)arg0]((void *)arg0);
((void (*)(s32))func_8015C6E0)(arg0);
return;
}
iVar2 = ((s32 (*)(s32))func_8014CC28)(arg0);
uVar4 = ((u32 (*)(s32))func_8014F3E8)(arg0);
if (uVar4 != 0) {
if ((uVar4 & 0x4000) == 0) {
if (func_80146E98(arg0) != 0) {
D_80180A1C[*(u16 *)arg0]((void *)arg0);
func_80147078((s32 *)arg0, 0);
func_80159BE4(arg0);
}
} else {
func_80147078((s32 *)arg0, 4);
func_8015C0C4(arg0);
}
} else {
if (iVar2 == 0) {
D_80180A1C[*(u16 *)arg0]((void *)arg0);
func_80147078((s32 *)arg0, 3);
((void (*)(s32))func_8015BE94)(arg0);
}
}
}
void func_8015C6A4(void) {
}
src/ov_SC03_107/ov_SC03_107_jr_8015A3C8.c
+117 -1
View File
@@ -3195,7 +3195,123 @@ s32 func_8015C128(s32 param_1) {
}
INCLUDE_ASM("asm/ov_SC03_107/nonmatchings/ov_SC03_107_jr_8015A3C8", func_8015C32C);
extern void (*D_80184B44[])(void *);
extern u16 D_800B99DA;
extern s32 func_80149FB0(s32 a0);
extern s32 func_801496D4(void*);
extern void func_80149704(void);
extern s32 func_801619A4(s32*);
extern s32 func_80149AA8(s32*);
extern void func_80149AD4(s32*);
extern s32 func_80149B54(s32*);
extern void func_80149BAC(s32*);
extern s32 func_801498E0(s32*);
extern s32 func_80149954(s32);
extern s32 func_80149A64(s32*);
extern void func_800CCCC0(s32 a0);
extern int func_80148AFC(void *a0);
extern void func_8001382C(s32 a0, void *a1, void *a2);
extern void func_80146DB8(s32 *a0, s32 *a1);
extern void func_80147A84(s32 a0);
extern void func_801473EC(s32*);
extern void func_8014C010(s32 a0, s32 a1);
extern void func_80147324(s32 a0);
extern void func_8014D738(void);
extern void func_8014CC28(s32);
extern s32 func_8014F3E8(s32);
extern s32 func_80146E98(s32 a0);
extern void func_80147078(s32 *a0, s16 a1);
extern s32 func_8015BE94();
extern void func_80159BE4(s32 a0);
extern void func_8015C0C4(s32 a0);
extern void func_8015C6E0(s32*);
void func_8015C32C(s32 arg0) {
s32 iVar2;
u32 uVar4;
s32 vin[4];
s32 vout[4];
func_80149FB0(arg0);
if (((s32 (*)(s32))func_801496D4)(arg0) != 0) {
D_80184B44[*(u16 *)arg0]((void *)arg0);
((void (*)(s32))func_80149704)(arg0);
return;
}
switch (((s32 (*)(s32))func_801619A4)(arg0)) {
case 0:
case 1:
case 6:
if (((s32 (*)(s32))func_80149AA8)(arg0) != 0) {
D_80184B44[*(u16 *)arg0]((void *)arg0);
((void (*)(s32))func_80149AD4)(arg0);
return;
}
if (((s32 (*)(s32))func_80149B54)(arg0) != 0) {
D_80184B44[*(u16 *)arg0]((void *)arg0);
((void (*)(s32))func_80149BAC)(arg0);
return;
}
break;
case 3:
((void (*)(s32))func_801498E0)(arg0);
break;
case 4:
((void (*)(s32))func_80149954)(arg0);
break;
case 5:
if (((s32 (*)(s32))func_80149A64)(arg0) != 0) {
D_80184B44[*(u16 *)arg0]((void *)arg0);
func_800CCCC0(arg0);
return;
}
}
if ((func_80148AFC((void *)arg0) & 0xff) != 0) {
vin[0] = 0;
vin[1] = 0;
vin[2] = -0x4000;
func_8001382C((s32)*(s16 *)(*(s32 *)(arg0 + 0x20) + 0x12), vin, vout);
*(s32 *)(arg0 + 0x234) += vout[0];
*(s32 *)(arg0 + 0x238) += vout[1];
*(s32 *)(arg0 + 0x23c) += vout[2];
}
func_8001382C((s16)-*(u16 *)(*(s32 *)(arg0 + 0x20) + 0x12), (void *)(arg0 + 0x234), vout);
func_80146DB8((s32 *)arg0, vout);
func_80147A84(arg0);
((void (*)(s32))func_801473EC)(arg0);
if ((D_800B99DA & 3) == 0) {
func_8014C010(arg0, 1);
func_80147324(0x65f);
}
if (((s32 (*)(s32))func_8014D738)(arg0) != 0) {
D_80184B44[*(u16 *)arg0]((void *)arg0);
((void (*)(s32))func_8015C6E0)(arg0);
return;
}
iVar2 = ((s32 (*)(s32))func_8014CC28)(arg0);
uVar4 = ((u32 (*)(s32))func_8014F3E8)(arg0);
if (uVar4 != 0) {
if ((uVar4 & 0x4000) == 0) {
if (func_80146E98(arg0) != 0) {
D_80184B44[*(u16 *)arg0]((void *)arg0);
func_80147078((s32 *)arg0, 0);
func_80159BE4(arg0);
}
} else {
func_80147078((s32 *)arg0, 4);
func_8015C0C4(arg0);
}
} else {
if (iVar2 == 0) {
D_80184B44[*(u16 *)arg0]((void *)arg0);
func_80147078((s32 *)arg0, 3);
((void (*)(s32))func_8015BE94)(arg0);
}
}
}
void func_8015C6A4(void) {
}