Import JASCmdStack, std-vector work, Z2StatusMgr OK (#2029)

* Import JASCmdStack

* Work on std-vector

* Z2StatusMgr OK

4 files changed, 17 insertions, 2 deletions

diff --git a/include/Z2AudioLib/Z2Creature.h b/include/Z2AudioLib/Z2Creature.h
index 45128bc3b0..b924d5e97e 100644
--- a/include/Z2AudioLib/Z2Creature.h
+++ b/include/Z2AudioLib/Z2Creature.h
@@ -80,6 +80,7 @@ public:
     bool isRiding() const { return mRiding; }
     void i_setLinkState(u8 i_state) { mLinkState = i_state; }
     Z2SoundObjSimple& getKantera() { return mKantera; }
+    u8 getLinkHp() const { return mLinkHp; }
 
     static Z2CreatureLink* mLinkPtr;
 
diff --git a/include/Z2AudioLib/Z2Param.h b/include/Z2AudioLib/Z2Param.h
index 819c825092..d384e22a76 100644
--- a/include/Z2AudioLib/Z2Param.h
+++ b/include/Z2AudioLib/Z2Param.h
@@ -42,4 +42,9 @@ struct Z2Param {
     static f32 ENEMY_LASTHIT_MUTE_VOLUME;
 };
 
+extern u8 struct_80450860;
+extern u8 struct_80450861;
+extern u8 struct_80450862;
+extern u8 struct_80450863;
+
 #endif /* Z2PARAM_H */
diff --git a/include/Z2AudioLib/Z2SceneMgr.h b/include/Z2AudioLib/Z2SceneMgr.h
index 1f6d9d5ebd..15a0e3c410 100644
--- a/include/Z2AudioLib/Z2SceneMgr.h
+++ b/include/Z2AudioLib/Z2SceneMgr.h
@@ -30,6 +30,7 @@ public:
 
     bool isSceneExist() const { return sceneExist; }
     int getCurrentSceneNum() const { return sceneNum; }
+    bool isInGame() const { return inGame; }
 
 private:
     /* 0x00 */ long BGM_ID;
diff --git a/include/Z2AudioLib/Z2SeqMgr.h b/include/Z2AudioLib/Z2SeqMgr.h
index 3d44016e1f..c29d1d72b8 100644
--- a/include/Z2AudioLib/Z2SeqMgr.h
+++ b/include/Z2AudioLib/Z2SeqMgr.h
@@ -13,8 +13,12 @@ struct TTransition {
 
 struct Z2SoundFader {
     void move(f32 vol, u32 count) {
-        mIntensity = vol;
-        mTransition.zero();
+        if (count != 0) {
+            mTransition.set(vol, mIntensity, count);
+        } else {
+            mIntensity = vol;
+            mTransition.zero();
+        }
     }
 
     /* 0x0 */ float mIntensity;
@@ -85,6 +89,10 @@ public:
 
     void i_bgmAllUnMute(u32 count) { mAllBgmMaster.move(1.0f, count); }
 
+    void i_muteSceneBgm(u32 count, f32 vol) {
+        field_0x44.move(vol, count);
+    }
+
     void i_unMuteSceneBgm(u32 count) {
         mBgmPause.move(1.0f, 0);
         field_0x44.move(1.0f, count);