more tower, fail

3 files changed, 19 insertions, 1539 deletions

diff --git a/asm/battle_frontier_2.s b/asm/battle_frontier_2.s
index 48673d4fa..108f1996c 100644
--- a/asm/battle_frontier_2.s
+++ b/asm/battle_frontier_2.s
@@ -3600,7 +3600,7 @@ _081A370C:
 	ldr r0, [r2]
 	adds r0, r1
 	adds r0, 0xC
-	bl ConvertBattleFrontierTrainerSpeechToString
+	bl FrontierSpeechToString
 	b _081A38F8
 	.pool
 _081A3738:
@@ -3652,7 +3652,7 @@ _081A3794:
 	ldr r0, [r2]
 	adds r0, r1
 	adds r0, 0x18
-	bl ConvertBattleFrontierTrainerSpeechToString
+	bl FrontierSpeechToString
 	b _081A38F8
 	.pool
 _081A37B8:
@@ -3720,7 +3720,7 @@ _081A3844:
 	ldr r0, [r2]
 	adds r0, r1
 	adds r0, 0x24
-	bl ConvertBattleFrontierTrainerSpeechToString
+	bl FrontierSpeechToString
 	b _081A38F8
 	.pool
 _081A3868:
@@ -3736,7 +3736,7 @@ _081A3868:
 	beq _081A3890
 _081A387C:
 	bl sub_81864E0
-	bl ConvertBattleFrontierTrainerSpeechToString
+	bl FrontierSpeechToString
 	b _081A38F8
 	.pool
 _081A3890:
@@ -3764,7 +3764,7 @@ _081A38A8:
 	ldr r1, =gApprentices+0x4A
 _081A38C4:
 	adds r0, r1
-	bl ConvertBattleFrontierTrainerSpeechToString
+	bl FrontierSpeechToString
 	b _081A38F8
 	.pool
 _081A38D4:
@@ -3784,7 +3784,7 @@ _081A38D4:
 	muls r0, r3
 	ldr r1, =gApprentices+0x4A
 	adds r0, r1
-	bl ConvertBattleFrontierTrainerSpeechToString
+	bl FrontierSpeechToString
 _081A38F8:
 	pop {r0}
 	bx r0
@@ -10896,7 +10896,7 @@ _081A7560:
 	lsls r0, 2
 	ldr r1, =gUnknown_086123E4
 	adds r0, r1
-	bl ConvertBattleFrontierTrainerSpeechToString
+	bl FrontierSpeechToString
 	pop {r0}
 	bx r0
 	.pool
@@ -12875,7 +12875,7 @@ sub_81A84EC: @ 81A84EC
 	ldr r0, [r2]
 	adds r0, r1
 	adds r0, 0xC
-	bl ConvertBattleFrontierTrainerSpeechToString
+	bl FrontierSpeechToString
 	b _081A8542
 	.pool
 _081A8524:
@@ -12892,7 +12892,7 @@ _081A8524:
 	ldr r0, [r2]
 	adds r0, r1
 	adds r0, 0xC
-	bl ConvertBattleFrontierTrainerSpeechToString
+	bl FrontierSpeechToString
 _081A8542:
 	pop {r0}
 	bx r0
@@ -16003,7 +16003,7 @@ sub_81A9EDC: @ 81A9EDC
 	ldr r0, [r2]
 	adds r0, r1
 	adds r0, 0xC
-	bl ConvertBattleFrontierTrainerSpeechToString
+	bl FrontierSpeechToString
 	pop {r0}
 	bx r0
 	.pool
@@ -16020,7 +16020,7 @@ sub_81A9EFC: @ 81A9EFC
 	ldr r0, [r2]
 	adds r0, r1
 	adds r0, 0x18
-	bl ConvertBattleFrontierTrainerSpeechToString
+	bl FrontierSpeechToString
 	pop {r0}
 	bx r0
 	.pool
@@ -16037,7 +16037,7 @@ sub_81A9F1C: @ 81A9F1C
 	ldr r0, [r2]
 	adds r0, r1
 	adds r0, 0x24
-	bl ConvertBattleFrontierTrainerSpeechToString
+	bl FrontierSpeechToString
 	pop {r0}
 	bx r0
 	.pool
diff --git a/asm/battle_tower.s b/asm/battle_tower.s
index fd011c555..b8f138e7b 100644
--- a/asm/battle_tower.s
+++ b/asm/battle_tower.s
@@ -5,1526 +5,6 @@
 
 	.text
 
