diff options
author | KDSKardabox <bollygame94@gmail.com> | 2018-03-19 16:15:13 +0530 |
---|---|---|
committer | KDSKardabox <bollygame94@gmail.com> | 2018-03-19 16:15:13 +0530 |
commit | f9f64fff422a245536a3baadc02c120474af1957 (patch) | |
tree | 26483531fb97102fe728ca8793bde039473b90aa /include/item_menu_icons.h | |
parent | a24ffb13213b7cd8761cd501bc4c052da66f57c4 (diff) | |
parent | 2ecbe252a29b9d58bfd2df82c01f94be7b69a7b0 (diff) |
Resolve conflicts
Diffstat (limited to 'include/item_menu_icons.h')
-rw-r--r-- | include/item_menu_icons.h | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/include/item_menu_icons.h b/include/item_menu_icons.h index 56e012421..aee7599df 100644 --- a/include/item_menu_icons.h +++ b/include/item_menu_icons.h @@ -1,16 +1,25 @@ #ifndef GUARD_ITEM_MENU_ICONS #define GUARD_ITEM_MENU_ICONS +extern const struct CompressedSpriteSheet gUnknown_0857FB34; +extern const struct CompressedSpriteSheet gUnknown_0857FB3C; +extern const struct CompressedSpritePalette gUnknown_0857FB44; extern const struct CompressedSpriteSheet gUnknown_0857FDEC; extern const struct CompressedSpritePalette gUnknown_0857FDF4; -u8 sub_80D511C(u8 a0, u8 a1, u8 a2, u8 a3); +void RemoveBagSprite(u8 id); +void AddBagVisualSprite(u8 bagPocketId); +void SetBagVisualPocketId(u8 bagPocketId, bool8 isSwitchingPockets); +void ShakeBagVisual(void); +void AddSwitchPocketRotatingBallSprite(s16 rotationDirection); +void AddBagItemIconSprite(u16 itemId, u8 id); +void RemoveBagItemIconSprite(u8 id); +void sub_80D4FAC(void); +void sub_80D4FC8(u8 arg0); +void sub_80D4FEC(u8 arg0); u8 CreateBerryTagSprite(u8 id, s16 x, s16 y); void FreeBerryTagSpritePalette(void); +u8 sub_80D511C(u8 berryId, u8 x, u8 y, bool8 startAffine); u8 CreateBerryFlavorCircleSprite(s16 x); -void sub_80D4FAC(void); -void RemoveBagItemIconObject(u8); -void sub_80D4FEC(u8); -void sub_80D4FC8(u8); #endif // GUARD_ITEM_MENU_ICONS |