summaryrefslogtreecommitdiff
path: root/src/battle_controller_opponent.c
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2021-10-09 11:33:37 -0400
committerGriffinR <griffin.g.richards@gmail.com>2021-10-09 11:34:51 -0400
commit28de627913f04e059f995169299e41ce4c2544f0 (patch)
treebaba21a14ae6c2d0a7464851346e6217ac8a34be /src/battle_controller_opponent.c
parente26f9d10d7bebee5ea512fc4729ce6adafec66a0 (diff)
Add TRACKS_ALL, remove BGCntrlBitfield
Diffstat (limited to 'src/battle_controller_opponent.c')
-rw-r--r--src/battle_controller_opponent.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/battle_controller_opponent.c b/src/battle_controller_opponent.c
index 87bef4302..4da3b834a 100644
--- a/src/battle_controller_opponent.c
+++ b/src/battle_controller_opponent.c
@@ -334,7 +334,7 @@ static void Intro_TryShinyAnimShowHealthbox(void)
m4aMPlayContinue(&gMPlayInfo_BGM);
}
else
- m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 0x100);
+ m4aMPlayVolumeControl(&gMPlayInfo_BGM, TRACKS_ALL, 0x100);
}
gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].bgmRestored = TRUE;
bgmRestored = TRUE;
@@ -470,7 +470,7 @@ static void SwitchIn_HandleSoundAndEnd(void)
if (gSprites[gBattlerSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy
|| gSprites[gBattlerSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy_2)
{
- m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 0x100);
+ m4aMPlayVolumeControl(&gMPlayInfo_BGM, TRACKS_ALL, 0x100);
OpponentBufferExecCompleted();
}
}