diff options
| author | camthesaxman <cameronghall@cox.net> | 2017-05-10 16:53:37 -0500 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2017-05-10 16:53:37 -0500 |
| commit | 46c1cb5af0f808f56cbb2288dd5741ec6e476998 (patch) | |
| tree | b9ab5e60b66e5a600afc90b41e35ae26ae5cd432 /src/sound.c | |
| parent | 32153295edc1e93bd27894f75f2ab01f9140bed5 (diff) | |
| parent | f546ea4f0bf95ddd4f4a07f7f83b1abc37cf57ea (diff) | |
Merge remote-tracking branch 'upstream/master' into decompile_battle_2
Diffstat (limited to 'src/sound.c')
| -rw-r--r-- | src/sound.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/sound.c b/src/sound.c index 3256c4d67..ed69ca01d 100644 --- a/src/sound.c +++ b/src/sound.c @@ -339,7 +339,7 @@ void PlayCry4(u16 species, s8 pan, u8 mode) } else { - if (!(gBattleTypeFlags & BATTLE_TYPE_40)) + if (!(gBattleTypeFlags & BATTLE_TYPE_MULTI)) m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 85); PlayCryInternal(species, pan, 125, 10, mode); } |