5 files changed, 24 insertions, 22 deletions
diff --git a/asm/berry_crush.s b/asm/berry_crush.s
index 6502fc916..0f730e732 100644
--- a/asm/berry_crush.s
+++ b/asm/berry_crush.s
@@ -58,8 +58,8 @@ _0814B74C: .4byte 0x0000012f
 _0814B750: .4byte sub_8056534
 	thumb_func_end sub_814B6FC
 
-	thumb_func_start sub_814B754
-sub_814B754: @ 814B754
+	thumb_func_start StartBerryCrush
+StartBerryCrush: @ 814B754
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -183,7 +183,7 @@ _0814B84C:
 	.align 2, 0
 _0814B858: .4byte sub_814BA80
 _0814B85C: .4byte sub_814BA98
-	thumb_func_end sub_814B754
+	thumb_func_end StartBerryCrush
 
 	thumb_func_start sub_814B860
 sub_814B860: @ 814B860
diff --git a/asm/berry_crush_2.s b/asm/berry_crush_2.s
index 7495c8519..774349691 100644
--- a/asm/berry_crush_2.s
+++ b/asm/berry_crush_2.s
@@ -3323,7 +3323,7 @@ _0814D488:
 	lsls r0, 24
 	cmp r0, 0
 	beq _0814D4BE
-	bl sub_800AAC0
+	bl Link_TryStartSend5FFF
 	b _0814D4B8
 _0814D498:
 	ldr r0, _0814D4B4 @ =gReceivedRemoteLinkPlayers
diff --git a/asm/cable_club.s b/asm/cable_club.s
index 27a3d93f4..ec553cfee 100644
--- a/asm/cable_club.s
+++ b/asm/cable_club.s
@@ -751,7 +751,7 @@ sub_8080CDC: @ 8080CDC
 	lsrs r0, 16
 	cmp r0, 0x1
 	bhi _08080D3C
-	bl sub_800AAC0
+	bl Link_TryStartSend5FFF
 	bl HideFieldMessageBox
 	ldr r0, _08080D38 @ =sub_8080F78
 	b _08080D72
@@ -845,14 +845,14 @@ sub_8080DC0: @ 8080DC0
 	bl sub_8080D8C
 	cmp r0, 0x1
 	beq _08080DFE
-	bl sub_800AAC0
+	bl Link_TryStartSend5FFF
 	b _08080E02
 	.align 2, 0
 _08080DE8: .4byte gSpecialVar_Result
 _08080DEC:
 	cmp r0, 0x3
 	bne _08080DF6
-	bl sub_800AAC0
+	bl Link_TryStartSend5FFF
 	b _08080E02
 _08080DF6:
 	cmp r0, 0x7
@@ -1010,7 +1010,7 @@ _08080F48: .4byte gLinkType
 _08080F4C: .4byte 0x00004411
 _08080F50: .4byte gTasks
 _08080F54:
-	bl sub_800AAC0
+	bl Link_TryStartSend5FFF
 	ldr r0, _08080F70 @ =gTasks
 	mov r2, r8
 	adds r1, r2, r7
@@ -1564,7 +1564,7 @@ _0808138C:
 	ble _0808143A
 	b _080813AA
 _0808139C:
-	bl sub_800AAC0
+	bl Link_TryStartSend5FFF
 	b _080813AA
 _080813A2:
 	ldr r0, _080813B4 @ =gReceivedRemoteLinkPlayers
@@ -1895,7 +1895,7 @@ sub_8081624: @ 8081624
 	.align 2, 0
 _0808163C: .4byte gMain
 _08081640:
-	bl sub_800AAC0
+	bl Link_TryStartSend5FFF
 	ldrb r0, [r4]
 	adds r0, 0x1
 	strb r0, [r4]
@@ -1942,9 +1942,9 @@ sub_8081668: @ 8081668
 	beq _0808170A
 	ldr r0, _080816C4 @ =gBattleOutcome
 	ldrb r0, [r0]
-	cmp r0, 0x1
+	cmp r0, 0x1 @ B_OUTCOME_WON
 	beq _080816C8
