summaryrefslogtreecommitdiff
path: root/include/sound.h
diff options
context:
space:
mode:
authorjiangzhengwenjz <jiangzhengwenjzw@qq.com>2019-07-15 00:04:06 +0800
committerjiangzhengwenjz <jiangzhengwenjzw@qq.com>2019-07-15 00:04:06 +0800
commit96fa1a23edaf12082034b4ef79244e6ce3dd3128 (patch)
tree969c8a73b9f5b3ecdb0f7fc13d551f73d4d70e63 /include/sound.h
parent277726fd5e8c6da021206deeecb163f40073ff3c (diff)
parent53b950019aca8896d70c4d5e4f9e2a1d5143e489 (diff)
Merge branch 'master' into pokemon
Diffstat (limited to 'include/sound.h')
-rw-r--r--include/sound.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/sound.h b/include/sound.h
index e720fc1a2..e5736fad8 100644
--- a/include/sound.h
+++ b/include/sound.h
@@ -12,7 +12,6 @@ void StopMapMusic(void);
void FadeOutMapMusic(u8 speed);
void FadeOutAndPlayNewMapMusic(u16 songNum, u8 speed);
void FadeOutAndFadeInNewMapMusic(u16 songNum, u8 fadeOutSpeed, u8 fadeInSpeed);
-void FadeInNewMapMusic(u16 songNum, u8 speed);
bool8 IsNotWaitingForBGMStop(void);
void PlayFanfareByFanfareNum(u8 fanfareNum);
bool8 WaitFanfare(bool8 stop);