through sub_8025758

1 files changed, 0 insertions, 487 deletions

diff --git a/asm/dodrio_berry_picking.s b/asm/dodrio_berry_picking.s
index 7441c2593..9b7172029 100755
--- a/asm/dodrio_berry_picking.s
+++ b/asm/dodrio_berry_picking.s
@@ -5,493 +5,6 @@
 
 	.text
 
-	thumb_func_start sub_8025470
-sub_8025470: @ 8025470
-	push {r4,r5,lr}
-	sub sp, 0x4
-	ldr r4, =gUnknown_02022C98
-	ldr r0, [r4]
-	ldrb r0, [r0, 0x10]
-	cmp r0, 0x7
-	bls _08025480
-	b _08025606
-_08025480:
-	lsls r0, 2
-	ldr r1, =_08025494
-	adds r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.pool
-	.align 2, 0
-_08025494:
-	.4byte _080254B4
-	.4byte _080254D4
-	.4byte _080254F0
-	.4byte _08025504
-	.4byte _08025520
-	.4byte _0802553C
-	.4byte _08025564
-	.4byte _08025578
-_080254B4:
-	bl sub_8027748
-	ldr r1, =0x00000bb7
-	cmp r0, r1
-	bls _080254C4
-	movs r0, 0x4
-	bl sub_80292E0
-_080254C4:
-	ldr r0, =gUnknown_02022C98
-	ldr r1, [r0]
-	b _080255E8
-	.pool
-_080254D4:
-	bl sub_802A770
-	cmp r0, 0
-	beq _080254DE
-	b _0802563C
-_080254DE:
-	movs r0, 0x3
-	bl sub_80292E0
-	ldr r0, =gUnknown_02022C98
-	ldr r1, [r0]
-	b _080255E8
-	.pool
-_080254F0:
-	bl sub_8028FCC
-	bl sub_80272E8
-	ldr r0, =gUnknown_02022C98
-	ldr r1, [r0]
-	b _080255E8
-	.pool
-_08025504:
-	bl sub_802A794
-	lsls r0, 24
-	lsrs r0, 24
-	mov r1, sp
-	strb r0, [r1]
-	cmp r0, 0
-	bne _08025516
-	b _0802563C
-_08025516:
-	ldr r0, =gUnknown_02022C98
-	ldr r1, [r0]
-	b _080255E8
-	.pool
-_08025520:
-	bl sub_802A770
-	cmp r0, 0
-	beq _0802552A
-	b _0802563C
-_0802552A:
-	movs r0, 0x5
-	bl sub_80292E0
-	ldr r0, =gUnknown_02022C98
-	ldr r1, [r0]
-	b _080255E8
-	.pool
-_0802553C:
-	bl sub_802A794
-	mov r1, sp
-	strb r0, [r1]
-	movs r0, 0
-	movs r2, 0x1
-	bl SendBlock
-	lsls r0, 24
-	cmp r0, 0
-	beq _0802563C
-	ldr r2, =gUnknown_02022C98
-	ldr r1, [r2]
-	movs r0, 0
-	strb r0, [r1, 0x8]
-	ldr r1, [r2]
-	b _080255E8
-	.pool
-_08025564:
-	bl IsLinkTaskFinished
-	lsls r0, 24
-	cmp r0, 0
-	beq _0802563C
-	ldr r0, =gUnknown_02022C98
-	ldr r1, [r0]
-	b _080255E8
-	.pool
-_08025578:
-	bl sub_8025170
-	cmp r0, 0
-	beq _080255BE
-	movs r2, 0
-	ldr r1, =gUnknown_02022C98
-	ldr r0, [r1]
-	adds r0, 0x24
-	ldrb r0, [r0]
-	cmp r2, r0
-	bcs _080255BE
-	adds r3, r1, 0
-	movs r5, 0x86
-	lsls r5, 1
-	ldr r4, =gBlockRecvBuffer
-_08025596:
-	ldr r1, [r3]
-	adds r1, r2, r1
-	adds r1, r5
-	lsls r0, r2, 8
-	adds r0, r4
-	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 _08025596
-_080255BE:
-	ldr r4, =gUnknown_02022C98
-	ldr r2, [r4]
-	adds r1, r2, 0
-	adds r1, 0x24
-	ldrb r0, [r2, 0x8]
-	ldrb r1, [r1]
-	cmp r0, r1
-	bcc _080255F8
-	ldrb r0, [r2, 0x14]
-	adds r0, 0x1
-	strb r0, [r2, 0x14]
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x77
-	bls _0802563C
-	bl sub_8027608
-	movs r0, 0x6
-	bl sub_80292E0
-	ldr r1, [r4]
-_080255E8:
-	ldrb r0, [r1, 0x10]
-	adds r0, 0x1
-	strb r0, [r1, 0x10]
-	b _0802563C
-	.pool
-_080255F8:
-	bl sub_8027554
-	b _0802563C
-_080255FE:
-	movs r0, 0x8
-	bl sub_8026240
-	b _0802563C
-_08025606:
-	bl sub_802A770
-	cmp r0, 0
-	bne _0802563C
-	movs r2, 0
-	ldr r1, [r4]
-	adds r0, r1, 0
-	adds r0, 0x24
-	ldrb r0, [r0]
-	cmp r2, r0
-	bcs _08025636
-	movs r4, 0x86
-	lsls r4, 1
-	adds r3, r1, r4
-	adds r1, r0, 0
-_08025624:
-	adds r0, r3, r2
-	ldrb r0, [r0]
-	cmp r0, 0x2
-	beq _080255FE
-	adds r0, r2, 0x1
-	lsls r0, 24
-	lsrs r2, r0, 24
-	cmp r2, r1
-	bcc _08025624
-_08025636:
-	movs r0, 0xA
-	bl sub_8026240
-_0802563C:
-	add sp, 0x4
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8025470
-
-	thumb_func_start sub_8025644
-sub_8025644: @ 8025644
-	push {r4,lr}
-	ldr r4, =gUnknown_02022C98
-	ldr r0, [r4]
-	ldrb r0, [r0, 0x10]
-	cmp r0, 0x1
-	beq _08025672
-	cmp r0, 0x1
-	bgt _08025660
-	cmp r0, 0
-	beq _08025666
-	b _08025692
-	.pool
-_08025660:
-	cmp r0, 0x2
-	beq _0802567C
-	b _08025692
-_08025666:
-	bl sub_800AC34
-	movs r0, 0x7
-	bl sub_80292E0
-	b _08025688
-_08025672:
-	bl sub_802A770
-	cmp r0, 0
-	bne _080256A0
-	b _08025688
-_0802567C:
-	bl sub_802A794
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x5
-	bne _080256A0
-_08025688:
-	ldr r1, [r4]
-	ldrb r0, [r1, 0x10]
-	adds r0, 0x1
-	strb r0, [r1, 0x10]
-	b _080256A0
-_08025692:
-	ldr r0, =gReceivedRemoteLinkPlayers
-	ldrb r0, [r0]
-	cmp r0, 0
-	bne _080256A0
-	movs r0, 0x9
-	bl sub_8026240
-_080256A0:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8025644
-
-	thumb_func_start sub_80256AC
-sub_80256AC: @ 80256AC
-	push {r4,lr}
-	sub sp, 0x4
-	ldr r4, =gUnknown_02022C98
-	ldr r0, [r4]
-	ldrb r1, [r0, 0x10]
-	cmp r1, 0x1
-	beq _080256E0
-	cmp r1, 0x1
-	bgt _080256C8
-	cmp r1, 0
-	beq _080256CE
-	b _08025728
-	.pool
-_080256C8:
-	cmp r1, 0x2
-	beq _080256F8
-	b _08025728
-_080256CE:
-	movs r0, 0x1
-	negs r0, r0
-	str r1, [sp]
-	movs r1, 0
-	movs r2, 0
-	movs r3, 0x10
-	bl BeginNormalPaletteFade
-	b _0802571A
-_080256E0:
-	bl UpdatePaletteFade
-	ldr r0, =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	bne _0802574C
-	b _0802571A
-	.pool
-_080256F8:
-	bl sub_8028B80
-	bl sub_80287E4
-	ldr r0, [r4]
-	adds r0, 0x24
-	ldrb r0, [r0]
-	bl sub_8028614
-	bl sub_8028E84
-	ldr r1, =gUnknown_03000DB0
-	movs r0, 0x1
-	str r0, [r1]
-	movs r0, 0x8
-	bl sub_80292E0
-_0802571A:
-	ldr r1, [r4]
-	ldrb r0, [r1, 0x10]
-	adds r0, 0x1
-	strb r0, [r1, 0x10]
-	b _0802574C
-	.pool
-_08025728:
-	bl sub_802A770
-	cmp r0, 0
-	bne _0802574C
-	ldr r4, =gUnknown_02022C98
-	ldr r0, [r4]
-	ldr r0, [r0]
-	bl SetMainCallback2
-	ldr r0, [r4]
-	ldrb r0, [r0, 0x4]
-	bl DestroyTask
-	ldr r0, [r4]
-	bl Free
-	bl FreeAllWindowBuffers
-_0802574C:
-	add sp, 0x4
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80256AC
-
-	thumb_func_start sub_8025758
-sub_8025758: @ 8025758
-	push {r4,lr}
-	sub sp, 0x4
-	ldr r4, =gUnknown_02022C98
-	ldr r1, [r4]
-	ldrb r0, [r1, 0x10]
-	cmp r0, 0x6
-	bls _08025768
-	b _0802585C
-_08025768:
-	lsls r0, 2
-	ldr r1, =_0802577C
-	adds r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.pool
-	.align 2, 0
-_0802577C:
-	.4byte _08025798
-	.4byte _08025838
-	.4byte _080257B0
-	.4byte _08025802
-	.4byte _08025808
-	.4byte _08025818
-	.4byte _08025838
-_08025798:
-	movs r0, 0x9
-	bl sub_80292E0
-	movs r0, 0x1
-	negs r0, r0
-	movs r1, 0
-	str r1, [sp]
-	movs r2, 0
-	movs r3, 0x10
-	bl BeginNormalPaletteFade
-	b _08025848
-_080257B0:
-	movs r0, 0
-	movs r1, 0
-	movs r2, 0
-	bl ChangeBgX
-	movs r0, 0
-	movs r1, 0
-	movs r2, 0
-	bl ChangeBgY
-	movs r0, 0x1
-	movs r1, 0
-	movs r2, 0
-	bl ChangeBgX
-	movs r0, 0x1
-	movs r1, 0
-	movs r2, 0
-	bl ChangeBgY
-	movs r0, 0x2
-	movs r1, 0
-	movs r2, 0
-	bl ChangeBgX
-	movs r0, 0x2
-	movs r1, 0
-	movs r2, 0
-	bl ChangeBgY
-	movs r0, 0x3
-	movs r1, 0
-	movs r2, 0
-	bl ChangeBgX
-	movs r0, 0x3
-	movs r1, 0
-	movs r2, 0
-	bl ChangeBgY
-	b _08025848
-_08025802:
-	bl StopMapMusic
-	b _08025848
-_08025808:
-	ldr r0, =0x0000021e
-	bl PlayNewMapMusic
-	bl sub_8028E4C
-	b _08025848
-	.pool
-_08025818:
-	movs r4, 0x1
-	negs r4, r4
-	adds r0, r4, 0
-	movs r1, 0x10
-	movs r2, 0
-	bl BlendPalettes
-	movs r0, 0
-	str r0, [sp]
-	adds r0, r4, 0
-	movs r1, 0
-	movs r2, 0x10
-	movs r3, 0
-	bl BeginNormalPaletteFade
-	b _08025848
-_08025838:
-	bl UpdatePaletteFade
-	ldr r0, =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	bne _0802588C
-_08025848:
-	ldr r0, =gUnknown_02022C98
-	ldr r1, [r0]
-	ldrb r0, [r1, 0x10]
-	adds r0, 0x1
-	strb r0, [r1, 0x10]
-	b _0802588C
-	.pool
-_0802585C:
-	ldrb r0, [r1, 0x4]
-	bl DestroyTask
-	ldr r0, =sub_802589C
-	bl sub_802621C
-	bl sub_802903C
-	ldr r0, [r4]
-	bl sub_8024A30
-	ldr r0, =gReceivedRemoteLinkPlayers
-	ldrb r0, [r0]
-	cmp r0, 0
-	bne _08025882
-	ldr r0, [r4]
-	adds r0, 0x24
-	movs r1, 0x1
-	strb r1, [r0]
-_08025882:
-	bl sub_80273F0
-	movs r0, 0
-	bl sub_8028EC8
-_0802588C:
-	add sp, 0x4
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8025758
-
 	thumb_func_start sub_802589C
 sub_802589C: @ 802589C
 	push {r4,r5,lr}