diff options
| author | Cameron Hall <camthesaxman@users.noreply.github.com> | 2019-07-30 21:31:27 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-30 21:31:27 -0500 |
| commit | bc159dbb03735db55e6a09bb7947dccc70d0532b (patch) | |
| tree | 5b27866fe839d0f2f7ae76e0f13580ecea2dd863 /src/pokeblock_feed.c | |
| parent | b8393b3a799f92e7064c266600607d98f6baf4d9 (diff) | |
| parent | cf0da4c3bb5658908275068591fe51fb6f2ce49d (diff) | |
Merge pull request #752 from camthesaxman/emerald_diff
resolve some Emerald differences
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 a4614f52d..cb3d8789e 100644 --- a/src/pokeblock_feed.c +++ b/src/pokeblock_feed.c @@ -21,7 +21,7 @@ #include "trig.h" #include "ewram.h" -extern struct MusicPlayerInfo gMPlay_BGM; +extern struct MusicPlayerInfo gMPlayInfo_BGM; extern u8 gPokeblockMonID; extern s16 gPokeblockGain; @@ -743,7 +743,7 @@ static void Task_ReturnAfterPaletteFade(u8 taskID) { if (!gPaletteFade.active) { - m4aMPlayVolumeControl(&gMPlay_BGM, -1, 256); + m4aMPlayVolumeControl(&gMPlayInfo_BGM, -1, 256); SetMainCallback2(gMain.savedCallback); DestroyTask(taskID); } |