Cool_Tools/vgmstream
1
0
Fork 0
mirror of https://github.com/vgmstream/vgmstream.git synced 2024-11-28 08:20:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #922 from NicknineTheEagle/cri

Browse Source 
CRI CPK: Added support for ADX sounds
This commit is contained in:
NicknineTheEagle 2021-08-16 15:43:28 +03:00 committed by GitHub
commit 630cb09f47
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/meta/cpk.c
View File

@ -3,7 +3,7 @@
#include "cri_utf.h"
typedef enum { HCA, CWAV, } cpk_type_t;
typedef enum { HCA, CWAV, ADX } cpk_type_t;
static void load_cpk_name(STREAMFILE* sf, STREAMFILE* sf_acb, VGMSTREAM* vgmstream, int waveid);
@ -184,8 +184,14 @@ VGMSTREAM* init_vgmstream_cpk_memory(STREAMFILE* sf, STREAMFILE* sf_acb) {
type = CWAV;
extension = "bcwav";
}
else {
goto fail;
else if (read_u16be(subfile_offset, sf) == 0x8000) {
off_t test_offset = subfile_offset + read_u16be(subfile_offset + 0x02, sf) + 0x04;
if (read_u16be(test_offset - 0x06, sf) != 0x2863 || /* "(c" */
read_u32be(test_offset - 0x04, sf) != 0x29435249) /* ")CRI" */
goto fail;
type = ADX;
extension = "adx";
}
temp_sf = setup_subfile_streamfile(sf, subfile_offset, subfile_size, extension);
@ -200,6 +206,10 @@ VGMSTREAM* init_vgmstream_cpk_memory(STREAMFILE* sf, STREAMFILE* sf_acb) {
vgmstream = init_vgmstream_rwsd(temp_sf);
if (!vgmstream) goto fail;
break;
case ADX: /* Sonic Generations (3DS) */
vgmstream = init_vgmstream_adx(temp_sf);
if (!vgmstream) goto fail;
break;
default:
goto fail;
}