port sub_8050F3C

asm/cable_club.s

@@ -2193,7 +2193,7 @@ _08081894:
 	.align 2, 0
 _080818A4: .4byte gPaletteFade
 _080818A8:
-	ldr r1, _080818C0 @ =gUnknown_2031DA4
+	ldr r1, _080818C0 @ =gSelectedTradeMonPositions
 	movs r0, 0
 	strb r0, [r1]
 	strb r0, [r1, 0x1]
@@ -2205,7 +2205,7 @@ _080818B8:
 	strh r0, [r4, 0x8]
 	b _080818D8
 	.align 2, 0
-_080818C0: .4byte gUnknown_2031DA4
+_080818C0: .4byte gSelectedTradeMonPositions
 _080818C4:
 	ldr r0, _080818E0 @ =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
@@ -2269,7 +2269,7 @@ _0808192C:
 	.align 2, 0
 _0808193C: .4byte gPaletteFade
 _08081940:
-	ldr r1, _08081958 @ =gUnknown_2031DA4
+	ldr r1, _08081958 @ =gSelectedTradeMonPositions
 	movs r0, 0
 	strb r0, [r1]
 	strb r0, [r1, 0x1]
@@ -2281,7 +2281,7 @@ _08081950:
 	strh r0, [r4]
 	b _08081970
 	.align 2, 0
-_08081958: .4byte gUnknown_2031DA4
+_08081958: .4byte gSelectedTradeMonPositions
 _0808195C:
 	bl IsLinkTaskFinished
 	lsls r0, 24

asm/evolution_scene.s

@@ -2817,7 +2817,7 @@ _080CF620:
 	movs r0, 0
 	adds r1, r4, 0
 	movs r2, 0x1
-	bl sub_8054508
+	bl DrawTextOnTradeWindow
 	ldr r0, _080CF648 @ =gTasks
 	adds r1, r7, r6
 	lsls r1, 3
@@ -3110,7 +3110,7 @@ _080CF8A8:
 	movs r0, 0
 	adds r1, r4, 0
 	movs r2, 0x1
-	bl sub_8054508
+	bl DrawTextOnTradeWindow
 	ldr r0, _080CF91C @ =0x00000103
 	bl PlayFanfare
 	ldr r2, _080CF920 @ =gTasks
@@ -3222,7 +3222,7 @@ _080CF9AC:
 	ldr r1, _080CF9C8 @ =gUnknown_841E325
 	movs r0, 0
 	movs r2, 0x1
-	bl sub_8054508
+	bl DrawTextOnTradeWindow
 	ldr r0, _080CF9CC @ =gTasks
 	adds r1, r7, r6
 	lsls r1, 3
@@ -3341,7 +3341,7 @@ _080CFAA8:
 	movs r0, 0
 	adds r1, r4, 0
 	movs r2, 0x1
-	bl sub_8054508
+	bl DrawTextOnTradeWindow
 	ldr r1, _080CFAD4 @ =gTasks
 	adds r0, r7, r6
 	lsls r0, 3
@@ -3376,7 +3376,7 @@ _080CFAF2:
 	ldr r1, _080CFB2C @ =gDisplayedStringBattle
 	movs r0, 0
 	movs r2, 0x1
-	bl sub_8054508
+	bl DrawTextOnTradeWindow
 	ldr r0, _080CFB30 @ =gTasks
 	adds r1, r7, r6
 	lsls r1, 3
@@ -3477,7 +3477,7 @@ _080CFBDA:
 	ldr r1, _080CFC04 @ =gDisplayedStringBattle
 	movs r0, 0
 	movs r2, 0x1
-	bl sub_8054508
+	bl DrawTextOnTradeWindow
 	ldr r0, _080CFC08 @ =gTasks
 	adds r1, r7, r6
 	lsls r1, 3
@@ -3509,7 +3509,7 @@ _080CFC26:
 	ldr r1, _080CFC4C @ =gDisplayedStringBattle
 	movs r0, 0
 	movs r2, 0x1
-	bl sub_8054508
+	bl DrawTextOnTradeWindow
 	ldr r0, _080CFC50 @ =gTasks
 	adds r1, r7, r6
 	lsls r1, 3
@@ -3537,7 +3537,7 @@ _080CFC54:
 	ldr r1, _080CFCEC @ =gDisplayedStringBattle
 	movs r0, 0
 	movs r2, 0x1
-	bl sub_8054508
+	bl DrawTextOnTradeWindow
 	ldr r0, _080CFCF0 @ =gTasks
 	adds r1, r7, r6
 	lsls r1, 3
@@ -3625,7 +3625,7 @@ _080CFD1C:
 	ldr r1, _080CFD68 @ =gDisplayedStringBattle
 	movs r0, 0
 	movs r2, 0x1
