File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -1596,7 +1596,7 @@ enum exclusive_item_effect_id {
15961596
15971597#define GROUND_ITEM_TOOLBOX_INDEX 0x80
15981598#define HELD_ITEM_TOOLBOX_INDEX 0x81
1599- #define INVENTORY_SIZE 52
1599+ #define INVENTORY_SIZE 50
16001600#define NUMBER_OF_ITEM_IDS (ITEM_UNNAMED_0x577 + 1)
16011601
16021602// Item info
@@ -1634,7 +1634,7 @@ struct item_volatile {
16341634};
16351635
16361636struct bag_items_inner {
1637- /* 0x0 */ struct item bag_items [INVENTORY_SIZE - 2 ];
1637+ /* 0x0 */ struct item bag_items [INVENTORY_SIZE ];
16381638 // NOTE: I don't know why we have to do the subtraction - Seth
16391639};
16401640
Original file line number Diff line number Diff line change @@ -107,7 +107,7 @@ void AiDecideUseItem(struct entity *entity)
107107 else if (IqSkillIsEnabled (entity , IQ_ITEM_MASTER ))
108108 {
109109 s32 thrown_ai_flag ;
110- for (s32 toolbox_index = 1 ; toolbox_index < INVENTORY_SIZE ; toolbox_index ++ )
110+ for (s32 toolbox_index = 1 ; toolbox_index < INVENTORY_SIZE + 2 ; toolbox_index ++ )
111111 {
112112 u8 selected_toolbox_index ;
113113 if (toolbox_index == 1 )
Original file line number Diff line number Diff line change @@ -14,7 +14,7 @@ void AllInventoriesZInit(void)
1414{
1515 for (int inventory_index = MAIN_INVENTORY_INDEX ; inventory_index < NUM_INVENTORIES ; inventory_index ++ )
1616 {
17- for (int bag_index = 0 ; bag_index < INVENTORY_SIZE - 2 ; bag_index ++ )
17+ for (int bag_index = 0 ; bag_index < INVENTORY_SIZE ; bag_index ++ )
1818 {
1919 ItemZInit (& BAG_ITEMS_PTR_MIRROR -> inventories [inventory_index ].bag_items [bag_index ]);
2020 }
@@ -26,7 +26,7 @@ void AllInventoriesZInit(void)
2626
2727void SpecialEpisodeInventoryZInit (void )
2828{
29- for (int index = 0 ; index < INVENTORY_SIZE - 2 ; index ++ )
29+ for (int index = 0 ; index < INVENTORY_SIZE ; index ++ )
3030 {
3131 ItemZInit (& BAG_ITEMS_PTR_MIRROR -> inventories [SPECIAL_EPISODE_INVENTORY_INDEX ].bag_items [index ]);
3232 }
@@ -36,7 +36,7 @@ void SpecialEpisodeInventoryZInit(void)
3636
3737void RescueInventoryZInit (void )
3838{
39- for (int index = 0 ; index < INVENTORY_SIZE - 2 ; index ++ )
39+ for (int index = 0 ; index < INVENTORY_SIZE ; index ++ )
4040 {
4141 ItemZInit (& BAG_ITEMS_PTR_MIRROR -> inventories [RESCUE_INVENTORY_INDEX ].bag_items [index ]);
4242 }
You can’t perform that action at this time.
0 commit comments