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/item_menu_icons.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/item_menu_icons.c')
| -rw-r--r-- | src/item_menu_icons.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/item_menu_icons.c b/src/item_menu_icons.c index 85b42b9b3..67add5926 100644 --- a/src/item_menu_icons.c +++ b/src/item_menu_icons.c @@ -301,7 +301,7 @@ static const union AffineAnimCmd *const sSpriteAffineAnimTable_857FC74[] = static const struct SpriteTemplate gUnknown_0857FC7C = { - .tileTag = 0xFFFF, + .tileTag = INVALID_U16, .paletteTag = 0x7544, .oam = &sOamData_857FBD0, .anims = sSpriteAnimTable_857FBE0, @@ -410,13 +410,13 @@ static const struct SpriteTemplate gUnknown_0857FE10 = void RemoveBagSprite(u8 id) { u8 *spriteId = &gUnknown_0203CE54->unk804[id]; - if (*spriteId != 0xFF) + if (*spriteId != INVALID_U8) { FreeSpriteTilesByTag(id + 100); FreeSpritePaletteByTag(id + 100); FreeSpriteOamMatrix(&gSprites[*spriteId]); DestroySprite(&gSprites[*spriteId]); - *spriteId = 0xFF; + *spriteId = INVALID_U8; } } @@ -516,7 +516,7 @@ static void SpriteCB_SwitchPocketRotatingBallContinue(struct Sprite *sprite) void AddBagItemIconSprite(u16 itemId, u8 id) { u8 *spriteId = &gUnknown_0203CE54->unk804[id + 2]; - if (*spriteId == 0xFF) + if (*spriteId == INVALID_U8) { u8 iconSpriteId; |