diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-05-06 14:48:14 -0400 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-05-06 14:48:14 -0400 |
| commit | d3127e359447688e37cad222ae1586c6ec202ab0 (patch) | |
| tree | ace0980ae648527f3afa5d4b80ede4cb70479b2b /src/overworld.c | |
| parent | 554a26b6bece91e89cacd2ed2138b1dc66b31789 (diff) | |
Sync common scripts up to prof_birch.inc
Diffstat (limited to 'src/overworld.c')
| -rw-r--r-- | src/overworld.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/overworld.c b/src/overworld.c index 40525db5e..f46396c25 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -926,7 +926,7 @@ void Overworld_ClearSavedMusic(void) void sub_8053F0C(void) { - if (FlagGet(FLAG_SPECIAL_FLAG_1) != TRUE) + if (FlagGet(FLAG_DONT_TRANSITION_MUSIC) != TRUE) { u16 newMusic = GetWarpDestinationMusic(); u16 currentMusic = GetCurrentMapMusic(); @@ -973,7 +973,7 @@ u8 GetMapMusicFadeoutSpeed(void) void TryFadeOutOldMapMusic(void) { u16 music = GetWarpDestinationMusic(); - if (FlagGet(FLAG_SPECIAL_FLAG_1) != TRUE && music != GetCurrentMapMusic()) + if (FlagGet(FLAG_DONT_TRANSITION_MUSIC) != TRUE && music != GetCurrentMapMusic()) { u8 speed = GetMapMusicFadeoutSpeed(); FadeOutMapMusic(speed); |