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_script_commands.c | |
| parent | 404c415ef69f527adc3e795f4fd65f15c83402c4 (diff) | |
| parent | 59680b2a73bbe18566a2051102fd6424f7f13c8c (diff) | |
Merge remote-tracking branch 'Diego/master'
Diffstat (limited to 'src/battle_script_commands.c')
| -rw-r--r-- | src/battle_script_commands.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 4ddf2472e..c7976fc2a 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -112,7 +112,7 @@ extern u16 gBattle_BG1_Y; extern u16 gBattle_BG2_X; extern u16 gBattle_BG2_Y; extern u16 gBattle_BG3_X; -extern struct MusicPlayerInfo gMPlay_BGM; +extern struct MusicPlayerInfo gMPlayInfo_BGM; struct TrainerMoney { @@ -7103,10 +7103,10 @@ static void atk76_various(void) } break; case 21: - m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 0x55); + m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 0x55); break; case 22: - m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 0x100); + m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 0x100); break; case 23: gBattleStruct->field_2A2 |= gBitTable[gActiveBank]; |