1 files changed, 14 insertions, 14 deletions
diff --git a/asm/battle_ai_switch_items.s b/asm/battle_ai_switch_items.s
index bdc1283db..58acf73c2 100644
--- a/asm/battle_ai_switch_items.s
+++ b/asm/battle_ai_switch_items.s
@@ -40,7 +40,7 @@ ShouldSwitchIfPerishSong: @ 8039188
 	movs r0, 0x1
 	movs r1, 0x2
 	movs r2, 0
-	bl EmitTwoReturnValues
+	bl BtlController_EmitTwoReturnValues
 	movs r0, 0x1
 	b _080391E6
 	.align 2, 0
@@ -84,7 +84,7 @@ _08039208:
 	movs r0, 0x1
 	movs r1, 0x2
 	movs r2, 0
-	bl EmitTwoReturnValues
+	bl BtlController_EmitTwoReturnValues
 	movs r0, 0x1
 	b _0803935E
 	.align 2, 0
@@ -407,7 +407,7 @@ _080394A0:
 	movs r0, 0x1
 	movs r1, 0x2
 	movs r2, 0
-	bl EmitTwoReturnValues
+	bl BtlController_EmitTwoReturnValues
 	movs r0, 0x1
 	b _0803958A
 	.align 2, 0
@@ -628,7 +628,7 @@ _08039668:
 	movs r0, 0x1
 	movs r1, 0x2
 	movs r2, 0
-	bl EmitTwoReturnValues
+	bl BtlController_EmitTwoReturnValues
 _08039686:
 	movs r0, 0x1
 _08039688:
@@ -951,7 +951,7 @@ _080398EC:
 	movs r0, 0x1
 	movs r1, 0x2
 	movs r2, 0
-	bl EmitTwoReturnValues
+	bl BtlController_EmitTwoReturnValues
 	movs r0, 0x1
 	b _08039A56
 	.align 2, 0
@@ -1379,8 +1379,8 @@ _08039C76:
 	bx r1
 	thumb_func_end sub_8039A80
 
-	thumb_func_start sub_8039C84
-sub_8039C84: @ 8039C84
+	thumb_func_start AI_TrySwitchOrUseItem
+AI_TrySwitchOrUseItem: @ 8039C84
 	push {r4-r6,lr}
 	ldr r5, _08039CDC @ =gBattleTypeFlags
 	ldr r0, [r5]
@@ -1406,7 +1406,7 @@ _08039C94:
 	ldrb r0, [r0]
 	cmp r0, 0x6
 	bne _08039D5A
-	bl sub_8039E3C
+	bl GetMostSuitableMonToSwitchInto
 	lsls r0, 24
 	lsrs r4, r0, 24
 	cmp r4, 0x6
@@ -1518,14 +1518,14 @@ _08039D96:
 	lsls r2, 8
 	movs r0, 0x1
 	movs r1, 0
-	bl EmitTwoReturnValues
+	bl BtlController_EmitTwoReturnValues
 _08039DA8:
 	pop {r4-r6}
 	pop {r0}
 	bx r0
 	.align 2, 0
 _08039DB0: .4byte gActiveBattler
-	thumb_func_end sub_8039C84
+	thumb_func_end AI_TrySwitchOrUseItem
 
 	thumb_func_start sub_8039DB4
 sub_8039DB4: @ 8039DB4
@@ -1600,8 +1600,8 @@ _08039E26:
 _08039E38: .4byte gUnknown_824F050
 	thumb_func_end sub_8039DB4
 
-	thumb_func_start sub_8039E3C
-sub_8039E3C: @ 8039E3C
+	thumb_func_start GetMostSuitableMonToSwitchInto
+GetMostSuitableMonToSwitchInto: @ 8039E3C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -2015,7 +2015,7 @@ _0803A188: .4byte gBattlerPartyIndexes
 _0803A18C: .4byte gBattleMoveDamage
 _0803A190: .4byte gActiveBattler
 _0803A194: .4byte gBattleMoves
-	thumb_func_end sub_8039E3C
+	thumb_func_end GetMostSuitableMonToSwitchInto
 
 	thumb_func_start sub_803A198
 sub_803A198: @ 803A198
@@ -2604,7 +2604,7 @@ _0803A5FC:
 	movs r0, 0x1
 	movs r1, 0x1
 	movs r2, 0
-	bl EmitTwoReturnValues
+	bl BtlController_EmitTwoReturnValues
 	ldr r0, _0803A630 @ =gActiveBattler
 	ldrb r0, [r0]
 	lsrs r0, 1