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_gfx_sfx_util.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/battle_gfx_sfx_util.c')

diff --git a/src/battle_gfx_sfx_util.c b/src/battle_gfx_sfx_util.c
index 6f9d2db80..88dbb5360 100644
--- a/src/battle_gfx_sfx_util.c
+++ b/src/battle_gfx_sfx_util.c
@@ -6,7 +6,7 @@
 #include "constants/battle_anim.h"
 #include "battle_interface.h"
 #include "main.h"
-#include "malloc.h"
+#include "alloc.h"
 #include "graphics.h"
 #include "random.h"
 #include "util.h"
@@ -122,7 +122,7 @@ void FreeBattleSpritesData(void)
 u16 ChooseMoveAndTargetInBattlePalace(void)
 {
     s32 i, var1, var2;
-    s32 chosenMoveId = -1;
+    s32 chosenMoveId = INVALID_S32;
     struct ChooseMoveStruct *moveInfo = (struct ChooseMoveStruct*)(&gBattleBufferA[gActiveBattler][4]);
     u8 unusableMovesBits = CheckMoveLimitations(gActiveBattler, 0, 0xFF);
     s32 percent = Random() % 100;
-- 
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_gfx_sfx_util.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/battle_gfx_sfx_util.c')

diff --git a/src/battle_gfx_sfx_util.c b/src/battle_gfx_sfx_util.c
index 88dbb5360..8d7ed2dce 100644
--- a/src/battle_gfx_sfx_util.c
+++ b/src/battle_gfx_sfx_util.c
@@ -122,7 +122,7 @@ void FreeBattleSpritesData(void)
 u16 ChooseMoveAndTargetInBattlePalace(void)
 {
     s32 i, var1, var2;
-    s32 chosenMoveId = INVALID_S32;
+    s32 chosenMoveId = -1;
     struct ChooseMoveStruct *moveInfo = (struct ChooseMoveStruct*)(&gBattleBufferA[gActiveBattler][4]);
     u8 unusableMovesBits = CheckMoveLimitations(gActiveBattler, 0, 0xFF);
     s32 percent = Random() % 100;
-- 
cgit v1.2.3