From c69f1436534a2b09513c2359e37e2a958677fd4c Mon Sep 17 00:00:00 2001
From: Jcw87 <Jcw87@users.noreply.github.com>
Date: Mon, 22 Jan 2024 08:43:38 -0800
Subject: [PATCH] JAudio fixes

---
 include/JAZelAudio/JAIZelBasic.h       |  2 +-
 src/JAZelAudio/JAIZelBasic.cpp         | 10 +++++-----
 src/JSystem/JAudio/JAIBasic.cpp        |  2 +-
 src/JSystem/JAudio/JAIFx.cpp           |  1 +
 src/JSystem/JAudio/JAISequenceHeap.cpp |  1 +
 5 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/include/JAZelAudio/JAIZelBasic.h b/include/JAZelAudio/JAIZelBasic.h
index 7875e786f..5a5e2f1fb 100644
--- a/include/JAZelAudio/JAIZelBasic.h
+++ b/include/JAZelAudio/JAIZelBasic.h
@@ -220,7 +220,7 @@ public:
     /* 0x0061 */ u8 field_0x0061;
     /* 0x0062 */ u8 field_0x0062;
     /* 0x0063 */ u8 field_0x0063;
-    /* 0x0064 */ u8 field_0x0064[0x0065 - 0x0064];
+    /* 0x0064 */ u8 field_0x0064;
     /* 0x0065 */ u8 field_0x0065;
     /* 0x0066 */ u8 field_0x0066;
     /* 0x0067 */ u8 field_0x0067[0x0068 - 0x0067];
diff --git a/src/JAZelAudio/JAIZelBasic.cpp b/src/JAZelAudio/JAIZelBasic.cpp
index a64d5413e..c632c8e24 100644
--- a/src/JAZelAudio/JAIZelBasic.cpp
+++ b/src/JAZelAudio/JAIZelBasic.cpp
@@ -73,8 +73,8 @@ JAIZelBasic::JAIZelBasic() {
     field_0x01f8 = 0;
     field_0x0201 = 0;
     field_0x0204 = 0;
-    field_0x0064[0] = 0;
-    field_0x0064[1] = 0;
+    field_0x0064 = 0;
+    field_0x0065 = 0;
     field_0x00b8 = 0;
     field_0x00ba = 0;
     field_0x00bb = 0;
@@ -332,8 +332,8 @@ void JAIZelBasic::bgmStop(u32 param_1, s32 param_2) {
     field_0x1f3c = 0;
     field_0x0201 = 0;
     mLastMinibossSubBGMType = 0;
-    field_0x0064[0] = 0;
-    field_0x0064[1] = 0;
+    field_0x0064 = 0;
+    field_0x0065 = 0;
     field_0x00b8 = 0;
     field_0x00cb = 0xff;
     field_0x00cc = 0;
@@ -872,7 +872,7 @@ void JAIZelBasic::setOutputMode(u32 param_1) {
 
 /* 802A98A0-802A9A20       .text talkIn__11JAIZelBasicFv */
 void JAIZelBasic::talkIn() {
-    if (field_0x0064[0] != 1 && isDemo() != 1 && field_0x0098 != 0.0f) {
+    if (field_0x0064 != 1 && isDemo() != 1 && field_0x0098 != 0.0f) {
         field_0x0084 = JAIZelParam::VOL_BGM_TALKING;
         if (mpMainBgmSound && field_0x0078 != JA_BGM_BIRDMAN_GOAL && field_0x0078 != JA_BGM_BIRDMAN_FAIL) {
             mpMainBgmSound->setVolume(calcMainBgmVol(), 2, 0);
diff --git a/src/JSystem/JAudio/JAIBasic.cpp b/src/JSystem/JAudio/JAIBasic.cpp
index 6d1484132..b49522985 100644
--- a/src/JSystem/JAudio/JAIBasic.cpp
+++ b/src/JSystem/JAudio/JAIBasic.cpp
@@ -43,7 +43,7 @@ JAIBasic::JAIBasic() {
     mAudioCamera = NULL;
     field_0x10 = 0;
     initLoadFileSw = 2;
-    field_0x1c = 0;
+    field_0x1c = NULL;
     field_0x8 = NULL;
     field_0x18 = 0;
     msCurrentHeap = JASDram;
diff --git a/src/JSystem/JAudio/JAIFx.cpp b/src/JSystem/JAudio/JAIFx.cpp
index c7efa1a7e..c9d088f91 100644
--- a/src/JSystem/JAudio/JAIFx.cpp
+++ b/src/JSystem/JAudio/JAIFx.cpp
@@ -7,6 +7,7 @@
 #include "JSystem/JAudio/JAIBasic.h"
 #include "JSystem/JAudio/JASDSPInterface.h"
 #include "JSystem/JKernel/JKRSolidHeap.h"
+#include "global.h"
 
 JAInter::Fx::initOnCodeFxScene_s* JAInter::Fx::initOnCodeFxScene;
 u8 JAInter::Fx::mSceneMax;
diff --git a/src/JSystem/JAudio/JAISequenceHeap.cpp b/src/JSystem/JAudio/JAISequenceHeap.cpp
index f7c2c67b4..cc7d2ba36 100644
--- a/src/JSystem/JAudio/JAISequenceHeap.cpp
+++ b/src/JSystem/JAudio/JAISequenceHeap.cpp
@@ -7,6 +7,7 @@
 #include "JSystem/JAudio/JAIBasic.h"
 #include "JSystem/JAudio/JAIGlobalParameter.h"
 #include "JSystem/JKernel/JKRSolidHeap.h"
+#include "global.h"
 
 JAInter::HeapBlock* JAInter::HeapMgr::sAutoHeap;
 JAInter::HeapBlock* JAInter::HeapMgr::sStayHeap;