Merge branch 'master' into decompile_battle_frontier_1

asm/battle_frontier_2.s

@@ -1244,7 +1244,7 @@ _0819AF1A:
 	movs r0, 0x1
 	adds r2, r6, 0
 	movs r3, 0x5
-	bl sub_81BF8EC
+	bl ShowPokemonSummaryScreen
 _0819AF50:
 	add sp, 0x4
 	pop {r4-r6}
@@ -4373,7 +4373,7 @@ _0819C9C4:
 	str r0, [sp]
 	movs r0, 0
 	movs r3, 0x2
-	bl sub_81BF8EC
+	bl ShowPokemonSummaryScreen
 _0819C9F0:
 	add sp, 0x4
 	pop {r4-r6}

asm/contest.s

@@ -43,7 +43,7 @@ sub_80DB8B8: @ 80DB8B8
 	lsrs r4, r0, 24
 	adds r5, r4, 0
 	adds r0, r4, 0
-	bl sub_80DBCA8
+	bl Contest_IsMonsTurnDisabled
 	lsls r0, 24
 	cmp r0, 0
 	beq _080DB8D0
@@ -55,8 +55,8 @@ _080DB8D0:
 	cmp r4, r0
 	beq _080DB8F4
 	adds r0, r4, 0
-	bl sub_81562C4
-	bl sub_8156324
+	bl ContestAI_ResetAI
+	bl ContestAI_GetActionToUse
 	lsls r0, 24
 	ldr r2, =gContestMons
 	lsrs r0, 23
@@ -533,7 +533,7 @@ _080DBC3C:
 	ldr r0, [r3, 0x4]
 	adds r0, r4, r0
 	ldrh r0, [r0, 0x6]
-	bl sub_80DD9F0
+	bl Contest_GetMoveExcitement
 	ldr r1, [r5]
 	ldr r2, [r1]
 	ldrb r1, [r2, 0x1]
@@ -568,8 +568,8 @@ _080DBC3C:
 	.pool
 	thumb_func_end sub_80DBAA0
 
-	thumb_func_start sub_80DBCA8
-sub_80DBCA8: @ 80DBCA8
+	thumb_func_start Contest_IsMonsTurnDisabled
+Contest_IsMonsTurnDisabled: @ 80DBCA8
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -599,7 +599,7 @@ _080DBCD8:
 _080DBCDA:
 	pop {r1}
 	bx r1
-	thumb_func_end sub_80DBCA8
+	thumb_func_end Contest_IsMonsTurnDisabled
 
 	thumb_func_start sub_80DBCE0
 sub_80DBCE0: @ 80DBCE0
@@ -3233,7 +3233,7 @@ _080DD166:
 	ands r0, r2
 	strb r0, [r1, 0x15]
 _080DD1B4:
-	ldr r0, =gContestEffectFunctionTable
+	ldr r0, =gContestEffectFuncs
 	add r0, r9
 	ldr r0, [r0]
 	bl _call_via_r0
@@ -3425,7 +3425,7 @@ _080DD334:
 	ldr r0, [r0, 0x4]
 	adds r0, r4, r0
 	ldrh r0, [r0, 0x6]
-	bl sub_80DD9F0
+	bl Contest_GetMoveExcitement
 	ldr r1, [r5]
 	ldr r1, [r1, 0x10]
 	strb r0, [r1]
@@ -3506,8 +3506,8 @@ _080DD3C4:
 	.pool
 	thumb_func_end sub_80DD080
 
-	thumb_func_start sub_80DD3D4
-sub_80DD3D4: @ 80DD3D4
+	thumb_func_start SetContestantEffectStringID
+SetContestantEffectStringID: @ 80DD3D4
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r2, =gContestResources
@@ -3520,10 +3520,10 @@ sub_80DD3D4: @ 80DD3D4
 	strb r1, [r2, 0x13]
 	bx lr
 	.pool
-	thumb_func_end sub_80DD3D4
+	thumb_func_end SetContestantEffectStringID
 
-	thumb_func_start sub_80DD3F0
-sub_80DD3F0: @ 80DD3F0
+	thumb_func_start SetContestantEffectStringID2
+SetContestantEffectStringID2: @ 80DD3F0
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r2, =gContestResources
@@ -3536,10 +3536,10 @@ sub_80DD3F0: @ 80DD3F0
 	strb r1, [r2, 0x14]
 	bx lr
 	.pool
-	thumb_func_end sub_80DD3F0
+	thumb_func_end SetContestantEffectStringID2
 
-	thumb_func_start sub_80DD40C
-sub_80DD40C: @ 80DD40C
+	thumb_func_start SetStartledString
+SetStartledString: @ 80DD40C
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -3550,36 +3550,36 @@ sub_80DD40C: @ 80DD40C
 	cmp r1, 0x3B
 	bls _080DD426
 	movs r1, 0x35
-	bl sub_80DD3D4
+	bl SetContestantEffectStringID
 	b _080DD456
 _080DD426:
 	cmp r1, 0x27
 	bls _080DD432
 	movs r1, 0x34
