diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-08-29 03:11:03 -0400 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-08-29 03:11:03 -0400 |
| commit | bb56d4a3f4cab33f899646e0630282fc6176a9c9 (patch) | |
| tree | cb094078122b217fc67e2285614b79c6e83eaf88 /src/overworld.c | |
| parent | c5839905a1259fd7e843c0ffa1ce2470d40b76ae (diff) | |
Give songs meaningful english names
Diffstat (limited to 'src/overworld.c')
| -rw-r--r-- | src/overworld.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/overworld.c b/src/overworld.c index ce14ae88b..0e50a984d 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -1023,7 +1023,7 @@ void Overworld_PlaySpecialMapMusic(void) if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(POKEMON_LEAGUE_CHAMPIONS_ROOM) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(POKEMON_LEAGUE_CHAMPIONS_ROOM)) { PlayerGetDestCoords(&x, &y); - if (y - 7 < 11 && gMPlayInfo_BGM.songHeader == &mus_win_gym) + if (y - 7 < 11 && gMPlayInfo_BGM.songHeader == &mus_victory_gym_leader) { FadeInBGM(4); return; @@ -1034,8 +1034,8 @@ void Overworld_PlaySpecialMapMusic(void) if (gSaveBlock1Ptr->savedMusic) music = gSaveBlock1Ptr->savedMusic; - else if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING) && Overworld_MusicCanOverrideMapMusic(MUS_NAMINORI)) - music = MUS_NAMINORI; + else if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING) && Overworld_MusicCanOverrideMapMusic(MUS_SURF)) + music = MUS_SURF; if (music != GetCurrentMapMusic()) PlayNewMapMusic(music); @@ -1070,10 +1070,10 @@ static void Overworld_TryMapConnectionMusicTransition(void) { newMusic = GetWarpDestinationMusic(); currentMusic = GetCurrentMapMusic(); - if (currentMusic == MUS_NAMINORI) + if (currentMusic == MUS_SURF) return; - if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING) && Overworld_MusicCanOverrideMapMusic(MUS_NAMINORI)) - newMusic = MUS_NAMINORI; + if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING) && Overworld_MusicCanOverrideMapMusic(MUS_SURF)) + newMusic = MUS_SURF; if (newMusic != currentMusic) { if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_MACH_BIKE | PLAYER_AVATAR_FLAG_ACRO_BIKE)) @@ -1192,7 +1192,7 @@ static void ChooseAmbientCrySpecies(void) bool32 Overworld_MusicCanOverrideMapMusic(u16 music) { - if (music == MUS_CYCLING || music == MUS_NAMINORI) + if (music == MUS_CYCLING || music == MUS_SURF) { if (gMapHeader.regionMapSectionId == MAPSEC_KANTO_VICTORY_ROAD || gMapHeader.regionMapSectionId == MAPSEC_ROUTE_23 || gMapHeader.regionMapSectionId == MAPSEC_INDIGO_PLATEAU) return FALSE; |