From ca2bc94c2be5d7b915e5ab913ef026aa12b8fc0f Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Fri, 3 Nov 2017 20:59:29 -0400
Subject: through sub_80E6BF8

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

(limited to 'src')

diff --git a/src/record_mixing.c b/src/record_mixing.c
index 151835e5e..ade4d6e8c 100644
--- a/src/record_mixing.c
+++ b/src/record_mixing.c
@@ -1,6 +1,9 @@
 
 // Includes
 #include "global.h"
+#include "task.h"
+#include "cable_club.h"
+#include "record_mixing.h"
 
 // Static type declarations
 
@@ -9,10 +12,10 @@
 IWRAM_DATA bool8 gUnknown_03001130;
 IWRAM_DATA struct SecretBaseRecord *gUnknown_03001134;
 IWRAM_DATA TVShow *gUnknown_03001138;
-IWRAM_DATA struct UnknownSaveStruct2ABC *gUnknown_0300113C;
+IWRAM_DATA PokeNews *gUnknown_0300113C;
 IWRAM_DATA OldMan *gUnknown_03001140;
 IWRAM_DATA struct EasyChatPair *gUnknown_03001144;
-IWRAM_DATA struct DaycareData *gUnknown_03001148;
+IWRAM_DATA struct DayCareMailRecordMixing *gUnknown_03001148;
 IWRAM_DATA void *gUnknown_0300114C; // gSaveBlock2Ptr->field_64C
 IWRAM_DATA LilycoveLady *gUnknown_03001150;
 IWRAM_DATA void *gUnknown_03001154; // gSaveBlock2Ptr->field_0DC;
@@ -21,8 +24,37 @@ IWRAM_DATA u32 gUnknown_0300115C;
 IWRAM_DATA u8 gUnknown_03001160[8];
 IWRAM_DATA u32 gUnknown_03001168[3];
 
+EWRAM_DATA struct DayCareMailRecordMixing gUnknown_02039F9C[2] = {};
+EWRAM_DATA struct {
+    /*0x0000*/ u8 filler_0000[0x5110];
+} *gUnknown_0203A014 = NULL;
+EWRAM_DATA struct {
+    /*0x0000*/ u8 filler_0000[0x1444];
+} *gUnknown_0203A018 = NULL;
+
 // Static ROM declarations
 
+void sub_80E715C(u8 taskId);
+
 // .rodata
 
 // .text
+
+void sub_80E6BE8(void)
+{
+    sub_80B37D4(sub_80E715C);
+}
+
+void sub_80E6BF8(void)
+{
+    gUnknown_03001134 = gSaveBlock1Ptr->secretBases;
+    gUnknown_03001138 = gSaveBlock1Ptr->tvShows;
+    gUnknown_0300113C = gSaveBlock1Ptr->pokeNews;
+    gUnknown_03001140 = &gSaveBlock1Ptr->oldMan;
+    gUnknown_03001144 = gSaveBlock1Ptr->easyChatPairs;
+    gUnknown_03001148 = gUnknown_02039F9C;
+    gUnknown_0300114C = gSaveBlock2Ptr->field_64C;
+    gUnknown_03001150 = &gSaveBlock1Ptr->lilycoveLady;
+    gUnknown_03001154 = gSaveBlock2Ptr->field_0DC;
+    gUnknown_03001158 = gSaveBlock2Ptr->field_64C;
+}
-- 
cgit v1.2.3


From f8486b31c531dd9622e748e1382ab9e4b8a5fc5c Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Fri, 3 Nov 2017 21:56:18 -0400
Subject: sub_80E6CA0

---
 src/record_mixing.c | 37 ++++++++++++++++++++++++++++++++++---
 1 file changed, 34 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/record_mixing.c b/src/record_mixing.c
index ade4d6e8c..06cf1ab2e 100644
--- a/src/record_mixing.c
+++ b/src/record_mixing.c
@@ -3,10 +3,26 @@
 #include "global.h"
 #include "task.h"
 #include "cable_club.h"
+#include "link.h"
+#include "tv.h"
+#include "battle_tower.h"
+#include "mystery_event_script.h"
 #include "record_mixing.h"
 
 // Static type declarations
 
+struct RecordMixingData {
+    struct SecretBaseRecord secretBases[20];
+    TVShow tvShows[25];
+    PokeNews pokeNews[16];
+    OldMan oldMan;
+    struct EasyChatPair easyChatPair[5];
+    u8 unk_10ac[0x78];
+    u8 unk_1124[0xa4];
+    u16 unk_11c8;
+    u8 unk_11ca[0x27a];
+};
+
 // Static RAM declarations
 
 IWRAM_DATA bool8 gUnknown_03001130;
@@ -28,13 +44,12 @@ EWRAM_DATA struct DayCareMailRecordMixing gUnknown_02039F9C[2] = {};
 EWRAM_DATA struct {
     /*0x0000*/ u8 filler_0000[0x5110];
 } *gUnknown_0203A014 = NULL;
-EWRAM_DATA struct {
-    /*0x0000*/ u8 filler_0000[0x1444];
-} *gUnknown_0203A018 = NULL;
+EWRAM_DATA struct RecordMixingData *gUnknown_0203A018 = NULL;
 
 // Static ROM declarations
 
 void sub_80E715C(u8 taskId);
+void sub_80E89F8(void *dest);
 
 // .rodata
 
@@ -58,3 +73,19 @@ void sub_80E6BF8(void)
     gUnknown_03001154 = gSaveBlock2Ptr->field_0DC;
     gUnknown_03001158 = gSaveBlock2Ptr->field_64C;
 }
+
+void sub_80E6CA0(struct RecordMixingData *dest)
+{
+    memcpy(dest->secretBases, gUnknown_03001134, sizeof(struct SecretBaseRecord) * 20);
+    memcpy(dest->tvShows, gUnknown_03001138, sizeof(TVShow) * 25);
+    sub_80F14F8(dest->tvShows);
+    memcpy(dest->pokeNews, gUnknown_0300113C, sizeof(PokeNews) * 16);
+    memcpy(&dest->oldMan, gUnknown_03001140, sizeof(OldMan));
+    memcpy(dest->easyChatPair, gUnknown_03001144, sizeof(struct EasyChatPair) * 5);
+    sub_80E89F8(dest->unk_10ac);
+    sub_81659DC(gUnknown_0300114C, dest->unk_1124);
+    if (GetMultiplayerId() == 0)
+    {
+        dest->unk_11c8 = sub_81539D4();
+    }
+}
-- 
cgit v1.2.3


From 20ebcf71699a3463e130b68b1c2c2a3f984c8db8 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Fri, 3 Nov 2017 22:07:36 -0400
Subject: sub_80E6D54

---
 src/record_mixing.c | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

(limited to 'src')

diff --git a/src/record_mixing.c b/src/record_mixing.c
index 06cf1ab2e..5b1f1c0c8 100644
--- a/src/record_mixing.c
+++ b/src/record_mixing.c
@@ -7,6 +7,8 @@
 #include "tv.h"
 #include "battle_tower.h"
 #include "mystery_event_script.h"
+#include "secret_base.h"
+#include "mauville_old_man.h"
 #include "record_mixing.h"
 
 // Static type declarations
@@ -50,6 +52,8 @@ EWRAM_DATA struct RecordMixingData *gUnknown_0203A018 = NULL;
 
 void sub_80E715C(u8 taskId);
 void sub_80E89F8(void *dest);
+void sub_80E8A54(void *src);
+void TaskDummy4(void *src);
 
 // .rodata
 
@@ -89,3 +93,23 @@ void sub_80E6CA0(struct RecordMixingData *dest)
         dest->unk_11c8 = sub_81539D4();
     }
 }
+
+void sub_80E6D54(struct RecordMixingData *dest)
+{
+    memcpy(dest->secretBases, gUnknown_03001134, sizeof(struct SecretBaseRecord) * 20);
+    sub_80EB18C(dest->secretBases);
+    memcpy(dest->tvShows, gUnknown_03001138, sizeof(TVShow) * 25);
+    sub_80F1208(dest->tvShows);
+    memcpy(dest->pokeNews, gUnknown_0300113C, sizeof(PokeNews) * 16);
+    memcpy(&dest->oldMan, gUnknown_03001140, sizeof(OldMan));
+    sub_8120B70(&dest->oldMan);
+    memcpy(dest->easyChatPair, gUnknown_03001144, sizeof(struct EasyChatPair) * 5);
+    sub_80E89F8(dest->unk_10ac);
+    sub_80E8A54(dest->unk_10ac);
+    sub_81659DC(gUnknown_0300114C, dest->unk_1124);
+    TaskDummy4(dest->unk_1124);
+    if (GetMultiplayerId() == 0)
+    {
+        dest->unk_11c8 = sub_81539D4();
+    }
+}
-- 
cgit v1.2.3


From 1c3e7f169f26d471280a0f7aa1043dbd68e981c7 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Fri, 3 Nov 2017 22:26:12 -0400
Subject: sub_80E6E24

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

(limited to 'src')

diff --git a/src/record_mixing.c b/src/record_mixing.c
index 5b1f1c0c8..c8259e117 100644
--- a/src/record_mixing.c
+++ b/src/record_mixing.c
@@ -22,8 +22,13 @@ struct RecordMixingData {
     u8 unk_10ac[0x78];
     u8 unk_1124[0xa4];
     u16 unk_11c8;
-    u8 unk_11ca[0x27a];
-};
+    u8 filler_11ca[0x46];
+    u16 unk_1210;
+    u8 filler_1212[0x2];
+    LilycoveLady lilycoveLady;
+    u8 unk_1254[0x88];
+    u8 unk_12dc[0x168];
+}; // 1444
 
 // Static RAM declarations
 
@@ -54,6 +59,8 @@ void sub_80E715C(u8 taskId);
 void sub_80E89F8(void *dest);
 void sub_80E8A54(void *src);
 void TaskDummy4(void *src);
+void sub_80E8AC0(void *);
+void sub_80E8110(void *, void *);
 
 // .rodata
 
@@ -113,3 +120,39 @@ void sub_80E6D54(struct RecordMixingData *dest)
         dest->unk_11c8 = sub_81539D4();
     }
 }
+
+void sub_80E6E24(void)
+{
+    sub_80E9914();
+    sub_80F0BB8();
+    sub_80E6BF8();
+    if (sub_800A064())
+    {
+        if (sub_800A03C() == FALSE)
+        {
+            sub_80E6CA0(gUnknown_0203A018);
+        }
+        else
+        {
+            sub_80E6D54(gUnknown_0203A018);
+        }
+    }
+    else
+    {
+        memcpy(gUnknown_0203A018->secretBases, gUnknown_03001134, sizeof(struct SecretBaseRecord) * 20);
+        memcpy(gUnknown_0203A018->tvShows, gUnknown_03001138, sizeof(TVShow) * 25);
+        memcpy(gUnknown_0203A018->pokeNews, gUnknown_0300113C, sizeof(PokeNews) * 16);
+        memcpy(&gUnknown_0203A018->oldMan, gUnknown_03001140, sizeof(OldMan));
+        memcpy(&gUnknown_0203A018->lilycoveLady, gUnknown_03001150, sizeof(LilycoveLady));
+        memcpy(gUnknown_0203A018->easyChatPair, gUnknown_03001144, sizeof(struct EasyChatPair) * 5);
+        sub_80E89F8(gUnknown_0203A018->unk_10ac);
+        memcpy(gUnknown_0203A018->unk_1124, gUnknown_0300114C, 0xec);
+        sub_80E8AC0(gUnknown_0203A018->unk_1124);
+        if (GetMultiplayerId() == 0)
+        {
+            gUnknown_0203A018->unk_1210 = sub_81539D4();
+        }
+        sub_80E8110(gUnknown_0203A018->unk_1254, gUnknown_03001154);
+        sub_80E8260(gUnknown_0203A018->unk_12dc);
+    }
+}
-- 
cgit v1.2.3


From f5c1e190d1e8a50e9a5d27f2489d12167c193b61 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sat, 4 Nov 2017 09:39:41 -0400
Subject: sub_80E6F60

---
 src/record_mixing.c | 80 ++++++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 61 insertions(+), 19 deletions(-)

(limited to 'src')

diff --git a/src/record_mixing.c b/src/record_mixing.c
index c8259e117..4853afb29 100644
--- a/src/record_mixing.c
+++ b/src/record_mixing.c
@@ -14,20 +14,19 @@
 // Static type declarations
 
 struct RecordMixingData {
-    struct SecretBaseRecord secretBases[20];
-    TVShow tvShows[25];
-    PokeNews pokeNews[16];
-    OldMan oldMan;
-    struct EasyChatPair easyChatPair[5];
-    u8 unk_10ac[0x78];
-    u8 unk_1124[0xa4];
-    u16 unk_11c8;
-    u8 filler_11ca[0x46];
-    u16 unk_1210;
-    u8 filler_1212[0x2];
-    LilycoveLady lilycoveLady;
-    u8 unk_1254[0x88];
-    u8 unk_12dc[0x168];
+    /* 0x0000 */ struct SecretBaseRecord secretBases[20];
+    /* 0x0c80 */ TVShow tvShows[25];
+    /* 0x1004 */ PokeNews pokeNews[16];
+    /* 0x1044 */ OldMan oldMan;
+    /* 0x1084 */ struct EasyChatPair easyChatPair[5];
+    /* 0x10ac */ u8 unk_10ac[0x78];
+    /* 0x1124 */ u8 unk_1124[0xa4];
+    /* 0x11c8 */ u16 unk_11c8;
+    /* 0x11ca */ u8 filler_11ca[0x46];
+    /* 0x1210 */ u16 unk_1210;
+    /* 0x1214 */ LilycoveLady lilycoveLady;
+    /* 0x1254 */ u8 unk_1254[0x88];
+    /* 0x12dc */ u8 unk_12dc[0x168];
 }; // 1444
 
 // Static RAM declarations
@@ -48,19 +47,29 @@ IWRAM_DATA u8 gUnknown_03001160[8];
 IWRAM_DATA u32 gUnknown_03001168[3];
 
 EWRAM_DATA struct DayCareMailRecordMixing gUnknown_02039F9C[2] = {};
-EWRAM_DATA struct {
-    /*0x0000*/ u8 filler_0000[0x5110];
-} *gUnknown_0203A014 = NULL;
+EWRAM_DATA struct RecordMixingData *gUnknown_0203A014 = NULL;
 EWRAM_DATA struct RecordMixingData *gUnknown_0203A018 = NULL;
 
 // Static ROM declarations
 
 void sub_80E715C(u8 taskId);
+void sub_80E78C4(OldMan *, size_t, u8);
+void sub_80E7948(void *, size_t, u8);
+void sub_80E7A14(LilycoveLady *, size_t, u8);
+void sub_80E7B2C(TVShow *);
+void sub_80E7B60(void *, size_t, u8, TVShow *);
+void sub_80E7F68(void *, u8);
+void sub_80E8110(void *, void *);
+void sub_80E8468(void *, size_t, u8);
+void sub_80E89AC(void *, size_t, u8);
 void sub_80E89F8(void *dest);
 void sub_80E8A54(void *src);
-void TaskDummy4(void *src);
 void sub_80E8AC0(void *);
-void sub_80E8110(void *, void *);
+void sub_80EAF80(struct SecretBaseRecord *, size_t, u8);
+void sub_80F01E8(void *, size_t, u8);
+void sub_80F0C7C(PokeNews *, size_t, u8);
+void sub_812287C(struct EasyChatPair *, size_t, u8);
+void TaskDummy4(void *src);
 
 // .rodata
 
@@ -156,3 +165,36 @@ void sub_80E6E24(void)
         sub_80E8260(gUnknown_0203A018->unk_12dc);
     }
 }
+
+void sub_80E6F60(u32 a0)
+{
+    if (sub_800A064())
+    {
+        // Ruby/Sapphire
+        sub_80E7B2C(gUnknown_0203A014[0].tvShows);
+        sub_80EAF80(gUnknown_0203A014[0].secretBases, 0x1230, a0);
+        sub_80E7B60(gUnknown_0203A014[0].unk_10ac, 0x1230, a0, gUnknown_0203A014[0].tvShows);
+        sub_80E7948(gUnknown_0203A014[0].unk_1124, 0x1230, a0);
+        sub_80F01E8(gUnknown_0203A014[0].tvShows, 0x1230, a0);
+        sub_80F0C7C(gUnknown_0203A014[0].pokeNews, 0x1230, a0);
+        sub_80E78C4(&gUnknown_0203A014[0].oldMan, 0x1230, a0);
+        sub_812287C(gUnknown_0203A014[0].easyChatPair, 0x1230, a0);
+        sub_80E7F68(&gUnknown_0203A014[0].unk_11c8, a0);
+    }
+    else
+    {
+        // Emerald
+        sub_80E7B2C(gUnknown_0203A014[0].tvShows);
+        sub_80EAF80(gUnknown_0203A014[0].secretBases, 0x1444, a0);
+        sub_80F01E8(gUnknown_0203A014[0].tvShows, 0x1444, a0);
+        sub_80F0C7C(gUnknown_0203A014[0].pokeNews, 0x1444, a0);
+        sub_80E78C4(&gUnknown_0203A014[0].oldMan, 0x1444, a0);
+        sub_812287C(gUnknown_0203A014[0].easyChatPair, 0x1444, a0);
+        sub_80E7B60(gUnknown_0203A014[0].unk_10ac, 0x1444, a0, gUnknown_0203A014[0].tvShows);
+        sub_80E7948(gUnknown_0203A014[0].unk_1124, 0x1444, a0);
+        sub_80E7F68(&gUnknown_0203A014[0].unk_1210, a0);
+        sub_80E7A14(&gUnknown_0203A014[0].lilycoveLady, 0x1444, a0);
+        sub_80E8468(gUnknown_0203A014[0].unk_1254, 0x1444, a0);
+        sub_80E89AC(gUnknown_0203A014[0].unk_12dc, 0x1444, a0);
+    }
+}
-- 
cgit v1.2.3


From c05444679059e0692275781d065d36e79610cc4c Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sat, 4 Nov 2017 10:15:58 -0400
Subject: through sub_80E715C

---
 src/record_mixing.c | 114 ++++++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 106 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/record_mixing.c b/src/record_mixing.c
index 4853afb29..902dcde1d 100644
--- a/src/record_mixing.c
+++ b/src/record_mixing.c
@@ -1,19 +1,30 @@
 
 // Includes
 #include "global.h"
+#include "malloc.h"
 #include "task.h"
 #include "cable_club.h"
 #include "link.h"
 #include "tv.h"
 #include "battle_tower.h"
+#include "new_menu_helpers.h"
+#include "window.h"
 #include "mystery_event_script.h"
 #include "secret_base.h"
 #include "mauville_old_man.h"
+#include "sound.h"
+#include "songs.h"
+#include "overworld.h"
+#include "field_screen.h"
+#include "fldeff_80F9BCC.h"
+#include "script.h"
+#include "event_data.h"
+#include "strings.h"
 #include "record_mixing.h"
 
 // Static type declarations
 
-struct RecordMixingData {
+struct PlayerRecords {
     /* 0x0000 */ struct SecretBaseRecord secretBases[20];
     /* 0x0c80 */ TVShow tvShows[25];
     /* 0x1004 */ PokeNews pokeNews[16];
@@ -47,18 +58,20 @@ IWRAM_DATA u8 gUnknown_03001160[8];
 IWRAM_DATA u32 gUnknown_03001168[3];
 
 EWRAM_DATA struct DayCareMailRecordMixing gUnknown_02039F9C[2] = {};
-EWRAM_DATA struct RecordMixingData *gUnknown_0203A014 = NULL;
-EWRAM_DATA struct RecordMixingData *gUnknown_0203A018 = NULL;
+EWRAM_DATA struct PlayerRecords *gUnknown_0203A014 = NULL;
+EWRAM_DATA struct PlayerRecords *gUnknown_0203A018 = NULL;
 
 // Static ROM declarations
 
-void sub_80E715C(u8 taskId);
+static void sub_80E715C(u8 taskId);
+void sub_80E7324(u8 taskId);
 void sub_80E78C4(OldMan *, size_t, u8);
 void sub_80E7948(void *, size_t, u8);
 void sub_80E7A14(LilycoveLady *, size_t, u8);
 void sub_80E7B2C(TVShow *);
 void sub_80E7B60(void *, size_t, u8, TVShow *);
 void sub_80E7F68(void *, u8);
+void sub_80E7FF8(u8 taskId);
 void sub_80E8110(void *, void *);
 void sub_80E8468(void *, size_t, u8);
 void sub_80E89AC(void *, size_t, u8);
@@ -94,7 +107,7 @@ void sub_80E6BF8(void)
     gUnknown_03001158 = gSaveBlock2Ptr->field_64C;
 }
 
-void sub_80E6CA0(struct RecordMixingData *dest)
+void sub_80E6CA0(struct PlayerRecords *dest)
 {
     memcpy(dest->secretBases, gUnknown_03001134, sizeof(struct SecretBaseRecord) * 20);
     memcpy(dest->tvShows, gUnknown_03001138, sizeof(TVShow) * 25);
@@ -110,7 +123,7 @@ void sub_80E6CA0(struct RecordMixingData *dest)
     }
 }
 
-void sub_80E6D54(struct RecordMixingData *dest)
+void sub_80E6D54(struct PlayerRecords *dest)
 {
     memcpy(dest->secretBases, gUnknown_03001134, sizeof(struct SecretBaseRecord) * 20);
     sub_80EB18C(dest->secretBases);
@@ -135,7 +148,7 @@ void sub_80E6E24(void)
     sub_80E9914();
     sub_80F0BB8();
     sub_80E6BF8();
-    if (sub_800A064())
+    if (Link_AnyPartnersPlayingRubyOrSapphrie())
     {
         if (sub_800A03C() == FALSE)
         {
@@ -168,7 +181,7 @@ void sub_80E6E24(void)
 
 void sub_80E6F60(u32 a0)
 {
-    if (sub_800A064())
+    if (Link_AnyPartnersPlayingRubyOrSapphrie())
     {
         // Ruby/Sapphire
         sub_80E7B2C(gUnknown_0203A014[0].tvShows);
@@ -198,3 +211,88 @@ void sub_80E6F60(u32 a0)
         sub_80E89AC(gUnknown_0203A014[0].unk_12dc, 0x1444, a0);
     }
 }
+
+void sub_80E70F4(const u8 *src)
+{
+    sub_81973C4(0, 0);
+    PrintTextOnWindow(0, 1, src, 0, 1, 0, NULL);
+    CopyWindowToVram(0, 3);
+}
+
+void sub_80E7128(u8 taskId)
+{
+    if (++ gTasks[taskId].data[0] == 50)
+    {
+        PlaySE(SE_W213);
+        gTasks[taskId].data[0] = 0;
+    }
+}
+
+static void sub_80E715C(u8 taskId)
+{
+    s16 *data;
+
+    data = gTasks[taskId].data;
+    switch (data[0])
+    {
+        case 0:
+            gUnknown_0203A018 = malloc(sizeof(struct PlayerRecords));
+            gUnknown_0203A014 = malloc(sizeof(struct PlayerRecords) * 4);
+            sub_8009628(gSpecialVar_0x8005);
+            VarSet(VAR_0x4000, 1);
+            gUnknown_03001130 = FALSE;
+            sub_80E6E24();
+            sub_80FB00C();
+            data[0] = 1;
+            data[10] = CreateTask(sub_80E7324, 80);
+            data[15] = CreateTask(sub_80E7128, 81);
+            break;
+        case 1:
+            if (!gTasks[data[10]].isActive)
+            {
+                data[0] = 2;
+                FlagSet(SYS_MIX_RECORD);
+                sub_80FB074();
+                DestroyTask(data[15]);
+            }
+            break;
+        case 2:
+            data[10] = CreateTask(sub_80E7FF8, 10);
+            data[0] = 3;
+            PlaySE(SE_W226);
+            break;
+        case 3:
+            if (!gTasks[data[10]].isActive)
+            {
+                data[0] = 4;
+                if (!gLinkVSyncDisabled)
+                {
+                    data[10] = sub_80B3050();
+                }
+                sub_80E70F4(gText_RecordMixingComplete);
+                data[8] = 0;
+            }
+            break;
+        case 4:
+            if (++ data[8] > 60)
+            {
+                data[0] = 5;
+            }
+            break;
+        case 5:
+            if (!gTasks[data[10]].isActive)
+            {
+                free(gUnknown_0203A014);
+                free(gUnknown_0203A018);
+                sub_808729C();
+                if (gLinkVSyncDisabled)
+                {
+                    CreateTask(sub_80AF2B4, 10);
+                }
+                sub_8197434(0, 1);
+                DestroyTask(taskId);
+                EnableBothScriptContexts();
+            }
+            break;
+    }
+}
-- 
cgit v1.2.3


From 411cb29f4ab513da00d15ff16fc98fed8b31dfdb Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sat, 4 Nov 2017 10:55:39 -0400
Subject: sub_80E7324

---
 src/record_mixing.c | 107 +++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 106 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/record_mixing.c b/src/record_mixing.c
index 902dcde1d..c57dc9dae 100644
--- a/src/record_mixing.c
+++ b/src/record_mixing.c
@@ -20,6 +20,7 @@
 #include "script.h"
 #include "event_data.h"
 #include "strings.h"
+#include "string_util.h"
 #include "record_mixing.h"
 
 // Static type declarations
@@ -64,7 +65,11 @@ EWRAM_DATA struct PlayerRecords *gUnknown_0203A018 = NULL;
 // Static ROM declarations
 
 static void sub_80E715C(u8 taskId);
-void sub_80E7324(u8 taskId);
+static void sub_80E7324(u8 taskId);
+void sub_80E756C(u8 taskId);
+void sub_80E7630(u8 taskId);
+u8 sub_80E7810(void);
+void sub_80E7808(struct PlayerRecords *records, s16 *a1);
 void sub_80E78C4(OldMan *, size_t, u8);
 void sub_80E7948(void *, size_t, u8);
 void sub_80E7A14(LilycoveLady *, size_t, u8);
@@ -296,3 +301,103 @@ static void sub_80E715C(u8 taskId)
             break;
     }
 }
+
+static void sub_80E7324(u8 taskId)
+{
+    u8 r4;
+    u8 taskId2;
+    struct Task *task;
+
+    task = &gTasks[taskId];
+    switch (task->data[0])
+    {
+        case 0:
+            sub_80E70F4(gText_MixingRecords);
+            task->data[8] = 0x708;
+            task->data[0] = 400;
+            sub_8009FAC();
+            break;
+        case 100:
+            if (++ task->data[12] > 20)
+            {
+                task->data[12] = 0;
+                task->data[0] = 101;
+            }
+            break;
+        case 101:
+            r4 = sub_800ABAC();
+            if (sub_800ABBC() == TRUE)
+            {
+                if (r4 == sub_800AA48())
+                {
+                    PlaySE(SE_PIN);
+                    task->data[0] = 201;
+                    task->data[12] = 0;
+                }
+            }
+            else
+            {
+                PlaySE(SE_BOO);
+                task->data[0] = 301;
+            }
+            break;
+        case 201:
+            if (sub_800AA48() == sub_800ABAC() && ++ task->data[12] > (sub_800ABAC() * 30))
+            {
+                sub_800A620();
+                task->data[0] = 1;
+            }
+            break;
+        case 301:
+            if (sub_800AA48() == sub_800ABAC())
+            {
+                task->data[0] = 1;
+            }
+            break;
+        case 400:
+            if (++ task->data[12] > 20)
+            {
+                task->data[0] = 1;
+                task->data[12] = 0;
+            }
+            break;
+        case 1:
+            if (gReceivedRemoteLinkPlayers != 0)
+            {
+                ConvertIntToDecimalStringN(gStringVar1, sub_80E7810(), STR_CONV_MODE_LEADING_ZEROS, 2);
+                task->data[0] = 5;
+            }
+            break;
+        case 2:
+            task->data[6] = sub_800ABAC();
+            task->data[0] = 0;
+            task->data[5] = sub_80E7810();
+            task->func = sub_80E756C;
+            if (Link_AnyPartnersPlayingRubyOrSapphrie())
+            {
+                sub_80E7808(gUnknown_0203A018, &task->data[2]);
+                taskId2 = CreateTask(sub_80E7630, 80);
+                task->data[10] = taskId2;
+                gTasks[taskId2].data[0] = taskId;
+                sub_80E7808(gUnknown_0203A014, &gTasks[taskId2].data[5]);
+                gUnknown_0300115C = 0x1230;
+            }
+            else
+            {
+                sub_80E7808(gUnknown_0203A018, &task->data[2]);
+                taskId2 = CreateTask(sub_80E7630, 80);
+                task->data[10] = taskId2;
+                gTasks[taskId2].data[0] = taskId;
+                sub_80E7808(gUnknown_0203A014, &gTasks[taskId2].data[5]);
+                gUnknown_0300115C = 0x1444;
+            }
+            break;
+        case 5:
+            if (++ task->data[10] > 60)
+            {
+                task->data[10] = 0;
+                task->data[0] = 2;
+            }
+            break;
+    }
+}
-- 
cgit v1.2.3


From 6c746425ed48ba6d4d6519959b13914192da95b7 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sat, 4 Nov 2017 11:16:07 -0400
Subject: sub_80E756C

---
 src/record_mixing.c | 46 +++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 45 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/record_mixing.c b/src/record_mixing.c
index c57dc9dae..9dd3be0fe 100644
--- a/src/record_mixing.c
+++ b/src/record_mixing.c
@@ -66,8 +66,10 @@ EWRAM_DATA struct PlayerRecords *gUnknown_0203A018 = NULL;
 
 static void sub_80E715C(u8 taskId);
 static void sub_80E7324(u8 taskId);
-void sub_80E756C(u8 taskId);
+static void sub_80E756C(u8 taskId);
 void sub_80E7630(u8 taskId);
+void sub_80E77D4(u8 taskId);
+void *sub_80E77FC(s16 *asShort);
 u8 sub_80E7810(void);
 void sub_80E7808(struct PlayerRecords *records, s16 *a1);
 void sub_80E78C4(OldMan *, size_t, u8);
@@ -401,3 +403,45 @@ static void sub_80E7324(u8 taskId)
             break;
     }
 }
+
+static void sub_80E756C(u8 taskId)
+{
+    struct Task *task;
+    void *dest;
+
+    task = &gTasks[taskId];
+    switch (task->data[0])
+    {
+        case 0:
+            dest = sub_80E77FC(&task->data[2]) + task->data[4] * 200;
+            memcpy(gBlockSendBuffer, dest, 200);
+            task->data[0] ++;
+            break;
+        case 1:
+            if (GetMultiplayerId() == 0)
+            {
+                sub_800A4D8(1);
+            }
+            task->data[0] ++;
+            break;
+        case 2:
+            break;
+        case 3:
+            task->data[4] ++;
+            if (task->data[4] == gUnknown_0300115C / 200 + 1)
+            {
+                task->data[0] ++;
+            }
+            else
+            {
+                task->data[0] = 0;
+            }
+            break;
+        case 4:
+            if (!gTasks[task->data[10]].isActive)
+            {
+                task->func = sub_80E77D4;
+            }
+            break;
+    }
+}
-- 
cgit v1.2.3


