More battle factory work

1 files changed, 7 insertions, 720 deletions

diff --git a/asm/battle_frontier_2.s b/asm/battle_frontier_2.s
index ebf200811..4ad564400 100644
--- a/asm/battle_frontier_2.s
+++ b/asm/battle_frontier_2.s
@@ -6,719 +6,6 @@
 	.text
 
 
-	
-
-
-	thumb_func_start sub_819AB40
-sub_819AB40: @ 819AB40
-	push {r4-r6,lr}
-	movs r4, 0
-_0819AB44:
-	ldr r6, =gUnknown_0300127C
-	ldr r1, [r6]
-	movs r0, 0x6C
-	muls r0, r4
-	adds r1, r0
-	ldrh r1, [r1, 0xE]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	ldr r5, =gSprites
-	adds r0, r5
-	bl DestroySprite
-	adds r0, r4, 0x1
-	lsls r0, 24
-	lsrs r4, r0, 24
-	cmp r4, 0x5
-	bls _0819AB44
-	ldr r0, [r6]
-	ldrb r1, [r0, 0x4]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r5
-	bl DestroySprite
-	ldr r0, [r6]
-	ldrb r1, [r0, 0x1]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r5
-	bl DestroySprite
-	ldr r0, [r6]
-	ldrb r1, [r0, 0x2]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r5
-	bl DestroySprite
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_819AB40
-
-	thumb_func_start sub_819ABA8
-sub_819ABA8: @ 819ABA8
-	push {r4,lr}
-	lsls r0, 24
-	cmp r0, 0
-	ble _0819ABC8
-	ldr r0, =gUnknown_0300127C
-	ldr r1, [r0]
-	ldrb r3, [r1, 0x3]
-	adds r2, r0, 0
-	cmp r3, 0x5
-	beq _0819ABC4
-	adds r0, r3, 0x1
-	b _0819ABDE
-	.pool
-_0819ABC4:
-	movs r0, 0
-	b _0819ABDE
-_0819ABC8:
-	ldr r0, =gUnknown_0300127C
-	ldr r1, [r0]
-	ldrb r3, [r1, 0x3]
-	adds r2, r0, 0
-	cmp r3, 0
-	beq _0819ABDC
-	subs r0, r3, 0x1
-	b _0819ABDE
-	.pool
-_0819ABDC:
-	movs r0, 0x5
-_0819ABDE:
-	strb r0, [r1, 0x3]
-	ldr r2, [r2]
-	ldrb r3, [r2, 0x3]
-	ldr r4, =gSprites
-	ldrb r0, [r2, 0x4]
-	lsls r1, r0, 4
-	adds r1, r0
-	lsls r1, 2
-	adds r1, r4
-	movs r0, 0x6C
-	muls r0, r3
-	adds r2, r0
-	ldrh r2, [r2, 0xE]
-	lsls r0, r2, 4
-	adds r0, r2
-	lsls r0, 2
-	adds r0, r4
-	ldrh r0, [r0, 0x20]
-	strh r0, [r1, 0x20]
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_819ABA8
-
-	thumb_func_start sub_819AC10
-sub_819AC10: @ 819AC10
-	push {lr}
-	lsls r0, 24
-	cmp r0, 0
-	ble _0819AC30
-	ldr r0, =gUnknown_0300127C
-	ldr r1, [r0]
-	ldrb r3, [r1]
-	adds r2, r0, 0
-	cmp r3, 0x2
-	beq _0819AC2C
-	adds r0, r3, 0x1
-	b _0819AC46
-	.pool
-_0819AC2C:
-	movs r0, 0
-	b _0819AC46
-_0819AC30:
-	ldr r0, =gUnknown_0300127C
-	ldr r1, [r0]
-	ldrb r3, [r1]
-	adds r2, r0, 0
-	cmp r3, 0
-	beq _0819AC44
-	subs r0, r3, 0x1
-	b _0819AC46
-	.pool
-_0819AC44:
-	movs r0, 0x2
-_0819AC46:
-	strb r0, [r1]
-	ldr r3, =gSprites
-	ldr r2, [r2]
-	ldrb r0, [r2, 0x1]
-	lsls r1, r0, 4
-	adds r1, r0
-	lsls r1, 2
-	adds r1, r3
-	ldrb r0, [r2]
-	lsls r0, 4
-	adds r0, 0x70
-	strh r0, [r1, 0x22]
-	ldrb r0, [r2, 0x2]
-	lsls r1, r0, 4
-	adds r1, r0
-	lsls r1, 2
-	adds r1, r3
-	ldrb r0, [r2]
-	lsls r0, 4
-	adds r0, 0x70
-	strh r0, [r1, 0x22]
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_819AC10
-
-	thumb_func_start sub_819AC78
-sub_819AC78: @ 819AC78
-	push {lr}
-	lsls r0, 24
-	cmp r0, 0
-	ble _0819AC98
-	ldr r0, =gUnknown_0300127C
-	ldr r1, [r0]
-	ldrb r3, [r1, 0x7]
-	adds r2, r0, 0
-	cmp r3, 0x1
-	beq _0819AC94
-	adds r0, r3, 0x1
-	b _0819ACAE
-	.pool
-_0819AC94:
-	movs r0, 0
-	b _0819ACAE
-_0819AC98:
-	ldr r0, =gUnknown_0300127C
-	ldr r1, [r0]
-	ldrb r3, [r1, 0x7]
-	adds r2, r0, 0
-	cmp r3, 0
-	beq _0819ACAC
-	subs r0, r3, 0x1
-	b _0819ACAE
-	.pool
-_0819ACAC:
-	movs r0, 0x1
-_0819ACAE:
-	strb r0, [r1, 0x7]
-	ldr r3, =gSprites
-	ldr r2, [r2]
-	ldrb r0, [r2, 0x1]
-	lsls r1, r0, 4
-	adds r1, r0
-	lsls r1, 2
-	adds r1, r3
-	ldrb r0, [r2, 0x7]
-	lsls r0, 4
-	adds r0, 0x70
-	strh r0, [r1, 0x22]
-	ldrb r0, [r2, 0x2]
-	lsls r1, r0, 4
-	adds r1, r0
-	lsls r1, 2
-	adds r1, r3
-	ldrb r0, [r2, 0x7]
-	lsls r0, 4
-	adds r0, 0x70
-	strh r0, [r1, 0x22]
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_819AC78
-
-	thumb_func_start sub_819ACE0
-sub_819ACE0: @ 819ACE0
-	push {r4-r6,lr}
-	ldr r5, =gUnknown_0300127C
-	ldr r0, [r5]
-	ldrb r6, [r0, 0x3]
-	movs r1, 0x6C
-	adds r4, r6, 0
-	muls r4, r1
-	adds r0, r4
-	ldrb r0, [r0, 0x10]
-	cmp r0, 0
-	beq _0819AD60
-	movs r0, 0x64
-	bl IndexOfSpritePaletteTag
-	lsls r0, 24
-	lsrs r3, r0, 24
-	ldr r1, [r5]
-	ldrb r0, [r1, 0x5]
-	cmp r0, 0x3
-	bne _0819AD44
-	adds r0, r1, r4
-	ldrb r0, [r0, 0x10]
-	cmp r0, 0x1
-	bne _0819AD44
-	movs r2, 0
-	ldrb r0, [r1, 0x10]
-	cmp r0, 0x2
-	beq _0819AD32
-	movs r4, 0x6C
-_0819AD1A:
-	adds r0, r2, 0x1
-	lsls r0, 24
-	lsrs r2, r0, 24
-	cmp r2, 0x5
-	bhi _0819AD32
-	ldr r0, [r5]
-	adds r1, r2, 0
-	muls r1, r4
-	adds r0, r1
-	ldrb r0, [r0, 0x10]
-	cmp r0, 0x2
-	bne _0819AD1A
-_0819AD32:
-	cmp r2, 0x6
-	beq _0819AD9C
-	ldr r0, =gUnknown_0300127C
-	ldr r1, [r0]
-	movs r0, 0x6C
-	muls r0, r2
-	adds r1, r0
-	movs r0, 0x1
-	strb r0, [r1, 0x10]
-_0819AD44:
-	ldr r2, =gUnknown_0300127C
-	ldr r1, [r2]
-	movs r0, 0x6C
-	muls r0, r6
-	adds r1, r0
-	movs r0, 0
-	strb r0, [r1, 0x10]
-	ldr r1, [r2]
-	ldrb r0, [r1, 0x5]
-	subs r0, 0x1
-	b _0819AD78
-	.pool
-_0819AD60:
-	movs r0, 0x65
-	bl IndexOfSpritePaletteTag
-	lsls r0, 24
-	lsrs r3, r0, 24
-	ldr r0, [r5]
-	adds r1, r0, r4
-	ldrb r0, [r0, 0x5]
-	strb r0, [r1, 0x10]
-	ldr r1, [r5]
-	ldrb r0, [r1, 0x5]
-	adds r0, 0x1
-_0819AD78:
-	strb r0, [r1, 0x5]
-	ldr r2, =gSprites
-	ldr r0, =gUnknown_0300127C
-	ldr r0, [r0]
-	movs r1, 0x6C
-	muls r1, r6
-	adds r0, r1
-	ldrh r0, [r0, 0xE]
-	lsls r1, r0, 4
-	adds r1, r0
-	lsls r1, 2
-	adds r1, r2
-	lsls r3, 4
-	ldrb r2, [r1, 0x5]
-	movs r0, 0xF
-	ands r0, r2
-	orrs r0, r3
-	strb r0, [r1, 0x5]
-_0819AD9C:
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_819ACE0
-
-	thumb_func_start SetBallSpritePaletteNum
-SetBallSpritePaletteNum: @ 819ADAC
-	push {r4,lr}
-	lsls r0, 24
-	lsrs r4, r0, 24
-	ldr r0, =gUnknown_0300127C
-	ldr r0, [r0]
-	movs r1, 0x6C
-	muls r1, r4
-	adds r0, r1
-	ldrb r0, [r0, 0x10]
-	cmp r0, 0
-	beq _0819ADCC
-	movs r0, 0x65
-	b _0819ADCE
-	.pool
-_0819ADCC:
-	movs r0, 0x64
-_0819ADCE:
-	bl IndexOfSpritePaletteTag
-	lsls r0, 24
-	lsrs r3, r0, 24
-	ldr r2, =gSprites
-	ldr r0, =gUnknown_0300127C
-	ldr r0, [r0]
-	movs r1, 0x6C
-	muls r1, r4
-	adds r0, r1
-	ldrh r0, [r0, 0xE]
-	lsls r1, r0, 4
-	adds r1, r0
-	lsls r1, 2
-	adds r1, r2
-	lsls r3, 4
-	ldrb r2, [r1, 0x5]
-	movs r0, 0xF
-	ands r0, r2
-	orrs r0, r3
-	strb r0, [r1, 0x5]
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end SetBallSpritePaletteNum
-
-	thumb_func_start sub_819AE08
-sub_819AE08: @ 819AE08
-	push {r4-r6,lr}
-	sub sp, 0x4
-	lsls r0, 24
-	lsrs r2, r0, 24
-	ldr r1, =gTasks
-	lsls r0, r2, 2
-	adds r0, r2
-	lsls r0, 3
-	adds r6, r0, r1
-	movs r1, 0x8
-	ldrsh r0, [r6, r1]
-	cmp r0, 0x7
-	beq _0819AE64
-	cmp r0, 0x7
-	bgt _0819AE30
-	cmp r0, 0x6
-	beq _0819AE36
-	b _0819AF50
-	.pool
-_0819AE30:
-	cmp r0, 0x8
-	beq _0819AEE8
-	b _0819AF50
-_0819AE36:
-	ldr r1, =gPlttBufferUnfaded
-	ldr r0, =gPlttBufferFaded
-	movs r2, 0xE4
-	lsls r2, 1
-	adds r0, r2
-	ldrh r0, [r0]
-	adds r1, r2
-	movs r2, 0
-	strh r0, [r1]
-	movs r0, 0x1
-	negs r0, r0
-	str r2, [sp]
-	movs r1, 0
-	movs r3, 0x10
-	bl BeginNormalPaletteFade
-	movs r0, 0x7
-	strh r0, [r6, 0x8]
-	b _0819AF50
-	.pool
-_0819AE64:
-	ldr r0, =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	lsls r0, 24
-	lsrs r5, r0, 24
-	cmp r5, 0
-	bne _0819AF50
-	ldr r4, =gUnknown_0300127C
-	ldr r0, [r4]
-	ldr r2, =0x000002a1
-	adds r0, r2
-	ldrb r0, [r0]
-	bl DestroyTask
-	ldr r1, [r4]
-	movs r3, 0xA6
-	lsls r3, 2
-	adds r0, r1, r3
-	ldr r0, [r0]
-	movs r2, 0xA8
-	lsls r2, 2
-	adds r1, r2
-	bl sub_819F444
-	bl sub_819AB40
-	ldr r4, =gUnknown_0203CE2C
-	ldr r0, [r4]
-	bl Free
-	str r5, [r4]
-	ldr r4, =gUnknown_0203CE30
-	ldr r0, [r4]
-	bl Free
-	str r5, [r4]
-	ldr r4, =gUnknown_0203CE34
-	ldr r0, [r4]
-	bl Free
-	str r5, [r4]
-	ldr r4, =gUnknown_0203CE38
-	ldr r0, [r4]
-	bl Free
-	str r5, [r4]
-	bl FreeAllWindowBuffers
-	movs r0, 0x8
-	strh r0, [r6, 0x8]
-	b _0819AF50
-	.pool
-_0819AEE8:
-	ldr r4, =gUnknown_0300127C
-	ldr r1, [r4]
-	ldr r0, =gPlttBufferUnfaded
-	movs r3, 0xE4
-	lsls r3, 1
-	adds r0, r3
-	ldrh r0, [r0]
-	adds r3, 0xDC
-	adds r1, r3
-	strh r0, [r1]
-	adds r0, r2, 0
-	bl DestroyTask
-	ldr r1, [r4]
-	movs r0, 0x1
-	strb r0, [r1, 0x6]
-	ldr r0, [r4]
-	ldrb r6, [r0, 0x3]
-	ldr r4, =gUnknown_0203CE3C
-	movs r0, 0x96
-	lsls r0, 2
-	bl AllocZeroed
-	str r0, [r4]
-	movs r4, 0
-_0819AF1A:
-	ldr r5, =gUnknown_0203CE3C
-	ldr r1, [r5]
-	movs r0, 0x64
-	muls r0, r4
-	adds r0, r1
-	ldr r1, =gUnknown_0300127C
-	ldr r1, [r1]
-	movs r2, 0x6C
-	muls r2, r4
-	adds r1, r2
-	adds r1, 0x14
-	movs r2, 0x64
-	bl memcpy
-	adds r0, r4, 0x1
-	lsls r0, 24
-	lsrs r4, r0, 24
-	cmp r4, 0x5
-	bls _0819AF1A
-	ldr r1, [r5]
-	ldr r0, =sub_819A514
-	str r0, [sp]
-	movs r0, 0x1
-	adds r2, r6, 0
-	movs r3, 0x5
-	bl ShowPokemonSummaryScreen
-_0819AF50:
-	add sp, 0x4
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_819AE08
-
-	thumb_func_start bc_exit_to_overworld
-bc_exit_to_overworld: @ 819AF68
-	push {r4-r7,lr}
-	sub sp, 0x4
-	lsls r0, 24
-	lsrs r6, r0, 24
-	ldr r7, =gUnknown_0300127C
-	ldr r0, [r7]
-	movs r1, 0xA8
-	lsls r1, 2
-	adds r0, r1
-	ldrb r0, [r0]
-	cmp r0, 0x1
-	beq _0819B00E
-	ldr r1, =gTasks
-	lsls r0, r6, 2
-	adds r0, r6
-	lsls r0, 3
-	adds r4, r0, r1
-	movs r0, 0x8
-	ldrsh r1, [r4, r0]
-	cmp r1, 0
-	beq _0819AFA0
-	cmp r1, 0x1
-	beq _0819AFB8
-	b _0819B00E
-	.pool
-_0819AFA0:
-	movs r0, 0x1
-	negs r0, r0
-	str r1, [sp]
-	movs r1, 0
-	movs r2, 0
-	movs r3, 0x10
-	bl BeginNormalPaletteFade
-	ldrh r0, [r4, 0x8]
-	adds r0, 0x1
-	strh r0, [r4, 0x8]
-	b _0819B00E
-_0819AFB8:
-	bl UpdatePaletteFade
-	lsls r0, 24
-	lsrs r5, r0, 24
-	cmp r5, 0
-	bne _0819B00E
-	bl sub_819B764
-	ldr r0, [r7]
-	ldr r1, =0x000002a1
-	adds r0, r1
-	ldrb r0, [r0]
-	bl DestroyTask
-	bl sub_819AB40
-	ldr r4, =gUnknown_0203CE2C
-	ldr r0, [r4]
-	bl Free
-	str r5, [r4]
-	ldr r4, =gUnknown_0203CE34
-	ldr r0, [r4]
-	bl Free
-	str r5, [r4]
-	ldr r4, =gUnknown_0203CE38
-	ldr r0, [r4]
-	bl Free
-	str r5, [r4]
-	ldr r0, [r7]
-	bl Free
-	str r5, [r7]
-	bl FreeAllWindowBuffers
-	ldr r0, =CB2_ReturnToFieldContinueScript
-	bl SetMainCallback2
-	adds r0, r6, 0
-	bl DestroyTask
-_0819B00E:
-	add sp, 0x4
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end bc_exit_to_overworld
-
-	thumb_func_start sub_819B02C
-sub_819B02C: @ 819B02C
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	lsls r0, 24
-	lsrs r2, r0, 24
-	ldr r7, =gUnknown_0300127C
-	ldr r0, [r7]
-	movs r1, 0xA8
-	lsls r1, 2
-	adds r0, r1
-	ldrb r0, [r0]
-	cmp r0, 0x1
-	beq _0819B11A
-	ldr r1, =gTasks
-	lsls r0, r2, 2
-	adds r0, r2
-	lsls r0, 3
-	adds r5, r0, r1
-	movs r1, 0x8
-	ldrsh r0, [r5, r1]
-	cmp r0, 0x5
-	beq _0819B084
-	cmp r0, 0x5
-	bgt _0819B06C
-	cmp r0, 0x4
-	beq _0819B07A
-	b _0819B11A
-	.pool
-_0819B06C:
-	cmp r0, 0xA
-	bne _0819B11A
-	bl sub_819C4B4
-	movs r0, 0x4
-	strh r0, [r5, 0x8]
-	b _0819B11A
-_0819B07A:
-	bl sub_819B8D4
-	movs r0, 0x5
-	strh r0, [r5, 0x8]
-	b _0819B11A
-_0819B084:
-	ldr r2, =gMain
-	ldrh r1, [r2, 0x2E]
-	movs r0, 0x1
-	mov r8, r0
-	movs r6, 0x1
-	adds r0, r6, 0
-	ands r0, r1
-	cmp r0, 0
-	beq _0819B0B8
-	movs r0, 0x5
-	bl PlaySE
-	ldr r0, [r7]
-	ldrb r4, [r0, 0x7]
-	cmp r4, 0
-	bne _0819B0C6
-	bl sub_819C568
-	strh r4, [r5, 0x8]
-	ldr r0, =bc_exit_to_overworld
-	str r0, [r5]
-	b _0819B11A
-	.pool
-_0819B0B8:
-	movs r0, 0x2
-	ands r0, r1
-	cmp r0, 0
-	beq _0819B0EC
-	movs r0, 0x5
-	bl PlaySE
-_0819B0C6:
-	movs r0, 0x4
-	bl sub_819B958
-	bl sub_819BC9C
-	ldr r0, [r7]
-	ldr r1, =0x000002a2
-	adds r0, r1
-	mov r1, r8
-	strb r1, [r0]
-	strh r6, [r5, 0x8]
-	ldr r0, =sub_819B378
-	str r0, [r5]
-	b _0819B11A
-	.pool
-_0819B0EC:
-	ldrh r1, [r2, 0x30]
-	movs r0, 0x40
-	ands r0, r1
-	cmp r0, 0
-	beq _0819B106
-	movs r0, 0x5
-	bl PlaySE
-	movs r0, 0x1
-	negs r0, r0
-	bl sub_819AC78
-	b _0819B11A
-_0819B106:
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	beq _0819B11A
-	movs r0, 0x5
-	bl PlaySE
-	movs r0, 0x1
-	bl sub_819AC78
-_0819B11A:
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_819B02C
 
 	thumb_func_start sub_819B124
 sub_819B124: @ 819B124
