more battle frontier 2

1 files changed, 1 insertions, 1467 deletions

diff --git a/asm/battle_frontier_2.s b/asm/battle_frontier_2.s
index c5477493d..68c2f5465 100644
--- a/asm/battle_frontier_2.s
+++ b/asm/battle_frontier_2.s
@@ -7,1472 +7,6 @@
 	
 
 
-	thumb_func_start sub_81A2DB4
-sub_81A2DB4: @ 81A2DB4
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0x10
-	adds r5, r0, 0
-	adds r4, r2, 0
-	ldr r0, [sp, 0x30]
-	lsls r1, 16
-	lsrs r6, r1, 16
-	lsls r4, 24
-	lsrs r4, 24
-	lsls r3, 24
-	lsrs r3, 24
-	str r3, [sp, 0xC]
-	lsls r0, 24
-	lsrs r0, 24
-	adds r7, r0, 0
-	ldr r0, =gRecordsWindowId
-	mov r10, r0
-	ldrb r0, [r0]
-	str r7, [sp]
-	movs r1, 0xFF
-	mov r9, r1
-	str r1, [sp, 0x4]
-	movs r1, 0
-	mov r8, r1
-	str r1, [sp, 0x8]
-	movs r1, 0x1
-	adds r2, r5, 0
-	adds r3, r4, 0
-	bl AddTextPrinterParameterized
-	ldr r0, =0x0000270f
-	cmp r6, r0
-	bls _081A2E00
-	adds r6, r0, 0
-_081A2E00:
-	ldr r0, =gStringVar1
-	adds r1, r6, 0
-	movs r2, 0x1
-	movs r3, 0x4
-	bl ConvertIntToDecimalStringN
-	ldr r4, =gStringVar4
-	ldr r1, =gText_FloorsCleared
-	adds r0, r4, 0
-	bl StringExpandPlaceholders
-	mov r1, r10
-	ldrb r0, [r1]
-	str r7, [sp]
-	mov r1, r9
-	str r1, [sp, 0x4]
-	mov r1, r8
-	str r1, [sp, 0x8]
-	movs r1, 0x1
-	adds r2, r4, 0
-	ldr r3, [sp, 0xC]
-	bl AddTextPrinterParameterized
-	add sp, 0x10
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_81A2DB4
-
-	thumb_func_start sub_81A2E54
-sub_81A2E54: @ 81A2E54
-	push {r4,r5,lr}
-	sub sp, 0x4
-	adds r4, r1, 0
-	adds r5, r2, 0
-	lsls r0, 24
-	lsls r4, 24
-	lsrs r4, 24
-	lsls r5, 24
-	lsrs r5, 24
-	lsls r3, 24
-	lsrs r3, 24
-	ldr r1, =gSaveBlock2Ptr
-	ldr r1, [r1]
-	lsrs r0, 23
-	ldr r2, =0x00000e1e
-	adds r1, r2
-	adds r1, r0
-	ldrh r1, [r1]
-	ldr r0, =gText_Record
-	str r3, [sp]
-	adds r2, r4, 0
-	adds r3, r5, 0
-	bl sub_81A2DB4
-	add sp, 0x4
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_81A2E54
-
-	thumb_func_start sub_81A2E98
-sub_81A2E98: @ 81A2E98
-	push {lr}
-	lsls r0, 24
-	ldr r1, =gSaveBlock2Ptr
-	ldr r1, [r1]
-	lsrs r0, 23
-	ldr r2, =0x00000e1a
-	adds r1, r2
-	adds r1, r0
-	ldrh r0, [r1]
-	ldr r1, =0x0000270f
-	cmp r0, r1
-	bls _081A2EB2
-	adds r0, r1, 0
-_081A2EB2:
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_81A2E98
-
-	thumb_func_start sub_81A2EC4
-sub_81A2EC4: @ 81A2EC4
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	sub sp, 0x4
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	lsls r1, 24
-	lsrs r7, r1, 24
-	lsls r2, 24
-	lsrs r2, 24
-	mov r8, r2
-	lsls r3, 24
-	lsrs r6, r3, 24
-	adds r0, r4, 0
-	bl sub_81A2E98
-	lsls r0, 16
-	lsrs r5, r0, 16
-	cmp r4, 0
-	beq _081A2EF4
-	movs r0, 0x80
-	lsls r0, 6
-	b _081A2EF8
-_081A2EF4:
-	movs r0, 0x80
-	lsls r0, 5
-_081A2EF8:
-	bl sub_81A1C24
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _081A2F18
-	ldr r0, =gText_Current
-	str r6, [sp]
-	adds r1, r5, 0
-	adds r2, r7, 0
-	mov r3, r8
-	bl sub_81A2DB4
-	b _081A2F26
-	.pool
-_081A2F18:
-	ldr r0, =gText_Prev
-	str r6, [sp]
-	adds r1, r5, 0
-	adds r2, r7, 0
-	mov r3, r8
-	bl sub_81A2DB4
-_081A2F26:
-	add sp, 0x4
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_81A2EC4
-
-	thumb_func_start sub_81A2F38
-sub_81A2F38: @ 81A2F38
-	push {r4-r6,lr}
-	sub sp, 0xC
-	ldr r5, =gRecordsWindowId
-	ldr r0, =gUnknown_08611C74
-	bl AddWindow
-	strb r0, [r5]
-	ldrb r0, [r5]
-	movs r1, 0
-	bl NewMenuHelpers_DrawStdWindowFrame
-	ldrb r0, [r5]
-	movs r1, 0x11
-	bl FillWindowPixelBuffer
-	ldr r4, =gStringVar4
-	ldr r1, =gText_BattleQuestResults
-	adds r0, r4, 0
-	bl StringExpandPlaceholders
-	adds r0, r4, 0
-	movs r1, 0x2
-	bl sub_81A1C4C
-	ldrb r0, [r5]
-	ldr r2, =gText_Lv502
-	movs r1, 0x31
-	str r1, [sp]
-	movs r6, 0xFF
-	str r6, [sp, 0x4]
-	movs r4, 0
-	str r4, [sp, 0x8]
-	movs r1, 0x1
-	movs r3, 0x8
-	bl AddTextPrinterParameterized
-	ldrb r0, [r5]
-	ldr r2, =gText_OpenLv
-	movs r1, 0x61
-	str r1, [sp]
-	str r6, [sp, 0x4]
-	str r4, [sp, 0x8]
-	movs r1, 0x1
-	movs r3, 0x8
-	bl AddTextPrinterParameterized
-	movs r0, 0xA
-	bl PrintHyphens
-	movs r0, 0
-	movs r1, 0x40
-	movs r2, 0x6F
-	movs r3, 0x31
-	bl sub_81A2EC4
-	movs r0, 0
-	movs r1, 0x40
-	movs r2, 0x6F
-	movs r3, 0x41
-	bl sub_81A2E54
-	movs r0, 0x1
-	movs r1, 0x40
-	movs r2, 0x6F
-	movs r3, 0x61
-	bl sub_81A2EC4
-	movs r0, 0x1
-	movs r1, 0x40
-	movs r2, 0x6F
-	movs r3, 0x71
-	bl sub_81A2E54
-	ldrb r0, [r5]
-	bl PutWindowTilemap
-	ldrb r0, [r5]
-	movs r1, 0x3
-	bl CopyWindowToVram
-	add sp, 0xC
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_81A2F38
-
-	thumb_func_start sub_81A2FF8
-sub_81A2FF8: @ 81A2FF8
-	push {r4-r7,lr}
-	mov r7, r9
-	mov r6, r8
-	push {r6,r7}
-	sub sp, 0xC
-	ldr r4, =gRecordsWindowId
-	ldr r0, =gUnknown_08611C7C
-	bl AddWindow
-	strb r0, [r4]
-	ldrb r0, [r4]
-	movs r1, 0
-	bl NewMenuHelpers_DrawStdWindowFrame
-	ldrb r0, [r4]
-	movs r1, 0x11
-	bl FillWindowPixelBuffer
-	ldr r0, =gStringVar4
-	mov r9, r0
-	ldr r1, =gText_LinkContestResults
-	bl StringExpandPlaceholders
-	movs r0, 0x1
-	mov r1, r9
-	movs r2, 0xD0
-	bl GetStringCenterAlignXOffset
-	adds r3, r0, 0
-	ldrb r0, [r4]
-	lsls r3, 24
-	lsrs r3, 24
-	movs r1, 0x1
-	str r1, [sp]
-	movs r6, 0xFF
-	str r6, [sp, 0x4]
-	movs r5, 0
-	str r5, [sp, 0x8]
-	mov r2, r9
-	bl AddTextPrinterParameterized
-	ldr r7, =gText_1st
-	movs r0, 0x1
-	adds r1, r7, 0
-	movs r2, 0x26
-	bl GetStringRightAlignXOffset
-	adds r3, r0, 0
-	adds r3, 0x32
-	ldrb r0, [r4]
-	lsls r3, 24
-	lsrs r3, 24
-	movs r1, 0x19
-	mov r8, r1
-	str r1, [sp]
-	str r6, [sp, 0x4]
-	str r5, [sp, 0x8]
-	movs r1, 0x1
-	adds r2, r7, 0
-	bl AddTextPrinterParameterized
-	ldr r7, =gText_2nd
-	movs r0, 0x1
-	adds r1, r7, 0
-	movs r2, 0x26
-	bl GetStringRightAlignXOffset
-	adds r3, r0, 0
-	adds r3, 0x58
-	ldrb r0, [r4]
-	lsls r3, 24
-	lsrs r3, 24
-	mov r2, r8
-	str r2, [sp]
-	str r6, [sp, 0x4]
-	str r5, [sp, 0x8]
-	movs r1, 0x1
-	adds r2, r7, 0
-	bl AddTextPrinterParameterized
-	ldr r7, =gText_3rd
-	movs r0, 0x1
-	adds r1, r7, 0
-	movs r2, 0x26
-	bl GetStringRightAlignXOffset
-	adds r3, r0, 0
-	adds r3, 0x7E
-	ldrb r0, [r4]
-	lsls r3, 24
-	lsrs r3, 24
-	mov r1, r8
-	str r1, [sp]
-	str r6, [sp, 0x4]
-	str r5, [sp, 0x8]
-	movs r1, 0x1
-	adds r2, r7, 0
-	bl AddTextPrinterParameterized
-	ldr r7, =gText_4th
-	movs r0, 0x1
-	adds r1, r7, 0
-	movs r2, 0x26
-	bl GetStringRightAlignXOffset
-	adds r3, r0, 0
-	adds r3, 0xA4
-	ldrb r0, [r4]
-	lsls r3, 24
-	lsrs r3, 24
-	mov r2, r8
-	str r2, [sp]
-	str r6, [sp, 0x4]
-	str r5, [sp, 0x8]
-	movs r1, 0x1
-	adds r2, r7, 0
-	bl AddTextPrinterParameterized
-	ldrb r0, [r4]
-	ldr r2, =gText_Cool
-	movs r1, 0x29
-	str r1, [sp]
-	str r6, [sp, 0x4]
-	str r5, [sp, 0x8]
-	movs r1, 0x1
-	movs r3, 0x6
-	bl AddTextPrinterParameterized
-	ldrb r0, [r4]
-	ldr r2, =gText_Beauty
-	movs r1, 0x39
-	str r1, [sp]
-	str r6, [sp, 0x4]
-	str r5, [sp, 0x8]
-	movs r1, 0x1
-	movs r3, 0x6
-	bl AddTextPrinterParameterized
-	ldrb r0, [r4]
-	ldr r2, =gText_Cute
-	movs r1, 0x49
-	str r1, [sp]
-	str r6, [sp, 0x4]
-	str r5, [sp, 0x8]
-	movs r1, 0x1
-	movs r3, 0x6
-	bl AddTextPrinterParameterized
-	ldrb r0, [r4]
-	ldr r2, =gText_Smart
-	movs r1, 0x59
-	str r1, [sp]
-	str r6, [sp, 0x4]
-	str r5, [sp, 0x8]
-	movs r1, 0x1
-	movs r3, 0x6
-	bl AddTextPrinterParameterized
-	ldrb r0, [r4]
-	ldr r2, =gText_Tough
-	movs r1, 0x69
-	str r1, [sp]
-	str r6, [sp, 0x4]
-	str r5, [sp, 0x8]
-	movs r1, 0x1
-	movs r3, 0x6
-	bl AddTextPrinterParameterized
-	movs r1, 0
-_081A314A:
-	movs r5, 0
-	adds r0, r1, 0x1
-	mov r8, r0
-	lsls r0, r1, 28
-	movs r2, 0xA4
-	lsls r2, 22
-	adds r0, r2
-	lsrs r7, r0, 24
-	lsls r4, r1, 3
-_081A315C:
-	ldr r0, =gSaveBlock2Ptr
-	ldr r0, [r0]
-	ldr r1, =0x00000624
-	adds r0, r1
-	adds r0, r4
-	ldrh r1, [r0]
-	mov r0, r9
-	movs r2, 0x1
-	movs r3, 0x4
-	bl ConvertIntToDecimalStringN
-	ldr r6, =gRecordsWindowId
-	ldrb r0, [r6]
-	movs r1, 0x26
-	adds r3, r5, 0
-	muls r3, r1
-	adds r3, 0x40
-	lsls r3, 24
-	lsrs r3, 24
-	str r7, [sp]
-	movs r1, 0xFF
-	str r1, [sp, 0x4]
-	movs r1, 0
-	str r1, [sp, 0x8]
-	movs r1, 0x1
-	mov r2, r9
-	bl AddTextPrinterParameterized
-	adds r4, 0x2
-	adds r5, 0x1
-	cmp r5, 0x3
-	ble _081A315C
-	mov r1, r8
-	cmp r1, 0x4
-	ble _081A314A
-	ldrb r0, [r6]
-	bl PutWindowTilemap
-	ldrb r0, [r6]
-	movs r1, 0x3
-	bl CopyWindowToVram
-	add sp, 0xC
-	pop {r3,r4}
-	mov r8, r3
-	mov r9, r4
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_81A2FF8
-
-	thumb_func_start sub_81A31FC
-sub_81A31FC: @ 81A31FC
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0x24
-	ldr r0, =gSaveBlock2Ptr
-	ldr r0, [r0]
-	ldr r1, =0x00000ca9
-	adds r0, r1
-	ldrb r0, [r0]
-	lsls r0, 30
-	lsrs r7, r0, 30
-	ldr r0, =0x000040cf
-	bl VarGet
-	lsls r0, 16
-	lsrs r4, r0, 16
-	ldr r0, =0x000040ce
-	bl VarGet
-	lsls r0, 16
-	lsrs r0, 16
-	mov r8, r0
-	cmp r4, 0x6
-	bls _081A3232
-	b _081A35CE
-_081A3232:
-	lsls r0, r4, 2
-	ldr r1, =_081A3250
-	adds r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.pool
-	.align 2, 0
-_081A3250:
-	.4byte _081A326C
-	.4byte _081A33A8
-	.4byte _081A3414
-	.4byte _081A347C
-	.4byte _081A34CC
-	.4byte _081A354C
-	.4byte _081A3594
-_081A326C:
-	ldr r2, =gSaveBlock2Ptr
-	mov r9, r2
-	ldr r0, [r2]
-	lsls r3, r7, 1
-	mov r10, r3
-	mov r2, r8
-	lsls r1, r2, 2
-	add r1, r10
-	str r1, [sp, 0x20]
-	movs r3, 0xCE
-	lsls r3, 4
-	adds r1, r0, r3
-	ldr r2, [sp, 0x20]
-	adds r1, r2
-	adds r3, 0x10
-	adds r0, r3
-	adds r0, r2
-	ldrh r1, [r1]
-	ldrh r2, [r0]
-	cmp r1, r2
-	bhi _081A3298
-	b _081A35CE
-_081A3298:
-	strh r1, [r0]
-	mov r3, r8
-	cmp r3, 0x3
-	bne _081A32F2
-	ldr r6, =gBattleScripting
-	adds r6, 0x25
-	ldrb r0, [r6]
-	movs r4, 0x1
-	eors r0, r4
-	lsls r1, r0, 3
-	subs r1, r0
-	lsls r1, 2
-	ldr r5, =gLinkPlayers + 8
-	adds r1, r5
-	mov r0, sp
-	bl StringCopy
-	mov r0, sp
-	bl StripExtCtrlCodes
-	lsls r1, r7, 3
-	ldr r0, =0x00000ee1
-	adds r1, r0
-	mov r2, r9
-	ldr r0, [r2]
-	adds r0, r1
-	mov r1, sp
-	bl StringCopy
-	ldrb r0, [r6]
-	eors r4, r0
-	lsls r0, r4, 3
-	subs r0, r4
-	lsls r0, 2
-	subs r5, 0x4
-	adds r0, r5
-	ldr r0, [r0]
-	lsls r2, r7, 2
-	ldr r1, =0x00000ef1
-	adds r2, r1
-	mov r3, r9
-	ldr r1, [r3]
-	adds r1, r2
-	bl WriteUnalignedWord
-_081A32F2:
-	mov r7, r9
-	ldr r0, [r7]
-	movs r1, 0xCE
-	lsls r1, 4
-	adds r0, r1
-	ldr r2, [sp, 0x20]
-	adds r0, r2
-	ldrh r0, [r0]
-	cmp r0, 0x1
-	bhi _081A3308
-	b _081A35CE
-_081A3308:
-	bl sub_80EE818
-	lsls r0, 24
-	cmp r0, 0
-	bne _081A3314
-	b _081A35CE
-_081A3314:
-	mov r3, r8
-	cmp r3, 0x1
-	beq _081A335A
-	cmp r3, 0x1
-	bgt _081A3338
-	cmp r3, 0
-	beq _081A3344
-	b _081A35CE
-	.pool
-_081A3338:
-	mov r7, r8
-	cmp r7, 0x2
-	beq _081A3374
-	cmp r7, 0x3
-	beq _081A338E
-	b _081A35CE
-_081A3344:
-	mov r1, r9
-	ldr r0, [r1]
-	movs r2, 0xCE
-	lsls r2, 4
-	adds r0, r2
-	add r0, r10
-	ldrh r0, [r0]
-	movs r1, 0x1
-	bl sub_80EE8C8
-	b _081A35CE
-_081A335A:
-	mov r3, r9
-	ldr r0, [r3]
-	mov r1, r10
-	adds r1, 0x4
-	movs r7, 0xCE
-	lsls r7, 4
-	adds r0, r7
-	adds r0, r1
-	ldrh r0, [r0]
-	movs r1, 0x2
-	bl sub_80EE8C8
-	b _081A35CE
-_081A3374:
-	mov r1, r9
-	ldr r0, [r1]
-	mov r1, r10
-	adds r1, 0x8
-	movs r2, 0xCE
-	lsls r2, 4
-	adds r0, r2
-	adds r0, r1
-	ldrh r0, [r0]
-	movs r1, 0x3
-	bl sub_80EE8C8
-	b _081A35CE
-_081A338E:
-	mov r3, r9
-	ldr r0, [r3]
-	mov r1, r10
-	adds r1, 0xC
-	movs r7, 0xCE
-	lsls r7, 4
-	adds r0, r7
-	adds r0, r1
-	ldrh r0, [r0]
-	movs r1, 0x4
-	bl sub_80EE8C8
-	b _081A35CE
-_081A33A8:
-	ldr r6, =gSaveBlock2Ptr
-	ldr r0, [r6]
-	lsls r7, 1
-	mov r2, r8
-	lsls r1, r2, 2
-	adds r4, r7, r1
-	ldr r5, =0x00000d0c
-	adds r1, r0, r5
-	adds r1, r4
-	ldr r3, =0x00000d14
-	adds r0, r3
-	adds r0, r4
-	ldrh r2, [r1]
-	ldrh r3, [r0]
-	cmp r2, r3
-	bhi _081A33CA
-	b _081A35CE
-_081A33CA:
-	strh r2, [r0]
-	ldrh r0, [r1]
-	cmp r0, 0x1
-	bhi _081A33D4
-	b _081A35CE
-_081A33D4:
-	bl sub_80EE818
-	lsls r0, 24
-	cmp r0, 0
-	bne _081A33E0
-	b _081A35CE
-_081A33E0:
-	mov r0, r8
-	cmp r0, 0
-	bne _081A3404
-	ldr r0, [r6]
-	adds r0, r5
-	adds r0, r7
-	ldrh r0, [r0]
-	movs r1, 0x5
-	bl sub_80EE8C8
-	b _081A35CE
-	.pool
-_081A3404:
-	ldr r0, [r6]
-	adds r0, r5
-	adds r0, r4
-	ldrh r0, [r0]
-	movs r1, 0x6
-	bl sub_80EE8C8
-	b _081A35CE
-_081A3414:
-	ldr r6, =gSaveBlock2Ptr
-	ldr r0, [r6]
-	lsls r7, 1
-	mov r2, r8
-	lsls r1, r2, 2
-	adds r4, r7, r1
-	ldr r5, =0x00000dc8
-	adds r1, r0, r5
-	adds r1, r4
-	movs r3, 0xDD
-	lsls r3, 4
-	adds r0, r3
-	adds r0, r4
-	ldrh r2, [r1]
-	ldrh r3, [r0]
-	cmp r2, r3
-	bhi _081A3438
-	b _081A35CE
-_081A3438:
-	strh r2, [r0]
-	ldrh r0, [r1]
-	cmp r0, 0x1
-	bhi _081A3442
-	b _081A35CE
-_081A3442:
-	bl sub_80EE818
-	lsls r0, 24
-	cmp r0, 0
-	bne _081A344E
-	b _081A35CE
-_081A344E:
-	mov r0, r8
-	cmp r0, 0
-	bne _081A346C
-	ldr r0, [r6]
-	adds r0, r5
-	adds r0, r7
-	ldrh r0, [r0]
-	movs r1, 0xB
-	bl sub_80EE8C8
-	b _081A35CE
-	.pool
-_081A346C:
-	ldr r0, [r6]
-	adds r0, r5
-	adds r0, r4
-	ldrh r0, [r0]
-	movs r1, 0xC
-	bl sub_80EE8C8
-	b _081A35CE
-_081A347C:
-	ldr r6, =gSaveBlock2Ptr
-	ldr r1, [r6]
-	lsls r4, r7, 1
-	ldr r5, =0x00000dda
-	adds r0, r1, r5
-	adds r0, r4
-	ldr r2, =0x00000dde
-	adds r1, r2
-	adds r1, r4
-	ldrh r2, [r0]
-	ldrh r3, [r1]
-	cmp r2, r3
-	bhi _081A3498
-	b _081A35CE
-_081A3498:
-	strh r2, [r1]
-	ldrh r0, [r0]
-	cmp r0, 0x1
-	bhi _081A34A2
-	b _081A35CE
-_081A34A2:
-	bl sub_80EE818
-	lsls r0, 24
-	cmp r0, 0
-	bne _081A34AE
-	b _081A35CE
-_081A34AE:
-	ldr r0, [r6]
-	adds r0, r5
-	adds r0, r4
-	ldrh r0, [r0]
-	movs r1, 0xA
-	bl sub_80EE8C8
-	b _081A35CE
-	.pool
-_081A34CC:
-	ldr r6, =gSaveBlock2Ptr
-	ldr r2, [r6]
-	lsls r7, 1
-	mov r9, r7
-	mov r7, r8
-	lsls r0, r7, 2
-	mov r1, r9
-	adds r4, r1, r0
-	ldr r5, =0x00000de2
-	adds r0, r2, r5
-	adds r3, r0, r4
-	ldr r7, =0x00000dea
-	adds r0, r2, r7
-	adds r0, r4
-	ldrh r1, [r3]
-	ldrh r7, [r0]
-	cmp r1, r7
-	bls _081A35CE
-	strh r1, [r0]
-	ldr r0, =0x00000dfa
-	adds r1, r2, r0
-	adds r1, r4
-	ldr r7, =0x00000df2
-	adds r0, r2, r7
-	adds r0, r4
-	ldrh r0, [r0]
-	strh r0, [r1]
-	ldrh r0, [r3]
-	cmp r0, 0x1
-	bls _081A35CE
-	bl sub_80EE818
-	lsls r0, 24
-	cmp r0, 0
-	beq _081A35CE
-	mov r0, r8
-	cmp r0, 0
-	bne _081A353C
-	ldr r0, [r6]
-	adds r0, r5
-	add r0, r9
-	ldrh r0, [r0]
-	movs r1, 0x7
-	bl sub_80EE8C8
-	b _081A35CE
-	.pool
-_081A353C:
-	ldr r0, [r6]
-	adds r0, r5
-	adds r0, r4
-	ldrh r0, [r0]
-	movs r1, 0x8
-	bl sub_80EE8C8
-	b _081A35CE
-_081A354C:
-	ldr r6, =gSaveBlock2Ptr
-	ldr r1, [r6]
-	lsls r4, r7, 1
-	ldr r5, =0x00000e04
-	adds r0, r1, r5
-	adds r0, r4
-	ldr r2, =0x00000e08
-	adds r1, r2
-	adds r1, r4
-	ldrh r2, [r0]
-	ldrh r3, [r1]
-	cmp r2, r3
-	bls _081A35CE
-	strh r2, [r1]
-	ldrh r0, [r0]
-	cmp r0, 0x1
-	bls _081A35CE
-	bl sub_80EE818
-	lsls r0, 24
-	cmp r0, 0
-	beq _081A35CE
-	ldr r0, [r6]
-	adds r0, r5
-	adds r0, r4
-	ldrh r0, [r0]
-	movs r1, 0x9
-	bl sub_80EE8C8
-	b _081A35CE
-	.pool
-_081A3594:
-	ldr r6, =gSaveBlock2Ptr
-	ldr r1, [r6]
-	lsls r4, r7, 1
-	ldr r5, =0x00000e1a
-	adds r0, r1, r5
-	adds r0, r4
-	ldr r7, =0x00000e1e
-	adds r1, r7
-	adds r1, r4
-	ldrh r2, [r0]
-	ldrh r3, [r1]
-	cmp r2, r3
-	bls _081A35CE
-	strh r2, [r1]
-	ldrh r0, [r0]
-	cmp r0, 0x1
-	bls _081A35CE
-	bl sub_80EE818
-	lsls r0, 24
-	cmp r0, 0
-	beq _081A35CE
-	ldr r0, [r6]
-	adds r0, r5
-	adds r0, r4
-	ldrh r0, [r0]
-	movs r1, 0xD
-	bl sub_80EE8C8
-_081A35CE:
-	add sp, 0x24
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_81A31FC
-
-	thumb_func_start sub_81A35EC
-sub_81A35EC: @ 81A35EC
-	push {r4,lr}
-	ldr r0, =0x000040cf
-	bl VarGet
-	ldr r4, =gSpecialVar_Result
-	bl sub_81A3610
-	lsls r0, 24
-	lsrs r0, 24
-	strh r0, [r4]
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_81A35EC
-
-	thumb_func_start sub_81A3610
-sub_81A3610: @ 81A3610
-	push {r4-r7,lr}
-	mov r7, r9
-	mov r6, r8
-	push {r6,r7}
-	movs r0, 0
-	mov r8, r0
-	ldr r0, =0x000040cf
-	bl VarGet
-	lsls r0, 16
-	lsrs r6, r0, 16
-	ldr r0, =0x000040ce
-	bl VarGet
-	adds r4, r0, 0
-	lsls r4, 16
-	lsrs r4, 16
-	bl sub_81A39C4
-	lsls r0, 16
-	ldr r1, =gUnknown_08611550
-	mov r9, r1
-	lsls r7, r6, 2
-	adds r1, 0x3
-	adds r1, r7, r1
-	lsrs r0, 16
-	ldrb r1, [r1]
-	adds r5, r0, r1
-	cmp r4, 0
-	beq _081A365C
-	movs r0, 0
-	b _081A36C2
-	.pool
-_081A365C:
-	lsls r0, r6, 24
-	lsrs r0, 24
-	bl sub_81A3B30
-	lsls r0, 24
-	lsrs r1, r0, 24
-	cmp r1, 0
-	blt _081A3680
-	cmp r1, 0x1
-	bgt _081A3680
-	adds r0, r1, r7
-	add r0, r9
-	ldrb r0, [r0]
-	cmp r5, r0
-	bne _081A36BC
-	adds r1, 0x1
-	mov r8, r1
-	b _081A36BC
-_081A3680:
-	ldr r1, =gUnknown_08611550
-	lsls r2, r6, 2
-	adds r0, r2, r1
-	ldrb r0, [r0]
-	cmp r5, r0
-	bne _081A3694
-	movs r0, 0x3
-	b _081A36BA
-	.pool
-_081A3694:
-	adds r0, r1, 0x1
-	adds r0, r2, r0
-	ldrb r0, [r0]
-	cmp r5, r0
-	bne _081A36A4
-	movs r1, 0x4
-	mov r8, r1
-	b _081A36BC
-_081A36A4:
-	cmp r5, r0
-	ble _081A36BC
-	subs r0, r5, r0
-	adds r1, 0x2
-	adds r1, r2, r1
-	ldrb r1, [r1]
-	bl __modsi3
-	cmp r0, 0
-	bne _081A36BC
-	movs r0, 0x4
-_081A36BA:
-	mov r8, r0
-_081A36BC:
-	mov r1, r8
-	lsls r0, r1, 24
-	lsrs r0, 24
-_081A36C2:
-	pop {r3,r4}
-	mov r8, r3
-	mov r9, r4
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_81A3610
-
-	thumb_func_start CopyFrontierTrainerText
-CopyFrontierTrainerText: @ 81A36D0
-	push {lr}
-	lsls r0, 24
-	lsrs r0, 24
-	adds r2, r0, 0
-	lsls r1, 16
-	lsrs r3, r1, 16
-	cmp r0, 0x1
-	beq _081A3766
-	cmp r0, 0x1
-	bgt _081A36EA
-	cmp r0, 0
-	beq _081A36F2
-	b _081A38F8
-_081A36EA:
-	cmp r2, 0x2
-	bne _081A36F0
-	b _081A3818
-_081A36F0:
-	b _081A38F8
-_081A36F2:
-	movs r0, 0xFA
-	lsls r0, 1
-	cmp r3, r0
-	bne _081A370C
-	ldr r0, =gSaveBlock2Ptr
-	ldr r0, [r0]
-	ldr r1, =0x00000bfc
-	b _081A38C4
-	.pool
-_081A370C:
-	ldr r0, =0x000003fe
-	cmp r3, r0
-	beq _081A3786
-	ldr r0, =0x0000012b
-	cmp r3, r0
-	bhi _081A3738
-	ldr r2, =gFacilityTrainers
-	movs r0, 0x34
-	adds r1, r3, 0
-	muls r1, r0
-	ldr r0, [r2]
-	adds r0, r1
-	adds r0, 0xC
-	bl FrontierSpeechToString
-	b _081A38F8
-	.pool
-_081A3738:
-	ldr r0, =0x0000018f
-	cmp r3, r0
-	bhi _081A3758
-	ldr r1, =gSaveBlock2Ptr
-	movs r0, 0xEC
-	muls r0, r3
-	ldr r1, [r1]
-	adds r0, r1
-	ldr r1, =0xfffef2b8
-	b _081A38C4
-	.pool
-_081A3758:
-	adds r0, r3, 0
-	adds r0, 0x70
-	lsls r0, 24
-	lsrs r0, 24
-	bl CopyFriendsApprenticeChallengeText
-	b _081A38F8
-_081A3766:
-	movs r0, 0xFA
-	lsls r0, 1
-	cmp r3, r0
-	bne _081A3780
-	ldr r0, =gSaveBlock2Ptr
-	ldr r0, [r0]
-	ldr r1, =0x00000c08
-	b _081A38C4
-	.pool
-_081A3780:
-	ldr r0, =0x000003fe
-	cmp r3, r0
-	bne _081A3794
-_081A3786:
-	movs r0, 0
-	bl sub_81A51A8
-	b _081A38F8
-	.pool
-_081A3794:
-	ldr r0, =0x0000012b
-	cmp r3, r0
-	bhi _081A37B8
-	ldr r2, =gFacilityTrainers
-	movs r0, 0x34
-	adds r1, r3, 0
-	muls r1, r0
-	ldr r0, [r2]
-	adds r0, r1
-	adds r0, 0x18
-	bl FrontierSpeechToString
-	b _081A38F8
-	.pool
-_081A37B8:
-	ldr r0, =0x0000018f
-	cmp r3, r0
-	bhi _081A37EC
-	ldr r0, =gBattleTypeFlags
-	ldr r0, [r0]
-	movs r1, 0x80
-	lsls r1, 17
-	ands r0, r1
-	cmp r0, 0
-	bne _081A387C
-	ldr r1, =gSaveBlock2Ptr
-	movs r0, 0xEC
-	muls r0, r3
-	ldr r1, [r1]
-	adds r0, r1
-	ldr r1, =0xfffef2c4
-	b _081A38C4
-	.pool
-_081A37EC:
-	ldr r0, =gBattleTypeFlags
-	ldr r0, [r0]
-	movs r1, 0x80
-	lsls r1, 17
-	ands r0, r1
-	cmp r0, 0
-	bne _081A387C
-	ldr r1, =gSaveBlock2Ptr
-	lsls r0, r3, 4
-	adds r0, r3
-	lsls r0, 2
-	ldr r1, [r1]
-	adds r0, r1
-	ldr r1, =0xffff96c4
-	b _081A38C4
-	.pool
-_081A3818:
-	movs r0, 0xFA
-	lsls r0, 1
-	cmp r3, r0
-	bne _081A3830
-	ldr r0, =gSaveBlock2Ptr
-	ldr r0, [r0]
-	ldr r1, =0x00000c14
-	b _081A38C4
-	.pool
-_081A3830:
-	ldr r0, =0x000003fe
-	cmp r3, r0
-	bne _081A3844
-	movs r0, 0x1
-	bl sub_81A51A8
-	b _081A38F8
-	.pool
-_081A3844:
-	ldr r0, =0x0000012b
-	cmp r3, r0
-	bhi _081A3868
-	ldr r2, =gFacilityTrainers
-	movs r0, 0x34
-	adds r1, r3, 0
-	muls r1, r0
-	ldr r0, [r2]
-	adds r0, r1
-	adds r0, 0x24
-	bl FrontierSpeechToString
-	b _081A38F8
-	.pool
-_081A3868:
-	ldr r0, =0x0000018f
-	cmp r3, r0
-	bhi _081A38A8
-	ldr r0, =gBattleTypeFlags
-	ldr r0, [r0]
-	movs r1, 0x80
-	lsls r1, 17
-	ands r0, r1
-	cmp r0, 0
-	beq _081A3890
-_081A387C:
-	bl sub_81864E0
-	bl FrontierSpeechToString
-	b _081A38F8
-	.pool
-_081A3890:
-	ldr r1, =gSaveBlock2Ptr
-	movs r0, 0xEC
-	muls r0, r3
-	ldr r1, [r1]
-	adds r0, r1
-	ldr r1, =0xfffef2d0
-	b _081A38C4
-	.pool
-_081A38A8:
-	ldr r0, =gBattleTypeFlags
-	ldr r0, [r0]
-	movs r1, 0x80
-	lsls r1, 17
-	ands r0, r1
-	cmp r0, 0
-	beq _081A38D4
-	bl sub_81864A8
-	lsls r0, 24
-	lsrs r3, r0, 24
-	movs r0, 0x58
-	muls r0, r3
-	ldr r1, =gApprentices+0x4A
-_081A38C4:
-	adds r0, r1
-	bl FrontierSpeechToString
-	b _081A38F8
-	.pool
-_081A38D4:
-	ldr r0, =gSaveBlock2Ptr
-	ldr r1, [r0]
-	ldr r0, =0xfffffe70
-	adds r2, r3, r0
-	lsls r0, r2, 4
-	adds r0, r2
-	lsls r0, 2
-	adds r1, r0
-	adds r1, 0xDC
-	ldrb r0, [r1]
-	lsls r0, 27
-	lsrs r3, r0, 27
-	movs r0, 0x58
-	muls r0, r3
-	ldr r1, =gApprentices+0x4A
-	adds r0, r1
-	bl FrontierSpeechToString
-_081A38F8:
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end CopyFrontierTrainerText
-
-	thumb_func_start sub_81A3908
-sub_81A3908: @ 81A3908
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	ldr r0, =gSaveBlock2Ptr
-	ldr r1, [r0]
-	ldr r2, =0x00000cdc
-	adds r1, r2
-	movs r2, 0
-	str r2, [r1]
-	movs r4, 0
-	mov r9, r0
-	mov r8, r9
-	movs r6, 0
-_081A3926:
-	movs r5, 0
-	lsls r7, r4, 2
-	mov r10, r7
-	adds r0, r4, 0x1
-	mov r12, r0
-_081A3930:
-	mov r1, r8
-	ldr r2, [r1]
-	lsls r3, r5, 1
-	mov r7, r10
-	adds r1, r3, r7
-	movs r7, 0xCE
-	lsls r7, 4
-	adds r0, r2, r7
-	adds r0, r1
-	strh r6, [r0]
-	cmp r4, 0x1
-	bgt _081A3960
-	adds r7, 0x2C
-	adds r0, r2, r7
-	adds r0, r1
-	strh r6, [r0]
-	adds r7, 0xBC
-	adds r0, r2, r7
-	adds r0, r1
-	strh r6, [r0]
-	adds r7, 0x1A
-	adds r0, r2, r7
-	adds r0, r1
-	strh r6, [r0]
-_081A3960:
-	cmp r4, 0
-	bne _081A3980
-	mov r1, r8
-	ldr r0, [r1]
-	ldr r2, =0x00000dda
-	adds r1, r0, r2
-	adds r1, r3
-	strh r4, [r1]
-	ldr r7, =0x00000e04
-	adds r1, r0, r7
-	adds r1, r3
-	strh r4, [r1]
-	ldr r1, =0x00000e1a
-	adds r0, r1
-	adds r0, r3
-	strh r4, [r0]
-_081A3980:
-	adds r5, 0x1
-	cmp r5, 0x1
-	ble _081A3930
-	mov r4, r12
-	cmp r4, 0x3
-	ble _081A3926
-	mov r2, r9
-	ldr r0, [r2]
-	ldr r7, =0x00000ca8
-	adds r1, r0, r7
-	ldrb r0, [r1]
-	cmp r0, 0
-	beq _081A399E
-	movs r0, 0x1
-	strb r0, [r1]
-_081A399E:
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_81A3908
-
-	thumb_func_start sub_81A39C4
-sub_81A39C4: @ 81A39C4
-	push {r4,r5,lr}
-	ldr r0, =gSaveBlock2Ptr
-	ldr r0, [r0]
-	ldr r1, =0x00000ca9
-	adds r0, r1
-	ldrb r0, [r0]
-	lsls r0, 30
-	lsrs r4, r0, 30
-	ldr r0, =0x000040ce
-	bl VarGet
-	lsls r0, 16
-	lsrs r5, r0, 16
-	ldr r0, =0x000040cf
-	bl VarGet
-	lsls r0, 16
-	lsrs r0, 16
-	cmp r0, 0x6
-	bhi _081A3AC4
-	lsls r0, 2
-	ldr r1, =_081A3A0C
-	adds r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.pool
-	.align 2, 0
-_081A3A0C:
-	.4byte _081A3A28
-	.4byte _081A3A3C
-	.4byte _081A3A54
-	.4byte _081A3A6C
-	.4byte _081A3A80
-	.4byte _081A3A98
-	.4byte _081A3AAC
-_081A3A28:
-	ldr r0, =gSaveBlock2Ptr
-	ldr r0, [r0]
-	lsls r1, r4, 1
-	lsls r2, r5, 2
-	adds r1, r2
-	movs r2, 0xCE
-	lsls r2, 4
-	b _081A3AB4
-	.pool
-_081A3A3C:
-	ldr r0, =gSaveBlock2Ptr
-	ldr r0, [r0]
-	lsls r1, r4, 1
-	lsls r2, r5, 2
-	adds r1, r2
-	ldr r2, =0x00000d0c
-	b _081A3AB4
-	.pool
-_081A3A54:
-	ldr r0, =gSaveBlock2Ptr
-	ldr r0, [r0]
-	lsls r1, r4, 1
-	lsls r2, r5, 2
-	adds r1, r2
-	ldr r2, =0x00000dc8
-	b _081A3AB4
-	.pool
-_081A3A6C:
-	ldr r0, =gSaveBlock2Ptr
-	ldr r0, [r0]
-	lsls r1, r4, 1
-	ldr r2, =0x00000dda
-	b _081A3AB4
-	.pool
-_081A3A80:
-	ldr r0, =gSaveBlock2Ptr
-	ldr r0, [r0]
-	lsls r1, r4, 1
-	lsls r2, r5, 2
-	adds r1, r2
-	ldr r2, =0x00000de2
-	b _081A3AB4
-	.pool
-_081A3A98:
-	ldr r0, =gSaveBlock2Ptr
-	ldr r0, [r0]
-	lsls r1, r4, 1
-	ldr r2, =0x00000e04
-	b _081A3AB4
-	.pool
-_081A3AAC:
-	ldr r0, =gSaveBlock2Ptr
-	ldr r0, [r0]
-	lsls r1, r4, 1
-	ldr r2, =0x00000e1a
-_081A3AB4:
-	adds r0, r2
-	adds r0, r1
-	ldrh r0, [r0]
-	b _081A3AC6
-	.pool
-_081A3AC4:
-	movs r0, 0
-_081A3AC6:
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_81A39C4
 
 	thumb_func_start sub_81A3ACC
 sub_81A3ACC: @ 81A3ACC
@@ -4119,7 +2653,7 @@ sub_81A513C: @ 81A513C
 	lsrs r4, r0, 24
 	cmp r4, 0x2
 	bne _081A51A0
-	bl sub_81A39C4
+	bl GetCurrentFacilityWinStreak
 	lsls r0, 16
 	ldr r3, =gUnknown_08611550
 	lsls r2, r5, 2