Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_party_menu

asm/battle_tower.s

@@ -576,7 +576,7 @@ _0816266C:
 	b _081626BA
 	.pool
 _08162698:
-	ldr r3, =gUnknown_08610970
+	ldr r3, =gApprentices
 	ldr r0, =gSaveBlock2Ptr
 	ldr r1, [r0]
 	ldr r0, =0xfffffe70
@@ -747,7 +747,7 @@ _081627E8:
 	b _08162836
 	.pool
 _08162814:
-	ldr r3, =gUnknown_08610970
+	ldr r3, =gApprentices
 	ldr r0, =gSaveBlock2Ptr
 	ldr r1, [r0]
 	ldr r0, =0xfffffe70
@@ -1161,7 +1161,7 @@ _08162B64:
 	cmp r0, 0
 	bne _08162BB0
 	ldr r4, =gFacilityClassToPicIndex
-	ldr r3, =gUnknown_08610970
+	ldr r3, =gApprentices
 	ldr r0, =gSaveBlock2Ptr
 	ldr r1, [r0]
 	ldr r0, =0xfffffe70
@@ -1184,7 +1184,7 @@ _08162B64:
 	.pool
 _08162BB0:
 	ldr r5, =gFacilityClassToPicIndex
-	ldr r4, =gUnknown_08610970
+	ldr r4, =gApprentices
 	bl sub_81864A8
 	lsls r0, 24
 	lsrs r0, 24
@@ -1301,7 +1301,7 @@ _08162CBC:
 	cmp r0, 0
 	beq _08162CF4
 	ldr r5, =gFacilityClassToTrainerClass
-	ldr r4, =gUnknown_08610970
+	ldr r4, =gApprentices
 	bl sub_81864A8
 	lsls r0, 24
 	lsrs r0, 24
@@ -1316,7 +1316,7 @@ _08162CBC:
 	.pool
 _08162CF4:
 	ldr r4, =gFacilityClassToTrainerClass
-	ldr r3, =gUnknown_08610970
+	ldr r3, =gApprentices
 	ldr r0, =gSaveBlock2Ptr
 	ldr r1, [r0]
 	ldr r0, =0xfffffe70
@@ -1407,7 +1407,7 @@ _08162DC0:
 	ands r0, r1
 	cmp r0, 0
 	beq _08162DE8
-	ldr r4, =gUnknown_08610970
+	ldr r4, =gApprentices
 	bl sub_81864A8
 	lsls r0, 24
 	lsrs r0, 24
@@ -1417,7 +1417,7 @@ _08162DC0:
 	b _08162E08
 	.pool
 _08162DE8:
-	ldr r3, =gUnknown_08610970
+	ldr r3, =gApprentices
 	ldr r0, =gSaveBlock2Ptr
 	ldr r1, [r0]
 	ldr r0, =0xfffffe70
@@ -1578,7 +1578,7 @@ _08162F24:
 _08162F3E:
 	adds r0, r5, 0
 	adds r1, r4, 0
-	bl sub_81A1650
+	bl GetApprenticeNameInLanguage
 	adds r1, r0, 0
 	adds r0, r6, 0
 	adds r2, r4, 0
@@ -1648,7 +1648,7 @@ _08162FC0:
 	b _0816300E
 	.pool
 _08162FEC:
-	ldr r3, =gUnknown_08610970
+	ldr r3, =gApprentices
 	ldr r0, =gSaveBlock2Ptr
 	ldr r1, [r0]
 	ldr r0, =0xfffffe70
@@ -1927,7 +1927,7 @@ _08163230:
 	ldr r1, [r6]
 	adds r1, r5
 	lsrs r2, r4, 24
-	bl sub_8068528
+	bl CreateApprenticeMon
 	movs r2, 0x80
 	lsls r2, 17
 	adds r4, r2
@@ -2831,7 +2831,7 @@ _0816399C:
 	adds r0, 0x70
 	lsls r0, 24
 	lsrs r0, 24
-	bl sub_819F99C
+	bl CopyFriendsApprenticeChallengeText
 _081639A8:
 	pop {r0}
 	bx r0
@@ -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
@@ -6295,7 +6295,7 @@ _08165812:
 	adds r0, r5
 	ldrb r2, [r0]
 	adds r0, r4, 0
-	bl sub_8068528
+	bl CreateApprenticeMon
 	movs r3, 0xC8
 	lsls r3, 1
 	adds r0, r7, r3
@@ -6690,7 +6690,7 @@ _08165B10:
 	adds r1, 0x1
 	cmp r1, 0x10
 	bls _08165B10
-	bl sub_819FA5C
+	bl ResetApprenticeStruct
 	pop {r0}
 	bx r0
 	thumb_func_end sub_8165B08

asm/field_player_avatar.s

@@ -1793,7 +1793,7 @@ InitPlayerAvatar: @ 808BFE0
 	movs r1, 0x1
 	orrs r0, r1
 	strb r0, [r4, 0x2]
-	bl sub_8154228
+	bl CreateWarpArrowSprite
 	strb r0, [r4, 0x1B]
 	adds r0, r4, 0
 	mov r1, r9
@@ -2080,7 +2080,7 @@ _0808C2A2:
 	movs r1, 0
 	ldrsh r3, [r7, r1]
 	adds r1, r6, 0
-	bl sub_8154298
+	bl ShowWarpArrowSprite
 	b _0808C302
 	.pool
 _0808C2E8:
@@ -2095,7 +2095,7 @@ _0808C2E8:
 	cmp r1, 0x3
 	ble _0808C2A2
 	ldrb r0, [r5, 0x1B]
-	bl objid_set_invisible
+	bl SetSpriteInvisible
 _0808C302:
 	add sp, 0x4
 	pop {r3,r4}

asm/party_menu.s

@@ -7846,7 +7846,7 @@ sub_81B5958: @ 81B5958
 	thumb_func_start sub_81B5974
 sub_81B5974: @ 81B5974
 	push {lr}
-	bl sub_809D1E8
+	bl TrySetDiveWarp
 	ldr r1, =gFieldEffectArguments
 	lsls r0, 24
 	lsrs r0, 24

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