Merge record mixing, pokemon and global with apprentice

2 files changed, 20 insertions, 1257 deletions

diff --git a/asm/battle_frontier_2.s b/asm/battle_frontier_2.s
index 5d48ce87c..ee5f37944 100644
--- a/asm/battle_frontier_2.s
+++ b/asm/battle_frontier_2.s
@@ -8,1243 +8,6 @@
 
 
 
-	thumb_func_start sub_819FD64
-sub_819FD64: @ 819FD64
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0x20
-	movs r5, 0
-	mov r0, sp
-	adds r0, 0xC
-	str r0, [sp, 0x14]
-	mov r1, sp
-	adds r1, 0x10
-	str r1, [sp, 0x18]
-	adds r1, r0, 0
-_0819FD80:
-	adds r0, r1, r5
-	strb r5, [r0]
-	adds r0, r5, 0x1
-	lsls r0, 24
-	lsrs r5, r0, 24
-	cmp r5, 0x2
-	bls _0819FD80
-	movs r5, 0
-	ldr r6, [sp, 0x14]
-_0819FD92:
-	bl Random
-	lsls r0, 16
-	lsrs r0, 16
-	movs r1, 0x3
-	bl __umodsi3
-	lsls r0, 24
-	lsrs r4, r0, 24
-	bl Random
-	lsls r0, 16
-	lsrs r0, 16
-	movs r1, 0x3
-	bl __umodsi3
-	lsls r0, 24
-	lsrs r0, 24
-	adds r2, r6, r4
-	ldrb r3, [r2]
-	adds r1, r6, r0
-	ldrb r0, [r1]
-	strb r0, [r2]
-	strb r3, [r1]
-	adds r0, r5, 0x1
-	lsls r0, 24
-	lsrs r5, r0, 24
-	cmp r5, 0x9
-	bls _0819FD92
-	movs r5, 0
-	ldr r2, =gUnknown_086114D3
-_0819FDD0:
-	mov r4, sp
-	adds r1, r4, r5
-	adds r0, r5, r2
-	ldrb r0, [r0]
-	strb r0, [r1]
-	adds r0, r5, 0x1
-	lsls r0, 24
-	lsrs r5, r0, 24
-	cmp r5, 0x9
-	bls _0819FDD0
-	movs r5, 0
-_0819FDE6:
-	bl Random
-	lsls r0, 16
-	lsrs r0, 16
-	movs r1, 0xA
-	bl __umodsi3
-	lsls r0, 24
-	lsrs r4, r0, 24
-	bl Random
-	lsls r0, 16
-	lsrs r0, 16
-	movs r1, 0xA
-	bl __umodsi3
-	lsls r0, 24
-	lsrs r0, 24
-	mov r6, sp
-	adds r2, r6, r4
-	ldrb r3, [r2]
-	adds r1, r6, r0
-	ldrb r0, [r1]
-	strb r0, [r2]
-	strb r3, [r1]
-	adds r0, r5, 0x1
-	lsls r0, 24
-	lsrs r5, r0, 24
-	cmp r5, 0x31
-	bls _0819FDE6
-	ldr r4, =gUnknown_030062EC
-	movs r0, 0x30
-	bl AllocZeroed
-	str r0, [r4]
-	movs r1, 0
-	strb r1, [r0]
-	movs r5, 0
-	movs r2, 0x4
-_0819FE34:
-	movs r3, 0
-_0819FE36:
-	ldr r0, [r4]
-	lsls r1, r3, 2
-	adds r1, r3
-	adds r1, r5, r1
-	adds r0, 0x20
-	adds r0, r1
-	strb r2, [r0]
-	adds r0, r3, 0x1
-	lsls r0, 24
-	lsrs r3, r0, 24
-	cmp r3, 0x2
-	bls _0819FE36
-	adds r0, r5, 0x1
-	lsls r0, 24
-	lsrs r5, r0, 24
-	cmp r5, 0x4
-	bls _0819FE34
-	movs r0, 0
-	ldr r7, [sp, 0x18]
-	strb r0, [r7]
-	movs r5, 0
-_0819FE60:
-	ldr r0, =gSaveBlock2Ptr
-	ldr r3, [r0]
-	lsls r4, r5, 2
-	adds r3, r4
-	mov r1, sp
-	adds r6, r1, r5
-	ldrb r0, [r6]
-	adds r3, 0xB8
-	movs r2, 0x3
-	ands r2, r0
-	ldrb r0, [r3]
-	movs r7, 0x4
-	negs r7, r7
-	adds r1, r7, 0
-	ands r0, r1
-	orrs r0, r2
-	strb r0, [r3]
-	ldrb r0, [r6]
-	adds r5, 0x1
-	str r5, [sp, 0x1C]
-	mov r8, r4
-	cmp r0, 0x3
-	beq _0819FF62
-	ldrb r0, [r6]
-	ldr r1, [sp, 0x14]
-	ldr r2, [sp, 0x18]
-	bl sub_819FCF8
-	ldr r1, =gSaveBlock2Ptr
-	ldr r3, [r1]
-	add r3, r8
-	adds r3, 0xB8
-	movs r2, 0x3
-	ands r2, r0
-	lsls r2, 2
-	ldrb r0, [r3]
-	movs r4, 0xD
-	negs r4, r4
-	adds r1, r4, 0
-	ands r0, r1
-	orrs r0, r2
-	strb r0, [r3]
-	ldr r7, =gSaveBlock2Ptr
-	ldr r0, [r7]
-	add r0, r8
-	adds r0, 0xB8
-	ldrb r0, [r0]
-	lsls r0, 28
-	lsrs r7, r0, 30
-	ldrb r0, [r6]
-	cmp r0, 0x2
-	bne _0819FF62
-	lsls r0, r7, 2
-	adds r0, r7
-	mov r10, r0
-	ldr r0, =gUnknown_030062EC
-	mov r9, r0
-_0819FED2:
-	bl Random
-	lsls r0, 16
-	lsrs r4, r0, 16
-	movs r1, 0x3
-	ands r4, r1
-	movs r3, 0
-	mov r6, r9
-	ldr r2, [r6]
-	ldrb r0, [r2]
-	adds r1, r0, 0x1
-	lsls r5, r7, 2
-	cmp r3, r1
-	bge _0819FF12
-	adds r2, 0x20
-	mov r6, r10
-	adds r0, r2, r6
-	ldrb r0, [r0]
-	cmp r0, r4
-	beq _0819FF12
-	adds r6, r1, 0
-	adds r1, r5, r7
-_0819FEFE:
-	adds r0, r3, 0x1
-	lsls r0, 24
-	lsrs r3, r0, 24
-	cmp r3, r6
-	bge _0819FF12
-	adds r0, r3, r1
-	adds r0, r2, r0
-	ldrb r0, [r0]
-	cmp r0, r4
-	bne _0819FEFE
-_0819FF12:
-	mov r1, r9
-	ldr r0, [r1]
-	ldrb r0, [r0]
-	adds r0, 0x1
-	ldr r1, =gUnknown_030062EC
-	cmp r3, r0
-	bne _0819FED2
-	ldr r0, [r1]
-	orrs r5, r7
-	ldrb r2, [r0]
-	adds r1, r5, r2
-	adds r0, 0x20
-	adds r0, r1
-	strb r4, [r0]
-	ldr r6, =gSaveBlock2Ptr
-	ldr r2, [r6]
-	add r2, r8
-	adds r2, 0xB8
-	movs r7, 0x3
-	ands r4, r7
-	lsls r3, r4, 4
-	ldrb r0, [r2]
-	movs r4, 0x31
-	negs r4, r4
-	adds r1, r4, 0
-	ands r0, r1
-	orrs r0, r3
-	strb r0, [r2]
-	ldr r0, [r6]
-	add r0, r8
-	adds r0, 0xB8
-	ldrb r0, [r0]
-	lsls r0, 28
-	lsrs r0, 30
-	bl sub_819FF98
-	ldr r1, [r6]
-	add r1, r8
-	adds r1, 0xBA
-	strh r0, [r1]
-_0819FF62:
-	ldr r6, [sp, 0x1C]
-	lsls r0, r6, 24
-	lsrs r5, r0, 24
-	cmp r5, 0x8
-	bhi _0819FF6E
-	b _0819FE60
-_0819FF6E:
-	ldr r4, =gUnknown_030062EC
-	ldr r0, [r4]
-	bl Free
-	movs r0, 0
-	str r0, [r4]
-	add sp, 0x20
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_819FD64
-
-	thumb_func_start sub_819FF98
-sub_819FF98: @ 819FF98
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0x10
-	lsls r0, 24
-	lsrs r0, 24
-	str r0, [sp]
-	movs r0, 0
-	str r0, [sp, 0xC]
-	movs r7, 0
-	ldr r1, [sp]
-	cmp r1, 0x2
-	bhi _0819FFE0
-	ldr r2, =gSaveBlock2Ptr
-	ldr r1, [r2]
-	adds r0, r1, 0
-	adds r0, 0xB4
-	ldr r3, [sp]
-	adds r0, r3
-	ldrb r4, [r0]
-	adds r1, 0xB2
-	ldrb r0, [r1]
-	lsls r0, 29
-	lsrs r0, 29
-	asrs r0, r3
-	movs r1, 0x1
-	ands r0, r1
-	lsls r0, 2
-	asrs r4, r0
-	movs r0, 0xF
-	ands r4, r0
-	b _0819FFE4
-	.pool
-_0819FFE0:
-	movs r4, 0
-	ldr r2, =gSaveBlock2Ptr
-_0819FFE4:
-	ldr r3, =gUnknown_08610970
-	lsls r1, r4, 1
-	ldr r4, [r2]
-	adds r0, r4, 0
-	adds r0, 0xB0
-	ldrb r2, [r0]
-	movs r0, 0x58
-	muls r0, r2
-	adds r1, r0
-	adds r3, 0x34
-	adds r1, r3
-	ldrh r1, [r1]
-	str r1, [sp, 0x8]
-	ldr r1, =gLevelUpLearnsets
-	ldr r2, [sp, 0x8]
-	lsls r0, r2, 2
-	adds r0, r1
-	ldr r6, [r0]
-	movs r3, 0
-	adds r4, 0xB1
-	ldrb r1, [r4]
-	movs r0, 0x3
-	ands r0, r1
-	movs r5, 0x3C
-	cmp r0, 0x1
-	bne _081A001A
-	movs r5, 0x32
-_081A001A:
-	ldrh r1, [r6]
-	ldr r4, =0x0000ffff
-	cmp r1, r4
-	beq _081A004C
-	movs r2, 0xFE
-	lsls r2, 8
-	adds r0, r2, 0
-	ands r0, r1
-	lsls r1, r5, 9
-	cmp r0, r1
-	bgt _081A004C
-	adds r5, r2, 0
-	adds r2, r1, 0
-_081A0034:
-	adds r0, r3, 0x1
-	lsls r0, 24
-	lsrs r3, r0, 24
-	lsls r0, r3, 1
-	adds r0, r6
-	ldrh r1, [r0]
-	cmp r1, r4
-	beq _081A004C
-	adds r0, r5, 0
-	ands r0, r1
-	cmp r0, r2
-	ble _081A0034
-_081A004C:
-	adds r5, r3, 0
-	movs r3, 0
-	str r3, [sp, 0x4]
-_081A0052:
-	bl Random
-	lsls r0, 16
-	lsrs r0, 16
-	movs r1, 0x1
-	ands r0, r1
-	cmp r0, 0
-	beq _081A0068
-	ldr r0, [sp, 0xC]
-	cmp r0, 0x1
-	bne _081A00E0
-_081A0068:
-	ldr r1, =0x000001ff
-	mov r8, r1
-_081A006C:
-	bl Random
-	lsls r0, 16
-	lsrs r0, 16
-	movs r1, 0x3A
-	bl __umodsi3
-	lsls r0, 24
-	lsrs r4, r0, 24
-	ldr r0, [sp, 0x8]
-	adds r1, r4, 0
-	bl CanSpeciesLearnTMHM
-	adds r2, r0, 0
-	cmp r2, 0
-	beq _081A006C
-	ldr r2, =0x00000121
-	adds r0, r4, r2
-	bl ItemIdToBattleMoveId
-	lsls r0, 16
-	lsrs r7, r0, 16
-	movs r2, 0x1
-	cmp r5, 0x4
-	bhi _081A00BC
-	movs r3, 0
-	b _081A00C6
-	.pool
-_081A00BC:
-	subs r0, r5, 0x4
-	b _081A00C2
-_081A00C0:
-	adds r0, r3, 0x1
-_081A00C2:
-	lsls r0, 24
-	lsrs r3, r0, 24
-_081A00C6:
-	cmp r3, r5
-	bcs _081A00DA
-	lsls r0, r3, 1
-	adds r0, r6
-	ldrh r0, [r0]
-	mov r1, r8
-	ands r0, r1
-	cmp r0, r7
-	bne _081A00C0
-	movs r2, 0
-_081A00DA:
-	cmp r2, 0x1
-	bne _081A006C
-	b _081A0146
-_081A00E0:
-	cmp r5, 0x4
-	bhi _081A00EA
-	movs r2, 0x1
-	str r2, [sp, 0xC]
-	b _081A0168
-_081A00EA:
-	subs r4, r5, 0x4
-	ldr r3, =0x000001ff
-	mov r10, r3
-	mov r8, r3
-	lsls r0, r4, 24
-	mov r9, r0
-_081A00F6:
-	bl Random
-	lsls r0, 16
-	lsrs r0, 16
-	adds r1, r4, 0
-	bl __modsi3
-	lsls r0, 24
-	lsrs r0, 23
-	adds r0, r6
-	ldrh r0, [r0]
-	mov r7, r8
-	ands r7, r0
-	movs r2, 0x1
-	mov r1, r9
-	lsrs r3, r1, 24
-	cmp r3, r5
-	bcs _081A0142
-	lsls r0, r3, 1
-	adds r0, r6
-	ldrh r1, [r0]
-	mov r0, r8
-	b _081A013A
-	.pool
-_081A0128:
-	adds r0, r3, 0x1
-	lsls r0, 24
-	lsrs r3, r0, 24
-	cmp r3, r5
-	bcs _081A0142
-	lsls r0, r3, 1
-	adds r0, r6
-	ldrh r0, [r0]
-	mov r1, r10
-_081A013A:
-	ands r0, r1
-	cmp r0, r7
-	bne _081A0128
-	movs r2, 0
-_081A0142:
-	cmp r2, 0x1
-	bne _081A00F6
-_081A0146:
-	ldr r0, [sp]
-	adds r1, r7, 0
-	bl sub_81A0194
-	lsls r0, 24
-	cmp r0, 0
-	beq _081A0168
-	ldr r0, =gUnknown_08611370
-	adds r0, r7, r0
-	ldrb r0, [r0]
-	cmp r0, 0
-	bne _081A0170
-	ldr r0, [sp, 0x4]
-	adds r0, 0x1
-	lsls r0, 24
-	lsrs r0, 24
-	str r0, [sp, 0x4]
-_081A0168:
-	ldr r2, [sp, 0x4]
-	cmp r2, 0x4
-	bhi _081A0170
-	b _081A0052
-_081A0170:
-	ldr r0, =gUnknown_030062EC
-	ldr r1, [r0]
-	ldrb r0, [r1]
-	adds r0, 0x1
-	strb r0, [r1]
-	adds r0, r7, 0
-	add sp, 0x10
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_819FF98
-
-	thumb_func_start sub_81A0194
-sub_81A0194: @ 81A0194
-	push {r4-r7,lr}
-	lsls r0, 24
-	lsrs r4, r0, 24
-	lsls r1, 16
-	lsrs r5, r1, 16
-	movs r3, 0
-	ldr r0, =gUnknown_030062EC
-	mov r12, r0
-	ldr r2, [r0]
-	lsls r1, r4, 2
-	adds r0, r1, r4
-	lsls r6, r0, 1
-	adds r2, 0x2
-	adds r7, r1, 0
-_081A01B0:
-	lsls r0, r3, 1
-	adds r0, r6
-	adds r0, r2, r0
-	ldrh r0, [r0]
-	cmp r0, r5
-	bne _081A01C4
-	movs r0, 0
-	b _081A01E2
-	.pool
-_081A01C4:
-	adds r0, r3, 0x1
-	lsls r0, 24
-	lsrs r3, r0, 24
-	cmp r3, 0x4
-	bls _081A01B0
-	mov r2, r12
-	ldr r1, [r2]
-	adds r0, r7, r4
-	ldrb r2, [r1]
-	adds r0, r2
-	lsls r0, 1
-	adds r1, 0x2
-	adds r1, r0
-	strh r5, [r1]
-	movs r0, 0x1
-_081A01E2:
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_81A0194
-
-	thumb_func_start sub_81A01E8
-sub_81A01E8: @ 81A01E8
-	push {r4-r7,lr}
-	mov r12, r1
-	lsls r0, 16
-	lsrs r2, r0, 16
-	ldr r0, =gSaveBlock2Ptr
-	ldr r0, [r0]
-	adds r0, 0xB1
-	ldrb r1, [r0]
-	movs r0, 0x3
-	ands r0, r1
-	movs r4, 0x3C
-	cmp r0, 0x1
-	bne _081A0204
-	movs r4, 0x32
-_081A0204:
-	ldr r1, =gLevelUpLearnsets
-	lsls r0, r2, 2
-	adds r0, r1
-	ldr r6, [r0]
-	movs r5, 0
-	ldrh r1, [r6]
-	ldr r3, =0x0000ffff
-	cmp r1, r3
-	beq _081A0240
-	movs r2, 0xFE
-	lsls r2, 8
-	adds r0, r2, 0
-	ands r0, r1
-	lsls r1, r4, 9
-	cmp r0, r1
-	bgt _081A0240
-	adds r4, r2, 0
-	adds r2, r1, 0
-_081A0228:
-	adds r0, r5, 0x1
-	lsls r0, 24
-	lsrs r5, r0, 24
-	lsls r0, r5, 1
-	adds r0, r6
-	ldrh r1, [r0]
-	cmp r1, r3
-	beq _081A0240
-	adds r0, r4, 0
-	ands r0, r1
-	cmp r0, r2
-	ble _081A0228
-_081A0240:
-	adds r4, r5, 0
-	cmp r4, 0x4
-	bls _081A0248
-	movs r4, 0x4
-_081A0248:
-	movs r2, 0
-	cmp r2, r4
-	bcs _081A026C
-	ldr r7, =0x000001ff
-_081A0250:
-	lsls r3, r2, 1
-	add r3, r12
-	adds r2, 0x1
-	subs r0, r5, r2
-	lsls r0, 1
-	adds r0, r6
-	ldrh r1, [r0]
-	adds r0, r7, 0
-	ands r0, r1
-	strh r0, [r3]
-	lsls r2, 24
-	lsrs r2, 24
-	cmp r2, r4
-	bcc _081A0250
-_081A026C:
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_81A01E8
-
-	thumb_func_start sub_81A0284
-sub_81A0284: @ 81A0284
-	push {r4-r7,lr}
-	mov r7, r9
-	mov r6, r8
-	push {r6,r7}
-	sub sp, 0x8
-	lsls r0, 24
-	lsrs r0, 24
-	mov r8, r0
-	lsls r1, 24
-	lsrs r6, r1, 24
-	lsls r2, 24
-	lsrs r5, r2, 24
-	ldr r1, =gSaveBlock2Ptr
-	ldr r2, [r1]
-	adds r0, r2, 0
-	adds r0, 0xB1
-	ldrb r0, [r0]
-	lsls r0, 26
-	lsrs r0, 28
-	adds r7, r1, 0
-	cmp r0, 0x2
-	bhi _081A02B8
-	movs r0, 0
-	b _081A037C
-	.pool
-_081A02B8:
-	movs r4, 0
-	movs r3, 0
-	adds r0, r2, 0
-	adds r0, 0xB8
-	ldrb r0, [r0]
-	lsls r0, 30
-	ldr r1, =gUnknown_08610970
-	mov r12, r1
-	lsls r6, 1
-	lsls r5, 1
-	mov r9, r5
-	cmp r0, 0
-	beq _081A02F4
-	adds r2, r7, 0
-_081A02D4:
-	adds r0, r4, 0x1
-	lsls r0, 24
-	lsrs r4, r0, 24
-	adds r0, r3, 0x1
-	lsls r0, 24
-	lsrs r3, r0, 24
-	cmp r3, 0x8
-	bhi _081A02F4
-	ldr r0, [r2]
-	lsls r1, r3, 2
-	adds r0, r1
-	adds r0, 0xB8
-	ldrb r0, [r0]
-	lsls r0, 30
-	cmp r0, 0
-	bne _081A02D4
-_081A02F4:
-	ldr r0, [r7]
-	adds r0, 0xB0
-	ldrb r1, [r0]
-	movs r0, 0x58
-	muls r0, r1
-	adds r0, r6, r0
-	mov r1, r12
-	adds r1, 0x34
-	adds r0, r1
-	ldrh r0, [r0]
-	mov r1, sp
-	bl sub_81A01E8
-	movs r3, 0
-	cmp r3, r4
-	bcs _081A0376
-	ldr r1, [r7]
-	adds r0, r1, 0
-	adds r0, 0xB1
-	ldrb r0, [r0]
-	lsls r0, 26
-	lsrs r0, 28
-	subs r0, 0x3
-	cmp r3, r0
-	bge _081A0376
-	adds r6, r7, 0
-	adds r5, r1, 0
-_081A032A:
-	lsls r0, r3, 2
-	adds r2, r5, r0
-	adds r0, r2, 0
-	adds r0, 0xB8
-	ldrb r1, [r0]
-	lsls r0, r1, 30
-	lsrs r0, 30
-	cmp r0, 0x2
-	bne _081A035C
-	lsls r0, r1, 28
-	lsrs r0, 30
-	cmp r0, r8
-	bne _081A035C
-	lsrs r0, r1, 6
-	cmp r0, 0
-	beq _081A035C
-	lsls r0, r1, 26
-	lsrs r0, 30
-	lsls r0, 1
-	mov r7, sp
-	adds r1, r7, r0
-	adds r0, r2, 0
-	adds r0, 0xBA
-	ldrh r0, [r0]
-	strh r0, [r1]
-_081A035C:
-	adds r0, r3, 0x1
-	lsls r0, 24
-	lsrs r3, r0, 24
-	cmp r3, r4
-	bcs _081A0376
-	ldr r0, [r6]
-	adds r0, 0xB1
-	ldrb r0, [r0]
-	lsls r0, 26
-	lsrs r0, 28
-	subs r0, 0x3
-	cmp r3, r0
-	blt _081A032A
-_081A0376:
-	mov r0, sp
-	add r0, r9
-	ldrh r0, [r0]
-_081A037C:
-	add sp, 0x8
-	pop {r3,r4}
-	mov r8, r3
-	mov r9, r4
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_81A0284
-
-	thumb_func_start sub_81A0390
-sub_81A0390: @ 81A0390
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	sub sp, 0xC
-	lsls r0, 24
-	lsrs r0, 24
-	mov r8, r0
-	movs r5, 0
-	ldr r7, =gSaveBlock2Ptr
-	adds r6, r7, 0
-	movs r4, 0
-_081A03A6:
-	ldr r0, [r6]
-	lsls r2, r5, 1
-	adds r2, r5
-	lsls r2, 2
-	adds r0, r2
-	adds r1, r0, 0
-	adds r1, 0xE0
-	strh r4, [r1]
-	adds r0, 0xEA
-	strh r4, [r0]
-	movs r3, 0
-_081A03BC:
-	ldr r0, [r6]
-	lsls r1, r3, 1
-	adds r1, r2
-	adds r0, 0xE2
-	adds r0, r1
-	strh r4, [r0]
-	adds r0, r3, 0x1
-	lsls r0, 24
-	lsrs r3, r0, 24
-	cmp r3, 0x3
-	bls _081A03BC
-	adds r0, r5, 0x1
-	lsls r0, 24
-	lsrs r5, r0, 24
-	cmp r5, 0x2
-	bls _081A03A6
-	ldr r0, [r7]
-	adds r0, 0xB1
-	ldrb r0, [r0]
-	lsrs r3, r0, 6
-	movs r5, 0
-_081A03E6:
-	lsls r0, r3, 2
-	mov r1, sp
-	adds r2, r1, r0
-	lsls r0, r5, 1
-	adds r0, r5
-	lsls r0, 2
-	adds r0, 0xE0
-	ldr r1, [r7]
-	adds r1, r0
-	str r1, [r2]
-	adds r0, r3, 0x1
-	movs r1, 0x3
-	bl __modsi3
-	lsls r0, 24
-	lsrs r3, r0, 24
-	adds r0, r5, 0x1
-	lsls r0, 24
-	lsrs r5, r0, 24
-	cmp r5, 0x2
-	bls _081A03E6
-	movs r5, 0
-	ldr r7, =gSaveBlock2Ptr
-	ldr r6, =gUnknown_08610970+0x34
-_081A0416:
-	ldr r0, [r7]
-	mov r12, r0
-	adds r0, 0xB4
-	adds r0, r5
-	ldrb r2, [r0]
-	mov r0, r12
-	adds r0, 0xB2
-	ldrb r0, [r0]
-	lsls r0, 29
-	lsrs r0, 29
-	asrs r0, r5
-	movs r1, 0x1
-	ands r0, r1
-	lsls r0, 2
-	asrs r2, r0
-	movs r0, 0xF
-	ands r2, r0
-	lsls r0, r5, 2
-	mov r1, sp
-	adds r3, r1, r0
-	ldr r4, [r3]
-	lsls r2, 1
-	mov r0, r12
-	adds r0, 0xB0
-	ldrb r1, [r0]
-	movs r0, 0x58
-	muls r0, r1
-	adds r2, r0
-	adds r2, r6
-	ldrh r0, [r2]
-	strh r0, [r4]
-	ldr r1, [r3]
-	ldrh r0, [r1]
-	adds r1, 0x2
-	bl sub_81A01E8
-	adds r0, r5, 0x1
-	lsls r0, 24
-	lsrs r5, r0, 24
-	cmp r5, 0x2
-	bls _081A0416
-	movs r5, 0
-	cmp r5, r8
-	bcs _081A04D6
-	ldr r7, =gSaveBlock2Ptr
-_081A0470:
-	ldr r1, [r7]
-	lsls r0, r5, 2
-	adds r4, r1, r0
-	adds r0, r4, 0
-	adds r0, 0xB8
-	ldrb r2, [r0]
-	lsls r0, r2, 30
-	lsrs r1, r0, 30
-	lsls r0, r2, 28
-	lsrs r3, r0, 30
-	adds r6, r3, 0
-	cmp r1, 0x1
-	bne _081A04A8
-	lsrs r0, r2, 6
-	cmp r0, 0
-	beq _081A04CC
-	lsls r0, r3, 2
-	add r0, sp
-	ldr r1, [r0]
-	adds r0, r4, 0
-	adds r0, 0xBA
-	ldrh r0, [r0]
-	strh r0, [r1, 0xA]
-	b _081A04CC
-	.pool
-_081A04A8:
-	cmp r1, 0x2
-	bne _081A04CC
-	lsls r0, r2, 24
-	lsrs r0, 30
-	cmp r0, 0
-	beq _081A04CC
-	lsls r2, 26
-	lsrs r2, 30
-	lsls r0, r6, 2
-	add r0, sp
-	ldr r1, [r0]
-	lsls r2, 1
-	adds r1, 0x2
-	adds r1, r2
-	adds r0, r4, 0
-	adds r0, 0xBA
-	ldrh r0, [r0]
-	strh r0, [r1]
-_081A04CC:
-	adds r0, r5, 0x1
-	lsls r0, 24
-	lsrs r5, r0, 24
-	cmp r5, r8
-	bcc _081A0470
-_081A04D6:
-	add sp, 0xC
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_81A0390
-
-	thumb_func_start sub_81A04E4
-sub_81A04E4: @ 81A04E4
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0x18
-	lsls r0, 24
-	lsrs r0, 24
-	movs r7, 0x2
-	cmp r0, 0x6
-	bls _081A04FC
-	b _081A064C
-_081A04FC:
-	lsls r0, 2
-	ldr r1, =_081A050C
-	adds r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.pool
-	.align 2, 0
-_081A050C:
-	.4byte _081A0528
-	.4byte _081A0540
-	.4byte _081A05B4
-	.4byte _081A05F4
-	.4byte _081A061C
-	.4byte _081A064C
-	.4byte _081A0634
-_081A0528:
-	movs r0, 0x12
-	mov r10, r0
-	movs r6, 0x8
-	ldr r0, =gText_Lv50
-	str r0, [sp, 0xC]
-	ldr r0, =gText_OpenLevel
-	str r0, [sp, 0x10]
-	b _081A0652
-	.pool
-_081A0540:
-	movs r7, 0x3
-	movs r1, 0x12
-	mov r10, r1
-	movs r6, 0x6
-	movs r4, 0
-	ldr r0, =gSpeciesNames
-	mov r9, r0
-	ldr r0, =gSaveBlock2Ptr
-	ldr r3, [r0]
-	movs r1, 0xB2
-	adds r1, r3
-	mov r12, r1
-	adds r5, r3, 0
-	adds r5, 0xB0
-	ldr r0, =gUnknown_08610970+0x34
-	mov r8, r0
-_081A0560:
-	adds r0, r3, 0
-	adds r0, 0xB4
-	adds r0, r4
-	ldrb r2, [r0]
-	mov r1, r12
-	ldrb r0, [r1]
-	lsls r0, 29
-	lsrs r0, 29
-	asrs r0, r4
-	movs r1, 0x1
-	ands r0, r1
-	lsls r0, 2
-	asrs r2, r0
-	movs r0, 0xF
-	ands r2, r0
-	lsls r2, 1
-	ldrb r1, [r5]
-	movs r0, 0x58
-	muls r0, r1
-	adds r2, r0
-	add r2, r8
-	ldrh r1, [r2]
-	lsls r0, r4, 2
-	mov r2, sp
-	adds r2, r0
-	adds r2, 0xC
-	movs r0, 0xB
-	muls r0, r1
-	add r0, r9
-	str r0, [r2]
-	adds r0, r4, 0x1
-	lsls r0, 24
-	lsrs r4, r0, 24
-	cmp r4, 0x2
-	bls _081A0560
-	b _081A0652
-	.pool
-_081A05B4:
-	movs r0, 0x12
-	mov r10, r0
-	movs r6, 0x8
-	ldr r0, =gSaveBlock2Ptr
-	ldr r0, [r0]
-	adds r0, 0xB1
-	ldrb r0, [r0]
-	lsls r0, 26
-	lsrs r0, 28
-	cmp r0, 0x2
-	bls _081A05CC
-	b _081A06FA
-_081A05CC:
-	ldr r0, =gUnknown_030062F0
-	ldr r3, [r0]
-	ldrh r0, [r3, 0x2]
-	movs r2, 0xB
-	muls r0, r2
-	ldr r1, =gSpeciesNames
-	adds r0, r1
-	str r0, [sp, 0x10]
-	ldrh r0, [r3]
-	muls r0, r2
-	adds r0, r1
-	str r0, [sp, 0xC]
-	b _081A0652
-	.pool
-_081A05F4:
-	movs r1, 0x11
-	mov r10, r1
-	movs r6, 0x8
-	ldr r0, =gUnknown_030062F0
-	ldr r3, [r0]
-	ldrh r0, [r3, 0x4]
-	movs r2, 0xD
-	muls r0, r2
-	ldr r1, =gMoveNames
-	adds r0, r1
-	str r0, [sp, 0xC]
-	ldrh r0, [r3, 0x6]
-	muls r0, r2
-	adds r0, r1
-	str r0, [sp, 0x10]
-	b _081A0652
-	.pool
-_081A061C:
-	movs r0, 0x12
-	mov r10, r0
-	movs r6, 0x8
-	ldr r0, =gText_Give
-	str r0, [sp, 0xC]
-	ldr r0, =gText_NoNeed
-	str r0, [sp, 0x10]
-	b _081A0652
-	.pool
-_081A0634:
-	movs r1, 0x14
-	mov r10, r1
-	movs r6, 0x8
-	ldr r0, =gText_Yes
-	str r0, [sp, 0xC]
-	ldr r0, =gText_No
-	str r0, [sp, 0x10]
-	b _081A0652
-	.pool
-_081A064C:
-	movs r0, 0
-	mov r10, r0
-	movs r6, 0
-_081A0652:
-	movs r5, 0
-	movs r4, 0
-	lsls r1, r7, 25
-	mov r8, r1
-	cmp r4, r7
-	bcs _081A067E
-_081A065E:
-	lsls r0, r4, 2
-	add r0, sp
-	adds r0, 0xC
-	ldr r1, [r0]
-	movs r0, 0x1
-	movs r2, 0
-	bl GetStringWidth
-	cmp r0, r5
-	ble _081A0674
-	adds r5, r0, 0
-_081A0674:
-	adds r0, r4, 0x1
-	lsls r0, 24
-	lsrs r4, r0, 24
-	cmp r4, r7
-	bcc _081A065E
-_081A067E:
-	adds r0, r5, 0
-	bl convert_pixel_width_to_tile_width
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	mov r0, r10
-	adds r1, r4, 0
-	bl sub_80E2D5C
-	lsls r0, 24
-	lsrs r0, 24
-	mov r10, r0
-	mov r0, r8
-	lsrs r3, r0, 24
-	mov r0, r10
-	adds r1, r6, 0
-	adds r2, r4, 0
-	bl sub_81A0784
-	lsls r0, 24
-	lsrs r5, r0, 24
-	adds r0, r5, 0
-	movs r1, 0
-	bl SetStandardWindowBorderStyle
-	movs r4, 0
-	cmp r4, r7
-	bcs _081A06E6
-_081A06B8:
-	lsls r0, r4, 2
-	add r0, sp
-	adds r0, 0xC
-	ldr r2, [r0]
-	lsls r0, r4, 4
-	adds r0, 0x1
-	lsls r0, 24
-	lsrs r0, 24
-	str r0, [sp]
-	movs r0, 0xFF
-	str r0, [sp, 0x4]
-	movs r0, 0
-	str r0, [sp, 0x8]
-	adds r0, r5, 0
-	movs r1, 0x1
-	movs r3, 0x8
-	bl AddTextPrinterParameterized
-	adds r0, r4, 0x1
-	lsls r0, 24
-	lsrs r4, r0, 24
-	cmp r4, r7
-	bcc _081A06B8
-_081A06E6:
-	adds r0, r5, 0
-	adds r1, r7, 0
-	movs r2, 0
-	bl InitMenuInUpperLeftCornerPlaySoundWhenAPressed
-	movs r0, 0x1
-	adds r1, r7, 0
-	adds r2, r5, 0
-	bl sub_81A0804
-_081A06FA:
-	add sp, 0x18
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_81A04E4
-
 	thumb_func_start sub_81A070C
 sub_81A070C: @ 81A070C
 	push {r4,r5,lr}
