diff options
| author | golem galvanize <golemgalvanize@github.com> | 2018-01-16 21:53:55 -0500 |
|---|---|---|
| committer | golem galvanize <golemgalvanize@github.com> | 2018-01-16 21:53:55 -0500 |
| commit | c06bb601837c810ec71b05c0887118269613855d (patch) | |
| tree | 8ea80e699262df68bf854011e037e03b6f7542f5 /src/battle_controller_player.c | |
| parent | 35f88987254544aa77ec3fb1906e4b545b5b5f2d (diff) | |
| parent | 23f45bd2b6790df259caa180d46706cbdd54f86f (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into dump_slot_machine.s
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 6023552c3..a9d5b70eb 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -43,7 +43,7 @@ extern u8 gBattleBufferA[BATTLE_BANKS_COUNT][0x200]; extern u8 gBattleBufferB[BATTLE_BANKS_COUNT][0x200]; extern u8 gMultiUsePlayerCursor; extern struct BattlePokemon gBattleMons[BATTLE_BANKS_COUNT]; -extern struct MusicPlayerInfo gMPlay_BGM; +extern struct MusicPlayerInfo gMPlayInfo_BGM; extern u16 gPartnerTrainerId; extern struct SpriteTemplate gUnknown_0202499C; extern u8 gBattleMonForms[BATTLE_BANKS_COUNT]; @@ -1054,9 +1054,9 @@ static void sub_8058B40(void) if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x20) { if (gBattleTypeFlags & BATTLE_TYPE_MULTI && gBattleTypeFlags & BATTLE_TYPE_LINK) - m4aMPlayContinue(&gMPlay_BGM); + m4aMPlayContinue(&gMPlayInfo_BGM); else - m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 0x100); + m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 0x100); } gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x20 = 1; r9 = TRUE; @@ -1119,7 +1119,7 @@ static void sub_8058FC0(void) if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].specialAnimActive && !IsCryPlayingOrClearCrySongs()) { - m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 0x100); + m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 0x100); HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank); PlayerBufferExecCompleted(); } @@ -1148,7 +1148,7 @@ void c3_0802FDF4(u8 taskId) { if (!IsCryPlayingOrClearCrySongs()) { - m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 0x100); + m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 0x100); DestroyTask(taskId); } } |