diff options
author | Phlosioneer <mattmdrr2@gmail.com> | 2019-03-31 20:22:47 -0400 |
---|---|---|
committer | Phlosioneer <mattmdrr2@gmail.com> | 2019-03-31 20:22:47 -0400 |
commit | 37c7441a158f1c7046034a32eab8e1cbd79c69b9 (patch) | |
tree | abb77f18cf12ba633407e20bbcadf65773a21c74 /src/sound.c | |
parent | 23ac2cc94e2914a427e97467103c0160af6f1be0 (diff) | |
parent | 93c4e35d844046d12c7d8bcc64e8fc3e03e85e0d (diff) |
Merge branch 'master' into contest-data
Diffstat (limited to 'src/sound.c')
-rw-r--r-- | src/sound.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/sound.c b/src/sound.c index ebb4fad75..16f024858 100644 --- a/src/sound.c +++ b/src/sound.c @@ -264,7 +264,7 @@ void FadeInNewBGM(u16 songNum, u8 speed) { if (gDisableMusic) songNum = 0; - if (songNum == 0xFFFF) + if (songNum == MUS_NONE) songNum = 0; m4aSongNumStart(songNum); m4aMPlayImmInit(&gMPlayInfo_BGM); @@ -561,7 +561,7 @@ void PlayBGM(u16 songNum) { if (gDisableMusic) songNum = 0; - if (songNum == 0xFFFF) + if (songNum == MUS_NONE) songNum = 0; m4aSongNumStart(songNum); } |