JAIZelBasic work

include/JAZelAudio/JAIZelBasic.h

@@ -38,11 +38,11 @@ public:
     void onEnemyDamage();
     void mbossBgmMuteProcess();
     void mbossBgmNearByProcess(f32);
-    void checkBgmPlaying();
-    void checkPlayingMainBgmFlag();
-    void checkSubBgmPlaying();
-    void checkPlayingSubBgmFlag();
-    void checkPlayingStreamBgmFlag();
+    bool checkBgmPlaying();
+    int checkPlayingMainBgmFlag();
+    bool checkSubBgmPlaying();
+    int checkPlayingSubBgmFlag();
+    int checkPlayingStreamBgmFlag();
     void changeBgmStatus(s32);
     void changeSubBgmStatus(s32);
     void bgmMuteMtDragon();
@@ -102,7 +102,7 @@ public:
     BOOL check1stDynamicWave();
     void load2ndDynamicWave();
     void loadStaticWaves();
-    BOOL checkFirstWaves();
+    s32 checkFirstWaves();
     void setLinkHp(s32, s32);
     void setLinkSwordType(s32, s32);
     void setLinkShieldType(s32, s32);
@@ -145,8 +145,8 @@ public:
     void rainPlay(s32);
 
     virtual JAISound* makeSound(u32);
-    virtual bool getMapInfoFxline(u32);
-    virtual bool getMapInfoGround(u32);
+    virtual BOOL getMapInfoFxline(u32);
+    virtual BOOL getMapInfoGround(u32);
     virtual f32 getMapInfoFxParameter(u32);
 
     void setHour(s32 i_hour) { mHour = i_hour; }
@@ -155,6 +155,18 @@ public:
 
     static JAIZelBasic* getInterface() { return zel_basic; }
 
+    // TODO
+    void bstHoriOff() {}
+    void bstHoriOn() {}
+    void calcMainBgmVol() {}
+    void calcSubBgmVol() {}
+    void checkSeMute() {}
+    void checkTBoxDemo() {}
+    void getCurCamera(u32) {}
+    void getLinkBootsType() {}
+    void getLinkSwShieldBeat() {}
+    void isTaktUsing() {}
+
     static JAIZelBasic* zel_basic;
 
     // static m_bgm_mute_state;
@@ -199,10 +211,13 @@ public:
     /* 0x0061 */ u8 field_0x0061;
     /* 0x0062 */ u8 field_0x0062;
     /* 0x0063 */ u8 field_0x0063;
-    /* 0x0064 */ u8 field_0x0064[0x0066 - 0x0064];
+    /* 0x0064 */ u8 field_0x0064[0x0065 - 0x0064];
+    /* 0x0065 */ u8 field_0x0065;
     /* 0x0066 */ u8 field_0x0066;
-    /* 0x0067 */ u8 field_0x0067[0x0070 - 0x0067];
-    /* 0x0070 */ JAISound* mpSound;
+    /* 0x0067 */ u8 field_0x0067[0x0068 - 0x0067];
+    /* 0x0068 */ JAISound* mpMainBgmSound;
+    /* 0x006C */ JAISound* mpSubBgmSound;
+    /* 0x0070 */ JAISound* mpStreamBgmSound;
     /* 0x0074 */ int field_0x0074;
     /* 0x0078 */ u32 field_0x0078;
     /* 0x007C */ u32 field_0x007c;

include/JSystem/JAudio/JAIBankWave.h

