diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2018-01-14 21:41:29 -0600 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2018-01-14 21:41:29 -0600 |
| commit | 11cb3275cc53c2bcea4fdcfe11d9d9d429ee9c02 (patch) | |
| tree | eeac196360a94773ce50b7c7c2f5204e89a8610d /src/battle_controller_opponent.c | |
| parent | 404c415ef69f527adc3e795f4fd65f15c83402c4 (diff) | |
| parent | 59680b2a73bbe18566a2051102fd6424f7f13c8c (diff) | |
Merge remote-tracking branch 'Diego/master'
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(); } } |