-	bl sub_80DD3D4
+	bl SetContestantEffectStringID
 	b _080DD456
 _080DD432:
 	cmp r1, 0x1D
 	bls _080DD43E
 	movs r1, 0x33
-	bl sub_80DD3D4
+	bl SetContestantEffectStringID
 	b _080DD456
 _080DD43E:
 	cmp r1, 0x13
 	bls _080DD44A
 	movs r1, 0x32
-	bl sub_80DD3D4
+	bl SetContestantEffectStringID
 	b _080DD456
 _080DD44A:
 	cmp r2, 0x9
 	bls _080DD456
 	adds r0, r3, 0
 	movs r1, 0x31
-	bl sub_80DD3D4
+	bl SetContestantEffectStringID
 _080DD456:
 	pop {r0}
 	bx r0
-	thumb_func_end sub_80DD40C
+	thumb_func_end SetStartledString
 
 	thumb_func_start sub_80DD45C
 sub_80DD45C: @ 80DD45C
@@ -3678,8 +3678,8 @@ _080DD52C:
 	.pool
 	thumb_func_end sub_80DD45C
 
-	thumb_func_start sub_80DD560
-sub_80DD560: @ 80DD560
+	thumb_func_start MakeContestantNervous
+MakeContestantNervous: @ 80DD560
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -3703,7 +3703,7 @@ sub_80DD560: @ 80DD560
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end sub_80DD560
+	thumb_func_end MakeContestantNervous
 
 	thumb_func_start sub_80DD590
 sub_80DD590: @ 80DD590
@@ -4213,8 +4213,8 @@ _080DD9C8:
 	.pool
 	thumb_func_end sub_80DD940
 
-	thumb_func_start sub_80DD9F0
-sub_80DD9F0: @ 80DD9F0
+	thumb_func_start Contest_GetMoveExcitement
+Contest_GetMoveExcitement: @ 80DD9F0
 	lsls r0, 16
 	ldr r3, =gUnknown_085899EC
 	ldr r1, =gContestMoves
@@ -4233,7 +4233,7 @@ sub_80DD9F0: @ 80DD9F0
 	ldrsb r0, [r1, r0]
 	bx lr
 	.pool
-	thumb_func_end sub_80DD9F0
+	thumb_func_end Contest_GetMoveExcitement
 
 	thumb_func_start sub_80DDA20
 sub_80DDA20: @ 80DDA20
@@ -5136,7 +5136,7 @@ _080DE146:
 	beq _080DE1CA
 	lsls r0, r7, 24
 	lsrs r0, 24
-	bl sub_80DBCA8
+	bl Contest_IsMonsTurnDisabled
 	lsls r0, 24
 	cmp r0, 0
 	bne _080DE1CA

asm/party_menu.s

@@ -6796,7 +6796,7 @@ sub_81B3828: @ 81B3828
 	ldr r0, =sub_81B3894
 	str r0, [sp]
 	movs r0, 0x1
-	bl sub_81BF8EC
+	bl ShowPokemonSummaryScreen
 	b _081B3880
 	.pool
 _081B3868:
@@ -6810,7 +6810,7 @@ _081B3868:
 	ldr r0, =sub_81B3894
 	str r0, [sp]
 	movs r0, 0
-	bl sub_81BF8EC
+	bl ShowPokemonSummaryScreen
 _081B3880:
 	add sp, 0x4
 	pop {r4}
@@ -17663,7 +17663,7 @@ sub_81B968C: @ 81B968C
 	ldr r0, =CB2_ReturnToField
 	str r0, [sp]
 	movs r0, 0x3
-	bl sub_81BF8EC
+	bl ShowPokemonSummaryScreen
 	ldr r1, =gFieldCallback
 	ldr r0, =sub_80AF168
 	str r0, [r1]

asm/pokemon_storage_system.s

@@ -3685,7 +3685,7 @@ _080C9EB4:
 	adds r1, r4, 0
 	adds r2, r7, 0
 	adds r3, r6, 0
-	bl sub_81BFA80
+	bl ShowPokemonSummaryScreenSet40EF
 	b _080C9F56
 	.pool
 _080C9F04:
@@ -3695,7 +3695,7 @@ _080C9F04:
 	adds r1, r4, 0
 	adds r2, r7, 0
 	adds r3, r6, 0
-	bl sub_81BF8EC
+	bl ShowPokemonSummaryScreen
 	b _080C9F56
 	.pool
 _080C9F1C:

asm/trade.s

@@ -3499,7 +3499,7 @@ sub_807905C: @ 807905C
 	ldr r0, =sub_8077B74
 	str r0, [sp]
 	movs r0, 0x1
-	bl sub_81BF8EC
+	bl ShowPokemonSummaryScreen
 	b _080790C0
 	.pool
 _080790A4:
@@ -3515,7 +3515,7 @@ _080790A4:
 	ldr r0, =sub_8077B74
 	str r0, [sp]
 	movs r0, 0x1
-	bl sub_81BF8EC
+	bl ShowPokemonSummaryScreen
 _080790C0:
 	bl FreeAllWindowBuffers
 _080790C4: