Merge branch 'master' into pok_jump

24 files changed, 6404 insertions, 2039 deletions

diff --git a/src/battle_anim_effects_1.c b/src/battle_anim_effects_1.c
index 15b73a1e0..b3a67a509 100644
--- a/src/battle_anim_effects_1.c
+++ b/src/battle_anim_effects_1.c
@@ -5315,21 +5315,19 @@ static void sub_8102D8C(s16 a, s16 b, s16* c, s16* d, s8 e)
 
 static void sub_8102DE4(struct Sprite* sprite)
 {
-    int b;
-    s16 a;
-    int c;
+    s16 y, yDelta;
     u8 index;
+
     sprite->data[0]++;
-    b = sprite->data[0] * 5 - ((sprite->data[0] * 5 / 256) << 8);
+    yDelta = sprite->data[0] * 5 - ((sprite->data[0] * 5 / 256) << 8);
     sprite->data[4] += sprite->data[6];
     sprite->data[5] += sprite->data[7];
     sprite->pos1.x = sprite->data[4] >> 4;
     sprite->pos1.y = sprite->data[5] >> 4;
-    sprite->pos2.y = Sin(b, 15);
-    a = (u16)sprite->pos1.y;
-    c = (u16)sprite->pos1.x;
+    sprite->pos2.y = Sin(yDelta, 15);
 
-    if ((u32)((c + 16) << 16) > (0x110) << 16 || a < -16 || a > 0x80)
+    y = sprite->pos1.y;
+    if (sprite->pos1.x < -16 || sprite->pos1.x > 256 || y < -16 || y > 128)
     {
         DestroySpriteAndMatrix(sprite);
     }
@@ -5350,12 +5348,8 @@ static void sub_8102DE4(struct Sprite* sprite)
 
 void sub_8102EB0(struct Sprite* sprite)
 {
-    int a;
     if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_OPPONENT)
-    {
-        a = gBattleAnimArgs[1];
-        *(u16 *)&gBattleAnimArgs[1] = -a;
-    }
+        gBattleAnimArgs[1] *= -1;
 
     sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2) + gBattleAnimArgs[1];
     sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3) + gBattleAnimArgs[2];
@@ -5541,8 +5535,8 @@ static void sub_8103300(struct Sprite* sprite)
 
 static void sub_8103320(struct Sprite* sprite)
 {
-    s16 temp;
-    s16 temp2;
+    s16 x1, x2;
+
     sprite->data[1] += 4;
     if (sprite->data[1] > 254)
     {
@@ -5564,20 +5558,21 @@ static void sub_8103320(struct Sprite* sprite)
     if (sprite->data[1] > 0x9F)
         sprite->subpriority = sprite->data[2];
 
-    temp = gSineTable[sprite->data[1]];
-    sprite->pos2.x = (temp2 = temp >> 3) + (temp2 >> 1);
+    x1 = gSineTable[sprite->data[1]];
+    x2 = x1 >> 3;
+    sprite->pos2.x = (x1 >> 3) + (x2 >> 1);
 }
 
 void sub_8103390(struct Sprite* sprite)
 {
-    u8 bank;
+    u8 battler;
     if (gBattleAnimArgs[0] == 0)
-        bank = gBattleAnimAttacker;
+        battler = gBattleAnimAttacker;
     else
-        bank = gBattleAnimTarget;
+        battler = gBattleAnimTarget;
 
-    sub_810310C(bank, sprite);
-    if (GetBattlerSide(bank) == B_SIDE_PLAYER)
+    sub_810310C(battler, sprite);
+    if (GetBattlerSide(battler) == B_SIDE_PLAYER)
     {
         StartSpriteAnim(sprite, 0);
         sprite->data[0] = 2;
diff --git a/src/battle_anim_effects_3.c b/src/battle_anim_effects_3.c
index ab765b8c1..5d79a9e6b 100755
--- a/src/battle_anim_effects_3.c
+++ b/src/battle_anim_effects_3.c
@@ -2504,13 +2504,10 @@ void sub_815BE04(struct Sprite *sprite)
 
 static void sub_815BF44(struct Sprite *sprite)
 {
-    int var0;
-    s8 var1;
-
-    var0 = (u16)sprite->data[2] + (u16)sprite->data[3];
-    var1 = var0 >> 8;
-    sprite->pos2.y -= var1;
-    sprite->data[3] = var0 & 0xFF;
+    s16 delta = sprite->data[3] + sprite->data[2];
+    sprite->pos2.y -= delta >> 8;
+    sprite->data[3] += sprite->data[2];
+    sprite->data[3] &= 0xFF;
     if (sprite->data[4] == 0 && sprite->pos2.y < -8)
     {
         gSprites[sprite->data[6]].invisible = 0;
@@ -2543,19 +2540,12 @@ static void sub_815BFF4(struct Sprite *sprite)
 
 static void sub_815C050(struct Sprite *sprite)
 {
-    u16 d2;
-    register u16 d3 asm("r1");
-    int var0;
-    s8 var1;
-
     if (!sprite->invisible)
     {
-        d2 = sprite->data[2];
-        d3 = sprite->data[3];
-        var0 = d2 + d3;
-        var1 = var0 >> 8;
-        sprite->pos2.y -= var1;
-        sprite->data[3] = var0 & 0xFF;
+        s16 delta = sprite->data[3] + sprite->data[2];
+        sprite->pos2.y -= delta >> 8;
+        sprite->data[3] += sprite->data[2];
+        sprite->data[3] &= 0xFF;
         if (--sprite->data[1] == -1)
         {
             sprite->invisible = 1;
@@ -4322,7 +4312,7 @@ static void AnimSmellingSaltExclamationStep(struct Sprite *sprite)
 
 // Claps a hand several times.
 // arg 0: which hand
-// arg 1: 
+// arg 1:
 void AnimHelpingHandClap(struct Sprite *sprite)
 {
     if (gBattleAnimArgs[0] == 0)
diff --git a/src/contest_link_80F57C4.c b/src/contest_link_80F57C4.c
index bae7859b5..a0a29f0ad 100644
--- a/src/contest_link_80F57C4.c
+++ b/src/contest_link_80F57C4.c
@@ -71,15 +71,10 @@ struct ContestLinkUnk14
     u8 unk12;
 };
 
-struct ContestLinkUnk4
-{
-    struct ContestLinkUnk14 unk0[4];
-};
-
 struct ContestLink80F57C4
 {
     struct ContestLinkUnk0 *unk0;
-    struct ContestLinkUnk4 *unk4;
+    struct ContestLinkUnk14 (*unk4)[4];
     u8 *unk8;
     u8 *unkC[4];
     u8 *unk1C;
@@ -205,9 +200,7 @@ void sub_80F57C4(void)
 void sub_80F591C(void)
 {
     int i, j;
-    s8 var0;
-    s8 var1;
-    int var2;
+    s8 var0, var1;
     u16 tile1, tile2;
 
     LZDecompressVram(gUnknown_08C19588, (void *)BG_CHAR_ADDR(0));
@@ -228,11 +221,7 @@ void sub_80F591C(void)
             if (j < var0)
                 tile1 += 2;
 
-            var2 = var1;
-            if (var1 < 0)
-                var2 = -var2;
-
-            if (j < var2)
+            if (j < abs(var1))
             {
                 tile2 = 0x60A4;
                 if (var1 < 0)
@@ -719,7 +708,7 @@ static void sub_80F6404(u8 taskId)
             if (top > 80)
                 top = 80;
 
-            gBattle_WIN0V = (top << 8) | (160 - top);;
+            gBattle_WIN0V = (top << 8) | (160 - top);
             if (top == 80)
                 gTasks[taskId].data[0]++;
         }
@@ -737,8 +726,7 @@ static void sub_80F6404(u8 taskId)
 
 static void sub_80F66B4(u8 taskId)
 {
-    int i;
-    u16 nationalDexNum;
+    int i, nationalDexNum;
 
     if (gMain.newKeys & A_BUTTON)
     {
@@ -859,13 +847,13 @@ static void sub_80F68F0(u8 taskId)
 
 void sub_80F69B8(u16 species, u8 monIndex, u8 srcOffset, u8 useDmaNow, u32 personality)
 {
-    u8 frameNum;
     const u8 *iconPtr;
-    u16 var0;
-    u16 var1;
+    u16 var0, var1, frameNum;
 
-    u8 *contestPlayerMonIndex = &gContestPlayerMonIndex; // fake match
-    frameNum = (monIndex == *contestPlayerMonIndex) ? 1 : 0;
+    if (monIndex == gContestPlayerMonIndex)
+        frameNum = 1;
+    else
+        frameNum = 0;
 
     iconPtr = GetMonIconPtr(species, personality, frameNum);
     iconPtr += srcOffset * 0x200 + 0x80;
@@ -892,13 +880,12 @@ static void LoadAllContestMonIcons(u8 srcOffset, u8 useDmaNow)
 
 static void sub_80F6A9C(void)
 {
-    int i;
-    register u16 species asm("r0");
+    int i, species;
 
     for (i = 0; i < 4; i++)
     {
-        species = GetIconSpecies(gContestMons[i].species, 0);
-        LoadPalette(gMonIconPalettes[gMonIconPaletteIndices[species]], i * 0x10 + 0xA0, 0x20);
+        species = gContestMons[i].species;
+        LoadPalette(gMonIconPalettes[gMonIconPaletteIndices[GetIconSpecies(species, 0)]], i * 0x10 + 0xA0, 0x20);
     }
 }
 
@@ -1335,11 +1322,11 @@ static void sub_80F6F40(struct Sprite *sprite)
 static void sub_80F6F68(struct Sprite *sprite)
 {
     int i;
-    s16 var0;
 
-    var0 = (u16)sprite->data[7] + (u16)sprite->data[6];
-    sprite->pos1.x -= var0 >> 8;
-    sprite->data[7] = (sprite->data[6] + sprite->data[7]) & 0xFF;
+    s16 delta = sprite->data[7] + sprite->data[6];
+    sprite->pos1.x -= delta >> 8;
+    sprite->data[7] += sprite->data[6];
+    sprite->data[7] &= 0xFF;
     if (sprite->pos1.x < sprite->data[4])
         sprite->pos1.x = sprite->data[4];
 
@@ -1366,11 +1353,12 @@ static void sub_80F6FDC(struct Sprite *sprite)
 static void sub_80F7014(struct Sprite *sprite)
 {
     int i;
-    s16 var0;
+    s16 delta;
 
-    var0 = (u16)sprite->data[7] + (u16)sprite->data[6];
-    sprite->pos1.x -= var0 >> 8;
-    sprite->data[7] = (sprite->data[6] + sprite->data[7]) & 0xFF;
+    delta = sprite->data[7] + sprite->data[6];
+    sprite->pos1.x -= delta >> 8;
+    sprite->data[7] += sprite->data[6];
+    sprite->data[7] &= 0xFF;
     for (i = 0; i < 3; i++)
     {
         struct Sprite *sprite2 = &gSprites[sprite->data[i]];
@@ -1487,14 +1475,11 @@ static void sub_80F71C8(void)
     CopyToBgTilemapBufferRect_ChangePalette(2, gUnknown_0203A034->unkC[2], 0, 0, 32, 4, palette);
 }
 
-// fakematching?
 u8 sub_80F7310(u8 monIndex, u8 arg1)
 {
-    u32 var0;
-    u32 var1;
+    u32 var0 = gContestMonConditions[monIndex] << 16;
+    u32 var1 = var0 / 0x3F;
 
-    var0 = gContestMonConditions[monIndex] << 16;
-    var1 = var0 / 0x3F;
     if (var1 & 0xFFFF)
         var1 += 0x10000;
 
@@ -1510,8 +1495,7 @@ u8 sub_80F7310(u8 monIndex, u8 arg1)
 
 s8 sub_80F7364(u8 arg0, u8 arg1)
 {
-    u32 r4;
-    u32 r2;
+    u32 r4, r2;
     s16 val;
     s8 ret;
 
@@ -1607,9 +1591,10 @@ static void sub_80F75A8(struct Sprite *sprite)
     }
     else
     {
-        s16 delta = (u16)sprite->data[1] + 0x600;
+        s16 delta = sprite->data[1] + 0x600;
         sprite->pos1.x -= delta >> 8;
-        sprite->data[1] = (sprite->data[1] + 0x600) & 0xFF;
+        sprite->data[1] += 0x600;
+        sprite->data[1] &= 0xFF;
         if (sprite->pos1.x < 120)
             sprite->pos1.x = 120;
 
@@ -1624,9 +1609,10 @@ static void sub_80F75A8(struct Sprite *sprite)
 
 static void sub_80F7620(struct Sprite *sprite)
 {
-    s16 delta = (u16)sprite->data[1] + 0x600;
+    s16 delta = sprite->data[1] + 0x600;
     sprite->pos1.x -= delta >> 8;
-    sprite->data[1] = (sprite->data[1] + 0x600) & 0xFF;
+    sprite->data[1] += + 0x600;
+    sprite->data[1] &= 0xFF;
     if (sprite->pos1.x < -32)
     {
         sprite->callback = SpriteCallbackDummy;
@@ -1657,14 +1643,15 @@ static void sub_80F7670(u8 taskId)
 
 void sub_80F7768(struct Sprite *sprite)
 {
-    register s16 var0 asm("r1");
+    s16 delta;
 
     sprite->data[3] += sprite->data[0];
     sprite->pos2.x = Sin(sprite->data[3] >> 8, sprite->data[1]);
-    var0 = sprite->data[4] + sprite->data[2];
-    sprite->pos1.x += var0 >> 8;
-    var0 = var0 & 0xFF;
-    sprite->data[4] = var0;
+    delta = sprite->data[4] + sprite->data[2];
+    sprite->pos1.x += delta >> 8;
+    sprite->data[4] += sprite->data[2];
+    sprite->data[4] &= 0xff;
+
     sprite->pos1.y++;
     if (gUnknown_0203A034->unk0->unk9)
         sprite->invisible = 1;
@@ -1695,705 +1682,145 @@ static void sub_80F7824(u8 taskId)
     }
 }
 
-// static void sub_80F7880(void)
-// {
-//     int i;
-//     int var0;
-//     int var1;
-//     int var2;
-//     int var3;
-//     u32 var4;
-//     int var5;
-//     int var6;
-//     s16 var7;
-//     s16 var8;
-//     s16 r2;
-
-//     r2 = gUnknown_02039F08[0];
-//     for (i = 1; i < 4; i++)
-//     {
-//         if (r2 < gUnknown_02039F08[i])
-//             r2 = gUnknown_02039F08[i];
-//     }
-
-//     if (r2 < 0)
-//     {
-//         r2 = gUnknown_02039F08[0];
-//         for (i = 1; i < 4; i++)
-//         {
-//             if (r2 > gUnknown_02039F08[i])
-//                 r2 = gUnknown_02039F08[i];
-//         }
-//     }
-
-//     // _080F78E4
-//     for (i = 0; i < 4; i++)
-//     {
-//         var0 = gContestMonConditions[i] * 1000;
-//         var1 = r2;
-//         if (r2 < 0)
-//             var1 = -var1;
-
-//         var2 = var0 / var1;
-//         if (var2 % 10 > 4)
-//             var2 += 10;
-
-//         gUnknown_0203A034->unk4->unk0[i].unk0 = var2 / 10;
-//         var3 = gUnknown_02039F18[i];
-//         if (var3 < 0)
-//             var3 = -var3;
-
-//         var0 = var3 * 1000;
-//         var1 = r2;
-//         if (r2 < 0)
-//             var1 = -var1;
-
-//         var2 = var0 / var1;
-//         if (var2 % 10 > 4)
-//             var2 += 10;
-
-//         // _080F7966
-//         gUnknown_0203A034->unk4->unk0[i].unk4 = var2 / 10;
-//         if (gUnknown_02039F18[i] < 0)
-//             gUnknown_0203A034->unk4->unk0[i].unk10 = 1;
-
-//         var4 = gUnknown_0203A034->unk4->unk0[i].unk0 * 22528 / 100;
-//         if ((var4 & 0xFF) > 0x7F)
-//             var4 += 0x100;
-
-//         gUnknown_0203A034->unk4->unk0[i].unk8 = var4 >> 8;
-//         var4 = gUnknown_0203A034->unk4->unk0[i].unk4 * 22528 / 100;
-//         if ((var4 & 0xFF) > 0x7F)
-//             var4 += 0x100;
-
-//         gUnknown_0203A034->unk4->unk0[i].unkC = var4 >> 8;
-//         gUnknown_0203A034->unk4->unk0[i].unk11 = sub_80F7310(i, 1);
-//         var5 = sub_80F7364(i, 1);
-//         if (var5 < 0)
-//             var5 = -var5;
-
-//         gUnknown_0203A034->unk4->unk0[i].unk12 = var5;
-//         if (gContestFinalStandings[i])
-//         {
-//             var7 = gUnknown_0203A034->unk4->unk0[i].unk8;
-//             var8 = gUnknown_0203A034->unk4->unk0[i].unkC;
-//             if (gUnknown_0203A034->unk4->unk0[i].unk10)
-//                 var8 = -var8;
-
-//             if (var7 + var8 == 88)
-//             {
-//                 if (var8 > 0)
-//                     gUnknown_0203A034->unk4->unk0[i].unkC--;
-//                 else if (var7 > 0)
-//                     gUnknown_0203A034->unk4->unk0[i].unk8--;
-//             }
-//         }
-//     }
-// }
-
-NAKED
 static void sub_80F7880(void)
 {
-    asm_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 r0, =gUnknown_02039F08\n\
-    ldrh r2, [r0]\n\
-    adds r4, r0, 0\n\
-    adds r3, r4, 0x2\n\
-    movs r0, 0x2\n\
-    mov r8, r0\n\
-_080F7898:\n\
-    lsls r0, r2, 16\n\
-    asrs r0, 16\n\
-    movs r5, 0\n\
-    ldrsh r1, [r3, r5]\n\
-    cmp r0, r1\n\
-    bge _080F78A6\n\
-    ldrh r2, [r3]\n\
-_080F78A6:\n\
-    adds r3, 0x2\n\
-    movs r0, 0x1\n\
-    negs r0, r0\n\
-    add r8, r0\n\
-    mov r1, r8\n\
-    cmp r1, 0\n\
-    bge _080F7898\n\
-    lsls r0, r2, 16\n\
-    str r0, [sp]\n\
-    cmp r0, 0\n\
-    bge _080F78E4\n\
-    ldrh r2, [r4]\n\
-    adds r3, r4, 0x2\n\
-    movs r4, 0x2\n\
-    mov r8, r4\n\
-_080F78C4:\n\
-    lsls r0, r2, 16\n\
-    asrs r0, 16\n\
-    movs r5, 0\n\
-    ldrsh r1, [r3, r5]\n\
-    cmp r0, r1\n\
-    ble _080F78D2\n\
-    ldrh r2, [r3]\n\
-_080F78D2:\n\
-    adds r3, 0x2\n\
-    movs r0, 0x1\n\
-    negs r0, r0\n\
-    add r8, r0\n\
-    lsls r1, r2, 16\n\
-    str r1, [sp]\n\
-    mov r4, r8\n\
-    cmp r4, 0\n\
-    bge _080F78C4\n\
-_080F78E4:\n\
-    movs r5, 0\n\
-    mov r8, r5\n\
-    mov r10, r5\n\
-_080F78EA:\n\
-    ldr r0, =gContestMonConditions\n\
-    mov r1, r8\n\
-    lsls r7, r1, 1\n\
-    adds r0, r7, r0\n\
-    movs r2, 0\n\
-    ldrsh r1, [r0, r2]\n\
-    lsls r0, r1, 5\n\
-    subs r0, r1\n\
-    lsls r0, 2\n\
-    adds r0, r1\n\
-    lsls r0, 3\n\
-    ldr r4, [sp]\n\
-    asrs r5, r4, 16\n\
-    adds r1, r5, 0\n\
-    cmp r5, 0\n\
-    bge _080F790C\n\
-    negs r1, r5\n\
-_080F790C:\n\
-    bl __divsi3\n\
-    adds r4, r0, 0\n\
-    movs r1, 0xA\n\
-    bl __modsi3\n\
-    cmp r0, 0x4\n\
-    ble _080F791E\n\
-    adds r4, 0xA\n\
-_080F791E:\n\
-    ldr r0, =gUnknown_0203A034\n\
-    mov r9, r0\n\
-    ldr r0, [r0]\n\
-    ldr r0, [r0, 0x4]\n\
-    mov r1, r10\n\
-    adds r6, r1, r0\n\
-    adds r0, r4, 0\n\
-    movs r1, 0xA\n\
-    bl __divsi3\n\
-    str r0, [r6]\n\
-    ldr r0, =gUnknown_02039F18\n\
-    adds r7, r0\n\
-    movs r2, 0\n\
-    ldrsh r1, [r7, r2]\n\
-    cmp r1, 0\n\
-    bge _080F7942\n\
-    negs r1, r1\n\
-_080F7942:\n\
-    lsls r0, r1, 5\n\
-    subs r0, r1\n\
-    lsls r0, 2\n\
-    adds r0, r1\n\
-    lsls r0, 3\n\
-    adds r1, r5, 0\n\
-    cmp r1, 0\n\
-    bge _080F7954\n\
-    negs r1, r1\n\
-_080F7954:\n\
-    bl __divsi3\n\
-    adds r4, r0, 0\n\
-    movs r1, 0xA\n\
-    bl __modsi3\n\
-    cmp r0, 0x4\n\
-    ble _080F7966\n\
-    adds r4, 0xA\n\
-_080F7966:\n\
-    adds r0, r4, 0\n\
-    movs r1, 0xA\n\
-    bl __divsi3\n\
-    str r0, [r6, 0x4]\n\
-    movs r4, 0\n\
-    ldrsh r0, [r7, r4]\n\
-    cmp r0, 0\n\
-    bge _080F797C\n\
-    movs r0, 0x1\n\
-    strb r0, [r6, 0x10]\n\
-_080F797C:\n\
-    mov r5, r9\n\
-    ldr r0, [r5]\n\
-    ldr r0, [r0, 0x4]\n\
-    mov r1, r10\n\
-    adds r4, r1, r0\n\
-    ldr r1, [r4]\n\
-    lsls r0, r1, 1\n\
-    adds r0, r1\n\
-    lsls r0, 2\n\
-    subs r0, r1\n\
-    lsls r0, 11\n\
-    movs r1, 0x64\n\
-    bl __divsi3\n\
-    adds r1, r0, 0\n\
-    movs r5, 0xFF\n\
-    ands r0, r5\n\
-    cmp r0, 0x7F\n\
-    bls _080F79A8\n\
-    movs r2, 0x80\n\
-    lsls r2, 1\n\
-    adds r1, r2\n\
-_080F79A8:\n\
-    lsrs r0, r1, 8\n\
-    str r0, [r4, 0x8]\n\
-    ldr r1, [r4, 0x4]\n\
-    lsls r0, r1, 1\n\
-    adds r0, r1\n\
-    lsls r0, 2\n\
-    subs r0, r1\n\
-    lsls r0, 11\n\
-    movs r1, 0x64\n\
-    bl __divsi3\n\
-    adds r1, r0, 0\n\
-    ands r0, r5\n\
-    cmp r0, 0x7F\n\
-    bls _080F79CC\n\
-    movs r5, 0x80\n\
-    lsls r5, 1\n\
-    adds r1, r5\n\
-_080F79CC:\n\
-    lsrs r0, r1, 8\n\
-    str r0, [r4, 0xC]\n\
-    mov r0, r8\n\
-    lsls r4, r0, 24\n\
-    lsrs r4, 24\n\
-    adds r0, r4, 0\n\
-    movs r1, 0x1\n\
-    bl sub_80F7310\n\
-    mov r2, r9\n\
-    ldr r1, [r2]\n\
-    ldr r1, [r1, 0x4]\n\
-    add r1, r10\n\
-    strb r0, [r1, 0x11]\n\
-    adds r0, r4, 0\n\
-    movs r1, 0x1\n\
-    bl sub_80F7364\n\
-    mov r4, r9\n\
-    ldr r1, [r4]\n\
-    ldr r1, [r1, 0x4]\n\
-    add r1, r10\n\
-    lsls r0, 24\n\
-    asrs r0, 24\n\
-    cmp r0, 0\n\
-    bge _080F7A02\n\
-    negs r0, r0\n\
-_080F7A02:\n\
-    strb r0, [r1, 0x12]\n\
-    ldr r0, =gContestFinalStandings\n\
-    add r0, r8\n\
-    ldrb r0, [r0]\n\
-    cmp r0, 0\n\
-    beq _080F7A60\n\
-    mov r5, r9\n\
-    ldr r0, [r5]\n\
-    ldr r0, [r0, 0x4]\n\
-    mov r2, r10\n\
-    adds r1, r2, r0\n\
-    ldr r5, [r1, 0x8]\n\
-    ldrh r3, [r1, 0x8]\n\
-    ldr r4, [r1, 0xC]\n\
-    ldrh r2, [r1, 0xC]\n\
-    ldrb r0, [r1, 0x10]\n\
-    cmp r0, 0\n\
-    beq _080F7A2C\n\
-    lsls r0, r2, 16\n\
-    negs r0, r0\n\
-    lsrs r2, r0, 16\n\
-_080F7A2C:\n\
-    lsls r0, r3, 16\n\
-    asrs r3, r0, 16\n\
-    lsls r0, r2, 16\n\
-    asrs r2, r0, 16\n\
-    adds r0, r3, r2\n\
-    cmp r0, 0x58\n\
-    bne _080F7A60\n\
-    cmp r2, 0\n\
-    ble _080F7A58\n\
-    subs r0, r4, 0x1\n\
-    str r0, [r1, 0xC]\n\
-    b _080F7A60\n\
-    .pool\n\
-_080F7A58:\n\
-    cmp r3, 0\n\
-    ble _080F7A60\n\
-    subs r0, r5, 0x1\n\
-    str r0, [r1, 0x8]\n\
-_080F7A60:\n\
-    movs r4, 0x14\n\
-    add r10, r4\n\
-    movs r5, 0x1\n\
-    add r8, r5\n\
-    mov r0, r8\n\
-    cmp r0, 0x3\n\
-    bgt _080F7A70\n\
-    b _080F78EA\n\
-_080F7A70:\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");
-}
-
-// static void sub_80F7A80(u8 arg0, u8 arg1)
-// {
-//     int i;
-//     u8 taskId;
-//     u8 sp8, spC;
-
-//     sp8 = 0;
-//     spC = 0;
-//     if (!arg0)
-//     {
-//         u32 var0;
-//         for (i = 0; i < 4; i++)
-//         {
-//             int var1 = gUnknown_0203A034->unk4->unk0[i].unk11;
-//             if (arg1 < var1)
-//             {
-//                 int x = var1 + 19;
-//                 x -= arg1;
-//                 x--;
-//                 FillBgTilemapBufferRect_Palette0(1, 0x60B3, x, i * 3 + 5, 1, 1);
-//                 taskId = CreateTask(sub_80F7CA8, 10);
-//                 var0 = ((gUnknown_0203A034->unk4->unk0[i].unk8 << 16) / gUnknown_0203A034->unk4->unk0[i].unk11) * (arg1 + 1);
-//                 var0 &= 0xFFFF;
-//                 if (var0 > 0x7FFF)
-//                     var0 += 0x10000;
-
-//                 gTasks[taskId].data[0] = i;
-//                 gTasks[taskId].data[1] = var0 >> 16;
-//                 gUnknown_0203A034->unk0->unk14++;
-//                 sp8++;
-//             }
-//         }
-//     }
-//     else
-//     {
-//         u32 var0;
-//         for (i = 0; i < 4; i++)
-//         {
-//             int tile;
-//             s8 var1 = gUnknown_0203A034->unk4->unk0[i].unk12;
-//             tile = gUnknown_0203A034->unk4->unk0[i].unk10 ? 0x60A5 : 0x60A3;
-//             if (arg1 < var1)
-//             {
-//                 int thing = ((s8)arg1 - 19);
-//                 int x = var1 - thing;
-//                 x--;
-//                 FillBgTilemapBufferRect_Palette0(1, tile, x, i * 3 + 6, 1, 1);
-//                 taskId = CreateTask(sub_80F7CA8, 10);
-//                 var0 = ((gUnknown_0203A034->unk4->unk0[i].unkC << 16) / gUnknown_0203A034->unk4->unk0[i].unk12) * (arg1 + 1);
-//                 var0 &= 0xFFFF;
-//                 if (var0 > 0x7FFF)
-//                     var0 += 0x10000;
-
-//                 gTasks[taskId].data[0] = i;
-//                 if (gUnknown_0203A034->unk4->unk0[i].unk10)
-//                 {
-//                     gTasks[taskId].data[2] = 1;
-//                     spC++;
-//                 }
-//                 else
-//                 {
-//                     sp8++;
-//                 }
-
-//                 if (gUnknown_0203A034->unk4->unk0[i].unk10)
-//                     gTasks[taskId].data[1] = gUnknown_0203A034->unk4->unk0[i].unk8 - (var0 >> 16);
-//                 else
-//                     gTasks[taskId].data[1] = gUnknown_0203A034->unk4->unk0[i].unk8 + (var0 >> 16);
-
-//                 gUnknown_0203A034->unk0->unk14++;
-//             }
-//         }
-//     }
-
-//     if (spC)
-//         PlaySE(SE_PIN);
-
-//     if (sp8)
-//         PlaySE(SE_BAN);
-// }
+    int i, r4;
+    u32 r1;
+    s16 r2;
+    s8 var;
+
+    r2 = gUnknown_02039F08[0];
+    for (i = 1; i < 4; i++)
+    {
+        if (r2 < gUnknown_02039F08[i])
+            r2 = gUnknown_02039F08[i];
+    }
+
+    if (r2 < 0)
+    {
+        r2 = gUnknown_02039F08[0];
+        for (i = 1; i < 4; i++)
+        {
+            if (r2 > gUnknown_02039F08[i])
+                r2 = gUnknown_02039F08[i];
+        }
+    }
+
+    for (i = 0; i < 4; i++)
+    {
+        r4 = (gContestMonConditions[i] * 1000) / abs(r2);
+        if (r4 % 10 > 4)
+            r4 += 10;
+        (*gUnknown_0203A034->unk4)[i].unk0 = r4 / 10;
+
+        r4 = (abs(gUnknown_02039F18[i]) * 1000) / abs(r2);
+        if (r4 % 10 > 4)
+            r4 += 10;
+        (*gUnknown_0203A034->unk4)[i].unk4 = r4 / 10;
+
+        if (gUnknown_02039F18[i] < 0)
+            (*gUnknown_0203A034->unk4)[i].unk10 = 1;
+
+        r1 = ((*gUnknown_0203A034->unk4)[i].unk0 * 22528) / 100;
+        if ((r1 & 0xFF) > 0x7F)
+            r1 += 0x100;
+        (*gUnknown_0203A034->unk4)[i].unk8 = r1 >> 8;
+
+        r1 = ((*gUnknown_0203A034->unk4)[i].unk4 * 22528) / 100;
+        if ((r1 & 0xFF) > 0x7F)
+            r1 += 0x100;
+        (*gUnknown_0203A034->unk4)[i].unkC = r1 >> 8;
+
+        (*gUnknown_0203A034->unk4)[i].unk11 = sub_80F7310(i, 1);
+        var = sub_80F7364(i, 1);
+        (*gUnknown_0203A034->unk4)[i].unk12 = abs(var);
+
+        if (gContestFinalStandings[i])
+        {
+            s16 var1 = (*gUnknown_0203A034->unk4)[i].unk8;
+            s16 var2 = (*gUnknown_0203A034->unk4)[i].unkC;
+
+            if ((*gUnknown_0203A034->unk4)[i].unk10)
+                var2 *= -1;
+
+            if (var1 + var2 == 88)
+            {
+                if (var2 > 0)
+                    (*gUnknown_0203A034->unk4)[i].unkC--;
+                else if (var1 > 0)
+                    (*gUnknown_0203A034->unk4)[i].unk8--;
+            }
+        }
+    }
+}
 
-NAKED
 static void sub_80F7A80(u8 arg0, u8 arg1)
 {
-    asm_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, 24\n\
-    lsls r1, 24\n\
-    lsrs r1, 24\n\
-    mov r8, r1\n\
-    movs r1, 0\n\
-    str r1, [sp, 0x8]\n\
-    movs r3, 0\n\
-    str r3, [sp, 0xC]\n\
-    cmp r0, 0\n\
-    bne _080F7B5C\n\
-    mov r9, r3\n\
-    ldr r4, =gUnknown_0203A034\n\
-    mov r10, r4\n\
-    movs r7, 0xA0\n\
-    lsls r7, 19\n\
-    movs r6, 0\n\
-_080F7AAC:\n\
-    mov r1, r10\n\
-    ldr r0, [r1]\n\
-    ldr r0, [r0, 0x4]\n\
-    adds r0, r6, r0\n\
-    ldrb r2, [r0, 0x11]\n\
-    cmp r8, r2\n\
-    bcs _080F7B2E\n\
-    adds r2, 0x13\n\
-    mov r3, r8\n\
-    subs r2, r3\n\
-    subs r2, 0x1\n\
-    lsls r2, 24\n\
-    lsrs r2, 24\n\
-    lsrs r3, r7, 24\n\
-    movs r0, 0x1\n\
-    str r0, [sp]\n\
-    str r0, [sp, 0x4]\n\
-    ldr r1, =0x000060b3\n\
-    bl FillBgTilemapBufferRect_Palette0\n\
-    ldr r0, =sub_80F7CA8\n\
-    movs r1, 0xA\n\
-    bl CreateTask\n\
-    lsls r0, 24\n\
-    lsrs r5, r0, 24\n\
-    mov r0, r10\n\
-    ldr r4, [r0]\n\
-    ldr r1, [r4, 0x4]\n\
-    adds r1, r6, r1\n\
-    ldr r0, [r1, 0x8]\n\
-    lsls r0, 16\n\
-    ldrb r1, [r1, 0x11]\n\
-    bl __udivsi3\n\
-    mov r1, r8\n\
-    adds r1, 0x1\n\
-    adds r3, r0, 0\n\
-    muls r3, r1\n\
-    ldr r0, =0x0000ffff\n\
-    ands r0, r3\n\
-    ldr r1, =0x00007fff\n\
-    cmp r0, r1\n\
-    bls _080F7B0A\n\
-    movs r1, 0x80\n\
-    lsls r1, 9\n\
-    adds r3, r1\n\
-_080F7B0A:\n\
-    ldr r1, =gTasks\n\
-    lsls r0, r5, 2\n\
-    adds r0, r5\n\
-    lsls r0, 3\n\
-    adds r0, r1\n\
-    mov r1, r9\n\
-    strh r1, [r0, 0x8]\n\
-    lsrs r1, r3, 16\n\
-    strh r1, [r0, 0xA]\n\
-    ldr r1, [r4]\n\
-    ldrb r0, [r1, 0x14]\n\
-    adds r0, 0x1\n\
-    strb r0, [r1, 0x14]\n\
-    ldr r0, [sp, 0x8]\n\
-    adds r0, 0x1\n\
-    lsls r0, 24\n\
-    lsrs r0, 24\n\
-    str r0, [sp, 0x8]\n\
-_080F7B2E:\n\
-    movs r3, 0xC0\n\
-    lsls r3, 18\n\
-    adds r7, r3\n\
-    adds r6, 0x14\n\
-    movs r4, 0x1\n\
-    add r9, r4\n\
-    mov r0, r9\n\
-    cmp r0, 0x3\n\
-    ble _080F7AAC\n\
-    b _080F7C7E\n\
-    .pool\n\
-_080F7B5C:\n\
-    movs r1, 0\n\
-    mov r9, r1\n\
-    mov r10, r1\n\
-    movs r3, 0xC0\n\
-    lsls r3, 19\n\
-    str r3, [sp, 0x10]\n\
-_080F7B68:\n\
-    ldr r4, =gUnknown_0203A034\n\
-    ldr r0, [r4]\n\
-    ldr r0, [r0, 0x4]\n\
-    add r0, r10\n\
-    ldrb r2, [r0, 0x12]\n\
-    ldrb r0, [r0, 0x10]\n\
-    ldr r1, =0x000060a3\n\
-    cmp r0, 0\n\
-    beq _080F7B7C\n\
-    adds r1, 0x2\n\
-_080F7B7C:\n\
-    lsls r0, r2, 24\n\
-    asrs r0, 24\n\
-    cmp r8, r0\n\
-    bge _080F7C64\n\
-    mov r3, r8\n\
-    lsls r2, r3, 24\n\
-    asrs r2, 24\n\
-    subs r2, 0x13\n\
-    subs r2, r0, r2\n\
-    subs r2, 0x1\n\
-    lsls r2, 24\n\
-    lsrs r2, 24\n\
-    ldr r4, [sp, 0x10]\n\
-    lsrs r3, r4, 24\n\
-    movs r7, 0x1\n\
-    str r7, [sp]\n\
-    str r7, [sp, 0x4]\n\
-    movs r0, 0x1\n\
-    bl FillBgTilemapBufferRect_Palette0\n\
-    ldr r0, =sub_80F7CA8\n\
-    movs r1, 0xA\n\
-    bl CreateTask\n\
-    lsls r0, 24\n\
-    lsrs r5, r0, 24\n\
-    ldr r0, =gUnknown_0203A034\n\
-    ldr r6, [r0]\n\
-    ldr r1, [r6, 0x4]\n\
-    add r1, r10\n\
-    ldr r0, [r1, 0xC]\n\
-    lsls r0, 16\n\
-    ldrb r1, [r1, 0x12]\n\
-    bl __udivsi3\n\
-    mov r1, r8\n\
-    adds r1, 0x1\n\
-    adds r3, r0, 0\n\
-    muls r3, r1\n\
-    ldr r0, =0x0000ffff\n\
-    ands r0, r3\n\
-    ldr r1, =0x00007fff\n\
-    cmp r0, r1\n\
-    bls _080F7BDA\n\
-    movs r1, 0x80\n\
-    lsls r1, 9\n\
-    adds r3, r1\n\
-_080F7BDA:\n\
-    ldr r1, =gTasks\n\
-    lsls r2, r5, 2\n\
-    adds r0, r2, r5\n\
-    lsls r0, 3\n\
-    adds r4, r0, r1\n\
-    mov r0, r9\n\
-    strh r0, [r4, 0x8]\n\
-    ldr r0, [r6, 0x4]\n\
-    add r0, r10\n\
-    ldrb r0, [r0, 0x10]\n\
-    adds r6, r1, 0\n\
-    cmp r0, 0\n\
-    beq _080F7C1C\n\
-    strh r7, [r4, 0xC]\n\
-    ldr r0, [sp, 0xC]\n\
-    adds r0, 0x1\n\
-    lsls r0, 24\n\
-    lsrs r0, 24\n\
-    str r0, [sp, 0xC]\n\
-    b _080F7C26\n\
-    .pool\n\
-_080F7C1C:\n\
-    ldr r0, [sp, 0x8]\n\
-    adds r0, 0x1\n\
-    lsls r0, 24\n\
-    lsrs r0, 24\n\
-    str r0, [sp, 0x8]\n\
-_080F7C26:\n\
-    ldr r1, =gUnknown_0203A034\n\
-    ldr r0, [r1]\n\
-    ldr r0, [r0, 0x4]\n\
-    mov r4, r10\n\
-    adds r1, r4, r0\n\
-    ldrb r0, [r1, 0x10]\n\
-    ldr r4, =gUnknown_0203A034\n\
-    cmp r0, 0\n\
-    beq _080F7C4C\n\
-    adds r0, r2, r5\n\
-    lsls r0, 3\n\
-    adds r0, r6\n\
-    lsrs r2, r3, 16\n\
-    ldr r1, [r1, 0x8]\n\
-    subs r1, r2\n\
-    b _080F7C58\n\
-    .pool\n\
-_080F7C4C:\n\
-    adds r0, r2, r5\n\
-    lsls r0, 3\n\
-    adds r0, r6\n\
-    lsrs r2, r3, 16\n\
-    ldr r1, [r1, 0x8]\n\
-    adds r1, r2\n\
-_080F7C58:\n\
-    strh r1, [r0, 0xA]\n\
-    ldr r0, [r4]\n\
-    ldr r1, [r0]\n\
-    ldrb r0, [r1, 0x14]\n\
-    adds r0, 0x1\n\
-    strb r0, [r1, 0x14]\n\
-_080F7C64:\n\
-    movs r0, 0x14\n\
-    add r10, r0\n\
-    ldr r1, [sp, 0x10]\n\
-    movs r3, 0xC0\n\
-    lsls r3, 18\n\
-    adds r1, r3\n\
-    str r1, [sp, 0x10]\n\
-    movs r4, 0x1\n\
-    add r9, r4\n\
-    mov r0, r9\n\
-    cmp r0, 0x3\n\
-    bgt _080F7C7E\n\
-    b _080F7B68\n\
-_080F7C7E:\n\
-    ldr r1, [sp, 0xC]\n\
-    cmp r1, 0\n\
-    beq _080F7C8A\n\
-    movs r0, 0x16\n\
-    bl PlaySE\n\
-_080F7C8A:\n\
-    ldr r3, [sp, 0x8]\n\
-    cmp r3, 0\n\
-    beq _080F7C96\n\
-    movs r0, 0x15\n\
-    bl PlaySE\n\
-_080F7C96:\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 {r0}\n\
-    bx r0");
+    int i, taskId;
+    u32 var0;
+    u8 sp8 = 0, spC = 0;
+
+    if (!arg0)
+    {
+        for (i = 0; i < 4; i++)
+        {
+            u8 unk = (*gUnknown_0203A034->unk4)[i].unk11;
+            if (arg1 < unk)
+            {
+                FillBgTilemapBufferRect_Palette0(1, 0x60B3, ((19 + unk) - arg1) - 1, i * 3 + 5, 1, 1);
+                taskId = CreateTask(sub_80F7CA8, 10);
+
+                var0 = (((*gUnknown_0203A034->unk4)[i].unk8 << 16) / (*gUnknown_0203A034->unk4)[i].unk11) * (arg1 + 1);
+                if ((var0 & 0xFFFF) > 0x7FFF)
+                    var0 += 0x10000;
+
+                gTasks[taskId].data[0] = i;
+                gTasks[taskId].data[1] = var0 >> 16;
+                gUnknown_0203A034->unk0->unk14++;
+                sp8++;
+            }
+        }
+    }
+    else
+    {
+        for (i = 0; i < 4; i++)
+        {
+            s8 unk = (*gUnknown_0203A034->unk4)[i].unk12;
+            u32 tile = (*gUnknown_0203A034->unk4)[i].unk10 ? 0x60A5 : 0x60A3;
+            if (arg1 < unk)
+            {
+                FillBgTilemapBufferRect_Palette0(1, tile, ((19 + unk) - arg1) - 1, i * 3 + 6, 1, 1);
+                taskId = CreateTask(sub_80F7CA8, 10);
+
+                var0 = (((*gUnknown_0203A034->unk4)[i].unkC << 16) / (*gUnknown_0203A034->unk4)[i].unk12) * (arg1 + 1);
+                if ((var0 & 0xFFFF) > 0x7FFF)
+                    var0 += 0x10000;
+
+                gTasks[taskId].data[0] = i;
+                if ((*gUnknown_0203A034->unk4)[i].unk10)
+                {
+                    gTasks[taskId].data[2] = 1;
+                    spC++;
+                }
+                else
+                {
+                    sp8++;
+                }
+
+                if ((*gUnknown_0203A034->unk4)[i].unk10)
+                    gTasks[taskId].data[1] = -(var0 >> 16) + (*gUnknown_0203A034->unk4)[i].unk8 ;
+                else
+                    gTasks[taskId].data[1] = (var0 >> 16) + (*gUnknown_0203A034->unk4)[i].unk8;
+
+                gUnknown_0203A034->unk0->unk14++;
+            }
+        }
+    }
+
+    if (spC)
+        PlaySE(SE_BOO);
+    if (sp8)
+        PlaySE(SE_PIN);
 }
 
 void sub_80F7CA8(u8 taskId)
@@ -2624,8 +2051,7 @@ void sub_80F8290(void)
 
 void sub_80F82B4(void)
 {
-    u8 i;
-    u8 count;
+    u8 i, count;
 
     for (i = 0, count = 0; i < 4; i++)
     {
diff --git a/src/contest_painting.c b/src/contest_painting.c
index 820505b6e..66127cbbc 100644
--- a/src/contest_painting.c
+++ b/src/contest_painting.c
@@ -684,7 +684,7 @@ static void sub_8130760(u8 contestResult)
 
     gUnknown_030061A0.var_16 = 2;
     gUnknown_030061A0.var_0 = contestResult;
-    gUnknown_030061A0.var_10 = 0x6010000;
+    gUnknown_030061A0.var_10 = OBJ_VRAM0;
 
     sub_8124F2C(&gUnknown_030061A0);
     sub_81261A4(&gUnknown_030061A0);
diff --git a/src/data/region_map/city_map_entries.h b/src/data/region_map/city_map_entries.h
new file mode 100644
index 000000000..7b8361a7c
--- /dev/null
+++ b/src/data/region_map/city_map_entries.h
@@ -0,0 +1,113 @@
+const struct CityMapEntry gPokenavCityMaps[] = 
+{
+    {
+        .mapSecId = 0,
+        .index = 0,
+        .tilemap = gPokenavCityMap_Littleroot_0,
+    },
+    {
+        .mapSecId = 1,
+        .index = 0,
+        .tilemap = gPokenavCityMap_Oldale_0,
+    },
+    {
+        .mapSecId = 2,
+        .index = 0,
+        .tilemap = gPokenavCityMap_Dewford_0,
+    },
+    {
+        .mapSecId = 3,
+        .index = 0,
+        .tilemap = gPokenavCityMap_Lavarige_0,
+    },
+    {
+        .mapSecId = 4,
+        .index = 0,
+        .tilemap = gPokenavCityMap_Fallarbor_0,
+    },
+    {
+        .mapSecId = 5,
+        .index = 0,
+        .tilemap = gPokenavCityMap_Verdanturf_0,
+    },
+    {
+        .mapSecId = 6,
+        .index = 0,
+        .tilemap = gPokenavCityMap_Pacifidlog_0,
+    },
+    {
+        .mapSecId = 7,
+        .index = 0,
+        .tilemap = gPokenavCityMap_Petalburg_0,
+    },
+    {
+        .mapSecId = 8,
+        .index = 0,
+        .tilemap = gPokenavCityMap_Slateport_0,
+    },
+    {
+        .mapSecId = 8,
+        .index = 1,
+        .tilemap = gPokenavCityMap_Slateport_1,
+    },
+    {
+        .mapSecId = 9,
+        .index = 0,
+        .tilemap = gPokenavCityMap_Mauville_0,
+    },
+    {
+        .mapSecId = 9,
+        .index = 1,
+        .tilemap = gPokenavCityMap_Mauville_1,
+    },
+    {
+        .mapSecId = 10,
+        .index = 0,
+        .tilemap = gPokenavCityMap_Rustboro_0,
+    },
+    {
+        .mapSecId = 10,
+        .index = 1,
+        .tilemap = gPokenavCityMap_Rustboro_1,
+    },
+    {
+        .mapSecId = 11,
+        .index = 0,
+        .tilemap = gPokenavCityMap_Fortree_0,
+    },
+    {
+        .mapSecId = 12,
+        .index = 0,
+        .tilemap = gPokenavCityMap_Lilycove_0,
+    },
+    {
+        .mapSecId = 12,
+        .index = 1,
+        .tilemap = gPokenavCityMap_Lilycove_1,
+    },
+    {
+        .mapSecId = 13,
+        .index = 0,
+        .tilemap = gPokenavCityMap_Mossdeep_0,
+    },
+    {
+        .mapSecId = 13,
+        .index = 1,
+        .tilemap = gPokenavCityMap_Mossdeep_1,
+    },
+    {
+        .mapSecId = 14,
+        .index = 0,
+        .tilemap = gPokenavCityMap_Sootopolis_0,
+    },
+    {
+        .mapSecId = 15,
+        .index = 0,
+        .tilemap = gPokenavCityMap_EverGrande_0,
+    },
+    {
+        .mapSecId = 15,
+        .index = 1,
+        .tilemap = gPokenavCityMap_EverGrande_1,
+    },
+};
diff --git a/src/data/region_map/city_map_tilemaps.h b/src/data/region_map/city_map_tilemaps.h
new file mode 100644
index 000000000..8a8a931f9
--- /dev/null
+++ b/src/data/region_map/city_map_tilemaps.h
@@ -0,0 +1,22 @@
+const u32 gPokenavCityMap_Lavarige_0[] = INCBIN_U32("graphics/pokenav/city_maps/lavaridge_0.bin.lz");
+const u32 gPokenavCityMap_Fallarbor_0[] = INCBIN_U32("graphics/pokenav/city_maps/fallarbor_0.bin.lz");
+const u32 gPokenavCityMap_Fortree_0[] = INCBIN_U32("graphics/pokenav/city_maps/fortree_0.bin.lz");
+const u32 gPokenavCityMap_Slateport_0[] = INCBIN_U32("graphics/pokenav/city_maps/slateport_0.bin.lz");
+const u32 gPokenavCityMap_Slateport_1[] = INCBIN_U32("graphics/pokenav/city_maps/slateport_1.bin.lz");
+const u32 gPokenavCityMap_Rustboro_0[] = INCBIN_U32("graphics/pokenav/city_maps/rustboro_0.bin.lz");
+const u32 gPokenavCityMap_Rustboro_1[] = INCBIN_U32("graphics/pokenav/city_maps/rustboro_1.bin.lz");
+const u32 gPokenavCityMap_Pacifidlog_0[] = INCBIN_U32("graphics/pokenav/city_maps/pacifidlog_0.bin.lz");
+const u32 gPokenavCityMap_Mauville_1[] = INCBIN_U32("graphics/pokenav/city_maps/mauville_1.bin.lz");
+const u32 gPokenavCityMap_Mauville_0[] = INCBIN_U32("graphics/pokenav/city_maps/mauville_0.bin.lz");
+const u32 gPokenavCityMap_Oldale_0[] = INCBIN_U32("graphics/pokenav/city_maps/oldale_0.bin.lz");
+const u32 gPokenavCityMap_Lilycove_1[] = INCBIN_U32("graphics/pokenav/city_maps/lilycove_1.bin.lz");
+const u32 gPokenavCityMap_Lilycove_0[] = INCBIN_U32("graphics/pokenav/city_maps/lilycove_0.bin.lz");
+const u32 gPokenavCityMap_Littleroot_0[] = INCBIN_U32("graphics/pokenav/city_maps/littleroot_0.bin.lz");
+const u32 gPokenavCityMap_Dewford_0[] = INCBIN_U32("graphics/pokenav/city_maps/dewford_0.bin.lz");
+const u32 gPokenavCityMap_Sootopolis_0[] = INCBIN_U32("graphics/pokenav/city_maps/sootopolis_0.bin.lz");
+const u32 gPokenavCityMap_EverGrande_0[] = INCBIN_U32("graphics/pokenav/city_maps/ever_grande_0.bin.lz");
+const u32 gPokenavCityMap_EverGrande_1[] = INCBIN_U32("graphics/pokenav/city_maps/ever_grande_1.bin.lz");
+const u32 gPokenavCityMap_Verdanturf_0[] = INCBIN_U32("graphics/pokenav/city_maps/verdanturf_0.bin.lz");
+const u32 gPokenavCityMap_Mossdeep_1[] = INCBIN_U32("graphics/pokenav/city_maps/mossdeep_1.bin.lz");
+const u32 gPokenavCityMap_Mossdeep_0[] = INCBIN_U32("graphics/pokenav/city_maps/mossdeep_0.bin.lz");
+const u32 gPokenavCityMap_Petalburg_0[] = INCBIN_U32("graphics/pokenav/city_maps/petalburg_0.bin.lz");
diff --git a/src/data/text/gift_ribbon_descriptions.h b/src/data/text/gift_ribbon_descriptions.h
new file mode 100644
index 000000000..ea108be18
--- /dev/null
+++ b/src/data/text/gift_ribbon_descriptions.h
@@ -0,0 +1,115 @@
+const u8 gGiftRibbonDescriptionPart1_2003RegionalTourney[] = _("2003 REGIONAL TOURNEY");
+const u8 gGiftRibbonDescriptionPart2_Champion[] = _("CHAMPION RIBBON");
+const u8 gGiftRibbonDescriptionPart1_2003NationalTourney[] = _("2003 NATIONAL TOURNEY");
+const u8 gGiftRibbonDescriptionPart1_2003GlobalCup[] = _("2003 GLOBAL CUP");
+const u8 gGiftRibbonDescriptionPart2_RunnerUp[] = _("Runner-up RIBBON");
+const u8 gGiftRibbonDescriptionPart2_Semifinalist[] = _("Semifinalist RIBBON");
+const u8 gGiftRibbonDescriptionPart1_2004RegionalTourney[] = _("2004 REGIONAL TOURNEY");
+const u8 gGiftRibbonDescriptionPart1_2004NationalTourney[] = _("2004 NATIONAL TOURNEY");
+const u8 gGiftRibbonDescriptionPart1_2004GlobalCup[] = _("2004 GLOBAL CUP");
+const u8 gGiftRibbonDescriptionPart1_2005RegionalTourney[] = _("2005 REGIONAL TOURNEY");
+const u8 gGiftRibbonDescriptionPart1_2005NationalTourney[] = _("2005 NATIONAL TOURNEY");
+const u8 gGiftRibbonDescriptionPart1_2005GlobalCup[] = _("2005 GLOBAL CUP");
+const u8 gGiftRibbonDescriptionPart1_PokemonBattleCup[] = _("POKéMON BATTLE CUP");
+const u8 gGiftRibbonDescriptionPart2_Participation[] = _("Participation RIBBON");
+const u8 gGiftRibbonDescriptionPart1_PokemonLeague[] = _("POKéMON LEAGUE");
+const u8 gGiftRibbonDescriptionPart1_AdvanceCup[] = _("ADVANCE CUP");
+const u8 gGiftRibbonDescriptionPart1_PokemonTournament[] = _("POKéMON Tournament");
+const u8 gGiftRibbonDescriptionPart2_Participation2[] = _("Participation RIBBON");
+const u8 gGiftRibbonDescriptionPart1_PokemonEvent[] = _("POKéMON Event");
+const u8 gGiftRibbonDescriptionPart1_PokemonFestival[] = _("POKéMON Festival");
+const u8 gGiftRibbonDescriptionPart1_DifficultyClearing[] = _("Difficulty-clearing");
+const u8 gGiftRibbonDescriptionPart2_Commemorative[] = _("Commemorative RIBBON");
+const u8 gGiftRibbonDescriptionPart1_ClearingAllChallenges[] = _("RIBBON awarded for");
+const u8 gGiftRibbonDescriptionPart2_ClearingAllChallenges[] = _("clearing all challenges.");
+const u8 gGiftRibbonDescriptionPart1_100StraightWin[] = _("100-straight Win");
+const u8 gGiftRibbonDescriptionPart1_DarknessTower[] = _("DARKNESS TOWER Clear");
+const u8 gGiftRibbonDescriptionPart1_RedTower[] = _("RED TOWER Clear");
+const u8 gGiftRibbonDescriptionPart1_BlackironTower[] = _("BLACKIRON TOWER Clear");
+const u8 gGiftRibbonDescriptionPart1_FinalTower[] = _("FINAL TOWER Clear");
+const u8 gGiftRibbonDescriptionPart1_LegendMaking[] = _("Legend-making");
+const u8 gGiftRibbonDescriptionPart1_PokemonCenterTokyo[] = _("POKéMON CENTER TOKYO");
+const u8 gGiftRibbonDescriptionPart1_PokemonCenterOsaka[] = _("POKéMON CENTER OSAKA");
+const u8 gGiftRibbonDescriptionPart1_PokemonCenterNagoya[] = _("POKéMON CENTER NAGOYA");
+const u8 gGiftRibbonDescriptionPart1_PokemonCenterNY[] = _("POKéMON CENTER NY");
+const u8 gGiftRibbonDescriptionPart1_SummerHolidays[] = _("Summer Holidays RIBBON");
+const u8 gGiftRibbonDescriptionPart2_EmptyString[] = _("");
+const u8 gGiftRibbonDescriptionPart1_WinterHolidays[] = _("Winter Holidays RIBBON");
+const u8 gGiftRibbonDescriptionPart1_SpringHolidays[] = _("Spring Holidays RIBBON");
+const u8 gGiftRibbonDescriptionPart1_Evergreen[] = _("Evergreen RIBBON");
+const u8 gGiftRibbonDescriptionPart1_SpecialHoliday[] = _("Special Holiday RIBBON");
+const u8 gGiftRibbonDescriptionPart1_HardWorker[] = _("Hard Worker RIBBON");
+const u8 gGiftRibbonDescriptionPart1_LotsOfFriends[] = _("Lots of Friends RIBBON");
+const u8 gGiftRibbonDescriptionPart1_FullOfEnergy[] = _("Full of Energy RIBBON");
+const u8 gGiftRibbonDescriptionPart1_LovedPokemon[] = _("A commemorative RIBBON");
+const u8 gGiftRibbonDescriptionPart2_LovedPokemon[] = _("for a loved POKéMON.");
+const u8 gGiftRibbonDescriptionPart1_LoveForPokemon[] = _("RIBBON that shows");
+const u8 gGiftRibbonDescriptionPart2_LoveForPokemon[] = _("love for POKéMON.");
+
+const u8 *const gGiftRibbonDescriptionPointers[][2] = 
+{
+    {gGiftRibbonDescriptionPart1_2003RegionalTourney,   gGiftRibbonDescriptionPart2_Champion},
+    {gGiftRibbonDescriptionPart1_2003NationalTourney,   gGiftRibbonDescriptionPart2_Champion},
+    {gGiftRibbonDescriptionPart1_2003GlobalCup,         gGiftRibbonDescriptionPart2_Champion},
+    {gGiftRibbonDescriptionPart1_2003RegionalTourney,   gGiftRibbonDescriptionPart2_RunnerUp},
+    {gGiftRibbonDescriptionPart1_2003NationalTourney,   gGiftRibbonDescriptionPart2_RunnerUp},
+    {gGiftRibbonDescriptionPart1_2003GlobalCup,         gGiftRibbonDescriptionPart2_RunnerUp},
+    {gGiftRibbonDescriptionPart1_2003RegionalTourney,   gGiftRibbonDescriptionPart2_Semifinalist},
+    {gGiftRibbonDescriptionPart1_2003NationalTourney,   gGiftRibbonDescriptionPart2_Semifinalist},
+    {gGiftRibbonDescriptionPart1_2003GlobalCup,         gGiftRibbonDescriptionPart2_Semifinalist},
+    {gGiftRibbonDescriptionPart1_2004RegionalTourney,   gGiftRibbonDescriptionPart2_Champion},
+    {gGiftRibbonDescriptionPart1_2004NationalTourney,   gGiftRibbonDescriptionPart2_Champion},
+    {gGiftRibbonDescriptionPart1_2004GlobalCup,         gGiftRibbonDescriptionPart2_Champion},
+    {gGiftRibbonDescriptionPart1_2004RegionalTourney,   gGiftRibbonDescriptionPart2_RunnerUp},
+    {gGiftRibbonDescriptionPart1_2004NationalTourney,   gGiftRibbonDescriptionPart2_RunnerUp},
+    {gGiftRibbonDescriptionPart1_2004GlobalCup,         gGiftRibbonDescriptionPart2_RunnerUp},
+    {gGiftRibbonDescriptionPart1_2004RegionalTourney,   gGiftRibbonDescriptionPart2_Semifinalist},
+    {gGiftRibbonDescriptionPart1_2004NationalTourney,   gGiftRibbonDescriptionPart2_Semifinalist},
+    {gGiftRibbonDescriptionPart1_2004GlobalCup,         gGiftRibbonDescriptionPart2_Semifinalist},
+    {gGiftRibbonDescriptionPart1_2005RegionalTourney,   gGiftRibbonDescriptionPart2_Champion},
+    {gGiftRibbonDescriptionPart1_2005NationalTourney,   gGiftRibbonDescriptionPart2_Champion},
+    {gGiftRibbonDescriptionPart1_2005GlobalCup,         gGiftRibbonDescriptionPart2_Champion},
+    {gGiftRibbonDescriptionPart1_2005RegionalTourney,   gGiftRibbonDescriptionPart2_RunnerUp},
+    {gGiftRibbonDescriptionPart1_2005NationalTourney,   gGiftRibbonDescriptionPart2_RunnerUp},
+    {gGiftRibbonDescriptionPart1_2005GlobalCup,         gGiftRibbonDescriptionPart2_RunnerUp},
+    {gGiftRibbonDescriptionPart1_2005RegionalTourney,   gGiftRibbonDescriptionPart2_Semifinalist},
+    {gGiftRibbonDescriptionPart1_2005NationalTourney,   gGiftRibbonDescriptionPart2_Semifinalist},
+    {gGiftRibbonDescriptionPart1_2005GlobalCup,         gGiftRibbonDescriptionPart2_Semifinalist},
+    {gGiftRibbonDescriptionPart1_PokemonBattleCup,      gGiftRibbonDescriptionPart2_Champion},
+    {gGiftRibbonDescriptionPart1_PokemonBattleCup,      gGiftRibbonDescriptionPart2_RunnerUp},
+    {gGiftRibbonDescriptionPart1_PokemonBattleCup,      gGiftRibbonDescriptionPart2_Semifinalist},
+    {gGiftRibbonDescriptionPart1_PokemonBattleCup,      gGiftRibbonDescriptionPart2_Participation},
+    {gGiftRibbonDescriptionPart1_PokemonLeague,         gGiftRibbonDescriptionPart2_Champion},
+    {gGiftRibbonDescriptionPart1_PokemonLeague,         gGiftRibbonDescriptionPart2_RunnerUp},
+    {gGiftRibbonDescriptionPart1_PokemonLeague,         gGiftRibbonDescriptionPart2_Semifinalist},
+    {gGiftRibbonDescriptionPart1_PokemonLeague,         gGiftRibbonDescriptionPart2_Participation},
+    {gGiftRibbonDescriptionPart1_AdvanceCup,            gGiftRibbonDescriptionPart2_Champion},
+    {gGiftRibbonDescriptionPart1_AdvanceCup,            gGiftRibbonDescriptionPart2_RunnerUp},
+    {gGiftRibbonDescriptionPart1_AdvanceCup,            gGiftRibbonDescriptionPart2_Semifinalist},
+    {gGiftRibbonDescriptionPart1_AdvanceCup,            gGiftRibbonDescriptionPart2_Participation},
+    {gGiftRibbonDescriptionPart1_PokemonTournament,     gGiftRibbonDescriptionPart2_Participation2},
+    {gGiftRibbonDescriptionPart1_PokemonEvent,          gGiftRibbonDescriptionPart2_Participation2},
+    {gGiftRibbonDescriptionPart1_PokemonFestival,       gGiftRibbonDescriptionPart2_Participation2},
+    {gGiftRibbonDescriptionPart1_DifficultyClearing,    gGiftRibbonDescriptionPart2_Commemorative},
+    {gGiftRibbonDescriptionPart1_ClearingAllChallenges, gGiftRibbonDescriptionPart2_ClearingAllChallenges},
+    {gGiftRibbonDescriptionPart1_100StraightWin,        gGiftRibbonDescriptionPart2_Commemorative},
+    {gGiftRibbonDescriptionPart1_DarknessTower,         gGiftRibbonDescriptionPart2_Commemorative},
+    {gGiftRibbonDescriptionPart1_RedTower,              gGiftRibbonDescriptionPart2_Commemorative},
+    {gGiftRibbonDescriptionPart1_BlackironTower,        gGiftRibbonDescriptionPart2_Commemorative},
+    {gGiftRibbonDescriptionPart1_FinalTower,            gGiftRibbonDescriptionPart2_Commemorative},
+    {gGiftRibbonDescriptionPart1_LegendMaking,          gGiftRibbonDescriptionPart2_Commemorative},
+    {gGiftRibbonDescriptionPart1_PokemonCenterTokyo,    gGiftRibbonDescriptionPart2_Commemorative},
+    {gGiftRibbonDescriptionPart1_PokemonCenterOsaka,    gGiftRibbonDescriptionPart2_Commemorative},
+    {gGiftRibbonDescriptionPart1_PokemonCenterNagoya,   gGiftRibbonDescriptionPart2_Commemorative},
+    {gGiftRibbonDescriptionPart1_PokemonCenterNY,       gGiftRibbonDescriptionPart2_Commemorative},
+    {gGiftRibbonDescriptionPart1_SummerHolidays,        gGiftRibbonDescriptionPart2_EmptyString},
+    {gGiftRibbonDescriptionPart1_WinterHolidays,        gGiftRibbonDescriptionPart2_EmptyString},
+    {gGiftRibbonDescriptionPart1_SpringHolidays,        gGiftRibbonDescriptionPart2_EmptyString},
+    {gGiftRibbonDescriptionPart1_Evergreen,             gGiftRibbonDescriptionPart2_EmptyString},
+    {gGiftRibbonDescriptionPart1_SpecialHoliday,        gGiftRibbonDescriptionPart2_EmptyString},
+    {gGiftRibbonDescriptionPart1_HardWorker,            gGiftRibbonDescriptionPart2_EmptyString},
+    {gGiftRibbonDescriptionPart1_LotsOfFriends,         gGiftRibbonDescriptionPart2_EmptyString},
+    {gGiftRibbonDescriptionPart1_FullOfEnergy,          gGiftRibbonDescriptionPart2_EmptyString},
+    {gGiftRibbonDescriptionPart1_LovedPokemon,          gGiftRibbonDescriptionPart2_LovedPokemon},
+    {gGiftRibbonDescriptionPart1_LoveForPokemon,        gGiftRibbonDescriptionPart2_LoveForPokemon}
+};
diff --git a/src/data/text/match_call_messages.h b/src/data/text/match_call_messages.h
new file mode 100644
index 000000000..c3015b5a7
--- /dev/null
+++ b/src/data/text/match_call_messages.h
@@ -0,0 +1,476 @@
+#define MCFLAVOR(name) {gMatchCallFlavorText_##name##_Strategy, \
+                        gMatchCallFlavorText_##name##_Pokemon,  \
+                        gMatchCallFlavorText_##name##_Intro1,   \
+                        gMatchCallFlavorText_##name##_Intro2}
+
+const u8 gMatchCallFlavorText_AromaLady_Rose_Strategy[] = _("Becalm fighting emotions.");
+const u8 gMatchCallFlavorText_AromaLady_Rose_Pokemon[] = _("Fragrant GRASS POKéMON.");
+const u8 gMatchCallFlavorText_AromaLady_Rose_Intro1[] = _("Soothing aromas make the");
+const u8 gMatchCallFlavorText_AromaLady_Rose_Intro2[] = _("body and mind healthy.");
+
+const u8 gMatchCallFlavorText_RuinManiac_Andres_Strategy[] = _("I'm not very good at this.");
+const u8 gMatchCallFlavorText_RuinManiac_Andres_Pokemon[] = _("Ruin-exploration partners.");
+const u8 gMatchCallFlavorText_RuinManiac_Andres_Intro1[] = _("I am searching for undersea");
+const u8 gMatchCallFlavorText_RuinManiac_Andres_Intro2[] = _("ruins and relics.");
+
+const u8 gMatchCallFlavorText_RuinManiac_Dusty_Strategy[] = _("Overwhelm with power!");
+const u8 gMatchCallFlavorText_RuinManiac_Dusty_Pokemon[] = _("Craggy ROCK POKéMON.");
+const u8 gMatchCallFlavorText_RuinManiac_Dusty_Intro1[] = _("In search of ancient lore,");
+const u8 gMatchCallFlavorText_RuinManiac_Dusty_Intro2[] = _("I travel the world.");
+
+const u8 gMatchCallFlavorText_Tuber_Lola_Strategy[] = _("I'm going to try hard!");
+const u8 gMatchCallFlavorText_Tuber_Lola_Pokemon[] = _("Good swimmer POKéMON.");
+const u8 gMatchCallFlavorText_Tuber_Lola_Intro1[] = _("I wish I could swim without");
+const u8 gMatchCallFlavorText_Tuber_Lola_Intro2[] = _("using an inner tube.");
+
+const u8 gMatchCallFlavorText_Tuber_Ricky_Strategy[] = _("I don't know. I'll try hard.");
+const u8 gMatchCallFlavorText_Tuber_Ricky_Pokemon[] = _("WATER POKéMON are buddies.");
+const u8 gMatchCallFlavorText_Tuber_Ricky_Intro1[] = _("It's not like I can't swim.");
+const u8 gMatchCallFlavorText_Tuber_Ricky_Intro2[] = _("I just like my inner tube.");
+
+const u8 gMatchCallFlavorText_SisAndBro_LilaAndRoy_Strategy[] = _("We split our duties.");
+const u8 gMatchCallFlavorText_SisAndBro_LilaAndRoy_Pokemon[] = _("We like friendly POKéMON.");
+const u8 gMatchCallFlavorText_SisAndBro_LilaAndRoy_Intro1[] = _("We enjoy POKéMON together");
+const u8 gMatchCallFlavorText_SisAndBro_LilaAndRoy_Intro2[] = _("as sister and brother.");
+
+const u8 gMatchCallFlavorText_Cooltrainer_Cristin_Strategy[] = _("I finish with power moves!");
+const u8 gMatchCallFlavorText_Cooltrainer_Cristin_Pokemon[] = _("A mix of different types.");
+const u8 gMatchCallFlavorText_Cooltrainer_Cristin_Intro1[] = _("I aim to become the ultimate");
+const u8 gMatchCallFlavorText_Cooltrainer_Cristin_Intro2[] = _("TRAINER!");
+
+const u8 gMatchCallFlavorText_Cooltrainer_Brooke_Strategy[] = _("Exploit the foe's weakness.");
+const u8 gMatchCallFlavorText_Cooltrainer_Brooke_Pokemon[] = _("Balance is crucial.");
+const u8 gMatchCallFlavorText_Cooltrainer_Brooke_Intro1[] = _("My goal is to become the");
+const u8 gMatchCallFlavorText_Cooltrainer_Brooke_Intro2[] = _("POKéMON CHAMPION.");
+
+const u8 gMatchCallFlavorText_Cooltrainer_Wilton_Strategy[] = _("Upset the opponent.");
+const u8 gMatchCallFlavorText_Cooltrainer_Wilton_Pokemon[] = _("Type doesn't matter.");
+const u8 gMatchCallFlavorText_Cooltrainer_Wilton_Intro1[] = _("I'm a top student at the");
+const u8 gMatchCallFlavorText_Cooltrainer_Wilton_Intro2[] = _("TRAINER'S SCHOOL.");
+
+const u8 gMatchCallFlavorText_HexManiac_Valerie_Strategy[] = _("Slow, steady suffering.");
+const u8 gMatchCallFlavorText_HexManiac_Valerie_Pokemon[] = _("Scary to meet at night.");
+const u8 gMatchCallFlavorText_HexManiac_Valerie_Intro1[] = _("I see things that others");
+const u8 gMatchCallFlavorText_HexManiac_Valerie_Intro2[] = _("can't see...");
+
+const u8 gMatchCallFlavorText_Lady_Cindy_Strategy[] = _("Anything to win.");
+const u8 gMatchCallFlavorText_Lady_Cindy_Pokemon[] = _("Gorgeous type!");
+const u8 gMatchCallFlavorText_Lady_Cindy_Intro1[] = _("I have a pool specially for");
+const u8 gMatchCallFlavorText_Lady_Cindy_Intro2[] = _("my POKéMON at home.");
+
+const u8 gMatchCallFlavorText_Beauty_Thalia_Strategy[] = _("You'll fall under my spell!");
+const u8 gMatchCallFlavorText_Beauty_Thalia_Pokemon[] = _("Mature WATER type.");
+const u8 gMatchCallFlavorText_Beauty_Thalia_Intro1[] = _("I dream of cruising around");
+const u8 gMatchCallFlavorText_Beauty_Thalia_Intro2[] = _("the world on a luxury liner.");
+
+const u8 gMatchCallFlavorText_Beauty_Jessica_Strategy[] = _("I'll lead you astray.");
+const u8 gMatchCallFlavorText_Beauty_Jessica_Pokemon[] = _("Cute, of course.");
+const u8 gMatchCallFlavorText_Beauty_Jessica_Intro1[] = _("I love the SAFARI ZONE.");
+const u8 gMatchCallFlavorText_Beauty_Jessica_Intro2[] = _("I seem to end up there.");
+
+const u8 gMatchCallFlavorText_RichBoy_Winston_Strategy[] = _("Strategy? Who needs it?");
+const u8 gMatchCallFlavorText_RichBoy_Winston_Pokemon[] = _("I spent big money on it!");
+const u8 gMatchCallFlavorText_RichBoy_Winston_Intro1[] = _("I, being rich, sleep in a");
+const u8 gMatchCallFlavorText_RichBoy_Winston_Intro2[] = _("custom POKéMON bed.");
+
+const u8 gMatchCallFlavorText_PokeManiac_Steve_Strategy[] = _("Wrestle down with power.");
+const u8 gMatchCallFlavorText_PokeManiac_Steve_Pokemon[] = _("Took all night to catch.");
+const u8 gMatchCallFlavorText_PokeManiac_Steve_Intro1[] = _("Big, burly, and buff");
+const u8 gMatchCallFlavorText_PokeManiac_Steve_Intro2[] = _("POKéMON are the best...");
+
+const u8 gMatchCallFlavorText_Swimmer_Tony_Strategy[] = _("Ram at full speed!");
+const u8 gMatchCallFlavorText_Swimmer_Tony_Pokemon[] = _("Funky WATER type!");
+const u8 gMatchCallFlavorText_Swimmer_Tony_Intro1[] = _("If I can't be out swimming,");
+const u8 gMatchCallFlavorText_Swimmer_Tony_Intro2[] = _("I'll be pumping weights.");
+
+const u8 gMatchCallFlavorText_BlackBelt_Nob_Strategy[] = _("Grand slam pummeling!");
+const u8 gMatchCallFlavorText_BlackBelt_Nob_Pokemon[] = _("FIGHTING type.");
+const u8 gMatchCallFlavorText_BlackBelt_Nob_Intro1[] = _("Not to brag, but I can bust");
+const u8 gMatchCallFlavorText_BlackBelt_Nob_Intro2[] = _("ten roof tiles!");
+
+const u8 gMatchCallFlavorText_BlackBelt_Koji_Strategy[] = _("Witness karate power!");
+const u8 gMatchCallFlavorText_BlackBelt_Koji_Pokemon[] = _("My partners in training!");
+const u8 gMatchCallFlavorText_BlackBelt_Koji_Intro1[] = _("Let us discuss matters of");
+const u8 gMatchCallFlavorText_BlackBelt_Koji_Intro2[] = _("the world with bare fists!");
+
+const u8 gMatchCallFlavorText_Guitarist_Fernando_Strategy[] = _("Rock to stunning sounds!");
+const u8 gMatchCallFlavorText_Guitarist_Fernando_Pokemon[] = _("Electric-and-sound combo!");
+const u8 gMatchCallFlavorText_Guitarist_Fernando_Intro1[] = _("My compositions will shock");
+const u8 gMatchCallFlavorText_Guitarist_Fernando_Intro2[] = _("you and stun you!");
+
+const u8 gMatchCallFlavorText_Guitarist_Dalton_Strategy[] = _("I'll electrify you!");
+const u8 gMatchCallFlavorText_Guitarist_Dalton_Pokemon[] = _("They're ELECTRIC!");
+const u8 gMatchCallFlavorText_Guitarist_Dalton_Intro1[] = _("I want to make people cry");
+const u8 gMatchCallFlavorText_Guitarist_Dalton_Intro2[] = _("with songs from my heart.");
+
+const u8 gMatchCallFlavorText_Kindler_Bernie_Strategy[] = _("Burn it all down!");
+const u8 gMatchCallFlavorText_Kindler_Bernie_Pokemon[] = _("Burn-inducing POKéMON.");
+const u8 gMatchCallFlavorText_Kindler_Bernie_Intro1[] = _("When you light a campfire,");
+const u8 gMatchCallFlavorText_Kindler_Bernie_Intro2[] = _("be sure there's some water.");
+
+const u8 gMatchCallFlavorText_Camper_Ethan_Strategy[] = _("Hang in and be tenacious!");
+const u8 gMatchCallFlavorText_Camper_Ethan_Pokemon[] = _("I'll raise any POKéMON.");
+const u8 gMatchCallFlavorText_Camper_Ethan_Intro1[] = _("POKéMON raised in the wild");
+const u8 gMatchCallFlavorText_Camper_Ethan_Intro2[] = _("grow strong!");
+
+const u8 gMatchCallFlavorText_OldCouple_JohnAndJay_Strategy[] = _("Our love lets us prevail.");
+const u8 gMatchCallFlavorText_OldCouple_JohnAndJay_Pokemon[] = _("We've had them for years.");
+const u8 gMatchCallFlavorText_OldCouple_JohnAndJay_Intro1[] = _("Married 50 years, we've");
+const u8 gMatchCallFlavorText_OldCouple_JohnAndJay_Intro2[] = _("devotedly raised POKéMON.");
+
+const u8 gMatchCallFlavorText_BugManiac_Jeffrey_Strategy[] = _("Attack in waves!");
+const u8 gMatchCallFlavorText_BugManiac_Jeffrey_Pokemon[] = _("BUG POKéMON are cool.");
+const u8 gMatchCallFlavorText_BugManiac_Jeffrey_Intro1[] = _("I go into the forest every");
+const u8 gMatchCallFlavorText_BugManiac_Jeffrey_Intro2[] = _("day to catch BUG POKéMON.");
+
+const u8 gMatchCallFlavorText_Psychic_Cameron_Strategy[] = _("Daze and confuse!");
+const u8 gMatchCallFlavorText_Psychic_Cameron_Pokemon[] = _("Ones with weird powers.");
+const u8 gMatchCallFlavorText_Psychic_Cameron_Intro1[] = _("I can see through exactly");
+const u8 gMatchCallFlavorText_Psychic_Cameron_Intro2[] = _("what you're thinking!");
+
+const u8 gMatchCallFlavorText_Psychic_Jacki_Strategy[] = _("Battle at full power.");
+const u8 gMatchCallFlavorText_Psychic_Jacki_Pokemon[] = _("POKéMON of many mysteries.");
+const u8 gMatchCallFlavorText_Psychic_Jacki_Intro1[] = _("When we spoke, I was really");
+const u8 gMatchCallFlavorText_Psychic_Jacki_Intro2[] = _("using telepathy.");
+
+const u8 gMatchCallFlavorText_Gentleman_Walter_Strategy[] = _("Calm and collected.");
+const u8 gMatchCallFlavorText_Gentleman_Walter_Pokemon[] = _("POKéMON of distinction.");
+const u8 gMatchCallFlavorText_Gentleman_Walter_Intro1[] = _("We enjoy a spot of tea");
+const u8 gMatchCallFlavorText_Gentleman_Walter_Intro2[] = _("every day. It's imported.");
+
+const u8 gMatchCallFlavorText_SchoolKid_Karen_Strategy[] = _("I use my head to battle.");
+const u8 gMatchCallFlavorText_SchoolKid_Karen_Pokemon[] = _("I love any kind of POKéMON!");
+const u8 gMatchCallFlavorText_SchoolKid_Karen_Intro1[] = _("My daddy gives me spending");
+const u8 gMatchCallFlavorText_SchoolKid_Karen_Intro2[] = _("money if I ace a test.");
+
+const u8 gMatchCallFlavorText_SchoolKid_Jerry_Strategy[] = _("My knowledge rules!");
+const u8 gMatchCallFlavorText_SchoolKid_Jerry_Pokemon[] = _("Any smart POKéMON!");
+const u8 gMatchCallFlavorText_SchoolKid_Jerry_Intro1[] = _("I want to be a POKéMON");
+const u8 gMatchCallFlavorText_SchoolKid_Jerry_Intro2[] = _("researcher in the future.");
+
+const u8 gMatchCallFlavorText_SrAndJr_AnnaAndMeg_Strategy[] = _("We talk it over first.");
+const u8 gMatchCallFlavorText_SrAndJr_AnnaAndMeg_Pokemon[] = _("POKéMON that we both like.");
+const u8 gMatchCallFlavorText_SrAndJr_AnnaAndMeg_Intro1[] = _("We're senior and junior");
+const u8 gMatchCallFlavorText_SrAndJr_AnnaAndMeg_Intro2[] = _("students into POKéMON!");
+
+const u8 gMatchCallFlavorText_Pokefan_Isabel_Strategy[] = _("Go for it, my dears!");
+const u8 gMatchCallFlavorText_Pokefan_Isabel_Pokemon[] = _("I have no likes or dislikes.");
+const u8 gMatchCallFlavorText_Pokefan_Isabel_Intro1[] = _("While out shopping for");
+const u8 gMatchCallFlavorText_Pokefan_Isabel_Intro2[] = _("supper, I battle too.");
+
+const u8 gMatchCallFlavorText_Pokefan_Miguel_Strategy[] = _("I battle with love!");
+const u8 gMatchCallFlavorText_Pokefan_Miguel_Pokemon[] = _("A POKéMON raised with love!");
+const u8 gMatchCallFlavorText_Pokefan_Miguel_Intro1[] = _("It's important to build");
+const u8 gMatchCallFlavorText_Pokefan_Miguel_Intro2[] = _("trust with your POKéMON.");
+
+const u8 gMatchCallFlavorText_Expert_Timothy_Strategy[] = _("I see through your moves!");
+const u8 gMatchCallFlavorText_Expert_Timothy_Pokemon[] = _("The essence of FIGHTING.");
+const u8 gMatchCallFlavorText_Expert_Timothy_Intro1[] = _("I'm not ready to give way");
+const u8 gMatchCallFlavorText_Expert_Timothy_Intro2[] = _("to the young yet!");
+
+const u8 gMatchCallFlavorText_Expert_Shelby_Strategy[] = _("Attack while defending.");
+const u8 gMatchCallFlavorText_Expert_Shelby_Pokemon[] = _("The FIGHTING type.");
+const u8 gMatchCallFlavorText_Expert_Shelby_Intro1[] = _("Being old, I have my own");
+const u8 gMatchCallFlavorText_Expert_Shelby_Intro2[] = _("style of battling.");
+
+const u8 gMatchCallFlavorText_Youngster_Calvin_Strategy[] = _("I do what I can.");
+const u8 gMatchCallFlavorText_Youngster_Calvin_Pokemon[] = _("I use different types.");
+const u8 gMatchCallFlavorText_Youngster_Calvin_Intro1[] = _("I'm going to keep working");
+const u8 gMatchCallFlavorText_Youngster_Calvin_Intro2[] = _("until I beat a GYM LEADER.");
+
+const u8 gMatchCallFlavorText_Fisherman_Elliot_Strategy[] = _("I battle patiently.");
+const u8 gMatchCallFlavorText_Fisherman_Elliot_Pokemon[] = _("WATER POKéMON to battle!");
+const u8 gMatchCallFlavorText_Fisherman_Elliot_Intro1[] = _("I'm the world's only guy to");
+const u8 gMatchCallFlavorText_Fisherman_Elliot_Intro2[] = _("catch a huge POKéMON!");
+
+const u8 gMatchCallFlavorText_Triathlete_Isaiah_Strategy[] = _("Exploit the environment!");
+const u8 gMatchCallFlavorText_Triathlete_Isaiah_Pokemon[] = _("All hail the WATER type!");
+const u8 gMatchCallFlavorText_Triathlete_Isaiah_Intro1[] = _("I won't be beaten by some");
+const u8 gMatchCallFlavorText_Triathlete_Isaiah_Intro2[] = _("beach bum SWIMMER!");
+
+const u8 gMatchCallFlavorText_Triathlete_Maria_Strategy[] = _("Speed above all!");
+const u8 gMatchCallFlavorText_Triathlete_Maria_Pokemon[] = _("I use a speedy POKéMON.");
+const u8 gMatchCallFlavorText_Triathlete_Maria_Intro1[] = _("A marathon is a challenge");
+const u8 gMatchCallFlavorText_Triathlete_Maria_Intro2[] = _("against your own self.");
+
+const u8 gMatchCallFlavorText_Triathlete_Abigail_Strategy[] = _("Defense is crucial.");
+const u8 gMatchCallFlavorText_Triathlete_Abigail_Pokemon[] = _("My POKéMON is solid.");
+const u8 gMatchCallFlavorText_Triathlete_Abigail_Intro1[] = _("I started this for dieting,");
+const u8 gMatchCallFlavorText_Triathlete_Abigail_Intro2[] = _("but I got right into it.");
+
+const u8 gMatchCallFlavorText_Triathlete_Dylan_Strategy[] = _("Strike before stricken!");
+const u8 gMatchCallFlavorText_Triathlete_Dylan_Pokemon[] = _("A fast-running POKéMON!");
+const u8 gMatchCallFlavorText_Triathlete_Dylan_Intro1[] = _("If you ran and ran, you'd");
+const u8 gMatchCallFlavorText_Triathlete_Dylan_Intro2[] = _("become one with the wind.");
+
+const u8 gMatchCallFlavorText_Triathlete_Katelyn_Strategy[] = _("All-out offensive!");
+const u8 gMatchCallFlavorText_Triathlete_Katelyn_Pokemon[] = _("WATER POKéMON rule!");
+const u8 gMatchCallFlavorText_Triathlete_Katelyn_Intro1[] = _("I must swim over 6 miles");
+const u8 gMatchCallFlavorText_Triathlete_Katelyn_Intro2[] = _("every day.");
+
+const u8 gMatchCallFlavorText_Triathlete_Benjamin_Strategy[] = _("Push and push again!");
+const u8 gMatchCallFlavorText_Triathlete_Benjamin_Pokemon[] = _("The strength of STEEL.");
+const u8 gMatchCallFlavorText_Triathlete_Benjamin_Intro1[] = _("If you're sweating, get");
+const u8 gMatchCallFlavorText_Triathlete_Benjamin_Intro2[] = _("fluids into you regularly.");
+
+const u8 gMatchCallFlavorText_Triathlete_Pablo_Strategy[] = _("Draw the power of WATER.");
+const u8 gMatchCallFlavorText_Triathlete_Pablo_Pokemon[] = _("Toughened WATER POKéMON.");
+const u8 gMatchCallFlavorText_Triathlete_Pablo_Intro1[] = _("Training POKéMON is good,");
+const u8 gMatchCallFlavorText_Triathlete_Pablo_Intro2[] = _("but don't neglect yourself.");
+
+const u8 gMatchCallFlavorText_DragonTamer_Nicolas_Strategy[] = _("It's about POKéMON power!");
+const u8 gMatchCallFlavorText_DragonTamer_Nicolas_Pokemon[] = _("See the power of DRAGONS!");
+const u8 gMatchCallFlavorText_DragonTamer_Nicolas_Intro1[] = _("I'll become legendary as the");
+const u8 gMatchCallFlavorText_DragonTamer_Nicolas_Intro2[] = _("strongest one day!");
+
+const u8 gMatchCallFlavorText_BirdKeeper_Robert_Strategy[] = _("I'll show you my technique!");
+const u8 gMatchCallFlavorText_BirdKeeper_Robert_Pokemon[] = _("Elegantly wheeling BIRDS.");
+const u8 gMatchCallFlavorText_BirdKeeper_Robert_Intro1[] = _("My BIRD POKéMON, deliver my");
+const u8 gMatchCallFlavorText_BirdKeeper_Robert_Intro2[] = _("love to that girl!");
+
+const u8 gMatchCallFlavorText_NinjaBoy_Lao_Strategy[] = _("You'll suffer from poison!");
+const u8 gMatchCallFlavorText_NinjaBoy_Lao_Pokemon[] = _("Poisonous POKéMON.");
+const u8 gMatchCallFlavorText_NinjaBoy_Lao_Intro1[] = _("I undertake training so");
+const u8 gMatchCallFlavorText_NinjaBoy_Lao_Intro2[] = _("that I may become a ninja.");
+
+const u8 gMatchCallFlavorText_BattleGirl_Cyndy_Strategy[] = _("The first strike wins!");
+const u8 gMatchCallFlavorText_BattleGirl_Cyndy_Pokemon[] = _("Speedy FIGHTING type.");
+const u8 gMatchCallFlavorText_BattleGirl_Cyndy_Intro1[] = _("If my POKéMON lose,");
+const u8 gMatchCallFlavorText_BattleGirl_Cyndy_Intro2[] = _("I'll carry on the fight!");
+
+const u8 gMatchCallFlavorText_ParasolLady_Madeline_Strategy[] = _("Go, go, my POKéMON!");
+const u8 gMatchCallFlavorText_ParasolLady_Madeline_Pokemon[] = _("I'll raise anything.");
+const u8 gMatchCallFlavorText_ParasolLady_Madeline_Intro1[] = _("UV rays are your skin's");
+const u8 gMatchCallFlavorText_ParasolLady_Madeline_Intro2[] = _("enemy. Get protected.");
+
+const u8 gMatchCallFlavorText_Swimmer_Jenny_Strategy[] = _("No mercy!");
+const u8 gMatchCallFlavorText_Swimmer_Jenny_Pokemon[] = _("Cute WATER POKéMON.");
+const u8 gMatchCallFlavorText_Swimmer_Jenny_Intro1[] = _("I have too many fans.");
+const u8 gMatchCallFlavorText_Swimmer_Jenny_Intro2[] = _("I was interviewed on TV.");
+
+const u8 gMatchCallFlavorText_Picnicker_Diana_Strategy[] = _("I think about this & that.");
+const u8 gMatchCallFlavorText_Picnicker_Diana_Pokemon[] = _("I like all POKéMON.");
+const u8 gMatchCallFlavorText_Picnicker_Diana_Intro1[] = _("What lies beyond that");
+const u8 gMatchCallFlavorText_Picnicker_Diana_Intro2[] = _("yonder hill?");
+
+const u8 gMatchCallFlavorText_Twins_AmyAndLiv_Strategy[] = _("We battle together!");
+const u8 gMatchCallFlavorText_Twins_AmyAndLiv_Pokemon[] = _("We train together!");
+const u8 gMatchCallFlavorText_Twins_AmyAndLiv_Intro1[] = _("We like the same POKéMON,");
+const u8 gMatchCallFlavorText_Twins_AmyAndLiv_Intro2[] = _("but different desserts.");
+
+const u8 gMatchCallFlavorText_Sailor_Ernest_Strategy[] = _("I force things with power!");
+const u8 gMatchCallFlavorText_Sailor_Ernest_Pokemon[] = _("WATER and FIGHTING types.");
+const u8 gMatchCallFlavorText_Sailor_Ernest_Intro1[] = _("Seamen are rough spirits!");
+const u8 gMatchCallFlavorText_Sailor_Ernest_Intro2[] = _("Any complaints?");
+
+const u8 gMatchCallFlavorText_Sailor_Cory_Strategy[] = _("Up for a fight anytime!");
+const u8 gMatchCallFlavorText_Sailor_Cory_Pokemon[] = _("WATER POKéMON are my faves!");
+const u8 gMatchCallFlavorText_Sailor_Cory_Intro1[] = _("If you want to shout loud,");
+const u8 gMatchCallFlavorText_Sailor_Cory_Intro2[] = _("suck in air with your belly!");
+
+const u8 gMatchCallFlavorText_Collector_Edwin_Strategy[] = _("Protect POKéMON from harm.");
+const u8 gMatchCallFlavorText_Collector_Edwin_Pokemon[] = _("I love rare POKéMON.");
+const u8 gMatchCallFlavorText_Collector_Edwin_Intro1[] = _("I want to collect all the");
+const u8 gMatchCallFlavorText_Collector_Edwin_Intro2[] = _("world's rare POKéMON.");
+
+const u8 gMatchCallFlavorText_PkmnBreeder_Lydia_Strategy[] = _("I count on power.");
+const u8 gMatchCallFlavorText_PkmnBreeder_Lydia_Pokemon[] = _("POKéMON are my children.");
+const u8 gMatchCallFlavorText_PkmnBreeder_Lydia_Intro1[] = _("It takes knowledge and");
+const u8 gMatchCallFlavorText_PkmnBreeder_Lydia_Intro2[] = _("love to raise POKéMON.");
+
+const u8 gMatchCallFlavorText_PkmnBreeder_Isaac_Strategy[] = _("Full-on attack!");
+const u8 gMatchCallFlavorText_PkmnBreeder_Isaac_Pokemon[] = _("Anything. I'll raise it.");
+const u8 gMatchCallFlavorText_PkmnBreeder_Isaac_Intro1[] = _("I give them {POKEBLOCK}S for");
+const u8 gMatchCallFlavorText_PkmnBreeder_Isaac_Intro2[] = _("going after CONTEST titles.");
+
+const u8 gMatchCallFlavorText_PkmnBreeder_Gabrielle_Strategy[] = _("I raise POKéMON with care.");
+const u8 gMatchCallFlavorText_PkmnBreeder_Gabrielle_Pokemon[] = _("Fun-to-raise POKéMON.");
+const u8 gMatchCallFlavorText_PkmnBreeder_Gabrielle_Intro1[] = _("Treat every POKéMON you");
+const u8 gMatchCallFlavorText_PkmnBreeder_Gabrielle_Intro2[] = _("meet with respect.");
+
+const u8 gMatchCallFlavorText_PkmnRanger_Catherine_Strategy[] = _("I believe in my POKéMON.");
+const u8 gMatchCallFlavorText_PkmnRanger_Catherine_Pokemon[] = _("I like strong POKéMON.");
+const u8 gMatchCallFlavorText_PkmnRanger_Catherine_Intro1[] = _("I'm training for rescue");
+const u8 gMatchCallFlavorText_PkmnRanger_Catherine_Intro2[] = _("work with my POKéMON.");
+
+const u8 gMatchCallFlavorText_PkmnRanger_Jackson_Strategy[] = _("Attack in waves!");
+const u8 gMatchCallFlavorText_PkmnRanger_Jackson_Pokemon[] = _("I use different types.");
+const u8 gMatchCallFlavorText_PkmnRanger_Jackson_Intro1[] = _("Those who destroy nature");
+const u8 gMatchCallFlavorText_PkmnRanger_Jackson_Intro2[] = _("must never be forgiven!");
+
+const u8 gMatchCallFlavorText_Lass_Haley_Strategy[] = _("I'll show you some guts!");
+const u8 gMatchCallFlavorText_Lass_Haley_Pokemon[] = _("Cute POKéMON are my faves!");
+const u8 gMatchCallFlavorText_Lass_Haley_Intro1[] = _("After a battle, I always");
+const u8 gMatchCallFlavorText_Lass_Haley_Intro2[] = _("bathe with my POKéMON.");
+
+const u8 gMatchCallFlavorText_BugCatcher_James_Strategy[] = _("Lightning-fast attack!");
+const u8 gMatchCallFlavorText_BugCatcher_James_Pokemon[] = _("BUG POKéMON are number 1!");
+const u8 gMatchCallFlavorText_BugCatcher_James_Intro1[] = _("If you want to catch BUG");
+const u8 gMatchCallFlavorText_BugCatcher_James_Intro2[] = _("POKéMON, wake up early.");
+
+const u8 gMatchCallFlavorText_Hiker_Trent_Strategy[] = _("I battle with power.");
+const u8 gMatchCallFlavorText_Hiker_Trent_Pokemon[] = _("Hard-bodied POKéMON.");
+const u8 gMatchCallFlavorText_Hiker_Trent_Intro1[] = _("I've been planning a month");
+const u8 gMatchCallFlavorText_Hiker_Trent_Intro2[] = _("for today's hike.");
+
+const u8 gMatchCallFlavorText_Hiker_Sawyer_Strategy[] = _("I like it hot!");
+const u8 gMatchCallFlavorText_Hiker_Sawyer_Pokemon[] = _("Hot POKéMON!");
+const u8 gMatchCallFlavorText_Hiker_Sawyer_Intro1[] = _("As much as I love POKéMON,");
+const u8 gMatchCallFlavorText_Hiker_Sawyer_Intro2[] = _("I surely like hiking!");
+
+const u8 gMatchCallFlavorText_YoungCouple_LoisAndHal_Strategy[] = _("Lovey-dovey strategy!");
+const u8 gMatchCallFlavorText_YoungCouple_LoisAndHal_Pokemon[] = _("Lovey-dovey POKéMON!");
+const u8 gMatchCallFlavorText_YoungCouple_LoisAndHal_Intro1[] = _("We're lovey-dovey!");
+const u8 gMatchCallFlavorText_YoungCouple_LoisAndHal_Intro2[] = _("Forever lovey-dovey!");
+
+const u8 gMatchCallFlavorText_PkmnTrainer_Wally_Strategy[] = _("We let it all hang out.");
+const u8 gMatchCallFlavorText_PkmnTrainer_Wally_Pokemon[] = _("The 1st POKéMON I caught.");
+const u8 gMatchCallFlavorText_PkmnTrainer_Wally_Intro1[] = _("POKéMON and I have grown");
+const u8 gMatchCallFlavorText_PkmnTrainer_Wally_Intro2[] = _("stronger together.");
+
+const u8 gMatchCallFlavorText_RockinWhiz_Roxanne_Strategy[] = _("ROCK-type power attack.");
+const u8 gMatchCallFlavorText_RockinWhiz_Roxanne_Pokemon[] = _("I prefer rock-hard POKéMON.");
+const u8 gMatchCallFlavorText_RockinWhiz_Roxanne_Intro1[] = _("A LEADER of a big GYM bears");
+const u8 gMatchCallFlavorText_RockinWhiz_Roxanne_Intro2[] = _("a lot of responsibility.");
+
+const u8 gMatchCallFlavorText_TheBigHit_Brawly_Strategy[] = _("Direct physical action!");
+const u8 gMatchCallFlavorText_TheBigHit_Brawly_Pokemon[] = _("FIGHTING POKéMON rule!");
+const u8 gMatchCallFlavorText_TheBigHit_Brawly_Intro1[] = _("The world awaits me as the");
+const u8 gMatchCallFlavorText_TheBigHit_Brawly_Intro2[] = _("next big wave!");
+
+const u8 gMatchCallFlavorText_SwellShock_Wattson_Strategy[] = _("I choose to electrify.");
+const u8 gMatchCallFlavorText_SwellShock_Wattson_Pokemon[] = _("Get shocked by electricity!");
+const u8 gMatchCallFlavorText_SwellShock_Wattson_Intro1[] = _("One must never throw a");
+const u8 gMatchCallFlavorText_SwellShock_Wattson_Intro2[] = _("match. Even I must not.");
+
+const u8 gMatchCallFlavorText_PassionBurn_Flannery_Strategy[] = _("Battle aggressively.");
+const u8 gMatchCallFlavorText_PassionBurn_Flannery_Pokemon[] = _("Burn with passion!");
+const u8 gMatchCallFlavorText_PassionBurn_Flannery_Intro1[] = _("Completely wash away daily");
+const u8 gMatchCallFlavorText_PassionBurn_Flannery_Intro2[] = _("fatigue in hot springs!");
+
+const u8 gMatchCallFlavorText_ReliableOne_Dad_Strategy[] = _("I flexibly adapt my style.");
+const u8 gMatchCallFlavorText_ReliableOne_Dad_Pokemon[] = _("Grown in a balanced manner.");
+const u8 gMatchCallFlavorText_ReliableOne_Dad_Intro1[] = _("I walk the 30 minutes from");
+const u8 gMatchCallFlavorText_ReliableOne_Dad_Intro2[] = _("home to here every day.");
+
+const u8 gMatchCallFlavorText_SkyTamer_Winona_Strategy[] = _("I take advantage of speed.");
+const u8 gMatchCallFlavorText_SkyTamer_Winona_Pokemon[] = _("Graceful sky dancers.");
+const u8 gMatchCallFlavorText_SkyTamer_Winona_Intro1[] = _("The ultimate would be to");
+const u8 gMatchCallFlavorText_SkyTamer_Winona_Intro2[] = _("live as one with nature.");
+
+const u8 gMatchCallFlavorText_MysticDuo_TateAndLiza_Strategy[] = _("We battle in cooperation.");
+const u8 gMatchCallFlavorText_MysticDuo_TateAndLiza_Pokemon[] = _("Always friendly POKéMON.");
+const u8 gMatchCallFlavorText_MysticDuo_TateAndLiza_Intro1[] = _("Papa has trouble telling");
+const u8 gMatchCallFlavorText_MysticDuo_TateAndLiza_Intro2[] = _("the two of us apart!");
+
+const u8 gMatchCallFlavorText_DandyCharm_Juan_Strategy[] = _("I use splendid waterpower.");
+const u8 gMatchCallFlavorText_DandyCharm_Juan_Pokemon[] = _("POKéMON of elegance!");
+const u8 gMatchCallFlavorText_DandyCharm_Juan_Intro1[] = _("The adulation of beautiful");
+const u8 gMatchCallFlavorText_DandyCharm_Juan_Intro2[] = _("ladies fills me with energy!");
+
+const u8 gMatchCallFlavorText_EliteFour_Sidney_Strategy[] = _("Offense over defense!");
+const u8 gMatchCallFlavorText_EliteFour_Sidney_Pokemon[] = _("The DARK side's beauties.");
+const u8 gMatchCallFlavorText_EliteFour_Sidney_Intro1[] = _("They said I was a punk, but");
+const u8 gMatchCallFlavorText_EliteFour_Sidney_Intro2[] = _("I'm one of the ELITE FOUR!");
+
+const u8 gMatchCallFlavorText_EliteFour_Phoebe_Strategy[] = _("Confuse and confound.");
+const u8 gMatchCallFlavorText_EliteFour_Phoebe_Pokemon[] = _("There's nothing definite.");
+const u8 gMatchCallFlavorText_EliteFour_Phoebe_Intro1[] = _("I wonder how my grandma at");
+const u8 gMatchCallFlavorText_EliteFour_Phoebe_Intro2[] = _("MT. PYRE is doing?");
+
+const u8 gMatchCallFlavorText_EliteFour_Glacia_Strategy[] = _("I use items for help.");
+const u8 gMatchCallFlavorText_EliteFour_Glacia_Pokemon[] = _("Flaming passion in icy cold!");
+const u8 gMatchCallFlavorText_EliteFour_Glacia_Intro1[] = _("The ICE type can be better");
+const u8 gMatchCallFlavorText_EliteFour_Glacia_Intro2[] = _("trained in this hot land.");
+
+const u8 gMatchCallFlavorText_EliteFour_Drake_Strategy[] = _("Harness strong abilities.");
+const u8 gMatchCallFlavorText_EliteFour_Drake_Pokemon[] = _("The raw power of DRAGONS!");
+const u8 gMatchCallFlavorText_EliteFour_Drake_Intro1[] = _("I dedicate myself to the");
+const u8 gMatchCallFlavorText_EliteFour_Drake_Intro2[] = _("POKéMON that saved me.");
+
+const u8 gMatchCallFlavorText_Champion_Wallace_Strategy[] = _("Dignity and respect.");
+const u8 gMatchCallFlavorText_Champion_Wallace_Pokemon[] = _("I prefer POKéMON of grace.");
+const u8 gMatchCallFlavorText_Champion_Wallace_Intro1[] = _("I represent beauty as");
+const u8 gMatchCallFlavorText_Champion_Wallace_Intro2[] = _("well as intelligence.");
+
+const u8 *const gMatchCallMessages[][4] = 
+{
+    [REMATCH_ROSE] = MCFLAVOR(AromaLady_Rose),
+    [REMATCH_ANDRES] = MCFLAVOR(RuinManiac_Andres),
+    [REMATCH_DUSTY] = MCFLAVOR(RuinManiac_Dusty),
+    [REMATCH_LOLA] = MCFLAVOR(Tuber_Lola),
+    [REMATCH_RICKY] = MCFLAVOR(Tuber_Ricky),
+    [REMATCH_LILA_AND_ROY] = MCFLAVOR(SisAndBro_LilaAndRoy),
+    [REMATCH_CRISTIN] = MCFLAVOR(Cooltrainer_Cristin),
+    [REMATCH_BROOKE] = MCFLAVOR(Cooltrainer_Brooke),
+    [REMATCH_WILTON] = MCFLAVOR(Cooltrainer_Wilton),
+    [REMATCH_VALERIE] = MCFLAVOR(HexManiac_Valerie),
+    [REMATCH_CINDY] = MCFLAVOR(Lady_Cindy),
+    [REMATCH_THALIA] = MCFLAVOR(Beauty_Thalia),
+    [REMATCH_JESSICA] = MCFLAVOR(Beauty_Jessica),
+    [REMATCH_WINSTON] = MCFLAVOR(RichBoy_Winston),
+    [REMATCH_STEVE] = MCFLAVOR(PokeManiac_Steve),
+    [REMATCH_TONY] = MCFLAVOR(Swimmer_Tony),
+    [REMATCH_NOB] = MCFLAVOR(BlackBelt_Nob),
+    [REMATCH_KOJI] = MCFLAVOR(BlackBelt_Koji),
+    [REMATCH_FERNANDO] = MCFLAVOR(Guitarist_Fernando),
+    [REMATCH_DALTON] = MCFLAVOR(Guitarist_Dalton),
+    [REMATCH_BERNIE] = MCFLAVOR(Kindler_Bernie),
+    [REMATCH_ETHAN] = MCFLAVOR(Camper_Ethan),
+    [REMATCH_JOHN_AND_JAY] = MCFLAVOR(OldCouple_JohnAndJay),
+    [REMATCH_JEFFREY] = MCFLAVOR(BugManiac_Jeffrey),
+    [REMATCH_CAMERON] = MCFLAVOR(Psychic_Cameron),
+    [REMATCH_JACKI] = MCFLAVOR(Psychic_Jacki),
+    [REMATCH_WALTER] = MCFLAVOR(Gentleman_Walter),
+    [REMATCH_KAREN] = MCFLAVOR(SchoolKid_Karen),
+    [REMATCH_JERRY] = MCFLAVOR(SchoolKid_Jerry),
+    [REMATCH_ANNA_AND_MEG] = MCFLAVOR(SrAndJr_AnnaAndMeg),
+    [REMATCH_ISABEL] = MCFLAVOR(Pokefan_Isabel),
+    [REMATCH_MIGUEL] = MCFLAVOR(Pokefan_Miguel),
+    [REMATCH_TIMOTHY] = MCFLAVOR(Expert_Timothy),
+    [REMATCH_SHELBY] = MCFLAVOR(Expert_Shelby),
+    [REMATCH_CALVIN] = MCFLAVOR(Youngster_Calvin),
+    [REMATCH_ELLIOT] = MCFLAVOR(Fisherman_Elliot),
+    [REMATCH_ISAIAH] = MCFLAVOR(Triathlete_Isaiah),
+    [REMATCH_MARIA] = MCFLAVOR(Triathlete_Maria),
+    [REMATCH_ABIGAIL] = MCFLAVOR(Triathlete_Abigail),
+    [REMATCH_DYLAN] = MCFLAVOR(Triathlete_Dylan),
+    [REMATCH_KATELYN] = MCFLAVOR(Triathlete_Katelyn),
+    [REMATCH_BENJAMIN] = MCFLAVOR(Triathlete_Benjamin),
+    [REMATCH_PABLO] = MCFLAVOR(Triathlete_Pablo),
+    [REMATCH_NICOLAS] = MCFLAVOR(DragonTamer_Nicolas),
+    [REMATCH_ROBERT] = MCFLAVOR(BirdKeeper_Robert),
+    [REMATCH_LAO] = MCFLAVOR(NinjaBoy_Lao),
+    [REMATCH_CYNDY] = MCFLAVOR(BattleGirl_Cyndy),
+    [REMATCH_MADELINE] = MCFLAVOR(ParasolLady_Madeline),
+    [REMATCH_JENNY] = MCFLAVOR(Swimmer_Jenny),
+    [REMATCH_DIANA] = MCFLAVOR(Picnicker_Diana),
+    [REMATCH_AMY_AND_LIV] = MCFLAVOR(Twins_AmyAndLiv),
+    [REMATCH_ERNEST] = MCFLAVOR(Sailor_Ernest),
+    [REMATCH_CORY] = MCFLAVOR(Sailor_Cory),
+    [REMATCH_EDWIN] = MCFLAVOR(Collector_Edwin),
+    [REMATCH_LYDIA] = MCFLAVOR(PkmnBreeder_Lydia),
+    [REMATCH_ISAAC] = MCFLAVOR(PkmnBreeder_Isaac),
+    [REMATCH_GABRIELLE] = MCFLAVOR(PkmnBreeder_Gabrielle),
+    [REMATCH_CATHERINE] = MCFLAVOR(PkmnRanger_Catherine),
+    [REMATCH_JACKSON] = MCFLAVOR(PkmnRanger_Jackson),
+    [REMATCH_HALEY] = MCFLAVOR(Lass_Haley),
+    [REMATCH_JAMES] = MCFLAVOR(BugCatcher_James),
+    [REMATCH_TRENT] = MCFLAVOR(Hiker_Trent),
+    [REMATCH_SAWYER] = MCFLAVOR(Hiker_Sawyer),
+    [REMATCH_KIRA_AND_DAN] = MCFLAVOR(YoungCouple_LoisAndHal),
+    [REMATCH_WALLY_3] = MCFLAVOR(PkmnTrainer_Wally),
+    [REMATCH_ROXANNE] = MCFLAVOR(RockinWhiz_Roxanne),
+    [REMATCH_BRAWLY] = MCFLAVOR(TheBigHit_Brawly),
+    [REMATCH_WATTSON] = MCFLAVOR(SwellShock_Wattson),
+    [REMATCH_FLANNERY] = MCFLAVOR(PassionBurn_Flannery),
+    [REMATCH_NORMAN] = MCFLAVOR(ReliableOne_Dad),
+    [REMATCH_WINONA] = MCFLAVOR(SkyTamer_Winona),
+    [REMATCH_TATE_AND_LIZA] = MCFLAVOR(MysticDuo_TateAndLiza),
+    [REMATCH_JUAN] = MCFLAVOR(DandyCharm_Juan),
+    [REMATCH_SIDNEY] = MCFLAVOR(EliteFour_Sidney),
+    [REMATCH_PHOEBE] = MCFLAVOR(EliteFour_Phoebe),
+    [REMATCH_GLACIA] = MCFLAVOR(EliteFour_Glacia),
+    [REMATCH_DRAKE] = MCFLAVOR(EliteFour_Drake),
+    [REMATCH_WALLACE] = MCFLAVOR(Champion_Wallace),
+};
diff --git a/src/data/text/ribbon_descriptions.h b/src/data/text/ribbon_descriptions.h
new file mode 100644
index 000000000..f455a7771
--- /dev/null
+++ b/src/data/text/ribbon_descriptions.h
@@ -0,0 +1,48 @@
+const u8 gRibbonDescriptionPart1_Champion[] = _("CHAMPION-beating, HALL");
+const u8 gRibbonDescriptionPart2_Champion[] = _("OF FAME Member RIBBON");
+const u8 gRibbonDescriptionPart1_CoolContest[] = _("COOL CONTEST");
+const u8 gRibbonDescriptionPart1_BeautyContest[] = _("BEAUTY CONTEST");
+const u8 gRibbonDescriptionPart1_CuteContest[] = _("CUTE CONTEST");
+const u8 gRibbonDescriptionPart1_SmartContest[] = _("SMART CONTEST");
+const u8 gRibbonDescriptionPart1_ToughContest[] = _("TOUGH CONTEST");
+const u8 gRibbonDescriptionPart2_NormalRank[] = _("Normal Rank winner!");
+const u8 gRibbonDescriptionPart2_SuperRank[] = _("Super Rank winner!");
+const u8 gRibbonDescriptionPart2_HyperRank[] = _("Hyper Rank winner!");
+const u8 gRibbonDescriptionPart2_MasterRank[] = _("Master Rank winner!");
+const u8 gRibbonDescriptionPart1_Winning[] = _("For clearing LV50");
+const u8 gRibbonDescriptionPart2_Winning[] = _("at the BATTLE TOWER.");
+const u8 gRibbonDescriptionPart1_Victory[] = _("For clearing Open Level");
+const u8 gRibbonDescriptionPart2_Victory[] = _("at the BATTLE TOWER.");
+const u8 gRibbonDescriptionPart1_Artist[] = _("RIBBON for being chosen");
+const u8 gRibbonDescriptionPart2_Artist[] = _("as a super sketch model.");
+const u8 gRibbonDescriptionPart1_Effort[] = _("RIBBON awarded for");
+const u8 gRibbonDescriptionPart2_Effort[] = _("being a hard worker.");
+
+const u8 *const gRibbonDescriptionPointers[][2] = 
+{
+    {gRibbonDescriptionPart1_Champion,      gRibbonDescriptionPart2_Champion},
+    {gRibbonDescriptionPart1_CoolContest,   gRibbonDescriptionPart2_NormalRank},
+    {gRibbonDescriptionPart1_CoolContest,   gRibbonDescriptionPart2_SuperRank},
+    {gRibbonDescriptionPart1_CoolContest,   gRibbonDescriptionPart2_HyperRank},
+    {gRibbonDescriptionPart1_CoolContest,   gRibbonDescriptionPart2_MasterRank},
+    {gRibbonDescriptionPart1_BeautyContest, gRibbonDescriptionPart2_NormalRank},
+    {gRibbonDescriptionPart1_BeautyContest, gRibbonDescriptionPart2_SuperRank},
+    {gRibbonDescriptionPart1_BeautyContest, gRibbonDescriptionPart2_HyperRank},
+    {gRibbonDescriptionPart1_BeautyContest, gRibbonDescriptionPart2_MasterRank},
+    {gRibbonDescriptionPart1_CuteContest,   gRibbonDescriptionPart2_NormalRank},
+    {gRibbonDescriptionPart1_CuteContest,   gRibbonDescriptionPart2_SuperRank},
+    {gRibbonDescriptionPart1_CuteContest,   gRibbonDescriptionPart2_HyperRank},
+    {gRibbonDescriptionPart1_CuteContest,   gRibbonDescriptionPart2_MasterRank},
+    {gRibbonDescriptionPart1_SmartContest,  gRibbonDescriptionPart2_NormalRank},
+    {gRibbonDescriptionPart1_SmartContest,  gRibbonDescriptionPart2_SuperRank},
+    {gRibbonDescriptionPart1_SmartContest,  gRibbonDescriptionPart2_HyperRank},
+    {gRibbonDescriptionPart1_SmartContest,  gRibbonDescriptionPart2_MasterRank},
+    {gRibbonDescriptionPart1_ToughContest,  gRibbonDescriptionPart2_NormalRank},
+    {gRibbonDescriptionPart1_ToughContest,  gRibbonDescriptionPart2_SuperRank},
+    {gRibbonDescriptionPart1_ToughContest,  gRibbonDescriptionPart2_HyperRank},
+    {gRibbonDescriptionPart1_ToughContest,  gRibbonDescriptionPart2_MasterRank},
+    {gRibbonDescriptionPart1_Winning,       gRibbonDescriptionPart2_Winning},
+    {gRibbonDescriptionPart1_Victory,       gRibbonDescriptionPart2_Victory},
+    {gRibbonDescriptionPart1_Artist,        gRibbonDescriptionPart2_Artist},
+    {gRibbonDescriptionPart1_Effort,        gRibbonDescriptionPart2_Effort},
+};
diff --git a/src/dodrio_berry_picking.c b/src/dodrio_berry_picking.c
index 0eb0c12f8..714b10ef6 100644
--- a/src/dodrio_berry_picking.c
+++ b/src/dodrio_berry_picking.c
@@ -1,249 +1,456 @@
 #include "global.h"
 #include "alloc.h"
-#include "palette.h"
-#include "window.h"
 #include "bg.h"
+#include "dodrio_berry_picking.h"
+#include "dynamic_placeholder_text_util.h"
+#include "event_data.h"
 #include "gpu_regs.h"
-#include "random.h"
+#include "international_string_util.h"
+#include "item.h"
 #include "link.h"
 #include "link_rfu.h"
-#include "task.h"
-#include "main.h"
-#include "constants/songs.h"
-#include "sound.h"
 #include "m4a.h"
+#include "main.h"
+#include "palette.h"
 #include "pokemon_jump.h"
+#include "random.h"
+#include "save.h"
+#include "script.h"
+#include "sound.h"
+#include "string_util.h"
+#include "strings.h"
+#include "task.h"
+#include "text_window.h"
+#include "window.h"
+#include "constants/items.h"
+#include "constants/songs.h"
+#include "constants/species.h"
 
-struct DodrioBerryPickingSubstruct_0160
+struct DodrioSubstruct_0160
 {
-    /*0x0000 : 0x0160*/ u8 filler_000[12];
-    /*0x000C : 0x016C*/ u8 unk_00C;
-    /*0x000D : 0x016D*/ u8 filler_00D[0x3000 - 0xd];
-    /*0x3000 : 0x3160*/ u32 unk_3000;
-    /*0x3004 : 0x3164*/ u8 filler_3004[16];
-    /*0x3014 : 0x3174*/ u8 unk_3014;
-    /*0x3015 : 0x3175*/ u8 filler_3015[0x318C - 0x3175];
+    /*0x0000 : 0x3000*/ u16 ALIGNED(4) tilemapBuffers[3][BG_SCREEN_SIZE];
+    /*0x3000 : 0x3160*/ bool32 finished;
+    /*0x3004 : 0x3164*/ u8 ALIGNED(4) unk3004;
+    /*0x3008 : 0x3168*/ u8 ALIGNED(4) unk3008[10];
+    /*0x3014 : 0x3174*/ u8 ALIGNED(4) state;
+    /*0x3018 : 0x3178*/ u8 ALIGNED(4) unk3018;
+    /*0x301C : 0x317C*/ u16 ALIGNED(4) unk301C;
+    /*0x3020 : 0x3180*/ u8 ALIGNED(4) unk3020;
+    /*0x3024 : 0x3184*/ u8 ALIGNED(4) unk3024;
+    /*0x3024 : 0x3184*/ void (*unk3028)(void);
 }; // size = 0x302C
 
-struct DodrioBerryPickingStruct_2022CF4
+struct DodrioStruct_2022CF4
 {
-    u8 filler_00[0x40];
+    u8 filler_00[0xc];
+    u8 unkC[10];
+    s16 unk16[10];
+    u16 unk2A[10];
+    u16 unk3E;
 }; // size = 0x40
 
-struct DodrioBerryPickingSubstruct_31A0_14
+struct DodrioSubstruct_31A0_14
 {
-    u8 unk_0[11];
-    u8 unk_B[11];
+    u8 unk0[11];
+    u8 unkB[11];
 };
 
-struct DodrioBerryPickingSubstruct_31A0
-{
-    u8 unk_00[0x10];
-    u32 unk_10;
-    struct DodrioBerryPickingSubstruct_31A0_14 unk_14;
-    u8 unk_2C;
-    u8 filler_2D[3];
-    u8 unk_30;
-    u8 filler_31[3];
-    u8 unk_34;
-    u8 filler_35[7];
+struct DodrioSubstruct_31A0_2C
+{
+    u8 unk0;
+    u8 ALIGNED(4) unk4;
+    u8 ALIGNED(4) unk8;
+};
+
+struct DodrioSubstruct_31A0
+{
+    u8 name[0x10];
+    u32 unk10;
+    struct DodrioSubstruct_31A0_14 unk14;
+    struct DodrioSubstruct_31A0_2C unk2C;
+    u8 filler_35[4];
 }; // size = 0x3C
 
-struct DodrioBerryPickingSubstruct_318C
+struct DodrioSubstruct_318C
 {
     bool8 isShiny;
 };
 
-struct DodrioBerryPickingStruct
+struct DodrioSubstruct_3308
+{
+    u8 unk0;
+    u32 unk4;
+};
+
+struct DodrioStruct
 {
     /*0x0000*/ void (*savedCallback)(void);
-    /*0x0004*/ u8 unk_0004;
-    /*0x0005*/ u8 filler_0005[3];
-    /*0x0008*/ u8 unk_0008;
-    /*0x0009*/ u8 filler_0009[3];
-    /*0x000C*/ u8 unk_000C;
-    /*0x000D*/ u8 filler_000D[3];
-    /*0x0010*/ u8 unk_0010;
-    /*0x0011*/ u8 filler_0011[3];
-    /*0x0014*/ u8 unk_0014;
-    /*0x0015*/ u8 filler_0015[3];
-    /*0x0018*/ u8 unk_0018;
-    /*0x0019*/ u8 filler_0019[3];
-    /*0x001C*/ u8 unk_001C;
-    /*0x001D*/ u8 filler_001D[3];
-    /*0x0020*/ u8 unk_0020;
-    /*0x0021*/ u8 filler_0021[3];
-    /*0x0024*/ u8 unk_0024;
-    /*0x0025*/ u8 filler_0025[3];
-    /*0x0028*/ u8 multiplayerId;
+    /*0x0004*/ u8 ALIGNED(4) unk04;
+    /*0x0008*/ u8 ALIGNED(4) unk08;
+    /*0x000C*/ u8 ALIGNED(4) unk0C;
+    /*0x0010*/ u8 ALIGNED(4) unk10;
+    /*0x0014*/ u8 ALIGNED(4) unk14;
+    /*0x0018*/ u8 ALIGNED(4) unk18;
+    /*0x001C*/ u8 ALIGNED(4) unk1C;
+    /*0x0020*/ u8 ALIGNED(4) unk20;
+    /*0x0024*/ u8 ALIGNED(4) unk24;
+    /*0x0028*/ u8 ALIGNED(4) multiplayerId;
     /*0x0029*/ u8 filler_0029[7];
-    /*0x0030*/ u8 unk_0030;
-    /*0x0031*/ u8 filler_0031[3];
-    /*0x0034*/ u8 unk_0034[5];
-    /*0x0039*/ u8 filler_0039[3];
-    /*0x003C*/ u8 unk_003C;
-    /*0x003D*/ u8 filler_003D[3];
-    /*0x0040*/ u8 unk_0040;
-    /*0x0041*/ u8 filler_0041[3];
-    /*0x0044*/ u8 unk_0044;
-    /*0x0045*/ u8 filler_0045[3];
-    /*0x0048*/ u8 unk_0048;
-    // align 1
-    /*0x004A*/ u16 unk_004A[5][6];
-    /*0x0086*/ u16 unk_0086[5];
-    /*0x0090*/ u8 unk_0090[5];
-    /*0x0095*/ u8 filler_0095[3];
-    /*0x0098*/ u8 unk_0098[4];
-    /*0x009C*/ u8 unk_009C[12];
-    /*0x00A8*/ u8 unk_00A8[5];
-    /*0x00AD*/ u8 filler_00AD[3];
-    /*0x00B0*/ u8 unk_00B0[5];
-    /*0x00B5*/ u8 filler_00B5[3];
-    /*0x00B8*/ u8 unk_00B8[5];
-    /*0x00BD*/ u8 filler_00BD[7];
-    /*0x00C4*/ u8 unk_00C4[11];
-    /*0x00CF*/ u8 filler_00CF[1];
-    /*0x00D0*/ u8 unk_00D0[11];
-    /*0x00DB*/ u8 filler_00DB[1];
-    /*0x00DC*/ u8 unk_00DC[11];
-    /*0x00E7*/ u8 filler_0xE7[1];
-    /*0x00E8*/ u8 unk_00E8[5];
-    /*0x00ED*/ u8 filler_00ED[7];
-    /*0x00F4*/ u8 unk_00F4[11][2];
-    /*0x010A*/ u8 filler_010A[2];
-    /*0x010C*/ u8 unk_010C[5];
-    /*0x0111*/ u8 filler_0111[3];
-    /*0x0114*/ u16 unk_0114;
-    // align 2
-    /*0x0118*/ u32 unk_0118;
-    /*0x011C*/ u32 unk_011C;
-    /*0x0120*/ u32 unk_0120;
-    /*0x0124*/ u8 unk_0124;
-    /*0x0125*/ u8 filler_0125[3];
-    /*0x0128*/ u8 unk_0128;
-    // align 2
-    /*0x012C*/ u32 unk_012C;
-    /*0x0130*/ u32 unk_0130[5];
-    /*0x0144*/ u8 unk_0144;
-    /*0x0145*/ u8 filler_0145[3];
-    /*0x0148*/ u8 unk_0148[11];
-    /*0x0153*/ u8 filler_0153[1];
-    /*0x0154*/ u8 unk_0154;
-    /*0x0155*/ u8 filler_0155[11];
-    /*0x0160*/ struct DodrioBerryPickingSubstruct_0160 unk_0160;
-    /*0x318C*/ struct DodrioBerryPickingSubstruct_318C unk_318C[5];
-    /*0x31A0*/ struct DodrioBerryPickingSubstruct_31A0 unk_31A0[5];
-    /*0x32CC*/ struct DodrioBerryPickingSubstruct_31A0 unk_32CC;
-    /*0x3308*/ u8 unk_3308[0x3330 - 0x3308];
+    /*0x0030*/ u8 ALIGNED(4) unk30;
+    /*0x0034*/ u8 ALIGNED(4) unk34[5];
+    /*0x003C*/ u8 ALIGNED(4) unk3C;
+    /*0x0040*/ u8 ALIGNED(4) unk40;
+    /*0x0044*/ u8 ALIGNED(4) unk44;
+    /*0x0048*/ u8 ALIGNED(4) unk48;
+    /*0x004A*/ u16 unk4A[5][6];
+    /*0x0086*/ u16 unk86[5];
+    /*0x0090*/ u8 ALIGNED(4) unk90[5];
+    /*0x0098*/ u8 ALIGNED(4) unk98[4];
+    /*0x009C*/ u8 ALIGNED(4) unk9C[11];
+    /*0x00A8*/ u8 ALIGNED(4) unkA8[5];
+    /*0x00B0*/ u8 ALIGNED(4) unkB0[5];
+    /*0x00B8*/ u8 ALIGNED(4) unkB8[11];
+    /*0x00C4*/ u8 ALIGNED(4) unkC4[11];
+    /*0x00D0*/ u8 ALIGNED(4) unkD0[11];
+    /*0x00DC*/ u8 ALIGNED(4) unkDC[11];
+    /*0x00E8*/ u8 ALIGNED(4) unkE8[11];
+    /*0x00F4*/ u8 ALIGNED(4) unkF4[11][2];
+    /*0x010C*/ u8 ALIGNED(4) unk10C[5];
+    /*0x0112*/ u16 unk112;
+    /*0x0114*/ u16 unk114;
+    /*0x0118*/ u32 unk118;
+    /*0x011C*/ u32 unk11C;
+    /*0x0120*/ u32 unk120;
+    /*0x0124*/ u8 ALIGNED(4) unk124;
+    /*0x0128*/ u8 ALIGNED(4) unk128;
+    /*0x012C*/ u32 unk12C;
+    /*0x0130*/ u32 unk130[5];
+    /*0x0144*/ u8 ALIGNED(4) unk144;
+    /*0x0148*/ u8 ALIGNED(4) unk148[11];
+    /*0x0154*/ u8 ALIGNED(4) unk154;
+    /*0x0158*/ u8 ALIGNED(4) unk158[5];
+    /*0x0160*/ struct DodrioSubstruct_0160 unk160;
+    /*0x318C*/ struct DodrioSubstruct_318C unk318C[5];
+    /*0x31A0*/ struct DodrioSubstruct_31A0 unk31A0[5];
+    /*0x32CC*/ struct DodrioSubstruct_31A0 unk32CC;
+    /*0x3308*/ struct DodrioSubstruct_3308 unk3308[5];
 }; // size = 0x3330
 
-EWRAM_DATA struct DodrioBerryPickingStruct * gUnknown_02022C98 = NULL;
-EWRAM_DATA u16 * gUnknown_02022C9C[5] = {NULL};
-EWRAM_DATA u16 * gUnknown_02022CB0[2] = {NULL};
-EWRAM_DATA u16 * gUnknown_02022CB8[11] = {NULL};
-EWRAM_DATA u16 * gUnknown_02022CE4[4] = {NULL};
-EWRAM_DATA struct DodrioBerryPickingStruct_2022CF4 * gUnknown_02022CF4 = NULL;
-EWRAM_DATA struct DodrioBerryPickingSubstruct_0160 * gUnknown_02022CF8 = NULL;
+EWRAM_DATA static struct DodrioStruct * gUnknown_02022C98 = NULL;
+EWRAM_DATA static u16 *gUnknown_02022C9C[5] = {NULL};
+EWRAM_DATA static u16 *gUnknown_02022CB0[2] = {NULL};
+EWRAM_DATA static u16 *gUnknown_02022CB8[11] = {NULL};
+EWRAM_DATA static u16 *gUnknown_02022CE4[4] = {NULL};
+EWRAM_DATA static struct DodrioStruct_2022CF4 *gUnknown_02022CF4 = NULL;
+EWRAM_DATA static struct DodrioSubstruct_0160 *gUnknown_02022CF8 = NULL;
 
 static bool32 gUnknown_03000DB0;
 
-void sub_8024A1C(void);
-void sub_8024A30(struct DodrioBerryPickingStruct *);
-void sub_8024BC8(u8 taskId);
-void sub_8024DBC(void);
-void sub_8024E00(void);
-void sub_8024E38(void);
-void sub_8024F10(void);
-void sub_8024F38(void);
-void sub_8024FFC(void);
-void sub_80250D4(void);
-void sub_8025158(void);
-void sub_8025198(void);
-void sub_8025230(void);
-void sub_8025324(void);
-void sub_8025470(void);
-void sub_8025644(void);
-void sub_80256AC(void);
-void sub_8025758(void);
-void sub_802589C(u8 taskId);
-void sub_8025910(u8 taskId);
-void sub_8025D04(void);
-void sub_8025D50(void);
-void sub_8025E0C(void);
-void sub_8025ED8(void);
-void sub_8025F48(void);
-void sub_8026044(void);
-void sub_80261CC(void);
-void sub_80261E4(void);
-void sub_80261F8(struct DodrioBerryPickingSubstruct_318C *, struct Pokemon *);
-void sub_802620C(TaskFunc, u8);
-void sub_802621C(TaskFunc);
-void sub_8026240(u8);
-bool32 sub_8026264(void);
-void sub_80262C0(void);
-u32 sub_8026634(u8, u8, u8);
-void sub_802671C(void);
-void sub_8026AF4(void);
-void sub_8026B28(void);
-void sub_8026B5C(u8, u8*, u8*);
-u32 sub_8026BB8(void);
-void sub_8026C28(void);
-bool32 sub_8026C50(void);
-bool32 sub_8026C90(void);
-void sub_8026D1C(u8);
-u8 sub_8026D8C(u8);
-u8 sub_8026DB0(u8, u8);
-void sub_8026F1C(u8, u8, u8);
-void sub_8027234(u8);
-void sub_80272A4(void);
-void sub_80272E8(void);
-void sub_80273F0(void);
-void sub_802749C(void);
-u8 sub_8027518(u8);
-void sub_8027554(void);
-void sub_8027608(void);
-u32 sub_8027748(void);
-void sub_8027DD0(u8);
-u32 sub_8027E30(struct DodrioBerryPickingSubstruct_31A0 *, u8 *, u8 *, u8 *, u8 *, u8 *, u8, u32, u32);
-u32 sub_8028164(u32 unused, struct DodrioBerryPickingSubstruct_31A0 *, u8 *, u8 *, u8 *, u8 *, u8 *, u8 *, u32 *, u32 *);
-void sub_80282EC(u8);
-u32 sub_8028318(u8, u8 *);
-void sub_8028350(u8);
-bool32 sub_8028374(u8);
-void sub_80283A8(void);
-void sub_8028408(struct DodrioBerryPickingSubstruct_318C *, u8, u8, u8);
-void sub_80284CC(u8);
-void sub_8028504(u8);
-void sub_8028614(u8);
-void sub_802868C(u8, u8);
-void sub_8028734(void);
-void sub_80287E4(void);
-void sub_80289E8(u8);
-void sub_80286E4(void);
-bool32 sub_8028828(void);
-void sub_8028A34(void);
-void sub_8028A88(void);
-void sub_8028B80(void);
-void sub_8028D44(void);
-void sub_8028DFC(void);
-void sub_8028E4C(void);
-void sub_8028E84(void);
-void sub_8028EC8(u8);
-void sub_8028FCC(void);
-void sub_802903C(void);
-void sub_8029274(struct DodrioBerryPickingSubstruct_0160 *);
-void sub_80292E0(u8);
-bool32 sub_802A770(void);
-u8 sub_802A794(void);
-
-extern const u8 gUnknown_082F7A88[][3];
-extern const u8 gUnknown_082F449C[];
-extern const u8 gUknnown_082F45AF[];
-extern const u8 gUnknown_082F7A94[];
-extern void (*const gUnknown_082F7AC4[])(void);
-extern void (*const gUnknown_082F7AF4[])(void);
-
-void sub_802493C(u16 a0, void (*a1)(void))
+static void sub_8024A1C(void);
+static void sub_8024A30(struct DodrioStruct *);
+static void sub_8024BC8(u8 taskId);
+static void sub_8024DBC(void);
+static void sub_8024E00(void);
+static void sub_8024E38(void);
+static void sub_8024F10(void);
+static void sub_8024F38(void);
+static void sub_8024FFC(void);
+static void sub_80250D4(void);
+static void sub_8025158(void);
+static void sub_8025198(void);
+static void sub_8025230(void);
+static void sub_8025324(void);
+static void sub_8025470(void);
+static void sub_8025644(void);
+static void sub_80256AC(void);
+static void sub_8025758(void);
+static void sub_802589C(u8 taskId);
+static void sub_8025910(u8 taskId);
+static void sub_8025D04(void);
+static void sub_8025D50(void);
+static void sub_8025E0C(void);
+static void sub_8025ED8(void);
+static void sub_8025F48(void);
+static void sub_8026044(void);
+static void sub_80261CC(void);
+static void sub_80261E4(void);
+static void sub_80261F8(struct DodrioSubstruct_318C *, struct Pokemon *);
+static void sub_802620C(TaskFunc, u8);
+static void sub_802621C(TaskFunc);
+static void sub_8026240(u8);
+static bool32 sub_8026264(void);
+static void sub_80262C0(void);
+static bool32 sub_8026634(u8, u8, u8);
+static void sub_802671C(void);
+static void sub_8026AF4(void);
+static void sub_8026B28(void);
+static void sub_8026B5C(u8, u8*, u8*);
+static bool32 sub_8026BB8(void);
+static void sub_8026C28(void);
+static bool32 sub_8026C50(void);
+static bool32 sub_8026C90(void);
+static void sub_8026D1C(u8);
+static u8 sub_8026D8C(u8);
+static u8 sub_8026DB0(u8, u8);
+static void sub_8026F1C(u8, u8, u8);
+static void sub_8027234(bool32 arg0);
+static void sub_80272A4(void);
+static void sub_80272E8(void);
+static void sub_80273F0(void);
+static void sub_802749C(void);
+static u8 sub_8027518(u8);
+static void sub_8027554(void);
+static void sub_8027608(void);
+static u32 sub_8027748(void);
+static void sub_8027DD0(u32 arg0);
+static void sub_8027E30(struct DodrioSubstruct_31A0 *arg0, struct DodrioSubstruct_31A0_2C *arg1, struct DodrioSubstruct_31A0_2C *arg2, struct DodrioSubstruct_31A0_2C *arg3, struct DodrioSubstruct_31A0_2C *arg4, struct DodrioSubstruct_31A0_2C *arg5, u8 arg6, u32 arg7, u32 arg8);
+static u32 sub_8028164(u32 unused, struct DodrioSubstruct_31A0 *arg0, struct DodrioSubstruct_31A0_2C *arg1, struct DodrioSubstruct_31A0_2C *arg2, struct DodrioSubstruct_31A0_2C *arg3, struct DodrioSubstruct_31A0_2C *arg4, struct DodrioSubstruct_31A0_2C *arg5, u8 *arg6, u32 *arg7, u32 *arg8);
+static void sub_80282EC(u8);
+static u32 sub_8028318(u32 arg0, u8 *arg1);
+static void sub_8028350(u32 arg0);
+static u32 sub_8028374(u32 arg0);
+static void sub_80283A8(void);
+static void sub_8028408(struct DodrioSubstruct_318C *arg0, u8 arg1, u8 id, u8 arg3);
+static void sub_80284CC(u8);
+static void sub_8028504(u8);
+static void sub_8028614(u8 count);
+static void sub_802868C(bool8 invisible, u8 count);
+static void sub_8028734(void);
+static void sub_80287E4(void);
+static void sub_80289E8(bool8 invisible);
+static void sub_80286E4(void);
+static bool32 sub_8028828(void);
+static void sub_8028A34(void);
+static void sub_8028A88(void);
+static void sub_8028B80(void);
+static void sub_8028D44(void);
+static void sub_8028DFC(void);
+static void sub_8028E4C(void);
+static void sub_8028E84(void);
+static void sub_8028EC8(bool8 invisible);
+static void sub_8028FCC(void);
+static void sub_802903C(void);
+static void sub_8029274(struct DodrioSubstruct_0160 *PTR);
+static void sub_80292E0(u8);
+static bool32 sub_802A770(void);
+static u8 sub_802A794(void);
+static void sub_8028BF8(u8 id, bool8 invisible);
+static void sub_8028C30(bool8 invisible);
+static void sub_8028CA4(u16 id, u8 frameNum);
+static void sub_8028C7C(u8 id, u8 y);
+static void sub_80286B4(u8 id, u8 frameNum);
+static u8 sub_8026E70(u8 arg0, u8 arg1);
+static void sub_80288D4(u8 arg0);
+static u32 sub_8027DFC(u32 arg0);
+static u32 IncrementWithLimit(u32 arg0, u32 arg1);
+static u32 Min(u32 arg0, u32 arg1);
+static u32 sub_80276C0(u8 arg0);
+static void sub_8027ACC(u8 taskId);
+static void sub_8029314(u8 taskId);
+static void sub_8027BEC(u8 windowId, s32 width);
+static void nullsub_15(struct Sprite *sprite);
+static void sub_80284A8(struct Sprite *sprite);
+static u32 sub_802853C(struct Sprite *sprite);
+static u32 sub_80285AC(struct Sprite *sprite);
+static s16 sub_8028F14(u8 arg0, u8 arg1);
+static void sub_8028654(bool8 invisible, u8 id);
+static void sub_8029338(void);
+static bool32 sub_802A8E8(void);
+static void sub_802A7A8(void);
+static void sub_802A72C(void (*func)(void));
+static void (*sub_802A75C(void))(void);
+static void sub_8029338(void);
+static void sub_8029440(void);
+static void sub_802988C(void);
+static void sub_802A010(void);
+static void sub_802A380(void);
+static void sub_802A454(void);
+static void sub_802A534(void);
+static void sub_802A588(void);
+static void sub_802A6FC(void);
+static void nullsub_16(void);
+
+// const rom data
+static const u8 gUnknown_082F449C[5][5][11] =
+{
+    {
+        {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0},
+    },
+    {
+        {0, 1, 2, 3, 4, 5, 6, 3, 8, 9, 0},
+        {0, 1, 2, 5, 6, 3, 4, 5, 8, 9, 0},
+    },
+    {
+        {0, 1, 2, 3, 4, 5, 6, 7, 2, 9, 0},
+        {0, 1, 4, 5, 6, 7, 2, 3, 4, 9, 0},
+        {0, 1, 6, 7, 2, 3, 4, 5, 6, 9, 0},
+    },
+    {
+        {0, 1, 2, 3, 4, 5, 6, 7, 8, 1, 0},
+        {0, 3, 4, 5, 6, 7, 8, 1, 2, 3, 0},
+        {0, 5, 6, 7, 8, 1, 2, 3, 4, 5, 0},
+        {0, 7, 8, 1, 2, 3, 4, 5, 6, 7, 0},
+    },
+    {
+        {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0},
+        {2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2},
+        {4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4},
+        {6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6},
+        {8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8},
+    },
+};
+
+static const u8 gUknnown_082F45AF[5][5][3] =
+{
+    {
+        {4, 5, 6},
+    },
+    {
+        {3, 4, 5},
+        {5, 6, 3},
+    },
+    {
+        {4, 5, 6},
+        {6, 7, 2},
+        {2, 3, 4},
+    },
+    {
+        {3, 4, 5},
+        {5, 6, 7},
+        {7, 8, 1},
+        {1, 2, 3},
+    },
+    {
+        {4, 5, 6},
+        {6, 7, 8},
+        {8, 9, 0},
+        {0, 1, 2},
+        {2, 3, 4},
+    },
+};
+
+static const u8 gUnknown_082F45FA[5][5][3] =
+{
+    {
+        {1, 0, 1},
+    },
+    {
+        {1, 0, 1},
+        {0, 1, 0},
+    },
+    {
+        {2, 0, 1},
+        {0, 1, 2},
+        {1, 2, 0},
+    },
+    {
+        {3, 0, 1},
+        {0, 1, 2},
+        {1, 2, 3},
+        {2, 3, 0},
+    },
+    {
+        {4, 0, 1},
+        {0, 1, 2},
+        {1, 2, 3},
+        {2, 3, 4},
+        {3, 4, 0},
+    },
+};
+
+ALIGNED(4)
+static const u8 gUnknown_082F4648[5][11] =
+{
+    {9, 9, 9, 9, 1, 1, 1, 9, 9, 9, 9},
+    {9, 9, 9, 0, 0, 1, 1, 0, 9, 9, 9},
+    {9, 9, 2, 2, 0, 0, 1, 1, 1, 9, 9},
+    {9, 3, 3, 0, 0, 1, 1, 2, 2, 3, 9},
+    {3, 3, 4, 4, 0, 0, 1, 1, 2, 2, 3},
+};
+
+static const u8 gUnknown_082F467F[5][5] =
+{
+    {5},
+    {4, 6},
+    {3, 5, 7},
+    {2, 4, 6, 8},
+    {1, 3, 5, 6, 9},
+};
+
+// Duplicate and unused gfx. Feel free to remove.
+static const u32 sDuplicateGfx[] = INCBIN_U32("graphics/link_games/dodrioberry_bg1.gbapal",
+                                     "graphics/link_games/dodrioberry_bg2.gbapal",
+                                     "graphics/link_games/dodrioberry_pkmn.gbapal",
+                                     "graphics/link_games/dodrioberry_shiny.gbapal",
+                                     "graphics/link_games/dodrioberry_status.gbapal",
+                                     "graphics/link_games/dodrioberry_berrysprites.gbapal",
+                                     "graphics/link_games/dodrioberry_berrysprites.4bpp.lz",
+                                     "graphics/link_games/dodrioberry_platform.gbapal",
+                                     "graphics/link_games/dodrioberry_bg1.4bpp.lz",
+                                     "graphics/link_games/dodrioberry_bg2.4bpp.lz",
+                                     "graphics/link_games/dodrioberry_status.4bpp.lz",
+                                     "graphics/link_games/dodrioberry_platform.4bpp.lz",
+                                     "graphics/link_games/dodrioberry_pkmn.4bpp.lz",
+                                     "graphics/link_games/dodrioberry_bg1.bin.lz",
+                                     "graphics/link_games/dodrioberry_bg2right.bin.lz",
+                                     "graphics/link_games/dodrioberry_bg2left.bin.lz");
+
+
+static const u8 gUnknown_082F7A88[][3] =
+{
+    {40, 24, 13},
+    {32, 19, 10},
+    {22, 13, 7},
+};
+
+ALIGNED(4)
+static const u8 gUnknown_082F7A94[] = {8, 5, 8, 11, 15};
+
+ALIGNED(4)
+static const u8 gUnknown_082F7A9C[] = {5, 10, 20, 30, 50, 70, 100};
+
+ALIGNED(4)
+static const u8 gUnknown_082F7AA4[][10] =
+{
+    {15, 16, 17, 18, 19, 19, 18, 17, 16, 15},
+    {20, 21, 22, 23, 24, 25, 26, 27, 28, 29},
+    {30, 31, 32, 33, 34, 34, 33, 32, 31, 30},
+};
+
+static void (*const gUnknown_082F7AC4[])(void) =
+{
+    sub_8024DBC,
+    sub_8024E00,
+    sub_8024E38,
+    sub_8024F10,
+    sub_8024F38,
+    sub_8025198,
+    sub_8025324,
+    sub_8025470,
+    sub_8025644,
+    sub_80256AC,
+    sub_8025758,
+    sub_80250D4
+};
+
+static void (*const gUnknown_082F7AF4[])(void) =
+{
+    sub_8024DBC,
+    sub_8024E00,
+    sub_8024E38,
+    sub_8024F10,
+    sub_8024FFC,
+    sub_8025230,
+    sub_8025324,
+    sub_8025470,
+    sub_8025644,
+    sub_80256AC,
+    sub_8025758,
+    sub_8025158
+};
+
+// code
+void sub_802493C(u16 a0, void (*callback)(void))
 {
     gUnknown_03000DB0 = FALSE;
 
@@ -251,108 +458,108 @@ void sub_802493C(u16 a0, void (*a1)(void))
     {
         sub_8024A1C();
         sub_8024A30(gUnknown_02022C98);
-        gUnknown_02022C98->savedCallback = a1;
+        gUnknown_02022C98->savedCallback = callback;
         gUnknown_02022C98->multiplayerId = GetMultiplayerId();
-        gUnknown_02022C98->unk_32CC = gUnknown_02022C98->unk_31A0[gUnknown_02022C98->multiplayerId];
-        sub_80261F8(&gUnknown_02022C98->unk_318C[gUnknown_02022C98->multiplayerId], &gPlayerParty[a0]);
+        gUnknown_02022C98->unk32CC = gUnknown_02022C98->unk31A0[gUnknown_02022C98->multiplayerId];
+        sub_80261F8(&gUnknown_02022C98->unk318C[gUnknown_02022C98->multiplayerId], &gPlayerParty[a0]);
         CreateTask(sub_8024BC8, 1);
         SetMainCallback2(sub_80261CC);
         sub_80273F0();
-        sub_8026B5C(gUnknown_02022C98->unk_0024, &gUnknown_02022C98->unk_0044, &gUnknown_02022C98->unk_0048);
+        sub_8026B5C(gUnknown_02022C98->unk24, &gUnknown_02022C98->unk44, &gUnknown_02022C98->unk48);
         StopMapMusic();
         PlayNewMapMusic(MUS_RG_KINOMIKUI);
     }
     else
     {
-        SetMainCallback2(a1);
+        SetMainCallback2(callback);
         return;
     }
 }
 
-void sub_8024A1C(void)
+static void sub_8024A1C(void)
 {
     ResetTasks();
     ResetSpriteData();
     FreeAllSpritePalettes();
 }
 
-void sub_8024A30(struct DodrioBerryPickingStruct * data)
+static void sub_8024A30(struct DodrioStruct * data)
 {
     u8 i;
 
-    data->unk_000C = 0;
-    data->unk_0010 = 0;
-    data->unk_0014 = 0;
-    data->unk_0018 = 0;
-    data->unk_001C = 0;
-    data->unk_011C = 0;
-    data->unk_0120 = 0;
-    data->unk_0030 = 0;
-    data->unk_0040 = 0;
-    data->unk_003C = 0;
-    data->unk_012C = 0;
+    data->unk0C = 0;
+    data->unk10 = 0;
+    data->unk14 = 0;
+    data->unk18 = 0;
+    data->unk1C = 0;
+    data->unk11C = 0;
+    data->unk120 = 0;
+    data->unk30 = 0;
+    data->unk40 = 0;
+    data->unk3C = 0;
+    data->unk12C = 0;
 
     for (i = 0; i < 4; i++)
     {
-        data->unk_0098[i] = 0;
+        data->unk98[i] = 0;
     }
 
     for (i = 0; i < 5; i++)
     {
-        data->unk_00A8[i] = 0;
-        data->unk_00B0[i] = 0;
-        data->unk_004A[i][0] = 0;
-        data->unk_004A[i][1] = 0;
-        data->unk_004A[i][2] = 0;
-        data->unk_004A[i][3] = 0;
-        data->unk_004A[i][5] = 0;
-        data->unk_010C[i] = 0;
-        data->unk_0130[i] = 0;
+        data->unkA8[i] = 0;
+        data->unkB0[i] = 0;
+        data->unk4A[i][0] = 0;
+        data->unk4A[i][1] = 0;
+        data->unk4A[i][2] = 0;
+        data->unk4A[i][3] = 0;
+        data->unk4A[i][5] = 0;
+        data->unk10C[i] = 0;
+        data->unk130[i] = 0;
     }
 
     for (i = 0; i < 11; i++)
     {
-        data->unk_00D0[i] = 0;
-        data->unk_00DC[i] = 0;
-        data->unk_00C4[i] = 0;
-        data->unk_00F4[i][0] = 0xFF;
-        data->unk_00F4[i][1] = 0xFF;
+        data->unkD0[i] = 0;
+        data->unkDC[i] = 0;
+        data->unkC4[i] = 0;
+        data->unkF4[i][0] = 0xFF;
+        data->unkF4[i][1] = 0xFF;
     }
 
-    data->unk_0020 = GetMultiplayerId() == 0 ? 1 : 0;
-    data->unk_0024 = GetLinkPlayerCount();
-    data->unk_0034[0] = GetMultiplayerId();
-    for (i = 1; i < data->unk_0024; i++)
+    data->unk20 = GetMultiplayerId() == 0 ? 1 : 0;
+    data->unk24 = GetLinkPlayerCount();
+    data->unk34[0] = GetMultiplayerId();
+    for (i = 1; i < data->unk24; i++)
     {
-        data->unk_0034[i] = data->unk_0034[i - 1] + 1;
-        if (data->unk_0034[i] > data->unk_0024 - 1)
-            data->unk_0034[i] %= data->unk_0024;
+        data->unk34[i] = data->unk34[i - 1] + 1;
+        if (data->unk34[i] > data->unk24 - 1)
+            data->unk34[i] %= data->unk24;
     }
 }
 
-void sub_8024BC8(u8 taskId)
+static void sub_8024BC8(u8 taskId)
 {
     u8 r4, r5;
 
-    switch (gUnknown_02022C98->unk_000C)
+    switch (gUnknown_02022C98->unk0C)
     {
     case 0:
         SetVBlankCallback(NULL);
         sub_802620C(sub_8025910, 4);
-        gUnknown_02022C98->unk_000C++;
+        gUnknown_02022C98->unk0C++;
         break;
     case 1:
         if (!FuncIsActiveTask(sub_8025910))
         {
-            sub_8029274(&gUnknown_02022C98->unk_0160);
-            gUnknown_02022C98->unk_000C++;
+            sub_8029274(&gUnknown_02022C98->unk160);
+            gUnknown_02022C98->unk0C++;
         }
         break;
     case 2:
         if (!sub_802A770())
         {
             sub_8010434();
-            gUnknown_02022C98->unk_000C++;
+            gUnknown_02022C98->unk0C++;
         }
         break;
     case 3:
@@ -363,37 +570,37 @@ void sub_8024BC8(u8 taskId)
                 LoadWirelessStatusIndicatorSpriteGfx();
                 CreateWirelessStatusIndicatorSprite(0, 0);
             }
-            gUnknown_02022C98->unk_000C++;
+            gUnknown_02022C98->unk0C++;
         }
         break;
     case 4:
-        r5 = gUnknown_02022C98->unk_0024;
+        r5 = gUnknown_02022C98->unk24;
         sub_80283A8();
         for (r4 = 0; r4 < r5; r4++)
         {
-            sub_8028408(&gUnknown_02022C98->unk_318C[gUnknown_02022C98->unk_0034[r4]], r4, gUnknown_02022C98->unk_0034[r4], gUnknown_02022C98->unk_0024);
+            sub_8028408(&gUnknown_02022C98->unk318C[gUnknown_02022C98->unk34[r4]], r4, gUnknown_02022C98->unk34[r4], gUnknown_02022C98->unk24);
         }
-        sub_802868C(0, gUnknown_02022C98->unk_0024);
-        gUnknown_02022C98->unk_000C++;
+        sub_802868C(FALSE, gUnknown_02022C98->unk24);
+        gUnknown_02022C98->unk0C++;
         break;
     case 5:
         sub_8028A34();
         sub_8028A88();
         sub_8028D44();
         sub_8028734();
-        gUnknown_02022C98->unk_000C++;
+        gUnknown_02022C98->unk0C++;
         break;
     case 6:
         BlendPalettes(0xFFFFFFFF, 0x10, 0x00);
         BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0);
         SetVBlankCallback(sub_80261E4);
-        gUnknown_02022C98->unk_000C++;
+        gUnknown_02022C98->unk0C++;
         break;
     case 7:
         UpdatePaletteFade();
         if (!gPaletteFade.active)
         {
-            gUnknown_02022C98->unk_000C++;
+            gUnknown_02022C98->unk0C++;
         }
         break;
     default:
@@ -403,36 +610,36 @@ void sub_8024BC8(u8 taskId)
     }
 }
 
-void sub_8024D4C(u8 taskId)
+static void sub_8024D4C(u8 taskId)
 {
     sub_8025D04();
-    gUnknown_082F7AC4[gUnknown_02022C98->unk_0018]();
-    if (gUnknown_03000DB0 == FALSE)
+    gUnknown_082F7AC4[gUnknown_02022C98->unk18]();
+    if (!gUnknown_03000DB0)
     {
         sub_8026AF4();
     }
     sub_8025D50();
 }
 
-void sub_8024D84(u8 taskId)
+static void sub_8024D84(u8 taskId)
 {
     sub_8025E0C();
-    gUnknown_082F7AF4[gUnknown_02022C98->unk_0018]();
-    if (gUnknown_03000DB0 == FALSE)
+    gUnknown_082F7AF4[gUnknown_02022C98->unk18]();
+    if (!gUnknown_03000DB0)
     {
         sub_8026B28();
     }
     sub_8025ED8();
 }
 
-void sub_8024DBC(void)
+static void sub_8024DBC(void)
 {
-    switch (gUnknown_02022C98->unk_0010)
+    switch (gUnknown_02022C98->unk10)
     {
     case 0:
         sub_8028504(1);
         sub_80292E0(1);
-        gUnknown_02022C98->unk_0010++;
+        gUnknown_02022C98->unk10++;
         break;
     case 1:
         if (!sub_802A770())
@@ -441,50 +648,50 @@ void sub_8024DBC(void)
     }
 }
 
-void sub_8024E00(void)
+static void sub_8024E00(void)
 {
-    if (gUnknown_02022C98->unk_0010 == 0)
+    if (gUnknown_02022C98->unk10 == 0)
     {
         sub_80262C0();
-        gUnknown_02022C98->unk_0010++;
+        gUnknown_02022C98->unk10++;
     }
     else
     {
-        gUnknown_02022C98->unk_0118 = 1;
+        gUnknown_02022C98->unk118 = 1;
         sub_8026240(2);
     }
 }
 
-void sub_8024E38(void)
+static void sub_8024E38(void)
 {
-    switch (gUnknown_02022C98->unk_0010)
+    switch (gUnknown_02022C98->unk10)
     {
     case 0:
         sub_802EB24(7, 8, 120, 80, 0);
-        gUnknown_02022C98->unk_0010++;
+        gUnknown_02022C98->unk10++;
         break;
     case 1:
         sub_8010434();
-        gUnknown_02022C98->unk_0010++;
+        gUnknown_02022C98->unk10++;
         break;
     case 2:
         if (IsLinkTaskFinished())
         {
-            gUnknown_02022C98->unk_0010++;
-            gUnknown_02022C98->unk_0030 = 0;
+            gUnknown_02022C98->unk10++;
+            gUnknown_02022C98->unk30 = 0;
         }
         break;
     case 3:
         if (!sub_802EB84())
         {
-            gUnknown_02022C98->unk_0010++;
+            gUnknown_02022C98->unk10++;
         }
         break;
     case 4:
-        if (++gUnknown_02022C98->unk_0030 > 5)
+        if (++gUnknown_02022C98->unk30 > 5)
         {
             sub_8010434();
-            gUnknown_02022C98->unk_0010++;
+            gUnknown_02022C98->unk10++;
         }
         break;
     case 5:
@@ -496,52 +703,52 @@ void sub_8024E38(void)
     }
 }
 
-void sub_8024F10(void)
+static void sub_8024F10(void)
 {
-    if (gUnknown_02022C98->unk_0010 == 0)
+    if (gUnknown_02022C98->unk10 == 0)
     {
-        if (gUnknown_02022C98->unk_011C != 0)
+        if (gUnknown_02022C98->unk11C != 0)
         {
             sub_8026240(4);
         }
     }
 }
 
-void sub_8024F38(void)
+static void sub_8024F38(void)
 {
-    if (gUnknown_02022C98->unk_0010 == 0)
+    if (gUnknown_02022C98->unk10 == 0)
     {
-        if (gUnknown_02022C98->unk_0040 < 10)
+        if (gUnknown_02022C98->unk40 < 10)
         {
-            if (gUnknown_02022C98->unk_00A8[0] == 0)
+            if (gUnknown_02022C98->unkA8[0] == 0)
             {
                 if (JOY_NEW(DPAD_UP))
                 {
-                    if (gUnknown_02022C98->unk_31A0[0].unk_2C == 0)
+                    if (gUnknown_02022C98->unk31A0[0].unk2C.unk0 == 0)
                     {
-                        gUnknown_02022C98->unk_31A0[0].unk_30 = 0;
-                        gUnknown_02022C98->unk_31A0[0].unk_2C = sub_8027518(2);
+                        gUnknown_02022C98->unk31A0[0].unk2C.unk4 = 0;
+                        gUnknown_02022C98->unk31A0[0].unk2C.unk0 = sub_8027518(2);
                     }
                 }
                 else if (JOY_NEW(DPAD_RIGHT))
                 {
-                    if (gUnknown_02022C98->unk_31A0[0].unk_2C == 0)
+                    if (gUnknown_02022C98->unk31A0[0].unk2C.unk0 == 0)
                     {
-                        gUnknown_02022C98->unk_31A0[0].unk_30 = 0;
-                        gUnknown_02022C98->unk_31A0[0].unk_2C = sub_8027518(1);
+                        gUnknown_02022C98->unk31A0[0].unk2C.unk4 = 0;
+                        gUnknown_02022C98->unk31A0[0].unk2C.unk0 = sub_8027518(1);
                     }
                 }
                 else if (JOY_NEW(DPAD_LEFT))
                 {
-                    if (gUnknown_02022C98->unk_31A0[0].unk_2C == 0)
+                    if (gUnknown_02022C98->unk31A0[0].unk2C.unk0 == 0)
                     {
-                        gUnknown_02022C98->unk_31A0[0].unk_30 = 0;
-                        gUnknown_02022C98->unk_31A0[0].unk_2C = sub_8027518(3);
+                        gUnknown_02022C98->unk31A0[0].unk2C.unk4 = 0;
+                        gUnknown_02022C98->unk31A0[0].unk2C.unk0 = sub_8027518(3);
                     }
                 }
                 else
                 {
-                    gUnknown_02022C98->unk_31A0[0].unk_2C = sub_8027518(0);
+                    gUnknown_02022C98->unk31A0[0].unk2C.unk0 = sub_8027518(0);
                 }
             }
         }
@@ -554,34 +761,34 @@ void sub_8024F38(void)
     }
 }
 
-void sub_8024FFC(void)
+static void sub_8024FFC(void)
 {
-    if (gUnknown_02022C98->unk_0040 < 10)
+    if (gUnknown_02022C98->unk40 < 10)
     {
         if (JOY_NEW(DPAD_UP))
         {
-            if (gUnknown_02022C98->unk_31A0[gUnknown_02022C98->multiplayerId].unk_2C == 0)
+            if (gUnknown_02022C98->unk31A0[gUnknown_02022C98->multiplayerId].unk2C.unk0 == 0)
             {
-                gUnknown_02022C98->unk_32CC.unk_2C = 2;
+                gUnknown_02022C98->unk32CC.unk2C.unk0 = 2;
             }
         }
         else if (JOY_NEW(DPAD_RIGHT))
         {
-            if (gUnknown_02022C98->unk_31A0[gUnknown_02022C98->multiplayerId].unk_2C == 0)
+            if (gUnknown_02022C98->unk31A0[gUnknown_02022C98->multiplayerId].unk2C.unk0 == 0)
             {
-                gUnknown_02022C98->unk_32CC.unk_2C = 1;
+                gUnknown_02022C98->unk32CC.unk2C.unk0 = 1;
             }
         }
         else if (JOY_NEW(DPAD_LEFT))
         {
-            if (gUnknown_02022C98->unk_31A0[gUnknown_02022C98->multiplayerId].unk_2C == 0)
+            if (gUnknown_02022C98->unk31A0[gUnknown_02022C98->multiplayerId].unk2C.unk0 == 0)
             {
-                gUnknown_02022C98->unk_32CC.unk_2C = 3;
+                gUnknown_02022C98->unk32CC.unk2C.unk0 = 3;
             }
         }
         else
         {
-            gUnknown_02022C98->unk_32CC.unk_2C = 0;
+            gUnknown_02022C98->unk32CC.unk2C.unk0 = 0;
         }
     }
     else
@@ -591,7 +798,7 @@ void sub_8024FFC(void)
     sub_8026044();
 }
 
-void sub_80250D4(void)
+static void sub_80250D4(void)
 {
     u8 i;
 
@@ -604,26 +811,26 @@ void sub_80250D4(void)
     }
     else
     {
-        gUnknown_02022C98->unk_012C = 1;
-        for (i = 1; i < gUnknown_02022C98->unk_0024; i++)
+        gUnknown_02022C98->unk12C = 1;
+        for (i = 1; i < gUnknown_02022C98->unk24; i++)
         {
-            if (gUnknown_02022C98->unk_0130[i] != 1)
+            if (gUnknown_02022C98->unk130[i] != 1)
             {
-                gUnknown_02022C98->unk_012C = 0;
+                gUnknown_02022C98->unk12C = 0;
                 break;
             }
         }
     }
 }
 
-void sub_8025158(void)
+static void sub_8025158(void)
 {
     sub_8026044();
     if (sub_8026C90() == 1)
         sub_8026240(5);
 }
 
-bool32 sub_8025170(void)
+static bool32 sub_8025170(void)
 {
     u8 r4 = GetBlockReceivedStatus();
     u8 r0 = sub_800A9D8();
@@ -638,32 +845,32 @@ bool32 sub_8025170(void)
     }
 }
 
-void sub_8025198(void)
+static void sub_8025198(void)
 {
-    switch (gUnknown_02022C98->unk_0010)
+    switch (gUnknown_02022C98->unk10)
     {
     case 0:
-        if (SendBlock(0, gUnknown_02022C98->unk_004A, sizeof(gUnknown_02022C98->unk_004A)))
+        if (SendBlock(0, gUnknown_02022C98->unk4A, sizeof(gUnknown_02022C98->unk4A)))
         {
-            gUnknown_02022C98->unk_0008 = 0;
-            gUnknown_02022C98->unk_0010++;
+            gUnknown_02022C98->unk08 = 0;
+            gUnknown_02022C98->unk10++;
         }
         break;
     case 1:
         if (IsLinkTaskFinished())
         {
-            gUnknown_02022C98->unk_0010++;
+            gUnknown_02022C98->unk10++;
         }
         break;
     case 2:
         if (sub_8025170())
         {
-            gUnknown_02022C98->unk_0008 = gUnknown_02022C98->unk_0024;
+            gUnknown_02022C98->unk08 = gUnknown_02022C98->unk24;
         }
-        if (gUnknown_02022C98->unk_0008 >= gUnknown_02022C98->unk_0024)
+        if (gUnknown_02022C98->unk08 >= gUnknown_02022C98->unk24)
         {
-            gUnknown_02022C98->unk_0014++;
-            gUnknown_02022C98->unk_0010++;
+            gUnknown_02022C98->unk14++;
+            gUnknown_02022C98->unk10++;
         }
         break;
     default:
@@ -676,38 +883,38 @@ void sub_8025198(void)
     }
 }
 
-void sub_8025230(void)
+static void sub_8025230(void)
 {
     u8 i;
 
-    switch (gUnknown_02022C98->unk_0010) {
+    switch (gUnknown_02022C98->unk10) {
     case 0:
-        if (SendBlock(0, gUnknown_02022C98->unk_004A[gUnknown_02022C98->unk_0014],
-                      sizeof(gUnknown_02022C98->unk_004A))) {
-            gUnknown_02022C98->unk_0008 = 0;
-            gUnknown_02022C98->unk_0010++;
+        if (SendBlock(0, gUnknown_02022C98->unk4A[gUnknown_02022C98->unk14],
+                      sizeof(gUnknown_02022C98->unk4A))) {
+            gUnknown_02022C98->unk08 = 0;
+            gUnknown_02022C98->unk10++;
         }
         break;
     case 1:
         if (IsLinkTaskFinished()) {
-            gUnknown_02022C98->unk_0010++;
+            gUnknown_02022C98->unk10++;
         }
         break;
     case 2:
         if (sub_8025170()) {
-            for (i = 0; i < gUnknown_02022C98->unk_0024; i++) {
-                memcpy(gUnknown_02022C98->unk_004A, gBlockRecvBuffer, sizeof(gUnknown_02022C98->unk_004A));
-                gUnknown_02022C98->unk_0008 = gUnknown_02022C98->unk_0024;
+            for (i = 0; i < gUnknown_02022C98->unk24; i++) {
+                memcpy(gUnknown_02022C98->unk4A, gBlockRecvBuffer, sizeof(gUnknown_02022C98->unk4A));
+                gUnknown_02022C98->unk08 = gUnknown_02022C98->unk24;
             }
         }
-        if (gUnknown_02022C98->unk_0008 >= gUnknown_02022C98->unk_0024) {
-            gUnknown_02022C98->unk_0014++;
-            gUnknown_02022C98->unk_0010++;
+        if (gUnknown_02022C98->unk08 >= gUnknown_02022C98->unk24) {
+            gUnknown_02022C98->unk14++;
+            gUnknown_02022C98->unk10++;
         }
         break;
     default:
         if (WaitFanfare(TRUE)) {
-            gUnknown_02022C98->unk_0114 = gUnknown_02022C98->unk_004A[gUnknown_02022C98->multiplayerId][5];
+            gUnknown_02022C98->unk114 = gUnknown_02022C98->unk4A[gUnknown_02022C98->multiplayerId][5];
             sub_8026240(6);
             FadeOutAndPlayNewMapMusic(MUS_RG_WIN_YASEI, 4);
         }
@@ -715,56 +922,56 @@ void sub_8025230(void)
     }
 }
 
-void sub_8025324(void)
+static void sub_8025324(void)
 {
     u8 sp00 = 1;
     u8 i;
 
-    switch (gUnknown_02022C98->unk_0010)
+    switch (gUnknown_02022C98->unk10)
     {
     case 0:
         sub_802749C();
-        sub_80289E8(1);
+        sub_80289E8(TRUE);
         sub_8028DFC();
-        sub_8028EC8(1);
+        sub_8028EC8(TRUE);
         sub_80292E0(2);
-        gUnknown_02022C98->unk_0010++;
+        gUnknown_02022C98->unk10++;
         break;
     case 1:
         if (!sub_802A770())
         {
             sub_80292E0(5);
-            gUnknown_02022C98->unk_0010++;
+            gUnknown_02022C98->unk10++;
         }
         break;
     case 2:
         sp00 = sub_802A794();
         if (SendBlock(0, &sp00, sizeof(sp00)))
         {
-            gUnknown_02022C98->unk_0010++;
+            gUnknown_02022C98->unk10++;
         }
         break;
     case 3:
         if (IsLinkTaskFinished())
         {
-            gUnknown_02022C98->unk_0010++;
-            gUnknown_02022C98->unk_0008 = 0;
+            gUnknown_02022C98->unk10++;
+            gUnknown_02022C98->unk08 = 0;
         }
         break;
     case 4:
         if (sub_8025170())
         {
-            for (i = 0; i < gUnknown_02022C98->unk_0024; i++)
+            for (i = 0; i < gUnknown_02022C98->unk24; i++)
             {
-                *(gUnknown_02022C98->unk_010C + i) = *(u8 *)gBlockRecvBuffer[i];
-                gUnknown_02022C98->unk_0008 = gUnknown_02022C98->unk_0024;
+                *(gUnknown_02022C98->unk10C + i) = *(u8 *)gBlockRecvBuffer[i];
+                gUnknown_02022C98->unk08 = gUnknown_02022C98->unk24;
             }
         }
-        if (gUnknown_02022C98->unk_0008 >= gUnknown_02022C98->unk_0024) {
-            if (++gUnknown_02022C98->unk_0014 >= 120)
+        if (gUnknown_02022C98->unk08 >= gUnknown_02022C98->unk24) {
+            if (++gUnknown_02022C98->unk14 >= 120)
             {
                 sub_80292E0(6);
-                gUnknown_02022C98->unk_0010++;
+                gUnknown_02022C98->unk10++;
             }
         }
         break;
@@ -777,74 +984,74 @@ void sub_8025324(void)
     }
 }
 
-void sub_8025470(void)
+static void sub_8025470(void)
 {
     u8 sp0;
     u8 i;
 
-    switch (gUnknown_02022C98->unk_0010)
+    switch (gUnknown_02022C98->unk10)
     {
     case 0:
         if (sub_8027748() >= 3000)
         {
             sub_80292E0(4);
         }
-        gUnknown_02022C98->unk_0010++;
+        gUnknown_02022C98->unk10++;
         break;
     case 1:
         if (!sub_802A770())
         {
             sub_80292E0(3);
-            gUnknown_02022C98->unk_0010++;
+            gUnknown_02022C98->unk10++;
         }
         break;
     case 2:
         sub_8028FCC();
         sub_80272E8();
-        gUnknown_02022C98->unk_0010++;
+        gUnknown_02022C98->unk10++;
         break;
     case 3:
         if ((sp0 = sub_802A794()) != 0)
         {
-            gUnknown_02022C98->unk_0010++;
+            gUnknown_02022C98->unk10++;
         }
         break;
     case 4:
         if (!sub_802A770())
         {
             sub_80292E0(5);
-            gUnknown_02022C98->unk_0010++;
+            gUnknown_02022C98->unk10++;
         }
         break;
     case 5:
         sp0 = sub_802A794();
         if (SendBlock(0, &sp0, sizeof(sp0)))
         {
-            gUnknown_02022C98->unk_0008 = 0;
-            gUnknown_02022C98->unk_0010++;
+            gUnknown_02022C98->unk08 = 0;
+            gUnknown_02022C98->unk10++;
         }
         break;
     case 6:
         if (IsLinkTaskFinished())
         {
-            gUnknown_02022C98->unk_0010++;
+            gUnknown_02022C98->unk10++;
         }
         break;
     case 7:
         if (sub_8025170())
         {
-            for (i = 0; i < gUnknown_02022C98->unk_0024; i++)
+            for (i = 0; i < gUnknown_02022C98->unk24; i++)
             {
-                *(gUnknown_02022C98->unk_010C + i) = *(u8 *)gBlockRecvBuffer[i];
-                gUnknown_02022C98->unk_0008 = gUnknown_02022C98->unk_0024;
+                *(gUnknown_02022C98->unk10C + i) = *(u8 *)gBlockRecvBuffer[i];
+                gUnknown_02022C98->unk08 = gUnknown_02022C98->unk24;
             }
         }
-        if (gUnknown_02022C98->unk_0008 >= gUnknown_02022C98->unk_0024) {
-            if (++gUnknown_02022C98->unk_0014 >= 120)
+        if (gUnknown_02022C98->unk08 >= gUnknown_02022C98->unk24) {
+            if (++gUnknown_02022C98->unk14 >= 120)
             {
                 sub_8027608();
                 sub_80292E0(6);
-                gUnknown_02022C98->unk_0010++;
+                gUnknown_02022C98->unk10++;
             }
         }
         else
@@ -855,9 +1062,9 @@ void sub_8025470(void)
     default:
         if (!sub_802A770())
         {
-            for (i = 0; i < gUnknown_02022C98->unk_0024; i++)
+            for (i = 0; i < gUnknown_02022C98->unk24; i++)
             {
-                if (gUnknown_02022C98->unk_010C[i] == 2)
+                if (gUnknown_02022C98->unk10C[i] == 2)
                 {
                     sub_8026240(8);
                     return;
@@ -869,25 +1076,25 @@ void sub_8025470(void)
     }
 }
 
-void sub_8025644(void)
+static void sub_8025644(void)
 {
-    switch (gUnknown_02022C98->unk_0010)
+    switch (gUnknown_02022C98->unk10)
     {
     case 0:
         sub_800AC34();
         sub_80292E0(7);
-        gUnknown_02022C98->unk_0010++;
+        gUnknown_02022C98->unk10++;
         break;
     case 1:
         if (!sub_802A770())
         {
-            gUnknown_02022C98->unk_0010++;
+            gUnknown_02022C98->unk10++;
         }
         break;
     case 2:
         if (sub_802A794() == 5)
         {
-            gUnknown_02022C98->unk_0010++;
+            gUnknown_02022C98->unk10++;
         }
         break;
     default:
@@ -899,35 +1106,35 @@ void sub_8025644(void)
     }
 }
 
-void sub_80256AC(void)
+static void sub_80256AC(void)
 {
-    switch (gUnknown_02022C98->unk_0010)
+    switch (gUnknown_02022C98->unk10)
     {
     case 0:
         BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0);
-        gUnknown_02022C98->unk_0010++;
+        gUnknown_02022C98->unk10++;
         break;
     case 1:
         UpdatePaletteFade();
         if (!gPaletteFade.active)
         {
-            gUnknown_02022C98->unk_0010++;
+            gUnknown_02022C98->unk10++;
         }
         break;
     case 2:
         sub_8028B80();
         sub_80287E4();
-        sub_8028614(gUnknown_02022C98->unk_0024);
+        sub_8028614(gUnknown_02022C98->unk24);
         sub_8028E84();
         gUnknown_03000DB0 = TRUE;
         sub_80292E0(8);
-        gUnknown_02022C98->unk_0010++;
+        gUnknown_02022C98->unk10++;
         break;
     default:
         if (!sub_802A770())
         {
             SetMainCallback2(gUnknown_02022C98->savedCallback);
-            DestroyTask(gUnknown_02022C98->unk_0004);
+            DestroyTask(gUnknown_02022C98->unk04);
             Free(gUnknown_02022C98);
             FreeAllWindowBuffers();
         }
@@ -935,20 +1142,20 @@ void sub_80256AC(void)
     }
 }
 
-void sub_8025758(void)
+static void sub_8025758(void)
 {
-    switch (gUnknown_02022C98->unk_0010)
+    switch (gUnknown_02022C98->unk10)
     {
     case 0:
         sub_80292E0(9);
         BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0);
-        gUnknown_02022C98->unk_0010++;
+        gUnknown_02022C98->unk10++;
         break;
     case 1:
         UpdatePaletteFade();
         if (!gPaletteFade.active)
         {
-            gUnknown_02022C98->unk_0010++;
+            gUnknown_02022C98->unk10++;
         }
         break;
     case 2:
@@ -960,66 +1167,66 @@ void sub_8025758(void)
         ChangeBgY(2, 0, 0);
         ChangeBgX(3, 0, 0);
         ChangeBgY(3, 0, 0);
-        gUnknown_02022C98->unk_0010++;
+        gUnknown_02022C98->unk10++;
         break;
     case 3:
         StopMapMusic();
-        gUnknown_02022C98->unk_0010++;
+        gUnknown_02022C98->unk10++;
         break;
     case 4:
         PlayNewMapMusic(MUS_RG_KINOMIKUI);
         sub_8028E4C();
-        gUnknown_02022C98->unk_0010++;
+        gUnknown_02022C98->unk10++;
         break;
     case 5:
         BlendPalettes(0xFFFFFFFF, 16, 0);
         BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0);
-        gUnknown_02022C98->unk_0010++;
+        gUnknown_02022C98->unk10++;
         break;
     case 6:
         UpdatePaletteFade();
         if (!gPaletteFade.active)
         {
-            gUnknown_02022C98->unk_0010++;
+            gUnknown_02022C98->unk10++;
         }
         break;
     default:
-        DestroyTask(gUnknown_02022C98->unk_0004);
+        DestroyTask(gUnknown_02022C98->unk04);
         sub_802621C(sub_802589C);
         sub_802903C();
         sub_8024A30(gUnknown_02022C98);
         if (gReceivedRemoteLinkPlayers == 0)
         {
-            gUnknown_02022C98->unk_0024 = 1;
+            gUnknown_02022C98->unk24 = 1;
         }
         sub_80273F0();
-        sub_8028EC8(0);
+        sub_8028EC8(FALSE);
         break;
     }
 }
 
-void sub_802589C(u8 taskId)
+static void sub_802589C(u8 taskId)
 {
-    switch (gUnknown_02022C98->unk_0010)
+    switch (gUnknown_02022C98->unk10)
     {
     case 0:
         if (sub_8026264() == 1)
         {
-            gUnknown_02022C98->unk_0010++;
+            gUnknown_02022C98->unk10++;
         }
         break;
     case 1:
         sub_80286E4();
-        gUnknown_02022C98->unk_0010++;
+        gUnknown_02022C98->unk10++;
         break;
     case 2:
-        if (sub_8028828() == 1)
+        if (sub_8028828() == TRUE)
         {
-            gUnknown_02022C98->unk_0010++;
+            gUnknown_02022C98->unk10++;
         }
         break;
     default:
-        if (gUnknown_02022C98->unk_0020 != 0)
+        if (gUnknown_02022C98->unk20 != 0)
         {
             sub_802621C(sub_8024D4C);
         }
@@ -1032,7 +1239,7 @@ void sub_802589C(u8 taskId)
     }
 }
 
-void sub_8025910(u8 taskId)
+static void sub_8025910(u8 taskId)
 {
     s16 * data = gTasks[taskId].data;
     u8 i;
@@ -1040,9 +1247,9 @@ void sub_8025910(u8 taskId)
     switch (data[0])
     {
     case 0:
-        if (SendBlock(0, &gUnknown_02022C98->unk_318C[gUnknown_02022C98->multiplayerId].isShiny, sizeof(gUnknown_02022C98->unk_318C[gUnknown_02022C98->multiplayerId].isShiny)))
+        if (SendBlock(0, &gUnknown_02022C98->unk318C[gUnknown_02022C98->multiplayerId].isShiny, sizeof(gUnknown_02022C98->unk318C[gUnknown_02022C98->multiplayerId].isShiny)))
         {
-            gUnknown_02022C98->unk_0008 = 0;
+            gUnknown_02022C98->unk08 = 0;
             data[0]++;
         }
         break;
@@ -1055,129 +1262,129 @@ void sub_8025910(u8 taskId)
     case 2:
         if (sub_8025170())
         {
-            for (i = 0; i < gUnknown_02022C98->unk_0024; i++)
+            for (i = 0; i < gUnknown_02022C98->unk24; i++)
             {
-                *(u8 *)&gUnknown_02022C98->unk_318C[i] = *(u8 *)gBlockRecvBuffer[i];
-                gUnknown_02022C98->unk_0008 = gUnknown_02022C98->unk_0024;
+                *(u8 *)&gUnknown_02022C98->unk318C[i] = *(u8 *)gBlockRecvBuffer[i];
+                gUnknown_02022C98->unk08 = gUnknown_02022C98->unk24;
             }
         }
-        if (gUnknown_02022C98->unk_0008 >= gUnknown_02022C98->unk_0024)
+        if (gUnknown_02022C98->unk08 >= gUnknown_02022C98->unk24)
         {
             DestroyTask(taskId);
             sub_80292E0(6);
-            gUnknown_02022C98->unk_0010++;
+            gUnknown_02022C98->unk10++;
         }
         break;
     }
 }
 
-void sub_80259FC(void)
+static void sub_80259FC(void)
 {
     u8 i;
-    u8 r7 = gUnknown_02022C98->unk_0024;
+    u8 r7 = gUnknown_02022C98->unk24;
 
-    gUnknown_02022C98->unk_31A0[0].unk_10 = sub_8028164(0, &gUnknown_02022C98->unk_31A0[0], &gUnknown_02022C98->unk_31A0[0].unk_2C, &gUnknown_02022C98->unk_31A0[1].unk_2C, &gUnknown_02022C98->unk_31A0[2].unk_2C, &gUnknown_02022C98->unk_31A0[3].unk_2C, &gUnknown_02022C98->unk_31A0[4].unk_2C, &gUnknown_02022C98->unk_0040, &gUnknown_02022C98->unk_0120, &gUnknown_02022C98->unk_012C);
-    gUnknown_02022C98->unk_0128 = 1;
+    gUnknown_02022C98->unk31A0[0].unk10 = sub_8028164(0, &gUnknown_02022C98->unk31A0[0], &gUnknown_02022C98->unk31A0[0].unk2C, &gUnknown_02022C98->unk31A0[1].unk2C, &gUnknown_02022C98->unk31A0[2].unk2C, &gUnknown_02022C98->unk31A0[3].unk2C, &gUnknown_02022C98->unk31A0[4].unk2C, &gUnknown_02022C98->unk40, &gUnknown_02022C98->unk120, &gUnknown_02022C98->unk12C);
+    gUnknown_02022C98->unk128 = 1;
 
     for (i = 1; i < r7; i++)
     {
-        if (   gUnknown_02022C98->unk_00A8[i] == 0
-            && sub_8028318(i, &gUnknown_02022C98->unk_31A0[i].unk_2C) == 0)
+        if (   gUnknown_02022C98->unkA8[i] == 0
+            && sub_8028318(i, &gUnknown_02022C98->unk31A0[i].unk2C.unk0) == 0)
         {
-            gUnknown_02022C98->unk_31A0[i].unk_2C = 0;
-            gUnknown_02022C98->unk_0128 = 0;
+            gUnknown_02022C98->unk31A0[i].unk2C.unk0 = 0;
+            gUnknown_02022C98->unk128 = 0;
         }
     }
-    if (++gUnknown_02022C98->unk_0124 >= 60)
+    if (++gUnknown_02022C98->unk124 >= 60)
     {
-        if (gUnknown_02022C98->unk_0128 != 0)
+        if (gUnknown_02022C98->unk128 != 0)
         {
             sub_8011AC8();
-            gUnknown_02022C98->unk_0124 = 0;
+            gUnknown_02022C98->unk124 = 0;
         }
-        else if (gUnknown_02022C98->unk_0124 > 70)
+        else if (gUnknown_02022C98->unk124 > 70)
         {
             sub_8011AC8();
-            gUnknown_02022C98->unk_0124 = 0;
+            gUnknown_02022C98->unk124 = 0;
         }
     }
 
     for (i = 0; i < r7; i++)
     {
-        if (   gUnknown_02022C98->unk_31A0[i].unk_2C != 0
-            && gUnknown_02022C98->unk_00A8[i] == 0)
+        if (   gUnknown_02022C98->unk31A0[i].unk2C.unk0 != 0
+            && gUnknown_02022C98->unkA8[i] == 0)
         {
-            gUnknown_02022C98->unk_00A8[i] = 1;
+            gUnknown_02022C98->unkA8[i] = 1;
         }
-        switch (gUnknown_02022C98->unk_00A8[i])
+        switch (gUnknown_02022C98->unkA8[i])
         {
         case 0:
         default:
             break;
         case 1 ... 3:
-            if (++gUnknown_02022C98->unk_00B0[i] >= 6)
+            if (++gUnknown_02022C98->unkB0[i] >= 6)
             {
-                gUnknown_02022C98->unk_00B0[i] = 0;
-                gUnknown_02022C98->unk_00A8[i] = 0;
-                gUnknown_02022C98->unk_31A0[i].unk_2C = 0;
-                gUnknown_02022C98->unk_31A0[i].unk_30 = 0;
-                gUnknown_02022C98->unk_31A0[i].unk_34 = 0;
+                gUnknown_02022C98->unkB0[i] = 0;
+                gUnknown_02022C98->unkA8[i] = 0;
+                gUnknown_02022C98->unk31A0[i].unk2C.unk0 = 0;
+                gUnknown_02022C98->unk31A0[i].unk2C.unk4 = 0;
+                gUnknown_02022C98->unk31A0[i].unk2C.unk8 = 0;
             }
             break;
         case 4:
-            if (++gUnknown_02022C98->unk_00B0[i] >= 40)
+            if (++gUnknown_02022C98->unkB0[i] >= 40)
             {
-                gUnknown_02022C98->unk_00B0[i] = 0;
-                gUnknown_02022C98->unk_00A8[i] = 0;
-                gUnknown_02022C98->unk_31A0[i].unk_2C = 0;
-                gUnknown_02022C98->unk_31A0[i].unk_30 = 0;
-                gUnknown_02022C98->unk_31A0[i].unk_34 = 0;
+                gUnknown_02022C98->unkB0[i] = 0;
+                gUnknown_02022C98->unkA8[i] = 0;
+                gUnknown_02022C98->unk31A0[i].unk2C.unk0 = 0;
+                gUnknown_02022C98->unk31A0[i].unk2C.unk4 = 0;
+                gUnknown_02022C98->unk31A0[i].unk2C.unk8 = 0;
             }
             break;
         }
     }
 }
 
-void sub_8025C0C(void)
+static void sub_8025C0C(void)
 {
     u8 i;
-    u8 r6 = gUnknown_02022C98->unk_0024;
+    u8 r6 = gUnknown_02022C98->unk24;
 
-    gUnknown_02022C98->unk_31A0[0].unk_10 = sub_8028164(0, &gUnknown_02022C98->unk_31A0[0], &gUnknown_02022C98->unk_31A0[0].unk_2C, &gUnknown_02022C98->unk_31A0[1].unk_2C, &gUnknown_02022C98->unk_31A0[2].unk_2C, &gUnknown_02022C98->unk_31A0[3].unk_2C, &gUnknown_02022C98->unk_31A0[4].unk_2C, &gUnknown_02022C98->unk_0040, &gUnknown_02022C98->unk_0120, &gUnknown_02022C98->unk_012C);
-    gUnknown_02022C98->unk_0128 = 1;
+    gUnknown_02022C98->unk31A0[0].unk10 = sub_8028164(0, &gUnknown_02022C98->unk31A0[0], &gUnknown_02022C98->unk31A0[0].unk2C, &gUnknown_02022C98->unk31A0[1].unk2C, &gUnknown_02022C98->unk31A0[2].unk2C, &gUnknown_02022C98->unk31A0[3].unk2C, &gUnknown_02022C98->unk31A0[4].unk2C, &gUnknown_02022C98->unk40, &gUnknown_02022C98->unk120, &gUnknown_02022C98->unk12C);
+    gUnknown_02022C98->unk128 = 1;
 
     for (i = 1; i < r6; i++)
     {
         if (sub_8028374(i) != 0)
         {
-            gUnknown_02022C98->unk_0130[i] = 1;
-            gUnknown_02022C98->unk_0128 = 0;
+            gUnknown_02022C98->unk130[i] = 1;
+            gUnknown_02022C98->unk128 = 0;
         }
     }
-    if (++gUnknown_02022C98->unk_0124 >= 60)
+    if (++gUnknown_02022C98->unk124 >= 60)
     {
-        if (gUnknown_02022C98->unk_0128 != 0)
+        if (gUnknown_02022C98->unk128 != 0)
         {
             sub_8011AC8();
-            gUnknown_02022C98->unk_0124 = 0;
+            gUnknown_02022C98->unk124 = 0;
         }
-        else if (gUnknown_02022C98->unk_0124 > 70)
+        else if (gUnknown_02022C98->unk124 > 70)
         {
             sub_8011AC8();
-            gUnknown_02022C98->unk_0124 = 0;
+            gUnknown_02022C98->unk124 = 0;
         }
     }
 }
 
-void sub_8025D04(void)
+static void sub_8025D04(void)
 {
-    switch (gUnknown_02022C98->unk_0018)
+    switch (gUnknown_02022C98->unk18)
     {
     case 3:
-        if (sub_8026BB8() == 1)
+        if (sub_8026BB8() == TRUE)
         {
             sub_8026C28();
-            gUnknown_02022C98->unk_011C = 1;
+            gUnknown_02022C98->unk11C = 1;
         }
         break;
     case 4:
@@ -1189,48 +1396,48 @@ void sub_8025D04(void)
     }
 }
 
-void sub_8025D50(void)
+static void sub_8025D50(void)
 {
-    switch (gUnknown_02022C98->unk_0018)
+    switch (gUnknown_02022C98->unk18)
     {
     case 4:
-        sub_8027E30(&gUnknown_02022C98->unk_32CC, &gUnknown_02022C98->unk_31A0[0].unk_2C, &gUnknown_02022C98->unk_31A0[1].unk_2C, &gUnknown_02022C98->unk_31A0[2].unk_2C, &gUnknown_02022C98->unk_31A0[3].unk_2C, &gUnknown_02022C98->unk_31A0[4].unk_2C, gUnknown_02022C98->unk_0040, gUnknown_02022C98->unk_0120, gUnknown_02022C98->unk_012C);
+        sub_8027E30(&gUnknown_02022C98->unk32CC, &gUnknown_02022C98->unk31A0[0].unk2C, &gUnknown_02022C98->unk31A0[1].unk2C, &gUnknown_02022C98->unk31A0[2].unk2C, &gUnknown_02022C98->unk31A0[3].unk2C, &gUnknown_02022C98->unk31A0[4].unk2C, gUnknown_02022C98->unk40, gUnknown_02022C98->unk120, gUnknown_02022C98->unk12C);
         break;
     case 11:
-        sub_8027E30(&gUnknown_02022C98->unk_32CC, &gUnknown_02022C98->unk_31A0[0].unk_2C, &gUnknown_02022C98->unk_31A0[1].unk_2C, &gUnknown_02022C98->unk_31A0[2].unk_2C, &gUnknown_02022C98->unk_31A0[3].unk_2C, &gUnknown_02022C98->unk_31A0[4].unk_2C, gUnknown_02022C98->unk_0040, gUnknown_02022C98->unk_0120, gUnknown_02022C98->unk_012C);
+        sub_8027E30(&gUnknown_02022C98->unk32CC, &gUnknown_02022C98->unk31A0[0].unk2C, &gUnknown_02022C98->unk31A0[1].unk2C, &gUnknown_02022C98->unk31A0[2].unk2C, &gUnknown_02022C98->unk31A0[3].unk2C, &gUnknown_02022C98->unk31A0[4].unk2C, gUnknown_02022C98->unk40, gUnknown_02022C98->unk120, gUnknown_02022C98->unk12C);
         break;
     }
 }
 
-void sub_8025E0C(void)
+static void sub_8025E0C(void)
 {
-    switch (gUnknown_02022C98->unk_0018)
+    switch (gUnknown_02022C98->unk18)
     {
     case 4:
-        sub_8028164(gUnknown_02022C98->multiplayerId, &gUnknown_02022C98->unk_31A0[gUnknown_02022C98->multiplayerId], &gUnknown_02022C98->unk_31A0[0].unk_2C, &gUnknown_02022C98->unk_31A0[1].unk_2C, &gUnknown_02022C98->unk_31A0[2].unk_2C, &gUnknown_02022C98->unk_31A0[3].unk_2C, &gUnknown_02022C98->unk_31A0[4].unk_2C, &gUnknown_02022C98->unk_0040, &gUnknown_02022C98->unk_0120, &gUnknown_02022C98->unk_012C);
+        sub_8028164(gUnknown_02022C98->multiplayerId, &gUnknown_02022C98->unk31A0[gUnknown_02022C98->multiplayerId], &gUnknown_02022C98->unk31A0[0].unk2C, &gUnknown_02022C98->unk31A0[1].unk2C, &gUnknown_02022C98->unk31A0[2].unk2C, &gUnknown_02022C98->unk31A0[3].unk2C, &gUnknown_02022C98->unk31A0[4].unk2C, &gUnknown_02022C98->unk40, &gUnknown_02022C98->unk120, &gUnknown_02022C98->unk12C);
         break;
     case 11:
-        sub_8028164(gUnknown_02022C98->multiplayerId, &gUnknown_02022C98->unk_31A0[gUnknown_02022C98->multiplayerId], &gUnknown_02022C98->unk_31A0[0].unk_2C, &gUnknown_02022C98->unk_31A0[1].unk_2C, &gUnknown_02022C98->unk_31A0[2].unk_2C, &gUnknown_02022C98->unk_31A0[3].unk_2C, &gUnknown_02022C98->unk_31A0[4].unk_2C, &gUnknown_02022C98->unk_0040, &gUnknown_02022C98->unk_0120, &gUnknown_02022C98->unk_012C);
+        sub_8028164(gUnknown_02022C98->multiplayerId, &gUnknown_02022C98->unk31A0[gUnknown_02022C98->multiplayerId], &gUnknown_02022C98->unk31A0[0].unk2C, &gUnknown_02022C98->unk31A0[1].unk2C, &gUnknown_02022C98->unk31A0[2].unk2C, &gUnknown_02022C98->unk31A0[3].unk2C, &gUnknown_02022C98->unk31A0[4].unk2C, &gUnknown_02022C98->unk40, &gUnknown_02022C98->unk120, &gUnknown_02022C98->unk12C);
         break;
     }
 }
 
-void sub_8025ED8(void)
+static void sub_8025ED8(void)
 {
-    switch (gUnknown_02022C98->unk_0018)
+    switch (gUnknown_02022C98->unk18)
     {
     case 3:
         sub_8027DD0(1);
-        gUnknown_02022C98->unk_011C = 1;
+        gUnknown_02022C98->unk11C = 1;
         break;
     case 4:
-        if (gUnknown_02022C98->unk_32CC.unk_2C != 0)
+        if (gUnknown_02022C98->unk32CC.unk2C.unk0 != 0)
         {
-            sub_80282EC(gUnknown_02022C98->unk_32CC.unk_2C);
+            sub_80282EC(gUnknown_02022C98->unk32CC.unk2C.unk0);
         }
         break;
     case 11:
-        if (gUnknown_02022C98->unk_0120 == 0 && gUnknown_02022C98->unk_012C == 0)
+        if (gUnknown_02022C98->unk120 == 0 && gUnknown_02022C98->unk12C == 0)
         {
             sub_8028350(1);
         }
@@ -1238,105 +1445,105 @@ void sub_8025ED8(void)
     }
 }
 
-void sub_8025F48(void)
+static void sub_8025F48(void)
 {
-    if (gUnknown_02022C98->unk_31A0[gUnknown_02022C98->multiplayerId].unk_2C == 0)
+    if (gUnknown_02022C98->unk31A0[gUnknown_02022C98->multiplayerId].unk2C.unk0 == 0)
     {
         if (!IsSEPlaying())
         {
-            gUnknown_02022C98->unk_0144 = 0;
+            gUnknown_02022C98->unk144 = 0;
         }
     }
-    else if (gUnknown_02022C98->unk_31A0[gUnknown_02022C98->multiplayerId].unk_30 == 1)
+    else if (gUnknown_02022C98->unk31A0[gUnknown_02022C98->multiplayerId].unk2C.unk4 == 1)
     {
-        if (gUnknown_02022C98->unk_0144 == 0)
+        if (gUnknown_02022C98->unk144 == 0)
         {
             m4aSongNumStop(SE_SEIKAI);
             PlaySE(SE_SEIKAI);
-            gUnknown_02022C98->unk_0144 = 1;
+            gUnknown_02022C98->unk144 = 1;
         }
     }
-    else if (gUnknown_02022C98->unk_31A0[gUnknown_02022C98->multiplayerId].unk_34 == 1)
+    else if (gUnknown_02022C98->unk31A0[gUnknown_02022C98->multiplayerId].unk2C.unk8 == 1)
     {
-        if (gUnknown_02022C98->unk_0144 == 0 && !IsSEPlaying())
+        if (gUnknown_02022C98->unk144 == 0 && !IsSEPlaying())
         {
             PlaySE(SE_BOO);
             sub_80284CC(1);
-            gUnknown_02022C98->unk_0144 = 1;
+            gUnknown_02022C98->unk144 = 1;
         }
     }
 
-    if (gUnknown_02022C98->unk_0154 == 0 && gUnknown_02022C98->unk_0040 >= 10)
+    if (gUnknown_02022C98->unk154 == 0 && gUnknown_02022C98->unk40 >= 10)
     {
         StopMapMusic();
-        gUnknown_02022C98->unk_0154 = 1;
+        gUnknown_02022C98->unk154 = 1;
     }
-    else if (gUnknown_02022C98->unk_0154 == 1)
+    else if (gUnknown_02022C98->unk154 == 1)
     {
         PlayFanfareByFanfareNum(11); // MUS_ME_ZANNEN
-        gUnknown_02022C98->unk_0154 = 2;
+        gUnknown_02022C98->unk154 = 2;
     }
 }
 
-void sub_8026044(void)
+static void sub_8026044(void)
 {
-    u8 r8 = gUnknown_02022C98->unk_0044;
-    u8 r7 = gUnknown_02022C98->unk_0048;
+    u8 r8 = gUnknown_02022C98->unk44;
+    u8 r7 = gUnknown_02022C98->unk48;
     u8 r4;
-    if (gUnknown_02022C98->unk_31A0[gUnknown_02022C98->multiplayerId].unk_2C == 0)
+    if (gUnknown_02022C98->unk31A0[gUnknown_02022C98->multiplayerId].unk2C.unk0 == 0)
     {
-        if (gUnknown_02022C98->unk_31A0[gUnknown_02022C98->multiplayerId].unk_30 != 1 && gUnknown_02022C98->unk_31A0[gUnknown_02022C98->multiplayerId].unk_34 != 1)
+        if (gUnknown_02022C98->unk31A0[gUnknown_02022C98->multiplayerId].unk2C.unk4 != 1 && gUnknown_02022C98->unk31A0[gUnknown_02022C98->multiplayerId].unk2C.unk8 != 1)
         {
-            gUnknown_02022C98->unk_0144 = 0;
+            gUnknown_02022C98->unk144 = 0;
         }
     }
-    else if (gUnknown_02022C98->unk_31A0[gUnknown_02022C98->multiplayerId].unk_30 == 1)
+    else if (gUnknown_02022C98->unk31A0[gUnknown_02022C98->multiplayerId].unk2C.unk4 == 1)
     {
-        if (gUnknown_02022C98->unk_0144 == 0)
+        if (gUnknown_02022C98->unk144 == 0)
         {
             m4aSongNumStop(SE_SEIKAI);
             PlaySE(SE_SEIKAI);
-            gUnknown_02022C98->unk_0144 = 1;
+            gUnknown_02022C98->unk144 = 1;
         }
     }
-    else if (gUnknown_02022C98->unk_31A0[gUnknown_02022C98->multiplayerId].unk_34 == 1)
+    else if (gUnknown_02022C98->unk31A0[gUnknown_02022C98->multiplayerId].unk2C.unk8 == 1)
     {
-        if (gUnknown_02022C98->unk_0144 == 0 && !IsSEPlaying())
+        if (gUnknown_02022C98->unk144 == 0 && !IsSEPlaying())
         {
             PlaySE(SE_BOO);
             sub_80284CC(1);
-            gUnknown_02022C98->unk_0144 = 1;
+            gUnknown_02022C98->unk144 = 1;
         }
     }
     for (r4 = r8; r4 < r7; r4++)
     {
-        struct DodrioBerryPickingSubstruct_31A0_14 * ptr = &gUnknown_02022C98->unk_31A0[gUnknown_02022C98->multiplayerId].unk_14;
-        if (ptr->unk_B[r4] >= 10)
+        struct DodrioSubstruct_31A0_14 * ptr = &gUnknown_02022C98->unk31A0[gUnknown_02022C98->multiplayerId].unk14;
+        if (ptr->unkB[r4] >= 10)
         {
-            if (gUnknown_02022C98->unk_0148[r4] == 0)
+            if (gUnknown_02022C98->unk148[r4] == 0)
             {
-                PlaySE(SE_FUUSEN1 + ptr->unk_0[r4]);
-                gUnknown_02022C98->unk_0148[r4] = 1;
+                PlaySE(SE_FUUSEN1 + ptr->unk0[r4]);
+                gUnknown_02022C98->unk148[r4] = 1;
             }
         }
         else
         {
-            gUnknown_02022C98->unk_0148[r4] = 0;
+            gUnknown_02022C98->unk148[r4] = 0;
         }
     }
-    if (gUnknown_02022C98->unk_0154 == 0 && gUnknown_02022C98->unk_0040 >= 10)
+    if (gUnknown_02022C98->unk154 == 0 && gUnknown_02022C98->unk40 >= 10)
     {
         StopMapMusic();
-        gUnknown_02022C98->unk_0154 = 1;
+        gUnknown_02022C98->unk154 = 1;
     }
-    else if (gUnknown_02022C98->unk_0154 == 1)
+    else if (gUnknown_02022C98->unk154 == 1)
     {
         PlayFanfareByFanfareNum(11); // MUS_ME_ZANNEN
-        gUnknown_02022C98->unk_0154 = 2;
+        gUnknown_02022C98->unk154 = 2;
     }
 }
 
-void sub_80261CC(void)
+static void sub_80261CC(void)
 {
     RunTasks();
     AnimateSprites();
@@ -1344,46 +1551,46 @@ void sub_80261CC(void)
     UpdatePaletteFade();
 }
 
-void sub_80261E4(void)
+static void sub_80261E4(void)
 {
     TransferPlttBuffer();
     LoadOam();
     ProcessSpriteCopyRequests();
 }
 
-void sub_80261F8(struct DodrioBerryPickingSubstruct_318C * a0, struct Pokemon * a1)
+static void sub_80261F8(struct DodrioSubstruct_318C * a0, struct Pokemon * a1)
 {
     a0->isShiny = IsMonShiny(a1);
 }
 
-void sub_802620C(TaskFunc func, u8 priority)
+static void sub_802620C(TaskFunc func, u8 priority)
 {
     CreateTask(func, priority);
 }
 
-void sub_802621C(TaskFunc func)
+static void sub_802621C(TaskFunc func)
 {
-    gUnknown_02022C98->unk_0004 = CreateTask(func, 1);
-    gUnknown_02022C98->unk_0010 = 0;
-    gUnknown_02022C98->unk_000C = 0;
-    gUnknown_02022C98->unk_0014 = 0;
+    gUnknown_02022C98->unk04 = CreateTask(func, 1);
+    gUnknown_02022C98->unk10 = 0;
+    gUnknown_02022C98->unk0C = 0;
+    gUnknown_02022C98->unk14 = 0;
 }
 
-void sub_8026240(u8 a0)
+static void sub_8026240(u8 a0)
 {
-    gUnknown_02022C98->unk_001C = gUnknown_02022C98->unk_0018;
-    gUnknown_02022C98->unk_0018 = a0;
-    gUnknown_02022C98->unk_0010 = 0;
-    gUnknown_02022C98->unk_0014 = 0;
+    gUnknown_02022C98->unk1C = gUnknown_02022C98->unk18;
+    gUnknown_02022C98->unk18 = a0;
+    gUnknown_02022C98->unk10 = 0;
+    gUnknown_02022C98->unk14 = 0;
 }
 
-bool32 sub_8026264(void)
+static bool32 sub_8026264(void)
 {
-    u8 r2 = gUnknown_02022C98->unk_0014 / 4;
-    gUnknown_02022C98->unk_0014++;
-    if (r2 != 0 && gUnknown_02022C98->unk_0014 % 4 == 0)
+    u8 r2 = gUnknown_02022C98->unk14 / 4;
+    gUnknown_02022C98->unk14++;
+    if (r2 != 0 && gUnknown_02022C98->unk14 % 4 == 0)
     {
-        if (r2 < gUnknown_082F7A94[gUnknown_02022C98->unk_0024 - 1])
+        if (r2 < gUnknown_082F7A94[gUnknown_02022C98->unk24 - 1])
         {
             SetGpuReg(REG_OFFSET_BG1HOFS,  (r2 * 8));
             SetGpuReg(REG_OFFSET_BG2HOFS, -(r2 * 8));
@@ -1400,530 +1607,125 @@ bool32 sub_8026264(void)
     }
 }
 
-void sub_80262C0(void)
+static void sub_80262C0(void)
 {
     u8 i;
-    u8 start = gUnknown_02022C98->unk_0044;
-    u8 finish = gUnknown_02022C98->unk_0048;
+    u8 start = gUnknown_02022C98->unk44;
+    u8 finish = gUnknown_02022C98->unk48;
 
     for (i = start; i < finish; i++)
     {
-        struct DodrioBerryPickingSubstruct_31A0_14 * ptr = &gUnknown_02022C98->unk_32CC.unk_14;
-        ptr->unk_B[i] = (i % 2 == 0) ? 1 : 0;
-        ptr->unk_0[i] = 0;
+        struct DodrioSubstruct_31A0_14 * ptr = &gUnknown_02022C98->unk32CC.unk14;
+        ptr->unkB[i] = (i % 2 == 0) ? 1 : 0;
+        ptr->unk0[i] = 0;
     }
 }
 
-#ifdef NONMATCHING
-void sub_8026324(void)
-{
-    u8 sp0 = gUnknown_02022C98->unk_0044;
-    u8 sp4 = gUnknown_02022C98->unk_0048;
-    u8 sp8 = gUnknown_02022C98->unk_0024;
-    u8 r6;
-    u8 r10;
-    s32 r2;
-    u8 r5;
-    u8 r3;
-    s32 r2_2;
-    u8 r4;
-    u8 r7, r7_2;
+static void sub_8026324(void)
+{
+    u8 sp0 = gUnknown_02022C98->unk44;
+    u8 sp4 = gUnknown_02022C98->unk48;
+    u8 sp8 = gUnknown_02022C98->unk24;
+    u8 i, j, k, r5;
 
-    if (gUnknown_02022C98->unk_0040 >= 10)
+    if (gUnknown_02022C98->unk40 >= 10)
         return;
 
-    for (r6 = 0; r6 < sp8; r6++)
+    for (i = 0; i < sp8; i++)
     {
-        if (gUnknown_02022C98->unk_31A0[r6].unk_2C != 0 && gUnknown_02022C98->unk_00A8[r6] == 1)
+        u8 *ptr = &gUnknown_02022C98->unk31A0[i].unk2C.unk0;
+        if (*ptr != 0 && gUnknown_02022C98->unkA8[i] == 1)
         {
-            for (r10 = sp0; r10 < sp4; r10++)
+            for (j = sp0; j < sp4; j++)
             {
-                r5 = gUnknown_082F449C[r10];
-                if (gUnknown_02022C98->unk_00F4[r5][0] == r6)
-                {
+                r5 = gUnknown_082F449C[0][0][j];
+                if (gUnknown_02022C98->unkF4[r5][0] == i || gUnknown_02022C98->unkF4[r5][1] == i)
                     break;
-                }
-                if (gUnknown_02022C98->unk_00F4[r5][1] == r6)
-                {
-                    break;
-                }
-                if (sub_8026634(gUnknown_02022C98->unk_31A0[r6].unk_2C, r6, gUnknown_082F449C[r10]) == 1)
+                if (sub_8026634(i, *ptr, r5) == TRUE)
                 {
-                    for (r2 = 0; r2 < 2; r2++)
+                    for (k = 0; k < 2; k++)
                     {
-                        if (gUnknown_02022C98->unk_00F4[r5][r2] == 0xFF)
+                        if (gUnknown_02022C98->unkF4[r5][k] == 0xFF)
                         {
-                            gUnknown_02022C98->unk_00F4[r5][r2] = r6;
-                            gUnknown_02022C98->unk_00A8[r6] = 2;
-                            gUnknown_02022C98->unk_00C4[r5] = 1;
+                            gUnknown_02022C98->unkF4[r5][k] = i;
+                            gUnknown_02022C98->unkA8[i] = 2;
+                            gUnknown_02022C98->unkC4[r5] = 1;
                             break;
                         }
                     }
                     break;
                 }
-                if (gUnknown_02022C98->unk_31A0[r6].unk_34 == 1)
-                {
+                if (gUnknown_02022C98->unk31A0[i].unk2C.unk8 == 1)
                     break;
-                }
             }
         }
     }
 
-    for (r10 = sp0; r10 < sp4; r10++)
+    for (j = sp0; j < sp4; j++)
     {
-        r6 = 0xFF;
-        r5 = gUnknown_082F449C[r10];
-        if (gUnknown_02022C98->unk_00C4[r5] == 1)
+        u8 id = 0xFF;
+        r5 = gUnknown_082F449C[0][0][j];
+        if (gUnknown_02022C98->unkC4[r5] == 1)
         {
-            r3 = gUnknown_02022C98->unk_0090[sub_8026D8C(r5)] / 7;
-            if (r3 < 2)
-            {
-                r3 = 2;
-            }
-            r2 = gUnknown_082F7A88[r3][gUnknown_02022C98->unk_31A0[0].unk_14.unk_0[r5]] - gUnknown_02022C98->unk_00D0[r5];
+            s32 r2;
+            u8 r4, r3 = gUnknown_02022C98->unk90[sub_8026D8C(r5)] / 7;
+            if (r3 >= ARRAY_COUNT(gUnknown_082F7A88) - 1)
+                r3 = ARRAY_COUNT(gUnknown_082F7A88) - 1;
+
+            r2 = gUnknown_082F7A88[r3][gUnknown_02022C98->unk31A0[0].unk14.unk0[r5]] - gUnknown_02022C98->unkD0[r5];
             if (r2 < 6)
+                gUnknown_02022C98->unk9C[r5] += r2;
+
+            if (++gUnknown_02022C98->unk9C[r5] >= 6)
             {
-                gUnknown_02022C98->unk_009C[r5] += r2;
-            }
-            if (++gUnknown_02022C98->unk_009C[r5] >= 6)
-            {
-                gUnknown_02022C98->unk_009C[r5] = 0;
-                if (gUnknown_02022C98->unk_00F4[r5][0] != 0xFF && gUnknown_02022C98->unk_00F4[r5][1] == 0xFF)
+                gUnknown_02022C98->unk9C[r5] = 0;
+                if (gUnknown_02022C98->unkF4[r5][0] == 0xFF && gUnknown_02022C98->unkF4[r5][1] == 0xFF)
                 {
-                    r4 = gUnknown_02022C98->unk_00F4[r5][0];
+                    continue;
                 }
-                else if (gUnknown_02022C98->unk_00F4[r5][0] == 0xFF && gUnknown_02022C98->unk_00F4[r5][1] == 0xFF)
+                else if (gUnknown_02022C98->unkF4[r5][0] != 0xFF && gUnknown_02022C98->unkF4[r5][1] == 0xFF)
                 {
-                    continue;
+                    r4 = gUnknown_02022C98->unkF4[r5][0];
                 }
                 else
                 {
-                    r7 = gUnknown_02022C98->unk_00F4[r5][0];
-                    r7_2 = gUnknown_02022C98->unk_00F4[r5][1];
-                    if ((Random() & 1))
+                    u8 unk0 = gUnknown_02022C98->unkF4[r5][0];
+                    i = gUnknown_02022C98->unkF4[r5][1]; // Have to re-use the variable to match.
+                    if (!(Random() & 1))
                     {
-                        r4 = r7_2;
-                        r6 = r7;
+                        r4 = unk0;
+                        id = i;
                     }
                     else
                     {
-                        r4 = r7;
-                        r6 = r7_2;
+                        r4 = i;
+                        id = unk0;
                     }
                 }
-                gUnknown_02022C98->unk_32CC.unk_14.unk_B[r5] = 7;
-                gUnknown_02022C98->unk_00C4[r5] = 2;
-                gUnknown_02022C98->unk_00A8[r4] = 3;
-                gUnknown_02022C98->unk_00B8[r5] = r4;
-                gUnknown_02022C98->unk_31A0[r4].unk_30 = 1;
-                gUnknown_02022C98->unk_31A0[r6].unk_34 = 1;
-                gUnknown_02022C98->unk_0086[r4]++;
+                gUnknown_02022C98->unk32CC.unk14.unkB[r5] = 7;
+                gUnknown_02022C98->unkC4[r5] = 2;
+                gUnknown_02022C98->unkA8[r4] = 3;
+                gUnknown_02022C98->unkB8[r5] = r4;
+                gUnknown_02022C98->unk31A0[r4].unk2C.unk4 = 1;
+                gUnknown_02022C98->unk31A0[id].unk2C.unk8 = 1;
+                gUnknown_02022C98->unk86[r4]++;
                 sub_8026F1C(0, r5, r4);
-                sub_8027234(1);
+                sub_8027234(TRUE);
                 sub_8026D1C(r4);
-                gUnknown_02022C98->unk_00E8[r5] = gUnknown_02022C98->unk_32CC.unk_14.unk_0[r5];
-                gUnknown_02022C98->unk_32CC.unk_14.unk_0[r5] = 3;
-                gUnknown_02022C98->unk_00F4[r5][0] = 0xFF;
-                gUnknown_02022C98->unk_00F4[r5][1] = 0xFF;
+                gUnknown_02022C98->unkE8[r5] = gUnknown_02022C98->unk32CC.unk14.unk0[r5];
+                gUnknown_02022C98->unk32CC.unk14.unk0[r5] = 3;
+                gUnknown_02022C98->unkF4[r5][0] = 0xFF;
+                gUnknown_02022C98->unkF4[r5][1] = 0xFF;
             }
         }
     }
 }
-#else
-NAKED
-void sub_8026324(void)
-{
-    asm_unified("\tpush {r4-r7,lr}\n"
-                "\tmov r7, r10\n"
-                "\tmov r6, r9\n"
-                "\tmov r5, r8\n"
-                "\tpush {r5-r7}\n"
-                "\tsub sp, 0x10\n"
-                "\tldr r0, =gUnknown_02022C98\n"
-                "\tldr r1, [r0]\n"
-                "\tadds r0, r1, 0\n"
-                "\tadds r0, 0x44\n"
-                "\tldrb r0, [r0]\n"
-                "\tstr r0, [sp]\n"
-                "\tadds r0, r1, 0\n"
-                "\tadds r0, 0x48\n"
-                "\tldrb r0, [r0]\n"
-                "\tstr r0, [sp, 0x4]\n"
-                "\tadds r0, r1, 0\n"
-                "\tadds r0, 0x24\n"
-                "\tldrb r0, [r0]\n"
-                "\tstr r0, [sp, 0x8]\n"
-                "\tadds r0, r1, 0\n"
-                "\tadds r0, 0x40\n"
-                "\tldrb r0, [r0]\n"
-                "\tcmp r0, 0x9\n"
-                "\tbls _08026358\n"
-                "\tb _08026614\n"
-                "_08026358:\n"
-                "\tmovs r6, 0\n"
-                "\tldr r0, [sp, 0x8]\n"
-                "\tcmp r6, r0\n"
-                "\tbcs _08026440\n"
-                "_08026360:\n"
-                "\tldr r3, =gUnknown_02022C98\n"
-                "\tlsls r0, r6, 4\n"
-                "\tsubs r1, r0, r6\n"
-                "\tlsls r1, 2\n"
-                "\tldr r2, [r3]\n"
-                "\tadds r1, r2\n"
-                "\tldr r4, =0x000031cc\n"
-                "\tadds r4, r1\n"
-                "\tmov r8, r4\n"
-                "\tldrb r1, [r4]\n"
-                "\tmov r9, r0\n"
-                "\tadds r0, r6, 0x1\n"
-                "\tstr r0, [sp, 0xC]\n"
-                "\tcmp r1, 0\n"
-                "\tbeq _08026434\n"
-                "\tadds r0, r2, 0\n"
-                "\tadds r0, 0xA8\n"
-                "\tadds r0, r6\n"
-                "\tldrb r0, [r0]\n"
-                "\tcmp r0, 0x1\n"
-                "\tbne _08026434\n"
-                "\tldr r1, [sp]\n"
-                "\tmov r10, r1\n"
-                "\tldr r2, [sp, 0x4]\n"
-                "\tcmp r10, r2\n"
-                "\tbcs _08026434\n"
-                "\tadds r7, r3, 0\n"
-                "_08026396:\n"
-                "\tldr r0, =gUnknown_082F449C\n"
-                "\tadd r0, r10\n"
-                "\tldrb r5, [r0]\n"
-                "\tldr r1, [r7]\n"
-                "\tlsls r4, r5, 1\n"
-                "\tadds r0, r1, 0\n"
-                "\tadds r0, 0xF4\n"
-                "\tadds r0, r4\n"
-                "\tldrb r0, [r0]\n"
-                "\tcmp r0, r6\n"
-                "\tbeq _08026434\n"
-                "\tadds r0, r1, 0\n"
-                "\tadds r0, 0xF5\n"
-                "\tadds r0, r4\n"
-                "\tldrb r0, [r0]\n"
-                "\tcmp r0, r6\n"
-                "\tbeq _08026434\n"
-                "\tmov r0, r8\n"
-                "\tldrb r1, [r0]\n"
-                "\tadds r0, r6, 0\n"
-                "\tadds r2, r5, 0\n"
-                "\tbl sub_8026634\n"
-                "\tcmp r0, 0x1\n"
-                "\tbne _08026410\n"
-                "\tmovs r2, 0\n"
-                "\tldr r3, =gUnknown_02022C98\n"
-                "\tmov r8, r4\n"
-                "_080263CE:\n"
-                "\tldr r0, [r3]\n"
-                "\tmov r4, r8\n"
-                "\tadds r1, r2, r4\n"
-                "\tadds r0, 0xF4\n"
-                "\tadds r1, r0, r1\n"
-                "\tldrb r0, [r1]\n"
-                "\tcmp r0, 0xFF\n"
-                "\tbne _08026404\n"
-                "\tstrb r6, [r1]\n"
-                "\tldr r0, [r3]\n"
-                "\tadds r0, 0xA8\n"
-                "\tadds r0, r6\n"
-                "\tmovs r1, 0x2\n"
-                "\tstrb r1, [r0]\n"
-                "\tldr r0, [r3]\n"
-                "\tadds r0, 0xC4\n"
-                "\tadds r0, r5\n"
-                "\tmovs r1, 0x1\n"
-                "\tstrb r1, [r0]\n"
-                "\tb _08026434\n"
-                "\t.pool\n"
-                "_08026404:\n"
-                "\tadds r0, r2, 0x1\n"
-                "\tlsls r0, 24\n"
-                "\tlsrs r2, r0, 24\n"
-                "\tcmp r2, 0x1\n"
-                "\tbls _080263CE\n"
-                "\tb _08026434\n"
-                "_08026410:\n"
-                "\tldr r0, [r7]\n"
-                "\tmov r2, r9\n"
-                "\tsubs r1, r2, r6\n"
-                "\tlsls r1, 2\n"
-                "\tadds r0, r1\n"
-                "\tldr r4, =0x000031d4\n"
-                "\tadds r0, r4\n"
-                "\tldrb r0, [r0]\n"
-                "\tcmp r0, 0x1\n"
-                "\tbeq _08026434\n"
-                "\tmov r0, r10\n"
-                "\tadds r0, 0x1\n"
-                "\tlsls r0, 24\n"
-                "\tlsrs r0, 24\n"
-                "\tmov r10, r0\n"
-                "\tldr r0, [sp, 0x4]\n"
-                "\tcmp r10, r0\n"
-                "\tbcc _08026396\n"
-                "_08026434:\n"
-                "\tldr r1, [sp, 0xC]\n"
-                "\tlsls r0, r1, 24\n"
-                "\tlsrs r6, r0, 24\n"
-                "\tldr r2, [sp, 0x8]\n"
-                "\tcmp r6, r2\n"
-                "\tbcc _08026360\n"
-                "_08026440:\n"
-                "\tldr r4, [sp]\n"
-                "\tmov r10, r4\n"
-                "\tldr r0, [sp, 0x4]\n"
-                "\tcmp r10, r0\n"
-                "\tbcc _0802644C\n"
-                "\tb _08026614\n"
-                "_0802644C:\n"
-                "\tldr r1, =gUnknown_02022C98\n"
-                "\tmov r9, r1\n"
-                "_08026450:\n"
-                "\tmovs r6, 0xFF\n"
-                "\tldr r0, =gUnknown_082F449C\n"
-                "\tadd r0, r10\n"
-                "\tldrb r5, [r0]\n"
-                "\tmov r2, r9\n"
-                "\tldr r0, [r2]\n"
-                "\tadds r0, 0xC4\n"
-                "\tadds r0, r5\n"
-                "\tldrb r0, [r0]\n"
-                "\tcmp r0, 0x1\n"
-                "\tbeq _08026468\n"
-                "\tb _08026602\n"
-                "_08026468:\n"
-                "\tadds r0, r5, 0\n"
-                "\tbl sub_8026D8C\n"
-                "\tmov r1, r9\n"
-                "\tldr r4, [r1]\n"
-                "\tlsls r0, 24\n"
-                "\tlsrs r0, 24\n"
-                "\tadds r1, r4, 0\n"
-                "\tadds r1, 0x90\n"
-                "\tadds r1, r0\n"
-                "\tldrb r0, [r1]\n"
-                "\tmovs r1, 0x7\n"
-                "\tbl __udivsi3\n"
-                "\tlsls r0, 24\n"
-                "\tlsrs r3, r0, 24\n"
-                "\tcmp r3, 0x1\n"
-                "\tbls _0802648E\n"
-                "\tmovs r3, 0x2\n"
-                "_0802648E:\n"
-                "\tldr r2, =gUnknown_082F7A88\n"
-                "\tldr r0, =0x000031b4\n"
-                "\tadds r1, r4, r0\n"
-                "\tadds r1, r5\n"
-                "\tlsls r0, r3, 1\n"
-                "\tadds r0, r3\n"
-                "\tldrb r1, [r1]\n"
-                "\tadds r0, r1\n"
-                "\tadds r0, r2\n"
-                "\tldrb r1, [r0]\n"
-                "\tadds r0, r4, 0\n"
-                "\tadds r0, 0xD0\n"
-                "\tadds r0, r5\n"
-                "\tldrb r0, [r0]\n"
-                "\tsubs r2, r1, r0\n"
-                "\tcmp r2, 0x5\n"
-                "\tbgt _080264BC\n"
-                "\tadds r1, r4, 0\n"
-                "\tadds r1, 0x9C\n"
-                "\tadds r1, r5\n"
-                "\tldrb r0, [r1]\n"
-                "\tadds r0, r2\n"
-                "\tstrb r0, [r1]\n"
-                "_080264BC:\n"
-                "\tmov r2, r9\n"
-                "\tldr r1, [r2]\n"
-                "\tadds r1, 0x9C\n"
-                "\tadds r1, r5\n"
-                "\tldrb r0, [r1]\n"
-                "\tadds r0, 0x1\n"
-                "\tmovs r2, 0\n"
-                "\tstrb r0, [r1]\n"
-                "\tmovs r4, 0xFF\n"
-                "\tands r0, r4\n"
-                "\tcmp r0, 0x5\n"
-                "\tbhi _080264D6\n"
-                "\tb _08026602\n"
-                "_080264D6:\n"
-                "\tmov r1, r9\n"
-                "\tldr r0, [r1]\n"
-                "\tadds r0, 0x9C\n"
-                "\tadds r0, r5\n"
-                "\tstrb r2, [r0]\n"
-                "\tldr r3, [r1]\n"
-                "\tlsls r1, r5, 1\n"
-                "\tadds r0, r3, 0\n"
-                "\tadds r0, 0xF4\n"
-                "\tadds r2, r0, r1\n"
-                "\tldrb r0, [r2]\n"
-                "\tmov r8, r1\n"
-                "\tcmp r0, 0xFF\n"
-                "\tbne _08026518\n"
-                "\tadds r0, r3, 0\n"
-                "\tadds r0, 0xF5\n"
-                "\tadd r0, r8\n"
-                "\tldrb r0, [r0]\n"
-                "\tcmp r0, 0xFF\n"
-                "\tbne _08026500\n"
-                "\tb _08026602\n"
-                "_08026500:\n"
-                "\tb _08026528\n"
-                "\t.pool\n"
-                "_08026518:\n"
-                "\tadds r0, r3, 0\n"
-                "\tadds r0, 0xF5\n"
-                "\tadd r0, r8\n"
-                "\tldrb r0, [r0]\n"
-                "\tcmp r0, 0xFF\n"
-                "\tbne _08026528\n"
-                "\tldrb r4, [r2]\n"
-                "\tb _0802654E\n"
-                "_08026528:\n"
-                "\tmov r2, r9\n"
-                "\tldr r1, [r2]\n"
-                "\tadds r0, r1, 0\n"
-                "\tadds r0, 0xF4\n"
-                "\tadd r0, r8\n"
-                "\tldrb r7, [r0]\n"
-                "\tadds r1, 0xF5\n"
-                "\tadd r1, r8\n"
-                "\tldrb r6, [r1]\n"
-                "\tbl Random\n"
-                "\tmovs r1, 0x1\n"
-                "\tands r1, r0\n"
-                "\tcmp r1, 0\n"
-                "\tbne _0802654A\n"
-                "\tadds r4, r7, 0\n"
-                "\tb _0802654E\n"
-                "_0802654A:\n"
-                "\tadds r4, r6, 0\n"
-                "\tadds r6, r7, 0\n"
-                "_0802654E:\n"
-                "\tmov r1, r9\n"
-                "\tldr r0, [r1]\n"
-                "\tldr r2, =0x000032eb\n"
-                "\tadds r0, r2\n"
-                "\tadds r0, r5\n"
-                "\tmovs r1, 0x7\n"
-                "\tstrb r1, [r0]\n"
-                "\tmov r1, r9\n"
-                "\tldr r0, [r1]\n"
-                "\tadds r0, 0xC4\n"
-                "\tadds r0, r5\n"
-                "\tmovs r1, 0x2\n"
-                "\tstrb r1, [r0]\n"
-                "\tmov r2, r9\n"
-                "\tldr r0, [r2]\n"
-                "\tadds r0, 0xA8\n"
-                "\tadds r0, r4\n"
-                "\tmovs r1, 0x3\n"
-                "\tstrb r1, [r0]\n"
-                "\tldr r0, [r2]\n"
-                "\tadds r0, 0xB8\n"
-                "\tadds r0, r5\n"
-                "\tstrb r4, [r0]\n"
-                "\tldr r1, [r2]\n"
-                "\tlsls r0, r4, 4\n"
-                "\tsubs r0, r4\n"
-                "\tlsls r0, 2\n"
-                "\tadds r1, r0\n"
-                "\tldr r2, =0x000031d0\n"
-                "\tadds r1, r2\n"
-                "\tmovs r0, 0x1\n"
-                "\tstrb r0, [r1]\n"
-                "\tmov r2, r9\n"
-                "\tldr r1, [r2]\n"
-                "\tlsls r0, r6, 4\n"
-                "\tsubs r0, r6\n"
-                "\tlsls r0, 2\n"
-                "\tadds r1, r0\n"
-                "\tldr r0, =0x000031d4\n"
-                "\tadds r1, r0\n"
-                "\tmovs r2, 0x1\n"
-                "\tstrb r2, [r1]\n"
-                "\tmov r0, r9\n"
-                "\tldr r1, [r0]\n"
-                "\tlsls r0, r4, 1\n"
-                "\tadds r1, 0x86\n"
-                "\tadds r1, r0\n"
-                "\tldrh r0, [r1]\n"
-                "\tadds r0, 0x1\n"
-                "\tstrh r0, [r1]\n"
-                "\tmovs r0, 0\n"
-                "\tadds r1, r5, 0\n"
-                "\tadds r2, r4, 0\n"
-                "\tbl sub_8026F1C\n"
-                "\tmovs r0, 0x1\n"
-                "\tbl sub_8027234\n"
-                "\tadds r0, r4, 0\n"
-                "\tbl sub_8026D1C\n"
-                "\tmov r1, r9\n"
-                "\tldr r0, [r1]\n"
-                "\tadds r1, r0, 0\n"
-                "\tadds r1, 0xE8\n"
-                "\tadds r1, r5\n"
-                "\tldr r2, =0x000032e0\n"
-                "\tadds r0, r2\n"
-                "\tadds r0, r5\n"
-                "\tldrb r0, [r0]\n"
-                "\tstrb r0, [r1]\n"
-                "\tmov r4, r9\n"
-                "\tldr r0, [r4]\n"
-                "\tadds r0, r2\n"
-                "\tadds r0, r5\n"
-                "\tmovs r1, 0x3\n"
-                "\tstrb r1, [r0]\n"
-                "\tldr r1, [r4]\n"
-                "\tadds r1, 0xF4\n"
-                "\tadd r1, r8\n"
-                "\tldrb r0, [r1]\n"
-                "\tmovs r2, 0xFF\n"
-                "\torrs r0, r2\n"
-                "\tstrb r0, [r1]\n"
-                "\tldr r1, [r4]\n"
-                "\tadds r1, 0xF5\n"
-                "\tadd r1, r8\n"
-                "\tldrb r0, [r1]\n"
-                "\torrs r0, r2\n"
-                "\tstrb r0, [r1]\n"
-                "_08026602:\n"
-                "\tmov r0, r10\n"
-                "\tadds r0, 0x1\n"
-                "\tlsls r0, 24\n"
-                "\tlsrs r0, 24\n"
-                "\tmov r10, r0\n"
-                "\tldr r4, [sp, 0x4]\n"
-                "\tcmp r10, r4\n"
-                "\tbcs _08026614\n"
-                "\tb _08026450\n"
-                "_08026614:\n"
-                "\tadd sp, 0x10\n"
-                "\tpop {r3-r5}\n"
-                "\tmov r8, r3\n"
-                "\tmov r9, r4\n"
-                "\tmov r10, r5\n"
-                "\tpop {r4-r7}\n"
-                "\tpop {r0}\n"
-                "\tbx r0\n"
-                "\t.pool");
-}
-#endif // NONMATCHING
 
-u32 sub_8026634(u8 a0, u8 a1, u8 a2)
+static bool32 sub_8026634(u8 a0, u8 a1, u8 a2)
 {
     s32 r7 = 0;
-    u8 r5 = gUnknown_02022C98->unk_0024 - 1;
-    struct DodrioBerryPickingSubstruct_31A0_14 * ptr = &gUnknown_02022C98->unk_32CC.unk_14;
+    u8 r5 = gUnknown_02022C98->unk24 - 1;
+    struct DodrioSubstruct_31A0_14 * ptr = &gUnknown_02022C98->unk32CC.unk14;
 
     switch (a1)
     {
@@ -1938,13 +1740,13 @@ u32 sub_8026634(u8 a0, u8 a1, u8 a2)
         r7 = 2;
         break;
     }
-    if (ptr->unk_B[a2] == 6 || ptr->unk_B[a2] == 7)
+    if (ptr->unkB[a2] == 6 || ptr->unkB[a2] == 7)
     {
-        if (a2 == gUknnown_082F45AF[r7 + a0 * 3 + 15 * r5])
+        if (a2 == gUknnown_082F45AF[r5][a0][r7])
         {
-            if (gUnknown_02022C98->unk_00C4[a2] == 1 || gUnknown_02022C98->unk_00C4[a2] == 2)
+            if (gUnknown_02022C98->unkC4[a2] == 1 || gUnknown_02022C98->unkC4[a2] == 2)
             {
-                gUnknown_02022C98->unk_31A0[a0].unk_34 = 1;
+                gUnknown_02022C98->unk31A0[a0].unk2C.unk8 = 1;
                 return FALSE;
             }
             else
@@ -1955,98 +1757,3330 @@ u32 sub_8026634(u8 a0, u8 a1, u8 a2)
     }
     else
     {
-        if (a2 == gUknnown_082F45AF[r7 + a0 * 3 + 15 * r5])
+        if (a2 == gUknnown_082F45AF[r5][a0][r7])
         {
-            gUnknown_02022C98->unk_00A8[a0] = 4;
-            gUnknown_02022C98->unk_31A0[a0].unk_34 = 1;
+            gUnknown_02022C98->unkA8[a0] = 4;
+            gUnknown_02022C98->unk31A0[a0].unk2C.unk8 = 1;
         }
     }
     return FALSE;
 }
 
-void sub_802671C(void)
+static void sub_802671C(void)
 {
-    u8 r1 = gUnknown_02022C98->unk_0044;
-    u8 r9 = gUnknown_02022C98->unk_0048;
+    u8 r1 = gUnknown_02022C98->unk44;
+    u8 r9 = gUnknown_02022C98->unk48;
     u8 r3 = 0;
     u8 r10 = 0;
     u8 i;
     u8 r2;
-    struct DodrioBerryPickingStruct *ptr;
+    struct DodrioStruct *ptr;
 
-    gUnknown_02022C98->unk_0120 = 0;
+    gUnknown_02022C98->unk120 = 0;
 
     for (i = r1; i < r9 - 1; i++)
     {
         ptr = gUnknown_02022C98;
 
-        if (gUnknown_02022C98->unk_00C4[i] == 0 || gUnknown_02022C98->unk_00C4[i] == 1)
+        if (gUnknown_02022C98->unkC4[i] == 0 || gUnknown_02022C98->unkC4[i] == 1)
         {
-            gUnknown_02022C98->unk_0120 = 1;
-            if (ptr->unk_32CC.unk_14.unk_B[i] >= 10)
+            gUnknown_02022C98->unk120 = 1;
+            if (ptr->unk32CC.unk14.unkB[i] >= 10)
             {
-                ptr->unk_32CC.unk_14.unk_B[i] = 10;
-                gUnknown_02022C98->unk_00C4[i] = 3;
-                if (gUnknown_02022C98->unk_0148[i] == 0)
+                ptr->unk32CC.unk14.unkB[i] = 10;
+                gUnknown_02022C98->unkC4[i] = 3;
+                if (gUnknown_02022C98->unk148[i] == 0)
                 {
-                    gUnknown_02022C98->unk_0148[i] = 1;
-                    PlaySE(SE_FUUSEN1 + ptr->unk_32CC.unk_14.unk_0[i]);
+                    gUnknown_02022C98->unk148[i] = 1;
+                    PlaySE(SE_FUUSEN1 + ptr->unk32CC.unk14.unk0[i]);
                 }
-                if (gUnknown_02022C98->unk_0040 < 10 || r10 == 1)
+                if (gUnknown_02022C98->unk40 < 10 || r10 == 1)
                 {
                     r10 = 1;
-                    gUnknown_02022C98->unk_0148[i] = 0;
-                    if (gUnknown_02022C98->unk_0040 < 10)
+                    gUnknown_02022C98->unk148[i] = 0;
+                    if (gUnknown_02022C98->unk40 < 10)
                     {
-                        gUnknown_02022C98->unk_0040++;
+                        gUnknown_02022C98->unk40++;
                     }
                     sub_8026F1C(3, i, 0);
-                    sub_8027234(0);
+                    sub_8027234(FALSE);
                 }
             }
             else
             {
-                r3 = gUnknown_02022C98->unk_0090[sub_8026D8C(i)] / 7;
+                r3 = gUnknown_02022C98->unk90[sub_8026D8C(i)] / 7;
                 if (r3 >= 2)
                 {
                     r3 = 2;
                 }
-                r2 = gUnknown_082F7A88[r3][ptr->unk_32CC.unk_14.unk_0[i]];
-                if (++gUnknown_02022C98->unk_00D0[i] >= r2)
+                r2 = gUnknown_082F7A88[r3][ptr->unk32CC.unk14.unk0[i]];
+                if (++gUnknown_02022C98->unkD0[i] >= r2)
                 {
-                    ptr->unk_32CC.unk_14.unk_B[i]++;
-                    gUnknown_02022C98->unk_00D0[i] = 0;
+                    ptr->unk32CC.unk14.unkB[i]++;
+                    gUnknown_02022C98->unkD0[i] = 0;
                 }
                 sub_8026324();
             }
         }
-        else if (gUnknown_02022C98->unk_00C4[i] == 2)
+        else if (gUnknown_02022C98->unkC4[i] == 2)
+        {
+            gUnknown_02022C98->unk120 = 1;
+            if (++gUnknown_02022C98->unkDC[i] >= 20)
+            {
+                gUnknown_02022C98->unk31A0[gUnknown_02022C98->unkB8[i]].unk2C.unk4 = 0;
+                gUnknown_02022C98->unkDC[i] = 0;
+                gUnknown_02022C98->unkD0[i] = 0;
+                gUnknown_02022C98->unkC4[i] = 0;
+                ptr->unk32CC.unk14.unkB[i] = 1;
+                ptr->unk32CC.unk14.unk0[i] = sub_8026DB0(sub_8026D8C(i), i);
+            }
+        }
+        else if (gUnknown_02022C98->unkC4[i] == 3)
+        {
+            if (++gUnknown_02022C98->unkDC[i] >= 20)
+            {
+                if (gUnknown_02022C98->unk40 < 10)
+                {
+                    gUnknown_02022C98->unkDC[i] = 0;
+                    gUnknown_02022C98->unkD0[i] = 0;
+                    gUnknown_02022C98->unkC4[i] = 0;
+                    ptr->unk32CC.unk14.unkB[i] = 1;
+                    gUnknown_02022C98->unkE8[i] = ptr->unk32CC.unk14.unk0[i];
+                    ptr->unk32CC.unk14.unk0[i] = sub_8026DB0(sub_8026D8C(i), i);
+                }
+            }
+        }
+    }
+}
+
+static void sub_8026988(void)
+{
+    u8 i, first, count;
+
+    first = gUnknown_02022C98->unk44;
+    count = gUnknown_02022C98->unk48;
+    for (i = first; i < count; i++)
+    {
+        struct DodrioSubstruct_31A0 *ptr = &gUnknown_02022C98->unk31A0[gUnknown_02022C98->multiplayerId];
+        u8 var = gUnknown_082F449C[gUnknown_02022C98->unk24 - 1][gUnknown_02022C98->multiplayerId][i];
+
+        if (ptr->unk14.unkB[var] != 0)
+            sub_8028BF8(i, FALSE);
+        else
+            sub_8028BF8(i, TRUE);
+
+        if (ptr->unk14.unkB[var] > 9)
+        {
+            sub_8028CA4(i, ptr->unk14.unk0[var] + 3);
+            sub_8028C7C(i, ptr->unk14.unkB[var] * 2 - 1);
+        }
+        else if (ptr->unk14.unk0[var] == 3)
+        {
+            ptr->unk14.unkB[var] = 7;
+            sub_8028CA4(i, 6);
+            sub_8028C7C(i, ptr->unk14.unkB[var] * 2 - 1);
+        }
+        else
+        {
+            sub_8028CA4(i, ptr->unk14.unk0[var]);
+            sub_8028C7C(i, ptr->unk14.unkB[var] * 2);
+        }
+    }
+}
+
+static void sub_8026A88(void)
+{
+    u8 i, count;
+
+    count = gUnknown_02022C98->unk24;
+    for (i = 0; i < count; i++)
+    {
+        struct DodrioSubstruct_31A0 *ptr = &gUnknown_02022C98->unk31A0[i];
+        sub_80286B4(i, ptr->unk2C.unk0);
+    }
+}
+
+static void sub_8026AC8(void)
+{
+    u8 i, count;
+
+    count = gUnknown_02022C98->unk24;
+    for (i = 0; i < count; i++)
+        sub_80286B4(i, 4);
+}
+
+static void sub_8026AF4(void)
+{
+    sub_8026988();
+    if (gUnknown_02022C98->unk40 > 9)
+        sub_8026AC8();
+    else
+        sub_8026A88();
+
+    sub_80288D4(gUnknown_02022C98->unk40);
+}
+
+// This function is literally the same as the one above...Why?
+static void sub_8026B28(void)
+{
+    sub_8026988();
+    if (gUnknown_02022C98->unk40 > 9)
+        sub_8026AC8();
+    else
+        sub_8026A88();
+
+    sub_80288D4(gUnknown_02022C98->unk40);
+}
+
+static void sub_8026B5C(u8 arg0, u8 *arg1, u8 *arg2)
+{
+    switch (arg0)
+    {
+    case 1:
+        *arg1 = 4, *arg2 = 7;
+        break;
+    case 2:
+        *arg1 = 3, *arg2 = 8;
+        break;
+    case 3:
+        *arg1 = 2, *arg2 = 9;
+        break;
+    case 4:
+        *arg1 = 1, *arg2 = 10;
+        break;
+    case 5:
+        *arg1 = 0, *arg2 = 11;
+        break;
+    }
+}
+
+static bool32 sub_8026BB8(void)
+{
+    u8 i, count;
+
+    count = gUnknown_02022C98->unk24;
+    for (i = 1; i < count; i++)
+    {
+        if (gUnknown_02022C98->unk158[i] == 0)
+            gUnknown_02022C98->unk158[i] = sub_8027DFC(i);
+    }
+
+    // This loop won't ever run, the seemingly poitnless assingment below is to make the compiler
+    // generate code for it.
+    count = count;
+    for (; i < count; i++)
+    {
+        if (gUnknown_02022C98->unk158[i] == 0)
+            return FALSE;
+    }
+
+    return TRUE;
+}
+
+static void sub_8026C28(void)
+{
+    u8 i;
+
+    for (i = 0; i < 5; i++)
+        gUnknown_02022C98->unk158[i] = 0;
+}
+
+static bool32 sub_8026C50(void)
+{
+    if (gUnknown_02022C98->unk40 > 9 && gUnknown_02022C98->unk120 == 0)
+    {
+        gUnknown_02022C98->unk40 = 10;
+        if (gUnknown_02022C98->unk12C != 0)
+            return TRUE;
+    }
+
+    return FALSE;
+}
+
+static bool32 sub_8026C90(void)
+{
+    u8 i, first, count;
+
+    if (gUnknown_02022C98->unk40 > 9)
+    {
+        first = gUnknown_02022C98->unk44;
+        count = gUnknown_02022C98->unk48;
+        gUnknown_02022C98->unk40 = 10;
+        if (gUnknown_02022C98->unk12C != 0)
+        {
+            for (i = first; i < count; i++)
+            {
+                struct DodrioSubstruct_31A0 *ptr = &gUnknown_02022C98->unk31A0[gUnknown_02022C98->multiplayerId];
+                u8 var = gUnknown_082F449C[gUnknown_02022C98->unk24 - 1][gUnknown_02022C98->multiplayerId][i];
+
+                if (ptr->unk14.unkB[var] != 10)
+                    return FALSE;
+            }
+            return TRUE;
+        }
+    }
+
+    return FALSE;
+}
+
+static void sub_8026D1C(u8 arg0)
+{
+    u8 var = gUnknown_082F7A9C[gUnknown_02022C98->unk90[arg0] % 7] + (gUnknown_02022C98->unk90[arg0] / 7) * 100;
+    if (gUnknown_02022C98->unk86[arg0] >= var)
+        gUnknown_02022C98->unk90[arg0]++;
+}
+
+static u8 sub_8026D8C(u8 arg0)
+{
+    return gUnknown_082F4648[gUnknown_02022C98->unk24 - 1][arg0];
+}
+
+static u8 sub_8026DB0(u8 arg0, u8 arg1)
+{
+    u8 i, var3;
+    u8 count = gUnknown_02022C98->unk24 - 1;
+    u8 var0 = gUnknown_082F45FA[count][arg0][0];
+    u8 var1 = gUnknown_082F45FA[count][arg0][1];
+    u8 var2 = gUnknown_082F45FA[count][arg0][2];
+
+    for (i = 0; gUnknown_082F467F[count][i] != 0; i++)
+    {
+        if (arg1 == gUnknown_082F467F[count][i])
+            return sub_8026E70(gUnknown_02022C98->unk90[var1], arg1);
+    }
+
+    // Gets the highest of the three.
+    if (gUnknown_02022C98->unk90[var0] > gUnknown_02022C98->unk90[var1])
+        var3 = gUnknown_02022C98->unk90[var0];
+    else
+        var3 = gUnknown_02022C98->unk90[var1];
+
+    if (gUnknown_02022C98->unk90[var2] > var3)
+        var3 = gUnknown_02022C98->unk90[var2];
+
+    return sub_8026E70(var3, arg1);
+}
+
+static u8 sub_8026E70(u8 arg0, u8 arg1)
+{
+    u8 var = gUnknown_02022C98->unkE8[arg1];
+    switch (arg0 % 7)
+    {
+    default: return 0;
+    case 0:  return 0;
+    case 1:  return 1;
+    case 2:  return 2;
+    case 3:
+        if (var == 0)
+            return 1;
+        else
+            return 0;
+    case 4:
+        if (var == 0)
+            return 2;
+        else
+            return 0;
+    case 5:
+        if (var == 2)
+            return 1;
+        else
+            return 2;
+    case 6:
+        if (var == 0)
+            return 1;
+        else if (var == 1)
+            return 2;
+        else
+            return 0;
+    }
+}
+
+static bool32 sub_8026EEC(u16 arg0[5][6])
+{
+    int sum, i;
+    for (sum = 0, i = 0; i < GetLinkPlayerCount(); sum += arg0[i][3], i++)
+        ;
+
+    if (sum >= 11)
+        return TRUE;
+    else
+        return FALSE;
+}
+
+static void sub_8026F1C(u8 arg0, u8 arg1, u8 arg2)
+{
+    u8 var;
+    u8 count = gUnknown_02022C98->unk24;
+    switch (arg0)
+    {
+    case 0:
+    case 1:
+    case 2:
+        var = gUnknown_02022C98->unk31A0[0].unk14.unk0[arg1];
+        gUnknown_02022C98->unk4A[arg2][var] = IncrementWithLimit(gUnknown_02022C98->unk4A[arg2][var], 20000);
+        break;
+    case 3:
+        if (sub_8026EEC(gUnknown_02022C98->unk4A))
+            break;
+        switch (count)
+        {
+        case 5:
+            switch (arg1)
+            {
+            case 0:
+                gUnknown_02022C98->unk4A[2][3]++;
+                gUnknown_02022C98->unk4A[3][3]++;
+                break;
+            case 1:
+                gUnknown_02022C98->unk4A[3][3]++;
+                break;
+            case 2:
+                gUnknown_02022C98->unk4A[3][3]++;
+                gUnknown_02022C98->unk4A[4][3]++;
+                break;
+            case 3:
+                gUnknown_02022C98->unk4A[4][3]++;
+                break;
+            case 4:
+                gUnknown_02022C98->unk4A[4][3]++;
+                gUnknown_02022C98->unk4A[0][3]++;
+                break;
+            case 5:
+                gUnknown_02022C98->unk4A[0][3]++;
+                break;
+            case 6:
+                gUnknown_02022C98->unk4A[0][3]++;
+                gUnknown_02022C98->unk4A[1][3]++;
+                break;
+            case 7:
+                gUnknown_02022C98->unk4A[1][3]++;
+                break;
+            case 8:
+                gUnknown_02022C98->unk4A[1][3]++;
+                gUnknown_02022C98->unk4A[2][3]++;
+                break;
+            case 9:
+                gUnknown_02022C98->unk4A[2][3]++;
+                break;
+            }
+            break;
+        case 4:
+            switch (arg1)
+            {
+            case 1:
+                gUnknown_02022C98->unk4A[2][3]++;
+                gUnknown_02022C98->unk4A[3][3]++;
+                break;
+            case 2:
+                gUnknown_02022C98->unk4A[3][3]++;
+                break;
+            case 3:
+                gUnknown_02022C98->unk4A[3][3]++;
+                gUnknown_02022C98->unk4A[0][3]++;
+                break;
+            case 4:
+                gUnknown_02022C98->unk4A[0][3]++;
+                break;
+            case 5:
+                gUnknown_02022C98->unk4A[0][3]++;
+                gUnknown_02022C98->unk4A[1][3]++;
+                break;
+            case 6:
+                gUnknown_02022C98->unk4A[1][3]++;
+                break;
+            case 7:
+                gUnknown_02022C98->unk4A[1][3]++;
+                gUnknown_02022C98->unk4A[2][3]++;
+                break;
+            case 8:
+                gUnknown_02022C98->unk4A[2][3]++;
+                break;
+            }
+            break;
+        case 3:
+            switch (arg1)
+            {
+            case 2:
+                gUnknown_02022C98->unk4A[1][3]++;
+                gUnknown_02022C98->unk4A[2][3]++;
+                break;
+            case 3:
+                gUnknown_02022C98->unk4A[2][3]++;
+                break;
+            case 4:
+                gUnknown_02022C98->unk4A[2][3]++;
+                gUnknown_02022C98->unk4A[0][3]++;
+                break;
+            case 5:
+                gUnknown_02022C98->unk4A[0][3]++;
+                break;
+            case 6:
+                gUnknown_02022C98->unk4A[0][3]++;
+                gUnknown_02022C98->unk4A[1][3]++;
+                break;
+            case 7:
+                gUnknown_02022C98->unk4A[1][3]++;
+                break;
+            }
+            break;
+        case 2:
+            switch (arg1)
+            {
+            case 3:
+                gUnknown_02022C98->unk4A[0][3]++;
+                gUnknown_02022C98->unk4A[1][3]++;
+                break;
+            case 4:
+                gUnknown_02022C98->unk4A[0][3]++;
+                break;
+            case 5:
+                gUnknown_02022C98->unk4A[0][3]++;
+                gUnknown_02022C98->unk4A[1][3]++;
+                break;
+            case 6:
+                gUnknown_02022C98->unk4A[1][3]++;
+                break;
+            }
+            break;
+        }
+        break;
+    }
+}
+
+static void sub_8027234(bool32 arg0)
+{
+    if (gUnknown_02022C98->unk24 != 5)
+        return;
+
+    if (arg0 == TRUE)
+    {
+        if (++gUnknown_02022C98->unk112 > gUnknown_02022C98->unk114)
+            gUnknown_02022C98->unk114 = gUnknown_02022C98->unk112;
+        if (gUnknown_02022C98->unk112 > 9999)
+            gUnknown_02022C98->unk112 = 9999;
+    }
+    else
+    {
+        if (gUnknown_02022C98->unk112 > gUnknown_02022C98->unk114)
+            gUnknown_02022C98->unk114 = gUnknown_02022C98->unk112;
+        gUnknown_02022C98->unk112 = 0;
+    }
+}
+
+static void sub_80272A4(void)
+{
+    u8 i;
+    for (i = 0; i < gUnknown_02022C98->unk24; i++)
+        gUnknown_02022C98->unk4A[i][5] = gUnknown_02022C98->unk114;
+}
+
+static void sub_80272E8(void)
+{
+    u8 i, j;
+
+    for (i = 0; i < 5; i++)
+    {
+        for (j = 0; j < 11; j++)
+            gUnknown_02022C98->unk31A0[i].unk14.unkB[j] = 0;
+        gUnknown_02022C98->unk31A0[i].unk2C.unk0 = 0;
+        gUnknown_02022C98->unk31A0[i].unk2C.unk4 = 0;
+        gUnknown_02022C98->unk90[i] = 0;
+        gUnknown_02022C98->unk86[i] = 0;
+        gUnknown_02022C98->unk3308[i].unk0 = 0;
+        gUnknown_02022C98->unk3308[i].unk4 = 0;
+        gUnknown_02022C98->unk4A[i][0] = 0;
+        gUnknown_02022C98->unk4A[i][1] = 0;
+        gUnknown_02022C98->unk4A[i][2] = 0;
+        gUnknown_02022C98->unk4A[i][3] = 0;
+        gUnknown_02022C98->unk4A[i][4] = 0;
+        gUnknown_02022C98->unk4A[i][5] = 0;
+    }
+    gUnknown_02022C98->unk154 = 0;
+    gUnknown_02022C98->unk112 = 0;
+    gUnknown_02022C98->unk40 = 0;
+    sub_8026A88();
+    sub_8026988();
+}
+
+static const s16 gUnknown_082F7B24[] = {10, 30, 50, 50};
+
+static void sub_80273F0(void)
+{
+    u8 i, var = 0, var2 = 0;
+
+    switch (gUnknown_02022C98->unk24)
+    {
+    case 4:  var = 1; break;
+    case 5:  var = 2; break;
+    }
+
+    var2 = Random() % 10;
+    for (i = 0; i < 5; i++)
+        gUnknown_02022C98->unk4A[i][4] = gUnknown_082F7AA4[var][var2];
+}
+
+static u32 sub_802745C(u8 arg0)
+{
+    u32 sum = gUnknown_02022C98->unk4A[arg0][0]
+            + gUnknown_02022C98->unk4A[arg0][1]
+            + gUnknown_02022C98->unk4A[arg0][2];
+    return min(sum, 9999);
+}
+
+static void sub_802749C(void)
+{
+    u32 berriesPicked = Min(sub_802745C(gUnknown_02022C98->multiplayerId), 9999);
+    u32 score = Min(sub_80276C0(gUnknown_02022C98->multiplayerId), 999990);
+
+    if (gSaveBlock2Ptr->berryPick.bestScore < score)
+        gSaveBlock2Ptr->berryPick.bestScore = score;
+    if (gSaveBlock2Ptr->berryPick.berriesPicked < berriesPicked)
+        gSaveBlock2Ptr->berryPick.berriesPicked = berriesPicked;
+    if (gSaveBlock2Ptr->berryPick.berriesPickedInRow < gUnknown_02022C98->unk114)
+        gSaveBlock2Ptr->berryPick.berriesPickedInRow = gUnknown_02022C98->unk114;
+}
+
+static u8 sub_8027518(u8 arg0)
+{
+    u8 i, saved;
+
+    saved = gUnknown_02022C98->unk98[3];
+    for (i = 3; i != 0; i--)
+        gUnknown_02022C98->unk98[i] = gUnknown_02022C98->unk98[i - 1];
+    gUnknown_02022C98->unk98[0] = arg0;
+    return saved;
+}
+
+static void sub_8027554(void)
+{
+    if (gUnknown_02022C98->unkB0[gUnknown_02022C98->multiplayerId] == 0)
+    {
+        if (gMain.newKeys & DPAD_UP)
+        {
+            gUnknown_02022C98->unk31A0[gUnknown_02022C98->multiplayerId].unk2C.unk0 = 2;
+            gUnknown_02022C98->unkB0[gUnknown_02022C98->multiplayerId] = 6;
+            PlaySE(SE_W204);
+        }
+        else if (gMain.newKeys & DPAD_LEFT)
+        {
+            gUnknown_02022C98->unk31A0[gUnknown_02022C98->multiplayerId].unk2C.unk0 = 3;
+            gUnknown_02022C98->unkB0[gUnknown_02022C98->multiplayerId] = 6;
+            PlaySE(SE_W204);
+        }
+        else if (gMain.newKeys & DPAD_RIGHT)
+        {
+            gUnknown_02022C98->unk31A0[gUnknown_02022C98->multiplayerId].unk2C.unk0 = 1;
+            gUnknown_02022C98->unkB0[gUnknown_02022C98->multiplayerId] = 6;
+            PlaySE(SE_W204);
+        }
+        else
+        {
+            gUnknown_02022C98->unk31A0[gUnknown_02022C98->multiplayerId].unk2C.unk0 = 0;
+        }
+    }
+    else
+    {
+        gUnknown_02022C98->unkB0[gUnknown_02022C98->multiplayerId]--;
+    }
+}
+
+static void sub_8027608(void)
+{
+    gUnknown_02022C98->unk31A0[gUnknown_02022C98->multiplayerId].unk2C.unk0 = 0;
+}
+
+static u16 sub_802762C(void)
+{
+    return gUnknown_02022C98->unk4A[gUnknown_02022C98->multiplayerId][4] + FIRST_BERRY_INDEX;
+}
+
+static u8 sub_8027650(void)
+{
+    return gUnknown_02022C98->unk24;
+}
+
+static u8 *sub_8027660(u8 id)
+{
+    if (gReceivedRemoteLinkPlayers)
+        return gLinkPlayers[id].name;
+    else
+        return gUnknown_02022C98->unk31A0[id].name;
+}
+
+static u16 sub_80276A0(u8 arg0, u8 arg1)
+{
+    return gUnknown_02022C98->unk4A[arg0][arg1];
+}
+
+static u32 sub_80276C0(u8 arg0)
+{
+    u8 i;
+    u32 var, sum = 0;
+
+    for (i = 0; i < 3; i++)
+        sum += gUnknown_02022C98->unk4A[arg0][i] * gUnknown_082F7B24[i];
+
+    var = gUnknown_02022C98->unk4A[arg0][3] * gUnknown_082F7B24[3];
+    if (sum <= var)
+        return 0;
+    else
+        return sum - var;
+}
+
+static u32 sub_8027748(void)
+{
+    u8 i, count = gUnknown_02022C98->unk24;
+    u32 maxVar = sub_80276C0(0);
+
+    for (i = 1; i < count; i++)
+    {
+        u32 var = sub_80276C0(i);
+        if (var > maxVar)
+            maxVar = var;
+    }
+    return Min(maxVar, 999990);
+}
+
+static u32 sub_802778C(u8 arg0)
+{
+    u8 i, count = gUnknown_02022C98->unk24;
+    u16 maxVar = gUnknown_02022C98->unk4A[0][arg0];
+
+    for (i = 0; i < count; i++)
+    {
+        u16 var = gUnknown_02022C98->unk4A[i][arg0];
+        if (var > maxVar)
+            maxVar = var;
+    }
+    return maxVar;
+}
+
+static u32 sub_80277D0(u8 arg0)
+{
+    u32 vals[5], temp;
+    s16 r6 = TRUE;
+    u8 i, count = gUnknown_02022C98->unk24;
+
+    for (i = 0; i < count; i++)
+        vals[i] = temp = sub_80276C0(i);
+
+    while (r6)
+    {
+        r6 = FALSE;
+        for (i = 0; i < count - 1; i++)
+        {
+            if (vals[i] < vals[i + 1])
+            {
+                SWAP(vals[i], vals[i + 1], temp);
+                r6 = TRUE;
+            }
+        }
+    }
+
+    return vals[arg0];
+}
+
+static u32 sub_802784C(void)
+{
+    u8 i, r10 = 0, r8 = 0, r9 = 0, count = gUnknown_02022C98->unk24;
+
+    // Function called two times for some reason.
+    sub_8027748();
+    if (sub_8027748() == 0)
+    {
+        for (i = 0; i < count; i++)
+        {
+            gUnknown_02022C98->unk3308[i].unk0 = 4;
+            gUnknown_02022C98->unk3308[i].unk4 = 0;
+        }
+    }
+
+    for (i = 0; i < count; i++)
+        gUnknown_02022C98->unk3308[i].unk4 = Min(sub_80276C0(i), 999990);
+
+    do
+    {
+        u32 r6 = sub_80277D0(r10);
+        u8 r3 = r8;
+        for (i = 0; i < count; i++)
+        {
+            if (r6 == gUnknown_02022C98->unk3308[i].unk4)
+            {
+                gUnknown_02022C98->unk3308[i].unk0 = r3;
+                r8++;
+                r9++;
+            }
+        }
+        r10 = r8;
+    } while (r9 < count);
+
+    return 0;
+}
+
+static void sub_802793C(struct DodrioSubstruct_3308 *dst, u8 id)
+{
+    *dst = gUnknown_02022C98->unk3308[id];
+}
+
+// Unused function
+static u8 sub_802795C(u8 arg0)
+{
+    u8 i, ret = 0, count = gUnknown_02022C98->unk24;
+    u32 var, vars[5] = {0};
+
+    for (i = 0; i < count; i++)
+        vars[i] = sub_80276C0(i);
+
+    var = vars[arg0];
+    for (i = 0; i < 5; i++)
+    {
+        if (i != arg0 && var < vars[i])
+            ret++;
+    }
+
+    return ret;
+}
+
+static u8 sub_80279C8(void)
+{
+    u8 multiplayerId = gUnknown_02022C98->multiplayerId;
+    u16 itemId = sub_802762C();
+
+    if (sub_80276C0(multiplayerId) != sub_8027748())
+        return 3;
+    if (!CheckBagHasSpace(itemId, 1))
+        return 2;
+
+    AddBagItem(itemId, 1);
+    if (!CheckBagHasSpace(itemId, 1))
+        return 1;
+    return 0;
+}
+
+// Really? What next, u32 Add(u32 a)return a+1;?
+static u32 IncrementWithLimit(u32 a, u32 max)
+{
+    if (a < max)
+        return a + 1;
+    else
+        return max;
+}
+
+// Gamefreak pls, min(a, b) ((a) < (b) ? (a) : (b)) is a well-known macro
+static u32 Min(u32 a, u32 b)
+{
+    if (a < b)
+        return a;
+    else
+        return b;
+}
+
+static u8 sub_8027A48(u8 id)
+{
+    return gUnknown_02022C98->unk34[id];
+}
+
+void sub_8027A5C(void)
+{
+    int i;
+    for (i = 0; i < PARTY_SIZE; i++)
+    {
+        if (GetMonData(&gPlayerParty[i], MON_DATA_SANITY_HAS_SPECIES)
+            && GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2) == SPECIES_DODRIO)
+        {
+            gSpecialVar_Result = 1;
+            return;
+        }
+    }
+
+    gSpecialVar_Result = 0;
+}
+
+void sub_8027AAC(void)
+{
+    u8 taskId = CreateTask(sub_8027ACC, 0);
+    sub_8027ACC(taskId);
+}
+
+// Data related to printing saved results.
+static const struct WindowTemplate gUnknown_082F7B2C =
+{
+    .bg = 0,
+    .tilemapLeft = 5,
+    .tilemapTop = 1,
+    .width = 20,
+    .height = 11,
+    .paletteNum = 15,
+    .baseBlock = 0x1,
+};
+
+static const u8 *const gUnknown_082F7B34[3] = {gText_BerriesPicked, gText_BestScore, gText_BerriesInRowFivePlayers};
+static const u8 gUnknown_082F7B40[] = {4, 7, 4};
+
+ALIGNED(4)
+static const u8 gUnknown_082F7B44[][2] = {{25}, {41}, {57}};
+static const u8 gUnknown_082F7B4A[][2] = {{25}, {41}, {73}};
+
+static void sub_8027ACC(u8 taskId)
+{
+    struct WindowTemplate window;
+    s32 i, width, widthCurr;
+    s16 *data = gTasks[taskId].data;
+
+    switch (data[0])
+    {
+    case 0:
+        window = gUnknown_082F7B2C;
+        width = GetStringWidth(1, gText_BerryPickingRecords, 0);
+        for (i = 0; i < ARRAY_COUNT(gUnknown_082F7B34); i++)
+        {
+            widthCurr = GetStringWidth(1, gUnknown_082F7B34[i], 0) + 50;
+            if (widthCurr > width)
+                width = widthCurr;
+        }
+        width = (width + 7) / 8;
+        if (width & 1)
+            width++;
+        window.tilemapLeft = (30 - width) / 2;
+        window.width = width;
+        data[1] = AddWindow(&window);
+        sub_8027BEC(data[1], width);
+        CopyWindowToVram(data[1], 3);
+        data[0]++;
+        break;
+    case 1:
+        if (!IsDma3ManagerBusyWithBgCopy())
+            data[0]++;
+        break;
+    case 2:
+        if (gMain.newKeys & (A_BUTTON | B_BUTTON))
+        {
+            rbox_fill_rectangle(data[1]);
+            CopyWindowToVram(data[1], 1);
+            data[0]++;
+        }
+        break;
+    case 3:
+        if (!IsDma3ManagerBusyWithBgCopy())
+        {
+            RemoveWindow(data[1]);
+            DestroyTask(taskId);
+            EnableBothScriptContexts();
+        }
+        break;
+    }
+}
+
+static void sub_8027BEC(u8 windowId, s32 width)
+{
+    s32 i, x, numWidth;
+    s32 results[3];
+    results[0] = gSaveBlock2Ptr->berryPick.berriesPicked;
+    results[1] = gSaveBlock2Ptr->berryPick.bestScore;
+    results[2] = gSaveBlock2Ptr->berryPick.berriesPickedInRow;
+
+    LoadUserWindowBorderGfx_(windowId, 0x21D, 0xD0);
+    DrawTextBorderOuter(windowId, 0x21D, 0xD);
+    FillWindowPixelBuffer(windowId, PIXEL_FILL(1));
+    AddTextPrinterParameterized(windowId, 1, gText_BerryPickingRecords, GetStringCenterAlignXOffset(1, gText_BerryPickingRecords, width * 8), 1, TEXT_SPEED_FF, NULL);
+    for (i = 0; i < 3; i++)
+    {
+        ConvertIntToDecimalStringN(gStringVar1, results[i], STR_CONV_MODE_LEFT_ALIGN, gUnknown_082F7B40[i]);
+        numWidth = GetStringWidth(1, gStringVar1, -1);
+        AddTextPrinterParameterized(windowId, 1, gUnknown_082F7B34[i], 0, gUnknown_082F7B44[i][0], TEXT_SPEED_FF, NULL);
+        x = (width * 8) - numWidth;
+        AddTextPrinterParameterized(windowId, 1, gStringVar1, x, gUnknown_082F7B4A[i][0], TEXT_SPEED_FF, NULL);
+    }
+    PutWindowTilemap(windowId);
+}
+
+// Debug functions?
+static const u16 gUnknown_082F7B50[][4] =
+{
+    {9999, 0, 90, 9999},
+    {9999, 9999, 70, 9999},
+    {9999, 0, 9999, 0},
+    {9999, 9999, 60, 0},
+    {9999, 9999, 9999, 0},
+};
+
+static const u8 gUnknown_082F7B78[] = _("あいうえおかき");
+static const u8 gUnknown_082F7B80[] = _("ABCDEFG");
+static const u8 gUnknown_082F7B88[] = _("0123456");
+
+static const u8 *const gUnknown_082F7B90[] =
+{
+    gUnknown_082F7B78,
+    gUnknown_082F7B78,
+    gUnknown_082F7B78,
+    gUnknown_082F7B80,
+    gUnknown_082F7B88
+};
+
+static void sub_8027D20(void)
+{
+    gUnknown_02022C98->unk24 = GetLinkPlayerCount();
+}
+
+static void sub_8027D38(void)
+{
+    u8 i, playerId;
+
+    for (playerId = gUnknown_02022C98->unk24; playerId < 5; playerId++)
+        StringCopy(gLinkPlayers[playerId].name, gUnknown_082F7B90[playerId]);
+
+    gUnknown_02022C98->unk24 = 5;
+    for (i = 0; i < 4; i++)
+    {
+        for (playerId = 0; playerId < gUnknown_02022C98->unk24; playerId++)
+            gUnknown_02022C98->unk4A[playerId][i] = gUnknown_082F7B50[playerId][i];
+    }
+}
+
+struct UnkPacket1
+{
+    u8 id;
+    u8 ALIGNED(4) unk4;
+};
+
+static void sub_8027DD0(u32 arg0)
+{
+    struct UnkPacket1 packet;
+    packet.id = 1;
+    packet.unk4 = arg0;
+    sub_800FE50(&packet);
+}
+
+static u32 sub_8027DFC(u32 arg0)
+{
+    struct UnkPacket1 *packet;
+
+    if ((gRecvCmds[0][0] & 0xFF00) != 0x2F00)
+        return 0;
+
+    packet = (void *)&gRecvCmds[arg0][1];
+    if (packet->id == 1)
+        return packet->unk4;
+
+    return 0;
+}
+
+struct UnkPacket2
+{
+    u8 id;
+    u8 unk1_0:4;
+    u8 unk1_1:4;
+    u8 unk2_0:4;
+    u8 unk2_1:4;
+    u8 unk3_0:4;
+    u8 unk3_1:4;
+    u8 unk4_0:4;
+    u8 unk4_1:4;
+    u8 unk5_0:4;
+    u8 unk5_1:4;
+    u8 unk6_0:2;
+    u8 unk6_1:2;
+    u8 unk6_2:2;
+    u8 unk6_3:2;
+    u8 unk7_0:2;
+    u8 unk7_1:2;
+    u8 unk7_2:2;
+    u8 unk7_3:2;
+    u8 unk8_0:2;
+    u8 unk8_1:2;
+    u8 unk8_2:2;
+    u8 unk8_3:2;
+    u8 unk9_0:2;
+    u8 unk9_1:2;
+    u8 unk9_2:2;
+    u8 unk9_3:1;
+    u8 unk9_4:1;
+    u8 unkA_0:1;
+    u8 unkA_1:1;
+    u8 unkA_2:1;
+    u8 unkA_3:5;
+    u8 unkB_0:1;
+    u8 unkB_1:1;
+    u8 unkB_2:1;
+    u8 unkB_3:1;
+    u8 unkB_4:1;
+    u8 unkB_5:1;
+    u8 unkB_6:1;
+};
+
+#ifdef NONMATCHING
+static void sub_8027E30(struct DodrioSubstruct_31A0 *arg0, struct DodrioSubstruct_31A0_2C *arg1, struct DodrioSubstruct_31A0_2C *arg2, struct DodrioSubstruct_31A0_2C *arg3, struct DodrioSubstruct_31A0_2C *arg4, struct DodrioSubstruct_31A0_2C *arg5, u8 arg6, u32 arg7, u32 arg8)
+{
+    struct UnkPacket2 packet;
+    struct DodrioSubstruct_31A0_14 *ptr = &arg0->unk14;
+
+    packet.id = 2;
+    packet.unk1_0 = ptr->unkB[0];
+    packet.unk1_1 = ptr->unkB[1];
+    packet.unk2_0 = ptr->unkB[2];
+    packet.unk2_1 = ptr->unkB[3];
+    packet.unk3_0 = ptr->unkB[4];
+    packet.unk3_1 = ptr->unkB[5];
+    packet.unk4_0 = ptr->unkB[6];
+    packet.unk4_1 = ptr->unkB[7];
+    packet.unk5_0 = ptr->unkB[8];
+    packet.unk5_1 = ptr->unkB[9];
+
+    packet.unk6_0 = ptr->unk0[0];
+    packet.unk6_1 = ptr->unk0[1];
+    packet.unk6_2 = ptr->unk0[2];
+    packet.unk6_3 = ptr->unk0[3];
+    packet.unk7_0 = ptr->unk0[4];
+    packet.unk7_1 = ptr->unk0[5];
+    packet.unk7_2 = ptr->unk0[6];
+    packet.unk7_3 = ptr->unk0[7];
+    packet.unk8_0 = ptr->unk0[8];
+    packet.unk8_1 = ptr->unk0[9];
+
+    packet.unk8_2 = arg1->unk0;
+    packet.unk8_3 = arg2->unk0;
+    packet.unk9_0 = arg3->unk0;
+    packet.unk9_1 = arg4->unk0;
+    packet.unk9_2 = arg5->unk0;
+
+    packet.unk9_3 = arg1->unk4;
+    packet.unk9_4 = arg2->unk4;
+    packet.unkA_0 = arg3->unk4;
+    packet.unkA_1 = arg4->unk4;
+    packet.unkA_2 = arg5->unk4;
+
+    packet.unkB_2 = arg1->unk8;
+    packet.unkB_3 = arg2->unk8;
+    packet.unkB_4 = arg3->unk8;
+    packet.unkB_5 = arg4->unk8;
+    packet.unkB_6 = arg5->unk8;
+
+    packet.unkA_3 = arg6;
+    packet.unkB_1 = arg7;
+    packet.unkB_0 = arg8;
+    sub_800FE50(&packet);
+}
+#else
+NAKED
+static void sub_8027E30(struct DodrioSubstruct_31A0 *arg0, struct DodrioSubstruct_31A0_2C *arg1, struct DodrioSubstruct_31A0_2C *arg2, struct DodrioSubstruct_31A0_2C *arg3, struct DodrioSubstruct_31A0_2C *arg4, struct DodrioSubstruct_31A0_2C *arg5, u8 arg6, u32 arg7, u32 arg8)
+{
+    asm_unified("   push {r4-r7,lr}\n\
+    mov r7, r10\n\
+    mov r6, r9\n\
+    mov r5, r8\n\
+    push {r5-r7}\n\
+    sub sp, 0x20\n\
+    ldr r4, [sp, 0x48]\n\
+    lsls r4, 24\n\
+    str r4, [sp, 0x1C]\n\
+    movs r4, 0x14\n\
+    adds r4, r0\n\
+    mov r9, r4\n\
+    mov r5, sp\n\
+    movs r4, 0x2\n\
+    strb r4, [r5]\n\
+    mov r10, sp\n\
+    mov r5, r9\n\
+    ldrb r4, [r5, 0xB]\n\
+    movs r7, 0xF\n\
+    adds r5, r7, 0\n\
+    ands r5, r4\n\
+    mov r6, r10\n\
+    ldrb r6, [r6, 0x1]\n\
+    mov r8, r6\n\
+    movs r4, 0x10\n\
+    negs r4, r4\n\
+    mov r6, r8\n\
+    ands r4, r6\n\
+    orrs r4, r5\n\
+    mov r5, r10\n\
+    strb r4, [r5, 0x1]\n\
+    mov r8, sp\n\
+    mov r6, r9\n\
+    ldrb r5, [r6, 0xC]\n\
+    lsls r5, 4\n\
+    ands r4, r7\n\
+    orrs r4, r5\n\
+    mov r5, r8\n\
+    strb r4, [r5, 0x1]\n\
+    ldrb r5, [r6, 0xD]\n\
+    movs r6, 0xF\n\
+    ands r5, r6\n\
+    mov r4, r10\n\
+    ldrb r4, [r4, 0x2]\n\
+    mov r8, r4\n\
+    movs r4, 0x10\n\
+    negs r4, r4\n\
+    mov r6, r8\n\
+    ands r4, r6\n\
+    orrs r4, r5\n\
+    mov r5, r10\n\
+    strb r4, [r5, 0x2]\n\
+    mov r8, sp\n\
+    mov r6, r9\n\
+    ldrb r5, [r6, 0xE]\n\
+    lsls r5, 4\n\
+    ands r4, r7\n\
+    orrs r4, r5\n\
+    mov r5, r8\n\
+    strb r4, [r5, 0x2]\n\
+    ldrb r5, [r6, 0xF]\n\
+    movs r6, 0xF\n\
+    ands r5, r6\n\
+    mov r4, r10\n\
+    ldrb r4, [r4, 0x3]\n\
+    mov r8, r4\n\
+    movs r4, 0x10\n\
+    negs r4, r4\n\
+    mov r6, r8\n\
+    ands r4, r6\n\
+    orrs r4, r5\n\
+    mov r5, r10\n\
+    strb r4, [r5, 0x3]\n\
+    mov r8, sp\n\
+    mov r6, r9\n\
+    ldrb r5, [r6, 0x10]\n\
+    lsls r5, 4\n\
+    ands r4, r7\n\
+    orrs r4, r5\n\
+    mov r5, r8\n\
+    strb r4, [r5, 0x3]\n\
+    ldrb r5, [r6, 0x11]\n\
+    movs r6, 0xF\n\
+    ands r5, r6\n\
+    mov r4, r10\n\
+    ldrb r4, [r4, 0x4]\n\
+    mov r8, r4\n\
+    movs r4, 0x10\n\
+    negs r4, r4\n\
+    mov r6, r8\n\
+    ands r4, r6\n\
+    orrs r4, r5\n\
+    mov r5, r10\n\
+    strb r4, [r5, 0x4]\n\
+    mov r8, sp\n\
+    mov r6, r9\n\
+    ldrb r5, [r6, 0x12]\n\
+    lsls r5, 4\n\
+    ands r4, r7\n\
+    orrs r4, r5\n\
+    mov r5, r8\n\
+    strb r4, [r5, 0x4]\n\
+    ldrb r4, [r6, 0x13]\n\
+    movs r6, 0xF\n\
+    ands r4, r6\n\
+    mov r6, r8\n\
+    ldrb r5, [r6, 0x5]\n\
+    movs r6, 0x10\n\
+    negs r6, r6\n\
+    ands r6, r5\n\
+    orrs r6, r4\n\
+    str r6, [sp, 0xC]\n\
+    mov r4, r8\n\
+    strb r6, [r4, 0x5]\n\
+    mov r5, sp\n\
+    mov r6, r9\n\
+    ldrb r4, [r6, 0x14]\n\
+    lsls r4, 4\n\
+    ldr r6, [sp, 0xC]\n\
+    ands r6, r7\n\
+    orrs r6, r4\n\
+    strb r6, [r5, 0x5]\n\
+    mov r7, sp\n\
+    movs r4, 0x3\n\
+    mov r8, r4\n\
+    ldrb r0, [r0, 0x14]\n\
+    mov r5, r8\n\
+    ands r0, r5\n\
+    ldrb r5, [r7, 0x6]\n\
+    movs r6, 0x4\n\
+    negs r6, r6\n\
+    mov r10, r6\n\
+    mov r4, r10\n\
+    ands r4, r5\n\
+    orrs r4, r0\n\
+    strb r4, [r7, 0x6]\n\
+    mov r5, r9\n\
+    ldrb r0, [r5, 0x1]\n\
+    mov r6, r8\n\
+    ands r0, r6\n\
+    lsls r0, 2\n\
+    movs r5, 0xD\n\
+    negs r5, r5\n\
+    ands r5, r4\n\
+    orrs r5, r0\n\
+    strb r5, [r7, 0x6]\n\
+    mov r0, r9\n\
+    ldrb r4, [r0, 0x2]\n\
+    ands r4, r6\n\
+    lsls r4, 4\n\
+    movs r0, 0x31\n\
+    negs r0, r0\n\
+    ands r0, r5\n\
+    orrs r0, r4\n\
+    strb r0, [r7, 0x6]\n\
+    mov r5, sp\n\
+    mov r6, r9\n\
+    ldrb r4, [r6, 0x3]\n\
+    lsls r4, 6\n\
+    movs r6, 0x3F\n\
+    ands r0, r6\n\
+    orrs r0, r4\n\
+    strb r0, [r5, 0x6]\n\
+    mov r4, r9\n\
+    ldrb r0, [r4, 0x4]\n\
+    mov r5, r8\n\
+    ands r0, r5\n\
+    ldrb r5, [r7, 0x7]\n\
+    mov r4, r10\n\
+    ands r4, r5\n\
+    orrs r4, r0\n\
+    strb r4, [r7, 0x7]\n\
+    mov r6, r9\n\
+    ldrb r0, [r6, 0x5]\n\
+    mov r5, r8\n\
+    ands r0, r5\n\
+    lsls r0, 2\n\
+    movs r5, 0xD\n\
+    negs r5, r5\n\
+    ands r5, r4\n\
+    orrs r5, r0\n\
+    strb r5, [r7, 0x7]\n\
+    ldrb r4, [r6, 0x6]\n\
+    mov r6, r8\n\
+    ands r4, r6\n\
+    lsls r4, 4\n\
+    movs r0, 0x31\n\
+    negs r0, r0\n\
+    ands r0, r5\n\
+    orrs r0, r4\n\
+    strb r0, [r7, 0x7]\n\
+    mov r5, sp\n\
+    mov r6, r9\n\
+    ldrb r4, [r6, 0x7]\n\
+    lsls r4, 6\n\
+    movs r6, 0x3F\n\
+    ands r0, r6\n\
+    orrs r0, r4\n\
+    strb r0, [r5, 0x7]\n\
+    mov r8, sp\n\
+    mov r0, r9\n\
+    ldrb r4, [r0, 0x8]\n\
+    movs r7, 0x3\n\
+    adds r0, r7, 0\n\
+    ands r0, r4\n\
+    mov r4, r8\n\
+    ldrb r5, [r4, 0x8]\n\
+    mov r4, r10\n\
+    ands r4, r5\n\
+    orrs r4, r0\n\
+    mov r5, r8\n\
+    strb r4, [r5, 0x8]\n\
+    mov r6, r9\n\
+    ldrb r5, [r6, 0x9]\n\
+    adds r0, r7, 0\n\
+    ands r0, r5\n\
+    lsls r0, 2\n\
+    movs r5, 0xD\n\
+    negs r5, r5\n\
+    ands r5, r4\n\
+    orrs r5, r0\n\
+    mov r0, r8\n\
+    strb r5, [r0, 0x8]\n\
+    ldrb r0, [r1]\n\
+    adds r4, r7, 0\n\
+    ands r4, r0\n\
+    lsls r4, 4\n\
+    movs r0, 0x31\n\
+    negs r0, r0\n\
+    ands r0, r5\n\
+    orrs r0, r4\n\
+    mov r4, r8\n\
+    strb r0, [r4, 0x8]\n\
+    mov r5, sp\n\
+    ldrb r4, [r2]\n\
+    lsls r4, 6\n\
+    movs r6, 0x3F\n\
+    ands r0, r6\n\
+    orrs r0, r4\n\
+    strb r0, [r5, 0x8]\n\
+    ldrb r4, [r3]\n\
+    adds r0, r7, 0\n\
+    ands r0, r4\n\
+    ldrb r4, [r5, 0x9]\n\
+    mov r6, r10\n\
+    ands r6, r4\n\
+    orrs r6, r0\n\
+    mov r10, r6\n\
+    strb r6, [r5, 0x9]\n\
+    ldr r0, [sp, 0x40]\n\
+    ldrb r4, [r0]\n\
+    adds r0, r7, 0\n\
+    ands r0, r4\n\
+    lsls r0, 2\n\
+    movs r4, 0xD\n\
+    negs r4, r4\n\
+    ands r6, r4\n\
+    orrs r6, r0\n\
+    str r6, [sp, 0x10]\n\
+    strb r6, [r5, 0x9]\n\
+    mov r4, sp\n\
+    ldr r5, [sp, 0x44]\n\
+    ldrb r0, [r5]\n\
+    adds r6, r7, 0\n\
+    ands r6, r0\n\
+    lsls r0, r6, 4\n\
+    subs r7, 0x34\n\
+    ldr r5, [sp, 0x10]\n\
+    ands r7, r5\n\
+    orrs r7, r0\n\
+    strb r7, [r4, 0x9]\n\
+    mov r5, sp\n\
+    ldrb r0, [r1, 0x4]\n\
+    movs r6, 0x1\n\
+    mov r12, r6\n\
+    mov r4, r12\n\
+    ands r4, r0\n\
+    lsls r4, 6\n\
+    movs r0, 0x41\n\
+    negs r0, r0\n\
+    mov r10, r0\n\
+    ands r0, r7\n\
+    orrs r0, r4\n\
+    strb r0, [r5, 0x9]\n\
+    ldrb r4, [r2, 0x4]\n\
+    lsls r4, 7\n\
+    movs r5, 0x7F\n\
+    ands r0, r5\n\
+    orrs r0, r4\n\
+    mov r4, r8\n\
+    strb r0, [r4, 0x9]\n\
+    ldrb r4, [r3, 0x4]\n\
+    mov r0, r12\n\
+    ands r0, r4\n\
+    mov r5, r8\n\
+    ldrb r4, [r5, 0xA]\n\
+    movs r7, 0x2\n\
+    negs r7, r7\n\
+    adds r5, r7, 0\n\
+    ands r5, r4\n\
+    orrs r5, r0\n\
+    mov r6, r8\n\
+    strb r5, [r6, 0xA]\n\
+    mov r9, sp\n\
+    ldr r4, [sp, 0x40]\n\
+    ldrb r0, [r4, 0x4]\n\
+    mov r4, r12\n\
+    ands r4, r0\n\
+    lsls r4, 1\n\
+    movs r6, 0x3\n\
+    negs r6, r6\n\
+    mov r8, r6\n\
+    mov r0, r8\n\
+    ands r0, r5\n\
+    orrs r0, r4\n\
+    mov r4, r9\n\
+    strb r0, [r4, 0xA]\n\
+    ldr r6, [sp, 0x44]\n\
+    ldrb r5, [r6, 0x4]\n\
+    mov r4, r12\n\
+    ands r4, r5\n\
+    lsls r4, 2\n\
+    movs r5, 0x5\n\
+    negs r5, r5\n\
+    ands r0, r5\n\
+    orrs r0, r4\n\
+    mov r4, r9\n\
+    strb r0, [r4, 0xA]\n\
+    mov r4, sp\n\
+    ldrb r1, [r1, 0x8]\n\
+    mov r0, r12\n\
+    ands r0, r1\n\
+    lsls r0, 2\n\
+    ldrb r1, [r4, 0xB]\n\
+    ands r5, r1\n\
+    orrs r5, r0\n\
+    strb r5, [r4, 0xB]\n\
+    ldrb r1, [r2, 0x8]\n\
+    mov r0, r12\n\
+    ands r0, r1\n\
+    lsls r0, 3\n\
+    movs r1, 0x9\n\
+    negs r1, r1\n\
+    ands r1, r5\n\
+    orrs r1, r0\n\
+    strb r1, [r4, 0xB]\n\
+    ldrb r2, [r3, 0x8]\n\
+    mov r0, r12\n\
+    ands r0, r2\n\
+    lsls r0, 4\n\
+    movs r2, 0x11\n\
+    negs r2, r2\n\
+    ands r2, r1\n\
+    orrs r2, r0\n\
+    strb r2, [r4, 0xB]\n\
+    mov r3, sp\n\
+    ldr r5, [sp, 0x40]\n\
+    ldrb r0, [r5, 0x8]\n\
+    mov r1, r12\n\
+    ands r1, r0\n\
+    lsls r1, 5\n\
+    movs r0, 0x21\n\
+    negs r0, r0\n\
+    ands r0, r2\n\
+    orrs r0, r1\n\
+    strb r0, [r3, 0xB]\n\
+    mov r2, sp\n\
+    ldrb r1, [r6, 0x8]\n\
+    mov r6, r12\n\
+    ands r6, r1\n\
+    lsls r1, r6, 6\n\
+    mov r3, r10\n\
+    ands r0, r3\n\
+    orrs r0, r1\n\
+    strb r0, [r2, 0xB]\n\
+    ldr r4, [sp, 0x1C]\n\
+    lsrs r3, r4, 21\n\
+    ldrb r1, [r2, 0xA]\n\
+    movs r0, 0x7\n\
+    ands r0, r1\n\
+    orrs r0, r3\n\
+    strb r0, [r2, 0xA]\n\
+    mov r1, sp\n\
+    ldr r5, [sp, 0x4C]\n\
+    movs r6, 0x1\n\
+    ands r5, r6\n\
+    lsls r2, r5, 1\n\
+    ldrb r0, [r1, 0xB]\n\
+    mov r3, r8\n\
+    ands r3, r0\n\
+    orrs r3, r2\n\
+    mov r8, r3\n\
+    strb r3, [r1, 0xB]\n\
+    mov r0, sp\n\
+    ldr r4, [sp, 0x50]\n\
+    ands r4, r6\n\
+    mov r5, r8\n\
+    ands r5, r7\n\
+    orrs r5, r4\n\
+    strb r5, [r0, 0xB]\n\
+    bl sub_800FE50\n\
+    add sp, 0x20\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\
+");
+}
+#endif
+
+static u32 sub_8028164(u32 unused, struct DodrioSubstruct_31A0 *arg0, struct DodrioSubstruct_31A0_2C *arg1, struct DodrioSubstruct_31A0_2C *arg2, struct DodrioSubstruct_31A0_2C *arg3, struct DodrioSubstruct_31A0_2C *arg4, struct DodrioSubstruct_31A0_2C *arg5, u8 *arg6, u32 *arg7, u32 *arg8)
+{
+    struct UnkPacket2 *packet;
+    struct DodrioSubstruct_31A0_14 *ptr = &arg0->unk14;
+
+    if ((gRecvCmds[0][0] & 0xFF00) != 0x2F00)
+        return 0;
+
+    packet = (void *)&gRecvCmds[0][1];
+    if (packet->id == 2)
+    {
+        ptr->unkB[0] = packet->unk1_0;
+        ptr->unkB[1] = packet->unk1_1;
+        ptr->unkB[2] = packet->unk2_0;
+        ptr->unkB[3] = packet->unk2_1;
+        ptr->unkB[4] = packet->unk3_0;
+        ptr->unkB[5] = packet->unk3_1;
+        ptr->unkB[6] = packet->unk4_0;
+        ptr->unkB[7] = packet->unk4_1;
+        ptr->unkB[8] = packet->unk5_0;
+        ptr->unkB[9] = packet->unk5_1;
+        ptr->unkB[10] = packet->unk1_0;
+
+        ptr->unk0[0] = packet->unk6_0;
+        ptr->unk0[1] = packet->unk6_1;
+        ptr->unk0[2] = packet->unk6_2;
+        ptr->unk0[3] = packet->unk6_3;
+        ptr->unk0[4] = packet->unk7_0;
+        ptr->unk0[5] = packet->unk7_1;
+        ptr->unk0[6] = packet->unk7_2;
+        ptr->unk0[7] = packet->unk7_3;
+        ptr->unk0[8] = packet->unk8_0;
+        ptr->unk0[9] = packet->unk8_1;
+        ptr->unk0[10] = packet->unk6_0;
+
+        arg1->unk0 = packet->unk8_2;
+        arg1->unk4 = packet->unk9_3;
+        arg1->unk8 = packet->unkB_2;
+
+        arg2->unk0 = packet->unk8_3;
+        arg2->unk4 = packet->unk9_4;
+        arg2->unk8 = packet->unkB_3;
+
+        arg3->unk0 = packet->unk9_0;
+        arg3->unk4 = packet->unkA_0;
+        arg3->unk8 = packet->unkB_4;
+
+        arg4->unk0 = packet->unk9_1;
+        arg4->unk4 = packet->unkA_1;
+        arg4->unk8 = packet->unkB_5;
+
+        arg5->unk0 = packet->unk9_2;
+        arg5->unk4 = packet->unkA_2;
+        arg5->unk8 = packet->unkB_6;
+
+        *arg6 = packet->unkA_3;
+        *arg7 = packet->unkB_1;
+        *arg8 = packet->unkB_0;
+        return 1;
+    }
+
+    return 0;
+}
+
+struct UnkPacket3
+{
+    u8 id;
+    u8 ALIGNED(4) unk4;
+};
+
+static void sub_80282EC(u8 arg0)
+{
+    struct UnkPacket3 packet;
+    packet.id = 3;
+    packet.unk4 = arg0;
+    sub_800FE50(&packet);
+}
+
+static u32 sub_8028318(u32 arg0, u8 *arg1)
+{
+    struct UnkPacket3 *packet;
+
+    if ((gRecvCmds[0][0] & 0xFF00) != 0x2F00)
+        return 0;
+
+    packet = (void *)&gRecvCmds[arg0][1];
+    if (packet->id == 3)
+    {
+        *arg1 = packet->unk4;
+        return 1;
+    }
+
+    return 0;
+}
+
+struct UnkPacket4
+{
+    u8 id;
+    u32 unk4;
+};
+
+static void sub_8028350(u32 arg0)
+{
+    struct UnkPacket4 packet;
+    packet.id = 4;
+    packet.unk4 = arg0;
+    sub_800FE50(&packet);
+}
+
+static u32 sub_8028374(u32 arg0)
+{
+    struct UnkPacket4 *packet;
+
+    if ((gRecvCmds[0][0] & 0xFF00) != 0x2F00)
+        return 0;
+
+    packet = (void *)&gRecvCmds[arg0][1];
+    if (packet->id == 4)
+        return packet->unk4;
+
+    return 0;
+}
+
+// Large chunk of data
+static const struct BgTemplate gUnknown_082F7BA4[] =
+{
+    {
+        .bg = 0,
+        .charBaseIndex = 0,
+        .mapBaseIndex = 30,
+        .screenSize = 0,
+        .paletteMode = 0,
+        .priority = 0,
+        .baseTile = 0
+    },
+    {
+        .bg = 1,
+        .charBaseIndex = 2,
+        .mapBaseIndex = 12,
+        .screenSize = 1,
+        .paletteMode = 0,
+        .priority = 1,
+        .baseTile = 0
+    },
+    {
+        .bg = 2,
+        .charBaseIndex = 2,
+        .mapBaseIndex = 14,
+        .screenSize = 1,
+        .paletteMode = 0,
+        .priority = 1,
+        .baseTile = 0
+    },
+    {
+        .bg = 3,
+        .charBaseIndex = 3,
+        .mapBaseIndex = 31,
+        .screenSize = 0,
+        .paletteMode = 0,
+        .priority = 2,
+        .baseTile = 0
+    },
+};
+
+// Unknown unreferenced data, feel free to remove.
+static const u32 sUnused[] = {255, 0};
+
+static const struct WindowTemplate gUnknown_082F7BBC[] =
+{
+    {
+        .bg = 0,
+        .tilemapLeft = 1,
+        .tilemapTop = 1,
+        .width = 28,
+        .height = 2,
+        .paletteNum = 13,
+        .baseBlock = 0x13,
+    },
+    {
+        .bg = 0,
+        .tilemapLeft = 1,
+        .tilemapTop = 5,
+        .width = 28,
+        .height = 14,
+        .paletteNum = 13,
+        .baseBlock = 0x4B,
+    }
+};
+static const struct WindowTemplate gUnknown_082F7BCC =
+{
+    .bg = 0,
+    .tilemapLeft = 1,
+    .tilemapTop = 5,
+    .width = 28,
+    .height = 7,
+    .paletteNum = 13,
+    .baseBlock = 0x4B,
+};
+static const struct WindowTemplate gUnknown_082F7BD4[] =
+{
+    {
+        .bg = 0,
+        .tilemapLeft = 1,
+        .tilemapTop = 8,
+        .width = 19,
+        .height = 3,
+        .paletteNum = 13,
+        .baseBlock = 0x13,
+    },
+    {
+        .bg = 0,
+        .tilemapLeft = 22,
+        .tilemapTop = 7,
+        .width = 6,
+        .height = 4,
+        .paletteNum = 13,
+        .baseBlock = 0x4C,
+    }
+};
+static const struct WindowTemplate gUnknown_082F7BE4 =
+{
+    .bg = 0,
+    .tilemapLeft = 4,
+    .tilemapTop = 6,
+    .width = 22,
+    .height = 5,
+    .paletteNum = 13,
+    .baseBlock = 0x13,
+};
+static const struct WindowTemplate gUnknown_082F7BEC =
+{
+    .bg = 0,
+    .tilemapLeft = 5,
+    .tilemapTop = 8,
+    .width = 19,
+    .height = 3,
+    .paletteNum = 13,
+    .baseBlock = 0x13,
+};
+
+// This is an unused copy of the tables from the top of the file. Feel free to remove.
+static const u8 sDuplicateArray[] =
+{
+    0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3, 4, 5, 6, 3, 8, 9, 0, 0, 1, 2, 5, 6, 3, 4, 5, 8, 9, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3, 4, 5, 6, 7, 2, 9,
+    0, 0, 1, 4, 5, 6, 7, 2, 3, 4, 9, 0, 0, 1, 6, 7, 2, 3, 4, 5, 6, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 1, 2, 3, 4, 5, 6, 7, 8, 1, 0, 0, 3, 4, 5, 6, 7, 8, 1, 2, 3, 0, 0, 5, 6, 7, 8, 1, 2, 3, 4, 5, 0, 0, 7,
+    8, 1, 2, 3, 4, 5, 6, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 2, 3, 4, 5, 6, 7, 8, 9, 0,
+    1, 2, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 4, 5, 6, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 4, 5, 5, 6, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 5, 6, 6, 7, 2, 2, 3, 4, 0, 0, 0, 0, 0, 0,
+    3, 4, 5, 5, 6, 7, 7, 8, 1, 1, 2, 3, 0, 0, 0, 4, 5, 6, 6, 7, 8, 8, 9, 0, 0, 1, 2, 2, 3, 4, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 1, 0, 1, 2, 1, 2, 0, 0, 0, 0, 0, 0, 0, 3, 0, 1, 0, 1,
+    2, 1, 2, 3, 2, 3, 0, 0, 0, 0, 4, 0, 1, 0, 1, 2, 1, 2, 3, 2, 3, 4, 3, 4, 0, 0, 0, 0, 9, 9, 9, 9, 1, 1, 1, 9, 9, 9, 9, 9,
+    9, 9, 0, 0, 1, 1, 0, 9, 9, 9, 9, 9, 2, 2, 0, 0, 1, 1, 1, 9, 9, 9, 3, 3, 0, 0, 1, 1, 2, 2, 3, 9, 3, 3, 4, 4, 0, 0, 1, 1,
+    2, 2, 3, 5, 0, 0, 0, 0, 4, 6, 0, 0, 0, 3, 5, 7, 0, 0, 2, 4, 6, 8, 0, 1, 3, 5, 6, 9
+};
+
+static const u16 gDodrioBerryBgPal1[] = INCBIN_U16("graphics/link_games/dodrioberry_bg1.gbapal",
+                                            "graphics/link_games/dodrioberry_bg2.gbapal");
+static const u16 gDodrioBerryPkmnPal[] = INCBIN_U16("graphics/link_games/dodrioberry_pkmn.gbapal");
+static const u16 gDodrioBerryShinyPal[] = INCBIN_U16("graphics/link_games/dodrioberry_shiny.gbapal");
+static const u16 gDodrioBerryStatusPal[] = INCBIN_U16("graphics/link_games/dodrioberry_status.gbapal");
+static const u16 gDodrioBerrySpritesPal[] = INCBIN_U16("graphics/link_games/dodrioberry_berrysprites.gbapal");
+static const u32 gDodrioBerrySpritesGfx[] = INCBIN_U32("graphics/link_games/dodrioberry_berrysprites.4bpp.lz");
+static const u16 gDodrioBerryPlatformPal[] = INCBIN_U16("graphics/link_games/dodrioberry_platform.gbapal");
+static const u32 gDodrioBerryBgGfx1[] = INCBIN_U32("graphics/link_games/dodrioberry_bg1.4bpp.lz");
+static const u32 gDodrioBerryBgGfx2[] = INCBIN_U32("graphics/link_games/dodrioberry_bg2.4bpp.lz");
+static const u32 gDodrioBerryStatusGfx[] = INCBIN_U32("graphics/link_games/dodrioberry_status.4bpp.lz");
+static const u32 gDodrioBerryPlatformGfx[] = INCBIN_U32("graphics/link_games/dodrioberry_platform.4bpp.lz");
+static const u32 gDodrioBerryPkmnGfx[] = INCBIN_U32("graphics/link_games/dodrioberry_pkmn.4bpp.lz");
+static const u32 gDodrioBerryBgTilemap1[] = INCBIN_U32("graphics/link_games/dodrioberry_bg1.bin.lz");
+static const u32 gDodrioBerryBgTilemap2Right[] = INCBIN_U32("graphics/link_games/dodrioberry_bg2right.bin.lz");
+static const u32 gDodrioBerryBgTilemap2Left[] = INCBIN_U32("graphics/link_games/dodrioberry_bg2left.bin.lz");
+
+static const struct OamData sOamData_82FB1E0 =
+{
+    .y = 0,
+    .affineMode = 0,
+    .objMode = 0,
+    .mosaic = 0,
+    .bpp = 0,
+    .shape = 0,
+    .x = 0,
+    .matrixNum = 0,
+    .size = 3,
+    .tileNum = 0,
+    .priority = 2,
+    .paletteNum = 0,
+    .affineParam = 0
+};
+
+static const struct OamData sOamData_82FB1E8 =
+{
+    .y = 0,
+    .affineMode = 0,
+    .objMode = 0,
+    .mosaic = 0,
+    .bpp = 0,
+    .shape = 0,
+    .x = 0,
+    .matrixNum = 0,
+    .size = 1,
+    .tileNum = 0,
+    .priority = 0,
+    .paletteNum = 0,
+    .affineParam = 0
+};
+
+static const struct OamData sOamData_82FB1F0 =
+{
+    .y = 0,
+    .affineMode = 0,
+    .objMode = 0,
+    .mosaic = 0,
+    .bpp = 0,
+    .shape = 0,
+    .x = 0,
+    .matrixNum = 0,
+    .size = 1,
+    .tileNum = 0,
+    .priority = 2,
+    .paletteNum = 0,
+    .affineParam = 0
+};
+
+static const struct OamData sOamData_82FB1F8 =
+{
+    .y = 0,
+    .affineMode = 0,
+    .objMode = 0,
+    .mosaic = 0,
+    .bpp = 0,
+    .shape = 1,
+    .x = 0,
+    .matrixNum = 0,
+    .size = 3,
+    .tileNum = 0,
+    .priority = 3,
+    .paletteNum = 0,
+    .affineParam = 0
+};
+
+static const union AnimCmd sSpriteAnim_82FB200[] =
+{
+    ANIMCMD_FRAME(0, 20),
+    ANIMCMD_JUMP(0)
+};
+
+static const union AnimCmd sSpriteAnim_82FB208[] =
+{
+    ANIMCMD_FRAME(64, 20),
+    ANIMCMD_JUMP(0)
+};
+
+static const union AnimCmd sSpriteAnim_82FB210[] =
+{
+    ANIMCMD_FRAME(128, 20),
+    ANIMCMD_JUMP(0)
+};
+
+static const union AnimCmd sSpriteAnim_82FB218[] =
+{
+    ANIMCMD_FRAME(192, 20),
+    ANIMCMD_JUMP(0)
+};
+
+static const union AnimCmd sSpriteAnim_82FB220[] =
+{
+    ANIMCMD_FRAME(256, 20),
+    ANIMCMD_JUMP(0)
+};
+
+static const union AnimCmd *const sSpriteAnimTable_82FB228[] =
+{
+    sSpriteAnim_82FB200,
+    sSpriteAnim_82FB208,
+    sSpriteAnim_82FB210,
+    sSpriteAnim_82FB218,
+    sSpriteAnim_82FB220
+};
+
+static const union AnimCmd sSpriteAnim_82FB23C[] =
+{
+    ANIMCMD_FRAME(0, 20),
+    ANIMCMD_JUMP(0)
+};
+
+static const union AnimCmd sSpriteAnim_82FB244[] =
+{
+    ANIMCMD_FRAME(4, 20),
+    ANIMCMD_JUMP(0)
+};
+
+static const union AnimCmd sSpriteAnim_82FB24C[] =
+{
+    ANIMCMD_FRAME(8, 20),
+    ANIMCMD_JUMP(0)
+};
+
+static const union AnimCmd *const sSpriteAnimTable_82FB254[] =
+{
+    sSpriteAnim_82FB23C,
+    sSpriteAnim_82FB244,
+    sSpriteAnim_82FB24C
+};
+
+static const union AnimCmd sSpriteAnim_82FB260[] =
+{
+    ANIMCMD_FRAME(0, 20),
+    ANIMCMD_JUMP(0)
+};
+
+static const union AnimCmd sSpriteAnim_82FB268[] =
+{
+    ANIMCMD_FRAME(4, 20),
+    ANIMCMD_JUMP(0)
+};
+
+static const union AnimCmd sSpriteAnim_82FB270[] =
+{
+    ANIMCMD_FRAME(8, 20),
+    ANIMCMD_JUMP(0)
+};
+
+static const union AnimCmd sSpriteAnim_82FB278[] =
+{
+    ANIMCMD_FRAME(12, 20),
+    ANIMCMD_JUMP(0)
+};
+
+static const union AnimCmd sSpriteAnim_82FB280[] =
+{
+    ANIMCMD_FRAME(16, 20),
+    ANIMCMD_JUMP(0)
+};
+
+static const union AnimCmd sSpriteAnim_82FB288[] =
+{
+    ANIMCMD_FRAME(20, 20),
+    ANIMCMD_JUMP(0)
+};
+
+static const union AnimCmd sSpriteAnim_82FB290[] =
+{
+    ANIMCMD_FRAME(24, 20),
+    ANIMCMD_JUMP(0)
+};
+
+static const union AnimCmd sSpriteAnim_82FB298[] =
+{
+    ANIMCMD_FRAME(28, 20),
+    ANIMCMD_JUMP(0)
+};
+
+static const union AnimCmd sSpriteAnim_82FB2A0[] =
+{
+    ANIMCMD_FRAME(32, 20),
+    ANIMCMD_JUMP(0)
+};
+
+static const union AnimCmd *const sSpriteAnimTable_82FB2A8[] =
+{
+    sSpriteAnim_82FB260,
+    sSpriteAnim_82FB268,
+    sSpriteAnim_82FB270,
+    sSpriteAnim_82FB278,
+    sSpriteAnim_82FB280,
+    sSpriteAnim_82FB288,
+    sSpriteAnim_82FB290,
+    sSpriteAnim_82FB298,
+    sSpriteAnim_82FB2A0
+};
+
+static const union AnimCmd sSpriteAnim_82FB2CC[] =
+{
+    ANIMCMD_FRAME(0, 20),
+    ANIMCMD_JUMP(0)
+};
+
+static const union AnimCmd *const sSpriteAnimTable_82FB2D4[] =
+{
+    sSpriteAnim_82FB2CC
+};
+
+static void sub_80283A8(void)
+{
+    void *ptr = AllocZeroed(0x3000);
+    struct SpritePalette pal1 = {gDodrioBerryPkmnPal, 0};
+    struct SpritePalette pal2 = {gDodrioBerryShinyPal, 1};
+
+    LZ77UnCompWram(gDodrioBerryPkmnGfx, ptr);
+    // This check should be one line up.
+    if (ptr != NULL)
+    {
+        struct SpriteSheet sheet = {ptr, 0x3000, 0};
+        LoadSpriteSheet(&sheet);
+        Free(ptr);
+    }
+    LoadSpritePalette(&pal1);
+    LoadSpritePalette(&pal2);
+}
+
+static void sub_8028408(struct DodrioSubstruct_318C *arg0, u8 arg1, u8 id, u8 arg3)
+{
+    struct SpriteTemplate sprTemplate =
+    {
+        .tileTag = 0,
+        .paletteTag = arg0->isShiny,
+        .oam = &sOamData_82FB1E0,
+        .anims = sSpriteAnimTable_82FB228,
+        .images = NULL,
+        .affineAnims = gDummySpriteAffineAnimTable,
+        .callback = sub_80284A8,
+    };
+
+    gUnknown_02022C9C[id] = AllocZeroed(4);
+    *gUnknown_02022C9C[id] = CreateSprite(&sprTemplate, sub_8028F14(arg1, arg3), 136, 3);
+    sub_8028654(TRUE, id);
+}
+
+static void sub_80284A8(struct Sprite *sprite)
+{
+    switch (sprite->data[0])
+    {
+    case 0:
+        break;
+    case 1:
+        sub_802853C(sprite);
+        break;
+    case 2:
+        sub_80285AC(sprite);
+        break;
+    }
+}
+
+static void sub_80284CC(u8 unused)
+{
+    struct Sprite *sprite = &gSprites[*gUnknown_02022C9C[GetMultiplayerId()]];
+    sprite->data[0] = 1;
+    sprite->data[1] = 0;
+    sprite->data[2] = 0;
+    sprite->data[3] = 0;
+    sprite->data[4] = 0;
+}
+
+static void sub_8028504(u8 unused)
+{
+    struct Sprite *sprite = &gSprites[*gUnknown_02022C9C[GetMultiplayerId()]];
+    sprite->data[0] = 2;
+    sprite->data[1] = 0;
+    sprite->data[2] = 0;
+    sprite->data[3] = 0;
+    sprite->data[4] = 0;
+}
+
+static u32 sub_802853C(struct Sprite *sprite)
+{
+    s8 var;
+    u8 mod = (++sprite->data[1] / 2) % 4;
+
+    if (sprite->data[1] >= 3)
+    {
+        switch (mod)
+        {
+        default:
+            var = 1;
+            break;
+        case 1:
+        case 2:
+            var = -1;
+            break;
+        }
+
+        sprite->pos1.x += var;
+        if (++sprite->data[1] >= 40)
+        {
+            sprite->data[0] = 0;
+            sprite->pos1.x = sub_8028F14(0, sub_8027650());
+        }
+    }
+
+    return 0;
+}
+
+static u32 sub_80285AC(struct Sprite *sprite)
+{
+    u8 mod = (++sprite->data[1] / 13) % 4;
+
+    if (sprite->data[1] % 13 == 0 && mod != 0)
+        PlaySE(SE_W204);
+    if (sprite->data[1] >= 104)
+    {
+        sprite->data[0] = 0;
+        mod = 0;
+    }
+    sub_80286B4(GetMultiplayerId(), mod);
+    return 0;
+}
+
+static void sub_8028614(u8 count)
+{
+    u8 i;
+    for (i = 0; i < count; i++)
+    {
+        struct Sprite *sprite = &gSprites[*gUnknown_02022C9C[i]];
+        if (sprite != NULL)
+            DestroySpriteAndFreeResources(sprite);
+        // Memory should be freed here but is not.
+    }
+}
+
+static void sub_8028654(bool8 invisible, u8 id)
+{
+    gSprites[*gUnknown_02022C9C[id]].invisible = invisible;
+}
+
+static void sub_802868C(bool8 invisible, u8 count)
+{
+    u8 i;
+    for (i = 0; i < count; i++)
+        sub_8028654(invisible, i);
+}
+
+static void sub_80286B4(u8 id, u8 frameNum)
+{
+    StartSpriteAnim(&gSprites[*gUnknown_02022C9C[id]], frameNum);
+}
+
+static void nullsub_15(struct Sprite *sprite)
+{
+
+}
+
+static void sub_80286E4(void)
+{
+    u8 i;
+    for (i = 0; i < 10; i++)
+    {
+        struct Sprite *sprite = &gSprites[gUnknown_02022CF4->unk2A[i]];
+        sprite->pos1.x = (i * 16) + 48;
+        sprite->pos1.y = -8 - (i * 8);
+        gUnknown_02022CF4->unkC[i] = 0;
+    }
+}
+
+static void sub_8028734(void)
+{
+    u8 i;
+    void *ptr = AllocZeroed(0x180);
+    struct SpritePalette spPal = {gDodrioBerryStatusPal, 2};
+
+    LZ77UnCompWram(gDodrioBerryStatusGfx, ptr);
+    // This check should be one line up.
+    if (ptr != NULL)
+    {
+        struct SpriteSheet spSheet = {ptr, 0x180, 1};
+        struct SpriteTemplate spTemplate =
+        {
+            .tileTag = 1,
+            .paletteTag = 2,
+            .oam = &sOamData_82FB1E8,
+            .anims = sSpriteAnimTable_82FB254,
+            .images = NULL,
+            .affineAnims = gDummySpriteAffineAnimTable,
+            .callback = nullsub_15,
+        };
+
+        gUnknown_02022CF4 = AllocZeroed(sizeof(*gUnknown_02022CF4));
+        LoadSpriteSheet(&spSheet);
+        LoadSpritePalette(&spPal);
+        for (i = 0; i < 10; i++)
+            gUnknown_02022CF4->unk2A[i] = CreateSprite(&spTemplate, (i * 16) + 48, -8 - (i * 8), 0);
+    }
+
+    Free(ptr);
+}
+
+static void sub_80287E4(void)
+{
+    u8 i;
+    for (i = 0; i < 10; i++)
+    {
+        struct Sprite *sprite = &gSprites[gUnknown_02022CF4->unk2A[i]];
+        if (sprite != NULL)
+            DestroySpriteAndFreeResources(sprite);
+    }
+    FREE_AND_SET_NULL(gUnknown_02022CF4);
+}
+
+static bool32 sub_8028828(void)
+{
+    u8 i;
+    bool32 r3 = FALSE;
+    for (i = 0; i < 10; i++)
+    {
+        struct Sprite *sprite = &gSprites[gUnknown_02022CF4->unk2A[i]];
+        gUnknown_02022CF4->unk16[i] = 2;
+        if (gUnknown_02022CF4->unkC[i] != 0 && sprite->pos1.y == 8)
+            continue;
+        r3 = TRUE;
+        if (sprite->pos1.y == 8)
+        {
+            if (gUnknown_02022CF4->unkC[i] != 0)
+                continue;
+            gUnknown_02022CF4->unkC[i] = 1;
+            gUnknown_02022CF4->unk16[i] = -16;
+            PlaySE(SE_TK_KASYA);
+        }
+        sprite->pos1.y += gUnknown_02022CF4->unk16[i];
+    }
+
+    if (r3)
+        return FALSE;
+    else
+        return TRUE;
+}
+
+static void sub_80288D4(u8 arg0)
+{
+    u8 i;
+
+    if (arg0 > 10)
+    {
+        for (i = 0; i < 10; i++)
+            StartSpriteAnim(&gSprites[gUnknown_02022CF4->unk2A[i]], 1);
+    }
+    else
+    {
+        for (i = 0; i < 10 - arg0; i++)
+        {
+            if (arg0 > 6)
+            {
+                gUnknown_02022CF4->unk3E += arg0 - 6;
+                if (gUnknown_02022CF4->unk3E > 30)
+                    gUnknown_02022CF4->unk3E = 0;
+                else if (gUnknown_02022CF4->unk3E > 10)
+                    StartSpriteAnim(&gSprites[gUnknown_02022CF4->unk2A[i]], 2);
+                else
+                    StartSpriteAnim(&gSprites[gUnknown_02022CF4->unk2A[i]], 0);
+            }
+            else
+            {
+                StartSpriteAnim(&gSprites[gUnknown_02022CF4->unk2A[i]], 0);
+            }
+        }
+        for (; i < 10; i++)
+            StartSpriteAnim(&gSprites[gUnknown_02022CF4->unk2A[i]], 1);
+    }
+}
+
+static void sub_80289E8(bool8 invisible)
+{
+    u8 i;
+    for (i = 0; i < 10; i++)
+        gSprites[gUnknown_02022CF4->unk2A[i]].invisible = invisible;
+}
+
+// Unknown unused data, feel free to remove.
+static const u8 sUnused2[] = {0xD4, 0x3E, 0x3F, 0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0xFB, 0x0, 0x0};
+
+static void sub_8028A34(void)
+{
+    void *ptr = AllocZeroed(0x480);
+    struct SpritePalette sprPal = {gDodrioBerrySpritesPal, 3};
+
+    LZ77UnCompWram(gDodrioBerrySpritesGfx, ptr);
+    if (ptr != NULL)
+    {
+        struct SpriteSheet sprSheet = {ptr, 0x480, 2};
+        LoadSpriteSheet(&sprSheet);
+    }
+
+    LoadSpritePalette(&sprPal);
+    Free(ptr);
+}
+
+static const s16 gUnknown_082FB31C[] = {88, 128, 168, 208};
+
+static void sub_8028A88(void)
+{
+    u8 i;
+    s16 x;
+
+    struct SpriteTemplate sprTemplate1 =
+    {
+        .tileTag = 2,
+        .paletteTag = 3,
+        .oam = &sOamData_82FB1F0,
+        .anims = sSpriteAnimTable_82FB2A8,
+        .images = NULL,
+        .affineAnims = gDummySpriteAffineAnimTable,
+        .callback = SpriteCallbackDummy,
+    };
+    struct SpriteTemplate sprTemplate2 =
+    {
+        .tileTag = 2,
+        .paletteTag = 3,
+        .oam = &sOamData_82FB1E8,
+        .anims = sSpriteAnimTable_82FB2A8,
+        .images = NULL,
+        .affineAnims = gDummySpriteAffineAnimTable,
+        .callback = SpriteCallbackDummy,
+    };
+
+    for (i = 0; i < 11; i++)
+    {
+        gUnknown_02022CB8[i] = AllocZeroed(4);
+        x = i * 16;
+        *gUnknown_02022CB8[i] = CreateSprite(&sprTemplate1, x + (i * 8), 8, 1);
+        sub_8028BF8(i, TRUE);
+    }
+    for (i = 0; i < 4; i++)
+    {
+        gUnknown_02022CE4[i] = AllocZeroed(4);
+        if (i == 3)
+            *gUnknown_02022CE4[i] = CreateSprite(&sprTemplate2, gUnknown_082FB31C[i], 49, 0);
+        else
+            *gUnknown_02022CE4[i] = CreateSprite(&sprTemplate2, gUnknown_082FB31C[i], 52, 0);
+        StartSpriteAnim(&gSprites[*gUnknown_02022CE4[i]], i);
+    }
+
+    sub_8028C30(TRUE);
+}
+
+static void sub_8028B80(void)
+{
+    struct Sprite *sprite;
+    u8 i;
+
+    for (i = 0; i < 11; i++)
+    {
+        sprite = &gSprites[*gUnknown_02022CB8[i]];
+        if (sprite != NULL)
+            DestroySprite(sprite);
+        FREE_AND_SET_NULL(gUnknown_02022CB8[i]);
+    }
+    for (i = 0; i < 4; i++)
+    {
+        sprite = &gSprites[*gUnknown_02022CE4[i]];
+        if (sprite != NULL)
+            DestroySprite(sprite);
+        FREE_AND_SET_NULL(gUnknown_02022CE4[i]);
+    }
+}
+
+static void sub_8028BF8(u8 id, bool8 invisible)
+{
+    gSprites[*gUnknown_02022CB8[id]].invisible = invisible;
+}
+
+static void sub_8028C30(bool8 invisible)
+{
+    u8 i;
+    for (i = 0; i < 4; i++)
+        gSprites[*gUnknown_02022CE4[i]].invisible = invisible;
+}
+
+static void sub_8028C7C(u8 id, u8 y)
+{
+    gSprites[*gUnknown_02022CB8[id]].pos1.y = y * 8;
+}
+
+static void sub_8028CA4(u16 id, u8 frameNum)
+{
+    StartSpriteAnim(&gSprites[*gUnknown_02022CB8[id]], frameNum);
+}
+
+// Unused
+static void sub_8028CD0(u8 spriteId)
+{
+    gSprites[spriteId].pos1.x = 20 * spriteId + 50;
+    gSprites[spriteId].pos1.y = 50;
+}
+
+// Gamefreak made a mistake there and goes out of bounds for the data array as it holds 8 elements
+// in turn overwriting sprite's subpriority and subsprites fields.
+#if defined(NONMATCHING) || MODERN
+    #define sKeepPosX data[1]
+#else
+    #define sKeepPosX data[10]
+#endif // NONMATCHING
+
+static void sub_8028CF4(struct Sprite *sprite)
+{
+    u8 i;
+    static const u8 array[] = {30, 20};
+
+    if (sprite->sKeepPosX != TRUE)
+    {
+        for (i = 0; i < 2; i++)
+        {
+            if (++gUnknown_02022CB0[i][1] > array[i])
+            {
+                sprite->pos1.x--;
+                gUnknown_02022CB0[i][1] = 0;
+            }
+        }
+    }
+}
+
+static const s16 gUnknown_082FB356[][2] = {{230, 55}, {30, 74}};
+
+static void sub_8028D44(void)
+{
+    u8 i;
+    void *ptr = AllocZeroed(0x400);
+    struct SpritePalette sprPal = {gDodrioBerryPlatformPal, 6};
+
+    LZ77UnCompWram(gDodrioBerryPlatformGfx, ptr);
+    if (ptr != NULL)
+    {
+        struct SpriteSheet sprSheet = {ptr, 0x400, 5};
+        struct SpriteTemplate sprTemplate =
+        {
+            .tileTag = 5,
+            .paletteTag = 6,
+            .oam = &sOamData_82FB1F8,
+            .anims = sSpriteAnimTable_82FB2D4,
+            .images = NULL,
+            .affineAnims = gDummySpriteAffineAnimTable,
+            .callback = sub_8028CF4,
+        };
+
+        LoadSpriteSheet(&sprSheet);
+        LoadSpritePalette(&sprPal);
+        for (i = 0; i < 2; i++)
+        {
+            gUnknown_02022CB0[i] = AllocZeroed(4);
+            *gUnknown_02022CB0[i] = CreateSprite(&sprTemplate, gUnknown_082FB356[i][0], gUnknown_082FB356[i][1], 4);
+        }
+    }
+
+    Free(ptr);
+}
+
+static void sub_8028DFC(void)
+{
+    u8 i;
+    for (i = 0; i < 2; i++)
+    {
+        struct Sprite *sprite = &gSprites[*gUnknown_02022CB0[i]];
+        sprite->sKeepPosX = TRUE;
+        sprite->pos1.x = gUnknown_082FB356[i][0];
+        sprite->pos1.y = gUnknown_082FB356[i][1];
+    }
+}
+
+static void sub_8028E4C(void)
+{
+    u8 i;
+    for (i = 0; i < 2; i++)
+    {
+        struct Sprite *sprite = &gSprites[*gUnknown_02022CB0[i]];
+        sprite->sKeepPosX = FALSE;
+    }
+}
+
+static void sub_8028E84(void)
+{
+    u8 i;
+    for (i = 0; i < 2; i++)
+    {
+        struct Sprite *sprite = &gSprites[*gUnknown_02022CB0[i]];
+        if (sprite)
+            DestroySprite(sprite);
+        FREE_AND_SET_NULL(gUnknown_02022CB0[i]);
+    }
+}
+
+static void sub_8028EC8(bool8 invisible)
+{
+    u8 i;
+    for (i = 0; i < 2; i++)
+        gSprites[*gUnknown_02022CB0[i]].invisible = invisible;
+}
+
+#undef sKeepPosX
+
+static s16 sub_8028F14(u8 arg0, u8 arg1)
+{
+    s16 x = 0;
+    switch (arg1)
+    {
+    case 1:
+        x = 15;
+        break;
+    case 2:
+        switch (arg0)
+        {
+            case 0: x = 12; break;
+            case 1: x = 18; break;
+        }
+        break;
+    case 3:
+        switch (arg0)
+        {
+            case 0: x = 15; break;
+            case 1: x = 21; break;
+            case 2: x =  9; break;
+        }
+        break;
+    case 4:
+        switch (arg0)
         {
-            gUnknown_02022C98->unk_0120 = 1;
-            if (++gUnknown_02022C98->unk_00DC[i] >= 20)
+            case 0: x = 12; break;
+            case 1: x = 18; break;
+            case 2: x = 24; break;
+            case 3: x =  6; break;
+        }
+        break;
+    case 5:
+        switch (arg0)
+        {
+            case 0: x = 15; break;
+            case 1: x = 21; break;
+            case 2: x = 27; break;
+            case 3: x =  3; break;
+            case 4: x =  9; break;
+        }
+        break;
+    }
+
+    return x * 8;
+}
+
+static void sub_8028FCC(void)
+{
+    u8 i;
+    for (i = 0; i < 11; i++)
+    {
+        sub_8028BF8(i, TRUE);
+        sub_8028C7C(i, 1);
+    }
+    sub_80289E8(FALSE);
+}
+
+static void sub_8028FF8(u8 frameId)
+{
+    LoadBgTiles(0, GetWindowFrameTilesPal(frameId)->tiles, 0x120, 1);
+    LoadPalette(GetWindowFrameTilesPal(frameId)->pal, 0xA0, 0x20);
+}
+
+static void sub_802902C(void)
+{
+    LoadUserWindowBorderGfx_(0, 0xA, 0xB0);
+}
+
+static void sub_802903C(void)
+{
+    gUnknown_02022CF8->finished = FALSE;
+    gUnknown_02022CF8->state = 0;
+    gUnknown_02022CF8->unk3018 = 0;
+    gUnknown_02022CF8->unk3020 = 0;
+    gUnknown_02022CF8->unk3024 = 0;
+}
+
+static void sub_8029074(const struct WindowTemplate *winTempl)
+{
+    u8 pal = 0xA;
+
+    FillBgTilemapBufferRect(0, 1, winTempl->tilemapLeft - 1,                winTempl->tilemapTop - 1,                   1, 1, pal);
+    FillBgTilemapBufferRect(0, 2, winTempl->tilemapLeft,                    winTempl->tilemapTop - 1,                   winTempl->width, 1, pal);
+    FillBgTilemapBufferRect(0, 3, winTempl->tilemapLeft + winTempl->width,  winTempl->tilemapTop - 1,                   1, 1, pal);
+    FillBgTilemapBufferRect(0, 4, winTempl->tilemapLeft - 1,                winTempl->tilemapTop, 1,                    winTempl->height, pal);
+    FillBgTilemapBufferRect(0, 6, winTempl->tilemapLeft + winTempl->width,  winTempl->tilemapTop, 1,                    winTempl->height, pal);
+    FillBgTilemapBufferRect(0, 7, winTempl->tilemapLeft - 1,                winTempl->tilemapTop + winTempl->height,    1, 1, pal);
+    FillBgTilemapBufferRect(0, 8, winTempl->tilemapLeft,                    winTempl->tilemapTop + winTempl->height,    winTempl->width, 1, pal);
+    FillBgTilemapBufferRect(0, 9, winTempl->tilemapLeft + winTempl->width,  winTempl->tilemapTop + winTempl->height,    1, 1, pal);
+}
+
+static void sub_8029174(const struct WindowTemplate *winTempl)
+{
+    u8 pal = 0xB;
+
+    FillBgTilemapBufferRect(0, 10, winTempl->tilemapLeft - 1,                winTempl->tilemapTop - 1,                   1, 1, pal);
+    FillBgTilemapBufferRect(0, 11, winTempl->tilemapLeft,                    winTempl->tilemapTop - 1,                   winTempl->width, 1, pal);
+    FillBgTilemapBufferRect(0, 12, winTempl->tilemapLeft + winTempl->width,  winTempl->tilemapTop - 1,                   1, 1, pal);
+    FillBgTilemapBufferRect(0, 13, winTempl->tilemapLeft - 1,                winTempl->tilemapTop, 1,                    winTempl->height, pal);
+    FillBgTilemapBufferRect(0, 15, winTempl->tilemapLeft + winTempl->width,  winTempl->tilemapTop, 1,                    winTempl->height, pal);
+    FillBgTilemapBufferRect(0, 16, winTempl->tilemapLeft - 1,                winTempl->tilemapTop + winTempl->height,    1, 1, pal);
+    FillBgTilemapBufferRect(0, 17, winTempl->tilemapLeft,                    winTempl->tilemapTop + winTempl->height,    winTempl->width, 1, pal);
+    FillBgTilemapBufferRect(0, 18, winTempl->tilemapLeft + winTempl->width,  winTempl->tilemapTop + winTempl->height,    1, 1, pal);
+}
+
+static void sub_8029274(struct DodrioSubstruct_0160 *ptr)
+{
+    gUnknown_02022CF8 = ptr;
+    gUnknown_02022CF8->finished = FALSE;
+    gUnknown_02022CF8->state = 0;
+    gUnknown_02022CF8->unk3018 = 0;
+    gUnknown_02022CF8->unk3020 = 0;
+    gUnknown_02022CF8->unk3024 = 0;
+    gUnknown_02022CF8->unk3004 = CreateTask(sub_8029314, 3);
+    sub_802A72C(sub_8029338);
+}
+
+static void sub_80292D4(void)
+{
+    FreeAllWindowBuffers();
+}
+
+// Data used by functions below.
+struct WinCoords
+{
+    u8 left;
+    u8 top;
+};
+
+static const u8 gUnknown_082FB380[][3] =
+{
+    {1, 2, 3},
+    {1, 4, 5},
+    {1, 8, 9},
+    {1, 6, 7},
+};
+
+static const struct WinCoords gUnknown_082FB38C[] = {{12, 6}};
+static const struct WinCoords gUnknown_082FB390[] = {{9, 10}, {15, 6}};
+static const struct WinCoords gUnknown_082FB398[] = {{12, 6}, {18, 10}, {6, 10}};
+static const struct WinCoords gUnknown_082FB3A4[] = {{9, 10}, {15, 6}, {21, 10}, {3, 6}};
+static const struct WinCoords gUnknown_082FB3B4[] = {{12, 6}, {18, 10}, {23, 6}, {1, 6}, {6, 10}};
+
+static const struct WinCoords *const gUnknown_082FB3C8[] =
+{
+    gUnknown_082FB38C,
+    gUnknown_082FB390,
+    gUnknown_082FB398,
+    gUnknown_082FB3A4,
+    gUnknown_082FB3B4,
+};
+
+static const u8 *const gUnknown_082FB3DC[] =
+{
+    gText_1Colon,
+    gText_2Colon,
+    gText_3Colon,
+    gText_4Colon,
+    gText_5Colon,
+};
+
+static const u16 gUnknown_082FB3F0[] = {92, 132, 172, 212};
+static const u16 gUnknown_082FB3F8[] = {33, 49, 65, 81, 97};
+static const u16 gUnknown_082FB402[] = {17, 33, 49, 65, 81};
+
+struct
+{
+    u8 id;
+    void (*func)(void);
+} const gUnknown_082FB40C[] =
+{
+    {0, sub_8029338},
+    {1, sub_8029440},
+    {2, sub_802988C},
+    {3, sub_802A010},
+    {4, sub_802A380},
+    {5, sub_802A454},
+    {6, sub_802A534},
+    {7, sub_802A588},
+    {8, sub_802A6FC},
+    {9, nullsub_16},
+};
+
+static void sub_80292E0(u8 arg0)
+{
+    u8 i;
+    for (i = 0; i < 10; i++)
+    {
+        if (gUnknown_082FB40C[i].id == arg0)
+            sub_802A72C(gUnknown_082FB40C[i].func);
+    }
+}
+
+static void sub_8029314(u8 taskId)
+{
+    if (!gUnknown_02022CF8->finished)
+        sub_802A75C()();
+}
+
+static void sub_8029338(void)
+{
+    switch (gUnknown_02022CF8->state)
+    {
+    case 0:
+        sub_802A7A8();
+        gUnknown_02022CF8->state++;
+        break;
+    case 1:
+        if (sub_802A8E8() == TRUE)
+            gUnknown_02022CF8->state++;
+        break;
+    case 2:
+        CopyToBgTilemapBuffer(3, gDodrioBerryBgTilemap1, 0, 0);
+        CopyToBgTilemapBuffer(1, gDodrioBerryBgTilemap2Left, 0, 0);
+        CopyToBgTilemapBuffer(2, gDodrioBerryBgTilemap2Right, 0, 0);
+        CopyBgTilemapBufferToVram(3);
+        CopyBgTilemapBufferToVram(1);
+        CopyBgTilemapBufferToVram(2);
+        gUnknown_02022CF8->state++;
+        break;
+    case 3:
+        ShowBg(0);
+        ShowBg(3);
+        ShowBg(1);
+        ShowBg(2);
+        gUnknown_02022CF8->state++;
+        break;
+    case 4:
+        sub_8028FF8(gSaveBlock2Ptr->optionsWindowFrameType);
+        sub_802902C();
+        gUnknown_02022CF8->state++;
+        break;
+    default:
+        gUnknown_02022CF8->finished = TRUE;
+        break;
+    }
+}
+
+static void sub_8029440(void)
+{
+    u8 i, playersCount, id, colorsId, *name;
+    u32 left;
+    struct WindowTemplate window;
+    const struct WinCoords *ptr;
+
+    switch (gUnknown_02022CF8->state)
+    {
+    case 0:
+        playersCount = sub_8027650();
+        ptr = gUnknown_082FB3C8[playersCount - 1];
+        window.bg = 0;
+        window.width = 7;
+        window.height = 2;
+        window.paletteNum = 0xD;
+        window.baseBlock = 0x13;
+        for (i = 0; i < playersCount; ptr++, i++)
+        {
+            colorsId = 0;
+            id = sub_8027A48(i);
+            left = (56 - GetStringWidth(1, sub_8027660(id), -1)) / 2u;
+            window.tilemapLeft = ptr->left;
+            window.tilemapTop = ptr->top;
+            gUnknown_02022CF8->unk3008[i] = AddWindow(&window);
+            ClearWindowTilemap(gUnknown_02022CF8->unk3008[i]);
+            FillWindowPixelBuffer(gUnknown_02022CF8->unk3008[i], PIXEL_FILL(1));
+            if (id == GetMultiplayerId())
+                colorsId = 2;
+            name = sub_8027660(id);
+            AddTextPrinterParameterized3(gUnknown_02022CF8->unk3008[i], 1, left, 1, gUnknown_082FB380[colorsId], -1, name);
+            CopyWindowToVram(gUnknown_02022CF8->unk3008[i], 2);
+            window.baseBlock += 0xE;
+            sub_8029174(&window);
+        }
+        gUnknown_02022CF8->state++;
+        break;
+    case 1:
+        if (!IsDma3ManagerBusyWithBgCopy())
+        {
+            playersCount = sub_8027650();
+            for (i = 0; i < playersCount; i++)
+                PutWindowTilemap(gUnknown_02022CF8->unk3008[i]);
+            CopyBgTilemapBufferToVram(0);
+            gUnknown_02022CF8->state++;
+        }
+        break;
+    default:
+        if (++gUnknown_02022CF8->state > 180)
+        {
+            playersCount = sub_8027650();
+            for (i = 0; i < playersCount; i++)
             {
-                gUnknown_02022C98->unk_31A0[gUnknown_02022C98->unk_00B8[i]].unk_30 = 0;
-                gUnknown_02022C98->unk_00DC[i] = 0;
-                gUnknown_02022C98->unk_00D0[i] = 0;
-                gUnknown_02022C98->unk_00C4[i] = 0;
-                ptr->unk_32CC.unk_14.unk_B[i] = 1;
-                ptr->unk_32CC.unk_14.unk_0[i] = sub_8026DB0(sub_8026D8C(i), i);
+                ClearWindowTilemap(gUnknown_02022CF8->unk3008[i]);
+                RemoveWindow(gUnknown_02022CF8->unk3008[i]);
             }
+            FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 30, 20);
+            CopyBgTilemapBufferToVram(0);
+            gUnknown_02022CF8->finished = TRUE;
         }
-        else if (gUnknown_02022C98->unk_00C4[i] == 3)
+        break;
+    }
+}
+
+static void sub_80296A8(u8 playersCount_)
+{
+    u8 i, r8 = 0, r6 = 0;
+    u8 playersCount = playersCount_; // Pointless variable, I know, but it's needed to match.
+    u8 *name;
+    u32 x, numWidth;
+    u8 numString[32];
+    u8 array[5] = {0, 1, 2, 3, 4};
+    struct DodrioSubstruct_3308 temp, structArray[5];
+
+    for (i = 0; i < playersCount; i++)
+    {
+        array[i] = i;
+        sub_802793C(&temp, i);
+        structArray[i] = temp;
+    }
+
+    if (sub_8027748() != 0)
+    {
+        do
         {
-            if (++gUnknown_02022C98->unk_00DC[i] >= 20)
+            for (i = 0; i < playersCount; i++)
             {
-                if (gUnknown_02022C98->unk_0040 < 10)
+                if (structArray[i].unk0 == r8)
                 {
-                    gUnknown_02022C98->unk_00DC[i] = 0;
-                    gUnknown_02022C98->unk_00D0[i] = 0;
-                    gUnknown_02022C98->unk_00C4[i] = 0;
-                    ptr->unk_32CC.unk_14.unk_B[i] = 1;
-                    gUnknown_02022C98->unk_00E8[i] = ptr->unk_32CC.unk_14.unk_0[i];
-                    ptr->unk_32CC.unk_14.unk_0[i] = sub_8026DB0(sub_8026D8C(i), i);
+                    array[r6] = i;
+                    r6++;
                 }
             }
+            r8 = r6;
+        } while (r6 < playersCount);
+    }
+
+    for (i = 0; i < playersCount; i++)
+    {
+        if (structArray[i].unk4 == 0)
+            structArray[i].unk0 = playersCount - 1;
+    }
+
+    x = 216 - GetStringWidth(1, gText_SpacePoints, 0);
+    for (i = 0; i < playersCount; i++)
+    {
+        u8 colorsId = 0;
+        u8 id = array[i];
+        u32 points = structArray[id].unk4;
+
+        AddTextPrinterParameterized(gUnknown_02022CF8->unk3008[1], 1, gUnknown_082FB3DC[structArray[id].unk0], 8, gUnknown_082FB402[i], -1, NULL);
+        if (id == GetMultiplayerId())
+            colorsId = 2;
+        name = sub_8027660(id);
+        AddTextPrinterParameterized3(gUnknown_02022CF8->unk3008[1], 1, 28, gUnknown_082FB402[i], gUnknown_082FB380[colorsId], -1, name);
+        ConvertIntToDecimalStringN(numString, points, STR_CONV_MODE_LEFT_ALIGN, 7);
+        numWidth = GetStringWidth(1, numString, -1);
+        AddTextPrinterParameterized(gUnknown_02022CF8->unk3008[1], 1, numString, x - numWidth, gUnknown_082FB402[i], -1, NULL);
+        AddTextPrinterParameterized(gUnknown_02022CF8->unk3008[1], 1, gText_SpacePoints, x, gUnknown_082FB402[i], -1, NULL);
+    }
+}
+
+static void sub_802988C(void)
+{
+    u8 i, j, itemGiveRet, playersCount = sub_8027650();
+    u8 *name;
+    u32 strWidth, x;
+
+    switch (gUnknown_02022CF8->state)
+    {
+    case 0:
+        sub_802784C();
+        gUnknown_02022CF8->unk301C = 0;
+        gUnknown_02022CF8->state++;
+        break;
+    case 1:
+        gUnknown_02022CF8->unk3008[0] = AddWindow(&gUnknown_082F7BBC[0]);
+        gUnknown_02022CF8->unk3008[1] = AddWindow(&gUnknown_082F7BBC[1]);
+        ClearWindowTilemap(gUnknown_02022CF8->unk3008[0]);
+        ClearWindowTilemap(gUnknown_02022CF8->unk3008[1]);
+        sub_8029174(&gUnknown_082F7BBC[0]);
+        sub_8029174(&gUnknown_082F7BBC[1]);
+        gUnknown_02022CF8->state++;
+        break;
+    case 2:
+        FillWindowPixelBuffer(gUnknown_02022CF8->unk3008[0], PIXEL_FILL(1));
+        FillWindowPixelBuffer(gUnknown_02022CF8->unk3008[1], PIXEL_FILL(1));
+        strWidth = GetStringWidth(1, gText_BerryPickingResults, -1);
+        x = (224 - strWidth) / 2;
+        AddTextPrinterParameterized(gUnknown_02022CF8->unk3008[0], 1, gText_BerryPickingResults, x, 1, -1, NULL);
+        AddTextPrinterParameterized(gUnknown_02022CF8->unk3008[1], 1, gText_10P30P50P50P, 68, 17, -1, NULL);
+        for (i = 0; i < playersCount; i++)
+        {
+            u8 colorsId = 0;
+            if (i == GetMultiplayerId())
+                colorsId = 2;
+
+            name = sub_8027660(i);
+            AddTextPrinterParameterized3(gUnknown_02022CF8->unk3008[1], 1, 0, gUnknown_082FB3F8[i], gUnknown_082FB380[colorsId], -1, name);
+            for (j = 0; j < 4; j++)
+            {
+                u32 width;
+                u16 result1 = Min(sub_80276A0(i, j), 9999);
+                u16 result2 = Min(sub_802778C(j), 9999);
+
+                ConvertIntToDecimalStringN(gStringVar4, result1, STR_CONV_MODE_LEFT_ALIGN, 4);
+                width = GetStringWidth(1, gStringVar4, -1);
+                if (result2 == result1 && result2 != 0)
+                    AddTextPrinterParameterized3(gUnknown_02022CF8->unk3008[1], 1, gUnknown_082FB3F0[j] - width, gUnknown_082FB3F8[i], gUnknown_082FB380[1], -1, gStringVar4);
+                else
+                    AddTextPrinterParameterized(gUnknown_02022CF8->unk3008[1], 1, gStringVar4, gUnknown_082FB3F0[j] - width, gUnknown_082FB3F8[i], -1, NULL);
+            }
+        }
+        CopyWindowToVram(gUnknown_02022CF8->unk3008[0], 2);
+        CopyWindowToVram(gUnknown_02022CF8->unk3008[1], 2);
+        gUnknown_02022CF8->state++;
+        break;
+    case 3:
+        if (!IsDma3ManagerBusyWithBgCopy())
+        {
+            PutWindowTilemap(gUnknown_02022CF8->unk3008[0]);
+            PutWindowTilemap(gUnknown_02022CF8->unk3008[1]);
+        }
+        CopyBgTilemapBufferToVram(0);
+        sub_8028C30(FALSE);
+        gUnknown_02022CF8->state++;
+        break;
+    case 4:
+        if (++gUnknown_02022CF8->unk301C >= 30 && gMain.newKeys & A_BUTTON)
+        {
+            gUnknown_02022CF8->unk301C = 0;
+            PlaySE(SE_SELECT);
+            sub_8028C30(TRUE);
+            gUnknown_02022CF8->state++;
+        }
+        break;
+    case 5:
+        FillWindowPixelBuffer(gUnknown_02022CF8->unk3008[0], PIXEL_FILL(1));
+        FillWindowPixelBuffer(gUnknown_02022CF8->unk3008[1], PIXEL_FILL(1));
+        strWidth = GetStringWidth(1, gText_AnnouncingRankings, -1);
+        x = (224 - strWidth) / 2;
+        AddTextPrinterParameterized(gUnknown_02022CF8->unk3008[0], 1, gText_AnnouncingRankings, x, 1, -1, NULL);
+        gUnknown_02022CF8->state++;
+        break;
+    case 6:
+        sub_80296A8(playersCount);
+        CopyWindowToVram(gUnknown_02022CF8->unk3008[0], 2);
+        CopyWindowToVram(gUnknown_02022CF8->unk3008[1], 2);
+        gUnknown_02022CF8->state++;
+        break;
+    case 7:
+        if (!IsDma3ManagerBusyWithBgCopy())
+        {
+            PutWindowTilemap(gUnknown_02022CF8->unk3008[0]);
+            PutWindowTilemap(gUnknown_02022CF8->unk3008[1]);
+        }
+        CopyBgTilemapBufferToVram(0);
+        gUnknown_02022CF8->state++;
+        break;
+    case 8:
+        if (++gUnknown_02022CF8->unk301C >= 30 && gMain.newKeys & A_BUTTON)
+        {
+            gUnknown_02022CF8->unk301C = 0;
+            PlaySE(SE_SELECT);
+            if (sub_8027748() < 3000)
+            {
+                gUnknown_02022CF8->state = 127;
+            }
+            else
+            {
+                StopMapMusic();
+                gUnknown_02022CF8->state++;
+            }
+
+            FillBgTilemapBufferRect_Palette0(0, 0, 0, 5, 30, 15);
+            RemoveWindow(gUnknown_02022CF8->unk3008[1]);
+            gUnknown_02022CF8->unk3008[1] = AddWindow(&gUnknown_082F7BCC);
+            ClearWindowTilemap(gUnknown_02022CF8->unk3008[1]);
+            sub_8029174(&gUnknown_082F7BCC);
+        }
+        break;
+    case 9:
+        PlayNewMapMusic(MUS_FANFA1);
+        FillWindowPixelBuffer(gUnknown_02022CF8->unk3008[0], PIXEL_FILL(1));
+        FillWindowPixelBuffer(gUnknown_02022CF8->unk3008[1], PIXEL_FILL(1));
+        strWidth = GetStringWidth(1, gText_AnnouncingPrizes, -1);
+        x = (224 - strWidth) / 2;
+        AddTextPrinterParameterized(gUnknown_02022CF8->unk3008[0], 1, gText_AnnouncingPrizes, x, 1, -1, NULL);
+        DynamicPlaceholderTextUtil_Reset();
+        CopyItemName(sub_802762C(), gStringVar1);
+        DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, gStringVar1);
+        DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, gText_FirstPlacePrize);
+        AddTextPrinterParameterized(gUnknown_02022CF8->unk3008[1], 1, gStringVar4, 0, 1, -1, NULL);
+        itemGiveRet = sub_80279C8();
+        if (itemGiveRet != 0 && itemGiveRet != 3)
+        {
+            DynamicPlaceholderTextUtil_Reset();
+            CopyItemName(sub_802762C(), gStringVar1);
+            DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, gStringVar1);
+            if (itemGiveRet == 2)
+                DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, gText_CantHoldAnyMore);
+            else if (itemGiveRet == 1)
+                DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, gText_FilledStorageSpace);
+            AddTextPrinterParameterized(gUnknown_02022CF8->unk3008[1], 1, gStringVar4, 0, 41, -1, NULL);
+        }
+        CopyWindowToVram(gUnknown_02022CF8->unk3008[0], 2);
+        CopyWindowToVram(gUnknown_02022CF8->unk3008[1], 2);
+        gUnknown_02022CF8->state++;
+        break;
+    case 10:
+        if (!IsDma3ManagerBusyWithBgCopy())
+        {
+            PutWindowTilemap(gUnknown_02022CF8->unk3008[0]);
+            PutWindowTilemap(gUnknown_02022CF8->unk3008[1]);
+        }
+        CopyBgTilemapBufferToVram(0);
+        FadeOutAndFadeInNewMapMusic(MUS_RG_WIN_YASEI, 20, 10);
+        gUnknown_02022CF8->state++;
+        break;
+    case 11:
+        if (++gUnknown_02022CF8->unk301C >= 30 && gMain.newKeys & A_BUTTON)
+        {
+            gUnknown_02022CF8->unk301C = 0;
+            PlaySE(SE_SELECT);
+            gUnknown_02022CF8->state++;
+        }
+        break;
+    default:
+        ClearWindowTilemap(gUnknown_02022CF8->unk3008[0]);
+        ClearWindowTilemap(gUnknown_02022CF8->unk3008[1]);
+        RemoveWindow(gUnknown_02022CF8->unk3008[0]);
+        RemoveWindow(gUnknown_02022CF8->unk3008[1]);
+        FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 30, 20);
+        CopyBgTilemapBufferToVram(0);
+        gUnknown_02022CF8->finished = TRUE;
+        break;
+    }
+}
+
+static void sub_802A010(void)
+{
+    u8 y;
+
+    switch (gUnknown_02022CF8->state)
+    {
+    case 0:
+        gUnknown_02022CF8->unk3008[0] = AddWindow(&gUnknown_082F7BD4[0]);
+        gUnknown_02022CF8->unk3008[1] = AddWindow(&gUnknown_082F7BD4[1]);
+        ClearWindowTilemap(gUnknown_02022CF8->unk3008[0]);
+        ClearWindowTilemap(gUnknown_02022CF8->unk3008[1]);
+        sub_8029174(&gUnknown_082F7BD4[0]);
+        sub_8029074(&gUnknown_082F7BD4[1]);
+        gUnknown_02022CF8->state++;
+        gUnknown_02022CF8->unk3020 = 0;
+        gUnknown_02022CF8->unk3024 = 0;
+        break;
+    case 1:
+        FillWindowPixelBuffer(gUnknown_02022CF8->unk3008[0], PIXEL_FILL(1));
+        FillWindowPixelBuffer(gUnknown_02022CF8->unk3008[1], PIXEL_FILL(1));
+        AddTextPrinterParameterized(gUnknown_02022CF8->unk3008[0], 1, gText_WantToPlayAgain, 0, 5, -1, NULL);
+        AddTextPrinterParameterized(gUnknown_02022CF8->unk3008[1], 1, gText_Yes, 8, 1, -1, NULL);
+        AddTextPrinterParameterized(gUnknown_02022CF8->unk3008[1], 1, gText_No, 8, 17, -1, NULL);
+        AddTextPrinterParameterized(gUnknown_02022CF8->unk3008[1], 1, gText_SelectorArrow2, 0, 1, -1, NULL);
+        CopyWindowToVram(gUnknown_02022CF8->unk3008[0], 2);
+        CopyWindowToVram(gUnknown_02022CF8->unk3008[1], 2);
+        gUnknown_02022CF8->state++;
+        break;
+    case 2:
+        if (!IsDma3ManagerBusyWithBgCopy())
+        {
+            PutWindowTilemap(gUnknown_02022CF8->unk3008[0]);
+            PutWindowTilemap(gUnknown_02022CF8->unk3008[1]);
+        }
+        CopyBgTilemapBufferToVram(0);
+        gUnknown_02022CF8->state++;
+        break;
+    case 3:
+        y = gUnknown_02022CF8->unk3020;
+        if (y == 0)
+            y = 1;
+        FillWindowPixelBuffer(gUnknown_02022CF8->unk3008[1], PIXEL_FILL(1));
+        AddTextPrinterParameterized(gUnknown_02022CF8->unk3008[1], 1, gText_Yes, 8, 1, -1, NULL);
+        AddTextPrinterParameterized(gUnknown_02022CF8->unk3008[1], 1, gText_No, 8, 17, -1, NULL);
+        AddTextPrinterParameterized(gUnknown_02022CF8->unk3008[1], 1, gText_SelectorArrow2, 0, ((y - 1) * 16) + 1, -1, NULL);
+        CopyWindowToVram(gUnknown_02022CF8->unk3008[1], 3);
+        // Increment state only if A or B button have been pressed.
+        if (gMain.newKeys & A_BUTTON)
+        {
+            PlaySE(SE_SELECT);
+            if (gUnknown_02022CF8->unk3020 == 0)
+                gUnknown_02022CF8->unk3020 = 1;
+            gUnknown_02022CF8->state++;
+        }
+        else if (gMain.newKeys & (DPAD_UP | DPAD_DOWN))
+        {
+            PlaySE(SE_SELECT);
+            switch (gUnknown_02022CF8->unk3020)
+            {
+            case 0:
+                gUnknown_02022CF8->unk3020 = 2;
+                break;
+            case 1:
+                gUnknown_02022CF8->unk3020 = 2;
+                break;
+            case 2:
+                gUnknown_02022CF8->unk3020 = 1;
+                break;
+            }
+        }
+        else if (gMain.newKeys & B_BUTTON)
+        {
+            PlaySE(SE_SELECT);
+            gUnknown_02022CF8->unk3020 = 2;
+            gUnknown_02022CF8->state++;
+        }
+        break;
+    default:
+        gUnknown_02022CF8->unk3024 = gUnknown_02022CF8->unk3020;
+        ClearWindowTilemap(gUnknown_02022CF8->unk3008[0]);
+        ClearWindowTilemap(gUnknown_02022CF8->unk3008[1]);
+        RemoveWindow(gUnknown_02022CF8->unk3008[0]);
+        RemoveWindow(gUnknown_02022CF8->unk3008[1]);
+        FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 30, 20);
+        CopyBgTilemapBufferToVram(0);
+        gUnknown_02022CF8->finished = TRUE;
+        break;
+    }
+}
+
+static void sub_802A380(void)
+{
+    switch (gUnknown_02022CF8->state)
+    {
+    case 0:
+        DrawDialogueFrame(0, FALSE);
+        AddTextPrinterParameterized2(0, 1, gText_SavingDontTurnOffPower, 0, NULL, 2, 1, 3);
+        gUnknown_02022CF8->state++;
+        break;
+    case 1:
+        CopyWindowToVram(0, 3);
+        gUnknown_02022CF8->state++;
+        break;
+    case 2:
+        if (!IsDma3ManagerBusyWithBgCopy())
+        {
+            CreateTask(sub_8153688, 0);
+            gUnknown_02022CF8->state++;
         }
+        break;
+    case 3:
+        if (!FuncIsActiveTask(sub_8153688))
+            gUnknown_02022CF8->state++;
+        break;
+    default:
+        FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 30, 20);
+        CopyBgTilemapBufferToVram(0);
+        gUnknown_02022CF8->finished = TRUE;
+        break;
     }
 }
+
+static void sub_802A454(void)
+{
+    switch (gUnknown_02022CF8->state)
+    {
+    case 0:
+        gUnknown_02022CF8->unk3008[0] = AddWindow(&gUnknown_082F7BEC);
+        ClearWindowTilemap(gUnknown_02022CF8->unk3008[0]);
+        sub_8029174(&gUnknown_082F7BEC);
+        gUnknown_02022CF8->state++;
+        break;
+    case 1:
+        FillWindowPixelBuffer(gUnknown_02022CF8->unk3008[0], PIXEL_FILL(1));
+        AddTextPrinterParameterized(gUnknown_02022CF8->unk3008[0], 1, gText_CommunicationStandby3, 0, 5, -1, NULL);
+        CopyWindowToVram(gUnknown_02022CF8->unk3008[0], 2);
+        gUnknown_02022CF8->state++;
+        break;
+    case 2:
+        if (!IsDma3ManagerBusyWithBgCopy())
+            PutWindowTilemap(gUnknown_02022CF8->unk3008[0]);
+        CopyBgTilemapBufferToVram(0);
+        gUnknown_02022CF8->state++;
+        break;
+    default:
+        gUnknown_02022CF8->finished = TRUE;
+        break;
+    }
+}
+
+static void sub_802A534(void)
+{
+    ClearWindowTilemap(gUnknown_02022CF8->unk3008[0]);
+    RemoveWindow(gUnknown_02022CF8->unk3008[0]);
+    FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 30, 20);
+    CopyBgTilemapBufferToVram(0);
+    gUnknown_02022CF8->finished = TRUE;
+}
+
+static void sub_802A588(void)
+{
+    switch (gUnknown_02022CF8->state)
+    {
+    case 0:
+        gUnknown_02022CF8->unk3008[0] = AddWindow(&gUnknown_082F7BE4);
+        ClearWindowTilemap(gUnknown_02022CF8->unk3008[0]);
+        sub_8029174(&gUnknown_082F7BE4);
+        gUnknown_02022CF8->state++;
+        gUnknown_02022CF8->unk301C = 0;
+        gUnknown_02022CF8->unk3020 = 0;
+        gUnknown_02022CF8->unk3024 = 0;
+        break;
+    case 1:
+        FillWindowPixelBuffer(gUnknown_02022CF8->unk3008[0], PIXEL_FILL(1));
+        AddTextPrinterParameterized(gUnknown_02022CF8->unk3008[0], 1, gText_SomeoneDroppedOut, 0, 5, -1, NULL);
+        CopyWindowToVram(gUnknown_02022CF8->unk3008[0], 2);
+        gUnknown_02022CF8->state++;
+        break;
+    case 2:
+        if (!IsDma3ManagerBusyWithBgCopy())
+            PutWindowTilemap(gUnknown_02022CF8->unk3008[0]);
+        CopyBgTilemapBufferToVram(0);
+        gUnknown_02022CF8->state++;
+        break;
+    case 3:
+        if (++gUnknown_02022CF8->unk301C >= 120)
+            gUnknown_02022CF8->state++;
+        break;
+    default:
+        gUnknown_02022CF8->unk3024 = 5;
+        ClearWindowTilemap(gUnknown_02022CF8->unk3008[0]);
+        RemoveWindow(gUnknown_02022CF8->unk3008[0]);
+        FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 30, 20);
+        CopyBgTilemapBufferToVram(0);
+        gUnknown_02022CF8->finished = TRUE;
+        break;
+    }
+}
+
+static void sub_802A6FC(void)
+{
+    DestroyTask(gUnknown_02022CF8->unk3004);
+    gUnknown_02022CF8->finished = TRUE;
+}
+
+static void nullsub_16(void)
+{
+
+}
+
+static void sub_802A72C(void (*func)(void))
+{
+    gUnknown_02022CF8->state = 0;
+    gUnknown_02022CF8->finished = FALSE;
+    gUnknown_02022CF8->unk3028 = func;
+}
+
+static void (*sub_802A75C(void))(void)
+{
+    return gUnknown_02022CF8->unk3028;
+}
+
+static bool32 sub_802A770(void)
+{
+    if (gUnknown_02022CF8->finished == TRUE)
+        return FALSE;
+    else
+        return TRUE;
+}
+
+static u8 sub_802A794(void)
+{
+    return gUnknown_02022CF8->unk3024;
+}
+
+static void sub_802A7A8(void)
+{
+    DmaClearLarge16(3, (void *)VRAM, VRAM_SIZE, 0x1000);
+    DmaClear32(3,(void *)OAM, OAM_SIZE);
+    DmaClear16(3, (void *)PLTT, PLTT_SIZE);
+    SetGpuReg(REG_OFFSET_DISPCNT, 0);
+    ResetBgsAndClearDma3BusyFlags(0);
+    InitBgsFromTemplates(0, gUnknown_082F7BA4, ARRAY_COUNT(gUnknown_082F7BA4));
+    ChangeBgX(0, 0, 0);
+    ChangeBgY(0, 0, 0);
+    ChangeBgX(1, 0, 0);
+    ChangeBgY(1, 0, 0);
+    ChangeBgX(2, 0, 0);
+    ChangeBgY(2, 0, 0);
+    ChangeBgX(3, 0, 0);
+    ChangeBgY(3, 0, 0);
+    InitStandardTextBoxWindows();
+    sub_8197200();
+    SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_ON | DISPCNT_OBJ_1D_MAP);
+    SetBgTilemapBuffer(3, gUnknown_02022CF8->tilemapBuffers[0]);
+    SetBgTilemapBuffer(1, gUnknown_02022CF8->tilemapBuffers[1]);
+    SetBgTilemapBuffer(2, gUnknown_02022CF8->tilemapBuffers[2]);
+}
+
+static bool32 sub_802A8E8(void)
+{
+    switch (gUnknown_02022CF8->unk3018)
+    {
+    case 0:
+        LoadPalette(gDodrioBerryBgPal1, 0, sizeof(gDodrioBerryBgPal1));
+        break;
+    case 1:
+        reset_temp_tile_data_buffers();
+        break;
+    case 2:
+        decompress_and_copy_tile_data_to_vram(3, gDodrioBerryBgGfx1, 0, 0, 0);
+        break;
+    case 3:
+        decompress_and_copy_tile_data_to_vram(1, gDodrioBerryBgGfx2, 0, 0, 0);
+        break;
+    case 4:
+        if (free_temp_tile_data_buffers_if_possible() == TRUE)
+            return FALSE;
+        break;
+    case 5:
+        LoadPalette(stdpal_get(3), 0xD0, 0x20);
+        break;
+    default:
+        gUnknown_02022CF8->unk3018 = 0;
+        return TRUE;
+    }
+
+    gUnknown_02022CF8->unk3018++;
+    return FALSE;
+}
diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c
index b322fc1c7..6d62cdc4a 100644
--- a/src/field_player_avatar.c
+++ b/src/field_player_avatar.c
@@ -336,14 +336,9 @@ void player_step(u8 direction, u16 newKeys, u16 heldKeys)
 
 static bool8 TryInterruptEventObjectSpecialAnim(struct EventObject *playerEventObj, u8 direction)
 {
-    #ifdef NONMATCHING
-        u8 r5 = direction;
-        u8 r6 = direction;
-    #else
-        u8 r5 = direction;
-        register u8 r6 asm("r6") = direction;
-    #endif
-    //a very bad HACK
+    u8 r5 = direction;
+    u8 r6 = direction;
+    r6++; r6--;
 
     if (EventObjectIsMovementOverridden(playerEventObj)
      && !EventObjectClearHeldMovementIfFinished(playerEventObj))
diff --git a/src/fldeff_flash.c b/src/fldeff_flash.c
index c002f700f..a2457307b 100644
--- a/src/fldeff_flash.c
+++ b/src/fldeff_flash.c
@@ -219,8 +219,8 @@ static void sub_8137404(u8 taskId)
 static void sub_8137420(u8 taskId)
 {
     SetGpuReg(REG_OFFSET_DISPCNT, 0);
-    LZ77UnCompVram(gCaveTransitionTiles, (void *)0x600C000);
-    LZ77UnCompVram(gCaveTransitionTilemap, (void *)0x600F800);
+    LZ77UnCompVram(gCaveTransitionTiles, (void *)(VRAM + 0xC000));
+    LZ77UnCompVram(gCaveTransitionTilemap, (void *)(VRAM + 0xF800));
     LoadPalette(gCaveTransitionPalette_White, 0xE0, 0x20);
     LoadPalette(gUnknown_085B28A0, 0xE0, 0x10);
     SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT1_BG0
@@ -304,8 +304,8 @@ static void sub_81375BC(u8 taskId)
 static void sub_81375D8(u8 taskId)
 {
     SetGpuReg(REG_OFFSET_DISPCNT, 0);
-    LZ77UnCompVram(gCaveTransitionTiles, (void *)0x600C000);
-    LZ77UnCompVram(gCaveTransitionTilemap, (void *)0x600F800);
+    LZ77UnCompVram(gCaveTransitionTiles, (void *)(VRAM + 0xC000));
+    LZ77UnCompVram(gCaveTransitionTilemap, (void *)(VRAM + 0xF800));
     SetGpuReg(REG_OFFSET_BLDCNT, 0);
     SetGpuReg(REG_OFFSET_BLDALPHA, 0);
     SetGpuReg(REG_OFFSET_BLDY, 0);
diff --git a/src/pokenav_match_call_data.c b/src/pokenav_match_call_data.c
index 5c1fb59f7..d2d89babf 100644
--- a/src/pokenav_match_call_data.c
+++ b/src/pokenav_match_call_data.c
@@ -6,6 +6,7 @@
 #include "battle.h"
 #include "gym_leader_rematch.h"
 #include "match_call.h"
+#include "constants/region_map_sections.h"
 
 // Static type declarations
 
@@ -17,13 +18,13 @@ typedef struct MatchCallTextDataStruct {
 
 struct MatchCallStructCommon {
     u8 type;
-    u8 v1;
+    u8 mapSec;
     u16 flag;
 };
 
 struct MatchCallStruct0 {
     u8 type;
-    u8 v1;
+    u8 mapSec;
     u16 flag;
     const u8 *desc;
     const u8 *name;
@@ -32,7 +33,7 @@ struct MatchCallStruct0 {
 
 struct MatchCallStruct1 {
     u8 type;
-    u8 v1;
+    u8 mapSec;
     u16 flag;
     u16 rematchTableIdx;
     const u8 *desc;
@@ -42,12 +43,12 @@ struct MatchCallStruct1 {
 
 struct MatchCallSubstruct2 {
     u16 flag;
-    u8 v2;
+    u8 mapSec;
 };
 
 struct MatchCallStruct2 {
     u8 type;
-    u8 v1;
+    u8 mapSec;
     u16 flag;
     u16 rematchTableIdx;
     const u8 *desc;
@@ -57,7 +58,7 @@ struct MatchCallStruct2 {
 
 struct MatchCallStruct3 {
     u8 type;
-    u8 v1;
+    u8 mapSec;
     u16 flag;
     const u8 *desc;
     const u8 *name;
@@ -75,7 +76,7 @@ struct MatchCallStruct4 {
 // Note: Type1 and Type5 have identical struct layouts.
 struct MatchCallStruct5 {
     u8 type;
-    u8 v1;
+    u8 mapSec;
     u16 flag;
     u16 rematchTableIdx;
     const u8 *desc;
@@ -110,11 +111,11 @@ static bool32 MatchCallGetFlag_Type2(match_call_t);
 static bool32 MatchCallGetFlag_Type3(match_call_t);
 static bool32 MatchCallGetFlag_Type4(match_call_t);
 
-static u8 sub_81D1714(match_call_t);
-static u8 sub_81D1718(match_call_t);
-static u8 sub_81D171C(match_call_t);
-static u8 sub_81D1750(match_call_t);
-static u8 sub_81D1754(match_call_t);
+static u8 MatchCallGetMapSec_Type0(match_call_t);
+static u8 MatchCallGetMapSec_Type1(match_call_t);
+static u8 MatchCallGetMapSec_Type2(match_call_t);
+static u8 MatchCallGetMapSec_Type3(match_call_t);
+static u8 MatchCallGetMapSec_Type4(match_call_t);
 
 static bool32 MatchCall_IsRematchable_Type0(match_call_t);
 static bool32 MatchCall_IsRematchable_Type1(match_call_t);
@@ -325,7 +326,7 @@ static const match_call_text_data_t sMrStoneTextScripts[] = {
 static const struct MatchCallStruct0 sMrStoneMatchCallHeader =
 {
     .type = 0,
-    .v1 = 10,
+    .mapSec = MAPSEC_RUSTBORO_CITY,
     .flag = 0xFFFF,
     .desc = gMrStoneMatchCallDesc,
     .name = gMrStoneMatchCallName,
@@ -348,7 +349,7 @@ static const match_call_text_data_t sNormanTextScripts[] = {
 static const struct MatchCallStruct5 sNormanMatchCallHeader =
 {
     .type = 5,
-    .v1 = 7,
+    .mapSec = MAPSEC_PETALBURG_CITY,
     .flag = FLAG_ENABLE_NORMAN_MATCH_CALL,
     .rematchTableIdx = REMATCH_NORMAN,
     .desc = gNormanMatchCallDesc,
@@ -359,7 +360,7 @@ static const struct MatchCallStruct5 sNormanMatchCallHeader =
 static const struct MatchCallStruct3 sProfBirchMatchCallHeader =
 {
     .type = 3,
-    .v1 = 0,
+    .mapSec = 0,
     .flag = FLAG_ENABLE_PROF_BIRCH_MATCH_CALL,
     .desc = gProfBirchMatchCallDesc,
     .name = gProfBirchMatchCallName
@@ -375,7 +376,7 @@ static const match_call_text_data_t sMomTextScripts[] = {
 static const struct MatchCallStruct0 sMomMatchCallHeader =
 {
     .type = 0,
-    .v1 = 0,
+    .mapSec = MAPSEC_LITTLEROOT_TOWN,
     .flag = FLAG_ENABLE_MOM_MATCH_CALL,
     .desc = gMomMatchCallDesc,
     .name = gMomMatchCallName,
@@ -396,7 +397,7 @@ static const match_call_text_data_t sStevenTextScripts[] = {
 static const struct MatchCallStruct0 sStevenMatchCallHeader =
 {
     .type = 0,
-    .v1 = 0xD5,
+    .mapSec = MAPSEC_NONE,
     .flag = FLAG_REGISTERED_STEVEN_POKENAV,
     .desc = gStevenMatchCallDesc,
     .name = gStevenMatchCallName,
@@ -473,16 +474,16 @@ static const match_call_text_data_t sWallyTextScripts[] = {
 };
 
 const struct MatchCallSubstruct2 sWallyAdditionalData[] = {
-    { FLAG_HIDE_MAUVILLE_CITY_WALLY, 0x05 },
-    { FLAG_GROUDON_AWAKENED_MAGMA_HIDEOUT, 0xD5 },
-    { FLAG_HIDE_VICTORY_ROAD_ENTRANCE_WALLY, 0x46 },
-    { 0xFFFF,     0xD5 }
+    { FLAG_HIDE_MAUVILLE_CITY_WALLY,          MAPSEC_VERDANTURF_TOWN },
+    { FLAG_GROUDON_AWAKENED_MAGMA_HIDEOUT,    MAPSEC_NONE },
+    { FLAG_HIDE_VICTORY_ROAD_ENTRANCE_WALLY,  MAPSEC_VICTORY_ROAD },
+    { 0xFFFF,                                 MAPSEC_NONE }
 };
 
 static const struct MatchCallStruct2 sWallyMatchCallHeader =
 {
     .type = 2,
-    .v1 = 0,
+    .mapSec = 0,
     .flag = FLAG_ENABLE_WALLY_MATCH_CALL,
     .rematchTableIdx = REMATCH_WALLY_3,
     .desc = gWallyMatchCallDesc,
@@ -505,7 +506,7 @@ static const match_call_text_data_t sScottTextScripts[] = {
 static const struct MatchCallStruct0 sScottMatchCallHeader =
 {
     .type = 0,
-    .v1 = 0xD5,
+    .mapSec = MAPSEC_NONE,
     .flag = FLAG_ENABLE_SCOTT_MATCH_CALL,
     .desc = gScottMatchCallDesc,
     .name = gScottMatchCallName,
@@ -523,7 +524,7 @@ static const match_call_text_data_t sRoxanneTextScripts[] = {
 static const struct MatchCallStruct5 sRoxanneMatchCallHeader =
 {
     .type = 5,
-    .v1 = 10,
+    .mapSec = MAPSEC_RUSTBORO_CITY,
     .flag = FLAG_ENABLE_ROXANNE_MATCH_CALL,
     .rematchTableIdx = REMATCH_ROXANNE,
     .desc = gRoxanneMatchCallDesc,
@@ -542,7 +543,7 @@ static const match_call_text_data_t sBrawlyTextScripts[] = {
 static const struct MatchCallStruct5 sBrawlyMatchCallHeader =
 {
     .type = 5,
-    .v1 = 2,
+    .mapSec = MAPSEC_DEWFORD_TOWN,
     .flag = FLAG_ENABLE_BRAWLY_MATCH_CALL,
     .rematchTableIdx = REMATCH_BRAWLY,
     .desc = gBrawlyMatchCallDesc,
@@ -561,7 +562,7 @@ static const match_call_text_data_t sWattsonTextScripts[] = {
 static const struct MatchCallStruct5 sWattsonMatchCallHeader =
 {
     .type = 5,
-    .v1 = 9,
+    .mapSec = MAPSEC_MAUVILLE_CITY,
     .flag = FLAG_ENABLE_WATTSON_MATCH_CALL,
     .rematchTableIdx = REMATCH_WATTSON,
     .desc = gWattsonMatchCallDesc,
@@ -580,7 +581,7 @@ static const match_call_text_data_t sFlanneryTextScripts[] = {
 static const struct MatchCallStruct5 sFlanneryMatchCallHeader =
 {
     .type = 5,
-    .v1 = 3,
+    .mapSec = MAPSEC_LAVARIDGE_TOWN,
     .flag = FLAG_ENABLE_FLANNERY_MATCH_CALL,
     .rematchTableIdx = REMATCH_FLANNERY,
     .desc = gFlanneryMatchCallDesc,
@@ -599,7 +600,7 @@ static const match_call_text_data_t sWinonaTextScripts[] = {
 static const struct MatchCallStruct5 sWinonaMatchCallHeader =
 {
     .type = 5,
-    .v1 = 11,
+    .mapSec = MAPSEC_FORTREE_CITY,
     .flag = FLAG_ENABLE_WINONA_MATCH_CALL,
     .rematchTableIdx = REMATCH_WINONA,
     .desc = gWinonaMatchCallDesc,
@@ -618,7 +619,7 @@ static const match_call_text_data_t sTateLizaTextScripts[] = {
 static const struct MatchCallStruct5 sTateLizaMatchCallHeader =
 {
     .type = 5,
-    .v1 = 13,
+    .mapSec = MAPSEC_MOSSDEEP_CITY,
     .flag = FLAG_ENABLE_TATE_AND_LIZA_MATCH_CALL,
     .rematchTableIdx = REMATCH_TATE_AND_LIZA,
     .desc = gTateLizaMatchCallDesc,
@@ -637,7 +638,7 @@ static const match_call_text_data_t sJuanTextScripts[] = {
 static const struct MatchCallStruct5 sJuanMatchCallHeader =
 {
     .type = 5,
-    .v1 = 14,
+    .mapSec = MAPSEC_SOOTOPOLIS_CITY,
     .flag = FLAG_ENABLE_JUAN_MATCH_CALL,
     .rematchTableIdx = REMATCH_JUAN,
     .desc = gJuanMatchCallDesc,
@@ -653,7 +654,7 @@ static const match_call_text_data_t sSidneyTextScripts[] = {
 static const struct MatchCallStruct5 sSidneyMatchCallHeader =
 {
     .type = 5,
-    .v1 = 15,
+    .mapSec = MAPSEC_EVER_GRANDE_CITY,
     .flag = FLAG_REMATCH_SIDNEY,
     .rematchTableIdx = REMATCH_SIDNEY,
     .desc = gEliteFourMatchCallDesc,
@@ -669,7 +670,7 @@ static const match_call_text_data_t sPhoebeTextScripts[] = {
 static const struct MatchCallStruct5 sPhoebeMatchCallHeader =
 {
     .type = 5,
-    .v1 = 15,
+    .mapSec = MAPSEC_EVER_GRANDE_CITY,
     .flag = FLAG_REMATCH_PHOEBE,
     .rematchTableIdx = REMATCH_PHOEBE,
     .desc = gEliteFourMatchCallDesc,
@@ -685,7 +686,7 @@ static const match_call_text_data_t sGlaciaTextScripts[] = {
 static const struct MatchCallStruct5 sGlaciaMatchCallHeader =
 {
     .type = 5,
-    .v1 = 15,
+    .mapSec = MAPSEC_EVER_GRANDE_CITY,
     .flag = FLAG_REMATCH_GLACIA,
     .rematchTableIdx = REMATCH_GLACIA,
     .desc = gEliteFourMatchCallDesc,
@@ -701,7 +702,7 @@ static const match_call_text_data_t sDrakeTextScripts[] = {
 static const struct MatchCallStruct5 sDrakeMatchCallHeader =
 {
     .type = 5,
-    .v1 = 15,
+    .mapSec = MAPSEC_EVER_GRANDE_CITY,
     .flag = FLAG_REMATCH_DRAKE,
     .rematchTableIdx = REMATCH_DRAKE,
     .desc = gEliteFourMatchCallDesc,
@@ -717,7 +718,7 @@ static const match_call_text_data_t sWallaceTextScripts[] = {
 static const struct MatchCallStruct5 sWallaceMatchCallHeader =
 {
     .type = 5,
-    .v1 = 15,
+    .mapSec = MAPSEC_EVER_GRANDE_CITY,
     .flag = FLAG_REMATCH_WALLACE,
     .rematchTableIdx = REMATCH_WALLACE,
     .desc = gChampionMatchCallDesc,
@@ -753,24 +754,24 @@ static bool32 (*const sMatchCallGetFlagFuncs[])(match_call_t) = {
     MatchCallGetFlag_Type0,
     MatchCallGetFlag_Type1,
     MatchCallGetFlag_Type2,
-    MatchCallGetFlag_Type3,
-    MatchCallGetFlag_Type4
+    MatchCallGetFlag_Type4,
+    MatchCallGetFlag_Type3
 };
 
-static u8 (*const gUnknown_08625310[])(match_call_t) = {
-    sub_81D1714,
-    sub_81D1718,
-    sub_81D171C,
-    sub_81D1750,
-    sub_81D1754
+static u8 (*const sMatchCallGetMapSecFuncs[])(match_call_t) = {
+    MatchCallGetMapSec_Type0,
+    MatchCallGetMapSec_Type1,
+    MatchCallGetMapSec_Type2,
+    MatchCallGetMapSec_Type4,
+    MatchCallGetMapSec_Type3
 };
 
 static bool32 (*const sMatchCall_IsRematchableFunctions[])(match_call_t) = {
     MatchCall_IsRematchable_Type0,
     MatchCall_IsRematchable_Type1,
     MatchCall_IsRematchable_Type2,
-    MatchCall_IsRematchable_Type3,
-    MatchCall_IsRematchable_Type4
+    MatchCall_IsRematchable_Type4,
+    MatchCall_IsRematchable_Type3
 };
 
 static bool32 (*const gUnknown_08625338[])(match_call_t) = {
@@ -785,24 +786,24 @@ static u32 (*const sMatchCall_GetRematchTableIdxFunctions[])(match_call_t) = {
     MatchCall_GetRematchTableIdx_Type0,
     MatchCall_GetRematchTableIdx_Type1,
     MatchCall_GetRematchTableIdx_Type2,
-    MatchCall_GetRematchTableIdx_Type3,
-    MatchCall_GetRematchTableIdx_Type4
+    MatchCall_GetRematchTableIdx_Type4,
+    MatchCall_GetRematchTableIdx_Type3
 };
 
 static void (*const sMatchCall_GetMessageFunctions[])(match_call_t, u8 *) = {
     MatchCall_GetMessage_Type0,
     MatchCall_GetMessage_Type1,
     MatchCall_GetMessage_Type2,
-    MatchCall_GetMessage_Type3,
-    MatchCall_GetMessage_Type4
+    MatchCall_GetMessage_Type4,
+    MatchCall_GetMessage_Type3
 };
 
 static void (*const sMatchCall_GetNameAndDescFunctions[])(match_call_t, const u8 **, const u8 **) = {
     MatchCall_GetNameAndDesc_Type0,
     MatchCall_GetNameAndDesc_Type1,
     MatchCall_GetNameAndDesc_Type2,
-    MatchCall_GetNameAndDesc_Type3,
-    MatchCall_GetNameAndDesc_Type4
+    MatchCall_GetNameAndDesc_Type4,
+    MatchCall_GetNameAndDesc_Type3
 };
 
 static const struct UnkStruct_08625388 sMatchCallCheckPageOverrides[] = {
@@ -883,7 +884,7 @@ static bool32 MatchCallGetFlag_Type2(match_call_t matchCall)
     return FlagGet(matchCall.type2->flag);
 }
 
-static bool32 MatchCallGetFlag_Type3(match_call_t matchCall)
+static bool32 MatchCallGetFlag_Type4(match_call_t matchCall)
 {
     if (matchCall.type4->gender != gSaveBlock2Ptr->playerGender)
         return FALSE;
@@ -892,12 +893,12 @@ static bool32 MatchCallGetFlag_Type3(match_call_t matchCall)
     return FlagGet(matchCall.type4->flag);
 }
 
-static bool32 MatchCallGetFlag_Type4(match_call_t matchCall)
+static bool32 MatchCallGetFlag_Type3(match_call_t matchCall)
 {
     return FlagGet(matchCall.type3->flag);
 }
 
-u8 sub_81D16DC(u32 idx)
+u8 MatchCallMapSecGetByIndex(u32 idx)
 {
     match_call_t matchCall;
     u32 i;
@@ -906,20 +907,20 @@ u8 sub_81D16DC(u32 idx)
         return 0;
     matchCall = sMatchCallHeaders[idx];
     i = MatchCallGetFunctionIndex(matchCall);
-    return gUnknown_08625310[i](matchCall);
+    return sMatchCallGetMapSecFuncs[i](matchCall);
 }
 
-static u8 sub_81D1714(match_call_t matchCall)
+static u8 MatchCallGetMapSec_Type0(match_call_t matchCall)
 {
-    return matchCall.type0->v1;
+    return matchCall.type0->mapSec;
 }
 
-static u8 sub_81D1718(match_call_t matchCall)
+static u8 MatchCallGetMapSec_Type1(match_call_t matchCall)
 {
-    return matchCall.type1->v1;
+    return matchCall.type1->mapSec;
 }
 
-static u8 sub_81D171C(match_call_t matchCall)
+static u8 MatchCallGetMapSec_Type2(match_call_t matchCall)
 {
     s32 i;
 
@@ -928,17 +929,17 @@ static u8 sub_81D171C(match_call_t matchCall)
         if (!FlagGet(matchCall.type2->v10[i].flag))
             break;
     }
-    return matchCall.type2->v10[i].v2;
+    return matchCall.type2->v10[i].mapSec;
 }
 
-static u8 sub_81D1750(match_call_t matchCall)
+static u8 MatchCallGetMapSec_Type4(match_call_t matchCall)
 {
-    return 0xd5;
+    return MAPSEC_NONE;
 }
 
-static u8 sub_81D1754(match_call_t matchCall)
+static u8 MatchCallGetMapSec_Type3(match_call_t matchCall)
 {
-    return 0xd5;
+    return MAPSEC_NONE;
 }
 
 bool32 MatchCall_IsRematchable(u32 idx)
@@ -970,12 +971,12 @@ static bool32 MatchCall_IsRematchable_Type2(match_call_t matchCall)
     return gSaveBlock1Ptr->trainerRematches[matchCall.type2->rematchTableIdx] ? TRUE : FALSE;
 }
 
-static bool32 MatchCall_IsRematchable_Type3(match_call_t matchCall)
+static bool32 MatchCall_IsRematchable_Type4(match_call_t matchCall)
 {
     return FALSE;
 }
 
-static bool32 MatchCall_IsRematchable_Type4(match_call_t matchCall)
+static bool32 MatchCall_IsRematchable_Type3(match_call_t matchCall)
 {
     return FALSE;
 }
@@ -1051,12 +1052,12 @@ static u32 MatchCall_GetRematchTableIdx_Type2(match_call_t matchCall)
     return matchCall.type2->rematchTableIdx;
 }
 
-static u32 MatchCall_GetRematchTableIdx_Type3(match_call_t matchCall)
+static u32 MatchCall_GetRematchTableIdx_Type4(match_call_t matchCall)
 {
     return REMATCH_TABLE_ENTRIES;
 }
 
-static u32 MatchCall_GetRematchTableIdx_Type4(match_call_t matchCall)
+static u32 MatchCall_GetRematchTableIdx_Type3(match_call_t matchCall)
 {
     return REMATCH_TABLE_ENTRIES;
 }
@@ -1091,12 +1092,12 @@ static void MatchCall_GetMessage_Type2(match_call_t matchCall, u8 *dest)
     sub_81D1920(matchCall.type2->textData, dest);
 }
 
-static void MatchCall_GetMessage_Type3(match_call_t matchCall, u8 *dest)
+static void MatchCall_GetMessage_Type4(match_call_t matchCall, u8 *dest)
 {
     sub_81D1920(matchCall.type4->textData, dest);
 }
 
-static void MatchCall_GetMessage_Type4(match_call_t matchCall, u8 *dest)
+static void MatchCall_GetMessage_Type3(match_call_t matchCall, u8 *dest)
 {
     sub_8197080(dest);
 }
@@ -1190,13 +1191,13 @@ static void MatchCall_GetNameAndDesc_Type2(match_call_t matchCall, const u8 **de
     *desc = matchCall.type2->desc;
 }
 
-static void MatchCall_GetNameAndDesc_Type3(match_call_t matchCall, const u8 **desc, const u8 **name)
+static void MatchCall_GetNameAndDesc_Type4(match_call_t matchCall, const u8 **desc, const u8 **name)
 {
     *desc = matchCall.type4->desc;
     *name = matchCall.type4->name;
 }
 
-static void MatchCall_GetNameAndDesc_Type4(match_call_t matchCall, const u8 **desc, const u8 **name)
+static void MatchCall_GetNameAndDesc_Type3(match_call_t matchCall, const u8 **desc, const u8 **name)
 {
     *desc = matchCall.type3->desc;
     *name = matchCall.type3->name;
diff --git a/src/pokenav_unk_10.c b/src/pokenav_unk_10.c
index dd91e930a..0ca0ea20d 100644
--- a/src/pokenav_unk_10.c
+++ b/src/pokenav_unk_10.c
@@ -60,8 +60,77 @@ u32 sub_81D0954(void);
 void sub_81D1500(struct Pokenav10Struct *structPtr);
 bool32 sub_81D1524(struct Pokenav10Struct *structPtr);
 void sub_81D1538(struct Sprite *sprite);
+u32 sub_81D0C84(s32);
+u32 sub_81D0D2C(s32);
+u32 sub_81D0D8C(s32);
+u32 sub_81D0E00(s32);
+u32 sub_81D0C54(s32);
+
+const u8 gUnknown_086237F8[][4] = 
+{
+    {1, 1, 0, 0},
+    {3, 4, 1, 0},
+    {3, 4, 5, 0},
+    {3, 4, 9, 0},
+    {3, 4, 13, 0},
+    {3, 4, 17, 0},
+    {1, 1, 21, 0},
+    {1, 1, 22, 0},
+    {1, 1, 23, 0},
+    {1, 1, 24, 0},
+    {1, 1, 25, 1},
+    {1, 1, 26, 1},
+    {1, 1, 27, 1},
+    {1, 1, 28, 1},
+    {1, 1, 29, 1},
+    {1, 1, 30, 1},
+    {1, 1, 31, 1}
+};
+
+#include "data/text/ribbon_descriptions.h"
+#include "data/text/gift_ribbon_descriptions.h"
+
+const u16 gUnknown_08623FF8[] = INCBIN_U16("graphics/pokenav/ribbons_icon1.gbapal");
+const u16 gUnknown_08624018[] = INCBIN_U16("graphics/pokenav/ribbons_icon2.gbapal");
+const u16 gUnknown_08624038[] = INCBIN_U16("graphics/pokenav/ribbons_icon3.gbapal");
+const u16 gUnknown_08624058[] = INCBIN_U16("graphics/pokenav/ribbons_icon4.gbapal");
+const u16 gUnknown_08624078[] = INCBIN_U16("graphics/pokenav/ribbons_icon5.gbapal");
+const u16 gUnknown_08624098[] = INCBIN_U16("graphics/pokenav/8624098.gbapal");
+const u32 gUnknown_086240B8[] = INCBIN_U32("graphics/pokenav/ribbons_icon.4bpp.lz");
+const u32 gUnknown_08624280[] = INCBIN_U32("graphics/pokenav/ribbons_icon_big.4bpp.lz");
+
+const struct BgTemplate gUnknown_08624B98[2] = 
+{
+    {
+        .bg = 1,
+        .charBaseIndex = 3,
+        .mapBaseIndex = 0x07,
+        .screenSize = 0,
+        .paletteMode = 0,
+        .priority = 1,
+        .baseTile = 0
+    },
+    {
+        .bg = 2,
+        .charBaseIndex = 1,
+        .mapBaseIndex = 0x06,
+        .screenSize = 0,
+        .paletteMode = 0,
+        .priority = 2,
+        .baseTile = 0
+    }
+};
+
+const LoopedTask gUnknown_08624BA0[] = 
+{
+    NULL,
+    sub_81D0C84,
+    sub_81D0D2C,
+    sub_81D0D8C,
+    sub_81D0E00,
+    sub_81D0C54
+};
 
-// code
 static const struct WindowTemplate gUnknown_08624BB8 =
 {
     .bg = 2,
diff --git a/src/pokenav_unk_2.c b/src/pokenav_unk_2.c
index 3aec4685e..60aa5ea5e 100644
--- a/src/pokenav_unk_2.c
+++ b/src/pokenav_unk_2.c
@@ -1,6 +1,261 @@
 #include "global.h"
+#include "bg.h"
 #include "gym_leader_rematch.h"
 #include "pokenav.h"
+#include "sprite.h"
+#include "window.h"
+#include "strings.h"
+#include "scanline_effect.h"
+
+extern const u32 gPokenavOptions_Gfx[];
+extern const u16 gPokenavOptions_Pal[];
+
+const u16 gUnknown_0861FC78[] = INCBIN_U16("graphics/pokenav/bg.gbapal");
+const u32 gUnknown_0861FC98[] = INCBIN_U32("graphics/pokenav/bg.4bpp.lz");
+const u32 gUnknown_0861FCAC[] = INCBIN_U32("graphics/pokenav/bg.bin.lz");
+const u16 gUnknown_0861FD4C[] = INCBIN_U16("graphics/pokenav/outline.gbapal");
+const u32 gUnknown_0861FD6C[] = INCBIN_U32("graphics/pokenav/outline.4bpp.lz");
+const u32 gUnknown_0861FFF4[] = INCBIN_U32("graphics/pokenav/outline_map.bin.lz");
+const u16 gUnknown_08620104[] = INCBIN_U16("graphics/pokenav/blue_light.gbapal");    
+const u32 gUnknown_08620124[] = INCBIN_U32("graphics/pokenav/blue_light.4bpp.lz");
+
+const struct BgTemplate gUnknown_08620194[3] = 
+{
+    {
+        .bg = 1,
+        .charBaseIndex = 1,
+        .mapBaseIndex = 0x0F,
+        .screenSize = 0,
+        .paletteMode = 0,
+        .priority = 1,
+        .baseTile = 0
+    },
+    {
+        .bg = 2,
+        .charBaseIndex = 2,
+        .mapBaseIndex = 0x17,
+        .screenSize = 0,
+        .paletteMode = 0,
+        .priority = 2,
+        .baseTile = 0
+    },
+    {
+        .bg = 3,
+        .charBaseIndex = 3,
+        .mapBaseIndex = 0x1F,
+        .screenSize = 0,
+        .paletteMode = 0,
+        .priority = 3,
+        .baseTile = 0
+    }
+};
+
+u32 sub_81C9C6C(s32);
+u32 sub_81C9CA8(s32);
+u32 sub_81C9D44(s32);
+u32 sub_81C9DD8(s32);
+u32 sub_81C9E58(s32);
+u32 sub_81C9EC8(s32);
+u32 sub_81C9EF8(s32);
+u32 sub_81C9F28(s32);
+
+u32 (*const gUnknown_086201A0[])(s32) = 
+{
+    NULL,
+    sub_81C9C6C,
+    sub_81C9CA8,
+    sub_81C9D44,
+    sub_81C9DD8,
+    sub_81C9E58,
+    sub_81C9EC8,
+    sub_81C9EF8,
+    sub_81C9F28
+};
+
+const struct CompressedSpriteSheet gUnknown_086201C4[] =
+{
+    {
+        .data = gPokenavOptions_Gfx,
+        .size = 0x3400,
+        .tag = 0x0003
+    },
+    {
+        .data = gUnknown_08620124,
+        .size = 0x0100,
+        .tag = 0x0001
+    }
+};
+
+ const struct SpritePalette gUnknown_086201D4[] = 
+ {
+    {gPokenavOptions_Pal + 0x00, 4},
+    {gPokenavOptions_Pal + 0x10, 5},
+    {gPokenavOptions_Pal + 0x20, 6},
+    {gPokenavOptions_Pal + 0x30, 7},
+    {gPokenavOptions_Pal + 0x40, 8},
+    {gUnknown_08620104, 3},
+    {}
+};
+
+const u16 gUnknown_0862020C[] = {0, 0};
+const u16 gUnknown_08620210[] = {0x20, 1};    
+const u16 gUnknown_08620214[] = {0x40, 4};    
+const u16 gUnknown_08620218[] = {0x60, 2};
+const u16 gUnknown_0862021C[] = {0x80, 3};    
+const u16 gUnknown_08620220[] = {0xA0, 1};
+const u16 gUnknown_08620224[] = {0xC0, 1};
+const u16 gUnknown_08620228[] = {0xE0, 4};
+const u16 gUnknown_0862022C[] = {0x100, 1};
+const u16 gUnknown_08620230[] = {0x120, 2};
+const u16 gUnknown_08620234[] = {0x140, 0};
+const u16 gUnknown_08620238[] = {0x160, 0};
+const u16 gUnknown_0862023C[] = {0x180, 3};
+
+struct UnkStruct_08620240
+{
+    u16 unk0;
+    u16 unk2;
+    const u16 *unk4[6];
+};
+
+const struct UnkStruct_08620240 gUnknown_08620240[5] = 
+{
+    {
+        0x2A,
+        0x14,
+        {gUnknown_0862020C, gUnknown_08620210, gUnknown_0862021C, NULL, NULL, NULL}
+    },
+    {
+        0x2A,
+        0x14,
+        {gUnknown_0862020C, gUnknown_08620210, gUnknown_08620214, gUnknown_0862021C, NULL, NULL}
+    },
+    {
+        0x2A,
+        0x14,
+        {gUnknown_0862020C, gUnknown_08620210, gUnknown_08620214, gUnknown_08620218, gUnknown_0862021C, NULL}
+    },
+    {
+        0x38,
+        0x14,
+        {gUnknown_08620220, gUnknown_08620224, gUnknown_0862023C, NULL, NULL, NULL}
+    },
+    {
+        0x28,
+        0x10,
+        {gUnknown_08620228, gUnknown_0862022C, gUnknown_08620230, gUnknown_08620234, gUnknown_08620238, gUnknown_0862023C}
+    },
+};
+
+const struct WindowTemplate gUnknown_086202CC = 
+{
+    .bg = 1,
+    .tilemapLeft = 3,
+    .tilemapTop = 17,
+    .width = 0x18,
+    .height = 0x2,
+    .paletteNum = 1,
+    .baseBlock = 8
+};
+
+const u8 *const gUnknown_086202D4[] = 
+{
+    gUnknown_085EBCC5,
+    gUnknown_085EBCE8,
+    gUnknown_085EBD01,
+    gUnknown_085EBD1C,
+    gUnknown_085EBD34,
+    gUnknown_085EBD83,
+    gUnknown_085EBDA2,
+    gUnknown_085EBDBF,
+    gUnknown_085EBDDB,
+    gUnknown_085EBDEE,
+    gUnknown_085EBE06,
+    gUnknown_085EBE19,
+    gUnknown_085EBE2D,
+    gUnknown_085EBE41
+};
+
+const u8 gUnknown_0862030C[] = {6, 8, 7};
+
+const u8 gUnknown_0862030F[] = {6, 8, 7, 0, 0};
+
+const struct OamData gUnknown_08620314 = 
+{
+    .y = 0,
+    .affineMode = 0,
+    .objMode = 0,
+    .bpp = 0,
+    .shape = SPRITE_SHAPE(32x16),
+    .x = 0,
+    .size = SPRITE_SIZE(32x16),
+    .tileNum = 0,
+    .priority = 2,
+    .paletteNum = 0,
+};
+
+const union AffineAnimCmd gUnknown_0862031C[] =
+{
+    AFFINEANIMCMD_FRAME(0x100, 0x100, 0, 0),
+    AFFINEANIMCMD_END,
+};
+
+const union AffineAnimCmd gUnknown_0862032C[] =
+{
+    AFFINEANIMCMD_FRAME(0x100, 0x100, 0, 0),
+    AFFINEANIMCMD_FRAME(0x10, 0x10, 0, 0x12),
+    AFFINEANIMCMD_END,
+};
+
+const union AffineAnimCmd *const gUnknown_08620344[] =
+{
+    gUnknown_0862031C,
+    gUnknown_0862032C
+};
+
+const struct SpriteTemplate gUnknown_0862034C =
+{
+    .tileTag = 3,
+    .paletteTag = 4,
+    .oam = &gUnknown_08620314,
+    .anims = gDummySpriteAnimTable,
+    .images = NULL,
+    .affineAnims = gUnknown_08620344,
+    .callback = SpriteCallbackDummy,
+};
+
+const struct OamData gUnknown_08620364 = 
+{
+    .y = 0,
+    .affineMode = 0,
+    .objMode = 0,
+    .bpp = 0,
+    .shape = SPRITE_SHAPE(32x16),
+    .x = 0,
+    .size = SPRITE_SIZE(32x16),
+    .tileNum = 0,
+    .priority = 2,
+    .paletteNum = 0,
+};
+
+const struct SpriteTemplate gUnknown_0862036C =
+{
+    .tileTag = 1,
+    .paletteTag = 3,
+    .oam = &gUnknown_08620364,
+    .anims = gDummySpriteAnimTable,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = SpriteCallbackDummy,
+};
+
+const struct ScanlineEffectParams gUnknown_08620384 = 
+{
+    (void *)REG_ADDR_WIN0H,
+    ((DMA_ENABLE | DMA_START_HBLANK | DMA_REPEAT | DMA_DEST_RELOAD) << 16) | 1,
+    1,
+    0
+};
 
 bool32 sub_81C98D4(void)
 {
diff --git a/src/pokenav_unk_3.c b/src/pokenav_unk_3.c
index d7afada49..9b62bea78 100755
--- a/src/pokenav_unk_3.c
+++ b/src/pokenav_unk_3.c
@@ -37,9 +37,10 @@ static u32 sub_81CACF8(struct Pokenav3Struct *);
 static u32 sub_81CAD20(s32);
 static bool32 sub_81CB1D0(void);
 
-extern const u8 gUnknown_08622508[];
-extern const u8 gUnknown_0862250A[];
-extern const u8 *const gUnknown_08622028[][4];
+#include "data/text/match_call_messages.h"
+
+const u8 gUnknown_08622508[] = {0, 2};
+const u8 gUnknown_0862250A[] = {0, 1, 2};
 
 bool32 sub_81CAAE8(void)
 {
@@ -207,7 +208,7 @@ static u32 sub_81CAD20(s32 taskState)
             {
                 state->unk1C[state->unkA].unk2 = j;
                 state->unk1C[state->unkA].unk0 = 1;
-                state->unk1C[state->unkA].unk1 = sub_81D16DC(j);
+                state->unk1C[state->unkA].unk1 = MatchCallMapSecGetByIndex(j);
                 state->unkA++;
             }
 
@@ -364,7 +365,7 @@ const u8 *sub_81CAFD8(int index, int textType)
         var0 = state->unk1C[index].unk2;
     }
 
-    return gUnknown_08622028[var0][textType];
+    return gMatchCallMessages[var0][textType];
 }
 
 u16 sub_81CB01C(void)
diff --git a/src/pokenav_unk_4.c b/src/pokenav_unk_4.c
index cd9651580..93dab4491 100755
--- a/src/pokenav_unk_4.c
+++ b/src/pokenav_unk_4.c
@@ -93,27 +93,191 @@ static void sub_81CC330(struct Pokenav4Struct *);
 static struct Sprite *sub_81CC370(void);
 static void sub_81CC440(struct Sprite *sprite);
 static void sub_81CC4A4(struct Sprite *sprite);
+void sub_81CC34C(struct Sprite *sprite);
+u32 sub_81CB510(s32);
+u32 sub_81CB588(s32);
+u32 sub_81CB600(s32);
+u32 sub_81CB678(s32);
+u32 sub_81CB6F0(s32);
+u32 sub_81CB734(s32);
+u32 sub_81CB75C(s32);
+u32 sub_81CB7A0(s32);
+u32 sub_81CB824(s32);
+u32 sub_81CB888(s32);
+u32 sub_81CB93C(s32);
+u32 sub_81CBAD4(s32);
+u32 sub_81CB9C8(s32);
+u32 sub_81CBA68(s32);
+u32 sub_81CBB74(s32);
 
-extern const LoopedTask gUnknown_08622798[];
-extern const struct BgTemplate gUnknown_0862278C[3];
-extern const u16 gUnknown_08622510[];
-extern const u32 gUnknown_08622530[];
-extern const u32 gUnknown_08622760[];
-extern const u16 gUnknown_08622700[];
-extern const u16 gUnknown_08622720[];
-extern const u8 gUnknown_086225D4[];
-extern const u16 gUnknown_086226E0[];
-extern const struct BgTemplate gUnknown_08622794;
-extern const struct WindowTemplate gUnknown_086227D8;
-extern const struct WindowTemplate gUnknown_086227E0;
-extern const u8 *const gUnknown_086227E8[];
 extern const struct WindowTemplate gUnknown_08622808;
-extern const u8 gUnknown_086227F4[];
-extern const struct CompressedSpriteSheet gUnknown_08622810[1];
-extern const struct SpritePalette gUnknown_08622818[];
 extern const struct SpriteTemplate gUnknown_08622830;
 extern const struct SpriteTemplate gUnknown_08622850;
 
+const u16 gUnknown_08622510[] = INCBIN_U16("graphics/pokenav/ui_matchcall.gbapal");
+const u32 gUnknown_08622530[] = INCBIN_U32("graphics/pokenav/ui_matchcall.4bpp.lz");
+const u32 gUnknown_086225D4[] = INCBIN_U32("graphics/pokenav/ui_matchcall.bin.lz");
+const u16 gUnknown_08622698[] = INCBIN_U16("graphics/pokenav/arrow2.gbapal");
+const u32 gUnknown_086226B8[] = INCBIN_U32("graphics/pokenav/arrow2.4bpp.lz");
+const u16 gUnknown_086226E0[] = INCBIN_U16("graphics/pokenav/86226E0.gbapal");
+const u16 gUnknown_08622700[] = INCBIN_U16("graphics/pokenav/8622700.gbapal");
+const u16 gUnknown_08622720[] = INCBIN_U16("graphics/pokenav/pokeball_matchcall.gbapal");
+const u32 gUnknown_08622760[] = INCBIN_U32("graphics/pokenav/pokeball_matchcall.4bpp.lz");
+
+const struct BgTemplate gUnknown_0862278C[3] = 
+{
+    {
+        .bg = 1,
+        .charBaseIndex = 3,
+        .mapBaseIndex = 0x1F,
+        .screenSize = 0,
+        .paletteMode = 0,
+        .priority = 1,
+        .baseTile = 0
+    },
+    {
+        .bg = 2,
+        .charBaseIndex = 2,
+        .mapBaseIndex = 0x06,
+        .screenSize = 0,
+        .paletteMode = 0,
+        .priority = 2,
+        .baseTile = 0x80
+    },
+    {
+        .bg = 3,
+        .charBaseIndex = 1,
+        .mapBaseIndex = 0x07,
+        .screenSize = 0,
+        .paletteMode = 0,
+        .priority = 3,
+        .baseTile = 0
+    }
+};
+
+const LoopedTask gUnknown_08622798[] = 
+{
+    NULL,
+    sub_81CB510,
+    sub_81CB588,
+    sub_81CB600,
+    sub_81CB678,
+    sub_81CB6F0,
+    sub_81CB734,
+    sub_81CB75C,
+    sub_81CB7A0,
+    sub_81CB824,
+    sub_81CB888,
+    sub_81CB93C,
+    sub_81CBAD4,
+    sub_81CB9C8,
+    sub_81CBA68,
+    sub_81CBB74
+};
+
+const struct WindowTemplate gUnknown_086227D8 = 
+{
+    .bg = 2,
+    .tilemapLeft = 0,
+    .tilemapTop = 5,
+    .width = 11,
+    .height = 2,
+    .paletteNum = 2,
+    .baseBlock = 16
+};
+
+const struct WindowTemplate gUnknown_086227E0 = 
+{
+    .bg = 2,
+    .tilemapLeft = 0,
+    .tilemapTop = 9,
+    .width = 11,
+    .height = 8,
+    .paletteNum = 2,
+    .baseBlock = 38
+};
+
+const u8 *const gUnknown_086227E8[] = 
+{
+    gUnknown_085EC017,
+    gUnknown_085EC01C,
+    gUnknown_085EC022
+};
+
+const u8 gUnknown_086227F4[] = _("·{PAUSE 0x04}·{PAUSE 0x04}·{PAUSE 0x04}·{PAUSE 0x04}·\p");
+
+const struct WindowTemplate gUnknown_08622808 = 
+{
+    .bg = 1,
+    .tilemapLeft = 1,
+    .tilemapTop = 12,
+    .width = 0x1C,
+    .height = 0x04,
+    .paletteNum = 1,
+    .baseBlock = 10
+};
+
+const struct CompressedSpriteSheet gUnknown_08622810[1] = 
+{
+    {gUnknown_086226B8, 0x40, 7}
+};
+
+const struct SpritePalette gUnknown_08622818[] = 
+{
+    {gUnknown_08622698, 12},
+    {}
+};
+
+const struct OamData gUnknown_08622828 = 
+{
+    .y = 0,
+    .affineMode = 0,
+    .objMode = 0,
+    .bpp = 0,
+    .shape = SPRITE_SHAPE(8x16),
+    .x = 0,
+    .size = SPRITE_SIZE(8x16),
+    .tileNum = 0,
+    .priority = 1,
+    .paletteNum = 0,
+}; 
+
+const struct SpriteTemplate gUnknown_08622830 =
+{
+    .tileTag = 7,
+    .paletteTag = 12,
+    .oam = &gUnknown_08622828,
+    .anims = gDummySpriteAnimTable,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = sub_81CC34C,
+};
+
+const struct OamData gUnknown_08622848 = 
+{
+    .y = 0,
+    .affineMode = 0,
+    .objMode = 0,
+    .bpp = 0,
+    .shape = SPRITE_SHAPE(64x64),
+    .x = 0,
+    .size = SPRITE_SIZE(64x64),
+    .tileNum = 0,
+    .priority = 1,
+    .paletteNum = 0,
+};
+
+const struct SpriteTemplate gUnknown_08622850 =
+{
+    .tileTag = 8,
+    .paletteTag = 13,
+    .oam = &gUnknown_08622848,
+    .anims = gDummySpriteAnimTable,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = SpriteCallbackDummy,
+};
+
 bool32 sub_81CB260(void)
 {
     struct Pokenav4Struct *state = AllocSubstruct(6, sizeof(struct Pokenav4Struct));
@@ -718,7 +882,7 @@ static void sub_81CBBB8(void)
     template.unkE = 7;
     template.unk10 = sub_81CB050;
     template.unk14 = sub_81CBCEC;
-    sub_81C81D4(&gUnknown_08622794, &template, 2);
+    sub_81C81D4(&gUnknown_0862278C[2], &template, 2);
     CreateTask(sub_81CBC64, 7);
 }
 
diff --git a/src/pokenav_unk_5.c b/src/pokenav_unk_5.c
index 5f24fd07f..ccab58078 100755
--- a/src/pokenav_unk_5.c
+++ b/src/pokenav_unk_5.c
@@ -32,11 +32,11 @@ struct Pokenav5Struct_2
     u8 cityZoomPics[22][0xC8];
 };
 
-struct CityZoomPic
+struct CityMapEntry
 {
     u16 mapSecId;
-    u16 unk2;
-    const u32 *data;
+    u16 index;
+    const u32 *tilemap;
 };
 
 static u32 sub_81CC568(struct Pokenav5Struct *);
@@ -61,17 +61,110 @@ static void sub_81CCDE8(struct Pokenav5Struct_2 *, int, int);
 static void sub_81CCFA4(int);
 static void sub_81CCC9C(u8 taskId);
 static void sub_81CCF78(void);
+void sub_81CCEF4(struct Sprite *sprite);
+u32 sub_81CC848(s32);
+u32 sub_81CC878(s32);
+u32 sub_81CC8D8(s32);
+u32 sub_81CC95C(s32);
 
-extern const LoopedTask gUnknown_086230E4[];
-extern const struct BgTemplate gUnknown_086230D8[2];
-extern const struct CompressedSpriteSheet gUnknown_086230F8[1];
-extern const struct SpritePalette gUnknown_08623100[];
-extern const struct WindowTemplate gUnknown_08623110;
-extern const u32 gUnknown_08622888[];
-extern const u16 gUnknown_08622868[];
 extern const u16 gHoennMapZoomIcons_Pal[];
-extern const struct CityZoomPic gUnknown_08623118[22];
 extern const struct SpriteTemplate gUnknown_086231D0;
+extern const u32 gHoennMapZoomIcons_Gfx[];
+
+const u16 gUnknown_08622868[] = INCBIN_U16("graphics/pokenav/8622868.gbapal");
+const u32 gUnknown_08622888[] = INCBIN_U32("graphics/pokenav/zoom_tiles.4bpp.lz");
+
+#include "data/region_map/city_map_tilemaps.h"
+
+
+const struct BgTemplate gUnknown_086230D8[3] = 
+{
+    {
+        .bg = 1,
+        .charBaseIndex = 1,
+        .mapBaseIndex = 0x1F,
+        .screenSize = 0,
+        .paletteMode = 0,
+        .priority = 1,
+        .baseTile = 0
+    },
+    {
+        .bg = 2,
+        .charBaseIndex = 2,
+        .mapBaseIndex = 0x06,
+        .screenSize = 0,
+        .paletteMode = 0,
+        .priority = 2,
+        .baseTile = 0
+    },
+    {
+        .bg = 2,
+        .charBaseIndex = 0,
+        .mapBaseIndex = 0x00,
+        .screenSize = 2,
+        .paletteMode = 0,
+        .priority = 3,
+        .baseTile = 0
+    },
+};
+
+const LoopedTask gUnknown_086230E4[] = 
+{
+    NULL,
+    sub_81CC848,
+    sub_81CC878,
+    sub_81CC8D8,
+    sub_81CC95C
+};
+
+const struct CompressedSpriteSheet gUnknown_086230F8[1] = 
+{
+    {gHoennMapZoomIcons_Gfx, 0x800, 6}
+};
+
+const struct SpritePalette gUnknown_08623100[] = 
+{
+    {gHoennMapZoomIcons_Pal, 11},
+    {}
+};
+
+const struct WindowTemplate gUnknown_08623110 = 
+{
+    .bg = 1,
+    .tilemapLeft = 17,
+    .tilemapTop = 4,
+    .width = 12,
+    .height = 13,
+    .paletteNum = 1,
+    .baseBlock = 0x4C
+};
+
+#include "data/region_map/city_map_entries.h"
+
+const struct OamData gUnknown_086231C8 = 
+{
+    .y = 0,
+    .affineMode = 0,
+    .objMode = 0,
+    .bpp = 0,
+    .shape = SPRITE_SHAPE(32x8),
+    .x = 0,
+    .size = SPRITE_SIZE(32x8),
+    .tileNum = 0,
+    .priority = 1,
+    .paletteNum = 0,
+};
+
+const struct SpriteTemplate gUnknown_086231D0 =
+{
+    .tileTag = 6,
+    .paletteTag = 11,
+    .oam = &gUnknown_086231C8,
+    .anims = gDummySpriteAnimTable,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = sub_81CCEF4,
+};
 
 u32 sub_81CC4D4(void)
 {
@@ -215,7 +308,7 @@ static u32 sub_81CC6F4(s32 taskState)
         HideBg(2);
         HideBg(3);
         SetBgMode(1);
-        InitBgTemplates(gUnknown_086230D8, ARRAY_COUNT(gUnknown_086230D8));
+        InitBgTemplates(gUnknown_086230D8, ARRAY_COUNT(gUnknown_086230D8) - 1);
         regionMap = GetSubstructPtr(16);
         sub_8122CF8(regionMap, &gUnknown_086230D8[1], sub_81CC6D0());
         sub_81CC9C0();
@@ -278,7 +371,7 @@ static u32 sub_81CC6F4(s32 taskState)
     }
 }
 
-u32 sub_81CC848(int taskState)
+u32 sub_81CC848(s32 taskState)
 {
     struct Pokenav5Struct_2 *state = GetSubstructPtr(4);
     switch (taskState)
@@ -295,7 +388,7 @@ u32 sub_81CC848(int taskState)
     return 4;
 }
 
-u32 sub_81CC878(int taskState)
+u32 sub_81CC878(s32 taskState)
 {
     switch (taskState)
     {
@@ -321,7 +414,7 @@ u32 sub_81CC878(int taskState)
     return 4;
 }
 
-u32 sub_81CC8D8(int taskState)
+u32 sub_81CC8D8(s32 taskState)
 {
     struct Pokenav5Struct_2 *state = GetSubstructPtr(4);
     switch (taskState)
@@ -354,7 +447,7 @@ u32 sub_81CC8D8(int taskState)
     return 4;
 }
 
-u32 sub_81CC95C(int taskState)
+u32 sub_81CC95C(s32 taskState)
 {
     switch (taskState)
     {
@@ -521,9 +614,9 @@ static bool32 sub_81CCD24(void)
 static u32 sub_81CCD34(s32 taskState)
 {
     struct Pokenav5Struct_2 *state = GetSubstructPtr(4);
-    if (taskState < (int)ARRAY_COUNT(gUnknown_08623118))
+    if (taskState < (int)ARRAY_COUNT(gPokenavCityMaps))
     {
-        LZ77UnCompWram(gUnknown_08623118[taskState].data, state->cityZoomPics[taskState]);
+        LZ77UnCompWram(gPokenavCityMaps[taskState].tilemap, state->cityZoomPics[taskState]);
         return 1;
     }
 
@@ -533,10 +626,10 @@ static u32 sub_81CCD34(s32 taskState)
 static void sub_81CCD70(struct Pokenav5Struct_2 *state, int mapSecId, int pos)
 {
     int i;
-    for (i = 0; i < (int)ARRAY_COUNT(gUnknown_08623118) && (gUnknown_08623118[i].mapSecId != mapSecId || gUnknown_08623118[i].unk2 != pos); i++)
+    for (i = 0; i < (int)ARRAY_COUNT(gPokenavCityMaps) && (gPokenavCityMaps[i].mapSecId != mapSecId || gPokenavCityMaps[i].index != pos); i++)
         ;
 
-    if (i == ARRAY_COUNT(gUnknown_08623118))
+    if (i == ARRAY_COUNT(gPokenavCityMaps))
         return;
 
     FillBgTilemapBufferRect_Palette0(1, 0x1041, 17, 6, 12, 11);
diff --git a/src/pokenav_unk_7.c b/src/pokenav_unk_7.c
index ff5d2cc6e..90b677fa7 100644
--- a/src/pokenav_unk_7.c
+++ b/src/pokenav_unk_7.c
@@ -1,5 +1,7 @@
 #include "global.h"
 #include "bg.h"
+#include "window.h"
+#include "pokenav.h"
 #include "decompress.h"
 #include "gpu_regs.h"
 #include "graphics.h"
@@ -13,7 +15,106 @@
 #include "strings.h"
 #include "text.h"
 
-static u8 gUnknown_030012BC;
+u32 sub_81CE37C(s32);
+u32 sub_81CE2D0(s32);
+u32 sub_81CE4D8(s32);
+u32 sub_81CE5E4(s32);
+u32 sub_81CE6BC(s32);
+u32 sub_81CE700(s32);
+
+BSS_DATA u8 gUnknown_030012BC;
+
+const u16 gUnknown_086231E8[] = INCBIN_U16("graphics/pokenav/86231E8.gbapal");
+const u16 gUnknown_08623208[] = INCBIN_U16("graphics/pokenav/8623208.gbapal");
+const u32 gUnknown_08623228[] = INCBIN_U32("graphics/pokenav/8623228.4bpp.lz");
+const u32 gUnknown_0862323C[] = INCBIN_U32("graphics/pokenav/862323C.bin.lz");
+const u16 gUnknown_08623338[] = INCBIN_U16("graphics/pokenav/8623338.gbapal");
+
+const struct BgTemplate gUnknown_08623358[3] = 
+{
+    {
+        .bg = 1,
+        .charBaseIndex = 1,
+        .mapBaseIndex = 0x1F,
+        .screenSize = 0,
+        .paletteMode = 0,
+        .priority = 1,
+        .baseTile = 0
+    },
+    {
+        .bg = 2,
+        .charBaseIndex = 3,
+        .mapBaseIndex = 0x1D,
+        .screenSize = 0,
+        .paletteMode = 0,
+        .priority = 2,
+        .baseTile = 0
+    },
+    {
+        .bg = 3,
+        .charBaseIndex = 2,
+        .mapBaseIndex = 0x1E,
+        .screenSize = 0,
+        .paletteMode = 0,
+        .priority = 3,
+        .baseTile = 0
+    }
+};
+
+const struct WindowTemplate gUnknown_08623364 = 
+{
+    .bg = 1,
+    .tilemapLeft = 13,
+    .tilemapTop = 1,
+    .width = 13,
+    .height = 4,
+    .paletteNum = 15,
+    .baseBlock = 2
+};
+
+const struct WindowTemplate gUnknown_0862336C = 
+{
+    .bg = 1,
+    .tilemapLeft = 1,
+    .tilemapTop = 6,
+    .width = 7,
+    .height = 2,
+    .paletteNum = 15,
+    .baseBlock = 0x36
+};
+
+const struct WindowTemplate gUnknown_08623374 = 
+{
+    .bg = 1,
+    .tilemapLeft = 1,
+    .tilemapTop = 0x1C,
+    .width = 5,
+    .height = 2,
+    .paletteNum = 15,
+    .baseBlock = 0x44
+};
+
+const struct WindowTemplate gUnknown_0862337C = 
+{
+    .bg = 1,
+    .tilemapLeft = 13,
+    .tilemapTop = 0x1C,
+    .width = 3,
+    .height = 2,
+    .paletteNum = 15,
+    .baseBlock = 0x44
+};
+
+const LoopedTask gUnknown_08623384[] =
+{
+    NULL,
+    sub_81CE37C,
+    sub_81CE2D0,
+    sub_81CE4D8,
+    sub_81CE5E4,
+    sub_81CE6BC,
+    sub_81CE700
+};
 
 struct Pokenav7Struct
 {
@@ -52,19 +153,6 @@ void sub_81CEEC8(void);
 void sub_81CEE68(void);
 void sub_81CEE74(bool8 showBg);
 
-// const data
-extern const LoopedTask gUnknown_08623384[];
-extern const struct BgTemplate gUnknown_08623358[3];
-extern const u32 gUnknown_08623228[];
-extern const u32 gUnknown_0862323C[];
-extern const u16 gUnknown_086231E8[];
-extern const u16 gUnknown_08623338[];
-extern const u16 gUnknown_08623208[];
-extern const struct WindowTemplate gUnknown_08623364;
-extern const struct WindowTemplate gUnknown_0862336C;
-extern const struct WindowTemplate gUnknown_08623374;
-extern const struct WindowTemplate gUnknown_0862337C;
-
 // code
 bool32 sub_81CDDD4(void)
 {
diff --git a/src/pokenav_unk_8.c b/src/pokenav_unk_8.c
index 56ffd0f0a..bcafc14d0 100644
--- a/src/pokenav_unk_8.c
+++ b/src/pokenav_unk_8.c
@@ -1,5 +1,81 @@
 #include "global.h"
 #include "pokenav.h"
+#include "bg.h"
+#include "window.h"
+
+u32 sub_81CF134(void);
+u32 sub_81CF1C4(void);
+u32 sub_81CF1D8(void);
+u32 sub_81CF278(void);
+u32 sub_81CF578(s32);
+u32 sub_81CF5F0(s32);
+u32 sub_81CF668(s32);
+u32 sub_81CF6E0(s32);
+u32 sub_81CF758(s32);
+u32 sub_81CF798(s32);
+
+const u32 gUnknown_086233A0[] = {0x16, 0x17, 0x18, 0x21, 0x2F};
+
+u32 (*const gUnknown_086233B4[])(void) = 
+{
+    sub_81CF134,
+    sub_81CF1C4,
+    sub_81CF1D8,
+    sub_81CF278
+};
+
+const u16 gUnknown_086233C4[] = INCBIN_U16("graphics/pokenav/condition_search2.gbapal");
+const u32 gUnknown_086233E4[] = INCBIN_U32("graphics/pokenav/condition_search2.4bpp.lz");
+const u32 gUnknown_086234AC[] = INCBIN_U32("graphics/pokenav/condition_search2.bin.lz");
+const u16 gUnknown_08623570[] = INCBIN_U16("graphics/pokenav/8623570.gbapal");
+
+const struct BgTemplate gUnknown_08623590 = 
+{
+    .bg = 1,
+    .charBaseIndex = 1,
+    .mapBaseIndex = 0x06,
+    .screenSize = 0,
+    .paletteMode = 0,
+    .priority = 2,
+    .baseTile = 0
+};
+
+const struct BgTemplate gUnknown_08623594 = 
+{
+    .bg = 2,
+    .charBaseIndex = 2,
+    .mapBaseIndex = 0x07,
+    .screenSize = 0,
+    .paletteMode = 0,
+    .priority = 3,
+    .baseTile = 0
+};
+
+const LoopedTask gUnknown_08623598[] = 
+{
+    NULL,
+    sub_81CF578,
+    sub_81CF5F0,
+    sub_81CF668,
+    sub_81CF6E0,
+    sub_81CF758,
+    sub_81CF798
+};
+
+const struct WindowTemplate gUnknown_086235B4 = 
+{
+    .bg = 1,
+    .tilemapLeft = 1,
+    .tilemapTop = 6,
+    .width = 7,
+    .height = 2,
+    .paletteNum = 1,
+    .baseBlock = 20
+};
+
+const u8 gUnknown_086235BC[] = _("{COLOR_HIGHLIGHT_SHADOW}{LIGHT_RED}{WHITE}{GREEN}♂{COLOR_HIGHLIGHT_SHADOW}{DARK_GREY}{WHITE}{LIGHT_GREY}");
+const u8 gUnknown_086235C8[] = _("{COLOR_HIGHLIGHT_SHADOW}{LIGHT_GREEN}{WHITE}{BLUE}♀{COLOR_HIGHLIGHT_SHADOW}{DARK_GREY}{WHITE}{LIGHT_GREY}");
+const u8 gUnknown_086235D4[] = _("{UNK_SPACER}");
 
 struct PokenavSub7
 {
@@ -12,8 +88,6 @@ struct PokenavSub7
     struct PokenavSub18 *unkPtr;
 };
 
-extern const u32 gUnknown_086233A0[];
-
 u32 sub_81CF010(struct PokenavSub7 *structPtr);
 u32 sub_81CF030(struct PokenavSub7 *structPtr);
 u32 sub_81CF0B8(struct PokenavSub7 *structPtr);
diff --git a/src/pokenav_unk_9.c b/src/pokenav_unk_9.c
new file mode 100644
index 000000000..2927d7211
--- /dev/null
+++ b/src/pokenav_unk_9.c
@@ -0,0 +1,74 @@
+#include "global.h"
+#include "pokenav.h"
+#include "bg.h"
+#include "window.h"
+
+u32 sub_81CFB8C(void);
+u32 sub_81CFC2C(void);
+u32 sub_81CFC40(void);
+u32 sub_81CFFFC(s32);
+u32 sub_81D0074(s32);
+u32 sub_81D00EC(s32);
+u32 sub_81D0164(s32);
+u32 sub_81D01DC(s32);
+u32 sub_81D021C(s32);
+
+u32 (*const gUnknown_086235D8[])(void) = 
+{
+    sub_81CFB8C,
+    sub_81CFC2C,
+    sub_81CFC40
+};
+
+const u16 gUnknown_086235E4[] = INCBIN_U16("graphics/pokenav/ui_ribbons.gbapal");
+const u32 gUnknown_08623604[] = INCBIN_U32("graphics/pokenav/ui_ribbons.4bpp.lz");
+const u32 gUnknown_086236CC[] = INCBIN_U32("graphics/pokenav/ui_ribbons.bin.lz");
+const u16 gUnknown_08623790[] = INCBIN_U16("graphics/pokenav/8623790.gbapal");
+
+const struct BgTemplate gUnknown_086237B0 = 
+{
+    .bg = 1,
+    .charBaseIndex = 1,
+    .mapBaseIndex = 0x06,
+    .screenSize = 0,
+    .paletteMode = 0,
+    .priority = 2,
+    .baseTile = 0
+};
+
+const struct BgTemplate gUnknown_086237B4 = 
+{
+    .bg = 2,
+    .charBaseIndex = 2,
+    .mapBaseIndex = 0x07,
+    .screenSize = 0,
+    .paletteMode = 0,
+    .priority = 3,
+    .baseTile = 0
+};
+
+const LoopedTask gUnknown_086237B8[] = 
+{
+    NULL,
+    sub_81CFFFC,
+    sub_81D0074,
+    sub_81D00EC,
+    sub_81D0164,
+    sub_81D01DC,
+    sub_81D021C
+};
+
+const struct WindowTemplate gUnknown_086237D4 = 
+{
+    .bg = 1,
+    .tilemapLeft = 1,
+    .tilemapTop = 6,
+    .width = 7,
+    .height = 2,
+    .paletteNum = 1,
+    .baseBlock = 20
+};
+
+const u8 gUnknown_086237DC[] = _("{COLOR_HIGHLIGHT_SHADOW}{LIGHT_RED}{WHITE}{GREEN}♂{COLOR_HIGHLIGHT_SHADOW}{DARK_GREY}{WHITE}{LIGHT_GREY}");
+const u8 gUnknown_086237E8[] = _("{COLOR_HIGHLIGHT_SHADOW}{LIGHT_GREEN}{WHITE}{BLUE}♀{COLOR_HIGHLIGHT_SHADOW}{DARK_GREY}{WHITE}{LIGHT_GREY}");
+const u8 gUnknown_086237F4[] = _("{UNK_SPACER}");
diff --git a/src/text.c b/src/text.c
index 91a82b19f..7e4fa7104 100644
--- a/src/text.c
+++ b/src/text.c
@@ -462,6 +462,108 @@ u8 GetLastTextColor(u8 colorType)
     }
 }
 
+#ifdef NONMATCHING
+
+#define GLYPH_COPY(fromY_, toY_, fromX_, toX_, unk)                                                                 \
+{                                                                                                                   \
+    u32 i, j, *ptr, toY, fromX, toX, r5, toOrr, bits;                                                               \
+    u8 *dst;                                                                                                        \
+                                                                                                                    \
+    j = fromX_;                                                                                                     \
+    i = fromY_;                                                                                                     \
+    ptr = unk;                                                                                                      \
+    toX = toX_;                                                                                                     \
+    toY = toY_;                                                                                                     \
+    fromX = fromX_;                                                                                                 \
+                                                                                                                    \
+    for (; i < toY; i++)                                                                                            \
+    {                                                                                                               \
+        r5 = *(ptr++);                                                                                              \
+        for (j = fromX; j < toX; j++)                                                                               \
+        {                                                                                                           \
+            toOrr = r5 & 0xF;                                                                                       \
+            if (toOrr)                                                                                              \
+            {                                                                                                       \
+                dst = windowTiles + ((j / 8) * 32) + ((j & 7) / 2) + ((i / 8) * widthOffset) + ((i & 7) * 4);       \
+                bits = ((j & 1) << 2);                                                                              \
+                *dst = ((toOrr << bits) | (*dst & (0xF0 >> bits)));                                                 \
+            }                                                                                                       \
+            r5 >>= 4;                                                                                               \
+        }                                                                                                           \
+    }                                                                                                               \
+}
+
+void CopyGlyphToWindow(struct TextPrinter *textPrinter)
+{
+    struct Window *win;
+    struct WindowTemplate *winTempl;
+    struct Struct_03002F90 *unkStruct;
+    u32 currX, widthOffset, currY;
+    s32 r4, r0;
+    u8 *windowTiles;
+
+    win = &gWindows[textPrinter->printerTemplate.windowId];
+    winTempl = &win->window;
+
+    r4 = (winTempl->width * 8) - textPrinter->printerTemplate.currentX;
+    if (r4 > gUnknown_03002F90.unk80)
+        r4 = gUnknown_03002F90.unk80;
+
+    r0 = (winTempl->height * 8) - textPrinter->printerTemplate.currentY;
+    if (r0 > gUnknown_03002F90.unk81)
+        r0 = gUnknown_03002F90.unk81;
+
+    currX = textPrinter->printerTemplate.currentX;
+    currY = textPrinter->printerTemplate.currentY;
+    unkStruct = &gUnknown_03002F90;
+    windowTiles = win->tileData;
+    widthOffset = winTempl->width * 32;
+
+    if (r4 <= 8)
+    {
+        if (r0 <= 8)
+        {
+            GLYPH_COPY(currY, currY + r0, currX, currX + r4, unkStruct->unk0);
+        }
+        else
+        {
+            u32 temp;
+            GLYPH_COPY(currY, currY + 8, currX, currX + r4, unkStruct->unk0);
+
+            temp = currY + 8;
+            GLYPH_COPY(temp, (temp - 8) + r0, currX, currX + r4, unkStruct->unk40);
+        }
+    }
+    else
+    {
+        if (r0 <= 8)
+        {
+            u32 temp;
+            GLYPH_COPY(currY, currY + r0, currX, currX + 8, unkStruct->unk0);
+
+            temp = currX + 8;
+            GLYPH_COPY(currY, currY + r0, temp, (temp - 8) + r4, unkStruct->unk20);
+        }
+        else
+        {
+            u32 temp;
+            GLYPH_COPY(currY, currY + 8, currX, currX + 8, unkStruct->unk0);
+
+            temp = currX + 8;
+            GLYPH_COPY(currY, currY + 8, temp, temp - 8 + r4, unkStruct->unk20);
+
+            temp = currY + 8;
+            GLYPH_COPY(temp, temp - 8 + r0, currX, currX + 8, unkStruct->unk40);
+            {
+                u32 tempX, tempY;
+                tempX = currX + 8;
+                tempY = currY + 8;
+                GLYPH_COPY(tempY, tempY - 8 + r0, tempX, tempX - 8 + r4, unkStruct->unk60);
+            }
+        }
+    }
+}
+#else
 NAKED
 void CopyGlyphToWindow(struct TextPrinter *x)
 {
@@ -1164,6 +1266,7 @@ _080052AA:\n\
     bx r0\n\
     .pool");
 }
+#endif // NONMATCHING
 
 void ClearTextSpan(struct TextPrinter *textPrinter, u32 width)
 {
diff --git a/src/union_room.c b/src/union_room.c
index 486771af7..01288c8cc 100644
--- a/src/union_room.c
+++ b/src/union_room.c
@@ -1,53 +1,54 @@
 #include "global.h"
-#include "window.h"
+#include "alloc.h"
+#include "battle.h"
+#include "berry_crush.h"
 #include "bg.h"
-#include "random.h"
-#include "string_util.h"
-#include "task.h"
+#include "cable_club.h"
+#include "data.h"
+#include "decompress.h"
+#include "dodrio_berry_picking.h"
+#include "dynamic_placeholder_text_util.h"
+#include "easy_chat.h"
 #include "event_data.h"
+#include "event_obj_lock.h"
+#include "field_control_avatar.h"
+#include "field_player_avatar.h"
+#include "field_screen_effect.h"
+#include "field_weather.h"
+#include "international_string_util.h"
+#include "librfu.h"
 #include "link.h"
 #include "link_rfu.h"
-#include "librfu.h"
-#include "alloc.h"
-#include "menu.h"
 #include "list_menu.h"
+#include "load_save.h"
+#include "menu.h"
 #include "menu_helpers.h"
-#include "script.h"
-#include "sound.h"
-#include "constants/songs.h"
-#include "constants/game_stat.h"
-#include "constants/maps.h"
-#include "constants/species.h"
-#include "constants/rgb.h"
-#include "constants/battle_frontier.h"
-#include "trade.h"
-#include "trainer_card.h"
+#include "mevent.h"
+#include "mystery_gift.h"
 #include "overworld.h"
-#include "battle.h"
-#include "load_save.h"
-#include "cable_club.h"
-#include "field_control_avatar.h"
-#include "party_menu.h"
-#include "field_weather.h"
 #include "palette.h"
-#include "decompress.h"
-#include "start_menu.h"
-#include "data.h"
-#include "field_screen_effect.h"
+#include "party_menu.h"
+#include "pokemon_jump.h"
+#include "random.h"
+#include "script.h"
 #include "script_pokemon_util_80F87D8.h"
-#include "international_string_util.h"
-#include "field_player_avatar.h"
+#include "sound.h"
+#include "start_menu.h"
+#include "string_util.h"
 #include "strings.h"
-#include "mevent.h"
-#include "dynamic_placeholder_text_util.h"
+#include "task.h"
+#include "trade.h"
+#include "trainer_card.h"
 #include "union_room.h"
-#include "easy_chat.h"
-#include "event_obj_lock.h"
 #include "union_room_chat.h"
-#include "berry_crush.h"
-#include "mystery_gift.h"
 #include "union_room_player_avatar.h"
-#include "pokemon_jump.h"
+#include "window.h"
+#include "constants/battle_frontier.h"
+#include "constants/game_stat.h"
+#include "constants/maps.h"
+#include "constants/rgb.h"
+#include "constants/songs.h"
+#include "constants/species.h"
 
 EWRAM_DATA u8 gUnknown_02022C20[12] = {};
 EWRAM_DATA u8 gUnknown_02022C2C = 0;
@@ -98,7 +99,6 @@ bool32 sub_8017678(struct UnkStruct_Shared *arg0, struct UnkStruct_Shared *arg1)
 u32 sub_8018120(struct TradeUnkStruct *arg0, u8 multiplayerId);
 void sub_801807C(struct TradeUnkStruct *arg0);
 void sub_801AC54(void);
-void sub_802493C(u8 monId, MainCallback callback);
 void sub_80149D8(void);
 void MG_DrawTextBorder(u8 windowId);
 s8 mevent_message_print_and_prompt_yes_no(u8 *textState, u8 *arg1, u8 arg2, const u8 *str);
diff --git a/src/use_pokeblock.c b/src/use_pokeblock.c
index f28b651cc..655f38def 100644
--- a/src/use_pokeblock.c
+++ b/src/use_pokeblock.c
@@ -85,6 +85,10 @@ struct UsePokeblockStruct
     /*0x7FD0*/ struct UsePokeblockSubStruct info;
 };
 
+#define TAG_TILE_CONDITION_UP_DOWN    0
+#define TAG_PAL_CONDITION_UP_DOWN     0
+#define TAG_PAL_POKEBLOCK_CONDITION   1
+
 extern void sub_81D21DC(u8);
 
 // this file's functions
@@ -130,26 +134,12 @@ static u8 sub_8168048(void);
 void sub_8168180(struct Sprite *sprite);
 void sub_81681B4(struct Sprite *sprite);
 void sub_8168168(struct Sprite *sprite);
+void sub_8168374(struct Sprite *sprite);
 
-extern const struct BgTemplate gUnknown_085DFCCC[4];
-extern const struct WindowTemplate gUnknown_085DFCDC[];
-extern const struct WindowTemplate sUsePokeblockYesNoWinTemplate[];
-extern const u8* sContestStatNames[];
-extern const u32 gUnknown_085DFCB0[];
-extern const u8 gUnknown_085DFCC4[];
-extern const struct SpriteSheet gSpriteSheet_ConditionUpDown;
-extern const struct SpritePalette gSpritePalette_ConditionUpDown;
-extern const struct SpriteTemplate gSpriteTemplate_085DFD5C;
-extern const s16 gUnknown_085DFD28[][2];
-extern const u32 gUnknown_085DFB60[];
-extern const u32 gUnknown_085DFA80[];
-extern const u32 gUnknown_085DFA60[];
-extern const u32 gUnknown_085DFC0C[];
 extern const u16 gUnknown_086231E8[];
 extern const u16 gUnknown_08623208[];
-extern const u8 gUnknown_085DFCC9[];
-extern const struct SpritePalette gUnknown_085DFDB8;
-extern const struct SpriteTemplate gUnknown_085DFDA0;
+extern const struct SpritePalette gSpritePalette_085DFDB8;
+extern const struct SpriteTemplate gSpriteTemplate_085DFDA0;
 
 // ram variables
 EWRAM_DATA struct UsePokeblockSubStruct *gUnknown_0203BC90 = NULL;
@@ -165,6 +155,245 @@ EWRAM_DATA struct UsePokeblockStruct *gUnknown_0203BCAC = NULL;
 // const rom data
 // todo: make it static once the file is decompiled
 
+const u32 gUnknown_085DFA60[] = INCBIN_U32("graphics/interface/85DFA60.bin");
+const u32 gUnknown_085DFA80[] = INCBIN_U32("graphics/interface/85DFA80.4bpp");
+const u32 gUnknown_085DFB60[] = INCBIN_U32("graphics/interface/85DFB60.bin");
+const u32 gUnknown_085DFC0C[] = INCBIN_U32("graphics/interface/85DFC0C.bin");
+
+const u32 gUnknown_085DFCB0[] =
+{
+    MON_DATA_COOL,
+    MON_DATA_TOUGH,
+    MON_DATA_SMART,
+    MON_DATA_CUTE,
+    MON_DATA_BEAUTY
+};
+
+const u8 gUnknown_085DFCC4[] =
+{
+    0, // Spicy/Cool
+    4, // Dry/Beauty
+    3, // Sweet/Cute
+    2, // Bitter/Smart
+    1  // Sour/Tough 
+};
+
+const u8 gUnknown_085DFCC9[] =
+{
+    0,
+    8,
+    1
+};
+
+const struct BgTemplate gUnknown_085DFCCC[4] =
+{
+    {
+        .bg = 0,
+        .charBaseIndex = 2,
+        .mapBaseIndex = 0x1F,
+        .screenSize = 0,
+        .paletteMode = 0,
+        .priority = 0,
+        .baseTile = 0
+    },
+    {
+        .bg = 1,
+        .charBaseIndex = 0,
+        .mapBaseIndex = 0x1E,
+        .screenSize = 0,
+        .paletteMode = 0,
+        .priority = 3,
+        .baseTile = 0
+    },
+    {
+        .bg = 3,
+        .charBaseIndex = 3,
+        .mapBaseIndex = 0x1D,
+        .screenSize = 0,
+        .paletteMode = 0,
+        .priority = 2,
+        .baseTile = 0x100
+    },
+    {
+        .bg = 2,
+        .charBaseIndex = 0,
+        .mapBaseIndex = 0x17,
+        .screenSize = 0,
+        .paletteMode = 0,
+        .priority = 1,
+        .baseTile = 0
+    }
+};
+
+const struct WindowTemplate gUnknown_085DFCDC[] = 
+{
+    {
+        .bg = 0,
+        .tilemapLeft = 0xD,
+        .tilemapTop = 1,
+        .width = 0xD,
+        .height = 4,
+        .paletteNum = 0xF,
+        .baseBlock = 1
+    },
+    {
+        .bg = 0,
+        .tilemapLeft = 0,
+        .tilemapTop = 0xE,
+        .width = 0xB,
+        .height = 2,
+        .paletteNum = 0xF,
+        .baseBlock = 0x35
+    },
+    {
+        .bg = 0,
+        .tilemapLeft = 1,
+        .tilemapTop = 0x11,
+        .width = 0x1C,
+        .height = 2,
+        .paletteNum = 0xF,
+        .baseBlock = 0x4B
+    },
+    DUMMY_WIN_TEMPLATE
+};
+
+const struct WindowTemplate sUsePokeblockYesNoWinTemplate = 
+{
+    .bg = 0,
+    .tilemapLeft = 0x18,
+    .tilemapTop = 0xB,
+    .width = 5,
+    .height = 4,
+    .paletteNum = 0xF,
+    .baseBlock = 0x83
+};
+
+const u8 *const sContestStatNames[] =
+{
+    gText_Coolness,
+    gText_Toughness,
+    gText_Smartness,
+    gText_Cuteness,
+    gText_Beauty3
+};
+
+const struct SpriteSheet gSpriteSheet_ConditionUpDown = 
+{
+    gUsePokeblockUpDown_Gfx, 0x200, TAG_TILE_CONDITION_UP_DOWN
+};
+
+const struct SpritePalette gSpritePalette_ConditionUpDown =
+{
+    gUsePokeblockUpDown_Pal, TAG_PAL_CONDITION_UP_DOWN
+};
+
+const s16 gUnknown_085DFD28[][2] =
+{
+    {0x9C, 0x24},
+    {0x75, 0x3B},
+    {0x75, 0x76},
+    {0xC5, 0x76},
+    {0xC5, 0x3B}
+};
+
+const struct OamData gOamData_085DFD3C = 
+{
+    .y = 0,
+    .affineMode = 0,
+    .objMode = 0,
+    .bpp = 0,
+    .shape = SPRITE_SHAPE(32x16),
+    .x = 0,
+    .size = SPRITE_SIZE(32x16),
+    .tileNum = 0,
+    .priority = 1,
+    .paletteNum = 0,
+};
+
+const union AnimCmd gSpriteAnim_085DFD44[] =
+{
+    ANIMCMD_FRAME(0, 5),
+    ANIMCMD_END
+};
+
+const union AnimCmd gSpriteAnim_085DFD4C[] =
+{
+    ANIMCMD_FRAME(8, 5),
+    ANIMCMD_END
+};
+
+const union AnimCmd *const gSpriteAnimTable_085DFD54[] =
+{
+    gSpriteAnim_085DFD44,
+    gSpriteAnim_085DFD4C
+};
+
+const struct SpriteTemplate gSpriteTemplate_085DFD5C =
+{
+    .tileTag = 0,
+    .paletteTag = 0,
+    .oam = &gOamData_085DFD3C,
+    .anims = gSpriteAnimTable_085DFD54,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = SpriteCallbackDummy,
+};
+
+const struct OamData gOamData_085DFD74 = 
+{
+    .y = 0,
+    .affineMode = 0,
+    .objMode = 0,
+    .bpp = 0,
+    .shape = SPRITE_SHAPE(64x32),
+    .x = 0,
+    .size = SPRITE_SIZE(64x32),
+    .tileNum = 0,
+    .priority = 1,
+    .paletteNum = 0,
+};
+
+const union AnimCmd gSpriteAnim_085DFD7C[] =
+{
+    ANIMCMD_FRAME(0, 5),
+    ANIMCMD_END
+};
+
+const union AnimCmd gSpriteAnim_085DFD84[] =
+{
+    ANIMCMD_FRAME(32, 5),
+    ANIMCMD_END
+};
+
+const union AnimCmd gSpriteAnim_085DFD8C[] =
+{
+    ANIMCMD_FRAME(64, 5),
+    ANIMCMD_END
+};
+
+const union AnimCmd *const gSpriteAnimTable_085DFD94[] =
+{
+    gSpriteAnim_085DFD7C,
+    gSpriteAnim_085DFD84,
+    gSpriteAnim_085DFD8C
+};
+
+const struct SpriteTemplate gSpriteTemplate_085DFDA0 =
+{
+    .tileTag = 1,
+    .paletteTag = 1,
+    .oam = &gOamData_085DFD74,
+    .anims = gSpriteAnimTable_085DFD94,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = sub_8168374,
+};
+
+const struct SpritePalette gSpritePalette_085DFDB8 =
+{
+    gUsePokeblockCondition_Pal, TAG_PAL_POKEBLOCK_CONDITION
+};
+
 // code
 void ChooseMonToGivePokeblock(struct Pokeblock *pokeblock, void (*callback)(void))
 {
@@ -618,7 +847,7 @@ void sub_8166D44(void)
     AddTextPrinterParameterized(2, 1, gStringVar4, 0, 1, 0, NULL);
     PutWindowTilemap(2);
     CopyWindowToVram(2, 3);
-    CreateYesNoMenu(sUsePokeblockYesNoWinTemplate, 151, 14, 0);
+    CreateYesNoMenu(&sUsePokeblockYesNoWinTemplate, 151, 14, 0);
 }
 
 s8 sub_8166DE4(void)
@@ -1373,7 +1602,7 @@ static void sub_8168248(void)
     struct CompressedSpriteSheet spriteSheet;
     struct SpritePalette spritePalette;
 
-    spritePalette = gUnknown_085DFDB8;
+    spritePalette = gSpritePalette_085DFDB8;
     spriteSheet.data = gUsePokeblockCondition_Gfx;
     spriteSheet.size = 0x800;
     spriteSheet.tag = 1;
@@ -1388,7 +1617,7 @@ static void sub_8168294(void)
     int yStart = 17;
     int var = 8;
     struct Sprite **sprites = gUnknown_0203BCAC->field_7B44;
-    const struct SpriteTemplate *template = &gUnknown_085DFDA0;
+    const struct SpriteTemplate *template = &gSpriteTemplate_085DFDA0;
 
     for (i = 0, xDiff = 64, xStart = -96; i < 2; i++)
     {