diff options
| author | scnorton <scnorton@biociphers.org> | 2018-01-16 17:09:36 -0500 |
|---|---|---|
| committer | scnorton <scnorton@biociphers.org> | 2018-01-16 17:09:36 -0500 |
| commit | d8bb1d15e7941d9689393f1215c82788a793af50 (patch) | |
| tree | 7006f3de7d3cf5a0fce6af66bd182d3d3f985854 /src/battle_controller_opponent.c | |
| parent | 09d3da101bd1b1c9d7471e7a193f0af7cae0ab73 (diff) | |
| parent | 309640a28c63528fda8d6b50b9d5bb83eddeb8c9 (diff) | |
Merge branch 'master' into mac_build_and_libc
Diffstat (limited to 'src/battle_controller_opponent.c')
| -rw-r--r-- | src/battle_controller_opponent.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/battle_controller_opponent.c b/src/battle_controller_opponent.c index 8aeab6a55..30414d53a 100644 --- a/src/battle_controller_opponent.c +++ b/src/battle_controller_opponent.c @@ -38,7 +38,7 @@ extern u8 gBankSpriteIds[BATTLE_BANKS_COUNT]; extern u8 gBattleBufferA[BATTLE_BANKS_COUNT][0x200]; extern u8 gBattleBufferB[BATTLE_BANKS_COUNT][0x200]; extern u8 gHealthBoxesIds[BATTLE_BANKS_COUNT]; -extern struct MusicPlayerInfo gMPlay_BGM; +extern struct MusicPlayerInfo gMPlayInfo_BGM; extern u8 gUnknown_03005D7C[BATTLE_BANKS_COUNT]; extern void (*gBattleBankFunc[BATTLE_BANKS_COUNT])(void); extern void *gUnknown_020244D8; @@ -350,10 +350,10 @@ static void sub_805F560(void) if (gBattleTypeFlags & BATTLE_TYPE_MULTI && gBattleTypeFlags & BATTLE_TYPE_LINK) { if (GetBankIdentity(gActiveBank) == 1) - m4aMPlayContinue(&gMPlay_BGM); + m4aMPlayContinue(&gMPlayInfo_BGM); } else - m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 0x100); + m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 0x100); } gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x20 = 1; sp = TRUE; @@ -485,7 +485,7 @@ static void sub_805FC80(void) { if (gSprites[gBankSpriteIds[gActiveBank]].callback == SpriteCallbackDummy || gSprites[gBankSpriteIds[gActiveBank]].callback == SpriteCallbackDummy_2) { - m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 0x100); + m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 0x100); OpponentBufferExecCompleted(); } } |