merge bike with master, fix conflicts

2017-12-24 00:08:55 +01:00
parent 6b5157b2a3 841ee0f2b2
commit 8cd4908fa3
1429 changed files with 532566 additions and 21602 deletions
@@ -1000,8 +1000,8 @@ void GetOnOffBike(u8 transitionFlags)
    else
    {
        SetPlayerAvatarTransitionFlags(transitionFlags);
-        Overworld_SetSavedMusic(BGM_CYCLING);
-        Overworld_ChangeMusicTo(BGM_CYCLING);
+        Overworld_SetSavedMusic(MUS_CYCLING);
+        Overworld_ChangeMusicTo(MUS_CYCLING);
    }
 }