summaryrefslogtreecommitdiff
path: root/asm/friend_area_action_menu.s
diff options
context:
space:
mode:
authorDennis <dhilhorst2000@gmail.com>2021-07-10 18:23:20 +0200
committerGitHub <noreply@github.com>2021-07-10 11:23:20 -0500
commit92a8e55fdd348a88a365eb389181d8e29da6dad9 (patch)
tree2467ef22cb8cf75bdf056143fab3fac4a68ef404 /asm/friend_area_action_menu.s
parent386299d1f401cb939e6fe3ea16d0ca57731b2648 (diff)
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 <seth.barberee@gmail.com>
Diffstat (limited to 'asm/friend_area_action_menu.s')
-rw-r--r--asm/friend_area_action_menu.s8
1 files changed, 4 insertions, 4 deletions
diff --git a/asm/friend_area_action_menu.s b/asm/friend_area_action_menu.s
index 998bb5c..f984e29 100644
--- a/asm/friend_area_action_menu.s
+++ b/asm/friend_area_action_menu.s
@@ -142,7 +142,7 @@ _08027552:
adds r2, r3
movs r0, 0xA
str r0, [r2]
- bl sub_8090A34
+ bl GetNumberOfFilledInventorySlots
cmp r0, 0
bne _08027588
ldr r0, [r4]
@@ -165,7 +165,7 @@ _08027588:
adds r2, r3
movs r0, 0xB
str r0, [r2]
- bl sub_8090A34
+ bl GetNumberOfFilledInventorySlots
cmp r0, 0x13
bgt _080275AE
ldr r0, [r4]
@@ -320,7 +320,7 @@ sub_80276A8:
adds r1, r2, r3
movs r0, 0xA
str r0, [r1]
- bl sub_8090A34
+ bl GetNumberOfFilledInventorySlots
cmp r0, 0
bne _080276E4
ldr r0, [r5]
@@ -697,7 +697,7 @@ _080279D8:
adds r0, 0x14
bl sub_8091274
_080279F0:
- bl sub_80910B4
+ bl FillInventoryGaps
ldr r0, [r4]
movs r1, 0
strb r1, [r0, 0x14]