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

8 files changed, 18 insertions, 444 deletions

diff --git a/asm/code_801B3C0.s b/asm/code_801B3C0.s
index 966c4c3..9f4a4a1 100644
--- a/asm/code_801B3C0.s
+++ b/asm/code_801B3C0.s
@@ -969,7 +969,7 @@ _0801BDD2:
 	ldr r4, _0801BE08
 	ldr r0, [r4]
 	adds r0, 0x20
-	bl sub_80917B8
+	bl MoveToStorage
 	ldr r0, [r4]
 	ldr r0, [r0, 0x24]
 	bl ShiftItemsDownFrom
diff --git a/asm/code_8048480.s b/asm/code_8048480.s
index df967ae..d2f141e 100644
--- a/asm/code_8048480.s
+++ b/asm/code_8048480.s
@@ -413,7 +413,7 @@ _08048852:
 	movs r0, 0x1
 	b _08048862
 	.align 2, 0
-_08048858: .4byte gUnknown_810A580
+_08048858: .4byte gTypeGummiIQBoost
 _0804885C: .4byte gUnknown_810A808
 _08048860:
 	movs r0, 0
diff --git a/asm/friend_list_menu.s b/asm/friend_list_menu.s
index d2e6283..d9a0e57 100644
--- a/asm/friend_list_menu.s
+++ b/asm/friend_list_menu.s
@@ -7271,7 +7271,7 @@ sub_80227B8:
 	adds r1, r5, 0
 	movs r2, 0x6
 	bl sub_808D9AC
-	bl sub_809177C
+	bl HasGummiItem
 	lsls r0, 24
 	cmp r0, 0
 	beq _08022818
@@ -7921,7 +7921,7 @@ sub_8022D2C:
 	adds r0, r2, 0
 	adds r0, 0x52
 	ldrb r0, [r0]
-	bl sub_8091764
+	bl IsGummiItem
 	lsls r0, 24
 	cmp r0, 0
 	bne _08022D74
@@ -8194,7 +8194,7 @@ _08022F68:
 	ldrb r1, [r1]
 	adds r3, 0x44
 	movs r2, 0
-	bl sub_80915F4
+	bl GetGummiItemStatBoost
 	ldr r1, [r4]
 	adds r0, r1, 0
 	adds r0, 0x20
@@ -15029,7 +15029,7 @@ _080265B4:
 	adds r2, r3
 	movs r0, 0xA
 	str r0, [r2]
-	bl sub_809177C
+	bl HasGummiItem
 	lsls r0, 24
 	cmp r0, 0
 	bne _080265EC
diff --git a/asm/items_1.s b/asm/items_1.s
index 50b1f34..625ba0a 100644
--- a/asm/items_1.s
+++ b/asm/items_1.s
@@ -5,432 +5,6 @@
 
 	.text
 