@@ -2143,7 +906,7 @@ _081A0E3C:
 	adds r0, r2, r0
 	ldrb r0, [r0]
 	lsrs r4, r0, 4
-	ldr r3, =gUnknown_08610970
+	ldr r3, =gApprentices
 	lsls r1, r4, 1
 	adds r5, 0xB0
 	ldrb r0, [r5]
@@ -2226,7 +989,7 @@ _081A0EC4:
 	asrs r4, r1
 	movs r0, 0xF
 	ands r4, r0
-	ldr r2, =gUnknown_08610970
+	ldr r2, =gApprentices
 	lsls r1, r4, 1
 	adds r0, r5, 0
 	adds r0, 0xB0
@@ -2320,7 +1083,7 @@ _081A0F54:
 	asrs r0, r1
 	movs r1, 0xF
 	ands r0, r1
-	ldr r2, =gUnknown_08610970
+	ldr r2, =gApprentices
 	lsls r0, 1
 	adds r1, r3, 0
 	adds r1, 0xB0
@@ -2554,7 +1317,7 @@ _081A1184:
 _081A11C0:
 	movs r2, 0
 _081A11C2:
-	ldr r3, =gUnknown_08610970
+	ldr r3, =gApprentices
 	lsls r1, r2, 1
 	ldr r0, [r6]
 	adds r0, 0xB0
