diff --git a/include/item_icon.h b/include/item_icon.h index e64c2ad34a..64753c32e2 100644 --- a/include/item_icon.h +++ b/include/item_icon.h @@ -12,6 +12,6 @@ void CopyItemIconPicTo4x4Buffer(const void *src, void *dest); u8 AddItemIconSprite(u16 tilesTag, u16 paletteTag, u16 itemId); u8 AddCustomItemIconSprite(const struct SpriteTemplate *customSpriteTemplate, u16 tilesTag, u16 paletteTag, u16 itemId); const void *GetItemIconPic(u16 itemId); -const void *GetItemIconPalette(u16 itemId); +const u16 *GetItemIconPalette(u16 itemId); #endif //GUARD_ITEM_ICON_H diff --git a/src/item_icon.c b/src/item_icon.c index 9881ec250d..e5bd085d7f 100644 --- a/src/item_icon.c +++ b/src/item_icon.c @@ -176,7 +176,7 @@ const void *GetItemIconPic(u16 itemId) return gItemsInfo[itemId].iconPic; } -const void *GetItemIconPalette(u16 itemId) +const u16 *GetItemIconPalette(u16 itemId) { if (itemId == ITEM_LIST_END) return gItemIconPalette_ReturnToFieldArrow; diff --git a/src/pokemon_storage_system.c b/src/pokemon_storage_system.c index 5c26c15edb..b782e3ff9e 100644 --- a/src/pokemon_storage_system.c +++ b/src/pokemon_storage_system.c @@ -691,7 +691,7 @@ static void MultiMove_DeselectColumn(u8, u8, u8); static bool32 IsItemIconAtPosition(u8, u8); static u8 GetNewItemIconIdx(void); static void SetItemIconPosition(u8, u8, u8); -static void LoadItemIconGfx(u8, const u32 *, const u32 *); +static void LoadItemIconGfx(u8 id, const u32 *itemTiles, const u16 *itemPal); static void SetItemIconAffineAnim(u8, u8); static void SetItemIconActive(u8, bool8); static u8 GetItemIconIdxByPosition(u8, u8); @@ -8851,7 +8851,7 @@ static void TryLoadItemIconAtPos(u8 cursorArea, u8 cursorPos) if (heldItem != ITEM_NONE) { const u32 *tiles = GetItemIconPic(heldItem); - const u32 *pal = GetItemIconPalette(heldItem); + const u16 *pal = GetItemIconPalette(heldItem); u8 id = GetNewItemIconIdx(); SetItemIconPosition(id, cursorArea, cursorPos); @@ -8908,7 +8908,7 @@ static void TakeItemFromMon(u8 cursorArea, u8 cursorPos) static void InitItemIconInCursor(u16 itemId) { const u32 *tiles = GetItemIconPic(itemId); - const u32 *pal = GetItemIconPalette(itemId); + const u16 *pal = GetItemIconPalette(itemId); u8 id = GetNewItemIconIdx(); LoadItemIconGfx(id, tiles, pal); SetItemIconAffineAnim(id, ITEM_ANIM_LARGE); @@ -9172,7 +9172,7 @@ static void SetItemIconPosition(u8 id, u8 cursorArea, u8 cursorPos) sStorage->itemIcons[id].pos = cursorPos; } -static void LoadItemIconGfx(u8 id, const u32 *itemTiles, const u32 *itemPal) +static void LoadItemIconGfx(u8 id, const u32 *itemTiles, const u16 *itemPal) { s32 i; @@ -9185,8 +9185,7 @@ static void LoadItemIconGfx(u8 id, const u32 *itemTiles, const u32 *itemPal) CpuFastCopy(&sStorage->tileBuffer[i * 0x60], &sStorage->itemIconBuffer[i * 0x80], 0x60); CpuFastCopy(sStorage->itemIconBuffer, sStorage->itemIcons[id].tiles, 0x200); - LZ77UnCompWram(itemPal, sStorage->itemIconBuffer); - LoadPalette(sStorage->itemIconBuffer, sStorage->itemIcons[id].palIndex, PLTT_SIZE_4BPP); + LoadPalette(itemPal, sStorage->itemIcons[id].palIndex, PLTT_SIZE_4BPP); } static void SetItemIconAffineAnim(u8 id, u8 animNum)