@@ -836,7 +123,7 @@ _0819B228:
 	adds r0, r1
 	movs r1, 0xA
 	strh r1, [r0, 0x8]
-	ldr r1, =sub_819B02C
+	ldr r1, =Task_HandleSelectionScreenYesNo
 	str r1, [r0]
 	b _0819B36E
 	.pool
@@ -860,7 +147,7 @@ _0819B260:
 	adds r0, r1
 	movs r1, 0x6
 	strh r1, [r0, 0x8]
-	ldr r1, =sub_819AE08
+	ldr r1, =Task_FromSelectScreenToSummaryScreen
 	str r1, [r0]
 	b _0819B36E
 	.pool
@@ -909,7 +196,7 @@ _0819B2D0:
 	bl PlaySE
 	movs r0, 0x1
 	negs r0, r0
-	bl sub_819AC10
+	bl UpdateMenuCursorPosition
 	b _0819B36E
 _0819B2EA:
 	movs r0, 0x80
@@ -919,7 +206,7 @@ _0819B2EA:
 	movs r0, 0x5
 	bl PlaySE
 	movs r0, 0x1
-	bl sub_819AC10
+	bl UpdateMenuCursorPosition
 	b _0819B36E
 _0819B300:
 	ldr r0, =gPaletteFade
@@ -1065,7 +352,7 @@ _0819B422:
 	bl PlaySE
 	movs r0, 0x1
 _0819B432:
-	bl sub_819ABA8
+	bl UpdateBallCursorPosition
 	bl sub_819BCF8
 	bl sub_819B9E8
 	b _0819B476
@@ -2041,7 +1328,7 @@ _0819BC60:
 	adds r1, r2
 	movs r2, 0
 	bl sub_819F3F8
-	bl sub_819ACE0
+	bl HandleMonSelectionChange
 	bl sub_819BA64
 	movs r0, 0x3
 	bl sub_819B958
@@ -2064,7 +1351,7 @@ _0819BC96:
 sub_819BC9C: @ 819BC9C
 	push {lr}
 	bl sub_819C568
-	bl sub_819ACE0
+	bl HandleMonSelectionChange
 	bl sub_819BA64
 	movs r0, 0x3
 	bl sub_819B958