Merge remote-tracking branch 'upstream/master' into port_matchings

1 files changed, 3 insertions, 2 deletions

diff --git a/src/battle_tower.c b/src/battle_tower.c
index 04f3019b1..4c6934781 100644
--- a/src/battle_tower.c
+++ b/src/battle_tower.c
@@ -1124,7 +1124,8 @@ static void SetPlayerBattleTowerRecord(void)
         playerRecord->greeting[i] = gSaveBlock1Ptr->easyChatBattleStart[i];
 
     for (i = 0; i < 3; i++)
-        sub_803E23C(&gPlayerParty[gSaveBlock2Ptr->battleTower.selectedPartyMons[i] - 1], &playerRecord->party[i]);
+        ConvertPokemonToBattleTowerPokemon(&gPlayerParty[gSaveBlock2Ptr->battleTower.selectedPartyMons[i] - 1],
+                                           &playerRecord->party[i]);
 
     SetBattleTowerRecordChecksum(&gSaveBlock2Ptr->battleTower.playerRecord);
     SaveCurrentWinStreak();
@@ -1320,7 +1321,7 @@ static void Debug_FillEReaderTrainerWithPlayerData(void)
     }
 
     for (i = 0; i < 3; i++)
-        sub_803E23C(&gPlayerParty[i], &ereaderTrainer->party[i]);
+        ConvertPokemonToBattleTowerPokemon(&gPlayerParty[i], &ereaderTrainer->party[i]);
 
     SetEReaderTrainerChecksum(ereaderTrainer);
 }