through sub_80259FC

1 files changed, 0 insertions, 430 deletions

diff --git a/asm/dodrio_berry_picking.s b/asm/dodrio_berry_picking.s
index 9b7172029..5a771737d 100755
--- a/asm/dodrio_berry_picking.s
+++ b/asm/dodrio_berry_picking.s
@@ -5,436 +5,6 @@
 
 	.text
 
-	thumb_func_start sub_802589C
-sub_802589C: @ 802589C
-	push {r4,r5,lr}
-	lsls r0, 24
-	lsrs r5, r0, 24
-	ldr r1, =gUnknown_02022C98
-	ldr r0, [r1]
-	ldrb r0, [r0, 0x10]
-	adds r4, r1, 0
-	cmp r0, 0x1
-	beq _080258C8
-	cmp r0, 0x1
-	bgt _080258BC
-	cmp r0, 0
-	beq _080258C2
-	b _080258E0
-	.pool
-_080258BC:
-	cmp r0, 0x2
-	beq _080258CE
-	b _080258E0
-_080258C2:
-	bl sub_8026264
-	b _080258D2
-_080258C8:
-	bl sub_80286E4
-	b _080258D6
-_080258CE:
-	bl sub_8028828
-_080258D2:
-	cmp r0, 0x1
-	bne _08025904
-_080258D6:
-	ldr r1, [r4]
-	ldrb r0, [r1, 0x10]
-	adds r0, 0x1
-	strb r0, [r1, 0x10]
-	b _08025904
-_080258E0:
-	ldr r0, [r4]
-	adds r0, 0x20
-	ldrb r0, [r0]
-	cmp r0, 0
-	beq _080258F8
-	ldr r0, =sub_8024D4C
-	bl sub_802621C
-	b _080258FE
-	.pool
-_080258F8:
-	ldr r0, =sub_8024D84
-	bl sub_802621C
-_080258FE:
-	adds r0, r5, 0
-	bl DestroyTask
-_08025904:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_802589C
-
-	thumb_func_start sub_8025910
-sub_8025910: @ 8025910
-	push {r4-r6,lr}
-	lsls r0, 24
-	lsrs r6, r0, 24
-	lsls r0, r6, 2
-	adds r0, r6
-	lsls r0, 3
-	ldr r1, =gTasks + 0x8
-	adds r5, r0, r1
-	movs r0, 0
-	ldrsh r4, [r5, r0]
-	cmp r4, 0x1
-	beq _0802596C
-	cmp r4, 0x1
-	bgt _08025938
-	cmp r4, 0
-	beq _0802593E
-	b _080259E8
-	.pool
-_08025938:
-	cmp r4, 0x2
-	beq _0802597E
-	b _080259E8
-_0802593E:
-	ldr r6, =gUnknown_02022C98
-	ldr r1, [r6]
-	adds r0, r1, 0
-	adds r0, 0x28
-	ldrb r0, [r0]
-	lsls r0, 2
-	ldr r2, =0x0000318c
-	adds r0, r2
-	adds r1, r0
-	movs r0, 0
-	movs r2, 0x1
-	bl SendBlock
-	lsls r0, 24
-	cmp r0, 0
-	beq _080259E8
-	ldr r0, [r6]
-	strb r4, [r0, 0x8]
-	b _08025976
-	.pool
-_0802596C:
-	bl IsLinkTaskFinished
-	lsls r0, 24
-	cmp r0, 0
-	beq _080259E8
-_08025976:
-	ldrh r0, [r5]
-	adds r0, 0x1
-	strh r0, [r5]
-	b _080259E8
-_0802597E:
-	bl sub_8025170
-	cmp r0, 0
-	beq _080259C4
-	movs r2, 0
-	ldr r1, =gUnknown_02022C98
-	ldr r0, [r1]
-	adds r0, 0x24
-	ldrb r0, [r0]
-	cmp r2, r0
-	bcs _080259C4
-	adds r3, r1, 0
-	ldr r5, =gBlockRecvBuffer
-	ldr r4, =0x0000318c
-_0802599A:
-	ldr r0, [r3]
-	lsls r1, r2, 2
-	adds r1, r0
-	adds r1, r4
-	lsls r0, r2, 8
-	adds r0, r5
-	ldrb r0, [r0]
-	strb r0, [r1]
-	ldr r1, [r3]
-	adds r0, r1, 0
-	adds r0, 0x24
-	ldrb r0, [r0]
-	strb r0, [r1, 0x8]
-	adds r0, r2, 0x1
-	lsls r0, 24
-	lsrs r2, r0, 24
-	ldr r0, [r3]
-	adds r0, 0x24
-	ldrb r0, [r0]
-	cmp r2, r0
-	bcc _0802599A
-_080259C4:
-	ldr r4, =gUnknown_02022C98
-	ldr r0, [r4]
-	adds r1, r0, 0
-	adds r1, 0x24
-	ldrb r0, [r0, 0x8]
-	ldrb r1, [r1]
-	cmp r0, r1
-	bcc _080259E8
-	adds r0, r6, 0
-	bl DestroyTask
-	movs r0, 0x6
-	bl sub_80292E0
-	ldr r1, [r4]
-	ldrb r0, [r1, 0x10]
-	adds r0, 0x1
-	strb r0, [r1, 0x10]
-_080259E8:
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8025910
-
-	thumb_func_start sub_80259FC
-sub_80259FC: @ 80259FC
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	sub sp, 0x18
-	ldr r6, =gUnknown_02022C98
-	ldr r0, [r6]
-	adds r1, r0, 0
-	adds r1, 0x24
-	ldrb r7, [r1]
-	ldr r2, =0x000031a0
-	adds r1, r0, r2
-	ldr r3, =0x000031cc
-	adds r2, r0, r3
-	ldr r4, =0x00003208
-	adds r3, r0, r4
-	ldr r5, =0x00003244
-	adds r4, r0, r5
-	str r4, [sp]
-	adds r5, 0x3C
-	adds r4, r0, r5
-	str r4, [sp, 0x4]
-	adds r5, 0x3C
-	adds r4, r0, r5
-	str r4, [sp, 0x8]
-	adds r4, r0, 0
-	adds r4, 0x40
-	str r4, [sp, 0xC]
-	movs r5, 0x90
-	lsls r5, 1
-	adds r4, r0, r5
-	str r4, [sp, 0x10]
-	movs r4, 0x96
-	lsls r4, 1
-	adds r0, r4
-	str r0, [sp, 0x14]
-	movs r0, 0
-	bl sub_8028164
-	ldr r1, [r6]
-	ldr r5, =0x000031b0
-	adds r2, r1, r5
-	str r0, [r2]
-	movs r0, 0x94
-	lsls r0, 1
-	adds r1, r0
-	movs r0, 0x1
-	strb r0, [r1]
-	movs r5, 0x1
-	cmp r5, r7
-	bcs _08025AA4
-_08025A60:
-	ldr r1, [r6]
-	adds r0, r1, 0
-	adds r0, 0xA8
-	adds r0, r5
-	ldrb r0, [r0]
-	cmp r0, 0
-	bne _08025A9A
-	lsls r0, r5, 4
-	subs r0, r5
-	lsls r4, r0, 2
-	adds r1, r4, r1
-	ldr r2, =0x000031cc
-	adds r1, r2
-	adds r0, r5, 0
-	bl sub_8028318
-	adds r1, r0, 0
-	cmp r1, 0
-	bne _08025A9A
-	ldr r0, [r6]
-	adds r0, r4
-	ldr r3, =0x000031cc
-	adds r0, r3
-	strb r1, [r0]
-	ldr r0, [r6]
-	movs r4, 0x94
-	lsls r4, 1
-	adds r0, r4
-	strb r1, [r0]
-_08025A9A:
-	adds r0, r5, 0x1
-	lsls r0, 24
-	lsrs r5, r0, 24
-	cmp r5, r7
-	bcc _08025A60
-_08025AA4:
-	ldr r5, =gUnknown_02022C98
-	ldr r1, [r5]
-	movs r6, 0x92
-	lsls r6, 1
-	adds r1, r6
-	ldrb r0, [r1]
-	adds r0, 0x1
-	strb r0, [r1]
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x3B
-	bls _08025B02
-	ldr r1, [r5]
-	movs r2, 0x94
-	lsls r2, 1
-	adds r0, r1, r2
-	ldrb r4, [r0]
-	cmp r4, 0
-	beq _08025AF0
-	bl sub_8011AC8
-	ldr r0, [r5]
-	adds r0, r6
-	movs r1, 0
-	strb r1, [r0]
-	b _08025B02
-	.pool
-_08025AF0:
-	adds r0, r1, r6
-	ldrb r0, [r0]
-	cmp r0, 0x46
-	bls _08025B02
-	bl sub_8011AC8
-	ldr r0, [r5]
-	adds r0, r6
-	strb r4, [r0]
-_08025B02:
-	movs r5, 0
-	cmp r5, r7
-	bcs _08025BF6
-	ldr r3, =0x000031cc
-	mov r12, r3
-	ldr r4, =gUnknown_02022C98
-	mov r8, r4
-_08025B10:
-	mov r6, r8
-	ldr r2, [r6]
-	lsls r0, r5, 4
-	subs r1, r0, r5
-	lsls r1, 2
-	adds r1, r2, r1
-	add r1, r12
-	ldrb r1, [r1]
-	adds r6, r0, 0
-	cmp r1, 0
-	beq _08025B36
-	adds r0, r2, 0
-	adds r0, 0xA8
-	adds r1, r0, r5
-	ldrb r0, [r1]
-	cmp r0, 0
-	bne _08025B36
-	movs r0, 0x1
-	strb r0, [r1]
-_08025B36:
-	adds r3, r4, 0
-	ldr r1, [r3]
-	adds r0, r1, 0
-	adds r0, 0xA8
-	adds r0, r5
-	ldrb r0, [r0]
-	cmp r0, 0x3
-	bgt _08025B54
-	cmp r0, 0x1
-	bge _08025B5A
-	b _08025BEC
-	.pool
-_08025B54:
-	cmp r0, 0x4
-	beq _08025BA8
-	b _08025BEC
-_08025B5A:
-	adds r1, 0xB0
-	adds r1, r5
-	ldrb r0, [r1]
-	adds r0, 0x1
-	movs r2, 0
-	strb r0, [r1]
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x5
-	bls _08025BEC
-	ldr r0, [r3]
-	adds r0, 0xB0
-	adds r0, r5
-	strb r2, [r0]
-	ldr r0, [r3]
-	adds r0, 0xA8
-	adds r0, r5
-	strb r2, [r0]
-	ldr r0, [r3]
-	subs r1, r6, r5
-	lsls r1, 2
-	adds r0, r1
-	add r0, r12
-	strb r2, [r0]
-	ldr r0, [r3]
-	adds r0, r1
-	ldr r6, =0x000031d0
-	adds r0, r6
-	strb r2, [r0]
-	ldr r0, [r3]
-	adds r0, r1
-	ldr r1, =0x000031d4
-	adds r0, r1
-	b _08025BEA
-	.pool
-_08025BA8:
-	adds r1, 0xB0
-	adds r1, r5
-	ldrb r0, [r1]
-	adds r0, 0x1
-	movs r2, 0
-	strb r0, [r1]
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x27
-	bls _08025BEC
-	ldr r0, [r4]
-	adds r0, 0xB0
-	adds r0, r5
-	strb r2, [r0]
-	ldr r0, [r4]
-	adds r0, 0xA8
-	adds r0, r5
-	strb r2, [r0]
-	ldr r0, [r4]
-	subs r1, r6, r5
-	lsls r1, 2
-	adds r0, r1
-	add r0, r12
-	strb r2, [r0]
-	ldr r0, [r4]
-	adds r0, r1
-	ldr r3, =0x000031d0
-	adds r0, r3
-	strb r2, [r0]
-	ldr r0, [r4]
-	adds r0, r1
-	ldr r6, =0x000031d4
-	adds r0, r6
-_08025BEA:
-	strb r2, [r0]
-_08025BEC:
-	adds r0, r5, 0x1
-	lsls r0, 24
-	lsrs r5, r0, 24
-	cmp r5, r7
-	bcc _08025B10
-_08025BF6:
-	add sp, 0x18
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80259FC
-
 	thumb_func_start sub_8025C0C
 sub_8025C0C: @ 8025C0C
 	push {r4-r7,lr}