diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-17 19:34:55 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-17 19:34:55 +0100 |
| commit | d0245cf8d23aa65a357977a00b21f58d42dfcf6e (patch) | |
| tree | cb5e1c81baaf882f2bb8f323b04a7b41d316be7b /src/recorded_battle.c | |
| parent | 3e1f3d0e1e2bc5fbe5e630d81b741b653080e77b (diff) | |
| parent | a98c6bf210cec0591badb51be1e472c5fb4f1f1a (diff) | |
recorded battle merge conflicts fix
Diffstat (limited to 'src/recorded_battle.c')
| -rw-r--r-- | src/recorded_battle.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/recorded_battle.c b/src/recorded_battle.c index 12e9cce2d..d7ef254a1 100644 --- a/src/recorded_battle.c +++ b/src/recorded_battle.c @@ -230,7 +230,7 @@ u8 RecordedBattle_ReadBankAction(u8 bank) ResetPaletteFadeControl(); BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); SetMainCallback2(CB2_QuitRecordedBattle); - return 0xFF; + return -1; } else { |