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

fix(carve): repoint 800_b_2's INCLUDE_ASM paths to its own subseg

Browse Source 
The 3-way split moved func_8002FDE8 and func_80032A74 into the 800_b_2 subseg,
but their INCLUDE_ASM directives still named "asm/nonmatchings/800_b". The
incremental build passed anyway because the OLD .s files were still on disk;
make clean removed them and splat now emits under 800_b_2, so a genuinely clean
rebuild died in jtbl_rodata_pads:

    FileNotFoundError: asm/nonmatchings/800_b/func_8002FDE8.s

This is exactly what R22 exists to catch, and it is the reason a byte check is
only trustworthy from a clean tree. asm/nonmatchings/800_b no longer exists at
all -- piece 1's three functions are all banked, so splat emits no directory
for it.

main rebuilds 143dbb89f34491258bbc27810d0a12ec8b43a8dd from a clean extract.
This commit is contained in:
Drew T
2026-09-03 22:26:10 -06:00
parent f4ff8267a5
commit b31e499c9b
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/800_b_2.c
+2 -2
View File
@@ -2812,7 +2812,7 @@ void func_8002FDC8(void) {
func_80037D74();
}
INCLUDE_ASM("asm/nonmatchings/800_b", func_8002FDE8);
INCLUDE_ASM("asm/nonmatchings/800_b_2", func_8002FDE8);
/* func_8002FF0C -- start playback of resource `entry` from the buffer `arg`.
*
@@ -4979,7 +4979,7 @@ done:
return ret;
}
INCLUDE_ASM("asm/nonmatchings/800_b", func_80032A74);
INCLUDE_ASM("asm/nonmatchings/800_b_2", func_80032A74);
extern u16 D_800A46E8[];
extern void func_8003324C(s32);