@@ -2983,7 +1746,7 @@ _081A14C2:
 	thumb_func_start sub_81A150C
 sub_81A150C: @ 81A150C
 	push {lr}
-	ldr r2, =gUnknown_08610970
+	ldr r2, =gApprentices
 	ldr r0, =gSaveBlock2Ptr
 	ldr r0, [r0]
 	adds r0, 0xDC
@@ -3053,7 +1816,7 @@ _081A1594:
 	thumb_func_start sub_81A15A4
 sub_81A15A4: @ 81A15A4
 	push {lr}
-	ldr r2, =gUnknown_08610970
+	ldr r2, =gApprentices
 	ldr r0, =gSaveBlock2Ptr
 	ldr r0, [r0]
 	adds r0, 0xB0
@@ -3141,7 +1904,7 @@ sub_81A1650: @ 81A1650
 	push {lr}
 	movs r2, 0x58
 	muls r2, r0
-	ldr r0, =gUnknown_08610970
+	ldr r0, =gApprentices
 	adds r2, r0
 	subs r0, r1, 0x1
 	cmp r0, 0x6
@@ -7047,7 +5810,7 @@ _081A38A8:
 	lsrs r3, r0, 24
 	movs r0, 0x58
 	muls r0, r3
-	ldr r1, =gUnknown_08610970+0x4A
+	ldr r1, =gApprentices+0x4A
 _081A38C4:
 	adds r0, r1
 	bl ConvertBattleFrontierTrainerSpeechToString
