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

Synced src/mon_markings.c and partly synced PSS

Browse Source
This commit is contained in:
Eduardo Quezada
2022-07-30 02:22:59 -04:00
parent 4a60396428
commit 60ce72fa5a
88 changed files with 1742 additions and 1590 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/item_menu_icons.c
+10 -10
View File
@@ -6,11 +6,11 @@
#include "constants/items.h"
static EWRAM_DATA u8 sItemMenuIconSpriteIds[12] = {0};
static EWRAM_DATA void * sItemIconTilesBuffer = NULL;
static EWRAM_DATA void * sItemIconTilesBufferPadded = NULL;
static EWRAM_DATA void *sItemIconTilesBuffer = NULL;
static EWRAM_DATA void *sItemIconTilesBufferPadded = NULL;
static void SpriteCB_BagVisualSwitchingPockets(struct Sprite * sprite);
static void SpriteCB_ShakeBagSprite(struct Sprite * sprite);
static void SpriteCB_BagVisualSwitchingPockets(struct Sprite *sprite);
static void SpriteCB_ShakeBagSprite(struct Sprite *sprite);
static const struct OamData sOamData_BagOrSatchel = {
.affineMode = ST_OAM_AFFINE_NORMAL,
@@ -561,13 +561,13 @@ void CreateBagOrSatchelSprite(u8 animNum)
void SetBagVisualPocketId(u8 animNum)
{
struct Sprite * sprite = &gSprites[sItemMenuIconSpriteIds[0]];
struct Sprite *sprite = &gSprites[sItemMenuIconSpriteIds[0]];
sprite->y2 = -5;
sprite->callback = SpriteCB_BagVisualSwitchingPockets;
StartSpriteAnim(sprite, animNum);
}
static void SpriteCB_BagVisualSwitchingPockets(struct Sprite * sprite)
static void SpriteCB_BagVisualSwitchingPockets(struct Sprite *sprite)
{
if (sprite->y2 != 0)
sprite->y2++;
@@ -577,7 +577,7 @@ static void SpriteCB_BagVisualSwitchingPockets(struct Sprite * sprite)
void ShakeBagSprite(void)
{
struct Sprite * sprite = &gSprites[sItemMenuIconSpriteIds[0]];
struct Sprite *sprite = &gSprites[sItemMenuIconSpriteIds[0]];
if (sprite->affineAnimEnded)
{
StartSpriteAffineAnim(sprite, 1);
@@ -585,7 +585,7 @@ void ShakeBagSprite(void)
}
}
static void SpriteCB_ShakeBagSprite(struct Sprite * sprite)
static void SpriteCB_ShakeBagSprite(struct Sprite *sprite)
{
if (sprite->affineAnimEnded)
{
@@ -658,7 +658,7 @@ static bool8 TryAllocItemIconTilesBuffers(void)
return TRUE;
}
void CopyItemIconPicTo4x4Buffer(const void * src, void * dest)
void CopyItemIconPicTo4x4Buffer(const void *src, void *dest)
{
u8 i;
@@ -760,7 +760,7 @@ void DestroyItemMenuIcon(u8 idx)
}
}
const void * GetItemIconGfxPtr(u16 itemId, u8 attrId)
const void *GetItemIconGfxPtr(u16 itemId, u8 attrId)
{
if (itemId > ITEM_N_A)
itemId = ITEM_NONE;