start pokemon 3

asm/pokemon_3.s

@@ -7,425 +7,7 @@
 
 
 
-	thumb_func_start sub_806F160
-sub_806F160: @ 806F160
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	adds r6, r0, 0
-	ldrb r0, [r6]
-	lsls r0, 28
-	movs r4, 0
-	cmp r0, 0
-	beq _0806F1EA
-_0806F176:
-	ldr r0, [r6, 0xC]
-	lsls r2, r4, 1
-	adds r1, r2, r4
-	lsls r1, 3
-	adds r0, r1, r0
-	ldr r3, =gUnknown_08329D98
-	adds r1, r3
-	ldm r1!, {r3,r5,r7}
-	stm r0!, {r3,r5,r7}
-	ldm r1!, {r3,r5,r7}
-	stm r0!, {r3,r5,r7}
-	movs r5, 0
-	ldrb r3, [r6, 0x1]
-	ldr r7, [r6, 0xC]
-	mov r9, r7
-	mov r8, r2
-	ldr r0, [r6, 0x10]
-	mov r12, r0
-	adds r1, r4, 0x1
-	mov r10, r1
-	cmp r5, r3
-	bcs _0806F1C8
-	mov r7, r12
-	ldr r1, [r6, 0x8]
-	lsls r0, r4, 2
-	adds r0, r1
-	ldr r2, [r0]
-_0806F1AC:
-	adds r0, r4, 0
-	muls r0, r3
-	adds r0, r5
-	lsls r0, 3
-	adds r0, r7
-	lsls r1, r5, 11
-	adds r1, r2, r1
-	str r1, [r0]
-	adds r0, r5, 0x1
-	lsls r0, 16
-	lsrs r5, r0, 16
-	ldrb r3, [r6, 0x1]
-	cmp r5, r3
-	bcc _0806F1AC
-_0806F1C8:
-	mov r3, r8
-	adds r1, r3, r4
-	lsls r1, 3
-	add r1, r9
-	ldrb r0, [r6, 0x1]
-	muls r0, r4
-	lsls r0, 3
-	add r0, r12
-	str r0, [r1, 0xC]
-	mov r5, r10
-	lsls r0, r5, 16
-	lsrs r4, r0, 16
-	ldrb r0, [r6]
-	lsls r0, 28
-	lsrs r0, 28
-	cmp r4, r0
-	blt _0806F176
-_0806F1EA:
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_806F160
 
