Merge branch 'master' of github.com:pret/pokeruby into pikalaxalt/field_map_obj

10 files changed, 2293 insertions, 1281 deletions

diff --git a/src/battle_interface.c b/src/battle_interface.c
index 9938c4b54..ba3cba894 100644
--- a/src/battle_interface.c
+++ b/src/battle_interface.c
@@ -8,6 +8,7 @@
 #include "songs.h"
 #include "battle.h"
 #include "palette.h"
+#include "battle_interface.h"
 
 struct UnknownStruct5
 {
@@ -35,15 +36,6 @@ struct UnknownStruct7
     u8 filler0[0x180];
 };
 
-struct UnknownStruct9
-{
-    s32 unk0;
-    u32 unk4;
-    u32 unk8;
-    u32 unkC_0:5;
-    u32 unk10;
-};
-
 extern u8 ewram[];
 #define ewram520   ((struct UnknownStruct7 *)(ewram + 0x00520))
 #define ewram16088 (*(u8 *)                  (ewram + 0x16088))
@@ -109,9 +101,8 @@ extern void load_gfxc_health_bar();
 
 static void sub_8043D5C(struct Sprite *);
 static const void *sub_8043CDC(u8);
-void sub_8044210(u8, s16, u8);
+static void sub_8044210(u8, s16, u8);
 static void draw_status_ailment_maybe(u8);
-void sub_8045A5C(u8 a, struct Pokemon *pkmn, u8 c);
 extern void sub_8045180(struct Sprite *);
 static void sub_8045110(struct Sprite *);
 static void sub_8045048(struct Sprite *);
@@ -119,12 +110,11 @@ static void sub_8044F70(u8 taskId);
 static void sub_8044E74(u8 taskId);
 static void sub_8044ECC(u8 taskId);
 static u8 sub_80457E8(u8, u8);
-s32 sub_8045C78(u8, u8, u8, u8);
 static int sub_8045F58(s32, s32, int, int *, u8, u16);
 static u8 GetScaledExpFraction(int, int, int, u8);
 static void sub_8045D58(u8, u8);
 static u8 sub_804602C(int, int, int, int *, u8 *, u8);
-static void sub_8046128(struct UnknownStruct9 *a, int *b, void *c);
+static void sub_8046128(struct BattleInterfaceStruct1 *a, int *b, void *c);
 
 static int do_nothing(s16 unused1, s16 unused2, int unused3)
 {
@@ -937,7 +927,7 @@ _0804420C: .4byte 0x04000008\n\
 }
 #endif
 
-void sub_8044210(u8 a, s16 b, u8 c)
+static void sub_8044210(u8 a, s16 b, u8 c)
 {
     u8 str[0x14];
     u8 *ptr;
@@ -1377,15 +1367,9 @@ void sub_804454C(void)
     }
 }
 
-struct UnknownStruct8
-{
-    u16 unk0;
-    u32 unk4;
-};
-
 // This function almost matches except for just two instructions around 0x08044B52 that are swapped.
 #ifdef NONMATCHING
-u8 sub_8044804(u8 a, const struct UnknownStruct8 *b, u8 c, u8 d)
+u8 sub_8044804(u8 a, const struct BattleInterfaceStruct2 *b, u8 c, u8 d)
 {
     u8 r7;
     s16 x;
@@ -1594,7 +1578,7 @@ u8 sub_8044804(u8 a, const struct UnknownStruct8 *b, u8 c, u8 d)
 }
 #else
 __attribute__((naked))