From d921e555d20151c420eb0dab03913125a7bbf1fb Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sat, 4 Nov 2017 11:39:23 -0400
Subject: sub_80E7630

---
 src/record_mixing.c | 47 ++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 46 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/record_mixing.c b/src/record_mixing.c
index 9dd3be0fe..d00634212 100644
--- a/src/record_mixing.c
+++ b/src/record_mixing.c
@@ -67,10 +67,11 @@ EWRAM_DATA struct PlayerRecords *gUnknown_0203A018 = NULL;
 static void sub_80E715C(u8 taskId);
 static void sub_80E7324(u8 taskId);
 static void sub_80E756C(u8 taskId);
-void sub_80E7630(u8 taskId);
+static void sub_80E7630(u8 taskId);
 void sub_80E77D4(u8 taskId);
 void *sub_80E77FC(s16 *asShort);
 u8 sub_80E7810(void);
+void *sub_80E7820(u8);
 void sub_80E7808(struct PlayerRecords *records, s16 *a1);
 void sub_80E78C4(OldMan *, size_t, u8);
 void sub_80E7948(void *, size_t, u8);
@@ -445,3 +446,47 @@ static void sub_80E756C(u8 taskId)
             break;
     }
 }
+
+static void sub_80E7630(u8 taskId)
+{
+    struct Task *task;
+    u8 status;
+    u8 counter;
+    u8 i;
+    void *dest;
+    void *src;
+
+    task = &gTasks[taskId];
+    status = GetBlockReceivedStatus();
+    counter = 0;
+    if (status == sub_800A9D8())
+    {
+        for (i = 0; i < GetLinkPlayerCount(); i ++)
+        {
+            if ((status >> i) & 0x01)
+            {
+                dest = sub_80E77FC(&task->data[5]) + task->data[i + 1] * 200 + gUnknown_0300115C * i;
+                src = sub_80E7820(i);
+                if ((task->data[i + 1] + 1) * 200 > gUnknown_0300115C)
+                {
+                    memcpy(dest, src, gUnknown_0300115C - task->data[i + 1] * 200);
+                }
+                else
+                {
+                    memcpy(dest, src, 200);
+                }
+                ResetBlockReceivedFlag(i);
+                task->data[i + 1] ++;
+                if (task->data[i + 1] == gUnknown_0300115C / 200 + 1)
+                {
+                    counter ++;
+                }
+            }
+        }
+        gTasks[task->data[0]].data[0] ++;
+    }
+    if (counter == GetLinkPlayerCount())
+    {
+        DestroyTask(taskId);
+    }
+}
-- 
cgit v1.2.3


From cd4aa5efe5e3ca9ad96ceee0462ff69c99d3fc92 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sat, 4 Nov 2017 11:49:28 -0400
Subject: through sub_80E7820

---
 src/record_mixing.c | 71 +++++++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 61 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/record_mixing.c b/src/record_mixing.c
index d00634212..01b19cbb3 100644
--- a/src/record_mixing.c
+++ b/src/record_mixing.c
@@ -68,11 +68,11 @@ static void sub_80E715C(u8 taskId);
 static void sub_80E7324(u8 taskId);
 static void sub_80E756C(u8 taskId);
 static void sub_80E7630(u8 taskId);
-void sub_80E77D4(u8 taskId);
-void *sub_80E77FC(s16 *asShort);
-u8 sub_80E7810(void);
-void *sub_80E7820(u8);
-void sub_80E7808(struct PlayerRecords *records, s16 *a1);
+static void sub_80E77D4(u8 taskId);
+static void *sub_80E77FC(const u16 *asShort);
+static void sub_80E7808(void *records, u16 *a1);
+static u8 sub_80E7810(void);
+static void *sub_80E7820(u8);
 void sub_80E78C4(OldMan *, size_t, u8);
 void sub_80E7948(void *, size_t, u8);
 void sub_80E7A14(LilycoveLady *, size_t, u8);
@@ -378,20 +378,20 @@ static void sub_80E7324(u8 taskId)
             task->func = sub_80E756C;
             if (Link_AnyPartnersPlayingRubyOrSapphrie())
             {
-                sub_80E7808(gUnknown_0203A018, &task->data[2]);
+                sub_80E7808(gUnknown_0203A018, (u16 *)&task->data[2]);
                 taskId2 = CreateTask(sub_80E7630, 80);
                 task->data[10] = taskId2;
                 gTasks[taskId2].data[0] = taskId;
-                sub_80E7808(gUnknown_0203A014, &gTasks[taskId2].data[5]);
+                sub_80E7808(gUnknown_0203A014, (u16 *)&gTasks[taskId2].data[5]);
                 gUnknown_0300115C = 0x1230;
             }
             else
             {
-                sub_80E7808(gUnknown_0203A018, &task->data[2]);
+                sub_80E7808(gUnknown_0203A018, (u16 *)&task->data[2]);
                 taskId2 = CreateTask(sub_80E7630, 80);
                 task->data[10] = taskId2;
                 gTasks[taskId2].data[0] = taskId;
-                sub_80E7808(gUnknown_0203A014, &gTasks[taskId2].data[5]);
+                sub_80E7808(gUnknown_0203A014, (u16 *)&gTasks[taskId2].data[5]);
                 gUnknown_0300115C = 0x1444;
             }
             break;
