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/fldeff_cut.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/fldeff_cut.c')
| -rw-r--r-- | src/fldeff_cut.c | 4 |
1 files changed, 2 insertions, 2 deletions
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, |