dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Give proper names to item icon graphics

Browse Source
This commit is contained in:
GriffinR
2023-05-12 10:45:01 -04:00
parent b83a178b18
commit 86c2142719
9 changed files with 1406 additions and 1609 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/item_menu_icons.c
+6 -5
View File
@@ -327,14 +327,14 @@ u8 AddItemIconObject(u16 tilesTag, u16 paletteTag, u16 itemId)
if (!TryAllocItemIconTilesBuffers())
return MAX_SPRITES;
LZDecompressWram(GetItemIconGfxPtr(itemId, 0), sItemIconTilesBuffer);
LZDecompressWram(GetItemIconGfxPtr(itemId, ITEMICON_TILES), sItemIconTilesBuffer);
CopyItemIconPicTo4x4Buffer(sItemIconTilesBuffer, sItemIconTilesBufferPadded);
spriteSheet.data = sItemIconTilesBufferPadded;
spriteSheet.size = 0x200;
spriteSheet.tag = tilesTag;
LoadSpriteSheet(&spriteSheet);
spritePalette.data = GetItemIconGfxPtr(itemId, 1);
spritePalette.data = GetItemIconGfxPtr(itemId, ITEMICON_PAL);
spritePalette.tag = paletteTag;
LoadCompressedSpritePalette(&spritePalette);
@@ -358,14 +358,14 @@ u8 AddItemIconObjectWithCustomObjectTemplate(const struct SpriteTemplate * origT
if (!TryAllocItemIconTilesBuffers())
return MAX_SPRITES;
LZDecompressWram(GetItemIconGfxPtr(itemId, 0), sItemIconTilesBuffer);
LZDecompressWram(GetItemIconGfxPtr(itemId, ITEMICON_TILES), sItemIconTilesBuffer);
CopyItemIconPicTo4x4Buffer(sItemIconTilesBuffer, sItemIconTilesBufferPadded);
spriteSheet.data = sItemIconTilesBufferPadded;
spriteSheet.size = 0x200;
spriteSheet.tag = tilesTag;
LoadSpriteSheet(&spriteSheet);
spritePalette.data = GetItemIconGfxPtr(itemId, 1);
spritePalette.data = GetItemIconGfxPtr(itemId, ITEMICON_PAL);
spritePalette.tag = paletteTag;
LoadCompressedSpritePalette(&spritePalette);
@@ -410,7 +410,8 @@ void DestroyItemMenuIcon(u8 idx)
}
}
const void *GetItemIconGfxPtr(u16 itemId, u8 attrId)
// attrId is either ITEMICON_TILES or ITEMICON_PAL
const u32 *GetItemIconGfxPtr(u16 itemId, u8 attrId)
{
if (itemId > ITEMS_COUNT)
itemId = ITEM_NONE;