Z2AudioLib debug (#3016)

5 files changed, 19 insertions, 9 deletions

diff --git a/include/Z2AudioLib/Z2Param.h b/include/Z2AudioLib/Z2Param.h
index 541bbb9556..aceb09ce97 100644
--- a/include/Z2AudioLib/Z2Param.h
+++ b/include/Z2AudioLib/Z2Param.h
@@ -47,6 +47,10 @@ struct Z2Param {
     static u8 BGM_CROSS_FADEOUT_TIME;
     static u8 BATTLE_BGM_WAIT_TIME;
 
+    static f32 ENEMY_NEARBY_DIST;
+    static f32 BATTLE_FADEIN_DIST;
+    static f32 BATTLE_FADEOUT_DIST;
+
     static u8 FOUND_TRACK_FI_TIME;
     static u8 FOUND_TRACK_FO_TIME;
     static u8 CLOSE_BATTLE_TRACK_FI_TIME;
@@ -60,6 +64,10 @@ struct Z2Param {
     static u8 DARK_SE_FILTER_ON;
     static u8 DARK_SE_LOW_PASS_FILTER_SETTING;
     static u8 SYSTEM_SE_USE_DARK_SE_SETTING;
+
+    static f32 AUDIBLE_DELTA_RANGE_VOLUME;
+    static f32 AUDIBLE_DELTA_RANGE_PAN;
+    static f32 AUDIBLE_DELTA_RANGE_DOLBY;
 };
 
 extern u8 data_8045086C;
diff --git a/include/Z2AudioLib/Z2SeqMgr.h b/include/Z2AudioLib/Z2SeqMgr.h
index eadb0e0675..76c2674697 100644
--- a/include/Z2AudioLib/Z2SeqMgr.h
+++ b/include/Z2AudioLib/Z2SeqMgr.h
@@ -45,7 +45,7 @@ struct Z2SoundFader {
         fadeIn(fadeTime);
     }
 
-    u32 getCount() {
+    u32 getCount() const {
         return transition_.remainingSteps_;
     }
 
@@ -53,12 +53,8 @@ struct Z2SoundFader {
         return intensity_;
     }
 
-    f32 getDest() {
-        if (getCount() != 0) {
-            return transition_.targetValue_;
-        } else {
-            return intensity_;
-        }
+    f32 getDest() const {
+        return getCount() != 0 ? transition_.targetValue_ : getIntensity();
     }
 
     void calc() {
diff --git a/include/Z2AudioLib/Z2SoundMgr.h b/include/Z2AudioLib/Z2SoundMgr.h
index e8fd244eca..cd6341b2cb 100644
--- a/include/Z2AudioLib/Z2SoundMgr.h
+++ b/include/Z2AudioLib/Z2SoundMgr.h
@@ -9,6 +9,12 @@ u16 seqCallback(JASTrack* track, u16 command);
 
 class Z2SoundMgr : public JASGlobalInstance<Z2SoundMgr> {
 public:
+#if PLATFORM_GCN
+    static const int MAX_CATEGORIES = 9;
+#else
+    static const int MAX_CATEGORIES = 10;
+#endif
+
     Z2SoundMgr();
     void calc();
     void setIIR(JAISound* sound, const s16* iir);
diff --git a/include/Z2AudioLib/Z2SoundObjMgr.h b/include/Z2AudioLib/Z2SoundObjMgr.h
index da709d2e34..a353ff1bcc 100644
--- a/include/Z2AudioLib/Z2SoundObjMgr.h
+++ b/include/Z2AudioLib/Z2SoundObjMgr.h
@@ -96,7 +96,7 @@ public:
     u8 isTwilightBattle();
 
     u8 getEnemyNumNear() const { return enemuNumNear_; }
-    u8 getEnemyNumVeryFar() { return enemuNumVeryFar_; }
+    u8 getEnemyNumVeryFar() const { return enemuNumVeryFar_; }
     bool isForceBattle() { return forceBattle_; }
     JSUList<Z2CreatureEnemy>* getEnemyList() { return this; }
 
diff --git a/include/Z2AudioLib/Z2StatusMgr.h b/include/Z2AudioLib/Z2StatusMgr.h
index 6532801576..615374f2be 100644
--- a/include/Z2AudioLib/Z2StatusMgr.h
+++ b/include/Z2AudioLib/Z2StatusMgr.h
@@ -37,7 +37,7 @@ struct Z2StatusMgr : public JASGlobalInstance<Z2StatusMgr> {
     /* 0x01 */ u8 mMinute;
     /* 0x02 */ u8 mWeekday;
     /* 0x03 */ u8 field_0x03;
-    /* 0x04 */ s16 mTime;
+    /* 0x04 */ u16 mTime;
     /* 0x08 */ void* mEventBit;
     /* 0x0C */ u8 mPauseFlag;
     /* 0x10 */ u32 mCameraMapInfo;