-	thumb_func_start sub_80915F4
-sub_80915F4:
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	adds r6, r0, 0
-	adds r7, r3, 0
-	lsls r1, 24
-	lsrs r5, r1, 24
-	lsls r2, 24
-	lsrs r2, 24
-	mov r8, r2
-	ldr r0, _080916B8
-	strh r0, [r7]
-	movs r0, 0
-	strh r0, [r7, 0x2]
-	adds r0, r5, 0
-	bl sub_8091764
-	lsls r0, 24
-	cmp r0, 0
-	bne _0809161E
-	b _08091756
-_0809161E:
-	movs r1, 0x8
-	ldrsh r0, [r6, r1]
-	movs r1, 0
-	bl GetPokemonType
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	movs r2, 0x8
-	ldrsh r0, [r6, r2]
-	movs r1, 0x1
-	bl GetPokemonType
-	lsls r0, 24
-	lsrs r0, 24
-	adds r2, r5, 0
-	subs r2, 0x55
-	ldr r5, _080916BC
-	lsls r2, 1
-	lsls r1, r4, 3
-	adds r1, r4
-	lsls r1, 2
-	adds r1, r2, r1
-	adds r1, r5
-	movs r4, 0
-	ldrsh r3, [r1, r4]
-	lsls r1, r0, 3
-	adds r1, r0
-	lsls r1, 2
-	adds r2, r1
-	adds r2, r5
-	movs r1, 0
-	ldrsh r0, [r2, r1]
-	movs r2, 0x14
-	ldrsh r1, [r6, r2]
-	adds r3, r0
-	ldrh r4, [r6, 0x14]
-	adds r3, r4
-	strh r3, [r6, 0x14]
-	movs r2, 0x14
-	ldrsh r0, [r6, r2]
-	subs r1, r0, r1
-	lsls r3, 16
-	cmp r3, 0
-	bgt _0809167C
-	movs r0, 0x1
-	strh r0, [r6, 0x14]
-_0809167C:
-	movs r4, 0x14
-	ldrsh r0, [r6, r4]
-	ldr r2, _080916C0
-	cmp r0, r2
-	ble _08091688
-	strh r2, [r6, 0x14]
-_08091688:
-	movs r0, 0
-	cmp r1, 0x8
-	bgt _0809169C
-	movs r0, 0x1
-	cmp r1, 0x4
-	bgt _0809169C
-	movs r0, 0x3
-	cmp r1, 0x2
-	ble _0809169C
-	movs r0, 0x2
-_0809169C:
-	strh r0, [r7]
-	mov r1, r8
-	cmp r1, 0
-	bne _08091756
-	cmp r0, 0
-	bne _080916C4
-	movs r0, 0x10
-	bl RandomCapped
-	cmp r0, 0xA
-	bne _080916C4
-	movs r0, 0xF
-	b _080916D2
-	.align 2, 0
-_080916B8: .4byte 0x0000ffff
-_080916BC: .4byte gUnknown_810A580
-_080916C0: .4byte 0x000003e7
-_080916C4:
-	movs r0, 0x4
-	bl RandomCapped
-	ldr r1, _080916EC
-	lsls r0, 1
-	adds r0, r1
-	ldrh r0, [r0]
-_080916D2:
-	strh r0, [r7, 0x2]
-	ldrh r1, [r7, 0x2]
-	movs r0, 0x1
-	ands r0, r1
-	cmp r0, 0
-	beq _080916F6
-	ldrb r0, [r6, 0x18]
-	cmp r0, 0xFE
-	bhi _080916F0
-	adds r0, 0x1
-	strb r0, [r6, 0x18]
-	b _080916F6
-	.align 2, 0
-_080916EC: .4byte gUnknown_81097E0
-_080916F0:
-	ldr r0, _0809170C
-	ands r0, r1
-	strh r0, [r7, 0x2]
-_080916F6:
-	ldrh r1, [r7, 0x2]
-	movs r0, 0x2
-	ands r0, r1
-	cmp r0, 0
-	beq _08091716
-	ldrb r0, [r6, 0x19]
-	cmp r0, 0xFE
-	bhi _08091710
-	adds r0, 0x1
-	strb r0, [r6, 0x19]
-	b _08091716
-	.align 2, 0
-_0809170C: .4byte 0x0000fffe
-_08091710:
-	ldr r0, _0809172C
-	ands r0, r1
-	strh r0, [r7, 0x2]
-_08091716:
-	ldrh r1, [r7, 0x2]
-	movs r0, 0x4
-	ands r0, r1
-	cmp r0, 0
-	beq _08091736
-	ldrb r0, [r6, 0x1A]
-	cmp r0, 0xFE
-	bhi _08091730
-	adds r0, 0x1
-	strb r0, [r6, 0x1A]
-	b _08091736
-	.align 2, 0
-_0809172C: .4byte 0x0000fffd
-_08091730:
-	ldr r0, _0809174C
-	ands r0, r1
-	strh r0, [r7, 0x2]
-_08091736:
-	ldrh r1, [r7, 0x2]
-	movs r0, 0x8
-	ands r0, r1
-	cmp r0, 0
-	beq _08091756
-	ldrb r0, [r6, 0x1B]
-	cmp r0, 0xFE
-	bhi _08091750
-	adds r0, 0x1
-	strb r0, [r6, 0x1B]
-	b _08091756
-	.align 2, 0
-_0809174C: .4byte 0x0000fffb
-_08091750:
-	ldr r0, _08091760
-	ands r0, r1
-	strh r0, [r7, 0x2]
-_08091756:
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08091760: .4byte 0x0000fff7
-	thumb_func_end sub_80915F4
-
-	thumb_func_start sub_8091764
-sub_8091764:
-	push {lr}
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x55
-	bls _08091776
-	cmp r0, 0x66
-	bhi _08091776
-	movs r0, 0x1
-	b _08091778
-_08091776:
-	movs r0, 0
-_08091778:
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8091764
-
-	thumb_func_start sub_809177C
-sub_809177C:
-	push {r4,lr}
-	movs r4, 0
-_08091780:
-	lsls r1, r4, 2
-	ldr r0, _080917A4
-	ldr r0, [r0]
-	adds r2, r1, r0
-	ldrb r1, [r2]
-	movs r0, 0x1
-	ands r0, r1
-	cmp r0, 0
-	beq _080917A8
-	ldrb r0, [r2, 0x2]
-	bl sub_8091764
-	lsls r0, 24
-	cmp r0, 0
-	beq _080917A8
-	movs r0, 0x1
-	b _080917B0
-	.align 2, 0
-_080917A4: .4byte gTeamInventory_203B460
-_080917A8:
-	adds r4, 0x1
-	cmp r4, 0x13
-	ble _08091780
-	movs r0, 0
-_080917B0:
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_809177C
-
-	thumb_func_start sub_80917B8
-sub_80917B8:
-	push {r4,lr}
-	adds r4, r0, 0
-	ldrb r0, [r4, 0x2]
-	bl IsThrowableItem
-	lsls r0, 24
-	cmp r0, 0
-	beq _080917E0
-	ldr r2, _080917DC
-	ldr r1, [r2]
-	ldrb r0, [r4, 0x2]
-	lsls r0, 1
-	adds r1, 0x50
-	adds r1, r0
-	ldrh r0, [r1]
-	ldrb r3, [r4, 0x1]
-	adds r0, r3
-	b _080917F0
-	.align 2, 0
-_080917DC: .4byte gTeamInventory_203B460
-_080917E0:
-	ldr r2, _0809180C
-	ldr r1, [r2]
-	ldrb r0, [r4, 0x2]
-	lsls r0, 1
-	adds r1, 0x50
-	adds r1, r0
-	ldrh r0, [r1]
-	adds r0, 0x1
-_080917F0:
-	strh r0, [r1]
-	ldr r0, [r2]
-	ldrb r1, [r4, 0x2]
-	lsls r1, 1
-	adds r0, 0x50
-	adds r2, r0, r1
-	ldrh r0, [r2]
-	ldr r1, _08091810
-	cmp r0, r1
-	bls _08091806
-	strh r1, [r2]
-_08091806:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0809180C: .4byte gTeamInventory_203B460
-_08091810: .4byte 0x000003e7
-	thumb_func_end sub_80917B8
-
-	thumb_func_start sub_8091814
-sub_8091814:
-	push {lr}
-	movs r3, 0
-	ldr r0, _0809183C
-	ldr r0, [r0]
-	movs r2, 0x8C
-	lsls r2, 2
-	adds r1, r0, r2
-	movs r2, 0x7
-_08091824:
-	ldrb r0, [r1]
-	cmp r0, 0
-	beq _0809182C
-	adds r3, 0x1
-_0809182C:
-	adds r1, 0x4
-	subs r2, 0x1
-	cmp r2, 0
-	bge _08091824
-	adds r0, r3, 0
-	pop {r1}
-	bx r1
-	.align 2, 0
-_0809183C: .4byte gTeamInventory_203B460
-	thumb_func_end sub_8091814
-
-	thumb_func_start sub_8091840
-sub_8091840:
-	lsls r0, 24
-	ldr r1, _08091858
-	lsrs r0, 22
-	movs r2, 0x8C
-	lsls r2, 2
-	adds r0, r2
-	ldr r1, [r1]
-	adds r1, r0
-	movs r0, 0
-	strb r0, [r1]
-	strb r0, [r1, 0x1]
-	bx lr
-	.align 2, 0
-_08091858: .4byte gTeamInventory_203B460
-	thumb_func_end sub_8091840
-
-	thumb_func_start sub_809185C
-sub_809185C:
-	lsls r0, 24
-	ldr r1, _08091870
-	lsrs r0, 22
-	movs r2, 0x8C
-	lsls r2, 2
-	adds r0, r2
-	ldr r1, [r1]
-	adds r1, r0
-	adds r0, r1, 0
-	bx lr
-	.align 2, 0
-_08091870: .4byte gTeamInventory_203B460
-	thumb_func_end sub_809185C
-
-	thumb_func_start sub_8091874
-sub_8091874:
-	push {r4-r7,lr}
-	movs r2, 0
-	movs r4, 0
-	ldr r7, _08091884
-	movs r6, 0x8C
-	lsls r6, 2
-	movs r3, 0
-	b _080918A0
-	.align 2, 0
-_08091884: .4byte gTeamInventory_203B460
-_08091888:
-	cmp r2, r4
-	ble _0809189A
-	ldr r0, [r7]
-	lsls r1, r4, 2
-	adds r0, r6
-	adds r1, r0, r1
-	adds r0, r3
-	ldr r0, [r0]
-	str r0, [r1]
-_0809189A:
-	adds r3, 0x4
-	adds r2, 0x1
-	adds r4, 0x1
-_080918A0:
-	cmp r2, 0x7
-	bgt _080918CA
-	ldr r0, [r7]
-	adds r0, r3
-	adds r0, r6
-	ldrb r0, [r0]
-	cmp r0, 0
-	bne _080918CA
-	ldr r5, _080918E8
-	movs r1, 0x8C
-	lsls r1, 2
-_080918B6:
-	adds r3, 0x4
-	adds r2, 0x1
-	cmp r2, 0x7
-	bgt _080918CA
-	ldr r0, [r5]
-	adds r0, r3
-	adds r0, r1
-	ldrb r0, [r0]
-	cmp r0, 0
-	beq _080918B6
-_080918CA:
-	cmp r2, 0x8
-	bne _08091888
-	cmp r4, 0x7
-	bgt _080918E0
-_080918D2:
-	lsls r0, r4, 24
-	lsrs r0, 24
-	bl sub_8091840
-	adds r4, 0x1
-	cmp r4, 0x7
-	ble _080918D2
-_080918E0:
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080918E8: .4byte gTeamInventory_203B460
-	thumb_func_end sub_8091874
-
 	thumb_func_start sub_80918EC
 sub_80918EC:
 	push {r4-r7,lr}
