Cool_Tools/vgmstream
1
0
Fork 0
mirror of https://github.com/vgmstream/vgmstream.git synced 2025-02-17 19:19:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix some .awb [Voice of Cards: TBOB (Switch)]

Browse Source
This commit is contained in:
bnnm 2022-09-16 23:39:44 +02:00
parent 919f1e4c0f
commit 2d675476a8
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/meta/awb.c
View File

@ -16,7 +16,7 @@ VGMSTREAM* init_vgmstream_awb_memory(STREAMFILE* sf, STREAMFILE* sf_acb) {
uint32_t offset, subfile_offset, subfile_next, subfile_size; uint32_t offset, subfile_offset, subfile_next, subfile_size;
int total_subsongs, target_subsong = sf->stream_index; int total_subsongs, target_subsong = sf->stream_index;
uint8_t offset_size; uint8_t offset_size;
uint16_t alignment, subkey; uint16_t waveid_alignment, offset_alignment, subkey;
int waveid; int waveid;
@ -29,11 +29,11 @@ VGMSTREAM* init_vgmstream_awb_memory(STREAMFILE* sf, STREAMFILE* sf_acb) {
goto fail; goto fail;
/* 0x04(1): version? 0x01=common, 0x02=2018+ (no apparent differences) */ /* 0x04(1): version? 0x01=common, 0x02=2018+ (no apparent differences) */
offset_size = read_u8(0x05,sf); offset_size = read_u8 (0x05,sf);
/* 0x06(2): always 0x0002? */ waveid_alignment = read_u16le(0x06,sf); /* usually 0x02, rarely 0x04 [Voice of Cards: The Beasts of Burden (Switch)]*/
total_subsongs = read_s32le(0x08,sf); total_subsongs = read_s32le(0x08,sf);
alignment = read_u16le(0x0c,sf); offset_alignment = read_u16le(0x0c,sf);
subkey = read_u16le(0x0e,sf); subkey = read_u16le(0x0e,sf);
if (target_subsong == 0) target_subsong = 1; if (target_subsong == 0) target_subsong = 1;
if (target_subsong > total_subsongs || total_subsongs <= 0) goto fail; if (target_subsong > total_subsongs || total_subsongs <= 0) goto fail;
@ -42,11 +42,11 @@ VGMSTREAM* init_vgmstream_awb_memory(STREAMFILE* sf, STREAMFILE* sf_acb) {
/* id table: read target */ /* id table: read target */
{ {
uint32_t waveid_offset = offset + (target_subsong-1) * 0x02; uint32_t waveid_offset = offset + (target_subsong-1) * waveid_alignment;
waveid = read_u16le(waveid_offset,sf); waveid = read_u16le(waveid_offset,sf);
offset += total_subsongs * 0x02; offset += total_subsongs * waveid_alignment;
} }
/* offset table: find target */ /* offset table: find target */
@ -71,14 +71,14 @@ VGMSTREAM* init_vgmstream_awb_memory(STREAMFILE* sf, STREAMFILE* sf_acb) {
} }
/* offset are absolute but sometimes misaligned (specially first that just points to offset table end) */ /* offset are absolute but sometimes misaligned (specially first that just points to offset table end) */
subfile_offset += (subfile_offset % alignment) ? subfile_offset += (subfile_offset % offset_alignment) ?
alignment - (subfile_offset % alignment) : 0; offset_alignment - (subfile_offset % offset_alignment) : 0;
subfile_next += (subfile_next % alignment) && subfile_next < file_size ? subfile_next += (subfile_next % offset_alignment) && subfile_next < file_size ?
alignment - (subfile_next % alignment) : 0; offset_alignment - (subfile_next % offset_alignment) : 0;
subfile_size = subfile_next - subfile_offset; subfile_size = subfile_next - subfile_offset;
} }
//;VGM_LOG("awb: subfile offset=%x + %x\n", subfile_offset, subfile_size); ;VGM_LOG("awb: subfile offset=%x + %x\n", subfile_offset, subfile_size);
/* autodetect as there isn't anything, plus can mix types /* autodetect as there isn't anything, plus can mix types
* (waveid<>codec info is usually in the companion .acb) */ * (waveid<>codec info is usually in the companion .acb) */