mirror of
https://github.com/zeldaret/mm.git
synced 2026-09-07 19:10:38 -04:00
[Audio 9/9] Loose ends (#1755)
* [Audio 9/9] Loose ends * Fix sampleconv memset bug * Doc updates from oot
This commit is contained in:
@@ -1,5 +1,10 @@
|
||||
#include "global.h"
|
||||
#include "buffers.h"
|
||||
#include "assets/audio/sequence_sizes.h"
|
||||
#include "assets/audio/soundfont_sizes.h"
|
||||
#define SFX_SEQ_SIZE Sequence_0_SIZE
|
||||
#define AMBIENCE_SEQ_SIZE Sequence_1_SIZE
|
||||
#define SFX_SOUNDFONTS_SIZE (Soundfont_0_SIZE + Soundfont_1_SIZE + Soundfont_2_SIZE)
|
||||
|
||||
static s32 sBssPad[36];
|
||||
AudioContext gAudioCtx;
|
||||
@@ -14,21 +19,12 @@ const s16 gAudioTatumInit[] = {
|
||||
TATUMS_PER_BEAT, // gTatumsPerBeat
|
||||
};
|
||||
|
||||
// TODO: Extract from table?
|
||||
#define NUM_SOUNDFONTS 41
|
||||
#define SFX_SEQ_SIZE 0xC6A0
|
||||
#define AMBIENCE_SEQ_SIZE 0xFC0
|
||||
#define SOUNDFONT_0_SIZE 0x81C0
|
||||
#define SOUNDFONT_1_SIZE 0x36D0
|
||||
#define SOUNDFONT_2_SIZE 0xCE0
|
||||
|
||||
// Sizes of everything on the init pool
|
||||
#define AI_BUFFERS_SIZE (AIBUF_SIZE * ARRAY_COUNT(gAudioCtx.aiBuffers))
|
||||
#define SOUNDFONT_LIST_SIZE (NUM_SOUNDFONTS * sizeof(SoundFont))
|
||||
|
||||
// 0x19BD0
|
||||
#define PERMANENT_POOL_SIZE \
|
||||
(SFX_SEQ_SIZE + AMBIENCE_SEQ_SIZE + SOUNDFONT_0_SIZE + SOUNDFONT_1_SIZE + SOUNDFONT_2_SIZE + 0x430)
|
||||
#define PERMANENT_POOL_SIZE (SFX_SEQ_SIZE + AMBIENCE_SEQ_SIZE + SFX_SOUNDFONTS_SIZE + 0x430)
|
||||
|
||||
const AudioHeapInitSizes gAudioHeapInitSizes = {
|
||||
ALIGN16(sizeof(gAudioHeap) - 0x100), // audio heap size
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
* Description: Twinmold
|
||||
*/
|
||||
|
||||
#include "prevent_bss_reordering.h"
|
||||
#include "z_boss_02.h"
|
||||
#include "z64rumble.h"
|
||||
#include "z64shrink_window.h"
|
||||
|
||||
Reference in New Issue
Block a user