-u8 sub_8044804(u8 a, const struct UnknownStruct8 *b, u8 c, u8 d)
+u8 sub_8044804(u8 a, const struct BattleInterfaceStruct2 *b, u8 c, u8 d)
 {
     asm(".syntax unified\n\
     push {r4-r7,lr}\n\
@@ -3005,7 +2989,7 @@ static u8 sub_804602C(int a, int b, int c, int *d, u8 *e, u8 f)
     return r3;
 }
 
-s16 sub_80460C8(struct UnknownStruct9 *a, int *b, void *c, int d)
+s16 sub_80460C8(struct BattleInterfaceStruct1 *a, int *b, void *c, int d)
 {
     u16 r7;
     s16 r1;
@@ -3020,7 +3004,7 @@ s16 sub_80460C8(struct UnknownStruct9 *a, int *b, void *c, int d)
     return r7;
 }
 
-static void sub_8046128(struct UnknownStruct9 *a, int *b, void *c)
+static void sub_8046128(struct BattleInterfaceStruct1 *a, int *b, void *c)
 {
     u8 sp8[6];
     u16 sp10[6];
diff --git a/src/battle_party_menu.c b/src/battle_party_menu.c
index 820d16465..690ef99be 100644
--- a/src/battle_party_menu.c
+++ b/src/battle_party_menu.c
@@ -40,7 +40,6 @@ extern TaskFunc PartyMenuGetPopupMenuFunc(u8, const struct PartyPopupMenu *, con
 extern void ShowPokemonSummaryScreen(struct Pokemon *, u8, u8, void (*)(u8), int);
 extern void sub_806E7D0(u8, const struct PartyPopupMenu *);
 extern u8 *sub_8040D08();
-extern void sub_806E834();
 extern u8 sub_8094C20();
 extern void sub_8040B8C(void);
 extern u8 pokemon_order_func(u8);
diff --git a/src/credits.c b/src/credits.c
index 01af78bce..ca5553c2e 100644
--- a/src/credits.c
+++ b/src/credits.c
@@ -1,12 +1,17 @@
 #include "global.h"
 #include "asm.h"
 #include "decompress.h"
+#include "event_data.h"
 #include "m4a.h"
 #include "main.h"
 #include "menu.h"
 #include "palette.h"
+#include "pokedex.h"
+#include "rng.h"
 #include "songs.h"
 #include "sound.h"
+#include "species.h"
+#include "starter_choose.h"
 #include "trig.h"
 
 asm(".set REG_BASE, 0x4000000");
@@ -15,8 +20,6 @@ asm(".set OFFSET_REG_BLDALPHA,    0x52");
 asm(".set REG_BLDCNT,      REG_BASE + OFFSET_REG_BLDCNT");
 asm(".set REG_BLDALPHA,    REG_BASE + OFFSET_REG_BLDALPHA");
 
-u32 NationalPokedexNumToSpecies(u16 nationalNum);
-
 struct MonCoords
 {
     u8 x, y;
@@ -126,14 +129,17 @@ enum
     TDE_TASK_A_ID = 2,
 };
 
+#define POKEMON_TILE_COUNT 68
+
 struct Unk201C000
 {
-    u16 unk0[8];
-    u8 pad_10[0x78];
+    u16 unk0[POKEMON_TILE_COUNT];
     u16 unk88;
     u16 unk8A;
     u16 unk8C;
     u16 unk8E;
+    u16 unk90[386];
+    u16 unk394;
 };
 
 struct CreditsEntry
@@ -226,12 +232,12 @@ static u8 sub_8144454(u8 page, u8 taskIdA);
 static void task_d_8144514(u8 taskIdD);
 static bool8 sub_8144ECC(u8 data, u8 taskIdA);
 static void sub_81450AC(u8 taskIdA);
-void sub_8145128(u16, u16, u16);
-static void sub_81452D0(u16 arg0, u16 arg1);
+static void sub_8145128(u16, u16, u16);
+static void sub_81452D0(u16 arg0, u16 palette);
 static void spritecb_player_8145378(struct Sprite *sprite);
 static void spritecb_rival_8145420(struct Sprite *sprite);
-u8 sub_81456B4(u16 nationalNum, u16 x, u16 y, u16 arg3);
-void sub_81458DC(void);
+static u8 sub_81456B4(u16 nationalNum, u16 x, u16 y, u16 position);
+static void sub_81458DC(void);
 
 static void vblank_8143948(void)
 {
@@ -666,8 +672,7 @@ static void task_b_81441B8(u8 taskIdB)
 
                 for (i = 0; i < 5; i++)
                 {
-                    sub_8072BD8(gCreditsEntryPointerTable[gTasks[taskIdB].data[TDB_CURRENT_PAGE]][i]->text, 0,
-                        9 + i * 2, 240);
+                    sub_8072BD8(gCreditsEntryPointerTable[gTasks[taskIdB].data[TDB_CURRENT_PAGE]][i]->text, 0, 9 + i * 2, 240);
                 }
 
                 gTasks[taskIdB].data[TDB_CURRENT_PAGE] += 1;
@@ -816,8 +821,6 @@ static u8 sub_8144454(u8 page, u8 taskIdA)
     return FALSE;
 }
 
-#define UNK_DEFINE_44 (0x44)
-
 static void task_d_8144514(u8 taskIdD)
 {
     struct Unk201C000 *r6 = &ewram1c000;
@@ -834,7 +837,7 @@ static void task_d_8144514(u8 taskIdD)
         gTasks[taskIdD].data[TDD_STATE]++;
         break;
     case 2:
-        if (r6->unk88 == UNK_DEFINE_44 || gTasks[gTasks[taskIdD].data[TDD_TASK_A_ID]].func != task_a_8143B68)
+        if (r6->unk88 == POKEMON_TILE_COUNT || gTasks[gTasks[taskIdD].data[TDD_TASK_A_ID]].func != task_a_8143B68)
             break;
         r2 = sub_81456B4(r6->unk0[r6->unk8C], gUnknown_0840CA00[r6->unk8A][0], gUnknown_0840CA00[r6->unk8A][1], r6->unk8A);
         if (r6->unk8C < r6->unk8E - 1)
@@ -866,83 +869,83 @@ static void task_d_8144514(u8 taskIdD)
 
 void task_c_8144664(u8 taskIdC)
 {
-    switch (gTasks[taskIdC].data[0])
+    switch (gTasks[taskIdC].data[TDC_0])
     {
     case 0:
-        gUnknown_0203935A = Sin((gTasks[taskIdC].data[5] >> 1) & 0x7F, 12);
-        gTasks[taskIdC].data[5]++;
+        gUnknown_0203935A = Sin((gTasks[taskIdC].data[TDC_5] >> 1) & 0x7F, 12);
+        gTasks[taskIdC].data[TDC_5]++;
         break;
     case 1:
         if (gUnknown_0203935A != 0)
         {
-            gUnknown_0203935A = Sin((gTasks[taskIdC].data[5] >> 1) & 0x7F, 12);
-            gTasks[taskIdC].data[5]++;
+            gUnknown_0203935A = Sin((gTasks[taskIdC].data[TDC_5] >> 1) & 0x7F, 12);
+            gTasks[taskIdC].data[TDC_5]++;
         }
         else
         {
-            gSprites[gTasks[taskIdC].data[2]].data0 = 2;
-            gTasks[taskIdC].data[5] = 0;
-            gTasks[taskIdC].data[0]++;
+            gSprites[gTasks[taskIdC].data[TDC_2]].data0 = 2;
+            gTasks[taskIdC].data[TDC_5] = 0;
+            gTasks[taskIdC].data[TDC_0]++;
         }
         break;
     case 2:
-        if (gTasks[taskIdC].data[5] < 64)
+        if (gTasks[taskIdC].data[TDC_5] < 64)
         {
-            gTasks[taskIdC].data[5]++;
-            gUnknown_0203935A = Sin(gTasks[taskIdC].data[5] & 0x7F, 20);
+            gTasks[taskIdC].data[TDC_5]++;
+            gUnknown_0203935A = Sin(gTasks[taskIdC].data[TDC_5] & 0x7F, 20);
         }
         else
         {
-            gTasks[taskIdC].data[0]++;
+            gTasks[taskIdC].data[TDC_0]++;
         }
         break;
     case 3:
-        gSprites[gTasks[taskIdC].data[2]].data0 = 3;
-        gSprites[gTasks[taskIdC].data[3]].data0 = 1;
-        gTasks[taskIdC].data[4] = 120;
-        gTasks[taskIdC].data[0]++;
+        gSprites[gTasks[taskIdC].data[TDC_2]].data0 = 3;
+        gSprites[gTasks[taskIdC].data[TDC_3]].data0 = 1;
+        gTasks[taskIdC].data[TDC_4] = 120;
+        gTasks[taskIdC].data[TDC_0]++;
         break;
     case 4:
-        if (gTasks[taskIdC].data[4] != 0)
+        if (gTasks[taskIdC].data[TDC_4] != 0)
         {
-            gTasks[taskIdC].data[4]--;
+            gTasks[taskIdC].data[TDC_4]--;
         }
         else
         {
-            gTasks[taskIdC].data[5] = 64;
-            gTasks[taskIdC].data[0]++;
+            gTasks[taskIdC].data[TDC_5] = 64;
+            gTasks[taskIdC].data[TDC_0]++;
         }
         break;
     case 5:
-        if (gTasks[taskIdC].data[5] > 0)
+        if (gTasks[taskIdC].data[TDC_5] > 0)
         {
-            gTasks[taskIdC].data[5]--;
-            gUnknown_0203935A = Sin(gTasks[taskIdC].data[5] & 0x7F, 20);
+            gTasks[taskIdC].data[TDC_5]--;
+            gUnknown_0203935A = Sin(gTasks[taskIdC].data[TDC_5] & 0x7F, 20);
         }
         else
         {
-            gSprites[gTasks[taskIdC].data[2]].data0 = 1;
-            gTasks[taskIdC].data[0]++;
+            gSprites[gTasks[taskIdC].data[TDC_2]].data0 = 1;
+            gTasks[taskIdC].data[TDC_0]++;
         }
         break;
     case 6:
-        gTasks[taskIdC].data[0] = 50;
+        gTasks[taskIdC].data[TDC_0] = 50;
         break;
     case 10:
-        gSprites[gTasks[taskIdC].data[3]].data0 = 2;
-        gTasks[taskIdC].data[0] = 50;
+        gSprites[gTasks[taskIdC].data[TDC_3]].data0 = 2;
+        gTasks[taskIdC].data[TDC_0] = 50;
         break;
     case 20:
-        gSprites[gTasks[taskIdC].data[2]].data0 = 4;
-        gTasks[taskIdC].data[0] = 50;
+        gSprites[gTasks[taskIdC].data[TDC_2]].data0 = 4;
+        gTasks[taskIdC].data[TDC_0] = 50;
         break;
     case 30:
-        gSprites[gTasks[taskIdC].data[2]].data0 = 5;
-        gSprites[gTasks[taskIdC].data[3]].data0 = 3;
-        gTasks[taskIdC].data[0] = 50;
+        gSprites[gTasks[taskIdC].data[TDC_2]].data0 = 5;
+        gSprites[gTasks[taskIdC].data[TDC_3]].data0 = 3;
+        gTasks[taskIdC].data[TDC_0] = 50;
         break;
     case 50:
-        gTasks[taskIdC].data[0] = 0;
+        gTasks[taskIdC].data[TDC_0] = 0;
         break;
     }
 }
@@ -1205,119 +1208,39 @@ static void sub_81450AC(u8 taskIdA)
     gUnknown_0203935C = 1;
 }
 
-__attribute__((naked))
-void sub_8145128(u16 arg0, u16 arg1, u16 arg2)
-{
-    asm(".syntax unified\n\
-    push {r4-r7,lr}\n\
-    adds r3, r0, 0\n\
-    adds r4, r2, 0\n\
-    lsls r3, 16\n\
-    lsrs r3, 16\n\
-    lsls r1, 16\n\
-    lsrs r7, r1, 16\n\
-    lsls r4, 16\n\
-    lsrs r5, r4, 16\n\
-    ldr r0, _081451EC @ =gCreditsCopyrightEnd_Gfx\n\
-    movs r6, 0xC0\n\
-    lsls r6, 19\n\
-    adds r3, r6\n\
-    adds r1, r3, 0\n\
-    bl LZ77UnCompVram\n\
-    ldr r0, _081451F0 @ =gIntroCopyright_Pal\n\
-    adds r1, r5, 0\n\
-    movs r2, 0x20\n\
-    bl LoadPalette\n\
-    lsrs r4, 20\n\
-    lsls r4, 28\n\
-    lsrs r4, 16\n\
-    movs r2, 0\n\
-    adds r1, r4, 0x1\n\
-    ldr r3, _081451F4 @ =0x000003ff\n\
-_0814515E:\n\
-    lsls r0, r2, 1\n\
-    adds r0, r7\n\
-    adds r0, r6\n\
-    strh r1, [r0]\n\
-    adds r0, r2, 0x1\n\
-    lsls r0, 16\n\
-    lsrs r2, r0, 16\n\
-    cmp r2, r3\n\
-    bls _0814515E\n\
-    movs r2, 0\n\
-    adds r0, r4, 0x2\n\
-    adds r6, r4, 0\n\
-    adds r6, 0x17\n\
-    movs r1, 0x2B\n\
-    adds r1, r4\n\
-    mov r12, r1\n\
-    adds r4, 0x42\n\
-    ldr r5, _081451F8 @ =0x060001c8\n\
-    adds r3, r0, 0\n\
-_08145184:\n\
-    lsls r0, r2, 1\n\
-    adds r0, r7\n\
-    adds r0, r5\n\
-    adds r1, r2, r3\n\
-    strh r1, [r0]\n\
-    adds r0, r2, 0x1\n\
-    lsls r0, 16\n\
-    lsrs r2, r0, 16\n\
-    cmp r2, 0x14\n\
-    bls _08145184\n\
-    movs r2, 0\n\
-    ldr r5, _081451FC @ =0x06000248\n\
-    adds r3, r6, 0\n\
-_0814519E:\n\
-    lsls r0, r2, 1\n\
-    adds r0, r7\n\
-    adds r0, r5\n\
-    adds r1, r2, r3\n\
-    strh r1, [r0]\n\
-    adds r0, r2, 0x1\n\
-    lsls r0, 16\n\
-    lsrs r2, r0, 16\n\
-    cmp r2, 0x13\n\
-    bls _0814519E\n\
-    movs r2, 0\n\
-    ldr r5, _08145200 @ =0x060002c8\n\
-    mov r3, r12\n\
-_081451B8:\n\
-    lsls r0, r2, 1\n\
-    adds r0, r7\n\
-    adds r0, r5\n\
-    adds r1, r2, r3\n\
-    strh r1, [r0]\n\
-    adds r0, r2, 0x1\n\
-    lsls r0, 16\n\
-    lsrs r2, r0, 16\n\
-    cmp r2, 0x16\n\
-    bls _081451B8\n\
-    movs r2, 0\n\
-    ldr r3, _08145204 @ =0x06000348\n\
-_081451D0:\n\
-    lsls r0, r2, 1\n\
-    adds r0, r7\n\
-    adds r0, r3\n\
-    adds r1, r2, r4\n\
-    strh r1, [r0]\n\
-    adds r0, r2, 0x1\n\
-    lsls r0, 16\n\
-    lsrs r2, r0, 16\n\
-    cmp r2, 0xB\n\
-    bls _081451D0\n\
-    pop {r4-r7}\n\
-    pop {r0}\n\
-    bx r0\n\
-    .align 2, 0\n\
-_081451EC: .4byte gCreditsCopyrightEnd_Gfx\n\
-_081451F0: .4byte gIntroCopyright_Pal\n\
-_081451F4: .4byte 0x000003ff\n\
-_081451F8: .4byte 0x060001c8\n\
-_081451FC: .4byte 0x06000248\n\
-_08145200: .4byte 0x060002c8\n\
-_08145204: .4byte 0x06000348\n\
-    .syntax divided\n");
+static void sub_8145128(u16 arg0, u16 arg1, u16 arg2) {
+    u16 baseTile;
+    u16 i;
+
+    LZ77UnCompVram(gCreditsCopyrightEnd_Gfx, (void *) (VRAM + arg0));
+    LoadPalette(gIntroCopyright_Pal, arg2, sizeof(gIntroCopyright_Pal));
+
+    baseTile = (arg2 / 16) << 12;
+
+    for (i = 0; i < 32 * 32; i++)
+    {
+        ((u16 *) (VRAM + arg1))[i] = baseTile + 1;
+    }
+
+    for (i = 0; i < 21; i++)
+    {
+        ((u16 *) (VRAM + arg1))[7 * 32 + 4 + i] = i + 2 + baseTile;
+    }
+
+    for (i = 0; i < 20; i++)
+    {
+        ((u16 *) (VRAM + arg1))[9 * 32 + 4 + i] = i + 23 + baseTile;
+    }
+
+    for (i = 0; i < 23; i++)
+    {
+        ((u16 *) (VRAM + arg1))[11 * 32 + 4 + i] = i + 43 + baseTile;
+    }
+
+    for (i = 0; i < 12; i++)
+    {
+        ((u16 *) (VRAM + arg1))[13 * 32 + 4 + i] = i + 66 + baseTile;
+    }
 }
 
 u16 sub_8145208(u8 arg0)
@@ -1332,106 +1255,45 @@ u16 sub_8145208(u8 arg0)
 
     if (arg0 & (1 << 7))
     {
-        out |= 0x800;
+        out |= 1 << 11;
     }
 
     if (arg0 & (1 << 6))
     {
-        out |= 0x400;
+        out |= 1 << 10;
     }
 
     return out;
 }
 
-__attribute__((naked))
-void sub_814524C(void *arg0, u8 arg1, u8 arg2, u16 arg3, int arg4)
-{
-    asm(".syntax unified\n\
-    push {r4-r7,lr}\n\
-    mov r7, r10\n\
-    mov r6, r9\n\
-    mov r5, r8\n\
-    push {r5-r7}\n\
-    sub sp, 0xC\n\
-    str r0, [sp]\n\
-    ldr r0, [sp, 0x2C]\n\
-    lsls r1, 24\n\
-    lsrs r1, 24\n\
-    mov r10, r1\n\
-    lsls r2, 24\n\
-    lsrs r2, 24\n\
-    str r2, [sp, 0x4]\n\
-    lsls r3, 16\n\
-    lsrs r3, 16\n\
-    str r3, [sp, 0x8]\n\
-    lsls r0, 16\n\
-    lsrs r0, 20\n\
-    lsls r0, 28\n\
-    lsrs r0, 16\n\
-    mov r9, r0\n\
-    movs r5, 0\n\
-_0814527A:\n\
-    movs r4, 0\n\
-    lsls r7, r5, 1\n\
-    ldr r1, [sp, 0x4]\n\
-    adds r0, r1, r5\n\
-    adds r2, r5, 0x1\n\
-    mov r8, r2\n\
-    lsls r0, 6\n\
-    ldr r1, [sp, 0x8]\n\
-    adds r6, r0, r1\n\
-_0814528C:\n\
-    adds r0, r7, r5\n\
-    adds r0, r4\n\
-    ldr r2, [sp]\n\
-    adds r0, r2, r0\n\
-    ldrb r0, [r0]\n\
-    bl sub_8145208\n\
-    mov r2, r10\n\
-    adds r1, r2, r4\n\
-    lsls r1, 1\n\
-    adds r1, r6\n\
-    movs r2, 0xC0\n\
-    lsls r2, 19\n\
-    adds r1, r2\n\
-    add r0, r9\n\
-    strh r0, [r1]\n\
-    adds r0, r4, 0x1\n\
-    lsls r0, 24\n\
-    lsrs r4, r0, 24\n\
-    cmp r4, 0x2\n\
-    bls _0814528C\n\
-    mov r1, r8\n\
-    lsls r0, r1, 24\n\
-    lsrs r5, r0, 24\n\
-    cmp r5, 0x4\n\
-    bls _0814527A\n\
-    add sp, 0xC\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\
-    .syntax divided\n");
+void sub_814524C(u8 arg0[], u8 baseX, u8 baseY, u16 arg3, u16 palette) {
+    u8 y, x;
+
+    const u16 tileOffset = (palette / 16) << 12;
+
+    for (y = 0; y < 5; y++)
+    {
+        for (x = 0; x < 3; x++)
+        {
+            ((u16 *) (VRAM + arg3 + (baseY + y) * 64))[baseX + x] = tileOffset + sub_8145208(arg0[y * 3 + x]);
+        }
+    }
 }
 
-static void sub_81452D0(u16 arg0, u16 arg1)
+static void sub_81452D0(u16 arg0, u16 palette)
 {
-    u16 i;
-    u16 foo = arg1 / 16;
-    u16 bar = foo * 4096;
-
-    for (i = 0; i < 0x400; i++)
-        ((u16 *)(VRAM + arg0))[i] = bar + 1;
-
-    sub_814524C(&gUnknown_0840B83C, 3, 7, arg0, arg1);
-    sub_814524C(&gUnknown_0840B84B, 7, 7, arg0, arg1);
-    sub_814524C(&gUnknown_0840B85A, 11, 7, arg0, arg1);
-    sub_814524C(&gUnknown_0840B85A, 16, 7, arg0, arg1);
-    sub_814524C(&gUnknown_0840B869, 20, 7, arg0, arg1);
-    sub_814524C(&gUnknown_0840B878, 24, 7, arg0, arg1);
+    u16 pos;
+    u16 baseTile = (palette / 16) << 12;
+
+    for (pos = 0; pos < 32 * 32; pos++)
+        ((u16 *) (VRAM + arg0))[pos] = baseTile + 1;
+
+    sub_814524C(gUnknown_0840B83C, 3, 7, arg0, palette);
+    sub_814524C(gUnknown_0840B84B, 7, 7, arg0, palette);
+    sub_814524C(gUnknown_0840B85A, 11, 7, arg0, palette);
+    sub_814524C(gUnknown_0840B85A, 16, 7, arg0, palette);
+    sub_814524C(gUnknown_0840B869, 20, 7, arg0, palette);
+    sub_814524C(gUnknown_0840B878, 24, 7, arg0, palette);
 }
 
 static void spritecb_player_8145378(struct Sprite *sprite)
@@ -1538,268 +1400,121 @@ static void spritecb_rival_8145420(struct Sprite *sprite)
     }
 }
 
-__attribute__((naked))
-void spritecb_81454E0(struct Sprite *sprite)
-{
-    asm(".syntax unified\n\
-    push {r4,r5,lr}\n\
-    sub sp, 0x4\n\
-    adds r5, r0, 0\n\
-    ldr r0, _081454F8 @ =gUnknown_0203935C\n\
-    movs r1, 0\n\
-    ldrsh r0, [r0, r1]\n\
-    cmp r0, 0\n\
-    beq _081454FC\n\
-    adds r0, r5, 0\n\
-    bl DestroySprite\n\
-    b _081456A6\n\
-    .align 2, 0\n\
-_081454F8: .4byte gUnknown_0203935C\n\
-_081454FC:\n\
-    ldrh r0, [r5, 0x3C]\n\
-    adds r0, 0x1\n\
-    strh r0, [r5, 0x3C]\n\
-    movs r2, 0x2E\n\
-    ldrsh r0, [r5, r2]\n\
-    cmp r0, 0xA\n\
-    bhi _08145544\n\
-    lsls r0, 2\n\
-    ldr r1, _08145514 @ =_08145518\n\
-    adds r0, r1\n\
-    ldr r0, [r0]\n\
-    mov pc, r0\n\
-    .align 2, 0\n\
-_08145514: .4byte _08145518\n\
-    .align 2, 0\n\
-_08145518:\n\
-    .4byte _08145544\n\
-    .4byte _0814559E\n\
-    .4byte _08145620\n\
-    .4byte _08145660\n\
-    .4byte _08145544\n\
-    .4byte _08145544\n\
-    .4byte _08145544\n\
-    .4byte _08145544\n\
-    .4byte _08145544\n\
-    .4byte _08145544\n\
-    .4byte _08145696\n\
-_08145544:\n\
-    ldrb r1, [r5, 0x1]\n\
-    movs r0, 0x4\n\
-    negs r0, r0\n\
-    ands r0, r1\n\
-    movs r1, 0x1\n\
-    orrs r0, r1\n\
-    strb r0, [r5, 0x1]\n\
-    movs r0, 0x30\n\
-    ldrsh r1, [r5, r0]\n\
-    movs r0, 0x1F\n\
-    ands r1, r0\n\
-    lsls r1, 1\n\
-    ldrb r2, [r5, 0x3]\n\
-    movs r0, 0x3F\n\
-    negs r0, r0\n\
-    ands r0, r2\n\
-    orrs r0, r1\n\
-    strb r0, [r5, 0x3]\n\
-    movs r0, 0x10\n\
-    strh r0, [r5, 0x32]\n\
-    ldrh r4, [r5, 0x30]\n\
-    lsls r4, 24\n\
-    lsrs r4, 24\n\
-    movs r0, 0x80\n\
-    lsls r0, 9\n\
-    movs r1, 0x10\n\
-    bl __divsi3\n\
-    adds r1, r0, 0\n\
-    str r1, [sp]\n\
-    adds r0, r4, 0\n\
-    movs r2, 0\n\
-    movs r3, 0\n\
-    bl SetOamMatrix\n\
-    adds r2, r5, 0\n\
-    adds r2, 0x3E\n\
-    ldrb r1, [r2]\n\
-    movs r0, 0x5\n\
-    negs r0, r0\n\
-    ands r0, r1\n\
-    strb r0, [r2]\n\
-    movs r0, 0x1\n\
-    strh r0, [r5, 0x2E]\n\
-    b _081456A6\n\
-_0814559E:\n\
-    ldrh r1, [r5, 0x32]\n\
-    movs r2, 0x32\n\
-    ldrsh r0, [r5, r2]\n\
-    cmp r0, 0xFF\n\
-    bgt _081455D4\n\
-    adds r0, r1, 0\n\
-    adds r0, 0x8\n\
-    strh r0, [r5, 0x32]\n\
-    ldrh r4, [r5, 0x30]\n\
-    lsls r4, 24\n\
-    lsrs r4, 24\n\
-    movs r0, 0x32\n\
-    ldrsh r1, [r5, r0]\n\
-    movs r0, 0x80\n\
-    lsls r0, 9\n\
-    bl __divsi3\n\
-    adds r1, r0, 0\n\
-    lsls r1, 16\n\
-    lsrs r1, 16\n\
-    str r1, [sp]\n\
-    adds r0, r4, 0\n\
-    movs r2, 0\n\
-    movs r3, 0\n\
-    bl SetOamMatrix\n\
-    b _081455DA\n\
-_081455D4:\n\
-    ldrh r0, [r5, 0x2E]\n\
-    adds r0, 0x1\n\
-    strh r0, [r5, 0x2E]\n\
-_081455DA:\n\
-    movs r2, 0x30\n\
-    ldrsh r1, [r5, r2]\n\
-    cmp r1, 0x2\n\
-    beq _081456A6\n\
-    cmp r1, 0x2\n\
-    bgt _081455EC\n\
-    cmp r1, 0x1\n\
-    beq _081455F2\n\
-    b _081456A6\n\
-_081455EC:\n\
-    cmp r1, 0x3\n\
-    beq _0814560A\n\
-    b _081456A6\n\
-_081455F2:\n\
-    ldrh r1, [r5, 0x3C]\n\
-    movs r0, 0x3\n\
-    ands r0, r1\n\
-    cmp r0, 0\n\
-    bne _08145602\n\
-    ldrh r0, [r5, 0x22]\n\
-    adds r0, 0x1\n\
-    strh r0, [r5, 0x22]\n\
-_08145602:\n\
-    ldrh r0, [r5, 0x20]\n\
-    subs r0, 0x2\n\
-    strh r0, [r5, 0x20]\n\
-    b _081456A6\n\
-_0814560A:\n\
-    ldrh r0, [r5, 0x3C]\n\
-    ands r1, r0\n\
-    cmp r1, 0\n\
-    bne _08145618\n\
-    ldrh r0, [r5, 0x22]\n\
-    adds r0, 0x1\n\
-    strh r0, [r5, 0x22]\n\
-_08145618:\n\
-    ldrh r0, [r5, 0x20]\n\
-    adds r0, 0x2\n\
-    strh r0, [r5, 0x20]\n\
-    b _081456A6\n\
-_08145620:\n\
-    ldrh r1, [r5, 0x34]\n\
-    movs r2, 0x34\n\
-    ldrsh r0, [r5, r2]\n\
-    cmp r0, 0\n\
-    beq _08145630\n\
-    subs r0, r1, 0x1\n\
-    strh r0, [r5, 0x34]\n\
-    b _081456A6\n\
-_08145630:\n\
-    ldr r1, _0814565C @ =REG_BLDCNT\n\
-    movs r2, 0xF4\n\
-    lsls r2, 4\n\
-    adds r0, r2, 0\n\
-    strh r0, [r1]\n\
-    adds r1, 0x2\n\
-    movs r0, 0x10\n\
-    strh r0, [r1]\n\
-    ldrb r1, [r5, 0x1]\n\
-    movs r0, 0xD\n\
-    negs r0, r0\n\
-    ands r0, r1\n\
-    movs r1, 0x4\n\
-    orrs r0, r1\n\
-    strb r0, [r5, 0x1]\n\
-    movs r0, 0x10\n\
-    strh r0, [r5, 0x34]\n\
-    ldrh r0, [r5, 0x2E]\n\
-    adds r0, 0x1\n\
-    strh r0, [r5, 0x2E]\n\
-    b _081456A6\n\
-    .align 2, 0\n\
-_0814565C: .4byte REG_BLDCNT\n\
-_08145660:\n\
-    ldrh r1, [r5, 0x34]\n\
-    movs r2, 0x34\n\
-    ldrsh r0, [r5, r2]\n\
-    cmp r0, 0\n\
-    beq _08145684\n\
-    subs r1, 0x1\n\
-    strh r1, [r5, 0x34]\n\
-    ldr r3, _08145680 @ =REG_BLDALPHA\n\
-    movs r0, 0x34\n\
-    ldrsh r2, [r5, r0]\n\
-    movs r0, 0x10\n\
-    subs r0, r2\n\
-    lsls r0, 8\n\
-    adds r1, r0\n\
-    strh r1, [r3]\n\
-    b _081456A6\n\
-    .align 2, 0\n\
-_08145680: .4byte REG_BLDALPHA\n\
-_08145684:\n\
-    adds r2, r5, 0\n\
-    adds r2, 0x3E\n\
-    ldrb r0, [r2]\n\
-    movs r1, 0x4\n\
-    orrs r0, r1\n\
-    strb r0, [r2]\n\
-    movs r0, 0xA\n\
-    strh r0, [r5, 0x2E]\n\
-    b _081456A6\n\
-_08145696:\n\
-    ldr r0, _081456B0 @ =REG_BLDCNT\n\
-    movs r1, 0\n\
-    strh r1, [r0]\n\
-    adds r0, 0x2\n\
-    strh r1, [r0]\n\
-    adds r0, r5, 0\n\
-    bl DestroySprite\n\
-_081456A6:\n\
-    add sp, 0x4\n\
-    pop {r4,r5}\n\
-    pop {r0}\n\
-    bx r0\n\
-    .align 2, 0\n\
-_081456B0: .4byte REG_BLDCNT\n\
-    .syntax divided\n");
+void spritecb_81454E0(struct Sprite *sprite) {
+    if (gUnknown_0203935C)
+    {
+        DestroySprite(sprite);
+        return;
+    }
+
+    sprite->data7 += 1;
+    switch (sprite->data0)
+    {
+    case 0:
+    default:
+        sprite->oam.affineMode = 1;
+        sprite->oam.matrixNum = sprite->data1;
+        sprite->data2 = 16;
+        SetOamMatrix(sprite->data1, 0x10000 / sprite->data2, 0, 0, 0x10000 / sprite->data2);
+        sprite->invisible = FALSE;
+        sprite->data0 = 1;
+        break;
+
+    case 1:
+        if (sprite->data2 < 256)
+        {
+            sprite->data2 += 8;
+            SetOamMatrix(sprite->data1, 0x10000 / sprite->data2, 0, 0, 0x10000 / sprite->data2);
+        }
+        else
+        {
+            sprite->data0 += 1;
+        }
+        switch (sprite->data1)
+        {
+        case 1:
+            if ((sprite->data7 & 3) == 0)
+            {
+                sprite->pos1.y += 1;
+            }
+            sprite->pos1.x -= 2;
+            break;
+        case 2:
+            break;
+        case 3:
+            if ((sprite->data7 & 3) == 0)
+            {
+                sprite->pos1.y += 1;
+            }
+            sprite->pos1.x += 2;
+            break;
+        }
+        break;
+
+    case 2:
+        if (sprite->data3 != 0)
+        {
+            sprite->data3 -= 1;
+        }
+        else
+        {
+            REG_BLDCNT = 0xF40;
+            REG_BLDALPHA = 0x10;
+            sprite->oam.objMode = 1;
+            sprite->data3 = 16;
+            sprite->data0 += 1;
+        }
+        break;
+
+    case 3:
+        if (sprite->data3 != 0)
+        {
+            int data3;
+            vu16 *reg;
+
+            sprite->data3 -= 1;
+
+            reg = &REG_BLDALPHA;
+            data3 = 16 - sprite->data3;
+            *reg = (data3 << 8) + sprite->data3;
+        }
+        else
+        {
+            sprite->invisible = TRUE;
+            sprite->data0 = 10;
+        }
+        break;
+
+    case 10:
+        REG_BLDCNT = 0;
+        REG_BLDALPHA = 0;
+        DestroySprite(sprite);
+        break;
+
+    }
 }
 
-#ifdef NONMATCHING
-u8 sub_81456B4(u16 nationalNum, u16 x, u16 y, u16 arg3)
+static u8 sub_81456B4(u16 species, u16 x, u16 y, u16 position)
 {
-    u32 species;
     u32 personality;
     void *palette;
     u8 spriteId;
     u8 spriteId2;
 
-    species = NationalPokedexNumToSpecies(nationalNum);
+    species = NationalPokedexNumToSpecies(species);
+
     switch (species)
     {
-    case SPECIES_UNOWN:
-        personality = gSaveBlock2.pokedex.unownPersonality;
+    default:
+        personality = 0;
         break;
 
     case SPECIES_SPINDA:
         personality = gSaveBlock2.pokedex.spindaPersonality;
         break;
 
-    default:
-        personality = 0;
+    case SPECIES_UNOWN:
+        personality = gSaveBlock2.pokedex.unownPersonality;
         break;
     }
 
@@ -1808,196 +1523,30 @@ u8 sub_81456B4(u16 nationalNum, u16 x, u16 y, u16 arg3)
         gMonFrontPicCoords[species].x,
         gMonFrontPicCoords[species].y,
         0x2000000,
-        gUnknown_0840B5A0[arg3],
+        gUnknown_0840B5A0[position],
         species,
         personality,
         1
     );
 
     palette = species_and_otid_get_pal(species, 0, 0xFFFF);
-    LoadCompressedPalette(palette, 0x100 + (arg3 * 16), 0x20);
-    sub_8143648(arg3, arg3);
+    LoadCompressedPalette(palette, 0x100 + (position * 16), 0x20);
+    sub_8143648(position, position);
 
     spriteId = CreateSprite(&gUnknown_02024E8C, x, y, 0);
-    gSprites[spriteId].oam.paletteNum = arg3;
+    gSprites[spriteId].oam.paletteNum = position;
     gSprites[spriteId].oam.priority = 1;
-    gSprites[spriteId].data1 = arg3 + 1;
+    gSprites[spriteId].data1 = position + 1;
     gSprites[spriteId].invisible = TRUE;
     gSprites[spriteId].callback = spritecb_81454E0;
 
     spriteId2 = CreateSprite(&gSpriteTemplate_840CAEC, gSprites[spriteId].pos1.x, gSprites[spriteId].pos1.y, 1);
     gSprites[spriteId2].data0 = spriteId;
 
-    StartSpriteAnimIfDifferent(&gSprites[spriteId2], arg3);
+    StartSpriteAnimIfDifferent(&gSprites[spriteId2], position);
 
     return spriteId;
 }
-#else
-__attribute__((naked))
-u8 sub_81456B4(u16 nationalNum, u16 x, u16 y, u16 arg3)
-{
-    asm(".syntax unified\n\
-    push {r4-r7,lr}\n\
-    mov r7, r10\n\
-    mov r6, r9\n\
-    mov r5, r8\n\
-    push {r5-r7}\n\
-    sub sp, 0x14\n\
-    lsls r0, 16\n\
-    lsrs r6, r0, 16\n\
-    lsls r1, 16\n\
-    lsrs r1, 16\n\
-    mov r10, r1\n\
-    lsls r2, 16\n\
-    lsrs r2, 16\n\
-    str r2, [sp, 0x10]\n\
-    lsls r3, 16\n\
-    lsrs r3, 16\n\
-    mov r9, r3\n\
-    adds r0, r6, 0\n\
-    bl NationalPokedexNumToSpecies\n\
-    adds r6, r0, 0\n\
-    cmp r6, 0xC9\n\
-    beq _081456F8\n\
-    movs r0, 0x9A\n\
-    lsls r0, 1\n\
-    cmp r6, r0\n\
-    beq _081456EE\n\
-    movs r7, 0\n\
-    b _081456FC\n\
-_081456EE:\n\
-    ldr r0, _081456F4 @ =gSaveBlock2\n\
-    ldr r7, [r0, 0x20]\n\
-    b _081456FC\n\
-    .align 2, 0\n\
-_081456F4: .4byte gSaveBlock2\n\
-_081456F8:\n\
-    ldr r0, _081457E8 @ =gSaveBlock2\n\
-    ldr r7, [r0, 0x1C]\n\
-_081456FC:\n\
-    lsls r0, r6, 3\n\
-    ldr r1, _081457EC @ =gMonFrontPicTable\n\
-    adds r0, r1\n\
-    ldr r1, _081457F0 @ =gMonFrontPicCoords\n\
-    lsls r2, r6, 2\n\
-    adds r2, r1\n\
-    ldrb r1, [r2]\n\
-    ldrb r2, [r2, 0x1]\n\
-    movs r3, 0x80\n\
-    lsls r3, 18\n\
-    ldr r4, _081457F4 @ =gUnknown_0840B5A0\n\
-    mov r8, r4\n\
-    mov r5, r9\n\
-    lsls r4, r5, 2\n\
-    add r4, r8\n\
-    ldr r4, [r4]\n\
-    str r4, [sp]\n\
-    str r6, [sp, 0x4]\n\
-    str r7, [sp, 0x8]\n\
-    movs r4, 0x1\n\
-    str r4, [sp, 0xC]\n\
-    bl LoadSpecialPokePic\n\
-    ldr r2, _081457F8 @ =0x0000ffff\n\
-    adds r0, r6, 0\n\
-    movs r1, 0\n\
-    bl species_and_otid_get_pal\n\
-    lsls r5, 4\n\
-    mov r8, r5\n\
-    movs r1, 0x80\n\
-    lsls r1, 1\n\
-    add r1, r8\n\
-    lsls r1, 16\n\
-    lsrs r1, 16\n\
-    movs r2, 0x20\n\
-    bl LoadCompressedPalette\n\
-    mov r7, r9\n\
-    lsls r6, r7, 24\n\
-    lsrs r6, 24\n\
-    mov r0, r9\n\
-    adds r1, r6, 0\n\
-    bl sub_8143648\n\
-    ldr r0, _081457FC @ =gUnknown_02024E8C\n\
-    mov r2, r10\n\
-    lsls r1, r2, 16\n\
-    asrs r1, 16\n\
-    ldr r3, [sp, 0x10]\n\
-    lsls r2, r3, 16\n\
-    asrs r2, 16\n\
-    movs r3, 0\n\
-    bl CreateSprite\n\
-    adds r4, r0, 0\n\
-    lsls r4, 24\n\
-    lsrs r4, 24\n\
-    ldr r5, _08145800 @ =gSprites\n\
-    lsls r2, r4, 4\n\
-    adds r2, r4\n\
-    lsls r2, 2\n\
-    adds r3, r2, r5\n\
-    ldrb r1, [r3, 0x5]\n\
-    movs r0, 0xF\n\
-    ands r0, r1\n\
-    mov r7, r8\n\
-    orrs r0, r7\n\
-    movs r1, 0xD\n\
-    negs r1, r1\n\
-    ands r0, r1\n\
-    movs r1, 0x4\n\
-    orrs r0, r1\n\
-    strb r0, [r3, 0x5]\n\
-    mov r0, r9\n\
-    adds r0, 0x1\n\
-    strh r0, [r3, 0x30]\n\
-    movs r0, 0x3E\n\
-    adds r0, r3\n\
-    mov r8, r0\n\
-    ldrb r0, [r0]\n\
-    orrs r0, r1\n\
-    mov r1, r8\n\
-    strb r0, [r1]\n\
-    adds r0, r5, 0\n\
-    adds r0, 0x1C\n\
-    adds r2, r0\n\
-    ldr r0, _08145804 @ =spritecb_81454E0\n\
-    str r0, [r2]\n\
-    ldr r0, _08145808 @ =gSpriteTemplate_840CAEC\n\
-    movs r2, 0x20\n\
-    ldrsh r1, [r3, r2]\n\
-    movs r7, 0x22\n\
-    ldrsh r2, [r3, r7]\n\
-    movs r3, 0x1\n\
-    bl CreateSprite\n\
-    adds r1, r0, 0\n\
-    lsls r1, 24\n\
-    lsrs r1, 24\n\
-    lsls r0, r1, 4\n\
-    adds r0, r1\n\
-    lsls r0, 2\n\
-    adds r0, r5\n\
-    strh r4, [r0, 0x2E]\n\
-    adds r1, r6, 0\n\
-    bl StartSpriteAnimIfDifferent\n\
-    adds r0, r4, 0\n\
-    add sp, 0x14\n\
-    pop {r3-r5}\n\
-    mov r8, r3\n\
-    mov r9, r4\n\
-    mov r10, r5\n\
-    pop {r4-r7}\n\
-    pop {r1}\n\
-    bx r1\n\
-    .align 2, 0\n\
-_081457E8: .4byte gSaveBlock2\n\
-_081457EC: .4byte gMonFrontPicTable\n\
-_081457F0: .4byte gMonFrontPicCoords\n\
-_081457F4: .4byte gUnknown_0840B5A0\n\
-_081457F8: .4byte 0x0000ffff\n\
-_081457FC: .4byte gUnknown_02024E8C\n\
-_08145800: .4byte gSprites\n\
-_08145804: .4byte spritecb_81454E0\n\
-_08145808: .4byte gSpriteTemplate_840CAEC\n\
-    .syntax divided\n");
-}
-#endif
 
 void spritecb_814580C(struct Sprite *sprite)
 {
@@ -2015,223 +1564,79 @@ void spritecb_814580C(struct Sprite *sprite)
     sprite->pos1.y = gSprites[sprite->data0].pos1.y;
 }
 
-__attribute__((naked))
-void sub_81458DC(void)
-{
-    asm(".syntax unified\n\
-    push {r4-r7,lr}\n\
-    mov r7, r10\n\
-    mov r6, r9\n\
-    mov r5, r8\n\
-    push {r5-r7}\n\
-    sub sp, 0x4\n\
-    ldr r7, _0814597C @ =0x0201c000\n\
-    ldr r0, _08145980 @ =0x00004023\n\
-    bl VarGet\n\
-    lsls r0, 16\n\
-    lsrs r0, 16\n\
-    bl GetStarterPokemon\n\
-    lsls r0, 16\n\
-    lsrs r0, 16\n\
-    bl SpeciesToNationalPokedexNum\n\
-    lsls r0, 16\n\
-    lsrs r0, 16\n\
-    mov r10, r0\n\
-    movs r4, 0x1\n\
-    movs r5, 0\n\
-    ldr r0, _08145984 @ =0x00000181\n\
-    mov r8, r0\n\
-_0814590E:\n\
-    adds r0, r4, 0\n\
-    movs r1, 0x1\n\
-    bl sub_8090D90\n\
-    lsls r0, 24\n\
-    adds r6, r7, 0\n\
-    adds r6, 0x90\n\
-    cmp r0, 0\n\
-    beq _0814592C\n\
-    lsls r0, r5, 1\n\
-    adds r0, r6, r0\n\
-    strh r4, [r0]\n\
-    adds r0, r5, 0x1\n\
-    lsls r0, 16\n\
-    lsrs r5, r0, 16\n\
-_0814592C:\n\
-    adds r0, r4, 0x1\n\
-    lsls r0, 16\n\
-    lsrs r4, r0, 16\n\
-    cmp r4, r8\n\
-    bls _0814590E\n\
-    adds r4, r5, 0\n\
-    ldr r0, _08145984 @ =0x00000181\n\
-    lsls r1, r4, 16\n\
-    mov r9, r1\n\
-    movs r2, 0x8E\n\
-    adds r2, r7\n\
-    mov r8, r2\n\
-    adds r1, r7, 0\n\
-    adds r1, 0x86\n\
-    str r1, [sp]\n\
-    cmp r4, r0\n\
-    bhi _08145964\n\
-    adds r1, r6, 0\n\
-    movs r3, 0\n\
-    adds r2, r0, 0\n\
-_08145954:\n\
-    lsls r0, r4, 1\n\
-    adds r0, r1, r0\n\
-    strh r3, [r0]\n\
-    adds r0, r4, 0x1\n\
-    lsls r0, 16\n\
-    lsrs r4, r0, 16\n\
-    cmp r4, r2\n\
-    bls _08145954\n\
-_08145964:\n\
-    movs r2, 0xE5\n\
-    lsls r2, 2\n\
-    adds r0, r7, r2\n\
-    strh r5, [r0]\n\
-    mov r1, r9\n\
-    lsrs r0, r1, 16\n\
-    cmp r0, 0x43\n\
-    bhi _08145988\n\
-    mov r2, r8\n\
-    strh r5, [r2]\n\
-    b _0814598E\n\
-    .align 2, 0\n\
-_0814597C: .4byte 0x0201c000\n\
-_08145980: .4byte 0x00004023\n\
-_08145984: .4byte 0x00000181\n\
-_08145988:\n\
-    movs r0, 0x44\n\
-    mov r1, r8\n\
-    strh r0, [r1]\n\
-_0814598E:\n\
-    movs r5, 0\n\
-    movs r2, 0xE5\n\
-    lsls r2, 2\n\
-    adds r4, r7, r2\n\
-    mov r9, r5\n\
-    b _0814599E\n\
-_0814599A:\n\
-    cmp r5, 0x43\n\
-    bhi _081459EE\n\
-_0814599E:\n\
-    bl Random\n\
-    lsls r0, 16\n\
-    lsrs r0, 16\n\
-    ldrh r1, [r4]\n\
-    bl __umodsi3\n\
-    lsls r0, 16\n\
-    lsrs r2, r0, 16\n\
-    lsls r1, r5, 1\n\
-    adds r1, r7, r1\n\
-    lsls r0, r2, 1\n\
-    adds r3, r6, r0\n\
-    ldrh r0, [r3]\n\
-    strh r0, [r1]\n\
-    adds r0, r5, 0x1\n\
-    lsls r0, 16\n\
-    lsrs r5, r0, 16\n\
-    mov r0, r9\n\
-    strh r0, [r3]\n\
-    ldrh r0, [r4]\n\
-    subs r0, 0x1\n\
-    strh r0, [r4]\n\
-    lsls r0, 16\n\
-    lsrs r0, 16\n\
-    cmp r2, r0\n\
-    beq _081459E8\n\
-    ldrh r0, [r4]\n\
-    lsls r0, 1\n\
-    adds r0, r6, r0\n\
-    ldrh r0, [r0]\n\
-    strh r0, [r3]\n\
-    ldrh r0, [r4]\n\
-    lsls r0, 1\n\
-    adds r0, r6, r0\n\
-    mov r1, r9\n\
-    strh r1, [r0]\n\
-_081459E8:\n\
-    ldrh r0, [r4]\n\
-    cmp r0, 0\n\
-    bne _0814599A\n\
-_081459EE:\n\
-    mov r2, r8\n\
-    ldrh r0, [r2]\n\
-    cmp r0, 0x43\n\
-    bhi _08145A26\n\
-    adds r5, r0, 0\n\
-    movs r2, 0\n\
-    cmp r5, 0x43\n\
-    bhi _08145A5C\n\
-    mov r3, r8\n\
-_08145A00:\n\
-    lsls r1, r5, 1\n\
-    adds r1, r7, r1\n\
-    lsls r0, r2, 1\n\
-    adds r0, r7, r0\n\
-    ldrh r0, [r0]\n\
-    strh r0, [r1]\n\
-    adds r0, r2, 0x1\n\
-    lsls r0, 16\n\
-    lsrs r2, r0, 16\n\
-    ldrh r0, [r3]\n\
-    cmp r2, r0\n\
-    bne _08145A1A\n\
-    movs r2, 0\n\
-_08145A1A:\n\
-    adds r0, r5, 0x1\n\
-    lsls r0, 16\n\
-    lsrs r5, r0, 16\n\
-    cmp r5, 0x43\n\
-    bls _08145A00\n\
-    b _08145A5C\n\
-_08145A26:\n\
-    movs r4, 0\n\
-    ldrh r0, [r7]\n\
-    cmp r0, r10\n\
-    beq _08145A42\n\
-_08145A2E:\n\
-    adds r0, r4, 0x1\n\
-    lsls r0, 16\n\
-    lsrs r4, r0, 16\n\
-    lsls r0, r4, 1\n\
-    adds r0, r7, r0\n\
-    ldrh r0, [r0]\n\
-    cmp r0, r10\n\
-    beq _08145A42\n\
-    cmp r4, 0x43\n\
-    bls _08145A2E\n\
-_08145A42:\n\
-    mov r1, r8\n\
-    ldrh r0, [r1]\n\
-    subs r0, 0x1\n\
-    cmp r4, r0\n\
-    bge _08145A5C\n\
-    lsls r0, r4, 1\n\
-    adds r0, r7, r0\n\
-    ldr r2, [sp]\n\
-    ldrh r1, [r2]\n\
-    strh r1, [r0]\n\
-    mov r0, r10\n\
-    strh r0, [r2]\n\
-    b _08145A62\n\
-_08145A5C:\n\
-    mov r2, r10\n\
-    ldr r1, [sp]\n\
-    strh r2, [r1]\n\
-_08145A62:\n\
-    movs r0, 0x44\n\
-    mov r1, r8\n\
-    strh r0, [r1]\n\
-    add sp, 0x4\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\
-    .syntax divided\n");
+static void sub_81458DC(void) {
+    struct Unk201C000 *unk201C000 = &ewram1c000;
+    u16 starter = SpeciesToNationalPokedexNum(GetStarterPokemon(VarGet(VAR_FIRST_POKE)));
+    u16 seenTypesCount;
+    u16 page;
+    u16 dexNum;
+    u16 j;
+
+    for (dexNum = 1, seenTypesCount = 0; dexNum < 386; dexNum++)
+    {
+        if (sub_8090D90(dexNum, 1))
+        {
+            unk201C000->unk90[seenTypesCount] = dexNum;
+            seenTypesCount++;
+        }
+    }
+
+    for (dexNum = seenTypesCount; dexNum < 386; dexNum++)
+    {
+        unk201C000->unk90[dexNum] = 0;
+    }
+
+    unk201C000->unk394 = seenTypesCount;
+    if (unk201C000->unk394 < POKEMON_TILE_COUNT)
+    {
+        unk201C000->unk8E = seenTypesCount;
+    }
+    else
+    {
+        unk201C000->unk8E = POKEMON_TILE_COUNT;
+    }
+
+    j = 0;
+    do
+    {
+        page = Random() % unk201C000->unk394;
+        unk201C000->unk0[j] = unk201C000->unk90[page];
+
+        j++;
+        unk201C000->unk90[page] = 0;
+        unk201C000->unk394--;
+        if (page != unk201C000->unk394)
+        {
+            unk201C000->unk90[page] = unk201C000->unk90[unk201C000->unk394];
+            unk201C000->unk90[unk201C000->unk394] = 0;
+        }
+    }
+    while (unk201C000->unk394 != 0 && j < POKEMON_TILE_COUNT);
+
+    if (unk201C000->unk8E < POKEMON_TILE_COUNT)
+    {
+        for (j = unk201C000->unk8E, page = 0; j < POKEMON_TILE_COUNT; j++)
+        {
+            unk201C000->unk0[j] = unk201C000->unk0[page];
+
+            page++;
+            if (page == unk201C000->unk8E)
+                page = 0;
+        }
+        unk201C000->unk0[POKEMON_TILE_COUNT - 1] = starter;
+    }
+    else
+    {
+
+        for (dexNum = 0; unk201C000->unk0[dexNum] != starter && dexNum < POKEMON_TILE_COUNT; dexNum++);
+
+        if (dexNum < unk201C000->unk8E - 1)
+        {
+            unk201C000->unk0[dexNum] = unk201C000->unk0[POKEMON_TILE_COUNT - 1];
+            unk201C000->unk0[POKEMON_TILE_COUNT - 1] = starter;
+        }
+        else
+            unk201C000->unk0[POKEMON_TILE_COUNT - 1] = starter;
+    }
+    unk201C000->unk8E = POKEMON_TILE_COUNT;
 }
diff --git a/src/daycare.c b/src/daycare.c
index 1729efb2a..92be45cfa 100644
--- a/src/daycare.c
+++ b/src/daycare.c
@@ -1,8 +1,11 @@
 #include "global.h"
 #include "pokemon.h"
 #include "string_util.h"
+#include "asm.h"
 
-u8 *pokemon_get_nick(struct Pokemon *mon, u8 *dest)
+extern u8 gLastFieldPokeMenuOpened;
+
+u8 *GetMonNick(struct Pokemon *mon, u8 *dest)
 {
     s8 nickname[POKEMON_NAME_LENGTH * 2];
 
@@ -10,7 +13,7 @@ u8 *pokemon_get_nick(struct Pokemon *mon, u8 *dest)
     return StringCopy10(dest, nickname);
 }
 
-u8 *pokemon_get_nick_(struct BoxPokemon *mon, u8 *dest)
+u8 *GetBoxMonNick(struct BoxPokemon *mon, u8 *dest)
 {
     s8 nickname[POKEMON_NAME_LENGTH * 2];
 
@@ -18,14 +21,368 @@ u8 *pokemon_get_nick_(struct BoxPokemon *mon, u8 *dest)
     return StringCopy10(dest, nickname);
 }
 
-u8 daycare_count_pokemon(struct BoxPokemon *daycare_data)
+u8 Daycare_CountPokemon(struct BoxPokemon *daycare_data)
 {
     u8 i, count;
     count = 0;
 
-    for (i = 0; i <= 1; i++)
-        if (GetBoxMonData(daycare_data + i, MON_DATA_SPECIES) != 0)
+    for(i = 0;i <= 1;i++)
+        if(GetBoxMonData(daycare_data + i, MON_DATA_SPECIES) != 0)
             count++;
 
     return count;
 }
+
+#ifndef ASDF
+__attribute__((naked))
+void sub_8041324(struct BoxPokemon * box_pokemon, void * void_pointer)
+{
+    asm(".syntax unified\n\
+    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\
+    mov r10, r1\n\
+    movs r7, 0\n\
+    movs r5, 0\n\
+    mov r6, r10\n\
+    adds r6, 0x74\n\
+    movs r0, 0x1\n\
+    mov r8, r0\n\
+_0804133E:\n\
+    lsls r0, r5, 2\n\
+    adds r0, r5\n\
+    lsls r0, 4\n\
+    mov r1, r9\n\
+    adds r4, r1, r0\n\
+    adds r0, r4, 0\n\
+    movs r1, 0xB\n\
+    bl GetBoxMonData\n\
+    cmp r0, 0\n\
+    beq _0804136E\n\
+    adds r0, r7, 0x1\n\
+    lsls r0, 24\n\
+    lsrs r7, r0, 24\n\
+    adds r0, r4, 0\n\
+    movs r1, 0xC\n\
+    bl GetBoxMonData\n\
+    adds r1, r0, 0\n\
+    cmp r1, 0\n\
+    bne _0804136E\n\
+    lsls r0, r5, 1\n\
+    adds r0, r6, r0\n\
+    b _08041374\n\
+_0804136E:\n\
+    lsls r0, r5, 1\n\
+    adds r0, r6, r0\n\
+    mov r1, r8\n\
+_08041374:\n\
+    strh r1, [r0]\n\
+    adds r0, r5, 0x1\n\
+    lsls r0, 24\n\
+    lsrs r5, r0, 24\n\
+    cmp r5, 0x1\n\
+    bls _0804133E\n\
+    mov r0, r10\n\
+    str r7, [r0, 0x70]\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\
+    .syntax divided\n");
+}
+#endif
+
+s8 Daycare_FindEmptySpot(struct BoxPokemon * daycare_data)
+{
+    u8 i;
+
+    for(i = 0;i <= 1;i++)
+        if(GetBoxMonData(daycare_data + i, MON_DATA_SPECIES) == 0)
+            return i;
+
+    return -1;
+}
+
+/*void Daycare_SendPokemon(struct Pokemon * mon, struct BoxPokemon * daycare_data){ // unfinished
+    s8 empty_slot;
+
+    empty_slot = Daycare_FindEmptySpot(daycare_data);
+    if(MonHasMail(mon) != 0){ // if the mon holds a mail?
+        u8 empty_slot_times_56 = empty_slot * 56;
+        u8 * something2 = ((u8 *) (daycare_data + 2)) + empty_slot_times_56 + 36;
+        StringCopy(something2, gSaveBlock2.playerName);
+        PadNameString(something2, 0xFC);
+        something2 += 8;
+        GetMonNick(mon, something2);
+        u8 pokerus = GetMonData(mon, MON_DATA_64);
+        something1 += (u8 * daycare_data)
+}*/
+
+__attribute__((naked))
+void Daycare_SendPokemon()
+{
+    // strange stack usage - happens because THUMB ARM only allows R0-R7 to be pushed/popped:
+    //    all registers in reglist must be Lo registers, except that PUSH can include the LR, and POP can include the PC
+    // the ldm/stm section probably copies some struct, but I'm not sure how the code would look
+    asm(".syntax unified\n\
+    push {r4-r7,lr}\n\
+    mov r7, r9\n\
+    mov r6, r8\n\
+    push {r6,r7}\n\
+    adds r7, r0, 0\n\
+    mov r8, r1\n\
+    mov r0, r8\n\
+    bl Daycare_FindEmptySpot\n\
+    lsls r0, 24\n\
+    lsrs r4, r0, 24\n\
+    mov r9, r4\n\
+    adds r0, r7, 0\n\
+    bl MonHasMail\n\
+    lsls r0, 24\n\
+    cmp r0, 0\n\
+    beq _0804144A\n\
+    lsls r0, r4, 24\n\
+    asrs r0, 24\n\
+    lsls r4, r0, 3\n\
+    subs r4, r0\n\
+    lsls r4, 3\n\
+    adds r5, r4, 0\n\
+    adds r5, 0xA0\n\
+    add r5, r8\n\
+    adds r6, r5, 0\n\
+    adds r6, 0x24\n\
+    ldr r1, _08041490 @ =gSaveBlock2\n\
+    adds r0, r6, 0\n\
+    bl StringCopy\n\
+    adds r0, r6, 0\n\
+    movs r1, 0xFC\n\
+    bl PadNameString\n\
+    adds r6, 0x8\n\
+    adds r0, r7, 0\n\
+    adds r1, r6, 0\n\
+    bl GetMonNick\n\
+    adds r0, r7, 0\n\
+    movs r1, 0x40\n\
+    bl GetMonData\n\
+    lsls r0, 24\n\
+    lsrs r0, 24\n\
+    add r4, r8\n\
+    ldr r2, _08041494 @ =gSaveBlock1\n\
+    lsls r1, r0, 3\n\
+    adds r1, r0\n\
+    lsls r1, 2\n\
+    adds r1, r2\n\
+    adds r4, 0xA0\n\
+    ldr r0, _08041498 @ =0x00002b4c\n\
+    adds r1, r0\n\
+    ldm r1!, {r0,r2,r3}\n\
+    stm r4!, {r0,r2,r3}\n\
+    ldm r1!, {r0,r2,r3}\n\
+    stm r4!, {r0,r2,r3}\n\
+    ldm r1!, {r0,r2,r3}\n\
+    stm r4!, {r0,r2,r3}\n\
+    adds r0, r7, 0\n\
+    bl TakeMailFromMon\n\
+_0804144A:\n\
+    mov r2, r9\n\
+    lsls r4, r2, 24\n\
+    asrs r4, 24\n\
+    lsls r5, r4, 2\n\
+    adds r4, r5, r4\n\
+    lsls r4, 4\n\
+    add r4, r8\n\
+    adds r0, r4, 0\n\
+    adds r1, r7, 0\n\
+    movs r2, 0x50\n\
+    bl memcpy\n\
+    adds r0, r4, 0\n\
+    bl BoxMonRestorePP\n\
+    movs r0, 0x88\n\
+    lsls r0, 1\n\
+    add r0, r8\n\
+    adds r0, r5\n\
+    movs r1, 0\n\
+    str r1, [r0]\n\
+    adds r0, r7, 0\n\
+    bl ZeroMonData\n\
+    bl party_compaction\n\
+    bl CalculatePlayerPartyCount\n\
+    pop {r3,r4}\n\
+    mov r8, r3\n\
+    mov r9, r4\n\
+    pop {r4-r7}\n\
+    pop {r0}\n\
+    bx r0\n\
+    .align 2, 0\n\
+_08041490: .4byte gSaveBlock2\n\
+_08041494: .4byte gSaveBlock1\n\
+_08041498: .4byte 0x00002b4c\n\
+    .syntax divided\n");
+}
+
+void Daycare_SendPokemon_Special()
+{
+    Daycare_SendPokemon(gPlayerParty + gLastFieldPokeMenuOpened, gSaveBlock1.daycareData);
+}
+
+void sub_80417F4(u8 *);
+
+void sub_80414C0(struct BoxPokemon * daycare_data)
+{
+    u32 second_species;
+    if((GetBoxMonData(&daycare_data[1], MON_DATA_SPECIES) != 0) && ((second_species = GetBoxMonData(&daycare_data[0], MON_DATA_SPECIES)) == 0)){
+        daycare_data[0] = daycare_data[1];
+        ZeroBoxMonData(&daycare_data[1]);
+        memcpy(daycare_data + 2, (u8 *) (daycare_data + 1) + 0x88, 0x38);
+        *((u32 *)(daycare_data) + 68) = *((u32 *)(daycare_data) + 69);
+        *((u32 *)(daycare_data) + 69) = second_species;
+        sub_80417F4((u8 *) (daycare_data + 1) + 0x88);
+    }
+}
+
+u8 TryIncrementMonLevel(struct Pokemon *);
+extern u16 word_2024E82;
+
+void sub_804151C(struct Pokemon * mon)
+{
+    s32 i;
+    u8 r6;
+    u16 temp;
+
+    for(i = 0; i < 100; i++){
+        if(TryIncrementMonLevel(mon) == FALSE) goto end;
+
+        r6 = 1;
+        while((temp = sub_803B7C8(mon, r6)) != 0){
+            r6 = 0;
+            if(temp == 0xffff){
+                DeleteFirstMoveAndGiveMoveToMon(mon, word_2024E82);
+            }
+        }
+    }
+
+    end:
+
+    CalculateMonStats(mon);
+}
+
+__attribute__((naked))
+u16 sub_8041570(struct BoxPokemon * daycare_data, u8 a2){
+    asm(".syntax unified\n\
+    push {r4-r7,lr}\n\
+    mov r7, r9\n\
+    mov r6, r8\n\
+    push {r6,r7}\n\
+    sub sp, 0x68\n\
+    adds r5, r0, 0\n\
+    lsls r1, 24\n\
+    lsrs r4, r1, 24\n\
+    lsls r7, r4, 2\n\
+    adds r0, r7, r4\n\
+    lsls r0, 4\n\
+    adds r6, r5, r0\n\
+    ldr r1, _08041640 @ =gStringVar1\n\
+    adds r0, r6, 0\n\
+    bl GetBoxMonNick\n\
+    adds r0, r6, 0\n\
+    movs r1, 0xB\n\
+    bl GetBoxMonData\n\
+    lsls r0, 16\n\
+    lsrs r0, 16\n\
+    mov r9, r0\n\
+    adds r0, r6, 0\n\
+    mov r1, sp\n\
+    bl sub_803B4B4\n\
+    mov r0, sp\n\
+    movs r1, 0x38\n\
+    bl GetMonData\n\
+    cmp r0, 0x64\n\
+    beq _080415D8\n\
+    mov r0, sp\n\
+    movs r1, 0x19\n\
+    bl GetMonData\n\
+    movs r2, 0x88\n\
+    lsls r2, 1\n\
+    adds r1, r5, r2\n\
+    adds r1, r7\n\
+    ldr r1, [r1]\n\
+    adds r0, r1\n\
+    str r0, [sp, 0x64]\n\
+    add r2, sp, 0x64\n\
+    mov r0, sp\n\
+    movs r1, 0x19\n\
+    bl SetMonData\n\
+    mov r0, sp\n\
+    bl sub_804151C\n\
+_080415D8:\n\
+    ldr r0, _08041644 @ =gPlayerParty\n\
+    movs r1, 0xFA\n\
+    lsls r1, 1\n\
+    adds r1, r0\n\
+    mov r8, r1\n\
+    mov r0, r8\n\
+    mov r1, sp\n\
+    movs r2, 0x64\n\
+    bl memcpy\n\
+    lsls r0, r4, 3\n\
+    subs r0, r4\n\
+    lsls r1, r0, 3\n\
+    adds r0, r5, r1\n\
+    adds r0, 0xC0\n\
+    ldrh r0, [r0]\n\
+    cmp r0, 0\n\
+    beq _08041610\n\
+    adds r4, r1, 0\n\
+    adds r4, 0xA0\n\
+    adds r4, r5, r4\n\
+    mov r0, r8\n\
+    adds r1, r4, 0\n\
+    bl GiveMailToMon2\n\
+    adds r0, r4, 0\n\
+    bl sub_80417F4\n\
+_08041610:\n\
+    bl party_compaction\n\
+    adds r0, r6, 0\n\
+    bl ZeroBoxMonData\n\
+    movs r2, 0x88\n\
+    lsls r2, 1\n\
+    adds r0, r5, r2\n\
+    adds r0, r7\n\
+    movs r1, 0\n\
+    str r1, [r0]\n\
+    adds r0, r5, 0\n\
+    bl sub_80414C0\n\
+    bl CalculatePlayerPartyCount\n\
+    mov r0, r9\n\
+    add sp, 0x68\n\
+    pop {r3,r4}\n\
+    mov r8, r3\n\
+    mov r9, r4\n\
+    pop {r4-r7}\n\
+    pop {r1}\n\
+    bx r1\n\
+    .align 2, 0\n\
+_08041640: .4byte gStringVar1\n\
+_08041644: .4byte gPlayerParty\n\
+    .syntax divided");
+}
+
+extern u8 gSpecialVar_0x8004;
+
+u16 sub_8041648()
+{
+    return sub_8041570(gSaveBlock1.daycareData, gSpecialVar_0x8004);
+}
+
+u8 Daycare_GetLevelAfterSteps(struct BoxPokemon * mon, u32 steps){
+    struct BoxPokemon temp = *mon;
+    u32 new_exp = GetBoxMonData(mon, MON_DATA_EXP) + steps;
+    SetBoxMonData(&temp, MON_DATA_EXP, (u8 *) &new_exp);
+    return GetLevelFromBoxMonExp(&temp);
+}
diff --git a/src/easy_chat.c b/src/easy_chat.c
index ee1e37b9b..86719a2ae 100644
--- a/src/easy_chat.c
+++ b/src/easy_chat.c
@@ -5,27 +5,252 @@
 #include "field_message_box.h"
 #include "pokedex.h"
 #include "rng.h"
+#include "string_util.h"
+#include "strings.h"
 #include "text.h"
 
+u8 sub_80EB37C(u16);
 u8 sub_80EB8C0(void);
 u8 sub_80EB868(u8);
 u16 sub_80EAE88(u8);
 void sub_80EB890(u8);
 u16 sub_80EB784(u16 group);
 u8 sub_80EAD7C(u8 group);
-u8 sub_80EB680(u16 *, u16, u16, u16);
+static bool8 sub_80EB680(u16 *, u16, u16, u16);
 static u16 sub_80EB9D8(void);
 static u16 sub_80EB960(void);
 u16 sub_80EB72C(u16);
 
+extern const u8 gSpeciesNames[][11];
+extern u8 gMoveNames[][13];
 extern void *gEasyChatGroupWords[];
 extern const u8 gEasyChatGroupSizes[];
 
 extern u16 gSpecialVar_0x8004;
 
+extern const u8 gOtherText_ThreeQuestions[];
+
+#ifdef NONMATCHING
+u8 *sub_80EB3FC(u8 *dst, u16 word) {
+    int group, wordIndex;
+    u8 *src;
+    u16 i;
+
+
+    if (sub_80EB37C(word))
+    {
+        return StringCopy(dst, gOtherText_ThreeQuestions);
+    }
+
+    if (word != 0xFFFF)
+    {
+        group = word >> 9;
+        wordIndex = word & 0x1FF;
+        switch (group)
+        {
+        case EC_GROUP_POKEMON: // 0
+        case EC_GROUP_POKEMON_2: // 21
+            dst = StringCopy(dst, gSpeciesNames[wordIndex]);
+            break;
+
+        case EC_GROUP_MOVE_1: // 18
+        case EC_GROUP_MOVE_2: // 19
+            dst = StringCopy(dst, gMoveNames[wordIndex]);
+            break;
+
+        default:
+            src = gEasyChatGroupWords[group];
+
+            i = wordIndex - 1;
+            while (i != 0xFFFF)
+            {
+                while (*src++ != EOS)
+                {
+                }
+                i--;
+            }
+            dst = StringCopy(dst, src);
+            break;
+        }
+    }
+
+    dst[0] = EOS;
+    return dst;
+}
+#endif
+
+u8 *ConvertEasyChatWordsToString(u8 *dst, u16 *words, u16 arg2, u16 arg3) {
+    u16 i;
+    u16 n;
+
+    const u16 i1 = arg2 - 1;
+
+    for (i = 0; i < arg3; i++)
+    {
+        u16 word;
+
+        for (n = 0; n < i1; n++)
+        {
+            dst = sub_80EB3FC(dst, words[0]);
+
+            if (words[0] != 0xFFFF)
+            {
+                dst[0] = CHAR_SPACE;
+                dst++;
+            }
+
+            words++;
+        }
+
+        word = words[0];
+        words++;
+        dst = sub_80EB3FC(dst, word);
+
+        dst[0] = 0xFE;
+        dst++;
+    }
+
+    dst--;
+    dst[0] = EOS;
+
+    return dst;
+}
+
+u8 *sub_80EB544(u8 *dst, u16 *words, u16 arg2, u16 arg3) {
+    u16 i;
+    u16 n;
+
+    const u16 i1 = arg2 - 1;
+
+    for (i = 0; i < arg3; i++)
+    {
+        u16 word;
+
+        for (n = 0; n < i1; n++)
+        {
+            dst = sub_80EB3FC(dst, words[0]);
+
+            if (words[0] != 0xFFFF)
+            {
+                dst[0] = CHAR_SPACE;
+                dst++;
+            }
+
+            words++;
+        }
+
+        word = words[0];
+        words++;
+        dst = sub_80EB3FC(dst, word);
+
+        // Only difference with ConvertEasyChatWordsToString
+        dst[0] = (i == 0) ? 0xFE : 0xFA;
+        dst++;
+    }
+
+    dst--;
+    dst[0] = EOS;
+
+    return dst;
+}
+
+
+u16 unref_sub_80EB5E0(u16 arg0) {
+    u8 *chars;
+    u16 i;
+    u16 strlen;
+    int group, word;
+
+
+    if (arg0 == 0xFFFF)
+    {
+        return 0;
+    }
+
+    group = arg0 >> 9;
+    word = arg0 & 0x1FF;
+    switch (group)
+    {
+    case EC_GROUP_POKEMON: // 0
+    case EC_GROUP_POKEMON_2: // 21
+        chars = (u8 *) gSpeciesNames[word];
+        break;
+
+    case EC_GROUP_MOVE_1: // 18
+    case EC_GROUP_MOVE_2: // 19
+        chars = gMoveNames[word];
+        break;
+
+    default:
+        chars = gEasyChatGroupWords[group];
+
+        i = word - 1;
+        while (i != 0xFFFF)
+        {
+            while (*chars++ != EOS)
+            {
+            }
+            i--;
+        }
+        break;
+    }
+
+    strlen = 0;
+    while (*chars != EOS)
+    {
+        chars++;
+        strlen += 1;
+    }
+
+    return strlen;
+}
+
+static bool8 sub_80EB680(u16 *arg0, u16 arg1, u16 arg2, u16 arg3) {
+    return FALSE;
+}
+
+void unref_sub_80EB684(u8 arg0, u16 arg1) {
+    u16 *ptr;
+    u16 c;
+
+    // FIXME: find actual tv shows used
+    switch (arg0)
+    {
+    case 5:
+        c = 6;
+        ptr = (u16*)((void *)&gSaveBlock1.tvShows.shows[arg1] + 0x04);
+        break;
+    case 7:
+        c = 2;
+        ptr = (u16*)((void *)&gSaveBlock1.tvShows.shows[arg1] + 0x1C);
+        break;
+    case 8:
+        c = 1;
+        ptr = (u16*)((void *)&gSaveBlock1.tvShows.shows[arg1] + 0x02);
+        break;
+
+    default:
+        return;
+    }
+
+    c -= 1;
+    while (c != 0xFFFF)
+    {
+        *ptr = -1;
+        ptr++;
+        c -= 1;
+    }
+}
+
 void sub_80EB6FC(u16 *arg0, u16 arg1) {
-    for (arg1--; arg1!=0xffff; arg1--)
-        *(arg0++) = 0xffff;
+    u16 i;
+
+    for (i = arg1 - 1; i != 0xFFFF; i--)
+    {
+        *arg0 = 0xFFFF;
+        arg0++;
+    }
+
 }
 
 u16 sub_80EB72C(u16 group) {
diff --git a/src/intro.c b/src/intro.c
index ea6edba3d..2a62892ba 100644
--- a/src/intro.c
+++ b/src/intro.c
@@ -19,7 +19,6 @@
 #include "trig.h"
 
 extern void *species_and_otid_get_pal(/*TODO: arg types*/);
-extern void sub_8143648(int, u8);
 extern void sub_8143680(int, u8);
 
 struct MonCoords
diff --git a/src/menu.c b/src/menu.c
index ba98ff057..3759d22c9 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -598,7 +598,7 @@ s8 ProcessMenuInputNoWrap_(void)
     return ProcessMenuInputNoWrap();
 }
 
-u8 MenuPrint_PixelCoords(u8 *text, u8 left, u16 top, u8 a4)
+u8 MenuPrint_PixelCoords(const u8 *text, u8 left, u16 top, u8 a4)
 {
     return sub_8004D04(gMenuWindowPtr, text, gMenuTextTileOffset, left, top, a4);
 }
diff --git a/src/mori_debug_menu.c b/src/mori_debug_menu.c
index 9f586dcb9..fd0ad773b 100644
--- a/src/mori_debug_menu.c
+++ b/src/mori_debug_menu.c
@@ -65,7 +65,7 @@ u8 MoriDebugMenu_SearchChild(u8 a1, u8 a2, u8 *ptr)
 
 s8 MoriDebugMenu_Egg(void)
 {
-    if ( daycare_count_pokemon(gSaveBlock1.filler_2F9C) == 2 && daycare_relationship_score_from_savegame() )
+    if ( Daycare_CountPokemon(gSaveBlock1.daycareData) == 2 && daycare_relationship_score_from_savegame() )
         sub_8041940();
     CloseMenu();
 
@@ -74,7 +74,7 @@ s8 MoriDebugMenu_Egg(void)
 
 s8 MoriDebugMenu_MaleEgg(void)
 {
-    if ( daycare_count_pokemon(gSaveBlock1.filler_2F9C) == 2 && daycare_relationship_score_from_savegame() )
+    if ( Daycare_CountPokemon(gSaveBlock1.daycareData) == 2 && daycare_relationship_score_from_savegame() )
         sub_8041950();
     CloseMenu();
 
diff --git a/src/party_menu.c b/src/party_menu.c
index d473eae6d..8eb181f46 100644
--- a/src/party_menu.c
+++ b/src/party_menu.c
@@ -1,52 +1,223 @@
 #include "global.h"
+#include "asm.h"
 #include "menu.h"
 #include "pokemon.h"
 #include "songs.h"
 #include "sound.h"
 #include "string_util.h"
 #include "task.h"
+#include "sprite.h"
+#include "palette.h"
+#include "event_data.h"
+#include "main.h"
+#include "item.h"
+#include "battle_interface.h"
+#include "species.h"
 
 #define DATA_COUNT (6)
 
+struct Unk2001000
+{
+    u8 unk0;
+    u8 unk1;
+    u8 unk2;
+};
+
+struct Unk201B000
+{
+    u8 filler0[0x260];
+    u8 unk260;
+    u8 unk261;
+    u8 filler262[2];
+    s16 unk264[DATA_COUNT * 2];
+    u8 filler27C[2];
+    s16 unk27E;
+    s16 unk280;
+    s16 unk282;
+};
+
 struct Unk201C000
 {
     /*0x00*/ struct Pokemon *pokemon;
-    /*0x04*/ u8 var04;
-    /*0x05*/ u8 var05;
-    /*0x06*/ u16 var06;
-    u8 pad_08[10];
-    /*0x12*/ u16 var12;
+    /*0x04*/ u8 unk4;
+    /*0x05*/ u8 unk5;
+    /*0x06*/ u16 unk6;
+    /*0x08*/ u16 unk8;
+    /*0x0A*/ u8 pad_0A[2];
+    /*0x0C*/ s32 unkC;
+    /*0x10*/ TaskFunc unk10;
+    /*0x14*/ TaskFunc unk14;
+};
+
+struct Unk201F000
+{
+    u8 filler0[0xE00];
+    u8 unkE00[3];  // not sure if this is an array or struct, or how big it is
 };
 
-struct Unk201B260
+struct UnknownStruct5
 {
-    /*0x00*/ u8 var00;
-    /*0x01*/ u8 var01;
-    u8 pad_02[2];
-    /*0x04*/ s16 var04[DATA_COUNT * 2];
-    u8 pad_1C[2];
-    /*0x1E*/ u16 var1E;
-    /*0x20*/ u16 var20;
+    u8 unk0;
+    u8 unk1;
+    u16 *unk4;
 };
 
-extern struct Unk201B260 unk_201B260;
-extern struct Unk201C000 unk_201C000;
+extern u8 ewram[];
+#define ewram01000 (*(struct Unk2001000 *)(ewram + 0x01000))
+#define ewram1B000 (*(struct Unk201B000 *)(ewram + 0x1B000))
+#define ewram1C000 (*(struct Unk201C000 *)(ewram + 0x1C000))
+#define ewram1F000 (*(struct Unk201F000 *)(ewram + 0x1F000))
+
 extern u8 gUnknown_0202E8F4;
 extern u8 gUnknown_0202E8F6;
+extern u16 gUnknown_0202E8F8;
+extern u8 gUnknown_0202E8FA;
+extern u8 gLastFieldPokeMenuOpened;
+extern u8 gPlayerPartyCount;
+extern u16 gScriptItemId;
+extern s32 gBattleMoveDamage;
+
+//extern const u16 gUnknown_083769A8[][6];
+//extern const u8 gUnknown_083769A8[][12];
+extern void *const gUnknown_08376858[][6];
+extern const u8 gUnknown_083769A8[];
+extern const u8 gUnknown_08376D1C[DATA_COUNT];
+extern const u16 gUnknown_08376504[];
+extern void (*const gUnknown_08376B54[])(u8);
+extern const u8 *const gUnknown_08376D04[DATA_COUNT];
+extern const struct UnknownStruct5 gUnknown_08376BB4[][6];
+extern const u8 gOtherText_TallPlusAndRightArrow[];
+extern const u8 gOtherText_WontHaveAnyEffect[];
+extern const u8 gOtherText_ElevatedTo[];
+extern const u8 gOtherText_MailMustBeRemoved[];
+extern const u8 gOtherText_AlreadyHolding[];
+extern const u8 gOtherText_TakenAndReplaced[];
+extern const u8 gOtherText_BagFullCannotRemoveItem[];
+extern const u8 gOtherText_WasGivenToHold[];
+extern const u8 gOtherText_PokeHoldingItemCantMail[];
+extern const u8 gOtherText_MailTransferredMailbox[];
+extern const u8 gOtherText_NotHoldingAnything[];
+extern const u8 gOtherText_ReceivedTheThingFrom[];
+extern const u8 gOtherText_SendRemovedMailPrompt[];
+extern const u8 gOtherText_MailTaken[];
+extern const u8 gOtherText_MailWasSent[];
+extern const u8 gOtherText_MailboxIsFull[];
+extern const u8 gOtherText_MailRemovedMessageLost[];
+extern const u8 gOtherText_WantsToLearn[];
+extern const u8 gOtherText_NotCompatible[];
+extern const u8 gOtherText_AlreadyKnows[];
+extern const u8 gOtherText_LearnedMove[];
+extern const u8 gOtherText_WhichMoveToForget2[];
+extern const u8 gOtherText_ForgetMove123_2[];
+extern const u8 gOtherText_StopTryingTo[];
+extern const u8 gOtherText_DidNotLearnMove2[];
+extern const u8 gOtherText_RegainedHealth[];
+extern const u8 gOtherText_HPRestoredBy[];
+extern const u8 gOtherText_CuredPoisoning[];
+extern const u8 gOtherText_WokeUp[];
+extern const u8 gOtherText_BurnHealed[];
+extern const u8 gOtherText_ThawedOut[];
+extern const u8 gOtherText_CuredParalysis[];
+extern const u8 gOtherText_SnapConfusion[];
+extern const u8 gOtherText_GotOverLove[];
+extern const u8 gOtherText_BecameHealthy[];
+extern const u8 gOtherText_Hp2[];
+extern const u8 gOtherText_Attack[];
+extern const u8 gOtherText_Defense[];
+extern const u8 gOtherText_Speed[];
+extern const u8 gOtherText_SpAtk2[];
+extern const u8 gOtherText_SpDef2[];
+extern const u8 gOtherText_WasRaised[];
+extern const u8 gOtherText_PPIncreased[];
+extern const u8 gOtherText_PPRestored[];
+extern const u8 gMoveNames[][13];
+extern const u8 *const gItemEffectTable[];
 
-extern u8 gUnknown_083769A8[][12];
-extern u8 gUnknown_08376D1C[DATA_COUNT];
-extern u8 *gUnknown_08376D04[DATA_COUNT];
-extern u8 gOtherText_TallPlusAndRightArrow[];
+extern bool8 IsDoubleBattle(void);
+extern void SetUpBattlePokemonMenu(u8);
+extern void sub_808B0C0(u8);
+extern u8 GiveMailToMon(struct Pokemon *, u16);
+extern bool8 ItemIsMail(u16);
+extern void ClearMailStruct(struct MailStruct *);
+extern u8 GiveMailToMon2(struct Pokemon *, struct MailStruct *);
+extern void TakeMailFromMon(struct Pokemon *);
+extern u8 TakeMailFromMon2(struct Pokemon *);
+extern u32 CanMonLearnTMHM(struct Pokemon *, u8);
+extern void sub_809D9F0(struct Pokemon *, u8, u8, void *, u32);
+extern void sub_808B564();
+extern u8 sub_809FA30(void);
+extern void sub_808B508(u8);
+extern void sub_8032638();
+extern u8 sub_8094C20();
+extern bool8 ExecuteTableBasedItemEffect_();
+extern u8 GetMonStatusAndPokerus();
 
-void task_pc_turn_off(u8 *u8, int i);
+u8 sub_806CA38(u8);
+void task_pc_turn_off();
 static void sub_806E884(u8 taskId);
 void sub_806F8AC(u8 taskId);
+void sub_806FB0C(u8 taskId);
 void PartyMenuUpdateLevelOrStatus(struct Pokemon *, u8);
-u8 ExecuteTableBasedItemEffect__(u8 u8, u16 u16, int i);
+bool8 ExecuteTableBasedItemEffect__(u8, u16, u8);
 void sub_80701DC(u8 taskId);
+void DoRecoverPP(u8);
+void Task_RareCandy1(u8);
+void Task_RareCandy2(u8);
+void Task_RareCandy3(u8);
+void sub_806D538();
+void sub_806D5A4(void);
+void sub_806E8D0(u8 taskId, u16 b, TaskFunc c);
+void GetMedicineItemEffectMessage(u16);
+void sub_8070A20();
+void sub_8070848(u8 taskId);
+void sub_8070968();
+void party_menu_link_mon_held_item_object(u8);
+void Task_ConfirmGiveHeldItem(u8);
+void DisplayGiveHeldItemMessage(u8, u16, u8);
+void SetHeldItemIconVisibility();
+void DisplayTakeHeldItemMessage(u8, u16, u8);
+void Task_ConfirmTakeHeldMail(u8);
+void Task_TeamMonTMMove(u8);
+void Task_TeamMonTMMove2(u8);
+void Task_TeamMonTMMove3(u8);
+void Task_TeamMonTMMove4(u8);
+void sub_806F358(u8);
+void sub_806F390(u8);
+void sub_806F44C(u8);
+void TMMoveUpdateMoveSlot(u8);
+void StopTryingToTeachMove_806F614(u8);
+void StopTryingToTeachMove_806F67C(u8);
+void StopTryingToTeachMove_806F6B4(u8);
+void sub_806FB44(u8);
+void sub_8070C54();
+void SetMonIconAnim();
+u8 GetMonIconSpriteId_maybe();
+void PartyMenuDoPrintHP(u8, int, u16, u16);
+void PartyMenuClearLevelStatusTilemap();
+void PartyMenuPrintMonLevelOrStatus();
+u8 GetItemEffectType();
+bool8 IsBlueYellowRedFlute(u16);
+void TryPrintPartyMenuMonNickname();
+void sub_8070088(u8);
+
+
+/*
+void sub_806AEDC(void)
+{
+    const struct UnknownStruct5 *r5;
+    s32 i;
 
-u8 sub_806E834(u8 *message, u8 arg1)
+    AnimateSprites();
+    BuildOamBuffer();
+    r5 = gUnknown_08376BB4[gUnknown_0202E8FA];
+    for (i = 0; i < 6; i++)
+        sub_800142C(r5[i].unk0 * 8, r5[i].unk1 * 8, r5[i].unk4, 0, (i << 5) | 0x200);
+    RunTasks();
+    UpdatePaletteFade();
+}
+*/
+
+u8 sub_806E834(const u8 *message, u8 arg1)
 {
     u8 taskId;
 
@@ -63,227 +234,1217 @@ u8 sub_806E834(u8 *message, u8 arg1)
 
 static void sub_806E884(u8 taskId)
 {
-    if (MenuUpdateWindowText() == 0)
+    if (MenuUpdateWindowText())
     {
-        return;
+        gUnknown_0202E8F6 = 0;
+        if (gTasks[taskId].data[0] == 0)
+            MenuZeroFillWindowRect(3, 14, 26, 19);
+        DestroyTask(taskId);
     }
+}
 
-    gUnknown_0202E8F6 = 0;
+void sub_806E8D0(u8 taskId, u16 b, TaskFunc c)
+{
+    ewram1C000.unk10 = c;
+    ewram1C000.unk4 = taskId;
+    ewram1C000.unk5 = sub_806CA38(taskId);
+    ewram1C000.unk6 = b;
+    ewram1C000.pokemon = &gPlayerParty[ewram1C000.unk5];
+}
+
+bool8 PartyMenuUpdateMonHeldItem(struct Pokemon *pkmn, u16 item)
+{
+    u8 itemData[2];
 
-    if (gTasks[taskId].data[0] == 0)
+    if (ItemIsMail(item) == TRUE)
     {
-        MenuZeroFillWindowRect(3, 14, 26, 19);
+        if (GiveMailToMon(pkmn, item) == 0xFF)
+            return TRUE;
+        gUnknown_0202E8F4 = 2;
+    }
+    else
+    {
+        gUnknown_0202E8F4 = 1;
     }
 
-    DestroyTask(taskId);
+    itemData[0] = item;
+    itemData[1] = item >> 8;
+    SetMonData(pkmn, MON_DATA_HELD_ITEM, itemData);
+    return FALSE;
 }
 
-asm(".section .text_b");
-
-#ifdef NONMATCHING
-void sub_8070088(u8 taskId)
+void PartyMenuTryGiveMonHeldItem(u8 taskId, u16 newItem, TaskFunc c)
 {
-    u8 dummyTaskId;
-    struct Task *task2;
+    u16 currentItem;
 
     gTasks[taskId].func = TaskDummy;
+    sub_806E8D0(taskId, newItem, c);
+    currentItem = GetMonData(ewram1C000.pokemon, MON_DATA_HELD_ITEM);
+    gUnknown_0202E8F4 = 0;
+    gUnknown_0202E8F8 = 0;
+    if (currentItem != 0)
+    {
+        if (ItemIsMail(currentItem) == TRUE)
+        {
+            sub_806E834(gOtherText_MailMustBeRemoved, 1);
+            CreateTask(party_menu_link_mon_held_item_object, 5);
+        }
+        else
+        {
+            GetMonNickname(ewram1C000.pokemon, gStringVar1);
+            CopyItemName(currentItem, gStringVar2);
+            StringExpandPlaceholders(gStringVar4, gOtherText_AlreadyHolding);
+            sub_806E834(gStringVar4, 1);
+            CreateTask(Task_ConfirmGiveHeldItem, 5);
+            if (ItemIsMail(newItem) == TRUE)
+                gUnknown_0202E8F8 = currentItem;
+        }
+    }
+    else
+    {
+        PartyMenuUpdateMonHeldItem(ewram1C000.pokemon, newItem);
+        RemoveBagItem(newItem, 1);
+        if (ItemIsMail(newItem))
+        {
+            gTasks[taskId].func = c;
+        }
+        else
+        {
+            DisplayGiveHeldItemMessage(ewram1C000.unk5, newItem, 1);
+            CreateTask(party_menu_link_mon_held_item_object, 5);
+        }
+    }
+}
 
-    if (GetMonData(&gPlayerParty[unk_201C000.var04], MON_DATA_SPECIES) == 0)
+void party_menu_link_mon_held_item_object(u8 taskId)
+{
+    if (gUnknown_0202E8F6 == 0)
     {
-        gTasks[taskId].func = sub_80701DC;
-        return;
+        SetHeldItemIconVisibility(ewram1C000.unk4, ewram1C000.unk5);
+        gTasks[ewram1C000.unk4].func = ewram1C000.unk10;
+        DestroyTask(taskId);
     }
+}
 
-    dummyTaskId = CreateTask(TaskDummy, 5);
-    task2 = &gTasks[dummyTaskId];
+void PartyMenuTryGiveMonHeldItem_806EACC(u8 taskId)
+{
+    s8 selection = ProcessMenuInputNoWrap_();
 
-    task2->data[10] = GetMonData(unk_201C000.pokemon, MON_DATA_MAX_HP);
-    task2->data[11] = GetMonData(unk_201C000.pokemon, MON_DATA_HP);
+    if (selection == 0)
+    {
+        u16 currentItem;
 
-    if (ExecuteTableBasedItemEffect__(unk_201C000.var05, unk_201C000.var06, 0))
+        MenuZeroFillWindowRect(23, 8, 29, 13);
+        currentItem = GetMonData(ewram1C000.pokemon, MON_DATA_HELD_ITEM);
+        RemoveBagItem(ewram1C000.unk6, 1);
+        if (AddBagItem(currentItem, 1) == TRUE)
+        {
+            PartyMenuUpdateMonHeldItem(ewram1C000.pokemon, ewram1C000.unk6);
+            if (ItemIsMail(ewram1C000.unk6))
+            {
+                DisplayTakeHeldItemMessage(ewram1C000.unk5, currentItem, 1);
+            }
+            else
+            {
+                CopyItemName(ewram1C000.unk6, gStringVar1);
+                StringExpandPlaceholders(gStringVar4, gOtherText_TakenAndReplaced);
+                sub_806E834(gStringVar4, 1);
+            }
+        }
+        else
+        {
+            sub_806E834(gOtherText_BagFullCannotRemoveItem, 0);
+            AddBagItem(ewram1C000.unk6, 1);
+        }
+    }
+    else
     {
-        DestroyTask(dummyTaskId);
-        gTasks[taskId].func = sub_80701DC;
-        return;
+        if (selection != 1 && selection != -1)
+            return;
+        if (selection == -1)
+            PlaySE(SE_SELECT);
+        MenuZeroFillWindowRect(23, 8, 29, 13);
     }
+    gTasks[taskId].func = party_menu_link_mon_held_item_object;
+}
 
-    gUnknown_0202E8F4 = 1;
-    MenuZeroFillWindowRect(3, 14, 26, 19);
-    PlaySE(SE_KAIFUKU);
-    PartyMenuUpdateLevelOrStatus(unk_201C000.pokemon, unk_201C000.var05);
+void Task_ConfirmGiveHeldItem(u8 taskId)
+{
+    if (gUnknown_0202E8F6 == 0)
+    {
+        DisplayYesNoMenu(23, 8, 1);
+        gTasks[taskId].func = PartyMenuTryGiveMonHeldItem_806EACC;
+    }
+}
+
+void DisplayGiveHeldItemMessage(u8 a, u16 b, u8 c)
+{
+    GetMonNickname(&gPlayerParty[a], gStringVar1);
+    CopyItemName(b, gStringVar2);
+    StringExpandPlaceholders(gStringVar4, gOtherText_WasGivenToHold);
+    sub_806E834(gStringVar4, c);
+}
 
-    task_pc_turn_off(&gUnknown_083769A8[IsDoubleBattle()][unk_201C000.var05], 9);
-    unk_201B260.var01 = 2; // u8
 
-    task2->data[12] = GetMonData(unk_201C000.pokemon, MON_DATA_HP) - task2->data[11];
-    task2->data[14] = 1;
-    unk_201B260.var1E = 1; // u16
-    unk_201B260.var20 = 1; // u16
+// Not sure about this one for now.
+/*
+void PartyMenuTryGiveMonMail(u8 taskId, TaskFunc func)
+{
+    u16 currentItem;
+    struct MailStruct *r4;
 
-    unk_201C000.var12 = -0x8000;
-    task2->func = sub_806F8AC;
+    gTasks[taskId].func = TaskDummy;
+    sub_806E8D0(taskId, 0, func);
+    currentItem = GetMonData(ewram1C000.pokemon, MON_DATA_HELD_ITEM);
+    gUnknown_0202E8F4 = 0;
+    r4 = &gSaveBlock1.mail[ewram1F000.unkE00[0] + ewram1F000.unkE00[2]];
+    if (currentItem != 0)
+    {
+        sub_806E834(gOtherText_PokeHoldingItemCantMail, 1);
+        CreateTask(party_menu_link_mon_held_item_object, 5);
+    }
+    else
+    {
+        GiveMailToMon2(ewram1C000.pokemon, r4);
+        ClearMailStruct(r4);
+        sub_806E834(gOtherText_MailTransferredMailbox, 1);
+        CreateTask(party_menu_link_mon_held_item_object, 5);
+    }
 }
-#else
+*/
 __attribute__((naked))
-void sub_8070088(void)
+void PartyMenuTryGiveMonMail(u8 taskId, TaskFunc func)
 {
     asm(".syntax unified\n\
-    push {r4-r7,lr}\n\
-    mov r7, r10\n\
-    mov r6, r9\n\
-    mov r5, r8\n\
-    push {r5-r7}\n\
-    sub sp, 0x4\n\
+    push {r4,r5,lr}\n\
+    adds r2, r1, 0\n\
     lsls r0, 24\n\
     lsrs r0, 24\n\
-    ldr r1, _08070120 @ =gTasks\n\
-    mov r10, r1\n\
+    ldr r3, _0806ECA0 @ =gTasks\n\
     lsls r1, r0, 2\n\
     adds r1, r0\n\
     lsls r1, 3\n\
-    mov r2, r10\n\
-    adds r7, r1, r2\n\
-    ldr r5, _08070124 @ =TaskDummy\n\
-    str r5, [r7]\n\
-    ldr r4, _08070128 @ =0x0201c000\n\
-    ldrb r0, [r4, 0x5]\n\
-    movs r1, 0x64\n\
-    mov r9, r1\n\
-    mov r2, r9\n\
-    muls r2, r0\n\
-    adds r0, r2, 0\n\
-    ldr r1, _0807012C @ =gPlayerParty\n\
-    mov r8, r1\n\
-    add r0, r8\n\
-    movs r1, 0xB\n\
+    adds r1, r3\n\
+    ldr r3, _0806ECA4 @ =TaskDummy\n\
+    str r3, [r1]\n\
+    movs r1, 0\n\
+    bl sub_806E8D0\n\
+    ldr r5, _0806ECA8 @ =0x0201c000\n\
+    ldr r0, [r5]\n\
+    movs r1, 0xC\n\
     bl GetMonData\n\
+    lsls r0, 16\n\
+    ldr r2, _0806ECAC @ =gUnknown_0202E8F4\n\
+    movs r1, 0\n\
+    strb r1, [r2]\n\
+    movs r1, 0xF8\n\
+    lsls r1, 6\n\
+    adds r2, r5, r1\n\
+    ldrb r1, [r2]\n\
+    adds r1, 0x6\n\
+    ldrb r2, [r2, 0x2]\n\
+    adds r1, r2\n\
+    lsls r2, r1, 3\n\
+    adds r2, r1\n\
+    lsls r2, 2\n\
+    ldr r1, _0806ECB0 @ =gSaveBlock1 + 0x2B4C\n\
+    adds r4, r2, r1\n\
     cmp r0, 0\n\
-    beq _08070118\n\
-    adds r0, r5, 0\n\
+    beq _0806ECBC\n\
+    ldr r0, _0806ECB4 @ =gOtherText_PokeHoldingItemCantMail\n\
+    movs r1, 0x1\n\
+    bl sub_806E834\n\
+    ldr r0, _0806ECB8 @ =party_menu_link_mon_held_item_object\n\
     movs r1, 0x5\n\
     bl CreateTask\n\
-    lsls r0, 24\n\
-    lsrs r5, r0, 24\n\
-    lsls r0, r5, 2\n\
-    adds r0, r5\n\
-    lsls r0, 3\n\
-    str r0, [sp]\n\
-    mov r0, r10\n\
-    adds r0, 0x8\n\
-    ldr r2, [sp]\n\
-    adds r6, r2, r0\n\
-    ldrb r0, [r4, 0x5]\n\
-    mov r1, r9\n\
-    muls r1, r0\n\
-    adds r0, r1, 0\n\
-    add r0, r8\n\
-    str r0, [r4]\n\
-    movs r1, 0x3A\n\
-    bl GetMonData\n\
-    strh r0, [r6, 0x14]\n\
-    ldr r0, [r4]\n\
-    movs r1, 0x39\n\
-    bl GetMonData\n\
-    strh r0, [r6, 0x16]\n\
-    ldrb r0, [r4, 0x5]\n\
-    ldrh r1, [r4, 0x6]\n\
-    movs r2, 0\n\
-    bl ExecuteTableBasedItemEffect__\n\
-    lsls r0, 24\n\
-    cmp r0, 0\n\
-    beq _08070134\n\
-    adds r0, r5, 0\n\
-    bl DestroyTask\n\
-_08070118:\n\
-    ldr r0, _08070130 @ =sub_80701DC\n\
-    str r0, [r7]\n\
-    b _080701B0\n\
+    b _0806ECDA\n\
     .align 2, 0\n\
-_08070120: .4byte gTasks\n\
-_08070124: .4byte TaskDummy\n\
-_08070128: .4byte 0x0201c000\n\
-_0807012C: .4byte gPlayerParty\n\
-_08070130: .4byte sub_80701DC\n\
-_08070134:\n\
-    ldr r1, _080701C0 @ =gUnknown_0202E8F4\n\
-    movs r0, 0x1\n\
-    strb r0, [r1]\n\
-    movs r0, 0x3\n\
-    movs r1, 0xE\n\
-    movs r2, 0x1A\n\
-    movs r3, 0x13\n\
-    bl MenuZeroFillWindowRect\n\
-    movs r0, 0x1\n\
-    bl PlaySE\n\
-    ldr r0, [r4]\n\
-    ldrb r1, [r4, 0x5]\n\
-    bl PartyMenuUpdateLevelOrStatus\n\
-    bl IsDoubleBattle\n\
-    adds r1, r0, 0\n\
-    lsls r1, 24\n\
-    lsrs r1, 24\n\
-    lsls r0, r1, 1\n\
-    adds r0, r1\n\
-    lsls r0, 2\n\
-    ldrb r1, [r4, 0x5]\n\
-    lsls r1, 1\n\
-    adds r0, r1\n\
-    ldr r1, _080701C4 @ =gUnknown_083769A8\n\
-    adds r0, r1\n\
-    movs r1, 0x9\n\
-    bl task_pc_turn_off\n\
-    ldr r2, _080701C8 @ =0xfffff261\n\
-    adds r1, r4, r2\n\
-    movs r0, 0x2\n\
-    strb r0, [r1]\n\
-    ldr r0, [r4]\n\
-    movs r1, 0x39\n\
-    bl GetMonData\n\
-    ldrh r1, [r6, 0x16]\n\
-    subs r0, r1\n\
-    strh r0, [r6, 0x18]\n\
-    movs r0, 0x1\n\
-    strh r0, [r6, 0x1C]\n\
-    ldr r1, _080701CC @ =0xfffff27e\n\
-    adds r0, r4, r1\n\
+_0806ECA0: .4byte gTasks\n\
+_0806ECA4: .4byte TaskDummy\n\
+_0806ECA8: .4byte 0x0201c000\n\
+_0806ECAC: .4byte gUnknown_0202E8F4\n\
+_0806ECB0: .4byte gSaveBlock1 + 0x2B4C\n\
+_0806ECB4: .4byte gOtherText_PokeHoldingItemCantMail\n\
+_0806ECB8: .4byte party_menu_link_mon_held_item_object\n\
+_0806ECBC:\n\
+    ldr r0, [r5]\n\
+    adds r1, r4, 0\n\
+    bl GiveMailToMon2\n\
+    adds r0, r4, 0\n\
+    bl ClearMailStruct\n\
+    ldr r0, _0806ECE0 @ =gOtherText_MailTransferredMailbox\n\
     movs r1, 0x1\n\
-    strh r1, [r0]\n\
-    ldr r2, _080701D0 @ =0xfffff280\n\
-    adds r0, r4, r2\n\
-    strh r1, [r0]\n\
-    ldrh r1, [r6, 0x16]\n\
-    adds r2, 0x2\n\
-    adds r0, r4, r2\n\
-    strh r1, [r0]\n\
-    ldr r0, _080701D4 @ =0xffff8000\n\
-    str r0, [r4, 0xC]\n\
-    ldr r1, [sp]\n\
-    add r1, r10\n\
-    ldr r0, _080701D8 @ =sub_806F8AC\n\
-    str r0, [r1]\n\
-_080701B0:\n\
-    add sp, 0x4\n\
-    pop {r3-r5}\n\
-    mov r8, r3\n\
-    mov r9, r4\n\
-    mov r10, r5\n\
-    pop {r4-r7}\n\
+    bl sub_806E834\n\
+    ldr r0, _0806ECE4 @ =party_menu_link_mon_held_item_object\n\
+    movs r1, 0x5\n\
+    bl CreateTask\n\
+_0806ECDA:\n\
+    pop {r4,r5}\n\
     pop {r0}\n\
     bx r0\n\
     .align 2, 0\n\
-_080701C0: .4byte gUnknown_0202E8F4\n\
-_080701C4: .4byte gUnknown_083769A8\n\
-_080701C8: .4byte 0xfffff261\n\
-_080701CC: .4byte 0xfffff27e\n\
-_080701D0: .4byte 0xfffff280\n\
-_080701D4: .4byte 0xffff8000\n\
-_080701D8: .4byte sub_806F8AC\n\
+_0806ECE0: .4byte gOtherText_MailTransferredMailbox\n\
+_0806ECE4: .4byte party_menu_link_mon_held_item_object\n\
     .syntax divided\n");
 }
-#endif
 
+void PartyMenuTryGiveMonHeldItem_806ECE8(u8 taskId, TaskFunc func)
+{
+    u16 currentItem;
+
+    gTasks[taskId].func = TaskDummy;
+    sub_806E8D0(taskId, 0, func);
+    currentItem = GetMonData(ewram1C000.pokemon, MON_DATA_HELD_ITEM);
+    if (currentItem == 0)
+    {
+        StringExpandPlaceholders(gStringVar4, gOtherText_NotHoldingAnything);
+        sub_806E834(gStringVar4, 0);
+        CreateTask(party_menu_link_mon_held_item_object, 5);
+    }
+    else
+    {
+        u8 itemData[2];
+
+        itemData[0] = 0;
+        itemData[1] = 0;
+        if (AddBagItem(currentItem, 1) == TRUE)
+        {
+            if (ItemIsMail(currentItem) == TRUE)
+                TakeMailFromMon(ewram1C000.pokemon);
+            DisplayTakeHeldItemMessage(ewram1C000.unk5, currentItem, 0);
+            SetMonData(ewram1C000.pokemon, MON_DATA_HELD_ITEM, itemData);
+        }
+        else
+        {
+            sub_806E834(gOtherText_BagFullCannotRemoveItem, 0);
+        }
+        CreateTask(party_menu_link_mon_held_item_object, 5);
+    }
+}
+
+void DisplayTakeHeldItemMessage(u8 a, u16 b, u8 c)
+{
+    GetMonNickname(&gPlayerParty[a], gStringVar1);
+    CopyItemName(b, gStringVar2);
+    StringExpandPlaceholders(gStringVar4, gOtherText_ReceivedTheThingFrom);
+    sub_806E834(gStringVar4, c);
+}
+
+void DoTakeMail(u8 taskId, TaskFunc func)
+{
+    gTasks[taskId].func = TaskDummy;
+    sub_806E8D0(taskId, 0, func);
+    ewram1C000.unk6 = GetMonData(ewram1C000.pokemon, MON_DATA_HELD_ITEM);
+    sub_806E834(gOtherText_SendRemovedMailPrompt, 1);
+    CreateTask(Task_ConfirmTakeHeldMail, 5);
+}
+
+void Task_LoseMailMessage(u8 taskId)
+{
+    s8 selection = ProcessMenuInputNoWrap_();
+
+    if (selection == 0)
+    {
+        if (AddBagItem(ewram1C000.unk6, 1) == TRUE)
+        {
+            TakeMailFromMon(ewram1C000.pokemon);
+            sub_806E834(gOtherText_MailTaken, 0);
+        }
+        else
+        {
+            sub_806E834(gOtherText_BagFullCannotRemoveItem, 0);
+        }
+        MenuZeroFillWindowRect(23, 8, 29, 13);
+        gTasks[taskId].func = party_menu_link_mon_held_item_object;
+    }
+    else
+    {
+        if (selection != 1 && selection != -1)
+            return;
+        if (selection == -1)
+            PlaySE(SE_SELECT);
+        MenuZeroFillWindowRect(23, 8, 29, 13);
+        MenuZeroFillWindowRect(0, 14, 29, 19);
+        gTasks[taskId].func = party_menu_link_mon_held_item_object;
+    }
+}
+
+void Task_ConfirmLoseMailMessage(u8 taskId)
+{
+    if (gUnknown_0202E8F6 == 0)
+    {
+        DisplayYesNoMenu(23, 8, 1);
+        gTasks[taskId].func = Task_LoseMailMessage;
+    }
+}
+
+void Task_TakeHeldMail(u8 taskId)
+{
+    s8 selection = ProcessMenuInputNoWrap_();
+
+    if (selection == 0)
+    {
+        MenuZeroFillWindowRect(23, 8, 29, 13);
+        if (TakeMailFromMon2(ewram1C000.pokemon) != 0xFF)
+            sub_806E834(gOtherText_MailWasSent, 0);
+        else
+            sub_806E834(gOtherText_MailboxIsFull, 0);
+        gTasks[taskId].func = party_menu_link_mon_held_item_object;
+    }
+    else
+    {
+        if (selection != 1 && selection != -1)
+            return;
+        if (selection == -1)
+            PlaySE(SE_SELECT);
+        MenuZeroFillWindowRect(23, 8, 29, 13);
+        sub_806E834(gOtherText_MailRemovedMessageLost, 1);
+        gTasks[taskId].func = Task_ConfirmLoseMailMessage;
+    }
+}
+
+void Task_ConfirmTakeHeldMail(u8 taskId)
+{
+    if (gUnknown_0202E8F6 == 0)
+    {
+        DisplayYesNoMenu(23, 8, 1);
+        gTasks[taskId].func = Task_TakeHeldMail;
+    }
+}
+
+u16 ItemIdToBattleMoveId(u16 item)
+{
+    u16 moveId = item - 289;
 
-asm(".section .text_c");
+    return gUnknown_08376504[moveId];
+}
+
+bool8 pokemon_has_move(struct Pokemon *pkmn, u16 move)
+{
+    u8 i;
+
+    for (i = 0; i < 4; i++)
+    {
+        if (GetMonData(pkmn, MON_DATA_MOVE1 + i) == move)
+            return TRUE;
+    }
+    return FALSE;
+}
+
+void TeachMonTMMove(u8 taskId, u16 move, TaskFunc func)
+{
+    PlaySE(SE_SELECT);
+    gTasks[taskId].func = TaskDummy;
+    sub_806E8D0(taskId, move, func);
+    CreateTask(Task_TeamMonTMMove, 5);
+}
+
+void Task_TeamMonTMMove(u8 taskId)
+{
+    GetMonNickname(ewram1C000.pokemon, gStringVar1);
+    ewram1C000.unk8 = ItemIdToBattleMoveId(ewram1C000.unk6);
+    StringCopy(gStringVar2, gMoveNames[ewram1C000.unk8]);
+    ewram1B000.unk282 = 0;
+    if (pokemon_has_move(ewram1C000.pokemon, ewram1C000.unk8))
+    {
+        StringExpandPlaceholders(gStringVar4, gOtherText_AlreadyKnows);
+        sub_806E834(gStringVar4, 1);
+        gTasks[taskId].func = party_menu_link_mon_held_item_object;
+    }
+    else
+    {
+        if (!CanMonLearnTMHM(ewram1C000.pokemon, ewram1C000.unk6 - 33))
+        {
+            StringExpandPlaceholders(gStringVar4, gOtherText_NotCompatible);
+            sub_806E834(gStringVar4, 1);
+            gTasks[taskId].func = party_menu_link_mon_held_item_object;
+        }
+        else
+        {
+            if (GiveMoveToMon(ewram1C000.pokemon, ewram1C000.unk8) != 0xFFFF)
+            {
+                Task_TeamMonTMMove2(taskId);
+            }
+            else
+            {
+                StringExpandPlaceholders(gStringVar4, gOtherText_WantsToLearn);
+                sub_806E834(gStringVar4, 1);
+                gTasks[taskId].func = sub_806F358;
+            }
+        }
+    }
+}
+
+void Task_TeamMonTMMove2(u8 taskId)
+{
+    StringCopy(gStringVar2, gMoveNames[ewram1C000.unk8]);
+    StringExpandPlaceholders(gStringVar4, gOtherText_LearnedMove);
+    sub_806E834(gStringVar4, 1);
+    AdjustFriendship(ewram1C000.pokemon, 4);
+    if (ewram1B000.unk282 == 0 && ewram1C000.unk6 <= 0x152)
+        RemoveBagItem(ewram1C000.unk6, 1);
+    gTasks[taskId].func = Task_TeamMonTMMove3;
+}
+
+void Task_TeamMonTMMove3(u8 taskId)
+{
+    if (gUnknown_0202E8F6 == 0)
+    {
+        PlayFanfare(BGM_FANFA1);
+        gTasks[taskId].func = Task_TeamMonTMMove4;
+    }
+}
+
+void Task_TeamMonTMMove4(u8 taskId)
+{
+    if (IsFanfareTaskInactive())
+    {
+        if ((gMain.newKeys & A_BUTTON) || (gMain.newKeys & B_BUTTON))
+        {
+            SetHeldItemIconVisibility(ewram1C000.unk4, ewram1C000.unk5);
+            if (ewram1B000.unk282 == 1)
+            {
+                sub_8070C54(taskId);
+            }
+            else
+            {
+                gTasks[ewram1C000.unk4].func = ewram1C000.unk10;
+                DestroyTask(taskId);
+            }
+        }
+    }
+}
+
+void sub_806F2FC(u8 taskId)
+{
+    if (gUnknown_0202E8F6 == 0)
+    {
+        SetHeldItemIconVisibility(ewram1C000.unk4, ewram1C000.unk5);
+        if (ewram1B000.unk282 == 1)
+        {
+            sub_8070C54(taskId);
+        }
+        else
+        {
+            gTasks[ewram1C000.unk4].func = ewram1C000.unk10;
+            DestroyTask(taskId);
+        }
+    }
+}
+
+void sub_806F358(u8 taskId)
+{
+    if (gUnknown_0202E8F6 == 0)
+    {
+        DisplayYesNoMenu(23, 8, 1);
+        gTasks[taskId].func = sub_806F390;
+    }
+}
+
+void sub_806F390(u8 taskId)
+{
+    s8 selection = ProcessMenuInputNoWrap_();
+
+    if (selection == 0)
+    {
+        MenuZeroFillWindowRect(23, 8, 29, 13);
+        sub_806E834(gOtherText_WhichMoveToForget2, 1);
+        gTasks[taskId].func = sub_806F44C;
+    }
+    else
+    {
+        if (selection != 1 && selection != -1)
+            return;
+        if (selection == -1)
+            PlaySE(SE_SELECT);
+        StopTryingToTeachMove_806F614(taskId);
+    }
+}
+
+void sub_806F3FC(u8 taskId)
+{
+    if (!gPaletteFade.active)
+    {
+        sub_809D9F0(gPlayerParty, ewram1C000.unk5, gPlayerPartyCount - 1, sub_808B564, ewram1C000.unk8);
+        DestroyTask(taskId);
+    }
+}
+
+void sub_806F44C(u8 taskId)
+{
+    if (gUnknown_0202E8F6 == 0)
+    {
+        BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0);
+        gTasks[taskId].func = sub_806F3FC;
+    }
+}
+
+void TaughtMove(u8 taskId)
+{
+    if (!gPaletteFade.active)
+    {
+        u8 moveIndex;
+        u16 r4;
+
+        gTasks[taskId].func = TaskDummy;
+        sub_806E8D0(taskId, gScriptItemId, sub_808B508);
+        moveIndex = sub_809FA30();
+        r4 = GetMonData(ewram1C000.pokemon, MON_DATA_MOVE1 + moveIndex);
+        GetMonNickname(ewram1C000.pokemon, gStringVar1);
+        StringCopy(gStringVar2, gMoveNames[r4]);
+        StringExpandPlaceholders(gStringVar4, gOtherText_ForgetMove123_2);
+        sub_806E834(gStringVar4, 1);
+        CreateTask(TMMoveUpdateMoveSlot, 5);
+    }
+}
+
+void TMMoveUpdateMoveSlot(u8 taskId)
+{
+    if (gUnknown_0202E8F6 == 0)
+    {
+        RemoveMonPPBonus(ewram1C000.pokemon, sub_809FA30());
+        SetMonMoveSlot(ewram1C000.pokemon, ewram1C000.unk8, sub_809FA30());
+        Task_TeamMonTMMove2(taskId);
+    }
+}
+
+void StopTryingToTeachMove_806F588(u8 taskId)
+{
+    if (!gPaletteFade.active)
+    {
+        gTasks[taskId].func = TaskDummy;
+        sub_806E8D0(taskId, gScriptItemId, sub_808B508);
+        StringCopy(gStringVar2, gMoveNames[ewram1C000.unk8]);
+        StringExpandPlaceholders(gStringVar4, gOtherText_StopTryingTo);
+        sub_806E834(gStringVar4, 1);
+        CreateTask(StopTryingToTeachMove_806F67C, 5);
+    }
+}
+
+void StopTryingToTeachMove_806F614(u8 taskId)
+{
+    MenuZeroFillWindowRect(23, 8, 29, 13);
+    StringCopy(gStringVar2, gMoveNames[ewram1C000.unk8]);
+    StringExpandPlaceholders(gStringVar4, gOtherText_StopTryingTo);
+    sub_806E834(gStringVar4, 1);
+    gTasks[taskId].func = StopTryingToTeachMove_806F67C;
+}
+
+void StopTryingToTeachMove_806F67C(u8 taskId)
+{
+    if (gUnknown_0202E8F6 == 0)
+    {
+        DisplayYesNoMenu(23, 8, 1);
+        gTasks[taskId].func = StopTryingToTeachMove_806F6B4;
+    }
+}
+
+void StopTryingToTeachMove_806F6B4(u8 taskId)
+{
+    s8 selection = ProcessMenuInputNoWrap_();
+
+    if (selection == 0)
+    {
+        MenuZeroFillWindowRect(23, 8, 29, 13);
+        GetMonNickname(ewram1C000.pokemon, gStringVar1);
+        StringCopy(gStringVar2, gMoveNames[ewram1C000.unk8]);
+        StringExpandPlaceholders(gStringVar4, gOtherText_DidNotLearnMove2);
+        sub_806E834(gStringVar4, 1);
+        gTasks[taskId].func = sub_806F2FC;
+    }
+    else
+    {
+        if (selection != 1 && selection != -1)
+            return;
+        if (selection == -1)
+            PlaySE(SE_SELECT);
+        MenuZeroFillWindowRect(23, 8, 29, 13);
+        GetMonNickname(ewram1C000.pokemon, gStringVar1);
+        StringCopy(gStringVar2, gMoveNames[ewram1C000.unk8]);
+        StringExpandPlaceholders(gStringVar4, gOtherText_WantsToLearn);
+        sub_806E834(gStringVar4, 1);
+        gTasks[taskId].func = sub_806F358;
+    }
+}
+
+bool8 IsHMMove(u16 move)
+{
+    u8 i;
+
+    for (i = 0; i < 8; i++)
+    {
+        if (gUnknown_08376504[50 + i] == move)
+            return TRUE;
+    }
+    return FALSE;
+}
+
+s16 sub_806F7E8(u8 taskId, struct BattleInterfaceStruct1 *b, s8 c)
+{
+    s16 *taskData;
+    u8 hpBarLevel;
+    void *vramPtr;
+
+    taskData = gTasks[taskId].data;
+
+    b->unk0 = taskData[10];
+    b->unk4 = taskData[11];
+    b->unk8 = taskData[12] * c;
+    b->unk10 = 0x100;
+    hpBarLevel = GetHPBarLevel(ewram1B000.unk282, b->unk0);
+    if (hpBarLevel > 2)
+        b->unkC_0 = 4;
+    if (hpBarLevel == 2)
+        b->unkC_0 = 5;
+    if (hpBarLevel < 2)
+        b->unkC_0 = 6;
+    vramPtr = gUnknown_08376858[IsDoubleBattle()][ewram1C000.unk5];
+    return sub_80460C8(b, &ewram1C000.unkC, vramPtr, 0);
+}
+
+void sub_806F8AC(u8 taskId)
+{
+    struct BattleInterfaceStruct1 sp0;
+    u16 sp14;
+
+    ewram1B000.unk282 = sub_806F7E8(taskId, &sp0, -1);
+    if (ewram1B000.unk282 == -1)
+    {
+        ewram1C000.unkC = 0;
+        if (-sp0.unk8 + sp0.unk4 > sp0.unk0)
+            sp14 = sp0.unk0 - sp0.unk4;
+        else
+            sp14 = -sp0.unk8;
+        gBattleMoveDamage = -sp14;
+        GetMonNickname(ewram1C000.pokemon, gStringVar1);
+        ConvertIntToDecimalStringN(gStringVar2, sp14, 0, 3);
+        if (gTasks[taskId].data[14] == 0)
+            StringExpandPlaceholders(gStringVar4, gOtherText_HPRestoredBy);
+        else
+            StringExpandPlaceholders(gStringVar4, gOtherText_RegainedHealth);
+        SetMonIconAnim(GetMonIconSpriteId_maybe(ewram1C000.unk4, ewram1C000.unk5), ewram1C000.pokemon);
+        task_pc_turn_off(&gUnknown_083769A8[IsDoubleBattle() * 12 + ewram1C000.unk5 * 2], 7);
+        ewram1B000.unk261 = 2;
+        sub_806E834(gStringVar4, 1);
+        sp14 += sp0.unk4;
+        SetMonData(ewram1C000.pokemon, MON_DATA_HP, (u8 *)&sp14);
+        RemoveBagItem(ewram1C000.unk6, 1);
+        sub_8032638();
+        gTasks[taskId].func = sub_806FB44;
+    }
+    else
+    {
+        PartyMenuDoPrintHP(ewram1C000.unk5, IsDoubleBattle(), ewram1B000.unk282, sp0.unk0);
+    }
+}
+
+void sub_806FA18(u8 taskId)
+{
+    struct BattleInterfaceStruct1 sp0;
+
+    ewram1B000.unk282 = sub_806F7E8(taskId, &sp0, 1);
+    if (ewram1B000.unk282 == -1)
+    {
+        PlaySE(SE_KAIFUKU);
+        ewram1C000.unkC = 0;
+        gTasks[taskId].data[11] -= gTasks[taskId].data[12];
+        SetMonData(ewram1C000.pokemon, MON_DATA_HP, (u8 *)&gTasks[taskId].data[11]);
+        SetMonIconAnim(GetMonIconSpriteId_maybe(ewram1C000.unk4, ewram01000.unk1), ewram1C000.pokemon);
+        ewram1C000.unk5 = gSprites[ewram01000.unk2].data0;
+        ewram1C000.pokemon = &gPlayerParty[ewram1C000.unk5];
+        gTasks[taskId].data[10] = GetMonData(ewram1C000.pokemon, MON_DATA_MAX_HP);
+        gTasks[taskId].data[11] = GetMonData(ewram1C000.pokemon, MON_DATA_HP);
+        ewram1C000.unkC = -32768;
+        ewram1C000.unk14 = ewram1C000.unk10;
+        gTasks[taskId].func = sub_806F8AC;
+        ewram1B000.unk282 = gTasks[taskId].data[11];
+    }
+    else
+    {
+        PartyMenuDoPrintHP(ewram1C000.unk5, IsDoubleBattle(), ewram1B000.unk282, sp0.unk0);
+    }
+}
+
+void sub_806FB0C(u8 taskId)
+{
+    if (gUnknown_0202E8F6 == 0)
+    {
+        gTasks[ewram1C000.unk4].func = ewram1C000.unk10;
+        DestroyTask(taskId);
+    }
+}
+
+void sub_806FB44(u8 taskId)
+{
+    if (gUnknown_0202E8F6 == 0)
+    {
+        gTasks[ewram1C000.unk4].func = ewram1C000.unk14;
+        DestroyTask(taskId);
+    }
+}
+
+bool8 IsHPRecoveryItem(u16 item)
+{
+    const u8 *itemEffect;
+
+    if (item == 0xAF)
+        itemEffect = gSaveBlock1.enigmaBerry.itemEffect;
+    else
+        itemEffect = gItemEffectTable[item - 13];
+
+    if (itemEffect[4] & 4)
+        return TRUE;
+    else
+        return FALSE;
+}
+
+void PartyMenuUpdateLevelOrStatus(struct Pokemon *pkmn, u8 b)
+{
+    PartyMenuClearLevelStatusTilemap(b);
+    PartyMenuPrintMonLevelOrStatus(b, pkmn);
+}
+
+void GetMedicineItemEffectMessage(u16 item)
+{
+    switch (GetItemEffectType(item))
+    {
+        case 3:
+            StringExpandPlaceholders(gStringVar4, gOtherText_CuredPoisoning);
+            break;
+        case 4:
+            StringExpandPlaceholders(gStringVar4, gOtherText_WokeUp);
+            break;
+        case 5:
+            StringExpandPlaceholders(gStringVar4, gOtherText_BurnHealed);
+            break;
+        case 6:
+            StringExpandPlaceholders(gStringVar4, gOtherText_ThawedOut);
+            break;
+        case 7:
+            StringExpandPlaceholders(gStringVar4, gOtherText_CuredParalysis);
+            break;
+        case 8:
+            StringExpandPlaceholders(gStringVar4, gOtherText_SnapConfusion);
+            break;
+        case 9:
+            StringExpandPlaceholders(gStringVar4, gOtherText_GotOverLove);
+            break;
+        case 11:
+            StringExpandPlaceholders(gStringVar4, gOtherText_BecameHealthy);
+            break;
+        case 13:
+            StringCopy(gStringVar2, gOtherText_Hp2);
+            StringExpandPlaceholders(gStringVar4, gOtherText_WasRaised);
+            break;
+        case 12:
+            StringCopy(gStringVar2, gOtherText_Attack);
+            StringExpandPlaceholders(gStringVar4, gOtherText_WasRaised);
+            break;
+        case 17:
+            StringCopy(gStringVar2, gOtherText_Defense);
+            StringExpandPlaceholders(gStringVar4, gOtherText_WasRaised);
+            break;
+        case 16:
+            StringCopy(gStringVar2, gOtherText_Speed);
+            StringExpandPlaceholders(gStringVar4, gOtherText_WasRaised);
+            break;
+        case 14:
+            StringCopy(gStringVar2, gOtherText_SpAtk2);
+            StringExpandPlaceholders(gStringVar4, gOtherText_WasRaised);
+            break;
+        case 15:
+            StringCopy(gStringVar2, gOtherText_SpDef2);
+            StringExpandPlaceholders(gStringVar4, gOtherText_WasRaised);
+            break;
+        case 19:
+        case 20:
+            StringExpandPlaceholders(gStringVar4, gOtherText_PPIncreased);
+            break;
+        case 21:
+            StringExpandPlaceholders(gStringVar4, gOtherText_PPRestored);
+            break;
+        default:
+            StringExpandPlaceholders(gStringVar4, gOtherText_WontHaveAnyEffect);
+            break;
+    }
+}
+
+bool8 IsMedicineIneffective(struct Pokemon *pkmn, u16 item)
+{
+    if (GetItemEffectType(item) == 13
+     && GetMonData(pkmn, MON_DATA_SPECIES) == SPECIES_SHEDINJA)
+        return TRUE;
+    else
+        return FALSE;
+}
+
+bool8 ExecuteTableBasedItemEffect__(u8 a, u16 b, u8 c)
+{
+    if (gMain.inBattle)
+        return ExecuteTableBasedItemEffect_(&gPlayerParty[a], b, sub_8094C20(a), c);
+    else
+        return ExecuteTableBasedItemEffect_(&gPlayerParty[a], b, a, c);
+}
+
+void UseMedicine(u8 taskId, u16 item, TaskFunc func)
+{
+    u8 r7;
+    bool8 r9 = FALSE;
+    bool8 r0;
+
+    gTasks[taskId].func = TaskDummy;
+    r7 = CreateTask(TaskDummy, 5);
+    sub_806E8D0(taskId, item, func);
+    if (!IsMedicineIneffective(ewram1C000.pokemon, item))
+    {
+        r9 = IsHPRecoveryItem(item);
+        if (r9 == TRUE)
+        {
+            gTasks[r7].data[10] = GetMonData(ewram1C000.pokemon, MON_DATA_MAX_HP);
+            gTasks[r7].data[11] = GetMonData(ewram1C000.pokemon, MON_DATA_HP);
+            if (gTasks[r7].data[10] == gTasks[r7].data[11])
+            {
+                r9 = FALSE;
+                gTasks[r7].data[10] = 0;
+                gTasks[r7].data[11] = 0;
+            }
+        }
+        r0 = ExecuteTableBasedItemEffect__(ewram1C000.unk5, item, 0);
+    }
+    else
+    {
+        r0 = TRUE;
+    }
+
+    if (r0)
+    {
+        gUnknown_0202E8F4 = 0;
+        PlaySE(SE_SELECT);
+        sub_806E834(gOtherText_WontHaveAnyEffect, 1);
+        gTasks[r7].func = sub_806FB0C;
+    }
+    else
+    {
+        u8 statusAndPkrs;
+
+        gUnknown_0202E8F4 = 1;
+        if (!IsBlueYellowRedFlute(item))
+            PlaySE(SE_KAIFUKU);
+        else
+            PlaySE(SE_BIDORO);
+        statusAndPkrs = GetMonStatusAndPokerus(ewram1C000.pokemon);
+        if (statusAndPkrs == 6 || statusAndPkrs == 0)
+            PartyMenuUpdateLevelOrStatus(ewram1C000.pokemon, ewram1C000.unk5);
+        if (r9 == TRUE)
+        {
+            gTasks[r7].data[12] = GetMonData(ewram1C000.pokemon, MON_DATA_HP) - gTasks[r7].data[11];
+            ewram1C000.unkC = -32768;
+            if (gTasks[r7].data[11] == 0)
+                gTasks[r7].data[14] = 1;
+            else
+                gTasks[r7].data[14] = 0;
+            ewram1C000.unk14 = ewram1C000.unk10;
+            gTasks[r7].func = sub_806F8AC;
+            ewram1B000.unk282 = gTasks[r7].data[11];
+        }
+        else
+        {
+            GetMonNickname(ewram1C000.pokemon, gStringVar1);
+            if (!IsBlueYellowRedFlute(item))
+                RemoveBagItem(item, 1);
+            GetMedicineItemEffectMessage(item);
+            TryPrintPartyMenuMonNickname(ewram1C000.unk5, ewram1C000.pokemon);
+            sub_806E834(gStringVar4, 1);
+            gTasks[r7].func = sub_806FB0C;
+        }
+    }
+}
+
+bool8 IsBlueYellowRedFlute(u16 item)
+{
+    if (item == 0x27
+     || item == 0x29
+     || item == 0x28)
+        return TRUE;
+    else
+        return FALSE;
+}
+
+void sub_8070048(u8 taskId, u16 item, TaskFunc func)
+{
+    ewram1C000.unk10 = func;
+    ewram1C000.unk4 = taskId;
+    ewram1C000.unk6 = item;
+    ewram1C000.unk5 = 0;
+    ewram1C000.unk14 = sub_80701DC;
+    ewram1B000.unk27E = 0;
+    ewram1B000.unk280 = 0;
+    sub_8070088(taskId);
+}
+
+void sub_8070088(u8 taskId)
+{
+    u8 taskId2;
+
+    gTasks[taskId].func = TaskDummy;
+    if (GetMonData(&gPlayerParty[ewram1C000.unk5], MON_DATA_SPECIES) == 0)
+    {
+        gTasks[taskId].func = sub_80701DC;
+    }
+    else
+    {
+        s16 *taskData;
+
+        taskId2 = CreateTask(TaskDummy, 5);
+        taskData = gTasks[taskId2].data;
+        ewram1C000.pokemon = &gPlayerParty[ewram1C000.unk5];
+        taskData[10] = GetMonData(ewram1C000.pokemon, MON_DATA_MAX_HP);
+        taskData[11] = GetMonData(ewram1C000.pokemon, MON_DATA_HP);
+        if (ExecuteTableBasedItemEffect__(ewram1C000.unk5, ewram1C000.unk6, 0))
+        {
+            DestroyTask(taskId2);
+            gTasks[taskId].func = sub_80701DC;
+        }
+        else
+        {
+            gUnknown_0202E8F4 = 1;
+            MenuZeroFillWindowRect(3, 14, 26, 19);
+            PlaySE(SE_KAIFUKU);
+            PartyMenuUpdateLevelOrStatus(ewram1C000.pokemon, ewram1C000.unk5);
+            task_pc_turn_off(&gUnknown_083769A8[IsDoubleBattle() * 12 + ewram1C000.unk5 * 2], 9);
+            ewram1B000.unk261 = 2;
+            taskData[12] = GetMonData(ewram1C000.pokemon, MON_DATA_HP) - taskData[11];
+            taskData[14] = 1;
+            ewram1B000.unk27E = 1;
+            ewram1B000.unk280 = 1;
+            ewram1B000.unk282 = taskData[11];
+            ewram1C000.unkC = -32768;
+            gTasks[taskId2].func = sub_806F8AC;
+        }
+    }
+}
+
+void sub_80701DC(u8 taskId)
+{
+    if (ewram1B000.unk27E == 1)
+    {
+        AddBagItem(ewram1C000.unk6, 1);
+        if (GetMonData(&gPlayerParty[ewram1C000.unk5], MON_DATA_SPECIES) != 0)
+        {
+            task_pc_turn_off(&gUnknown_083769A8[IsDoubleBattle() * 12 + ewram1C000.unk5 * 2], 3);
+            ewram1B000.unk261 = 2;
+        }
+        ewram1B000.unk27E = 0;
+    }
+    ewram1C000.unk5++;
+    if (ewram1C000.unk5 == 6)
+    {
+        gUnknown_0202E8F4 = 0;
+        if (ewram1B000.unk280 == 0)
+        {
+            gTasks[taskId].func = TaskDummy;
+            sub_806E834(gOtherText_WontHaveAnyEffect, 1);
+            CreateTask(sub_806FB0C, 8);
+        }
+        else
+        {
+            RemoveBagItem(ewram1C000.unk6, 1);
+            gTasks[taskId].func = ewram1C000.unk10;
+        }
+        gLastFieldPokeMenuOpened = 0;
+    }
+    else
+    {
+        sub_8070088(taskId);
+    }
+}
+
+void CreateItemUseMoveMenu(u8 partyMonIndex)
+{
+    u8 r6;
+    u8 i;
+
+    r6 = 0;
+    MenuDrawTextWindow(19, 10, 29, 19);
+    for (i = 0; i < 4; i++)
+    {
+        u16 move = GetMonData(&gPlayerParty[partyMonIndex], MON_DATA_MOVE1 + i);
+
+        MenuPrint(gMoveNames[move], 20, i * 2 + 11);
+        if (move != 0)
+            r6++;
+    }
+    InitMenu(0, 20, 11, r6, 0, 9);
+}
+
+void Task_HandleItemUseMoveMenuInput(u8 taskId)
+{
+    if (gMain.newKeys & DPAD_UP)
+    {
+        PlaySE(SE_SELECT);
+        MoveMenuCursor(-1);
+    }
+    else if (gMain.newKeys & DPAD_DOWN)
+    {
+        PlaySE(SE_SELECT);
+        MoveMenuCursor(1);
+    }
+    else if (gMain.newKeys & A_BUTTON)
+    {
+        gUnknown_08376B54[0](taskId);
+    }
+    else if (gMain.newKeys & B_BUTTON)
+    {
+        PlaySE(SE_SELECT);
+        gUnknown_08376B54[1](taskId);
+    }
+}
+
+void DoPPRecoveryItemEffect(u8 taskId, u16 b, TaskFunc c)
+{
+    const u8 *itemEffect;
+    u8 taskId2;
+
+    if (b == 0xAF)
+        itemEffect = gSaveBlock1.enigmaBerry.itemEffect;
+    else
+        itemEffect = gItemEffectTable[b - 13];
+    gTasks[taskId].func = TaskDummy;
+    taskId2 = CreateTask(TaskDummy, 5);
+    sub_806E8D0(taskId, b, c);
+    if (!(itemEffect[4] & 0x10))
+    {
+        gTasks[taskId2].data[11] = 0;
+        DoRecoverPP(taskId2);
+    }
+    else
+    {
+        PlaySE(SE_SELECT);
+        sub_806D538(10, 3);
+        CreateItemUseMoveMenu(ewram1C000.unk5);
+        gTasks[taskId2].func = Task_HandleItemUseMoveMenuInput;
+        gMain.newKeys = 0;
+    }
+}
+
+void ItemUseMoveMenu_HandleMoveSelection(u8 taskId)
+{
+    sub_8072DEC();
+    MenuZeroFillWindowRect(19, 10, 29, 19);
+    sub_806D5A4();
+    gTasks[taskId].data[11] = GetMenuCursorPos();
+    DoRecoverPP(taskId);
+}
+
+void ItemUseMoveMenu_HandleCancel(u8 taskId)
+{
+    sub_8072DEC();
+    MenuZeroFillWindowRect(19, 10, 29, 19);
+    if (gMain.inBattle)
+        gTasks[ewram1C000.unk4].func = SetUpBattlePokemonMenu;
+    else
+        gTasks[ewram1C000.unk4].func = sub_808B0C0;
+    sub_806D538(3, 0);
+    DestroyTask(taskId);
+}
+
+void DoRecoverPP(u8 taskId)
+{
+    u16 r5 = 0;
+
+    if (ExecuteTableBasedItemEffect__(ewram1C000.unk5, ewram1C000.unk6, gTasks[taskId].data[11]))
+    {
+        gUnknown_0202E8F4 = r5;
+        PlaySE(SE_SELECT);
+        sub_806E834(gOtherText_WontHaveAnyEffect, 1);
+    }
+    else
+    {
+        gUnknown_0202E8F4 = 1;
+        PlaySE(SE_KAIFUKU);
+        RemoveBagItem(ewram1C000.unk6, 1);
+        r5 = GetMonData(ewram1C000.pokemon, MON_DATA_MOVE1 + gTasks[taskId].data[11]);
+        StringCopy(gStringVar1, gMoveNames[r5]);
+        GetMedicineItemEffectMessage(ewram1C000.unk6);
+        sub_806E834(gStringVar4, 1);
+    }
+    gTasks[taskId].func = sub_806FB0C;
+}
+
+void DoPPUpItemEffect(u8 taskId, u16 b, TaskFunc c)
+{
+    gTasks[taskId].func = TaskDummy;
+    sub_806E8D0(taskId, b, c);
+    PlaySE(SE_SELECT);
+    sub_806D538(11, 3);
+    CreateItemUseMoveMenu(ewram1C000.unk5);
+    CreateTask(Task_HandleItemUseMoveMenuInput, 5);
+    gMain.newKeys = 0;
+}
+
+void DoRareCandyItemEffect(u8 taskId, u16 b, TaskFunc c)
+{
+    u8 i;
+    bool8 r0;
+
+    gTasks[taskId].func = TaskDummy;
+    sub_806E8D0(taskId, b, c);
+
+    if (GetMonData(ewram1C000.pokemon, MON_DATA_LEVEL) != 100)
+    {
+        for (i = 0; i < 6; i++)
+            ewram1B000.unk264[i] = GetMonData(ewram1C000.pokemon, gUnknown_08376D1C[i]);
+        r0 = ExecuteTableBasedItemEffect__(ewram1C000.unk5, b, 0);
+    }
+    else
+        r0 = TRUE;
+
+    if (r0)
+    {
+        gUnknown_0202E8F4 = 0;
+        PlaySE(SE_SELECT);
+        sub_806E834(gOtherText_WontHaveAnyEffect, 1);
+        CreateTask(sub_806FB0C, 5);
+    }
+    else
+    {
+        u8 level;
+
+        gUnknown_0202E8F4 = 1;
+        PlayFanfareByFanfareNum(0);
+        sub_8070A20(ewram1C000.unk5, ewram1C000.pokemon);
+        RemoveBagItem(b, 1);
+        GetMonNickname(ewram1C000.pokemon, gStringVar1);
+        level = GetMonData(ewram1C000.pokemon, MON_DATA_LEVEL);
+        ConvertIntToDecimalStringN(gStringVar2, level, 0, 3);
+        StringExpandPlaceholders(gStringVar4, gOtherText_ElevatedTo);
+        sub_806E834(gStringVar4, 1);
+        CreateTask(Task_RareCandy1, 5);
+    }
+}
+
+void Task_RareCandy1(u8 taskId)
+{
+    if (WaitFanfare(0) && gUnknown_0202E8F6 == 0)
+    {
+        if ((gMain.newKeys & A_BUTTON) || (gMain.newKeys & B_BUTTON))
+        {
+            PlaySE(SE_SELECT);
+            sub_8070848(taskId);
+            gTasks[taskId].func = Task_RareCandy2;
+        }
+    }
+}
+
+void Task_RareCandy2(u8 taskId)
+{
+    if ((gMain.newKeys & A_BUTTON) || (gMain.newKeys & B_BUTTON))
+    {
+        PlaySE(SE_SELECT);
+        sub_8070968(taskId);
+        gTasks[taskId].func = Task_RareCandy3;
+    }
+}
 
 void sub_8070848(u8 taskId)
 {
@@ -296,35 +1457,27 @@ void sub_8070848(u8 taskId)
         u8 x;
         u8 y;
         u32 stat;
-        struct Pokemon **pokemon;
 
-        pokemon = &unk_201C000.pokemon;
-        asm("" ::: "r0");
-        stat = GetMonData(*pokemon, gUnknown_08376D1C[i]);
+        stat = GetMonData(ewram1C000.pokemon, gUnknown_08376D1C[i]);
 
-        unk_201B260.var04[i + DATA_COUNT] = stat;
-        unk_201B260.var04[i] = stat - unk_201B260.var04[i];
+        ewram1B000.unk264[i + DATA_COUNT] = stat;
+        ewram1B000.unk264[i] = stat - ewram1B000.unk264[i];
 
         x = (i / 3) * 9 + 11;
         y = ((i % 3) << 1) + 1;
 
         MenuPrint_PixelCoords(gUnknown_08376D04[i], (x + 1) * 8, y * 8, 1);
 
-
         if (i == 2)
-        {
             MenuPrint_PixelCoords(gOtherText_TallPlusAndRightArrow, (x + 6) * 8 + 6, y * 8, 0);
-        }
         else
-        {
             MenuPrint_PixelCoords(gOtherText_TallPlusAndRightArrow, (x + 6) * 8 + 6, y * 8, 1);
-        }
 
-        gStringVar1[0] = 0xFC;
+        gStringVar1[0] = EXT_CTRL_CODE_BEGIN;
         gStringVar1[1] = 0x14;
         gStringVar1[2] = 0x06;
 
-        ConvertIntToDecimalStringN(gStringVar1 + 3, unk_201B260.var04[i], 1, 2);
+        ConvertIntToDecimalStringN(gStringVar1 + 3, ewram1B000.unk264[i], 1, 2);
 
         MenuPrint_PixelCoords(gStringVar1, (x + 6) * 8 + 12, y * 8, 0);
     }
diff --git a/src/record_mixing.c b/src/record_mixing.c
index ddf9a5376..58722010f 100644
--- a/src/record_mixing.c
+++ b/src/record_mixing.c
@@ -23,7 +23,7 @@ extern u8 gUnknown_083D0288[2];
 extern u8 gUnknown_083D028A[2][3];
 extern u8 gUnknown_083D0290[9][4];
 
-extern u8 gUnknown_02038738[];  //Don't know what type this points to
+extern struct RecordMixing_UnknownStruct gUnknown_02038738[2];  //Don't know what type this points to
 extern u16 gSpecialVar_0x8005;
 extern u32 gUnknown_03005D2C;
 extern u8 gUnknown_03000718;
@@ -36,7 +36,7 @@ extern bool8 gReceivedRemoteLinkPlayers;
 
 void sub_80B929C(void)
 {
-    sub_8083A84(sub_80B9484);
+    sub_8083A84(Task_RecordMixing_Main);
 }
 
 struct PlayerRecords {
@@ -53,8 +53,10 @@ struct PlayerRecords {
 extern struct PlayerRecords unk_2008000;
 extern struct PlayerRecords unk_2018000;
 
-#ifdef NONMATCHING
-void sub_80B92AC(void)
+void sub_80BC300();
+void sub_80C045C();
+
+void RecordMixing_PrepareExchangePacket(void)
 {
     sub_80BC300();
     sub_80C045C();
@@ -64,125 +66,17 @@ void sub_80B92AC(void)
     memcpy(unk_2018000.filler1004, gUnknown_083D0274, 0x40);
     memcpy(unk_2018000.filler1044, gUnknown_083D0278, 0x40);
     memcpy(unk_2018000.easyChatPairs, recordMixingEasyChatPairs, 0x28);
-    memcpy(gUnknown_02038738, gSaveBlock1.filler_303C, 0x38);
-    memcpy(gUnknown_02038738 + 0x38, gSaveBlock1.filler_3074, 0x38);
-    sub_8041324(gSaveBlock1.filler_2F9C, gUnknown_02038738);
+    gUnknown_02038738[0] = gSaveBlock1.filler_303C[0];
+    gUnknown_02038738[1] = gSaveBlock1.filler_303C[1];
+    sub_8041324(gSaveBlock1.daycareData, gUnknown_02038738);
     memcpy(unk_2018000.filler10AC, gUnknown_083D0280, 0x78);
     memcpy(unk_2018000.filler1124, gUnknown_083D0284, 0xA4);
 
     if (GetMultiplayerId() == 0)
         unk_2018000.filler11C8[0] = sub_8126338();
 }
-#else
-__attribute__((naked))
-void sub_80B92AC(void)
-{
-    asm(".syntax unified\n\
-    push {r4-r6,lr}\n\
-    bl sub_80BC300\n\
-    bl sub_80C045C\n\
-    ldr r6, _080B9364 @ =0x02018000\n\
-    ldr r0, _080B9368 @ =recordMixingSecretBases\n\
-    ldr r1, [r0]\n\
-    movs r2, 0xC8\n\
-    lsls r2, 4\n\
-    adds r0, r6, 0\n\
-    bl memcpy\n\
-    movs r1, 0xC8\n\
-    lsls r1, 4\n\
-    adds r0, r6, r1\n\
-    ldr r1, _080B936C @ =recordMixingTvShows\n\
-    ldr r1, [r1]\n\
-    movs r2, 0xE1\n\
-    lsls r2, 2\n\
-    bl memcpy\n\
-    ldr r2, _080B9370 @ =0x00001004\n\
-    adds r0, r6, r2\n\
-    ldr r1, _080B9374 @ =gUnknown_083D0274\n\
-    ldr r1, [r1]\n\
-    movs r2, 0x40\n\
-    bl memcpy\n\
-    ldr r1, _080B9378 @ =0x00001044\n\
-    adds r0, r6, r1\n\
-    ldr r1, _080B937C @ =gUnknown_083D0278\n\
-    ldr r1, [r1]\n\
-    movs r2, 0x40\n\
-    bl memcpy\n\
-    ldr r2, _080B9380 @ =0x00001084\n\
-    adds r0, r6, r2\n\
-    ldr r1, _080B9384 @ =recordMixingEasyChatPairs\n\
-    ldr r1, [r1]\n\
-    movs r2, 0x28\n\
-    bl memcpy\n\
-    ldr r5, _080B9388 @ =gUnknown_02038738\n\
-    ldr r4, _080B938C @ =gSaveBlock1\n\
-    ldr r0, _080B9390 @ =0x0000303c\n\
-    adds r1, r4, r0\n\
-    adds r0, r5, 0\n\
-    movs r2, 0x38\n\
-    bl memcpy\n\
-    ldr r2, _080B9394 @ =0x00003074\n\
-    adds r1, r4, r2\n\
-    adds r0, r5, 0\n\
-    adds r0, 0x38\n\
-    movs r2, 0x38\n\
-    bl memcpy\n\
-    ldr r0, _080B9398 @ =0x00002f9c\n\
-    adds r4, r0\n\
-    adds r0, r4, 0\n\
-    adds r1, r5, 0\n\
-    bl sub_8041324\n\
-    ldr r1, _080B939C @ =0x000010ac\n\
-    adds r0, r6, r1\n\
-    ldr r1, _080B93A0 @ =gUnknown_083D0280\n\
-    ldr r1, [r1]\n\
-    movs r2, 0x78\n\
-    bl memcpy\n\
-    ldr r2, _080B93A4 @ =0x00001124\n\
-    adds r0, r6, r2\n\
-    ldr r1, _080B93A8 @ =gUnknown_083D0284\n\
-    ldr r1, [r1]\n\
-    movs r2, 0xA4\n\
-    bl memcpy\n\
-    bl GetMultiplayerId\n\
-    lsls r0, 24\n\
-    cmp r0, 0\n\
-    bne _080B935C\n\
-    bl sub_8126338\n\
-    ldr r2, _080B93AC @ =0x000011c8\n\
-    adds r1, r6, r2\n\
-    strh r0, [r1]\n\
-_080B935C:\n\
-    pop {r4-r6}\n\
-    pop {r0}\n\
-    bx r0\n\
-    .align 2, 0\n\
-_080B9364: .4byte 0x02018000\n\
-_080B9368: .4byte recordMixingSecretBases\n\
-_080B936C: .4byte recordMixingTvShows\n\
-_080B9370: .4byte 0x00001004\n\
-_080B9374: .4byte gUnknown_083D0274\n\
-_080B9378: .4byte 0x00001044\n\
-_080B937C: .4byte gUnknown_083D0278\n\
-_080B9380: .4byte 0x00001084\n\
-_080B9384: .4byte recordMixingEasyChatPairs\n\
-_080B9388: .4byte gUnknown_02038738\n\
-_080B938C: .4byte gSaveBlock1\n\
-_080B9390: .4byte 0x0000303c\n\
-_080B9394: .4byte 0x00003074\n\
-_080B9398: .4byte 0x00002f9c\n\
-_080B939C: .4byte 0x000010ac\n\
-_080B93A0: .4byte gUnknown_083D0280\n\
-_080B93A4: .4byte 0x00001124\n\
-_080B93A8: .4byte gUnknown_083D0284\n\
-_080B93AC: .4byte 0x000011c8\n\
-    .syntax divided\n");
-}
-#endif
 
-#undef NONMATCHING
-
-void sub_80B93B0(u32 a)
+void RecordMixing_ReceiveExchangePacket(u32 a)
 {
     sub_80BD674(unk_2008000.secretBases, sizeof(struct PlayerRecords), a);
     sub_80BFD44((u8 *)unk_2008000.tvShows, sizeof(struct PlayerRecords), a);
@@ -195,7 +89,7 @@ void sub_80B93B0(u32 a)
     sub_80B9F3C(unk_2008000.filler11C8, a);
 }
 
-void sub_80B9450(u8 taskId)
+void Task_RecordMixing_SoundEffect(u8 taskId)
 {
     gTasks[taskId].data[0]++;
     if (gTasks[taskId].data[0] == 50)
@@ -206,24 +100,23 @@ void sub_80B9450(u8 taskId)
 }
 
 #define TD_STATE 0
-
-void sub_80B9484(u8 taskId)
+void Task_RecordMixing_Main(u8 taskId)
 {
     s16 *taskData = gTasks[taskId].data;
 
     switch (taskData[TD_STATE])
     {
-    case 0:
+    case 0:        // init
         sub_8007270(gSpecialVar_0x8005);
         VarSet(0x4000, 1);
         gUnknown_03000718 = 0;
-        sub_80B92AC();
+        RecordMixing_PrepareExchangePacket();
         CreateRecordMixingSprite();
         taskData[TD_STATE] = 1;
         taskData[10] = CreateTask(sub_80B95F0, 0x50);
-        taskData[15] = CreateTask(sub_80B9450, 0x51);
+        taskData[15] = CreateTask(Task_RecordMixing_SoundEffect, 0x51);
         break;
-    case 1:
+    case 1:        // wait for sub_80B95F0
         if (!gTasks[taskData[10]].isActive)
         {
             taskData[TD_STATE] = 2;
@@ -237,7 +130,7 @@ void sub_80B9484(u8 taskId)
         taskData[TD_STATE] = 3;
         PlaySE(SE_W226);
         break;
-    case 3:
+    case 3:        // wait for sub_80BA00C
         if (!gTasks[taskData[10]].isActive)
         {
             taskData[TD_STATE] = 4;
@@ -247,7 +140,7 @@ void sub_80B9484(u8 taskId)
             taskData[8] = 0;
         }
         break;
-    case 4:
+    case 4:        // wait 60 frames
         taskData[8]++;
         if (taskData[8] > 60)
             taskData[TD_STATE] = 5;
@@ -275,10 +168,10 @@ void sub_80B95F0(u8 taskId)
         MenuDisplayMessageBox();
         MenuPrint(gOtherText_MixingRecordsWithFriend, 2, 15);
         task->data[8] = 0x708;
-        task->data[TD_STATE] = 0x190;
+        task->data[TD_STATE] = 400;
         ClearLinkCallback_2();
         break;
-    case 100:
+    case 100:        // wait 20 frames
         task->data[12]++;
         if (task->data[12] > 20)
         {
@@ -320,7 +213,7 @@ void sub_80B95F0(u8 taskId)
         if (sub_800820C() == GetLinkPlayerCount_2())
             task->data[TD_STATE] = 1;
         break;
-    case 400:
+    case 400:        // wait 20 frames
         task->data[12]++;
         if (task->data[12] > 20)
         {
@@ -328,7 +221,7 @@ void sub_80B95F0(u8 taskId)
             task->data[12] = 0;
         }
         break;
-    case 1:
+    case 1:        // wait for handshake
         if (gReceivedRemoteLinkPlayers)
         {
             ConvertIntToDecimalStringN(gStringVar1, GetMultiplayerId_(), 2, 2);
@@ -342,16 +235,16 @@ void sub_80B95F0(u8 taskId)
         task->data[6] = GetLinkPlayerCount_2();
         task->data[TD_STATE] = 0;
         task->data[5] = GetMultiplayerId_();
-        task->func = sub_80B97DC;
+        task->func = Task_RecordMixing_SendPacket;
         StorePtrInTaskData(&unk_2018000, &task->data[2]);
-        subTaskId = CreateTask(Task_CopyRecvBuffer, 0x50);
+        subTaskId = CreateTask(Task_RecordMixing_CopyReceiveBuffer, 0x50);
         task->data[10] = subTaskId;
         gTasks[subTaskId].data[0] = taskId;
         //StorePtrInTaskData((void*)0x2008000, &gTasks[subTaskId].data[5]);
         StorePtrInTaskData((u8 *)&unk_2018000 - 0x10000, &gTasks[subTaskId].data[5]);
         break;
     }
-    case 5:
+    case 5:        // wait 60 frames
         task->data[10]++;
         if (task->data[10] > 60)
         {
@@ -362,9 +255,10 @@ void sub_80B95F0(u8 taskId)
     }
 }
 
-void sub_80B97DC(u8 taskId)
+void Task_RecordMixing_SendPacket(u8 taskId)
 {
     struct Task *task = &gTasks[taskId];
+    // does this send the data 24 times?
 
     switch (task->data[TD_STATE])
     {
@@ -392,15 +286,15 @@ void sub_80B97DC(u8 taskId)
             break;
         case 4:
             if (!gTasks[task->data[10]].isActive)
-                task->func = sub_80B9A1C;
+                task->func = Task_RecordMixing_SendPacket_SwitchToReceive;
     }
 }
 
-void Task_CopyRecvBuffer(u8 taskId)
+void Task_RecordMixing_CopyReceiveBuffer(u8 taskId)
 {
     struct Task *task = &gTasks[taskId];
     s32 recvStatus = GetBlockReceivedStatus();
-    u32 sp8 = 0;
+    u8 handledPlayers = 0;
 
     if (recvStatus == sub_8008198())
     {
@@ -408,32 +302,27 @@ void Task_CopyRecvBuffer(u8 taskId)
 
         for (player = 0; player < GetLinkPlayerCount(); player++)
         {
-            //_080B98D4
-            u8 *ptr;
             void *src;
             u8 *dst;
 
             if ((recvStatus >> player) & 1)
             {
-                ptr = LoadPtrFromTaskData(&task->data[5]);
-                dst = ptr + task->data[player + 1] * BUFFER_CHUNK_SIZE + player * sizeof(struct PlayerRecords);
+                dst = LoadPtrFromTaskData(&task->data[5]) + task->data[player + 1] * BUFFER_CHUNK_SIZE + player * sizeof(struct PlayerRecords);
                 src = GetPlayerRecvBuffer(player);
-                if ((u32)(task->data[player + 1] + 1) * BUFFER_CHUNK_SIZE > sizeof(struct PlayerRecords))
+                if ((task->data[player + 1] + 1) * BUFFER_CHUNK_SIZE > sizeof(struct PlayerRecords))
                     memcpy(dst, src, sizeof(struct PlayerRecords) - task->data[player + 1] * BUFFER_CHUNK_SIZE);
                 else
                     memcpy(dst, src, BUFFER_CHUNK_SIZE);
-                //_080B993C
                 ResetBlockReceivedFlag(player);
                 task->data[player + 1]++;
                 if ((u16)task->data[player + 1] == 0x18)
-                    sp8 = (u8)(sp8 + 1);
+                    handledPlayers++;
             }
         }
-        //line 828
         gTasks[task->data[0]].data[0]++;
     }
     //_080B998A
-    if (sp8 == GetLinkPlayerCount())
+    if (handledPlayers == GetLinkPlayerCount())
         DestroyTask(taskId);
 }
 
@@ -445,18 +334,18 @@ void sub_80B99B4(u8 taskId)
         DestroyTask(taskId);
 }
 
-void sub_80B99E8(u8 taskId)
+void Task_RecordMixing_ReceivePacket(u8 taskId)
 {
     struct Task *task = &gTasks[taskId];
 
     task->func = sub_80B99B4;
     if (gUnknown_03000718 == 1)
-        sub_80B93B0(task->data[5]);
+        RecordMixing_ReceiveExchangePacket(task->data[5]);
 }
 
-void sub_80B9A1C(u8 taskId)
+void Task_RecordMixing_SendPacket_SwitchToReceive(u8 taskId)
 {
-    gTasks[taskId].func = sub_80B99E8;
+    gTasks[taskId].func = Task_RecordMixing_ReceivePacket;
     gUnknown_03000718 = 1;
 }
 
@@ -537,6 +426,7 @@ u8 sub_80B9BBC(u16 *a)
     return a[16];
 }
 
+#undef NONMATCHING
 #ifdef NONMATCHING
 
 void sub_80B9BC4(u32 a, u32 b, u32 c, u32 d)