Name remaining funcs in union_room.c

7 files changed, 16 insertions, 16 deletions

diff --git a/asm/berry_crush_2.s b/asm/berry_crush_2.s
index 774349691..1bf9aad82 100644
--- a/asm/berry_crush_2.s
+++ b/asm/berry_crush_2.s
@@ -1655,7 +1655,7 @@ _0814C77A:
 	movs r2, 0xC
 	bl memcpy
 	adds r0, r4, 0
-	bl sub_80F9E2C
+	bl RfuPrepareSend0x2f00
 _0814C7AC:
 	pop {r3}
 	mov r8, r3
diff --git a/asm/cable_club.s b/asm/cable_club.s
index ec553cfee..4c35c1826 100644
--- a/asm/cable_club.s
+++ b/asm/cable_club.s
@@ -1955,7 +1955,7 @@ _080816BC: .4byte gLocalLinkPlayerId
 _080816C0: .4byte gWirelessCommType
 _080816C4: .4byte gBattleOutcome
 _080816C8:
-	@ sub_8144714(0, gLinkPlayers[GetMultiplayerId() ^ 1].trainerId);
+	@ MEvent_RecordIdOfWonderCardSenderByEventType(0, gLinkPlayers[GetMultiplayerId() ^ 1].trainerId);
 	ldr r4, _080816E8 @ =gLinkPlayers
 	bl GetMultiplayerId
 	eors r0, r5
@@ -1968,12 +1968,12 @@ _080816C8:
 	adds r1, r4
 	ldr r1, [r1]
 	movs r0, 0
-	bl sub_8144714
+	bl MEvent_RecordIdOfWonderCardSenderByEventType
 	b _0808170A
 	.align 2, 0
 _080816E8: .4byte gLinkPlayers
 _080816EC:
-	@ sub_8144714(1, gLinkPlayers[GetMultiplayerId() ^ 1].trainerId);
+	@ MEvent_RecordIdOfWonderCardSenderByEventType(1, gLinkPlayers[GetMultiplayerId() ^ 1].trainerId);
 	ldr r4, _08081718 @ =gLinkPlayers
 	bl GetMultiplayerId
 	eors r0, r5
@@ -1986,7 +1986,7 @@ _080816EC:
 	adds r1, r4
 	ldr r1, [r1]
 	movs r0, 0x1
-	bl sub_8144714
+	bl MEvent_RecordIdOfWonderCardSenderByEventType
 _0808170A:
 	bl InUnionRoom
 	cmp r0, 0x1
@@ -2289,7 +2289,7 @@ _0808195C:
 	lsls r0, 24
 	cmp r0, 0
 	beq _08081970
-	bl sub_8117118
+	bl UnionRoom_CreateTask_CallBC2ReturnFromLinkTrade
 	adds r0, r5, 0
 	bl DestroyTask
 _08081970:
diff --git a/asm/dodrio_berry_picking_2.s b/asm/dodrio_berry_picking_2.s
index 792dc4b0f..91594c7a8 100644
--- a/asm/dodrio_berry_picking_2.s
+++ b/asm/dodrio_berry_picking_2.s
@@ -407,7 +407,7 @@ sub_815A61C: @ 815A61C
 	ands r5, r7
 	orrs r5, r4
 	strb r5, [r0, 0xB]
-	bl sub_80F9E2C
+	bl RfuPrepareSend0x2f00
 	add sp, 0x20
 	pop {r3-r5}
 	mov r8, r3
@@ -637,7 +637,7 @@ sub_815AAD8: @ 815AAD8
 	orrs r1, r0
 	str r1, [sp, 0x4]
 	mov r0, sp
-	bl sub_80F9E2C
+	bl RfuPrepareSend0x2f00
 	add sp, 0x8
 	pop {r0}
 	bx r0
@@ -692,7 +692,7 @@ sub_815AB3C: @ 815AB3C
 	str r1, [sp]
 	str r0, [sp, 0x4]
 	mov r0, sp
-	bl sub_80F9E2C
+	bl RfuPrepareSend0x2f00
 	add sp, 0x8
 	pop {r0}
 	bx r0
diff --git a/asm/pokedex_screen.s b/asm/pokedex_screen.s
index 345f3c83c..9dbbabd6f 100644
--- a/asm/pokedex_screen.s
+++ b/asm/pokedex_screen.s
@@ -1839,7 +1839,7 @@ _08106478:
 	bl FillWindowPixelBuffer
 	movs r0, 0xB0
 	movs r1, 0x1
-	bl sub_8107D38
+	bl ListMenuLoadStdPalAt
 	mov r0, r10
 	cmp r0, 0
 	beq _08106504
diff --git a/asm/pokemon_jump.s b/asm/pokemon_jump.s
index d94a5c8db..1644bb3d8 100644
--- a/asm/pokemon_jump.s
+++ b/asm/pokemon_jump.s
@@ -621,7 +621,7 @@ _08147A5C:
 	ldrh r0, [r4, 0x18]
 	strh r0, [r1, 0x2]
 	mov r0, sp
-	bl sub_80F9E2C
+	bl RfuPrepareSend0x2f00
 	b _08147A9E
 	.align 2, 0
 _08147A88: .4byte gTasks+0x8
diff --git a/asm/pokemon_jump_2.s b/asm/pokemon_jump_2.s
index 449a8fb81..5d2aa8ff8 100644
--- a/asm/pokemon_jump_2.s
+++ b/asm/pokemon_jump_2.s
@@ -4302,7 +4302,7 @@ sub_8149A6C: @ 8149A6C
 	ldr r0, [r0, 0x8]
 	str r0, [sp, 0x4]
 	mov r0, sp
-	bl sub_80F9E2C
+	bl RfuPrepareSend0x2f00
 	add sp, 0xC
 	pop {r0}
 	bx r0
@@ -4363,7 +4363,7 @@ sub_8149AE0: @ 8149AE0
 	strb r1, [r2]
 	str r0, [sp, 0x4]
 	mov r0, sp
-	bl sub_80F9E2C
+	bl RfuPrepareSend0x2f00
 	add sp, 0xC
 	pop {r0}
 	bx r0
@@ -4425,7 +4425,7 @@ sub_8149AF8: @ 8149AF8
 	ldrh r0, [r0, 0xE]
 	strh r0, [r1, 0x4]
 	mov r0, sp
-	bl sub_80F9E2C
+	bl RfuPrepareSend0x2f00
 	add sp, 0xC
 	pop {r3}
 	mov r8, r3
@@ -4520,7 +4520,7 @@ sub_8149BF4: @ 8149BF4
 	mov r0, sp
 	strb r1, [r0, 0x6]
 	strh r2, [r0, 0x8]
-	bl sub_80F9E2C
+	bl RfuPrepareSend0x2f00
 	add sp, 0xC
 	pop {r4}
 	pop {r0}
diff --git a/asm/pokemon_summary_screen.s b/asm/pokemon_summary_screen.s
index d6c3f548f..19b838f47 100644
--- a/asm/pokemon_summary_screen.s
+++ b/asm/pokemon_summary_screen.s
@@ -3187,7 +3187,7 @@ _08135FC8: .4byte gUnknown_8E9B310
 _08135FCC:
 	movs r0, 0x60
 	movs r1, 0x1
-	bl sub_8107D38
+	bl ListMenuLoadStdPalAt
 	ldr r0, _08135FE0 @ =gUnknown_84636C0
 	movs r1, 0x70
 _08135FD8: