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/pokemon_icon.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/pokemon_icon.c')
| -rw-r--r-- | src/pokemon_icon.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/pokemon_icon.c b/src/pokemon_icon.c index 994cc520e..5926f9513 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) == 0xFF) + if (IndexOfSpritePaletteTag(gMonIconPaletteTable[palIndex].tag) == INVALID_U8) LoadSpritePalette(&gMonIconPaletteTable[palIndex]); } void LoadMonIconPalette(u16 species) { u8 palIndex = gMonIconPaletteIndices[species]; - if (IndexOfSpritePaletteTag(gMonIconPaletteTable[palIndex].tag) == 0xFF) + if (IndexOfSpritePaletteTag(gMonIconPaletteTable[palIndex].tag) == INVALID_U8) LoadSpritePalette(&gMonIconPaletteTable[palIndex]); } @@ -1287,7 +1287,7 @@ static u8 CreateMonIconSprite(struct MonIconSpriteTemplate *iconTemplate, s16 x, struct SpriteTemplate spriteTemplate = { - .tileTag = 0xFFFF, + .tileTag = INVALID_U16, .paletteTag = iconTemplate->paletteTag, .oam = iconTemplate->oam, .anims = iconTemplate->anims, |