diff options
| author | huderlem <huderlem@gmail.com> | 2019-10-19 08:05:11 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-19 08:05:11 -0500 |
| commit | cb9f89925f35e2b0e7f13644a8bda90cd6c387bf (patch) | |
| tree | 22242b9f9d9a22096de6d5a0e7190b7b07a23a68 /src/overworld.c | |
| parent | 8b1df92aca6c9d0eb3bcd932be7795eda879c2a0 (diff) | |
| parent | b4a9298205ee9355fadd4455a9b8f692dcd3e787 (diff) | |
Merge pull request #841 from GriffinRichards/document-gyms2
Document Petalburg, Fortree, Mossdeep, and Sootopolis Gyms
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 d796a670f..55afe2fcf 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -1183,7 +1183,7 @@ void Overworld_ClearSavedMusic(void) static void sub_8085810(void) { - if (FlagGet(FLAG_SPECIAL_FLAG_0x4001) != TRUE) + if (FlagGet(FLAG_DONT_TRANSITION_MUSIC) != TRUE) { u16 newMusic = GetWarpDestinationMusic(); u16 currentMusic = GetCurrentMapMusic(); @@ -1231,7 +1231,7 @@ void TryFadeOutOldMapMusic(void) { u16 currentMusic = GetCurrentMapMusic(); u16 warpMusic = GetWarpDestinationMusic(); - if (FlagGet(FLAG_SPECIAL_FLAG_0x4001) != TRUE && warpMusic != GetCurrentMapMusic()) + if (FlagGet(FLAG_DONT_TRANSITION_MUSIC) != TRUE && warpMusic != GetCurrentMapMusic()) { if (currentMusic == MUS_NAMINORI && VarGet(VAR_SKY_PILLAR_STATE) == 2 |