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/trainer_pokemon_sprites.c | 42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

(limited to 'src/trainer_pokemon_sprites.c')

diff --git a/src/trainer_pokemon_sprites.c b/src/trainer_pokemon_sprites.c
index 040310901..fd97623fe 100644
--- a/src/trainer_pokemon_sprites.c
+++ b/src/trainer_pokemon_sprites.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "sprite.h"
 #include "window.h"
-#include "malloc.h"
+#include "alloc.h"
 #include "constants/species.h"
 #include "palette.h"
 #include "decompress.h"
@@ -107,9 +107,9 @@ static void LoadPicPaletteByTagOrSlot(u16 species, u32 otId, u32 personality, u8
 {
     if (!isTrainer)
     {
-        if (paletteTag == 0xFFFF)
+        if (paletteTag == INVALID_U16)
         {
-            sCreatingSpriteTemplate.paletteTag |= 0xFFFF;
+            sCreatingSpriteTemplate.paletteTag |= INVALID_U16;
             LoadCompressedPalette(GetFrontSpritePalFromSpeciesAndPersonality(species, otId, personality), 0x100 + paletteSlot * 0x10, 0x20);
         }
         else
@@ -120,9 +120,9 @@ static void LoadPicPaletteByTagOrSlot(u16 species, u32 otId, u32 personality, u8
     }
     else
     {
-        if (paletteTag == 0xFFFF)
+        if (paletteTag == INVALID_U16)
         {
-            sCreatingSpriteTemplate.paletteTag |= 0xFFFF;
+            sCreatingSpriteTemplate.paletteTag |= INVALID_U16;
             LoadCompressedPalette(gTrainerFrontPicPaletteTable[species].data, 0x100 + paletteSlot * 0x10, 0x20);
         }
         else
@@ -166,30 +166,30 @@ static u16 CreatePicSprite(u16 species, u32 otId, u32 personality, bool8 isFront
     }
     if (i == PICS_COUNT)
     {
-        return 0xFFFF;
+        return INVALID_U16;
     }
     framePics = Alloc(4 * 0x800);
     if (!framePics)
     {
-        return 0xFFFF;
+        return INVALID_U16;
     }
     images = Alloc(4 * sizeof(struct SpriteFrameImage));
     if (!images)
     {
         Free(framePics);
-        return 0xFFFF;
+        return INVALID_U16;
     }
     if (DecompressPic(species, personality, isFrontPic, framePics, isTrainer, ignoreDeoxys))
     {
         // debug trap?
-        return 0xFFFF;
+        return INVALID_U16;
     }
     for (j = 0; j < 4; j ++)
     {
         images[j].data = framePics + 0x800 * j;
         images[j].size = 0x800;
     }
-    sCreatingSpriteTemplate.tileTag = 0xFFFF;
+    sCreatingSpriteTemplate.tileTag = INVALID_U16;
     sCreatingSpriteTemplate.oam = &gUnknown_0860B064;
     AssignSpriteAnimsTable(isTrainer);
     sCreatingSpriteTemplate.images = images;
@@ -197,7 +197,7 @@ static u16 CreatePicSprite(u16 species, u32 otId, u32 personality, bool8 isFront
     sCreatingSpriteTemplate.callback = DummyPicSpriteCallback;
     LoadPicPaletteByTagOrSlot(species, otId, personality, paletteSlot, paletteTag, isTrainer);
     spriteId = CreateSprite(&sCreatingSpriteTemplate, x, y, 0);
-    if (paletteTag == 0xFFFF)
+    if (paletteTag == INVALID_U16)
     {
         gSprites[spriteId].oam.paletteNum = paletteSlot;
     }
@@ -232,12 +232,12 @@ u16 CreatePicSprite2(u16 species, u32 otId, u32 personality, u8 flags, s16 x, s1
     }
     if (i == PICS_COUNT)
     {
-        return 0xFFFF;
+        return INVALID_U16;
     }
     framePics = Alloc(4 * 0x800);
     if (!framePics)
     {
-        return 0xFFFF;
+        return INVALID_U16;
     }
     if (flags & 0x80)
     {
@@ -252,19 +252,19 @@ u16 CreatePicSprite2(u16 species, u32 otId, u32 personality, u8 flags, s16 x, s1
     if (!images)
     {
         Free(framePics);
-        return 0xFFFF;
+        return INVALID_U16;
     }
     if (DecompressPic(species, personality, flags, framePics, FALSE, FALSE))
     {
         // debug trap?
-        return 0xFFFF;
+        return INVALID_U16;
     }
     for (j = 0; j < 4; j ++)
     {
         images[j].data = framePics + 0x800 * j;
         images[j].size = 0x800;
     }
-    sCreatingSpriteTemplate.tileTag = 0xFFFF;
+    sCreatingSpriteTemplate.tileTag = INVALID_U16;
     sCreatingSpriteTemplate.anims = gMonAnimationsSpriteAnimsPtrTable[species];
     sCreatingSpriteTemplate.images = images;
     if (flags2 == 0x01)
@@ -285,7 +285,7 @@ u16 CreatePicSprite2(u16 species, u32 otId, u32 personality, u8 flags, s16 x, s1
     sCreatingSpriteTemplate.callback = DummyPicSpriteCallback;
     LoadPicPaletteByTagOrSlot(species, otId, personality, paletteSlot, paletteTag, FALSE);
     spriteId = CreateSprite(&sCreatingSpriteTemplate, x, y, 0);
-    if (paletteTag == 0xFFFF)
+    if (paletteTag == INVALID_U16)
     {
         gSprites[spriteId].oam.paletteNum = paletteSlot;
     }
@@ -312,11 +312,11 @@ static u16 FreeAndDestroyPicSpriteInternal(u16 spriteId)
     }
     if (i == PICS_COUNT)
     {
-        return 0xFFFF;
+        return INVALID_U16;
     }
     framePics = sSpritePics[i].frames;
     images = sSpritePics[i].images;
-    if (sSpritePics[i].paletteTag != 0xFFFF)
+    if (sSpritePics[i].paletteTag != INVALID_U16)
     {
         FreeSpritePaletteByTag(GetSpritePaletteTagByPaletteNum(gSprites[spriteId].oam.paletteNum));
     }
@@ -331,7 +331,7 @@ static u16 sub_818D65C(u16 species, u32 otId, u32 personality, bool8 isFrontPic,
 {
     if (DecompressPic_HandleDeoxys(species, personality, isFrontPic, (u8 *)GetWindowAttribute(windowId, WINDOW_TILE_DATA), FALSE))
     {
-        return 0xFFFF;
+        return INVALID_U16;
     }
     LoadPicPaletteBySlot(species, otId, personality, paletteSlot, isTrainer);
     return 0;
@@ -349,7 +349,7 @@ static u16 sub_818D6CC(u16 species, u32 otId, u32 personality, bool8 isFrontPic,
         Free(framePics);
         return 0;
     }
-    return 0xFFFF;
+    return INVALID_U16;
 }
 
 static u16 CreateMonPicSprite(u16 species, u32 otId, u32 personality, bool8 isFrontPic, s16 x, s16 y, u8 paletteSlot, u16 paletteTag, bool8 ignoreDeoxys)
-- 
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/trainer_pokemon_sprites.c | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

(limited to 'src/trainer_pokemon_sprites.c')

diff --git a/src/trainer_pokemon_sprites.c b/src/trainer_pokemon_sprites.c
index fd97623fe..f5354a1e8 100644
--- a/src/trainer_pokemon_sprites.c
+++ b/src/trainer_pokemon_sprites.c
@@ -107,9 +107,9 @@ static void LoadPicPaletteByTagOrSlot(u16 species, u32 otId, u32 personality, u8
 {
     if (!isTrainer)
     {
-        if (paletteTag == INVALID_U16)
+        if (paletteTag == 0xFFFF)
         {
-            sCreatingSpriteTemplate.paletteTag |= INVALID_U16;
+            sCreatingSpriteTemplate.paletteTag |= 0xFFFF;
             LoadCompressedPalette(GetFrontSpritePalFromSpeciesAndPersonality(species, otId, personality), 0x100 + paletteSlot * 0x10, 0x20);
         }
         else
@@ -120,9 +120,9 @@ static void LoadPicPaletteByTagOrSlot(u16 species, u32 otId, u32 personality, u8
     }
     else
     {
-        if (paletteTag == INVALID_U16)
+        if (paletteTag == 0xFFFF)
         {
-            sCreatingSpriteTemplate.paletteTag |= INVALID_U16;
+            sCreatingSpriteTemplate.paletteTag |= 0xFFFF;
             LoadCompressedPalette(gTrainerFrontPicPaletteTable[species].data, 0x100 + paletteSlot * 0x10, 0x20);
         }
         else
@@ -166,30 +166,30 @@ static u16 CreatePicSprite(u16 species, u32 otId, u32 personality, bool8 isFront
     }
     if (i == PICS_COUNT)
     {
-        return INVALID_U16;
+        return 0xFFFF;
     }
     framePics = Alloc(4 * 0x800);
     if (!framePics)
     {
-        return INVALID_U16;
+        return 0xFFFF;
     }
     images = Alloc(4 * sizeof(struct SpriteFrameImage));
     if (!images)
     {
         Free(framePics);
-        return INVALID_U16;
+        return 0xFFFF;
     }
     if (DecompressPic(species, personality, isFrontPic, framePics, isTrainer, ignoreDeoxys))
     {
         // debug trap?
-        return INVALID_U16;
+        return 0xFFFF;
     }
     for (j = 0; j < 4; j ++)
     {
         images[j].data = framePics + 0x800 * j;
         images[j].size = 0x800;
     }
-    sCreatingSpriteTemplate.tileTag = INVALID_U16;
+    sCreatingSpriteTemplate.tileTag = 0xFFFF;
     sCreatingSpriteTemplate.oam = &gUnknown_0860B064;
     AssignSpriteAnimsTable(isTrainer);
     sCreatingSpriteTemplate.images = images;
@@ -197,7 +197,7 @@ static u16 CreatePicSprite(u16 species, u32 otId, u32 personality, bool8 isFront
     sCreatingSpriteTemplate.callback = DummyPicSpriteCallback;
     LoadPicPaletteByTagOrSlot(species, otId, personality, paletteSlot, paletteTag, isTrainer);
     spriteId = CreateSprite(&sCreatingSpriteTemplate, x, y, 0);
-    if (paletteTag == INVALID_U16)
+    if (paletteTag == 0xFFFF)
     {
         gSprites[spriteId].oam.paletteNum = paletteSlot;
     }
@@ -232,12 +232,12 @@ u16 CreatePicSprite2(u16 species, u32 otId, u32 personality, u8 flags, s16 x, s1
     }
     if (i == PICS_COUNT)
     {
-        return INVALID_U16;
+        return 0xFFFF;
     }
     framePics = Alloc(4 * 0x800);
     if (!framePics)
     {
-        return INVALID_U16;
+        return 0xFFFF;
     }
     if (flags & 0x80)
     {
@@ -252,19 +252,19 @@ u16 CreatePicSprite2(u16 species, u32 otId, u32 personality, u8 flags, s16 x, s1
     if (!images)
     {
         Free(framePics);
-        return INVALID_U16;
+        return 0xFFFF;
     }
     if (DecompressPic(species, personality, flags, framePics, FALSE, FALSE))
     {
         // debug trap?
-        return INVALID_U16;
+        return 0xFFFF;
     }
     for (j = 0; j < 4; j ++)
     {
         images[j].data = framePics + 0x800 * j;
         images[j].size = 0x800;
     }
-    sCreatingSpriteTemplate.tileTag = INVALID_U16;
+    sCreatingSpriteTemplate.tileTag = 0xFFFF;
     sCreatingSpriteTemplate.anims = gMonAnimationsSpriteAnimsPtrTable[species];
     sCreatingSpriteTemplate.images = images;
     if (flags2 == 0x01)
@@ -285,7 +285,7 @@ u16 CreatePicSprite2(u16 species, u32 otId, u32 personality, u8 flags, s16 x, s1
     sCreatingSpriteTemplate.callback = DummyPicSpriteCallback;
     LoadPicPaletteByTagOrSlot(species, otId, personality, paletteSlot, paletteTag, FALSE);
     spriteId = CreateSprite(&sCreatingSpriteTemplate, x, y, 0);
-    if (paletteTag == INVALID_U16)
+    if (paletteTag == 0xFFFF)
     {
         gSprites[spriteId].oam.paletteNum = paletteSlot;
     }
@@ -312,11 +312,11 @@ static u16 FreeAndDestroyPicSpriteInternal(u16 spriteId)
     }
     if (i == PICS_COUNT)
     {
-        return INVALID_U16;
+        return 0xFFFF;
     }
     framePics = sSpritePics[i].frames;
     images = sSpritePics[i].images;
-    if (sSpritePics[i].paletteTag != INVALID_U16)
+    if (sSpritePics[i].paletteTag != 0xFFFF)
     {
         FreeSpritePaletteByTag(GetSpritePaletteTagByPaletteNum(gSprites[spriteId].oam.paletteNum));
     }
@@ -331,7 +331,7 @@ static u16 sub_818D65C(u16 species, u32 otId, u32 personality, bool8 isFrontPic,
 {
     if (DecompressPic_HandleDeoxys(species, personality, isFrontPic, (u8 *)GetWindowAttribute(windowId, WINDOW_TILE_DATA), FALSE))
     {
-        return INVALID_U16;
+        return 0xFFFF;
     }
     LoadPicPaletteBySlot(species, otId, personality, paletteSlot, isTrainer);
     return 0;
@@ -349,7 +349,7 @@ static u16 sub_818D6CC(u16 species, u32 otId, u32 personality, bool8 isFrontPic,
         Free(framePics);
         return 0;
     }
-    return INVALID_U16;
+    return 0xFFFF;
 }
 
 static u16 CreateMonPicSprite(u16 species, u32 otId, u32 personality, bool8 isFrontPic, s16 x, s16 y, u8 paletteSlot, u16 paletteTag, bool8 ignoreDeoxys)
-- 
cgit v1.2.3