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>

1 files changed, 57 insertions, 57 deletions

diff --git a/asm/friend_list_menu.s b/asm/friend_list_menu.s
index 46903a6..d2e6283 100644
--- a/asm/friend_list_menu.s
+++ b/asm/friend_list_menu.s
@@ -334,7 +334,7 @@ _0801F074:
 	b _0801F12E
 	.align 2, 0
 _0801F0C8: .4byte gUnknown_203B270
-_0801F0CC: .4byte gUnknown_203B460
+_0801F0CC: .4byte gTeamInventory_203B460
 _0801F0D0:
 	ldr r0, _0801F0E0
 	ldr r1, [r0]
@@ -599,7 +599,7 @@ sub_801F280:
 	str r0, [sp]
 	movs r0, 0xC
 	movs r1, 0
-	bl sub_8014FF0
+	bl xxx_format_and_draw
 	movs r7, 0
 	ldr r0, [r4]
 	movs r1, 0x36
@@ -691,7 +691,7 @@ _0801F372:
 	adds r0, r4, 0
 	adds r1, r6, 0
 	ldr r2, _0801F3F4
-	bl sub_8014FF0
+	bl xxx_format_and_draw
 _0801F386:
 	adds r7, 0x1
 	mov r1, r8
@@ -728,7 +728,7 @@ _0801F394:
 	str r0, [sp]
 	movs r0, 0x8
 	movs r1, 0
-	bl sub_8014FF0
+	bl xxx_format_and_draw
 	ldr r0, [r4]
 	ldr r0, [r0, 0x54]
 	bl sub_80073E0
@@ -1535,7 +1535,7 @@ _0801F9F0:
 	str r4, [sp]
 	movs r0, 0x10
 	movs r1, 0
-	bl sub_8014FF0
+	bl xxx_format_and_draw
 	ldr r3, [r5]
 	ldr r1, [r3, 0xC]
 	lsls r1, 2
@@ -1548,7 +1548,7 @@ _0801F9F0:
 	str r4, [sp]
 	movs r0, 0x4
 	movs r1, 0x10
-	bl sub_8014FF0
+	bl xxx_format_and_draw
 	ldr r0, [r5]
 	ldr r0, [r0, 0x5C]
 	bl sub_80073E0
@@ -1922,7 +1922,7 @@ _0801FD68:
 	movs r0, 0x3
 	b _0801FD76
 	.align 2, 0
-_0801FD6C: .4byte gUnknown_203B460
+_0801FD6C: .4byte gTeamInventory_203B460
 _0801FD70:
 	bl sub_8021130
 _0801FD74:
@@ -4213,7 +4213,7 @@ _08020FB8:
 	bl sub_801FDA8
 	b _080210BE
 	.align 2, 0
-_08020FD8: .4byte gUnknown_203B460
+_08020FD8: .4byte gTeamInventory_203B460
 _08020FDC:
 	ldr r4, _08020FFC
 	ldr r1, [r4]
@@ -4599,7 +4599,7 @@ _080212BC:
 	bl PlayMenuSoundEffect
 	b _080212F2
 	.align 2, 0
-_080212E8: .4byte gUnknown_203B460
+_080212E8: .4byte gTeamInventory_203B460
 _080212EC:
 	movs r0, 0
 	bl PlayMenuSoundEffect
@@ -4915,7 +4915,7 @@ _08021502:
 	.align 2, 0
 _08021568: .4byte gUnknown_203B280
 _0802156C: .4byte gUnknown_80DC494
-_08021570: .4byte gUnknown_203B460
+_08021570: .4byte gTeamInventory_203B460
 _08021574:
 	mov r0, r10
 	ldr r1, _08021598
@@ -6907,7 +6907,7 @@ _080224F8:
 	bl sub_8021D44
 	b _08022532
 	.align 2, 0
-_08022524: .4byte gUnknown_203B460
+_08022524: .4byte gTeamInventory_203B460
 _08022528: .4byte gUnknown_203B290
 _0802252C:
 	movs r0, 0xA
@@ -7034,7 +7034,7 @@ _08022612:
 	bl sub_8021D44
 	b _0802265E
 	.align 2, 0
-_0802262C: .4byte gUnknown_203B460
+_0802262C: .4byte gTeamInventory_203B460
 _08022630:
 	ldr r0, _08022644
 	ldr r0, [r0]
@@ -7295,7 +7295,7 @@ _08022820:
 	adds r0, r4, 0
 	adds r1, r5, 0
 	bl strcpy
