From 5650c7fe0861609b4b2c6db09312622a1fcd7fc1 Mon Sep 17 00:00:00 2001
From: Caroline Madsen <69010899+randomsalience@users.noreply.github.com>
Date: Wed, 23 Oct 2024 19:25:13 -0400
Subject: JAudio2 and Z2AudioLib work (#2223)

* JAudio2 and Z2AudioLib work

* check1stDynamicWave matched
---
 src/Z2AudioLib/Z2AudioArcLoader.cpp | 69 ++++++-------------------------------
 1 file changed, 11 insertions(+), 58 deletions(-)

(limited to 'src/Z2AudioLib/Z2AudioArcLoader.cpp')

diff --git a/src/Z2AudioLib/Z2AudioArcLoader.cpp b/src/Z2AudioLib/Z2AudioArcLoader.cpp
index 99075c1014..b7d6789d98 100644
--- a/src/Z2AudioLib/Z2AudioArcLoader.cpp
+++ b/src/Z2AudioLib/Z2AudioArcLoader.cpp
@@ -5,54 +5,13 @@
 
 #include "Z2AudioLib/Z2AudioArcLoader.h"
 #include "JSystem/JAudio2/JAUSectionHeap.h"
-#include "dol2asm.h"
-
-//
-// Types:
-//
-
-//
-// Forward References:
-//
-
-extern "C" void __ct__16Z2AudioArcLoaderFP10JAUSection();
-extern "C" void readCommandMore__16Z2AudioArcLoaderFUl();
-extern "C" void readBFCA__16Z2AudioArcLoaderFPCv();
-extern "C" void readBSTN__16Z2AudioArcLoaderFPCvUl();
-extern "C" void __dt__16Z2AudioArcLoaderFv();
-
-//
-// External References:
-//
-
-extern "C" void __dt__22JAUAudioArcInterpreterFv();
-extern "C" void __ct__17JAUAudioArcLoaderFP10JAUSection();
-extern "C" void readWS__17JAUAudioArcLoaderFUlPCvUl();
-extern "C" void readBNK__17JAUAudioArcLoaderFUlPCv();
-extern "C" void readBSC__17JAUAudioArcLoaderFPCvUl();
-extern "C" void readBST__17JAUAudioArcLoaderFPCvUl();
-extern "C" void readBMS__17JAUAudioArcLoaderFUlPCvUl();
-extern "C" void readBMS_fromArchive__17JAUAudioArcLoaderFUl();
-extern "C" void newVoiceBank__17JAUAudioArcLoaderFUlUl();
-extern "C" void newDynamicSeqBlock__17JAUAudioArcLoaderFUl();
-extern "C" void readBSFT__17JAUAudioArcLoaderFPCv();
-extern "C" void beginBNKList__17JAUAudioArcLoaderFUlUl();
-extern "C" void endBNKList__17JAUAudioArcLoaderFv();
-extern "C" void readMaxSeCategory__17JAUAudioArcLoaderFiii();
-extern "C" void getOpenSection__14JAUSectionHeapFv();
-extern "C" void initDataArc__11Z2FxLineMgrFP10JKRArchiveP7JKRHeap();
-extern "C" void __dl__FPv();
-extern "C" void mount__10JKRArchiveFPvP7JKRHeapQ210JKRArchive15EMountDirection();
-extern "C" void _savegpr_29();
-extern "C" void _restgpr_29();
-extern "C" extern void* __vt__17JAUAudioArcLoader[17 + 1 /* padding */];
-extern "C" extern u8 data_80450B40[4];
-extern "C" extern u8 data_80450CC0[4 + 4 /* padding */];
-extern "C" u8 sCurrentHeap__7JKRHeap[4];
-extern "C" extern u8 __OSReport_disable;
+#include "JSystem/JKernel/JKRArchive.h"
+#include "JSystem/JKernel/JKRHeap.h"
+#include "Z2AudioLib/Z2FxLineMgr.h"
 
 /* 802A9A34-802A9A70 2A4374 003C+00 0/0 1/1 0/0 .text __ct__16Z2AudioArcLoaderFP10JAUSection */
 Z2AudioArcLoader::Z2AudioArcLoader(JAUSection* param_0) : JAUAudioArcLoader(param_0) {
+    /* empty function */
 }
 
 /* 802A9A70-802A9AC8 2A43B0 0058+00 1/0 0/0 0/0 .text readCommandMore__16Z2AudioArcLoaderFUl */
@@ -68,22 +27,16 @@ bool Z2AudioArcLoader::readCommandMore(u32 param_0) {
 }
 
 /* 802A9AC8-802A9B54 2A4408 008C+00 1/1 0/0 0/0 .text            readBFCA__16Z2AudioArcLoaderFPCv */
-// regalloc and extra stack
-#ifdef NONMATCHING
+// NONMATCHING regalloc
 void Z2AudioArcLoader::readBFCA(void const* param_0) {
-    JAUSectionHeap* sectionHeap = JASGlobalInstance<JAUSectionHeap>::getInstance();
-    JKRHeap* pJVar1 = sectionHeap->getHeap();
-    JKRArchive* pJVar5 = JKRArchive::mount((void*)param_0, JKRGetCurrentHeap(), JKRArchive::MOUNT_DIRECTION_TAIL);
-    Z2GetFxLineMgr()->initDataArc(pJVar5, pJVar1);
-    JKRUnmountArchive(pJVar5);
+    JKRHeap* heap = JAUSectionHeap::getInstance()->getHeap();
+    JKRArchive* archive = JKRArchive::mount((void*)param_0, JKRGetCurrentHeap(), JKRArchive::MOUNT_DIRECTION_TAIL);
+    Z2GetFxLineMgr()->initDataArc(archive, heap);
+    JKRUnmountArchive(archive);
 }
-#else
-void Z2AudioArcLoader::readBFCA(void const* param_0) {
-    // NONMATCHING
-}
-#endif
+
 /* 802A9B54-802A9B58 2A4494 0004+00 1/0 0/0 0/0 .text            readBSTN__16Z2AudioArcLoaderFPCvUl
  */
 void Z2AudioArcLoader::readBSTN(void const* param_0, u32 param_1) {
     /* empty function */
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3