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/felicity_bank_1.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/felicity_bank_1.c') diff --git a/src/felicity_bank_1.c b/src/felicity_bank_1.c index fc769cb..ac7a1db 100644 --- a/src/felicity_bank_1.c +++ b/src/felicity_bank_1.c @@ -1,9 +1,9 @@ #include "global.h" #include "item.h" -#include "gUnknown_203B460.h" +#include "team_inventory.h" #include "felicity_bank.h" -extern struct unkStruct_203B460 *gUnknown_203B460; +extern struct TeamInventory *gTeamInventory_203B460; extern struct unkStruct_203B204 *gUnknown_203B204; extern u8 gUnknown_80DB738; @@ -61,8 +61,8 @@ void Felicity_DepositMoney(void) break; case 3: gUnknown_203B204->chosenAmount = gUnknown_203B204->unk64; - gUnknown_203B460->teamSavings += gUnknown_203B204->chosenAmount; - gUnknown_203B460->teamMoney -= gUnknown_203B204->chosenAmount; + gTeamInventory_203B460->teamSavings += gUnknown_203B204->chosenAmount; + gTeamInventory_203B460->teamMoney -= gUnknown_203B204->chosenAmount; PlaySound(0x14c); UpdateFelicityBankState(9); break; @@ -83,8 +83,8 @@ void Felicity_WithdrawMoney(void) break; case 3: gUnknown_203B204->chosenAmount = gUnknown_203B204->unk64; - gUnknown_203B460->teamMoney += gUnknown_203B204->chosenAmount; - gUnknown_203B460->teamSavings -= gUnknown_203B204->chosenAmount; + gTeamInventory_203B460->teamMoney += gUnknown_203B204->chosenAmount; + gTeamInventory_203B460->teamSavings -= gUnknown_203B204->chosenAmount; PlaySound(0x14c); UpdateFelicityBankState(0xc); break; @@ -134,9 +134,9 @@ void CreateFelicityMoneySavingsHeader(u32 param_1) sub_8008C54(param_1); sub_80073B8(param_1); xxx_call_draw_string(16, 4, gFelicityMoney, param_1, 0); - sub_8012BC4(96, 4, gUnknown_203B460->teamMoney, 5, 5, param_1); + sub_8012BC4(96, 4, gTeamInventory_203B460->teamMoney, 5, 5, param_1); xxx_call_draw_string(112, 4, gFelicitySavings, param_1, 0); - sub_8012BC4(200,4,gUnknown_203B460->teamSavings,7,5,param_1); + sub_8012BC4(200,4,gTeamInventory_203B460->teamSavings,7,5,param_1); sub_80073E0(param_1); } @@ -145,6 +145,6 @@ void DrawTeamMoneyBox(u32 param_1) sub_8008C54(param_1); sub_80073B8(param_1); xxx_call_draw_string(6, 0, &gUnknown_80DB738,param_1, 0); // Money - sub_8012BC4(42, 12, gUnknown_203B460->teamMoney, 5, 5, param_1); + sub_8012BC4(42, 12, gTeamInventory_203B460->teamMoney, 5, 5, param_1); sub_80073E0(param_1); } -- cgit v1.2.3