through sub_8026044

1 files changed, 0 insertions, 697 deletions

diff --git a/asm/dodrio_berry_picking.s b/asm/dodrio_berry_picking.s
index 5a771737d..cb3b042d9 100755
--- a/asm/dodrio_berry_picking.s
+++ b/asm/dodrio_berry_picking.s
@@ -5,703 +5,6 @@
 
 	.text
 
-	thumb_func_start sub_8025C0C
-sub_8025C0C: @ 8025C0C
-	push {r4-r7,lr}
-	sub sp, 0x18
-	ldr r5, =gUnknown_02022C98
-	ldr r0, [r5]
-	adds r1, r0, 0
-	adds r1, 0x24
-	ldrb r6, [r1]
-	ldr r2, =0x000031a0
-	adds r1, r0, r2
-	ldr r3, =0x000031cc
-	adds r2, r0, r3
-	ldr r4, =0x00003208
-	adds r3, r0, r4
-	ldr r7, =0x00003244
-	adds r4, r0, r7
-	str r4, [sp]
-	adds r7, 0x3C
-	adds r4, r0, r7
-	str r4, [sp, 0x4]
-	adds r7, 0x3C
-	adds r4, r0, r7
-	str r4, [sp, 0x8]
-	adds r4, r0, 0
-	adds r4, 0x40
-	str r4, [sp, 0xC]
-	movs r7, 0x90
-	lsls r7, 1
-	adds r4, r0, r7
-	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, [r5]
-	ldr r7, =0x000031b0
-	adds r2, r1, r7
-	str r0, [r2]
-	movs r0, 0x94
-	lsls r0, 1
-	adds r1, r0
-	movs r0, 0x1
-	strb r0, [r1]
-	movs r4, 0x1
-	cmp r4, r6
-	bcs _08025C9C
-_08025C6C:
-	adds r0, r4, 0
-	bl sub_8028374
-	cmp r0, 0
-	beq _08025C92
-	ldr r0, =gUnknown_02022C98
-	ldr r2, [r0]
-	lsls r1, r4, 2
-	movs r3, 0x98
-	lsls r3, 1
-	adds r0, r2, r3
-	adds r0, r1
-	movs r1, 0x1
-	str r1, [r0]
-	movs r7, 0x94
-	lsls r7, 1
-	adds r1, r2, r7
-	movs r0, 0
-	strb r0, [r1]
-_08025C92:
-	adds r0, r4, 0x1
-	lsls r0, 24
-	lsrs r4, r0, 24
-	cmp r4, r6
-	bcc _08025C6C
-_08025C9C:
-	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 _08025CFA
-	ldr r1, [r5]
-	movs r2, 0x94
-	lsls r2, 1
-	adds r0, r1, r2
-	ldrb r4, [r0]
-	cmp r4, 0
-	beq _08025CE8
-	bl sub_8011AC8
-	ldr r0, [r5]
-	adds r0, r6
-	movs r1, 0
-	strb r1, [r0]
-	b _08025CFA
-	.pool
-_08025CE8:
-	adds r0, r1, r6
-	ldrb r0, [r0]
-	cmp r0, 0x46
-	bls _08025CFA
-	bl sub_8011AC8
-	ldr r0, [r5]
-	adds r0, r6
-	strb r4, [r0]
-_08025CFA:
-	add sp, 0x18
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8025C0C
-
-	thumb_func_start sub_8025D04
-sub_8025D04: @ 8025D04
-	push {r4,r5,lr}
-	ldr r5, =gUnknown_02022C98
-	ldr r0, [r5]
-	ldrb r0, [r0, 0x18]
-	cmp r0, 0x4
-	beq _08025D40
-	cmp r0, 0x4
-	bgt _08025D20
-	cmp r0, 0x3
-	beq _08025D26
-	b _08025D4A
-	.pool
-_08025D20:
-	cmp r0, 0xB
-	beq _08025D46
-	b _08025D4A
-_08025D26:
-	bl sub_8026BB8
-	adds r4, r0, 0
-	cmp r4, 0x1
-	bne _08025D4A
-	bl sub_8026C28
-	ldr r0, [r5]
-	movs r1, 0x8E
-	lsls r1, 1
-	adds r0, r1
-	str r4, [r0]
-	b _08025D4A
-_08025D40:
-	bl sub_80259FC
-	b _08025D4A
-_08025D46:
-	bl sub_8025C0C
-_08025D4A:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8025D04
-
-	thumb_func_start sub_8025D50
-sub_8025D50: @ 8025D50
-	push {r4-r6,lr}
-	sub sp, 0x14
-	ldr r0, =gUnknown_02022C98
-	ldr r5, [r0]
-	ldrb r0, [r5, 0x18]
-	cmp r0, 0x4
-	beq _08025D68
-	cmp r0, 0xB
-	beq _08025DB8
-	b _08025DF4
-	.pool
-_08025D68:
-	ldr r1, =0x000032cc
-	adds r0, r5, r1
-	ldr r2, =0x000031cc
-	adds r1, r5, r2
-	ldr r3, =0x00003208
-	adds r2, r5, r3
-	ldr r4, =0x00003244
-	adds r3, r5, r4
-	movs r6, 0xCA
-	lsls r6, 6
-	adds r4, r5, r6
-	str r4, [sp]
-	adds r6, 0x3C
-	adds r4, r5, r6
-	str r4, [sp, 0x4]
-	adds r4, r5, 0
-	adds r4, 0x40
-	ldrb r4, [r4]
-	str r4, [sp, 0x8]
-	movs r6, 0x90
-	lsls r6, 1
-	adds r4, r5, r6
-	ldr r4, [r4]
-	str r4, [sp, 0xC]
-	adds r6, 0xC
-	adds r4, r5, r6
-	ldr r4, [r4]
-	str r4, [sp, 0x10]
-	bl sub_8027E30
-	b _08025DF4
-	.pool
-_08025DB8:
-	ldr r1, =0x000032cc
-	adds r0, r5, r1
-	ldr r2, =0x000031cc
-	adds r1, r5, r2
-	ldr r3, =0x00003208
-	adds r2, r5, r3
-	ldr r4, =0x00003244
-	adds r3, r5, r4
-	movs r6, 0xCA
-	lsls r6, 6
-	adds r4, r5, r6
-	str r4, [sp]
-	adds r6, 0x3C
-	adds r4, r5, r6
-	str r4, [sp, 0x4]
-	adds r4, r5, 0
-	adds r4, 0x40
-	ldrb r4, [r4]
-	str r4, [sp, 0x8]
-	movs r6, 0x90
-	lsls r6, 1
-	adds r4, r5, r6
-	ldr r4, [r4]
-	str r4, [sp, 0xC]
-	adds r6, 0xC
-	adds r4, r5, r6
-	ldr r4, [r4]
-	str r4, [sp, 0x10]
-	bl sub_8027E30
-_08025DF4:
-	add sp, 0x14
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8025D50
-
-	thumb_func_start sub_8025E0C
-sub_8025E0C: @ 8025E0C
-	push {r4-r6,lr}
-	sub sp, 0x18
-	ldr r0, =gUnknown_02022C98
-	ldr r5, [r0]
-	ldrb r0, [r5, 0x18]
-	cmp r0, 0x4
-	beq _08025E24
-	cmp r0, 0xB
-	beq _08025E7C
-	b _08025EC0
-	.pool
-_08025E24:
-	adds r0, r5, 0
-	adds r0, 0x28
-	ldrb r0, [r0]
-	lsls r1, r0, 4
-	subs r1, r0
-	lsls r1, 2
-	ldr r2, =0x000031a0
-	adds r1, r2
-	adds r1, r5, r1
-	ldr r3, =0x000031cc
-	adds r2, r5, r3
-	ldr r4, =0x00003208
-	adds r3, r5, r4
-	ldr r6, =0x00003244
-	adds r4, r5, r6
-	str r4, [sp]
-	adds r6, 0x3C
-	adds r4, r5, r6
-	str r4, [sp, 0x4]
-	adds r6, 0x3C
-	adds r4, r5, r6
-	str r4, [sp, 0x8]
-	adds r4, r5, 0
-	adds r4, 0x40
-	str r4, [sp, 0xC]
-	movs r6, 0x90
-	lsls r6, 1
-	adds r4, r5, r6
-	str r4, [sp, 0x10]
-	adds r6, 0xC
-	adds r4, r5, r6
-	str r4, [sp, 0x14]
-	bl sub_8028164
-	b _08025EC0
-	.pool
-_08025E7C:
-	adds r0, r5, 0
-	adds r0, 0x28
-	ldrb r0, [r0]
-	lsls r1, r0, 4
-	subs r1, r0
-	lsls r1, 2
-	ldr r2, =0x000031a0
-	adds r1, r2
-	adds r1, r5, r1
-	ldr r3, =0x000031cc
-	adds r2, r5, r3
-	ldr r4, =0x00003208
-	adds r3, r5, r4
-	ldr r6, =0x00003244
-	adds r4, r5, r6
-	str r4, [sp]
-	adds r6, 0x3C
-	adds r4, r5, r6
-	str r4, [sp, 0x4]
-	adds r6, 0x3C
-	adds r4, r5, r6
-	str r4, [sp, 0x8]
-	adds r4, r5, 0
-	adds r4, 0x40
-	str r4, [sp, 0xC]
-	movs r6, 0x90
-	lsls r6, 1
-	adds r4, r5, r6
-	str r4, [sp, 0x10]
-	adds r6, 0xC
-	adds r4, r5, r6
-	str r4, [sp, 0x14]
-	bl sub_8028164
-_08025EC0:
-	add sp, 0x18
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8025E0C
-
-	thumb_func_start sub_8025ED8
-sub_8025ED8: @ 8025ED8
-	push {r4,lr}
-	ldr r4, =gUnknown_02022C98
-	ldr r1, [r4]
-	ldrb r0, [r1, 0x18]
-	cmp r0, 0x4
-	beq _08025F0E
-	cmp r0, 0x4
-	bgt _08025EF4
-	cmp r0, 0x3
-	beq _08025EFA
-	b _08025F40
-	.pool
-_08025EF4:
-	cmp r0, 0xB
-	beq _08025F24
-	b _08025F40
-_08025EFA:
-	movs r0, 0x1
-	bl sub_8027DD0
-	ldr r0, [r4]
-	movs r1, 0x8E
-	lsls r1, 1
-	adds r0, r1
-	movs r1, 0x1
-	str r1, [r0]
-	b _08025F40
-_08025F0E:
-	ldr r2, =0x000032f8
-	adds r1, r2
-	ldrb r0, [r1]
-	cmp r0, 0
-	beq _08025F40
-	bl sub_80282EC
-	b _08025F40
-	.pool
-_08025F24:
-	movs r2, 0x90
-	lsls r2, 1
-	adds r0, r1, r2
-	ldr r0, [r0]
-	cmp r0, 0
-	bne _08025F40
-	adds r2, 0xC
-	adds r0, r1, r2
-	ldr r0, [r0]
-	cmp r0, 0
-	bne _08025F40
-	movs r0, 0x1
-	bl sub_8028350
-_08025F40:
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8025ED8
-
-	thumb_func_start sub_8025F48
-sub_8025F48: @ 8025F48
-	push {r4-r6,lr}
-	ldr r6, =gUnknown_02022C98
-	ldr r2, [r6]
-	adds r0, r2, 0
-	adds r0, 0x28
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	subs r0, r1
-	lsls r0, 2
-	adds r1, r2, r0
-	ldr r3, =0x000031cc
-	adds r0, r1, r3
-	ldrb r0, [r0]
-	cmp r0, 0
-	bne _08025F88
-	bl IsSEPlaying
-	lsls r0, 24
-	lsrs r1, r0, 24
-	cmp r1, 0
-	bne _08025FEA
-	ldr r0, [r6]
-	movs r2, 0xA2
-	lsls r2, 1
-	adds r0, r2
-	strb r1, [r0]
-	b _08025FEA
-	.pool
-_08025F88:
-	ldr r3, =0x000031d0
-	adds r0, r1, r3
-	ldrb r4, [r0]
-	cmp r4, 0x1
-	bne _08025FB8
-	movs r1, 0xA2
-	lsls r1, 1
-	adds r0, r2, r1
-	ldrb r0, [r0]
-	cmp r0, 0
-	bne _08025FEA
-	movs r0, 0x1F
-	bl m4aSongNumStop
-	movs r0, 0x1F
-	bl PlaySE
-	ldr r0, [r6]
-	movs r2, 0xA2
-	lsls r2, 1
-	adds r0, r2
-	b _08025FE8
-	.pool
-_08025FB8:
-	ldr r3, =0x000031d4
-	adds r0, r1, r3
-	ldrb r4, [r0]
-	cmp r4, 0x1
-	bne _08025FEA
-	movs r5, 0xA2
-	lsls r5, 1
-	adds r0, r2, r5
-	ldrb r0, [r0]
-	cmp r0, 0
-	bne _08025FEA
-	bl IsSEPlaying
-	lsls r0, 24
-	cmp r0, 0
-	bne _08025FEA
-	movs r0, 0x16
-	bl PlaySE
-	movs r0, 0x1
-	bl sub_80284CC
-	ldr r0, [r6]
-	adds r0, r5
-_08025FE8:
-	strb r4, [r0]
-_08025FEA:
-	ldr r0, =gUnknown_02022C98
-	ldr r2, [r0]
-	movs r5, 0xAA
-	lsls r5, 1
-	adds r1, r2, r5
-	ldrb r1, [r1]
-	adds r4, r0, 0
-	cmp r1, 0
-	bne _0802601C
-	adds r0, r2, 0
-	adds r0, 0x40
-	ldrb r0, [r0]
-	cmp r0, 0x9
-	bls _0802601C
-	bl StopMapMusic
-	ldr r0, [r4]
-	adds r0, r5
-	movs r1, 0x1
-	b _0802603A
-	.pool
-_0802601C:
-	ldr r0, [r4]
-	movs r1, 0xAA
-	lsls r1, 1
-	adds r0, r1
-	ldrb r0, [r0]
-	cmp r0, 0x1
-	bne _0802603C
-	movs r0, 0xB
-	bl PlayFanfareByFanfareNum
-	ldr r0, [r4]
-	movs r2, 0xAA
-	lsls r2, 1
-	adds r0, r2
-	movs r1, 0x2
-_0802603A:
-	strb r1, [r0]
-_0802603C:
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8025F48
-
-	thumb_func_start sub_8026044
-sub_8026044: @ 8026044
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	ldr r6, =gUnknown_02022C98
-	ldr r2, [r6]
-	adds r0, r2, 0
-	adds r0, 0x44
-	ldrb r0, [r0]
-	mov r8, r0
-	adds r0, r2, 0
-	adds r0, 0x48
-	ldrb r7, [r0]
-	subs r0, 0x20
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	subs r0, r1
-	lsls r0, 2
-	adds r1, r2, r0
-	ldr r3, =0x000031cc
-	adds r0, r1, r3
-	ldrb r3, [r0]
-	cmp r3, 0
-	bne _0802609C
-	ldr r4, =0x000031d0
-	adds r0, r1, r4
-	ldrb r0, [r0]
-	cmp r0, 0x1
-	beq _080260FE
-	adds r4, 0x4
-	adds r0, r1, r4
-	ldrb r0, [r0]
-	cmp r0, 0x1
-	beq _080260FE
-	movs r1, 0xA2
-	lsls r1, 1
-	adds r0, r2, r1
-	strb r3, [r0]
-	b _080260FE
-	.pool
-_0802609C:
-	ldr r3, =0x000031d0
-	adds r0, r1, r3
-	ldrb r4, [r0]
-	cmp r4, 0x1
-	bne _080260CC
-	movs r1, 0xA2
-	lsls r1, 1
-	adds r0, r2, r1
-	ldrb r0, [r0]
-	cmp r0, 0
-	bne _080260FE
-	movs r0, 0x1F
-	bl m4aSongNumStop
-	movs r0, 0x1F
-	bl PlaySE
-	ldr r0, [r6]
-	movs r3, 0xA2
-	lsls r3, 1
-	adds r0, r3
-	b _080260FC
-	.pool
-_080260CC:
-	ldr r4, =0x000031d4
-	adds r0, r1, r4
-	ldrb r4, [r0]
-	cmp r4, 0x1
-	bne _080260FE
-	movs r5, 0xA2
-	lsls r5, 1
-	adds r0, r2, r5
-	ldrb r0, [r0]
-	cmp r0, 0
-	bne _080260FE
-	bl IsSEPlaying
-	lsls r0, 24
-	cmp r0, 0
-	bne _080260FE
-	movs r0, 0x16
-	bl PlaySE
-	movs r0, 0x1
-	bl sub_80284CC
-	ldr r0, [r6]
-	adds r0, r5
-_080260FC:
-	strb r4, [r0]
-_080260FE:
-	mov r4, r8
-	cmp r4, r7
-	bcs _08026172
-	ldr r5, =gUnknown_02022C98
-_08026106:
-	ldr r2, [r5]
-	adds r0, r2, 0
-	adds r0, 0x28
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	subs r0, r1
-	lsls r0, 2
-	ldr r1, =0x000031a0
-	adds r0, r1
-	adds r0, r2, r0
-	adds r1, r0, 0
-	adds r1, 0x14
-	adds r0, 0x1F
-	adds r0, r4
-	ldrb r0, [r0]
-	cmp r0, 0x9
-	bls _0802615C
-	movs r3, 0xA4
-	lsls r3, 1
-	adds r0, r2, r3
-	adds r0, r4
-	ldrb r0, [r0]
-	cmp r0, 0
-	bne _08026168
-	adds r0, r1, r4
-	ldrb r0, [r0]
-	adds r0, 0x4A
-	bl PlaySE
-	ldr r0, [r5]
-	movs r1, 0xA4
-	lsls r1, 1
-	adds r0, r1
-	adds r0, r4
-	movs r1, 0x1
-	b _08026166
-	.pool
-_0802615C:
-	movs r3, 0xA4
-	lsls r3, 1
-	adds r0, r2, r3
-	adds r0, r4
-	movs r1, 0
-_08026166:
-	strb r1, [r0]
-_08026168:
-	adds r0, r4, 0x1
-	lsls r0, 24
-	lsrs r4, r0, 24
-	cmp r4, r7
-	bcc _08026106
-_08026172:
-	ldr r0, =gUnknown_02022C98
-	ldr r2, [r0]
-	movs r5, 0xAA
-	lsls r5, 1
-	adds r1, r2, r5
-	ldrb r1, [r1]
-	adds r4, r0, 0
-	cmp r1, 0
-	bne _080261A0
-	adds r0, r2, 0
-	adds r0, 0x40
-	ldrb r0, [r0]
-	cmp r0, 0x9
-	bls _080261A0
-	bl StopMapMusic
-	ldr r0, [r4]
-	adds r0, r5
-	movs r1, 0x1
-	b _080261BE
-	.pool
-_080261A0:
-	ldr r0, [r4]
-	movs r1, 0xAA
-	lsls r1, 1
-	adds r0, r1
-	ldrb r0, [r0]
-	cmp r0, 0x1
-	bne _080261C0
-	movs r0, 0xB
-	bl PlayFanfareByFanfareNum
-	ldr r0, [r4]
-	movs r3, 0xAA
-	lsls r3, 1
-	adds r0, r3
-	movs r1, 0x2
-_080261BE:
-	strb r1, [r0]
-_080261C0:
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8026044
-
 	thumb_func_start sub_80261CC
 sub_80261CC: @ 80261CC
 	push {lr}