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 --- asm/felicity_bank.s | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'asm/felicity_bank.s') diff --git a/asm/felicity_bank.s b/asm/felicity_bank.s index c60b295..7711bc9 100644 --- a/asm/felicity_bank.s +++ b/asm/felicity_bank.s @@ -93,7 +93,7 @@ _080165B4: b _08016632 .align 2, 0 _080165FC: .4byte gUnknown_203B204 -_08016600: .4byte gUnknown_203B460 +_08016600: .4byte gTeamInventory_203B460 _08016604: .4byte gFelicityDialogue _08016608: ldr r0, _08016648 @@ -168,7 +168,7 @@ _08016668: ldr r2, [r1] b _08016844 .align 2, 0 -_08016698: .4byte gUnknown_203B460 +_08016698: .4byte gTeamInventory_203B460 _0801669C: .4byte gFelicityDialogue _080166A0: ldr r0, _080166BC @@ -221,7 +221,7 @@ _080166DC: adds r2, 0x1C b _0801683C .align 2, 0 -_08016700: .4byte gUnknown_203B460 +_08016700: .4byte gTeamInventory_203B460 _08016704: .4byte gFelicityDialogue _08016708: movs r5, 0x99 @@ -301,7 +301,7 @@ _0801676E: movs r0, 0x1 b _080168AE .align 2, 0 -_080167A0: .4byte gUnknown_203B460 +_080167A0: .4byte gTeamInventory_203B460 _080167A4: .4byte 0x0098967f _080167A8: ldr r3, [r2] @@ -341,7 +341,7 @@ _080167CC: adds r2, 0x30 b _0801683C .align 2, 0 -_080167F4: .4byte gUnknown_203B460 +_080167F4: .4byte gTeamInventory_203B460 _080167F8: .4byte 0x0001869e _080167FC: .4byte gFelicityDialogue _08016800: @@ -439,7 +439,7 @@ _080168B2: bl CreateFelicityMoneySavingsHeader b _080168EC .align 2, 0 -_080168BC: .4byte gUnknown_203B460 +_080168BC: .4byte gTeamInventory_203B460 _080168C0: .4byte 0x0001869f _080168C4: ldr r3, [r2] -- cgit v1.2.3