@@ -14,7 +14,7 @@ namespace JAInter {
         void finishSceneSet(u32);
         void loadSceneWave(s32, s32);
         void loadGroupWave(s32, s32);
-        void getWaveLoadStatus(s32);
+        s32 getWaveLoadStatus(s32);
         bool checkAllWaveLoadStatus();
 
         extern s32* wsGroupNumber;

include/JSystem/JAudio/JAIBasic.h

@@ -19,8 +19,8 @@ class JAIBasic {
 public:
     JAIBasic();
     virtual JAISound* makeSound(u32);
-    virtual bool getMapInfoFxline(u32);
-    virtual bool getMapInfoGround(u32);
+    virtual BOOL getMapInfoFxline(u32);
+    virtual BOOL getMapInfoGround(u32);
     virtual f32 getMapInfoFxParameter(u32);
     virtual void setSeExtParameter(JAISound*);
     virtual void setRegisterTrackCallback();
@@ -81,6 +81,22 @@ public:
         return msCurrentHeap;
     }
 
+    // TODO
+    void addInitOnCodeSeScene(u32, u32) {}
+    void checkAllWaveLoadStatus() {}
+    void checkEnablePrepare(u32) {}
+    void getAudioCamera() {}
+    void getInitDataInfo() {}
+    void getInitOnCodeSeScene() {}
+    void getSceneSetFlag() {}
+    void getSeSoundHandle() {}
+    void getWaveLoadStatus(s32) {}
+    void initAudio(JKRSolidHeap*, u32, u8) {}
+    void loadSceneWave(s32, s32) {}
+    void prepareSoundVec(u32, JAISound**, Vec*, u32, u32, u8) {}
+    void setInitDataInfo(char*) {}
+    void setInitOnCodeSeScene(u32*) {}
+
     static JAIBasic* msBasic;
     static JKRSolidHeap* msCurrentHeap;
 };

include/JSystem/JAudio/JAISound.h

@@ -72,6 +72,46 @@ public:
     int checkSoundHandle(u32, void*);
     void initParameter(JAISound**, JAInter::Actor*, u32, u32, u8, void*);
 
+    // TODO
+    void decWait() {}
+    void getAct() {}
+    void getAdjustPriority() {}
+    void getFadetime() {}
+    void getID() {}
+    void getInfoPointer() {}
+    void getMapInfo() {}
+    void getNextSound() {}
+    void getPlayGameFrameCounter() {}
+    void getPlayer() {}
+    void getPositionInfo() {}
+    void getPrevSound() {}
+    void getPriority() {}
+    void getStatus() {}
+    void getTrack() {}
+    void getTrans() {}
+    void getWait() {}
+    void incPlayGameFrameCounter() {}
+    void setCustomParameterPointer(void*) {}
+    void setDemoFxmix(f32, u32) {}
+    void setDemoPan(f32, u32) {}
+    void setDemoPitch(f32, u32) {}
+    void setDemoVolume(f32, u32) {}
+    void setFadetime(u32) {}
+    void setID(u32) {}
+    void setMainSoundPPointer(JAISound**) {}
+    void setNextSound(JAISound*) {}
+    void setPrevSound(JAISound*) {}
+    void setPriority(u32) {}
+    void setRandom(u8) {}
+    void setSeInterDolbyU7(u8, u8, u32, u8) {}
+    void setSeInterFxmixU7(u8, u8, u32, u8) {}
+    void setSeqInterVolumeU7(u8, u8, u32) {}
+    void setStatus(u8) {}
+    void setTrack(u8) {}
+    void setTrackVolumeU7(u8, u8, u32) {}
+    void setVolumeU7(u8, u32, u8) {}
+    void setWait(u8) {}
+
     /* 0x04 */ u8 field_0x4;
     /* 0x05 */ u8 field_0x5;
     /* 0x06 */ u8 field_0x6;

include/JSystem/JAudio/JAIStreamMgr.h

@@ -28,9 +28,11 @@ namespace JAInter {
 
         extern LinkSound streamControl;
         extern u8 flags;
-        extern int streamUpdate;
+        extern int streamUpdate; // TODO pointer to something, not actually an int
         extern u8* streamList;
         extern u8* initOnCodeStrm;
+
+        inline int getUpdateInfo() { return streamUpdate; }
     }
 
     namespace StreamLib {