Merge with master

1 files changed, 4 insertions, 4 deletions

diff --git a/src/record_mixing.c b/src/record_mixing.c
index 975b51386..2b497c82b 100644
--- a/src/record_mixing.c
+++ b/src/record_mixing.c
@@ -22,8 +22,8 @@
 #include "constants/songs.h"
 #include "menu.h"
 #include "overworld.h"
-#include "field_screen.h"
-#include "fldeff_80F9BCC.h"
+#include "field_screen_effect.h"
+#include "fldeff_misc.h"
 #include "script.h"
 #include "event_data.h"
 #include "lilycove_lady.h"
@@ -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);
     }