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 /data/maps/Route124 | |
| parent | 6b5157b2a3b2d81f83a910b211834cde5cd3a238 (diff) | |
| parent | 841ee0f2b25b39b923a9f800279df413edb8c66d (diff) | |
merge bike with master, fix conflicts
Diffstat (limited to 'data/maps/Route124')
| -rw-r--r-- | data/maps/Route124/header.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/data/maps/Route124/header.inc b/data/maps/Route124/header.inc index bdd54bf00..e4c690104 100644 --- a/data/maps/Route124/header.inc +++ b/data/maps/Route124/header.inc @@ -3,7 +3,7 @@ Route124: @ 84828FC .4byte Route124_MapEvents .4byte Route124_MapScripts .4byte Route124_MapConnections - .2byte BGM_DOORO_X3 + .2byte MUS_DOORO_X3 .2byte 40 .byte 39 .byte 0 |