@@ -465,7 +465,7 @@ static void sub_80E7630(u8 taskId)
         {
             if ((status >> i) & 0x01)
             {
-                dest = sub_80E77FC(&task->data[5]) + task->data[i + 1] * 200 + gUnknown_0300115C * i;
+                dest = sub_80E77FC((u16 *)&task->data[5]) + task->data[i + 1] * 200 + gUnknown_0300115C * i;
                 src = sub_80E7820(i);
                 if ((task->data[i + 1] + 1) * 200 > gUnknown_0300115C)
                 {
@@ -490,3 +490,54 @@ static void sub_80E7630(u8 taskId)
         DestroyTask(taskId);
     }
 }
+
+static void sub_80E776C(u8 taskId)
+{
+    struct Task *task;
+
+    task = &gTasks[taskId];
+    if (!gTasks[task->data[10]].isActive)
+    {
+        DestroyTask(taskId);
+    }
+}
+
+static void sub_80E77A0(u8 taskId)
+{
+    struct Task *task;
+
+    task = &gTasks[taskId];
+    task->func = sub_80E776C;
+    if (gUnknown_03001130 == TRUE)
+    {
+        sub_80E6F60(task->data[5]);
+    }
+}
+
+static void sub_80E77D4(u8 taskId)
+{
+    gTasks[taskId].func = sub_80E77A0;
+    gUnknown_03001130 = TRUE;
+}
+
+
+static void *sub_80E77FC(const u16 *asShort)
+{
+    return (void *)(asShort[0] | (asShort[1] << 16));
+}
+
+static void sub_80E7808(void *data, u16 *asShort)
+{
+    asShort[0] = (u32)data;
+    asShort[1] = ((u32)data >> 16);
+}
+
+static u8 sub_80E7810(void)
+{
+    return GetMultiplayerId();
+}
+
+static void *sub_80E7820(u8 id)
+{
+    return gBlockRecvBuffer[id];
+}
-- 
cgit v1.2.3


From fb9e5cb3a411a1186a029e089ee63a3f9928457b Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sat, 4 Nov 2017 12:03:50 -0400
Subject: sub_80E7830

---
 src/record_mixing.c | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

(limited to 'src')

diff --git a/src/record_mixing.c b/src/record_mixing.c
index 01b19cbb3..14afd57ce 100644
--- a/src/record_mixing.c
+++ b/src/record_mixing.c
@@ -94,6 +94,10 @@ void TaskDummy4(void *src);
 
 // .rodata
 
+extern const u8 gUnknown_0858CF8C[];
+extern const u8 gUnknown_0858CF8E[][3];
+extern const u8 gUnknown_0858CF94[][4];
+
 // .text
 
 void sub_80E6BE8(void)
@@ -541,3 +545,33 @@ static void *sub_80E7820(u8 id)
 {
     return gBlockRecvBuffer[id];
 }
+
+void sub_80E7830(u32 *data)
+{
+    u32 i;
+    u32 linkTrainerId;
+
+    switch ((u32)GetLinkPlayerCount())
+    {
+        case 2:
+            for (i = 0; i < 2; i ++)
+            {
+                data[i] = gUnknown_0858CF8C[i];
+            }
+            break;
+        case 3:
+            linkTrainerId = GetLinkPlayerTrainerId(0) % 2;
+            for (i = 0; i < 3; i ++)
+            {
+                data[i] = gUnknown_0858CF8E[linkTrainerId][i];
+            }
+            break;
+        case 4:
+            linkTrainerId = GetLinkPlayerTrainerId(0) % 9;
+            for (i = 0; i < 4; i ++)
+            {
+                data[i] = gUnknown_0858CF94[linkTrainerId][i];
+            }
+            break;
+    }
+}
-- 
cgit v1.2.3


From 158e9ff7623a8eba3e00c962e1050c6937bf535a Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sat, 4 Nov 2017 12:20:40 -0400
Subject: sub_80E78C4

---
 src/record_mixing.c | 29 ++++++++++++++++++++++++++---
 1 file changed, 26 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/record_mixing.c b/src/record_mixing.c
index 14afd57ce..6670663f4 100644
--- a/src/record_mixing.c
+++ b/src/record_mixing.c
@@ -160,7 +160,7 @@ void sub_80E6E24(void)
     sub_80E9914();
     sub_80F0BB8();
     sub_80E6BF8();
-    if (Link_AnyPartnersPlayingRubyOrSapphrie())
+    if (Link_AnyPartnersPlayingRubyOrSapphire())
     {
         if (sub_800A03C() == FALSE)
         {
@@ -193,7 +193,7 @@ void sub_80E6E24(void)
 
 void sub_80E6F60(u32 a0)
 {
-    if (Link_AnyPartnersPlayingRubyOrSapphrie())
+    if (Link_AnyPartnersPlayingRubyOrSapphire())
     {
         // Ruby/Sapphire
         sub_80E7B2C(gUnknown_0203A014[0].tvShows);
@@ -380,7 +380,7 @@ static void sub_80E7324(u8 taskId)
             task->data[0] = 0;
             task->data[5] = sub_80E7810();
             task->func = sub_80E756C;
-            if (Link_AnyPartnersPlayingRubyOrSapphrie())
+            if (Link_AnyPartnersPlayingRubyOrSapphire())
             {
                 sub_80E7808(gUnknown_0203A018, (u16 *)&task->data[2]);
                 taskId2 = CreateTask(sub_80E7630, 80);
@@ -575,3 +575,26 @@ void sub_80E7830(u32 *data)
             break;
     }
 }
+
+void sub_80E78C4(OldMan *oldMan, size_t recordSize, u8 which)
+{
+    u8 version;
+    u16 language;
+    OldMan *dest;
+    u32 data[4];
+
+    sub_80E7830(data);
+    dest = (OldMan *)((void *)oldMan + recordSize * data[which]);
+    version = gLinkPlayers[data[which]].version;
+    language = gLinkPlayers[data[which]].language;
+    if (Link_AnyPartnersPlayingRubyOrSapphire())
+    {
+        sub_8120D34(dest, version, language);
+    }
+    else
+    {
+        sub_8120CD0(dest, version, language);
+    }
+    memcpy(gUnknown_03001140, (OldMan *)((void *)oldMan + recordSize * data[which]), sizeof(OldMan));
+    sub_8120670();
+}
-- 
cgit v1.2.3


From f2e723660bba8432f398784f9a1ea0d609e24e8d Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sat, 4 Nov 2017 18:48:13 -0400
Subject: sub_80E7948

---
 src/record_mixing.c | 88 +++++++++++++++++++++++++++++++++++++----------------
 1 file changed, 61 insertions(+), 27 deletions(-)

(limited to 'src')

diff --git a/src/record_mixing.c b/src/record_mixing.c
index 6670663f4..6f09e30e2 100644
--- a/src/record_mixing.c
+++ b/src/record_mixing.c
@@ -3,6 +3,8 @@
 #include "global.h"
 #include "malloc.h"
 #include "task.h"
+#include "species.h"
+#include "pokemon.h"
 #include "cable_club.h"
 #include "link.h"
 #include "tv.h"
@@ -32,9 +34,7 @@ struct PlayerRecords {
     /* 0x1044 */ OldMan oldMan;
     /* 0x1084 */ struct EasyChatPair easyChatPair[5];
     /* 0x10ac */ u8 unk_10ac[0x78];
-    /* 0x1124 */ u8 unk_1124[0xa4];
-    /* 0x11c8 */ u16 unk_11c8;
-    /* 0x11ca */ u8 filler_11ca[0x46];
+    /* 0x1124 */ union BattleTowerRecord battleTowerRecord;
     /* 0x1210 */ u16 unk_1210;
     /* 0x1214 */ LilycoveLady lilycoveLady;
     /* 0x1254 */ u8 unk_1254[0x88];
@@ -73,8 +73,8 @@ static void *sub_80E77FC(const u16 *asShort);
 static void sub_80E7808(void *records, u16 *a1);
 static u8 sub_80E7810(void);
 static void *sub_80E7820(u8);
-void sub_80E78C4(OldMan *, size_t, u8);
-void sub_80E7948(void *, size_t, u8);
+static void sub_80E78C4(OldMan *, size_t, u8);
+static void sub_80E7948(union BattleTowerRecord *, size_t, u8);
 void sub_80E7A14(LilycoveLady *, size_t, u8);
 void sub_80E7B2C(TVShow *);
 void sub_80E7B60(void *, size_t, u8, TVShow *);
@@ -85,12 +85,12 @@ void sub_80E8468(void *, size_t, u8);
 void sub_80E89AC(void *, size_t, u8);
 void sub_80E89F8(void *dest);
 void sub_80E8A54(void *src);
-void sub_80E8AC0(void *);
+void sub_80E8AC0(union BattleTowerRecord *);
 void sub_80EAF80(struct SecretBaseRecord *, size_t, u8);
 void sub_80F01E8(void *, size_t, u8);
 void sub_80F0C7C(PokeNews *, size_t, u8);
 void sub_812287C(struct EasyChatPair *, size_t, u8);
-void TaskDummy4(void *src);
+void TaskDummy4(union BattleTowerRecord *src);
 
 // .rodata
 
@@ -128,10 +128,10 @@ void sub_80E6CA0(struct PlayerRecords *dest)
     memcpy(&dest->oldMan, gUnknown_03001140, sizeof(OldMan));
     memcpy(dest->easyChatPair, gUnknown_03001144, sizeof(struct EasyChatPair) * 5);
     sub_80E89F8(dest->unk_10ac);
-    sub_81659DC(gUnknown_0300114C, dest->unk_1124);
+    sub_81659DC(gUnknown_0300114C, &dest->battleTowerRecord);
     if (GetMultiplayerId() == 0)
     {
-        dest->unk_11c8 = sub_81539D4();
+        dest->battleTowerRecord.ruby_sapphire.unk_11c8 = sub_81539D4();
     }
 }
 
@@ -147,11 +147,11 @@ void sub_80E6D54(struct PlayerRecords *dest)
     memcpy(dest->easyChatPair, gUnknown_03001144, sizeof(struct EasyChatPair) * 5);
     sub_80E89F8(dest->unk_10ac);
     sub_80E8A54(dest->unk_10ac);
-    sub_81659DC(gUnknown_0300114C, dest->unk_1124);
-    TaskDummy4(dest->unk_1124);
+    sub_81659DC(gUnknown_0300114C, &dest->battleTowerRecord);
+    TaskDummy4(&dest->battleTowerRecord);
     if (GetMultiplayerId() == 0)
     {
-        dest->unk_11c8 = sub_81539D4();
+        dest->battleTowerRecord.ruby_sapphire.unk_11c8 = sub_81539D4();
     }
 }
 
@@ -180,8 +180,8 @@ void sub_80E6E24(void)
         memcpy(&gUnknown_0203A018->lilycoveLady, gUnknown_03001150, sizeof(LilycoveLady));
         memcpy(gUnknown_0203A018->easyChatPair, gUnknown_03001144, sizeof(struct EasyChatPair) * 5);
         sub_80E89F8(gUnknown_0203A018->unk_10ac);
-        memcpy(gUnknown_0203A018->unk_1124, gUnknown_0300114C, 0xec);
-        sub_80E8AC0(gUnknown_0203A018->unk_1124);
+        memcpy(&gUnknown_0203A018->battleTowerRecord, gUnknown_0300114C, 0xec);
+        sub_80E8AC0(&gUnknown_0203A018->battleTowerRecord);
         if (GetMultiplayerId() == 0)
         {
             gUnknown_0203A018->unk_1210 = sub_81539D4();
@@ -199,12 +199,12 @@ void sub_80E6F60(u32 a0)
         sub_80E7B2C(gUnknown_0203A014[0].tvShows);
         sub_80EAF80(gUnknown_0203A014[0].secretBases, 0x1230, a0);
         sub_80E7B60(gUnknown_0203A014[0].unk_10ac, 0x1230, a0, gUnknown_0203A014[0].tvShows);
-        sub_80E7948(gUnknown_0203A014[0].unk_1124, 0x1230, a0);
+        sub_80E7948(&gUnknown_0203A014[0].battleTowerRecord, 0x1230, a0);
         sub_80F01E8(gUnknown_0203A014[0].tvShows, 0x1230, a0);
         sub_80F0C7C(gUnknown_0203A014[0].pokeNews, 0x1230, a0);
         sub_80E78C4(&gUnknown_0203A014[0].oldMan, 0x1230, a0);
         sub_812287C(gUnknown_0203A014[0].easyChatPair, 0x1230, a0);
-        sub_80E7F68(&gUnknown_0203A014[0].unk_11c8, a0);
+        sub_80E7F68(&gUnknown_0203A014[0].battleTowerRecord.ruby_sapphire.unk_11c8, a0);
     }
     else
     {
@@ -216,7 +216,7 @@ void sub_80E6F60(u32 a0)
         sub_80E78C4(&gUnknown_0203A014[0].oldMan, 0x1444, a0);
         sub_812287C(gUnknown_0203A014[0].easyChatPair, 0x1444, a0);
         sub_80E7B60(gUnknown_0203A014[0].unk_10ac, 0x1444, a0, gUnknown_0203A014[0].tvShows);
-        sub_80E7948(gUnknown_0203A014[0].unk_1124, 0x1444, a0);
+        sub_80E7948(&gUnknown_0203A014[0].battleTowerRecord, 0x1444, a0);
         sub_80E7F68(&gUnknown_0203A014[0].unk_1210, a0);
         sub_80E7A14(&gUnknown_0203A014[0].lilycoveLady, 0x1444, a0);
         sub_80E8468(gUnknown_0203A014[0].unk_1254, 0x1444, a0);
@@ -530,10 +530,10 @@ static void *sub_80E77FC(const u16 *asShort)
     return (void *)(asShort[0] | (asShort[1] << 16));
 }
 
-static void sub_80E7808(void *data, u16 *asShort)
+static void sub_80E7808(void *records, u16 *asShort)
 {
-    asShort[0] = (u32)data;
-    asShort[1] = ((u32)data >> 16);
+    asShort[0] = (u32)records;
+    asShort[1] = ((u32)records >> 16);
 }
 
 static u8 sub_80E7810(void)
@@ -576,17 +576,17 @@ void sub_80E7830(u32 *data)
     }
 }
 
-void sub_80E78C4(OldMan *oldMan, size_t recordSize, u8 which)
+static void sub_80E78C4(OldMan *oldMan, size_t recordSize, u8 which)
 {
     u8 version;
     u16 language;
     OldMan *dest;
-    u32 data[4];
+    u32 mixIndices[4];
 
-    sub_80E7830(data);
-    dest = (OldMan *)((void *)oldMan + recordSize * data[which]);
-    version = gLinkPlayers[data[which]].version;
-    language = gLinkPlayers[data[which]].language;
+    sub_80E7830(mixIndices);
+    dest = (OldMan *)((void *)oldMan + recordSize * mixIndices[which]);
+    version = gLinkPlayers[mixIndices[which]].version;
+    language = gLinkPlayers[mixIndices[which]].language;
     if (Link_AnyPartnersPlayingRubyOrSapphire())
     {
         sub_8120D34(dest, version, language);
@@ -595,6 +595,40 @@ void sub_80E78C4(OldMan *oldMan, size_t recordSize, u8 which)
     {
         sub_8120CD0(dest, version, language);
     }
-    memcpy(gUnknown_03001140, (OldMan *)((void *)oldMan + recordSize * data[which]), sizeof(OldMan));
+    memcpy(gUnknown_03001140, (OldMan *)((void *)oldMan + recordSize * mixIndices[which]), sizeof(OldMan));
     sub_8120670();
 }
+
+static void sub_80E7948(union BattleTowerRecord *battleTowerRecord, size_t recordSize, u8 which)
+{
+    union BattleTowerRecord *r6;
+    struct UnknownPokemonStruct *btPokemon;
+    u32 mixIndices[4];
+    s32 i;
+
+    sub_80E7830(mixIndices);
+    if (Link_AnyPartnersPlayingRubyOrSapphire())
+    {
+        if (sub_816587C((union BattleTowerRecord *)((void *)battleTowerRecord + recordSize * mixIndices[which]), (union BattleTowerRecord *)((void *)battleTowerRecord + recordSize * which)) == TRUE)
+        {
+            r6 = (union BattleTowerRecord *)((void *)battleTowerRecord + recordSize * which);
+            r6->emerald.language = gLinkPlayers[mixIndices[which]].language;
+            sub_8164F70(r6);
+        }
+    }
+    else
+    {
+        memcpy((union BattleTowerRecord *)((void *)battleTowerRecord + recordSize * which), (union BattleTowerRecord *)((void *)battleTowerRecord + recordSize * mixIndices[which]), sizeof(union BattleTowerRecord));
+        r6 = (union BattleTowerRecord *)((void *)battleTowerRecord + recordSize * which);
+        for (i = 0; i < 4; i ++)
+        {
+            btPokemon = &r6->emerald.party[i];
+            if (btPokemon->species != SPECIES_NONE && IsStringJapanese(btPokemon->nickname))
+            {
+                ConvertInternationalString(btPokemon->nickname, LANGUAGE_JAPANESE);
+            }
+        }
+        sub_8164F70(r6);
+    }
+    sub_81628A0((union BattleTowerRecord *)((void *)battleTowerRecord + recordSize * which));
+}
-- 
cgit v1.2.3


From 8d05aeccec2efb8943823124aaca79277d5ed305 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sat, 4 Nov 2017 19:03:41 -0400
Subject: sub_80E7A14

---
 src/lilycove_lady.c | 10 +++++-----
 src/record_mixing.c | 56 ++++++++++++++++++++++++++++++++++++++++-------------
 2 files changed, 48 insertions(+), 18 deletions(-)

(limited to 'src')

diff --git a/src/lilycove_lady.c b/src/lilycove_lady.c
index 3b7ae49f2..64e28ecc9 100644
--- a/src/lilycove_lady.c
+++ b/src/lilycove_lady.c
@@ -879,26 +879,26 @@ void sub_818E564(void)
     EnableBothScriptContexts();
 }
 
-void sub_818E570(const struct LilycoveLadyQuiz *quiz)
+void sub_818E570(const LilycoveLady *lilycoveLady)
 {
     u8 i;
 
     gUnknown_0203CD68 = &gSaveBlock1Ptr->lilycoveLady.quiz;
-    if (quiz->unk_02c < 16 && gUnknown_0203CD68->id == LILYCOVE_LADY_QUIZ)
+    if (lilycoveLady->quiz.unk_02c < 16 && gUnknown_0203CD68->id == LILYCOVE_LADY_QUIZ)
     {
         for (i = 0; i < 4; i ++)
         {
-            if (quiz->unk_02c != gUnknown_0203CD68->unk_02b)
+            if (lilycoveLady->quiz.unk_02c != gUnknown_0203CD68->unk_02b)
             {
                 break;
             }
             gUnknown_0203CD68->unk_02b = Random() % 16;
         }
-        if (quiz->unk_02c == gUnknown_0203CD68->unk_02b)
+        if (lilycoveLady->quiz.unk_02c == gUnknown_0203CD68->unk_02b)
         {
             gUnknown_0203CD68->unk_02b = (gUnknown_0203CD68->unk_02b + 1) % 16;
         }
-        gUnknown_0203CD68->unk_02c = quiz->unk_02c;
+        gUnknown_0203CD68->unk_02c = lilycoveLady->quiz.unk_02c;
     }
 }
 
diff --git a/src/record_mixing.c b/src/record_mixing.c
index 6f09e30e2..9157597dd 100644
--- a/src/record_mixing.c
+++ b/src/record_mixing.c
@@ -21,6 +21,7 @@
 #include "fldeff_80F9BCC.h"
 #include "script.h"
 #include "event_data.h"
+#include "lilycove_lady.h"
 #include "strings.h"
 #include "string_util.h"
 #include "record_mixing.h"
@@ -75,7 +76,7 @@ static u8 sub_80E7810(void);
 static void *sub_80E7820(u8);
 static void sub_80E78C4(OldMan *, size_t, u8);
 static void sub_80E7948(union BattleTowerRecord *, size_t, u8);
-void sub_80E7A14(LilycoveLady *, size_t, u8);
+static void sub_80E7A14(LilycoveLady *, size_t, u8);
 void sub_80E7B2C(TVShow *);
 void sub_80E7B60(void *, size_t, u8, TVShow *);
 void sub_80E7F68(void *, u8);
@@ -584,7 +585,7 @@ static void sub_80E78C4(OldMan *oldMan, size_t recordSize, u8 which)
     u32 mixIndices[4];
 
     sub_80E7830(mixIndices);
-    dest = (OldMan *)((void *)oldMan + recordSize * mixIndices[which]);
+    dest = (void *)oldMan + recordSize * mixIndices[which];
     version = gLinkPlayers[mixIndices[which]].version;
     language = gLinkPlayers[mixIndices[which]].language;
     if (Link_AnyPartnersPlayingRubyOrSapphire())
@@ -595,13 +596,13 @@ static void sub_80E78C4(OldMan *oldMan, size_t recordSize, u8 which)
     {
         sub_8120CD0(dest, version, language);
     }
-    memcpy(gUnknown_03001140, (OldMan *)((void *)oldMan + recordSize * mixIndices[which]), sizeof(OldMan));
+    memcpy(gUnknown_03001140, (void *)oldMan + recordSize * mixIndices[which], sizeof(OldMan));
     sub_8120670();
 }
 
 static void sub_80E7948(union BattleTowerRecord *battleTowerRecord, size_t recordSize, u8 which)
 {
-    union BattleTowerRecord *r6;
+    union BattleTowerRecord *dest;
     struct UnknownPokemonStruct *btPokemon;
     u32 mixIndices[4];
     s32 i;
@@ -609,26 +610,55 @@ static void sub_80E7948(union BattleTowerRecord *battleTowerRecord, size_t recor
     sub_80E7830(mixIndices);
     if (Link_AnyPartnersPlayingRubyOrSapphire())
     {
-        if (sub_816587C((union BattleTowerRecord *)((void *)battleTowerRecord + recordSize * mixIndices[which]), (union BattleTowerRecord *)((void *)battleTowerRecord + recordSize * which)) == TRUE)
+        if (sub_816587C((void *)battleTowerRecord + recordSize * mixIndices[which], (void *)battleTowerRecord + recordSize * which) == TRUE)
         {
-            r6 = (union BattleTowerRecord *)((void *)battleTowerRecord + recordSize * which);
-            r6->emerald.language = gLinkPlayers[mixIndices[which]].language;
-            sub_8164F70(r6);
+            dest = (void *)battleTowerRecord + recordSize * which;
+            dest->emerald.language = gLinkPlayers[mixIndices[which]].language;
+            sub_8164F70(dest);
         }
     }
     else
     {
-        memcpy((union BattleTowerRecord *)((void *)battleTowerRecord + recordSize * which), (union BattleTowerRecord *)((void *)battleTowerRecord + recordSize * mixIndices[which]), sizeof(union BattleTowerRecord));
-        r6 = (union BattleTowerRecord *)((void *)battleTowerRecord + recordSize * which);
+        memcpy((void *)battleTowerRecord + recordSize * which, (void *)battleTowerRecord + recordSize * mixIndices[which], sizeof(union BattleTowerRecord));
+        dest = (void *)battleTowerRecord + recordSize * which;
         for (i = 0; i < 4; i ++)
         {
-            btPokemon = &r6->emerald.party[i];
+            btPokemon = &dest->emerald.party[i];
             if (btPokemon->species != SPECIES_NONE && IsStringJapanese(btPokemon->nickname))
             {
                 ConvertInternationalString(btPokemon->nickname, LANGUAGE_JAPANESE);
             }
         }
-        sub_8164F70(r6);
+        sub_8164F70(dest);
+    }
+    sub_81628A0((void *)battleTowerRecord + recordSize * which);
+}
+
+static void sub_80E7A14(LilycoveLady *lilycoveLady, size_t recordSize, u8 which)
+{
+    LilycoveLady *dest;
+    u32 mixIndices[4];
+
+    sub_80E7830(mixIndices);
+    memcpy((void *)lilycoveLady + recordSize * which, gUnknown_03001150, sizeof(LilycoveLady));
+    if (GetLilycoveLadyId() == 0)
+    {
+        dest = malloc(sizeof(LilycoveLady));
+        if (dest == NULL)
+        {
+            return;
+        }
+        memcpy(dest, gUnknown_03001150, sizeof(LilycoveLady));
+    }
+    else
+    {
+        dest = NULL;
+    }
+    memcpy(gUnknown_03001150, (void *)lilycoveLady + recordSize * mixIndices[which], sizeof(LilycoveLady));
+    sub_818DA78();
+    if (dest != NULL)
+    {
+        sub_818E570(dest);
+        free(dest);
     }
-    sub_81628A0((union BattleTowerRecord *)((void *)battleTowerRecord + recordSize * which));
 }
-- 
cgit v1.2.3


From 0a17fc98f6cc08151aab395064185815e41ab898 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Mon, 6 Nov 2017 23:03:11 -0500
Subject: nonmatching sub_80E7B60

---
 src/record_mixing.c | 779 +++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 764 insertions(+), 15 deletions(-)

(limited to 'src')

diff --git a/src/record_mixing.c b/src/record_mixing.c
index 9157597dd..66972b650 100644
--- a/src/record_mixing.c
+++ b/src/record_mixing.c
@@ -2,6 +2,10 @@
 // Includes
 #include "global.h"
 #include "malloc.h"
+#include "rng.h"
+#include "items.h"
+#include "text.h"
+
 #include "task.h"
 #include "species.h"
 #include "pokemon.h"
@@ -34,7 +38,7 @@ struct PlayerRecords {
     /* 0x1004 */ PokeNews pokeNews[16];
     /* 0x1044 */ OldMan oldMan;
     /* 0x1084 */ struct EasyChatPair easyChatPair[5];
-    /* 0x10ac */ u8 unk_10ac[0x78];
+    /* 0x10ac */ struct UnkStruct_80E7B60 unk_10ac;
     /* 0x1124 */ union BattleTowerRecord battleTowerRecord;
     /* 0x1210 */ u16 unk_1210;
     /* 0x1214 */ LilycoveLady lilycoveLady;
@@ -50,16 +54,17 @@ IWRAM_DATA TVShow *gUnknown_03001138;
 IWRAM_DATA PokeNews *gUnknown_0300113C;
 IWRAM_DATA OldMan *gUnknown_03001140;
 IWRAM_DATA struct EasyChatPair *gUnknown_03001144;
-IWRAM_DATA struct DayCareMailRecordMixing *gUnknown_03001148;
+IWRAM_DATA struct UnkStruct_80E7B60 *gUnknown_03001148;
 IWRAM_DATA void *gUnknown_0300114C; // gSaveBlock2Ptr->field_64C
 IWRAM_DATA LilycoveLady *gUnknown_03001150;
 IWRAM_DATA void *gUnknown_03001154; // gSaveBlock2Ptr->field_0DC;
 IWRAM_DATA void *gUnknown_03001158; // gSaveBlock2Ptr->field_64C
 IWRAM_DATA u32 gUnknown_0300115C;
-IWRAM_DATA u8 gUnknown_03001160[8];
+IWRAM_DATA u8 gUnknown_03001160;
+IWRAM_DATA u32 filler_03001164;
 IWRAM_DATA u32 gUnknown_03001168[3];
 
-EWRAM_DATA struct DayCareMailRecordMixing gUnknown_02039F9C[2] = {};
+EWRAM_DATA struct UnkStruct_80E7B60 gUnknown_02039F9C = {};
 EWRAM_DATA struct PlayerRecords *gUnknown_0203A014 = NULL;
 EWRAM_DATA struct PlayerRecords *gUnknown_0203A018 = NULL;
 
@@ -77,8 +82,8 @@ static void *sub_80E7820(u8);
 static void sub_80E78C4(OldMan *, size_t, u8);
 static void sub_80E7948(union BattleTowerRecord *, size_t, u8);
 static void sub_80E7A14(LilycoveLady *, size_t, u8);
-void sub_80E7B2C(TVShow *);
-void sub_80E7B60(void *, size_t, u8, TVShow *);
+static void sub_80E7B2C(const u8 *);
+static void sub_80E7B60(struct UnkStruct_80E7B60 *, size_t, u8, TVShow *);
 void sub_80E7F68(void *, u8);
 void sub_80E7FF8(u8 taskId);
 void sub_80E8110(void *, void *);
@@ -99,6 +104,9 @@ extern const u8 gUnknown_0858CF8C[];
 extern const u8 gUnknown_0858CF8E[][3];
 extern const u8 gUnknown_0858CF94[][4];
 
+extern const u8 gUnknown_0858CFB8[3][2];
+extern const u8 gUnknown_0858CFBE[3][4];
+
 // .text
 
 void sub_80E6BE8(void)
@@ -113,7 +121,7 @@ void sub_80E6BF8(void)
     gUnknown_0300113C = gSaveBlock1Ptr->pokeNews;
     gUnknown_03001140 = &gSaveBlock1Ptr->oldMan;
     gUnknown_03001144 = gSaveBlock1Ptr->easyChatPairs;
-    gUnknown_03001148 = gUnknown_02039F9C;
+    gUnknown_03001148 = &gUnknown_02039F9C;
     gUnknown_0300114C = gSaveBlock2Ptr->field_64C;
     gUnknown_03001150 = &gSaveBlock1Ptr->lilycoveLady;
     gUnknown_03001154 = gSaveBlock2Ptr->field_0DC;
@@ -128,7 +136,7 @@ void sub_80E6CA0(struct PlayerRecords *dest)
     memcpy(dest->pokeNews, gUnknown_0300113C, sizeof(PokeNews) * 16);
     memcpy(&dest->oldMan, gUnknown_03001140, sizeof(OldMan));
     memcpy(dest->easyChatPair, gUnknown_03001144, sizeof(struct EasyChatPair) * 5);
-    sub_80E89F8(dest->unk_10ac);
+    sub_80E89F8(&dest->unk_10ac);
     sub_81659DC(gUnknown_0300114C, &dest->battleTowerRecord);
     if (GetMultiplayerId() == 0)
     {
@@ -146,8 +154,8 @@ void sub_80E6D54(struct PlayerRecords *dest)
     memcpy(&dest->oldMan, gUnknown_03001140, sizeof(OldMan));
     sub_8120B70(&dest->oldMan);
     memcpy(dest->easyChatPair, gUnknown_03001144, sizeof(struct EasyChatPair) * 5);
-    sub_80E89F8(dest->unk_10ac);
-    sub_80E8A54(dest->unk_10ac);
+    sub_80E89F8(&dest->unk_10ac);
+    sub_80E8A54(&dest->unk_10ac);
     sub_81659DC(gUnknown_0300114C, &dest->battleTowerRecord);
     TaskDummy4(&dest->battleTowerRecord);
     if (GetMultiplayerId() == 0)
@@ -180,7 +188,7 @@ void sub_80E6E24(void)
         memcpy(&gUnknown_0203A018->oldMan, gUnknown_03001140, sizeof(OldMan));
         memcpy(&gUnknown_0203A018->lilycoveLady, gUnknown_03001150, sizeof(LilycoveLady));
         memcpy(gUnknown_0203A018->easyChatPair, gUnknown_03001144, sizeof(struct EasyChatPair) * 5);
-        sub_80E89F8(gUnknown_0203A018->unk_10ac);
+        sub_80E89F8(&gUnknown_0203A018->unk_10ac);
         memcpy(&gUnknown_0203A018->battleTowerRecord, gUnknown_0300114C, 0xec);
         sub_80E8AC0(&gUnknown_0203A018->battleTowerRecord);
         if (GetMultiplayerId() == 0)
@@ -197,9 +205,9 @@ void sub_80E6F60(u32 a0)
     if (Link_AnyPartnersPlayingRubyOrSapphire())
     {
         // Ruby/Sapphire
-        sub_80E7B2C(gUnknown_0203A014[0].tvShows);
+        sub_80E7B2C((void *)gUnknown_0203A014[0].tvShows);
         sub_80EAF80(gUnknown_0203A014[0].secretBases, 0x1230, a0);
-        sub_80E7B60(gUnknown_0203A014[0].unk_10ac, 0x1230, a0, gUnknown_0203A014[0].tvShows);
+        sub_80E7B60(&gUnknown_0203A014[0].unk_10ac, 0x1230, a0, gUnknown_0203A014[0].tvShows);
         sub_80E7948(&gUnknown_0203A014[0].battleTowerRecord, 0x1230, a0);
         sub_80F01E8(gUnknown_0203A014[0].tvShows, 0x1230, a0);
         sub_80F0C7C(gUnknown_0203A014[0].pokeNews, 0x1230, a0);
@@ -210,13 +218,13 @@ void sub_80E6F60(u32 a0)
     else
     {
         // Emerald
-        sub_80E7B2C(gUnknown_0203A014[0].tvShows);
+        sub_80E7B2C((void *)gUnknown_0203A014[0].tvShows);
         sub_80EAF80(gUnknown_0203A014[0].secretBases, 0x1444, a0);
         sub_80F01E8(gUnknown_0203A014[0].tvShows, 0x1444, a0);
         sub_80F0C7C(gUnknown_0203A014[0].pokeNews, 0x1444, a0);
         sub_80E78C4(&gUnknown_0203A014[0].oldMan, 0x1444, a0);
         sub_812287C(gUnknown_0203A014[0].easyChatPair, 0x1444, a0);
-        sub_80E7B60(gUnknown_0203A014[0].unk_10ac, 0x1444, a0, gUnknown_0203A014[0].tvShows);
+        sub_80E7B60(&gUnknown_0203A014[0].unk_10ac, 0x1444, a0, gUnknown_0203A014[0].tvShows);
         sub_80E7948(&gUnknown_0203A014[0].battleTowerRecord, 0x1444, a0);
         sub_80E7F68(&gUnknown_0203A014[0].unk_1210, a0);
         sub_80E7A14(&gUnknown_0203A014[0].lilycoveLady, 0x1444, a0);
@@ -662,3 +670,744 @@ static void sub_80E7A14(LilycoveLady *lilycoveLady, size_t recordSize, u8 which)
         free(dest);
     }
 }
+
+static u8 sub_80E7A9C(struct DayCareMailRecordMixing *rmMail)
+{
+    return rmMail->mail.itemId;
+}
+
+static void sub_80E7AA4(struct UnkStruct_80E7B60 *src, size_t recordSize, u8 (*idxs)[2], u8 which0, u8 which1)
+{
+    struct DayCareMailRecordMixing buffer;
+    struct UnkStruct_80E7B60 *_src1;
+    struct UnkStruct_80E7B60 *_src2;
+
+    _src1 = (void *)src + recordSize * idxs[which0][0];
+    memcpy(&buffer, &_src1->unk_00[idxs[which0][1]], sizeof(struct DayCareMailRecordMixing));
+    _src2 = (void *)src + recordSize * idxs[which1][0];
+    memcpy(&_src1->unk_00[idxs[which0][1]], &_src2->unk_00[idxs[which1][1]], sizeof(struct DayCareMailRecordMixing));
+    memcpy(&_src2->unk_00[idxs[which1][1]], &buffer, sizeof(struct DayCareMailRecordMixing));
+}
+
+static void sub_80E7B2C(const u8 *src)
+{
+    u8 sum;
+    int i;
+
+    sum = 0;
+    for (i = 0; i < 256; i ++)
+    {
+        sum += src[i];
+    }
+    gUnknown_03001160 = sum;
+}
+
+static u8 sub_80E7B54(void)
+{
+    return gUnknown_03001160;
+}
+
+#ifdef NONMATCHING
+static void sub_80E7B60(struct UnkStruct_80E7B60 *src, size_t recordSize, u8 which, TVShow *shows)
+{
+    // r9 = which
+    u16 i;
+    u16 j;
+    u8 linkPlayerCount;
+    u16 language;
+    u16 otNameLanguage;
+    u16 nicknameLanguage;
+    u32 version;
+    u8 dcMail1;
+    u8 dcMail2;
+    u8 r1_80e7b54;
+    struct DayCareMailRecordMixing *recordMixingMail;
+    struct UnkStruct_80E7B60 *_src;
+    u8 sp04[4];
+    u8 sp08[4];
+    struct UnkStruct_80E7B60 *sp0c[4]; // -> sp+48
+    u8 sp1c[4][2]; // [][0] -> sp+4c, [][1] -> sp+50
+    u8 sp24[4][2];
+    // sp+2c = src
+    // sp+30 = recordSize
+    u8 sp34;
+    u16 oldSeed;
+    bool32 anyRS; // sp+3c
+
+    oldSeed = Random2();
+    SeedRng2(gLinkPlayers[0].trainerId);
+    linkPlayerCount = GetLinkPlayerCount();
+    for (i = 0; i < 4; i ++)
+    {
+        sp04[i] = 0xFF;
+        sp08[i] = 0;
+        sp1c[i][0] = 0;
+        sp1c[i][1] = 0;
+    }
+    anyRS = Link_AnyPartnersPlayingRubyOrSapphire();
+    for (i = 0; i < GetLinkPlayerCount(); i ++) // r8 = i
+    {
+        // sp+54 = linkPlayerCount << 16
+        // sp+44 = which * recordSize
+        _src = (void *)src + i * recordSize; // r7
+        language = gLinkPlayers[i].language; // r9
+        version = (u8)gLinkPlayers[i].version; // sp+40
+        for (j = 0; j < _src->unk_70; j ++)
+        {
+            // r10 = ~0x10
+            recordMixingMail = &_src->unk_00[j];
+            if (recordMixingMail->mail.itemId != ITEM_NONE)
+            {
+                if (anyRS)
+                {
+                    if (StringLength(recordMixingMail->OT_name) <= 5)
+                    {
+                        otNameLanguage = LANGUAGE_JAPANESE;
+                    }
+                    else
+                    {
+                        StripExtCtrlCodes(recordMixingMail->OT_name);
+                        otNameLanguage = language;
+                    }
+                    if (recordMixingMail->monName[0] == EXT_CTRL_CODE_BEGIN && recordMixingMail->monName[1] == EXT_CTRL_CODE_JPN)
+                    {
+                        StripExtCtrlCodes(recordMixingMail->monName);
+                        nicknameLanguage = LANGUAGE_JAPANESE;
+                    }
+                    else
+                    {
+                        nicknameLanguage = language;
+                    }
+                    if (version == VERSION_RUBY || version == VERSION_SAPPHIRE)
+                    {
+                        recordMixingMail->language_maybe = otNameLanguage;
+                        recordMixingMail->unknown = nicknameLanguage;
+                    }
+                }
+                else if (language == LANGUAGE_JAPANESE)
+                {
+                    if (IsStringJapanese(recordMixingMail->OT_name))
+                    {
+                        recordMixingMail->language_maybe = LANGUAGE_JAPANESE;
+                    }
+                    else
+                    {
+                        recordMixingMail->language_maybe = GAME_LANGUAGE;
+                    }
+                    if (IsStringJapanese(recordMixingMail->monName))
+                    {
+                        recordMixingMail->unknown = LANGUAGE_JAPANESE;
+                    }
+                    else
+                    {
+                        recordMixingMail->unknown = GAME_LANGUAGE;
+                    }
+                }
+            }
+        }
+    }
+    sp34 = 0;
+    for (i = 0; i < linkPlayerCount; i ++)
+    {
+        _src = (void *)src + i * recordSize; // r7
+        if (_src->unk_70 != 0)
+        {
+            for (j = 0; j < _src->unk_70; j ++)
+            {
+                if (_src->unk_74[j] == 0)
+                {
+                    sp1c[i][j] = 1;
+                }
+            }
+        }
+    }
+    i = 0;
+    for (j = 0; j < linkPlayerCount; j ++)
+    {
+        _src = (void *)src + j * recordSize;
+        if (sp1c[j][0] == TRUE || sp1c[j][1] == TRUE)
+        {
+            sp34 ++;
+        }
+        if (sp1c[j][0] == TRUE && sp1c[j][1] == FALSE)
+        {
+            sp24[i][0] = j;
+            sp24[i][1] = 0;
+            i ++;
+        }
+        else if (sp1c[j][0] == FALSE && sp1c[j][1] == TRUE)
+        {
+            sp24[i][0] = j;
+            sp24[i][1] = 0;
+            i ++;
+        }
+        else if (sp1c[j][0] == TRUE && sp1c[j][1] == TRUE)
+        {
+            sp24[i][0] = j;
+            dcMail1 = sub_80E7A9C(&_src->unk_00[0]);
+            dcMail2 = sub_80E7A9C(&_src->unk_00[1]);
+            if (!dcMail1 && dcMail2)
+            {
+                sp24[i][1] = 1;
+            }
+            else if ((dcMail1 && dcMail2) || (!dcMail1 && !dcMail2))
+            {
+                sp24[i][1] = Random2() % 2;
+            }
+            else
+            {
+                sp24[i][1] = 0;
+            }
+            i ++;
+        }
+    }
+    for (i = 0; i < 4; i ++)
+    {
+        _src = &src[which * recordSize];
+        sp0c[i] = _src;
+    }
+    r1_80e7b54 = sub_80E7B54() % 3;
+    switch (sp34)
+    {
+        case 2:
+            sub_80E7AA4(src, recordSize, sp24, 0, 1);
+            break;
+        case 3:
+            sub_80E7AA4(src, recordSize, sp24, gUnknown_0858CFB8[r1_80e7b54][0], gUnknown_0858CFB8[r1_80e7b54][1]);
+            break;
+        case 4:
+            sub_80E7AA4(src, recordSize, sp24, gUnknown_0858CFBE[r1_80e7b54][0], gUnknown_0858CFBE[r1_80e7b54][1]);
+            sub_80E7AA4(src, recordSize, sp24, gUnknown_0858CFBE[r1_80e7b54][2], gUnknown_0858CFBE[r1_80e7b54][3]);
+            break;
+    }
+    _src = (void *)src + which * recordSize;
+    memcpy(&gSaveBlock1Ptr->daycare.mons[0].mail, &_src->unk_00[0], sizeof(struct DayCareMailRecordMixing));
+    memcpy(&gSaveBlock1Ptr->daycare.mons[1].mail, &_src->unk_00[1], sizeof(struct DayCareMailRecordMixing));
+    SeedRng(oldSeed);
+}
+#else
+__attribute__((naked)) static void sub_80E7B60(struct UnkStruct_80E7B60 *src, size_t recordSize, u8 which, TVShow *shows)
+{
+    asm_unified("\tpush {r4-r7,lr}\n"
+                    "\tmov r7, r10\n"
+                    "\tmov r6, r9\n"
+                    "\tmov r5, r8\n"
+                    "\tpush {r5-r7}\n"
+                    "\tsub sp, 0x58\n"
+                    "\tstr r0, [sp, 0x2C]\n"
+                    "\tstr r1, [sp, 0x30]\n"
+                    "\tlsls r2, 24\n"
+                    "\tlsrs r2, 24\n"
+                    "\tmov r9, r2\n"
+                    "\tbl Random2\n"
+                    "\tlsls r0, 16\n"
+                    "\tlsrs r0, 16\n"
+                    "\tstr r0, [sp, 0x38]\n"
+                    "\tldr r0, =gLinkPlayers\n"
+                    "\tldrh r0, [r0, 0x4]\n"
+                    "\tbl SeedRng2\n"
+                    "\tbl GetLinkPlayerCount\n"
+                    "\tlsls r0, 24\n"
+                    "\tlsrs r4, r0, 24\n"
+                    "\tmovs r0, 0\n"
+                    "\tmov r8, r0\n"
+                    "\tmov r1, sp\n"
+                    "\tadds r1, 0x1C\n"
+                    "\tstr r1, [sp, 0x4C]\n"
+                    "\tmov r2, sp\n"
+                    "\tadds r2, 0x1D\n"
+                    "\tstr r2, [sp, 0x50]\n"
+                    "\tmov r3, sp\n"
+                    "\tadds r3, 0xC\n"
+                    "\tstr r3, [sp, 0x48]\n"
+                    "\tmovs r7, 0xFF\n"
+                    "\tadd r3, sp, 0x8\n"
+                    "\tmovs r2, 0\n"
+                    "\tadds r6, r1, 0\n"
+                    "\tldr r5, [sp, 0x50]\n"
+                    "_080E7BB0:\n"
+                    "\tmov r1, sp\n"
+                    "\tadd r1, r8\n"
+                    "\tadds r1, 0x4\n"
+                    "\tldrb r0, [r1]\n"
+                    "\torrs r0, r7\n"
+                    "\tstrb r0, [r1]\n"
+                    "\tmov r1, r8\n"
+                    "\tadds r0, r3, r1\n"
+                    "\tstrb r2, [r0]\n"
+                    "\tlsls r1, 1\n"
+                    "\tadds r0, r6, r1\n"
+                    "\tstrb r2, [r0]\n"
+                    "\tadds r1, r5, r1\n"
+                    "\tstrb r2, [r1]\n"
+                    "\tmov r0, r8\n"
+                    "\tadds r0, 0x1\n"
+                    "\tlsls r0, 16\n"
+                    "\tlsrs r0, 16\n"
+                    "\tmov r8, r0\n"
+                    "\tcmp r0, 0x3\n"
+                    "\tbls _080E7BB0\n"
+                    "\tbl Link_AnyPartnersPlayingRubyOrSapphire\n"
+                    "\tstr r0, [sp, 0x3C]\n"
+                    "\tmovs r2, 0\n"
+                    "\tmov r8, r2\n"
+                    "\tlsls r4, 16\n"
+                    "\tstr r4, [sp, 0x54]\n"
+                    "\tldr r0, [sp, 0x30]\n"
+                    "\tmov r3, r9\n"
+                    "\tmuls r3, r0\n"
+                    "\tstr r3, [sp, 0x44]\n"
+                    "\tb _080E7D04\n"
+                    "\t.pool\n"
+                    "_080E7BF8:\n"
+                    "\tldr r1, [sp, 0x30]\n"
+                    "\tmov r0, r8\n"
+                    "\tmuls r0, r1\n"
+                    "\tldr r2, [sp, 0x2C]\n"
+                    "\tadds r7, r2, r0\n"
+                    "\tldr r1, =gLinkPlayers\n"
+                    "\tmov r3, r8\n"
+                    "\tlsls r0, r3, 3\n"
+                    "\tsubs r0, r3\n"
+                    "\tlsls r0, 2\n"
+                    "\tadds r0, r1\n"
+                    "\tldrh r1, [r0, 0x1A]\n"
+                    "\tmov r9, r1\n"
+                    "\tldrb r0, [r0]\n"
+                    "\tstr r0, [sp, 0x40]\n"
+                    "\tmovs r6, 0\n"
+                    "\tldr r0, [r7, 0x70]\n"
+                    "\tcmp r6, r0\n"
+                    "\tbcs _080E7CFA\n"
+                    "\tmovs r2, 0x10\n"
+                    "\tnegs r2, r2\n"
+                    "\tmov r10, r2\n"
+                    "_080E7C24:\n"
+                    "\tlsls r0, r6, 3\n"
+                    "\tsubs r0, r6\n"
+                    "\tlsls r0, 3\n"
+                    "\tadds r5, r7, r0\n"
+                    "\tldrh r0, [r5, 0x20]\n"
+                    "\tcmp r0, 0\n"
+                    "\tbeq _080E7CEE\n"
+                    "\tldr r3, [sp, 0x3C]\n"
+                    "\tcmp r3, 0\n"
+                    "\tbeq _080E7C9A\n"
+                    "\tadds r4, r5, 0\n"
+                    "\tadds r4, 0x24\n"
+                    "\tadds r0, r4, 0\n"
+                    "\tbl StringLength\n"
+                    "\tlsls r0, 16\n"
+                    "\tlsrs r0, 16\n"
+                    "\tcmp r0, 0x5\n"
+                    "\tbhi _080E7C54\n"
+                    "\tmovs r4, 0x1\n"
+                    "\tb _080E7C5C\n"
+                    "\t.pool\n"
+                    "_080E7C54:\n"
+                    "\tadds r0, r4, 0\n"
+                    "\tbl StripExtCtrlCodes\n"
+                    "\tmov r4, r9\n"
+                    "_080E7C5C:\n"
+                    "\tldrh r1, [r5, 0x2C]\n"
+                    "\tldr r0, =0x000015fc\n"
+                    "\tcmp r1, r0\n"
+                    "\tbne _080E7C74\n"
+                    "\tadds r0, r5, 0\n"
+                    "\tadds r0, 0x2C\n"
+                    "\tbl StripExtCtrlCodes\n"
+                    "\tmovs r1, 0x1\n"
+                    "\tb _080E7C76\n"
+                    "\t.pool\n"
+                    "_080E7C74:\n"
+                    "\tmov r1, r9\n"
+                    "_080E7C76:\n"
+                    "\tldr r0, [sp, 0x40]\n"
+                    "\tsubs r0, 0x1\n"
+                    "\tcmp r0, 0x1\n"
+                    "\tbhi _080E7CEE\n"
+                    "\tadds r2, r5, 0\n"
+                    "\tadds r2, 0x37\n"
+                    "\tmovs r0, 0xF\n"
+                    "\tands r4, r0\n"
+                    "\tldrb r0, [r2]\n"
+                    "\tmov r3, r10\n"
+                    "\tands r0, r3\n"
+                    "\torrs r0, r4\n"
+                    "\tlsls r1, 4\n"
+                    "\tmovs r3, 0xF\n"
+                    "\tands r0, r3\n"
+                    "\torrs r0, r1\n"
+                    "\tstrb r0, [r2]\n"
+                    "\tb _080E7CEE\n"
+                    "_080E7C9A:\n"
+                    "\tmov r0, r9\n"
+                    "\tcmp r0, 0x1\n"
+                    "\tbne _080E7CEE\n"
+                    "\tadds r0, r5, 0\n"
+                    "\tadds r0, 0x24\n"
+                    "\tbl IsStringJapanese\n"
+                    "\tcmp r0, 0\n"
+                    "\tbeq _080E7CBA\n"
+                    "\tadds r0, r5, 0\n"
+                    "\tadds r0, 0x37\n"
+                    "\tldrb r1, [r0]\n"
+                    "\tmov r2, r10\n"
+                    "\tands r1, r2\n"
+                    "\tmovs r2, 0x1\n"
+                    "\tb _080E7CC6\n"
+                    "_080E7CBA:\n"
+                    "\tadds r0, r5, 0\n"
+                    "\tadds r0, 0x37\n"
+                    "\tldrb r1, [r0]\n"
+                    "\tmov r3, r10\n"
+                    "\tands r1, r3\n"
+                    "\tmovs r2, 0x2\n"
+                    "_080E7CC6:\n"
+                    "\torrs r1, r2\n"
+                    "\tstrb r1, [r0]\n"
+                    "\tadds r4, r0, 0\n"
+                    "\tadds r0, r5, 0\n"
+                    "\tadds r0, 0x2C\n"
+                    "\tbl IsStringJapanese\n"
+                    "\tcmp r0, 0\n"
+                    "\tbeq _080E7CE2\n"
+                    "\tldrb r0, [r4]\n"
+                    "\tmovs r1, 0xF\n"
+                    "\tands r1, r0\n"
+                    "\tmovs r0, 0x10\n"
+                    "\tb _080E7CEA\n"
+                    "_080E7CE2:\n"
+                    "\tldrb r0, [r4]\n"
+                    "\tmovs r1, 0xF\n"
+                    "\tands r1, r0\n"
+                    "\tmovs r0, 0x20\n"
+                    "_080E7CEA:\n"
+                    "\torrs r1, r0\n"
+                    "\tstrb r1, [r4]\n"
+                    "_080E7CEE:\n"
+                    "\tadds r0, r6, 0x1\n"
+                    "\tlsls r0, 16\n"
+                    "\tlsrs r6, r0, 16\n"
+                    "\tldr r0, [r7, 0x70]\n"
+                    "\tcmp r6, r0\n"
+                    "\tbcc _080E7C24\n"
+                    "_080E7CFA:\n"
+                    "\tmov r0, r8\n"
+                    "\tadds r0, 0x1\n"
+                    "\tlsls r0, 16\n"
+                    "\tlsrs r0, 16\n"
+                    "\tmov r8, r0\n"
+                    "_080E7D04:\n"
+                    "\tbl GetLinkPlayerCount\n"
+                    "\tlsls r0, 24\n"
+                    "\tlsrs r0, 24\n"
+                    "\tcmp r8, r0\n"
+                    "\tbcs _080E7D12\n"
+                    "\tb _080E7BF8\n"
+                    "_080E7D12:\n"
+                    "\tmovs r0, 0\n"
+                    "\tstr r0, [sp, 0x34]\n"
+                    "\tmov r8, r0\n"
+                    "\tldr r1, [sp, 0x54]\n"
+                    "\tlsrs r0, r1, 16\n"
+                    "\tldr r2, [sp, 0x34]\n"
+                    "\tcmp r2, r0\n"
+                    "\tbcs _080E7D70\n"
+                    "\tadds r5, r0, 0\n"
+                    "_080E7D24:\n"
+                    "\tldr r3, [sp, 0x30]\n"
+                    "\tmov r0, r8\n"
+                    "\tmuls r0, r3\n"
+                    "\tldr r1, [sp, 0x2C]\n"
+                    "\tadds r7, r1, r0\n"
+                    "\tldr r0, [r7, 0x70]\n"
+                    "\tcmp r0, 0\n"
+                    "\tbeq _080E7D62\n"
+                    "\tmovs r6, 0\n"
+                    "\tcmp r6, r0\n"
+                    "\tbcs _080E7D62\n"
+                    "\tadds r3, r7, 0\n"
+                    "\tadds r3, 0x74\n"
+                    "\tldr r2, [sp, 0x4C]\n"
+                    "\tmov r0, r8\n"
+                    "\tlsls r1, r0, 1\n"
+                    "\tmovs r4, 0x1\n"
+                    "_080E7D46:\n"
+                    "\tlsls r0, r6, 1\n"
+                    "\tadds r0, r3, r0\n"
+                    "\tldrh r0, [r0]\n"
+                    "\tcmp r0, 0\n"
+                    "\tbne _080E7D56\n"
+                    "\tadds r0, r6, r1\n"
+                    "\tadds r0, r2, r0\n"
+                    "\tstrb r4, [r0]\n"
+                    "_080E7D56:\n"
+                    "\tadds r0, r6, 0x1\n"
+                    "\tlsls r0, 16\n"
+                    "\tlsrs r6, r0, 16\n"
+                    "\tldr r0, [r7, 0x70]\n"
+                    "\tcmp r6, r0\n"
+                    "\tbcc _080E7D46\n"
+                    "_080E7D62:\n"
+                    "\tmov r0, r8\n"
+                    "\tadds r0, 0x1\n"
+                    "\tlsls r0, 16\n"
+                    "\tlsrs r0, 16\n"
+                    "\tmov r8, r0\n"
+                    "\tcmp r8, r5\n"
+                    "\tbcc _080E7D24\n"
+                    "_080E7D70:\n"
+                    "\tmovs r6, 0\n"
+                    "\tmov r8, r6\n"
+                    "\tldr r1, [sp, 0x54]\n"
+                    "\tcmp r1, 0\n"
+                    "\tbeq _080E7E64\n"
+                    "\tadd r2, sp, 0x24\n"
+                    "\tmov r10, r2\n"
+                    "\tmovs r3, 0x25\n"
+                    "\tadd r3, sp\n"
+                    "\tmov r9, r3\n"
+                    "_080E7D84:\n"
+                    "\tldr r1, [sp, 0x30]\n"
+                    "\tmov r0, r8\n"
+                    "\tmuls r0, r1\n"
+                    "\tldr r2, [sp, 0x2C]\n"
+                    "\tadds r7, r2, r0\n"
+                    "\tmov r3, r8\n"
+                    "\tlsls r1, r3, 1\n"
+                    "\tldr r2, [sp, 0x4C]\n"
+                    "\tadds r0, r2, r1\n"
+                    "\tldrb r0, [r0]\n"
+                    "\tcmp r0, 0x1\n"
+                    "\tbeq _080E7DA6\n"
+                    "\tldr r3, [sp, 0x50]\n"
+                    "\tadds r0, r3, r1\n"
+                    "\tldrb r0, [r0]\n"
+                    "\tcmp r0, 0x1\n"
+                    "\tbne _080E7DB0\n"
+                    "_080E7DA6:\n"
+                    "\tldr r0, [sp, 0x34]\n"
+                    "\tadds r0, 0x1\n"
+                    "\tlsls r0, 24\n"
+                    "\tlsrs r0, 24\n"
+                    "\tstr r0, [sp, 0x34]\n"
+                    "_080E7DB0:\n"
+                    "\tldr r2, [sp, 0x4C]\n"
+                    "\tadds r0, r2, r1\n"
+                    "\tldrb r0, [r0]\n"
+                    "\tcmp r0, 0x1\n"
+                    "\tbne _080E7DD4\n"
+                    "\tldr r3, [sp, 0x50]\n"
+                    "\tadds r0, r3, r1\n"
+                    "\tldrb r2, [r0]\n"
+                    "\tcmp r2, 0\n"
+                    "\tbne _080E7DD4\n"
+                    "_080E7DC4:\n"
+                    "\tlsls r1, r6, 1\n"
+                    "\tmov r3, r10\n"
+                    "\tadds r0, r3, r1\n"
+                    "\tmov r3, r8\n"
+                    "\tstrb r3, [r0]\n"
+                    "\tadd r1, r9\n"
+                    "\tstrb r2, [r1]\n"
+                    "\tb _080E7E4E\n"
+                    "_080E7DD4:\n"
+                    "\tldr r2, [sp, 0x4C]\n"
+                    "\tadds r0, r2, r1\n"
+                    "\tldrb r0, [r0]\n"
+                    "\tcmp r0, 0\n"
+                    "\tbne _080E7DE8\n"
+                    "\tldr r3, [sp, 0x50]\n"
+                    "\tadds r0, r3, r1\n"
+                    "\tldrb r2, [r0]\n"
+                    "\tcmp r2, 0x1\n"
+                    "\tbeq _080E7DC4\n"
+                    "_080E7DE8:\n"
+                    "\tldr r2, [sp, 0x4C]\n"
+                    "\tadds r0, r2, r1\n"
+                    "\tldrb r0, [r0]\n"
+                    "\tcmp r0, 0x1\n"
+                    "\tbne _080E7E54\n"
+                    "\tldr r3, [sp, 0x50]\n"
+                    "\tadds r0, r3, r1\n"
+                    "\tldrb r0, [r0]\n"
+                    "\tcmp r0, 0x1\n"
+                    "\tbne _080E7E54\n"
+                    "\tlsls r5, r6, 1\n"
+                    "\tmov r1, r10\n"
+                    "\tadds r0, r1, r5\n"
+                    "\tmov r2, r8\n"
+                    "\tstrb r2, [r0]\n"
+                    "\tadds r0, r7, 0\n"
+                    "\tbl sub_80E7A9C\n"
+                    "\tadds r4, r0, 0\n"
+                    "\tlsls r4, 24\n"
+                    "\tlsrs r4, 24\n"
+                    "\tadds r0, r7, 0\n"
+                    "\tadds r0, 0x38\n"
+                    "\tbl sub_80E7A9C\n"
+                    "\tlsls r0, 24\n"
+                    "\tlsrs r1, r0, 24\n"
+                    "\tcmp r4, 0\n"
+                    "\tbne _080E7E30\n"
+                    "\tcmp r1, 0\n"
+                    "\tbeq _080E7E34\n"
+                    "\tmov r3, r9\n"
+                    "\tadds r1, r3, r5\n"
+                    "\tmovs r0, 0x1\n"
+                    "\tstrb r0, [r1]\n"
+                    "\tb _080E7E4E\n"
+                    "_080E7E30:\n"
+                    "\tcmp r1, 0\n"
+                    "\tbeq _080E7E48\n"
+                    "_080E7E34:\n"
+                    "\tbl Random2\n"
+                    "\tmov r1, r9\n"
+                    "\tadds r2, r1, r5\n"
+                    "\tlsls r0, 16\n"
+                    "\tlsrs r0, 16\n"
+                    "\tmovs r1, 0x1\n"
+                    "\tands r0, r1\n"
+                    "\tstrb r0, [r2]\n"
+                    "\tb _080E7E4E\n"
+                    "_080E7E48:\n"
+                    "\tmov r2, r9\n"
+                    "\tadds r0, r2, r5\n"
+                    "\tstrb r1, [r0]\n"
+                    "_080E7E4E:\n"
+                    "\tadds r0, r6, 0x1\n"
+                    "\tlsls r0, 16\n"
+                    "\tlsrs r6, r0, 16\n"
+                    "_080E7E54:\n"
+                    "\tmov r0, r8\n"
+                    "\tadds r0, 0x1\n"
+                    "\tlsls r0, 16\n"
+                    "\tlsrs r3, r0, 16\n"
+                    "\tmov r8, r3\n"
+                    "\tldr r1, [sp, 0x54]\n"
+                    "\tcmp r0, r1\n"
+                    "\tbcc _080E7D84\n"
+                    "_080E7E64:\n"
+                    "\tmovs r2, 0\n"
+                    "\tmov r8, r2\n"
+                    "\tldr r3, [sp, 0x44]\n"
+                    "\tlsls r0, r3, 4\n"
+                    "\tsubs r0, r3\n"
+                    "\tlsls r0, 3\n"
+                    "\tldr r1, [sp, 0x2C]\n"
+                    "\tadds r7, r1, r0\n"
+                    "\tldr r1, [sp, 0x48]\n"
+                    "_080E7E76:\n"
+                    "\tmov r2, r8\n"
+                    "\tlsls r0, r2, 2\n"
+                    "\tadds r0, r1, r0\n"
+                    "\tstr r7, [r0]\n"
+                    "\tmov r0, r8\n"
+                    "\tadds r0, 0x1\n"
+                    "\tlsls r0, 16\n"
+                    "\tlsrs r0, 16\n"
+                    "\tmov r8, r0\n"
+                    "\tcmp r0, 0x3\n"
+                    "\tbls _080E7E76\n"
+                    "\tbl sub_80E7B54\n"
+                    "\tlsls r0, 24\n"
+                    "\tlsrs r0, 24\n"
+                    "\tmovs r1, 0x3\n"
+                    "\tbl __umodsi3\n"
+                    "\tlsls r0, 24\n"
+                    "\tlsrs r1, r0, 24\n"
+                    "\tldr r3, [sp, 0x34]\n"
+                    "\tcmp r3, 0x3\n"
+                    "\tbeq _080E7EC8\n"
+                    "\tcmp r3, 0x3\n"
+                    "\tbgt _080E7EAE\n"
+                    "\tcmp r3, 0x2\n"
+                    "\tbeq _080E7EB6\n"
+                    "\tb _080E7F1C\n"
+                    "_080E7EAE:\n"
+                    "\tldr r0, [sp, 0x34]\n"
+                    "\tcmp r0, 0x4\n"
+                    "\tbeq _080E7EE8\n"
+                    "\tb _080E7F1C\n"
+                    "_080E7EB6:\n"
+                    "\tadd r2, sp, 0x24\n"
+                    "\tmovs r0, 0x1\n"
+                    "\tstr r0, [sp]\n"
+                    "\tldr r0, [sp, 0x2C]\n"
+                    "\tldr r1, [sp, 0x30]\n"
+                    "\tmovs r3, 0\n"
+                    "\tbl sub_80E7AA4\n"
+                    "\tb _080E7F1C\n"
+                    "_080E7EC8:\n"
+                    "\tldr r0, =gUnknown_0858CFB8\n"
+                    "\tlsls r1, 1\n"
+                    "\tadds r2, r1, r0\n"
+                    "\tldrb r3, [r2]\n"
+                    "\tadds r0, 0x1\n"
+                    "\tadds r1, r0\n"
+                    "\tldrb r0, [r1]\n"
+                    "\tadd r2, sp, 0x24\n"
+                    "\tstr r0, [sp]\n"
+                    "\tldr r0, [sp, 0x2C]\n"
+                    "\tldr r1, [sp, 0x30]\n"
+                    "\tbl sub_80E7AA4\n"
+                    "\tb _080E7F1C\n"
+                    "\t.pool\n"
+                    "_080E7EE8:\n"
+                    "\tadd r6, sp, 0x24\n"
+                    "\tldr r4, =gUnknown_0858CFBE\n"
+                    "\tlsls r5, r1, 2\n"
+                    "\tadds r0, r5, r4\n"
+                    "\tldrb r3, [r0]\n"
+                    "\tadds r0, r4, 0x1\n"
+                    "\tadds r0, r5, r0\n"
+                    "\tldrb r0, [r0]\n"
+                    "\tstr r0, [sp]\n"
+                    "\tldr r0, [sp, 0x2C]\n"
+                    "\tldr r1, [sp, 0x30]\n"
+                    "\tadds r2, r6, 0\n"
+                    "\tbl sub_80E7AA4\n"
+                    "\tadds r0, r4, 0x2\n"
+                    "\tadds r0, r5, r0\n"
+                    "\tldrb r3, [r0]\n"
+                    "\tadds r4, 0x3\n"
+                    "\tadds r5, r4\n"
+                    "\tldrb r0, [r5]\n"
+                    "\tstr r0, [sp]\n"
+                    "\tldr r0, [sp, 0x2C]\n"
+                    "\tldr r1, [sp, 0x30]\n"
+                    "\tadds r2, r6, 0\n"
+                    "\tbl sub_80E7AA4\n"
+                    "_080E7F1C:\n"
+                    "\tldr r1, [sp, 0x2C]\n"
+                    "\tldr r2, [sp, 0x44]\n"
+                    "\tadds r7, r1, r2\n"
+                    "\tldr r4, =gSaveBlock1Ptr\n"
+                    "\tldr r0, [r4]\n"
+                    "\tmovs r3, 0xC2\n"
+                    "\tlsls r3, 6\n"
+                    "\tadds r0, r3\n"
+                    "\tadds r1, r7, 0\n"
+                    "\tmovs r2, 0x38\n"
+                    "\tbl memcpy\n"
+                    "\tldr r0, [r4]\n"
+                    "\tldr r1, =0x0000310c\n"
+                    "\tadds r0, r1\n"
+                    "\tadds r1, r7, 0\n"
+                    "\tadds r1, 0x38\n"
+                    "\tmovs r2, 0x38\n"
+                    "\tbl memcpy\n"
+                    "\tldr r0, [sp, 0x38]\n"
+                    "\tbl SeedRng\n"
+                    "\tadd sp, 0x58\n"
+                    "\tpop {r3-r5}\n"
+                    "\tmov r8, r3\n"
+                    "\tmov r9, r4\n"
+                    "\tmov r10, r5\n"
+                    "\tpop {r4-r7}\n"
+                    "\tpop {r0}\n"
+                    "\tbx r0\n"
+                    "\t.pool");
+}
+#endif // NONMATCHING
-- 
cgit v1.2.3


From 8d6007256f2d59765c89c41af4f3487e283e9381 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Mon, 6 Nov 2017 23:20:11 -0500
Subject: sub_80E7F68

---
 src/item.c          |  9 ------
 src/record_mixing.c | 89 ++++++++++++++++++++++++++++++++++++-----------------
 2 files changed, 60 insertions(+), 38 deletions(-)

(limited to 'src')

diff --git a/src/item.c b/src/item.c
index 0114676b6..845c0109c 100644
--- a/src/item.c
+++ b/src/item.c
@@ -16,15 +16,6 @@ extern const u8 gUnknown_085897E4[][28]; // not sure what this one is
 bool8 CheckPyramidBagHasItem(u16 itemId, u16 count);
 bool8 CheckPyramidBagHasSpace(u16 itemId, u16 count);
 
-enum
-{
-    ITEMS_POCKET,
-    BALLS_POCKET,
-    TMHM_POCKET,
-    BERRIES_POCKET,
-    KEYITEMS_POCKET
-};
-
 u16 GetBagItemQuantity(u16* quantity)
 {
     return gSaveBlock2Ptr->encryptionKey ^ *quantity;
diff --git a/src/record_mixing.c b/src/record_mixing.c
index 66972b650..e8a61a223 100644
--- a/src/record_mixing.c
+++ b/src/record_mixing.c
@@ -5,7 +5,7 @@
 #include "rng.h"
 #include "items.h"
 #include "text.h"
-
+#include "item.h"
 #include "task.h"
 #include "species.h"
 #include "pokemon.h"
@@ -32,13 +32,24 @@
 
 // Static type declarations
 
+struct PlayerRecordsRS {
+    struct SecretBaseRecord secretBases[20];
+    TVShow tvShows[25];
+    PokeNews pokeNews[16];
+    OldMan oldMan;
+    struct EasyChatPair easyChatPairs[5];
+    struct UnkStruct_80E7B60 dayCareMail;
+    struct RSBattleTowerRecord battleTowerRecord;
+    u16 filler11C8[0x32];
+};
+
 struct PlayerRecords {
     /* 0x0000 */ struct SecretBaseRecord secretBases[20];
     /* 0x0c80 */ TVShow tvShows[25];
     /* 0x1004 */ PokeNews pokeNews[16];
     /* 0x1044 */ OldMan oldMan;
     /* 0x1084 */ struct EasyChatPair easyChatPair[5];
-    /* 0x10ac */ struct UnkStruct_80E7B60 unk_10ac;
+    /* 0x10ac */ struct UnkStruct_80E7B60 dayCareMail;
     /* 0x1124 */ union BattleTowerRecord battleTowerRecord;
     /* 0x1210 */ u16 unk_1210;
     /* 0x1214 */ LilycoveLady lilycoveLady;
@@ -84,7 +95,7 @@ static void sub_80E7948(union BattleTowerRecord *, size_t, u8);
 static void sub_80E7A14(LilycoveLady *, size_t, u8);
 static void sub_80E7B2C(const u8 *);
 static void sub_80E7B60(struct UnkStruct_80E7B60 *, size_t, u8, TVShow *);
-void sub_80E7F68(void *, u8);
+void sub_80E7F68(u16 *item, u8 which);
 void sub_80E7FF8(u8 taskId);
 void sub_80E8110(void *, void *);
 void sub_80E8468(void *, size_t, u8);
@@ -136,7 +147,7 @@ void sub_80E6CA0(struct PlayerRecords *dest)
     memcpy(dest->pokeNews, gUnknown_0300113C, sizeof(PokeNews) * 16);
     memcpy(&dest->oldMan, gUnknown_03001140, sizeof(OldMan));
     memcpy(dest->easyChatPair, gUnknown_03001144, sizeof(struct EasyChatPair) * 5);
-    sub_80E89F8(&dest->unk_10ac);
+    sub_80E89F8(&dest->dayCareMail);
     sub_81659DC(gUnknown_0300114C, &dest->battleTowerRecord);
     if (GetMultiplayerId() == 0)
     {
@@ -154,8 +165,8 @@ void sub_80E6D54(struct PlayerRecords *dest)
     memcpy(&dest->oldMan, gUnknown_03001140, sizeof(OldMan));
     sub_8120B70(&dest->oldMan);
     memcpy(dest->easyChatPair, gUnknown_03001144, sizeof(struct EasyChatPair) * 5);
-    sub_80E89F8(&dest->unk_10ac);
-    sub_80E8A54(&dest->unk_10ac);
+    sub_80E89F8(&dest->dayCareMail);
+    sub_80E8A54(&dest->dayCareMail);
     sub_81659DC(gUnknown_0300114C, &dest->battleTowerRecord);
     TaskDummy4(&dest->battleTowerRecord);
     if (GetMultiplayerId() == 0)
@@ -188,7 +199,7 @@ void sub_80E6E24(void)
         memcpy(&gUnknown_0203A018->oldMan, gUnknown_03001140, sizeof(OldMan));
         memcpy(&gUnknown_0203A018->lilycoveLady, gUnknown_03001150, sizeof(LilycoveLady));
         memcpy(gUnknown_0203A018->easyChatPair, gUnknown_03001144, sizeof(struct EasyChatPair) * 5);
-        sub_80E89F8(&gUnknown_0203A018->unk_10ac);
+        sub_80E89F8(&gUnknown_0203A018->dayCareMail);
         memcpy(&gUnknown_0203A018->battleTowerRecord, gUnknown_0300114C, 0xec);
         sub_80E8AC0(&gUnknown_0203A018->battleTowerRecord);
         if (GetMultiplayerId() == 0)
@@ -200,36 +211,36 @@ void sub_80E6E24(void)
     }
 }
 
-void sub_80E6F60(u32 a0)
+void sub_80E6F60(u32 which)
 {
     if (Link_AnyPartnersPlayingRubyOrSapphire())
     {
         // Ruby/Sapphire
         sub_80E7B2C((void *)gUnknown_0203A014[0].tvShows);
-        sub_80EAF80(gUnknown_0203A014[0].secretBases, 0x1230, a0);
-        sub_80E7B60(&gUnknown_0203A014[0].unk_10ac, 0x1230, a0, gUnknown_0203A014[0].tvShows);
-        sub_80E7948(&gUnknown_0203A014[0].battleTowerRecord, 0x1230, a0);
-        sub_80F01E8(gUnknown_0203A014[0].tvShows, 0x1230, a0);
-        sub_80F0C7C(gUnknown_0203A014[0].pokeNews, 0x1230, a0);
-        sub_80E78C4(&gUnknown_0203A014[0].oldMan, 0x1230, a0);
-        sub_812287C(gUnknown_0203A014[0].easyChatPair, 0x1230, a0);
-        sub_80E7F68(&gUnknown_0203A014[0].battleTowerRecord.ruby_sapphire.unk_11c8, a0);
+        sub_80EAF80(gUnknown_0203A014[0].secretBases, sizeof(struct PlayerRecordsRS), which);
+        sub_80E7B60(&gUnknown_0203A014[0].dayCareMail, sizeof(struct PlayerRecordsRS), which, gUnknown_0203A014[0].tvShows);
+        sub_80E7948(&gUnknown_0203A014[0].battleTowerRecord, sizeof(struct PlayerRecordsRS), which);
+        sub_80F01E8(gUnknown_0203A014[0].tvShows, sizeof(struct PlayerRecordsRS), which);
+        sub_80F0C7C(gUnknown_0203A014[0].pokeNews, sizeof(struct PlayerRecordsRS), which);
+        sub_80E78C4(&gUnknown_0203A014[0].oldMan, sizeof(struct PlayerRecordsRS), which);
+        sub_812287C(gUnknown_0203A014[0].easyChatPair, sizeof(struct PlayerRecordsRS), which);
+        sub_80E7F68(&gUnknown_0203A014[0].battleTowerRecord.ruby_sapphire.unk_11c8, which);
     }
     else
     {
         // Emerald
         sub_80E7B2C((void *)gUnknown_0203A014[0].tvShows);
-        sub_80EAF80(gUnknown_0203A014[0].secretBases, 0x1444, a0);
-        sub_80F01E8(gUnknown_0203A014[0].tvShows, 0x1444, a0);
-        sub_80F0C7C(gUnknown_0203A014[0].pokeNews, 0x1444, a0);
-        sub_80E78C4(&gUnknown_0203A014[0].oldMan, 0x1444, a0);
-        sub_812287C(gUnknown_0203A014[0].easyChatPair, 0x1444, a0);
-        sub_80E7B60(&gUnknown_0203A014[0].unk_10ac, 0x1444, a0, gUnknown_0203A014[0].tvShows);
-        sub_80E7948(&gUnknown_0203A014[0].battleTowerRecord, 0x1444, a0);
-        sub_80E7F68(&gUnknown_0203A014[0].unk_1210, a0);
-        sub_80E7A14(&gUnknown_0203A014[0].lilycoveLady, 0x1444, a0);
-        sub_80E8468(gUnknown_0203A014[0].unk_1254, 0x1444, a0);
-        sub_80E89AC(gUnknown_0203A014[0].unk_12dc, 0x1444, a0);
+        sub_80EAF80(gUnknown_0203A014[0].secretBases, sizeof(struct PlayerRecords), which);
+        sub_80F01E8(gUnknown_0203A014[0].tvShows, sizeof(struct PlayerRecords), which);
+        sub_80F0C7C(gUnknown_0203A014[0].pokeNews, sizeof(struct PlayerRecords), which);
+        sub_80E78C4(&gUnknown_0203A014[0].oldMan, sizeof(struct PlayerRecords), which);
+        sub_812287C(gUnknown_0203A014[0].easyChatPair, sizeof(struct PlayerRecords), which);
+        sub_80E7B60(&gUnknown_0203A014[0].dayCareMail, sizeof(struct PlayerRecords), which, gUnknown_0203A014[0].tvShows);
+        sub_80E7948(&gUnknown_0203A014[0].battleTowerRecord, sizeof(struct PlayerRecords), which);
+        sub_80E7F68(&gUnknown_0203A014[0].unk_1210, which);
+        sub_80E7A14(&gUnknown_0203A014[0].lilycoveLady, sizeof(struct PlayerRecords), which);
+        sub_80E8468(gUnknown_0203A014[0].unk_1254, sizeof(struct PlayerRecords), which);
+        sub_80E89AC(gUnknown_0203A014[0].unk_12dc, sizeof(struct PlayerRecords), which);
     }
 }
 
@@ -396,7 +407,7 @@ static void sub_80E7324(u8 taskId)
                 task->data[10] = taskId2;
                 gTasks[taskId2].data[0] = taskId;
                 sub_80E7808(gUnknown_0203A014, (u16 *)&gTasks[taskId2].data[5]);
-                gUnknown_0300115C = 0x1230;
+                gUnknown_0300115C = sizeof(struct PlayerRecordsRS);
             }
             else
             {
@@ -405,7 +416,7 @@ static void sub_80E7324(u8 taskId)
                 task->data[10] = taskId2;
                 gTasks[taskId2].data[0] = taskId;
                 sub_80E7808(gUnknown_0203A014, (u16 *)&gTasks[taskId2].data[5]);
-                gUnknown_0300115C = 0x1444;
+                gUnknown_0300115C = sizeof(struct PlayerRecords);
             }
             break;
         case 5:
@@ -1411,3 +1422,23 @@ __attribute__((naked)) static void sub_80E7B60(struct UnkStruct_80E7B60 *src, si
                     "\t.pool");
 }
 #endif // NONMATCHING
+
+static void sub_80E7F68(u16 *item, u8 which)
+{
+    if (which != 0 && *item != ITEM_NONE && GetPocketByItemId(*item) == KEYITEMS_POCKET + 1)
+    {
+        if (!CheckBagHasItem(*item, 1) && !CheckPCHasItem(*item, 1) && AddBagItem(*item, 1))
+        {
+            VarSet(VAR_0x4001, *item);
+            StringCopy(gStringVar1, gLinkPlayers[0].name);
+            if (*item == ITEM_EON_TICKET)
+            {
+                FlagSet(SYS_HAS_EON_TICKET);
+            }
+        }
+        else
+        {
+            VarSet(VAR_0x4001, ITEM_NONE);
+        }
+    }
+}
-- 
cgit v1.2.3


From bc063b45d05716d1eab283f6d474bcdc601cafde Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Mon, 6 Nov 2017 23:33:39 -0500
Subject: sub_80E7FF8

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

(limited to 'src')

diff --git a/src/record_mixing.c b/src/record_mixing.c
index e8a61a223..afaa091eb 100644
--- a/src/record_mixing.c
+++ b/src/record_mixing.c
@@ -8,6 +8,8 @@
 #include "item.h"
 #include "task.h"
 #include "species.h"
+#include "save.h"
+#include "load_save.h"
 #include "pokemon.h"
 #include "cable_club.h"
 #include "link.h"
@@ -95,8 +97,8 @@ static void sub_80E7948(union BattleTowerRecord *, size_t, u8);
 static void sub_80E7A14(LilycoveLady *, size_t, u8);
 static void sub_80E7B2C(const u8 *);
 static void sub_80E7B60(struct UnkStruct_80E7B60 *, size_t, u8, TVShow *);
-void sub_80E7F68(u16 *item, u8 which);
-void sub_80E7FF8(u8 taskId);
+static void sub_80E7F68(u16 *item, u8 which);
+static void sub_80E7FF8(u8 taskId);
 void sub_80E8110(void *, void *);
 void sub_80E8468(void *, size_t, u8);
 void sub_80E89AC(void *, size_t, u8);
@@ -1442,3 +1444,83 @@ static void sub_80E7F68(u16 *item, u8 which)
         }
     }
 }