@@ -530,7 +104,7 @@ sub_8091980:
 _0809199C:
 	lsls r0, r5, 24
 	lsrs r0, 24
-	bl sub_8091840
+	bl xxx_init_unk230_substruct
 	adds r5, 0x1
 	cmp r5, 0x7
 	ble _0809199C
@@ -1432,4 +1006,4 @@ _08092038: .4byte gTeamInventory_203B460
 _0809203C: .4byte gRecruitedPokemonRef
 	thumb_func_end sub_8091FB4
 
-        .align 2,0
+        .align 2,0
\ No newline at end of file
diff --git a/asm/kangaskhan_storage_1.s b/asm/kangaskhan_storage_1.s
index 29c152c..4652c29 100644
--- a/asm/kangaskhan_storage_1.s
+++ b/asm/kangaskhan_storage_1.s
@@ -404,7 +404,7 @@ _080178F4:
 	ldr r4, _08017914
 	ldr r0, [r4]
 	adds r0, 0xC
-	bl sub_80917B8
+	bl MoveToStorage
 	ldr r0, [r4]
 	ldr r0, [r0, 0x10]
 	bl ShiftItemsDownFrom
@@ -520,7 +520,7 @@ _080179D2:
 	lsls r4, r5, 2
 	ldr r0, [r6]
 	adds r0, r4
