diff options
| author | camthesaxman <cameronghall@cox.net> | 2019-07-29 21:17:54 -0500 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2019-07-29 21:17:54 -0500 |
| commit | ea0dfce3c41c6348cfbea086c291ab19744def9a (patch) | |
| tree | 26c30719ebfb546dcbc7aa68e002a3db4b5bb30a /src/battle_controller_player.c | |
| parent | db4af549fdf13cdaca6654f7bb9ef54ecef14359 (diff) | |
gMPlay to gMPlayInfo
Diffstat (limited to 'src/battle_controller_player.c')
| -rw-r--r-- | src/battle_controller_player.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c index 86105cb54..7de3ada41 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -148,7 +148,7 @@ extern u8 gUnknown_03004348; extern struct BattlePokemon gBattleMons[]; extern MainCallback gPreBattleCallback1; extern u8 gHealthboxSpriteIds[]; -extern struct MusicPlayerInfo gMPlay_BGM; +extern struct MusicPlayerInfo gMPlayInfo_BGM; extern u8 gUnknown_0300434C[]; extern u8 gUnknown_0202E8F4; extern u8 gUnknown_0202E8F5; @@ -1209,9 +1209,9 @@ void sub_802D31C(void) FreeSpriteTilesByTag(0x27F9); FreeSpritePaletteByTag(0x27F9); if (gBattleTypeFlags & BATTLE_TYPE_MULTI) - m4aMPlayContinue(&gMPlay_BGM); + m4aMPlayContinue(&gMPlayInfo_BGM); else - m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 256); + m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 256); HandleLowHpMusicChange(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], gActiveBattler); if (IsDoubleBattle()) HandleLowHpMusicChange(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler ^ 2]], gActiveBattler ^ 2); @@ -1269,7 +1269,7 @@ void sub_802D730(void) { if (!ewram17810[gActiveBattler].unk0_6 && !IsCryPlayingOrClearCrySongs()) { - m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 0x100); + m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 0x100); HandleLowHpMusicChange(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], gActiveBattler); PlayerBufferExecCompleted(); } @@ -1295,7 +1295,7 @@ void c3_0802FDF4(u8 taskId) { if (!IsCryPlayingOrClearCrySongs()) { - m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 0x100); + m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 0x100); DestroyTask(taskId); } } |