-
-
-
-
-	thumb_func_start sub_8163914
-sub_8163914: @ 8163914
-	push {lr}
-	bl GetFacilityEnemyMonLevel
-	ldr r0, =gSpecialVar_0x8005
-	ldrh r0, [r0]
-	cmp r0, 0
-	beq _08163930
-	ldr r0, =gTrainerBattleOpponent_B
-	b _08163932
-	.pool
-_08163930:
-	ldr r0, =gTrainerBattleOpponent_A
-_08163932:
-	ldrh r3, [r0]
-	movs r0, 0xFA
-	lsls r0, 1
-	cmp r3, r0
-	bne _08163950
-	ldr r0, =gSaveBlock2Ptr
-	ldr r0, [r0]
-	ldr r1, =0x00000bfc
-	b _08163986
-	.pool
-_08163950:
-	ldr r0, =0x0000012b
-	cmp r3, r0
-	bhi _08163974
-	ldr r2, =gFacilityTrainers
-	movs r0, 0x34
-	adds r1, r3, 0
-	muls r1, r0
-	ldr r0, [r2]
-	adds r0, r1
-	adds r0, 0xC
-	bl ConvertBattleFrontierTrainerSpeechToString
-	b _081639A8
-	.pool
-_08163974:
-	ldr r0, =0x0000018f
-	cmp r3, r0
-	bhi _0816399C
-	ldr r1, =gSaveBlock2Ptr
-	movs r0, 0xEC
-	muls r0, r3
-	ldr r1, [r1]
-	adds r0, r1
-	ldr r1, =0xfffef2b8
-_08163986:
-	adds r0, r1
-	bl ConvertBattleFrontierTrainerSpeechToString
-	b _081639A8
-	.pool
-_0816399C:
-	adds r0, r3, 0
-	adds r0, 0x70
-	lsls r0, 24
-	lsrs r0, 24
-	bl CopyFriendsApprenticeChallengeText
-_081639A8:
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8163914
-
-	thumb_func_start sub_81639AC
-sub_81639AC: @ 81639AC
-	push {r4-r6,lr}
-	sub sp, 0x4
-	bl sub_81864CC
-	ldr r0, =gBattleScripting
-	adds r0, 0x26
-	ldrb r0, [r0]
-	cmp r0, 0xA
-	bhi _08163A78
-	lsls r0, 2
-	ldr r1, =_081639D0
-	adds r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.pool
-	.align 2, 0
-_081639D0:
-	.4byte _081639FC
-	.4byte _08163A38
-	.4byte _08163A74
-	.4byte _081639FC
-	.4byte _081639FC
-	.4byte _081639FC
-	.4byte _081639FC
-	.4byte _081639FC
-	.4byte _08163A78
-	.4byte _081639FC
-	.4byte _081639FC
-_081639FC:
-	ldr r0, =gSaveBlock2Ptr
-	ldr r0, [r0]
-	ldr r2, =0x00000ebc
-	adds r1, r0, r2
-	ldr r2, [r1]
-	ldr r0, =0x00fffffe
-	cmp r2, r0
-	bhi _08163A2C
-	adds r0, r2, 0x1
-	str r0, [r1]
-	movs r1, 0x14
-	bl __umodsi3
-	cmp r0, 0
-	bne _08163A78
-	bl UpdateGymLeaderRematch
-	b _08163A78
-	.pool
-_08163A2C:
-	ldr r0, =0x00ffffff
-	str r0, [r1]
-	b _08163A78
-	.pool
-_08163A38:
-	movs r5, 0
-	ldr r6, =gSaveBlock1Ptr
-_08163A3C:
-	movs r0, 0x64
-	adds r4, r5, 0
-	muls r4, r0
-	movs r0, 0x8E
-	lsls r0, 2
-	adds r1, r4, r0
-	ldr r0, [r6]
-	adds r0, r1
-	movs r1, 0xC
-	bl GetMonData
-	mov r1, sp
-	strh r0, [r1]
-	ldr r0, =gPlayerParty
-	adds r4, r0
-	adds r0, r4, 0
-	movs r1, 0xC
-	mov r2, sp
-	bl SetMonData
-	adds r5, 0x1
-	cmp r5, 0x5
-	ble _08163A3C
-	b _08163A78
-	.pool
-_08163A74:
-	bl sub_816537C
-_08163A78:
-	ldr r0, =CB2_ReturnToFieldContinueScriptPlayMapMusic
-	bl SetMainCallback2
-	add sp, 0x4
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_81639AC
-
-	thumb_func_start sub_8163A8C
-sub_8163A8C: @ 8163A8C
-	push {r4,lr}
-	lsls r0, 24
-	lsrs r4, r0, 24
-	bl IsBattleTransitionDone
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _08163AB0
-	ldr r0, =gMain
-	ldr r1, =sub_81639AC
-	str r1, [r0, 0x8]
-	ldr r0, =CB2_InitBattle
-	bl SetMainCallback2
-	adds r0, r4, 0
-	bl DestroyTask
-_08163AB0:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8163A8C
-
-	thumb_func_start sub_8163AC4
-sub_8163AC4: @ 8163AC4
-	push {r4-r6,lr}
-	sub sp, 0x4
-	ldr r0, =gBattleScripting
-	ldr r2, =gSpecialVar_0x8004
-	ldrh r1, [r2]
-	adds r0, 0x26
-	strb r1, [r0]
-	ldrh r0, [r2]
-	cmp r0, 0xA
-	bls _08163ADA
-	b _08163E68
-_08163ADA:
-	lsls r0, 2
-	ldr r1, =_08163AF0
-	adds r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.pool
-	.align 2, 0
-_08163AF0:
-	.4byte _08163B1C
-	.4byte _08163BC0
-	.4byte _08163C10
-	.4byte _08163C70
-	.4byte _08163CC4
-	.4byte _08163D28
-	.4byte _08163D74
-	.4byte _08163DB4
-	.4byte _08163E2C
-	.4byte _08163DF4
-	.4byte _08163DC8
-_08163B1C:
-	ldr r5, =gBattleTypeFlags
-	movs r0, 0x84
-	lsls r0, 1
-	str r0, [r5]
-	ldr r0, =0x000040ce
-	bl VarGet
-	lsls r0, 16
-	lsrs r4, r0, 16
-	cmp r4, 0x1
-	beq _08163B56
-	cmp r4, 0x1
-	bgt _08163B44
-	cmp r4, 0
-	beq _08163B4E
-	b _08163BA6
-	.pool
-_08163B44:
-	cmp r4, 0x2
-	beq _08163B64
-	cmp r4, 0x3
-	beq _08163B98
-	b _08163BA6
-_08163B4E:
-	movs r0, 0x3
-	bl sub_8163048
-	b _08163BA6
-_08163B56:
-	movs r0, 0x4
-	bl sub_8163048
-	ldr r0, [r5]
-	orrs r0, r4
-	str r0, [r5]
-	b _08163BA6
-_08163B64:
-	movs r0, 0x2
-	bl sub_816306C
-	ldr r1, =gPartnerTrainerId
-	ldr r0, =gSaveBlock2Ptr
-	ldr r0, [r0]
-	ldr r2, =0x00000cd6
-	adds r0, r2
-	ldrh r0, [r0]
-	strh r0, [r1]
-	ldrh r0, [r1]
-	bl sub_8165404
-	ldr r0, [r5]
-	ldr r1, =0x00408041
-	orrs r0, r1
-	str r0, [r5]
-	b _08163BA6
-	.pool
-_08163B98:
-	ldr r0, [r5]
-	ldr r1, =0x00800043
-	orrs r0, r1
-	str r0, [r5]
-	movs r0, 0x2
-	bl sub_816306C
-_08163BA6:
-	ldr r0, =sub_8163A8C
-	movs r1, 0x1
-	bl CreateTask
-	movs r0, 0
-	bl PlayMapChosenOrBattleBGM
-	movs r0, 0
-	b _08163E10
-	.pool
-_08163BC0:
-	movs r5, 0
-	ldr r6, =gSaveBlock1Ptr
-_08163BC4:
-	movs r0, 0x64
-	adds r4, r5, 0
-	muls r4, r0
-	ldr r0, =gPlayerParty
-	adds r0, r4, r0
-	movs r1, 0xC
-	bl GetMonData
-	mov r1, sp
-	strh r0, [r1]
-	movs r0, 0x8E
-	lsls r0, 2
-	adds r4, r0
-	ldr r0, [r6]
-	adds r0, r4
-	movs r1, 0xC
-	mov r2, sp
-	bl SetMonData
-	adds r5, 0x1
-	cmp r5, 0x5
-	ble _08163BC4
-	ldr r0, =sub_8163A8C
-	movs r1, 0x1
-	bl CreateTask
-	movs r0, 0
-	bl PlayMapChosenOrBattleBGM
-	movs r0, 0xC
-	b _08163E10
-	.pool
-_08163C10:
-	bl ZeroEnemyPartyMons
-	movs r5, 0
-	ldr r4, =gSaveBlock2Ptr
-_08163C18:
-	movs r0, 0x64
-	muls r0, r5
-	ldr r1, =gEnemyParty
-	adds r0, r1
-	movs r1, 0x2C
-	adds r2, r5, 0
-	muls r2, r1
-	movs r1, 0xC2
-	lsls r1, 4
-	adds r2, r1
-	ldr r1, [r4]
-	adds r1, r2
-	bl sub_806819C
-	adds r5, 0x1
-	cmp r5, 0x2
-	ble _08163C18
-	ldr r1, =gBattleTypeFlags
-	ldr r0, =0x00000808
-	str r0, [r1]
-	ldr r1, =gTrainerBattleOpponent_A
-	movs r0, 0
-	strh r0, [r1]
-	ldr r0, =sub_8163A8C
-	movs r1, 0x1
-	bl CreateTask
-	movs r0, 0
-	bl PlayMapChosenOrBattleBGM
-	movs r0, 0xD
-	b _08163E10
-	.pool
-_08163C70:
-	ldr r4, =gBattleTypeFlags
-	ldr r0, =0x00010008
-	str r0, [r4]
-	ldr r0, =0x000040ce
-	bl VarGet
-	lsls r0, 16
-	lsrs r1, r0, 16
-	cmp r1, 0x1
-	bne _08163C8A
-	ldr r0, [r4]
-	orrs r0, r1
-	str r0, [r4]
-_08163C8A:
-	ldr r0, =gTrainerBattleOpponent_A
-	ldrh r1, [r0]
-	ldr r0, =0x000003fe
-	cmp r1, r0
-	bne _08163C9A
-	movs r0, 0x2
-	bl sub_8163048
-_08163C9A:
-	ldr r0, =sub_8163A8C
-	movs r1, 0x1
-	bl CreateTask
-	movs r0, 0
-	bl sub_806E694
-	movs r0, 0x3
-	b _08163E10
-	.pool
-_08163CC4:
-	ldr r4, =gBattleTypeFlags
-	ldr r0, =0x00020008
-	str r0, [r4]
-	ldr r0, =0x000040ce
-	bl VarGet
-	lsls r0, 16
-	lsrs r1, r0, 16
-	cmp r1, 0x1
-	bne _08163CDE
-	ldr r0, [r4]
-	orrs r0, r1
-	str r0, [r4]
-_08163CDE:
-	ldr r0, =gSaveBlock2Ptr
-	ldr r0, [r0]
-	ldr r2, =0x00000ca9
-	adds r0, r2
-	ldrb r1, [r0]
-	movs r0, 0x3
-	ands r0, r1
-	cmp r0, 0x2
-	beq _08163D0C
-	movs r0, 0x3
-	bl sub_8163048
-	b _08163D12
-	.pool
-_08163D0C:
-	movs r0, 0x3
-	bl sub_81630A0
-_08163D12:
-	ldr r0, =sub_8163A8C
-	movs r1, 0x1
-	bl CreateTask
-	movs r0, 0
-	bl PlayMapChosenOrBattleBGM
-	movs r0, 0x4
-	b _08163E10
-	.pool
-_08163D28:
-	ldr r1, =gBattleTypeFlags
-	ldr r0, =0x00040008
-	str r0, [r1]
-	ldr r0, =gSaveBlock2Ptr
-	ldr r0, [r0]
-	ldr r1, =0x00000ca9
-	adds r0, r1
-	ldrb r1, [r0]
-	movs r0, 0x3
-	ands r0, r1
-	cmp r0, 0x2
-	beq _08163D58
-	movs r0, 0x3
-	bl sub_8163048
-	b _08163D5E
-	.pool
-_08163D58:
-	movs r0, 0x3
-	bl sub_81630A0
-_08163D5E:
-	ldr r0, =sub_8163A8C
-	movs r1, 0x1
-	bl CreateTask
-	movs r0, 0
-	bl PlayMapChosenOrBattleBGM
-	movs r0, 0x5
-	b _08163E10
-	.pool
-_08163D74:
-	ldr r4, =gBattleTypeFlags
-	ldr r0, =0x00080008
-	str r0, [r4]
-	ldr r0, =0x000040ce
-	bl VarGet
-	lsls r0, 16
-	lsrs r1, r0, 16
-	cmp r1, 0x1
-	bne _08163D8E
-	ldr r0, [r4]
-	orrs r0, r1
-	str r0, [r4]
-_08163D8E:
-	bl sub_8163590
-	ldr r0, =sub_8163A8C
-	movs r1, 0x1
-	bl CreateTask
-	movs r0, 0
-	bl PlayMapChosenOrBattleBGM
-	movs r0, 0x6
-	b _08163E10
-	.pool
-_08163DB4:
-	ldr r1, =gBattleTypeFlags
-	movs r0, 0x84
-	lsls r0, 1
-	str r0, [r1]
-	movs r0, 0x3
-	bl sub_8163048
-	b _08163E00
-	.pool
-_08163DC8:
-	ldr r1, =gBattleTypeFlags
-	ldr r0, =0x00200008
-	str r0, [r1]
-	movs r0, 0x3
-	bl sub_8163048
-	ldr r0, =sub_8163A8C
-	movs r1, 0x1
-	bl CreateTask
-	movs r0, 0
-	bl PlayMapChosenOrBattleBGM
-	movs r0, 0xA
-	b _08163E10
-	.pool
-_08163DF4:
-	ldr r1, =gBattleTypeFlags
-	ldr r0, =0x00008109
-	str r0, [r1]
-	movs r0, 0x1
-	bl sub_816306C
-_08163E00:
-	ldr r0, =sub_8163A8C
-	movs r1, 0x1
-	bl CreateTask
-	movs r0, 0
-	bl PlayMapChosenOrBattleBGM
-	movs r0, 0x7
-_08163E10:
-	bl sub_80B100C
-	lsls r0, 24
-	lsrs r0, 24
-	bl BattleTransition_StartOnField
-	b _08163E68
-	.pool
-_08163E2C:
-	ldr r1, =gBattleTypeFlags
-	ldr r0, =0x00408049
-	str r0, [r1]
-	ldr r5, =0x00000c03
-	adds r0, r5, 0
-	bl sub_8165404
-	ldr r4, =gApproachingTrainerId
-	movs r0, 0
-	strb r0, [r4]
-	ldr r0, =MossdeepCity_SpaceCenter_2F_EventScript_224157 + 1
-	bl BattleSetup_ConfigureTrainerBattle
-	movs r0, 0x1
-	strb r0, [r4]
-	ldr r0, =MossdeepCity_SpaceCenter_2F_EventScript_224166 + 1
-	bl BattleSetup_ConfigureTrainerBattle
-	ldr r0, =gPartnerTrainerId
-	strh r5, [r0]
-	ldr r0, =sub_8163A8C
-	movs r1, 0x1
-	bl CreateTask
-	movs r0, 0
-	bl PlayMapChosenOrBattleBGM
-	movs r0, 0x12
-	bl BattleTransition_StartOnField
-_08163E68:
-	add sp, 0x4
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8163AC4
-
-	thumb_func_start sub_8163E90
-sub_8163E90: @ 8163E90
-	push {r4-r6,lr}
-	ldr r6, =gSaveBlock2Ptr
-	ldr r0, [r6]
-	ldr r1, =0x00000ca9
-	adds r0, r1
-	ldrb r5, [r0]
-	lsls r5, 30
-	lsrs r5, 30
-	ldr r0, =0x000040ce
-	bl VarGet
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	adds r0, r5, 0
-	adds r1, r4, 0
-	bl GetCurrentBattleTowerWinStreak
-	lsls r0, 16
-	lsrs r2, r0, 16
-	ldr r0, [r6]
-	lsls r5, 1
-	lsls r4, 2
-	adds r5, r4
-	movs r1, 0xCE
-	lsls r1, 4
-	adds r0, r1
-	adds r1, r0, r5
-	ldrh r0, [r1]
-	cmp r0, r2
-	bcs _08163ED0
-	strh r2, [r1]
-_08163ED0:
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8163E90
-
-	thumb_func_start sub_8163EE4
-sub_8163EE4: @ 8163EE4
-	push {r4-r7,lr}
-	mov r7, r9
-	mov r6, r8
-	push {r6,r7}
-	ldr r4, =gSaveBlock2Ptr
-	ldr r0, [r4]
-	ldr r1, =0x0000064c
-	adds r5, r0, r1
-	adds r0, r5, 0
-	bl sub_8164FB8
-	ldr r0, [r4]
-	ldr r2, =0x00000ca9
-	adds r0, r2
-	ldrb r0, [r0]
-	lsls r0, 30
-	lsrs r6, r0, 30
-	ldr r0, =0x000040ce
-	bl VarGet
-	lsls r0, 24
-	lsrs r7, r0, 24
-	ldr r2, [r4]
-	ldrb r0, [r2, 0x8]
-	cmp r0, 0
-	beq _08163F40
-	ldr r4, =gTowerFemaleFacilityClasses
-	ldrb r0, [r2, 0xA]
-	ldrb r1, [r2, 0xB]
-	adds r0, r1
-	ldrb r1, [r2, 0xC]
-	adds r0, r1
-	ldrb r1, [r2, 0xD]
-	adds r0, r1
-	movs r1, 0x14
-	b _08163F52
-	.pool
-_08163F40:
-	ldr r4, =gTowerMaleFacilityClasses
-	ldrb r0, [r2, 0xA]
-	ldrb r1, [r2, 0xB]
-	adds r0, r1
-	ldrb r1, [r2, 0xC]
-	adds r0, r1
-	ldrb r1, [r2, 0xD]
-	adds r0, r1
-	movs r1, 0x1E
-_08163F52:
-	bl __umodsi3
-	adds r0, r4
-	ldrb r0, [r0]
-	strb r6, [r5]
-	strb r0, [r5, 0x1]
-	adds r0, r5, 0
-	adds r0, 0xC
-	ldr r4, =gSaveBlock2Ptr
-	ldr r1, [r4]
-	adds r1, 0xA
-	bl CopyUnalignedWord
-	adds r0, r5, 0x4
-	ldr r1, [r4]
-	bl StringCopy7
-	adds r0, r6, 0
-	adds r1, r7, 0
-	bl GetCurrentBattleTowerWinStreak
-	strh r0, [r5, 0x2]
-	movs r4, 0
-	movs r2, 0x10
-	adds r2, r5
-	mov r12, r2
-	movs r7, 0x1C
-	adds r7, r5
-	mov r9, r7
-	adds r6, r5, 0
-	adds r6, 0x28
-	movs r0, 0xE4
-	adds r0, r5
-	mov r8, r0
-_08163F96:
-	lsls r2, r4, 1
-	mov r1, r12
-	adds r3, r1, r2
-	ldr r0, =gSaveBlock1Ptr
-	ldr r1, [r0]
-	ldr r7, =0x00002bbc
-	adds r0, r1, r7
-	adds r0, r2
-	ldrh r0, [r0]
-	strh r0, [r3]
-	mov r0, r9
-	adds r3, r0, r2
-	adds r7, 0xC
-	adds r0, r1, r7
-	adds r0, r2
-	ldrh r0, [r0]
-	strh r0, [r3]
-	adds r3, r6, r2
-	ldr r0, =0x00002bd4
-	adds r1, r0
-	adds r1, r2
-	ldrh r0, [r1]
-	strh r0, [r3]
-	adds r4, 0x1
-	cmp r4, 0x5
-	ble _08163F96
-	movs r4, 0
-_08163FCC:
-	ldr r6, =gSaveBlock2Ptr
-	ldr r0, [r6]
-	lsls r1, r4, 1
-	ldr r2, =0x00000caa
-	adds r0, r2
-	adds r1, r0, r1
-	ldrh r0, [r1]
-	cmp r0, 0
-	beq _08163FF4
-	adds r1, r0, 0
-	movs r0, 0x64
-	muls r0, r1
-	ldr r1, =gPlayerParty - 100
-	adds r0, r1
-	movs r1, 0x2C
-	muls r1, r4
-	adds r1, 0x34
-	adds r1, r5, r1
-	bl sub_80686FC
-_08163FF4:
-	adds r4, 0x1
-	cmp r4, 0x3
-	ble _08163FCC
-	ldr r0, =gGameLanguage
-	ldrb r0, [r0]
-	mov r7, r8
-	strb r0, [r7]
-	ldr r0, [r6]
-	ldr r1, =0x0000064c
-	adds r0, r1
-	bl CalcEmeraldBattleTowerChecksum
-	bl sub_8163E90
-	pop {r3,r4}
-	mov r8, r3
-	mov r9, r4
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8163EE4
-
-	thumb_func_start sub_8164040
-sub_8164040: @ 8164040
-	push {r4,r5,lr}
-	ldr r5, =gSaveBlock2Ptr
-	ldr r0, [r5]
-	ldr r1, =0x00000ca9
-	adds r0, r1
-	ldrb r4, [r0]
-	lsls r4, 30
-	lsrs r4, 30
-	ldr r0, =0x000040ce
-	bl VarGet
-	lsls r0, 16
-	ldr r5, [r5]
-	lsls r4, 1
-	lsrs r0, 14
-	adds r4, r0
-	movs r2, 0xCE
-	lsls r2, 4
-	adds r0, r5, r2
-	adds r0, r4
-	ldrh r0, [r0]
-	movs r1, 0x7
-	bl __udivsi3
-	lsls r0, 16
-	lsrs r1, r0, 16
-	ldr r0, =gSpecialVar_0x8005
-	ldrh r0, [r0]
-	cmp r0, 0
-	bne _0816408E
-	cmp r1, 0x1
-	bgt _0816408A
-	ldr r1, =0x00000cb2
-	adds r0, r5, r1
-	ldrh r0, [r0]
-	cmp r0, 0
-	beq _0816408E
-_0816408A:
-	bl sub_8163EE4
-_0816408E:
-	ldr r4, =gSaveBlock2Ptr
-	ldr r0, [r4]
-	ldr r1, =gSpecialVar_0x8005
-	ldrh r1, [r1]
-	ldr r2, =0x00000ca8
-	adds r0, r2
-	strb r1, [r0]
-	movs r0, 0x80
-	lsls r0, 7
-	movs r1, 0
-	bl VarSet
-	ldr r1, [r4]
-	ldr r0, =0x00000ca9
-	adds r1, r0
-	ldrb r0, [r1]
-	movs r2, 0x4
-	orrs r0, r2
-	strb r0, [r1]
-	bl sub_81A4C30
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8164040
-
-	thumb_func_start nullsub_61
-nullsub_61: @ 81640D8
-	bx lr
-	thumb_func_end nullsub_61
-
-	thumb_func_start nullsub_116
-nullsub_116: @ 81640DC
-	bx lr
-	thumb_func_end nullsub_116
-
-	thumb_func_start sub_81640E0
-sub_81640E0: @ 81640E0
-	push {r4-r7,lr}
-	sub sp, 0xC
-	adds r5, r0, 0
-	lsls r5, 16
-	lsrs r5, 16
-	ldr r4, =gPlayerParty
-	adds r0, r4, 0
-	movs r1, 0xB
-	movs r2, 0
-	bl GetMonData
-	lsls r0, 16
-	lsrs r7, r0, 16
-	adds r4, 0x64
-	adds r0, r4, 0
-	movs r1, 0xB
-	movs r2, 0
-	bl GetMonData
-	lsls r0, 16
-	lsrs r4, r0, 16
-	movs r6, 0
-	movs r2, 0
-	ldr r0, =gSaveBlock2Ptr
-	ldr r1, [r0]
-	ldr r0, =0xfffffe70
-	adds r5, r0
-	lsls r0, r5, 4
-	adds r0, r5
-	lsls r0, 2
-	adds r1, 0xE0
-	adds r0, r1
-	mov r3, sp
-_08164122:
-	ldrh r1, [r0]
-	cmp r1, r7
-	beq _08164130
-	cmp r1, r4
-	beq _08164130
-	stm r3!, {r2}
-	adds r6, 0x1
-_08164130:
-	adds r0, 0xC
-	adds r2, 0x1
-	cmp r2, 0x2
-	ble _08164122
-	bl Random
-	ldr r4, =gUnknown_03006298
-	lsls r0, 16
-	lsrs r0, 16
-	adds r1, r6, 0
-	bl __modsi3
-	lsls r0, 2
-	add r0, sp
-	ldr r0, [r0]
-	strh r0, [r4]
-_08164150:
-	bl Random
-	lsls r0, 16
-	lsrs r0, 16
-	adds r1, r6, 0
-	bl __modsi3
-	lsls r0, 2
-	add r0, sp
-	ldr r0, [r0]
-	strh r0, [r4, 0x2]
-	ldrh r1, [r4]
-	lsls r0, 16
-	lsrs r0, 16
-	cmp r1, r0
-	beq _08164150
-	add sp, 0xC
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_81640E0
-
-	thumb_func_start sub_8164188
-sub_8164188: @ 8164188
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0x1C
-	adds r5, r0, 0
-	lsls r5, 16
-	lsrs r5, 16
-	ldr r6, =gSaveBlock2Ptr
-	ldr r0, [r6]
-	ldr r1, =0x00000ca9
-	adds r0, r1
-	ldrb r0, [r0]
-	lsls r0, 30
-	lsrs r0, 30
-	str r0, [sp, 0xC]
-	ldr r4, =gPlayerParty
-	adds r0, r4, 0
-	movs r1, 0xB
-	movs r2, 0
-	bl GetMonData
-	lsls r0, 16
-	lsrs r0, 16
-	str r0, [sp, 0x10]
-	adds r4, 0x64
-	adds r0, r4, 0
-	movs r1, 0xB
-	movs r2, 0
-	bl GetMonData
-	lsls r0, 16
-	lsrs r0, 16
-	str r0, [sp, 0x14]
-	movs r3, 0
-	mov r8, r3
-	movs r7, 0
-	adds r2, r6, 0
-	ldr r0, =0xfffffed4
-	adds r5, r0
-	ldr r6, =0x0000076c
-	mov r10, sp
-	movs r0, 0xEC
-	adds r1, r5, 0
-	muls r1, r0
-	mov r9, r1
-_081641E6:
-	ldr r1, [r2]
-	movs r0, 0x2C
-	muls r0, r7
-	mov r3, r9
-	adds r5, r0, r3
-	adds r1, r5
-	adds r0, r1, r6
-	ldrh r0, [r0]
-	ldr r3, [sp, 0x10]
-	cmp r0, r3
-	beq _0816423A
-	ldr r3, [sp, 0x14]
-	cmp r0, r3
-	beq _0816423A
-	movs r0, 0xEF
-	lsls r0, 3
-	adds r4, r1, r0
-	ldr r1, [sp, 0xC]
-	lsls r0, r1, 24
-	lsrs r0, 24
-	str r2, [sp, 0x18]
-	bl GetFrontierEnemyMonLevel
-	ldrb r1, [r4]
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r2, [sp, 0x18]
-	cmp r1, r0
-	bhi _0816423A
-	ldr r0, [r2]
-	adds r0, r5
-	adds r0, r6
-	ldrh r0, [r0]
-	cmp r0, 0
-	beq _0816423A
-	mov r3, r10
-	adds r3, 0x4
-	mov r10, r3
-	subs r3, 0x4
-	stm r3!, {r7}
-	movs r0, 0x1
-	add r8, r0
-_0816423A:
-	adds r7, 0x1
-	cmp r7, 0x3
-	ble _081641E6
-	bl Random
-	ldr r4, =gUnknown_03006298
-	lsls r0, 16
-	lsrs r0, 16
-	mov r1, r8
-	bl __modsi3
-	lsls r0, 2
-	add r0, sp
-	ldr r0, [r0]
-	strh r0, [r4, 0x4]
-_08164258:
-	bl Random
-	lsls r0, 16
-	lsrs r0, 16
-	mov r1, r8
-	bl __modsi3
-	lsls r0, 2
-	add r0, sp
-	ldr r0, [r0]
-	strh r0, [r4, 0x6]
-	ldrh r1, [r4, 0x4]
-	lsls r0, 16
-	lsrs r0, 16
-	cmp r1, r0
-	beq _08164258
-	add sp, 0x1C
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8164188
-
-	thumb_func_start sub_81642A0
-sub_81642A0: @ 81642A0
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0x4C
-	ldr r0, =gSaveBlock1Ptr
-	ldr r0, [r0]
-	movs r1, 0xC7
-	lsls r1, 4
-	adds r1, r0, r1
-	str r1, [sp, 0x24]
-	ldr r5, =gSaveBlock2Ptr
-	ldr r0, [r5]
-	ldr r2, =0x00000ca9
-	adds r0, r2
-	ldrb r0, [r0]
-	lsls r0, 30
-	lsrs r0, 30
-	str r0, [sp, 0x14]
-	ldr r0, =0x000040ce
-	bl VarGet
-	lsls r0, 16
-	ldr r1, [r5]
-	ldr r3, [sp, 0x14]
-	lsls r2, r3, 1
-	lsrs r0, 14
-	adds r2, r0
-	movs r4, 0xCE
-	lsls r4, 4
-	adds r1, r4
-	adds r1, r2
-	ldrh r0, [r1]
-	movs r1, 0x7
-	bl __udivsi3
-	lsls r0, 16
-	lsrs r0, 16
-	str r0, [sp, 0x18]
-	ldr r4, =gPlayerParty
-	adds r0, r4, 0
-	movs r1, 0xB
-	movs r2, 0
-	bl GetMonData
-	str r0, [sp, 0x1C]
-	adds r4, 0x64
-	adds r0, r4, 0
-	movs r1, 0xB
-	movs r2, 0
-	bl GetMonData
-	str r0, [sp, 0x20]
-	bl GetFacilityEnemyMonLevel
-	movs r7, 0
-	ldr r0, [sp, 0x18]
-	lsls r0, 24
-	mov r10, r0
-_08164318:
-	lsls r6, r7, 1
-_0816431A:
-	mov r1, r10
-	lsrs r0, r1, 24
-	movs r1, 0
-	bl sub_8162548
-	lsls r0, 16
-	lsrs r0, 16
-	mov r8, r0
-	movs r2, 0
-	mov r9, r2
-	cmp r9, r7
-	bge _08164368
-	ldr r0, [r5]
-	ldr r3, =0x00000cb4
-	adds r1, r0, r3
-	ldrh r0, [r1]
-	cmp r0, r8
-	beq _08164368
-	ldr r0, =gFacilityTrainers
-	ldr r2, [r0]
-	movs r4, 0x34
-	mov r0, r8
-	muls r0, r4
-	adds r0, r2
-	ldrb r3, [r0]
-_0816434C:
-	ldrh r0, [r1]
-	muls r0, r4
-	adds r0, r2
-	ldrb r0, [r0]
-	cmp r0, r3
-	beq _08164368
-	adds r1, 0x2
-	movs r0, 0x1
-	add r9, r0
-	cmp r9, r7
-	bge _08164368
-	ldrh r0, [r1]
-	cmp r0, r8
-	bne _0816434C
-_08164368:
-	cmp r9, r7
-	bne _0816431A
-	ldr r0, [r5]
-	ldr r1, =0x00000cb4
-	adds r0, r1
-	adds r0, r6
-	mov r2, r8
-	strh r2, [r0]
-	mov r7, r9
-	adds r7, 0x1
-	cmp r7, 0x5
-	ble _08164318
-	movs r3, 0x8
-	mov r10, r3
-	movs r4, 0
-	mov r9, r4
-	ldr r0, [sp, 0x24]
-	str r0, [sp, 0x40]
-_0816438C:
-	ldr r1, =gSaveBlock2Ptr
-	ldr r0, [r1]
-	mov r2, r9
-	lsls r1, r2, 1
-	ldr r3, =0x00000cb4
-	adds r0, r3
-	adds r0, r1
-	ldrh r0, [r0]
-	mov r8, r0
-	bl GetBattleFacilityTrainerGfxId
-	ldr r4, [sp, 0x40]
-	strb r0, [r4, 0x19]
-	movs r7, 0
-_081643A8:
-	adds r0, r7, 0x1
-	str r0, [sp, 0x30]
-	mov r1, r10
-	lsls r1, 1
-	str r1, [sp, 0x38]
-	mov r2, r10
-	adds r2, 0x1
-	str r2, [sp, 0x34]
-	mov r0, r10
-	subs r0, 0x1
-	lsls r0, 1
-	str r0, [sp, 0x28]
-_081643C0:
-	mov r0, r8
-	bl RandomizeFacilityTrainerMonId
-	lsls r0, 16
-	lsrs r6, r0, 16
-	movs r0, 0x1
-	ands r0, r7
-	cmp r0, 0
-	beq _081643F4
-	ldr r3, =gSaveBlock2Ptr
-	ldr r0, [r3]
-	ldr r4, =0x00000cb4
-	adds r0, r4
-	ldr r1, [sp, 0x28]
-	adds r0, r1
-	ldrh r2, [r0]
-	ldr r0, =gFacilityTrainerMons
-	ldr r0, [r0]
-	lsls r2, 4
-	adds r2, r0
-	lsls r1, r6, 4
-	adds r1, r0
-	ldrb r0, [r2, 0xA]
-	ldrb r1, [r1, 0xA]
-	cmp r0, r1
-	beq _081643C0
-_081643F4:
-	movs r5, 0x8
-	cmp r5, r10
-	bge _08164430
-	ldr r2, =gSaveBlock2Ptr
-	ldr r0, [r2]
-	ldr r1, =gFacilityTrainerMons
-	ldr r3, [r1]
-	lsls r1, r6, 4
-	adds r1, r3
-	ldr r4, =0x00000cc4
-	adds r2, r0, r4
-	ldrh r0, [r1]
-	mov r12, r0
-_0816440E:
-	ldrh r0, [r2]
-	lsls r0, 4
-	adds r0, r3
-	ldrh r0, [r0]
-	cmp r0, r12
-	beq _08164430
-	ldrh r0, [r1]
-	ldr r4, [sp, 0x1C]
-	cmp r4, r0
-	beq _08164430
-	ldr r4, [sp, 0x20]
-	cmp r4, r0
-	beq _08164430
-	adds r2, 0x2
-	adds r5, 0x1
-	cmp r5, r10
-	blt _0816440E
-_08164430:
-	cmp r5, r10
-	bne _081643C0
-	ldr r1, =gSaveBlock2Ptr
-	ldr r0, [r1]
-	ldr r2, =0x00000cb4
-	adds r0, r2
-	ldr r3, [sp, 0x38]
-	adds r0, r3
-	strh r6, [r0]
-	ldr r4, [sp, 0x34]
-	mov r10, r4
-	ldr r7, [sp, 0x30]
-	cmp r7, 0x1
-	ble _081643A8
-	ldr r0, [sp, 0x40]
-	adds r0, 0x18
-	str r0, [sp, 0x40]
-	movs r1, 0x1
-	add r9, r1
-	mov r2, r9
-	cmp r2, 0x5
-	ble _0816438C
-	movs r3, 0
-	mov r10, r3
-	bl sub_8165B20
-	movs r4, 0
-	mov r9, r4
-	ldr r0, =gSaveBlock2Ptr
-	ldr r0, [r0]
-	movs r2, 0
-	adds r6, r0, 0
-	adds r6, 0xDC
-	mov r8, sp
-_08164474:
-	ldrb r0, [r6]
-	lsls r4, r0, 25
-	lsrs r0, r4, 30
-	cmp r0, 0
-	beq _081644E0
-	ldr r1, =gUnknown_085DF9EC
-	ldrb r0, [r6, 0x1]
-	adds r0, r1
-	ldrb r0, [r0]
-	movs r1, 0x7
-	str r2, [sp, 0x44]
-	bl __udivsi3
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r2, [sp, 0x44]
-	ldr r1, [sp, 0x18]
-	cmp r0, r1
-	bgt _081644E0
-	lsrs r0, r4, 30
-	subs r0, 0x1
-	ldr r3, [sp, 0x14]
-	cmp r0, r3
-	bne _081644E0
-	movs r5, 0
-	ldr r0, =gSaveBlock2Ptr
-	ldr r0, [r0]
-	adds r0, 0xE0
-	adds r1, r2, r0
-	movs r7, 0x2
-_081644B0:
-	ldrh r0, [r1]
-	ldr r4, [sp, 0x1C]
-	cmp r4, r0
-	beq _081644C0
-	ldr r3, [sp, 0x20]
-	cmp r3, r0
-	beq _081644C0
-	adds r5, 0x1
-_081644C0:
-	adds r1, 0xC
-	subs r7, 0x1
-	cmp r7, 0
-	bge _081644B0
-	cmp r5, 0x2
-	ble _081644E0
-	movs r0, 0xC8
-	lsls r0, 1
-	add r0, r9
-	mov r4, r8
-	adds r4, 0x4
-	mov r8, r4
-	subs r4, 0x4
-	stm r4!, {r0}
-	movs r0, 0x1
-	add r10, r0
-_081644E0:
-	adds r2, 0x44
-	adds r6, 0x44
-	movs r1, 0x1
-	add r9, r1
-	mov r3, r9
-	cmp r3, 0x3
-	ble _08164474
-	mov r4, r10
-	cmp r4, 0
-	beq _08164532
-	bl Random
-	ldr r6, =gSaveBlock2Ptr
-	ldr r4, [r6]
-	lsls r0, 16
-	lsrs r0, 16
-	mov r1, r10
-	bl __modsi3
-	lsls r0, 2
-	add r0, sp
-	ldr r0, [r0]
-	movs r5, 0xCC
-	lsls r5, 4
-	adds r4, r5
-	strh r0, [r4]
-	ldrh r0, [r4]
-	bl GetBattleFacilityTrainerGfxId
-	ldr r1, [sp, 0x24]
-	adds r1, 0xA8
-	strb r0, [r1, 0x1]
-	movs r0, 0xD8
-	lsls r0, 2
-	bl FlagClear
-	ldr r0, [r6]
-	adds r0, r5
-	ldrh r0, [r0]
-	bl sub_81640E0
-_08164532:
-	movs r0, 0
-	mov r10, r0
-	mov r9, r0
-	mov r1, sp
-	str r1, [sp, 0x3C]
-_0816453C:
-	ldr r0, =gSaveBlock2Ptr
-	movs r2, 0xEC
-	mov r1, r9
-	muls r1, r2
-	movs r3, 0xE7
-	lsls r3, 3
-	adds r1, r3
-	ldr r0, [r0]
-	movs r2, 0
-	movs r3, 0
-	movs r7, 0
-	mov r4, r9
-	adds r4, 0x1
-	str r4, [sp, 0x2C]
-	adds r1, r0, r1
-_0816455A:
-	ldm r1!, {r0}
-	orrs r2, r0
-	adds r3, r0
-	adds r7, 0x1
-	cmp r7, 0x39
-	bls _0816455A
-	ldr r0, =gSaveBlock2Ptr
-	ldr r5, [r0]
-	movs r1, 0xEC
-	mov r6, r9
-	muls r6, r1
-	adds r4, r5, r6
-	ldr r1, =0x0000073a
-	adds r0, r4, r1
-	ldrh r0, [r0]
-	movs r1, 0x7
-	str r2, [sp, 0x44]
-	str r3, [sp, 0x48]
-	bl __udivsi3
-	lsls r0, 16
-	lsrs r0, 16
-	ldr r2, [sp, 0x44]
-	ldr r3, [sp, 0x48]
-	ldr r1, [sp, 0x18]
-	cmp r0, r1
-	bgt _08164656
-	movs r1, 0xE7
-	lsls r1, 3
-	adds r0, r4, r1
-	ldrb r0, [r0]
-	ldr r4, [sp, 0x14]
-	cmp r0, r4
-	bne _08164656
-	cmp r2, 0
-	beq _08164656
-	adds r1, 0xE8
-	adds r0, r5, r1
-	adds r0, r6
-	ldr r0, [r0]
-	cmp r0, r3
-	bne _08164656
-	movs r5, 0
-	movs r7, 0
-	ldr r2, =gSaveBlock2Ptr
-	mov r8, r2
-	ldr r3, =0x0000076c
-_081645B8:
-	mov r4, r8
-	ldr r2, [r4]
-	movs r0, 0x2C
-	adds r1, r7, 0
-	muls r1, r0
-	movs r4, 0xEC
-	mov r0, r9
-	muls r0, r4
-	adds r6, r1, r0
-	adds r2, r6
-	adds r0, r2, r3
-	ldrh r0, [r0]
-	ldr r1, [sp, 0x1C]
-	cmp r1, r0
-	beq _0816463C
-	ldr r4, [sp, 0x20]
-	cmp r4, r0
-	beq _0816463C
-	movs r0, 0xEF
-	lsls r0, 3
-	adds r4, r2, r0
-	ldr r1, [sp, 0x14]
-	lsls r0, r1, 24
-	lsrs r0, 24
-	str r3, [sp, 0x48]
-	bl GetFrontierEnemyMonLevel
-	ldrb r1, [r4]
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r3, [sp, 0x48]
-	cmp r1, r0
-	bhi _0816463C
-	mov r2, r8
-	ldr r0, [r2]
-	adds r0, r6
-	adds r0, r3
-	ldrh r0, [r0]
-	cmp r0, 0
-	b _08164638
-	.pool
-_08164638:
-	beq _0816463C
-	adds r5, 0x1
-_0816463C:
-	adds r7, 0x1
-	cmp r7, 0x3
-	ble _081645B8
-	cmp r5, 0x1
-	ble _08164656
-	movs r0, 0x96
-	lsls r0, 1
-	add r0, r9
-	ldr r3, [sp, 0x3C]
-	stm r3!, {r0}
-	str r3, [sp, 0x3C]
-	movs r4, 0x1
-	add r10, r4
-_08164656:
-	ldr r0, [sp, 0x2C]
-	mov r9, r0
-	cmp r0, 0x4
-	bgt _08164660
-	b _0816453C
-_08164660:
-	mov r1, r10
-	cmp r1, 0
-	beq _081646A0
-	bl Random
-	ldr r6, =gSaveBlock2Ptr
-	ldr r4, [r6]
-	lsls r0, 16
-	lsrs r0, 16
-	mov r1, r10
-	bl __modsi3
-	lsls r0, 2
-	add r0, sp
-	ldr r0, [r0]
-	ldr r5, =0x00000cc2
-	adds r4, r5
-	strh r0, [r4]
-	ldrh r0, [r4]
-	bl GetBattleFacilityTrainerGfxId
-	ldr r1, [sp, 0x24]
-	adds r1, 0xC0
-	strb r0, [r1, 0x1]
-	ldr r0, =0x00000361
-	bl FlagClear
-	ldr r0, [r6]
-	adds r0, r5
-	ldrh r0, [r0]
-	bl sub_8164188
-_081646A0:
-	add sp, 0x4C
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_81642A0
-
 	thumb_func_start sub_81646BC
 sub_81646BC: @ 81646BC
 	push {r4-r7,lr}