-	bl sub_8054508
+	bl DrawTextOnTradeWindow
 	ldr r1, _080CFD6C @ =gTasks
 	adds r0, r7, r6
 	lsls r0, 3
@@ -3665,7 +3665,7 @@ _080CFD70:
 	ldr r1, _080CFDA4 @ =gDisplayedStringBattle
 	movs r0, 0
 	movs r2, 0x1
-	bl sub_8054508
+	bl DrawTextOnTradeWindow
 	ldr r1, _080CFDA8 @ =gTasks
 	adds r0, r7, r6
 	lsls r0, 3
@@ -3782,7 +3782,7 @@ _080CFE74:
 	ldr r1, _080CFEB8 @ =gDisplayedStringBattle
 	movs r0, 0
 	movs r2, 0x1
-	bl sub_8054508
+	bl DrawTextOnTradeWindow
 	ldr r1, _080CFEBC @ =gTasks
 	adds r0, r7, r6
 	lsls r0, 3
@@ -3825,7 +3825,7 @@ _080CFEC0:
 	ldr r1, _080CFF20 @ =gDisplayedStringBattle
 	movs r0, 0
 	movs r2, 0x1
-	bl sub_8054508
+	bl DrawTextOnTradeWindow
 	ldr r0, _080CFF24 @ =gTasks
 	adds r1, r7, r6
 	lsls r1, 3
@@ -3859,7 +3859,7 @@ _080CFF42:
 	ldr r1, _080CFF68 @ =gDisplayedStringBattle
 	movs r0, 0
 	movs r2, 0x1
-	bl sub_8054508
+	bl DrawTextOnTradeWindow
 	ldr r0, _080CFF6C @ =gTasks
 	adds r1, r7, r6
 	lsls r1, 3
@@ -3890,7 +3890,7 @@ _080CFF70:
 	ldr r1, _080CFFB0 @ =gDisplayedStringBattle
 	movs r0, 0
 	movs r2, 0x1
-	bl sub_8054508
+	bl DrawTextOnTradeWindow
 	ldr r1, _080CFFB4 @ =gTasks
 	adds r0, r7, r6
 	lsls r0, 3
@@ -3909,7 +3909,7 @@ _080CFFB8:
 	ldr r1, _080CFFE4 @ =gDisplayedStringBattle
 	movs r0, 0
 	movs r2, 0x1
-	bl sub_8054508
+	bl DrawTextOnTradeWindow
 	ldr r1, _080CFFE8 @ =gTasks
 	adds r0, r7, r6
 	lsls r0, 3
@@ -3932,7 +3932,7 @@ _080CFFEC:
 	ldr r1, _080D0010 @ =gDisplayedStringBattle
 	movs r0, 0
 	movs r2, 0x1
-	bl sub_8054508
+	bl DrawTextOnTradeWindow
 	ldr r1, _080D0014 @ =gTasks
 	adds r0, r7, r6
 	lsls r0, 3

asm/link_rfu_3.s

@@ -3083,7 +3083,7 @@ _08117210:
 	movs r2, 0xD8
 	bl memcpy
 	bl ResetBlockReceivedFlags
-	ldr r1, _08117270 @ =gUnknown_2031DA4
+	ldr r1, _08117270 @ =gSelectedTradeMonPositions
 	strb r7, [r1]
 	movs r0, 0x6
 	strb r0, [r1, 0x1]
@@ -3105,7 +3105,7 @@ _0811725C:
 	.align 2, 0
 _08117268: .4byte gLinkPartnerMail
 _0811726C: .4byte gBlockRecvBuffer
-_08117270: .4byte gUnknown_2031DA4
+_08117270: .4byte gSelectedTradeMonPositions
 _08117274: .4byte gMain
 _08117278: .4byte CB2_ReturnToField
 _0811727C: .4byte CB2_InitTradeAnim_LinkTrade

asm/pokeball.s

@@ -2327,8 +2327,8 @@ _0804BB90:
 	bx r0
 	thumb_func_end sub_804BAA4
 
-	thumb_func_start sub_804BB98
-sub_804BB98: @ 804BB98
+	thumb_func_start CreateTradePokeballSprite
+CreateTradePokeballSprite: @ 804BB98
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -2414,7 +2414,7 @@ _0804BC40: .4byte gUnknown_82605CC
 _0804BC44: .4byte gUnknown_82606F4
 _0804BC48: .4byte gSprites
 _0804BC4C: .4byte sub_804BC50
-	thumb_func_end sub_804BB98
+	thumb_func_end CreateTradePokeballSprite
 
 	thumb_func_start sub_804BC50
 sub_804BC50: @ 804BC50