nonmatching sub_809C664

1 files changed, 2 insertions, 263 deletions

diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s
index 8724f5608..ad3f371f5 100644
--- a/asm/pokemon_storage_system.s
+++ b/asm/pokemon_storage_system.s
@@ -5,270 +5,8 @@
 
 	.text
 
-	thumb_func_start sub_809C664
-sub_809C664: @ 809C664
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	ldr r0, _0809C6D8 @ =gUnknown_020384E4
-	ldrb r0, [r0]
-	mov r10, r0
-	ldr r7, _0809C6DC @ =gUnknown_020384E5
-	ldrb r4, [r7]
-	ldr r2, _0809C6E0 @ =gPokemonStorageSystemPtr
-	ldr r5, [r2]
-	ldr r1, _0809C6E4 @ =0x000011df
-	adds r0, r5, r1
-	movs r1, 0
-	strb r1, [r0]
-	ldr r3, _0809C6E8 @ =0x000011de
-	adds r0, r5, r3
-	strb r1, [r0]
-	adds r3, 0x5
-	adds r0, r5, r3
-	strb r1, [r0]
-	mov r9, r1
-	mov r8, r1
-	ldr r1, _0809C6EC @ =gMain
-	ldrh r3, [r1, 0x30]
-	movs r0, 0x40
-	ands r0, r3
-	adds r6, r7, 0
-	mov r12, r2
-	adds r2, r1, 0
-	cmp r0, 0
-	beq _0809C6A8
-	b _0809C81C
-_0809C6A8:
-	movs r0, 0x80
-	ands r0, r3
-	cmp r0, 0
-	beq _0809C6F0
-	lsls r0, r4, 24
-	movs r1, 0x80
-	lsls r1, 17
-	adds r0, r1
-	lsrs r4, r0, 24
-	asrs r0, 24
-	cmp r0, 0x6
-	ble _0809C6C2
-	movs r4, 0
-_0809C6C2:
-	lsls r0, r4, 24
-	asrs r0, 24
-	movs r1, 0
-	ldrsb r1, [r6, r1]
-	cmp r0, r1
-	bne _0809C6D0
-	b _0809C83C
-_0809C6D0:
-	movs r2, 0x1
-	mov r8, r2
-	b _0809C842
-	.align 2, 0
-_0809C6D8: .4byte gUnknown_020384E4
-_0809C6DC: .4byte gUnknown_020384E5
-_0809C6E0: .4byte gPokemonStorageSystemPtr
-_0809C6E4: .4byte 0x000011df
-_0809C6E8: .4byte 0x000011de
-_0809C6EC: .4byte gMain
-_0809C6F0:
-	movs r0, 0x20
-	ands r0, r3
-	cmp r0, 0
-	beq _0809C714
-	ldrb r1, [r6]
-	movs r0, 0
-	ldrsb r0, [r6, r0]
-	cmp r0, 0
-	beq _0809C714
-	movs r3, 0x1
-	mov r8, r3
-	ldr r2, _0809C710 @ =0x000011e2
-	adds r0, r5, r2
-	strb r1, [r0]
-	movs r4, 0
-	b _0809C83C
-	.align 2, 0
-_0809C710: .4byte 0x000011e2
-_0809C714:
-	ldrh r1, [r2, 0x30]
-	movs r0, 0x10
-	ands r0, r1
-	cmp r0, 0
-	beq _0809C748
-	movs r0, 0
-	ldrsb r0, [r6, r0]
-	cmp r0, 0
-	bne _0809C73C
-	movs r3, 0x1
-	mov r8, r3
-	mov r1, r12
-	ldr r0, [r1]
-	ldr r2, _0809C738 @ =0x000011e2
-	adds r0, r2
-	ldrb r4, [r0]
-	b _0809C83C
-	.align 2, 0
-_0809C738: .4byte 0x000011e2
-_0809C73C:
-	movs r3, 0x6
-	mov r8, r3
-	movs r0, 0
-	mov r10, r0
-	movs r4, 0
-	b _0809C83C
-_0809C748:
-	ldrh r1, [r2, 0x2E]
-	movs r0, 0x1
-	ands r0, r1
-	cmp r0, 0
-	beq _0809C7D0
-	movs r0, 0
-	ldrsb r0, [r6, r0]
-	cmp r0, 0x6
-	bne _0809C76E
-	mov r1, r12
-	ldr r0, [r1]
-	ldrb r0, [r0, 0x5]
-	cmp r0, 0x1
-	bne _0809C768
-	movs r0, 0x4
-	b _0809C84C
-_0809C768:
-	movs r2, 0x1
-	mov r9, r2
-	b _0809C7D0
-_0809C76E:
-	bl sub_809CAB0
-	lsls r0, 24
-	cmp r0, 0
-	beq _0809C7D0
-	ldr r0, _0809C784 @ =gUnknown_020384E9
-	ldrb r0, [r0]
-	cmp r0, 0
-	bne _0809C788
-	movs r0, 0x8
-	b _0809C84C
-	.align 2, 0
-_0809C784: .4byte gUnknown_020384E9
-_0809C788:
-	movs r0, 0
-	bl sub_809CE4C
-	subs r0, 0x1
-	lsls r0, 24
-	asrs r0, 24
-	cmp r0, 0x4
-	bhi _0809C7D0
-	lsls r0, 2
-	ldr r1, _0809C7A4 @ =_0809C7A8
-	adds r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.align 2, 0
-_0809C7A4: .4byte _0809C7A8
-	.align 2, 0
-_0809C7A8:
-	.4byte _0809C7BC
-	.4byte _0809C7C0
-	.4byte _0809C7C4
-	.4byte _0809C7C8
-	.4byte _0809C7CC
-_0809C7BC:
-	movs r0, 0xB
-	b _0809C84C
-_0809C7C0:
-	movs r0, 0xC
-	b _0809C84C
-_0809C7C4:
-	movs r0, 0xD
-	b _0809C84C
-_0809C7C8:
-	movs r0, 0xE
-	b _0809C84C
-_0809C7CC:
-	movs r0, 0xF
-	b _0809C84C
-_0809C7D0:
-	ldr r2, _0809C7EC @ =gMain
-	ldrh r1, [r2, 0x2E]
-	movs r0, 0x2
-	ands r0, r1
-	cmp r0, 0
-	beq _0809C7F8
-	ldr r0, _0809C7F0 @ =gPokemonStorageSystemPtr
-	ldr r0, [r0]
-	ldrb r0, [r0, 0x5]
-	cmp r0, 0x1
-	bne _0809C7F4
-	movs r0, 0x10
-	b _0809C84C
-	.align 2, 0
-_0809C7EC: .4byte gMain
-_0809C7F0: .4byte gPokemonStorageSystemPtr
-_0809C7F4:
-	movs r3, 0x1
-	mov r9, r3
-_0809C7F8:
-	mov r0, r9
-	cmp r0, 0
-	beq _0809C80A
-	movs r1, 0x6
-	mov r8, r1
-	movs r2, 0
-	mov r10, r2
-	movs r4, 0
-	b _0809C83C
-_0809C80A:
-	ldrh r1, [r2, 0x2E]
-	movs r0, 0x4
-	ands r0, r1
-	cmp r0, 0
-	beq _0809C83C
-	bl sub_809CD88
-	movs r0, 0
-	b _0809C84C
-_0809C81C:
-	lsls r0, r4, 24
-	movs r3, 0xFF
-	lsls r3, 24
-	adds r0, r3
-	lsrs r4, r0, 24
-	cmp r0, 0
-	bge _0809C82C
-	movs r4, 0x6
-_0809C82C:
-	lsls r0, r4, 24
-	asrs r0, 24
-	movs r1, 0
-	ldrsb r1, [r7, r1]
-	cmp r0, r1
-	beq _0809C83C
-	movs r0, 0x1
-	mov r8, r0
-_0809C83C:
-	mov r1, r8
-	cmp r1, 0
-	beq _0809C84A
-_0809C842:
-	mov r0, r10
-	adds r1, r4, 0
-	bl sub_809AF18
-_0809C84A:
-	mov r0, r8
-_0809C84C:
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_809C664
-
 	thumb_func_start sub_809C85C
+@ u8 sub_809C85C(void)
 sub_809C85C: @ 809C85C
 	push {r4-r6,lr}
 	ldr r0, _0809C894 @ =gPokemonStorageSystemPtr
@@ -392,6 +130,7 @@ _0809C93E:
 	thumb_func_end sub_809C85C
 
 	thumb_func_start sub_809C944
+@ u8 sub_809C944(void)
 sub_809C944: @ 809C944
 	push {r4-r7,lr}
 	ldr r0, _0809C988 @ =gUnknown_020384E4