-	bl sub_80917B8
+	bl MoveToStorage
 	ldr r0, [r6]
 	adds r0, r4
 	strb r7, [r0, 0x2]
diff --git a/asm/kangaskhan_storage_2.s b/asm/kangaskhan_storage_2.s
index 58c8bc6..0d1743f 100644
--- a/asm/kangaskhan_storage_2.s
+++ b/asm/kangaskhan_storage_2.s
@@ -465,7 +465,7 @@ _0801864A:
 	lsls r4, r5, 2
 	ldr r0, [r6]
 	adds r0, r4
-	bl sub_80917B8
+	bl MoveToStorage
 	ldr r0, [r6]
 	adds r0, r4
 	strb r7, [r0, 0x2]
@@ -849,7 +849,7 @@ _08018978: .4byte gUnknown_203B20C
 _0801897C:
 	ldr r0, [r4]
 	adds r0, 0x8
-	bl sub_80917B8
+	bl MoveToStorage
 	ldr r0, [r4]
 	ldr r0, [r0, 0xC]
 	bl ShiftItemsDownFrom
diff --git a/asm/kecleon_items.s b/asm/kecleon_items.s
index 044ae99..a0f9646 100644
--- a/asm/kecleon_items.s
+++ b/asm/kecleon_items.s
@@ -1228,8 +1228,8 @@ _08019874:
 	ldr r0, [r4]
 	adds r0, 0x20
 	ldrb r0, [r0]
