diff options
| author | KDSKardabox <bollygame94@gmail.com> | 2018-12-09 13:44:41 +0530 |
|---|---|---|
| committer | KDSKardabox <bollygame94@gmail.com> | 2018-12-09 13:44:41 +0530 |
| commit | 8712757d2454a8ee15680a658ea7df8621954bef (patch) | |
| tree | 5f0ebfdccc0e22c0e52f8d223ec4889c7597569f /src/recorded_battle.c | |
| parent | f8838491f6c46df771c5414f8b6da781294300b7 (diff) | |
| parent | 0b91d2948a431a5d44166544897a550061c01a31 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/recorded_battle.c')
| -rw-r--r-- | src/recorded_battle.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/recorded_battle.c b/src/recorded_battle.c index 5d79cb789..81935b7c6 100644 --- a/src/recorded_battle.c +++ b/src/recorded_battle.c @@ -9,7 +9,7 @@ #include "string_util.h" #include "palette.h" #include "save.h" -#include "malloc.h" +#include "alloc.h" #include "util.h" #include "task.h" #include "text.h" @@ -221,7 +221,7 @@ u8 RecordedBattle_GetBattlerAction(u8 battlerId) ResetPaletteFadeControl(); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0); SetMainCallback2(CB2_QuitRecordedBattle); - return -1; + return 0xFF; } else { |