@@ -7068,7 +5831,7 @@ _081A38D4:
 	lsrs r3, r0, 27
 	movs r0, 0x58
 	muls r0, r3
-	ldr r1, =gUnknown_08610970+0x4A
+	ldr r1, =gApprentices+0x4A
 	adds r0, r1
 	bl ConvertBattleFrontierTrainerSpeechToString
 _081A38F8:
diff --git a/asm/battle_tower.s b/asm/battle_tower.s
index 2312b63bd..e017e3b83 100644
--- a/asm/battle_tower.s
+++ b/asm/battle_tower.s
@@ -576,7 +576,7 @@ _0816266C:
 	b _081626BA
 	.pool
 _08162698:
-	ldr r3, =gUnknown_08610970
+	ldr r3, =gApprentices
 	ldr r0, =gSaveBlock2Ptr
 	ldr r1, [r0]
 	ldr r0, =0xfffffe70
@@ -747,7 +747,7 @@ _081627E8:
 	b _08162836
 	.pool
 _08162814:
-	ldr r3, =gUnknown_08610970
+	ldr r3, =gApprentices
 	ldr r0, =gSaveBlock2Ptr
 	ldr r1, [r0]
 	ldr r0, =0xfffffe70
@@ -1161,7 +1161,7 @@ _08162B64:
 	cmp r0, 0
 	bne _08162BB0
 	ldr r4, =gFacilityClassToPicIndex
