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/pokeblock_feed.c | |
| parent | 09d3da101bd1b1c9d7471e7a193f0af7cae0ab73 (diff) | |
| parent | 309640a28c63528fda8d6b50b9d5bb83eddeb8c9 (diff) | |
Merge branch 'master' into mac_build_and_libc
Diffstat (limited to 'src/pokeblock_feed.c')
| -rw-r--r-- | src/pokeblock_feed.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/pokeblock_feed.c b/src/pokeblock_feed.c index 1bf40bbe5..b26da118c 100644 --- a/src/pokeblock_feed.c +++ b/src/pokeblock_feed.c @@ -50,7 +50,7 @@ struct PokeblockFeedStruct }; extern u16 gSpecialVar_ItemId; -extern struct MusicPlayerInfo gMPlay_BGM; +extern struct MusicPlayerInfo gMPlayInfo_BGM; extern struct SpriteTemplate gUnknown_0202499C; extern const u8 gBattleTerrainPalette_Frontier[]; @@ -802,7 +802,7 @@ static void Task_ReturnAfterPaletteFade(u8 taskId) { ResetSpriteData(); FreeAllSpritePalettes(); - m4aMPlayVolumeControl(&gMPlay_BGM, -1, 0x100); + m4aMPlayVolumeControl(&gMPlayInfo_BGM, -1, 0x100); SetMainCallback2(gMain.savedCallback); DestroyTask(taskId); FreeAllWindowBuffers(); |