+
+static void sub_80E7FF8(u8 taskId)
+{
+    struct Task *task;
+
+    task = &gTasks[taskId];
+    switch (task->data[0])
+    {
+        case 0:
+            task->data[0] ++;
+            break;
+        case 1:
+            if (Link_AnyPartnersPlayingRubyOrSapphire())
+            {
+                task->data[0] ++;
+            }
+            else
+            {
+                task->data[0] = 6;
+            }
+            break;
+        case 2:
+            sub_8076D5C();
+            sub_8153430();
+            task->data[0] ++;
+            break;
+        case 3:
+            if (sub_8153474())
+            {
+                sav2_gender2_inplace_and_xFE();
+                task->data[0] = 4;
+                task->data[1] = 0;
+            }
+            break;
+        case 4:
+            if (++ task->data[1] > 10)
+            {
+                sub_800AC34();
+                task->data[0] ++;
+            }
+            break;
+        case 5:
+            if (gReceivedRemoteLinkPlayers == 0)
+            {
+                DestroyTask(taskId);
+            }
+            break;
+        case 6:
+            if (!sub_801048C(0))
+            {
+                CreateTask(sub_8153688, 5);
+                task->data[0] ++;
+            }
+            break;
+        case 7:
+            if (!FuncIsActiveTask(sub_8153688))
+            {
+                if (gLinkVSyncDisabled)
+                {
+                    sub_801048C(1);
+                    task->data[0] = 8;
+                }
+                else
+                {
+                    task->data[0] = 4;
+                }
+            }
+            break;
+        case 8:
+            sub_800ADF8();
+            task->data[0] ++;
+            break;
+        case 9:
+            if (sub_800A520())
+            {
+                DestroyTask(taskId);
+            }
+            break;
+    }
+}
-- 
cgit v1.2.3


From db898d0e4854c70a356d037919ea48aed1f62816 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Mon, 12 Feb 2018 08:16:28 -0500
Subject: Minor edit to make it possible to build when trying to match the
 nonmatching fn

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

(limited to 'src')

diff --git a/src/record_mixing.c b/src/record_mixing.c
index ff4d64f08..79db07bf0 100644
--- a/src/record_mixing.c
+++ b/src/record_mixing.c
@@ -894,8 +894,8 @@ static void sub_80E7B60(struct UnkStruct_80E7B60 *src, size_t recordSize, u8 whi
             break;
     }
     _src = (void *)src + which * recordSize;
-    memcpy(&gSaveBlock1Ptr->daycare.mons[0].mail, &_src->unk_00[0], sizeof(struct DayCareMailRecordMixing));
-    memcpy(&gSaveBlock1Ptr->daycare.mons[1].mail, &_src->unk_00[1], sizeof(struct DayCareMailRecordMixing));
+    memcpy(&gSaveBlock1Ptr->daycare.mons[0].misc.mail, &_src->unk_00[0], sizeof(struct DayCareMailRecordMixing));
+    memcpy(&gSaveBlock1Ptr->daycare.mons[1].misc.mail, &_src->unk_00[1], sizeof(struct DayCareMailRecordMixing));
     SeedRng(oldSeed);
 }
 #else
-- 
cgit v1.2.3


From 11d8f489c44cab2b05050ed136218957b2ef8a12 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Sat, 19 May 2018 14:30:41 +0200
Subject: failed attempt

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

(limited to 'src')

diff --git a/src/record_mixing.c b/src/record_mixing.c
index 1a39dfde9..43b87f840 100644
--- a/src/record_mixing.c
+++ b/src/record_mixing.c
@@ -31,9 +31,15 @@
 #include "strings.h"
 #include "string_util.h"
 #include "record_mixing.h"
+#include "new_game.h"
 
 // Static type declarations
 
+struct UnkRecordMixingStruct
+{
+    u8 field_0[0x44];
+};
+
 struct PlayerRecordsRS {
     struct SecretBaseRecord secretBases[20];
     TVShow tvShows[25];
@@ -99,7 +105,7 @@ static void sub_80E7B2C(const u8 *);
 static void sub_80E7B60(struct UnkStruct_80E7B60 *, size_t, u8, TVShow *);
 static void sub_80E7F68(u16 *item, u8 which);
 static void sub_80E7FF8(u8 taskId);
-void sub_80E8110(void *, void *);
+static void sub_80E8110(struct UnkRecordMixingStruct *arg0, struct UnkRecordMixingStruct *arg1);
 void sub_80E8468(void *, size_t, u8);
 void sub_80E89AC(void *, size_t, u8);
 void sub_80E89F8(void *dest);
@@ -206,7 +212,7 @@ void sub_80E6E24(void)
         {
             gUnknown_0203A018->unk_1210 = GetRecordMixingGift();
         }
-        sub_80E8110(gUnknown_0203A018->unk_1254, gUnknown_03001154);
+        sub_80E8110((void*) gUnknown_0203A018->unk_1254, gUnknown_03001154);
         sub_80E8260(gUnknown_0203A018->unk_12dc);
     }
 }
@@ -1521,3 +1527,55 @@ static void sub_80E7FF8(u8 taskId)
             break;
     }
 }
+
+/*
+static void sub_80E8110(struct UnkRecordMixingStruct *arg0, struct UnkRecordMixingStruct *arg1)
+{
+    s32 i, id;
+    s32 var_28, var_24, var_2C, r8;
+
+    arg0[0].field_0[0x38] = 0xFF;
+    arg0[1].field_0[0x38] = 0xFF;
+    memcpy(&arg0[0], &arg1[0], sizeof(struct UnkRecordMixingStruct));
+
+    var_28 = 0;
+    var_24 = 0;
+    var_2C = 0;
+    r8 = 0;
+    for (i = 0; i < 2; i++)
+    {
+        id = ((i + (gSaveBlock2Ptr->field_B0[2] << 0x1B >> 0x1E)) % 3) + 1;
+        if (arg1[id].field_0[0x38] != 0xFF)
+        {
+            if (ReadUnalignedWord(&arg1[id].field_0[0x34]) != ReadUnalignedWord(gSaveBlock2Ptr->playerTrainerId))
+            {
+                r8++;
+                var_2C = id;
+            }
+            if (ReadUnalignedWord(&arg1[id].field_0[0x34]) == ReadUnalignedWord(gSaveBlock2Ptr->playerTrainerId))
+            {
+                var_24++;
+                var_28 = id;
+            }
+        }
+    }
+
+    if (r8 == 0 && var_24 != 0)
+    {
+        r8 = var_24;
+        var_2C = var_28;
+    }
+
+    switch (r8)
+    {
+    case 1:
+        memcpy(&arg0[0], &arg1[var_2C], sizeof(struct UnkRecordMixingStruct));
+        break;
+    case 2:
+        if (Random2() > 0x3333)
+            memcpy(&arg0[1], &arg1[(gSaveBlock2Ptr->field_B0[2] << 0x1B >> 0x1E) + 1], sizeof(struct UnkRecordMixingStruct));
+        else
+            memcpy(&arg0[1], &arg1[((gSaveBlock2Ptr->field_B0[2] << 0x1B >> 0x1E) + 1) % 3 + 1], sizeof(struct UnkRecordMixingStruct));
+        break;
+    }
+}*/
-- 
cgit v1.2.3


