diff options
author | Dennis <dhilhorst2000@gmail.com> | 2021-07-12 21:10:32 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-07-12 14:10:32 -0500 |
commit | da7b30612f2cac57da0ffe09d1d7c42e309d15f2 (patch) | |
tree | e82dbc33b112798b308e8c001eb3979cab69aa05 /src/trade_items_menu.c | |
parent | 2104c4f7623f2bfc94130d25f2c903fa54991676 (diff) |
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
Diffstat (limited to 'src/trade_items_menu.c')
-rw-r--r-- | src/trade_items_menu.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/trade_items_menu.c b/src/trade_items_menu.c index a2053dd..b9284c0 100644 --- a/src/trade_items_menu.c +++ b/src/trade_items_menu.c @@ -351,9 +351,9 @@ void TradeItem_SendItemConfirm(void) case 5: sub_801CBB8(); // Used temp var to get correct statements - load = gTeamInventory_203B460->unk50[gTradeItemsMenu->itemToSend.itemIndex]; + load = gTeamInventory_203B460->teamStorage[gTradeItemsMenu->itemToSend.itemIndex]; load -= gTradeItemsMenu->numItemsToSend; - gTeamInventory_203B460->unk50[gTradeItemsMenu->itemToSend.itemIndex] = load; + gTeamInventory_203B460->teamStorage[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 = gTeamInventory_203B460->unk50[gTradeItemsMenu->sentItem.itemIndex]; + load = gTeamInventory_203B460->teamStorage[gTradeItemsMenu->sentItem.itemIndex]; load += gTradeItemsMenu->sentItem.numItems; - gTeamInventory_203B460->unk50[gTradeItemsMenu->sentItem.itemIndex] = load; + gTeamInventory_203B460->teamStorage[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, gTeamInventory_203B460->unk50[gTradeItemsMenu->itemToSend.itemIndex]); + sub_8036ECC(2, gTeamInventory_203B460->teamStorage[gTradeItemsMenu->itemToSend.itemIndex]); sub_801CCD8(); sub_8035CF4(&gTradeItemsMenu->unk44, 3, 0); sub_8036F30(); |