diff options
| author | robojumper <robojumper@gmail.com> | 2025-07-09 22:18:34 +0200 |
|---|---|---|
| committer | robojumper <robojumper@gmail.com> | 2025-09-13 11:07:47 +0200 |
| commit | a617b9f8cf8a6c3688f1034b2db641c9a092900c (patch) | |
| tree | 90969139b18ebfcd2c704e9ca4cee9eacfc3a438 /include/d/snd | |
| parent | 4f9d63d357dfbdf3f08a7294eb2fbc7ccfe790cf (diff) | |
Cleanup
Diffstat (limited to 'include/d/snd')
| -rw-r--r-- | include/d/snd/d_snd_bgm_mgr.h | 3 | ||||
| -rw-r--r-- | include/d/snd/d_snd_source.h | 4 | ||||
| -rw-r--r-- | include/d/snd/d_snd_source_if.h | 2 | ||||
| -rw-r--r-- | include/d/snd/d_snd_source_mgr.h | 2 |
4 files changed, 8 insertions, 3 deletions
diff --git a/include/d/snd/d_snd_bgm_mgr.h b/include/d/snd/d_snd_bgm_mgr.h index ff05db51..aa8654fa 100644 --- a/include/d/snd/d_snd_bgm_mgr.h +++ b/include/d/snd/d_snd_bgm_mgr.h @@ -73,7 +73,10 @@ public: /** Runs when the fight is over, no matter how you started it */ bool endBgmBattleRoom(); + bool beginBgmBattleMainLoop(); + bool isPlayingAnyBattleMusic(); + void cullTooManyPreparingSounds(); void removeFromAllBgmSoundLists(dSndBgmSound_c *sound); void addToBgmSoundList(BgmSoundList_e list, dSndBgmSound_c *sound); diff --git a/include/d/snd/d_snd_source.h b/include/d/snd/d_snd_source.h index 161322ab..f84105b5 100644 --- a/include/d/snd/d_snd_source.h +++ b/include/d/snd/d_snd_source.h @@ -183,7 +183,7 @@ public: return false; } /* 0x0F0 */ virtual void vt_0x0F0_noop() override {} - /* 0x0F4 */ virtual void setField0x101(u8 value) override { + /* 0x0F4 */ virtual void setField0x101(bool value) override { field_0x101 = value; } /* 0x0F8 */ virtual void setField0x102(u8 value) override { @@ -273,7 +273,7 @@ protected: /* 0x0FE */ u8 mSubtype; /* 0x0FF */ bool mIsSetup; /* 0x100 */ u8 field_0x100; - /* 0x101 */ u8 field_0x101; + /* 0x101 */ bool field_0x101; /* 0x102 */ u8 field_0x102; /* 0x104 */ u32 mFlagsPersistent; /* 0x108 */ u32 mFlagsHold; diff --git a/include/d/snd/d_snd_source_if.h b/include/d/snd/d_snd_source_if.h index 2ff36728..86a08c9f 100644 --- a/include/d/snd/d_snd_source_if.h +++ b/include/d/snd/d_snd_source_if.h @@ -93,7 +93,7 @@ public: /* 0x0E8 */ virtual bool isPlayingActionSound() const = 0; /* 0x0EC */ virtual bool isCurrentActionSound(u32 id) const = 0; /* 0x0F0 */ virtual void vt_0x0F0_noop() = 0; - /* 0x0F4 */ virtual void setField0x101(u8 value) = 0; + /* 0x0F4 */ virtual void setField0x101(bool value) = 0; /* 0x0F8 */ virtual void setField0x102(u8 value) = 0; /* 0x0FC */ virtual bool isInaudible() = 0; /* 0x100 */ virtual bool hasAnimSound() = 0; diff --git a/include/d/snd/d_snd_source_mgr.h b/include/d/snd/d_snd_source_mgr.h index 6bcbefad..e1eb6a28 100644 --- a/include/d/snd/d_snd_source_mgr.h +++ b/include/d/snd/d_snd_source_mgr.h @@ -62,6 +62,8 @@ public: field_0x3868--; } + void setMutedFromFader(bool muteFlag); + private: void calcEnemyObjVolume(); |