From 1a8d5132d66c731c59ac1eee7eb33ea37a8cc1c4 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Sun, 20 May 2018 10:51:09 +0200
Subject: fix record mixing for real

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

(limited to 'src')

diff --git a/src/record_mixing.c b/src/record_mixing.c
index 43b87f840..b825e7244 100644
--- a/src/record_mixing.c
+++ b/src/record_mixing.c
@@ -13,6 +13,7 @@
 #include "pokemon.h"
 #include "cable_club.h"
 #include "link.h"
+#include "link_rfu.h"
 #include "tv.h"
 #include "battle_tower.h"
 #include "window.h"
@@ -105,7 +106,7 @@ static void sub_80E7B2C(const u8 *);
 static void sub_80E7B60(struct UnkStruct_80E7B60 *, size_t, u8, TVShow *);
 static void sub_80E7F68(u16 *item, u8 which);
 static void sub_80E7FF8(u8 taskId);
-static void sub_80E8110(struct UnkRecordMixingStruct *arg0, struct UnkRecordMixingStruct *arg1);
+/*static*/ void sub_80E8110(struct UnkRecordMixingStruct *arg0, struct UnkRecordMixingStruct *arg1);
 void sub_80E8468(void *, size_t, u8);
 void sub_80E89AC(void *, size_t, u8);
 void sub_80E89F8(void *dest);
-- 
cgit v1.2.3


From c8e1c80375e82358bd1dfdeb2254f5506fcb425b Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Sun, 20 May 2018 12:21:39 +0200
Subject: record mixing fix for real hopefully

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

(limited to 'src')

diff --git a/src/record_mixing.c b/src/record_mixing.c
index b825e7244..e03702759 100644
--- a/src/record_mixing.c
+++ b/src/record_mixing.c
@@ -278,7 +278,7 @@ static void sub_80E715C(u8 taskId)
             gUnknown_0203A018 = malloc(sizeof(struct PlayerRecords));
             gUnknown_0203A014 = malloc(sizeof(struct PlayerRecords) * 4);
             sub_8009628(gSpecialVar_0x8005);
-            VarSet(VAR_0x4000, 1);
+            VarSet(VAR_TEMP_0, 1);
             gUnknown_03001130 = FALSE;
             sub_80E6E24();
             sub_80FB00C();
@@ -1435,7 +1435,7 @@ static void sub_80E7F68(u16 *item, u8 which)
     {
         if (!CheckBagHasItem(*item, 1) && !CheckPCHasItem(*item, 1) && AddBagItem(*item, 1))
         {
-            VarSet(VAR_0x4001, *item);
+            VarSet(VAR_TEMP_1, *item);
             StringCopy(gStringVar1, gLinkPlayers[0].name);
             if (*item == ITEM_EON_TICKET)
             {
@@ -1444,7 +1444,7 @@ static void sub_80E7F68(u16 *item, u8 which)
         }
         else
         {
-            VarSet(VAR_0x4001, ITEM_NONE);
+            VarSet(VAR_TEMP_1, ITEM_NONE);
         }
     }
 }
-- 
cgit v1.2.3


From 03b593d3c3c763f29ba6e7c27e06fcae8a62054a Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Tue, 22 May 2018 21:54:57 +0200
Subject: try my luck with record mixing

---
 src/record_mixing.c | 151 +++++++++++++++++++++++++++++++++++++---------------
 1 file changed, 107 insertions(+), 44 deletions(-)

(limited to 'src')

diff --git a/src/record_mixing.c b/src/record_mixing.c
index e03702759..553174325 100644
--- a/src/record_mixing.c
+++ b/src/record_mixing.c
@@ -38,31 +38,35 @@
 
 struct UnkRecordMixingStruct
 {
-    u8 field_0[0x44];
+    u8 field_0[0x34];
+    u8 playerId[4];
+    u8 field_38[10];
 };
 
-struct PlayerRecordsRS {
+struct PlayerRecordsRS
+{
     struct SecretBaseRecord secretBases[20];
     TVShow tvShows[25];
     PokeNews pokeNews[16];
     OldMan oldMan;
     struct EasyChatPair easyChatPairs[5];
-    struct UnkStruct_80E7B60 dayCareMail;
+    struct RecordMixingDayCareMail dayCareMail;
     struct RSBattleTowerRecord battleTowerRecord;
     u16 filler11C8[0x32];
 };
 
-struct PlayerRecords {
+struct PlayerRecords
+{
     /* 0x0000 */ struct SecretBaseRecord secretBases[20];
     /* 0x0c80 */ TVShow tvShows[25];
     /* 0x1004 */ PokeNews pokeNews[16];
     /* 0x1044 */ OldMan oldMan;
     /* 0x1084 */ struct EasyChatPair easyChatPair[5];
-    /* 0x10ac */ struct UnkStruct_80E7B60 dayCareMail;
+    /* 0x10ac */ struct RecordMixingDayCareMail dayCareMail;
     /* 0x1124 */ union BattleTowerRecord battleTowerRecord;
     /* 0x1210 */ u16 unk_1210;
     /* 0x1214 */ LilycoveLady lilycoveLady;
-    /* 0x1254 */ u8 unk_1254[0x88];
+    /* 0x1254 */ struct UnkRecordMixingStruct unk_1254[2];
     /* 0x12dc */ u8 unk_12dc[0x168];
 }; // 1444
 
@@ -74,7 +78,7 @@ IWRAM_DATA TVShow *gUnknown_03001138;
 IWRAM_DATA PokeNews *gUnknown_0300113C;
 IWRAM_DATA OldMan *gUnknown_03001140;
 IWRAM_DATA struct EasyChatPair *gUnknown_03001144;
-IWRAM_DATA struct UnkStruct_80E7B60 *gUnknown_03001148;
+IWRAM_DATA struct RecordMixingDayCareMail *gUnknown_03001148;
 IWRAM_DATA void *gUnknown_0300114C; // gSaveBlock2Ptr->field_64C
 IWRAM_DATA LilycoveLady *gUnknown_03001150;
 IWRAM_DATA void *gUnknown_03001154; // gSaveBlock2Ptr->field_0DC;
@@ -84,7 +88,7 @@ IWRAM_DATA u8 gUnknown_03001160;
 IWRAM_DATA u32 filler_03001164;
 IWRAM_DATA u32 gUnknown_03001168[3];
 
-EWRAM_DATA struct UnkStruct_80E7B60 gUnknown_02039F9C = {};
+EWRAM_DATA struct RecordMixingDayCareMail gUnknown_02039F9C = {};
 EWRAM_DATA struct PlayerRecords *gUnknown_0203A014 = NULL;
 EWRAM_DATA struct PlayerRecords *gUnknown_0203A018 = NULL;
 
@@ -103,10 +107,10 @@ static void sub_80E78C4(OldMan *, size_t, u8);
 static void sub_80E7948(union BattleTowerRecord *, size_t, u8);
 static void sub_80E7A14(LilycoveLady *, size_t, u8);
 static void sub_80E7B2C(const u8 *);
-static void sub_80E7B60(struct UnkStruct_80E7B60 *, size_t, u8, TVShow *);
+static void sub_80E7B60(struct RecordMixingDayCareMail *, size_t, u8, TVShow *);
 static void sub_80E7F68(u16 *item, u8 which);
 static void sub_80E7FF8(u8 taskId);
-/*static*/ void sub_80E8110(struct UnkRecordMixingStruct *arg0, struct UnkRecordMixingStruct *arg1);
+static void sub_80E8110(struct UnkRecordMixingStruct *arg0, struct UnkRecordMixingStruct *arg1);
 void sub_80E8468(void *, size_t, u8);
 void sub_80E89AC(void *, size_t, u8);
 void sub_80E89F8(void *dest);
@@ -213,8 +217,8 @@ void sub_80E6E24(void)
         {
             gUnknown_0203A018->unk_1210 = GetRecordMixingGift();
         }
-        sub_80E8110((void*) gUnknown_0203A018->unk_1254, gUnknown_03001154);
-        sub_80E8260(gUnknown_0203A018->unk_12dc);
+        sub_80E8110(gUnknown_0203A018->unk_1254, gUnknown_03001154);
+        sub_80E8260((void*)gUnknown_0203A018->unk_12dc);
     }
 }
 
@@ -688,22 +692,22 @@ static void sub_80E7A14(LilycoveLady *lilycoveLady, size_t recordSize, u8 which)
     }
 }
 
-static u8 sub_80E7A9C(struct DayCareMailRecordMixing *rmMail)
+static u8 sub_80E7A9C(struct DaycareMiscMon *rmMail)
 {
     return rmMail->mail.itemId;
 }
 
-static void sub_80E7AA4(struct UnkStruct_80E7B60 *src, size_t recordSize, u8 (*idxs)[2], u8 which0, u8 which1)
+static void sub_80E7AA4(struct RecordMixingDayCareMail *src, size_t recordSize, u8 (*idxs)[2], u8 which0, u8 which1)
 {
-    struct DayCareMailRecordMixing buffer;
-    struct UnkStruct_80E7B60 *_src1;
-    struct UnkStruct_80E7B60 *_src2;
-
-    _src1 = (void *)src + recordSize * idxs[which0][0];
-    memcpy(&buffer, &_src1->unk_00[idxs[which0][1]], sizeof(struct DayCareMailRecordMixing));
-    _src2 = (void *)src + recordSize * idxs[which1][0];
-    memcpy(&_src1->unk_00[idxs[which0][1]], &_src2->unk_00[idxs[which1][1]], sizeof(struct DayCareMailRecordMixing));
-    memcpy(&_src2->unk_00[idxs[which1][1]], &buffer, sizeof(struct DayCareMailRecordMixing));
+    struct DaycareMiscMon buffer;
+    struct RecordMixingDayCareMail *mail1;
+    struct RecordMixingDayCareMail *mail2;
+
+    mail1 = (void *)src + recordSize * idxs[which0][0];
+    memcpy(&buffer, &mail1->mail[idxs[which0][1]], sizeof(struct DaycareMiscMon));
+    mail2 = (void *)src + recordSize * idxs[which1][0];
+    memcpy(&mail1->mail[idxs[which0][1]], &mail2->mail[idxs[which1][1]], sizeof(struct DaycareMiscMon));
+    memcpy(&mail2->mail[idxs[which1][1]], &buffer, sizeof(struct DaycareMiscMon));
 }
 
 static void sub_80E7B2C(const u8 *src)
@@ -725,7 +729,7 @@ static u8 sub_80E7B54(void)
 }
 
 #ifdef NONMATCHING
-static void sub_80E7B60(struct UnkStruct_80E7B60 *src, size_t recordSize, u8 which, TVShow *shows)
+static void sub_80E7B60(struct RecordMixingDayCareMail *src, size_t recordSize, u8 which, TVShow *shows)
 {
     // r9 = which
     u16 i;
@@ -738,11 +742,11 @@ static void sub_80E7B60(struct UnkStruct_80E7B60 *src, size_t recordSize, u8 whi
     u8 dcMail1;
     u8 dcMail2;
     u8 r1_80e7b54;
-    struct DayCareMailRecordMixing *recordMixingMail;
-    struct UnkStruct_80E7B60 *_src;
+    struct DaycareMiscMon *recordMixingMail;
+    struct RecordMixingDayCareMail *_src;
     u8 sp04[4];
     u8 sp08[4];
-    struct UnkStruct_80E7B60 *sp0c[4]; // -> sp+48
+    struct RecordMixingDayCareMail *sp0c[4]; // -> sp+48
     u8 sp1c[4][2]; // [][0] -> sp+4c, [][1] -> sp+50
     u8 sp24[4][2];
     // sp+2c = src
@@ -898,12 +902,12 @@ static void sub_80E7B60(struct UnkStruct_80E7B60 *src, size_t recordSize, u8 whi
             break;
     }
     _src = (void *)src + which * recordSize;
-    memcpy(&gSaveBlock1Ptr->daycare.mons[0].misc.mail, &_src->unk_00[0], sizeof(struct DayCareMailRecordMixing));
-    memcpy(&gSaveBlock1Ptr->daycare.mons[1].misc.mail, &_src->unk_00[1], sizeof(struct DayCareMailRecordMixing));
+    memcpy(&gSaveBlock1Ptr->daycare.mons[0].misc.mail, &_src->unk_00[0], sizeof(struct DaycareMiscMon));
+    memcpy(&gSaveBlock1Ptr->daycare.mons[1].misc.mail, &_src->unk_00[1], sizeof(struct DaycareMiscMon));
     SeedRng(oldSeed);
 }
 #else
-__attribute__((naked)) static void sub_80E7B60(struct UnkStruct_80E7B60 *src, size_t recordSize, u8 which, TVShow *shows)
+__attribute__((naked)) static void sub_80E7B60(struct RecordMixingDayCareMail *src, size_t recordSize, u8 which, TVShow *shows)
 {
     asm_unified("\tpush {r4-r7,lr}\n"
                     "\tmov r7, r10\n"
@@ -1529,15 +1533,15 @@ static void sub_80E7FF8(u8 taskId)
     }
 }
 
-/*
-static void sub_80E8110(struct UnkRecordMixingStruct *arg0, struct UnkRecordMixingStruct *arg1)
+static void sub_80E8110(struct UnkRecordMixingStruct *dst, struct UnkRecordMixingStruct *src)
 {
     s32 i, id;
-    s32 var_28, var_24, var_2C, r8;
+    s32 var_2C, var_28, var_24, r8;
 
-    arg0[0].field_0[0x38] = 0xFF;
-    arg0[1].field_0[0x38] = 0xFF;
-    memcpy(&arg0[0], &arg1[0], sizeof(struct UnkRecordMixingStruct));
+    dst[0].field_38[0] = 0xFF;
+    dst[1].field_38[0] = 0xFF;
+
+    dst[0] = src[0];
 
     var_28 = 0;
     var_24 = 0;
@@ -1545,15 +1549,15 @@ static void sub_80E8110(struct UnkRecordMixingStruct *arg0, struct UnkRecordMixi
     r8 = 0;
     for (i = 0; i < 2; i++)
     {
-        id = ((i + (gSaveBlock2Ptr->field_B0[2] << 0x1B >> 0x1E)) % 3) + 1;
-        if (arg1[id].field_0[0x38] != 0xFF)
+        id = ((i + gSaveBlock2Ptr->field_B2_1) % 3) + 1;
+        if (src[id].field_38[0] != 0xFF)
         {
-            if (ReadUnalignedWord(&arg1[id].field_0[0x34]) != ReadUnalignedWord(gSaveBlock2Ptr->playerTrainerId))
+            if (ReadUnalignedWord(src[id].playerId) != ReadUnalignedWord(gSaveBlock2Ptr->playerTrainerId))
             {
                 r8++;
                 var_2C = id;
             }
-            if (ReadUnalignedWord(&arg1[id].field_0[0x34]) == ReadUnalignedWord(gSaveBlock2Ptr->playerTrainerId))
+            if (ReadUnalignedWord(src[id].playerId) == ReadUnalignedWord(gSaveBlock2Ptr->playerTrainerId))
             {
                 var_24++;
                 var_28 = id;
@@ -1570,13 +1574,72 @@ static void sub_80E8110(struct UnkRecordMixingStruct *arg0, struct UnkRecordMixi
     switch (r8)
     {
     case 1:
-        memcpy(&arg0[0], &arg1[var_2C], sizeof(struct UnkRecordMixingStruct));
+        dst[1] = src[var_2C];
         break;
     case 2:
         if (Random2() > 0x3333)
-            memcpy(&arg0[1], &arg1[(gSaveBlock2Ptr->field_B0[2] << 0x1B >> 0x1E) + 1], sizeof(struct UnkRecordMixingStruct));
+        {
+            dst[1] = src[gSaveBlock2Ptr->field_B2_1 + 1];
+        }
         else
-            memcpy(&arg0[1], &arg1[((gSaveBlock2Ptr->field_B0[2] << 0x1B >> 0x1E) + 1) % 3 + 1], sizeof(struct UnkRecordMixingStruct));
+        {
+            dst[1] = src[((gSaveBlock2Ptr->field_B2_1 + 1) % 3 + 1)];
+        }
         break;
     }
-}*/
+}
+
+void sub_80E8260(struct UnkRecordMixingStruct2 *dst)
+{
+    s32 i, j;
+
+    for (i = 0; i < 9; i++)
+    {
+        for (j = 0; j < 2; j++)
+        {
+            CopyUnalignedWord(dst->field_0[i][j].playerId, gSaveBlock2Ptr->playerTrainerId);
+            dst->field_0[i][j].language = LANGUAGE_ENGLISH;
+            StringCopy(dst->field_0[i][j].playerName, gSaveBlock2Ptr->playerName);
+        }
+    }
+
+    for (j = 0; j < 2; j++)
+    {
+        dst->field_120[j].language = LANGUAGE_ENGLISH;
+        CopyUnalignedWord(dst->field_120[j].playerId1, gSaveBlock2Ptr->playerTrainerId);
+        CopyUnalignedWord(dst->field_120[j].playerId2, gSaveBlock2Ptr->field_EF1[j]);
+        StringCopy(dst->field_120[j].playerName1, gSaveBlock2Ptr->playerName);
+        StringCopy(dst->field_120[j].playerName2, gSaveBlock2Ptr->field_EE1[j]);
+    }
+
+    for (i = 0; i < 2; i++)
+    {
+        dst->field_0[0][i].field_4 = gSaveBlock2Ptr->field_CF0[i];
+        dst->field_0[1][i].field_4 = gSaveBlock2Ptr->field_CF4[i];
+        dst->field_0[2][i].field_4 = gSaveBlock2Ptr->field_CF8[i];
+        dst->field_0[3][i].field_4 = gSaveBlock2Ptr->field_D14[i];
+        dst->field_0[4][i].field_4 = gSaveBlock2Ptr->field_DD0[i];
+        dst->field_0[5][i].field_4 = gSaveBlock2Ptr->field_DDE[i];
+        dst->field_0[6][i].field_4 = gSaveBlock2Ptr->field_DEA[i];
+        dst->field_0[7][i].field_4 = gSaveBlock2Ptr->field_E08[i];
+        dst->field_0[8][i].field_4 = gSaveBlock2Ptr->field_E1E[i];
+
+        dst->field_120[i].field_8 = gSaveBlock2Ptr->field_CFC[i];
+    }
+}
+
+bool32 sub_80E841C(struct UnkRecordMixingStruct *arg0, struct UnkRecordMixingStruct *arg1)
+{
+    s32 i;
+
+    for (i = 0; i < 4; i++)
+    {
+        if (ReadUnalignedWord(arg0->playerId) == ReadUnalignedWord(arg1[i].playerId)
+            && arg0->field_0[2] == arg1[i].field_0[2])
+        {
+            return TRUE;
+        }
+    }
+
+    return FALSE;
+}
-- 
cgit v1.2.3


From b051cbaaab8bacd0cdc65ce609a92bc9dd868a1f Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Fri, 25 May 2018 21:00:41 +0200
Subject: more record mixing decomp

---
 src/record_mixing.c | 732 +++++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 697 insertions(+), 35 deletions(-)

(limited to 'src')

diff --git a/src/record_mixing.c b/src/record_mixing.c
index 553174325..9a47d4112 100644
--- a/src/record_mixing.c
+++ b/src/record_mixing.c
@@ -1,5 +1,3 @@
-
-// Includes
 #include "global.h"
 #include "malloc.h"
 #include "random.h"
@@ -33,16 +31,11 @@
 #include "string_util.h"
 #include "record_mixing.h"
 #include "new_game.h"
+#include "daycare.h"
+#include "international_string_util.h"
 
 // Static type declarations
 
-struct UnkRecordMixingStruct
-{
-    u8 field_0[0x34];
-    u8 playerId[4];
-    u8 field_38[10];
-};
-
 struct PlayerRecordsRS
 {
     struct SecretBaseRecord secretBases[20];
@@ -67,7 +60,8 @@ struct PlayerRecords
     /* 0x1210 */ u16 unk_1210;
     /* 0x1214 */ LilycoveLady lilycoveLady;
     /* 0x1254 */ struct UnkRecordMixingStruct unk_1254[2];
-    /* 0x12dc */ u8 unk_12dc[0x168];
+    /* 0x12dc */ struct UnkRecordMixingStruct2 unk_12dc;
+    /* 0x1434 */ u8 field_1434[0x10];
 }; // 1444
 
 // Static RAM declarations
@@ -111,23 +105,51 @@ static void sub_80E7B60(struct RecordMixingDayCareMail *, size_t, u8, TVShow *);
 static void sub_80E7F68(u16 *item, u8 which);
 static void sub_80E7FF8(u8 taskId);
 static void sub_80E8110(struct UnkRecordMixingStruct *arg0, struct UnkRecordMixingStruct *arg1);
-void sub_80E8468(void *, size_t, u8);
-void sub_80E89AC(void *, size_t, u8);
-void sub_80E89F8(void *dest);
-void sub_80E8A54(void *src);
-void sub_80E8AC0(union BattleTowerRecord *);
+static void sub_80E8468(struct UnkRecordMixingStruct *arg0, size_t arg1, u32 arg2);
+static void sub_80E89AC(struct UnkRecordMixingStruct2 *arg0, size_t arg1, u32 arg2);
+static void sub_80E89F8(struct RecordMixingDayCareMail *dst);
+static void sub_80E8A54(struct RecordMixingDayCareMail *src);
+static void sub_80E8AC0(union BattleTowerRecord *);
 void sub_80EAF80(struct SecretBaseRecord *, size_t, u8);
 void sub_812287C(struct EasyChatPair *, size_t, u8);
-void TaskDummy4(union BattleTowerRecord *src);
+static void nullsub_1405(union BattleTowerRecord *src);
 
 // .rodata
 
-extern const u8 gUnknown_0858CF8C[];
-extern const u8 gUnknown_0858CF8E[][3];
-extern const u8 gUnknown_0858CF94[][4];
+static const u8 gUnknown_0858CF8C[] = {1, 0};
+
+static const u8 gUnknown_0858CF8E[][3] =
+{
+    {1, 2, 0},
+    {2, 0, 1},
+};
+
+static const u8 gUnknown_0858CF94[][4] =
+{
+    {1, 0, 3, 2},
+    {3, 0, 1, 2},
+    {2, 0, 3, 1},
+    {1, 3, 0, 2},
+    {2, 3, 0, 1},
+    {3, 2, 0, 1},
+    {1, 2, 3, 0},
+    {2, 3, 1, 0},
+    {3, 2, 1, 0},
+};
 
-extern const u8 gUnknown_0858CFB8[3][2];
-extern const u8 gUnknown_0858CFBE[3][4];
+static const u8 gUnknown_0858CFB8[3][2] =
+{
+    {0, 1},
+    {1, 2},
+    {2, 0},
+};
+
+static const u8 gUnknown_0858CFBE[3][4] =
+{
+    {0, 1, 2, 3},
+    {0, 2, 1, 3},
+    {0, 3, 2, 1},
+};
 
 // .text
 
@@ -146,7 +168,7 @@ void sub_80E6BF8(void)
     gUnknown_03001148 = &gUnknown_02039F9C;
     gUnknown_0300114C = gSaveBlock2Ptr->field_64C;
     gUnknown_03001150 = &gSaveBlock1Ptr->lilycoveLady;
-    gUnknown_03001154 = gSaveBlock2Ptr->field_0DC;
+    gUnknown_03001154 = gSaveBlock2Ptr->field_DC;
     gUnknown_03001158 = gSaveBlock2Ptr->field_64C;
 }
 
@@ -179,7 +201,7 @@ void sub_80E6D54(struct PlayerRecords *dest)
     sub_80E89F8(&dest->dayCareMail);
     sub_80E8A54(&dest->dayCareMail);
     sub_81659DC(gUnknown_0300114C, &dest->battleTowerRecord);
-    TaskDummy4(&dest->battleTowerRecord);
+    nullsub_1405(&dest->battleTowerRecord);
     if (GetMultiplayerId() == 0)
     {
         dest->battleTowerRecord.ruby_sapphire.unk_11c8 = GetRecordMixingGift();
@@ -218,7 +240,7 @@ void sub_80E6E24(void)
             gUnknown_0203A018->unk_1210 = GetRecordMixingGift();
         }
         sub_80E8110(gUnknown_0203A018->unk_1254, gUnknown_03001154);
-        sub_80E8260((void*)gUnknown_0203A018->unk_12dc);
+        sub_80E8260(&gUnknown_0203A018->unk_12dc);
     }
 }
 
@@ -250,8 +272,8 @@ void sub_80E6F60(u32 which)
         sub_80E7948(&gUnknown_0203A014[0].battleTowerRecord, sizeof(struct PlayerRecords), which);
         sub_80E7F68(&gUnknown_0203A014[0].unk_1210, which);
         sub_80E7A14(&gUnknown_0203A014[0].lilycoveLady, sizeof(struct PlayerRecords), which);
-        sub_80E8468(gUnknown_0203A014[0].unk_1254, sizeof(struct PlayerRecords), which);
-        sub_80E89AC(gUnknown_0203A014[0].unk_12dc, sizeof(struct PlayerRecords), which);
+        sub_80E8468(gUnknown_0203A014[0].unk_1254, sizeof(struct PlayerRecords), (u8) which);
+        sub_80E89AC(&gUnknown_0203A014[0].unk_12dc, sizeof(struct PlayerRecords), (u8) which);
     }
 }
 
@@ -692,22 +714,22 @@ static void sub_80E7A14(LilycoveLady *lilycoveLady, size_t recordSize, u8 which)
     }
 }
 
-static u8 sub_80E7A9C(struct DaycareMiscMon *rmMail)
+static u8 sub_80E7A9C(struct DayCareMail *rmMail)
 {
-    return rmMail->mail.itemId;
+    return rmMail->message.itemId;
 }
 
 static void sub_80E7AA4(struct RecordMixingDayCareMail *src, size_t recordSize, u8 (*idxs)[2], u8 which0, u8 which1)
 {
-    struct DaycareMiscMon buffer;
+    struct DayCareMail buffer;
     struct RecordMixingDayCareMail *mail1;
     struct RecordMixingDayCareMail *mail2;
 
     mail1 = (void *)src + recordSize * idxs[which0][0];
-    memcpy(&buffer, &mail1->mail[idxs[which0][1]], sizeof(struct DaycareMiscMon));
+    memcpy(&buffer, &mail1->mail[idxs[which0][1]], sizeof(struct DayCareMail));
     mail2 = (void *)src + recordSize * idxs[which1][0];
-    memcpy(&mail1->mail[idxs[which0][1]], &mail2->mail[idxs[which1][1]], sizeof(struct DaycareMiscMon));
-    memcpy(&mail2->mail[idxs[which1][1]], &buffer, sizeof(struct DaycareMiscMon));
+    memcpy(&mail1->mail[idxs[which0][1]], &mail2->mail[idxs[which1][1]], sizeof(struct DayCareMail));
+    memcpy(&mail2->mail[idxs[which1][1]], &buffer, sizeof(struct DayCareMail));
 }
 
 static void sub_80E7B2C(const u8 *src)
@@ -742,7 +764,7 @@ static void sub_80E7B60(struct RecordMixingDayCareMail *src, size_t recordSize,
     u8 dcMail1;
     u8 dcMail2;
     u8 r1_80e7b54;
-    struct DaycareMiscMon *recordMixingMail;
+    struct DayCareMail *recordMixingMail;
     struct RecordMixingDayCareMail *_src;
     u8 sp04[4];
     u8 sp08[4];
@@ -902,8 +924,8 @@ static void sub_80E7B60(struct RecordMixingDayCareMail *src, size_t recordSize,
             break;
     }
     _src = (void *)src + which * recordSize;
-    memcpy(&gSaveBlock1Ptr->daycare.mons[0].misc.mail, &_src->unk_00[0], sizeof(struct DaycareMiscMon));
-    memcpy(&gSaveBlock1Ptr->daycare.mons[1].misc.mail, &_src->unk_00[1], sizeof(struct DaycareMiscMon));
+    memcpy(&gSaveBlock1Ptr->daycare.mons[0].misc.mail, &_src->unk_00[0], sizeof(struct DayCareMail));
+    memcpy(&gSaveBlock1Ptr->daycare.mons[1].misc.mail, &_src->unk_00[1], sizeof(struct DayCareMail));
     SeedRng(oldSeed);
 }
 #else
@@ -1643,3 +1665,643 @@ bool32 sub_80E841C(struct UnkRecordMixingStruct *arg0, struct UnkRecordMixingStr
 
     return FALSE;
 }
