From 33bb17438e5294764ebae59306ffc9255e3c29ba Mon Sep 17 00:00:00 2001
From: Jeffrey Crowell <github@crowell.biz>
Date: Thu, 2 Jun 2022 21:52:22 -0400
Subject: [PATCH] fix audio for 64 bit

---
 soh/include/z64.h                | 2 +-
 soh/src/code/audio_init_params.c | 2 +-
 soh/src/code/audio_load.c        | 2 +-
 soh/src/code/audio_synthesis.c   | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/soh/include/z64.h b/soh/include/z64.h
index 05a32a1f9..42dd770b9 100644
--- a/soh/include/z64.h
+++ b/soh/include/z64.h
@@ -31,7 +31,7 @@
 #include "regs.h"
 
 //#define AUDIO_HEAP_SIZE 0x38000
-#define AUDIO_HEAP_SIZE 0x3800000 // The original audio heap size was too small. The heap would exceed capacity and corrupt everything in its path.
+#define AUDIO_HEAP_SIZE 0x5800000 // The original audio heap size was too small. The heap would exceed capacity and corrupt everything in its path.
 #define SYSTEM_HEAP_SIZE (1024 * 1024 * 4)
 
 #ifdef __cplusplus
diff --git a/soh/src/code/audio_init_params.c b/soh/src/code/audio_init_params.c
index 0cebdf596..6b8bc18fe 100644
--- a/soh/src/code/audio_init_params.c
+++ b/soh/src/code/audio_init_params.c
@@ -10,7 +10,7 @@ const s16 D_8014A6C0[] = {
     0x0030, // gTatumsPerBeat
 };
 
-const AudioContextInitSizes D_8014A6C4 = { 0x37F00, 0xE0E0, 0xBCE0 };
+const AudioContextInitSizes D_8014A6C4 = { 0x57F00, 0x2E0E0, 0xFCE0 };
 
 ReverbSettings D_80133420[][3] = {
     {
diff --git a/soh/src/code/audio_load.c b/soh/src/code/audio_load.c
index 02b671821..8a81da1ce 100644
--- a/soh/src/code/audio_load.c
+++ b/soh/src/code/audio_load.c
@@ -575,7 +575,7 @@ s32 AudioLoad_SyncInitSeqPlayerInternal(s32 playerIdx, s32 seqId, s32 arg2) {
     while (numFonts > 0) {
         fontId = gAudioContext.sequenceFontTable[index++];
 
-        if (gUseLegacySD)
+        //if (gUseLegacySD)
             AudioLoad_SyncLoadFont(fontId);
 
         numFonts--;
diff --git a/soh/src/code/audio_synthesis.c b/soh/src/code/audio_synthesis.c
index db43e64e0..4b30e8c7d 100644
--- a/soh/src/code/audio_synthesis.c
+++ b/soh/src/code/audio_synthesis.c
@@ -382,11 +382,11 @@ void AudioSynth_EnvSetup1(Acmd* cmd, s32 arg1, s32 arg2, s32 arg3, s32 arg4) {
 void func_800DBD08(void) {
 }
 
-void AudioSynth_LoadBuffer(Acmd* cmd, s32 arg1, s32 arg2, s32 arg3) {
+void AudioSynth_LoadBuffer(Acmd* cmd, s32 arg1, s32 arg2, uintptr_t arg3) {
     aLoadBuffer(cmd, arg3, arg1, arg2);
 }
 
-void AudioSynth_SaveBuffer(Acmd* cmd, s32 arg1, s32 arg2, s32 arg3) {
+void AudioSynth_SaveBuffer(Acmd* cmd, s32 arg1, s32 arg2, uintptr_t arg3) {
     aSaveBuffer(cmd, arg1, arg3, arg2);
 }