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

(limited to 'src/fldeff_cut.c')

diff --git a/src/fldeff_cut.c b/src/fldeff_cut.c
index 230a95e0b..2cffd5d41 100644
--- a/src/fldeff_cut.c
+++ b/src/fldeff_cut.c
@@ -6,7 +6,7 @@
 #include "field_player_avatar.h"
 #include "fieldmap.h"
 #include "fldeff_cut.h"
-#include "malloc.h"
+#include "alloc.h"
 #include "metatile_behavior.h"
 #include "overworld.h"
 #include "party_menu.h"
@@ -164,7 +164,7 @@ const struct SpritePalette gFieldEffectObjectPaletteInfo6 = {gFieldEffectObjectP
 
 static const struct SpriteTemplate sSpriteTemplate_CutGrass =
 {
-    .tileTag = 0xFFFF,
+    .tileTag = INVALID_U16,
     .paletteTag = 0x1000,
     .oam = &sOamData_CutGrass,
     .anims = sSpriteAnimTable_CutGrass,
-- 
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/fldeff_cut.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/fldeff_cut.c')

diff --git a/src/fldeff_cut.c b/src/fldeff_cut.c
index 2cffd5d41..6a310efd2 100644
--- a/src/fldeff_cut.c
+++ b/src/fldeff_cut.c
@@ -164,7 +164,7 @@ const struct SpritePalette gFieldEffectObjectPaletteInfo6 = {gFieldEffectObjectP
 
 static const struct SpriteTemplate sSpriteTemplate_CutGrass =
 {
-    .tileTag = INVALID_U16,
+    .tileTag = 0xFFFF,
     .paletteTag = 0x1000,
     .oam = &sOamData_CutGrass,
     .anims = sSpriteAnimTable_CutGrass,
-- 
cgit v1.2.3