Z2Audio player debug work / fix actor method returns (#3140)

* Z2Audio player debug work

* fix actor method returns

* wii build fix

5 files changed, 55 insertions, 36 deletions

diff --git a/include/Z2AudioCS/SpkTable.h b/include/Z2AudioCS/SpkTable.h
index 8fc12bd735..862fdba3c1 100644
--- a/include/Z2AudioCS/SpkTable.h
+++ b/include/Z2AudioCS/SpkTable.h
@@ -18,10 +18,10 @@ public:
     SpkTable(void);
     void setResource(void* res);
 
-    inline s32 getName(s32 num) {
+    inline const char* getName(s32 num) {
         JUT_ASSERT(0x35, num >= 0);
         JUT_ASSERT(0x36, num < mNumOfSound);
-        return *(mDataOffsets + num);
+        return (const char*)*(mDataOffsets + num);
     }
     inline s32 getNumOfSound() const { return mNumOfSound; }
     inline bool isValid(void) const { return mIsInitialized; }
diff --git a/include/Z2AudioCS/Z2AudioCS.h b/include/Z2AudioCS/Z2AudioCS.h
index 7d13accabc..694218ab4f 100644
--- a/include/Z2AudioCS/Z2AudioCS.h
+++ b/include/Z2AudioCS/Z2AudioCS.h
@@ -19,7 +19,7 @@ public:
     static SpkSoundHandle* getHandleSoundID(s32 soundNum);
     static SpkSoundHandle* start(s32 id, s32 chan);
     static SpkSoundHandle* startLevel(s32 id, s32 chan);
-    static s32 getName(s32 num);
+    static const char* getName(s32 num);
     static s32 getNumOfSound(void);
     static void stopAll(s32 chan, s32 msec);
     static void stop(s32 chan);
diff --git a/include/Z2AudioLib/Z2SoundPlayer.h b/include/Z2AudioLib/Z2SoundPlayer.h
index 6937ba63af..3baf4c15b5 100644
--- a/include/Z2AudioLib/Z2SoundPlayer.h
+++ b/include/Z2AudioLib/Z2SoundPlayer.h
@@ -3,6 +3,7 @@
 
 #include "JSystem/JAWExtSystem/JAWWindow.h"
 #include "JSystem/JAudio2/JAISoundHandles.h"
+#include "JSystem/JAudio2/JAUSoundTable.h"
 
 class Z2SoundPlayer : public JAWWindow {
 public:
@@ -24,43 +25,32 @@ public:
     virtual void onKeyRight(const JUTGamePad&);
 
     u32 getCursorMoveMax(const JUTGamePad&);
+    int getMenuNumberMax();
+    void correctSeNumber();
 
-    /* 0x3ED */ u8 field_0x3ed;
-    /* 0x3EE */ u8 field_0x3ee;
-    /* 0x3EF */ u8 field_0x3ef;
-    /* 0x3F0 */ u8 field_0x3f0;
-    /* 0x3F4 */ const char* field_0x3f4;
-    /* 0x3F8 */ short field_0x3f8;
-    /* 0x3FA */ short field_0x3fa;
-    /* 0x3FC */ short field_0x3fc;
-    /* 0x3FE */ short field_0x3fe;
-    /* 0x400 */ short field_0x400;
-    /* 0x402 */ short field_0x402;
-    /* 0x404 */ const char* field_0x404;
-    /* 0x408 */ const char* field_0x408;
-    /* 0x40C */ const char* field_0x40c;
-    /* 0x410 */ const char* field_0x410;
-    /* 0x414 */ const char* field_0x414;
-    /* 0x418 */ const char* field_0x418;
-    /* 0x41C */ const char* field_0x41c;
-    /* 0x420 */ const char* field_0x420;
-    /* 0x424 */ const char* field_0x424;
-    /* 0x428 */ const char* field_0x428;
-    /* 0x42C */ const char* field_0x42c;
-    /* 0x430 */ const char* field_0x430;
-    /* 0x434 */ const char* field_0x434;
-    /* 0x438 */ const char* field_0x438;
-    /* 0x43C */ const char* field_0x43c;
-    /* 0x440 */ const char* field_0x440;
-    /* 0x444 */ short field_0x444;
+    void onDrawSoundItem(JAWGraphContext*, JAUSoundNameTable*, int, const JUtility::TColor&, const JUtility::TColor&, const char*, u32, u32, u32);
+
+    /* 0x3ED */ bool field_0x3ed;
+    /* 0x3EE */ bool field_0x3ee;
+    /* 0x3EF */ bool field_0x3ef;
+    /* 0x3F0 */ bool field_0x3f0;
+    /* 0x3F4 */ const char* m_name;
+    /* 0x3F8 */ s16 field_0x3f8;
+    /* 0x3FA */ s16 field_0x3fa;
+    /* 0x3FC */ s16 field_0x3fc;
+    /* 0x3FE */ s16 field_0x3fe;
+    /* 0x400 */ s16 field_0x400;
+    /* 0x402 */ s16 m_portNum;
+    /* 0x404 */ const char* m_portNames[16];
+    /* 0x444 */ s16 m_portVal;
     /* 0x446 */ u8 field_0x446;
-    /* 0x448 */ short* field_0x448[7];
-    /* 0x464 */ int field_0x464;
-    /* 0x468 */ int field_0x468;
+    /* 0x448 */ s16* field_0x448[7];
+    /* 0x464 */ u32 m_cursorY;
+    /* 0x468 */ int m_cursorMax;
     /* 0x46C */ JAISoundHandle field_0x46c[8];
     /* 0x48C */ JAISoundHandles field_0x48c;
     /* 0x494 */ JAISoundHandle field_0x494;
-    /* 0x498 */ JAISoundHandle* field_0x498;
+    /* 0x498 */ JAISoundHandle* mp_subBgmHandle;
     /* 0x49C */ JAISoundHandle field_0x49c;
     /* 0x4A0 */ int field_0x4a0;
     /* 0x4A4 */ f32 field_0x4a4;
diff --git a/include/Z2AudioLib/Z2WaveArcLoader.h b/include/Z2AudioLib/Z2WaveArcLoader.h
index 81a4bc2123..ac15c50001 100644
--- a/include/Z2AudioLib/Z2WaveArcLoader.h
+++ b/include/Z2AudioLib/Z2WaveArcLoader.h
@@ -2,10 +2,39 @@
 #define Z2WAVEARCLOADER_H
 
 #include "JSystem/JAWExtSystem/JAWWindow.h"
+#include "JSystem/JAudio2/JASWaveArcLoader.h"
+#include "JSystem/JAudio2/JASWaveInfo.h"
 
 class Z2WaveArcLoader : public JAWWindow {
 public:
     Z2WaveArcLoader();
+    virtual ~Z2WaveArcLoader();
+
+    virtual void onDraw(JAWGraphContext*);
+
+    void checkWaveBank();
+    void checkWaveArc();
+
+    virtual void onKeyUp(const JUTGamePad&);
+    virtual void onKeyDown(const JUTGamePad&);
+    virtual void onKeyLeft(const JUTGamePad&);
+    virtual void onKeyRight(const JUTGamePad&);
+    virtual void onTrigA(const JUTGamePad&);
+    virtual void onTrigB(const JUTGamePad&);
+    virtual void onTrigZ(const JUTGamePad&);
+
+    /* 0x3F0 */ JASWaveBank* mpWaveBank;
+    /* 0x3F4 */ JASWaveArc* mpWaveArc;
+    /* 0x3F8 */ u32 mWaveUsedSize;
+    /* 0x3FC */ int mTotalUsedSize;
+    /* 0x400 */ u8 mBankNo;
+    /* 0x404 */ u32 mArcCount;
+    /* 0x408 */ u32 field_0x408;
+    /* 0x40C */ u32 field_0x40c;
+    /* 0x410 */ u32 field_0x410;
+    /* 0x414 */ u8 field_0x414;
+    /* 0x415 */ u8 field_0x415;
+    /* 0x416 */ bool mIsLoadTail;
 };
 
 #endif /* Z2WAVEARCLOADER_H */
diff --git a/include/d/actor/d_a_npc_sola.h b/include/d/actor/d_a_npc_sola.h
index 6d6cf742f8..0b13842f9c 100644
--- a/include/d/actor/d_a_npc_sola.h
+++ b/include/d/actor/d_a_npc_sola.h
@@ -77,7 +77,7 @@ public:
     int CreateHeap();
     int Delete();
     int Execute();
-    void Draw();
+    int Draw();
     static BOOL createHeapCallBack(fopAc_ac_c*);
     static BOOL ctrlJointCallBack(J3DJoint*, int);
     bool getType();