Merge branch 'master' into doc-banim

1 files changed, 7 insertions, 26 deletions

diff --git a/include/sound.h b/include/sound.h
index 25ffa2d6e..a5463a456 100644
--- a/include/sound.h
+++ b/include/sound.h
@@ -1,26 +1,7 @@
 #ifndef GUARD_SOUND_H
 #define GUARD_SOUND_H
 
-enum {
-    FANFARE_LEVEL_UP,
-    FANFARE_OBTAIN_ITEM,
-    FANFARE_EVOLVED,
-    FANFARE_OBTAIN_TMHM,
-    FANFARE_HEAL,
-    FANFARE_OBTAIN_BADGE,
-    FANFARE_MOVE_DELETED,
-    FANFARE_OBTAIN_BERRY,
-    FANFARE_AWAKEN_LEGEND,
-    FANFARE_SLOTS_JACKPOT,
-    FANFARE_SLOTS_WIN,
-    FANFARE_TOO_BAD,
-    FANFARE_RG_POKE_FLUTE,
-    FANFARE_RG_OBTAIN_KEY_ITEM,
-    FANFARE_RG_DEX_RATING,
-    FANFARE_OBTAIN_B_POINTS,
-    FANFARE_OBTAIN_SYMBOL,
-    FANFARE_REGISTER_MATCH_CALL,
-};
+#include "constants/sound.h"
 
 void InitMapMusic(void);
 void MapMusicMain(void);
@@ -44,12 +25,12 @@ bool8 IsBGMPausedOrStopped(void);
 void FadeInBGM(u8 speed);
 void FadeOutBGM(u8 speed);
 bool8 IsBGMStopped(void);
-void PlayCry1(u16 species, s8 pan);
-void PlayCry2(u16 species, s8 pan, s8 volume, u8 priority);
-void PlayCry3(u16 species, s8 pan, u8 mode);
-void PlayCry4(u16 species, s8 pan, u8 mode);
-void PlayCry5(u16 species, u8 mode);
-void PlayCry6(u16 species, s8 pan, u8 mode);
+void PlayCry_Normal(u16 species, s8 pan);
+void PlayCry_NormalNoDucking(u16 species, s8 pan, s8 volume, u8 priority);
+void PlayCry_ByMode(u16 species, s8 pan, u8 mode);
+void PlayCry_ReleaseDouble(u16 species, s8 pan, u8 mode);
+void PlayCry_Script(u16 species, u8 mode);
+void PlayCry_DuckNoRestore(u16 species, s8 pan, u8 mode);
 void PlayCryInternal(u16 species, s8 pan, s8 volume, u8 priority, u8 mode);
 bool8 IsCryFinished(void);
 void StopCryAndClearCrySongs(void);