dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Review changes

Browse Source
This commit is contained in:
Eduardo Quezada
2022-08-01 15:14:21 -04:00
parent 7ea49adf3c
commit cc288e3786
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pokeball.c
+1 -1
View File
@@ -1308,7 +1308,7 @@ void LoadBallGfx(u8 ballId)
{ {
u16 var; u16 var;
if (GetSpriteTileStartByTag(gBallSpriteSheets[ballId].tag) == TAG_NONE) if (GetSpriteTileStartByTag(gBallSpriteSheets[ballId].tag) == 0xFFFF)
{ {
LoadCompressedSpriteSheetUsingHeap(&gBallSpriteSheets[ballId]); LoadCompressedSpriteSheetUsingHeap(&gBallSpriteSheets[ballId]);
LoadCompressedSpritePaletteUsingHeap(&gBallSpritePalettes[ballId]); LoadCompressedSpritePaletteUsingHeap(&gBallSpritePalettes[ballId]);
src/pokemon_storage_system.c
+1 -3
View File
@@ -263,8 +263,6 @@ enum {
// between 2 Pokémon with held items // between 2 Pokémon with held items
#define MAX_ITEM_ICONS 3 #define MAX_ITEM_ICONS 3
#define MAX_MENU_ITEMS 7
// IDs for the item icons affine anims // IDs for the item icons affine anims
enum { enum {
ITEM_ANIM_NONE, ITEM_ANIM_NONE,
@@ -476,7 +474,7 @@ struct PokemonStorageSystemData
u8 iconScrollState; u8 iconScrollState;
u8 iconScrollToBoxId; // Unused duplicate of scrollToBoxId u8 iconScrollToBoxId; // Unused duplicate of scrollToBoxId
struct WindowTemplate menuWindow; struct WindowTemplate menuWindow;
struct StorageMenu menuItems[MAX_MENU_ITEMS]; struct StorageMenu menuItems[7];
u8 menuItemsCount; u8 menuItemsCount;
u8 menuWidth; u8 menuWidth;
u8 menuUnusedField; // Never read. u8 menuUnusedField; // Never read.