ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-02-04 02:10:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add some missing pocket constant usage

Browse Source
This commit is contained in:
GriffinR 2022-07-14 10:27:51 -04:00
parent f85b4699dc
commit 16ab534ddb
1 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/item_menu_icons.c
View File

@ -93,12 +93,12 @@ static const union AnimCmd sSpriteAnim_Bag_Berries[] =
static const union AnimCmd *const sBagSpriteAnimTable[] = static const union AnimCmd *const sBagSpriteAnimTable[] =
{ {
sSpriteAnim_Bag_Closed, [POCKET_NONE] = sSpriteAnim_Bag_Closed,
sSpriteAnim_Bag_Items, [POCKET_ITEMS] = sSpriteAnim_Bag_Items,
sSpriteAnim_Bag_Pokeballs, [POCKET_POKE_BALLS] = sSpriteAnim_Bag_Pokeballs,
sSpriteAnim_Bag_TMsHMs, [POCKET_TM_HM] = sSpriteAnim_Bag_TMsHMs,
sSpriteAnim_Bag_Berries, [POCKET_BERRIES] = sSpriteAnim_Bag_Berries,
sSpriteAnim_Bag_KeyItems [POCKET_KEY_ITEMS] = sSpriteAnim_Bag_KeyItems,
}; };
static const union AffineAnimCmd sSpriteAffineAnim_BagNormal[] = static const union AffineAnimCmd sSpriteAffineAnim_BagNormal[] =
@ -116,10 +116,15 @@ static const union AffineAnimCmd sSpriteAffineAnim_BagShake[] =
AFFINEANIMCMD_END AFFINEANIMCMD_END
}; };
enum {
ANIM_BAG_NORMAL,
ANIM_BAG_SHAKE,
};
static const union AffineAnimCmd *const sBagAffineAnimCmds[] = static const union AffineAnimCmd *const sBagAffineAnimCmds[] =
{ {
sSpriteAffineAnim_BagNormal, [ANIM_BAG_NORMAL] = sSpriteAffineAnim_BagNormal,
sSpriteAffineAnim_BagShake [ANIM_BAG_SHAKE] = sSpriteAffineAnim_BagShake
}; };
const struct CompressedSpriteSheet gBagMaleSpriteSheet = const struct CompressedSpriteSheet gBagMaleSpriteSheet =
@ -436,6 +441,8 @@ void AddBagVisualSprite(u8 bagPocketId)
SetBagVisualPocketId(bagPocketId, FALSE); SetBagVisualPocketId(bagPocketId, FALSE);
} }
#define sPocketId data[0]
void SetBagVisualPocketId(u8 bagPocketId, bool8 isSwitchingPockets) void SetBagVisualPocketId(u8 bagPocketId, bool8 isSwitchingPockets)
{ {
struct Sprite *sprite = &gSprites[gBagMenu->spriteIds[ITEMMENUSPRITE_BAG]]; struct Sprite *sprite = &gSprites[gBagMenu->spriteIds[ITEMMENUSPRITE_BAG]];
@ -443,8 +450,8 @@ void SetBagVisualPocketId(u8 bagPocketId, bool8 isSwitchingPockets)
{ {
sprite->y2 = -5; sprite->y2 = -5;
sprite->callback = SpriteCB_BagVisualSwitchingPockets; sprite->callback = SpriteCB_BagVisualSwitchingPockets;
sprite->data[0] = bagPocketId + 1; sprite->sPocketId = bagPocketId + 1;
StartSpriteAnim(sprite, 0); StartSpriteAnim(sprite, POCKET_NONE);
} }
else else
{ {
@ -460,26 +467,29 @@ static void SpriteCB_BagVisualSwitchingPockets(struct Sprite *sprite)
} }
else else
{ {
StartSpriteAnim(sprite, sprite->data[0]); StartSpriteAnim(sprite, sprite->sPocketId);
sprite->callback = SpriteCallbackDummy; sprite->callback = SpriteCallbackDummy;
} }
} }
#undef sPocketId
void ShakeBagSprite(void) void ShakeBagSprite(void)
{ {
struct Sprite *sprite = &gSprites[gBagMenu->spriteIds[ITEMMENUSPRITE_BAG]]; struct Sprite *sprite = &gSprites[gBagMenu->spriteIds[ITEMMENUSPRITE_BAG]];
if (sprite->affineAnimEnded) if (sprite->affineAnimEnded)
{ {
StartSpriteAffineAnim(sprite, 1); StartSpriteAffineAnim(sprite, ANIM_BAG_SHAKE);
sprite->callback = SpriteCB_ShakeBagSprite; sprite->callback = SpriteCB_ShakeBagSprite;
} }
} }
static void SpriteCB_ShakeBagSprite(struct Sprite *sprite) static void SpriteCB_ShakeBagSprite(struct Sprite *sprite)
{ {
// Wait for shaking to end
if (sprite->affineAnimEnded) if (sprite->affineAnimEnded)
{ {
StartSpriteAffineAnim(sprite, 0); StartSpriteAffineAnim(sprite, ANIM_BAG_NORMAL);
sprite->callback = SpriteCallbackDummy; sprite->callback = SpriteCallbackDummy;
} }
} }