From cc288e3786f4e42658b06585bf8d0a32f0c6be00 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Mon, 1 Aug 2022 15:14:21 -0400 Subject: [PATCH] Review changes --- src/pokeball.c | 2 +- src/pokemon_storage_system.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) 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.