diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-09-05 09:38:27 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-09-05 09:38:27 -0400 |
| commit | 3d3ec3150a7d297efe8b1dffe28a28275692f819 (patch) | |
| tree | e86983f4601dc74a8113dae471fa12315effb02f /src/pokeblock_feed.c | |
| parent | 78535eea89e8b71f37e188289793e3e18c9bb985 (diff) | |
| parent | f89f80daec6d1e9ec85fdc898f1b7914a126612e (diff) | |
Merge branch 'master' into modern_gcc
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); } |