From 0fca7394bcfe4db7615a3b0107cd9076e9d6aa5d Mon Sep 17 00:00:00 2001
From: Jcw87 <Jcw87@users.noreply.github.com>
Date: Thu, 19 Oct 2023 23:30:05 -0700
Subject: [PATCH] JASBank

---
 configure.py                     |  2 +-
 include/JSystem/JAudio/JASBank.h | 16 ++++++++++++++++
 src/JSystem/JAudio/JASBank.cpp   | 17 ++++++++++++-----
 3 files changed, 29 insertions(+), 6 deletions(-)
 create mode 100644 include/JSystem/JAudio/JASBank.h

diff --git a/configure.py b/configure.py
index ad9dd4698..9497a22a2 100644
--- a/configure.py
+++ b/configure.py
@@ -670,7 +670,7 @@ config.libs = [
             Object(NonMatching, "JSystem/JAudio/JASTrack.cpp"),
             Object(Matching,    "JSystem/JAudio/JASTrackInterrupt.cpp"),
             Object(Matching,    "JSystem/JAudio/JASTrackPort.cpp"),
-            Object(NonMatching, "JSystem/JAudio/JASBank.cpp"),
+            Object(Matching,    "JSystem/JAudio/JASBank.cpp"),
             Object(NonMatching, "JSystem/JAudio/JASWaveBank.cpp"),
             Object(NonMatching, "JSystem/JAudio/JASBasicBank.cpp"),
             Object(NonMatching, "JSystem/JAudio/JASBasicInst.cpp"),
diff --git a/include/JSystem/JAudio/JASBank.h b/include/JSystem/JAudio/JASBank.h
new file mode 100644
index 000000000..7763ef23e
--- /dev/null
+++ b/include/JSystem/JAudio/JASBank.h
@@ -0,0 +1,16 @@
+#ifndef JASBANK_H
+#define JASBANK_H
+
+#include "dolphin/types.h"
+
+class JKRHeap;
+
+namespace JASystem {
+    namespace TBank {
+        JKRHeap* getCurrentHeap();
+
+        extern JKRHeap* sCurrentHeap;
+    };
+}
+
+#endif /* JASBANK_H */
diff --git a/src/JSystem/JAudio/JASBank.cpp b/src/JSystem/JAudio/JASBank.cpp
index f44677f02..e1ee502ff 100644
--- a/src/JSystem/JAudio/JASBank.cpp
+++ b/src/JSystem/JAudio/JASBank.cpp
@@ -3,11 +3,18 @@
 // Translation Unit: JASBank.cpp
 //
 
-#include "JASBank.h"
+#include "JSystem/JAudio/JASBank.h"
+#include "JSystem/JAudio/JASSystemHeap.h"
+#include "JSystem/JKernel/JKRSolidHeap.h"
 #include "dolphin/types.h"
 
-/* 80284548-8028455C       .text getCurrentHeap__Q28JASystem5TBankFv */
-void JASystem::TBank::getCurrentHeap() {
-    /* Nonmatching */
-}
+JKRHeap* JASystem::TBank::sCurrentHeap;
 
+/* 80284548-8028455C       .text getCurrentHeap__Q28JASystem5TBankFv */
+JKRHeap* JASystem::TBank::getCurrentHeap() {
+    /* Nonmatching */
+    if (sCurrentHeap) {
+        return sCurrentHeap;
+    }
+    return JASDram;
+}