diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-12-08 21:44:12 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-08 21:44:12 -0600 |
| commit | 0b91d2948a431a5d44166544897a550061c01a31 (patch) | |
| tree | 6e590fbd965b8cd96852ec36474a6841a74dc9b8 /src/recorded_battle.c | |
| parent | 88ffb0976571c8782a5e632df79d34b7260882c9 (diff) | |
| parent | cceb8ac3314c9ba5a48d0b69bc39c41080335119 (diff) | |
Merge pull request #429 from nullableVoidPtr/master
Various fixes and cleanups
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 { |