recorded battle merge conflicts fix

2017-11-17 19:34:55 +01:00
parent 3e1f3d0e1e a98c6bf210
commit d0245cf8d2
2890 changed files with 157210 additions and 15752 deletions
@@ -230,7 +230,7 @@ u8 RecordedBattle_ReadBankAction(u8 bank)
        ResetPaletteFadeControl();
        BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
        SetMainCallback2(CB2_QuitRecordedBattle);
-        return 0xFF;
+        return -1;
    }
    else
    {