mirror of
https://github.com/Druthulu/BFM-decomp
synced 2026-09-26 13:33:34 -04:00
Drew T
8bbf2e8e4d
- libspu and libsnd interleave in 0x3A444..0x4239C (the 800-subseg tail), so they link
as ONE combined region rather than two tangled passes
- NEW tools/make_snd_used.py: build the curated combined dir — merge both libs by vram,
pick the byte-matching object per aliased address (link_object), exclude 4 addresses
that don't reconcile in-region (kept as byte-identical stubs):
0x3C438 S_R/S_W, 0x3D424 S_GRMDT/FB/T — scattered-.bss commons, cross-object (§9.1)
0x3D94C S_IH/UT_RON — false placement (inside libsnd SSSTART.o)
0x3FA64 VM_F (237 ins) — scattered-.bss commons (the one real loss)
- subsegs via gen_lib_subsegs.py (9 snd blocks + 8 sgap game/excluded-stub gaps);
integrate window 0x3A444..0x4239C; region byte-verified 60/60
- src/800.c trimmed at [0x3A444,0x4239C): kept 732 items < 0x3A444 (ALL matched C +
game + the deferred SSGM stub preserved), 0 real-C moved
- dual byte-gate PASS: 143dbb89 with and without the sound objects
- LINKED 710 -> 935 (+225); REAL still 43; byte-identical 48.66% (nearly half the EXE)
- deferred: SSGM.o @0x1BD80 (isolated, matched-C region, 8 ins)
83 lines
2.2 KiB
C
83 lines
2.2 KiB
C
#include "common.h"
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/snd6", _SsSeqPlay);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/snd6", MIDIREAD_OBJ_E4);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/snd6", MIDIREAD_OBJ_E8);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/snd6", _SsSeqGetEof);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/snd6", MIDIREAD_OBJ_20C);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/snd6", MIDIREAD_OBJ_2DC);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/snd6", MIDIREAD_OBJ_330);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/snd6", _SsGetSeqData);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/snd6", MIDIREAD_OBJ_600);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/snd6", MIDIREAD_OBJ_65C);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/snd6", MIDIREAD_OBJ_6AC);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/snd6", MIDIREAD_OBJ_6BC);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/snd6", MIDIREAD_OBJ_6C0);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/snd6", MIDIREAD_OBJ_6CC);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/snd6", _SsReadDeltaValue);
|
|
|
|
void MIDITIME_OBJ_A8(void) {
|
|
}
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/snd6", _SsSndNextSep);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/snd6", _SsSndReplay);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/snd6", func_8003EC10);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/snd6", func_8003ED94);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/snd6", func_8003EDBC);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/snd6", func_8003EDE8);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/snd6", _SsSndTempo);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/snd6", TEMPO_OBJ_128);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/snd6", TEMPO_OBJ_134);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/snd6", TEMPO_OBJ_208);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/snd6", SsGetCurrentPoint);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/snd6", func_8003F144);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/snd6", UT_GVA_OBJ_224);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/snd6", func_8003F380);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/snd6", UT_GVAD_OBJ_A0);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/snd6", SsUtKeyOnV);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/snd6", UT_KEYV_OBJ_174);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/snd6", UT_KEYV_OBJ_180);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/snd6", UT_KEYV_OBJ_350);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/snd6", UT_KEYV_OBJ_360);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/snd6", SsUtKeyOffV);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/snd6", UT_KEYV_OBJ_3FC);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/snd6", _SsVmDoAllocate);
|
|
|
|
INCLUDE_ASM("asm/nonmatchings/snd6", VM_ALOC2_OBJ_120);
|