diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-24 00:08:55 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-24 00:08:55 +0100 |
| commit | 8cd4908fa3820b22a8b4e3d96780d725132549c4 (patch) | |
| tree | bcc8e697ce7dd0d4ab532a61fccafbbdb6d2400e /src/bike.c | |
| parent | 6b5157b2a3b2d81f83a910b211834cde5cd3a238 (diff) | |
| parent | 841ee0f2b25b39b923a9f800279df413edb8c66d (diff) | |
merge bike with master, fix conflicts
Diffstat (limited to 'src/bike.c')
| -rw-r--r-- | src/bike.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/bike.c b/src/bike.c index b97a6dba6..64af7c711 100644 --- a/src/bike.c +++ b/src/bike.c @@ -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); } } |