summaryrefslogtreecommitdiff
path: root/src/pokemon_icon.c
diff options
context:
space:
mode:
authornullableVoidPtr <30564701+nullableVoidPtr@users.noreply.github.com>2018-12-05 22:31:01 +0800
committernullableVoidPtr <30564701+nullableVoidPtr@users.noreply.github.com>2018-12-06 10:38:28 +0800
commitf9ff7316d5c7277eb7482e30121388cd65f4ecfc (patch)
treeee8f4a9c338f880a3585d6e9ed9ed695f27cef3d /src/pokemon_icon.c
parent405f1bb529809b8169364737087189df0fcca1d2 (diff)
Remove uses of INVALID_ defines, clean up some arrays with constants, and spaces -> tabs
Diffstat (limited to 'src/pokemon_icon.c')
-rw-r--r--src/pokemon_icon.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/pokemon_icon.c b/src/pokemon_icon.c
index 5926f9513..994cc520e 100644
--- a/src/pokemon_icon.c
+++ b/src/pokemon_icon.c
@@ -1153,14 +1153,14 @@ void SafeLoadMonIconPalette(u16 species)
if (species > SPECIES_EGG)
species = 260;
palIndex = gMonIconPaletteIndices[species];
- if (IndexOfSpritePaletteTag(gMonIconPaletteTable[palIndex].tag) == INVALID_U8)
+ if (IndexOfSpritePaletteTag(gMonIconPaletteTable[palIndex].tag) == 0xFF)
LoadSpritePalette(&gMonIconPaletteTable[palIndex]);
}
void LoadMonIconPalette(u16 species)
{
u8 palIndex = gMonIconPaletteIndices[species];
- if (IndexOfSpritePaletteTag(gMonIconPaletteTable[palIndex].tag) == INVALID_U8)
+ if (IndexOfSpritePaletteTag(gMonIconPaletteTable[palIndex].tag) == 0xFF)
LoadSpritePalette(&gMonIconPaletteTable[palIndex]);
}
@@ -1287,7 +1287,7 @@ static u8 CreateMonIconSprite(struct MonIconSpriteTemplate *iconTemplate, s16 x,
struct SpriteTemplate spriteTemplate =
{
- .tileTag = INVALID_U16,
+ .tileTag = 0xFFFF,
.paletteTag = iconTemplate->paletteTag,
.oam = iconTemplate->oam,
.anims = iconTemplate->anims,