Moves and some friend_area_action_menu

1 files changed, 0 insertions, 649 deletions

diff --git a/asm/kangaskhan_storage_2.s b/asm/kangaskhan_storage_2.s
index 13f1b92..ec64f19 100644
--- a/asm/kangaskhan_storage_2.s
+++ b/asm/kangaskhan_storage_2.s
@@ -356,653 +356,4 @@ _08018582:
 	bx r0
 	thumb_func_end sub_80184D4
 
-	thumb_func_start sub_8018588
-sub_8018588:
-	push {r4,lr}
-	sub sp, 0x4
-	movs r0, 0
-	str r0, [sp]
-	ldr r4, _080185C4
-	ldr r0, [r4]
-	adds r0, 0x70
-	bl sub_8012FD8
-	lsls r0, 24
-	cmp r0, 0
-	bne _080185B4
-	ldr r0, [r4]
-	adds r0, 0x70
-	mov r1, sp
-	bl sub_8013114
-	ldr r1, [sp]
-	cmp r1, 0x1
-	beq _080185B4
-	ldr r0, [r4]
-	str r1, [r0, 0x14]
-_080185B4:
-	ldr r0, [sp]
-	cmp r0, 0x2
-	beq _080185CE
-	cmp r0, 0x2
-	bgt _080185C8
-	cmp r0, 0x1
-	beq _08018610
-	b _08018616
-	.align 2, 0
-_080185C4: .4byte gUnknown_203B20C
-_080185C8:
-	cmp r0, 0x3
-	beq _080185EA
-	b _08018616
-_080185CE:
-	bl GetNumberOfFilledInventorySlots
-	cmp r0, 0
-	beq _080185F6
-	movs r0, 0
-	bl sub_801CF50
-	lsls r0, 24
-	cmp r0, 0
-	bne _080185F6
-	movs r0, 0x4
-	bl sub_8017F10
-	b _08018616
-_080185EA:
-	movs r0, 0x1
-	bl sub_801CF14
-	lsls r0, 24
-	cmp r0, 0
-	beq _08018608
-_080185F6:
-	ldr r0, _08018604
-	ldr r0, [r0]
-	adds r0, 0x70
-	movs r1, 0x1
-	bl sub_8012EA4
-	b _08018616
-	.align 2, 0
-_08018604: .4byte gUnknown_203B20C
-_08018608:
-	movs r0, 0xA
-	bl sub_8017F10
-	b _08018616
-_08018610:
-	movs r0, 0x3
-	bl sub_8017F10
-_08018616:
-	add sp, 0x4
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8018588
-
-	thumb_func_start sub_8018620
-sub_8018620:
-	push {r4-r7,lr}
-	movs r0, 0x1
-	bl sub_801A6E8
-	cmp r0, 0x3
-	beq _0801863C
-	cmp r0, 0x3
-	bhi _08018636
-	cmp r0, 0x2
-	beq _080186E8
-	b _080186F2
-_08018636:
-	cmp r0, 0x4
-	beq _080186C0
-	b _080186F2
-_0801863C:
-	bl sub_801AEA8
-	cmp r0, 0
-	beq _08018698
-	movs r5, 0
-	ldr r6, _0801868C
-	movs r7, 0
-_0801864A:
-	adds r0, r5, 0
-	bl sub_801AED0
-	cmp r0, 0
-	beq _0801866A
-	lsls r4, r5, 2
-	ldr r0, [r6]
-	adds r0, r4
-	bl MoveToStorage
-	ldr r0, [r6]
-	adds r0, r4
-	strb r7, [r0, 0x2]
-	ldr r0, [r6]
-	adds r0, r4
-	strb r7, [r0]
-_0801866A:
-	adds r5, 0x1
-	cmp r5, 0x13
-	ble _0801864A
-	bl FillInventoryGaps
-	bl sub_801AE84
-	bl GetNumberOfFilledInventorySlots
-	cmp r0, 0
-	bne _08018690
-	bl sub_801A928
-	movs r0, 0x1
-	bl sub_8017F10
-	b _080186F2
-	.align 2, 0
-_0801868C: .4byte gTeamInventory_203B460
-_08018690:
-	movs r0, 0x5
-	bl sub_8017F10
-	b _080186F2
-_08018698:
-	bl sub_801A8AC
-	ldr r1, _080186B8
-	ldr r2, [r1]
-	str r0, [r2, 0xC]
-	ldr r1, _080186BC
-	ldr r1, [r1]
-	lsls r0, 2
-	adds r1, r0
-	ldr r0, [r1]
-	str r0, [r2, 0x8]
-	movs r0, 0x6
-	bl sub_8017F10
-	b _080186F2
-	.align 2, 0
-_080186B8: .4byte gUnknown_203B20C
-_080186BC: .4byte gTeamInventory_203B460
-_080186C0:
-	bl sub_801A8AC
-	ldr r1, _080186E0
-	ldr r2, [r1]
-	str r0, [r2, 0xC]
-	ldr r1, _080186E4
-	ldr r1, [r1]
-	lsls r0, 2
-	adds r1, r0
-	ldr r0, [r1]
-	str r0, [r2, 0x8]
-	movs r0, 0x7
-	bl sub_8017F10
-	b _080186F2
-	.align 2, 0
-_080186E0: .4byte gUnknown_203B20C
-_080186E4: .4byte gTeamInventory_203B460
-_080186E8:
-	bl sub_801A928
-	movs r0, 0x1
-	bl sub_8017F10
-_080186F2:
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8018620
-
-	thumb_func_start sub_80186F8
-sub_80186F8:
-	push {r4-r7,lr}
-	sub sp, 0x4
-	movs r0, 0x1
-	bl sub_801CA08
-	cmp r0, 0x2
-	bne _08018708
-	b _08018838
-_08018708:
-	cmp r0, 0x2
-	bhi _08018714
-	cmp r0, 0x1
-	bne _08018712
-	b _08018844
-_08018712:
-	b _0801884A
-_08018714:
-	cmp r0, 0x3
-	beq _0801871E
-	cmp r0, 0x4
-	beq _0801880C
-	b _0801884A
-_0801871E:
-	bl sub_801CFB8
-	cmp r0, 0
-	beq _080187E0
-	movs r6, 0
-	mov r5, sp
-	ldr r7, _0801876C
-_0801872C:
-	lsls r0, r6, 24
-	lsrs r4, r0, 24
-	adds r0, r4, 0
-	bl sub_801CFE0
-	cmp r0, 0
-	beq _080187B2
-	ldr r1, _08018770
-	ldr r0, [sp]
-	ands r0, r1
-	orrs r0, r4
-	str r0, [sp]
-	ldrb r0, [r5]
-	bl IsThrowableItem
-	lsls r0, 24
-	cmp r0, 0
-	beq _08018786
-	ldr r2, _08018774
-	ldr r1, [r2]
-	ldrb r0, [r5]
-	lsls r0, 1
-	adds r1, 0x50
-	adds r1, r0
-	ldrh r1, [r1]
-	cmp r1, 0x63
-	bls _08018778
-	ldr r0, [sp]
-	ands r0, r7
-	movs r1, 0xC6
-	lsls r1, 7
-	b _08018780
-	.align 2, 0
-_0801876C: .4byte 0xffff00ff
-_08018770: .4byte 0xffffff00
-_08018774: .4byte gTeamInventory_203B460
-_08018778:
-	lsls r1, 24
-	lsrs r1, 16
-	ldr r0, [sp]
-	ands r0, r7
-_08018780:
-	orrs r0, r1
-	str r0, [sp]
-	b _08018794
-_08018786:
-	ldr r0, [sp]
-	ands r0, r7
-	movs r1, 0x80
-	lsls r1, 1
-	orrs r0, r1
-	str r0, [sp]
-	ldr r2, _080187DC
-_08018794:
-	ldr r2, [r2]
-	ldrb r0, [r5]
-	lsls r0, 1
-	adds r2, 0x50
-	adds r2, r0
-	ldr r0, [sp]
-	lsrs r0, 8
-	lsls r0, 24
-	lsrs r0, 24
-	ldrh r1, [r2]
-	subs r1, r0
-	strh r1, [r2]
-	mov r0, sp
-	bl sub_8091274
-_080187B2:
-	adds r6, 0x1
-	cmp r6, 0xEF
-	ble _0801872C
-	bl FillInventoryGaps
-	bl sub_801CF94
-	movs r0, 0x1
-	bl sub_801CF14
-	lsls r0, 24
-	cmp r0, 0
-	bne _08018838
-	bl GetNumberOfFilledInventorySlots
-	cmp r0, 0x13
-	bgt _08018838
-	movs r0, 0xB
-	bl sub_8017F10
-	b _0801884A
-	.align 2, 0
-_080187DC: .4byte gTeamInventory_203B460
-_080187E0:
-	bl sub_801CB24
-	ldr r4, _08018808
-	ldr r1, [r4]
-	strb r0, [r1, 0x10]
-	ldr r1, [r4]
-	adds r0, r1, 0
-	adds r0, 0x8
-	ldrb r1, [r1, 0x10]
-	movs r2, 0
-	bl xxx_init_itemslot_8090A8C
-	ldr r1, [r4]
-	movs r0, 0x1
-	strb r0, [r1, 0x9]
-	movs r0, 0xD
-	bl sub_8017F10
-	b _0801884A
-	.align 2, 0
-_08018808: .4byte gUnknown_203B20C
-_0801880C:
-	bl sub_801CB24
-	ldr r4, _08018834
-	ldr r1, [r4]
-	strb r0, [r1, 0x10]
-	ldr r1, [r4]
-	adds r0, r1, 0
-	adds r0, 0x8
-	ldrb r1, [r1, 0x10]
-	movs r2, 0
-	bl xxx_init_itemslot_8090A8C
-	ldr r1, [r4]
-	movs r0, 0x1
-	strb r0, [r1, 0x9]
-	movs r0, 0xE
-	bl sub_8017F10
-	b _0801884A
-	.align 2, 0
-_08018834: .4byte gUnknown_203B20C
-_08018838:
-	bl sub_801CBB8
-	movs r0, 0x1
-	bl sub_8017F10
-	b _0801884A
-_08018844:
-	movs r0, 0
-	bl sub_801AD34
-_0801884A:
-	add sp, 0x4
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80186F8
-
-	thumb_func_start sub_8018854
-sub_8018854:
-	push {r4,lr}
-	sub sp, 0x4
-	movs r0, 0
-	bl sub_801CA08
-	ldr r4, _080188E0
-	ldr r0, [r4]
-	adds r0, 0x70
-	bl sub_8012FD8
-	ldr r0, [r4]
-	adds r0, 0xC0
-	bl sub_8013BBC
-	cmp r0, 0x1
-	beq _080188F8
-	cmp r0, 0x1
-	bcc _080188FC
-	cmp r0, 0x2
-	beq _080188F0
-	cmp r0, 0x3
-	bne _080188FC
-	ldr r1, [r4]
-	adds r0, r1, 0
-	adds r0, 0xC0
-	ldr r0, [r0]
-	strb r0, [r1, 0x9]
-	ldr r0, _080188E4
-	ldr r1, [r0]
-	ldr r3, [r4]
-	ldrb r0, [r3, 0xA]
-	lsls r0, 1
-	adds r1, 0x50
-	adds r1, r0
-	ldrb r2, [r3, 0x9]
-	ldrh r0, [r1]
-	subs r0, r2
-	strh r0, [r1]
-	ldrb r2, [r3, 0xA]
-	ldr r1, _080188E8
-	ldr r0, [sp]
-	ands r0, r1
-	orrs r0, r2
-	str r0, [sp]
-	ldrb r1, [r3, 0x9]
-	lsls r1, 8
-	ldr r2, _080188EC
-	ands r0, r2
-	orrs r0, r1
-	str r0, [sp]
-	mov r0, sp
-	bl sub_8091274
-	movs r0, 0x1
-	bl sub_801CF14
-	lsls r0, 24
-	cmp r0, 0
-	bne _080188D2
-	bl GetNumberOfFilledInventorySlots
-	cmp r0, 0x13
-	ble _080188F0
-_080188D2:
-	bl sub_801CBB8
-	movs r0, 0x1
-	bl sub_8017F10
-	b _080188FC
-	.align 2, 0
-_080188E0: .4byte gUnknown_203B20C
-_080188E4: .4byte gTeamInventory_203B460
-_080188E8: .4byte 0xffffff00
-_080188EC: .4byte 0xffff00ff
-_080188F0:
-	movs r0, 0xB
-	bl sub_8017F10
-	b _080188FC
-_080188F8:
-	bl sub_8018280
-_080188FC:
-	add sp, 0x4
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8018854
-
-	thumb_func_start sub_8018904
-sub_8018904:
-	push {r4,lr}
-	sub sp, 0x4
-	movs r0, 0
-	str r0, [sp]
-	bl sub_801A6E8
-	ldr r4, _08018944
-	ldr r0, [r4]
-	adds r0, 0x70
-	bl sub_8012FD8
-	lsls r0, 24
-	cmp r0, 0
-	bne _08018934
-	ldr r0, [r4]
-	adds r0, 0x70
-	mov r1, sp
-	bl sub_8013114
-	ldr r1, [sp]
-	cmp r1, 0x1
-	beq _08018934
-	ldr r0, [r4]
-	str r1, [r0, 0x18]
-_08018934:
-	ldr r0, [sp]
-	cmp r0, 0x2
-	beq _0801894E
-	cmp r0, 0x2
-	bgt _08018948
-	cmp r0, 0x1
-	beq _080189BA
-	b _080189C0
-	.align 2, 0
-_08018944: .4byte gUnknown_203B20C
-_08018948:
-	cmp r0, 0x4
-	beq _080189AC
-	b _080189C0
-_0801894E:
-	ldr r4, _08018978
-	ldr r0, [r4]
-	ldrb r0, [r0, 0xA]
-	bl IsNotMoneyOrUsedTMItem
-	lsls r0, 24
-	cmp r0, 0
-	beq _0801896C
-	ldr r0, [r4]
-	ldr r0, [r0, 0xC]
-	bl sub_801ADA0
-	lsls r0, 24
-	cmp r0, 0
-	bne _0801897C
-_0801896C:
-	ldr r0, [r4]
-	adds r0, 0x70
-	movs r1, 0x1
-	bl sub_8012EA4
-	b _080189C0
-	.align 2, 0
-_08018978: .4byte gUnknown_203B20C
-_0801897C:
-	ldr r0, [r4]
-	adds r0, 0x8
-	bl MoveToStorage
-	ldr r0, [r4]
-	ldr r0, [r0, 0xC]
-	bl ShiftItemsDownFrom
-	bl FillInventoryGaps
-	bl GetNumberOfFilledInventorySlots
-	cmp r0, 0
-	bne _080189A4
-	bl sub_801A928
-	movs r0, 0x1
-	bl sub_8017F10
-	b _080189C0
-_080189A4:
-	movs r0, 0x5
-	bl sub_8017F10
-	b _080189C0
-_080189AC:
-	movs r0, 0
-	bl sub_8099690
-	movs r0, 0x7
-	bl sub_8017F10
-	b _080189C0
-_080189BA:
-	movs r0, 0x5
-	bl sub_8017F10
-_080189C0:
-	add sp, 0x4
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8018904
-
-	thumb_func_start sub_80189C8
-sub_80189C8:
-	push {r4,lr}
-	sub sp, 0x8
-	movs r0, 0
-	str r0, [sp]
-	bl sub_801CA08
-	ldr r4, _08018A08
-	ldr r0, [r4]
-	adds r0, 0x70
-	bl sub_8012FD8
-	lsls r0, 24
-	cmp r0, 0
-	bne _080189F8
-	ldr r0, [r4]
-	adds r0, 0x70
-	mov r1, sp
-	bl sub_8013114
-	ldr r1, [sp]
-	cmp r1, 0x1
-	beq _080189F8
-	ldr r0, [r4]
-	str r1, [r0, 0x1C]
-_080189F8:
-	ldr r0, [sp]
-	cmp r0, 0x3
-	beq _08018A12
-	cmp r0, 0x3
-	bgt _08018A0C
-	cmp r0, 0x1
-	beq _08018AB8
-	b _08018ABE
-	.align 2, 0
-_08018A08: .4byte gUnknown_203B20C
-_08018A0C:
-	cmp r0, 0x4
-	beq _08018AB0
-	b _08018ABE
-_08018A12:
-	bl GetNumberOfFilledInventorySlots
-	cmp r0, 0x13
-	ble _08018A2C
-	ldr r0, _08018A28
-	ldr r0, [r0]
-	adds r0, 0x70
-	movs r1, 0x1
-	bl sub_8012EA4
-	b _08018ABE
-	.align 2, 0
-_08018A28: .4byte gUnknown_203B20C
-_08018A2C:
-	ldr r4, _08018A44
-	ldr r0, [r4]
-	ldrb r0, [r0, 0xA]
-	bl IsThrowableItem
-	lsls r0, 24
-	cmp r0, 0
-	beq _08018A48
-	movs r0, 0xC
-	bl sub_8017F10
-	b _08018ABE
-	.align 2, 0
-_08018A44: .4byte gUnknown_203B20C
-_08018A48:
-	ldr r0, _08018A9C
-	ldr r1, [r0]
-	ldr r3, [r4]
-	ldrb r0, [r3, 0xA]
-	lsls r0, 1
-	adds r1, 0x50
-	adds r1, r0
-	ldrb r2, [r3, 0x9]
-	ldrh r0, [r1]
-	subs r0, r2
-	strh r0, [r1]
-	ldrb r2, [r3, 0xA]
-	ldr r1, _08018AA0
-	ldr r0, [sp, 0x4]
-	ands r0, r1
-	orrs r0, r2
-	str r0, [sp, 0x4]
-	ldrb r1, [r3, 0x9]
-	lsls r1, 8
-	ldr r2, _08018AA4
-	ands r0, r2
-	orrs r0, r1
-	str r0, [sp, 0x4]
-	add r0, sp, 0x4
-	bl sub_8091274
-	movs r0, 0x1
-	bl sub_801CF14
-	lsls r0, 24
-	cmp r0, 0
-	bne _08018A90
-	bl GetNumberOfFilledInventorySlots
-	cmp r0, 0x13
-	ble _08018AA8
-_08018A90:
-	bl sub_801CBB8
-	movs r0, 0x1
-	bl sub_8017F10
-	b _08018ABE
-	.align 2, 0
-_08018A9C: .4byte gTeamInventory_203B460
-_08018AA0: .4byte 0xffffff00
-_08018AA4: .4byte 0xffff00ff
-_08018AA8:
-	movs r0, 0xB
-	bl sub_8017F10
-	b _08018ABE
-_08018AB0:
-	movs r0, 0xE
-	bl sub_8017F10
-	b _08018ABE
-_08018AB8:
-	movs r0, 0xB
-	bl sub_8017F10
-_08018ABE:
-	add sp, 0x8
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80189C8
-
         .align 2,0