-	cmp r0, 0x2
+	cmp r0, 0x2 @ B_OUTCOME_LOST
 	beq _080816EC
 	b _0808170A
 	.align 2, 0
@@ -1955,6 +1955,7 @@ _080816BC: .4byte gLocalLinkPlayerId
 _080816C0: .4byte gWirelessCommType
 _080816C4: .4byte gBattleOutcome
 _080816C8:
+	@ sub_8144714(0, gLinkPlayers[GetMultiplayerId() ^ 1].trainerId);
 	ldr r4, _080816E8 @ =gLinkPlayers
 	bl GetMultiplayerId
 	eors r0, r5
@@ -1972,6 +1973,7 @@ _080816C8:
 	.align 2, 0
 _080816E8: .4byte gLinkPlayers
 _080816EC:
+	@ sub_8144714(1, gLinkPlayers[GetMultiplayerId() ^ 1].trainerId);
 	ldr r4, _08081718 @ =gLinkPlayers
 	bl GetMultiplayerId
 	eors r0, r5
@@ -2198,7 +2200,7 @@ _080818A8:
 	strb r0, [r1]
 	strb r0, [r1, 0x1]
 	bl m4aMPlayAllStop
-	bl sub_800AAC0
+	bl Link_TryStartSend5FFF
 _080818B8:
 	ldrh r0, [r4, 0x8]
 	adds r0, 0x1
@@ -2507,7 +2509,7 @@ sub_8081B08: @ 8081B08
 	adds r4, r0, 0
 	lsls r4, 24
 	lsrs r4, 24
-	bl sub_800AAC0
+	bl Link_TryStartSend5FFF
 	ldr r1, _08081B28 @ =gTasks
 	lsls r0, r4, 2
 	adds r0, r4
diff --git a/asm/dodrio_berry_picking.s b/asm/dodrio_berry_picking.s
index 3e9c18491..b396926d4 100644
--- a/asm/dodrio_berry_picking.s
+++ b/asm/dodrio_berry_picking.s
@@ -5,8 +5,8 @@
 
 	.text
 
-	thumb_func_start sub_81507FC
-sub_81507FC: @ 81507FC
+	thumb_func_start StartDodrioBerryPicking
+StartDodrioBerryPicking: @ 81507FC
 	push {r4-r6,lr}
 	adds r5, r1, 0
 	lsls r0, 16
@@ -97,7 +97,7 @@ _081508D2:
 	pop {r4-r6}
 	pop {r0}
 	bx r0
-	thumb_func_end sub_81507FC
+	thumb_func_end StartDodrioBerryPicking
 
 	thumb_func_start sub_81508D8
 sub_81508D8: @ 81508D8
@@ -1611,7 +1611,7 @@ _081514A4:
 	beq _081514C0
 	b _081514D6
 _081514AA:
-	bl sub_800AAC0
+	bl Link_TryStartSend5FFF
 	movs r0, 0x7
 	bl sub_81549D4
 	b _081514CC
diff --git a/asm/pokemon_jump_2.s b/asm/pokemon_jump_2.s
index 5e6327c81..449a8fb81 100644
--- a/asm/pokemon_jump_2.s
+++ b/asm/pokemon_jump_2.s
@@ -5,8 +5,8 @@
 
 	.text
 
-	thumb_func_start sub_8147AA8
-sub_8147AA8: @ 8147AA8
+	thumb_func_start StartPokemonJump
+StartPokemonJump: @ 8147AA8
 	push {r4-r7,lr}
 	adds r6, r1, 0
 	lsls r0, 16
@@ -73,7 +73,7 @@ _08147B42:
 	pop {r4-r7}
 	pop {r0}
 	bx r0
-	thumb_func_end sub_8147AA8
+	thumb_func_end StartPokemonJump
 
 	thumb_func_start sub_8147B48
 sub_8147B48: @ 8147B48
@@ -2535,7 +2535,7 @@ _08148DEA:
 	ands r0, r1
 	cmp r0, 0
 	bne _08148E20
-	bl sub_800AAC0
+	bl Link_TryStartSend5FFF
 _08148DFA:
 	ldr r0, _08148E0C @ =gUnknown_203F3D4
 	ldr r1, [r0]