From 3909b6408c0125fe311d49a3029a2806993615f7 Mon Sep 17 00:00:00 2001 From: nullableVoidPtr <30564701+nullableVoidPtr@users.noreply.github.com> Date: Thu, 29 Nov 2018 19:24:28 +0800 Subject: 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 --- src/battle_anim_utility_funcs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/battle_anim_utility_funcs.c') diff --git a/src/battle_anim_utility_funcs.c b/src/battle_anim_utility_funcs.c index 6dfebe77f..5ed30ddc0 100644 --- a/src/battle_anim_utility_funcs.c +++ b/src/battle_anim_utility_funcs.c @@ -3,7 +3,7 @@ #include "contest.h" #include "gpu_regs.h" #include "graphics.h" -#include "malloc.h" +#include "alloc.h" #include "palette.h" #include "sound.h" #include "sprite.h" @@ -82,7 +82,7 @@ void sub_8116664(u8 taskId) animBattlers[1] = gBattleAnimTarget; break; case 5: - animBattlers[0] = 0xFF; + animBattlers[0] = INVALID_U8; break; case 6: selectedPalettes = 0; -- cgit v1.2.3 From f9ff7316d5c7277eb7482e30121388cd65f4ecfc Mon Sep 17 00:00:00 2001 From: nullableVoidPtr <30564701+nullableVoidPtr@users.noreply.github.com> Date: Wed, 5 Dec 2018 22:31:01 +0800 Subject: Remove uses of INVALID_ defines, clean up some arrays with constants, and spaces -> tabs --- src/battle_anim_utility_funcs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/battle_anim_utility_funcs.c') diff --git a/src/battle_anim_utility_funcs.c b/src/battle_anim_utility_funcs.c index 5ed30ddc0..c3d0fe90f 100644 --- a/src/battle_anim_utility_funcs.c +++ b/src/battle_anim_utility_funcs.c @@ -82,7 +82,7 @@ void sub_8116664(u8 taskId) animBattlers[1] = gBattleAnimTarget; break; case 5: - animBattlers[0] = INVALID_U8; + animBattlers[0] = 0xFF; break; case 6: selectedPalettes = 0; -- cgit v1.2.3