diff options
| author | cadmic <cadmic24@gmail.com> | 2024-09-11 03:31:54 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-11 19:31:54 +0900 |
| commit | 5419a18d7917f6c33367cbc5b72b280f97b37e65 (patch) | |
| tree | 2c1a55a832d3b8ae76a01e4f525e465dc6a708a2 /src/audio | |
| parent | fd7b92dac81a93945683c24782e03269925890bb (diff) | |
[ntsc-1.2] Match N64 audio tables (#2183)
* Match N64 audio tables
* ifdef PERMANENT_POOL_SIZE rather than EXTRA_SIZE
Diffstat (limited to 'src/audio')
| -rw-r--r-- | src/audio/general.c | 6 | ||||
| -rw-r--r-- | src/audio/session_config.c | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/src/audio/general.c b/src/audio/general.c index 528b16a19..8fb70bc46 100644 --- a/src/audio/general.c +++ b/src/audio/general.c @@ -169,7 +169,11 @@ u8 sSeqModeInput = 0; #define SEQ_FLAG_NO_AMBIENCE (1 << 7) u8 sSeqFlags[] = { - SEQ_FLAG_FANFARE, // NA_BGM_GENERAL_SFX +#if PLATFORM_N64 + SEQ_FLAG_FANFARE | SEQ_FLAG_ENEMY, // NA_BGM_GENERAL_SFX +#else + SEQ_FLAG_FANFARE, // NA_BGM_GENERAL_SFX +#endif SEQ_FLAG_ENEMY, // NA_BGM_NATURE_BACKGROUND 0, // NA_BGM_FIELD_LOGIC 0, // NA_BGM_FIELD_INIT diff --git a/src/audio/session_config.c b/src/audio/session_config.c index c8966ad95..8d1d97ca0 100644 --- a/src/audio/session_config.c +++ b/src/audio/session_config.c @@ -18,7 +18,11 @@ const TempoData gTempoData = { // 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)) +#if PLATFORM_N64 +#define PERMANENT_POOL_SIZE (SFX_SEQ_SIZE + SFX_SOUNDFONT_1_SIZE + SFX_SOUNDFONT_2_SIZE + 0x10) +#else #define PERMANENT_POOL_SIZE (SFX_SEQ_SIZE + SFX_SOUNDFONT_1_SIZE + SFX_SOUNDFONT_2_SIZE) +#endif const AudioHeapInitSizes gAudioHeapInitSizes = { ALIGN16(sizeof(gAudioHeap) - 0x100), // audio heap size |