+
+static void sub_80E8468(struct UnkRecordMixingStruct *arg0, size_t arg1, u32 arg2)
+{
+    s32 i, r7, r8;
+    struct UnkRecordMixingStruct *structPtr;
+    u32 data[4];
+    u32 structId;
+
+    sub_80E7830(data);
+    structPtr = (void*)(arg0) + (arg1 * data[arg2]);
+    r7 = 0;
+    r8 = 0;
+    for (i = 0; i < 2; i++)
+    {
+        if (structPtr[i].field_38[0] != 0xFF && !sub_80E841C(&structPtr[i], gSaveBlock2Ptr->field_DC))
+        {
+            r7++;
+            r8 = i;
+        }
+    }
+
+    switch (r7)
+    {
+    case 1:
+        structId = gSaveBlock2Ptr->field_B2_1 + 1;
+        gSaveBlock2Ptr->field_DC[structId] = structPtr[r8];
+        gSaveBlock2Ptr->field_B2_1 = (gSaveBlock2Ptr->field_B2_1 + 1) % 3;
+        break;
+    case 2:
+        for (i = 0; i < 2; i++)
+        {
+            structId = ((i ^ 1) + gSaveBlock2Ptr->field_B2_1) % 3 + 1;
+            gSaveBlock2Ptr->field_DC[structId] = structPtr[i];
+        }
+        gSaveBlock2Ptr->field_B2_1 = (gSaveBlock2Ptr->field_B2_1 + 2) % 3;
+        break;
+    }
+}
+
+struct UnknownRecMixingStruct
+{
+    u32 field_0;
+    u16 field_4;
+    u8 field_6[9];
+};
+
+struct UnknownRecMixingStruct2
+{
+    u32 field_0;
+    u16 field_4;
+    u16 field_6;
+    u16 field_8;
+    u8 field_A[16];
+};
+
+struct UnknownRecMixingStruct3
+{
+    u8 field_0[0x810];
+};
+
+NAKED
+void sub_80E8578(struct UnknownRecMixingStruct3 *arg0, struct UnkRecordMixingStruct2 *arg1, size_t arg2, u32 arg3, u32 arg4)
+{
+    asm_unified("	push {r4-r7,lr}\n\
+	mov r7, r10\n\
+	mov r6, r9\n\
+	mov r5, r8\n\
+	push {r5-r7}\n\
+	sub sp, 0x54\n\
+	str r0, [sp]\n\
+	ldr r0, [sp, 0x74]\n\
+	movs r4, 0\n\
+	mov r8, r4\n\
+	movs r5, 0\n\
+	str r5, [sp, 0x4]\n\
+	ldr r4, =gUnknown_03001168\n\
+	b _080E85A0\n\
+	.pool\n\
+_080E8598:\n\
+	adds r1, r2\n\
+	ldr r6, [sp, 0x4]\n\
+	adds r6, 0x1\n\
+	str r6, [sp, 0x4]\n\
+_080E85A0:\n\
+	ldr r5, [sp, 0x4]\n\
+	cmp r5, r0\n\
+	bge _080E85B6\n\
+	cmp r5, r3\n\
+	beq _080E85B0\n\
+	stm r4!, {r1}\n\
+	movs r6, 0x1\n\
+	add r8, r6\n\
+_080E85B0:\n\
+	mov r5, r8\n\
+	cmp r5, 0x3\n\
+	bne _080E8598\n\
+_080E85B6:\n\
+	movs r6, 0\n\
+	str r6, [sp, 0x4]\n\
+	subs r0, 0x1\n\
+	str r0, [sp, 0x24]\n\
+_080E85BE:\n\
+	movs r0, 0\n\
+	str r0, [sp, 0x8]\n\
+	ldr r1, [sp, 0x4]\n\
+	adds r1, 0x1\n\
+	str r1, [sp, 0x28]\n\
+	ldr r2, [sp, 0x4]\n\
+	lsls r2, 1\n\
+	str r2, [sp, 0x34]\n\
+	ldr r3, [sp, 0x4]\n\
+	adds r3, r2, r3\n\
+	str r3, [sp, 0x10]\n\
+	movs r4, 0\n\
+	str r4, [sp, 0x44]\n\
+	movs r5, 0\n\
+	str r5, [sp, 0x48]\n\
+_080E85DC:\n\
+	movs r6, 0\n\
+	mov r8, r6\n\
+	ldr r0, =gSaveBlock2Ptr\n\
+	ldr r1, [r0]\n\
+	ldr r2, [sp, 0x10]\n\
+	lsls r0, r2, 5\n\
+	ldr r3, [sp, 0x48]\n\
+	adds r0, r3, r0\n\
+	adds r3, r0, r1\n\
+	lsls r0, r2, 6\n\
+	ldr r4, [sp, 0x44]\n\
+	adds r0, r4, r0\n\
+	ldr r5, [sp]\n\
+	adds r2, r0, r5\n\
+_080E85F8:\n\
+	adds r0, r2, 0\n\
+	movs r6, 0x87\n\
+	lsls r6, 2\n\
+	adds r1, r3, r6\n\
+	ldm r1!, {r4-r6}\n\
+	stm r0!, {r4-r6}\n\
+	ldr r1, [r1]\n\
+	str r1, [r0]\n\
+	adds r3, 0x10\n\
+	adds r2, 0x10\n\
+	movs r0, 0x1\n\
+	add r8, r0\n\
+	mov r1, r8\n\
+	cmp r1, 0x2\n\
+	ble _080E85F8\n\
+	movs r2, 0\n\
+	mov r8, r2\n\
+	ldr r3, [sp, 0x24]\n\
+	cmp r8, r3\n\
+	bge _080E86DC\n\
+	ldr r4, [sp, 0x4]\n\
+	lsls r4, 5\n\
+	mov r9, r4\n\
+	ldr r5, [sp, 0x8]\n\
+	lsls r7, r5, 4\n\
+	ldr r6, [sp, 0x34]\n\
+	ldr r1, [sp, 0x4]\n\
+	adds r0, r6, r1\n\
+	lsls r0, 6\n\
+	str r0, [sp, 0x14]\n\
+	ldr r2, [sp]\n\
+	adds r0, r2, r0\n\
+	ldr r3, [sp, 0x44]\n\
+	str r3, [sp, 0x18]\n\
+	adds r0, r3\n\
+	str r0, [sp, 0x1C]\n\
+	ldr r4, [sp, 0x14]\n\
+	adds r0, r3, r4\n\
+	adds r0, r2\n\
+	adds r0, 0x30\n\
+	mov r10, r0\n\
+_080E864A:\n\
+	movs r5, 0\n\
+	str r5, [sp, 0xC]\n\
+	movs r3, 0\n\
+	mov r6, r8\n\
+	lsls r6, 2\n\
+	str r6, [sp, 0x38]\n\
+	ldr r1, [sp, 0x18]\n\
+	ldr r2, [sp, 0x14]\n\
+	adds r0, r1, r2\n\
+	ldr r4, [sp]\n\
+	adds r5, r0, r4\n\
+	ldr r0, =gUnknown_03001168\n\
+	adds r0, r6, r0\n\
+	str r0, [sp, 0x50]\n\
+_080E8666:\n\
+	lsls r0, r3, 4\n\
+	ldr r6, [sp, 0x1C]\n\
+	adds r0, r6, r0\n\
+	str r3, [sp, 0x4C]\n\
+	bl ReadUnalignedWord\n\
+	adds r4, r0, 0\n\
+	ldr r1, [sp, 0x50]\n\
+	ldr r0, [r1]\n\
+	add r0, r9\n\
+	adds r0, r7\n\
+	bl ReadUnalignedWord\n\
+	ldr r3, [sp, 0x4C]\n\
+	cmp r4, r0\n\
+	bne _080E86A8\n\
+	ldr r2, [sp, 0xC]\n\
+	adds r2, 0x1\n\
+	str r2, [sp, 0xC]\n\
+	ldr r4, [sp, 0x50]\n\
+	ldr r0, [r4]\n\
+	mov r6, r9\n\
+	adds r1, r7, r6\n\
+	adds r1, r0, r1\n\
+	ldrh r0, [r5, 0x4]\n\
+	ldrh r2, [r1, 0x4]\n\
+	cmp r0, r2\n\
+	bcs _080E86A8\n\
+	adds r0, r5, 0\n\
+	ldm r1!, {r2,r4,r6}\n\
+	stm r0!, {r2,r4,r6}\n\
+	ldr r1, [r1]\n\
+	str r1, [r0]\n\
+_080E86A8:\n\
+	adds r5, 0x10\n\
+	adds r3, 0x1\n\
+	cmp r3, 0x2\n\
+	ble _080E8666\n\
+	ldr r3, [sp, 0xC]\n\
+	cmp r3, 0\n\
+	bne _080E86CE\n\
+	ldr r0, =gUnknown_03001168\n\
+	ldr r4, [sp, 0x38]\n\
+	adds r0, r4, r0\n\
+	ldr r0, [r0]\n\
+	mov r5, r9\n\
+	adds r2, r7, r5\n\
+	mov r1, r10\n\
+	adds r0, r2\n\
+	ldm r0!, {r2,r3,r6}\n\
+	stm r1!, {r2,r3,r6}\n\
+	ldr r0, [r0]\n\
+	str r0, [r1]\n\
+_080E86CE:\n\
+	movs r4, 0x10\n\
+	add r10, r4\n\
+	movs r5, 0x1\n\
+	add r8, r5\n\
+	ldr r6, [sp, 0x24]\n\
+	cmp r8, r6\n\
+	blt _080E864A\n\
+_080E86DC:\n\
+	ldr r0, [sp, 0x44]\n\
+	adds r0, 0x60\n\
+	str r0, [sp, 0x44]\n\
+	ldr r1, [sp, 0x48]\n\
+	adds r1, 0x30\n\
+	str r1, [sp, 0x48]\n\
+	ldr r2, [sp, 0x8]\n\
+	adds r2, 0x1\n\
+	str r2, [sp, 0x8]\n\
+	cmp r2, 0x1\n\
+	bgt _080E86F4\n\
+	b _080E85DC\n\
+_080E86F4:\n\
+	ldr r3, [sp, 0x28]\n\
+	str r3, [sp, 0x4]\n\
+	cmp r3, 0x8\n\
+	bgt _080E86FE\n\
+	b _080E85BE\n\
+_080E86FE:\n\
+	movs r4, 0\n\
+	str r4, [sp, 0x8]\n\
+_080E8702:\n\
+	ldr r5, [sp, 0x8]\n\
+	adds r5, 0x1\n\
+	str r5, [sp, 0x2C]\n\
+	ldr r0, =gSaveBlock2Ptr\n\
+	ldr r1, [r0]\n\
+	movs r0, 0x54\n\
+	ldr r6, [sp, 0x8]\n\
+	muls r0, r6\n\
+	adds r3, r0, r1\n\
+	movs r0, 0xA8\n\
+	muls r0, r6\n\
+	ldr r1, [sp]\n\
+	adds r2, r0, r1\n\
+	movs r4, 0x2\n\
+	mov r8, r4\n\
+_080E8720:\n\
+	movs r5, 0xD8\n\
+	lsls r5, 3\n\
+	adds r0, r2, r5\n\
+	ldr r6, =0x0000057c\n\
+	adds r1, r3, r6\n\
+	ldm r1!, {r4-r6}\n\
+	stm r0!, {r4-r6}\n\
+	ldm r1!, {r4-r6}\n\
+	stm r0!, {r4-r6}\n\
+	ldr r1, [r1]\n\
+	str r1, [r0]\n\
+	adds r3, 0x1C\n\
+	adds r2, 0x1C\n\
+	movs r0, 0x1\n\
+	negs r0, r0\n\
+	add r8, r0\n\
+	mov r1, r8\n\
+	cmp r1, 0\n\
+	bge _080E8720\n\
+	movs r2, 0\n\
+	mov r8, r2\n\
+	ldr r3, [sp, 0x24]\n\
+	cmp r8, r3\n\
+	blt _080E8752\n\
+	b _080E885A\n\
+_080E8752:\n\
+	ldr r4, [sp, 0x8]\n\
+	lsls r1, r4, 3\n\
+	movs r0, 0xA8\n\
+	adds r5, r4, 0\n\
+	muls r5, r0\n\
+	str r5, [sp, 0x20]\n\
+	str r5, [sp, 0x3C]\n\
+	subs r1, r4\n\
+	lsls r1, 2\n\
+	mov r10, r1\n\
+_080E8766:\n\
+	movs r6, 0\n\
+	str r6, [sp, 0xC]\n\
+	mov r0, r8\n\
+	lsls r0, 2\n\
+	str r0, [sp, 0x38]\n\
+	mov r1, r8\n\
+	adds r1, 0x1\n\
+	str r1, [sp, 0x30]\n\
+	ldr r0, =gUnknown_03001168\n\
+	ldr r2, [sp, 0x38]\n\
+	adds r2, r0\n\
+	mov r9, r2\n\
+	ldr r3, [sp]\n\
+	movs r4, 0xD8\n\
+	lsls r4, 3\n\
+	adds r0, r3, r4\n\
+	ldr r5, [sp, 0x3C]\n\
+	adds r7, r5, r0\n\
+	str r6, [sp, 0x40]\n\
+	movs r3, 0x2\n\
+_080E878E:\n\
+	ldr r1, [sp, 0x20]\n\
+	movs r2, 0xD8\n\
+	lsls r2, 3\n\
+	adds r0, r1, r2\n\
+	ldr r4, [sp]\n\
+	adds r0, r4, r0\n\
+	ldr r6, [sp, 0x40]\n\
+	adds r5, r0, r6\n\
+	adds r0, r5, 0\n\
+	str r3, [sp, 0x4C]\n\
+	bl ReadUnalignedWord\n\
+	adds r4, r0, 0\n\
+	movs r6, 0x90\n\
+	lsls r6, 1\n\
+	add r6, r10\n\
+	mov r1, r9\n\
+	ldr r0, [r1]\n\
+	adds r0, r6\n\
+	bl ReadUnalignedWord\n\
+	ldr r3, [sp, 0x4C]\n\
+	cmp r4, r0\n\
+	bne _080E8808\n\
+	adds r0, r5, 0x4\n\
+	bl ReadUnalignedWord\n\
+	adds r4, r0, 0\n\
+	mov r2, r9\n\
+	ldr r0, [r2]\n\
+	adds r0, r6\n\
+	adds r0, 0x4\n\
+	bl ReadUnalignedWord\n\
+	ldr r3, [sp, 0x4C]\n\
+	cmp r4, r0\n\
+	bne _080E8808\n\
+	ldr r4, [sp, 0xC]\n\
+	adds r4, 0x1\n\
+	str r4, [sp, 0xC]\n\
+	mov r5, r9\n\
+	ldr r0, [r5]\n\
+	mov r6, r10\n\
+	adds r2, r0, r6\n\
+	movs r0, 0x94\n\
+	lsls r0, 1\n\
+	adds r1, r2, r0\n\
+	ldrh r0, [r7, 0x8]\n\
+	ldrh r1, [r1]\n\
+	cmp r0, r1\n\
+	bcs _080E8808\n\
+	adds r0, r7, 0\n\
+	movs r4, 0x90\n\
+	lsls r4, 1\n\
+	adds r1, r2, r4\n\
+	ldm r1!, {r2,r5,r6}\n\
+	stm r0!, {r2,r5,r6}\n\
+	ldm r1!, {r4-r6}\n\
+	stm r0!, {r4-r6}\n\
+	ldr r1, [r1]\n\
+	str r1, [r0]\n\
+_080E8808:\n\
+	adds r7, 0x1C\n\
+	ldr r0, [sp, 0x40]\n\
+	adds r0, 0x1C\n\
+	str r0, [sp, 0x40]\n\
+	subs r3, 0x1\n\
+	cmp r3, 0\n\
+	bge _080E878E\n\
+	ldr r1, [sp, 0xC]\n\
+	cmp r1, 0\n\
+	bne _080E8850\n\
+	mov r0, r8\n\
+	adds r0, 0x3\n\
+	lsls r1, r0, 3\n\
+	subs r1, r0\n\
+	lsls r1, 2\n\
+	ldr r2, [sp, 0x20]\n\
+	adds r1, r2\n\
+	ldr r3, [sp]\n\
+	adds r1, r3, r1\n\
+	ldr r0, =gUnknown_03001168\n\
+	ldr r4, [sp, 0x38]\n\
+	adds r0, r4, r0\n\
+	ldr r0, [r0]\n\
+	add r0, r10\n\
+	movs r5, 0xD8\n\
+	lsls r5, 3\n\
+	adds r1, r5\n\
+	movs r6, 0x90\n\
+	lsls r6, 1\n\
+	adds r0, r6\n\
+	ldm r0!, {r2-r4}\n\
+	stm r1!, {r2-r4}\n\
+	ldm r0!, {r2,r5,r6}\n\
+	stm r1!, {r2,r5,r6}\n\
+	ldr r0, [r0]\n\
+	str r0, [r1]\n\
+_080E8850:\n\
+	ldr r3, [sp, 0x30]\n\
+	mov r8, r3\n\
+	ldr r4, [sp, 0x24]\n\
+	cmp r8, r4\n\
+	blt _080E8766\n\
+_080E885A:\n\
+	ldr r5, [sp, 0x2C]\n\
+	str r5, [sp, 0x8]\n\
+	cmp r5, 0x1\n\
+	bgt _080E8864\n\
+	b _080E8702\n\
+_080E8864:\n\
+	add sp, 0x54\n\
+	pop {r3-r5}\n\
+	mov r8, r3\n\
+	mov r9, r4\n\
+	mov r10, r5\n\
+	pop {r4-r7}\n\
+	pop {r0}\n\
+	bx r0\n\
+	.pool\n\
+    ");
+}
+
+void sub_80E8880(struct UnknownRecMixingStruct *arg0, struct UnknownRecMixingStruct *arg1)
+{
+    s32 i, j;
+
+    for (i = 0; i < 3; i++)
+    {
+        s32 r2 = 0;
+        s32 r4 = -1;
+        for (j = 0; j < 6; j++)
+        {
+            if (arg1[j].field_4 > r2)
+            {
+                r4 = j;
+                r2 = arg1[j].field_4;
+            }
+        }
+
+        if (r4 >= 0)
+        {
+            arg0[i] = arg1[r4];
+            arg1[r4].field_4 = 0;
+        }
+    }
+}
+
+void sub_80E88CC(struct UnknownRecMixingStruct2 *arg0, struct UnknownRecMixingStruct2 *arg1)
+{
+    s32 i, j;
+
+    for (i = 0; i < 3; i++)
+    {
+        s32 r2 = 0;
+        s32 r4 = -1;
+        for (j = 0; j < 6; j++)
+        {
+            if (arg1[j].field_8 > r2)
+            {
+                r4 = j;
+                r2 = arg1[j].field_8;
+            }
+        }
+
+        if (r4 >= 0)
+        {
+            arg0[i] = arg1[r4];
+            arg1[r4].field_8 = 0;
+        }
+    }
+}
+
+NAKED
+void sub_80E8924(struct UnknownRecMixingStruct3 *arg0)
+{
+    asm_unified("push {r4-r7,lr}\n\
+	mov r7, r10\n\
+	mov r6, r9\n\
+	mov r5, r8\n\
+	push {r5-r7}\n\
+	mov r9, r0\n\
+	movs r0, 0\n\
+	ldr r1, =gSaveBlock2Ptr\n\
+	mov r10, r1\n\
+_080E8936:\n\
+	lsls r1, r0, 1\n\
+	adds r2, r0, 0x1\n\
+	mov r8, r2\n\
+	adds r1, r0\n\
+	lsls r0, r1, 5\n\
+	movs r2, 0x87\n\
+	lsls r2, 2\n\
+	adds r7, r0, r2\n\
+	lsls r1, 6\n\
+	mov r0, r9\n\
+	adds r4, r0, r1\n\
+	movs r6, 0\n\
+	movs r5, 0x1\n\
+_080E8950:\n\
+	mov r1, r10\n\
+	ldr r0, [r1]\n\
+	adds r0, r7\n\
+	adds r0, r6\n\
+	adds r1, r4, 0\n\
+	bl sub_80E8880\n\
+	adds r4, 0x60\n\
+	adds r6, 0x30\n\
+	subs r5, 0x1\n\
+	cmp r5, 0\n\
+	bge _080E8950\n\
+	mov r0, r8\n\
+	cmp r0, 0x8\n\
+	ble _080E8936\n\
+	movs r5, 0\n\
+	ldr r4, =gSaveBlock2Ptr\n\
+_080E8972:\n\
+	movs r0, 0x54\n\
+	adds r1, r5, 0\n\
+	muls r1, r0\n\
+	ldr r2, =0x0000057c\n\
+	adds r1, r2\n\
+	ldr r0, [r4]\n\
+	adds r0, r1\n\
+	movs r1, 0xA8\n\
+	muls r1, r5\n\
+	movs r2, 0xD8\n\
+	lsls r2, 3\n\
+	adds r1, r2\n\
+	add r1, r9\n\
+	bl sub_80E88CC\n\
+	adds r5, 0x1\n\
+	cmp r5, 0x1\n\
+	ble _080E8972\n\
+	pop {r3-r5}\n\
+	mov r8, r3\n\
+	mov r9, r4\n\
+	mov r10, r5\n\
+	pop {r4-r7}\n\
+	pop {r0}\n\
+	bx r0\n\
+	.pool");
+}
+
+static void sub_80E89AC(struct UnkRecordMixingStruct2 *arg0, size_t arg1, u32 arg2)
+{
+    u8 linkPlayerCount = GetLinkPlayerCount();
+    struct UnknownRecMixingStruct3 *largeStructPtr = AllocZeroed(sizeof(struct UnknownRecMixingStruct3));
+
+    sub_80E8578(largeStructPtr, arg0, arg1, arg2, linkPlayerCount);
+    sub_80E8924(largeStructPtr);
+
+    Free(largeStructPtr);
+}
+
+static void sub_80E89F8(struct RecordMixingDayCareMail *dst)
+{
+    gUnknown_02039F9C.mail[0] = gSaveBlock1Ptr->daycare.mons[0].mail;
+    gUnknown_02039F9C.mail[1] = gSaveBlock1Ptr->daycare.mons[1].mail;
+    InitDaycareMailRecordMixing(&gSaveBlock1Ptr->daycare, &gUnknown_02039F9C);
+    *dst = *gUnknown_03001148;
+}
+
+static void sub_80E8A54(struct RecordMixingDayCareMail *src)
+{
+    s32 i;
+
+    for (i = 0; i < src->numDaycareMons; i++)
+    {
+        struct DayCareMail *mail = &src->mail[i];
+        if (mail->message.itemId != 0)
+        {
+            if (mail->gameLanguage != LANGUAGE_JAPANESE)
+                PadNameString(mail->OT_name, 0xFC);
+
+            ConvertInternationalString(mail->monName, mail->monLanguage);
+        }
+    }
+}
+
+static void nullsub_1405(union BattleTowerRecord *src)
+{
+
+}
+
+static void sub_80E8AC0(union BattleTowerRecord *arg0)
+{
+    s32 i;
+
+    for (i = 0; i < 4; i++)
+    {
+        struct UnknownPokemonStruct *towerMon = &arg0->emerald.party[i];
+        if (towerMon->species != 0)
+            StripExtCtrlCodes(towerMon->nickname);
+    }
+
+    sub_8164F70(arg0);
+}
-- 
cgit v1.2.3


From 9e7965fab085a06f700756f448fbc072ee7e0095 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Sat, 26 May 2018 00:25:36 +0200
Subject: document record mixing

---
 src/daycare.c          |  34 +-
 src/dewford_trend.c    |   2 +-
 src/mauville_old_man.c |  29 +-
 src/record_mixing.c    | 963 ++++++++++++++++++++++++-------------------------
 src/secret_base.c      |   2 +-
 src/tv.c               |   4 +-
 6 files changed, 505 insertions(+), 529 deletions(-)

(limited to 'src')

diff --git a/src/daycare.c b/src/daycare.c
index 17928324f..5a6aa2b40 100644
--- a/src/daycare.c
+++ b/src/daycare.c
@@ -47,7 +47,7 @@ extern void sub_81B9328(void);
 extern void CB2_ReturnToField(void);
 
 // this file's functions
-static void ClearDaycareMonMisc(struct DaycareMiscMon *misc);
+static void ClearDaycareMonMail(struct DayCareMail *mail);
 static void SetInitialEggData(struct Pokemon *mon, u16 species, struct DayCare *daycare);
 static u8 GetDaycareCompatibilityScore(struct DayCare *daycare);
 static void DaycarePrintMonInfo(u8 windowId, s32 daycareSlotId, u8 y);
@@ -179,13 +179,13 @@ static void StorePokemonInDaycare(struct Pokemon *mon, struct DaycareMon *daycar
     {
         u8 mailId;
 
-        StringCopy(daycareMon->misc.OT_name, gSaveBlock2Ptr->playerName);
-        GetMonNick(mon, daycareMon->misc.monName);
-        StripExtCtrlCodes(daycareMon->misc.monName);
-        daycareMon->misc.gameLanguage = LANGUAGE_ENGLISH;
-        daycareMon->misc.monLanguage = GetMonData(mon, MON_DATA_LANGUAGE);
+        StringCopy(daycareMon->mail.OT_name, gSaveBlock2Ptr->playerName);
+        GetMonNick(mon, daycareMon->mail.monName);
+        StripExtCtrlCodes(daycareMon->mail.monName);
+        daycareMon->mail.gameLanguage = LANGUAGE_ENGLISH;
+        daycareMon->mail.monLanguage = GetMonData(mon, MON_DATA_LANGUAGE);
         mailId = GetMonData(mon, MON_DATA_MAIL);
-        daycareMon->misc.mail = gSaveBlock1Ptr->mail[mailId];
+        daycareMon->mail.message = gSaveBlock1Ptr->mail[mailId];
         TakeMailFromMon(mon);
     }
 
@@ -219,10 +219,10 @@ static void ShiftDaycareSlots(struct DayCare *daycare)
         daycare->mons[0].mon = daycare->mons[1].mon;
         ZeroBoxMonData(&daycare->mons[1].mon);
 
-        daycare->mons[0].misc = daycare->mons[1].misc;
+        daycare->mons[0].mail = daycare->mons[1].mail;
         daycare->mons[0].steps = daycare->mons[1].steps;
         daycare->mons[1].steps = 0;
-        ClearDaycareMonMisc(&daycare->mons[1].misc);
+        ClearDaycareMonMail(&daycare->mons[1].mail);
     }
 }
 
@@ -277,10 +277,10 @@ static u16 TakeSelectedPokemonFromDaycare(struct DaycareMon *daycareMon)
     }
 
     gPlayerParty[PARTY_SIZE - 1] = pokemon;
-    if (daycareMon->misc.mail.itemId)
+    if (daycareMon->mail.message.itemId)
     {
-        GiveMailToMon2(&gPlayerParty[PARTY_SIZE - 1], &daycareMon->misc.mail);
-        ClearDaycareMonMisc(&daycareMon->misc);
+        GiveMailToMon2(&gPlayerParty[PARTY_SIZE - 1], &daycareMon->mail.message);
+        ClearDaycareMonMail(&daycareMon->mail);
     }
 
     ZeroBoxMonData(&daycareMon->mon);
@@ -364,23 +364,23 @@ u8 GetNumLevelsGainedFromDaycare(void)
     return 0;
 }
 
-static void ClearDaycareMonMisc(struct DaycareMiscMon *misc)
+static void ClearDaycareMonMail(struct DayCareMail *mail)
 {
     s32 i;
 
     for (i = 0; i < OT_NAME_LENGTH + 1; i++)
-        misc->OT_name[i] = 0;
+        mail->OT_name[i] = 0;
     for (i = 0; i < POKEMON_NAME_LENGTH + 1; i++)
-        misc->monName[i] = 0;
+        mail->monName[i] = 0;
 
-    ClearMailStruct(&misc->mail);
+    ClearMailStruct(&mail->message);
 }
 
 static void ClearDaycareMon(struct DaycareMon *daycareMon)
 {
     ZeroBoxMonData(&daycareMon->mon);
     daycareMon->steps = 0;
-    ClearDaycareMonMisc(&daycareMon->misc);
+    ClearDaycareMonMail(&daycareMon->mail);
 }
 
 static void ClearAllDaycareData(struct DayCare *daycare)
diff --git a/src/dewford_trend.c b/src/dewford_trend.c
index 3ceec6563..44b42c123 100644
--- a/src/dewford_trend.c
+++ b/src/dewford_trend.c
@@ -158,7 +158,7 @@ static void sub_8122804(struct EasyChatPair *s, u16 b, u8 c)
     }
 }
 
-void sub_812287C(void *a, u32 b, u8 unused)
+void ReceiveEasyChatPairsData(void *a, u32 b, u8 unused)
 {
     u16 i, j, r3, players;
     struct EasyChatPair *buffer1, *buffer2, *src, *dst, *foo_of_buffer2;
diff --git a/src/mauville_old_man.c b/src/mauville_old_man.c
index 70a934615..2ce8a271d 100644
--- a/src/mauville_old_man.c
+++ b/src/mauville_old_man.c
@@ -793,11 +793,11 @@ void sub_8120C0C(union OldMan * oldMan, u32 r8, u32 r7, u32 r3)
     }
 }
 
-void sub_8120CD0(union OldMan * oldMan, u32 unused, u32 a2)
+void SanitizeReceivedEmeraldOldMan(union OldMan * oldMan, u32 version, u32 language)
 {
     u8 sp00[8];
     s32 i;
-    if (oldMan->common.id == MAUVILLE_MAN_STORYTELLER && a2 == LANGUAGE_JAPANESE)
+    if (oldMan->common.id == MAUVILLE_MAN_STORYTELLER && language == LANGUAGE_JAPANESE)
     {
         struct MauvilleManStoryteller * storyteller = &oldMan->storyteller;
 
@@ -816,9 +816,10 @@ void sub_8120CD0(union OldMan * oldMan, u32 unused, u32 a2)
     }
 }
 
-void sub_8120D34(union OldMan * oldMan, u32 r1, u32 r6)
+void SanitizeReceivedRubyOldMan(union OldMan * oldMan, u32 version, u32 language)
 {
-    u32 r2 = (r1 == LANGUAGE_JAPANESE || r1 == LANGUAGE_ENGLISH) ? 1 : 0;
+    bool32 isRuby = (version == VERSION_SAPPHIRE || version == VERSION_RUBY);
+
     switch (oldMan->common.id)
     {
         case MAUVILLE_MAN_TRADER:
@@ -826,7 +827,7 @@ void sub_8120D34(union OldMan * oldMan, u32 r1, u32 r6)
             struct MauvilleOldManTrader * trader = &oldMan->trader;
             s32 i;
 
-            if (r2)
+            if (isRuby)
             {
                 for (i = 0; i < 4; i++)
                 {
@@ -837,7 +838,7 @@ void sub_8120D34(union OldMan * oldMan, u32 r1, u32 r6)
                         trader->language[i] = LANGUAGE_JAPANESE;
                     }
                     else
-                        trader->language[i] = r6;
+                        trader->language[i] = language;
                 }
             }
             else
@@ -858,12 +859,12 @@ void sub_8120D34(union OldMan * oldMan, u32 r1, u32 r6)
             struct MauvilleManStoryteller * storyteller = &oldMan->storyteller;
             s32 i;
 
-            if (r2)
+            if (isRuby)
             {
                 for (i = 0; i < 4; i++)
                 {
                     if (storyteller->gameStatIDs[i] != 0)
-                        storyteller->language[i] = r6;
+                        storyteller->language[i] = language;
                 }
             }
         }
@@ -872,9 +873,9 @@ void sub_8120D34(union OldMan * oldMan, u32 r1, u32 r6)
         {
             struct MauvilleManBard * bard = &oldMan->bard;
 
-            if (r2)
+            if (isRuby)
             {
-                bard->language = r6;
+                bard->language = language;
             }
         }
             break;
@@ -882,9 +883,9 @@ void sub_8120D34(union OldMan * oldMan, u32 r1, u32 r6)
         {
             struct MauvilleManHipster * hipster = &oldMan->hipster;
 
-            if (r2)
+            if (isRuby)
             {
-                hipster->language = r6;
+                hipster->language = language;
             }
         }
             break;
@@ -892,9 +893,9 @@ void sub_8120D34(union OldMan * oldMan, u32 r1, u32 r6)
         {
             struct MauvilleManGiddy * giddy = &oldMan->giddy;
 
-            if (r2)
+            if (isRuby)
             {
-                giddy->language = r6;
+                giddy->language = language;
             }
         }
             break;
diff --git a/src/record_mixing.c b/src/record_mixing.c
index 9a47d4112..19a8b0889 100644
--- a/src/record_mixing.c
+++ b/src/record_mixing.c
@@ -34,13 +34,37 @@
 #include "daycare.h"
 #include "international_string_util.h"
 
+extern void ReceiveSecretBasesData(struct SecretBaseRecord *, size_t, u8);
+extern void ReceiveEasyChatPairsData(struct EasyChatPair *, size_t, u8);
+
 // Static type declarations
 
+struct UnknownRecMixingStruct
+{
+    u32 field_0;
+    u16 field_4;
+    u8 field_6[9];
+};
+
+struct UnknownRecMixingStruct2
+{
+    u32 field_0;
+    u16 field_4;
+    u16 field_6;
+    u16 field_8;
+    u8 field_A[16];
+};
+
+struct UnknownRecMixingStruct3
+{
+    u8 field_0[0x810];
+};
+
 struct PlayerRecordsRS
 {
-    struct SecretBaseRecord secretBases[20];
-    TVShow tvShows[25];
-    PokeNews pokeNews[16];
+    struct SecretBaseRecord secretBases[SECRET_BASES_COUNT];
+    TVShow tvShows[TV_SHOWS_COUNT];
+    PokeNews pokeNews[POKE_NEWS_COUNT];
     OldMan oldMan;
     struct EasyChatPair easyChatPairs[5];
     struct RecordMixingDayCareMail dayCareMail;
@@ -48,71 +72,75 @@ struct PlayerRecordsRS
     u16 filler11C8[0x32];
 };
 
-struct PlayerRecords
+struct PlayerRecordsEmerald
 {
-    /* 0x0000 */ struct SecretBaseRecord secretBases[20];
-    /* 0x0c80 */ TVShow tvShows[25];
-    /* 0x1004 */ PokeNews pokeNews[16];
+    /* 0x0000 */ struct SecretBaseRecord secretBases[SECRET_BASES_COUNT];
+    /* 0x0c80 */ TVShow tvShows[TV_SHOWS_COUNT];
+    /* 0x1004 */ PokeNews pokeNews[POKE_NEWS_COUNT];
     /* 0x1044 */ OldMan oldMan;
-    /* 0x1084 */ struct EasyChatPair easyChatPair[5];
+    /* 0x1084 */ struct EasyChatPair easyChatPairs[5];
     /* 0x10ac */ struct RecordMixingDayCareMail dayCareMail;
-    /* 0x1124 */ union BattleTowerRecord battleTowerRecord;
+    /* 0x1124 */ struct EmeraldBattleTowerRecord battleTowerRecord;
     /* 0x1210 */ u16 unk_1210;
     /* 0x1214 */ LilycoveLady lilycoveLady;
     /* 0x1254 */ struct UnkRecordMixingStruct unk_1254[2];
     /* 0x12dc */ struct UnkRecordMixingStruct2 unk_12dc;
     /* 0x1434 */ u8 field_1434[0x10];
-}; // 1444
+}; // 0x1444
+
+union PlayerRecords
+{
+    struct PlayerRecordsRS ruby;
+    struct PlayerRecordsEmerald emerald;
+};
 
 // Static RAM declarations
 
-IWRAM_DATA bool8 gUnknown_03001130;
-IWRAM_DATA struct SecretBaseRecord *gUnknown_03001134;
-IWRAM_DATA TVShow *gUnknown_03001138;
-IWRAM_DATA PokeNews *gUnknown_0300113C;
-IWRAM_DATA OldMan *gUnknown_03001140;
-IWRAM_DATA struct EasyChatPair *gUnknown_03001144;
-IWRAM_DATA struct RecordMixingDayCareMail *gUnknown_03001148;
-IWRAM_DATA void *gUnknown_0300114C; // gSaveBlock2Ptr->field_64C
-IWRAM_DATA LilycoveLady *gUnknown_03001150;
-IWRAM_DATA void *gUnknown_03001154; // gSaveBlock2Ptr->field_0DC;
-IWRAM_DATA void *gUnknown_03001158; // gSaveBlock2Ptr->field_64C
-IWRAM_DATA u32 gUnknown_0300115C;
-IWRAM_DATA u8 gUnknown_03001160;
-IWRAM_DATA u32 filler_03001164;
-IWRAM_DATA u32 gUnknown_03001168[3];
-
-EWRAM_DATA struct RecordMixingDayCareMail gUnknown_02039F9C = {};
-EWRAM_DATA struct PlayerRecords *gUnknown_0203A014 = NULL;
-EWRAM_DATA struct PlayerRecords *gUnknown_0203A018 = NULL;
+static IWRAM_DATA bool8 gUnknown_03001130;
+static IWRAM_DATA struct SecretBaseRecord *sSecretBasesSave;
+static IWRAM_DATA TVShow *sTvShowsSave;
+static IWRAM_DATA PokeNews *sPokeNewsSave;
+static IWRAM_DATA OldMan *sOldManSave;
+static IWRAM_DATA struct EasyChatPair *sEasyChatPairsSave;
+static IWRAM_DATA struct RecordMixingDayCareMail *gUnknown_03001148;
+static IWRAM_DATA void *sBattleTowerSave;
+static IWRAM_DATA LilycoveLady *sLilycoveLadySave;
+static IWRAM_DATA void *gUnknown_03001154; // gSaveBlock2Ptr->field_0DC;
+static IWRAM_DATA void *sBattleTowerSave_Duplicate;
+static IWRAM_DATA u32 sRecordStructSize;
+static IWRAM_DATA u8 gUnknown_03001160;
+static IWRAM_DATA u32 filler_03001164;
+static IWRAM_DATA u32 gUnknown_03001168[3];
+
+static EWRAM_DATA struct RecordMixingDayCareMail gUnknown_02039F9C = {0};
+static EWRAM_DATA union PlayerRecords *sReceivedRecords = NULL;
+static EWRAM_DATA union PlayerRecords *sSentRecord = NULL;
 
 // Static ROM declarations
 
-static void sub_80E715C(u8 taskId);
+static void Task_RecordMixing_Main(u8 taskId);
 static void sub_80E7324(u8 taskId);
-static void sub_80E756C(u8 taskId);
-static void sub_80E7630(u8 taskId);
-static void sub_80E77D4(u8 taskId);
-static void *sub_80E77FC(const u16 *asShort);
-static void sub_80E7808(void *records, u16 *a1);
-static u8 sub_80E7810(void);
-static void *sub_80E7820(u8);
-static void sub_80E78C4(OldMan *, size_t, u8);
-static void sub_80E7948(union BattleTowerRecord *, size_t, u8);
-static void sub_80E7A14(LilycoveLady *, size_t, u8);
+static void Task_SendPacket(u8 taskId);
+static void Task_CopyReceiveBuffer(u8 taskId);
+static void Task_SendPacket_SwitchToReceive(u8 taskId);
+static void *LoadPtrFromTaskData(const u16 *asShort);
+static void StorePtrInTaskData(void *records, u16 *a1);
+static u8 GetMultiplayerId_(void);
+static void *GetPlayerRecvBuffer(u8);
+static void ReceiveOldManData(OldMan *, size_t, u8);
+static void ReceiveBattleTowerData(void *battleTowerRecord, size_t, u8);
+static void ReceiveLilycoveLadyData(LilycoveLady *, size_t, u8);
 static void sub_80E7B2C(const u8 *);
-static void sub_80E7B60(struct RecordMixingDayCareMail *, size_t, u8, TVShow *);
+static void ReceiveDaycareMailData(struct RecordMixingDayCareMail *, size_t, u8, TVShow *);
 static void sub_80E7F68(u16 *item, u8 which);
 static void sub_80E7FF8(u8 taskId);
 static void sub_80E8110(struct UnkRecordMixingStruct *arg0, struct UnkRecordMixingStruct *arg1);
 static void sub_80E8468(struct UnkRecordMixingStruct *arg0, size_t arg1, u32 arg2);
 static void sub_80E89AC(struct UnkRecordMixingStruct2 *arg0, size_t arg1, u32 arg2);
 static void sub_80E89F8(struct RecordMixingDayCareMail *dst);
-static void sub_80E8A54(struct RecordMixingDayCareMail *src);
-static void sub_80E8AC0(union BattleTowerRecord *);
-void sub_80EAF80(struct SecretBaseRecord *, size_t, u8);
-void sub_812287C(struct EasyChatPair *, size_t, u8);
-static void nullsub_1405(union BattleTowerRecord *src);
+static void SanitizeDayCareMailForRuby(struct RecordMixingDayCareMail *src);
+static void SanitizeEmeraldBattleTowerRecord(struct EmeraldBattleTowerRecord *arg0);
+static void SanitizeRubyBattleTowerRecord(struct RSBattleTowerRecord *src);
 
 // .rodata
 
@@ -153,242 +181,244 @@ static const u8 gUnknown_0858CFBE[3][4] =
 
 // .text
 
+#define BUFFER_CHUNK_SIZE 200
+
 void sub_80E6BE8(void)
 {
-    sub_80B37D4(sub_80E715C);
+    sub_80B37D4(Task_RecordMixing_Main);
 }
 
-void sub_80E6BF8(void)
+// these variables were const in R/S, but had to become changeable because of saveblocks changing RAM position
+static void SetSrcLookupPointers(void)
 {
-    gUnknown_03001134 = gSaveBlock1Ptr->secretBases;
-    gUnknown_03001138 = gSaveBlock1Ptr->tvShows;
-    gUnknown_0300113C = gSaveBlock1Ptr->pokeNews;
-    gUnknown_03001140 = &gSaveBlock1Ptr->oldMan;
-    gUnknown_03001144 = gSaveBlock1Ptr->easyChatPairs;
+    sSecretBasesSave = gSaveBlock1Ptr->secretBases;
+    sTvShowsSave = gSaveBlock1Ptr->tvShows;
+    sPokeNewsSave = gSaveBlock1Ptr->pokeNews;
+    sOldManSave = &gSaveBlock1Ptr->oldMan;
+    sEasyChatPairsSave = gSaveBlock1Ptr->easyChatPairs;
     gUnknown_03001148 = &gUnknown_02039F9C;
-    gUnknown_0300114C = gSaveBlock2Ptr->field_64C;
-    gUnknown_03001150 = &gSaveBlock1Ptr->lilycoveLady;
+    sBattleTowerSave = &gSaveBlock2Ptr->battleTower;
+    sLilycoveLadySave = &gSaveBlock1Ptr->lilycoveLady;
     gUnknown_03001154 = gSaveBlock2Ptr->field_DC;
-    gUnknown_03001158 = gSaveBlock2Ptr->field_64C;
+    sBattleTowerSave_Duplicate = &gSaveBlock2Ptr->battleTower;
 }
 
-void sub_80E6CA0(struct PlayerRecords *dest)
+static void PrepareUnknownExchangePacket(struct PlayerRecordsRS *dest)
 {
-    memcpy(dest->secretBases, gUnknown_03001134, sizeof(struct SecretBaseRecord) * 20);
-    memcpy(dest->tvShows, gUnknown_03001138, sizeof(TVShow) * 25);
+    memcpy(dest->secretBases, sSecretBasesSave, sizeof(dest->secretBases));
+    memcpy(dest->tvShows, sTvShowsSave, sizeof(dest->tvShows));
     sub_80F14F8(dest->tvShows);
-    memcpy(dest->pokeNews, gUnknown_0300113C, sizeof(PokeNews) * 16);
-    memcpy(&dest->oldMan, gUnknown_03001140, sizeof(OldMan));
-    memcpy(dest->easyChatPair, gUnknown_03001144, sizeof(struct EasyChatPair) * 5);
+    memcpy(dest->pokeNews, sPokeNewsSave, sizeof(dest->pokeNews));
+    memcpy(&dest->oldMan, sOldManSave, sizeof(dest->oldMan));
+    memcpy(dest->easyChatPairs, sEasyChatPairsSave, sizeof(dest->easyChatPairs));
     sub_80E89F8(&dest->dayCareMail);
-    sub_81659DC(gUnknown_0300114C, &dest->battleTowerRecord);
+    sub_81659DC(sBattleTowerSave, &dest->battleTowerRecord);
+
     if (GetMultiplayerId() == 0)
-    {
-        dest->battleTowerRecord.ruby_sapphire.unk_11c8 = GetRecordMixingGift();
-    }
+        dest->battleTowerRecord.unk_11c8 = GetRecordMixingGift();
 }
 
-void sub_80E6D54(struct PlayerRecords *dest)
+static void PrepareExchangePacketForRubySapphire(struct PlayerRecordsRS *dest)
 {
-    memcpy(dest->secretBases, gUnknown_03001134, sizeof(struct SecretBaseRecord) * 20);
+    memcpy(dest->secretBases, sSecretBasesSave, sizeof(dest->secretBases));
     sub_80EB18C(dest->secretBases);
-    memcpy(dest->tvShows, gUnknown_03001138, sizeof(TVShow) * 25);
+    memcpy(dest->tvShows, sTvShowsSave, sizeof(dest->tvShows));
     sub_80F1208(dest->tvShows);
-    memcpy(dest->pokeNews, gUnknown_0300113C, sizeof(PokeNews) * 16);
-    memcpy(&dest->oldMan, gUnknown_03001140, sizeof(OldMan));
+    memcpy(dest->pokeNews, sPokeNewsSave, sizeof(dest->pokeNews));
+    memcpy(&dest->oldMan, sOldManSave, sizeof(dest->oldMan));
     sub_8120B70(&dest->oldMan);
-    memcpy(dest->easyChatPair, gUnknown_03001144, sizeof(struct EasyChatPair) * 5);
+    memcpy(dest->easyChatPairs, sEasyChatPairsSave, sizeof(dest->easyChatPairs));
     sub_80E89F8(&dest->dayCareMail);
-    sub_80E8A54(&dest->dayCareMail);
-    sub_81659DC(gUnknown_0300114C, &dest->battleTowerRecord);
-    nullsub_1405(&dest->battleTowerRecord);
+    SanitizeDayCareMailForRuby(&dest->dayCareMail);
+    sub_81659DC(sBattleTowerSave, &dest->battleTowerRecord);
+    SanitizeRubyBattleTowerRecord(&dest->battleTowerRecord);
+
     if (GetMultiplayerId() == 0)
-    {
-        dest->battleTowerRecord.ruby_sapphire.unk_11c8 = GetRecordMixingGift();
-    }
+        dest->battleTowerRecord.unk_11c8 = GetRecordMixingGift();
 }
 
-void sub_80E6E24(void)
+static void PrepareExchangePacket(void)
 {
     sub_80E9914();
     sub_80F0BB8();
-    sub_80E6BF8();
+    SetSrcLookupPointers();
+
     if (Link_AnyPartnersPlayingRubyOrSapphire())
     {
-        if (sub_800A03C() == FALSE)
-        {
-            sub_80E6CA0(gUnknown_0203A018);
-        }
+        if (sub_800A03C() == 0)
+            PrepareUnknownExchangePacket(&sSentRecord->ruby);
         else
-        {
-            sub_80E6D54(gUnknown_0203A018);
-        }
+            PrepareExchangePacketForRubySapphire(&sSentRecord->ruby);
     }
     else
     {
-        memcpy(gUnknown_0203A018->secretBases, gUnknown_03001134, sizeof(struct SecretBaseRecord) * 20);
-        memcpy(gUnknown_0203A018->tvShows, gUnknown_03001138, sizeof(TVShow) * 25);
-        memcpy(gUnknown_0203A018->pokeNews, gUnknown_0300113C, sizeof(PokeNews) * 16);
-        memcpy(&gUnknown_0203A018->oldMan, gUnknown_03001140, sizeof(OldMan));
-        memcpy(&gUnknown_0203A018->lilycoveLady, gUnknown_03001150, sizeof(LilycoveLady));
-        memcpy(gUnknown_0203A018->easyChatPair, gUnknown_03001144, sizeof(struct EasyChatPair) * 5);
-        sub_80E89F8(&gUnknown_0203A018->dayCareMail);
-        memcpy(&gUnknown_0203A018->battleTowerRecord, gUnknown_0300114C, 0xec);
-        sub_80E8AC0(&gUnknown_0203A018->battleTowerRecord);
+        memcpy(sSentRecord->emerald.secretBases, sSecretBasesSave, sizeof(sSentRecord->emerald.secretBases));
+        memcpy(sSentRecord->emerald.tvShows, sTvShowsSave, sizeof(sSentRecord->emerald.tvShows));
+        memcpy(sSentRecord->emerald.pokeNews, sPokeNewsSave, sizeof(sSentRecord->emerald.pokeNews));
+        memcpy(&sSentRecord->emerald.oldMan, sOldManSave, sizeof(sSentRecord->emerald.oldMan));
+        memcpy(&sSentRecord->emerald.lilycoveLady, sLilycoveLadySave, sizeof(sSentRecord->emerald.lilycoveLady));
+        memcpy(sSentRecord->emerald.easyChatPairs, sEasyChatPairsSave, sizeof(sSentRecord->emerald.easyChatPairs));
+        sub_80E89F8(&sSentRecord->emerald.dayCareMail);
+        memcpy(&sSentRecord->emerald.battleTowerRecord, sBattleTowerSave, sizeof(sSentRecord->emerald.battleTowerRecord));
+        SanitizeEmeraldBattleTowerRecord(&sSentRecord->emerald.battleTowerRecord);
+
         if (GetMultiplayerId() == 0)
-        {
-            gUnknown_0203A018->unk_1210 = GetRecordMixingGift();
-        }
-        sub_80E8110(gUnknown_0203A018->unk_1254, gUnknown_03001154);
-        sub_80E8260(&gUnknown_0203A018->unk_12dc);
+            sSentRecord->emerald.unk_1210 = GetRecordMixingGift();
+
+        sub_80E8110(sSentRecord->emerald.unk_1254, gUnknown_03001154);
+        sub_80E8260(&sSentRecord->emerald.unk_12dc);
     }
 }
 
-void sub_80E6F60(u32 which)
+static void ReceiveExchangePacket(u32 which)
 {
     if (Link_AnyPartnersPlayingRubyOrSapphire())
     {
         // Ruby/Sapphire
-        sub_80E7B2C((void *)gUnknown_0203A014[0].tvShows);
-        sub_80EAF80(gUnknown_0203A014[0].secretBases, sizeof(struct PlayerRecordsRS), which);
-        sub_80E7B60(&gUnknown_0203A014[0].dayCareMail, sizeof(struct PlayerRecordsRS), which, gUnknown_0203A014[0].tvShows);
-        sub_80E7948(&gUnknown_0203A014[0].battleTowerRecord, sizeof(struct PlayerRecordsRS), which);
-        sub_80F01E8(gUnknown_0203A014[0].tvShows, sizeof(struct PlayerRecordsRS), which);
-        sub_80F0C7C(gUnknown_0203A014[0].pokeNews, sizeof(struct PlayerRecordsRS), which);
-        sub_80E78C4(&gUnknown_0203A014[0].oldMan, sizeof(struct PlayerRecordsRS), which);
-        sub_812287C(gUnknown_0203A014[0].easyChatPair, sizeof(struct PlayerRecordsRS), which);
-        sub_80E7F68(&gUnknown_0203A014[0].battleTowerRecord.ruby_sapphire.unk_11c8, which);
+        sub_80E7B2C((void *)sReceivedRecords->ruby.tvShows);
+        ReceiveSecretBasesData(sReceivedRecords->ruby.secretBases, sizeof(struct PlayerRecordsRS), which);
+        ReceiveDaycareMailData(&sReceivedRecords->ruby.dayCareMail, sizeof(struct PlayerRecordsRS), which, sReceivedRecords->ruby.tvShows);
+        ReceiveBattleTowerData(&sReceivedRecords->ruby.battleTowerRecord, sizeof(struct PlayerRecordsRS), which);
+        ReceiveTvShowsData(sReceivedRecords->ruby.tvShows, sizeof(struct PlayerRecordsRS), which);
+        ReceivePokeNewsData(sReceivedRecords->ruby.pokeNews, sizeof(struct PlayerRecordsRS), which);
+        ReceiveOldManData(&sReceivedRecords->ruby.oldMan, sizeof(struct PlayerRecordsRS), which);
+        ReceiveEasyChatPairsData(sReceivedRecords->ruby.easyChatPairs, sizeof(struct PlayerRecordsRS), which);
+        sub_80E7F68(&sReceivedRecords->ruby.battleTowerRecord.unk_11c8, which);
     }
     else
     {
         // Emerald
-        sub_80E7B2C((void *)gUnknown_0203A014[0].tvShows);
-        sub_80EAF80(gUnknown_0203A014[0].secretBases, sizeof(struct PlayerRecords), which);
-        sub_80F01E8(gUnknown_0203A014[0].tvShows, sizeof(struct PlayerRecords), which);
-        sub_80F0C7C(gUnknown_0203A014[0].pokeNews, sizeof(struct PlayerRecords), which);
-        sub_80E78C4(&gUnknown_0203A014[0].oldMan, sizeof(struct PlayerRecords), which);
-        sub_812287C(gUnknown_0203A014[0].easyChatPair, sizeof(struct PlayerRecords), which);
-        sub_80E7B60(&gUnknown_0203A014[0].dayCareMail, sizeof(struct PlayerRecords), which, gUnknown_0203A014[0].tvShows);
-        sub_80E7948(&gUnknown_0203A014[0].battleTowerRecord, sizeof(struct PlayerRecords), which);
-        sub_80E7F68(&gUnknown_0203A014[0].unk_1210, which);
-        sub_80E7A14(&gUnknown_0203A014[0].lilycoveLady, sizeof(struct PlayerRecords), which);
-        sub_80E8468(gUnknown_0203A014[0].unk_1254, sizeof(struct PlayerRecords), (u8) which);
-        sub_80E89AC(&gUnknown_0203A014[0].unk_12dc, sizeof(struct PlayerRecords), (u8) which);
+        sub_80E7B2C((void *)sReceivedRecords->emerald.tvShows);
+        ReceiveSecretBasesData(sReceivedRecords->emerald.secretBases, sizeof(struct PlayerRecordsEmerald), which);
+        ReceiveTvShowsData(sReceivedRecords->emerald.tvShows, sizeof(struct PlayerRecordsEmerald), which);
+        ReceivePokeNewsData(sReceivedRecords->emerald.pokeNews, sizeof(struct PlayerRecordsEmerald), which);
+        ReceiveOldManData(&sReceivedRecords->emerald.oldMan, sizeof(struct PlayerRecordsEmerald), which);
+        ReceiveEasyChatPairsData(sReceivedRecords->emerald.easyChatPairs, sizeof(struct PlayerRecordsEmerald), which);
+        ReceiveDaycareMailData(&sReceivedRecords->emerald.dayCareMail, sizeof(struct PlayerRecordsEmerald), which, sReceivedRecords->emerald.tvShows);
+        ReceiveBattleTowerData(&sReceivedRecords->emerald.battleTowerRecord, sizeof(struct PlayerRecordsEmerald), which);
+        sub_80E7F68(&sReceivedRecords->emerald.unk_1210, which);
+        ReceiveLilycoveLadyData(&sReceivedRecords->emerald.lilycoveLady, sizeof(struct PlayerRecordsEmerald), which);
+        sub_80E8468(sReceivedRecords->emerald.unk_1254, sizeof(struct PlayerRecordsEmerald), (u8) which);
+        sub_80E89AC(&sReceivedRecords->emerald.unk_12dc, sizeof(struct PlayerRecordsEmerald), (u8) which);
     }
 }
 
-void sub_80E70F4(const u8 *src)
+static void PrintTextOnRecordMixing(const u8 *src)
 {
     NewMenuHelpers_DrawDialogueFrame(0, 0);
     PrintTextOnWindow(0, 1, src, 0, 1, 0, NULL);
     CopyWindowToVram(0, 3);
 }
 
-void sub_80E7128(u8 taskId)
+#define tCounter data[0]
+
+static void Task_RecordMixing_SoundEffect(u8 taskId)
 {
-    if (++ gTasks[taskId].data[0] == 50)
+    if (++gTasks[taskId].tCounter == 50)
     {
         PlaySE(SE_W213);
-        gTasks[taskId].data[0] = 0;
+        gTasks[taskId].tCounter = 0;
     }
 }
 
-static void sub_80E715C(u8 taskId)
+#undef tCounter
+
+#define tState        data[0]
+#define tSndEffTaskId data[15]
+
+static void Task_RecordMixing_Main(u8 taskId)
 {
-    s16 *data;
+    s16 *data = gTasks[taskId].data;
 
-    data = gTasks[taskId].data;
-    switch (data[0])
+    switch (tState)
     {
-        case 0:
-            gUnknown_0203A018 = malloc(sizeof(struct PlayerRecords));
-            gUnknown_0203A014 = malloc(sizeof(struct PlayerRecords) * 4);
-            sub_8009628(gSpecialVar_0x8005);
-            VarSet(VAR_TEMP_0, 1);
-            gUnknown_03001130 = FALSE;
-            sub_80E6E24();
-            sub_80FB00C();
-            data[0] = 1;
-            data[10] = CreateTask(sub_80E7324, 80);
-            data[15] = CreateTask(sub_80E7128, 81);
-            break;
-        case 1:
-            if (!gTasks[data[10]].isActive)
-            {
-                data[0] = 2;
-                FlagSet(FLAG_SYS_MIX_RECORD);
-                sub_80FB074();
-                DestroyTask(data[15]);
-            }
-            break;
-        case 2:
-            data[10] = CreateTask(sub_80E7FF8, 10);
-            data[0] = 3;
-            PlaySE(SE_W226);
-            break;
-        case 3:
-            if (!gTasks[data[10]].isActive)
-            {
-                data[0] = 4;
-                if (gWirelessCommType == 0)
-                {
-                    data[10] = sub_80B3050();
-                }
-                sub_80E70F4(gText_RecordMixingComplete);
-                data[8] = 0;
-            }
-            break;
-        case 4:
-            if (++ data[8] > 60)
-            {
-                data[0] = 5;
-            }
-            break;
-        case 5:
-            if (!gTasks[data[10]].isActive)
+    case 0: // init
+        sSentRecord = malloc(sizeof(union PlayerRecords));
+        sReceivedRecords = malloc(sizeof(union PlayerRecords) * 4);
+        sub_8009628(gSpecialVar_0x8005);
+        VarSet(VAR_TEMP_0, 1);
+        gUnknown_03001130 = FALSE;
+        PrepareExchangePacket();
+        CreateRecordMixingSprite();
+        tState = 1;
+        data[10] = CreateTask(sub_80E7324, 80);
+        tSndEffTaskId = CreateTask(Task_RecordMixing_SoundEffect, 81);
+        break;
+    case 1: // wait for sub_80E7324
+        if (!gTasks[data[10]].isActive)
+        {
+            tState = 2;
+            FlagSet(FLAG_SYS_MIX_RECORD);
+            DestroyRecordMixingSprite();
+            DestroyTask(tSndEffTaskId);
+        }
+        break;
+    case 2:
+        data[10] = CreateTask(sub_80E7FF8, 10);
+        tState = 3;
+        PlaySE(SE_W226);
+        break;
+    case 3: // wait for sub_80E7FF8
+        if (!gTasks[data[10]].isActive)
+        {
+            tState = 4;
+            if (gWirelessCommType == 0)
+                data[10] = sub_80B3050();
+
+            PrintTextOnRecordMixing(gText_RecordMixingComplete);
+            data[8] = 0;
+        }
+        break;
+    case 4: // wait 60 frames
+        if (++data[8] > 60)
+            tState = 5;
+        break;
+    case 5:
+        if (!gTasks[data[10]].isActive)
+        {
+            free(sReceivedRecords);
+            free(sSentRecord);
+            sub_808729C();
+            if (gWirelessCommType != 0)
             {
-                free(gUnknown_0203A014);
-                free(gUnknown_0203A018);
-                sub_808729C();
-                if (gWirelessCommType != 0)
-                {
-                    CreateTask(sub_80AF2B4, 10);
-                }
-                sub_8197434(0, 1);
-                DestroyTask(taskId);
-                EnableBothScriptContexts();
+                CreateTask(sub_80AF2B4, 10);
             }
-            break;
+            sub_8197434(0, 1);
+            DestroyTask(taskId);
+            EnableBothScriptContexts();
+        }
+        break;
     }
 }
 
