diff options
| author | nullableVoidPtr <30564701+nullableVoidPtr@users.noreply.github.com> | 2018-11-29 19:24:28 +0800 |
|---|---|---|
| committer | nullableVoidPtr <30564701+nullableVoidPtr@users.noreply.github.com> | 2018-12-06 09:44:08 +0800 |
| commit | 3909b6408c0125fe311d49a3029a2806993615f7 (patch) | |
| tree | a02365a6eb268dce08941968e11e319f3a7fe080 /src/recorded_battle.c | |
| parent | 1b33ad6c26fa83aa7b77055ddde59c61df03d0e4 (diff) | |
Fix alloc.c as per #386, define INVALID_ constants and rename malloc to alloc as per #325
Some of the INVALID_ are likely erroneously placed, due to lack of documentation
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..3fc08ff3f 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 INVALID_U8; } else { |