Dodrio: through sub_8024A30

1 files changed, 0 insertions, 303 deletions

diff --git a/asm/dodrio_berry_picking.s b/asm/dodrio_berry_picking.s
index e52e7a347..bcb250567 100755
--- a/asm/dodrio_berry_picking.s
+++ b/asm/dodrio_berry_picking.s
@@ -5,309 +5,6 @@
 
 	.text
 
-	thumb_func_start sub_802493C
-sub_802493C: @ 802493C
-	push {r4-r6,lr}
-	adds r5, r1, 0
-	lsls r0, 16
-	lsrs r6, r0, 16
-	ldr r1, =gUnknown_03000DB0
-	movs r0, 0
-	str r0, [r1]
-	ldr r0, =gReceivedRemoteLinkPlayers
-	ldrb r0, [r0]
-	cmp r0, 0
-	beq _08024A10
-	ldr r4, =gUnknown_02022C98
-	ldr r0, =0x00003330
-	bl AllocZeroed
-	str r0, [r4]
-	cmp r0, 0
-	beq _08024A10
-	bl sub_8024A1C
-	ldr r0, [r4]
-	bl sub_8024A30
-	ldr r0, [r4]
-	str r5, [r0]
-	bl GetMultiplayerId
-	ldr r1, [r4]
-	adds r1, 0x28
-	strb r0, [r1]
-	ldr r1, [r4]
-	ldr r2, =0x000032cc
-	adds r0, r1, r2
-	adds r2, r1, 0
-	adds r2, 0x28
-	ldrb r3, [r2]
-	lsls r2, r3, 4
-	subs r2, r3
-	lsls r2, 2
-	adds r1, r2
-	ldr r2, =0x000031a0
-	adds r1, r2
-	movs r2, 0x3C
-	bl memcpy
-	ldr r0, [r4]
-	adds r1, r0, 0
-	adds r1, 0x28
-	ldrb r1, [r1]
-	lsls r1, 2
-	ldr r2, =0x0000318c
-	adds r1, r2
-	adds r0, r1
-	movs r1, 0x64
-	muls r1, r6
-	ldr r2, =gPlayerParty
-	adds r1, r2
-	bl sub_80261F8
-	ldr r0, =sub_8024BC8
-	movs r1, 0x1
-	bl CreateTask
-	ldr r0, =sub_80261CC
-	bl SetMainCallback2
-	bl sub_80273F0
-	ldr r2, [r4]
-	adds r0, r2, 0
-	adds r0, 0x24
-	ldrb r0, [r0]
-	adds r1, r2, 0
-	adds r1, 0x44
-	adds r2, 0x48
-	bl sub_8026B5C
-	bl StopMapMusic
-	ldr r0, =0x0000021e
-	bl PlayNewMapMusic
-	b _08024A16
-	.pool
-_08024A10:
-	adds r0, r5, 0
-	bl SetMainCallback2
-_08024A16:
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_802493C
-
-	thumb_func_start sub_8024A1C
-sub_8024A1C: @ 8024A1C
-	push {lr}
-	bl ResetTasks
-	bl ResetSpriteData
-	bl FreeAllSpritePalettes
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8024A1C
-
-	thumb_func_start sub_8024A30
-sub_8024A30: @ 8024A30
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0x28
-	adds r2, r0, 0
-	movs r0, 0
-	strb r0, [r2, 0xC]
-	strb r0, [r2, 0x10]
-	strb r0, [r2, 0x14]
-	strb r0, [r2, 0x18]
-	strb r0, [r2, 0x1C]
-	movs r3, 0x8E
-	lsls r3, 1
-	adds r1, r2, r3
-	str r0, [r1]
-	movs r7, 0x90
-	lsls r7, 1
-	adds r1, r2, r7
-	str r0, [r1]
-	adds r1, r2, 0
-	adds r1, 0x30
-	strb r0, [r1]
-	adds r1, 0x10
-	strb r0, [r1]
-	subs r1, 0x4
-	strb r0, [r1]
-	adds r3, 0x10
-	adds r1, r2, r3
-	str r0, [r1]
-	movs r5, 0
-	adds r1, r2, 0
-	adds r1, 0x98
-	movs r3, 0
-_08024A76:
-	adds r0, r1, r5
-	strb r3, [r0]
-	adds r0, r5, 0x1
-	lsls r0, 24
-	lsrs r5, r0, 24
-	cmp r5, 0x3
-	bls _08024A76
-	movs r5, 0
-	adds r7, r2, 0
-	adds r7, 0xA8
-	str r7, [sp]
-	adds r0, r2, 0
-	adds r0, 0xB0
-	str r0, [sp, 0xC]
-	movs r1, 0x4A
-	adds r1, r2
-	mov r10, r1
-	movs r3, 0x4C
-	adds r3, r2
-	mov r9, r3
-	movs r7, 0x4E
-	adds r7, r2
-	mov r12, r7
-	subs r0, 0x60
-	str r0, [sp, 0x24]
-	adds r6, r2, 0
-	adds r6, 0x54
-	adds r1, r2, 0
-	adds r1, 0xD0
-	str r1, [sp, 0x1C]
-	adds r3, r2, 0
-	adds r3, 0xDC
-	str r3, [sp, 0x20]
-	adds r7, r2, 0
-	adds r7, 0xC4
-	str r7, [sp, 0x14]
-	adds r0, 0xA4
-	str r0, [sp, 0x4]
-	adds r1, 0x25
-	str r1, [sp, 0x8]
-	subs r3, 0xBC
-	str r3, [sp, 0x10]
-	movs r7, 0x24
-	adds r7, r2
-	mov r8, r7
-	subs r0, 0xC0
-	str r0, [sp, 0x18]
-	movs r3, 0
-	movs r1, 0x86
-	lsls r1, 1
-	adds r4, r2, r1
-	movs r7, 0x98
-	lsls r7, 1
-	adds r2, r7
-_08024AE2:
-	ldr r1, [sp]
-	adds r0, r1, r5
-	strb r3, [r0]
-	ldr r7, [sp, 0xC]
-	adds r0, r7, r5
-	strb r3, [r0]
-	lsls r0, r5, 1
-	adds r0, r5
-	lsls r0, 2
-	mov r7, r10
-	adds r1, r7, r0
-	strh r3, [r1]
-	mov r7, r9
-	adds r1, r7, r0
-	strh r3, [r1]
-	mov r7, r12
-	adds r1, r7, r0
-	strh r3, [r1]
-	ldr r7, [sp, 0x24]
-	adds r1, r7, r0
-	strh r3, [r1]
-	adds r0, r6, r0
-	strh r3, [r0]
-	adds r0, r4, r5
-	strb r3, [r0]
-	lsls r0, r5, 2
-	adds r0, r2, r0
-	str r3, [r0]
-	adds r0, r5, 0x1
-	lsls r0, 24
-	lsrs r5, r0, 24
-	cmp r5, 0x4
-	bls _08024AE2
-	movs r5, 0
-	movs r3, 0
-	movs r4, 0xFF
-	ldr r6, [sp, 0x1C]
-_08024B2C:
-	adds r0, r6, r5
-	strb r3, [r0]
-	ldr r1, [sp, 0x20]
-	adds r0, r1, r5
-	strb r3, [r0]
-	ldr r7, [sp, 0x14]
-	adds r0, r7, r5
-	strb r3, [r0]
-	lsls r1, r5, 1
-	ldr r0, [sp, 0x4]
-	adds r2, r0, r1
-	ldrb r0, [r2]
-	orrs r0, r4
-	strb r0, [r2]
-	ldr r7, [sp, 0x8]
-	adds r1, r7, r1
-	ldrb r0, [r1]
-	orrs r0, r4
-	strb r0, [r1]
-	adds r0, r5, 0x1
-	lsls r0, 24
-	lsrs r5, r0, 24
-	cmp r5, 0xA
-	bls _08024B2C
-	bl GetMultiplayerId
-	movs r1, 0
-	lsls r0, 24
-	cmp r0, 0
-	bne _08024B6A
-	movs r1, 0x1
-_08024B6A:
-	ldr r0, [sp, 0x10]
-	strb r1, [r0]
-	bl GetLinkPlayerCount
-	mov r1, r8
-	strb r0, [r1]
-	bl GetMultiplayerId
-	ldr r3, [sp, 0x18]
-	strb r0, [r3]
-	movs r5, 0x1
-	mov r7, r8
-	ldrb r7, [r7]
-	cmp r5, r7
-	bcs _08024BB6
-	ldr r7, [sp, 0x18]
-	mov r6, r8
-_08024B8C:
-	adds r4, r7, r5
-	subs r0, r5, 0x1
-	adds r0, r7, r0
-	ldrb r0, [r0]
-	adds r0, 0x1
-	strb r0, [r4]
-	ldrb r2, [r4]
-	ldrb r1, [r6]
-	subs r0, r1, 0x1
-	cmp r2, r0
-	ble _08024BAA
-	adds r0, r2, 0
-	bl __umodsi3
-	strb r0, [r4]
-_08024BAA:
-	adds r0, r5, 0x1
-	lsls r0, 24
-	lsrs r5, r0, 24
-	ldrb r0, [r6]
-	cmp r5, r0
-	bcc _08024B8C
-_08024BB6:
-	add sp, 0x28
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8024A30
-
 	thumb_func_start sub_8024BC8
 sub_8024BC8: @ 8024BC8
 	push {r4,r5,lr}