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/title_screen.c | |
parent | 78535eea89e8b71f37e188289793e3e18c9bb985 (diff) | |
parent | f89f80daec6d1e9ec85fdc898f1b7914a126612e (diff) |
Merge branch 'master' into modern_gcc
Diffstat (limited to 'src/title_screen.c')
-rw-r--r-- | src/title_screen.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/title_screen.c b/src/title_screen.c index df737fd06..b4aa9f8ed 100644 --- a/src/title_screen.c +++ b/src/title_screen.c @@ -41,7 +41,7 @@ #endif extern u8 gReservedSpritePaletteCount; -extern struct MusicPlayerInfo gMPlay_BGM; +extern struct MusicPlayerInfo gMPlayInfo_BGM; extern u16 gBattle_BG1_Y; extern u16 gBattle_BG1_X; extern const u8 gUnknown_08E9D8CC[]; @@ -851,7 +851,7 @@ static void Task_TitleScreenPhase3(u8 taskId) gBattle_BG1_X = 0; } UpdateLegendaryMarkingColor(gTasks[taskId].tCounter); - if ((gMPlay_BGM.status & 0xFFFF) == 0) + if ((gMPlayInfo_BGM.status & 0xFFFF) == 0) { BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, FADE_COLOR_WHITE); SetMainCallback2(CB2_GoToCopyrightScreen); |