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_script_commands.c | |
| parent | 09d3da101bd1b1c9d7471e7a193f0af7cae0ab73 (diff) | |
| parent | 309640a28c63528fda8d6b50b9d5bb83eddeb8c9 (diff) | |
Merge branch 'master' into mac_build_and_libc
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]; |