4 files changed, 5 insertions, 20 deletions
diff --git a/src/battle/battle_controller_linkpartner.c b/src/battle/battle_controller_linkpartner.c
index 4308a8a5c..7fd5261aa 100644
--- a/src/battle/battle_controller_linkpartner.c
+++ b/src/battle/battle_controller_linkpartner.c
@@ -501,7 +501,7 @@ void LinkPartnerBufferExecCompleted(void)
     if (gBattleTypeFlags & 2)
     {
         multiplayerId = GetMultiplayerId();
-        dp01_prepare_buffer_wireless_probably(2, 4, &multiplayerId);
+        PrepareBufferDataTransferLink(2, 4, &multiplayerId);
         gBattleBufferA[gActiveBank][0] = 0x38;
     }
     else
diff --git a/src/battle/battle_controller_player.c b/src/battle/battle_controller_player.c
index 269f20642..5cfdeefbe 100644
--- a/src/battle/battle_controller_player.c
+++ b/src/battle/battle_controller_player.c
@@ -346,7 +346,7 @@ void PlayerBufferExecCompleted(void)
     {
         u8 playerId = GetMultiplayerId();
 
-        dp01_prepare_buffer_wireless_probably(2, 4, &playerId);
+        PrepareBufferDataTransferLink(2, 4, &playerId);
         gBattleBufferA[gActiveBank][0] = 0x38;
     }
     else
diff --git a/src/battle/battle_controller_wally.c b/src/battle/battle_controller_wally.c
index 36e525bcc..e4b593df7 100644
--- a/src/battle/battle_controller_wally.c
+++ b/src/battle/battle_controller_wally.c
@@ -484,7 +484,7 @@ void WallyBufferExecCompleted(void)
     {
         u8 multiplayerId = GetMultiplayerId();
 
-        dp01_prepare_buffer_wireless_probably(2, 4, &multiplayerId);
+        PrepareBufferDataTransferLink(2, 4, &multiplayerId);
         gBattleBufferA[gActiveBank][0] = 0x38;
     }
     else
diff --git a/src/battle/battle_message.c b/src/battle/battle_message.c
index 37ec14459..a3cc320ad 100644
--- a/src/battle/battle_message.c
+++ b/src/battle/battle_message.c
@@ -116,22 +116,7 @@ struct StatusFlagString
 extern const struct StatusFlagString gUnknown_081FA6D4[7]; // status flag/text
 extern const u8 gUnknown_084017A8[8]; // empty flags
 
-struct StringInfo
-{
-    u16 currentMove;
-    u16 lastMove;
-    u16 lastItem;
-    u8 lastAbility;
-    u8 scrActive;
-    u8 unk1605E;
-    u8 hpScale;
-    u8 StringBank;
-    u8 moveType;
-    u8 abilities[4];
-    u8 textBuffs[3][0x10];
-};
-
-extern struct StringInfo* gSelectedOrderFromParty;
+extern struct StringInfoBattle* gSelectedOrderFromParty;
 #define gStringInfo gSelectedOrderFromParty
 
 void sub_8121D1C(u8* textBuff);
@@ -156,7 +141,7 @@ void BufferStringBattle(u16 stringID)
     int i;
     const u8* stringPtr = NULL;
 
-    gStringInfo = (struct StringInfo*)(&gBattleBufferA[gActiveBank][4]);
+    gStringInfo = (struct StringInfoBattle*)(&gBattleBufferA[gActiveBank][4]);
     gLastUsedItem = gStringInfo->lastItem;
     gLastUsedAbility = gStringInfo->lastAbility;
     BATTLE_STRUCT->scriptingActive = gStringInfo->scrActive;