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/team_inventory.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include/team_inventory.h') diff --git a/include/team_inventory.h b/include/team_inventory.h index 16cf0e1..b8b8a09 100644 --- a/include/team_inventory.h +++ b/include/team_inventory.h @@ -9,8 +9,8 @@ struct subStruct_203B460 struct TeamInventory { - struct ItemSlot teamItems[20]; - u16 unk50[0xF0]; + struct ItemSlot teamItems[INVENTORY_SIZE]; + u16 teamStorage[NUMBER_OF_ITEM_IDS]; struct subStruct_203B460 unk230[8]; // this is probably actually the same struct as ItemSlot_ALT (see sub_80919FC) struct subStruct_203B460 unk250[4]; // TODO: idk if this is identical struct or not.. Ghidra says sizes are same /* 0x260 */ s32 teamMoney; -- cgit v1.2.3