@@ -2979,7 +1459,7 @@ sub_8165360: @ 8165360
 	ldr r0, [r0]
 	ldr r1, =0x00000bfc
 	adds r0, r1
-	bl ConvertBattleFrontierTrainerSpeechToString
+	bl FrontierSpeechToString
 	pop {r0}
 	bx r0
 	.pool
@@ -3004,7 +1484,7 @@ _08165398:
 	ldr r0, [r0]
 	ldr r1, =0x00000c14
 	adds r0, r1
-	bl ConvertBattleFrontierTrainerSpeechToString
+	bl FrontierSpeechToString
 	b _081653C0
 	.pool
 _081653B4:
@@ -3012,7 +1492,7 @@ _081653B4:
 	ldr r0, [r0]
 	ldr r1, =0x00000c08
 	adds r0, r1
-	bl ConvertBattleFrontierTrainerSpeechToString
+	bl FrontierSpeechToString
 _081653C0:
 	pop {r0}
 	bx r0
diff --git a/asm/pokenav.s b/asm/pokenav.s
index a8d3c838f..b3a174bdc 100644
--- a/asm/pokenav.s
+++ b/asm/pokenav.s
@@ -28371,7 +28371,7 @@ _081D5764:
 	adds r1, 0x4
 	adds r0, r1
 	adds r0, 0x10
-	bl ConvertBattleFrontierTrainerSpeechToString
+	bl FrontierSpeechToString
 	b _081D580E
 	.pool
 _081D5790:
@@ -28392,7 +28392,7 @@ _081D5790:
 	adds r1, 0x4
 	adds r0, r1
 	adds r0, 0x1C
-	bl ConvertBattleFrontierTrainerSpeechToString
+	bl FrontierSpeechToString
 	b _081D580E
 	.pool
 _081D57BC:
@@ -28413,7 +28413,7 @@ _081D57BC:
 	adds r1, 0x4
 	adds r0, r1
 	adds r0, 0x28
-	bl ConvertBattleFrontierTrainerSpeechToString
+	bl FrontierSpeechToString
 	b _081D580E
 	.pool
 _081D57E8:
@@ -28434,7 +28434,7 @@ _081D57E8:
 	adds r1, 0x4
 	adds r0, r1
 	adds r0, 0x34
-	bl ConvertBattleFrontierTrainerSpeechToString
+	bl FrontierSpeechToString
 _081D580E:
 	bl sub_81D5710
 	pop {r4-r6}