From 92a8e55fdd348a88a365eb389181d8e29da6dad9 Mon Sep 17 00:00:00 2001 From: Dennis Date: Sat, 10 Jul 2021 18:23:20 +0200 Subject: Decompiled some item related functions (#42) * 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 Co-authored-by: Seth Barberee --- src/trade_items_menu.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/trade_items_menu.c') diff --git a/src/trade_items_menu.c b/src/trade_items_menu.c index 57dd99f..a2053dd 100644 --- a/src/trade_items_menu.c +++ b/src/trade_items_menu.c @@ -1,14 +1,14 @@ #include "global.h" #include "input.h" #include "item.h" +#include "team_inventory.h" #include "trade_items_menu.h" -#include "gUnknown_203B460.h" #include "memory.h" #include "save.h" extern struct TradeItemsMenu *gTradeItemsMenu; -extern struct unkStruct_203B460 *gUnknown_203B460; +extern struct TeamInventory *gTeamInventory_203B460; extern u32 gUnknown_202DE30; extern u32 gUnknown_202DE58; extern struct UnkTextStruct2 gUnknown_80E6174; @@ -44,7 +44,7 @@ extern s32 sub_80144A4(s32 *); extern u32 sub_801CA08(u32); extern void sub_801CBB8(); extern u8 sub_801CB24(); -extern void sub_801B3C0(struct ItemStruct_203B460 *); +extern void sub_801B3C0(struct ItemSlot *); extern u8 sub_8012FD8(u32 *); extern void sub_8013114(u32 *, s32 *); extern void sub_8035CC0(struct UnkTextStruct2 *, u32); @@ -63,7 +63,7 @@ extern void sub_80073E0(u32); extern void xxx_call_draw_string(u32, u32, u32 *, u32, u32); extern u8 sub_801CF14(u32); extern u32 sub_801D008(); -extern void sub_8090DC4(u32 *, u8, u32); +extern void sub_8090DC4(void*, u8, u32); extern void sub_801C8C4(u32, u32, s32 *, u32); void sub_8036F30(); @@ -351,9 +351,9 @@ void TradeItem_SendItemConfirm(void) case 5: sub_801CBB8(); // Used temp var to get correct statements - load = gUnknown_203B460->unk50[gTradeItemsMenu->itemToSend.itemIndex]; + load = gTeamInventory_203B460->unk50[gTradeItemsMenu->itemToSend.itemIndex]; load -= gTradeItemsMenu->numItemsToSend; - gUnknown_203B460->unk50[gTradeItemsMenu->itemToSend.itemIndex] = load; + gTeamInventory_203B460->unk50[gTradeItemsMenu->itemToSend.itemIndex] = load; SetTradeItemMenu(TRADE_ITEMS_PREPARE_TRADE_SAVING); PrepareSavePakWrite(SPECIES_NONE); break; @@ -450,9 +450,9 @@ void TradeItem_AddItem(void) { // Use temp var to get correct statements u16 load; - load = gUnknown_203B460->unk50[gTradeItemsMenu->sentItem.itemIndex]; + load = gTeamInventory_203B460->unk50[gTradeItemsMenu->sentItem.itemIndex]; load += gTradeItemsMenu->sentItem.numItems; - gUnknown_203B460->unk50[gTradeItemsMenu->sentItem.itemIndex] = load; + gTeamInventory_203B460->unk50[gTradeItemsMenu->sentItem.itemIndex] = load; } void sub_80369FC(void) @@ -1082,7 +1082,7 @@ void sub_8036F30(void) void sub_8036F74(void) { sub_8006518(gTradeItemsMenu->unk184); - sub_8036ECC(2, gUnknown_203B460->unk50[gTradeItemsMenu->itemToSend.itemIndex]); + sub_8036ECC(2, gTeamInventory_203B460->unk50[gTradeItemsMenu->itemToSend.itemIndex]); sub_801CCD8(); sub_8035CF4(&gTradeItemsMenu->unk44, 3, 0); sub_8036F30(); -- cgit v1.2.3