Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_party_menu

1 files changed, 2 insertions, 2 deletions

diff --git a/src/record_mixing.c b/src/record_mixing.c
index d37883e4d..6d5d49265 100644
--- a/src/record_mixing.c
+++ b/src/record_mixing.c
@@ -647,7 +647,7 @@ static void ReceiveOldManData(OldMan *oldMan, size_t recordSize, u8 which)
 static void ReceiveBattleTowerData(void *battleTowerRecord, size_t recordSize, u8 which)
 {
     struct EmeraldBattleTowerRecord *dest;
-    struct UnknownPokemonStruct *btPokemon;
+    struct BattleTowerPokemon *btPokemon;
     u32 mixIndices[4];
     s32 i;
 
@@ -1866,7 +1866,7 @@ static void SanitizeEmeraldBattleTowerRecord(struct EmeraldBattleTowerRecord *ds
 
     for (i = 0; i < 4; i++)
     {
-        struct UnknownPokemonStruct *towerMon = &dst->party[i];
+        struct BattleTowerPokemon *towerMon = &dst->party[i];
         if (towerMon->species != 0)
             StripExtCtrlCodes(towerMon->nickname);
     }