From f29a21e2547329a7f823f77830f4cb00b3728781 Mon Sep 17 00:00:00 2001 From: KiritoDv Date: Thu, 21 Nov 2024 01:32:10 -0600 Subject: [PATCH] Added jp audio --- assets/yaml/jp/rev0/ast_audio.yaml | 30 ++++++++++++++++++++++++++++++ config.yml | 2 +- src/audio/audio_load.c | 2 -- 3 files changed, 31 insertions(+), 3 deletions(-) create mode 100644 assets/yaml/jp/rev0/ast_audio.yaml diff --git a/assets/yaml/jp/rev0/ast_audio.yaml b/assets/yaml/jp/rev0/ast_audio.yaml new file mode 100644 index 00000000..c8c10685 --- /dev/null +++ b/assets/yaml/jp/rev0/ast_audio.yaml @@ -0,0 +1,30 @@ +:config: + force: true + header: + code: + - '#include "sys.h"' + - '#include "sf64audio_provisional.h"' + +audio_setup: + type: NAUDIO:V1:AUDIO_SETUP + audio_seq: + size: 0x3AFD0 + offset: 0xE9950 + audio_bank: + size: 0x1F120 + offset: 0x124920 + audio_table: + size: 0x700C20 + offset: 0x143A40 + +audio_sample_bank_table: + { type: NAUDIO:V1:AUDIO_TABLE, format: SAMPLE, offset: 0xC1360, symbol: gSampleBankTableInit } + +audio_seq_table: + { type: NAUDIO:V1:AUDIO_TABLE, format: SEQUENCE, offset: 0xC13B0, symbol: gSeqTableInit } + +audio_soundfont_table: + { type: NAUDIO:V1:AUDIO_TABLE, format: SOUNDFONT, offset: 0xC17E0, symbol: gSoundFontTableInit } + +audio_seq_font_table: + { type: ARRAY, count: 283, array_type: u8, offset: 0xC1A00, symbol: gSeqFontTableInit } \ No newline at end of file diff --git a/config.yml b/config.yml index 69ba91ea..6e7b92c6 100644 --- a/config.yml +++ b/config.yml @@ -27,7 +27,7 @@ d064229a32cc05ab85e2381ce07744eb3ffaf530: gbi: F3DEX sort: OFFSET output: - binary: sf64.otr + binary: mods/sf64jp.otr code: src/assets headers: include/assets modding: src/assets diff --git a/src/audio/audio_load.c b/src/audio/audio_load.c index a385da5d..3ed697d3 100644 --- a/src/audio/audio_load.c +++ b/src/audio/audio_load.c @@ -610,7 +610,6 @@ void AudioLoad_RelocateFont(s32 fontId, uintptr_t fontBaseAddr, SampleBankRelocI // } // } AudioTable* table = AudioLoad_GetLoadTable(FONT_TABLE); - printf("fontId: %d\n", fontId); SoundFont* font = Audio_LoadFont(table->entries[fontId], fontId); gSoundFontList[fontId] = *font; @@ -714,7 +713,6 @@ void* AudioLoad_AsyncLoadInner(s32 tableType, s32 id, s32 nChunks, s32 retData, return ResourceGetDataByCrc((uint64_t) table->entries[id].romAddr); case FONT_TABLE: gFontLoadStatus[id] = LOAD_STATUS_COMPLETE; - printf("fontId: %d\n", id); osSendMesg(retQueue, OS_MESG_32(retData << 0x18), OS_MESG_NOBLOCK); return Audio_LoadFont(table->entries[id], id); case SAMPLE_TABLE: