From 4ec14b3d431f61309e33ca58c7702678bd25ae7a Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Sat, 8 Dec 2018 22:05:11 +0100
Subject: Finish field screen

---
 src/record_mixing.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/record_mixing.c')

diff --git a/src/record_mixing.c b/src/record_mixing.c
index df4a1a720..a497f9cd8 100644
--- a/src/record_mixing.c
+++ b/src/record_mixing.c
@@ -22,7 +22,7 @@
 #include "constants/songs.h"
 #include "menu.h"
 #include "overworld.h"
-#include "field_screen.h"
+#include "field_screen_effect.h"
 #include "fldeff_80F9BCC.h"
 #include "script.h"
 #include "event_data.h"
-- 
cgit v1.2.3


From 68017b531a47bce7c125eea617a701a89013c983 Mon Sep 17 00:00:00 2001
From: Meowsy <Meowsy@users.noreply.github.com>
Date: Mon, 10 Dec 2018 15:49:33 -0500
Subject: Rename UnknownPokemonStruct to BattleTowerPokemon.

---
 src/record_mixing.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/record_mixing.c')

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);
     }
-- 
cgit v1.2.3


From 5eac3ce1a2503a2d358033b7e0242c1ecd2b63e3 Mon Sep 17 00:00:00 2001
From: garak <garakmon@gmail.com>
Date: Wed, 19 Dec 2018 22:19:54 -0500
Subject: rename fldeff_misc

---
 src/record_mixing.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/record_mixing.c')

diff --git a/src/record_mixing.c b/src/record_mixing.c
index 6d5d49265..2b497c82b 100644
--- a/src/record_mixing.c
+++ b/src/record_mixing.c
@@ -23,7 +23,7 @@
 #include "menu.h"
 #include "overworld.h"
 #include "field_screen_effect.h"
-#include "fldeff_80F9BCC.h"
+#include "fldeff_misc.h"
 #include "script.h"
 #include "event_data.h"
 #include "lilycove_lady.h"
-- 
cgit v1.2.3