-	bl sub_8090A34
+	bl GetNumberOfFilledInventorySlots
 	cmp r0, 0
 	bne _08022850
 	movs r0, 0x12
@@ -8097,7 +8097,7 @@ _08022E94:
 	b _08022EEE
 	.align 2, 0
 _08022EB4: .4byte gUnknown_203B294
-_08022EB8: .4byte gUnknown_203B460
+_08022EB8: .4byte gTeamInventory_203B460
 _08022EBC:
 	bl sub_801A8AC
 	ldr r1, _08022EE0
@@ -8116,7 +8116,7 @@ _08022EBC:
 	b _08022EEE
 	.align 2, 0
 _08022EE0: .4byte gUnknown_203B294
-_08022EE4: .4byte gUnknown_203B460
+_08022EE4: .4byte gTeamInventory_203B460
 _08022EE8:
 	movs r0, 0x16
 	bl sub_8022924
@@ -8224,7 +8224,7 @@ _08022F68:
 	beq _08022FD0
 	ldr r0, [r4]
 	ldr r0, [r0, 0x4C]
-	bl sub_80911F8
+	bl ShiftItemsDownFrom
 _08022FD0:
 	movs r0, 0
 	bl sub_8099690
@@ -8242,7 +8242,7 @@ _08022FD0:
 	.align 2, 0
 _08022FEC: .4byte gUnknown_203B294
 _08022FF0: .4byte gUnknown_202DE58
-_08022FF4: .4byte gUnknown_203B460
+_08022FF4: .4byte gTeamInventory_203B460
 _08022FF8: .4byte _08022FFC
 	.align 2, 0
 _08022FFC:
@@ -8339,8 +8339,8 @@ _080230B0:
 _080230B8:
 	ldr r0, [r4]
 	ldr r0, [r0, 0x4C]
-	bl sub_80911F8
-	bl sub_8090A34
+	bl ShiftItemsDownFrom
+	bl GetNumberOfFilledInventorySlots
 	cmp r0, 0
 	bne _080230DA
 	movs r0, 0
@@ -11772,15 +11772,15 @@ _08024B74:
 	ldr r0, [r1, 0x14]
 	cmp r0, 0x14
 	beq _08024BCA
-	bl sub_8091234
+	bl ClearItemSlotAt
 _08024BCA:
 	ldr r0, [r5]
 	ldr r0, [r0, 0x18]
 	cmp r0, 0x14
 	beq _08024BD6
-	bl sub_8091234
+	bl ClearItemSlotAt
 _08024BD6:
-	bl sub_80910B4
+	bl FillInventoryGaps
 	ldr r0, _08024C14
 	bl sub_801199C
 	movs r0, 0xD2
@@ -12230,7 +12230,7 @@ _08024F36:
 	.align 2, 0
 _08024F48: .4byte gUnknown_203B2B0
 _08024F4C:
-	bl sub_8090A34
+	bl GetNumberOfFilledInventorySlots
 	cmp r0, 0
 	bne _08024F5C
 	movs r0, 0xF
@@ -12283,7 +12283,7 @@ _08024FA6:
 	bl sub_80247EC
 	b _08024FCC
 _08024FAE:
-	bl sub_8090A34
+	bl GetNumberOfFilledInventorySlots
 	cmp r0, 0x1
 	bgt _08024FBE
 	movs r0, 0x10
@@ -12336,7 +12336,7 @@ _08024FF0:
 	b _08025052
 	.align 2, 0
 _08025014: .4byte gUnknown_203B2B0
-_08025018: .4byte gUnknown_203B460
+_08025018: .4byte gTeamInventory_203B460
 _0802501C:
 	bl sub_801A8AC
 	ldr r1, _08025040
@@ -12354,7 +12354,7 @@ _0802501C:
 	b _08025052
 	.align 2, 0
 _08025040: .4byte gUnknown_203B2B0
-_08025044: .4byte gUnknown_203B460
+_08025044: .4byte gTeamInventory_203B460
 _08025048:
 	bl sub_801A928
 	movs r0, 0x5
@@ -12401,7 +12401,7 @@ _08025074:
 	b _080250E6
 	.align 2, 0
 _080250A0: .4byte gUnknown_203B2B0
-_080250A4: .4byte gUnknown_203B460
+_080250A4: .4byte gTeamInventory_203B460
 _080250A8:
 	movs r0, 0x2
 	bl PlayMenuSoundEffect
@@ -12423,7 +12423,7 @@ _080250B0:
 	b _080250E6
 	.align 2, 0
 _080250D4: .4byte gUnknown_203B2B0
-_080250D8: .4byte gUnknown_203B460
+_080250D8: .4byte gTeamInventory_203B460
 _080250DC:
 	bl sub_801A928
 	movs r0, 0xA
@@ -12651,7 +12651,7 @@ _08025276:
 	movs r0, 0
 	b _08025292
 	.align 2, 0
-_08025284: .4byte gUnknown_203B460
+_08025284: .4byte gTeamInventory_203B460
 _08025288:
 	ldr r0, _080252B0
 	ldr r0, [r0]
@@ -12673,7 +12673,7 @@ _08025292:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_080252B0: .4byte gUnknown_203B460
+_080252B0: .4byte gTeamInventory_203B460
 _080252B4: .4byte gUnknown_203B2B0
 	thumb_func_end sub_8025254
 
@@ -13260,7 +13260,7 @@ sub_8025728:
 	adds r1, 0x4
 	movs r0, 0xA
 	str r0, [r1]
-	bl sub_8090A34
+	bl GetNumberOfFilledInventorySlots
 	cmp r0, 0
 	bne _08025774
 	ldr r0, [r5]
@@ -13279,7 +13279,7 @@ _08025774:
 	adds r1, 0xD4
 	movs r0, 0xB
 	str r0, [r1]
-	bl sub_8090A34
+	bl GetNumberOfFilledInventorySlots
 	cmp r0, 0x13
 	bgt _08025796
 	ldr r0, [r5]
@@ -13498,7 +13498,7 @@ sub_802591C:
 	adds r1, 0xCC
 	movs r0, 0xA
 	str r0, [r1]
-	bl sub_8090A34
+	bl GetNumberOfFilledInventorySlots
 	cmp r0, 0
 	bne _08025952
 	ldr r0, [r5]
@@ -13741,7 +13741,7 @@ _08025B28:
 	adds r0, 0x18
 	bl sub_8091274
 _08025B40:
-	bl sub_80910B4
+	bl FillInventoryGaps
 	ldr r0, [r4]
 	movs r1, 0
 	strb r1, [r0, 0x18]
@@ -13878,7 +13878,7 @@ _08025C34:
 	b _08025CAE
 	.align 2, 0
 _08025C60: .4byte gUnknown_203B2B4
-_08025C64: .4byte gUnknown_203B460
+_08025C64: .4byte gTeamInventory_203B460
 _08025C68:
 	bl sub_801A8AC
 	ldr r4, _08025C9C
@@ -13904,7 +13904,7 @@ _08025C68:
 	b _08025CAE
 	.align 2, 0
 _08025C9C: .4byte gUnknown_203B2B4
-_08025CA0: .4byte gUnknown_203B460
+_08025CA0: .4byte gTeamInventory_203B460
 _08025CA4:
 	bl sub_801A928
 	movs r0, 0x2
@@ -13958,8 +13958,8 @@ _08025CF8:
 	ldr r5, _08025D6C
 	ldr r0, [r5]
 	ldr r0, [r0, 0x10]
-	bl sub_80911F8
-	bl sub_80910B4
+	bl ShiftItemsDownFrom
+	bl FillInventoryGaps
 	ldr r1, [r5]
 	ldrb r0, [r1, 0x18]
 	cmp r0, 0
@@ -14162,7 +14162,7 @@ sub_8025E68:
 	movs r0, 0x4
 	movs r1, 0x3
 	adds r3, r6, 0
-	bl sub_8014FF0
+	bl xxx_format_and_draw
 	adds r0, r6, 0
 	bl sub_80073E0
 	add sp, 0x14
@@ -15053,7 +15053,7 @@ _080265EC:
 	adds r2, r3
 	movs r0, 0xB
 	str r0, [r2]
-	bl sub_8090A34
+	bl GetNumberOfFilledInventorySlots
 	cmp r0, 0
 	bne _0802661A
 	ldr r0, [r4]
@@ -15076,7 +15076,7 @@ _0802661A:
 	adds r2, r3
 	movs r0, 0xC
 	str r0, [r2]
-	bl sub_8090A34
+	bl GetNumberOfFilledInventorySlots
 	cmp r0, 0x13
 	bgt _08026640
 	ldr r0, [r4]
@@ -15271,7 +15271,7 @@ sub_802678C:
 	adds r1, r2, r3
 	movs r0, 0xB
 	str r0, [r1]
-	bl sub_8090A34
+	bl GetNumberOfFilledInventorySlots
 	cmp r0, 0
 	bne _080267C8
 	ldr r0, [r5]
@@ -15567,7 +15567,7 @@ _08026A10:
 	adds r0, 0x14
 	bl sub_8091274
 _08026A28:
-	bl sub_80910B4
+	bl FillInventoryGaps
 	ldr r0, [r4]
 	movs r1, 0
 	strb r1, [r0, 0x14]
@@ -15781,7 +15781,7 @@ _08026B94:
 	b _08026C0E
 	.align 2, 0
 _08026BC0: .4byte gUnknown_203B2B8
-_08026BC4: .4byte gUnknown_203B460
+_08026BC4: .4byte gTeamInventory_203B460
 _08026BC8:
 	bl sub_801A8AC
 	ldr r4, _08026BFC
@@ -15807,7 +15807,7 @@ _08026BC8:
 	b _08026C0E
 	.align 2, 0
 _08026BFC: .4byte gUnknown_203B2B8
-_08026C00: .4byte gUnknown_203B460
+_08026C00: .4byte gTeamInventory_203B460
 _08026C04:
 	bl sub_801A928
 	movs r0, 0x2
@@ -15861,8 +15861,8 @@ _08026C58:
 	ldr r5, _08026CCC
 	ldr r0, [r5]
 	ldr r0, [r0, 0xC]
-	bl sub_80911F8
-	bl sub_80910B4
+	bl ShiftItemsDownFrom
+	bl FillInventoryGaps
 	ldr r1, [r5]
 	ldrb r0, [r1, 0x14]
 	cmp r0, 0
@@ -16045,7 +16045,7 @@ sub_8026DAC:
 	movs r0, 0x4
 	movs r1, 0x3
 	adds r3, r6, 0
-	bl sub_8014FF0
+	bl xxx_format_and_draw
 	adds r0, r6, 0
 	bl sub_80073E0
 	add sp, 0x14
@@ -16195,7 +16195,7 @@ sub_8026F04:
 	movs r0, 0
 	b _08026F32
 _08026F14:
-	bl sub_8090A34
+	bl GetNumberOfFilledInventorySlots
 	cmp r0, 0x13
 	bgt _08026F20
 	movs r0, 0x1
@@ -16223,12 +16223,12 @@ sub_8026F38:
 	adds r4, r5, 0
 	adds r4, 0x28
 	ldrb r0, [r4]
-	bl sub_8091524
+	bl IsNotMoneyOrUsedTMItem
 	lsls r0, 24
 	cmp r0, 0
 	beq _08026F74
 	ldrb r0, [r4]
-	bl sub_8090A60
+	bl IsThrowableItem
 	lsls r0, 24
 	cmp r0, 0
 	beq _08026F80
@@ -16250,7 +16250,7 @@ _08026F74:
 	movs r0, 0
 	b _08026F96
 	.align 2, 0
-_08026F78: .4byte gUnknown_203B460
+_08026F78: .4byte gTeamInventory_203B460
 _08026F7C: .4byte 0x000003e7
 _08026F80:
 	ldr r0, _08026F9C
@@ -16270,7 +16270,7 @@ _08026F96:
 	pop {r1}
 	bx r1
 	.align 2, 0
-_08026F9C: .4byte gUnknown_203B460
+_08026F9C: .4byte gTeamInventory_203B460
 _08026FA0: .4byte 0x000003e6
 	thumb_func_end sub_8026F38
 
@@ -16296,7 +16296,7 @@ _08026FC4:
 	ldr r0, [r4]
 	adds r0, 0x14
 	bl sub_8091274
-	bl sub_80910B4
+	bl FillInventoryGaps
 	ldr r0, [r4]
 	movs r1, 0
 	strb r1, [r0, 0x14]
@@ -16317,7 +16317,7 @@ _08026FF8:
 	bl PlaySound
 	ldr r0, [r4]
 	ldrb r0, [r0, 0x14]
-	bl sub_8090A60
+	bl IsThrowableItem
 	lsls r0, 24
 	cmp r0, 0
 	beq _0802702C
@@ -16334,7 +16334,7 @@ _08026FF8:
 	b _0802703E
 	.align 2, 0
 _08027024: .4byte 0x0000014d
-_08027028: .4byte gUnknown_203B460
+_08027028: .4byte gTeamInventory_203B460
 _0802702C:
 	ldr r0, _08027060
 	ldr r1, [r0]
@@ -16362,7 +16362,7 @@ _0802703E:
 	bl sub_8026074
 	b _0802706E
 	.align 2, 0
-_08027060: .4byte gUnknown_203B460
+_08027060: .4byte gTeamInventory_203B460
 _08027064: .4byte gUnknown_203B2B8
 _08027068:
 	movs r0, 0x19