Rename GetItemFromGet and move obtainability checks to a separate function

This commit is contained in:
Garrett Cox
2022-08-29 15:26:27 -05:00
parent 6d4288c2a5
commit 5961c33ba9
5 changed files with 552 additions and 207 deletions
+16
View File
@@ -2534,6 +2534,22 @@ s32 Inventory_HasEmptyBottle(void) {
}
}
bool Inventory_HasEmptyBottleSlot(void) {
u8* items = gSaveContext.inventory.items;
if (items[SLOT_BOTTLE_1] == ITEM_NONE) {
return true;
} else if (items[SLOT_BOTTLE_2] == ITEM_NONE) {
return true;
} else if (items[SLOT_BOTTLE_3] == ITEM_NONE) {
return true;
} else if (items[SLOT_BOTTLE_4] == ITEM_NONE) {
return true;
} else {
return false;
}
}
s32 Inventory_HasSpecificBottle(u8 bottleItem) {
u8* items = gSaveContext.inventory.items;