update INVENTORY_SIZE 52 -> 50

This commit is contained in:
Seth Barberee 2026-02-02 21:31:38 -08:00
parent abcacd8c30
commit 6218fc0a4a
3 changed files with 6 additions and 6 deletions

View File

@ -1596,7 +1596,7 @@ enum exclusive_item_effect_id {
#define GROUND_ITEM_TOOLBOX_INDEX 0x80
#define HELD_ITEM_TOOLBOX_INDEX 0x81
#define INVENTORY_SIZE 52
#define INVENTORY_SIZE 50
#define NUMBER_OF_ITEM_IDS (ITEM_UNNAMED_0x577 + 1)
// Item info
@ -1634,7 +1634,7 @@ struct item_volatile {
};
struct bag_items_inner {
/* 0x0 */ struct item bag_items[INVENTORY_SIZE - 2];
/* 0x0 */ struct item bag_items[INVENTORY_SIZE];
// NOTE: I don't know why we have to do the subtraction - Seth
};

View File

@ -107,7 +107,7 @@ void AiDecideUseItem(struct entity *entity)
else if (IqSkillIsEnabled(entity, IQ_ITEM_MASTER))
{
s32 thrown_ai_flag;
for (s32 toolbox_index = 1; toolbox_index < INVENTORY_SIZE; toolbox_index++)
for (s32 toolbox_index = 1; toolbox_index < INVENTORY_SIZE + 2; toolbox_index++)
{
u8 selected_toolbox_index;
if (toolbox_index == 1)

View File

@ -14,7 +14,7 @@ void AllInventoriesZInit(void)
{
for(int inventory_index = MAIN_INVENTORY_INDEX; inventory_index < NUM_INVENTORIES; inventory_index++)
{
for(int bag_index = 0; bag_index < INVENTORY_SIZE - 2; bag_index++)
for(int bag_index = 0; bag_index < INVENTORY_SIZE; bag_index++)
{
ItemZInit(&BAG_ITEMS_PTR_MIRROR->inventories[inventory_index].bag_items[bag_index]);
}
@ -26,7 +26,7 @@ void AllInventoriesZInit(void)
void SpecialEpisodeInventoryZInit(void)
{
for(int index = 0; index < INVENTORY_SIZE - 2; index++)
for(int index = 0; index < INVENTORY_SIZE; index++)
{
ItemZInit(&BAG_ITEMS_PTR_MIRROR->inventories[SPECIAL_EPISODE_INVENTORY_INDEX].bag_items[index]);
}
@ -36,7 +36,7 @@ void SpecialEpisodeInventoryZInit(void)
void RescueInventoryZInit(void)
{
for(int index = 0; index < INVENTORY_SIZE - 2; index++)
for(int index = 0; index < INVENTORY_SIZE; index++)
{
ItemZInit(&BAG_ITEMS_PTR_MIRROR->inventories[RESCUE_INVENTORY_INDEX].bag_items[index]);
}