-	thumb_func_start sub_806F1FC
-sub_806F1FC: @ 806F1FC
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	adds r4, r0, 0
-	ldrb r0, [r4]
-	lsls r0, 28
-	movs r3, 0
-	cmp r0, 0
-	beq _0806F296
-	ldr r0, =gUnknown_08329F28
-	mov r10, r0
-_0806F216:
-	ldr r0, [r4, 0xC]
-	lsls r2, r3, 1
-	adds r1, r2, r3
-	lsls r1, 3
-	adds r1, r0
-	mov r0, r10
-	ldm r0!, {r5-r7}
-	stm r1!, {r5-r7}
-	ldm r0!, {r5-r7}
-	stm r1!, {r5-r7}
-	movs r5, 0
-	ldr r0, [r4, 0xC]
-	mov r8, r0
-	mov r12, r2
-	ldr r7, [r4, 0x10]
-	adds r1, r3, 0x1
-	mov r9, r1
-	ldrb r6, [r4, 0x1]
-	cmp r5, r6
-	bcs _0806F26A
-	adds r6, r7, 0
-	ldr r1, [r4, 0x8]
-	lsls r0, r3, 2
-	adds r0, r1
-	ldr r2, [r0]
-_0806F248:
-	ldrb r0, [r4]
-	lsls r0, 28
-	lsrs r0, 28
-	adds r1, r3, 0
-	muls r1, r0
-	adds r1, r5
-	lsls r1, 3
-	adds r1, r6
-	lsls r0, r5, 11
-	adds r0, r2, r0
-	str r0, [r1]
-	adds r0, r5, 0x1
-	lsls r0, 16
-	lsrs r5, r0, 16
-	ldrb r0, [r4, 0x1]
-	cmp r5, r0
-	bcc _0806F248
-_0806F26A:
-	mov r5, r12
-	adds r1, r5, r3
-	lsls r1, 3
-	add r1, r8
-	ldrb r0, [r4]
-	lsls r0, 28
-	lsrs r0, 28
-	muls r0, r3
-	lsls r0, 3
-	adds r0, r7, r0
-	str r0, [r1, 0xC]
-	ldr r6, =gUnknown_082FF70C
-	str r6, [r1, 0x8]
-	strh r3, [r1, 0x2]
-	mov r7, r9
-	lsls r0, r7, 16
-	lsrs r3, r0, 16
-	ldrb r0, [r4]
-	lsls r0, 28
-	lsrs r0, 28
-	cmp r3, r0
-	blt _0806F216
-_0806F296:
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_806F1FC
-
-	thumb_func_start sub_806F2AC
-sub_806F2AC: @ 806F2AC
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	lsls r0, 24
-	lsrs r6, r0, 24
-	lsls r1, 24
-	lsrs r5, r1, 24
-	movs r7, 0
-	movs r0, 0x1
-	ands r6, r0
-	movs r0, 0x14
-	bl AllocZeroed
-	adds r4, r0, 0
-	cmp r4, 0
-	bne _0806F2D0
-	movs r0, 0
-	b _0806F46E
-_0806F2D0:
-	cmp r5, 0
-	beq _0806F2E6
-	cmp r5, 0x2
-	bne _0806F2E6
-	movs r0, 0x77
-	strb r0, [r4]
-	movs r0, 0x4
-	strb r0, [r4, 0x1]
-	movs r0, 0x21
-	strb r0, [r4, 0x3]
-	b _0806F30E
-_0806F2E6:
-	ldrb r1, [r4]
-	movs r2, 0x10
-	negs r2, r2
-	adds r0, r2, 0
-	ands r0, r1
-	movs r1, 0x4
-	orrs r0, r1
-	movs r3, 0xF
-	ands r0, r3
-	movs r1, 0x40
-	orrs r0, r1
-	strb r0, [r4]
-	movs r0, 0x4
-	strb r0, [r4, 0x1]
-	ldrb r0, [r4, 0x3]
-	ands r2, r0
-	movs r0, 0x1
-	orrs r2, r0
-	ands r2, r3
-	strb r2, [r4, 0x3]
-_0806F30E:
-	ldrb r1, [r4, 0x3]
-	lsls r1, 28
-	lsrs r1, 28
-	ldrb r0, [r4]
-	lsls r0, 28
-	lsrs r0, 15
-	muls r0, r1
-	bl AllocZeroed
-	str r0, [r4, 0x4]
-	ldrb r0, [r4]
-	lsls r0, 28
-	lsrs r0, 23
-	bl AllocZeroed
-	adds r1, r0, 0
-	str r1, [r4, 0x8]
-	ldr r2, [r4, 0x4]
-	cmp r2, 0
-	beq _0806F33A
-	cmp r1, 0
-	bne _0806F344
-_0806F33A:
-	movs r0, 0x1
-	orrs r7, r0
-	lsls r6, 2
-	mov r8, r6
-	b _0806F378
-_0806F344:
-	ldrb r0, [r4]
-	lsls r0, 28
-	movs r3, 0
-	lsls r6, 2
-	mov r8, r6
-	cmp r0, 0
-	beq _0806F378
-	adds r6, r1, 0
-	adds r5, r2, 0
-_0806F356:
-	lsls r2, r3, 2
-	adds r2, r6
-	ldrb r0, [r4, 0x3]
-	lsls r0, 28
-	lsrs r0, 28
-	lsls r1, r3, 13
-	muls r0, r1
-	adds r0, r5, r0
-	str r0, [r2]
-	adds r0, r3, 0x1
-	lsls r0, 24
-	lsrs r3, r0, 24
-	ldrb r0, [r4]
-	lsls r0, 28
-	lsrs r0, 28
-	cmp r3, r0
-	blt _0806F356
-_0806F378:
-	ldrb r1, [r4]
-	lsls r1, 28
-	lsrs r1, 28
-	lsls r0, r1, 1
-	adds r0, r1
-	lsls r0, 3
-	bl AllocZeroed
-	str r0, [r4, 0xC]
-	ldrb r1, [r4]
-	lsls r1, 28
-	lsrs r1, 28
-	ldrb r0, [r4, 0x1]
-	lsls r0, 3
-	muls r0, r1
-	bl AllocZeroed
-	adds r1, r0, 0
-	str r1, [r4, 0x10]
-	ldr r0, [r4, 0xC]
-	cmp r0, 0
-	beq _0806F3A8
-	cmp r1, 0
-	bne _0806F3B2
-_0806F3A8:
-	movs r0, 0x2
-	orrs r7, r0
-	lsls r0, r7, 24
-	lsrs r7, r0, 24
-	b _0806F400
-_0806F3B2:
-	movs r3, 0
-	ldrb r0, [r4, 0x1]
-	ldrb r1, [r4]
-	lsls r1, 28
-	lsrs r1, 28
-	muls r0, r1
-	cmp r3, r0
-	bge _0806F3E2
-	movs r2, 0x80
-	lsls r2, 4
-_0806F3C6:
-	ldr r1, [r4, 0x10]
-	lsls r0, r3, 3
-	adds r0, r1
-	strh r2, [r0, 0x4]
-	adds r0, r3, 0x1
-	lsls r0, 24
-	lsrs r3, r0, 24
-	ldrb r1, [r4, 0x1]
-	ldrb r0, [r4]
-	lsls r0, 28
-	lsrs r0, 28
-	muls r0, r1
-	cmp r3, r0
-	blt _0806F3C6
-_0806F3E2:
-	ldrb r0, [r4, 0x3]
-	lsrs r0, 4
-	cmp r0, 0
-	blt _0806F3FA
-	cmp r0, 0x1
-	ble _0806F3FA
-	cmp r0, 0x2
-	bne _0806F3FA
-	adds r0, r4, 0
-	bl sub_806F1FC
-	b _0806F400
-_0806F3FA:
-	adds r0, r4, 0
-	bl sub_806F160
-_0806F400:
-	movs r0, 0x2
-	ands r0, r7
-	cmp r0, 0
-	beq _0806F424
-	ldr r0, [r4, 0x10]
-	cmp r0, 0
-	beq _0806F416
-	bl Free
-	movs r0, 0
-	str r0, [r4, 0x10]
-_0806F416:
-	ldr r0, [r4, 0xC]
-	cmp r0, 0
-	beq _0806F424
-	bl Free
-	movs r0, 0
-	str r0, [r4, 0xC]
-_0806F424:
-	movs r0, 0x1
-	ands r0, r7
-	cmp r0, 0
-	beq _0806F448
-	ldr r0, [r4, 0x8]
-	cmp r0, 0
-	beq _0806F43A
-	bl Free
-	movs r0, 0
-	str r0, [r4, 0x8]
-_0806F43A:
-	ldr r0, [r4, 0x4]
-	cmp r0, 0
-	beq _0806F448
-	bl Free
-	movs r0, 0
-	str r0, [r4, 0x4]
-_0806F448:
-	cmp r7, 0
-	beq _0806F45E
-	adds r0, r4, 0
-	movs r1, 0
-	movs r2, 0x14
-	bl memset
-	adds r0, r4, 0
-	bl Free
-	b _0806F468
-_0806F45E:
-	movs r0, 0xA3
-	strb r0, [r4, 0x2]
-	ldr r0, =gUnknown_020249B4
-	add r0, r8
-	str r4, [r0]
-_0806F468:
-	ldr r0, =gUnknown_020249B4
-	add r0, r8
-	ldr r0, [r0]
-_0806F46E:
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_806F2AC
 
 	thumb_func_start sub_806F47C
 sub_806F47C: @ 806F47C

ld_script.txt

@@ -69,7 +69,6 @@ SECTIONS {
         src/battle_ai_switch_items.o(.text);
         src/battle_controller_link_opponent.o(.text);
         src/pokemon_1.o(.text);
-        src/pokemon_3.o(.text);
         asm/pokemon_3.o(.text);
         src/trig.o(.text);
         src/random.o(.text);