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_script_commands.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_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]; |