JAudio2 and Z2AudioLib work (#2223)

* JAudio2 and Z2AudioLib work * check1stDynamicWave matched
2026-06-06 19:11:21 -04:00 · 2024-10-23 19:25:13 -04:00
parent 1289892a26
commit 9401af27b3
94 changed files with 3803 additions and 7254 deletions
@@ -4,180 +4,224 @@
 //

 #include "Z2AudioLib/Z2FxLineMgr.h"
-#include "dol2asm.h"
-
-//
-// Types:
-//
-
-struct JSUMemoryInputStream {
-    /* 802DC520 */ void setBuffer(void const*, s32);
-};
-
-struct JSUInputStream {
-    /* 802DC23C */ ~JSUInputStream();
-    /* 802DC298 */ void read(void*, s32);
-};
-
-struct JASDsp {
-    struct FxlineConfig_ {};
-
-    /* 8029DB78 */ void setFXLine(u8, s16*, JASDsp::FxlineConfig_*);
-};
-
-//
-// Forward References:
-//
-
-extern "C" void __ct__11Z2FxLineMgrFv();
-extern "C" void initDataArc__11Z2FxLineMgrFP10JKRArchiveP7JKRHeap();
-extern "C" void setLineID__11Z2FxLineMgrFScbb();
-extern "C" void setLine__11Z2FxLineMgrFP14Z2FxLineConfigbb();
-extern "C" void setFxForceOff__11Z2FxLineMgrFb();
-extern "C" void setUnderWaterFx__11Z2FxLineMgrFb();
-extern "C" void setSceneFx__11Z2FxLineMgrFl();
-
-//
-// External References:
-//
-
-extern "C" void setFXLine__6JASDspFUcPsPQ26JASDsp13FxlineConfig_();
-extern "C" void free__7JKRHeapFPvP7JKRHeap();
-extern "C" void* __nwa__FUlP7JKRHeapi();
-extern "C" void getResource__10JKRArchiveFUs();
-extern "C" void countResource__10JKRArchiveCFv();
-extern "C" void __dt__14JSUInputStreamFv();
-extern "C" void read__14JSUInputStreamFPvl();
-extern "C" void setBuffer__20JSUMemoryInputStreamFPCvl();
-extern "C" void _savegpr_22();
-extern "C" void _savegpr_28();
-extern "C" void _restgpr_22();
-extern "C" void _restgpr_28();
-extern "C" extern void* __vt__10JSUIosBase[3];
-extern "C" extern void* __vt__20JSURandomInputStream[9];
-extern "C" extern void* __vt__14JSUInputStream[6 + 1 /* padding */];
-extern "C" extern void* __vt__20JSUMemoryInputStream[9 + 1 /* padding */];
-extern "C" extern u8 data_80450B80[4];
-extern "C" extern u8 __OSReport_disable;
-
-//
-// Declarations:
-//
+#include "Z2AudioLib/Z2SceneMgr.h"
+#include "JSystem/JAudio2/JASDSPInterface.h"
+#include "JSystem/JKernel/JKRArchive.h"
+#include "JSystem/JKernel/JKRHeap.h"
+#include "JSystem/JSupport/JSUMemoryStream.h"

 /* 802BA7DC-802BA7FC 2B511C 0020+00 0/0 1/1 0/0 .text            __ct__11Z2FxLineMgrFv */
 Z2FxLineMgr::Z2FxLineMgr() : JASGlobalInstance<Z2FxLineMgr>(this) {
-    // NONMATCHING
+    mConfig = NULL;
+    mLineID = -1;
+    mFxDataNum = 0;
+    mSetUnderWaterFx = false;
 }

 /* 802BA7FC-802BAC28 2B513C 042C+00 0/0 1/1 0/0 .text
 * initDataArc__11Z2FxLineMgrFP10JKRArchiveP7JKRHeap            */
-void Z2FxLineMgr::initDataArc(JKRArchive* param_0, JKRHeap* param_1) {
-    // NONMATCHING
+void Z2FxLineMgr::initDataArc(JKRArchive* arc, JKRHeap* heap) {
+    mFxLineBuffer[0] = new (heap, 0x20) u8[0x2800];
+    mFxLineBuffer[1] = new (heap, 0x20) u8[0x2800];
+    mFxLineBuffer[2] = new (heap, 0x20) u8[0x4B00];
+    mFxLineBuffer[3] = new (heap, 0x20) u8[0x4B00];
+    mFxDataNum = arc->countResource();
+    mConfig = new (heap, 0) Z2FxLineConfig[mFxDataNum];
+    for (u8 i = 0; i < mFxDataNum; i++) {
+        void* res = arc->getResource(i);
+        u32 size = (arc->getResSize(res) + 0x1f) & ~0x1f;
+        JSUMemoryInputStream stream(res, size);
+        stream >> mConfig[i].field_0x0;
+        stream >> mConfig[i].field_0x1;
+        stream >> mConfig[i].field_0x2;
+        stream >> mConfig[i].field_0x3;
+        stream >> mConfig[i].field_0x4;
+        stream >> mConfig[i].field_0x6;
+        stream >> mConfig[i].field_0x8[0];
+        stream >> mConfig[i].field_0x8[1];
+        stream >> mConfig[i].field_0x8[2];
+        stream >> mConfig[i].field_0x8[3];
+        stream >> mConfig[i].field_0x8[4];
+        stream >> mConfig[i].field_0x8[5];
+        stream >> mConfig[i].field_0x8[6];
+        stream >> mConfig[i].field_0x8[7];
+        stream >> mConfig[i].field_0x18;
+        stream >> mConfig[i].field_0x19;
+        stream >> mConfig[i].field_0x1a;
+        stream >> mConfig[i].field_0x1b;
+        stream >> mConfig[i].field_0x1c;
+        stream >> mConfig[i].field_0x1e;
+        stream >> mConfig[i].field_0x20[0];
+        stream >> mConfig[i].field_0x20[1];
+        stream >> mConfig[i].field_0x20[2];
+        stream >> mConfig[i].field_0x20[3];
+        stream >> mConfig[i].field_0x20[4];
+        stream >> mConfig[i].field_0x20[5];
+        stream >> mConfig[i].field_0x20[6];
+        stream >> mConfig[i].field_0x20[7];
+        JKRFree(res);
+    }
+    setLineID(-1, false, false);
+    setLineID(-1, true, false);
 }

 /* 802BAC28-802BAC74 2B5568 004C+00 4/4 0/0 0/0 .text            setLineID__11Z2FxLineMgrFScbb */
-void Z2FxLineMgr::setLineID(s8 param_0, bool param_1, bool param_2) {
-    // NONMATCHING
+void Z2FxLineMgr::setLineID(s8 fxID, bool param_1, bool param_2) {
+    if (fxID < 0) {
+        mLineID = 0;
+    } else {
+        mLineID = fxID;
+    }
+    setLine(&mConfig[mLineID], param_1, param_2);
 }

 /* 802BAC74-802BAE1C 2B55B4 01A8+00 1/1 0/0 0/0 .text setLine__11Z2FxLineMgrFP14Z2FxLineConfigbb
 */
-void Z2FxLineMgr::setLine(Z2FxLineConfig* param_0, bool param_1, bool param_2) {
-    // NONMATCHING
+void Z2FxLineMgr::setLine(Z2FxLineConfig* config, bool param_1, bool param_2) {
+    u8 buf1 = 0;
+    u8 buf2 = 1;
+    if (param_1) {
+        buf1 = 2;
+        buf2 = 3;
+    }
+
+    if (mFxLineBuffer[buf1] == NULL || mFxLineBuffer[buf2] == NULL) {
+        return;
+    }
+
+    JASDsp::FxlineConfig_ dsp_config;
+    dsp_config.field_0x0 = config->field_0x0;
+    dsp_config.field_0x2 = config->field_0x1;
+    dsp_config.field_0x6 = config->field_0x2;
+    if (param_2) {
+        dsp_config.field_0x4 = 0;
+        dsp_config.field_0x8 = 0;
+    } else {
+        dsp_config.field_0x4 = config->field_0x4;
+        dsp_config.field_0x8 = config->field_0x6;
+    }
+    dsp_config.field_0xc = config->field_0x3;
+    dsp_config.field_0x10[0] = config->field_0x8[0];
+    dsp_config.field_0x10[1] = config->field_0x8[1];
+    dsp_config.field_0x10[2] = config->field_0x8[2];
+    dsp_config.field_0x10[3] = config->field_0x8[3];
+    dsp_config.field_0x10[4] = config->field_0x8[4];
+    dsp_config.field_0x10[5] = config->field_0x8[5];
+    dsp_config.field_0x10[6] = config->field_0x8[6];
+    dsp_config.field_0x10[7] = config->field_0x8[7];
+    JASDsp::setFXLine(buf1, (s16*)mFxLineBuffer[buf1], &dsp_config);
+
+    dsp_config.field_0x0 = config->field_0x18;
+    dsp_config.field_0x2 = config->field_0x19;
+    dsp_config.field_0x6 = config->field_0x1a;
+    if (param_2) {
+        dsp_config.field_0x4 = 0;
+        dsp_config.field_0x8 = 0;
+    } else {
+        dsp_config.field_0x4 = config->field_0x1c;
+        dsp_config.field_0x8 = config->field_0x1e;
+    }
+    dsp_config.field_0xc = config->field_0x1b;
+    dsp_config.field_0x10[0] = config->field_0x20[0];
+    dsp_config.field_0x10[1] = config->field_0x20[1];
+    dsp_config.field_0x10[2] = config->field_0x20[2];
+    dsp_config.field_0x10[3] = config->field_0x20[3];
+    dsp_config.field_0x10[4] = config->field_0x20[4];
+    dsp_config.field_0x10[5] = config->field_0x20[5];
+    dsp_config.field_0x10[6] = config->field_0x20[6];
+    dsp_config.field_0x10[7] = config->field_0x20[7];
+    JASDsp::setFXLine(buf2, (s16*)mFxLineBuffer[buf2], &dsp_config);
 }

 /* 802BAE1C-802BAE48 2B575C 002C+00 0/0 1/1 0/0 .text            setFxForceOff__11Z2FxLineMgrFb */
 void Z2FxLineMgr::setFxForceOff(bool param_0) {
-    // NONMATCHING
+    setLineID(mLineID, true, param_0);
 }

 /* 802BAE48-802BAEB8 2B5788 0070+00 0/0 1/1 0/0 .text            setUnderWaterFx__11Z2FxLineMgrFb */
 void Z2FxLineMgr::setUnderWaterFx(bool param_0) {
-    // NONMATCHING
+    if (mSetUnderWaterFx != param_0) {
+        if (param_0) {
+            setLineID(12, true, false);
+        } else {
+            setSceneFx(Z2GetSceneMgr()->getCurrentSceneNum());
+        }
+        mSetUnderWaterFx = param_0;
+    }
 }

-/* ############################################################################################## */
-/* 803CAB18-803CAC48 -00001 0130+00 1/1 0/0 0/0 .data            @3566 */
-SECTION_DATA static void* lit_3566[76] = {
-    (void*)(((char*)setSceneFx__11Z2FxLineMgrFl) + 0x88),
-    (void*)(((char*)setSceneFx__11Z2FxLineMgrFl) + 0x134),
-    (void*)(((char*)setSceneFx__11Z2FxLineMgrFl) + 0x7C),
-    (void*)(((char*)setSceneFx__11Z2FxLineMgrFl) + 0x68),
-    (void*)(((char*)setSceneFx__11Z2FxLineMgrFl) + 0x134),
-    (void*)(((char*)setSceneFx__11Z2FxLineMgrFl) + 0x134),
-    (void*)(((char*)setSceneFx__11Z2FxLineMgrFl) + 0x68),
-    (void*)(((char*)setSceneFx__11Z2FxLineMgrFl) + 0x134),
-    (void*)(((char*)setSceneFx__11Z2FxLineMgrFl) + 0x134),
-    (void*)(((char*)setSceneFx__11Z2FxLineMgrFl) + 0x68),
-    (void*)(((char*)setSceneFx__11Z2FxLineMgrFl) + 0x134),
-    (void*)(((char*)setSceneFx__11Z2FxLineMgrFl) + 0xB0),
-    (void*)(((char*)setSceneFx__11Z2FxLineMgrFl) + 0x68),
-    (void*)(((char*)setSceneFx__11Z2FxLineMgrFl) + 0x134),
-    (void*)(((char*)setSceneFx__11Z2FxLineMgrFl) + 0x134),
-    (void*)(((char*)setSceneFx__11Z2FxLineMgrFl) + 0x134),
-    (void*)(((char*)setSceneFx__11Z2FxLineMgrFl) + 0x134),
-    (void*)(((char*)setSceneFx__11Z2FxLineMgrFl) + 0x134),
-    (void*)(((char*)setSceneFx__11Z2FxLineMgrFl) + 0x134),
-    (void*)(((char*)setSceneFx__11Z2FxLineMgrFl) + 0x134),
-    (void*)(((char*)setSceneFx__11Z2FxLineMgrFl) + 0x134),
-    (void*)(((char*)setSceneFx__11Z2FxLineMgrFl) + 0x134),
-    (void*)(((char*)setSceneFx__11Z2FxLineMgrFl) + 0x134),
-    (void*)(((char*)setSceneFx__11Z2FxLineMgrFl) + 0x134),
-    (void*)(((char*)setSceneFx__11Z2FxLineMgrFl) + 0x134),
-    (void*)(((char*)setSceneFx__11Z2FxLineMgrFl) + 0x68),
-    (void*)(((char*)setSceneFx__11Z2FxLineMgrFl) + 0x134),
-    (void*)(((char*)setSceneFx__11Z2FxLineMgrFl) + 0x134),
-    (void*)(((char*)setSceneFx__11Z2FxLineMgrFl) + 0x54),
-    (void*)(((char*)setSceneFx__11Z2FxLineMgrFl) + 0x134),
-    (void*)(((char*)setSceneFx__11Z2FxLineMgrFl) + 0x134),
-    (void*)(((char*)setSceneFx__11Z2FxLineMgrFl) + 0x134),
-    (void*)(((char*)setSceneFx__11Z2FxLineMgrFl) + 0x134),
-    (void*)(((char*)setSceneFx__11Z2FxLineMgrFl) + 0x134),
-    (void*)(((char*)setSceneFx__11Z2FxLineMgrFl) + 0x134),
-    (void*)(((char*)setSceneFx__11Z2FxLineMgrFl) + 0x7C),
-    (void*)(((char*)setSceneFx__11Z2FxLineMgrFl) + 0x7C),
-    (void*)(((char*)setSceneFx__11Z2FxLineMgrFl) + 0x7C),
-    (void*)(((char*)setSceneFx__11Z2FxLineMgrFl) + 0x9C),
-    (void*)(((char*)setSceneFx__11Z2FxLineMgrFl) + 0x9C),
-    (void*)(((char*)setSceneFx__11Z2FxLineMgrFl) + 0x9C),
-    (void*)(((char*)setSceneFx__11Z2FxLineMgrFl) + 0xB0),
-    (void*)(((char*)setSceneFx__11Z2FxLineMgrFl) + 0xB0),
-    (void*)(((char*)setSceneFx__11Z2FxLineMgrFl) + 0xB0),
-    (void*)(((char*)setSceneFx__11Z2FxLineMgrFl) + 0xD0),
-    (void*)(((char*)setSceneFx__11Z2FxLineMgrFl) + 0xD0),
-    (void*)(((char*)setSceneFx__11Z2FxLineMgrFl) + 0xD0),
-    (void*)(((char*)setSceneFx__11Z2FxLineMgrFl) + 0xE4),
-    (void*)(((char*)setSceneFx__11Z2FxLineMgrFl) + 0xE4),
-    (void*)(((char*)setSceneFx__11Z2FxLineMgrFl) + 0xE4),
-    (void*)(((char*)setSceneFx__11Z2FxLineMgrFl) + 0xF8),
-    (void*)(((char*)setSceneFx__11Z2FxLineMgrFl) + 0xF8),
-    (void*)(((char*)setSceneFx__11Z2FxLineMgrFl) + 0xF8),
-    (void*)(((char*)setSceneFx__11Z2FxLineMgrFl) + 0x10C),
-    (void*)(((char*)setSceneFx__11Z2FxLineMgrFl) + 0x10C),
-    (void*)(((char*)setSceneFx__11Z2FxLineMgrFl) + 0x10C),
-    (void*)(((char*)setSceneFx__11Z2FxLineMgrFl) + 0x134),
-    (void*)(((char*)setSceneFx__11Z2FxLineMgrFl) + 0x134),
-    (void*)(((char*)setSceneFx__11Z2FxLineMgrFl) + 0x134),
-    (void*)(((char*)setSceneFx__11Z2FxLineMgrFl) + 0x134),
-    (void*)(((char*)setSceneFx__11Z2FxLineMgrFl) + 0x134),
-    (void*)(((char*)setSceneFx__11Z2FxLineMgrFl) + 0x120),
-    (void*)(((char*)setSceneFx__11Z2FxLineMgrFl) + 0x120),
-    (void*)(((char*)setSceneFx__11Z2FxLineMgrFl) + 0x134),
-    (void*)(((char*)setSceneFx__11Z2FxLineMgrFl) + 0x134),
-    (void*)(((char*)setSceneFx__11Z2FxLineMgrFl) + 0xE4),
-    (void*)(((char*)setSceneFx__11Z2FxLineMgrFl) + 0x134),
-    (void*)(((char*)setSceneFx__11Z2FxLineMgrFl) + 0x7C),
-    (void*)(((char*)setSceneFx__11Z2FxLineMgrFl) + 0x7C),
-    (void*)(((char*)setSceneFx__11Z2FxLineMgrFl) + 0x9C),
-    (void*)(((char*)setSceneFx__11Z2FxLineMgrFl) + 0x134),
-    (void*)(((char*)setSceneFx__11Z2FxLineMgrFl) + 0x134),
-    (void*)(((char*)setSceneFx__11Z2FxLineMgrFl) + 0x134),
-    (void*)(((char*)setSceneFx__11Z2FxLineMgrFl) + 0x134),
-    (void*)(((char*)setSceneFx__11Z2FxLineMgrFl) + 0x134),
-    (void*)(((char*)setSceneFx__11Z2FxLineMgrFl) + 0x7C),
-};
-
 /* 802BAEB8-802BB00C 2B57F8 0154+00 2/1 1/1 0/0 .text            setSceneFx__11Z2FxLineMgrFl */
-void Z2FxLineMgr::setSceneFx(s32 param_0) {
-    // NONMATCHING
-}
+void Z2FxLineMgr::setSceneFx(s32 sceneNum) {
+    if (Z2GetSceneMgr()->isInDarkness()) {
+        setLineID(11, true, false);
+    } else {
+        switch (sceneNum) {
+        case SPOT_SHADES_REALM:
+            setLineID(9, true, false);
+            break;
+        case SPOT_KAKARIKO_VILLAGE:
+        case SPOT_DEATH_MOUNTAIN:
+        case SPOT_HIDDEN_VILLAGE:
+        case SPOT_ZORAS_RIVER:
+        case SPOT_HYRULE_FIELD:
+            setLineID(10, true, false);
+            break;
+        case SPOT_SACRED_GROVE:
+        case SPOT_FOREST_TEMPLE:
+        case SPOT_FOREST_TEMPLE_MINIBOSS:
+        case SPOT_FOREST_TEMPLE_BOSS:
+        case SPOT_GORGE_LANTERN_CAVE:
+        case SPOT_LAKE_LANTERN_CAVE:
+        case SPOT_FARON_WOODS_CAVE:
+            if (Z2GetSceneMgr()->getCurrentRoomNum() == 2) {
+                return;
+            }
+            // fallthrough
+        case SPOT_FARON_WOODS:
+            setLineID(1, true, false);
+            break;
+        case SPOT_GORON_MINES:
+        case SPOT_GORON_MINES_MINIBOSS:
+        case SPOT_GORON_MINES_BOSS:
+        case SPOT_ELDIN_MAGNET_CAVE:
+            setLineID(2, true, false);
+            break;
+        case SPOT_LAKE_HYLIA:
+        case SPOT_LAKEBED_TEMPLE:
+        case SPOT_LAKEBED_TEMPLE_MINIBOSS:
+        case SPOT_LAKEBED_TEMPLE_BOSS:
+            if (Z2GetSceneMgr()->getCurrentRoomNum() == 1) {
+                setLineID(3, true, false);
+            }
+            break;
+        case SPOT_ARBITERS_GROUNDS:
+        case SPOT_ARBITERS_GROUNDS_MINIBOSS:
+        case SPOT_ARBITERS_GROUNDS_BOSS:
+            setLineID(4, true, false);
+            break;
+        case SPOT_SNOWPEAK_RUINS:
+        case SPOT_SNOWPEAK_RUINS_MINIBOSS:
+        case SPOT_SNOWPEAK_RUINS_BOSS:
+        case SPOT_ICE_BLOCK_PUZZLE:
+            setLineID(5, true, false);
+            break;
+        case SPOT_TEMPLE_OF_TIME:
+        case SPOT_TEMPLE_OF_TIME_MINIBOSS:
+        case SPOT_TEMPLE_OF_TIME_BOSS:
+            setLineID(6, true, false);
+            break;
+        case SPOT_CITY_IN_THE_SKY:
+        case SPOT_CITY_IN_THE_SKY_MINIBOSS:
+        case SPOT_CITY_IN_THE_SKY_BOSS:
+            setLineID(7, true, false);
+            break;
+        case SPOT_HYRULE_CASTLE:
+        case SPOT_FINAL_BATTLE_THRONE_ROOM:
+            setLineID(8, true, false);
+            break;
+        default:
+            setLineID(-1, true, false);
+            break;
+        }
+    }
+}