diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-10-17 11:32:30 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-17 11:32:30 -0400 |
| commit | 164590e37d67a385bf6479aafcbe5b351891bc0b (patch) | |
| tree | c3d4cac1627512d166440ead47d9f2285c8b4044 /src/battle_controller_opponent.c | |
| parent | a4a3c1c9e5a0026415330eab9bea2f8f3e83e0a3 (diff) | |
| parent | 1f39c34ca47e43b0afccaabe97d1df19e3f0b39b (diff) | |
Merge pull request #1512 from GriffinRichards/minor-constants
Add some misc constants/usage
Diffstat (limited to 'src/battle_controller_opponent.c')
| -rw-r--r-- | src/battle_controller_opponent.c | 4 |
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(); } } |