+#undef tState
+#undef tSndEffTaskId
+
 static void sub_80E7324(u8 taskId)
 {
-    u8 r4;
-    u8 taskId2;
-    struct Task *task;
+    struct Task *task = &gTasks[taskId];
 
-    task = &gTasks[taskId];
     switch (task->data[0])
     {
-        case 0:
-            sub_80E70F4(gText_MixingRecords);
-            task->data[8] = 0x708;
-            task->data[0] = 400;
-            ClearLinkCallback_2();
-            break;
-        case 100:
-            if (++ task->data[12] > 20)
-            {
-                task->data[12] = 0;
-                task->data[0] = 101;
-            }
-            break;
-        case 101:
-            r4 = GetLinkPlayerCount_2();
+    case 0:
+        PrintTextOnRecordMixing(gText_MixingRecords);
+        task->data[8] = 0x708;
+        task->data[0] = 400;
+        ClearLinkCallback_2();
+        break;
+    case 100: // wait 20 frames
+        if (++task->data[12] > 20)
+        {
+            task->data[12] = 0;
+            task->data[0] = 101;
+        }
+        break;
+    case 101:
+        {
+            u8 players = GetLinkPlayerCount_2();
             if (IsLinkMaster() == TRUE)
             {
-                if (r4 == sub_800AA48())
+                if (players == sub_800AA48())
                 {
                     PlaySE(SE_PIN);
                     task->data[0] = 201;
@@ -400,272 +430,248 @@ static void sub_80E7324(u8 taskId)
                 PlaySE(SE_BOO);
                 task->data[0] = 301;
             }
-            break;
-        case 201:
-            if (sub_800AA48() == GetLinkPlayerCount_2() && ++ task->data[12] > (GetLinkPlayerCount_2() * 30))
-            {
-                sub_800A620();
-                task->data[0] = 1;
-            }
-            break;
-        case 301:
-            if (sub_800AA48() == GetLinkPlayerCount_2())
-            {
-                task->data[0] = 1;
-            }
-            break;
-        case 400:
-            if (++ task->data[12] > 20)
-            {
-                task->data[0] = 1;
-                task->data[12] = 0;
-            }
-            break;
-        case 1:
-            if (gReceivedRemoteLinkPlayers != 0)
-            {
-                ConvertIntToDecimalStringN(gStringVar1, sub_80E7810(), STR_CONV_MODE_LEADING_ZEROS, 2);
-                task->data[0] = 5;
-            }
-            break;
-        case 2:
+        }
+        break;
+    case 201:
+        if (sub_800AA48() == GetLinkPlayerCount_2() && ++task->data[12] > (GetLinkPlayerCount_2() * 30))
+        {
+            sub_800A620();
+            task->data[0] = 1;
+        }
+        break;
+    case 301:
+        if (sub_800AA48() == GetLinkPlayerCount_2())
+            task->data[0] = 1;
+        break;
+    case 400: // wait 20 frames
+        if (++task->data[12] > 20)
+        {
+            task->data[0] = 1;
+            task->data[12] = 0;
+        }
+        break;
+    case 1: // wait for handshake
+        if (gReceivedRemoteLinkPlayers != 0)
+        {
+            ConvertIntToDecimalStringN(gStringVar1, GetMultiplayerId_(), STR_CONV_MODE_LEADING_ZEROS, 2);
+            task->data[0] = 5;
+        }
+        break;
+    case 2:
+        {
+            u8 subTaskId;
+
             task->data[6] = GetLinkPlayerCount_2();
             task->data[0] = 0;
-            task->data[5] = sub_80E7810();
-            task->func = sub_80E756C;
+            task->data[5] = GetMultiplayerId_();
+            task->func = Task_SendPacket;
             if (Link_AnyPartnersPlayingRubyOrSapphire())
             {
-                sub_80E7808(gUnknown_0203A018, (u16 *)&task->data[2]);
-                taskId2 = CreateTask(sub_80E7630, 80);
-                task->data[10] = taskId2;
-                gTasks[taskId2].data[0] = taskId;
-                sub_80E7808(gUnknown_0203A014, (u16 *)&gTasks[taskId2].data[5]);
-                gUnknown_0300115C = sizeof(struct PlayerRecordsRS);
+                StorePtrInTaskData(sSentRecord, (u16 *)&task->data[2]);
+                subTaskId = CreateTask(Task_CopyReceiveBuffer, 80);
+                task->data[10] = subTaskId;
+                gTasks[subTaskId].data[0] = taskId;
+                StorePtrInTaskData(sReceivedRecords, (u16 *)&gTasks[subTaskId].data[5]);
+                sRecordStructSize = sizeof(struct PlayerRecordsRS);
             }
             else
             {
-                sub_80E7808(gUnknown_0203A018, (u16 *)&task->data[2]);
-                taskId2 = CreateTask(sub_80E7630, 80);
-                task->data[10] = taskId2;
-                gTasks[taskId2].data[0] = taskId;
-                sub_80E7808(gUnknown_0203A014, (u16 *)&gTasks[taskId2].data[5]);
-                gUnknown_0300115C = sizeof(struct PlayerRecords);
-            }
-            break;
-        case 5:
-            if (++ task->data[10] > 60)
-            {
-                task->data[10] = 0;
-                task->data[0] = 2;
+                StorePtrInTaskData(sSentRecord, (u16 *)&task->data[2]);
+                subTaskId = CreateTask(Task_CopyReceiveBuffer, 80);
+                task->data[10] = subTaskId;
+                gTasks[subTaskId].data[0] = taskId;
+                StorePtrInTaskData(sReceivedRecords, (u16 *)&gTasks[subTaskId].data[5]);
+                sRecordStructSize = sizeof(struct PlayerRecordsEmerald);
             }
-            break;
+        }
+        break;
+    case 5: // wait 60 frames
+        if (++task->data[10] > 60)
+        {
+            task->data[10] = 0;
+            task->data[0] = 2;
+        }
+        break;
     }
 }
 
-static void sub_80E756C(u8 taskId)
+static void Task_SendPacket(u8 taskId)
 {
-    struct Task *task;
-    void *dest;
+    struct Task *task = &gTasks[taskId];
+    // does this send the data 24 times?
 
-    task = &gTasks[taskId];
     switch (task->data[0])
     {
-        case 0:
-            dest = sub_80E77FC(&task->data[2]) + task->data[4] * 200;
-            memcpy(gBlockSendBuffer, dest, 200);
-            task->data[0] ++;
-            break;
-        case 1:
-            if (GetMultiplayerId() == 0)
-            {
-                sub_800A4D8(1);
-            }
-            task->data[0] ++;
-            break;
-        case 2:
-            break;
-        case 3:
-            task->data[4] ++;
-            if (task->data[4] == gUnknown_0300115C / 200 + 1)
-            {
-                task->data[0] ++;
-            }
-            else
-            {
-                task->data[0] = 0;
-            }
-            break;
-        case 4:
-            if (!gTasks[task->data[10]].isActive)
-            {
-                task->func = sub_80E77D4;
-            }
-            break;
+    case 0: // Copy record data to send buffer
+        {
+            void *recordData = LoadPtrFromTaskData(&task->data[2]) + task->data[4] * BUFFER_CHUNK_SIZE;
+
+            memcpy(gBlockSendBuffer, recordData, BUFFER_CHUNK_SIZE);
+            task->data[0]++;
+        }
+        break;
+    case 1:
+        if (GetMultiplayerId() == 0)
+            sub_800A4D8(1);
+        task->data[0]++;
+        break;
+    case 2:
+        break;
+    case 3:
+        task->data[4]++;
+        if (task->data[4] == sRecordStructSize / 200 + 1)
+            task->data[0]++;
+        else
+            task->data[0] = 0;
+        break;
+    case 4:
+        if (!gTasks[task->data[10]].isActive)
+            task->func = Task_SendPacket_SwitchToReceive;
+        break;
     }
 }
 
-static void sub_80E7630(u8 taskId)
+static void Task_CopyReceiveBuffer(u8 taskId)
 {
-    struct Task *task;
-    u8 status;
-    u8 counter;
-    u8 i;
-    void *dest;
-    void *src;
-
-    task = &gTasks[taskId];
-    status = GetBlockReceivedStatus();
-    counter = 0;
+    struct Task *task = &gTasks[taskId];
+    u8 status = GetBlockReceivedStatus();
+    u8 handledPlayers = 0;
+
     if (status == sub_800A9D8())
     {
-        for (i = 0; i < GetLinkPlayerCount(); i ++)
+        u8 i;
+
+        for (i = 0; i < GetLinkPlayerCount(); i++)
         {
-            if ((status >> i) & 0x01)
+            void *dest;
+            void *src;
+
+            if ((status >> i) & 1)
             {
-                dest = sub_80E77FC((u16 *)&task->data[5]) + task->data[i + 1] * 200 + gUnknown_0300115C * i;
-                src = sub_80E7820(i);
-                if ((task->data[i + 1] + 1) * 200 > gUnknown_0300115C)
-                {
-                    memcpy(dest, src, gUnknown_0300115C - task->data[i + 1] * 200);
-                }
+                dest = LoadPtrFromTaskData((u16 *)&task->data[5]) + task->data[i + 1] * BUFFER_CHUNK_SIZE + sRecordStructSize * i;
+                src = GetPlayerRecvBuffer(i);
+                if ((task->data[i + 1] + 1) * BUFFER_CHUNK_SIZE > sRecordStructSize)
+                    memcpy(dest, src, sRecordStructSize - task->data[i + 1] * BUFFER_CHUNK_SIZE);
                 else
-                {
-                    memcpy(dest, src, 200);
-                }
+                    memcpy(dest, src, BUFFER_CHUNK_SIZE);
                 ResetBlockReceivedFlag(i);
-                task->data[i + 1] ++;
-                if (task->data[i + 1] == gUnknown_0300115C / 200 + 1)
-                {
-                    counter ++;
-                }
+                task->data[i + 1]++;
+                if (task->data[i + 1] == sRecordStructSize / BUFFER_CHUNK_SIZE + 1)
+                    handledPlayers++;
             }
         }
-        gTasks[task->data[0]].data[0] ++;
+        gTasks[task->data[0]].data[0]++;
     }
-    if (counter == GetLinkPlayerCount())
-    {
+
+    if (handledPlayers == GetLinkPlayerCount())
         DestroyTask(taskId);
-    }
 }
 
 static void sub_80E776C(u8 taskId)
 {
-    struct Task *task;
+    struct Task *task = &gTasks[taskId];
 
-    task = &gTasks[taskId];
     if (!gTasks[task->data[10]].isActive)
-    {
         DestroyTask(taskId);
-    }
 }
 
-static void sub_80E77A0(u8 taskId)
+static void Task_ReceivePacket(u8 taskId)
 {
-    struct Task *task;
+    struct Task *task = &gTasks[taskId];
 
-    task = &gTasks[taskId];
     task->func = sub_80E776C;
     if (gUnknown_03001130 == TRUE)
-    {
-        sub_80E6F60(task->data[5]);
-    }
+        ReceiveExchangePacket(task->data[5]);
 }
 
-static void sub_80E77D4(u8 taskId)
+static void Task_SendPacket_SwitchToReceive(u8 taskId)
 {
-    gTasks[taskId].func = sub_80E77A0;
+    gTasks[taskId].func = Task_ReceivePacket;
     gUnknown_03001130 = TRUE;
 }
 
-static void *sub_80E77FC(const u16 *asShort)
+static void *LoadPtrFromTaskData(const u16 *asShort)
 {
     return (void *)(asShort[0] | (asShort[1] << 16));
 }
 
-static void sub_80E7808(void *records, u16 *asShort)
+static void StorePtrInTaskData(void *records, u16 *asShort)
 {
     asShort[0] = (u32)records;
     asShort[1] = ((u32)records >> 16);
 }
 
-static u8 sub_80E7810(void)
+static u8 GetMultiplayerId_(void)
 {
     return GetMultiplayerId();
 }
 
-static void *sub_80E7820(u8 id)
+static void *GetPlayerRecvBuffer(u8 id)
 {
     return gBlockRecvBuffer[id];
 }
 
-void sub_80E7830(u32 *data)
+static void ShufflePlayerIndices(u32 *data)
 {
     u32 i;
     u32 linkTrainerId;
+    u32 players = GetLinkPlayerCount();
 
-    switch ((u32)GetLinkPlayerCount())
+    switch (players)
     {
-        case 2:
-            for (i = 0; i < 2; i ++)
-            {
-                data[i] = gUnknown_0858CF8C[i];
-            }
-            break;
-        case 3:
-            linkTrainerId = GetLinkPlayerTrainerId(0) % 2;
-            for (i = 0; i < 3; i ++)
-            {
-                data[i] = gUnknown_0858CF8E[linkTrainerId][i];
-            }
-            break;
-        case 4:
-            linkTrainerId = GetLinkPlayerTrainerId(0) % 9;
-            for (i = 0; i < 4; i ++)
-            {
-                data[i] = gUnknown_0858CF94[linkTrainerId][i];
-            }
-            break;
+    case 2:
+        for (i = 0; i < 2; i++)
+            data[i] = gUnknown_0858CF8C[i];
+        break;
+    case 3:
+        linkTrainerId = GetLinkPlayerTrainerId(0) % 2;
+        for (i = 0; i < 3; i++)
+            data[i] = gUnknown_0858CF8E[linkTrainerId][i];
+        break;
+    case 4:
+        linkTrainerId = GetLinkPlayerTrainerId(0) % 9;
+        for (i = 0; i < 4; i++)
+            data[i] = gUnknown_0858CF94[linkTrainerId][i];
+        break;
     }
 }
 
-static void sub_80E78C4(OldMan *oldMan, size_t recordSize, u8 which)
+static void ReceiveOldManData(OldMan *oldMan, size_t recordSize, u8 which)
 {
     u8 version;
     u16 language;
     OldMan *dest;
     u32 mixIndices[4];
 
-    sub_80E7830(mixIndices);
+    ShufflePlayerIndices(mixIndices);
     dest = (void *)oldMan + recordSize * mixIndices[which];
     version = gLinkPlayers[mixIndices[which]].version;
     language = gLinkPlayers[mixIndices[which]].language;
+
     if (Link_AnyPartnersPlayingRubyOrSapphire())
-    {
-        sub_8120D34(dest, version, language);
-    }
+        SanitizeReceivedRubyOldMan(dest, version, language);
     else
-    {
-        sub_8120CD0(dest, version, language);
-    }
-    memcpy(gUnknown_03001140, (void *)oldMan + recordSize * mixIndices[which], sizeof(OldMan));
+        SanitizeReceivedEmeraldOldMan(dest, version, language);
+
+    memcpy(sOldManSave, (void *)oldMan + recordSize * mixIndices[which], sizeof(OldMan));
     ResetMauvilleOldManFlag();
 }
 
-static void sub_80E7948(union BattleTowerRecord *battleTowerRecord, size_t recordSize, u8 which)
+static void ReceiveBattleTowerData(void *battleTowerRecord, size_t recordSize, u8 which)
 {
-    union BattleTowerRecord *dest;
+    struct EmeraldBattleTowerRecord *dest;
     struct UnknownPokemonStruct *btPokemon;
     u32 mixIndices[4];
     s32 i;
 
-    sub_80E7830(mixIndices);
+    ShufflePlayerIndices(mixIndices);
     if (Link_AnyPartnersPlayingRubyOrSapphire())
     {
         if (sub_816587C((void *)battleTowerRecord + recordSize * mixIndices[which], (void *)battleTowerRecord + recordSize * which) == TRUE)
         {
             dest = (void *)battleTowerRecord + recordSize * which;
-            dest->emerald.language = gLinkPlayers[mixIndices[which]].language;
-            sub_8164F70(dest);
+            dest->language = gLinkPlayers[mixIndices[which]].language;
+            CalcEmeraldBattleTowerChecksum(dest);
         }
     }
     else
@@ -674,38 +680,37 @@ static void sub_80E7948(union BattleTowerRecord *battleTowerRecord, size_t recor
         dest = (void *)battleTowerRecord + recordSize * which;
         for (i = 0; i < 4; i ++)
         {
-            btPokemon = &dest->emerald.party[i];
+            btPokemon = &dest->party[i];
             if (btPokemon->species != SPECIES_NONE && IsStringJapanese(btPokemon->nickname))
-            {
                 ConvertInternationalString(btPokemon->nickname, LANGUAGE_JAPANESE);
-            }
         }
-        sub_8164F70(dest);
+        CalcEmeraldBattleTowerChecksum(dest);
     }
     sub_81628A0((void *)battleTowerRecord + recordSize * which);
 }
 
-static void sub_80E7A14(LilycoveLady *lilycoveLady, size_t recordSize, u8 which)
+static void ReceiveLilycoveLadyData(LilycoveLady *lilycoveLady, size_t recordSize, u8 which)
 {
     LilycoveLady *dest;
     u32 mixIndices[4];
 
-    sub_80E7830(mixIndices);
-    memcpy((void *)lilycoveLady + recordSize * which, gUnknown_03001150, sizeof(LilycoveLady));
+    ShufflePlayerIndices(mixIndices);
+    memcpy((void *)lilycoveLady + recordSize * which, sLilycoveLadySave, sizeof(LilycoveLady));
+
     if (GetLilycoveLadyId() == 0)
     {
         dest = malloc(sizeof(LilycoveLady));
         if (dest == NULL)
-        {
             return;
-        }
-        memcpy(dest, gUnknown_03001150, sizeof(LilycoveLady));
+
+        memcpy(dest, sLilycoveLadySave, sizeof(LilycoveLady));
     }
     else
     {
         dest = NULL;
     }
-    memcpy(gUnknown_03001150, (void *)lilycoveLady + recordSize * mixIndices[which], sizeof(LilycoveLady));
+
+    memcpy(sLilycoveLadySave, (void *)lilycoveLady + recordSize * mixIndices[which], sizeof(LilycoveLady));
     sub_818DA78();
     if (dest != NULL)
     {
@@ -735,13 +740,12 @@ static void sub_80E7AA4(struct RecordMixingDayCareMail *src, size_t recordSize,
 static void sub_80E7B2C(const u8 *src)
 {
     u8 sum;
-    int i;
+    s32 i;
 
     sum = 0;
     for (i = 0; i < 256; i ++)
-    {
         sum += src[i];
-    }
+
     gUnknown_03001160 = sum;
 }
 
@@ -751,7 +755,7 @@ static u8 sub_80E7B54(void)
 }
 
 #ifdef NONMATCHING
-static void sub_80E7B60(struct RecordMixingDayCareMail *src, size_t recordSize, u8 which, TVShow *shows)
+static void ReceiveDaycareMailData(struct RecordMixingDayCareMail *src, size_t recordSize, u8 which, TVShow *shows)
 {
     // r9 = which
     u16 i;
@@ -929,7 +933,8 @@ static void sub_80E7B60(struct RecordMixingDayCareMail *src, size_t recordSize,
     SeedRng(oldSeed);
 }
 #else
-__attribute__((naked)) static void sub_80E7B60(struct RecordMixingDayCareMail *src, size_t recordSize, u8 which, TVShow *shows)
+NAKED
+static void ReceiveDaycareMailData(struct RecordMixingDayCareMail *src, size_t recordSize, u8 which, TVShow *shows)
 {
     asm_unified("\tpush {r4-r7,lr}\n"
                     "\tmov r7, r10\n"
@@ -1464,9 +1469,7 @@ static void sub_80E7F68(u16 *item, u8 which)
             VarSet(VAR_TEMP_1, *item);
             StringCopy(gStringVar1, gLinkPlayers[0].name);
             if (*item == ITEM_EON_TICKET)
-            {
                 FlagSet(FLAG_SYS_HAS_EON_TICKET);
-            }
         }
         else
         {
@@ -1477,84 +1480,77 @@ static void sub_80E7F68(u16 *item, u8 which)
 
 static void sub_80E7FF8(u8 taskId)
 {
-    struct Task *task;
+    struct Task *task = &gTasks[taskId];
 
-    task = &gTasks[taskId];
     switch (task->data[0])
     {
-        case 0:
+    case 0:
+        task->data[0]++;
+        break;
+    case 1:
+        if (Link_AnyPartnersPlayingRubyOrSapphire())
+            task->data[0]++;
+        else
+            task->data[0] = 6;
+        break;
+    case 2:
+        sub_8076D5C();
+        sub_8153430();
+        task->data[0] ++;
+        break;
+    case 3:
+        if (sub_8153474())
+        {
+            sav2_gender2_inplace_and_xFE();
+            task->data[0] = 4;
+            task->data[1] = 0;
+        }
+        break;
+    case 4:
+        if (++task->data[1] > 10)
+        {
+            sub_800AC34();
             task->data[0] ++;
-            break;
-        case 1:
-            if (Link_AnyPartnersPlayingRubyOrSapphire())
+        }
+        break;
+    case 5:
+        if (gReceivedRemoteLinkPlayers == 0)
+            DestroyTask(taskId);
+        break;
+    case 6:
+        if (!sub_801048C(0))
+        {
+            CreateTask(sub_8153688, 5);
+            task->data[0] ++;
+        }
+        break;
+    case 7:
+        if (!FuncIsActiveTask(sub_8153688))
+        {
+            if (gWirelessCommType)
             {
-                task->data[0] ++;
+                sub_801048C(1);
+                task->data[0] = 8;
             }
             else
             {
-                task->data[0] = 6;
-            }
-            break;
-        case 2:
-            sub_8076D5C();
-            sub_8153430();
-            task->data[0] ++;
-            break;
-        case 3:
-            if (sub_8153474())
-            {
-                sav2_gender2_inplace_and_xFE();
                 task->data[0] = 4;
-                task->data[1] = 0;
-            }
-            break;
-        case 4:
-            if (++ task->data[1] > 10)
-            {
-                sub_800AC34();
-                task->data[0] ++;
-            }
-            break;
-        case 5:
-            if (gReceivedRemoteLinkPlayers == 0)
-            {
-                DestroyTask(taskId);
-            }
-            break;
-        case 6:
-            if (!sub_801048C(0))
-            {
-                CreateTask(sub_8153688, 5);
-                task->data[0] ++;
-            }
-            break;
-        case 7:
-            if (!FuncIsActiveTask(sub_8153688))
-            {
-                if (gWirelessCommType)
-                {
-                    sub_801048C(1);
-                    task->data[0] = 8;
-                }
-                else
-                {
-                    task->data[0] = 4;
-                }
             }
-            break;
-        case 8:
-            sub_800ADF8();
-            task->data[0] ++;
-            break;
-        case 9:
-            if (sub_800A520())
-            {
-                DestroyTask(taskId);
-            }
-            break;
+        }
+        break;
+    case 8:
+        sub_800ADF8();
+        task->data[0] ++;
+        break;
+    case 9:
+        if (sub_800A520())
+            DestroyTask(taskId);
+        break;
     }
 }
 
+// New Emerald functions
+
 static void sub_80E8110(struct UnkRecordMixingStruct *dst, struct UnkRecordMixingStruct *src)
 {
     s32 i, id;
@@ -1650,7 +1646,7 @@ void sub_80E8260(struct UnkRecordMixingStruct2 *dst)
     }
 }
 
-bool32 sub_80E841C(struct UnkRecordMixingStruct *arg0, struct UnkRecordMixingStruct *arg1)
+static bool32 sub_80E841C(struct UnkRecordMixingStruct *arg0, struct UnkRecordMixingStruct *arg1)
 {
     s32 i;
 
@@ -1670,11 +1666,11 @@ static void sub_80E8468(struct UnkRecordMixingStruct *arg0, size_t arg1, u32 arg
 {
     s32 i, r7, r8;
     struct UnkRecordMixingStruct *structPtr;
-    u32 data[4];
+    u32 mixIndices[4];
     u32 structId;
 
-    sub_80E7830(data);
-    structPtr = (void*)(arg0) + (arg1 * data[arg2]);
+    ShufflePlayerIndices(mixIndices);
+    structPtr = (void*)(arg0) + (arg1 * mixIndices[arg2]);
     r7 = 0;
     r8 = 0;
     for (i = 0; i < 2; i++)
@@ -1704,29 +1700,8 @@ static void sub_80E8468(struct UnkRecordMixingStruct *arg0, size_t arg1, u32 arg
     }
 }
 
-struct UnknownRecMixingStruct
-{
-    u32 field_0;
-    u16 field_4;
-    u8 field_6[9];
-};
-
-struct UnknownRecMixingStruct2
-{
-    u32 field_0;
-    u16 field_4;
-    u16 field_6;
-    u16 field_8;
-    u8 field_A[16];
-};
-
-struct UnknownRecMixingStruct3
-{
-    u8 field_0[0x810];
-};
-
 NAKED
-void sub_80E8578(struct UnknownRecMixingStruct3 *arg0, struct UnkRecordMixingStruct2 *arg1, size_t arg2, u32 arg3, u32 arg4)
+static void sub_80E8578(struct UnknownRecMixingStruct3 *arg0, struct UnkRecordMixingStruct2 *arg1, size_t arg2, u32 arg3, u32 arg4)
 {
     asm_unified("	push {r4-r7,lr}\n\
 	mov r7, r10\n\
@@ -2130,7 +2105,7 @@ _080E8864:\n\
     ");
 }
 
-void sub_80E8880(struct UnknownRecMixingStruct *arg0, struct UnknownRecMixingStruct *arg1)
+static void sub_80E8880(struct UnknownRecMixingStruct *arg0, struct UnknownRecMixingStruct *arg1)
 {
     s32 i, j;
 
@@ -2155,7 +2130,7 @@ void sub_80E8880(struct UnknownRecMixingStruct *arg0, struct UnknownRecMixingStr
     }
 }
 
-void sub_80E88CC(struct UnknownRecMixingStruct2 *arg0, struct UnknownRecMixingStruct2 *arg1)
+static void sub_80E88CC(struct UnknownRecMixingStruct2 *arg0, struct UnknownRecMixingStruct2 *arg1)
 {
     s32 i, j;
 
@@ -2181,7 +2156,7 @@ void sub_80E88CC(struct UnknownRecMixingStruct2 *arg0, struct UnknownRecMixingSt
 }
 
 NAKED
-void sub_80E8924(struct UnknownRecMixingStruct3 *arg0)
+static void sub_80E8924(struct UnknownRecMixingStruct3 *arg0)
 {
     asm_unified("push {r4-r7,lr}\n\
 	mov r7, r10\n\
@@ -2270,7 +2245,7 @@ static void sub_80E89F8(struct RecordMixingDayCareMail *dst)
     *dst = *gUnknown_03001148;
 }
 
-static void sub_80E8A54(struct RecordMixingDayCareMail *src)
+static void SanitizeDayCareMailForRuby(struct RecordMixingDayCareMail *src)
 {
     s32 i;
 
@@ -2287,21 +2262,21 @@ static void sub_80E8A54(struct RecordMixingDayCareMail *src)
     }
 }
 
-static void nullsub_1405(union BattleTowerRecord *src)
+static void SanitizeRubyBattleTowerRecord(struct RSBattleTowerRecord *src)
 {
 
 }
 
-static void sub_80E8AC0(union BattleTowerRecord *arg0)
+static void SanitizeEmeraldBattleTowerRecord(struct EmeraldBattleTowerRecord *dst)
 {
     s32 i;
 
     for (i = 0; i < 4; i++)
     {
-        struct UnknownPokemonStruct *towerMon = &arg0->emerald.party[i];
+        struct UnknownPokemonStruct *towerMon = &dst->party[i];
         if (towerMon->species != 0)
             StripExtCtrlCodes(towerMon->nickname);
     }
 
-    sub_8164F70(arg0);
+    CalcEmeraldBattleTowerChecksum(dst);
 }
diff --git a/src/secret_base.c b/src/secret_base.c
index d86b99345..44e980c43 100644
--- a/src/secret_base.c
+++ b/src/secret_base.c
@@ -1673,7 +1673,7 @@ void sub_80EAEF4(struct SecretBaseRecordMixer *mixers)
     sub_80EABA4(&mixers[2], 0);
 }
 
-void sub_80EAF80(void *records, size_t recordSize, u8 linkIdx)
+void ReceiveSecretBasesData(void *records, size_t recordSize, u8 linkIdx)
 {
     struct SecretBaseRecordMixer mixers[3];
     u16 i;
diff --git a/src/tv.c b/src/tv.c
index 77b7d4a75..e69f6f411 100644
--- a/src/tv.c
+++ b/src/tv.c
@@ -3606,7 +3606,7 @@ void sub_80F01B8(void)
     FlagSet(0x396);
 }
 
-void sub_80F01E8(void *src, u32 size, u8 masterIdx)
+void ReceiveTvShowsData(void *src, u32 size, u8 masterIdx)
 {
     u8 i;
     u16 version;
@@ -4434,7 +4434,7 @@ static void sub_80F0C04(void)
     }
 }
 
-void sub_80F0C7C(void *src, u32 size, u8 masterIdx)
+void ReceivePokeNewsData(void *src, u32 size, u8 masterIdx)
 {
     u8 i;
     PokeNews (*rmBuffer2)[4][16];
-- 
cgit v1.2.3


From dd1c7c741a0f6931915ed620bce71127a593ef5a Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Sat, 26 May 2018 00:37:03 +0200
Subject: make record mixing compile

---
 src/egg_hatch.c | 10 +++++-----
 src/new_game.c  |  7 +++----
 2 files changed, 8 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/egg_hatch.c b/src/egg_hatch.c
index 8914d6ff3..1ed38c67e 100644
--- a/src/egg_hatch.c
+++ b/src/egg_hatch.c
@@ -390,13 +390,13 @@ static bool8 sub_807158C(struct DayCare *daycare, u8 daycareId)
     struct DaycareMon *daycareMon = &daycare->mons[daycareId];
 
     GetBoxMonNick(&daycareMon->mon, nick);
-    if (daycareMon->misc.mail.itemId != 0
-        && (StringCompareWithoutExtCtrlCodes(nick, daycareMon->misc.monName) != 0
-            || StringCompareWithoutExtCtrlCodes(gSaveBlock2Ptr->playerName, daycareMon->misc.OT_name) != 0))
+    if (daycareMon->mail.message.itemId != 0
+        && (StringCompareWithoutExtCtrlCodes(nick, daycareMon->mail.monName) != 0
+            || StringCompareWithoutExtCtrlCodes(gSaveBlock2Ptr->playerName, daycareMon->mail.OT_name) != 0))
     {
         StringCopy(gStringVar1, nick);
-        TVShowConvertInternationalString(gStringVar2, daycareMon->misc.OT_name, daycareMon->misc.gameLanguage);
-        TVShowConvertInternationalString(gStringVar3, daycareMon->misc.monName, daycareMon->misc.monLanguage);
+        TVShowConvertInternationalString(gStringVar2, daycareMon->mail.OT_name, daycareMon->mail.gameLanguage);
+        TVShowConvertInternationalString(gStringVar3, daycareMon->mail.monName, daycareMon->mail.monLanguage);
         return TRUE;
     }
     return FALSE;
diff --git a/src/new_game.c b/src/new_game.c
index 37336016e..c387bce65 100644
--- a/src/new_game.c
+++ b/src/new_game.c
@@ -119,11 +119,10 @@ void ClearAllContestWinnerPics(void)
 void sub_8084400(void)
 {
     // probably clearing one struct for battle frontier
-    CpuFill32(0, gSaveBlock2Ptr->field_64C, 2272);
+    CpuFill32(0, &gSaveBlock2Ptr->battleTower, 2272);
 
-    // those look like strings
-    gSaveBlock2Ptr->field_EE1 = 0xFF;
-    gSaveBlock2Ptr->field_EE9 = 0xFF;
+    gSaveBlock2Ptr->field_EE1[0][0] = EOS;
+    gSaveBlock2Ptr->field_EE1[1][0] = EOS;
 }
 
 void WarpToTruck(void)
-- 
cgit v1.2.3


From 42731e4b88115bada3aed8ebc3b2c3dabecbb020 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Wed, 30 May 2018 20:28:31 +0200
Subject: LANG_ENG to GAME_LANGUAGE

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

(limited to 'src')

diff --git a/src/record_mixing.c b/src/record_mixing.c
index 19a8b0889..35e518d8a 100644
--- a/src/record_mixing.c
+++ b/src/record_mixing.c
@@ -1616,14 +1616,14 @@ void sub_80E8260(struct UnkRecordMixingStruct2 *dst)
         for (j = 0; j < 2; j++)
         {
             CopyUnalignedWord(dst->field_0[i][j].playerId, gSaveBlock2Ptr->playerTrainerId);
-            dst->field_0[i][j].language = LANGUAGE_ENGLISH;
+            dst->field_0[i][j].language = GAME_LANGUAGE;
             StringCopy(dst->field_0[i][j].playerName, gSaveBlock2Ptr->playerName);
         }
     }
 
     for (j = 0; j < 2; j++)
     {
-        dst->field_120[j].language = LANGUAGE_ENGLISH;
+        dst->field_120[j].language = GAME_LANGUAGE;
         CopyUnalignedWord(dst->field_120[j].playerId1, gSaveBlock2Ptr->playerTrainerId);
         CopyUnalignedWord(dst->field_120[j].playerId2, gSaveBlock2Ptr->field_EF1[j]);
         StringCopy(dst->field_120[j].playerName1, gSaveBlock2Ptr->playerName);
-- 
cgit v1.2.3