Merge branch 'master' into shop

asm/battle_frontier_2.s

@@ -4152,7 +4152,7 @@ _081A1AEA:
 	cmp r3, r0
 	blt _081A1AEA
 _081A1B00:
-	bl sub_80F94E8
+	bl ReducePlayerPartyToThree
 	pop {r4-r7}
 	pop {r0}
 	bx r0
@@ -17008,7 +17008,7 @@ _081A87EC:
 	ldrh r1, [r0]
 	movs r0, 0x64
 	muls r0, r1
-	ldr r1, =gBattleScripting + 0x14
+	ldr r1, =gPlayerParty - 100
 	adds r0, r1
 	ldr r1, =0x00000e12
 	adds r3, r1

asm/battle_tower.s

@@ -3475,7 +3475,7 @@ _08163FCC:
 	adds r1, r0, 0
 	movs r0, 0x64
 	muls r0, r1
-	ldr r1, =gBattleScripting + 0x14
+	ldr r1, =gPlayerParty - 100
 	adds r0, r1
 	movs r1, 0x2C
 	muls r1, r4

asm/script_pokemon_util_80F87D8.s

@@ -1606,8 +1606,8 @@ _080F94D6:
 	.pool
 	thumb_func_end sub_80F94B8
 
-	thumb_func_start sub_80F94E8
-sub_80F94E8: @ 80F94E8
+	thumb_func_start ReducePlayerPartyToThree
+ReducePlayerPartyToThree: @ 80F94E8
 	push {r4-r7,lr}
 	sub sp, 0x198
 	add r0, sp, 0x190
@@ -1662,6 +1662,6 @@ _080F9538:
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end sub_80F94E8
+	thumb_func_end ReducePlayerPartyToThree
 
 	.align 2, 0 @ Don't pad with nop.

asm/trainer_card.s

@@ -1141,8 +1141,8 @@ _080C308C:
 	.pool
 	thumb_func_end sub_80C3020
 
-	thumb_func_start sub_80C30A4
-sub_80C30A4: @ 80C30A4
+	thumb_func_start TrainerCard_GenerateCardForPlayer
+TrainerCard_GenerateCardForPlayer: @ 80C30A4
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0
@@ -1197,7 +1197,7 @@ _080C3108:
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end sub_80C30A4
+	thumb_func_end TrainerCard_GenerateCardForPlayer
 
 	thumb_func_start sub_80C3120
 sub_80C3120: @ 80C3120
@@ -4558,8 +4558,8 @@ _080C4E44:
 	.pool
 	thumb_func_end sub_80C4DDC
 
-	thumb_func_start sub_80C4E74
-sub_80C4E74: @ 80C4E74
+	thumb_func_start TrainerCard_ShowLinkCard
+TrainerCard_ShowLinkCard: @ 80C4E74
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	adds r6, r1, 0
@@ -4600,7 +4600,7 @@ sub_80C4E74: @ 80C4E74
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end sub_80C4E74
+	thumb_func_end TrainerCard_ShowLinkCard
 
 	thumb_func_start sub_80C4EE4
 sub_80C4EE4: @ 80C4EE4