-	ldr r3, =gUnknown_08610970
+	ldr r3, =gApprentices
 	ldr r0, =gSaveBlock2Ptr
 	ldr r1, [r0]
 	ldr r0, =0xfffffe70
@@ -1184,7 +1184,7 @@ _08162B64:
 	.pool
 _08162BB0:
 	ldr r5, =gFacilityClassToPicIndex
-	ldr r4, =gUnknown_08610970
+	ldr r4, =gApprentices
 	bl sub_81864A8
 	lsls r0, 24
 	lsrs r0, 24
@@ -1301,7 +1301,7 @@ _08162CBC:
 	cmp r0, 0
 	beq _08162CF4
 	ldr r5, =gFacilityClassToTrainerClass
-	ldr r4, =gUnknown_08610970
+	ldr r4, =gApprentices
 	bl sub_81864A8
 	lsls r0, 24
 	lsrs r0, 24
@@ -1316,7 +1316,7 @@ _08162CBC:
 	.pool
 _08162CF4:
 	ldr r4, =gFacilityClassToTrainerClass
-	ldr r3, =gUnknown_08610970
+	ldr r3, =gApprentices
 	ldr r0, =gSaveBlock2Ptr
 	ldr r1, [r0]
 	ldr r0, =0xfffffe70
@@ -1407,7 +1407,7 @@ _08162DC0:
 	ands r0, r1
 	cmp r0, 0
 	beq _08162DE8
