Merge with master

2018-07-16 20:23:05 +02:00
parent ee3d505b58 07ef762770
commit ea5ffa3375
1044 changed files with 7296 additions and 7064 deletions
--- a/src/recorded_battle.c
+++ b/src/recorded_battle.c
@@ -219,7 +219,7 @@ u8 RecordedBattle_GetBattlerAction(u8 battlerId)
    {
        gSpecialVar_Result = gBattleOutcome = B_OUTCOME_PLAYER_TELEPORTED; // hah
        ResetPaletteFadeControl();
-        BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
+        BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0);
        SetMainCallback2(CB2_QuitRecordedBattle);
        return -1;
    }