Merge branch 'master' into doc-cablecar

2020-08-28 16:17:48 -04:00
parent 71a066f945 09cfed64b5
commit 08a8aad65a
1185 changed files with 10758 additions and 10803 deletions
@@ -351,7 +351,7 @@ static void CB2_LoadCableCar(void)
        break;
    case 8:
        BeginNormalPaletteFade(0xFFFFFFFF, 3, 16, 0, RGB(0, 0, 0));
-        FadeInNewBGM(MUS_ROPEWAY, 1);
+        FadeInNewBGM(MUS_CABLE_CAR, 1);
        SetBgRegs(TRUE);
        gMain.state++;
        break;