-	ldr r4, =gUnknown_08610970
+	ldr r4, =gApprentices
 	bl sub_81864A8
 	lsls r0, 24
 	lsrs r0, 24
@@ -1417,7 +1417,7 @@ _08162DC0:
 	b _08162E08
 	.pool
 _08162DE8:
-	ldr r3, =gUnknown_08610970
+	ldr r3, =gApprentices
 	ldr r0, =gSaveBlock2Ptr
 	ldr r1, [r0]
 	ldr r0, =0xfffffe70
@@ -1648,7 +1648,7 @@ _08162FC0:
 	b _0816300E
 	.pool
 _08162FEC:
-	ldr r3, =gUnknown_08610970
+	ldr r3, =gApprentices
 	ldr r0, =gSaveBlock2Ptr
 	ldr r1, [r0]
 	ldr r0, =0xfffffe70
@@ -1927,7 +1927,7 @@ _08163230:
 	ldr r1, [r6]
 	adds r1, r5
 	lsrs r2, r4, 24
-	bl sub_8068528
+	bl CreateApprenticeMon
 	movs r2, 0x80
 	lsls r2, 17
 	adds r4, r2
@@ -6295,7 +6295,7 @@ _08165812:
 	adds r0, r5
 	ldrb r2, [r0]
 	adds r0, r4, 0
-	bl sub_8068528
+	bl CreateApprenticeMon
 	movs r3, 0xC8
 	lsls r3, 1
 	adds r0, r7, r3