diff --git a/src/pokeball.c b/src/pokeball.c
index 8eafa57442..b9f63e5806 100644
--- a/src/pokeball.c
+++ b/src/pokeball.c
@@ -1308,7 +1308,7 @@ void LoadBallGfx(u8 ballId)
 {
     u16 var;
 
-    if (GetSpriteTileStartByTag(gBallSpriteSheets[ballId].tag) == TAG_NONE)
+    if (GetSpriteTileStartByTag(gBallSpriteSheets[ballId].tag) == 0xFFFF)
     {
         LoadCompressedSpriteSheetUsingHeap(&gBallSpriteSheets[ballId]);
         LoadCompressedSpritePaletteUsingHeap(&gBallSpritePalettes[ballId]);
diff --git a/src/pokemon_storage_system.c b/src/pokemon_storage_system.c
index 79edcb3016..f72f3216fe 100644
--- a/src/pokemon_storage_system.c
+++ b/src/pokemon_storage_system.c
@@ -263,8 +263,6 @@ enum {
 // between 2 Pokémon with held items
 #define MAX_ITEM_ICONS 3
 
-#define MAX_MENU_ITEMS 7
-
 // IDs for the item icons affine anims
 enum {
     ITEM_ANIM_NONE,
@@ -476,7 +474,7 @@ struct PokemonStorageSystemData
     u8 iconScrollState;
     u8 iconScrollToBoxId; // Unused duplicate of scrollToBoxId
     struct WindowTemplate menuWindow;
-    struct StorageMenu menuItems[MAX_MENU_ITEMS];
+    struct StorageMenu menuItems[7];
     u8 menuItemsCount;
     u8 menuWidth;
     u8 menuUnusedField; // Never read.