From da7b30612f2cac57da0ffe09d1d7c42e309d15f2 Mon Sep 17 00:00:00 2001 From: Dennis Date: Mon, 12 Jul 2021 21:10:32 +0200 Subject: More work on item related functions (#44) * decompile sub_8091290 * decompile sub_80912c8 * rename functions / struct field * more names * decompile 80913A0 * decompile GetItemMove * decompile sub_80913E0 * rename function * decompile CanSellItem function * rename inventory struct * add some item check functions * fix renaming stuff * this file shouldnt have been here * forgot merge conflict * decompile more item functions * rename some stuff * fix HM/TM naming * Update src/code_801AFA4.c Use enum value for USED_TM * Fix incorrect value * decompile sub_80915F4 * decompile HasGummiItem * decompiled another function and renamed stuff * decompile 2 smaller functions * more functions * more decompiling and renaming * redo change that was undone in the merge --- include/item.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'include/item.h') diff --git a/include/item.h b/include/item.h index bb358b5..76db8a8 100644 --- a/include/item.h +++ b/include/item.h @@ -35,6 +35,12 @@ struct ItemSlot_ALT u8 unk2; }; +struct unkStruct_80915F4 +{ + u16 unk0; + u16 unk2; +}; + enum ItemType { ITEM_TYPE_THROWABLE, @@ -311,8 +317,12 @@ enum ItemID { ITEM_ID_G_MACHINE_6, ITEM_ID_G_MACHINE_7, ITEM_ID_G_MACHINE_8, + NUMBER_OF_ITEM_IDS }; +#define NUMBER_OF_GUMMIS 18 +#define INVENTORY_SIZE 20 + void LoadItemParameters(void); struct TeamInventory *GetMoneyItemsInfo(void); void InitializeMoneyItems(void); @@ -336,5 +346,7 @@ void ConvertMoneyItemToMoney(); void AddToTeamMoney(s32 amount); u32 GetMoneyValue(struct ItemSlot* slot); u16 GetItemMove(u8 index); +bool8 IsGummiItem(u8); +void xxx_init_unk230_substruct(u8); #endif -- cgit v1.2.3