diff --git a/include/config.h b/include/config.h index 0f499d6b..3661ec8b 100644 --- a/include/config.h +++ b/include/config.h @@ -113,7 +113,7 @@ #define LONGER_POLES // Number of possible unique model ID's (keep it higher than 256) #define MODEL_ID_COUNT 256 -// Increase audio heap size to allow for more concurrent notes to be played and for more custom sequences/banks to be imported (does nothing with EU and SH versions) +// Increase audio heap size to allow for more concurrent notes to be played and for more custom sequences/banks to be imported (not supported for SH) #define EXPAND_AUDIO_HEAP // Allow all surfaces types to have force, (doesn't require setting force, just allows it to be optional). #define ALL_SURFACES_HAVE_FORCE diff --git a/src/audio/data.c b/src/audio/data.c index 8518737a..fcbd8fb8 100644 --- a/src/audio/data.c +++ b/src/audio/data.c @@ -13,14 +13,14 @@ extern struct OSMesgQueue OSMesgQueue3; //To increase reverb window sizes beyond 64, please increase the REVERB_WINDOW_SIZE_MAX in heap.c by a factor of 0x40. #ifdef VERSION_EU struct ReverbSettingsEU sReverbSettings[8] = { - {/*Downsample Rate*/ 4,/*Window Size*/ 16,/*Gain*/ 0x2FFF }, - {/*Downsample Rate*/ 4,/*Window Size*/ 10,/*Gain*/ 0x47FF }, - {/*Downsample Rate*/ 4,/*Window Size*/ 16,/*Gain*/ 0x2FFF }, - {/*Downsample Rate*/ 4,/*Window Size*/ 15,/*Gain*/ 0x3FFF }, - {/*Downsample Rate*/ 4,/*Window Size*/ 12,/*Gain*/ 0x4FFF }, - {/*Downsample Rate*/ 4,/*Window Size*/ 16,/*Gain*/ 0x2FFF }, //Duplicate of the first index - {/*Downsample Rate*/ 4,/*Window Size*/ 10,/*Gain*/ 0x47FF }, //Duplicate of the second index - {/*Downsample Rate*/ 4,/*Window Size*/ 10,/*Gain*/ 0x37FF }, + {/*Downsample Rate*/ 1,/*Window Size*/ 64,/*Gain*/ 0x2FFF }, + {/*Downsample Rate*/ 1,/*Window Size*/ 40,/*Gain*/ 0x47FF }, + {/*Downsample Rate*/ 1,/*Window Size*/ 64,/*Gain*/ 0x2FFF }, + {/*Downsample Rate*/ 1,/*Window Size*/ 60,/*Gain*/ 0x3FFF }, + {/*Downsample Rate*/ 1,/*Window Size*/ 48,/*Gain*/ 0x4FFF }, + {/*Downsample Rate*/ 1,/*Window Size*/ 64,/*Gain*/ 0x2FFF }, //Duplicate of the first index + {/*Downsample Rate*/ 1,/*Window Size*/ 40,/*Gain*/ 0x47FF }, //Duplicate of the second index + {/*Downsample Rate*/ 1,/*Window Size*/ 40,/*Gain*/ 0x37FF }, }; /** 1: Frequency diff --git a/src/audio/data.h b/src/audio/data.h index c65975ef..80bc9581 100644 --- a/src/audio/data.h +++ b/src/audio/data.h @@ -113,13 +113,13 @@ extern u16 gUnused80226E98[0x10]; extern u32 gAudioRandom; #ifdef EXPAND_AUDIO_HEAP -#if defined(VERSION_US) || defined(VERSION_JP) +#if defined(VERSION_US) || defined(VERSION_JP) || defined(VERSION_EU) #define EXT_AUDIO_HEAP_SIZE 0x27400 #define EXT_AUDIO_INIT_POOL_SIZE 0x8000 #else -// EU and SH versions not yet supported for extended audio heap -#define EXT_AUDIO_HEAP_SIZE 0x27400 -#define EXT_AUDIO_INIT_POOL_SIZE 0x8000 +// SH not yet supported for expanded audio heap +#define EXT_AUDIO_HEAP_SIZE 0x0 +#define EXT_AUDIO_INIT_POOL_SIZE 0x0 #endif #else #define EXT_AUDIO_HEAP_SIZE 0x0 @@ -153,8 +153,8 @@ extern OSMesgQueue *D_SH_80350FA8; #if defined(VERSION_EU) || defined(VERSION_SH) #define UNUSED_COUNT_80333EE8 24 -#define AUDIO_HEAP_SIZE (0x32b00 + EXT_AUDIO_HEAP_SIZE + EXT_AUDIO_INIT_POOL_SIZE + BETTER_REVERB_SIZE) -#define AUDIO_INIT_POOL_SIZE (0x2c00 + EXT_AUDIO_INIT_POOL_SIZE) +#define AUDIO_HEAP_SIZE (0x3AB00 + EXT_AUDIO_HEAP_SIZE + EXT_AUDIO_INIT_POOL_SIZE + BETTER_REVERB_SIZE) +#define AUDIO_INIT_POOL_SIZE (0x2C00 + EXT_AUDIO_INIT_POOL_SIZE) #else #define UNUSED_COUNT_80333EE8 16 #define AUDIO_HEAP_SIZE (0x34750 + EXT_AUDIO_HEAP_SIZE + EXT_AUDIO_INIT_POOL_SIZE + BETTER_REVERB_SIZE)