-	bl sub_8091840
-	bl sub_8091874
+	bl xxx_init_unk230_substruct
+	bl xxx_fill_unk230_gaps
 	b _080198C8
 	.align 2, 0
 _080198A8: .4byte gUnknown_203B210
diff --git a/asm/pokemon_square.s b/asm/pokemon_square.s
index c09d8bc..b6469c8 100644
--- a/asm/pokemon_square.s
+++ b/asm/pokemon_square.s
@@ -10,7 +10,7 @@
 sub_8019E40:
 	push {r4-r6,lr}
 	adds r6, r0, 0
-	bl sub_8091814
+	bl xxx_count_inv_unk230
 	cmp r0, 0
 	beq _08019ED4
 	ldr r5, _08019EC8
@@ -50,7 +50,7 @@ sub_8019E40:
 	movs r2, 0x1
 	bl sub_800641C
 	ldr r4, [r5]
-	bl sub_8091814
+	bl xxx_count_inv_unk230
 	adds r1, r0, 0
 	adds r0, r4, 0
 	movs r2, 0xA
@@ -212,7 +212,7 @@ sub_8019FCC:
 	movs r1, 0
 	movs r2, 0
 	bl sub_800641C
-	bl sub_8091814
+	bl xxx_count_inv_unk230
 	adds r1, r0, 0
 	ldr r0, [r5]
 	strh r1, [r0, 0x22]
@@ -1727,7 +1727,7 @@ _0801AC50:
 	adds r1, r4, 0
 	bl sub_8090E14
 	ldrb r0, [r4, 0x2]
-	bl sub_8091764
+	bl IsGummiItem
 	lsls r0, 24
 	lsrs r5, r0, 24
 	cmp r5, 0